From bb2d1b343dfe3fefb6b64c4ee5c3b7aca1fad8b9 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 18 Dec 2008 09:17:16 -0800 Subject: [PATCH] --- yaml --- r: 127402 b: refs/heads/master c: db5679437a2b938c9127480a3923633721583a4f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pci/access.c | 23 +++++++++++++++++++++++ trunk/include/linux/pci.h | 1 + 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 33e8b9ce3b15..95b72a92713d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 287d19ce2e67c15e79a187b3bdcbbea1a0a51a7d +refs/heads/master: db5679437a2b938c9127480a3923633721583a4f diff --git a/trunk/drivers/pci/access.c b/trunk/drivers/pci/access.c index 86ec4ad44bcd..381444794778 100644 --- a/trunk/drivers/pci/access.c +++ b/trunk/drivers/pci/access.c @@ -339,6 +339,29 @@ int pci_vpd_pci22_init(struct pci_dev *dev) return 0; } +/** + * pci_vpd_truncate - Set available Vital Product Data size + * @dev: pci device struct + * @size: available memory in bytes + * + * Adjust size of available VPD area. + */ +int pci_vpd_truncate(struct pci_dev *dev, size_t size) +{ + if (!dev->vpd) + return -EINVAL; + + /* limited by the access method */ + if (size > dev->vpd->len) + return -EINVAL; + + dev->vpd->len = size; + dev->vpd->attr->size = size; + + return 0; +} +EXPORT_SYMBOL(pci_vpd_truncate); + /** * pci_block_user_cfg_access - Block userspace PCI config reads/writes * @dev: pci device struct diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index 76079e106895..7cbecef19bb6 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -690,6 +690,7 @@ int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap); /* Vital product data routines */ ssize_t pci_read_vpd(struct pci_dev *dev, loff_t pos, size_t count, void *buf); ssize_t pci_write_vpd(struct pci_dev *dev, loff_t pos, size_t count, const void *buf); +int pci_vpd_truncate(struct pci_dev *dev, size_t size); /* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */ void pci_bus_assign_resources(struct pci_bus *bus);