2024-03-07 18:08:18

by Andreas Larsson

Subject: [PATCH] lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console

Allow FONT_SUN8x16 when EARLYFB is enabled for sparc64, even when
FRAMEBUFFER_CONSOLE is not to avoid the following warning for this case

WARNING: unmet direct dependencies detected for FONT_SUN8x16
Depends on [n]: FONT_SUPPORT [=y] && (FRAMEBUFFER_CONSOLE [=n] && (FONTS [=n] || SPARC [=y]) || BOOTX_TEXT)
Selected by [y]:
- EARLYFB [=y] && SPARC64 [=y]

by allowing it in the same manner as is done for powerpc in commit
0ebc7feae79a ("powerpc: Use shared font data").

Signed-off-by: Andreas Larsson <[email protected]>
Fixes: 0f1991949d9b ("sparc: Use shared font data")
Reported-by: kernel test robot <[email protected]>
Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
Cc: "Dr. David Alan Gilbert" <[email protected]>
Cc: Michael Ellerman <[email protected]>
Cc: Sam Ravnborg <[email protected]>
Cc: Randy Dunlap <[email protected]>
Cc: "David S. Miller" <[email protected]>
---
The commit this fixes can be found on my for-next branch from
https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git/
---
lib/fonts/Kconfig | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/fonts/Kconfig b/lib/fonts/Kconfig
index 7ee468ef21ec6..7e945fdcbf115 100644
--- a/lib/fonts/Kconfig
+++ b/lib/fonts/Kconfig
@@ -98,7 +98,8 @@ config FONT_10x18

config FONT_SUN8x16
bool "Sparc console 8x16 font"
- depends on (FRAMEBUFFER_CONSOLE && (FONTS || SPARC)) || BOOTX_TEXT
+ depends on (FRAMEBUFFER_CONSOLE && (FONTS || SPARC)) || \
+ BOOTX_TEXT || EARLYFB
help
This is the high resolution console font for Sun machines. Say Y.


base-commit: 626db6ee8ee1edac206610db407114aa83b53fd3
--
2.34.1

2024-03-07 19:16:14

by Dr. David Alan Gilbert

Subject: Re: [PATCH] lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console

* Andreas Larsson ([email protected]) wrote:
> Allow FONT_SUN8x16 when EARLYFB is enabled for sparc64, even when
> FRAMEBUFFER_CONSOLE is not to avoid the following warning for this case
>
> WARNING: unmet direct dependencies detected for FONT_SUN8x16
> Depends on [n]: FONT_SUPPORT [=y] && (FRAMEBUFFER_CONSOLE [=n] && (FONTS [=n] || SPARC [=y]) || BOOTX_TEXT)
> Selected by [y]:
> - EARLYFB [=y] && SPARC64 [=y]
>
> by allowing it in the same manner as is done for powerpc in commit
> 0ebc7feae79a ("powerpc: Use shared font data").

Yeh that looks like it should do it; I was hoping there was a way to make
that line simpler, but hey, thanks for fixing it.

Reviewed-by: Dr. David Alan Gilbert <[email protected]>

> Signed-off-by: Andreas Larsson <[email protected]>
> Fixes: 0f1991949d9b ("sparc: Use shared font data")
> Reported-by: kernel test robot <[email protected]>
> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
> Cc: "Dr. David Alan Gilbert" <[email protected]>
> Cc: Michael Ellerman <[email protected]>
> Cc: Sam Ravnborg <[email protected]>
> Cc: Randy Dunlap <[email protected]>
> Cc: "David S. Miller" <[email protected]>
> ---
> The commit this fixes can be found on my for-next branch from
> https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git/
> ---
> lib/fonts/Kconfig | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/lib/fonts/Kconfig b/lib/fonts/Kconfig
> index 7ee468ef21ec6..7e945fdcbf115 100644
> --- a/lib/fonts/Kconfig
> +++ b/lib/fonts/Kconfig
> @@ -98,7 +98,8 @@ config FONT_10x18
>
> config FONT_SUN8x16
> bool "Sparc console 8x16 font"
> - depends on (FRAMEBUFFER_CONSOLE && (FONTS || SPARC)) || BOOTX_TEXT
> + depends on (FRAMEBUFFER_CONSOLE && (FONTS || SPARC)) || \
> + BOOTX_TEXT || EARLYFB
> help
> This is the high resolution console font for Sun machines. Say Y.
>
>
> base-commit: 626db6ee8ee1edac206610db407114aa83b53fd3
> --
> 2.34.1
>
--
-----Open up your eyes, open up your mind, open up your code -------
/ Dr. David Alan Gilbert | Running GNU/Linux | Happy \
\ dave @ treblig.org | | In Hex /
\ _________________________|_____ http://www.treblig.org |_______/

2024-03-08 20:11:16

by Andreas Larsson

Subject: Re: [PATCH] lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console

On 2024-03-07 19:07, Andreas Larsson wrote:
> Allow FONT_SUN8x16 when EARLYFB is enabled for sparc64, even when
> FRAMEBUFFER_CONSOLE is not to avoid the following warning for this case
>
> WARNING: unmet direct dependencies detected for FONT_SUN8x16
> Depends on [n]: FONT_SUPPORT [=y] && (FRAMEBUFFER_CONSOLE [=n] && (FONTS [=n] || SPARC [=y]) || BOOTX_TEXT)
> Selected by [y]:
> - EARLYFB [=y] && SPARC64 [=y]
>
> by allowing it in the same manner as is done for powerpc in commit
> 0ebc7feae79a ("powerpc: Use shared font data").
>
> Signed-off-by: Andreas Larsson <[email protected]>
> Fixes: 0f1991949d9b ("sparc: Use shared font data")
> Reported-by: kernel test robot <[email protected]>
> Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
> Cc: "Dr. David Alan Gilbert" <[email protected]>
> Cc: Michael Ellerman <[email protected]>
> Cc: Sam Ravnborg <[email protected]>
> Cc: Randy Dunlap <[email protected]>
> Cc: "David S. Miller" <[email protected]>

Picking this up to my for-next.

Cheers,
Andreas