* [PATCH] mips: fix r3k_cache_init build regression
@ 2023-12-14 20:54 Arnd Bergmann
2023-12-14 21:50 ` Andrew Morton
2023-12-26 8:24 ` Philippe Mathieu-Daudé
0 siblings, 2 replies; 3+ messages in thread
From: Arnd Bergmann @ 2023-12-14 20:54 UTC (permalink / raw)
To: Andrew Morton
Cc: Arnd Bergmann, kernelci . org bot, Thomas Bogendoerfer, Zi Yan,
Jiaxun Yang, linux-mips, linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
My earlier patch removed __weak function declarations that used to
be turned into wild branches by the linker, instead causing
a link failure when the called functions are unavailable:
mips-linux-ld: arch/mips/mm/cache.o: in function `cpu_cache_init':
cache.c:(.text+0x670): undefined reference to `r3k_cache_init'
The __weak method seems suboptimal, so rather than putting that
back, make the function calls conditional on the Kconfig symbol
that controls the compilation.
Reported-by: kernelci.org bot <bot@kernelci.org>
Fixes: 66445677f01e ("mips: move cache declarations into header")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
My broken patch is currently in linux-mm, so the fix should
be applied on top.
---
arch/mips/mm/cache.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
index e5d19f4a38ba..b7ce73fba998 100644
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -205,14 +205,14 @@ static inline void setup_protection_map(void)
void cpu_cache_init(void)
{
- if (cpu_has_3k_cache) {
+ if (IS_ENABLED(CONFIG_CPU_R3000) && cpu_has_3k_cache) {
r3k_cache_init();
}
- if (cpu_has_4k_cache) {
+ if (IS_ENABLED(CONFIG_CPU_R4K_CACHE_TLB) && cpu_has_4k_cache) {
r4k_cache_init();
}
- if (cpu_has_octeon_cache) {
+ if (IS_ENABLED(CONFIG_CPU_CAVIUM_OCTEON) && cpu_has_octeon_cache) {
octeon_cache_init();
}
--
2.39.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] mips: fix r3k_cache_init build regression
2023-12-14 20:54 [PATCH] mips: fix r3k_cache_init build regression Arnd Bergmann
@ 2023-12-14 21:50 ` Andrew Morton
2023-12-26 8:24 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Andrew Morton @ 2023-12-14 21:50 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Arnd Bergmann, kernelci . org bot, Thomas Bogendoerfer, Zi Yan,
Jiaxun Yang, linux-mips, linux-kernel
On Thu, 14 Dec 2023 20:54:47 +0000 Arnd Bergmann <arnd@kernel.org> wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> My earlier patch removed __weak function declarations that used to
> be turned into wild branches by the linker, instead causing
> a link failure when the called functions are unavailable:
>
> mips-linux-ld: arch/mips/mm/cache.o: in function `cpu_cache_init':
> cache.c:(.text+0x670): undefined reference to `r3k_cache_init'
>
> The __weak method seems suboptimal, so rather than putting that
> back, make the function calls conditional on the Kconfig symbol
> that controls the compilation.
Cool, thanks.
> Reported-by: kernelci.org bot <bot@kernelci.org>
Please don't forget the Closes: - they're sometimes handy.
> Fixes: 66445677f01e ("mips: move cache declarations into header")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> My broken patch is currently in linux-mm, so the fix should
> be applied on top.
The mm-nonmm-stable branch of mm.git. So I'll queue this separately
and we'll have a minor bisection hole. <git rant elided>
> --- a/arch/mips/mm/cache.c
> +++ b/arch/mips/mm/cache.c
> @@ -205,14 +205,14 @@ static inline void setup_protection_map(void)
>
> void cpu_cache_init(void)
> {
> - if (cpu_has_3k_cache) {
> + if (IS_ENABLED(CONFIG_CPU_R3000) && cpu_has_3k_cache) {
> r3k_cache_init();
> }
> - if (cpu_has_4k_cache) {
> + if (IS_ENABLED(CONFIG_CPU_R4K_CACHE_TLB) && cpu_has_4k_cache) {
> r4k_cache_init();
> }
>
> - if (cpu_has_octeon_cache) {
> + if (IS_ENABLED(CONFIG_CPU_CAVIUM_OCTEON) && cpu_has_octeon_cache) {
> octeon_cache_init();
> }
I just can't help myself.
--- a/arch/mips/mm/cache.c~mips-fix-r3k_cache_init-build-regression-fix
+++ a/arch/mips/mm/cache.c
@@ -205,16 +205,13 @@ static inline void setup_protection_map(
void cpu_cache_init(void)
{
- if (IS_ENABLED(CONFIG_CPU_R3000) && cpu_has_3k_cache) {
+ if (IS_ENABLED(CONFIG_CPU_R3000) && cpu_has_3k_cache)
r3k_cache_init();
- }
- if (IS_ENABLED(CONFIG_CPU_R4K_CACHE_TLB) && cpu_has_4k_cache) {
+ if (IS_ENABLED(CONFIG_CPU_R4K_CACHE_TLB) && cpu_has_4k_cache)
r4k_cache_init();
- }
- if (IS_ENABLED(CONFIG_CPU_CAVIUM_OCTEON) && cpu_has_octeon_cache) {
+ if (IS_ENABLED(CONFIG_CPU_CAVIUM_OCTEON) && cpu_has_octeon_cache)
octeon_cache_init();
- }
setup_protection_map();
}
The rest of the file doesn't do the over-bracing, so there.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] mips: fix r3k_cache_init build regression
2023-12-14 20:54 [PATCH] mips: fix r3k_cache_init build regression Arnd Bergmann
2023-12-14 21:50 ` Andrew Morton
@ 2023-12-26 8:24 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-12-26 8:24 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Arnd Bergmann, Andrew Morton, kernelci . org bot,
Thomas Bogendoerfer, Zi Yan, Jiaxun Yang, linux-mips,
linux-kernel
Hi Arnd,
On 14/12/23 21:54, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> My earlier patch removed __weak function declarations that used to
> be turned into wild branches by the linker, instead causing
> a link failure when the called functions are unavailable:
>
> mips-linux-ld: arch/mips/mm/cache.o: in function `cpu_cache_init':
> cache.c:(.text+0x670): undefined reference to `r3k_cache_init'
>
> The __weak method seems suboptimal, so rather than putting that
> back, make the function calls conditional on the Kconfig symbol
> that controls the compilation.
>
> Reported-by: kernelci.org bot <bot@kernelci.org>
> Fixes: 66445677f01e ("mips: move cache declarations into header")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> My broken patch is currently in linux-mm, so the fix should
> be applied on top.
> ---
> arch/mips/mm/cache.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
> index e5d19f4a38ba..b7ce73fba998 100644
> --- a/arch/mips/mm/cache.c
> +++ b/arch/mips/mm/cache.c
> @@ -205,14 +205,14 @@ static inline void setup_protection_map(void)
>
> void cpu_cache_init(void)
> {
> - if (cpu_has_3k_cache) {
> + if (IS_ENABLED(CONFIG_CPU_R3000) && cpu_has_3k_cache) {
> r3k_cache_init();
> }
> - if (cpu_has_4k_cache) {
> + if (IS_ENABLED(CONFIG_CPU_R4K_CACHE_TLB) && cpu_has_4k_cache) {
Shouldn't we also check for CONFIG_CPU_SB1 enabled?
(See commit 641e97f31887 "Replace SB1 cachecode with standard
R4000 class cache code.")
With that:
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> r4k_cache_init();
> }
>
> - if (cpu_has_octeon_cache) {
> + if (IS_ENABLED(CONFIG_CPU_CAVIUM_OCTEON) && cpu_has_octeon_cache) {
> octeon_cache_init();
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-12-26 8:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-14 20:54 [PATCH] mips: fix r3k_cache_init build regression Arnd Bergmann
2023-12-14 21:50 ` Andrew Morton
2023-12-26 8:24 ` Philippe Mathieu-Daudé
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).