OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: Ignore 32-bit windows in 29-bit mode for SH7786 PCIe. 

Certain memory windows are only available for 32-bit space, so skip over
these in 29-bit mode. This will severely restrict the amount of memory
that can be mapped, but since a boot loader bug makes booting in 29-bit
mode close to impossible anyways, everything is ok.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2010-09-07 17:03:10 +09:00
parent 2c5f674339
commit da03a63ac8
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arch/sh/drivers/pci/pcie-sh7786.c
View File

@ -220,7 +220,7 @@ static int pcie_init(struct sh7786_pcie_port *port)
unsigned int data;
phys_addr_t memphys;
size_t memsize;
int ret, i;
int ret, i, win;
/* Begin initialization */
pcie_reset(port);
@ -337,13 +337,19 @@ static int pcie_init(struct sh7786_pcie_port *port)
printk(KERN_NOTICE "PCI: PCIe#%d link width %d\n",
port->index, (data >> 20) & 0x3f);
for (i = 0; i < chan->nr_resources; i++) {
for (i = win = 0; i < chan->nr_resources; i++) {
struct resource *res = chan->resources + i;
resource_size_t size;
u32 enable_mask;
pci_write_reg(chan, 0x00000000, SH4A_PCIEPTCTLR(i));
/*
* We can't use the 32-bit mode windows in legacy 29-bit
* mode, so just skip them entirely.
*/
if ((res->flags & IORESOURCE_MEM_32BIT) && __in_29bit_mode())
continue;
pci_write_reg(chan, 0x00000000, SH4A_PCIEPTCTLR(win));
size = resource_size(res);
@ -352,16 +358,18 @@ static int pcie_init(struct sh7786_pcie_port *port)
* keeps things pretty simple.
*/
__raw_writel(((roundup_pow_of_two(size) / SZ_256K) - 1) << 18,
chan->reg_base + SH4A_PCIEPAMR(i));
chan->reg_base + SH4A_PCIEPAMR(win));
pci_write_reg(chan, res->start, SH4A_PCIEPARL(i));
pci_write_reg(chan, 0x00000000, SH4A_PCIEPARH(i));
pci_write_reg(chan, res->start, SH4A_PCIEPARL(win));
pci_write_reg(chan, 0x00000000, SH4A_PCIEPARH(win));
enable_mask = MASK_PARE;
if (res->flags & IORESOURCE_IO)
enable_mask |= MASK_SPC;
pci_write_reg(chan, enable_mask, SH4A_PCIEPTCTLR(i));
pci_write_reg(chan, enable_mask, SH4A_PCIEPTCTLR(win));
win++;
}
return 0;