From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f66.google.com (mail-dl1-f66.google.com [74.125.82.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EEFE2257435 for ; Wed, 10 Jun 2026 02:46:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.66 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781059595; cv=none; b=EBz5SsVmBKXZPnu/65vv3XIPEs88na/8Bxr753t423+jMQEXC7k8Aml7jysZi/Zdg9hD8L8DldjPXHmdvfyZZ3XgNXK5R2bRy5kv7M7fRtfSikP87+anAZJpsV6FSiNPDDdUeAhj0BrsiGwrmZwIVMF6dPaeeEFpTh1DgcquKx0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781059595; c=relaxed/simple; bh=NUu5tC4n74302MKFWJZuFSdMSA1Qkn6hFanXk9NTz1c=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=s70udbo35l/SVS8PNs+Wq1K52ChIAGKvOJj4k9l6HZIxaMg4gTLVgE66HvzOceR9pPuZjcnJymFSumhdMXierP7pSpuRkPW/Buvz+P/5f+CBt14MCYWkwmLe2SGFnnmlVy3+APkJYtni6jWz3Do+O8NpoMNBrPC+NbSSl+PZxTI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=p25Bq58a; arc=none smtp.client-ip=74.125.82.66 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="p25Bq58a" Received: by mail-dl1-f66.google.com with SMTP id a92af1059eb24-13809ed8fbeso2349145c88.0 for ; Tue, 09 Jun 2026 19:46:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781059593; x=1781664393; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=dywY+EaNVUUmyes0LNSn8JSMxfnYFXFyYF6vzqLn8Ec=; b=p25Bq58aZ30MerQ3Bo0Rzy5lnWo/kPAuafKg2CO8W66d2KGIsLpyJXN0gIl6wF0VP5 4YqGWnIViHr1SyPWHMZ62PiFxOzmvlY+dWMRs5bzdtzDpbClumCmsAgwP9O+li25hbn/ S4U5DokCRHZ+n4neSz+31nNOYgb0HuzgZTLWPBZsjY3rvfWGgJBa4pArRiX5ykWDq4Wp 5BGqRNrT3q4tjP2NUQi025a4JcLjAHK/evhyuzwCKs9NspM9aM1GArrHzaHxBSPDl61o 44jfzJabU/prtSddveNu5bhtJvieOHEsJdXy7bFwuxw9uwGtfdaPE3xqqk8C8+Ngnpvw pz2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781059593; x=1781664393; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=dywY+EaNVUUmyes0LNSn8JSMxfnYFXFyYF6vzqLn8Ec=; b=HUqmlGty5OEpklWSvVM4vo8hbxLO8OlHmWzBja+LA2yIYmNp64IzbeR9V2yKMctGeP 361XoL5XQE/YxCRiFbkaKLp6U+smlCs66fUrlOl6SgKZnlakHJdajbeg+mXxJnkaJ5WK g81T8ZezhA5i2/Ok/5ooWZNik+2WB+GiY3UfspU+IJL0jhMk2y625KTkQdMT7xPMOt9C 6aO1H18FCEnW4sQCpJmXvkwn1l2tu3pvSNMBSgVxDt4Jibt0boAf7HtH0phghPt82hWX moO8ZuTMcjAbL9VNBthjIkEPIe6aMNTpf1/sfGAGnK4iB84w3kQqWvh0SoFLP/o1MQ7j szfQ== X-Forwarded-Encrypted: i=1; AFNElJ8rRw5GFNNJ+ffpqa07389dJsHPBVg0Xg+8M2t+trEIaARgh9eFAJwENBvdfcbkX6cXzKoefdxigPxaXhA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw65qkDb366yO4/7kYeOt2hbiopvKNCufB7jRSgw5bG4X7epqiG 0LLx+8WvzrfmMpyI62zM2nNSDKOclSHbuzbnfo5AgyNsYxU1usgaYFk8 X-Gm-Gg: Acq92OFP16Z2RVyhfC2xGXl15708SVZYWZzSQdGVDkeaVkjJxTpWZleDmOiQboQ7v9y C5HlIwkfdpPg2RPrg0V6DTIlN9g+Scb/NbiI1zdM/yXGv/2xTpk/pCJPO45kj+wbO4yQNUro1Nl wsHB8zSxoamIH1PkSlZxrOv/mQ6u1y+CABSamjDxcXTBTknTfXAbrAaLN24w2TpkiPY33uHk95E vLwJdduO9KmjNLYSdwoc0DQI/z8+CuzqcnuLmsjekXdRZ8PVH8fsNeC9wXg45AY/KlRe49+9rKK zvKApA7/Uh91KIiYGX+f3R+gD3Vxw1rH800fERsGWHaZqL0wRj184qUZsIaChBS+fj/SDmIfVQl TMwbIlZFeiDYuwu8hPJa/cwEaj9UMGgI+OcmP68bZchKPX2Ul7VauvGRXJG/1HLk4Quh7yZs/ov ubLIGYT4Af5/0JaS2rmRvii1TJ4lcAkt/ckXeez1d1kgJA4/b+isD/AtTnDSdvdNbaYHfy+CBUO /zMF46BIfGQU5/B6b48YwbmcVW34K/EqhhIf0AZ84mkZjCiS/giKZftKCFlPMRZSw3iykAeej98 PD9Zk9h8SqXj/RbTbX5vYyXPE4Ah X-Received: by 2002:a05:7022:ef18:b0:137:6781:7dd7 with SMTP id a92af1059eb24-1380670b7aamr12076752c88.20.1781059592912; Tue, 09 Jun 2026 19:46:32 -0700 (PDT) Received: from ethan-latitude5420.. (host-127-24.cafrjco.fresno.ca.us.clients.pavlovmedia.net. [68.180.127.24]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-137f5550bcdsm17792453c88.14.2026.06.09.19.46.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2026 19:46:31 -0700 (PDT) From: Ethan Nelson-Moore To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Ethan Nelson-Moore , Russell King , stable@vger.kernel.org, Greg Kroah-Hartman , Simona Vetter , Peilin Ye Subject: [PATCH] ARM: boot/compressed: adjust Acorn font display code for added header Date: Tue, 9 Jun 2026 19:46:17 -0700 Message-ID: <20260610024619.129261-1-enelsonmoore@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Commit 6735b4632def ("Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts") added a header to the data for built-in fonts. However, the Acorn font display code in the ARM decompressor was never adjusted to account for the added offset to the raw data, causing the font to display incorrectly. Resolve this issue by adding the appropriate offset when referring to the font data variable. Fixes: 6735b4632def ("Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts") Reported-by: Russell King Closes: https://lore.kernel.org/all/aifhAn2RMdxQ2p86@shell.armlinux.org.uk/ Cc: stable@vger.kernel.org # 5.10+ Signed-off-by: Ethan Nelson-Moore --- arch/arm/boot/compressed/ll_char_wr.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/compressed/ll_char_wr.S b/arch/arm/boot/compressed/ll_char_wr.S index 1ec8cb2898b1..7f218e938865 100644 --- a/arch/arm/boot/compressed/ll_char_wr.S +++ b/arch/arm/boot/compressed/ll_char_wr.S @@ -21,7 +21,8 @@ LC0: .word LC0 .word bytes_per_char_h .word video_size_row - .word acorndata_8x8 + @ The offset ensures that the header is skipped + .word acorndata_8x8 + 4 /* FONT_EXTRA_WORDS */ * 4 /* sizeof(int) */ .word con_charconvtable /* -- 2.43.0