From: James Morse <james.morse@arm.com>
To: x86@kernel.org, linux-kernel@vger.kernel.org
Cc: Fenghua Yu <fenghua.yu@intel.com>,
Reinette Chatre <reinette.chatre@intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
H Peter Anvin <hpa@zytor.com>, Babu Moger <Babu.Moger@amd.com>,
James Morse <james.morse@arm.com>
Subject: [PATCH v5 02/10] x86/resctrl: Remove max_delay
Date: Wed, 8 Jul 2020 16:39:21 +0000 [thread overview]
Message-ID: <20200708163929.2783-3-james.morse@arm.com> (raw)
In-Reply-To: <20200708163929.2783-1-james.morse@arm.com>
max_delay is used by x86's __get_mem_config_intel() as a local variable.
Remove it, replacing it with a local variable.
Signed-off-by: James Morse <james.morse@arm.com>
Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
---
arch/x86/kernel/cpu/resctrl/core.c | 8 ++++----
arch/x86/kernel/cpu/resctrl/internal.h | 3 ---
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c
index 12f967c6b603..e1fed3928b59 100644
--- a/arch/x86/kernel/cpu/resctrl/core.c
+++ b/arch/x86/kernel/cpu/resctrl/core.c
@@ -254,16 +254,16 @@ static bool __get_mem_config_intel(struct rdt_resource *r)
{
union cpuid_0x10_3_eax eax;
union cpuid_0x10_x_edx edx;
- u32 ebx, ecx;
+ u32 ebx, ecx, max_delay;
cpuid_count(0x00000010, 3, &eax.full, &ebx, &ecx, &edx.full);
r->num_closid = edx.split.cos_max + 1;
- r->membw.max_delay = eax.split.max_delay + 1;
+ max_delay = eax.split.max_delay + 1;
r->default_ctrl = MAX_MBA_BW;
if (ecx & MBA_IS_LINEAR) {
r->membw.delay_linear = true;
- r->membw.min_bw = MAX_MBA_BW - r->membw.max_delay;
- r->membw.bw_gran = MAX_MBA_BW - r->membw.max_delay;
+ r->membw.min_bw = MAX_MBA_BW - max_delay;
+ r->membw.bw_gran = MAX_MBA_BW - max_delay;
} else {
if (!rdt_get_mb_table(r))
return false;
diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
index 1bb81cbdad5f..dd51e23e346b 100644
--- a/arch/x86/kernel/cpu/resctrl/internal.h
+++ b/arch/x86/kernel/cpu/resctrl/internal.h
@@ -368,8 +368,6 @@ struct rdt_cache {
/**
* struct rdt_membw - Memory bandwidth allocation related data
- * @max_delay: Max throttle delay. Delay is the hardware
- * representation for memory bandwidth.
* @min_bw: Minimum memory bandwidth percentage user can request
* @bw_gran: Granularity at which the memory bandwidth is allocated
* @delay_linear: True if memory B/W delay is in linear scale
@@ -377,7 +375,6 @@ struct rdt_cache {
* @mb_map: Mapping of memory B/W percentage to memory B/W delay
*/
struct rdt_membw {
- u32 max_delay;
u32 min_bw;
u32 bw_gran;
u32 delay_linear;
--
2.20.1
next prev parent reply other threads:[~2020-07-08 16:40 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-08 16:39 [PATCH v5 00/10] x86/resctrl: Misc cleanup James Morse
2020-07-08 16:39 ` [PATCH v5 01/10] x86/resctrl: Nothing uses struct mbm_state chunks_bw James Morse
2020-08-19 12:33 ` [tip: x86/cache] x86/resctrl: Remove unused struct mbm_state::chunks_bw tip-bot2 for James Morse
2020-07-08 16:39 ` James Morse [this message]
2020-08-19 12:33 ` [tip: x86/cache] x86/resctrl: Remove struct rdt_membw::max_delay tip-bot2 for James Morse
2020-07-08 16:39 ` [PATCH v5 03/10] x86/resctrl: Fix stale comment James Morse
2020-08-19 12:33 ` [tip: x86/cache] " tip-bot2 for James Morse
2020-07-08 16:39 ` [PATCH v5 04/10] x86/resctrl: use container_of() in delayed_work handlers James Morse
2020-08-19 12:33 ` [tip: x86/cache] x86/resctrl: Use " tip-bot2 for James Morse
2020-07-08 16:39 ` [PATCH v5 05/10] x86/resctrl: Include pid.h James Morse
2020-08-19 12:33 ` [tip: x86/cache] " tip-bot2 for James Morse
2020-07-08 16:39 ` [PATCH v5 06/10] x86/resctrl: Use is_closid_match() in more places James Morse
2020-08-19 12:33 ` [tip: x86/cache] " tip-bot2 for James Morse
2020-07-08 16:39 ` [PATCH v5 07/10] x86/resctrl: Add arch_needs_linear to explain AMD/Intel MBA difference James Morse
2020-08-19 12:33 ` [tip: x86/cache] x86/resctrl: Add struct rdt_membw::arch_needs_linear " tip-bot2 for James Morse
2020-07-08 16:39 ` [PATCH v5 08/10] x86/resctrl: Merge AMD/Intel parse_bw() calls James Morse
2020-08-19 12:33 ` [tip: x86/cache] " tip-bot2 for James Morse
2020-07-08 16:39 ` [PATCH v5 09/10] x86/resctrl: Add arch_has_{sparse,empty}_bitmaps to explain CAT differences James Morse
2020-08-19 12:33 ` [tip: x86/cache] x86/resctrl: Add struct rdt_cache::arch_has_{sparse, empty}_bitmaps tip-bot2 for James Morse
2020-07-08 16:39 ` [PATCH v5 10/10] cacheinfo: Move resctrl's get_cache_id() to the cacheinfo header file James Morse
2020-08-19 12:33 ` [tip: x86/cache] " tip-bot2 for James Morse
2020-07-23 18:31 ` [PATCH v5 00/10] x86/resctrl: Misc cleanup James Morse
2020-07-23 20:31 ` Reinette Chatre
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=20200708163929.2783-3-james.morse@arm.com \
--to=james.morse@arm.com \
--cc=Babu.Moger@amd.com \
--cc=bp@alien8.de \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=reinette.chatre@intel.com \
--cc=tglx@linutronix.de \
--cc=x86@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).