From nobody Sat Sep 13 07:08:08 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC6E2C636CC for ; Sat, 4 Feb 2023 00:25:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232519AbjBDAZQ (ORCPT ); Fri, 3 Feb 2023 19:25:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230042AbjBDAZO (ORCPT ); Fri, 3 Feb 2023 19:25:14 -0500 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 992EC8E6A5; Fri, 3 Feb 2023 16:25:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: Content-Type:MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-ID:Content-Description:In-Reply-To:References; bh=0fRDbcUOHAqzyac5DoAoZnuHrvEv/9NAEeX2n3MClOU=; b=1jQLO6DgR1v7KlnN7Tskpmv6lO vDqanwJjFa7pi8SFbJFiLRwH4NJNEyA42MJRQnsXqetXUHB479aMrudF65rHrAwy4Otr/nE1XAYFZ 8+83zn84UwbFYno40lSCVYLVAja3rntf63dJ0MtN4An/IUnppy7/58YZnKX+JY+nnGY7G/+uHJW3G mk0CXGM1GzMQIsmOFaP0ouGt227BZonc/Wx3zDMalvQeNg+gvnQ38lrVN6FVY57iX+yhC9Zi+7OLX fdmrLCnVC4kyylc4EVwdb3jeO5g2NNk78eoZK+LmIJEOZVTYVTg5EMllO+HT21VLm/AFWb7wjstPY yLX9MOsQ==; Received: from [2601:1c2:d00:6a60::9526] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1pO6Mf-004784-OR; Sat, 04 Feb 2023 00:25:10 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Geert Uytterhoeven , Arnd Bergmann , Rich Felker , Yoshinori Sato , John Paul Adrian Glaubitz , linux-sh@vger.kernel.org Subject: [PATCH] sh: remove sh5/sh64 last fragments Date: Fri, 3 Feb 2023 16:25:08 -0800 Message-Id: <20230204002508.18800-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A previous patch removed most of the sh5 (sh64) support from the kernel tree. Now remove the last stragglers. Fixes: 37744feebc08 ("sh: remove sh5 support") Signed-off-by: Randy Dunlap Cc: Geert Uytterhoeven Cc: Arnd Bergmann Cc: Rich Felker Cc: Yoshinori Sato Cc: John Paul Adrian Glaubitz Cc: linux-sh@vger.kernel.org Acked-by: John Paul Adrian Glaubitz --- Documentation/kbuild/kbuild.rst | 1 - Documentation/scheduler/sched-arch.rst | 2 -- Documentation/translations/zh_CN/scheduler/sched-arch.rst | 2 -- scripts/checkstack.pl | 7 ------- tools/perf/arch/common.c | 2 -- tools/scripts/Makefile.arch | 5 ----- tools/testing/selftests/mm/Makefile | 2 +- tools/testing/selftests/mm/run_vmtests.sh | 2 +- 8 files changed, 2 insertions(+), 21 deletions(-) diff -- a/Documentation/kbuild/kbuild.rst b/Documentation/kbuild/kbuild.rst --- a/Documentation/kbuild/kbuild.rst +++ b/Documentation/kbuild/kbuild.rst @@ -160,7 +160,6 @@ directory name found in the arch/ direct But some architectures such as x86 and sparc have aliases. =20 - x86: i386 for 32 bit, x86_64 for 64 bit -- sh: sh for 32 bit, sh64 for 64 bit - sparc: sparc32 for 32 bit, sparc64 for 64 bit =20 CROSS_COMPILE diff -- a/Documentation/scheduler/sched-arch.rst b/Documentation/scheduler/= sched-arch.rst --- a/Documentation/scheduler/sched-arch.rst +++ b/Documentation/scheduler/sched-arch.rst @@ -70,7 +70,5 @@ Possible arch problems I found (and eith =20 ia64 - is safe_halt call racy vs interrupts? (does it sleep?) (See #4a) =20 -sh64 - Is sleeping racy vs interrupts? (See #4a) - sparc - IRQs on at this point(?), change local_irq_save to _disable. - TODO: needs secondary CPUs to disable preempt (See #1) diff -- a/Documentation/translations/zh_CN/scheduler/sched-arch.rst b/Docum= entation/translations/zh_CN/scheduler/sched-arch.rst --- a/Documentation/translations/zh_CN/scheduler/sched-arch.rst +++ b/Documentation/translations/zh_CN/scheduler/sched-arch.rst @@ -70,7 +70,5 @@ =E6=88=91=E5=8F=91=E7=8E=B0=E7=9A=84=E5=8F=AF=E8=83=BD=E7= =9A=84arch=E9=97=AE=E9=A2=98=EF=BC=88=E5=B9=B6=E8=AF=95 =20 ia64 - safe_halt=E7=9A=84=E8=B0=83=E7=94=A8=E4=B8=8E=E4=B8=AD=E6=96=AD=E7= =9B=B8=E6=AF=94=EF=BC=8C=E6=98=AF=E5=90=A6=E5=BE=88=E8=8D=92=E8=B0=AC=EF=BC= =9F (=E5=AE=83=E7=9D=A1=E7=9C=A0=E4=BA=86=E5=90=97) (=E5=8F=82=E8=80=83 #4a) =20 -sh64 - =E7=9D=A1=E7=9C=A0=E4=B8=8E=E4=B8=AD=E6=96=AD=E7=9B=B8=E6=AF=94=EF= =BC=8C=E6=98=AF=E5=90=A6=E5=BE=88=E8=8D=92=E8=B0=AC=EF=BC=9F (=E5=8F=82=E8= =80=83 #4a) - sparc - =E5=9C=A8=E8=BF=99=E4=B8=80=E7=82=B9=E4=B8=8A=EF=BC=8CIRQ=E6=98=AF= =E5=BC=80=E7=9D=80=E7=9A=84=EF=BC=88=EF=BC=9F=EF=BC=89=EF=BC=8C=E6=8A=8Aloc= al_irq_save=E6=94=B9=E4=B8=BA_disable=E3=80=82 - =E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9: =E9=9C=80=E8=A6=81=E7=AC=AC= =E4=BA=8C=E4=B8=AACPU=E6=9D=A5=E7=A6=81=E7=94=A8=E6=8A=A2=E5=8D=A0 (=E5=8F= =82=E8=80=83 #1) diff -- a/scripts/checkstack.pl b/scripts/checkstack.pl --- a/scripts/checkstack.pl +++ b/scripts/checkstack.pl @@ -10,7 +10,6 @@ # Mips port by Juan Quintela # IA64 port via Andreas Dilger # Arm port by Holger Schurig -# sh64 port by Paul Mundt # Random bits by Matt Mackall # M68k port by Geert Uytterhoeven and Andreas Schwab # AArch64, PARISC ports by Kyle McMartin @@ -100,12 +99,6 @@ my (@stack, $re, $dre, $sub, $x, $xs, $f # 100092: e3 f0 ff c8 ff 71 lay %r15,-56(%r15) $re =3D qr/.*(?:lay|ag?hi).*\%r15,-(([0-9]{2}|[3-9])[0-9]{2}) (?:\(\%r15\))?$/ox; - } elsif ($arch =3D~ /^sh64$/) { - #XXX: we only check for the immediate case presently, - # though we will want to check for the movi/sub - # pair for larger users. -- PFM. - #a00048e0: d4fc40f0 addi.l r15,-240,r15 - $re =3D qr/.*addi\.l.*r15,-(([0-9]{2}|[3-9])[0-9]{2}),r15/o; } elsif ($arch eq 'sparc' || $arch eq 'sparc64') { # f0019d10: 9d e3 bf 90 save %sp, -112, %sp $re =3D qr/.*save.*%sp, -(([0-9]{2}|[3-9])[0-9]{2}), %sp/o; diff -- a/tools/perf/arch/common.c b/tools/perf/arch/common.c --- a/tools/perf/arch/common.c +++ b/tools/perf/arch/common.c @@ -51,9 +51,7 @@ const char *const s390_triplets[] =3D { =20 const char *const sh_triplets[] =3D { "sh-unknown-linux-gnu-", - "sh64-unknown-linux-gnu-", "sh-linux-gnu-", - "sh64-linux-gnu-", NULL }; =20 diff -- a/tools/scripts/Makefile.arch b/tools/scripts/Makefile.arch --- a/tools/scripts/Makefile.arch +++ b/tools/scripts/Makefile.arch @@ -29,11 +29,6 @@ ifeq ($(ARCH),sparc64) SRCARCH :=3D sparc endif =20 -# Additional ARCH settings for sh -ifeq ($(ARCH),sh64) - SRCARCH :=3D sh -endif - LP64 :=3D $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1) ifeq ($(LP64), 1) IS_64_BIT :=3D 1 diff -- a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/= Makefile --- a/tools/testing/selftests/mm/Makefile +++ b/tools/testing/selftests/mm/Makefile @@ -90,7 +90,7 @@ endif =20 endif =20 -ifneq (,$(filter $(MACHINE),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x= sh64 sparc64 x86_64)) +ifneq (,$(filter $(MACHINE),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x= sparc64 x86_64)) TEST_GEN_FILES +=3D va_128TBswitch TEST_GEN_FILES +=3D virtual_address_range TEST_GEN_FILES +=3D write_to_hugetlbfs diff -- a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftes= ts/mm/run_vmtests.sh --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -132,7 +132,7 @@ else fi =20 # filter 64bit architectures -ARCH64STR=3D"arm64 ia64 mips64 parisc64 ppc64 ppc64le riscv64 s390x sh64 s= parc64 x86_64" +ARCH64STR=3D"arm64 ia64 mips64 parisc64 ppc64 ppc64le riscv64 s390x sparc6= 4 x86_64" if [ -z "$ARCH" ]; then ARCH=3D$(uname -m 2>/dev/null | sed -e 's/aarch64.*/arm64/') fi