openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

MIPS: Netlogic: Update function to read DRAM BARs 

Change name of xlp_get_dram_map to nlm_get_dram_map to be consistent
with the rest of the functions in the file. Pass the the size of the
array 'dram_map' to the function, and ensure that it does not write
past the end of the array.

Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/8892/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Jayachandran C 2015-01-07 16:58:33 +05:30 committed by Ralf Baechle
parent ddba6833bb
commit b3b73ae62c
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/include/asm/netlogic/xlp-hal/xlp.h
View File

@ -89,7 +89,7 @@ void xlp_wakeup_secondary_cpus(void);
void xlp_mmu_init(void); void xlp_mmu_init(void);
void nlm_hal_init(void); void nlm_hal_init(void);
int xlp_get_dram_map(int n, uint64_t *dram_map); int nlm_get_dram_map(int node, uint64_t *dram_map, int nentries);
struct pci_dev; struct pci_dev;
int xlp_socdev_to_node(const struct pci_dev *dev); int xlp_socdev_to_node(const struct pci_dev *dev);

12
arch/mips/netlogic/xlp/nlm_hal.c
View File

@ -449,19 +449,21 @@ unsigned int nlm_get_cpu_frequency(void)
/* /*
* Fills upto 8 pairs of entries containing the DRAM map of a node * Fills upto 8 pairs of entries containing the DRAM map of a node
* if n < 0, get dram map for all nodes * if node < 0, get dram map for all nodes
*/ */
int xlp_get_dram_map(int n, uint64_t *dram_map) int nlm_get_dram_map(int node, uint64_t *dram_map, int nentries)
{ {
uint64_t bridgebase, base, lim; uint64_t bridgebase, base, lim;
uint32_t val; uint32_t val;
unsigned int barreg, limreg, xlatreg; unsigned int barreg, limreg, xlatreg;
int i, node, rv; int i, n, rv;
/* Look only at mapping on Node 0, we don't handle crazy configs */ /* Look only at mapping on Node 0, we don't handle crazy configs */
bridgebase = nlm_get_bridge_regbase(0); bridgebase = nlm_get_bridge_regbase(0);
rv = 0; rv = 0;
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
if (rv + 1 >= nentries)
break;
if (cpu_is_xlp9xx()) { if (cpu_is_xlp9xx()) {
barreg = BRIDGE_9XX_DRAM_BAR(i); barreg = BRIDGE_9XX_DRAM_BAR(i);
limreg = BRIDGE_9XX_DRAM_LIMIT(i); limreg = BRIDGE_9XX_DRAM_LIMIT(i);
@ -471,10 +473,10 @@ int xlp_get_dram_map(int n, uint64_t *dram_map)
limreg = BRIDGE_DRAM_LIMIT(i); limreg = BRIDGE_DRAM_LIMIT(i);
xlatreg = BRIDGE_DRAM_NODE_TRANSLN(i); xlatreg = BRIDGE_DRAM_NODE_TRANSLN(i);
} }
if (n >= 0) { if (node >= 0) {
/* node specified, get node mapping of BAR */ /* node specified, get node mapping of BAR */
val = nlm_read_bridge_reg(bridgebase, xlatreg); val = nlm_read_bridge_reg(bridgebase, xlatreg);
node = (val >> 1) & 0x3; n = (val >> 1) & 0x3;
if (n != node) if (n != node)
continue; continue;
} }

2
arch/mips/netlogic/xlp/setup.c
View File

@ -81,7 +81,7 @@ static void __init xlp_init_mem_from_bars(void)
uint64_t map[16]; uint64_t map[16];
int i, n; int i, n;
n = xlp_get_dram_map(-1, map); /* -1: info for all nodes */ n = nlm_get_dram_map(-1, map, ARRAY_SIZE(map)); /* -1 : all nodes */
for (i = 0; i < n; i += 2) { for (i = 0; i < n; i += 2) {
/* exclude 0x1000_0000-0x2000_0000, u-boot device */ /* exclude 0x1000_0000-0x2000_0000, u-boot device */
if (map[i] <= 0x10000000 && map[i+1] > 0x10000000) if (map[i] <= 0x10000000 && map[i+1] > 0x10000000)