sfc: falcon: Read VPD with pci_vpd_alloc()

Use pci_vpd_alloc() to dynamically allocate a properly sized buffer and
read the full VPD data into it.

This avoids having to allocate a buffer on the stack, and we don't have to
make any assumptions on VPD size and location of information in VPD.

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

Link: https://lore.kernel.org/r/2a8d069e-9516-50d8-6520-2614222c8f5f@gmail.com
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/net/ethernet/sfc/falcon/efx.c b/drivers/net/ethernet/sfc/falcon/efx.c
index 9ec752a43c75709578ceb76f8a11e52eccec9141..191a720f56e3310b37898c9cd008979a01460108 100644 (file)
--- a/drivers/net/ethernet/sfc/falcon/efx.c
+++ b/drivers/net/ethernet/sfc/falcon/efx.c
@@ -2780,22 +2780,18 @@ static void ef4_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.
+ * Called during probe to display the part number of the installed NIC.
  */
-#define SFC_VPD_LEN 512
 static void ef4_probe_vpd_strings(struct ef4_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;
+       unsigned int vpd_size;
+       u8 *vpd_data;
 
-       /* 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");
+       vpd_data = pci_vpd_alloc(dev, &vpd_size);
+       if (IS_ERR(vpd_data)) {
+               pci_warn(dev, "Unable to read VPD\n");
                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);
        if (ro_start < 0) {
                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]);
@@ -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");
        if (i < 0) {
                netif_err(efx, drv, efx->net_dev, "Part number not found\n");
-               return;
+               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");
-               return;
+               goto out;
        }
 
        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");
        if (i < 0) {
                netif_err(efx, drv, efx->net_dev, "Serial number not found\n");
-               return;
+               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");
-               return;
+               goto out;
        }
 
        efx->vpd_sn = kmalloc(j + 1, GFP_KERNEL);
        if (!efx->vpd_sn)
-               return;
+               goto out;
 
        snprintf(efx->vpd_sn, j + 1, "%s", &vpd_data[i]);
+out:
+       kfree(vpd_data);
 }