Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 29 Jun 2022 20:40:27 -0700
From:   Ira Weiny <ira.weiny@intel.com>
To:     Jonathan Cameron <Jonathan.Cameron@huawei.com>
CC:     Dan Williams <dan.j.williams@intel.com>,
        Bjorn Helgaas <bhelgaas@google.com>,
        Ben Widawsky <bwidawsk@kernel.org>,
        Alison Schofield <alison.schofield@intel.com>,
        Lukas Wunner <lukas@wunner.de>,
        Vishal Verma <vishal.l.verma@intel.com>,
        Dave Jiang <dave.jiang@intel.com>,
        <linux-kernel@vger.kernel.org>, <linux-cxl@vger.kernel.org>,
        <linux-pci@vger.kernel.org>
Subject: Re: [PATCH V12 8/9] cxl/port: Retry reading CDAT on failure
Message-ID: <Yr0bK4RUnreNTy86@iweiny-desk3>
References: <20220628041527.742333-1-ira.weiny@intel.com>
 <20220628041527.742333-9-ira.weiny@intel.com>
 <20220628155720.000034cb@Huawei.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20220628155720.000034cb@Huawei.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?tNF9FzwQGGX9WsQI+Y6CRHUZqDNy8tCPaqoPCmIKKt05xf2qCiVQWzA7rbdO?=
 =?us-ascii?Q?8C6V+OO98VbKLdpp+N99eIr7BCG8Mcj+eg2JEI1s/VHYEqNKm3wPMTh6Rc9m?=
 =?us-ascii?Q?WZP0hos8ONnDD947crBKKhNR8nu+pSnBM9EV0DwJ/CWEJhMcDGJLrj4KbF6z?=
 =?us-ascii?Q?AJc0Aob7Je302yTCsuHJtGMxwu6t8F+08Dd6UGJuWto8qLBKAN23ZqGChcbF?=
 =?us-ascii?Q?vORB3rXoK/Ejb+M0/OKri9z0qlM2LKvWZxZ0JYBW048lEyTIaJ/VeE3hGknk?=
 =?us-ascii?Q?spVloRP/9KwQ/D2H6c9PbHLvNm36lKsVTNfzjIRd0Mil1DU+N+AAiMZtSa+O?=
 =?us-ascii?Q?k4I/g1C9sX/M4eFyy2YVnMQdrNVxZOzDOF18B1sK116jIWR2JshAmZ4Oc3/v?=
 =?us-ascii?Q?jdgkwU5WAQrqC4Uh5UkA/zNX/F4aNzp512f2V/XIQiQ94KW8x8VNmyqeqkfJ?=
 =?us-ascii?Q?LDAKZodBVsU2C0NM6d7SIavsawmqnb50oRqR9xEuLXuUXVCAkCT2qM0EQDog?=
 =?us-ascii?Q?dhtBdYqbT8eyEjiLtM9sN73kAeXgF62Q/A967bDdlwWqZ8EDR7Fsb4500uOb?=
 =?us-ascii?Q?zkIP/74GfNhQBB6YKRd9I3j9zX5hya9QQHtAVidRPy+N+ltS5PSDiHrPk8k/?=
 =?us-ascii?Q?k96CTncB13bT1MmlrNTsftXHjeldxAlKA2CEsnEFVrpI+jxcScgcTwDdvL9I?=
 =?us-ascii?Q?QfuZoFAWrxfnE2D8wTtQ+d0NKYvKeUu1REU5B8xZ2Javbqg0UdOwXrYPXArv?=
 =?us-ascii?Q?/1UDQ1AiWgowFqKk8KZcPlALwmP0+C8uDWnhmVE2wP6ng04MWDpDH37JAOW0?=
 =?us-ascii?Q?O5GddykvhyZ4zIq6E+dkvgbroTuW9sN+I/NGxrMNK20ovevACb3/FufcWNcS?=
 =?us-ascii?Q?0l4pjxoMqgE77VCb2YUnp6SI+SaNY3enbzCaJ42Trnd/EMaiCBQoWpUl0MDy?=
 =?us-ascii?Q?DqQxMS6OY7Cfj8m/oCKnNYkMtLIVxFNuMhPQ4QRXbpqW+laGCIrgpHXNUbYo?=
 =?us-ascii?Q?uaQxF1rnbViiKNYVOWsryYZTe/gnXNXGxFbiloyIlSwbiq3ZVniWPUYCtiFC?=
 =?us-ascii?Q?MDKArVGNUecVc7ZWvtW+ZsPTj9C/XO+X31VkzAax9is7TihIHEmrige0CQs2?=
 =?us-ascii?Q?dP+XZ5rTJ3gVJoBpkNmSH+F+FilE1iU0Tzi4uAmjbWed+u91m/YlqGOdAy6M?=
 =?us-ascii?Q?u1yHTWc0mr1HulXY+OShK+wWdiqNhiFNk3AofwtpiqXrP4JSMEDfYWTub9gB?=
 =?us-ascii?Q?IKHk1qKIiXQkPPuScpk6MGMAuwmR2E7Bz3GCcC8wP6dLIm8BYeig6rbYO+ZJ?=
 =?us-ascii?Q?73dXkUaB09LowGBd+udnmkHIK1dk2qq7haZLbG/RtW4BfgZD8frHSLgTjHqz?=
 =?us-ascii?Q?rfX1Lbr/Zcs4n6+rjyJrsMQtDvb/9FOWFgI9hdmEEYC7WrhTEaNTOY8GDi7b?=
 =?us-ascii?Q?CH/zpsM0A+GGoejUIg8xMsGssicKwcH8wM+4ABy2/51wO3aywy8zel7qknNn?=
 =?us-ascii?Q?X7nmsi0tzDak/LMmUD5iubRNzdFZxFxzhCWil8jEabqp8hECDIzVzNU3+YFY?=
 =?us-ascii?Q?oN92pZU5JediL5a0fGql9TCQcWevMvTkQOTzKI4gWTrhlaEb7tLq+XD/RyBw?=
 =?us-ascii?Q?tszdbtyVCTDJa41Vh4aHIhVp+LX0JvyY9TlYL0a7J/dU?=
