Merge tag 'pci-v5.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[linux-2.6-microblaze.git] / drivers / net / ethernet / sfc / efx.c

diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index a295e26..43ef4f5 100644 (file)
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -900,74 +900,36 @@ static void efx_pci_remove(struct pci_dev *pci_dev)
 
 /* NIC VPD information
  * Called during probe to display the part number of the
- * installed NIC.  VPD is potentially very large but this should
- * always appear within the first 512 bytes.
+ * installed NIC.
  */
-#define SFC_VPD_LEN 512
 static void efx_probe_vpd_strings(struct efx_nic *efx)
 {
        struct pci_dev *dev = efx->pci_dev;
-       char vpd_data[SFC_VPD_LEN];
-       ssize_t vpd_size;
-       int ro_start, ro_size, i, j;
-
-       /* Get the vpd data from the device */
-       vpd_size = pci_read_vpd(dev, 0, sizeof(vpd_data), vpd_data);
-       if (vpd_size <= 0) {
-               netif_err(efx, drv, efx->net_dev, "Unable to read VPD\n");
-               return;
-       }
-
-       /* Get the Read only section */
-       ro_start = pci_vpd_find_tag(vpd_data, vpd_size, PCI_VPD_LRDT_RO_DATA);
-       if (ro_start < 0) {
-               netif_err(efx, drv, efx->net_dev, "VPD Read-only not found\n");
-               return;
-       }
-
-       ro_size = pci_vpd_lrdt_size(&vpd_data[ro_start]);
-       j = ro_size;
-       i = ro_start + PCI_VPD_LRDT_TAG_SIZE;
-       if (i + j > vpd_size)
-               j = vpd_size - i;
-
-       /* 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");
-               return;
-       }
+       unsigned int vpd_size, kw_len;
+       u8 *vpd_data;
+       int start;
 
-       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");
+       vpd_data = pci_vpd_alloc(dev, &vpd_size);
+       if (IS_ERR(vpd_data)) {
+               pci_warn(dev, "Unable to read VPD\n");
                return;
        }
 
-       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");
-               return;
-       }
-
-       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");
-               return;
-       }
+       start = pci_vpd_find_ro_info_keyword(vpd_data, vpd_size,
+                                            PCI_VPD_RO_KEYWORD_PARTNO, &kw_len);
+       if (start < 0)
+               pci_err(dev, "Part number not found or incomplete\n");
+       else
+               pci_info(dev, "Part Number : %.*s\n", kw_len, vpd_data + start);
 
-       efx->vpd_sn = kmalloc(j + 1, GFP_KERNEL);
-       if (!efx->vpd_sn)
-               return;
+       start = pci_vpd_find_ro_info_keyword(vpd_data, vpd_size,
+                                            PCI_VPD_RO_KEYWORD_SERIALNO, &kw_len);
+       if (start < 0)
+               pci_err(dev, "Serial number not found or incomplete\n");
+       else
+               efx->vpd_sn = kmemdup_nul(vpd_data + start, kw_len, GFP_KERNEL);
 
-       snprintf(efx->vpd_sn, j + 1, "%s", &vpd_data[i]);
+       kfree(vpd_data);
 }