diff options
Diffstat (limited to 'drivers/fpga/dfl-pci.c')
| -rw-r--r-- | drivers/fpga/dfl-pci.c | 165 | 
1 files changed, 130 insertions, 35 deletions
diff --git a/drivers/fpga/dfl-pci.c b/drivers/fpga/dfl-pci.c index a2203d03c9e2..04e47e266f26 100644 --- a/drivers/fpga/dfl-pci.c +++ b/drivers/fpga/dfl-pci.c @@ -27,6 +27,14 @@  #define DRV_VERSION	"0.8"  #define DRV_NAME	"dfl-pci" +#define PCI_VSEC_ID_INTEL_DFLS 0x43 + +#define PCI_VNDR_DFLS_CNT 0x8 +#define PCI_VNDR_DFLS_RES 0xc + +#define PCI_VNDR_DFLS_RES_BAR_MASK GENMASK(2, 0) +#define PCI_VNDR_DFLS_RES_OFF_MASK GENMASK(31, 3) +  struct cci_drvdata {  	struct dfl_fpga_cdev *cdev;	/* container device */  }; @@ -119,49 +127,94 @@ 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_dfls_by_vsec(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; +	u32 bir, offset, vndr_hdr, dfl_cnt, dfl_res; +	int dfl_res_off, i, bars, voff = 0;  	resource_size_t start, len; -	void __iomem *base; -	int *irq_table; -	u32 offset; -	u64 v; -	/* allocate enumeration info via pci_dev */ -	info = dfl_fpga_enum_info_alloc(&pcidev->dev); -	if (!info) -		return -ENOMEM; +	while ((voff = pci_find_next_ext_capability(pcidev, voff, PCI_EXT_CAP_ID_VNDR))) { +		vndr_hdr = 0; +		pci_read_config_dword(pcidev, voff + PCI_VNDR_HEADER, &vndr_hdr); -	/* 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; +		if (PCI_VNDR_HEADER_ID(vndr_hdr) == PCI_VSEC_ID_INTEL_DFLS && +		    pcidev->vendor == PCI_VENDOR_ID_INTEL) +			break; +	} + +	if (!voff) { +		dev_dbg(&pcidev->dev, "%s no DFL VSEC found\n", __func__); +		return -ENODEV; +	} + +	dfl_cnt = 0; +	pci_read_config_dword(pcidev, voff + PCI_VNDR_DFLS_CNT, &dfl_cnt); +	if (dfl_cnt > PCI_STD_NUM_BARS) { +		dev_err(&pcidev->dev, "%s too many DFLs %d > %d\n", +			__func__, dfl_cnt, PCI_STD_NUM_BARS); +		return -EINVAL; +	} + +	dfl_res_off = voff + PCI_VNDR_DFLS_RES; +	if (dfl_res_off + (dfl_cnt * sizeof(u32)) > PCI_CFG_SPACE_EXP_SIZE) { +		dev_err(&pcidev->dev, "%s DFL VSEC too big for PCIe config space\n", +			__func__); +		return -EINVAL; +	} + +	for (i = 0, bars = 0; i < dfl_cnt; i++, dfl_res_off += sizeof(u32)) { +		dfl_res = GENMASK(31, 0); +		pci_read_config_dword(pcidev, dfl_res_off, &dfl_res); + +		bir = dfl_res & PCI_VNDR_DFLS_RES_BAR_MASK; +		if (bir >= PCI_STD_NUM_BARS) { +			dev_err(&pcidev->dev, "%s bad bir number %d\n", +				__func__, bir); +			return -EINVAL;  		} -		ret = dfl_fpga_enum_info_add_irq(info, nvec, irq_table); -		kfree(irq_table); -		if (ret) -			goto irq_free_exit; +		if (bars & BIT(bir)) { +			dev_err(&pcidev->dev, "%s DFL for BAR %d already specified\n", +				__func__, bir); +			return -EINVAL; +		} + +		bars |= BIT(bir); + +		len = pci_resource_len(pcidev, bir); +		offset = dfl_res & PCI_VNDR_DFLS_RES_OFF_MASK; +		if (offset >= len) { +			dev_err(&pcidev->dev, "%s bad offset %u >= %pa\n", +				__func__, offset, &len); +			return -EINVAL; +		} + +		dev_dbg(&pcidev->dev, "%s BAR %d offset 0x%x\n", __func__, bir, offset); + +		len -= offset; + +		start = pci_resource_start(pcidev, bir) + offset; + +		dfl_fpga_enum_info_add_dfl(info, start, len);  	} -	/* start to find Device Feature List in Bar 0 */ +	return 0; +} + +/* default method of finding dfls starting at offset 0 of bar 0 */ +static int find_dfls_by_default(struct pci_dev *pcidev, +				struct dfl_fpga_enum_info *info) +{ +	int port_num, bar, i, ret = 0; +	resource_size_t start, len; +	void __iomem *base; +	u32 offset; +	u64 v; + +	/* 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 +261,54 @@ 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)); +	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_dfls_by_vsec(pcidev, info); +	if (ret == -ENODEV) +		ret = find_dfls_by_default(pcidev, info); + +	if (ret) +		goto irq_free_exit; +  	/* start enumeration with prepared enumeration information */  	cdev = dfl_fpga_feature_devs_enumerate(info);  	if (IS_ERR(cdev)) {  | 
