From: Michael Ellerman <mpe@ellerman.id.au>
To: gregkh@linuxfoundation.org
Cc: stable@vger.kernel.org, linuxppc-dev@ozlabs.org
Subject: [PATCH stable 4.9 15/23] powerpc/powernv: Use the security flags in pnv_setup_rfi_flush()
Date: Sat, 2 Jun 2018 21:09:00 +1000 [thread overview]
Message-ID: <20180602110908.29773-16-mpe@ellerman.id.au> (raw)
In-Reply-To: <20180602110908.29773-1-mpe@ellerman.id.au>
commit 37c0bdd00d3ae83369ab60a6712c28e11e6458d5 upstream.
Now that we have the security flags we can significantly simplify the
code in pnv_setup_rfi_flush(), because we can use the flags instead of
checking device tree properties and because the security flags have
pessimistic defaults.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
---
arch/powerpc/platforms/powernv/setup.c | 41 +++++++++-------------------------
1 file changed, 10 insertions(+), 31 deletions(-)
diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index 26fbaf14f87a..2c646f5bd144 100644
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -65,7 +65,7 @@ static void init_fw_feat_flags(struct device_node *np)
if (fw_feature_is("enabled", "fw-bcctrl-serialized", np))
security_ftr_set(SEC_FTR_BCCTRL_SERIALISED);
- if (fw_feature_is("enabled", "inst-spec-barrier-ori31,31,0", np))
+ if (fw_feature_is("enabled", "inst-l1d-flush-ori30,30,0", np))
security_ftr_set(SEC_FTR_L1D_FLUSH_ORI30);
if (fw_feature_is("enabled", "inst-l1d-flush-trig2", np))
@@ -98,11 +98,10 @@ static void pnv_setup_rfi_flush(void)
{
struct device_node *np, *fw_features;
enum l1d_flush_type type;
- int enable;
+ bool enable;
/* Default to fallback in case fw-features are not available */
type = L1D_FLUSH_FALLBACK;
- enable = 1;
np = of_find_node_by_name(NULL, "ibm,opal");
fw_features = of_get_child_by_name(np, "fw-features");
@@ -110,40 +109,20 @@ static void pnv_setup_rfi_flush(void)
if (fw_features) {
init_fw_feat_flags(fw_features);
+ of_node_put(fw_features);
- np = of_get_child_by_name(fw_features, "inst-l1d-flush-trig2");
- if (np && of_property_read_bool(np, "enabled"))
+ if (security_ftr_enabled(SEC_FTR_L1D_FLUSH_TRIG2))
type = L1D_FLUSH_MTTRIG;
- of_node_put(np);
-
- np = of_get_child_by_name(fw_features, "inst-l1d-flush-ori30,30,0");
- if (np && of_property_read_bool(np, "enabled"))
+ if (security_ftr_enabled(SEC_FTR_L1D_FLUSH_ORI30))
type = L1D_FLUSH_ORI;
-
- of_node_put(np);
-
- /* Enable unless firmware says NOT to */
- enable = 2;
- np = of_get_child_by_name(fw_features, "needs-l1d-flush-msr-hv-1-to-0");
- if (np && of_property_read_bool(np, "disabled"))
- enable--;
-
- of_node_put(np);
-
- np = of_get_child_by_name(fw_features, "needs-l1d-flush-msr-pr-0-to-1");
- if (np && of_property_read_bool(np, "disabled"))
- enable--;
-
- np = of_get_child_by_name(fw_features, "speculation-policy-favor-security");
- if (np && of_property_read_bool(np, "disabled"))
- enable = 0;
-
- of_node_put(np);
- of_node_put(fw_features);
}
- setup_rfi_flush(type, enable > 0);
+ enable = security_ftr_enabled(SEC_FTR_FAVOUR_SECURITY) && \
+ (security_ftr_enabled(SEC_FTR_L1D_FLUSH_PR) || \
+ security_ftr_enabled(SEC_FTR_L1D_FLUSH_HV));
+
+ setup_rfi_flush(type, enable);
}
static void __init pnv_setup_arch(void)
--
2.14.1
next prev parent reply other threads:[~2018-06-02 11:09 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-02 11:08 [PATCH stable 4.9 00/23] powerpc backports for 4.9 Michael Ellerman
2018-06-02 11:08 ` [PATCH stable 4.9 01/23] powerpc/rfi-flush: Move out of HARDLOCKUP_DETECTOR #ifdef Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/rfi-flush: Move out of HARDLOCKUP_DETECTOR #ifdef" has been added to the 4.9-stable tree gregkh
2018-06-02 11:08 ` [PATCH stable 4.9 02/23] powerpc/pseries: Support firmware disable of RFI flush Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/pseries: Support firmware disable of RFI flush" has been added to the 4.9-stable tree gregkh
2018-06-02 11:08 ` [PATCH stable 4.9 03/23] powerpc/powernv: Support firmware disable of RFI flush Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/powernv: Support firmware disable of RFI flush" has been added to the 4.9-stable tree gregkh
2018-06-02 11:08 ` [PATCH stable 4.9 04/23] powerpc/rfi-flush: Move the logic to avoid a redo into the debugfs code Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/rfi-flush: Move the logic to avoid a redo into the debugfs code" has been added to the 4.9-stable tree gregkh
2018-06-02 11:08 ` [PATCH stable 4.9 05/23] powerpc/rfi-flush: Make it possible to call setup_rfi_flush() again Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/rfi-flush: Make it possible to call setup_rfi_flush() again" has been added to the 4.9-stable tree gregkh
2018-06-02 11:08 ` [PATCH stable 4.9 06/23] powerpc/rfi-flush: Always enable fallback flush on pseries Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/rfi-flush: Always enable fallback flush on pseries" has been added to the 4.9-stable tree gregkh
2018-06-02 11:08 ` [PATCH stable 4.9 07/23] powerpc/rfi-flush: Differentiate enabled and patched flush types Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/rfi-flush: Differentiate enabled and patched flush types" has been added to the 4.9-stable tree gregkh
2018-06-02 11:08 ` [PATCH stable 4.9 08/23] powerpc/rfi-flush: Call setup_rfi_flush() after LPM migration Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/rfi-flush: Call setup_rfi_flush() after LPM migration" has been added to the 4.9-stable tree gregkh
2018-06-02 11:08 ` [PATCH stable 4.9 09/23] powerpc/pseries: Add new H_GET_CPU_CHARACTERISTICS flags Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/pseries: Add new H_GET_CPU_CHARACTERISTICS flags" has been added to the 4.9-stable tree gregkh
2018-06-02 11:08 ` [PATCH stable 4.9 10/23] powerpc: Add security feature flags for Spectre/Meltdown Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc: Add security feature flags for Spectre/Meltdown" has been added to the 4.9-stable tree gregkh
2018-06-02 11:08 ` [PATCH stable 4.9 11/23] powerpc/pseries: Set or clear security feature flags Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/pseries: Set or clear security feature flags" has been added to the 4.9-stable tree gregkh
2018-06-02 11:08 ` [PATCH stable 4.9 12/23] powerpc/powernv: Set or clear security feature flags Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/powernv: Set or clear security feature flags" has been added to the 4.9-stable tree gregkh
2018-06-02 11:08 ` [PATCH stable 4.9 13/23] powerpc/64s: Move cpu_show_meltdown() Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/64s: Move cpu_show_meltdown()" has been added to the 4.9-stable tree gregkh
2018-06-02 11:08 ` [PATCH stable 4.9 14/23] powerpc/64s: Enhance the information in cpu_show_meltdown() Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/64s: Enhance the information in cpu_show_meltdown()" has been added to the 4.9-stable tree gregkh
2018-06-02 11:09 ` Michael Ellerman [this message]
2018-06-02 13:35 ` Patch "powerpc/powernv: Use the security flags in pnv_setup_rfi_flush()" " gregkh
2018-06-02 11:09 ` [PATCH stable 4.9 16/23] powerpc/pseries: Use the security flags in pseries_setup_rfi_flush() Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/pseries: Use the security flags in pseries_setup_rfi_flush()" has been added to the 4.9-stable tree gregkh
2018-06-02 11:09 ` [PATCH stable 4.9 17/23] powerpc/64s: Wire up cpu_show_spectre_v1() Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/64s: Wire up cpu_show_spectre_v1()" has been added to the 4.9-stable tree gregkh
2018-06-02 11:09 ` [PATCH stable 4.9 18/23] powerpc/64s: Wire up cpu_show_spectre_v2() Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/64s: Wire up cpu_show_spectre_v2()" has been added to the 4.9-stable tree gregkh
2018-06-02 11:09 ` [PATCH stable 4.9 19/23] powerpc/pseries: Fix clearing of security feature flags Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/pseries: Fix clearing of security feature flags" has been added to the 4.9-stable tree gregkh
2018-06-02 11:09 ` [PATCH stable 4.9 20/23] powerpc: Move default security feature flags Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc: Move default security feature flags" has been added to the 4.9-stable tree gregkh
2018-06-02 11:09 ` [PATCH stable 4.9 21/23] powerpc/pseries: Restore default security feature flags on setup Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/pseries: Restore default security feature flags on setup" has been added to the 4.9-stable tree gregkh
2018-06-02 11:09 ` [PATCH stable 4.9 22/23] powerpc/64s: Fix section mismatch warnings from setup_rfi_flush() Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/64s: Fix section mismatch warnings from setup_rfi_flush()" has been added to the 4.9-stable tree gregkh
2018-06-02 11:09 ` [PATCH stable 4.9 23/23] powerpc/64s: Add support for a store forwarding barrier at kernel entry/exit Michael Ellerman
2018-06-02 13:35 ` Patch "powerpc/64s: Add support for a store forwarding barrier at kernel entry/exit" has been added to the 4.9-stable tree gregkh
2018-06-02 13:30 ` [PATCH stable 4.9 00/23] powerpc backports for 4.9 Greg KH
2018-06-03 10:22 ` Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180602110908.29773-16-mpe@ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=gregkh@linuxfoundation.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).