Commit 3af09993 authored by Ivan Kokshaysky's avatar Ivan Kokshaysky Committed by Russell King

[PCI] Fix incorrect PCI cache line size assumptions.

Fix incorrect PCI cache line size assumptions on i386 and thus
avoid potential memory corruption with Memory Write-and-Invalidate.
parent e0246365
...@@ -120,13 +120,28 @@ struct pci_bus * __devinit pcibios_scan_root(int busnum) ...@@ -120,13 +120,28 @@ struct pci_bus * __devinit pcibios_scan_root(int busnum)
return pci_scan_bus(busnum, pci_root_ops, NULL); return pci_scan_bus(busnum, pci_root_ops, NULL);
} }
extern u8 pci_cache_line_size;
static int __init pcibios_init(void) static int __init pcibios_init(void)
{ {
struct cpuinfo_x86 *c = &boot_cpu_data;
if (!pci_root_ops) { if (!pci_root_ops) {
printk("PCI: System does not support PCI\n"); printk("PCI: System does not support PCI\n");
return 0; return 0;
} }
/*
* Assume PCI cacheline size of 32 bytes for all x86s except K7/K8
* and P4. It's also good for 386/486s (which actually have 16)
* as quite a few PCI devices do not support smaller values.
*/
pci_cache_line_size = 32 >> 2;
if (c->x86 >= 6 && c->x86_vendor == X86_VENDOR_AMD)
pci_cache_line_size = 64 >> 2; /* K7 & K8 */
else if (c->x86 > 6)
pci_cache_line_size = 128 >> 2; /* P4 */
pcibios_resource_survey(); pcibios_resource_survey();
#ifdef CONFIG_PCI_BIOS #ifdef CONFIG_PCI_BIOS
......
...@@ -584,6 +584,9 @@ pci_set_master(struct pci_dev *dev) ...@@ -584,6 +584,9 @@ pci_set_master(struct pci_dev *dev)
} }
#ifndef HAVE_ARCH_PCI_MWI #ifndef HAVE_ARCH_PCI_MWI
/* This can be overridden by arch code. */
u8 pci_cache_line_size = L1_CACHE_BYTES >> 2;
/** /**
* pci_generic_prep_mwi - helper function for pci_set_mwi * pci_generic_prep_mwi - helper function for pci_set_mwi
* @dev: the PCI device for which MWI is enabled * @dev: the PCI device for which MWI is enabled
...@@ -597,32 +600,29 @@ pci_set_master(struct pci_dev *dev) ...@@ -597,32 +600,29 @@ pci_set_master(struct pci_dev *dev)
static int static int
pci_generic_prep_mwi(struct pci_dev *dev) pci_generic_prep_mwi(struct pci_dev *dev)
{ {
int rc = 0; u8 cacheline_size;
u8 cache_size;
/* if (!pci_cache_line_size)
* Looks like this is necessary to deal with on all architectures, return -EINVAL; /* The system doesn't support MWI. */
* even this %$#%$# N440BX Intel based thing doesn't get it right.
* Ie. having two NICs in the machine, one will have the cache
* line set at boot time, the other will not.
*/
pci_read_config_byte(dev, PCI_CACHE_LINE_SIZE, &cache_size);
cache_size <<= 2;
if (cache_size != SMP_CACHE_BYTES) {
printk(KERN_WARNING "PCI: %s PCI cache line size set "
"incorrectly (%i bytes) by BIOS/FW, ",
dev->slot_name, cache_size);
if (cache_size > SMP_CACHE_BYTES) {
printk("expecting %i\n", SMP_CACHE_BYTES);
rc = -EINVAL;
} else {
printk("correcting to %i\n", SMP_CACHE_BYTES);
pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE,
SMP_CACHE_BYTES >> 2);
}
}
return rc; /* Validate current setting: the PCI_CACHE_LINE_SIZE must be
equal to or multiple of the right value. */
pci_read_config_byte(dev, PCI_CACHE_LINE_SIZE, &cacheline_size);
if (cacheline_size >= pci_cache_line_size &&
(cacheline_size % pci_cache_line_size) == 0)
return 0;
/* Write the correct value. */
pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, pci_cache_line_size);
/* Read it back. */
pci_read_config_byte(dev, PCI_CACHE_LINE_SIZE, &cacheline_size);
if (cacheline_size == pci_cache_line_size)
return 0;
printk(KERN_WARNING "PCI: cache line size of %d is not supported "
"by device %s\n", pci_cache_line_size << 2, dev->slot_name);
return -EINVAL;
} }
#endif /* !HAVE_ARCH_PCI_MWI */ #endif /* !HAVE_ARCH_PCI_MWI */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment