diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-09-03 16:34:15 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-09-04 15:32:22 +0200 |
| commit | bcaabe6d0586fabab72aa1fc6c06b8f83b6dfa0c (patch) | |
| tree | a14ee2d05b866a146be2544c04b795eb5c2c68a8 /target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch | |
| parent | 8d24ea3f31b4e60a342e579e3218e1adc282dba3 (diff) | |
| download | upstream-bcaabe6d0586fabab72aa1fc6c06b8f83b6dfa0c.tar.gz upstream-bcaabe6d0586fabab72aa1fc6c06b8f83b6dfa0c.tar.bz2 upstream-bcaabe6d0586fabab72aa1fc6c06b8f83b6dfa0c.zip | |
kernel: bump 5.4 to 5.4.211
Similar version was upstreamed:
bcm27xx/patches-5.4/950-0392-tty-amba-pl011-Add-un-throttle-support.patch
Manually adapted:
ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch
layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch
Compile-tested: x86/64
Run-tested: x86/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch b/target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch index e2da01fb0f..f232198319 100644 --- a/target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch +++ b/target/linux/layerscape/patches-5.4/301-arch-0008-arm-add-new-non-shareable-ioremap.patch @@ -63,8 +63,8 @@ Signed-off-by: Roy Pledge <roy.pledge@nxp.com> * address space as memory. Needed when the kernel wants to execute --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c -@@ -316,6 +316,13 @@ static struct mem_type mem_types[] __ro_ - .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE, +@@ -323,6 +323,13 @@ static struct mem_type mem_types[] __ro_ + .prot_sect = PMD_TYPE_SECT, .domain = DOMAIN_KERNEL, }, + [MT_MEMORY_RW_NS] = { @@ -77,7 +77,7 @@ Signed-off-by: Roy Pledge <roy.pledge@nxp.com> [MT_ROM] = { .prot_sect = PMD_TYPE_SECT, .domain = DOMAIN_KERNEL, -@@ -652,6 +659,7 @@ static void __init build_mem_type_table( +@@ -663,6 +670,7 @@ static void __init build_mem_type_table( } kern_pgprot |= PTE_EXT_AF; vecs_pgprot |= PTE_EXT_AF; @@ -85,11 +85,11 @@ Signed-off-by: Roy Pledge <roy.pledge@nxp.com> /* * Set PXN for user mappings -@@ -680,6 +688,7 @@ static void __init build_mem_type_table( +@@ -691,6 +699,7 @@ static void __init build_mem_type_table( mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot; mem_types[MT_MEMORY_RW].prot_sect |= ecc_mask | cp->pmd; mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot; + mem_types[MT_MEMORY_RW_NS].prot_sect |= ecc_mask | cp->pmd; + mem_types[MT_MEMORY_RO].prot_sect |= ecc_mask | cp->pmd; + mem_types[MT_MEMORY_RO].prot_pte |= kern_pgprot; mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot; - mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask; - mem_types[MT_ROM].prot_sect |= cp->pmd; |