powerpc/powernv/opal-msglog: Refactor memcons code
PATCH v3 1/2 powerpc/powernv/opal-msglog: Refactor memcons code
This patch refactors the code in opal-msglog that operates on the OPAL memory console in order to make it cleaner and also allow the reuse of the new memcons_* functions.
Signed-off-by Claudio Carvalho <[email protected]>
--- arch/powerpc/platforms/powernv/opal-msglog.c | 61 ++++++++++++++------ 1 file changed, 42 insertions(+), 19 deletions(-)
arch/powerpc/platforms/powernv/opal-msglog.c +42 -19
@@ -29,23 +29,24 @@ struct memcons {static struct memcons *opal_memcons =NULL ; -ssize_t opal_msglog_copy (char *to,loff_t pos,size_t count) +static ssize_t memcons_copy (struct memcons *mc,char *to,loff_t pos, +size_t count) {const char *conbuf;ssize_t ret;size_t first_read =0 ;uint32_t out_pos, avail; -if (!opal_memcons) +if (!mc)return -ENODEV ; - out_pos =be32_to_cpu (READ_ONCE (opal_memcons->out_pos)); + out_pos =be32_to_cpu (READ_ONCE (mc->out_pos));/* Now we've read out_pos, put a barrier in before reading the new * data it points to in conbuf. */ smp_rmb (); - conbuf =phys_to_virt (be64_to_cpu (opal_memcons->obuf_phys)); + conbuf =phys_to_virt (be64_to_cpu (mc->obuf_phys));/* When the buffer has wrapped, read from the out_pos marker to the end * of the buffer, and then read the remaining data as in the un-wrapped
@@ -53,7 +54,7 @@ ssize_t opal_msglog_copy(char *to, loff_t pos, size_t count)if (out_pos &MEMCONS_OUT_POS_WRAP ) { out_pos &=MEMCONS_OUT_POS_MASK ; - avail =be32_to_cpu (opal_memcons->obuf_size) - out_pos; + avail =be32_to_cpu (mc->obuf_size) - out_pos; ret =memory_read_from_buffer (to, count, &pos, conbuf + out_pos, avail);
@@ -71,7 +72,7 @@ ssize_t opal_msglog_copy(char *to, loff_t pos, size_t count) }/* Sanity check. The firmware should not do this to us. */ -if (out_pos >be32_to_cpu (opal_memcons->obuf_size)) { +if (out_pos >be32_to_cpu (mc->obuf_size)) {pr_err ("OPAL: memory console corruption. Aborting read.\n" );return -EINVAL ; }
@@ -86,11 +87,16 @@ ssize_t opal_msglog_copy(char *to, loff_t pos, size_t count)return ret; } +ssize_t opal_msglog_copy (char *to,loff_t pos,size_t count) +{ +return memcons_copy (opal_memcons, to, pos, count); +} +static ssize_t opal_msglog_read (struct file *file,struct kobject *kobj,struct bin_attribute *bin_attr,char *to,loff_t pos,size_t count) { -return opal_msglog_copy (to, pos, count); +return memcons_copy (opal_memcons, to, pos, count); }static struct bin_attribute opal_msglog_attr = {
@@ -98,32 +104,49 @@ static struct bin_attribute opal_msglog_attr = { .read = opal_msglog_read }; -void __init opal_msglog_init (void ) +static struct memcons *memcons_load_from_dt (struct device_node *node, +const char *mc_prop_name) {u64 mcaddr;struct memcons *mc; -if (of_property_read_u64 (opal_node,"ibm,opal-memcons" , &mcaddr)) { -pr_warn ("OPAL: Property ibm,opal-memcons not found, no message log\n" ); -return ; +if (of_property_read_u64 (node, mc_prop_name, &mcaddr)) { +pr_warn ("%s property not found, no message log\n" , + mc_prop_name); + goto out_err; } mc =phys_to_virt (mcaddr);if (!mc) { -pr_warn ("OPAL: memory console address is invalid\n" ); -return ; +pr_warn ("memory console address is invalid\n" ); + goto out_err; }if (be64_to_cpu (mc->magic) !=MEMCONS_MAGIC ) { -pr_warn ("OPAL: memory console version is invalid\n" ); -return ; +pr_warn ("memory console version is invalid\n" ); + goto out_err; } -/* Report maximum size */ - opal_msglog_attr.size =be32_to_cpu (mc->ibuf_size) + -be32_to_cpu (mc->obuf_size); +return mc; + +out_err: +return NULL ; +} + +static u32 memcons_get_size (struct memcons *mc) +{ +return be32_to_cpu (mc->ibuf_size) +be32_to_cpu (mc->obuf_size); +} + +void __init opal_msglog_init (void ) +{ + opal_memcons =memcons_load_from_dt (opal_node,"ibm,opal-memcons" ); +if (!opal_memcons) { +pr_warn ("OPAL: memcons failed to load from ibm,opal-memcons\n" ); +return ; + } - opal_memcons = mc; + opal_msglog_attr.size =memcons_get_size (opal_memcons); }void __init opal_msglog_sysfs_init (void )
Signature · 1 line
2.20.1
PATCH v3 2/2 powerpc/powernv: Add ultravisor message log interface
The ultravisor (UV) provides an in-memory console which follows the OPAL in-memory console structure.
This patch extends the OPAL msglog code to initialize the UV memory console and provide the "/sys/firmware/ultravisor/msglog" interface for userspace to view the UV message log.
Signed-off-by Claudio Carvalho <[email protected]>
---
This patch applies on top of the "kvmppc: Paravirtualize KVM to support ultravisor" patch series submitted by Claudio Carvalho.
--- arch/powerpc/include/asm/ultravisor.h | 8 ++++ arch/powerpc/platforms/powernv/opal-msglog.c | 36 ++++++++++++++++++ arch/powerpc/platforms/powernv/ultravisor.c | 40 ++++++++++++++++++++ 3 files changed, 84 insertions(+)
arch/powerpc/include/asm/ultravisor.h +8 -0
@@ -12,6 +12,14 @@#include <asm/ultravisor-api.h> #include <asm/firmware.h> +/* /sys/firmware/ultravisor */ +extern struct kobject *ultravisor_kobj; + +/* /ibm,ultravisor/ibm,uv-firmware */ +extern struct device_node *uv_firmware_node; + +void ultra_msglog_init (void ); +void ultra_msglog_sysfs_init (void );int early_init_dt_scan_ultravisor (unsigned long node,const char *uname,int depth,void *data);
arch/powerpc/platforms/powernv/opal-msglog.c +36 -0
@@ -11,6 +11,7 @@#include <linux/of.h> #include <linux/types.h> #include <asm/barrier.h> +#include <asm/ultravisor.h> /* OPAL in-memory console. Defined in OPAL source at core/console.c */ struct memcons {
@@ -28,6 +29,7 @@ struct memcons { };static struct memcons *opal_memcons =NULL ; +static struct memcons *ultra_memcons;static ssize_t memcons_copy (struct memcons *mc,char *to,loff_t pos,size_t count)
@@ -104,6 +106,18 @@ static struct bin_attribute opal_msglog_attr = { .read = opal_msglog_read }; +static ssize_t ultra_msglog_read (struct file *file,struct kobject *kobj, +struct bin_attribute *bin_attr,char *to, +loff_t pos,size_t count) +{ +return memcons_copy (ultra_memcons, to, pos, count); +} + +static struct bin_attribute ultra_msglog_attr = { + .attr = {.name ="msglog" , .mode =0400 }, + .read = ultra_msglog_read +}; +static struct memcons *memcons_load_from_dt (struct device_node *node,const char *mc_prop_name) {
@@ -159,3 +173,25 @@ void __init opal_msglog_sysfs_init(void)if (sysfs_create_bin_file (opal_kobj, &opal_msglog_attr) !=0 )pr_warn ("OPAL: sysfs file creation failed\n" ); } + +void __init ultra_msglog_init (void ) +{ + ultra_memcons =memcons_load_from_dt (uv_firmware_node,"memcons" ); +if (!ultra_memcons) { +pr_warn ("Ultravisor: memcons failed to load from DT\n" ); +return ; + } + + ultra_msglog_attr.size =memcons_get_size (ultra_memcons); +} + +void __init ultra_msglog_sysfs_init (void ) +{ +if (!ultra_memcons) { +pr_warn ("Ultravisor: msglog initialisation failed, not creating sysfs entry\n" ); +return ; + } + +if (sysfs_create_bin_file (ultravisor_kobj, &ultra_msglog_attr) !=0 ) +pr_warn ("Ultravisor: sysfs msglog file creation failed\n" ); +}
arch/powerpc/platforms/powernv/ultravisor.c +40 -0
@@ -8,9 +8,14 @@#include <linux/init.h> #include <linux/printk.h> #include <linux/of_fdt.h> +#include <linux/of.h> #include <asm/ultravisor.h> #include <asm/firmware.h> +#include <asm/machdep.h> + +struct kobject *ultravisor_kobj; +struct device_node *uv_firmware_node;int __init early_init_dt_scan_ultravisor (unsigned long node,const char *uname,int depth,void *data)
@@ -22,3 +27,38 @@ int __init early_init_dt_scan_ultravisor(unsigned long node, const char *uname,pr_debug ("Ultravisor detected!\n" );return 1 ; } + +static int __init ultra_sysfs_init (void ) +{ + ultravisor_kobj =kobject_create_and_add ("ultravisor" , firmware_kobj); +if (!ultravisor_kobj) { +pr_warn ("kobject_create_and_add ultravisor failed\n" ); +return -ENOMEM ; + } + +return 0 ; +} + +static int __init ultra_init (void ) +{ +int rc; + +if (!firmware_has_feature (FW_FEATURE_ULTRAVISOR )) + goto out; + + uv_firmware_node =of_find_compatible_node (NULL ,NULL , +"ibm,uv-firmware" ); +if (!uv_firmware_node) { +pr_err ("ibm,uv-firmware node not found\n" ); +return -ENODEV ; + } + +ultra_msglog_init (); + + rc =ultra_sysfs_init (); +if (rc =0 ) +ultra_msglog_sysfs_init (); +out: +return 0 ; +} +machine_subsys_initcall (powernv, ultra_init);
Signature · 1 line
2.20.1