From 1646b6b055572ffe7fb6b11d44e5702207bb4fa8 Mon Sep 17 00:00:00 2001 From: patrick Date: Mon, 1 Mar 2021 21:38:20 +0000 Subject: [PATCH] Update the MSI addresses for the Armada 8040. This chunk will only be there until we have a proper way of making the MSI pages available. --- sys/arch/arm64/dev/smmu.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/arch/arm64/dev/smmu.c b/sys/arch/arm64/dev/smmu.c index fd5fbd80615..5be66346c1c 100644 --- a/sys/arch/arm64/dev/smmu.c +++ b/sys/arch/arm64/dev/smmu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smmu.c,v 1.2 2021/03/01 21:35:03 patrick Exp $ */ +/* $OpenBSD: smmu.c,v 1.3 2021/03/01 21:38:20 patrick Exp $ */ /* * Copyright (c) 2008-2009,2014-2016 Dale Rahn * Copyright (c) 2021 Patrick Wildt @@ -774,14 +774,18 @@ smmu_domain_create(struct smmu_softc *sc, uint32_t sid) paddr_t msi_pa = 0x78020000; /* Ampere */ paddr_t msi_pa = 0x6020000; /* LX2K */ size_t msi_len = 0x20000; - paddr_t msi_pa = 0x280000; /* 8040 */ - size_t msi_len = 0x4000; + paddr_t msi_pa = 0xf0280000; /* 8040 GICv2 */ + size_t msi_len = 0x40000; while (msi_len) { smmu_enter(dom, msi_pa, msi_pa, PROT_READ | PROT_WRITE, PROT_READ | PROT_WRITE, PMAP_CACHE_WB); msi_pa += PAGE_SIZE; msi_len -= PAGE_SIZE; } + msi_pa = 0xf03f0000; /* 8040 GICP */ + msi_len = 0x1000; + smmu_enter(dom, msi_pa, msi_pa, PROT_READ | PROT_WRITE, + PROT_READ | PROT_WRITE, PMAP_CACHE_WB); } #endif -- 2.20.1