aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2010-02-26 14:04:43 +0000
committerDavid S. Miller <davem@davemloft.net>2010-02-28 00:43:33 -0800
commit4067a8541d397e9d6b443dd2ce0ecb78bfd991db (patch)
tree49690419b218020b8a0e9381db2f9cc90b658cd0 /drivers/net/tg3.c
parente1d5bdabb94da89bdb3c3f2ee105cf61fca88ec8 (diff)
downloadkernel_samsung_smdk4412-4067a8541d397e9d6b443dd2ce0ecb78bfd991db.zip
kernel_samsung_smdk4412-4067a8541d397e9d6b443dd2ce0ecb78bfd991db.tar.gz
kernel_samsung_smdk4412-4067a8541d397e9d6b443dd2ce0ecb78bfd991db.tar.bz2
pci: Add helper to search for VPD keywords
This patch adds the pci_vpd_find_info_keyword() helper function to find information field keywords within read-only and read-write large resource data type sections. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Signed-off-by: Michael Chan <mchan@broadcom.com> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r--drivers/net/tg3.c32
1 files changed, 13 insertions, 19 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index f59f369..204c565 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -12586,39 +12586,33 @@ static void __devinit tg3_read_partno(struct tg3 *tp)
/* Now parse and find the part number. */
for (i = 0; i < TG3_NVM_VPD_LEN - 2; ) {
- unsigned int block_end;
+ unsigned int block_end, rosize;
i = pci_vpd_find_tag(vpd_data, i, TG3_NVM_VPD_LEN,
PCI_VPD_LRDT_RO_DATA);
if (i < 0)
break;
- block_end = i + PCI_VPD_LRDT_TAG_SIZE +
- pci_vpd_lrdt_size(&vpd_data[i]);
-
+ rosize = pci_vpd_lrdt_size(&vpd_data[i]);
+ block_end = i + PCI_VPD_LRDT_TAG_SIZE + rosize;
i += PCI_VPD_LRDT_TAG_SIZE;
if (block_end > TG3_NVM_VPD_LEN)
goto out_not_found;
- while (i < (block_end - 2)) {
- if (vpd_data[i + 0] == 'P' &&
- vpd_data[i + 1] == 'N') {
- int partno_len = pci_vpd_info_field_size(&vpd_data[i]);
+ i = pci_vpd_find_info_keyword(vpd_data, i, rosize,
+ PCI_VPD_RO_KEYWORD_PARTNO);
+ if (i > 0) {
+ u8 len = pci_vpd_info_field_size(&vpd_data[i]);
- i += PCI_VPD_INFO_FLD_HDR_SIZE;
- if (partno_len > TG3_BPN_SIZE ||
- (partno_len + i) > TG3_NVM_VPD_LEN)
- goto out_not_found;
+ i += PCI_VPD_INFO_FLD_HDR_SIZE;
+ if (len > TG3_BPN_SIZE ||
+ (len + i) > TG3_NVM_VPD_LEN)
+ break;
- memcpy(tp->board_part_number,
- &vpd_data[i], partno_len);
+ memcpy(tp->board_part_number, &vpd_data[i], len);
- /* Success. */
- return;
- }
- i += PCI_VPD_INFO_FLD_HDR_SIZE +
- pci_vpd_info_field_size(&vpd_data[i]);
+ return;
}
/* Part number not found. */