Skip to contentSkip to conversation

powerpc/powernv: add hdat attribute to sysfs

PATCH Superseded Matt Brown 2 participants 2 messages Feb 24, 2017 PowerPC

v2 of 7 Superseded Latest is v7 →

lore
Share & tools
lore

Matt Brown

author
#0 lore raw

PATCH v2 1/1 powerpc/powernv: add hdat attribute to sysfs

The HDAT data area is consumed by skiboot and turned into a device-tree. In some cases we would like to look directly at the HDAT, so this patch adds a sysfs node to allow it to be viewed. This is not possible through /dev/mem as it is reserved memory which is stopped by the /dev/mem filter.

Signed-off-by Matt Brown <[email protected]>

---

Between v1 and v2 of the patch the following changes were made. Changelog:
- moved hdat code into opal-hdat.c
- added opal-hdat to the makefile
- changed struct and variable names from camelcase

---
 arch/powerpc/include/asm/opal.h            |  1 +
 arch/powerpc/platforms/powernv/Makefile    |  1 +
 arch/powerpc/platforms/powernv/opal-hdat.c | 63 ++++++++++++++++++++++++++++++
 arch/powerpc/platforms/powernv/opal.c      |  2 +
 4 files changed, 67 insertions(+)
 create mode 100644 arch/powerpc/platforms/powernv/opal-hdat.c
arch/powerpc/include/asm/opal.h +1 -0
index 5c7db0f..b26944e 100644
@@ -277,6 +277,7 @@ extern int opal_async_comp_init(void);
 extern int opal_sensor_init(void);
 extern int opal_hmi_handler_init(void);
 extern int opal_event_init(void);
+extern void opal_hdat_sysfs_init(void);
 
 extern int opal_machine_check(struct pt_regs *regs);
 extern bool opal_mce_check_early_recovery(struct pt_regs *regs);
arch/powerpc/platforms/powernv/Makefile +1 -0
index b5d98cb..9a0c9d6 100644
@@ -3,6 +3,7 @@ obj-y			+= opal-rtc.o opal-nvram.o opal-lpc.o opal-flash.o
 obj-y			+= rng.o opal-elog.o opal-dump.o opal-sysparam.o opal-sensor.o
 obj-y			+= opal-msglog.o opal-hmi.o opal-power.o opal-irqchip.o
 obj-y			+= opal-kmsg.o
+obj-y			+= opal-hdat.o
 
 obj-$(CONFIG_SMP)	+= smp.o subcore.o subcore-asm.o
 obj-$(CONFIG_PCI)	+= pci.o pci-ioda.o npu-dma.o
arch/powerpc/platforms/powernv/opal-hdat.c new file +63 -0

63 lines not on this page · raw message

arch/powerpc/platforms/powernv/opal.c +2 -0
index 2822935..cae3745 100644
@@ -740,6 +740,8 @@ static int __init opal_init(void)
 		opal_sys_param_init();
 		/* Setup message log sysfs interface. */
 		opal_msglog_sysfs_init();
+		/* Create hdat object under sys/firmware/opal */
+		opal_hdat_sysfs_init();
 	}
 
 	/* Initialize platform devices: IPMI backend, PRD & flash interface */
Signature · 1 line
2.9.3
#1 lore raw
Quoted 10 lines · Matt Brown

The HDAT data area is consumed by skiboot and turned into a device- tree.
In some cases we would like to look directly at the HDAT, so this patch
adds a sysfs node to allow it to be viewed.  This is not possible through
/dev/mem as it is reserved memory which is stopped by the /dev/mem filter.

Signed-off-by Matt Brown <[email protected]>

Your first patch, nice work! :)

See below.

Quoted 52 lines

---

Between v1 and v2 of the patch the following changes were made. Changelog:
- moved hdat code into opal-hdat.c
- added opal-hdat to the makefile
- changed struct and variable names from camelcase
---
 arch/powerpc/include/asm/opal.h            |  1 + arch/powerpc/platforms/powernv/Makefile    |  1 + arch/powerpc/platforms/powernv/opal-hdat.c | 63
++++++++++++++++++++++++++++++
 arch/powerpc/platforms/powernv/opal.c      |  2 +

 4 files changed, 67 insertions(+)

 create mode 100644 arch/powerpc/platforms/powernv/opal-hdat.c

arch/powerpc/include/asm/opal.h +1 -0
index 5c7db0f..b26944e 100644
@@ -277,6 +277,7 @@ extern int opal_async_comp_init(void);
  extern int opal_sensor_init(void);
  extern int opal_hmi_handler_init(void);
  extern int opal_event_init(void);
+extern void opal_hdat_sysfs_init(void);


 extern int opal_machine_check(struct pt_regs *regs); extern bool opal_mce_check_early_recovery(struct pt_regs *regs);

