mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: Sascha Hauer <s.hauer@pengutronix.de>,
	Barebox List <barebox@lists.infradead.org>
Subject: Re: [PATCH v2 28/34] ARM: mmu32: Add pte_flags_to_pmd()
Date: Wed, 17 May 2023 15:43:51 +0200	[thread overview]
Message-ID: <bfd18996-6881-c9b8-8d3e-2842dfc67368@pengutronix.de> (raw)
In-Reply-To: <20230517090340.3954615-29-s.hauer@pengutronix.de>

On 17.05.23 11:03, Sascha Hauer wrote:
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  arch/arm/cpu/mmu_32.c | 35 +++++++++++++++++++++++++++++------
>  1 file changed, 29 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm/cpu/mmu_32.c b/arch/arm/cpu/mmu_32.c
> index 4abaab7d87..0af89ac39c 100644
> --- a/arch/arm/cpu/mmu_32.c
> +++ b/arch/arm/cpu/mmu_32.c
> @@ -187,30 +187,53 @@ static u32 pmd_flags_to_pte(u32 pmd)
>  	return pte;
>  }
>  
> +static u32 pte_flags_to_pmd(u32 pte)
> +{
> +	u32 pmd = 0;
> +
> +	if (pte & PTE_BUFFERABLE)
> +		pmd |= PMD_SECT_BUFFERABLE;
> +	if (pte & PTE_CACHEABLE)
> +		pmd |= PMD_SECT_CACHEABLE;
> +
> +	if (cpu_architecture() >= CPU_ARCH_ARMv7) {
> +		if (pte & PTE_EXT_NG)
> +			pmd |= PMD_SECT_nG;
> +		if (pte & PTE_EXT_XN)
> +			pmd |= PMD_SECT_XN;

Note that at least,  <asm/pgtable.h> claims these bits are v6+:

#define PTE_EXT_XN		(1 << 0)	/* v6 */
#define PMD_SECT_nG		(1 << 17)	/* v6 */


> +
> +		/* TEX[2:0] */
> +		pmd |= ((pte >> 6) & 7) << 12;
> +		/* AP[1:0] */
> +		pmd |= ((pte >> 4) & 0x3) << 10;
> +		/* AP[2] */
> +		pmd |= ((pte >> 9) & 0x1) << 15;
> +	} else {
> +		pmd |= PMD_SECT_AP_WRITE | PMD_SECT_AP_READ;
> +	}
> +
> +	return pmd;
> +}
> +
>  int arch_remap_range(void *start, size_t size, unsigned flags)
>  {
>  	u32 addr = (u32)start;
>  	u32 pte_flags;
> -	u32 pgd_flags;
>  
>  	BUG_ON(!IS_ALIGNED(addr, PAGE_SIZE));
>  
>  	switch (flags) {
>  	case MAP_CACHED:
>  		pte_flags = pte_flags_cached;
> -		pgd_flags = PMD_SECT_DEF_CACHED;
>  		break;
>  	case MAP_UNCACHED:
>  		pte_flags = pte_flags_uncached;
> -		pgd_flags = pgd_flags_uncached;
>  		break;
>  	case MAP_FAULT:
>  		pte_flags = 0x0;
> -		pgd_flags = 0x0;
>  		break;
>  	case ARCH_MAP_WRITECOMBINE:
>  		pte_flags = pte_flags_wc;
> -		pgd_flags = pgd_flags_wc;
>  		break;
>  	default:
>  		return -EINVAL;
> @@ -228,7 +251,7 @@ int arch_remap_range(void *start, size_t size, unsigned flags)
>  			 * replace it with a section
>  			 */
>  			chunk = PGDIR_SIZE;
> -			*pgd = addr | pgd_flags;
> +			*pgd = addr | pte_flags_to_pmd(pte_flags) | PMD_TYPE_SECT;
>  			dma_flush_range(pgd, sizeof(*pgd));
>  		} else {
>  			unsigned int num_ptes;

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |




  reply	other threads:[~2023-05-17 13:45 UTC|newest]

Thread overview: 68+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-17  9:03 [PATCH v2 00/34] ARM: MMU rework Sascha Hauer
2023-05-17  9:03 ` [PATCH v2 01/34] ARM: remove unused membase argument Sascha Hauer
2023-05-17 12:45   ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 02/34] ARM: remove unused define Sascha Hauer
2023-05-17 12:45   ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 03/34] ARM: rename __arm_mem_scratch to arm_mem_scratch Sascha Hauer
2023-05-17 12:46   ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 04/34] ARM: put scratch mem area below OP-TEE Sascha Hauer
2023-05-17 12:48   ` Ahmad Fatoum
2023-05-17 13:14     ` Sascha Hauer
2023-05-17 15:50       ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 05/34] ARM: add arm_mem_optee() Sascha Hauer
2023-05-17 12:53   ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 06/34] ARM: make arm_mem_scratch() a static inline function Sascha Hauer
2023-05-17 12:53   ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 07/34] ARM: define stack base consistently Sascha Hauer
2023-05-17 12:55   ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 08/34] ARM: move arm_mem_scratch_get() lower for consistency Sascha Hauer
2023-05-17 12:57   ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 09/34] ARM: drop cache function initialization Sascha Hauer
2023-05-17  9:03 ` [PATCH v2 10/34] ARM: Add _32 suffix to aarch32 specific filenames Sascha Hauer
2023-05-17  9:03 ` [PATCH v2 11/34] ARM: cpu.c: remove unused include Sascha Hauer
2023-05-17  9:03 ` [PATCH v2 12/34] ARM: mmu-common.c: use common mmu include Sascha Hauer
2023-05-17  9:03 ` [PATCH v2 13/34] ARM: mmu32: rename mmu.h to mmu_32.h Sascha Hauer
2023-05-17  9:03 ` [PATCH v2 14/34] ARM: mmu: implement MAP_FAULT Sascha Hauer
2023-05-17  9:03 ` [PATCH v2 15/34] ARM: mmu64: Use arch_remap_range where possible Sascha Hauer
2023-05-17  9:03 ` [PATCH v2 16/34] ARM: mmu32: implement zero_page_*() Sascha Hauer
2023-05-17  9:03 ` [PATCH v2 17/34] ARM: i.MX: Drop HAB workaround Sascha Hauer
2023-05-17 13:01   ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 18/34] ARM: Move early MMU after malloc initialization Sascha Hauer
2023-05-17  9:03 ` [PATCH v2 19/34] ARM: mmu: move dma_sync_single_for_device to extra file Sascha Hauer
2023-05-17  9:03 ` [PATCH v2 20/34] ARM: mmu: merge mmu-early_xx.c into mmu_xx.c Sascha Hauer
2023-05-17  9:03 ` [PATCH v2 21/34] ARM: mmu: alloc 64k for early page tables Sascha Hauer
2023-05-17 13:03   ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 22/34] ARM: mmu32: create alloc_pte() Sascha Hauer
2023-05-17 13:07   ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 23/34] ARM: mmu64: " Sascha Hauer
2023-05-17 13:15   ` Ahmad Fatoum
2023-05-17 13:17   ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 24/34] ARM: mmu: drop ttb argument Sascha Hauer
2023-05-17 13:23   ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 25/34] ARM: mmu: always do MMU initialization early when MMU is enabled Sascha Hauer
2023-05-17 13:29   ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 26/34] ARM: mmu32: Assume MMU is on Sascha Hauer
2023-05-17 13:36   ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 27/34] ARM: mmu32: Fix pmd_flags_to_pte() for ARMv4/5/6 Sascha Hauer
2023-05-17 13:39   ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 28/34] ARM: mmu32: Add pte_flags_to_pmd() Sascha Hauer
2023-05-17 13:43   ` Ahmad Fatoum [this message]
2023-05-17 14:44     ` Sascha Hauer
2023-05-17  9:03 ` [PATCH v2 29/34] ARM: mmu32: add get_pte_flags, get_pmd_flags Sascha Hauer
2023-05-17 13:46   ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 30/34] ARM: mmu32: move functions into c file Sascha Hauer
2023-05-17 13:48   ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 31/34] ARM: mmu32: read TTB value from register Sascha Hauer
2023-05-17 13:58   ` Ahmad Fatoum
2023-05-17 14:39     ` Sascha Hauer
2023-05-19  6:53       ` Ahmad Fatoum
2023-05-19  7:44         ` Sascha Hauer
2023-05-19  7:52           ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 32/34] ARM: mmu32: Use pages for early MMU setup Sascha Hauer
2023-05-17 14:21   ` Ahmad Fatoum
2023-05-22  8:14     ` Sascha Hauer
2023-05-17  9:03 ` [PATCH v2 33/34] ARM: mmu32: Skip reserved ranges during initialization Sascha Hauer
2023-05-17 14:43   ` Ahmad Fatoum
2023-05-17 14:55     ` Sascha Hauer
2023-05-17 15:56       ` Ahmad Fatoum
2023-05-17  9:03 ` [PATCH v2 34/34] ARM: mmu64: Use two level pagetables in early code Sascha Hauer

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=bfd18996-6881-c9b8-8d3e-2842dfc67368@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=s.hauer@pengutronix.de \
    /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