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: VDEJwy+vHvt/nsZOUUIbpr1L0S5o2hKQj1Z6jvsTJAkkAfnLTIsACCAd65f/42hPeJvg5P4/zn
 88Y0KUjMPObw==
IronPort-SDR: cYXAPD2WmBzP4e9fps4JN9ZeNfrkm8AblXNjmvv2r3mtj0KgIl03LmIJprn3PsqSWFm5l6Epm7
 wo1QBJkfPCjw==
Date:   Tue, 17 Nov 2020 10:05:12 -0800 (PST)
From:   matthew.gerlach@linux.intel.com
To:     "Wu, Hao" <hao.wu@intel.com>
cc:     "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()
In-Reply-To: <DM6PR11MB3819F764DE20B0050A548C1F85E20@DM6PR11MB3819.namprd11.prod.outlook.com>
Message-ID: <alpine.DEB.2.22.394.2011170934400.296481@rhweight-WRK1>
References: <20201117012552.262149-1-matthew.gerlach@linux.intel.com> <20201117012552.262149-2-matthew.gerlach@linux.intel.com> <DM6PR11MB3819F764DE20B0050A548C1F85E20@DM6PR11MB3819.namprd11.prod.outlook.com>
User-Agent: Alpine 2.22 (DEB 394 2020-01-19)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII; format=flowed
Precedence: bulk


On Tue, 17 Nov 2020, Wu, Hao wrote:

>> Subject: [PATCH 1/2] fpga: dfl: refactor cci_enumerate_feature_devs()
>>
>> From: Matthew Gerlach <matthew.gerlach@linux.intel.com>
>>
>> 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.
>>
>> Signed-off-by: Matthew Gerlach <matthew.gerlach@linux.intel.com>
>> ---
>>  drivers/fpga/dfl-pci.c | 86 ++++++++++++++++++++++++------------------
>>  1 file changed, 49 insertions(+), 37 deletions(-)
>>
>> 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;
>>  }
>>
>> -/* 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 = pci_get_drvdata(pcidev);
>> -	int port_num, bar, i, nvec, ret = 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 = 0;
>>  	u32 offset;
>>  	u64 v;
>>
>> -	/* allocate enumeration info via pci_dev */
>> -	info = dfl_fpga_enum_info_alloc(&pcidev->dev);
>> -	if (!info)
>> -		return -ENOMEM;
>> -
>> -	/* add irq info for enumeration if the device support irq */
>> -	nvec = cci_pci_alloc_irq(pcidev);
>> -	if (nvec < 0) {
>> -		dev_err(&pcidev->dev, "Fail to alloc irq %d.\n", nvec);
>> -		ret = nvec;
>> -		goto enum_info_free_exit;
>> -	} else if (nvec) {
>> -		irq_table = cci_pci_create_irq_table(pcidev, nvec);
>> -		if (!irq_table) {
>> -			ret = -ENOMEM;
>> -			goto irq_free_exit;
>> -		}
>> -
>> -		ret = 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 = cci_pci_ioremap_bar0(pcidev);
>> -	if (!base) {
>> -		ret = -ENOMEM;
>> -		goto irq_free_exit;
>> -	}
>> +	if (!base)
>> +		return -ENOMEM;
>>
>>  	/*
>>  	 * 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 = -ENODEV;
>> -		goto irq_free_exit;
>>  	}
>>
>>  	/* release I/O mappings for next step enumeration */
>>  	pcim_iounmap_regions(pcidev, BIT(0));
>>
>> +
>
> We don't need 2 blank line here, remove one please.

I will remove this line in v2.
>
>> +	return ret;
>> +}
>> +
>> +/* enumerate feature devices under pci device */
>> +static int cci_enumerate_feature_devs(struct pci_dev *pcidev)
>> +{
>> +	struct cci_drvdata *drvdata = pci_get_drvdata(pcidev);
>> +	struct dfl_fpga_enum_info *info;
>> +	struct dfl_fpga_cdev *cdev;
>> +	int nvec, ret = 0;
>> +	int *irq_table;
>> +
>> +	/* allocate enumeration info via pci_dev */
>> +	info = dfl_fpga_enum_info_alloc(&pcidev->dev);
>> +	if (!info)
>> +		return -ENOMEM;
>> +
>> +	/* add irq info for enumeration if the device support irq */
>> +	nvec = cci_pci_alloc_irq(pcidev);
>> +	if (nvec < 0) {
>> +		dev_err(&pcidev->dev, "Fail to alloc irq %d.\n", nvec);
>> +		ret = nvec;
>> +		goto enum_info_free_exit;
>> +	} else if (nvec) {
>> +		irq_table = cci_pci_create_irq_table(pcidev, nvec);
>> +		if (!irq_table) {
>> +			ret = -ENOMEM;
>> +			goto irq_free_exit;
>> +		}
>> +
>> +		ret = dfl_fpga_enum_info_add_irq(info, nvec, irq_table);
>> +		kfree(irq_table);
>> +		if (ret)
>> +			goto irq_free_exit;
>> +	}
>> +
>> +	ret = find_dfl_in_bar0(pcidev, info);
>> +
>
> Remove this blank line, and maybe switch to a better function name here.

I will remove blank line in v2 and use your suggested function name, 
find_dfls_by_default.
>
> Thanks
> Hao
>
>> +	if (ret)
>> +		goto irq_free_exit;
>> +
>>  	/* start enumeration with prepared enumeration information */
>>  	cdev = dfl_fpga_feature_devs_enumerate(info);
>>  	if (IS_ERR(cdev)) {
>> --
>> 2.25.2
>
>