From owner-svn-src-all@freebsd.org Sat Feb 24 10:33:32 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1D5AEF2AB5A; Sat, 24 Feb 2018 10:33:32 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C11487A2B7; Sat, 24 Feb 2018 10:33:31 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BBCFC245AB; Sat, 24 Feb 2018 10:33:31 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1OAXV1o077640; Sat, 24 Feb 2018 10:33:31 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1OAXV7i077639; Sat, 24 Feb 2018 10:33:31 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201802241033.w1OAXV7i077639@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Sat, 24 Feb 2018 10:33:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329906 - head/sys/arm64/arm64 X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: head/sys/arm64/arm64 X-SVN-Commit-Revision: 329906 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Feb 2018 10:33:32 -0000 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) >>