Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
Date:   Wed, 18 May 2022 09:09:52 +0200
From:   Greg KH <gregkh@linuxfoundation.org>
To:     Kohei Tarumizu <tarumizu.kohei@fujitsu.com>
Cc:     catalin.marinas@arm.com, will@kernel.org, tglx@linutronix.de,
        mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com,
        x86@kernel.org, hpa@zytor.com, rafael@kernel.org,
        mchehab+huawei@kernel.org, eugenis@google.com, tony.luck@intel.com,
        pcc@google.com, peterz@infradead.org, marcos@orca.pet,
        conor.dooley@microchip.com, nicolas.ferre@microchip.com,
        marcan@marcan.st, linus.walleij@linaro.org, arnd@arndb.de,
        linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v4 5/8] arm64: Create cache sysfs directory without ACPI
 PPTT for hardware prefetch control
Message-ID: <YoSbwJIDoXz5Aipv@kroah.com>
References: <20220518063032.2377351-1-tarumizu.kohei@fujitsu.com>
 <20220518063032.2377351-6-tarumizu.kohei@fujitsu.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220518063032.2377351-6-tarumizu.kohei@fujitsu.com>
Precedence: bulk

On Wed, May 18, 2022 at 03:30:29PM +0900, Kohei Tarumizu wrote:
> Create a cache sysfs directory without ACPI PPTT if the
> CONFIG_HWPF_CONTROL is true.
> 
> Hardware prefetch control driver need cache sysfs directory and cache
> level/type information. In ARM processor, these information can be
> obtained from the register even without PPTT.
> 
> This patch set the cpu_map_populated to true if the machine doesn't
> have PPTT. It use only the level/type information obtained from
> CLIDR_EL1, and don't use CCSIDR information.
> 
> Signed-off-by: Kohei Tarumizu <tarumizu.kohei@fujitsu.com>
> ---
>  arch/arm64/kernel/cacheinfo.c | 29 +++++++++++++++++++++++++++++
>  1 file changed, 29 insertions(+)
> 
> diff --git a/arch/arm64/kernel/cacheinfo.c b/arch/arm64/kernel/cacheinfo.c
> index 587543c6c51c..039ec32d0b3d 100644
> --- a/arch/arm64/kernel/cacheinfo.c
> +++ b/arch/arm64/kernel/cacheinfo.c
> @@ -43,6 +43,21 @@ static void ci_leaf_init(struct cacheinfo *this_leaf,
>  	this_leaf->type = type;
>  }
>  
> +#if defined(CONFIG_HWPF_CONTROL)

Please do not put #if in .c files.

> +static bool acpi_has_pptt(void)
> +{
> +	struct acpi_table_header *table;
> +	acpi_status status;
> +
> +	status = acpi_get_table(ACPI_SIG_PPTT, 0, &table);
> +	if (ACPI_FAILURE(status))
> +		return false;
> +
> +	acpi_put_table(table);
> +	return true;
> +}
> +#endif
> +
>  int init_cache_level(unsigned int cpu)
>  {
>  	unsigned int ctype, level, leaves, fw_level;
> @@ -95,5 +110,19 @@ int populate_cache_leaves(unsigned int cpu)
>  			ci_leaf_init(this_leaf++, type, level);
>  		}
>  	}
> +
> +#if defined(CONFIG_HWPF_CONTROL)
> +	/*
> +	 * Hardware prefetch functions need cache sysfs directory and cache
> +	 * level/type information. In ARM processor, these information can be
> +	 * obtained from registers even without PPTT. Therefore, we set the
> +	 * cpu_map_populated to true to create cache sysfs directory, if the
> +	 * machine doesn't have PPTT.
> +	 **/
> +	if (!acpi_disabled)
> +		if (!acpi_has_pptt())
> +			this_cpu_ci->cpu_map_populated = true;
> +#endif

Same here, no #if is needed if you do it properly in your .h file.

thanks,

greg k-h