korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-08 06:44:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

sfc: falcon: Read VPD with pci_vpd_alloc()

Browse Source 
This is the same as 5119e20fac "sfc: Read VPD with pci_vpd_alloc()",
just for the falcon chip version.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Heiner Kallweit 2021-08-22 15:48:33 +02:00 committed by David S. Miller
parent dddb6c2fdb
commit 3873a9a4d8
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/net/ethernet/sfc/falcon/efx.c
View File

@ -2780,22 +2780,18 @@ static void ef4_pci_remove(struct pci_dev *pci_dev)
}; };
/* NIC VPD information /* NIC VPD information
* Called during probe to display the part number of the * Called during probe to display the part number of the installed NIC.
* installed NIC. VPD is potentially very large but this should
* always appear within the first 512 bytes.
*/ */
#define SFC_VPD_LEN 512
static void ef4_probe_vpd_strings(struct ef4_nic *efx) static void ef4_probe_vpd_strings(struct ef4_nic *efx)
{ {
struct pci_dev *dev = efx->pci_dev; struct pci_dev *dev = efx->pci_dev;
char vpd_data[SFC_VPD_LEN];
ssize_t vpd_size;
int ro_start, ro_size, i, j; int ro_start, ro_size, i, j;
unsigned int vpd_size;
u8 *vpd_data;
/* Get the vpd data from the device */ vpd_data = pci_vpd_alloc(dev, &vpd_size);
vpd_size = pci_read_vpd(dev, 0, sizeof(vpd_data), vpd_data); if (IS_ERR(vpd_data)) {
if (vpd_size <= 0) { pci_warn(dev, "Unable to read VPD\n");
netif_err(efx, drv, efx->net_dev, "Unable to read VPD\n");
return; return;
} }
@ -2803,7 +2799,7 @@ static void ef4_probe_vpd_strings(struct ef4_nic *efx)
ro_start = pci_vpd_find_tag(vpd_data, vpd_size, PCI_VPD_LRDT_RO_DATA); ro_start = pci_vpd_find_tag(vpd_data, vpd_size, PCI_VPD_LRDT_RO_DATA);
if (ro_start < 0) { if (ro_start < 0) {
netif_err(efx, drv, efx->net_dev, "VPD Read-only not found\n"); netif_err(efx, drv, efx->net_dev, "VPD Read-only not found\n");
return; goto out;
} }
ro_size = pci_vpd_lrdt_size(&vpd_data[ro_start]); ro_size = pci_vpd_lrdt_size(&vpd_data[ro_start]);
@ -2816,14 +2812,14 @@ static void ef4_probe_vpd_strings(struct ef4_nic *efx)
i = pci_vpd_find_info_keyword(vpd_data, i, j, "PN"); i = pci_vpd_find_info_keyword(vpd_data, i, j, "PN");
if (i < 0) { if (i < 0) {
netif_err(efx, drv, efx->net_dev, "Part number not found\n"); netif_err(efx, drv, efx->net_dev, "Part number not found\n");
return; goto out;
} }
j = pci_vpd_info_field_size(&vpd_data[i]); j = pci_vpd_info_field_size(&vpd_data[i]);
i += PCI_VPD_INFO_FLD_HDR_SIZE; i += PCI_VPD_INFO_FLD_HDR_SIZE;
if (i + j > vpd_size) { if (i + j > vpd_size) {
netif_err(efx, drv, efx->net_dev, "Incomplete part number\n"); netif_err(efx, drv, efx->net_dev, "Incomplete part number\n");
return; goto out;
} }
netif_info(efx, drv, efx->net_dev, netif_info(efx, drv, efx->net_dev,
@ -2834,21 +2830,23 @@ static void ef4_probe_vpd_strings(struct ef4_nic *efx)
i = pci_vpd_find_info_keyword(vpd_data, i, j, "SN"); i = pci_vpd_find_info_keyword(vpd_data, i, j, "SN");
if (i < 0) { if (i < 0) {
netif_err(efx, drv, efx->net_dev, "Serial number not found\n"); netif_err(efx, drv, efx->net_dev, "Serial number not found\n");
return; goto out;
} }
j = pci_vpd_info_field_size(&vpd_data[i]); j = pci_vpd_info_field_size(&vpd_data[i]);
i += PCI_VPD_INFO_FLD_HDR_SIZE; i += PCI_VPD_INFO_FLD_HDR_SIZE;
if (i + j > vpd_size) { if (i + j > vpd_size) {
netif_err(efx, drv, efx->net_dev, "Incomplete serial number\n"); netif_err(efx, drv, efx->net_dev, "Incomplete serial number\n");
return; goto out;
} }
efx->vpd_sn = kmalloc(j + 1, GFP_KERNEL); efx->vpd_sn = kmalloc(j + 1, GFP_KERNEL);
if (!efx->vpd_sn) if (!efx->vpd_sn)
return; goto out;
snprintf(efx->vpd_sn, j + 1, "%s", &vpd_data[i]); snprintf(efx->vpd_sn, j + 1, "%s", &vpd_data[i]);
out:
kfree(vpd_data);
} }