lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: Fix an off-by-1 in SH7780 PCIC memory resource mapping.

Browse Source 
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt
2010-02-05 16:11:25 +09:00
parent 8e04221029
commit 3b0be1a4f2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/sh/drivers/pci/pci-sh7780.c
View File

@@ -23,7 +23,7 @@
static struct resource sh7785_pci_resources[] = { static struct resource sh7785_pci_resources[] = {
{ {
.name = "SH7785_IO", .name = "PCI IO",
.start = 0x1000, .start = 0x1000,
.end = SZ_4M - 1, .end = SZ_4M - 1,
.flags = IORESOURCE_IO, .flags = IORESOURCE_IO,
@@ -338,8 +338,8 @@ static int __init sh7780_pci_init(void)
/* /*
* Setup the memory BARs * Setup the memory BARs
*/ */
for (i = 0; i < chan->nr_resources; i++) { for (i = 1; i < chan->nr_resources; i++) {
struct resource *res = chan->resources + (i + 1); struct resource *res = chan->resources + i;
resource_size_t size; resource_size_t size;
if (unlikely(res->flags & IORESOURCE_IO)) if (unlikely(res->flags & IORESOURCE_IO))
@@ -361,8 +361,8 @@ static int __init sh7780_pci_init(void)
* keeps things pretty simple. * keeps things pretty simple.
*/ */
__raw_writel(((roundup_pow_of_two(size) / SZ_256K) - 1) << 18, __raw_writel(((roundup_pow_of_two(size) / SZ_256K) - 1) << 18,
chan->reg_base + SH7780_PCIMBMR(i)); chan->reg_base + SH7780_PCIMBMR(i - 1));
__raw_writel(res->start, chan->reg_base + SH7780_PCIMBR(i)); __raw_writel(res->start, chan->reg_base + SH7780_PCIMBR(i - 1));
} }
/* /*