Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: FWz7vykoDyo/hV8RDQWsYWXTophoQBsENcVLOKQxNUbQ/CofYU7bGb8WtfVbG67Qb9CnCuW7Jn
 f58FXQra2ilQ==
IronPort-SDR: s8pur6JPQq5cjmBk5u4xXUYTBkosZD2Et7JGzAhIADIUXVwP2OOPagZFBIfpzFCgTa3aId3SNA
 Y74FBYfFsJzQ==
From:   "Wu, Hao" <hao.wu@intel.com>
To:     "matthew.gerlach@linux.intel.com" <matthew.gerlach@linux.intel.com>,
        "linux-fpga@vger.kernel.org" <linux-fpga@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "mdf@kernel.org" <mdf@kernel.org>,
        "trix@redhat.com" <trix@redhat.com>,
        "linux-doc@vger.kernel.org" <linux-doc@vger.kernel.org>,
        "corbet@lwn.net" <corbet@lwn.net>
Subject: RE: [PATCH 1/2] fpga: dfl: refactor cci_enumerate_feature_devs()
Thread-Topic: [PATCH 1/2] fpga: dfl: refactor cci_enumerate_feature_devs()
Thread-Index: AQHWvIBxozGsy0BNp0CzNAbUV8wEW6nMGFow
Date:   Tue, 17 Nov 2020 10:05:31 +0000
Message-ID: <DM6PR11MB3819F764DE20B0050A548C1F85E20@DM6PR11MB3819.namprd11.prod.outlook.com>
References: <20201117012552.262149-1-matthew.gerlach@linux.intel.com>
 <20201117012552.262149-2-matthew.gerlach@linux.intel.com>
