[PATCH] convert sticore.c to PCI ROM API (bugzilla #9425)
From: Krzysztof Helt <hidden>
Date: 2008-05-31 17:15:16
From: Krzysztof Helt <redacted> Convert console/sticore.c file to use PCI ROM API. Signed-off-by: Krzysztof Helt <redacted> --- I don't have cross-compiler nor the hardware so PARISC guys please test it. diff -urp linux-2.6.25/drivers/video/console/sticore.c linux-new/drivers/video/console/sticore.c
--- linux-2.6.25/drivers/video/console/sticore.c 2008-04-17 04:49:44.000000000 +0200
+++ linux-new/drivers/video/console/sticore.c 2008-05-31 14:47:14.794107818 +0200@@ -780,7 +780,8 @@ out_err: } static struct sti_struct * __devinit -sti_try_rom_generic(unsigned long address, unsigned long hpa, struct pci_dev *pd) +sti_try_rom_generic(char __iomem *address, unsigned long hpa, + struct pci_dev *pd) { struct sti_struct *sti; int ok;
@@ -868,10 +869,8 @@ test_rom: /* disable STI PCI ROM. ROM and card RAM overlap and * leaving it enabled would force HPMCs */ - if (sti->pd) { - unsigned long rom_base; - rom_base = pci_resource_start(sti->pd, PCI_ROM_RESOURCE); - pci_write_config_dword(sti->pd, PCI_ROM_ADDRESS, rom_base & ~PCI_ROM_ADDRESS_ENABLE); + if (sti->pd && rom_base) { + pci_unmap_rom(sti->pd, rom_base); DPRINTK((KERN_DEBUG "STI PCI ROM disabled\n")); }
@@ -930,22 +929,22 @@ static int __devinit sticore_pci_init(st const struct pci_device_id *ent) { #ifdef CONFIG_PCI - unsigned long fb_base, rom_base; - unsigned int fb_len, rom_len; + unsigned long fb_base; + unsigned int fb_len; + char __iomem *rom_base; + size_t rom_len; struct sti_struct *sti; pci_enable_device(pd); fb_base = pci_resource_start(pd, 0); fb_len = pci_resource_len(pd, 0); - rom_base = pci_resource_start(pd, PCI_ROM_RESOURCE); - rom_len = pci_resource_len(pd, PCI_ROM_RESOURCE); + rom_base = pci_map_rom(pd, &rom_len); if (rom_base) { - pci_write_config_dword(pd, PCI_ROM_ADDRESS, rom_base | PCI_ROM_ADDRESS_ENABLE); - DPRINTK((KERN_DEBUG "STI PCI ROM enabled at 0x%08lx\n", rom_base)); + DPRINTK((KERN_DEBUG "STI PCI ROM enabled at 0x%p\n", rom_base)); } - printk(KERN_INFO "STI PCI graphic ROM found at %08lx (%u kB), fb at %08lx (%u MB)\n", + printk(KERN_INFO "STI PCI graphic ROM found at %p (%u kB), fb at %08lx (%u MB)\n", rom_base, rom_len/1024, fb_base, fb_len/1024/1024); DPRINTK((KERN_DEBUG "Trying PCI STI ROM at %08lx, PCI hpa at %08lx\n", ----------------------------------------------------------------------
Podbij Dziki Zachod!Gra strategiczna online Sprawdz >>> http://link.interia.pl/f1dff