Commit 0ff25f6a authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Bjorn Helgaas
Browse files

bnxt: Search VPD with pci_vpd_find_ro_info_keyword() 

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

Link: https://lore.kernel.org/r/f062921c-ad33-3b3e-8ada-b53427a9cd4a@gmail.com


Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 550cd7c1

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+9 −29
Original line number Diff line number Diff line
@@ -12980,8 +12980,8 @@ static int bnxt_init_mac_addr(struct bnxt *bp) 
static void bnxt_vpd_read_info(struct bnxt *bp)

{

	struct pci_dev *pdev = bp->pdev;

	int i, len, pos, ro_size, size;

	unsigned int vpd_size;

	unsigned int vpd_size, kw_len;

	int pos, size;

	u8 *vpd_data;



	vpd_data = pci_vpd_alloc(pdev, &vpd_size);
@@ -12990,42 +12990,22 @@ static void bnxt_vpd_read_info(struct bnxt *bp) 
		return;

	}



	i = pci_vpd_find_tag(vpd_data, vpd_size, PCI_VPD_LRDT_RO_DATA);

	if (i < 0) {

		netdev_err(bp->dev, "VPD READ-Only not found\n");

		goto exit;

	}



	ro_size = pci_vpd_lrdt_size(&vpd_data[i]);

	i += PCI_VPD_LRDT_TAG_SIZE;

	if (i + ro_size > vpd_size)

		goto exit;



	pos = pci_vpd_find_info_keyword(vpd_data, i, ro_size,

					PCI_VPD_RO_KEYWORD_PARTNO);

	pos = pci_vpd_find_ro_info_keyword(vpd_data, vpd_size,

					   PCI_VPD_RO_KEYWORD_PARTNO, &kw_len);

	if (pos < 0)

		goto read_sn;



	len = pci_vpd_info_field_size(&vpd_data[pos]);

	pos += PCI_VPD_INFO_FLD_HDR_SIZE;

	if (len + pos > vpd_size)

		goto read_sn;



	size = min(len, BNXT_VPD_FLD_LEN - 1);

	size = min_t(int, kw_len, BNXT_VPD_FLD_LEN - 1);

	memcpy(bp->board_partno, &vpd_data[pos], size);



read_sn:

	pos = pci_vpd_find_info_keyword(vpd_data, i, ro_size,

					PCI_VPD_RO_KEYWORD_SERIALNO);

	pos = pci_vpd_find_ro_info_keyword(vpd_data, vpd_size,

					   PCI_VPD_RO_KEYWORD_SERIALNO,

					   &kw_len);

	if (pos < 0)

		goto exit;



	len = pci_vpd_info_field_size(&vpd_data[pos]);

	pos += PCI_VPD_INFO_FLD_HDR_SIZE;

	if (len + pos > vpd_size)

		goto exit;



	size = min(len, BNXT_VPD_FLD_LEN - 1);

	size = min_t(int, kw_len, BNXT_VPD_FLD_LEN - 1);

	memcpy(bp->board_serialno, &vpd_data[pos], size);

exit:

	kfree(vpd_data);