Date: Sat, 24 Feb 2018 10:33:31 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329906 - head/sys/arm64/arm64 Message-ID: <201802241033.w1OAXV7i077639@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Sat Feb 24 10:33:31 2018 New Revision: 329906 URL: https://svnweb.freebsd.org/changeset/base/329906 Log: 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 Modified: head/sys/arm64/arm64/gicv3_its.c Modified: head/sys/arm64/arm64/gicv3_its.c ============================================================================== --- head/sys/arm64/arm64/gicv3_its.c Sat Feb 24 10:26:26 2018 (r329905) +++ head/sys/arm64/arm64/gicv3_its.c Sat Feb 24 10:33:31 2018 (r329906) @@ -489,7 +489,7 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_so 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_so /* 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) >>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802241033.w1OAXV7i077639>