arch/powerpc/platforms/powernv/Makefile +0 -0
index b5d98cb..9a0c9d6 100644
@@ -3,6 +3,7 @@ obj-y			+= opal-rtc.o opal-

nvram.o opal-lpc.o opal-flash.o
 obj-y += rng.o opal-elog.o opal-dump.o opal-
sysparam.o opal-sensor.o
 obj-y += opal-msglog.o opal-hmi.o opal-
power.o opal-irqchip.o
 obj-y += opal-kmsg.o
+obj-y += opal-hdat.o

 obj-$(CONFIG_SMP) += smp.o subcore.o subcore-asm.o
 obj-$(CONFIG_PCI) += pci.o pci-ioda.o npu-dma.o

arch/powerpc/platforms/powernv/opal-hdat.c new file +0 -0
new file mode 100644
index 0000000..bd305e0

arch/powerpc/platforms/powernv/opal-hdat.c line 4

Quoted 4 lines
arch/powerpc/platforms/powernv/opal-hdat.c new file +4 -0
@@ -0,0 +1,63 @@
+/*
+ * PowerNV OPAL in-memory console interface
+ *
+ * Copyright 2014 IBM Corp.

2014?

arch/powerpc/platforms/powernv/opal-hdat.c line 9

Quoted 5 lines
arch/powerpc/platforms/powernv/opal-hdat.c new file +5 -0
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.

Check with someone maybe, but I thought we had to use V2.

Quoted 6 lines
arch/powerpc/platforms/powernv/opal-hdat.c new file +6 -0
+ */
+
+#include <asm/io.h>
+#include <asm/opal.h>
+#include <linux/of.h>
+#include <linux/types.h>

arch/powerpc/platforms/powernv/opal-hdat.c line 25

Quoted 10 lines
arch/powerpc/platforms/powernv/opal-hdat.c new file +10 -0
+
+struct hdat_info {
+	char *base;
+	u64 size;
+};
+
+static struct hdat_info hdat_inf;
+
+/* Read function for HDAT attribute in sysfs */
+static ssize_t hdat_read(struct file *file, struct kobject *kobj,

I assume this is just misaligned in my mail client...

Quoted 27 lines
arch/powerpc/platforms/powernv/opal-hdat.c new file +7 -0
+			 struct bin_attribute *bin_attr, char *to,
+			 loff_t pos, size_t count)
+{
+	if (!hdat_inf.base)
+		return -ENODEV;
+
+	return memory_read_from_buffer(to, count, &pos,

hdat_inf.base,

arch/powerpc/platforms/powernv/opal-hdat.c new file +16 -0
+					hdat_inf.size);
+}
+
+
+/* HDAT attribute for sysfs */
+static struct bin_attribute hdat_attr = {
+	.attr = {.name = "hdat", .mode = 0444},
+	.read = hdat_read
+};
+
+void __init opal_hdat_sysfs_init(void)
+{
+	u64 hdat_addr[2];
+
+	/* Check for the hdat-map prop in device-tree */
+	if (of_property_read_u64_array(opal_node, "hdat-map",

hdat_addr, 2)) {

arch/powerpc/platforms/powernv/opal-hdat.c new file +2 -0
+		pr_debug("OPAL: Property hdat-map not found.\n");
+		return;

arch/powerpc/platforms/powernv/opal-hdat.c line 60

Quoted 10 lines
arch/powerpc/platforms/powernv/opal-hdat.c new file +10 -0
+	}
+
+	/* Print out hdat-map values. [0]: base, [1]: size */
+	pr_debug("OPAL: HDAT Base address: %#llx\n", hdat_addr[0]);
+	pr_debug("OPAL: HDAT Size: %#llx\n", hdat_addr[1]);
+
+	hdat_inf.base = phys_to_virt(hdat_addr[0]);
+	hdat_inf.size = hdat_addr[1];
+
+	if (sysfs_create_bin_file(opal_kobj, &hdat_attr) != 0)

							 ^^^^
							Not Required

This can be replaced with:
"if (sysfs_create_bin_file(opal_kobj, &hdat_attr))"

Quoted 16 lines
arch/powerpc/platforms/powernv/opal-hdat.c new file +1 -0
+		pr_debug("OPAL: sysfs file creation for HDAT

failed");

arch/powerpc/platforms/powernv/opal-hdat.c new file +2 -0
+
+}
arch/powerpc/platforms/powernv/opal.c +2 -0
index 2822935..cae3745 100644
@@ -740,6 +740,8 @@ static int __init opal_init(void)
  		opal_sys_param_init();
  		/* Setup message log sysfs interface. */
  		opal_msglog_sysfs_init();
+		/* Create hdat object under sys/firmware/opal */
+		opal_hdat_sysfs_init();
  	}
Quoted 3 lines


  /* Initialize platform devices: IPMI backend, PRD & flash interface */

Suraj