CVS commit: src/sys/arch/arm/acpi

[Jared D. McNeill]

Module Name:    src
Committed By:   jmcneill
Date:           Thu Aug  1 18:59:11 UTC 2019

Modified Files:
        src/sys/arch/arm/acpi: acpi_machdep.c

Log Message:
Always map ACPI table memory as normal memory. Always map device memory as 
device memory.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/acpi/acpi_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/arm/acpi/acpi_machdep.c
diff -u src/sys/arch/arm/acpi/acpi_machdep.c:1.7 src/sys/arch/arm/acpi/acpi_machdep.c:1.8
--- src/sys/arch/arm/acpi/acpi_machdep.c:1.7	Thu Aug  1 13:13:51 2019
+++ src/sys/arch/arm/acpi/acpi_machdep.c	Thu Aug  1 18:59:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.c,v 1.7 2019/08/01 13:13:51 jmcneill Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.8 2019/08/01 18:59:10 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include "pci.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.7 2019/08/01 13:13:51 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.8 2019/08/01 18:59:10 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -74,21 +74,31 @@ acpi_md_pmapflags(paddr_t pa)
 		return 0;
 
 	while (len >= 28) {
+		const uint32_t type = be32dec(&map[0]);
 		const uint64_t phys_start = be64dec(&map[1]);
 		const uint64_t num_pages = be64dec(&map[3]);
 		const uint64_t attr = be64dec(&map[5]);
 
 		if (pa >= phys_start && pa < phys_start + (num_pages * EFI_PAGE_SIZE)) {
-			if ((attr & EFI_MD_ATTR_UC) != 0)
-				return PMAP_DEV;	/* Not cacheable means Device-nGnRnE */
-			else if ((attr & EFI_MD_ATTR_WC) != 0)
-				return PMAP_WRITE_COMBINE;
-			else if ((attr & EFI_MD_ATTR_WT) != 0)
-				return 0;	/* XXX */
-			else if ((attr & EFI_MD_ATTR_WB) != 0)
+			switch (type) {
+			case EFI_MD_TYPE_RECLAIM:
+				/* ACPI table memory */
 				return PMAP_WRITE_BACK;
-			else
+
+			case EFI_MD_TYPE_IOMEM:
+			case EFI_MD_TYPE_IOPORT:
+				return PMAP_DEV;
+
+			default:
+				if ((attr & EFI_MD_ATTR_WB) != 0)
+					return PMAP_WRITE_BACK;
+				else if ((attr & EFI_MD_ATTR_WC) != 0)
+					return PMAP_WRITE_COMBINE;
+				else if ((attr & EFI_MD_ATTR_WT) != 0)
+					return 0;	/* XXX */
+
 				return PMAP_DEV;
+			}
 		}
 
 		map += 7;