71 lines
2.2 KiB
Diff
71 lines
2.2 KiB
Diff
|
From c64da6a3c2950b925e95fb892e381ce89a869c8e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Marek Szyprowski <m.szyprowski@samsung.com>
|
||
|
|
Date: Mon, 4 May 2020 14:45:18 +0200
|
||
|
|
Subject: [PATCH] rpi4: add a mapping for the PCIe XHCI controller MMIO
|
||
|
|
registers (ARM 64bit)
|
||
|
|
|
||
|
|
Create a non-cacheable mapping for the 0x600000000 physical memory region,
|
||
|
|
where MMIO registers for the PCIe XHCI controller are instantiated by the
|
||
|
|
PCIe bridge.
|
||
|
|
|
||
|
|
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
|
||
|
|
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
|
||
|
|
Reviewed-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
||
|
|
---
|
||
|
|
arch/arm/mach-bcm283x/init.c | 18 +++++++++++++++---
|
||
|
|
1 file changed, 15 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/arm/mach-bcm283x/init.c b/arch/arm/mach-bcm283x/init.c
|
||
|
|
index 42953561a7..6a748da171 100644
|
||
|
|
--- a/arch/arm/mach-bcm283x/init.c
|
||
|
|
+++ b/arch/arm/mach-bcm283x/init.c
|
||
|
|
@@ -11,10 +11,15 @@
|
||
|
|
#include <dm/device.h>
|
||
|
|
#include <fdt_support.h>
|
||
|
|
|
||
|
|
+#define BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS 0x600000000UL
|
||
|
|
+#define BCM2711_RPI4_PCIE_XHCI_MMIO_SIZE 0x800000UL
|
||
|
|
+
|
||
|
|
#ifdef CONFIG_ARM64
|
||
|
|
#include <asm/armv8/mmu.h>
|
||
|
|
|
||
|
|
-static struct mm_region bcm283x_mem_map[] = {
|
||
|
|
+#define MAX_MAP_MAX_ENTRIES (4)
|
||
|
|
+
|
||
|
|
+static struct mm_region bcm283x_mem_map[MAX_MAP_MAX_ENTRIES] = {
|
||
|
|
{
|
||
|
|
.virt = 0x00000000UL,
|
||
|
|
.phys = 0x00000000UL,
|
||
|
|
@@ -34,7 +39,7 @@ static struct mm_region bcm283x_mem_map[] = {
|
||
|
|
}
|
||
|
|
};
|
||
|
|
|
||
|
|
-static struct mm_region bcm2711_mem_map[] = {
|
||
|
|
+static struct mm_region bcm2711_mem_map[MAX_MAP_MAX_ENTRIES] = {
|
||
|
|
{
|
||
|
|
.virt = 0x00000000UL,
|
||
|
|
.phys = 0x00000000UL,
|
||
|
|
@@ -48,6 +53,13 @@ static struct mm_region bcm2711_mem_map[] = {
|
||
|
|
.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
|
||
|
|
PTE_BLOCK_NON_SHARE |
|
||
|
|
PTE_BLOCK_PXN | PTE_BLOCK_UXN
|
||
|
|
+ }, {
|
||
|
|
+ .virt = BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS,
|
||
|
|
+ .phys = BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS,
|
||
|
|
+ .size = BCM2711_RPI4_PCIE_XHCI_MMIO_SIZE,
|
||
|
|
+ .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
|
||
|
|
+ PTE_BLOCK_NON_SHARE |
|
||
|
|
+ PTE_BLOCK_PXN | PTE_BLOCK_UXN
|
||
|
|
}, {
|
||
|
|
/* List terminator */
|
||
|
|
0,
|
||
|
|
@@ -71,7 +83,7 @@ static void _rpi_update_mem_map(struct mm_region *pd)
|
||
|
|
{
|
||
|
|
int i;
|
||
|
|
|
||
|
|
- for (i = 0; i < 2; i++) {
|
||
|
|
+ for (i = 0; i < MAX_MAP_MAX_ENTRIES; i++) {
|
||
|
|
mem_map[i].virt = pd[i].virt;
|
||
|
|
mem_map[i].phys = pd[i].phys;
|
||
|
|
mem_map[i].size = pd[i].size;
|