In-Reply-To: <20201117012552.262149-2-matthew.gerlach@linux.intel.com>
Accept-Language: en-US
Content-Language: en-US
dlp-product: dlpe-windows
dlp-reaction: no-action
dlp-version: 11.5.1.3
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: b0a1d2a5-f52a-41c5-1525-08d88ae051ac
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Nov 2020 10:05:31.8705
 (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: esB+GgmOv573SPQVpqE/iioDU/vl0Jx+hSD08Au48xa4QuulnBprgAM8zytKOnPI5XPZr7IIMOsSWEOVMgM60g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2571
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

> Subject: [PATCH 1/2] fpga: dfl: refactor cci_enumerate_feature_devs()
>=20
> From: Matthew Gerlach <matthew.gerlach@linux.intel.com>
>=20
> In preparation of looking for dfls based on a vendor
> specific pcie capability, move code that assumes
> Bar0/offset0 as start of DFL to its own function.
>=20
> Signed-off-by: Matthew Gerlach <matthew.gerlach@linux.intel.com>
> ---
>  drivers/fpga/dfl-pci.c | 86 ++++++++++++++++++++++++------------------
>  1 file changed, 49 insertions(+), 37 deletions(-)
>=20
> diff --git a/drivers/fpga/dfl-pci.c b/drivers/fpga/dfl-pci.c
> index a2203d03c9e2..b1b157b41942 100644
> --- a/drivers/fpga/dfl-pci.c
> +++ b/drivers/fpga/dfl-pci.c
> @@ -119,49 +119,20 @@ static int *cci_pci_create_irq_table(struct pci_dev
> *pcidev, unsigned int nvec)
>  	return table;
>  }
>=20
> -/* enumerate feature devices under pci device */
> -static int cci_enumerate_feature_devs(struct pci_dev *pcidev)
> +static int find_dfl_in_bar0(struct pci_dev *pcidev,
> +			    struct dfl_fpga_enum_info *info)
>  {
> -	struct cci_drvdata *drvdata =3D pci_get_drvdata(pcidev);
> -	int port_num, bar, i, nvec, ret =3D 0;
> -	struct dfl_fpga_enum_info *info;
> -	struct dfl_fpga_cdev *cdev;
>  	resource_size_t start, len;
> +	int port_num, bar, i;
>  	void __iomem *base;
> -	int *irq_table;
> +	int ret =3D 0;
>  	u32 offset;
>  	u64 v;
>=20
> -	/* allocate enumeration info via pci_dev */
> -	info =3D dfl_fpga_enum_info_alloc(&pcidev->dev);
> -	if (!info)
> -		return -ENOMEM;
> -
> -	/* add irq info for enumeration if the device support irq */
> -	nvec =3D cci_pci_alloc_irq(pcidev);
> -	if (nvec < 0) {
> -		dev_err(&pcidev->dev, "Fail to alloc irq %d.\n", nvec);
> -		ret =3D nvec;
> -		goto enum_info_free_exit;
> -	} else if (nvec) {
> -		irq_table =3D cci_pci_create_irq_table(pcidev, nvec);
> -		if (!irq_table) {
> -			ret =3D -ENOMEM;
> -			goto irq_free_exit;
> -		}
> -
> -		ret =3D dfl_fpga_enum_info_add_irq(info, nvec, irq_table);
> -		kfree(irq_table);
> -		if (ret)
> -			goto irq_free_exit;
> -	}
> -
> -	/* start to find Device Feature List in Bar 0 */
> +	/* start to find Device Feature List from Bar 0 */
>  	base =3D cci_pci_ioremap_bar0(pcidev);
> -	if (!base) {
> -		ret =3D -ENOMEM;
> -		goto irq_free_exit;
> -	}
> +	if (!base)
> +		return -ENOMEM;
>=20
>  	/*
>  	 * PF device has FME and Ports/AFUs, and VF device only has one
> @@ -208,12 +179,53 @@ static int cci_enumerate_feature_devs(struct
> pci_dev *pcidev)
>  		dfl_fpga_enum_info_add_dfl(info, start, len);
>  	} else {
>  		ret =3D -ENODEV;
> -		goto irq_free_exit;
>  	}
>=20
>  	/* release I/O mappings for next step enumeration */
>  	pcim_iounmap_regions(pcidev, BIT(0));
>=20
> +

We don't need 2 blank line here, remove one please.

> +	return ret;
> +}
> +
> +/* enumerate feature devices under pci device */
> +static int cci_enumerate_feature_devs(struct pci_dev *pcidev)
> +{
> +	struct cci_drvdata *drvdata =3D pci_get_drvdata(pcidev);
> +	struct dfl_fpga_enum_info *info;
> +	struct dfl_fpga_cdev *cdev;
> +	int nvec, ret =3D 0;
> +	int *irq_table;
> +
> +	/* allocate enumeration info via pci_dev */
> +	info =3D dfl_fpga_enum_info_alloc(&pcidev->dev);
> +	if (!info)
> +		return -ENOMEM;
> +
> +	/* add irq info for enumeration if the device support irq */
> +	nvec =3D cci_pci_alloc_irq(pcidev);
> +	if (nvec < 0) {
> +		dev_err(&pcidev->dev, "Fail to alloc irq %d.\n", nvec);
> +		ret =3D nvec;
> +		goto enum_info_free_exit;
> +	} else if (nvec) {
> +		irq_table =3D cci_pci_create_irq_table(pcidev, nvec);
> +		if (!irq_table) {
> +			ret =3D -ENOMEM;
> +			goto irq_free_exit;
> +		}
> +
> +		ret =3D dfl_fpga_enum_info_add_irq(info, nvec, irq_table);
> +		kfree(irq_table);
> +		if (ret)
> +			goto irq_free_exit;
> +	}
> +
> +	ret =3D find_dfl_in_bar0(pcidev, info);
> +

Remove this blank line, and maybe switch to a better function name here.

Thanks
Hao

> +	if (ret)
> +		goto irq_free_exit;
> +
>  	/* start enumeration with prepared enumeration information */
>  	cdev =3D dfl_fpga_feature_devs_enumerate(info);
>  	if (IS_ERR(cdev)) {
> --
> 2.25.2