2019-05-27 09:55:01 +03:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
2017-12-01 19:47:08 +03:00
|
|
|
/*
|
|
|
|
* Dynamic reconfiguration memory support
|
|
|
|
*
|
|
|
|
* Copyright 2017 IBM Corporation
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define pr_fmt(fmt) "drmem: " fmt
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/of.h>
|
|
|
|
#include <linux/of_fdt.h>
|
|
|
|
#include <linux/memblock.h>
|
|
|
|
#include <asm/prom.h>
|
|
|
|
#include <asm/drmem.h>
|
|
|
|
|
2020-07-29 14:40:32 +03:00
|
|
|
static int n_root_addr_cells, n_root_size_cells;
|
|
|
|
|
2017-12-01 19:47:08 +03:00
|
|
|
static struct drmem_lmb_info __drmem_info;
|
|
|
|
struct drmem_lmb_info *drmem_info = &__drmem_info;
|
|
|
|
|
2017-12-01 19:47:21 +03:00
|
|
|
u64 drmem_lmb_memory_max(void)
|
|
|
|
{
|
|
|
|
struct drmem_lmb *last_lmb;
|
|
|
|
|
|
|
|
last_lmb = &drmem_info->lmbs[drmem_info->n_lmbs - 1];
|
|
|
|
return last_lmb->base_addr + drmem_lmb_size();
|
|
|
|
}
|
|
|
|
|
2017-12-01 19:47:31 +03:00
|
|
|
static u32 drmem_lmb_flags(struct drmem_lmb *lmb)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Return the value of the lmb flags field minus the reserved
|
|
|
|
* bit used internally for hotplug processing.
|
|
|
|
*/
|
|
|
|
return lmb->flags & ~DRMEM_LMB_RESERVED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct property *clone_property(struct property *prop, u32 prop_sz)
|
|
|
|
{
|
|
|
|
struct property *new_prop;
|
|
|
|
|
|
|
|
new_prop = kzalloc(sizeof(*new_prop), GFP_KERNEL);
|
|
|
|
if (!new_prop)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
new_prop->name = kstrdup(prop->name, GFP_KERNEL);
|
|
|
|
new_prop->value = kzalloc(prop_sz, GFP_KERNEL);
|
|
|
|
if (!new_prop->name || !new_prop->value) {
|
|
|
|
kfree(new_prop->name);
|
|
|
|
kfree(new_prop->value);
|
|
|
|
kfree(new_prop);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
new_prop->length = prop_sz;
|
|
|
|
#if defined(CONFIG_OF_DYNAMIC)
|
|
|
|
of_property_set_flag(new_prop, OF_DYNAMIC);
|
|
|
|
#endif
|
|
|
|
return new_prop;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int drmem_update_dt_v1(struct device_node *memory,
|
|
|
|
struct property *prop)
|
|
|
|
{
|
|
|
|
struct property *new_prop;
|
2017-12-01 19:47:42 +03:00
|
|
|
struct of_drconf_cell_v1 *dr_cell;
|
2017-12-01 19:47:31 +03:00
|
|
|
struct drmem_lmb *lmb;
|
|
|
|
u32 *p;
|
|
|
|
|
|
|
|
new_prop = clone_property(prop, prop->length);
|
|
|
|
if (!new_prop)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
p = new_prop->value;
|
|
|
|
*p++ = cpu_to_be32(drmem_info->n_lmbs);
|
|
|
|
|
2017-12-01 19:47:42 +03:00
|
|
|
dr_cell = (struct of_drconf_cell_v1 *)p;
|
2017-12-01 19:47:31 +03:00
|
|
|
|
|
|
|
for_each_drmem_lmb(lmb) {
|
|
|
|
dr_cell->base_addr = cpu_to_be64(lmb->base_addr);
|
|
|
|
dr_cell->drc_index = cpu_to_be32(lmb->drc_index);
|
|
|
|
dr_cell->aa_index = cpu_to_be32(lmb->aa_index);
|
|
|
|
dr_cell->flags = cpu_to_be32(drmem_lmb_flags(lmb));
|
|
|
|
|
|
|
|
dr_cell++;
|
|
|
|
}
|
|
|
|
|
|
|
|
of_update_property(memory, new_prop);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-12-01 19:47:53 +03:00
|
|
|
static void init_drconf_v2_cell(struct of_drconf_cell_v2 *dr_cell,
|
|
|
|
struct drmem_lmb *lmb)
|
|
|
|
{
|
|
|
|
dr_cell->base_addr = cpu_to_be64(lmb->base_addr);
|
|
|
|
dr_cell->drc_index = cpu_to_be32(lmb->drc_index);
|
|
|
|
dr_cell->aa_index = cpu_to_be32(lmb->aa_index);
|
2018-02-21 13:36:26 +03:00
|
|
|
dr_cell->flags = cpu_to_be32(drmem_lmb_flags(lmb));
|
2017-12-01 19:47:53 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static int drmem_update_dt_v2(struct device_node *memory,
|
|
|
|
struct property *prop)
|
|
|
|
{
|
|
|
|
struct property *new_prop;
|
|
|
|
struct of_drconf_cell_v2 *dr_cell;
|
|
|
|
struct drmem_lmb *lmb, *prev_lmb;
|
|
|
|
u32 lmb_sets, prop_sz, seq_lmbs;
|
|
|
|
u32 *p;
|
|
|
|
|
|
|
|
/* First pass, determine how many LMB sets are needed. */
|
|
|
|
lmb_sets = 0;
|
|
|
|
prev_lmb = NULL;
|
|
|
|
for_each_drmem_lmb(lmb) {
|
|
|
|
if (!prev_lmb) {
|
|
|
|
prev_lmb = lmb;
|
|
|
|
lmb_sets++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (prev_lmb->aa_index != lmb->aa_index ||
|
2018-02-21 13:36:26 +03:00
|
|
|
drmem_lmb_flags(prev_lmb) != drmem_lmb_flags(lmb))
|
2017-12-01 19:47:53 +03:00
|
|
|
lmb_sets++;
|
|
|
|
|
|
|
|
prev_lmb = lmb;
|
|
|
|
}
|
|
|
|
|
|
|
|
prop_sz = lmb_sets * sizeof(*dr_cell) + sizeof(__be32);
|
|
|
|
new_prop = clone_property(prop, prop_sz);
|
|
|
|
if (!new_prop)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
p = new_prop->value;
|
|
|
|
*p++ = cpu_to_be32(lmb_sets);
|
|
|
|
|
|
|
|
dr_cell = (struct of_drconf_cell_v2 *)p;
|
|
|
|
|
|
|
|
/* Second pass, populate the LMB set data */
|
|
|
|
prev_lmb = NULL;
|
|
|
|
seq_lmbs = 0;
|
|
|
|
for_each_drmem_lmb(lmb) {
|
|
|
|
if (prev_lmb == NULL) {
|
|
|
|
/* Start of first LMB set */
|
|
|
|
prev_lmb = lmb;
|
|
|
|
init_drconf_v2_cell(dr_cell, lmb);
|
|
|
|
seq_lmbs++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (prev_lmb->aa_index != lmb->aa_index ||
|
2018-02-21 13:36:26 +03:00
|
|
|
drmem_lmb_flags(prev_lmb) != drmem_lmb_flags(lmb)) {
|
2017-12-01 19:47:53 +03:00
|
|
|
/* end of one set, start of another */
|
|
|
|
dr_cell->seq_lmbs = cpu_to_be32(seq_lmbs);
|
|
|
|
dr_cell++;
|
|
|
|
|
|
|
|
init_drconf_v2_cell(dr_cell, lmb);
|
|
|
|
seq_lmbs = 1;
|
|
|
|
} else {
|
|
|
|
seq_lmbs++;
|
|
|
|
}
|
|
|
|
|
|
|
|
prev_lmb = lmb;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* close out last LMB set */
|
|
|
|
dr_cell->seq_lmbs = cpu_to_be32(seq_lmbs);
|
|
|
|
of_update_property(memory, new_prop);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-12-01 19:47:31 +03:00
|
|
|
int drmem_update_dt(void)
|
|
|
|
{
|
|
|
|
struct device_node *memory;
|
|
|
|
struct property *prop;
|
|
|
|
int rc = -1;
|
|
|
|
|
|
|
|
memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
|
|
|
|
if (!memory)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
prop = of_find_property(memory, "ibm,dynamic-memory", NULL);
|
2017-12-01 19:47:53 +03:00
|
|
|
if (prop) {
|
2017-12-01 19:47:31 +03:00
|
|
|
rc = drmem_update_dt_v1(memory, prop);
|
2017-12-01 19:47:53 +03:00
|
|
|
} else {
|
|
|
|
prop = of_find_property(memory, "ibm,dynamic-memory-v2", NULL);
|
|
|
|
if (prop)
|
|
|
|
rc = drmem_update_dt_v2(memory, prop);
|
|
|
|
}
|
2017-12-01 19:47:31 +03:00
|
|
|
|
|
|
|
of_node_put(memory);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2020-07-29 14:40:32 +03:00
|
|
|
static void read_drconf_v1_cell(struct drmem_lmb *lmb,
|
2017-12-01 19:47:08 +03:00
|
|
|
const __be32 **prop)
|
|
|
|
{
|
|
|
|
const __be32 *p = *prop;
|
|
|
|
|
2020-07-29 14:40:32 +03:00
|
|
|
lmb->base_addr = of_read_number(p, n_root_addr_cells);
|
|
|
|
p += n_root_addr_cells;
|
2017-12-01 19:47:08 +03:00
|
|
|
lmb->drc_index = of_read_number(p++, 1);
|
|
|
|
|
|
|
|
p++; /* skip reserved field */
|
|
|
|
|
|
|
|
lmb->aa_index = of_read_number(p++, 1);
|
|
|
|
lmb->flags = of_read_number(p++, 1);
|
|
|
|
|
|
|
|
*prop = p;
|
|
|
|
}
|
|
|
|
|
2020-07-29 14:40:32 +03:00
|
|
|
static int
|
|
|
|
__walk_drmem_v1_lmbs(const __be32 *prop, const __be32 *usm, void *data,
|
|
|
|
int (*func)(struct drmem_lmb *, const __be32 **, void *))
|
2017-12-01 19:47:08 +03:00
|
|
|
{
|
|
|
|
struct drmem_lmb lmb;
|
|
|
|
u32 i, n_lmbs;
|
2020-07-29 14:40:32 +03:00
|
|
|
int ret = 0;
|
2017-12-01 19:47:08 +03:00
|
|
|
|
|
|
|
n_lmbs = of_read_number(prop++, 1);
|
|
|
|
for (i = 0; i < n_lmbs; i++) {
|
|
|
|
read_drconf_v1_cell(&lmb, &prop);
|
2020-07-29 14:40:32 +03:00
|
|
|
ret = func(&lmb, &usm, data);
|
|
|
|
if (ret)
|
|
|
|
break;
|
2017-12-01 19:47:08 +03:00
|
|
|
}
|
2020-07-29 14:40:32 +03:00
|
|
|
|
|
|
|
return ret;
|
2017-12-01 19:47:08 +03:00
|
|
|
}
|
|
|
|
|
2020-07-29 14:40:32 +03:00
|
|
|
static void read_drconf_v2_cell(struct of_drconf_cell_v2 *dr_cell,
|
2017-12-01 19:47:53 +03:00
|
|
|
const __be32 **prop)
|
|
|
|
{
|
|
|
|
const __be32 *p = *prop;
|
|
|
|
|
|
|
|
dr_cell->seq_lmbs = of_read_number(p++, 1);
|
2020-07-29 14:40:32 +03:00
|
|
|
dr_cell->base_addr = of_read_number(p, n_root_addr_cells);
|
|
|
|
p += n_root_addr_cells;
|
2017-12-01 19:47:53 +03:00
|
|
|
dr_cell->drc_index = of_read_number(p++, 1);
|
|
|
|
dr_cell->aa_index = of_read_number(p++, 1);
|
|
|
|
dr_cell->flags = of_read_number(p++, 1);
|
|
|
|
|
|
|
|
*prop = p;
|
|
|
|
}
|
|
|
|
|
2020-07-29 14:40:32 +03:00
|
|
|
static int
|
|
|
|
__walk_drmem_v2_lmbs(const __be32 *prop, const __be32 *usm, void *data,
|
|
|
|
int (*func)(struct drmem_lmb *, const __be32 **, void *))
|
2017-12-01 19:47:53 +03:00
|
|
|
{
|
|
|
|
struct of_drconf_cell_v2 dr_cell;
|
|
|
|
struct drmem_lmb lmb;
|
|
|
|
u32 i, j, lmb_sets;
|
2020-07-29 14:40:32 +03:00
|
|
|
int ret = 0;
|
2017-12-01 19:47:53 +03:00
|
|
|
|
|
|
|
lmb_sets = of_read_number(prop++, 1);
|
|
|
|
for (i = 0; i < lmb_sets; i++) {
|
|
|
|
read_drconf_v2_cell(&dr_cell, &prop);
|
|
|
|
|
|
|
|
for (j = 0; j < dr_cell.seq_lmbs; j++) {
|
|
|
|
lmb.base_addr = dr_cell.base_addr;
|
|
|
|
dr_cell.base_addr += drmem_lmb_size();
|
|
|
|
|
|
|
|
lmb.drc_index = dr_cell.drc_index;
|
|
|
|
dr_cell.drc_index++;
|
|
|
|
|
|
|
|
lmb.aa_index = dr_cell.aa_index;
|
|
|
|
lmb.flags = dr_cell.flags;
|
|
|
|
|
2020-07-29 14:40:32 +03:00
|
|
|
ret = func(&lmb, &usm, data);
|
|
|
|
if (ret)
|
|
|
|
break;
|
2017-12-01 19:47:53 +03:00
|
|
|
}
|
|
|
|
}
|
2020-07-29 14:40:32 +03:00
|
|
|
|
|
|
|
return ret;
|
2017-12-01 19:47:53 +03:00
|
|
|
}
|
|
|
|
|
2017-12-01 19:47:21 +03:00
|
|
|
#ifdef CONFIG_PPC_PSERIES
|
2020-07-29 14:40:32 +03:00
|
|
|
int __init walk_drmem_lmbs_early(unsigned long node, void *data,
|
|
|
|
int (*func)(struct drmem_lmb *, const __be32 **, void *))
|
2017-12-01 19:47:08 +03:00
|
|
|
{
|
|
|
|
const __be32 *prop, *usm;
|
2020-07-29 14:40:32 +03:00
|
|
|
int len, ret = -ENODEV;
|
2017-12-01 19:47:08 +03:00
|
|
|
|
|
|
|
prop = of_get_flat_dt_prop(node, "ibm,lmb-size", &len);
|
|
|
|
if (!prop || len < dt_root_size_cells * sizeof(__be32))
|
2020-07-29 14:40:32 +03:00
|
|
|
return ret;
|
|
|
|
|
|
|
|
/* Get the address & size cells */
|
|
|
|
n_root_addr_cells = dt_root_addr_cells;
|
|
|
|
n_root_size_cells = dt_root_size_cells;
|
2017-12-01 19:47:08 +03:00
|
|
|
|
|
|
|
drmem_info->lmb_size = dt_mem_next_cell(dt_root_size_cells, &prop);
|
|
|
|
|
|
|
|
usm = of_get_flat_dt_prop(node, "linux,drconf-usable-memory", &len);
|
|
|
|
|
|
|
|
prop = of_get_flat_dt_prop(node, "ibm,dynamic-memory", &len);
|
2017-12-01 19:47:53 +03:00
|
|
|
if (prop) {
|
2020-07-29 14:40:32 +03:00
|
|
|
ret = __walk_drmem_v1_lmbs(prop, usm, data, func);
|
2017-12-01 19:47:53 +03:00
|
|
|
} else {
|
|
|
|
prop = of_get_flat_dt_prop(node, "ibm,dynamic-memory-v2",
|
|
|
|
&len);
|
|
|
|
if (prop)
|
2020-07-29 14:40:32 +03:00
|
|
|
ret = __walk_drmem_v2_lmbs(prop, usm, data, func);
|
2017-12-01 19:47:53 +03:00
|
|
|
}
|
2017-12-01 19:47:08 +03:00
|
|
|
|
|
|
|
memblock_dump_all();
|
2020-07-29 14:40:32 +03:00
|
|
|
return ret;
|
2017-12-01 19:47:08 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
2017-12-01 19:47:21 +03:00
|
|
|
|
2020-07-29 14:40:32 +03:00
|
|
|
static int init_drmem_lmb_size(struct device_node *dn)
|
2017-12-01 19:47:21 +03:00
|
|
|
{
|
|
|
|
const __be32 *prop;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
if (drmem_info->lmb_size)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
prop = of_get_property(dn, "ibm,lmb-size", &len);
|
2020-07-29 14:40:32 +03:00
|
|
|
if (!prop || len < n_root_size_cells * sizeof(__be32)) {
|
2017-12-01 19:47:21 +03:00
|
|
|
pr_info("Could not determine LMB size\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2020-07-29 14:40:32 +03:00
|
|
|
drmem_info->lmb_size = of_read_number(prop, n_root_size_cells);
|
2017-12-01 19:47:21 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Returns the property linux,drconf-usable-memory if
|
|
|
|
* it exists (the property exists only in kexec/kdump kernels,
|
|
|
|
* added by kexec-tools)
|
|
|
|
*/
|
|
|
|
static const __be32 *of_get_usable_memory(struct device_node *dn)
|
|
|
|
{
|
|
|
|
const __be32 *prop;
|
|
|
|
u32 len;
|
|
|
|
|
|
|
|
prop = of_get_property(dn, "linux,drconf-usable-memory", &len);
|
|
|
|
if (!prop || len < sizeof(unsigned int))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return prop;
|
|
|
|
}
|
|
|
|
|
2020-07-29 14:40:32 +03:00
|
|
|
int walk_drmem_lmbs(struct device_node *dn, void *data,
|
|
|
|
int (*func)(struct drmem_lmb *, const __be32 **, void *))
|
2017-12-01 19:47:21 +03:00
|
|
|
{
|
|
|
|
const __be32 *prop, *usm;
|
2020-07-29 14:40:32 +03:00
|
|
|
int ret = -ENODEV;
|
|
|
|
|
|
|
|
if (!of_root)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
/* Get the address & size cells */
|
|
|
|
of_node_get(of_root);
|
|
|
|
n_root_addr_cells = of_n_addr_cells(of_root);
|
|
|
|
n_root_size_cells = of_n_size_cells(of_root);
|
|
|
|
of_node_put(of_root);
|
2017-12-01 19:47:21 +03:00
|
|
|
|
|
|
|
if (init_drmem_lmb_size(dn))
|
2020-07-29 14:40:32 +03:00
|
|
|
return ret;
|
2017-12-01 19:47:21 +03:00
|
|
|
|
|
|
|
usm = of_get_usable_memory(dn);
|
|
|
|
|
|
|
|
prop = of_get_property(dn, "ibm,dynamic-memory", NULL);
|
2017-12-01 19:47:53 +03:00
|
|
|
if (prop) {
|
2020-07-29 14:40:32 +03:00
|
|
|
ret = __walk_drmem_v1_lmbs(prop, usm, data, func);
|
2017-12-01 19:47:53 +03:00
|
|
|
} else {
|
|
|
|
prop = of_get_property(dn, "ibm,dynamic-memory-v2", NULL);
|
|
|
|
if (prop)
|
2020-07-29 14:40:32 +03:00
|
|
|
ret = __walk_drmem_v2_lmbs(prop, usm, data, func);
|
2017-12-01 19:47:53 +03:00
|
|
|
}
|
2020-07-29 14:40:32 +03:00
|
|
|
|
|
|
|
return ret;
|
2017-12-01 19:47:21 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void __init init_drmem_v1_lmbs(const __be32 *prop)
|
|
|
|
{
|
|
|
|
struct drmem_lmb *lmb;
|
|
|
|
|
|
|
|
drmem_info->n_lmbs = of_read_number(prop++, 1);
|
powerpc/pseries: Check for zero filled ibm,dynamic-memory property
Some versions of QEMU will produce an ibm,dynamic-reconfiguration-memory
node with a ibm,dynamic-memory property that is zero-filled. This
causes the drmem code to oops trying to parse this property.
The fix for this is to validate that the property does contain LMB
entries before trying to parse it and bail if the count is zero.
Oops: Kernel access of bad area, sig: 11 [#1]
DAR: 0000000000000010
NIP read_drconf_v1_cell+0x54/0x9c
LR read_drconf_v1_cell+0x48/0x9c
Call Trace:
__param_initcall_debug+0x0/0x28 (unreliable)
drmem_init+0x144/0x2f8
do_one_initcall+0x64/0x1d0
kernel_init_freeable+0x298/0x38c
kernel_init+0x24/0x160
ret_from_kernel_thread+0x5c/0xb4
The ibm,dynamic-reconfiguration-memory device tree property generated
that causes this:
ibm,dynamic-reconfiguration-memory {
ibm,lmb-size = <0x0 0x10000000>;
ibm,memory-flags-mask = <0xff>;
ibm,dynamic-memory = <0x0 0x0 0x0 0x0 0x0 0x0>;
linux,phandle = <0x7e57eed8>;
ibm,associativity-lookup-arrays = <0x1 0x4 0x0 0x0 0x0 0x0>;
ibm,memory-preservation-time = <0x0>;
};
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Reviewed-by: Cyril Bur <cyrilbur@gmail.com>
Tested-by: Daniel Black <daniel@linux.vnet.ibm.com>
[mpe: Trim oops report]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2018-02-16 06:27:41 +03:00
|
|
|
if (drmem_info->n_lmbs == 0)
|
|
|
|
return;
|
2017-12-01 19:47:21 +03:00
|
|
|
|
|
|
|
drmem_info->lmbs = kcalloc(drmem_info->n_lmbs, sizeof(*lmb),
|
|
|
|
GFP_KERNEL);
|
|
|
|
if (!drmem_info->lmbs)
|
|
|
|
return;
|
|
|
|
|
2018-10-02 18:35:59 +03:00
|
|
|
for_each_drmem_lmb(lmb) {
|
2017-12-01 19:47:21 +03:00
|
|
|
read_drconf_v1_cell(lmb, &prop);
|
2018-10-02 18:35:59 +03:00
|
|
|
lmb_set_nid(lmb);
|
|
|
|
}
|
2017-12-01 19:47:21 +03:00
|
|
|
}
|
|
|
|
|
2017-12-01 19:47:53 +03:00
|
|
|
static void __init init_drmem_v2_lmbs(const __be32 *prop)
|
|
|
|
{
|
|
|
|
struct drmem_lmb *lmb;
|
|
|
|
struct of_drconf_cell_v2 dr_cell;
|
|
|
|
const __be32 *p;
|
|
|
|
u32 i, j, lmb_sets;
|
|
|
|
int lmb_index;
|
|
|
|
|
|
|
|
lmb_sets = of_read_number(prop++, 1);
|
powerpc/pseries: Check for zero filled ibm,dynamic-memory property
Some versions of QEMU will produce an ibm,dynamic-reconfiguration-memory
node with a ibm,dynamic-memory property that is zero-filled. This
causes the drmem code to oops trying to parse this property.
The fix for this is to validate that the property does contain LMB
entries before trying to parse it and bail if the count is zero.
Oops: Kernel access of bad area, sig: 11 [#1]
DAR: 0000000000000010
NIP read_drconf_v1_cell+0x54/0x9c
LR read_drconf_v1_cell+0x48/0x9c
Call Trace:
__param_initcall_debug+0x0/0x28 (unreliable)
drmem_init+0x144/0x2f8
do_one_initcall+0x64/0x1d0
kernel_init_freeable+0x298/0x38c
kernel_init+0x24/0x160
ret_from_kernel_thread+0x5c/0xb4
The ibm,dynamic-reconfiguration-memory device tree property generated
that causes this:
ibm,dynamic-reconfiguration-memory {
ibm,lmb-size = <0x0 0x10000000>;
ibm,memory-flags-mask = <0xff>;
ibm,dynamic-memory = <0x0 0x0 0x0 0x0 0x0 0x0>;
linux,phandle = <0x7e57eed8>;
ibm,associativity-lookup-arrays = <0x1 0x4 0x0 0x0 0x0 0x0>;
ibm,memory-preservation-time = <0x0>;
};
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Reviewed-by: Cyril Bur <cyrilbur@gmail.com>
Tested-by: Daniel Black <daniel@linux.vnet.ibm.com>
[mpe: Trim oops report]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
2018-02-16 06:27:41 +03:00
|
|
|
if (lmb_sets == 0)
|
|
|
|
return;
|
2017-12-01 19:47:53 +03:00
|
|
|
|
|
|
|
/* first pass, calculate the number of LMBs */
|
|
|
|
p = prop;
|
|
|
|
for (i = 0; i < lmb_sets; i++) {
|
|
|
|
read_drconf_v2_cell(&dr_cell, &p);
|
|
|
|
drmem_info->n_lmbs += dr_cell.seq_lmbs;
|
|
|
|
}
|
|
|
|
|
|
|
|
drmem_info->lmbs = kcalloc(drmem_info->n_lmbs, sizeof(*lmb),
|
|
|
|
GFP_KERNEL);
|
|
|
|
if (!drmem_info->lmbs)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* second pass, read in the LMB information */
|
|
|
|
lmb_index = 0;
|
|
|
|
p = prop;
|
|
|
|
|
|
|
|
for (i = 0; i < lmb_sets; i++) {
|
|
|
|
read_drconf_v2_cell(&dr_cell, &p);
|
|
|
|
|
|
|
|
for (j = 0; j < dr_cell.seq_lmbs; j++) {
|
|
|
|
lmb = &drmem_info->lmbs[lmb_index++];
|
|
|
|
|
|
|
|
lmb->base_addr = dr_cell.base_addr;
|
|
|
|
dr_cell.base_addr += drmem_info->lmb_size;
|
|
|
|
|
|
|
|
lmb->drc_index = dr_cell.drc_index;
|
|
|
|
dr_cell.drc_index++;
|
|
|
|
|
|
|
|
lmb->aa_index = dr_cell.aa_index;
|
|
|
|
lmb->flags = dr_cell.flags;
|
2018-10-02 18:35:59 +03:00
|
|
|
|
|
|
|
lmb_set_nid(lmb);
|
2017-12-01 19:47:53 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-12-01 19:47:21 +03:00
|
|
|
static int __init drmem_init(void)
|
|
|
|
{
|
|
|
|
struct device_node *dn;
|
|
|
|
const __be32 *prop;
|
|
|
|
|
|
|
|
dn = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
|
|
|
|
if (!dn) {
|
|
|
|
pr_info("No dynamic reconfiguration memory found\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (init_drmem_lmb_size(dn)) {
|
|
|
|
of_node_put(dn);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
prop = of_get_property(dn, "ibm,dynamic-memory", NULL);
|
2017-12-01 19:47:53 +03:00
|
|
|
if (prop) {
|
2017-12-01 19:47:21 +03:00
|
|
|
init_drmem_v1_lmbs(prop);
|
2017-12-01 19:47:53 +03:00
|
|
|
} else {
|
|
|
|
prop = of_get_property(dn, "ibm,dynamic-memory-v2", NULL);
|
|
|
|
if (prop)
|
|
|
|
init_drmem_v2_lmbs(prop);
|
|
|
|
}
|
2017-12-01 19:47:21 +03:00
|
|
|
|
|
|
|
of_node_put(dn);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
late_initcall(drmem_init);
|