UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

MIPS: BCM47XX: Get rid of calls to KSEG1ADDR 

We should be using ioremap_nocache helper which handles remaps in a
smarter way.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Patchwork: http://patchwork.linux-mips.org/patch/7611/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Rafał Miłecki 2014-09-03 22:51:06 +02:00 committed by Ralf Baechle
parent 4060bbe993
commit 8d602dd0f9
1 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
arch/mips/bcm47xx/nvram.c
View File

@ -23,13 +23,13 @@
static char nvram_buf[NVRAM_SPACE]; static char nvram_buf[NVRAM_SPACE];
static const u32 nvram_sizes[] = {0x8000, 0xF000, 0x10000}; static const u32 nvram_sizes[] = {0x8000, 0xF000, 0x10000};
static u32 find_nvram_size(u32 end) static u32 find_nvram_size(void __iomem *end)
{ {
struct nvram_header *header; struct nvram_header __iomem *header;
int i; int i;
for (i = 0; i < ARRAY_SIZE(nvram_sizes); i++) { for (i = 0; i < ARRAY_SIZE(nvram_sizes); i++) {
header = (struct nvram_header *)KSEG1ADDR(end - nvram_sizes[i]); header = (struct nvram_header *)(end - nvram_sizes[i]);
if (header->magic == NVRAM_HEADER) if (header->magic == NVRAM_HEADER)
return nvram_sizes[i]; return nvram_sizes[i];
} }
@ -38,35 +38,39 @@ static u32 find_nvram_size(u32 end)
} }
/* Probe for NVRAM header */ /* Probe for NVRAM header */
static int nvram_find_and_copy(u32 base, u32 lim) static int nvram_find_and_copy(void __iomem *iobase, u32 lim)
{ {
struct nvram_header *header; struct nvram_header __iomem *header;
int i; int i;
u32 off; u32 off;
u32 *src, *dst; u32 *src, *dst;
u32 size; u32 size;
if (nvram_buf[0]) {
pr_warn("nvram already initialized\n");
return -EEXIST;
}
/* TODO: when nvram is on nand flash check for bad blocks first. */ /* TODO: when nvram is on nand flash check for bad blocks first. */
off = FLASH_MIN; off = FLASH_MIN;
while (off <= lim) { while (off <= lim) {
/* Windowed flash access */ /* Windowed flash access */
size = find_nvram_size(base + off); size = find_nvram_size(iobase + off);
if (size) { if (size) {
header = (struct nvram_header *)KSEG1ADDR(base + off - header = (struct nvram_header *)(iobase + off - size);
size);
goto found; goto found;
} }
off <<= 1; off <<= 1;
} }
/* Try embedded NVRAM at 4 KB and 1 KB as last resorts */ /* Try embedded NVRAM at 4 KB and 1 KB as last resorts */
header = (struct nvram_header *) KSEG1ADDR(base + 4096); header = (struct nvram_header *)(iobase + 4096);
if (header->magic == NVRAM_HEADER) { if (header->magic == NVRAM_HEADER) {
size = NVRAM_SPACE; size = NVRAM_SPACE;
goto found; goto found;
} }
header = (struct nvram_header *) KSEG1ADDR(base + 1024); header = (struct nvram_header *)(iobase + 1024);
if (header->magic == NVRAM_HEADER) { if (header->magic == NVRAM_HEADER) {
size = NVRAM_SPACE; size = NVRAM_SPACE;
goto found; goto found;
@ -94,6 +98,22 @@ found:
return 0; return 0;
} }
static int bcm47xx_nvram_init_from_mem(u32 base, u32 lim)
{
void __iomem *iobase;
int err;
iobase = ioremap_nocache(base, lim);
if (!iobase)
return -ENOMEM;
err = nvram_find_and_copy(iobase, lim);
iounmap(iobase);
return err;
}
#ifdef CONFIG_BCM47XX_SSB #ifdef CONFIG_BCM47XX_SSB
static int nvram_init_ssb(void) static int nvram_init_ssb(void)
{ {
@ -109,7 +129,7 @@ static int nvram_init_ssb(void)
return -ENXIO; return -ENXIO;
} }
return nvram_find_and_copy(base, lim); return bcm47xx_nvram_init_from_mem(base, lim);
} }
#endif #endif
@ -139,7 +159,7 @@ static int nvram_init_bcma(void)
return -ENXIO; return -ENXIO;
} }
return nvram_find_and_copy(base, lim); return bcm47xx_nvram_init_from_mem(base, lim);
} }
#endif #endif