From: Catalin Marinas <catalin.marinas@arm.com> To: Minchan Kim <minchan@kernel.org> Cc: Andrew Morton <akpm@linux-foundation.org>, linux@armlinux.org.uk, steve.capper@linaro.org, will.deacon@arm.com, linux-kernel@vger.kernel.org, android-treble-mediatek-ext@partner.android.com, kernel-team@android.com, linux-arm-kernel@lists.infradead.org, Simon Horman <horms@verge.net.au> Subject: Re: [RFC 1/3] arm: mm: reordering memory type table Date: Mon, 10 Sep 2018 17:50:11 +0100 [thread overview] Message-ID: <20180910165011.zcighyuabshsmxjb@armageddon.cambridge.arm.com> (raw) In-Reply-To: <20180906102212.218294-2-minchan@kernel.org> On Thu, Sep 06, 2018 at 07:22:10PM +0900, Minchan Kim wrote: > diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h > index 92fd2c8a9af0..91b99fadcba1 100644 > --- a/arch/arm/include/asm/pgtable-2level.h > +++ b/arch/arm/include/asm/pgtable-2level.h > @@ -164,14 +164,23 @@ > #define L_PTE_MT_BUFFERABLE (_AT(pteval_t, 0x01) << 2) /* 0001 */ > #define L_PTE_MT_WRITETHROUGH (_AT(pteval_t, 0x02) << 2) /* 0010 */ > #define L_PTE_MT_WRITEBACK (_AT(pteval_t, 0x03) << 2) /* 0011 */ > +#define L_PTE_MT_DEV_SHARED (_AT(pteval_t, 0x04) << 2) /* 0100 */ > #define L_PTE_MT_MINICACHE (_AT(pteval_t, 0x06) << 2) /* 0110 (sa1100, xscale) */ > #define L_PTE_MT_WRITEALLOC (_AT(pteval_t, 0x07) << 2) /* 0111 */ > -#define L_PTE_MT_DEV_SHARED (_AT(pteval_t, 0x04) << 2) /* 0100 */ > -#define L_PTE_MT_DEV_NONSHARED (_AT(pteval_t, 0x0c) << 2) /* 1100 */ > +#if defined(CONFIG_CPU_V7) || defined(CONFIG_CPU_V7M) || \ > + defined (CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) > +#define L_PTE_MT_DEV_WC L_PTE_MT_BUFFERABLE > +#define L_PTE_MT_DEV_CACHED L_PTE_MT_WRITEBACK > +#define L_PTE_MT_DEV_NONSHARED L_PTE_MT_MINICACHE I think you can just ignore v7M here, it doesn't have an MMU. You are defining L_PTE_MT_DEV_NONSHARED to L_PTE_MT_MINICACHE but what I think you just meant is index 6 in the cpu_v6_mt_table which I would use explicitly to avoid confusion. Anyway, on ARMv7 or ARMv6+LPAE, the non-shared device gets mapped to shared device in hardware. Looking through the arm32 code, it seems that MT_DEVICE_NONSHARED is used by arch/arm/mach-shmobile/setup-r8a7779.c and IIUC that's a v7 platform (R-Car H1, Cortex-A9). I think the above should be defined to L_PTE_MT_DEV_SHARED, unless I miss any place where DEV_NONSHARED is relevant on ARMv6 (adding Simon to confirm on shmobile). > diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S > index 81d0efb055c6..f896a30653fa 100644 > --- a/arch/arm/mm/proc-macros.S > +++ b/arch/arm/mm/proc-macros.S > @@ -134,21 +134,21 @@ > .macro armv6_mt_table pfx > \pfx\()_mt_table: Since you changed the MT index, you'd have to fix proc-v7-*levels.S as well. If you define DEV_NONSHARED to SHARED, I think you only need to update the index for L_PTE_MT_VECTORS. -- Catalin
WARNING: multiple messages have this Message-ID (diff)
From: catalin.marinas@arm.com (Catalin Marinas) To: linux-arm-kernel@lists.infradead.org Subject: [RFC 1/3] arm: mm: reordering memory type table Date: Mon, 10 Sep 2018 17:50:11 +0100 [thread overview] Message-ID: <20180910165011.zcighyuabshsmxjb@armageddon.cambridge.arm.com> (raw) In-Reply-To: <20180906102212.218294-2-minchan@kernel.org> On Thu, Sep 06, 2018 at 07:22:10PM +0900, Minchan Kim wrote: > diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h > index 92fd2c8a9af0..91b99fadcba1 100644 > --- a/arch/arm/include/asm/pgtable-2level.h > +++ b/arch/arm/include/asm/pgtable-2level.h > @@ -164,14 +164,23 @@ > #define L_PTE_MT_BUFFERABLE (_AT(pteval_t, 0x01) << 2) /* 0001 */ > #define L_PTE_MT_WRITETHROUGH (_AT(pteval_t, 0x02) << 2) /* 0010 */ > #define L_PTE_MT_WRITEBACK (_AT(pteval_t, 0x03) << 2) /* 0011 */ > +#define L_PTE_MT_DEV_SHARED (_AT(pteval_t, 0x04) << 2) /* 0100 */ > #define L_PTE_MT_MINICACHE (_AT(pteval_t, 0x06) << 2) /* 0110 (sa1100, xscale) */ > #define L_PTE_MT_WRITEALLOC (_AT(pteval_t, 0x07) << 2) /* 0111 */ > -#define L_PTE_MT_DEV_SHARED (_AT(pteval_t, 0x04) << 2) /* 0100 */ > -#define L_PTE_MT_DEV_NONSHARED (_AT(pteval_t, 0x0c) << 2) /* 1100 */ > +#if defined(CONFIG_CPU_V7) || defined(CONFIG_CPU_V7M) || \ > + defined (CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) > +#define L_PTE_MT_DEV_WC L_PTE_MT_BUFFERABLE > +#define L_PTE_MT_DEV_CACHED L_PTE_MT_WRITEBACK > +#define L_PTE_MT_DEV_NONSHARED L_PTE_MT_MINICACHE I think you can just ignore v7M here, it doesn't have an MMU. You are defining L_PTE_MT_DEV_NONSHARED to L_PTE_MT_MINICACHE but what I think you just meant is index 6 in the cpu_v6_mt_table which I would use explicitly to avoid confusion. Anyway, on ARMv7 or ARMv6+LPAE, the non-shared device gets mapped to shared device in hardware. Looking through the arm32 code, it seems that MT_DEVICE_NONSHARED is used by arch/arm/mach-shmobile/setup-r8a7779.c and IIUC that's a v7 platform (R-Car H1, Cortex-A9). I think the above should be defined to L_PTE_MT_DEV_SHARED, unless I miss any place where DEV_NONSHARED is relevant on ARMv6 (adding Simon to confirm on shmobile). > diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S > index 81d0efb055c6..f896a30653fa 100644 > --- a/arch/arm/mm/proc-macros.S > +++ b/arch/arm/mm/proc-macros.S > @@ -134,21 +134,21 @@ > .macro armv6_mt_table pfx > \pfx\()_mt_table: Since you changed the MT index, you'd have to fix proc-v7-*levels.S as well. If you define DEV_NONSHARED to SHARED, I think you only need to update the index for L_PTE_MT_VECTORS. -- Catalin
next prev parent reply other threads:[~2018-09-10 16:50 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-09-06 10:22 [RFC 0/3] arm: support get_user_pages_fast Minchan Kim 2018-09-06 10:22 ` Minchan Kim 2018-09-06 10:22 ` [RFC 1/3] arm: mm: reordering memory type table Minchan Kim 2018-09-06 10:22 ` Minchan Kim 2018-09-10 16:50 ` Catalin Marinas [this message] 2018-09-10 16:50 ` Catalin Marinas 2018-09-14 6:26 ` Minchan Kim 2018-09-14 6:26 ` Minchan Kim 2018-09-06 10:22 ` [RFC 2/3] arm: mm: introduce L_PTE_SPECIAL Minchan Kim 2018-09-06 10:22 ` Minchan Kim 2018-09-06 10:22 ` [RFC 3/3] arm: mm: support get_user_pages_fast Minchan Kim 2018-09-06 10:22 ` Minchan Kim
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=20180910165011.zcighyuabshsmxjb@armageddon.cambridge.arm.com \ --to=catalin.marinas@arm.com \ --cc=akpm@linux-foundation.org \ --cc=android-treble-mediatek-ext@partner.android.com \ --cc=horms@verge.net.au \ --cc=kernel-team@android.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=minchan@kernel.org \ --cc=steve.capper@linaro.org \ --cc=will.deacon@arm.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.