Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cb73f8c authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/mjg-pci-roms-from-efi' into next 

* pci/mjg-pci-roms-from-efi:
  PCI: Use phys_addr_t for physical ROM address
parents 3ced69f8 dbd3fc33

arch/x86/pci/common.c

+2 −2
Original line number Diff line number Diff line
@@ -628,8 +628,8 @@ int pcibios_add_device(struct pci_dev *dev) 
			    (PCI_FUNC(dev->devfn) == rom->function) &&

			    (dev->vendor == rom->vendor) &&

			    (dev->device == rom->devid)) {

				dev->rom = (void *)(unsigned long)(pa_data +

				      offsetof(struct pci_setup_rom, romdata));

				dev->rom = pa_data +

				      offsetof(struct pci_setup_rom, romdata);

				dev->romlen = rom->pcilen;

			}

		}

drivers/pci/rom.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size) 
	 */

	if (pdev->rom && pdev->romlen) {

		*size = pdev->romlen;

		return phys_to_virt((phys_addr_t)pdev->rom);

		return phys_to_virt(pdev->rom);

	/*

	 * IORESOURCE_ROM_SHADOW set on x86, x86_64 and IA64 supports legacy

	 * memory map if the VGA enable bit of the Bridge Control register is

include/linux/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ struct pci_dev { 
	};

	struct pci_ats	*ats;	/* Address Translation Service */

#endif

	void *rom; /* Physical pointer to ROM if it's not from the BAR */

	phys_addr_t rom; /* Physical address of ROM if it's not from the BAR */

	size_t romlen; /* Length of ROM if it's not from the BAR */

};