git: 42f71007d5c9 - Use the new PAGE_SIZE_4K in the GICv3 driver

[Andrew Turner]

The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=42f71007d5c92e42c9e3ad763ca371801c48432b

commit 42f71007d5c92e42c9e3ad763ca371801c48432b
Author:     Andrew Turner <andrew at FreeBSD.org>
AuthorDate: 2020-12-23 09:49:53 +0000
Commit:     Andrew Turner <andrew at FreeBSD.org>
CommitDate: 2020-12-23 13:10:26 +0000

    Use the new PAGE_SIZE_4K in the GICv3 driver
    
    Stop assuming PAGE_SIZE is 4k in the GICv3 ITS driver. We could use
    a 16k or 64k page in the future.
    
    Sponsored by:   Innovate UK
---
 sys/arm64/arm64/gicv3_its.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c
index 2c9a7dae77a2..061d5a1dbdb9 100644
--- a/sys/arm64/arm64/gicv3_its.c
+++ b/sys/arm64/arm64/gicv3_its.c
@@ -513,7 +513,7 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc)
 			    (nitspages - 1);
 
 			switch (page_size) {
-			case PAGE_SIZE:		/* 4KB */
+			case PAGE_SIZE_4K:	/* 4KB */
 				reg |=
 				    GITS_BASER_PSZ_4K << GITS_BASER_PSZ_SHIFT;
 				break;
@@ -544,7 +544,7 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc)
 			    (reg & GITS_BASER_PSZ_MASK)) {
 				switch (page_size) {
 				case PAGE_SIZE_16K:
-					page_size = PAGE_SIZE;
+					page_size = PAGE_SIZE_4K;
 					continue;
 				case PAGE_SIZE_64K:
 					page_size = PAGE_SIZE_16K;