Commit 68f3a94c authored by David Gibson's avatar David Gibson Committed by Alexander Graf
Browse files

pseries: Populate "/chosen/linux,stdout-path" in the FDT 



There is a device tree property "/chosen/linux,stdout-path" which indicates
which device should be used as stdout - ie. "the console".

Currently we don't specify anything, which means both firmware and Linux
choose something arbitrarily. Use the routine we added in the last patch
to pick a default vty and specify it as stdout.

Currently SLOF doesn't use the property, but we are hoping to update it
to do so.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 98331f8a

hw/spapr.c

+2 −0
Original line number Diff line number Diff line
@@ -441,6 +441,8 @@ static void spapr_finalize_fdt(sPAPREnvironment *spapr, 
        }

    }



    spapr_populate_chosen_stdout(fdt, spapr->vio_bus);



    _FDT((fdt_pack(fdt)));



    cpu_physical_memory_write(fdt_addr, fdt, fdt_totalsize(fdt));

hw/spapr_vio.c

+34 −0
Original line number Diff line number Diff line
@@ -793,4 +793,38 @@ out: 


    return ret;

}



int spapr_populate_chosen_stdout(void *fdt, VIOsPAPRBus *bus)

{

    VIOsPAPRDevice *dev;

    char *name, *path;

    int ret, offset;



    dev = spapr_vty_get_default(bus);

    if (!dev)

        return 0;



    offset = fdt_path_offset(fdt, "/chosen");

    if (offset < 0) {

        return offset;

    }



    name = vio_format_dev_name(dev);

    if (!name) {

        return -ENOMEM;

    }



    if (asprintf(&path, "/vdevice/%s", name) < 0) {

        path = NULL;

        ret = -ENOMEM;

        goto out;

    }



    ret = fdt_setprop_string(fdt, offset, "linux,stdout-path", path);

out:

    free(name);

    free(path);



    return ret;

}

#endif /* CONFIG_FDT */

hw/spapr_vio.h

+3 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ extern VIOsPAPRBus *spapr_vio_bus_init(void); 
extern VIOsPAPRDevice *spapr_vio_find_by_reg(VIOsPAPRBus *bus, uint32_t reg);

extern void spapr_vio_bus_register_withprop(VIOsPAPRDeviceInfo *info);

extern int spapr_populate_vdevice(VIOsPAPRBus *bus, void *fdt);

extern int spapr_populate_chosen_stdout(void *fdt, VIOsPAPRBus *bus);



extern int spapr_vio_signal(VIOsPAPRDevice *dev, target_ulong mode);
@@ -107,6 +108,8 @@ void spapr_vty_create(VIOsPAPRBus *bus, uint32_t reg, CharDriverState *chardev); 
void spapr_vlan_create(VIOsPAPRBus *bus, uint32_t reg, NICInfo *nd);

void spapr_vscsi_create(VIOsPAPRBus *bus, uint32_t reg);



VIOsPAPRDevice *spapr_vty_get_default(VIOsPAPRBus *bus);



int spapr_tce_set_bypass(uint32_t unit, uint32_t enable);

void spapr_vio_quiesce(void);

hw/spapr_vty.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static VIOsPAPRDeviceInfo spapr_vty = { 
    },

};



static VIOsPAPRDevice *spapr_vty_get_default(VIOsPAPRBus *bus)

VIOsPAPRDevice *spapr_vty_get_default(VIOsPAPRBus *bus)

{

    VIOsPAPRDevice *sdev, *selected;

    DeviceState *iter;