Fix up more strange byte writes to the PCI_ROM_ADDRESS config word
It's a dword thing, and the value we write is a dword. Doing a byte write to it is nonsensical, and writes only the low byte, which only contains the enable bit. So we enable a nonsensical address (usually zero), which causes the controller no end of problems. Trivial fix, but nasty to find. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Родитель
2f4ba45a75
Коммит
299cc3c166
|
@ -608,7 +608,7 @@ static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev, const cha
|
||||||
|
|
||||||
#ifdef __i386__
|
#ifdef __i386__
|
||||||
if (dev->resource[PCI_ROM_RESOURCE].start) {
|
if (dev->resource[PCI_ROM_RESOURCE].start) {
|
||||||
pci_write_config_byte(dev, PCI_ROM_ADDRESS, dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
|
pci_write_config_dword(dev, PCI_ROM_ADDRESS, dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
|
||||||
printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, dev->resource[PCI_ROM_RESOURCE].start);
|
printk(KERN_INFO "%s: ROM enabled at 0x%08lx\n", name, dev->resource[PCI_ROM_RESOURCE].start);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -173,7 +173,7 @@ static unsigned int __devinit init_chipset_hpt34x(struct pci_dev *dev, const cha
|
||||||
|
|
||||||
if (cmd & PCI_COMMAND_MEMORY) {
|
if (cmd & PCI_COMMAND_MEMORY) {
|
||||||
if (pci_resource_start(dev, PCI_ROM_RESOURCE)) {
|
if (pci_resource_start(dev, PCI_ROM_RESOURCE)) {
|
||||||
pci_write_config_byte(dev, PCI_ROM_ADDRESS,
|
pci_write_config_dword(dev, PCI_ROM_ADDRESS,
|
||||||
dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
|
dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
|
||||||
printk(KERN_INFO "HPT345: ROM enabled at 0x%08lx\n",
|
printk(KERN_INFO "HPT345: ROM enabled at 0x%08lx\n",
|
||||||
dev->resource[PCI_ROM_RESOURCE].start);
|
dev->resource[PCI_ROM_RESOURCE].start);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче