Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

Browse source 
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  parisc: Set PCI CLS early in boot.
This commit is contained in:
Linus Torvalds 2010-02-24 10:51:21 -08:00
commit 1e6c5c4e4c
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/parisc/kernel/pci.c
View file

@ -18,7 +18,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/cache.h> /* for L1_CACHE_BYTES */
#include <asm/superio.h> #include <asm/superio.h>
#define DEBUG_RESOURCES 0 #define DEBUG_RESOURCES 0
@ -123,6 +122,10 @@ static int __init pcibios_init(void)
} else { } else {
printk(KERN_WARNING "pci_bios != NULL but init() is!\n"); printk(KERN_WARNING "pci_bios != NULL but init() is!\n");
} }
/* Set the CLS for PCI as early as possible. */
pci_cache_line_size = pci_dfl_cache_line_size;
return 0; return 0;
} }
@ -171,7 +174,7 @@ void pcibios_set_master(struct pci_dev *dev)
** upper byte is PCI_LATENCY_TIMER. ** upper byte is PCI_LATENCY_TIMER.
*/ */
pci_write_config_word(dev, PCI_CACHE_LINE_SIZE, pci_write_config_word(dev, PCI_CACHE_LINE_SIZE,
(0x80 << 8) | (L1_CACHE_BYTES / sizeof(u32))); (0x80 << 8) | pci_cache_line_size);
} }