From patchwork Thu Mar 7 18:07:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Larsson X-Patchwork-Id: 1909424 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gaisler.com header.i=@gaisler.com header.a=rsa-sha256 header.s=unoeuro header.b=g5UATij/; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=ozlabs.org (client-ip=2404:9400:2221:ea00::3; helo=gandalf.ozlabs.org; envelope-from=srs0=ifpi=kn=vger.kernel.org=sparclinux+bounces-580-patchwork-incoming=ozlabs.org@ozlabs.org; receiver=patchwork.ozlabs.org) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TrHNN0YhLz1yX4 for ; Fri, 8 Mar 2024 05:08:19 +1100 (AEDT) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4TrHNM4kfNz4wc8 for ; Fri, 8 Mar 2024 05:08:19 +1100 (AEDT) Received: by gandalf.ozlabs.org (Postfix) id 4TrHNM4Qp8z4wxX; Fri, 8 Mar 2024 05:08:19 +1100 (AEDT) Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: gandalf.ozlabs.org; dmarc=pass (p=reject dis=none) header.from=gaisler.com Authentication-Results: gandalf.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gaisler.com header.i=@gaisler.com header.a=rsa-sha256 header.s=unoeuro header.b=g5UATij/; dkim-atps=neutral Authentication-Results: gandalf.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:4601:e00::3; helo=am.mirrors.kernel.org; envelope-from=sparclinux+bounces-580-patchwork-incoming=ozlabs.org@vger.kernel.org; receiver=ozlabs.org) Received: from am.mirrors.kernel.org (am.mirrors.kernel.org [IPv6:2604:1380:4601:e00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by gandalf.ozlabs.org (Postfix) with ESMTPS id 4TrHNL6tSxz4wc8 for ; Fri, 8 Mar 2024 05:08:18 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 4D2471F2292E for ; Thu, 7 Mar 2024 18:08:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 267A31DA27; Thu, 7 Mar 2024 18:08:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=gaisler.com header.i=@gaisler.com header.b="g5UATij/" X-Original-To: sparclinux@vger.kernel.org Received: from smtp-out3.simply.com (smtp-out3.simply.com [94.231.106.210]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE73612A15C; Thu, 7 Mar 2024 18:08:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=94.231.106.210 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709834891; cv=none; b=A2mAa7tzDPN5XETGXo2Lpe1AWOlQge9zzd3+dNd84VSzcTAgKSMOUrJfwyCxxqH+rbttiJVcxBJXJhXkzb9pPShb5XS2+ybVAuKTbrQuWFFOw77SdcoQxuZ1egAUEFSjQdFdxI0XpuEj3MpnK0NPe1h0Z5oGxX9mTIZPrrbl+VM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709834891; c=relaxed/simple; bh=d1LqTxtfR2Y90CoQGt9aHXtXMhcXtM4r5fGeKndr/Q4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=d5B/bihb+e8o/fNQIPc3ce1mcdg+QYqPhB7q5q0DpRIZSEexuxIdpZJNpCWuOiT4Z237sM8TRchk4LlTCAZHOyE6cshYti9vxRkf4M2BofEpd8WPHMs+BfCJSnrfXPrLXy/Jjcl3CVuvCJ9O4XPtrB8vrsk56yMqQdGfpxrmoF4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=gaisler.com; spf=pass smtp.mailfrom=gaisler.com; dkim=pass (1024-bit key) header.d=gaisler.com header.i=@gaisler.com header.b=g5UATij/; arc=none smtp.client-ip=94.231.106.210 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=gaisler.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gaisler.com Received: from localhost (localhost [127.0.0.1]) by smtp.simply.com (Simply.com) with ESMTP id 4TrHMx4CLYz687C; Thu, 7 Mar 2024 19:07:57 +0100 (CET) Received: from andreas.got.gaisler.com (h-98-128-223-123.NA.cust.bahnhof.se [98.128.223.123]) by smtp.simply.com (Simply.com) with ESMTPA id 4TrHMp2C7yz686Q; Thu, 7 Mar 2024 19:07:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gaisler.com; s=unoeuro; t=1709834877; bh=hf+Dkq4gendnDFhQL2nsuHPuMRlOr7oIlpwqpMC5s6o=; h=From:To:Cc:Subject:Date; b=g5UATij/BDx1CIuzLzDq2RrfiizCrNNT311KY+fBDxK7k1xUwCpSd1AT8ey0Tc8BG KuEnNe48tkual/NYHnIZe5JsPqoaJRXZICeoTOkN2VvwHLv6I34VJlYJlGHP0iQ/T9 3Bi58FJ4QPFPvGYcrAvVK2LqHsxkRNC1jQuWiNMk= From: Andreas Larsson To: sparclinux@vger.kernel.org, "David S. Miller" , "Dr. David Alan Gilbert" Cc: linux-kernel@vger.kernel.org, kernel test robot , Michael Ellerman , Sam Ravnborg , Randy Dunlap Subject: [PATCH] lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console Date: Thu, 7 Mar 2024 19:07:42 +0100 Message-Id: <20240307180742.900068-1-andreas@gaisler.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: sparclinux@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 Fixes: 0f1991949d9b ("sparc: Use shared font data") Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202402241539.epQT43nI-lkp@intel.com/ Cc: "Dr. David Alan Gilbert" Cc: Michael Ellerman Cc: Sam Ravnborg Cc: Randy Dunlap Cc: "David S. Miller" Reviewed-by: Dr. David Alan Gilbert --- 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(-) base-commit: 626db6ee8ee1edac206610db407114aa83b53fd3 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.