From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
To: x86@kernel.org
Cc: Andreas Herrmann <aherrmann@suse.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Chen Yu <yu.c.chen@intel.com>, Len Brown <len.brown@intel.com>,
Radu Rendec <rrendec@redhat.com>,
Pierre Gondois <Pierre.Gondois@arm.com>, Pu Wen <puwen@hygon.cn>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Sudeep Holla <sudeep.holla@arm.com>,
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
Will Deacon <will@kernel.org>, Zhang Rui <rui.zhang@intel.com>,
Huang Ying <ying.huang@intel.com>,
"Ravi V. Shankar" <ravi.v.shankar@intel.com>,
stable@vger.kernel.org, linux-kernel@vger.kernel.org,
Ricardo Neri <ricardo.neri-calderon@linux.intel.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 4/4] x86/cacheinfo: Clean out init_cache_level()
Date: Tue, 12 Dec 2023 14:25:19 -0800 [thread overview]
Message-ID: <20231212222519.12834-5-ricardo.neri-calderon@linux.intel.com> (raw)
In-Reply-To: <20231212222519.12834-1-ricardo.neri-calderon@linux.intel.com>
init_cache_level() no longer has a purpose on x86. It no longer needs to
set num_leaves, and it never had to set num_levels, which was unnecessary
on x86.
Replace it with "return 0" simply to override the weak function, which
would return an error.
Cc: Andreas Herrmann <aherrmann@suse.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chen Yu <yu.c.chen@intel.com>
CC: Huang Ying <ying.huang@intel.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Radu Rendec <rrendec@redhat.com>
Cc: Pierre Gondois <Pierre.Gondois@arm.com>
Cc: Pu Wen <puwen@hygon.cn>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Sudeep Holla <sudeep.holla@arm.com>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: Will Deacon <will@kernel.org>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: stable@vger.kernel.org
Reviewed-by: Len Brown <len.brown@intel.com>
Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
---
Changes since v3:
* Rebased on v6.7-rc5.
Changes since v2:
* None
Changes since v1:
* Introduced this patch.
---
arch/x86/kernel/cpu/cacheinfo.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/x86/kernel/cpu/cacheinfo.c b/arch/x86/kernel/cpu/cacheinfo.c
index 4125e53a5ef7..1cfe0921ac67 100644
--- a/arch/x86/kernel/cpu/cacheinfo.c
+++ b/arch/x86/kernel/cpu/cacheinfo.c
@@ -1002,11 +1002,6 @@ static void ci_leaf_init(struct cacheinfo *this_leaf,
int init_cache_level(unsigned int cpu)
{
- struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
-
- if (!this_cpu_ci)
- return -EINVAL;
- this_cpu_ci->num_levels = 3;
return 0;
}
--
2.25.1
next prev parent reply other threads:[~2023-12-12 22:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-12 22:25 [PATCH v4 0/4] x86/cacheinfo: Set the number of leaves per CPU Ricardo Neri
2023-12-12 22:25 ` [PATCH v4 1/4] cacheinfo: Check for null last-level cache info Ricardo Neri
2024-01-25 11:15 ` Sudeep Holla
2024-01-25 14:35 ` Ricardo Neri
2023-12-12 22:25 ` [PATCH v4 2/4] cacheinfo: Allocate memory for memory if not done from the primary CPU Ricardo Neri
2023-12-12 22:25 ` [PATCH v4 3/4] x86/cacheinfo: Delete global num_cache_leaves Ricardo Neri
2023-12-12 22:25 ` Ricardo Neri [this message]
2024-01-25 2:56 ` [PATCH v4 0/4] x86/cacheinfo: Set the number of leaves per CPU Ricardo Neri
2024-01-25 11:17 ` Sudeep Holla
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=20231212222519.12834-5-ricardo.neri-calderon@linux.intel.com \
--to=ricardo.neri-calderon@linux.intel.com \
--cc=Pierre.Gondois@arm.com \
--cc=aherrmann@suse.com \
--cc=catalin.marinas@arm.com \
--cc=len.brown@intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=puwen@hygon.cn \
--cc=rafael.j.wysocki@intel.com \
--cc=ravi.v.shankar@intel.com \
--cc=rrendec@redhat.com \
--cc=rui.zhang@intel.com \
--cc=srinivas.pandruvada@linux.intel.com \
--cc=stable@vger.kernel.org \
--cc=sudeep.holla@arm.com \
--cc=will@kernel.org \
--cc=x86@kernel.org \
--cc=ying.huang@intel.com \
--cc=yu.c.chen@intel.com \
/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
all inboxes | Powered by JetHome®