Correctly set the 16kB page size field in the ITS BASER register. Some

new arm64 hardware, e.g. ThunderX2, seems to use this page size so was
failing to attach as the register value read back was incorrect.

While here fix the spelling on shareability.

Sponsored by:	DARPA, AFRL
This commit is contained in:
Andrew Turner 2018-02-24 10:33:31 +00:00
parent cd84455f91
commit 4f3cad09fe
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=329906

View File

@ -489,7 +489,7 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc)
break;
case PAGE_SIZE_16K: /* 16KB */
reg |=
GITS_BASER_PSZ_4K << GITS_BASER_PSZ_SHIFT;
GITS_BASER_PSZ_16K << GITS_BASER_PSZ_SHIFT;
break;
case PAGE_SIZE_64K: /* 64KB */
reg |=
@ -502,7 +502,7 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc)
/* Read back to check */
tmp = gic_its_read_8(sc, GITS_BASER(i));
/* Do the snareability masks line up? */
/* Do the shareability masks line up? */
if ((tmp & GITS_BASER_SHARE_MASK) !=
(reg & GITS_BASER_SHARE_MASK)) {
share = (tmp & GITS_BASER_SHARE_MASK) >>