From: Mark Rutland <mark.rutland@arm.com>
To: Ard Biesheuvel <ardb@kernel.org>
Cc: catalin.marinas@arm.com, will@kernel.org,
linux-arm-kernel@lists.infradead.org, suzuki.poulose@arm.com
Subject: Re: [PATCH] arm64: drop duplicate definitions of ID_AA64MMFR0_TGRAN constants
Date: Tue, 14 Apr 2020 14:58:57 +0100 [thread overview]
Message-ID: <20200414135857.GH2486@C02TD0UTHF1T.local> (raw)
In-Reply-To: <20200414134706.8435-1-ardb@kernel.org>
On Tue, Apr 14, 2020 at 03:47:06PM +0200, Ard Biesheuvel wrote:
> A bunch of ID_AA64MMFR0_TGRAN_* constant definitions appear twice
> in arch/arm64/include/asm/sysreg.h, so drop the duplicates.
>
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Whoops. Looks like these were added in commit:
4bf8b96ed3f7e114 ("arm64: Check for selected granule support")
... and then duplicated along with all the other registers in commit:
3c739b5710843621 ("arm64: Keep track of CPU feature registers")
This patch looks sound to me, so:
Acked-by: Mark Rutland <mark.rutland@arm.com>
Mark.
> ---
> arch/arm64/include/asm/sysreg.h | 12 ------------
> 1 file changed, 12 deletions(-)
>
> diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h
> index ebc622432831..b7e62b4f73af 100644
> --- a/arch/arm64/include/asm/sysreg.h
> +++ b/arch/arm64/include/asm/sysreg.h
> @@ -783,18 +783,6 @@
> #define MVFR1_FPDNAN_SHIFT 4
> #define MVFR1_FPFTZ_SHIFT 0
>
> -
> -#define ID_AA64MMFR0_TGRAN4_SHIFT 28
> -#define ID_AA64MMFR0_TGRAN64_SHIFT 24
> -#define ID_AA64MMFR0_TGRAN16_SHIFT 20
> -
> -#define ID_AA64MMFR0_TGRAN4_NI 0xf
> -#define ID_AA64MMFR0_TGRAN4_SUPPORTED 0x0
> -#define ID_AA64MMFR0_TGRAN64_NI 0xf
> -#define ID_AA64MMFR0_TGRAN64_SUPPORTED 0x0
> -#define ID_AA64MMFR0_TGRAN16_NI 0x0
> -#define ID_AA64MMFR0_TGRAN16_SUPPORTED 0x1
> -
> #if defined(CONFIG_ARM64_4K_PAGES)
> #define ID_AA64MMFR0_TGRAN_SHIFT ID_AA64MMFR0_TGRAN4_SHIFT
> #define ID_AA64MMFR0_TGRAN_SUPPORTED ID_AA64MMFR0_TGRAN4_SUPPORTED
> --
> 2.17.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-04-14 13:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-14 13:47 [PATCH] arm64: drop duplicate definitions of ID_AA64MMFR0_TGRAN constants Ard Biesheuvel
2020-04-14 13:58 ` Mark Rutland [this message]
2020-04-14 15:31 ` Will Deacon
2020-04-14 14:52 ` Suzuki K Poulose
2020-04-28 16:39 ` Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200414135857.GH2486@C02TD0UTHF1T.local \
--to=mark.rutland@arm.com \
--cc=ardb@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=suzuki.poulose@arm.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).