Received-SPF: pass (google.com: domain of linux-kernel+bounces-143083-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Fri, 12 Apr 2024 17:27:23 +0100
From: Sudeep Holla <sudeep.holla@arm.com>
To: yunhui cui <cuiyunhui@bytedance.com>
Cc: Jeremy Linton <jeremy.linton@arm.com>, rafael@kernel.org,
	lenb@kernel.org, linux-acpi@vger.kernel.org,
	linux-kernel@vger.kernel.org, paul.walmsley@sifive.com,
	palmer@dabbelt.com, aou@eecs.berkeley.edu,
	linux-riscv@lists.infradead.org
Subject: Re: [External] Re: [PATCH 1/2] ACPI: PPTT: Populate cacheinfo
 entirely with PPTT
Message-ID: <Zhlg67dbl_S1GD0u@bogus>
References: <20240407123829.36474-1-cuiyunhui@bytedance.com>
 <abd135fa-c432-4e37-9792-07a0e17e93d5@arm.com>
 <CAEEQ3w=+C2J0ZS227-1P-B+pe_NRp_3i4c4CxGssiKqbpXx_qw@mail.gmail.com>
 <2cde00c8-7878-45c0-8621-fca4e70c75e7@arm.com>
 <ZhlcYRolZwm7UwJu@bogus>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ZhlcYRolZwm7UwJu@bogus>

On Fri, Apr 12, 2024 at 05:08:01PM +0100, Sudeep Holla wrote:
> diff --git i/arch/riscv/kernel/cacheinfo.c w/arch/riscv/kernel/cacheinfo.c
> index 09e9b88110d1..92ab73ed5234 100644
> --- i/arch/riscv/kernel/cacheinfo.c
> +++ w/arch/riscv/kernel/cacheinfo.c
> @@ -79,6 +79,27 @@ int populate_cache_leaves(unsigned int cpu)
>         struct device_node *prev = NULL;
>         int levels = 1, level = 1;
> 
> +       if (!acpi_disabled) {
> +               int ret, fw_levels, split_levels;
> +
> +               ret = acpi_get_cache_info(cpu, &fw_levels, &split_levels);
> +               if (ret)
> +                       return ret;
> +
> +               /* must be set, so we can drop num_leaves assignment below */
> +               this_cpu_ci->num_leaves = fw_levels + split_levels;
> +
> +               for (idx = 0; level <= this_cpu_ci->num_levels &&
> +                    idx < this_cpu_ci->num_leaves; idx++, level++) {
> +                       if (level <= split_levels) {
> +                               ci_leaf_init(this_leaf++, CACHE_TYPE_DATA, level);
> +                               ci_leaf_init(this_leaf++, CACHE_TYPE_INST, level);
> +                       } else {
> +                               ci_leaf_init(this_leaf++, CACHE_TYPE_UNIFIED, level);
> +                       }
> +               }

Ofcourse we need to add here,
		return 0;

> +       }
> +
>         if (of_property_read_bool(np, "cache-size"))
>                 ci_leaf_init(this_leaf++, np, CACHE_TYPE_UNIFIED, level);
>         if (of_property_read_bool(np, "i-cache-size"))
> 

-- 
Regards,
Sudeep