From nobody Sun Dec 14 23:20:30 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E1EC420299E for ; Thu, 8 May 2025 04:48:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746679689; cv=none; b=l5a9KnpVlbqHZJ4VWqsHA2LGl6TocGYYvtA+vLBTMGwx0C7ZUuReSdu7BtesT3zef2BHOvEgjw5mhcwaF0k5+3nj+Q+M6jw5RI185R0IgCLJXlnRTHCRufFAnaIdzNtvDcU090KxGGB5lmxbVvSJroZjDI2gbg0DQgVEym7tVz4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746679689; c=relaxed/simple; bh=je8FFs3l/IXpH0qcMI8C34Tu+VY47bqre7GII5SfwDc=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=NJ9ZkRLm7Bk2uBjxkY0iMnS52COEwRsYu/YR4aMqFcPh//sEfqlwJd+27z/8tSDNjo2n5eHDvYB2pIQCLA62vf/uYuNfCwv2Hnu70W/l1n7m9W9e1KJs5GHBztTRJB7xPe9S9PrjRsWgtSqzcfR+MEKwRzM+mTp/dZ04e1G6+0Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6F3AC106F; Wed, 7 May 2025 21:47:50 -0700 (PDT) Received: from a077893.arm.com (unknown [10.163.54.182]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 069383F5A1; Wed, 7 May 2025 21:47:57 -0700 (PDT) From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org Cc: ada.coupriediaz@arm.com, Anshuman Khandual , Catalin Marinas , Will Deacon , Mark Rutland , linux-kernel@vger.kernel.org Subject: [PATCH V2] arm64/debug: Drop redundant DBG_MDSCR_* macros Date: Thu, 8 May 2025 10:17:52 +0530 Message-Id: <20250508044752.234543-1-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" MDSCR_EL1 has already been defined in tools sysreg format and hence can be used in all debug monitor related call paths. Subsequently all DBG_MDSCR_* macros become redundant and hence can be dropped off completely. While here convert all variables handling MDSCR_EL1 register as u64 which reflects its true width as well. Cc: Catalin Marinas Cc: Will Deacon Cc: Mark Rutland Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Anshuman Khandual Reviewed-by: Ada Couprie Diaz --- This patch applies on v6.15-rc5 Changes in V2: - Changed reg, val width to u64 in cortex_a76_erratum_1463225_svc_handler()= per Ada - Changed mdscr register width to uint64_t in enable_monitor_debug_exceptio= ns() and install_ss() per Ada =20 Changes in V1: https://lore.kernel.org/all/20250417105253.3188976-1-anshuman.khandual@arm.= com/ arch/arm64/include/asm/assembler.h | 4 ++-- arch/arm64/include/asm/debug-monitors.h | 6 ----- arch/arm64/kernel/debug-monitors.c | 22 +++++++++---------- arch/arm64/kernel/entry-common.c | 4 ++-- .../selftests/kvm/arm64/debug-exceptions.c | 4 ++-- 5 files changed, 17 insertions(+), 23 deletions(-) diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/as= sembler.h index ad63457a05c5..f229d96616e5 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -53,7 +53,7 @@ .macro disable_step_tsk, flgs, tmp tbz \flgs, #TIF_SINGLESTEP, 9990f mrs \tmp, mdscr_el1 - bic \tmp, \tmp, #DBG_MDSCR_SS + bic \tmp, \tmp, #MDSCR_EL1_SS msr mdscr_el1, \tmp isb // Take effect before a subsequent clear of DAIF.D 9990: @@ -63,7 +63,7 @@ .macro enable_step_tsk, flgs, tmp tbz \flgs, #TIF_SINGLESTEP, 9990f mrs \tmp, mdscr_el1 - orr \tmp, \tmp, #DBG_MDSCR_SS + orr \tmp, \tmp, #MDSCR_EL1_SS msr mdscr_el1, \tmp 9990: .endm diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/a= sm/debug-monitors.h index 8f6ba31b8658..1f37dd01482b 100644 --- a/arch/arm64/include/asm/debug-monitors.h +++ b/arch/arm64/include/asm/debug-monitors.h @@ -13,14 +13,8 @@ #include =20 /* Low-level stepping controls. */ -#define DBG_MDSCR_SS (1 << 0) #define DBG_SPSR_SS (1 << 21) =20 -/* MDSCR_EL1 enabling bits */ -#define DBG_MDSCR_KDE (1 << 13) -#define DBG_MDSCR_MDE (1 << 15) -#define DBG_MDSCR_MASK ~(DBG_MDSCR_KDE | DBG_MDSCR_MDE) - #define DBG_ESR_EVT(x) (((x) >> 27) & 0x7) =20 /* AArch64 */ diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-m= onitors.c index 58f047de3e1c..08f1d02507cd 100644 --- a/arch/arm64/kernel/debug-monitors.c +++ b/arch/arm64/kernel/debug-monitors.c @@ -34,7 +34,7 @@ u8 debug_monitors_arch(void) /* * MDSCR access routines. */ -static void mdscr_write(u32 mdscr) +static void mdscr_write(u64 mdscr) { unsigned long flags; flags =3D local_daif_save(); @@ -43,7 +43,7 @@ static void mdscr_write(u32 mdscr) } NOKPROBE_SYMBOL(mdscr_write); =20 -static u32 mdscr_read(void) +static u64 mdscr_read(void) { return read_sysreg(mdscr_el1); } @@ -79,16 +79,16 @@ static DEFINE_PER_CPU(int, kde_ref_count); =20 void enable_debug_monitors(enum dbg_active_el el) { - u32 mdscr, enable =3D 0; + u64 mdscr, enable =3D 0; =20 WARN_ON(preemptible()); =20 if (this_cpu_inc_return(mde_ref_count) =3D=3D 1) - enable =3D DBG_MDSCR_MDE; + enable =3D MDSCR_EL1_MDE; =20 if (el =3D=3D DBG_ACTIVE_EL1 && this_cpu_inc_return(kde_ref_count) =3D=3D 1) - enable |=3D DBG_MDSCR_KDE; + enable |=3D MDSCR_EL1_KDE; =20 if (enable && debug_enabled) { mdscr =3D mdscr_read(); @@ -100,16 +100,16 @@ NOKPROBE_SYMBOL(enable_debug_monitors); =20 void disable_debug_monitors(enum dbg_active_el el) { - u32 mdscr, disable =3D 0; + u64 mdscr, disable =3D 0; =20 WARN_ON(preemptible()); =20 if (this_cpu_dec_return(mde_ref_count) =3D=3D 0) - disable =3D ~DBG_MDSCR_MDE; + disable =3D ~MDSCR_EL1_MDE; =20 if (el =3D=3D DBG_ACTIVE_EL1 && this_cpu_dec_return(kde_ref_count) =3D=3D 0) - disable &=3D ~DBG_MDSCR_KDE; + disable &=3D ~MDSCR_EL1_KDE; =20 if (disable) { mdscr =3D mdscr_read(); @@ -415,7 +415,7 @@ void kernel_enable_single_step(struct pt_regs *regs) { WARN_ON(!irqs_disabled()); set_regs_spsr_ss(regs); - mdscr_write(mdscr_read() | DBG_MDSCR_SS); + mdscr_write(mdscr_read() | MDSCR_EL1_SS); enable_debug_monitors(DBG_ACTIVE_EL1); } NOKPROBE_SYMBOL(kernel_enable_single_step); @@ -423,7 +423,7 @@ NOKPROBE_SYMBOL(kernel_enable_single_step); void kernel_disable_single_step(void) { WARN_ON(!irqs_disabled()); - mdscr_write(mdscr_read() & ~DBG_MDSCR_SS); + mdscr_write(mdscr_read() & ~MDSCR_EL1_SS); disable_debug_monitors(DBG_ACTIVE_EL1); } NOKPROBE_SYMBOL(kernel_disable_single_step); @@ -431,7 +431,7 @@ NOKPROBE_SYMBOL(kernel_disable_single_step); int kernel_active_single_step(void) { WARN_ON(!irqs_disabled()); - return mdscr_read() & DBG_MDSCR_SS; + return mdscr_read() & MDSCR_EL1_SS; } NOKPROBE_SYMBOL(kernel_active_single_step); =20 diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-com= mon.c index b260ddc4d3e9..34d9205b4764 100644 --- a/arch/arm64/kernel/entry-common.c +++ b/arch/arm64/kernel/entry-common.c @@ -344,7 +344,7 @@ static DEFINE_PER_CPU(int, __in_cortex_a76_erratum_1463= 225_wa); =20 static void cortex_a76_erratum_1463225_svc_handler(void) { - u32 reg, val; + u64 reg, val; =20 if (!unlikely(test_thread_flag(TIF_SINGLESTEP))) return; @@ -354,7 +354,7 @@ static void cortex_a76_erratum_1463225_svc_handler(void) =20 __this_cpu_write(__in_cortex_a76_erratum_1463225_wa, 1); reg =3D read_sysreg(mdscr_el1); - val =3D reg | DBG_MDSCR_SS | DBG_MDSCR_KDE; + val =3D reg | MDSCR_EL1_SS | MDSCR_EL1_KDE; write_sysreg(val, mdscr_el1); asm volatile("msr daifclr, #8"); isb(); diff --git a/tools/testing/selftests/kvm/arm64/debug-exceptions.c b/tools/t= esting/selftests/kvm/arm64/debug-exceptions.c index c7fb55c9135b..e34963956fbc 100644 --- a/tools/testing/selftests/kvm/arm64/debug-exceptions.c +++ b/tools/testing/selftests/kvm/arm64/debug-exceptions.c @@ -140,7 +140,7 @@ static void enable_os_lock(void) =20 static void enable_monitor_debug_exceptions(void) { - uint32_t mdscr; + uint64_t mdscr; =20 asm volatile("msr daifclr, #8"); =20 @@ -223,7 +223,7 @@ void install_hw_bp_ctx(uint8_t addr_bp, uint8_t ctx_bp,= uint64_t addr, =20 static void install_ss(void) { - uint32_t mdscr; + uint64_t mdscr; =20 asm volatile("msr daifclr, #8"); =20 --=20 2.25.1