aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2008-12-18 12:17:16 -0500
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-01-07 14:13:18 -0500
commitdb5679437a2b938c9127480a3923633721583a4f (patch)
treeb2625345baa35490104b81fc1c7bd8ef6bb74100
parent287d19ce2e67c15e79a187b3bdcbbea1a0a51a7d (diff)
PCI: add interface to set visible size of VPD
The VPD on all devices may not be 32K. Unfortunately, there is no generic way to find the size, so this adds a simple API hook to reset it. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
-rw-r--r--drivers/pci/access.c23
-rw-r--r--include/linux/pci.h1
2 files changed, 24 insertions, 0 deletions
diff --git a/drivers/pci/access.c b/drivers/pci/access.c
index 86ec4ad44bcd..381444794778 100644
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -340,6 +340,29 @@ int pci_vpd_pci22_init(struct pci_dev *dev)
340} 340}
341 341
342/** 342/**
343 * pci_vpd_truncate - Set available Vital Product Data size
344 * @dev: pci device struct
345 * @size: available memory in bytes
346 *
347 * Adjust size of available VPD area.
348 */
349int pci_vpd_truncate(struct pci_dev *dev, size_t size)
350{
351 if (!dev->vpd)
352 return -EINVAL;
353
354 /* limited by the access method */
355 if (size > dev->vpd->len)
356 return -EINVAL;
357
358 dev->vpd->len = size;
359 dev->vpd->attr->size = size;
360
361 return 0;
362}
363EXPORT_SYMBOL(pci_vpd_truncate);
364
365/**
343 * pci_block_user_cfg_access - Block userspace PCI config reads/writes 366 * pci_block_user_cfg_access - Block userspace PCI config reads/writes
344 * @dev: pci device struct 367 * @dev: pci device struct
345 * 368 *
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 76079e106895..7cbecef19bb6 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -690,6 +690,7 @@ int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap);
690/* Vital product data routines */ 690/* Vital product data routines */
691ssize_t pci_read_vpd(struct pci_dev *dev, loff_t pos, size_t count, void *buf); 691ssize_t pci_read_vpd(struct pci_dev *dev, loff_t pos, size_t count, void *buf);
692ssize_t pci_write_vpd(struct pci_dev *dev, loff_t pos, size_t count, const void *buf); 692ssize_t pci_write_vpd(struct pci_dev *dev, loff_t pos, size_t count, const void *buf);
693int pci_vpd_truncate(struct pci_dev *dev, size_t size);
693 694
694/* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */ 695/* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */
695void pci_bus_assign_resources(struct pci_bus *bus); 696void pci_bus_assign_resources(struct pci_bus *bus);