lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Export the ROM enable/disable helpers

Browse Source 
.... so that they can be used by MTD map drivers. Lets us close #9420

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Alan Cox
2008-09-23 17:25:10 +01:00
committed by David Woodhouse
parent 3afe7eb37f
commit e416de5e61
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/pci/rom.c
View File

@@ -21,7 +21,7 @@
* between the ROM and other resources, so enabling it may disable access * between the ROM and other resources, so enabling it may disable access
* to MMIO registers or other card memory. * to MMIO registers or other card memory.
*/ */
static int pci_enable_rom(struct pci_dev *pdev) int pci_enable_rom(struct pci_dev *pdev)
{ {
struct resource *res = pdev->resource + PCI_ROM_RESOURCE; struct resource *res = pdev->resource + PCI_ROM_RESOURCE;
struct pci_bus_region region; struct pci_bus_region region;
@@ -45,7 +45,7 @@ static int pci_enable_rom(struct pci_dev *pdev)
* Disable ROM decoding on a PCI device by turning off the last bit in the * Disable ROM decoding on a PCI device by turning off the last bit in the
* ROM BAR. * ROM BAR.
*/ */
static void pci_disable_rom(struct pci_dev *pdev) void pci_disable_rom(struct pci_dev *pdev)
{ {
u32 rom_addr; u32 rom_addr;
pci_read_config_dword(pdev, pdev->rom_base_reg, &rom_addr); pci_read_config_dword(pdev, pdev->rom_base_reg, &rom_addr);
@@ -260,3 +260,5 @@ void pci_cleanup_rom(struct pci_dev *pdev)
EXPORT_SYMBOL(pci_map_rom); EXPORT_SYMBOL(pci_map_rom);
EXPORT_SYMBOL(pci_unmap_rom); EXPORT_SYMBOL(pci_unmap_rom);
EXPORT_SYMBOL_GPL(pci_enable_rom);
EXPORT_SYMBOL_GPL(pci_disable_rom);

2
include/linux/pci.h
View File

@@ -631,6 +631,8 @@ int __must_check pci_assign_resource(struct pci_dev *dev, int i);
int pci_select_bars(struct pci_dev *dev, unsigned long flags); int pci_select_bars(struct pci_dev *dev, unsigned long flags);
/* ROM control related routines */ /* ROM control related routines */
int pci_enable_rom(struct pci_dev *pdev);
void pci_disable_rom(struct pci_dev *pdev);
void __iomem __must_check *pci_map_rom(struct pci_dev *pdev, size_t *size); void __iomem __must_check *pci_map_rom(struct pci_dev *pdev, size_t *size);
void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom); void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom);
size_t pci_get_rom_size(void __iomem *rom, size_t size); size_t pci_get_rom_size(void __iomem *rom, size_t size);