[PATCH 01/11] Initialize the mapping of KASan shadow memory
Russell King - ARM Linux
linux at armlinux.org.uk
Thu Nov 23 07:22:18 PST 2017
On Thu, Nov 23, 2017 at 01:54:59AM +0000, Liuwenliang (Abbott Liu) wrote:
> On Nov 23, 2017 20:30 Marc Zyngier [mailto:marc.zyngier at arm.com] wrote:
> >Please define both PAR accessors. Yes, I know the 32bit version is not
> >used yet, but it doesn't hurt to make it visible.
>
> Thanks for your review.
> I'm going to change it in the new version.
> Here is the code I tested on vexpress_a9 and vexpress_a15:
> diff --git a/arch/arm/include/asm/cp15.h b/arch/arm/include/asm/cp15.h
> index dbdbce1..b8353b1 100644
> --- a/arch/arm/include/asm/cp15.h
> +++ b/arch/arm/include/asm/cp15.h
> @@ -2,6 +2,7 @@
> #define __ASM_ARM_CP15_H
>
> #include <asm/barrier.h>
> +#include <linux/stringify.h>
>
> /*
> * CR1 bits (CP#15 CR1)
> @@ -64,8 +65,109 @@
> #define __write_sysreg(v, r, w, c, t) asm volatile(w " " c : : "r" ((t)(v)))
> #define write_sysreg(v, ...) __write_sysreg(v, __VA_ARGS__)
>
> +#define TTBR0_32 __ACCESS_CP15(c2, 0, c0, 0)
> +#define TTBR1_32 __ACCESS_CP15(c2, 0, c0, 1)
> +#define PAR_32 __ACCESS_CP15(c7, 0, c4, 0)
> +#define TTBR0_64 __ACCESS_CP15_64(0, c2)
> +#define TTBR1_64 __ACCESS_CP15_64(1, c2)
> +#define PAR_64 __ACCESS_CP15_64(0, c7)
> +#define VTTBR __ACCESS_CP15_64(6, c2)
> +#define CNTV_CVAL __ACCESS_CP15_64(3, c14)
> +#define CNTVOFF __ACCESS_CP15_64(4, c14)
> +
> +#define MIDR __ACCESS_CP15(c0, 0, c0, 0)
> +#define CSSELR __ACCESS_CP15(c0, 2, c0, 0)
> +#define VPIDR __ACCESS_CP15(c0, 4, c0, 0)
> +#define VMPIDR __ACCESS_CP15(c0, 4, c0, 5)
> +#define SCTLR __ACCESS_CP15(c1, 0, c0, 0)
> +#define CPACR __ACCESS_CP15(c1, 0, c0, 2)
> +#define HCR __ACCESS_CP15(c1, 4, c1, 0)
> +#define HDCR __ACCESS_CP15(c1, 4, c1, 1)
> +#define HCPTR __ACCESS_CP15(c1, 4, c1, 2)
> +#define HSTR __ACCESS_CP15(c1, 4, c1, 3)
> +#define TTBCR __ACCESS_CP15(c2, 0, c0, 2)
> +#define HTCR __ACCESS_CP15(c2, 4, c0, 2)
> +#define VTCR __ACCESS_CP15(c2, 4, c1, 2)
> +#define DACR __ACCESS_CP15(c3, 0, c0, 0)
> +#define DFSR __ACCESS_CP15(c5, 0, c0, 0)
> +#define IFSR __ACCESS_CP15(c5, 0, c0, 1)
> +#define ADFSR __ACCESS_CP15(c5, 0, c1, 0)
> +#define AIFSR __ACCESS_CP15(c5, 0, c1, 1)
> +#define HSR __ACCESS_CP15(c5, 4, c2, 0)
> +#define DFAR __ACCESS_CP15(c6, 0, c0, 0)
> +#define IFAR __ACCESS_CP15(c6, 0, c0, 2)
> +#define HDFAR __ACCESS_CP15(c6, 4, c0, 0)
> +#define HIFAR __ACCESS_CP15(c6, 4, c0, 2)
> +#define HPFAR __ACCESS_CP15(c6, 4, c0, 4)
> +#define ICIALLUIS __ACCESS_CP15(c7, 0, c1, 0)
> +#define ATS1CPR __ACCESS_CP15(c7, 0, c8, 0)
> +#define TLBIALLIS __ACCESS_CP15(c8, 0, c3, 0)
> +#define TLBIALL __ACCESS_CP15(c8, 0, c7, 0)
> +#define TLBIALLNSNHIS __ACCESS_CP15(c8, 4, c3, 4)
> +#define PRRR __ACCESS_CP15(c10, 0, c2, 0)
> +#define NMRR __ACCESS_CP15(c10, 0, c2, 1)
> +#define AMAIR0 __ACCESS_CP15(c10, 0, c3, 0)
> +#define AMAIR1 __ACCESS_CP15(c10, 0, c3, 1)
> +#define VBAR __ACCESS_CP15(c12, 0, c0, 0)
> +#define CID __ACCESS_CP15(c13, 0, c0, 1)
> +#define TID_URW __ACCESS_CP15(c13, 0, c0, 2)
> +#define TID_URO __ACCESS_CP15(c13, 0, c0, 3)
> +#define TID_PRIV __ACCESS_CP15(c13, 0, c0, 4)
> +#define HTPIDR __ACCESS_CP15(c13, 4, c0, 2)
> +#define CNTKCTL __ACCESS_CP15(c14, 0, c1, 0)
> +#define CNTV_CTL __ACCESS_CP15(c14, 0, c3, 1)
> +#define CNTHCTL __ACCESS_CP15(c14, 4, c1, 0)
> +
> extern unsigned long cr_alignment; /* defined in entry-armv.S */
>
> +static inline void set_par(u64 val)
> +{
> + if (IS_ENABLED(CONFIG_ARM_LPAE))
> + write_sysreg(val, PAR_64);
> + else
> + write_sysreg(val, PAR_32);
> +}
> +
> +static inline u64 get_par(void)
> +{
> + if (IS_ENABLED(CONFIG_ARM_LPAE))
> + return read_sysreg(PAR_64);
> + else
> + return (u64)read_sysreg(PAR_32);
> +}
> +
> +static inline void set_ttbr0(u64 val)
> +{
> + if (IS_ENABLED(CONFIG_ARM_LPAE))
> + write_sysreg(val, TTBR0_64);
> + else
> + write_sysreg(val, TTBR0_32);
> +}
> +
> +static inline u64 get_ttbr0(void)
> +{
> + if (IS_ENABLED(CONFIG_ARM_LPAE))
> + return read_sysreg(TTBR0_64);
> + else
> + return (u64)read_sysreg(TTBR0_32);
> +}
> +
> +static inline void set_ttbr1(u64 val)
> +{
> + if (IS_ENABLED(CONFIG_ARM_LPAE))
> + write_sysreg(val, TTBR1_64);
> + else
> + write_sysreg(val, TTBR1_32);
> +}
> +
> +static inline u64 get_ttbr1(void)
> +{
> + if (IS_ENABLED(CONFIG_ARM_LPAE))
> + return read_sysreg(TTBR1_64);
> + else
> + return (u64)read_sysreg(TTBR1_32);
> +}
> +
Please pay attention to the project coding style whenever creating code
for a program. It doesn't matter what the project coding style is, as
long as you write your code to match the style that is already there.
For the kernel, that is: tabs not spaces for indentation of code.
You seem to be using a variable number of spaces for all the new code
above.
Some of it seems to be your email client thinking it knows better about
white space - and such behaviours basically makes patches unapplyable.
See Documentation/process/email-clients.rst for hints about email
clients.
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line in suburbia: sync at 8.8Mbps down 630kbps up
According to speedtest.net: 8.21Mbps down 510kbps up
More information about the linux-arm-kernel
mailing list