X-MS-Exchange-CrossTenant-Network-Message-Id: fd7aef9a-6c37-4b70-dd96-08da5a4a49cb
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB6311.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 03:40:33.9773
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: S6Qz+Mm8fEaJQvUqlBUjCYMm6OeWhaqt8Ihe2bbqpk4KTfFWhs99tRniK/xJ6JnOeccVyzp5aoq8ZQ9Kd5tybQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR11MB2002
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Jun 28, 2022 at 03:57:20PM +0100, Jonathan Cameron wrote:
> On Mon, 27 Jun 2022 21:15:26 -0700
> ira.weiny@intel.com wrote:
> 

[snip]

> >  
> > -/**
> > - * read_cdat_data - Read the CDAT data on this port
> > - * @port: Port to read data from
> > - *
> > - * This call will sleep waiting for responses from the DOE mailbox.
> > - */
> > -void read_cdat_data(struct cxl_port *port)
> > +static int __read_cdat_data(struct cxl_port *port)
> >  {
> >  	static struct pci_doe_mb *cdat_mb;
> >  	struct device *dev = &port->dev;
> >  	struct device *uport = port->uport;
> >  	size_t cdat_length;
> > -	int ret;
> > +	int ret = 0;
> Fairly sure there isn't a path in which ret isn't set...
> 

Yep.

> 
> Mixing ret and rc is a bit inconsistent, maybe scrub patch set for
> one or the other. (My fault originally I think :)

Ok PCI uses both ret and rc.  :-(  But CXL seems to be consistent with rc.  So
I've used rc with the new series which I think satisfies both subsystems.

Thanks again for the detail review of the series.  Hopefully there will be a
new version out tomorrow.
Ira

> 
> 
> >  
> >  	cdat_mb = find_cdat_mb(uport);
> >  	if (!cdat_mb) {
> >  		dev_dbg(dev, "No CDAT mailbox\n");
> > -		return;
> > +		return -EIO;
> >  	}
> >  
> >  	port->cdat_sup = true;
> >  
> >  	if (cxl_cdat_get_length(dev, cdat_mb, &cdat_length)) {
> >  		dev_dbg(dev, "No CDAT length\n");
> > -		return;
> > +		return -EIO;
> >  	}
> >  
> >  	port->cdat.table = devm_kzalloc(dev, cdat_length, GFP_KERNEL);
> >  	if (!port->cdat.table)
> > -		return;
> > +		return -ENOMEM;
> >  
> >  	port->cdat.length = cdat_length;
> >  	ret = cxl_cdat_read_table(dev, cdat_mb, &port->cdat);
> > @@ -658,5 +652,30 @@ void read_cdat_data(struct cxl_port *port)
> >  		port->cdat.length = 0;
> >  		dev_err(dev, "CDAT data read error\n");
> >  	}
> > +
> > +	return ret;
> > +}
> > +
> > +/**
> > + * read_cdat_data - Read the CDAT data on this port
> > + * @port: Port to read data from
> > + *
> > + * This call will sleep waiting for responses from the DOE mailbox.
> > + */
> > +void read_cdat_data(struct cxl_port *port)
> > +{
> > +	int retries = 5;
> > +	int rc;
> > +
> > +	while (retries--) {
> > +		rc = __read_cdat_data(port);
> > +		if (!rc)
> > +			return;
> > +		dev_dbg(&port->dev,
> > +			"CDAT data read error rc=%d (retries %d)\n",
> > +			rc, retries);
> > +	}
> > +	dev_err(&port->dev, "CDAT data read failed after %d retries\n",
> > +		retries);
> >  }
> >  EXPORT_SYMBOL_NS_GPL(read_cdat_data, CXL);
>