leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI: Remove arch-specific IORESOURCE_ROM_SHADOW size from sysfs

Browse Source 
When pci_create_sysfs_dev_files() created the "rom" sysfs file, it set the
sysfs file size to the actual size of a ROM BAR, or if there was no ROM BAR
but the platform provided a shadow copy in RAM, to 0x20000.  0x20000 is an
arch-specific length that should not be baked into the PCI core.

Every place that sets IORESOURCE_ROM_SHADOW also sets the size of the
PCI_ROM_RESOURCE, so use the resource length always.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Bjorn Helgaas 2016-03-12 05:48:08 -06:00
parent 0c0e0736ac
commit ac0c302a91
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/pci/pci-sysfs.c
View File

@ -1356,7 +1356,7 @@ error:
int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev) int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
{ {
int retval; int retval;
int rom_size = 0; int rom_size;
struct bin_attribute *attr; struct bin_attribute *attr;
if (!sysfs_initialized) if (!sysfs_initialized)
@ -1373,12 +1373,8 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
if (retval) if (retval)
goto err_config_file; 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 the device has a ROM, try to expose it in sysfs. */
rom_size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
if (rom_size) { if (rom_size) {
attr = kzalloc(sizeof(*attr), GFP_ATOMIC); attr = kzalloc(sizeof(*attr), GFP_ATOMIC);
if (!attr) { if (!attr) {