From: Juergen Gross <jgross@suse.com>
To: xen-devel@lists.xenproject.org, x86@kernel.org,
linux-kernel@vger.kernel.org
Cc: Juergen Gross <jgross@suse.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
"H. Peter Anvin" <hpa@zytor.com>
Subject: [PATCH v2 06/10] x86/mtrr: remove set_all callback from struct mtrr_ops
Date: Sat, 20 Aug 2022 11:25:29 +0200 [thread overview]
Message-ID: <20220820092533.29420-7-jgross@suse.com> (raw)
In-Reply-To: <20220820092533.29420-1-jgross@suse.com>
Instead of using an indirect call to mtrr_if->set_all just call the
only possible target cache_cpu_init() directly. This enables to remove
the set_all callback from struct mtrr_ops.
Signed-off-by: Juergen Gross <jgross@suse.com>
---
arch/x86/kernel/cpu/mtrr/generic.c | 1 -
arch/x86/kernel/cpu/mtrr/mtrr.c | 10 +++++-----
arch/x86/kernel/cpu/mtrr/mtrr.h | 2 --
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index 0be6d43ec1fe..1c6260b94cb9 100644
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -848,7 +848,6 @@ int positive_have_wrcomb(void)
* Generic structure...
*/
const struct mtrr_ops generic_mtrr_ops = {
- .set_all = cache_cpu_init,
.get = generic_get_mtrr,
.get_free_region = generic_get_free_region,
.set = generic_set_mtrr,
diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.c b/arch/x86/kernel/cpu/mtrr/mtrr.c
index 4cd9c8d1473e..19662ab057be 100644
--- a/arch/x86/kernel/cpu/mtrr/mtrr.c
+++ b/arch/x86/kernel/cpu/mtrr/mtrr.c
@@ -165,15 +165,15 @@ static int mtrr_rendezvous_handler(void *info)
* saved, and we want to replicate that across all the cpus that come
* online (either at the end of boot or resume or during a runtime cpu
* online). If we're doing that, @reg is set to something special and on
- * all the cpu's we do mtrr_if->set_all() (On the logical cpu that
+ * all the cpu's we do cache_cpu_init() (On the logical cpu that
* started the boot/resume sequence, this might be a duplicate
- * set_all()).
+ * cache_cpu_init()).
*/
if (data->smp_reg != ~0U) {
mtrr_if->set(data->smp_reg, data->smp_base,
data->smp_size, data->smp_type);
} else if (mtrr_aps_delayed_init || !cpu_online(smp_processor_id())) {
- mtrr_if->set_all();
+ cache_cpu_init();
}
return 0;
}
@@ -768,7 +768,7 @@ void __init mtrr_bp_init(void)
if (mtrr_cleanup(phys_addr)) {
changed_by_mtrr_cleanup = 1;
- mtrr_if->set_all();
+ cache_cpu_init();
}
}
}
@@ -854,7 +854,7 @@ void mtrr_bp_restore(void)
if (!cache_generic)
return;
- mtrr_if->set_all();
+ cache_cpu_init();
}
static int __init mtrr_init_finialize(void)
diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
index 88b1c4b6174a..3b1883185185 100644
--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
@@ -16,8 +16,6 @@ struct mtrr_ops {
u32 vendor;
void (*set)(unsigned int reg, unsigned long base,
unsigned long size, mtrr_type type);
- void (*set_all)(void);
-
void (*get)(unsigned int reg, unsigned long *base,
unsigned long *size, mtrr_type *type);
int (*get_free_region)(unsigned long base, unsigned long size,
--
2.35.3
next prev parent reply other threads:[~2022-08-20 9:26 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-20 9:25 [PATCH v2 00/10] x86: make pat and mtrr independent from each other Juergen Gross
2022-08-20 9:25 ` [PATCH v2 01/10] x86/mtrr: fix MTRR fixup on APs Juergen Gross
2022-08-20 10:28 ` Greg KH
2022-08-21 12:25 ` Borislav Petkov
2022-08-21 21:41 ` Borislav Petkov
2022-08-22 5:17 ` Juergen Gross
2022-08-22 8:28 ` Borislav Petkov
2022-08-22 8:32 ` Juergen Gross
2022-10-19 18:45 ` [tip: x86/cpu] x86/mtrr: Add comment for set_mtrr_state() serialization tip-bot2 for Juergen Gross
2022-08-20 9:25 ` [PATCH v2 02/10] x86/mtrr: remove unused cyrix_set_all() function Juergen Gross
2022-08-25 10:31 ` Borislav Petkov
2022-08-25 10:38 ` Juergen Gross
2022-08-25 10:41 ` Juergen Gross
2022-08-25 11:42 ` Borislav Petkov
2022-08-25 12:13 ` Juergen Gross
2022-08-20 9:25 ` [PATCH v2 03/10] x86/mtrr: replace use_intel() with a local flag Juergen Gross
2022-08-20 9:25 ` [PATCH v2 04/10] x86: move some code out of arch/x86/kernel/cpu/mtrr Juergen Gross
2022-08-20 9:25 ` [PATCH v2 05/10] x86/mtrr: split generic_set_all() Juergen Gross
2022-08-20 9:25 ` Juergen Gross [this message]
2022-08-20 9:25 ` [PATCH v2 07/10] x86/mtrr: simplify mtrr_bp_init() Juergen Gross
2022-08-20 9:25 ` [PATCH v2 08/10] x86/mtrr: let cache_aps_delayed_init replace mtrr_aps_delayed_init Juergen Gross
2022-08-20 9:25 ` [PATCH v2 09/10] x86/mtrr: add a stop_machine() handler calling only cache_cpu_init() Juergen Gross
2022-08-20 9:25 ` [PATCH v2 10/10] x86: decouple pat and mtrr handling Juergen Gross
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=20220820092533.29420-7-jgross@suse.com \
--to=jgross@suse.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.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).