From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 22121C3DA49 for ; Tue, 30 Jul 2024 09:49:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type:Cc:To:From: Subject:Message-ID:Mime-Version:Date:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=vgchGZuOR74FDVD8hq/qj9jI3gWD5mclUTgDtvI1dRQ=; b=UXp51yqAP4UZCUooCDKZWGBPra 1ftxxu+aERoYQjYtlds4jPUCOSA4Mwm7lzs4HoPUupHi4ic6aois/n5J6CnP4gQIusKjGQxGR3NUl qTGSphp/qBRdxYD/oWmNjnesw0KDXS3bC9t5HX8UhcF75m1UzBydTbsHzznXeF1bsRypKQPPUwOhB gMdij8P8Ii5gQNEZwnVHQpQf5ztwEpeEe0cyVTvQwo3eUpu/fHLXvd/0X0Nb8FnH/cTBa4hFI+QaC NqYg6uovRYIv6qNoTLXCFFaBy2lvXlJ5ztE/vDjC11eBiijRCnPXNp8W5Ys7c0cO48XdlN7svV4SV lqBged8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sYjU6-0000000EbXX-2Jej; Tue, 30 Jul 2024 09:49:34 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sYjTe-0000000EbSc-18j9 for linux-arm-kernel@lists.infradead.org; Tue, 30 Jul 2024 09:49:07 +0000 Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-e03a694ba5aso5990648276.3 for ; Tue, 30 Jul 2024 02:49:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1722332944; x=1722937744; darn=lists.infradead.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=vgchGZuOR74FDVD8hq/qj9jI3gWD5mclUTgDtvI1dRQ=; b=uA7UAeeDf9pOFS0GZp175kGphWW8pR3OGvh0HXk4lzYFwfLp9ONJmw1KDUMY2fLRez xBFXdP1Pe2izcpLR/6lcyvRSb9Ep8z0rLQabmxsVrFuRRoBcD9oZqPHGuNOoWnYKXb4R uAcM+BVqs9rX+xR0Cnwxbs1WAFrPRWzpJdWb625zycUnORNaFB+wh99Scvjjno/TM0wz WAKUqoh98/FqhVDvMY1kIayHz1VBmcfRbyoXHJS7+9EO8Grr3UCikn5/HWW9TtiGq71B mS7xouuwgfWi5TbEtz9KgFMlnWITM9lpb8DFAqe+hZN14NCzmsPZA5T4SkP6/nXHY6Zl GCzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722332944; x=1722937744; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=vgchGZuOR74FDVD8hq/qj9jI3gWD5mclUTgDtvI1dRQ=; b=Z3g1TGVXE3x8ZCK0BDWhIOxd7Hgx9hFytggmC3epBfym7neEBiIXnwxp34lSa+leqG VM1Awot2+jrozgd5lrVTn9Sz6jlnRIgFMYg6XfVG15wQGquSyg29wQ9okbZ21Wm9l5Bn SeB0ch3lajZ79AUwyeIOQYBXG7nQQ/xnZ2h1qFqCSTupcAIW/l5U048DKs5g04REY3Ka dPfay5LtdKwiPdD0RSVhXnY5QFaBK+eFzgGDG0jTZfQSXTXvLVJgZHx994avoeVb+uln ap5xK+Hs85LgIbNzZXjEbousaxw0SWPVy66bqnnC+Ga/EH7KyILcG4DnT60sYzs63On5 JW2Q== X-Gm-Message-State: AOJu0YxnEDRyUPPEdeP87xKbbqLJDayUlgyyHLnsVEbaexWm1JbzxhL4 1EsbT4SRQhhVGHbdPO7M4DoIw20XpWK8uLPJTUNfk12gcAIeIgqDJRtjoDNEv37x/T50VedrZY+ uOf1cYECfPU6pONOthHlouAt3cEuZrTxpfadXpa+wIf1Dd4dzOANoEMFtk3UBJYIVhhOfYNc8gG oWYw+DyyFQlGd61rMNGi3gWGBsn86lZWHWk/ch/Nnf X-Google-Smtp-Source: AGHT+IFDD79z7FE5LHf2Q02J3Zx7TQKCtWFlEvyjWk2Ye7V7cl6VH2l8Yd49g9Tc0asCqfLRc1R1yPxJ X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a05:6902:72a:b0:e0b:5200:d93f with SMTP id 3f1490d57ef6-e0b543be33fmr18520276.3.1722332943347; Tue, 30 Jul 2024 02:49:03 -0700 (PDT) Date: Tue, 30 Jul 2024 11:48:59 +0200 Mime-Version: 1.0 X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=3929; i=ardb@kernel.org; h=from:subject; bh=qwgFXoPLv40l0E/EU91luZb+Pb3+QPu2gs01/JSgQpA=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIW3Fdm4P/pAdPK6W0UntK+M12s8FO9scv5v7lLPc74vY1 PVLWWd1lLIwiHEwyIopsgjM/vtu5+mJUrXOs2Rh5rAygQxh4OIUgIncFGJkeKmWVn34/ecM9kdS n/VOPGW5uoF17/MtKmsfii+a3d+z7QYjw6HDFRc0Vfs6LswMk+abzXlcba2tnGva29R2y82PQ4O cGAA= X-Mailer: git-send-email 2.46.0.rc1.232.g9752f9e123-goog Message-ID: <20240730094858.1070431-2-ardb+git@google.com> Subject: [PATCH] ARM: assembler: Drop obsolete VFP accessor fallback From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Calvin Owens , Arnd Bergmann , Nathan Chancellor , clang-built-linux , Russell King , Linus Walleij Content-Type: text/plain; charset="UTF-8" X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240730_024906_339833_DE92C766 X-CRM114-Status: GOOD ( 11.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Ard Biesheuvel Now that the minimum supported binutils version is 2.25, we no longer need a workaround for binutils older than 2.24 for accessing VFP control registers from assembler. Cc: Calvin Owens Cc: Arnd Bergmann Cc: Nathan Chancellor Cc: clang-built-linux Cc: Russell King Cc: Linus Walleij Signed-off-by: Ard Biesheuvel --- Note: applies onto 9410/1 arch/arm/Kconfig | 2 -- arch/arm/Kconfig.assembler | 6 ------ arch/arm/include/asm/vfp.h | 10 --------- arch/arm/include/asm/vfpmacros.h | 11 ---------- arch/arm/vfp/vfpinstr.h | 22 -------------------- 5 files changed, 51 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 54b2bb817a7f..854a12d89471 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1747,5 +1747,3 @@ config ARCH_HIBERNATION_POSSIBLE default y if ARCH_SUSPEND_POSSIBLE endmenu - -source "arch/arm/Kconfig.assembler" diff --git a/arch/arm/Kconfig.assembler b/arch/arm/Kconfig.assembler deleted file mode 100644 index 5cb31aae1188..000000000000 --- a/arch/arm/Kconfig.assembler +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 - -config AS_VFP_VMRS_FPINST - def_bool $(as-instr,.fpu vfpv2\nvmrs r0$(comma)FPINST) - help - Supported by binutils >= 2.24 and LLVM integrated assembler. diff --git a/arch/arm/include/asm/vfp.h b/arch/arm/include/asm/vfp.h index 157ea3426158..85ccc422d4d0 100644 --- a/arch/arm/include/asm/vfp.h +++ b/arch/arm/include/asm/vfp.h @@ -9,16 +9,6 @@ #ifndef __ASM_VFP_H #define __ASM_VFP_H -#ifndef CONFIG_AS_VFP_VMRS_FPINST -#define FPSID cr0 -#define FPSCR cr1 -#define MVFR1 cr6 -#define MVFR0 cr7 -#define FPEXC cr8 -#define FPINST cr9 -#define FPINST2 cr10 -#endif - /* FPSID bits */ #define FPSID_IMPLEMENTER_BIT (24) #define FPSID_IMPLEMENTER_MASK (0xff << FPSID_IMPLEMENTER_BIT) diff --git a/arch/arm/include/asm/vfpmacros.h b/arch/arm/include/asm/vfpmacros.h index ba0d4cb5377e..e2e1d5a3727a 100644 --- a/arch/arm/include/asm/vfpmacros.h +++ b/arch/arm/include/asm/vfpmacros.h @@ -8,7 +8,6 @@ #include -#ifdef CONFIG_AS_VFP_VMRS_FPINST .macro VFPFMRX, rd, sysreg, cond vmrs\cond \rd, \sysreg .endm @@ -16,16 +15,6 @@ .macro VFPFMXR, sysreg, rd, cond vmsr\cond \sysreg, \rd .endm -#else - @ Macros to allow building with old toolkits (with no VFP support) - .macro VFPFMRX, rd, sysreg, cond - MRC\cond p10, 7, \rd, \sysreg, cr0, 0 @ FMRX \rd, \sysreg - .endm - - .macro VFPFMXR, sysreg, rd, cond - MCR\cond p10, 7, \rd, \sysreg, cr0, 0 @ FMXR \sysreg, \rd - .endm -#endif @ read all the working registers back into the VFP .macro VFPFLDMIA, base, tmp diff --git a/arch/arm/vfp/vfpinstr.h b/arch/arm/vfp/vfpinstr.h index 32090b0fb250..a2f0c47e0ce7 100644 --- a/arch/arm/vfp/vfpinstr.h +++ b/arch/arm/vfp/vfpinstr.h @@ -62,8 +62,6 @@ #define FPSCR_C (1 << 29) #define FPSCR_V (1 << 28) -#ifdef CONFIG_AS_VFP_VMRS_FPINST - #define fmrx(_vfp_) ({ \ u32 __v; \ asm volatile (".fpu vfpv2\n" \ @@ -78,26 +76,6 @@ : : "r" (_var_) : "cc"); \ }) -#else - -#define vfpreg(_vfp_) #_vfp_ - -#define fmrx(_vfp_) ({ \ - u32 __v; \ - asm volatile ("mrc p10, 7, %0, " vfpreg(_vfp_) "," \ - "cr0, 0 @ fmrx %0, " #_vfp_ \ - : "=r" (__v) : : "cc"); \ - __v; \ -}) - -#define fmxr(_vfp_, _var_) ({ \ - asm volatile ("mcr p10, 7, %0, " vfpreg(_vfp_) "," \ - "cr0, 0 @ fmxr " #_vfp_ ", %0" \ - : : "r" (_var_) : "cc"); \ -}) - -#endif - u32 vfp_single_cpdo(u32 inst, u32 fpscr); u32 vfp_single_cprt(u32 inst, u32 fpscr, struct pt_regs *regs); -- 2.46.0.rc1.232.g9752f9e123-goog