aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-12 16:41:29 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-12 16:41:29 -0400
commit0806ca2ab3ef7d7a1bd41a980f661a13ba11acb5 (patch)
treeb0efd7382e59de26f173f61b677a579f3f4ee137 /drivers
parent21ba0f88ae56da82a3a15fe54d729208b64c4f4b (diff)
parent1612b18ccb2318563ba51268289dc3271a6052f7 (diff)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Support multiple CPUs going through OS_MCA [IA64] silence GCC ia64 unused variable warnings [IA64] prevent MCA when performing MMIO mmap to PCI config space [IA64] add sn_register_pmi_handler oemcall [IA64] Stop bit for brl instruction [IA64] SN: Correct ROM resource length for BIOS copy [IA64] Don't set psr.ic and psr.i simultaneously
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/rom.c73
1 files changed, 44 insertions, 29 deletions
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index d087e0817715..dbbcc04abd1a 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -54,6 +54,49 @@ static void pci_disable_rom(struct pci_dev *pdev)
54} 54}
55 55
56/** 56/**
57 * pci_get_rom_size - obtain the actual size of the ROM image
58 * @rom: kernel virtual pointer to image of ROM
59 * @size: size of PCI window
60 * return: size of actual ROM image
61 *
62 * Determine the actual length of the ROM image.
63 * The PCI window size could be much larger than the
64 * actual image size.
65 */
66size_t pci_get_rom_size(void __iomem *rom, size_t size)
67{
68 void __iomem *image;
69 int last_image;
70
71 image = rom;
72 do {
73 void __iomem *pds;
74 /* Standard PCI ROMs start out with these bytes 55 AA */
75 if (readb(image) != 0x55)
76 break;
77 if (readb(image + 1) != 0xAA)
78 break;
79 /* get the PCI data structure and check its signature */
80 pds = image + readw(image + 24);
81 if (readb(pds) != 'P')
82 break;
83 if (readb(pds + 1) != 'C')
84 break;
85 if (readb(pds + 2) != 'I')
86 break;
87 if (readb(pds + 3) != 'R')
88 break;
89 last_image = readb(pds + 21) & 0x80;
90 /* this length is reliable */
91 image += readw(pds + 16) * 512;
92 } while (!last_image);
93
94 /* never return a size larger than the PCI resource window */
95 /* there are known ROMs that get the size wrong */
96 return min((size_t)(image - rom), size);
97}
98
99/**
57 * pci_map_rom - map a PCI ROM to kernel space 100 * pci_map_rom - map a PCI ROM to kernel space
58 * @pdev: pointer to pci device struct 101 * @pdev: pointer to pci device struct
59 * @size: pointer to receive size of pci window over ROM 102 * @size: pointer to receive size of pci window over ROM
@@ -68,8 +111,6 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
68 struct resource *res = &pdev->resource[PCI_ROM_RESOURCE]; 111 struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];
69 loff_t start; 112 loff_t start;
70 void __iomem *rom; 113 void __iomem *rom;
71 void __iomem *image;
72 int last_image;
73 114
74 /* 115 /*
75 * IORESOURCE_ROM_SHADOW set on x86, x86_64 and IA64 supports legacy 116 * IORESOURCE_ROM_SHADOW set on x86, x86_64 and IA64 supports legacy
@@ -117,33 +158,7 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
117 * size is much larger than the actual size of the ROM. 158 * size is much larger than the actual size of the ROM.
118 * True size is important if the ROM is going to be copied. 159 * True size is important if the ROM is going to be copied.
119 */ 160 */
120 image = rom; 161 *size = pci_get_rom_size(rom, *size);
121 do {
122 void __iomem *pds;
123 /* Standard PCI ROMs start out with these bytes 55 AA */
124 if (readb(image) != 0x55)
125 break;
126 if (readb(image + 1) != 0xAA)
127 break;
128 /* get the PCI data structure and check its signature */
129 pds = image + readw(image + 24);
130 if (readb(pds) != 'P')
131 break;
132 if (readb(pds + 1) != 'C')
133 break;
134 if (readb(pds + 2) != 'I')
135 break;
136 if (readb(pds + 3) != 'R')
137 break;
138 last_image = readb(pds + 21) & 0x80;
139 /* this length is reliable */
140 image += readw(pds + 16) * 512;
141 } while (!last_image);
142
143 /* never return a size larger than the PCI resource window */
144 /* there are known ROMs that get the size wrong */
145 *size = min((size_t)(image - rom), *size);
146
147 return rom; 162 return rom;
148} 163}
149 164