* [PATCH 1/2] x86/bugs: Move enum taa_mitigations to bugs.c
@ 2019-11-12 22:18 Borislav Petkov
2019-11-12 22:18 ` [PATCH 2/2] x86/cpu/tsx: Define pr_fmt() Borislav Petkov
2019-12-15 10:18 ` [tip: x86/cpu] x86/bugs: Move enum taa_mitigations to bugs.c tip-bot2 for Borislav Petkov
0 siblings, 2 replies; 4+ messages in thread
From: Borislav Petkov @ 2019-11-12 22:18 UTC (permalink / raw)
To: X86 ML; +Cc: LKML
From: Borislav Petkov <bp@suse.de>
... because it is used only there.
No functional changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: x86@kernel.org
---
arch/x86/include/asm/processor.h | 7 -------
arch/x86/kernel/cpu/bugs.c | 7 +++++++
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 54f5d54280f6..6e0a3b43d027 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -988,11 +988,4 @@ enum mds_mitigations {
MDS_MITIGATION_VMWERV,
};
-enum taa_mitigations {
- TAA_MITIGATION_OFF,
- TAA_MITIGATION_UCODE_NEEDED,
- TAA_MITIGATION_VERW,
- TAA_MITIGATION_TSX_DISABLED,
-};
-
#endif /* _ASM_X86_PROCESSOR_H */
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 4c7b0fa15a19..513a7f807412 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -273,6 +273,13 @@ early_param("mds", mds_cmdline);
#undef pr_fmt
#define pr_fmt(fmt) "TAA: " fmt
+enum taa_mitigations {
+ TAA_MITIGATION_OFF,
+ TAA_MITIGATION_UCODE_NEEDED,
+ TAA_MITIGATION_VERW,
+ TAA_MITIGATION_TSX_DISABLED,
+};
+
/* Default mitigation for TAA-affected CPUs */
static enum taa_mitigations taa_mitigation __ro_after_init = TAA_MITIGATION_VERW;
static bool taa_nosmt __ro_after_init;
--
2.21.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] x86/cpu/tsx: Define pr_fmt()
2019-11-12 22:18 [PATCH 1/2] x86/bugs: Move enum taa_mitigations to bugs.c Borislav Petkov
@ 2019-11-12 22:18 ` Borislav Petkov
2019-12-15 10:18 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov
2019-12-15 10:18 ` [tip: x86/cpu] x86/bugs: Move enum taa_mitigations to bugs.c tip-bot2 for Borislav Petkov
1 sibling, 1 reply; 4+ messages in thread
From: Borislav Petkov @ 2019-11-12 22:18 UTC (permalink / raw)
To: X86 ML; +Cc: LKML
From: Borislav Petkov <bp@suse.de>
... so that all current and future pr_* statements in this file have the
proper prefix.
No functional changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: x86@kernel.org
---
arch/x86/kernel/cpu/tsx.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/tsx.c b/arch/x86/kernel/cpu/tsx.c
index 3e20d322bc98..1674c8da003e 100644
--- a/arch/x86/kernel/cpu/tsx.c
+++ b/arch/x86/kernel/cpu/tsx.c
@@ -14,6 +14,9 @@
#include "cpu.h"
+#undef pr_fmt
+#define pr_fmt(fmt) "tsx: " fmt
+
enum tsx_ctrl_states tsx_ctrl_state __ro_after_init = TSX_CTRL_NOT_SUPPORTED;
void tsx_disable(void)
@@ -99,7 +102,7 @@ void __init tsx_init(void)
tsx_ctrl_state = x86_get_tsx_auto_mode();
} else {
tsx_ctrl_state = TSX_CTRL_DISABLE;
- pr_err("tsx: invalid option, defaulting to off\n");
+ pr_err("invalid option, defaulting to off\n");
}
} else {
/* tsx= not provided */
--
2.21.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [tip: x86/cpu] x86/cpu/tsx: Define pr_fmt()
2019-11-12 22:18 ` [PATCH 2/2] x86/cpu/tsx: Define pr_fmt() Borislav Petkov
@ 2019-12-15 10:18 ` tip-bot2 for Borislav Petkov
0 siblings, 0 replies; 4+ messages in thread
From: tip-bot2 for Borislav Petkov @ 2019-12-15 10:18 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Borislav Petkov, x86, LKML
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: d157aa0fb241646e8818f699653ed983e6581b11
Gitweb: https://git.kernel.org/tip/d157aa0fb241646e8818f699653ed983e6581b11
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Tue, 12 Nov 2019 22:06:03 +01:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Sun, 15 Dec 2019 10:58:54 +01:00
x86/cpu/tsx: Define pr_fmt()
... so that all current and future pr_* statements in this file have the
proper prefix.
No functional changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: x86@kernel.org
Link: https://lkml.kernel.org/r/20191112221823.19677-2-bp@alien8.de
---
arch/x86/kernel/cpu/tsx.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/tsx.c b/arch/x86/kernel/cpu/tsx.c
index 3e20d32..1674c8d 100644
--- a/arch/x86/kernel/cpu/tsx.c
+++ b/arch/x86/kernel/cpu/tsx.c
@@ -14,6 +14,9 @@
#include "cpu.h"
+#undef pr_fmt
+#define pr_fmt(fmt) "tsx: " fmt
+
enum tsx_ctrl_states tsx_ctrl_state __ro_after_init = TSX_CTRL_NOT_SUPPORTED;
void tsx_disable(void)
@@ -99,7 +102,7 @@ void __init tsx_init(void)
tsx_ctrl_state = x86_get_tsx_auto_mode();
} else {
tsx_ctrl_state = TSX_CTRL_DISABLE;
- pr_err("tsx: invalid option, defaulting to off\n");
+ pr_err("invalid option, defaulting to off\n");
}
} else {
/* tsx= not provided */
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [tip: x86/cpu] x86/bugs: Move enum taa_mitigations to bugs.c
2019-11-12 22:18 [PATCH 1/2] x86/bugs: Move enum taa_mitigations to bugs.c Borislav Petkov
2019-11-12 22:18 ` [PATCH 2/2] x86/cpu/tsx: Define pr_fmt() Borislav Petkov
@ 2019-12-15 10:18 ` tip-bot2 for Borislav Petkov
1 sibling, 0 replies; 4+ messages in thread
From: tip-bot2 for Borislav Petkov @ 2019-12-15 10:18 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Borislav Petkov, x86, LKML
The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 72c2ce9867d9e8535f8c29eb6d842d1caad281af
Gitweb: https://git.kernel.org/tip/72c2ce9867d9e8535f8c29eb6d842d1caad281af
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Tue, 12 Nov 2019 21:58:57 +01:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Sat, 14 Dec 2019 16:06:33 +01:00
x86/bugs: Move enum taa_mitigations to bugs.c
... because it is used only there.
No functional changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: x86@kernel.org
Link: https://lkml.kernel.org/r/20191112221823.19677-1-bp@alien8.de
---
arch/x86/include/asm/processor.h | 7 -------
arch/x86/kernel/cpu/bugs.c | 7 +++++++
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 0340aad..7c071f8 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -1015,11 +1015,4 @@ enum mds_mitigations {
MDS_MITIGATION_VMWERV,
};
-enum taa_mitigations {
- TAA_MITIGATION_OFF,
- TAA_MITIGATION_UCODE_NEEDED,
- TAA_MITIGATION_VERW,
- TAA_MITIGATION_TSX_DISABLED,
-};
-
#endif /* _ASM_X86_PROCESSOR_H */
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 8bf6489..ed54b3b 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -286,6 +286,13 @@ early_param("mds", mds_cmdline);
#undef pr_fmt
#define pr_fmt(fmt) "TAA: " fmt
+enum taa_mitigations {
+ TAA_MITIGATION_OFF,
+ TAA_MITIGATION_UCODE_NEEDED,
+ TAA_MITIGATION_VERW,
+ TAA_MITIGATION_TSX_DISABLED,
+};
+
/* Default mitigation for TAA-affected CPUs */
static enum taa_mitigations taa_mitigation __ro_after_init = TAA_MITIGATION_VERW;
static bool taa_nosmt __ro_after_init;
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-12-15 10:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-12 22:18 [PATCH 1/2] x86/bugs: Move enum taa_mitigations to bugs.c Borislav Petkov
2019-11-12 22:18 ` [PATCH 2/2] x86/cpu/tsx: Define pr_fmt() Borislav Petkov
2019-12-15 10:18 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov
2019-12-15 10:18 ` [tip: x86/cpu] x86/bugs: Move enum taa_mitigations to bugs.c tip-bot2 for Borislav Petkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox