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.

Reviewed-by: Len Brown <len.brown@intel.com>
Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
---
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: Nikolay Borisov <nik.borisov@suse.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 # 6.3+
---
Changes since v4:
 * None

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 b5e216677a46..d7375328bc1f 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.34.1

On Mon, Aug 26, 2024 at 10:16:35PM -0700, Ricardo Neri wrote:
> 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.
> 
> Reviewed-by: Len Brown <len.brown@intel.com>
> Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>

Reviewed-by: Andreas Herrmann <aherrmann@suse.de>
Tested-by: Andreas Herrmann <aherrmann@suse.de>

Test was done with a system equipped with AMD Phenom II X6 1055T and
test kernels based on v6.11-rc5-176-g20371ba12063.


Thanks,
Andreas

On Sun, Sep 01, 2024 at 08:09:13PM +0200, Andreas Herrmann wrote:
> On Mon, Aug 26, 2024 at 10:16:35PM -0700, Ricardo Neri wrote:
> > 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.
> > 
> > Reviewed-by: Len Brown <len.brown@intel.com>
> > Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
> 
> Reviewed-by: Andreas Herrmann <aherrmann@suse.de>
> Tested-by: Andreas Herrmann <aherrmann@suse.de>
> 
> Test was done with a system equipped with AMD Phenom II X6 1055T and
> test kernels based on v6.11-rc5-176-g20371ba12063.

FYI, the test consisted of booting the mainline kernel w/o and w/ your
patches, checking for potential new errors/warnings in kernel log and
checking for changes or incosistencies in information of cache
characteristics as reported in sysfs, and by some tools (lscpu,
lstopo, x86info) -- e.g. x86info does not use sysfs to gather cache
information for CPUs.


Regards,
Andreas

On Mon, Sep 02, 2024 at 09:41:40AM +0200, Andreas Herrmann wrote:
> On Sun, Sep 01, 2024 at 08:09:13PM +0200, Andreas Herrmann wrote:
> > On Mon, Aug 26, 2024 at 10:16:35PM -0700, Ricardo Neri wrote:
> > > 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.
> > > 
> > > Reviewed-by: Len Brown <len.brown@intel.com>
> > > Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
> > 
> > Reviewed-by: Andreas Herrmann <aherrmann@suse.de>
> > Tested-by: Andreas Herrmann <aherrmann@suse.de>
> > 
> > Test was done with a system equipped with AMD Phenom II X6 1055T and
> > test kernels based on v6.11-rc5-176-g20371ba12063.
> 
> FYI, the test consisted of booting the mainline kernel w/o and w/ your
> patches, checking for potential new errors/warnings in kernel log and
> checking for changes or incosistencies in information of cache
> characteristics as reported in sysfs, and by some tools (lscpu,
> lstopo, x86info) -- e.g. x86info does not use sysfs to gather cache
> information for CPUs.

Thank you very much for you review and testing!

I will post a new version with the feedback from Nikolay and Sudeep and
your tags.

BR,
Ricardo

On 27.08.24 г. 8:16 ч., Ricardo Neri wrote:
> 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.
> 
> Reviewed-by: Len Brown <len.brown@intel.com>
> Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>

Reviewed-by: Nikolay Borisov <nik.borisov@suse.com>

<snip>

On Wed, Aug 28, 2024 at 05:01:38PM +0300, Nikolay Borisov wrote:
> 
> 
> On 27.08.24 г. 8:16 ч., Ricardo Neri wrote:
> > 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.
> > 
> > Reviewed-by: Len Brown <len.brown@intel.com>
> > Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
> 
> Reviewed-by: Nikolay Borisov <nik.borisov@suse.com>

Thank you!