pci: Add helper to find a VPD resource data type
Subsystems (3)
PATCH v3 3/7 pci: Add helper to find a VPD resource data type
This patch adds the pci_vpd_find_tag() helper function to find VPD resource data types in a buffer.
Signed-off-by Matt Carlson <[email protected]>
Signed-off-by Michael Chan <[email protected]>
--- drivers/net/bnx2.c | 24 ++++-------------------- drivers/net/tg3.c | 26 +++++--------------------- drivers/pci/Makefile | 2 +- drivers/pci/vpd.c | 43 +++++++++++++++++++++++++++++++++++++++++++ include/linux/pci.h | 12 ++++++++++++ 5 files changed, 65 insertions(+), 42 deletions(-) create mode 100644 drivers/pci/vpd.c
drivers/net/bnx2.c +4 -20
@@ -7759,28 +7759,12 @@ bnx2_read_vpd_fw_ver(struct bnx2 *bp) }for (i =0 ; i <=BNX2_VPD_LEN -3 ; ) { -unsigned char val = data[i];unsigned int block_end; -if (val &PCI_VPD_LRDT ) { -if (i +PCI_VPD_LRDT_TAG_SIZE >BNX2_VPD_LEN ) -break ; - -if (val !=PCI_VPD_LRDT_RO_DATA ) { - i +=PCI_VPD_LRDT_TAG_SIZE + -pci_vpd_lrdt_size (&data[i]); - -continue ; - } - }else { -if ((val &PCI_VPD_SRDT_TIN_MASK ) ==PCI_VPD_STIN_END ) -break ; - - i +=PCI_VPD_SRDT_TAG_SIZE + -pci_vpd_srdt_size (&data[i]); - -continue ; - } + i =pci_vpd_find_tag (data, i,BNX2_VPD_LEN , +PCI_VPD_LRDT_RO_DATA ); +if (i <0 ) +break ; block_end = (i +PCI_VPD_LRDT_TAG_SIZE +pci_vpd_lrdt_size (&data[i]));
drivers/net/tg3.c +5 -21
@@ -12440,7 +12440,7 @@ skip_phy_reset:static void __devinit tg3_read_partno (struct tg3 *tp) {unsigned char vpd_data[TG3_NVM_VPD_LEN ];/* in little-endian format */ -unsigned int i; +int i;u32 magic; if ((tp->tg3_flags3 & TG3_FLG3_NO_NVRAM) ||
@@ -12479,28 +12479,12 @@ 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 char val = vpd_data[i];unsigned int block_end; -if (val &PCI_VPD_LRDT ) { -if (i +PCI_VPD_LRDT_TAG_SIZE >TG3_NVM_VPD_LEN ) -break ; - -if (val !=PCI_VPD_LRDT_RO_DATA ) { - i +=PCI_VPD_LRDT_TAG_SIZE + -pci_vpd_lrdt_size (&vpd_data[i]); - -continue ; - } - }else { -if ((val &PCI_VPD_SRDT_TIN_MASK ) ==PCI_VPD_STIN_END ) -break ; - - i +=PCI_VPD_SRDT_TAG_SIZE + -pci_vpd_srdt_size (&vpd_data[i]); - -continue ; - } + 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]);
drivers/pci/Makefile +1 -1
@@ -4,7 +4,7 @@ obj-y += access.o bus.o probe.o remove.o pci.o quirks.o \ pci-driver.o search.o pci-sysfs.o rom.o setup-res.o \ - irq.o + irq.o vpd.o obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_SYSFS) += slot.o
drivers/pci/vpd.c new file +43 -0
43 lines not on this page · raw message
include/linux/pci.h +12 -0
@@ -1384,5 +1384,17 @@ static inline u8 pci_vpd_srdt_size(const u8 *srdt)return (*srdt) &PCI_VPD_SRDT_LEN_MASK ; } +/** +* pci_vpd_find_tag - Locates the Resource Data Type tag provided +* @buf: Pointer to buffered vpd data +* @off: The offset into the buffer at which to begin the search +* @len: The length of the vpd buffer +* @rdt: The Resource Data Type to search for +* +* Returns the index where the Resource Data Type was found or +* -ENOENT otherwise. +*/ +int pci_vpd_find_tag (const u8 *buf,unsigned int off,unsigned int len,u8 rdt); +#endif /* __KERNEL__ */ #endif /* LINUX_PCI_H */
Signature · 1 line
1.6.4.4