ppc/pnv: Pass content of the "compatible" property to pnv_dt_xscom()
Since pnv_dt_xscom() is called from chip specific dt_populate() hooks, it shouldn't have to guess the chip type in order to populate the "compatible" property. Just pass the compat string and its size as arguments. Signed-off-by: Greg Kurz <groug@kaod.org> Message-Id: <157623842430.360005.9513965612524265862.stgit@bahia.lan> Reviewed-by: Cédric Le Goater <clg@kaod.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
3f5b45ca4f
commit
c396c58a02
12
hw/ppc/pnv.c
12
hw/ppc/pnv.c
|
@ -280,11 +280,13 @@ static void pnv_dt_icp(PnvChip *chip, void *fdt, uint32_t pir,
|
||||||
|
|
||||||
static void pnv_chip_power8_dt_populate(PnvChip *chip, void *fdt)
|
static void pnv_chip_power8_dt_populate(PnvChip *chip, void *fdt)
|
||||||
{
|
{
|
||||||
|
static const char compat[] = "ibm,power8-xscom\0ibm,xscom";
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
pnv_dt_xscom(chip, fdt, 0,
|
pnv_dt_xscom(chip, fdt, 0,
|
||||||
cpu_to_be64(PNV_XSCOM_BASE(chip)),
|
cpu_to_be64(PNV_XSCOM_BASE(chip)),
|
||||||
cpu_to_be64(PNV_XSCOM_SIZE));
|
cpu_to_be64(PNV_XSCOM_SIZE),
|
||||||
|
compat, sizeof(compat));
|
||||||
|
|
||||||
for (i = 0; i < chip->nr_cores; i++) {
|
for (i = 0; i < chip->nr_cores; i++) {
|
||||||
PnvCore *pnv_core = chip->cores[i];
|
PnvCore *pnv_core = chip->cores[i];
|
||||||
|
@ -302,11 +304,13 @@ static void pnv_chip_power8_dt_populate(PnvChip *chip, void *fdt)
|
||||||
|
|
||||||
static void pnv_chip_power9_dt_populate(PnvChip *chip, void *fdt)
|
static void pnv_chip_power9_dt_populate(PnvChip *chip, void *fdt)
|
||||||
{
|
{
|
||||||
|
static const char compat[] = "ibm,power9-xscom\0ibm,xscom";
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
pnv_dt_xscom(chip, fdt, 0,
|
pnv_dt_xscom(chip, fdt, 0,
|
||||||
cpu_to_be64(PNV9_XSCOM_BASE(chip)),
|
cpu_to_be64(PNV9_XSCOM_BASE(chip)),
|
||||||
cpu_to_be64(PNV9_XSCOM_SIZE));
|
cpu_to_be64(PNV9_XSCOM_SIZE),
|
||||||
|
compat, sizeof(compat));
|
||||||
|
|
||||||
for (i = 0; i < chip->nr_cores; i++) {
|
for (i = 0; i < chip->nr_cores; i++) {
|
||||||
PnvCore *pnv_core = chip->cores[i];
|
PnvCore *pnv_core = chip->cores[i];
|
||||||
|
@ -323,11 +327,13 @@ static void pnv_chip_power9_dt_populate(PnvChip *chip, void *fdt)
|
||||||
|
|
||||||
static void pnv_chip_power10_dt_populate(PnvChip *chip, void *fdt)
|
static void pnv_chip_power10_dt_populate(PnvChip *chip, void *fdt)
|
||||||
{
|
{
|
||||||
|
static const char compat[] = "ibm,power10-xscom\0ibm,xscom";
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
pnv_dt_xscom(chip, fdt, 0,
|
pnv_dt_xscom(chip, fdt, 0,
|
||||||
cpu_to_be64(PNV10_XSCOM_BASE(chip)),
|
cpu_to_be64(PNV10_XSCOM_BASE(chip)),
|
||||||
cpu_to_be64(PNV10_XSCOM_SIZE));
|
cpu_to_be64(PNV10_XSCOM_SIZE),
|
||||||
|
compat, sizeof(compat));
|
||||||
|
|
||||||
for (i = 0; i < chip->nr_cores; i++) {
|
for (i = 0; i < chip->nr_cores; i++) {
|
||||||
PnvCore *pnv_core = chip->cores[i];
|
PnvCore *pnv_core = chip->cores[i];
|
||||||
|
|
|
@ -282,12 +282,9 @@ static int xscom_dt_child(Object *child, void *opaque)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char compat_p8[] = "ibm,power8-xscom\0ibm,xscom";
|
|
||||||
static const char compat_p9[] = "ibm,power9-xscom\0ibm,xscom";
|
|
||||||
static const char compat_p10[] = "ibm,power10-xscom\0ibm,xscom";
|
|
||||||
|
|
||||||
int pnv_dt_xscom(PnvChip *chip, void *fdt, int root_offset,
|
int pnv_dt_xscom(PnvChip *chip, void *fdt, int root_offset,
|
||||||
uint64_t xscom_base, uint64_t xscom_size)
|
uint64_t xscom_base, uint64_t xscom_size,
|
||||||
|
const char *compat, int compat_size)
|
||||||
{
|
{
|
||||||
uint64_t reg[] = { xscom_base, xscom_size };
|
uint64_t reg[] = { xscom_base, xscom_size };
|
||||||
int xscom_offset;
|
int xscom_offset;
|
||||||
|
@ -302,18 +299,7 @@ int pnv_dt_xscom(PnvChip *chip, void *fdt, int root_offset,
|
||||||
_FDT((fdt_setprop_cell(fdt, xscom_offset, "#address-cells", 1)));
|
_FDT((fdt_setprop_cell(fdt, xscom_offset, "#address-cells", 1)));
|
||||||
_FDT((fdt_setprop_cell(fdt, xscom_offset, "#size-cells", 1)));
|
_FDT((fdt_setprop_cell(fdt, xscom_offset, "#size-cells", 1)));
|
||||||
_FDT((fdt_setprop(fdt, xscom_offset, "reg", reg, sizeof(reg))));
|
_FDT((fdt_setprop(fdt, xscom_offset, "reg", reg, sizeof(reg))));
|
||||||
|
_FDT((fdt_setprop(fdt, xscom_offset, "compatible", compat, compat_size)));
|
||||||
if (pnv_chip_is_power10(chip)) {
|
|
||||||
_FDT((fdt_setprop(fdt, xscom_offset, "compatible", compat_p10,
|
|
||||||
sizeof(compat_p10))));
|
|
||||||
} else if (pnv_chip_is_power9(chip)) {
|
|
||||||
_FDT((fdt_setprop(fdt, xscom_offset, "compatible", compat_p9,
|
|
||||||
sizeof(compat_p9))));
|
|
||||||
} else {
|
|
||||||
_FDT((fdt_setprop(fdt, xscom_offset, "compatible", compat_p8,
|
|
||||||
sizeof(compat_p8))));
|
|
||||||
}
|
|
||||||
|
|
||||||
_FDT((fdt_setprop(fdt, xscom_offset, "scom-controller", NULL, 0)));
|
_FDT((fdt_setprop(fdt, xscom_offset, "scom-controller", NULL, 0)));
|
||||||
|
|
||||||
args.fdt = fdt;
|
args.fdt = fdt;
|
||||||
|
|
|
@ -115,7 +115,8 @@ typedef struct PnvXScomInterfaceClass {
|
||||||
|
|
||||||
void pnv_xscom_realize(PnvChip *chip, uint64_t size, Error **errp);
|
void pnv_xscom_realize(PnvChip *chip, uint64_t size, Error **errp);
|
||||||
int pnv_dt_xscom(PnvChip *chip, void *fdt, int root_offset,
|
int pnv_dt_xscom(PnvChip *chip, void *fdt, int root_offset,
|
||||||
uint64_t xscom_base, uint64_t xscom_size);
|
uint64_t xscom_base, uint64_t xscom_size,
|
||||||
|
const char *compat, int compat_size);
|
||||||
|
|
||||||
void pnv_xscom_add_subregion(PnvChip *chip, hwaddr offset,
|
void pnv_xscom_add_subregion(PnvChip *chip, hwaddr offset,
|
||||||
MemoryRegion *mr);
|
MemoryRegion *mr);
|
||||||
|
|
Loading…
Reference in a new issue