aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2010-03-18 09:20:43 +0000
committerJohn Crispin <john@openwrt.org>2010-03-18 09:20:43 +0000
commitafb701b0c4e85172bdf2cc9a8890bf4834a04ff5 (patch)
treebd1a2bbc5cd9f20de803c3f3c3206e9c4e536647
parent431808b5bfdb992bc47863174ec562f1599d1432 (diff)
downloadupstream-afb701b0c4e85172bdf2cc9a8890bf4834a04ff5.tar.gz
upstream-afb701b0c4e85172bdf2cc9a8890bf4834a04ff5.tar.bz2
upstream-afb701b0c4e85172bdf2cc9a8890bf4834a04ff5.zip
Calculate PCI BARMASK11 register value dynamicly, signed off by Ithamar R. Adema
SVN-Revision: 20262
-rw-r--r--target/linux/ifxmips/files/arch/mips/pci/pci-ifxmips.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/target/linux/ifxmips/files/arch/mips/pci/pci-ifxmips.c b/target/linux/ifxmips/files/arch/mips/pci/pci-ifxmips.c
index e50cb3bdc9..64f37d5564 100644
--- a/target/linux/ifxmips/files/arch/mips/pci/pci-ifxmips.c
+++ b/target/linux/ifxmips/files/arch/mips/pci/pci-ifxmips.c
@@ -89,6 +89,17 @@ pcibios_plat_dev_init(struct pci_dev *dev)
return 0;
}
+static u32 calc_bar11mask(void)
+{
+ u32 mem, bar11mask;
+
+ /* BAR11MASK value depends on available memory on system. */
+ mem = num_physpages * PAGE_SIZE;
+ bar11mask = (0x0ffffff0 & ~((1 << (fls(mem) -1)) -1)) | 8;
+
+ return bar11mask;
+}
+
static void __init
ifxmips_pci_startup(void)
{
@@ -138,7 +149,7 @@ ifxmips_pci_startup(void)
ifxmips_w32(0x19800000, PCI_CR_FCI_ADDR_MAP6);
ifxmips_w32(0x19c00000, PCI_CR_FCI_ADDR_MAP7);
ifxmips_w32(0x1ae00000, PCI_CR_FCI_ADDR_MAP11hg);
- ifxmips_w32(0x0e000008, PCI_CR_BAR11MASK);
+ ifxmips_w32(calc_bar11mask(), PCI_CR_BAR11MASK);
ifxmips_w32(0, PCI_CR_PCI_ADDR_MAP11);
ifxmips_w32(0, PCI_CS_BASE_ADDR1);
#ifdef CONFIG_SWAP_IO_SPACE