Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Aug 2023 16:38:59 GMT
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 43d74fcac058 - main - Revert "gicv3: Stop setting the esize field"
Message-ID:  <202308231638.37NGcx01023473@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=43d74fcac0589b3e6ee39bf4c2b307998aa5759d

commit 43d74fcac0589b3e6ee39bf4c2b307998aa5759d
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2023-08-23 15:34:54 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2023-08-23 16:38:20 +0000

    Revert "gicv3: Stop setting the esize field"
    
    This reverts commit 47a4b8ca96e3e18262629c05e46228c99a618487.
    
    It has the wrong differential review link
---
 sys/arm64/arm64/gicv3_its.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c
index ef73c76d2062..d67b19e7d345 100644
--- a/sys/arm64/arm64/gicv3_its.c
+++ b/sys/arm64/arm64/gicv3_its.c
@@ -557,13 +557,14 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc)
 			/* Clear the fields we will be setting */
 			reg &= ~(GITS_BASER_VALID | GITS_BASER_INDIRECT |
 			    GITS_BASER_CACHE_MASK | GITS_BASER_TYPE_MASK |
-			    GITS_BASER_PA_MASK |
+			    GITS_BASER_ESIZE_MASK | GITS_BASER_PA_MASK |
 			    GITS_BASER_SHARE_MASK | GITS_BASER_PSZ_MASK |
 			    GITS_BASER_SIZE_MASK);
 			/* Set the new values */
 			reg |= GITS_BASER_VALID |
 			    (cache << GITS_BASER_CACHE_SHIFT) |
 			    (type << GITS_BASER_TYPE_SHIFT) |
+			    ((esize - 1) << GITS_BASER_ESIZE_SHIFT) |
 			    paddr | (share << GITS_BASER_SHARE_SHIFT) |
 			    (nitspages - 1);
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308231638.37NGcx01023473>