[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1593882535-21368-1-git-send-email-nayna@linux.ibm.com>
Date: Sat, 4 Jul 2020 13:08:55 -0400
From: Nayna Jain <nayna@...ux.ibm.com>
To: linuxppc-dev@...abs.org
Cc: Michael Ellerman <mpe@...erman.id.au>,
Mimi Zohar <zohar@...ux.ibm.com>, linux-kernel@...r.kernel.org,
Nayna Jain <nayna@...ux.ibm.com>
Subject: [PATCH] powerpc/pseries: detect secure and trusted boot state of the system.
The device-tree property to check secure and trusted boot state is
different for guests(pseries) compared to baremetal(powernv).
This patch updates the existing is_ppc_secureboot_enabled() and
is_ppc_trustedboot_enabled() function to add support for pseries.
Signed-off-by: Nayna Jain <nayna@...ux.ibm.com>
---
arch/powerpc/kernel/secure_boot.c | 31 +++++++++++++++++++++++++------
1 file changed, 25 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/kernel/secure_boot.c b/arch/powerpc/kernel/secure_boot.c
index 4b982324d368..43fc6607c7a5 100644
--- a/arch/powerpc/kernel/secure_boot.c
+++ b/arch/powerpc/kernel/secure_boot.c
@@ -6,6 +6,7 @@
#include <linux/types.h>
#include <linux/of.h>
#include <asm/secure_boot.h>
+#include <asm/machdep.h>
static struct device_node *get_ppc_fw_sb_node(void)
{
@@ -23,11 +24,20 @@ bool is_ppc_secureboot_enabled(void)
{
struct device_node *node;
bool enabled = false;
+ const u32 *secureboot;
- node = get_ppc_fw_sb_node();
- enabled = of_property_read_bool(node, "os-secureboot-enforcing");
+ if (machine_is(powernv)) {
+ node = get_ppc_fw_sb_node();
+ enabled =
+ of_property_read_bool(node, "os-secureboot-enforcing");
+ of_node_put(node);
+ }
- of_node_put(node);
+ if (machine_is(pseries)) {
+ secureboot = of_get_property(of_root, "ibm,secure-boot", NULL);
+ if (secureboot)
+ enabled = (*secureboot > 1) ? true : false;
+ }
pr_info("Secure boot mode %s\n", enabled ? "enabled" : "disabled");
@@ -38,11 +48,20 @@ bool is_ppc_trustedboot_enabled(void)
{
struct device_node *node;
bool enabled = false;
+ const u32 *trustedboot;
- node = get_ppc_fw_sb_node();
- enabled = of_property_read_bool(node, "trusted-enabled");
+ if (machine_is(powernv)) {
+ node = get_ppc_fw_sb_node();
+ enabled = of_property_read_bool(node, "trusted-enabled");
+ of_node_put(node);
+ }
- of_node_put(node);
+ if (machine_is(pseries)) {
+ trustedboot =
+ of_get_property(of_root, "ibm,trusted-boot", NULL);
+ if (trustedboot)
+ enabled = (*trustedboot > 0) ? true : false;
+ }
pr_info("Trusted boot mode %s\n", enabled ? "enabled" : "disabled");
--
2.18.1
Powered by blists - more mailing lists