iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sfc: falcon: Search VPD with pci_vpd_find_ro_info_keyword()

Browse Source 
Use pci_vpd_find_ro_info_keyword() to search for keywords in VPD to
simplify the code.

Replace netif_err() with pci_err() because the netdevice isn't registered
yet, which results in very ugly messages.

Use kmemdup_nul() instead of open-coding it.

This is the same as 37838aa437c7 ("sfc: Search VPD with
pci_vpd_find_ro_info_keyword()"), just for the falcon chip version.

Link: https://lore.kernel.org/r/898282a1-13bd-17bc-2e9a-d3dcd336b46c@gmail.com
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Heiner Kallweit 2021-08-22 15:49:36 +02:00 committed by Bjorn Helgaas
parent 667bb0e8f7
commit 2d57dd6673
1 changed files with 14 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2785,9 +2785,9 @@ static void ef4_pci_remove(struct pci_dev *pci_dev)
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;
int ro_start, ro_size, i, j; unsigned int vpd_size, kw_len;
unsigned int vpd_size;
u8 *vpd_data; u8 *vpd_data;
int start;
vpd_data = pci_vpd_alloc(dev, &vpd_size); vpd_data = pci_vpd_alloc(dev, &vpd_size);
if (IS_ERR(vpd_data)) { if (IS_ERR(vpd_data)) {
@ -2795,57 +2795,20 @@ static void ef4_probe_vpd_strings(struct ef4_nic *efx)
return; return;
} }
/* Get the Read only section */ start = pci_vpd_find_ro_info_keyword(vpd_data, vpd_size,
ro_start = pci_vpd_find_tag(vpd_data, vpd_size, PCI_VPD_LRDT_RO_DATA); PCI_VPD_RO_KEYWORD_PARTNO, &kw_len);
if (ro_start < 0) { if (start < 0)
netif_err(efx, drv, efx->net_dev, "VPD Read-only not found\n"); pci_warn(dev, "Part number not found or incomplete\n");
goto out; else
} pci_info(dev, "Part Number : %.*s\n", kw_len, vpd_data + start);
ro_size = pci_vpd_lrdt_size(&vpd_data[ro_start]); start = pci_vpd_find_ro_info_keyword(vpd_data, vpd_size,
j = ro_size; PCI_VPD_RO_KEYWORD_SERIALNO, &kw_len);
i = ro_start + PCI_VPD_LRDT_TAG_SIZE; if (start < 0)
if (i + j > vpd_size) pci_warn(dev, "Serial number not found or incomplete\n");
j = vpd_size - i; else
efx->vpd_sn = kmemdup_nul(vpd_data + start, kw_len, GFP_KERNEL);
/* Get the Part number */
i = pci_vpd_find_info_keyword(vpd_data, i, j, "PN");
if (i < 0) {
netif_err(efx, drv, efx->net_dev, "Part number not found\n");
goto out;
}
j = pci_vpd_info_field_size(&vpd_data[i]);
i += PCI_VPD_INFO_FLD_HDR_SIZE;
if (i + j > vpd_size) {
netif_err(efx, drv, efx->net_dev, "Incomplete part number\n");
goto out;
}
netif_info(efx, drv, efx->net_dev,
"Part Number : %.*s\n", j, &vpd_data[i]);
i = ro_start + PCI_VPD_LRDT_TAG_SIZE;
j = ro_size;
i = pci_vpd_find_info_keyword(vpd_data, i, j, "SN");
if (i < 0) {
netif_err(efx, drv, efx->net_dev, "Serial number not found\n");
goto out;
}
j = pci_vpd_info_field_size(&vpd_data[i]);
i += PCI_VPD_INFO_FLD_HDR_SIZE;
if (i + j > vpd_size) {
netif_err(efx, drv, efx->net_dev, "Incomplete serial number\n");
goto out;
}
efx->vpd_sn = kmalloc(j + 1, GFP_KERNEL);
if (!efx->vpd_sn)
goto out;
snprintf(efx->vpd_sn, j + 1, "%s", &vpd_data[i]);
out:
kfree(vpd_data); kfree(vpd_data);
} }