[PATCH] PCI: port the fix for ROM sysfs to the capability-centralizing patch

["Zhao, Yu" <yu.zhao@xxxxxxxxx>]

This patch applies the fix for shadowed ROMs sysfs entry to
the capability centralized code.

From: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
Signed-off-by Yu Zhao <yu.zhao@xxxxxxxxx>

---
drivers/pci/pci-sysfs.c |   30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 3ad7ce8..2cad6da 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -768,6 +768,7 @@ static int pci_create_capabilities_sysfs(struct pci_dev *dev)
int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
{
	int retval;
+	int rom_size = 0;
	struct bin_attribute *attr;

	if (!sysfs_initialized)
@@ -784,15 +785,19 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
	if (retval)
		goto err_config_file;

+	if (pci_resource_len(pdev, PCI_ROM_RESOURCE))
+		rom_size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
+	else if (pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW)
+		rom_size = 0x20000;
+
	/* If the device has a ROM, try to expose it in sysfs. */
-	if (pci_resource_len(pdev, PCI_ROM_RESOURCE) ||
-	    (pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW)) {
+	if (rom_size) {
		attr = kzalloc(sizeof(*attr), GFP_ATOMIC);
		if (!attr) {
			retval = -ENOMEM;
			goto err_resource_files;
		}
-		attr->size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
+		attr->size = rom_size;
		attr->attr.name = "rom";
		attr->attr.mode = S_IRUSR;
		attr->read = pci_read_rom;
@@ -818,8 +823,7 @@ int __must_check pci_create_sysfs_dev_files (struct pci_dev *pdev)
	return 0;

err_rom_file:
-	if (pci_resource_len(pdev, PCI_ROM_RESOURCE) ||
-	    (pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW)) {
+	if (rom_size) {
		sysfs_remove_bin_file(&pdev->dev.kobj, pdev->rom_attr);
		kfree(pdev->rom_attr);
		pdev->rom_attr = NULL;
@@ -853,6 +857,8 @@ static void pci_remove_capabilities_sysfs(struct pci_dev *dev)
 */
void pci_remove_sysfs_dev_files(struct pci_dev *pdev)
{
+	int rom_size = 0;
+
	if (!sysfs_initialized)
		return;

@@ -865,12 +871,14 @@ void pci_remove_sysfs_dev_files(struct pci_dev *pdev)

	pci_remove_resource_files(pdev);

-	if (pci_resource_len(pdev, PCI_ROM_RESOURCE) ||
-	    (pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW)) {
-		if (pdev->rom_attr) {
-			sysfs_remove_bin_file(&pdev->dev.kobj, pdev->rom_attr);
-			kfree(pdev->rom_attr);
-		}
+	if (pci_resource_len(pdev, PCI_ROM_RESOURCE))
+		rom_size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
+	else if (pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW)
+		rom_size = 0x20000;
+
+	if (rom_size && pdev->rom_attr) {
+		sysfs_remove_bin_file(&pdev->dev.kobj, pdev->rom_attr);
+		kfree(pdev->rom_attr);
	}
}

--
1.5.6.4


--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html