From nobody Mon Jan 23 12:37:27 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P0qPM6dvCz3bSmt; Mon, 23 Jan 2023 12:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P0qPM3nxcz3Brm; Mon, 23 Jan 2023 12:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674477447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fr6mM00/SxRTegqvi9tBaP9Xhxl/h9p3IBaUHCM2/PE=; b=Ud5gu1s2XeOJ5VFF3tFEet8d4ZPg+F7SNdPMPwrZxn4+hdYx/UdhOXmoq936iXcM4vKO7h 3ONtyicwJtvt1rUB4WTNMZCnUrjVtZi7MJszLX1YuQgAjCbqSO43oNdkUh2vkcWMAazX8j fknGKDyQMSQOcB6Tt9ZzWKWUPVgxdR/01qMs3C/n5j7dA3vz/j3YoAVbxEk3NWKKVTLWLk LgxFnIfvf5j6vRRmvWxFfx8smwlqVB410i35HRbnaoqwFg9nYwrqiGGv1Q55DGLnqj86hT 9HzA/QlNUkx8sBXLfEkSF/8UzqDB8pmzGGQCWqnjGufwSD9nxGBnypFU1/F6qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674477447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fr6mM00/SxRTegqvi9tBaP9Xhxl/h9p3IBaUHCM2/PE=; b=j1OfD07jMkChvX1pY0TKmKeaZDUjc3USCG8CovBAhRvS+KDSplEKqSUMsASOU3SQ6tzC5y K+yYlCUCFCnbAznZtk1TfCYQhJR49XIRTSV16jeM3bpl/7gangO57jGRXYF0gI5BJ3q2tw PvIuQuu/BMFh5f7HU1pre6ploiqodC0wBp8mJ3CWZFoPb8sOnfTF89pV1zi7lNLnVCD9XY WgOpptB7UwiYjBMQRNUpSOHmOwMskNMCFatrDMxnJNVh4Du2QV++p3Y2ghFnAVYAtsQa/I 6MwNO/PXUUm9EVYdFwQDomL7huPcL/5oJ1opV4y6adYSyVGPHPcsgIxqoVR0aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674477447; a=rsa-sha256; cv=none; b=rlvaFWpZO5d8pW6422iKmSMsB3gjN4HV5LkkRTGg6brzET/Ok9Km498LiizJYNH+2pL9FB xqa9SBrywx1xClqq3tT4HF2UcjiUGsuor/AxjfvjzVq4TFpEklDDh6hxjYIkatwyS+kpOP /AscefD0i0yJnMTmy+Ln9IjA2+WvbQ5KhfqK2mHvS+TSfnzOtU7EvgQyt938XyOnrk1YE5 wZlwGvC4ndOTCRX3naqzr38EJFzn6fGSXmTOA7oRl9ZzGLP+KS72CYmOy6FGXHpnL91Fvw fSQG3C8WEbCuzNEgSmdzhafpPRZWPqH5wnG3ih7NL6yoVhOVOFu/t9iH5Y2ppw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P0qPM2cnTzV3Z; Mon, 23 Jan 2023 12:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30NCbRPl085106; Mon, 23 Jan 2023 12:37:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NCbRAU085105; Mon, 23 Jan 2023 12:37:27 GMT (envelope-from git) Date: Mon, 23 Jan 2023 12:37:27 GMT Message-Id: <202301231237.30NCbRAU085105@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 39c064581757 - stable/13 - Clear the indirect flag in the GICv3 ITS driver List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 39c0645817579e56683d00d38d3290a2c0b5f2cf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=39c0645817579e56683d00d38d3290a2c0b5f2cf commit 39c0645817579e56683d00d38d3290a2c0b5f2cf Author: Andrew Turner AuthorDate: 2022-10-04 11:46:24 +0000 Commit: Andrew Turner CommitDate: 2023-01-23 12:36:27 +0000 Clear the indirect flag in the GICv3 ITS driver Summary: The indirect flag tells the hardware to use a flat or two level table. As we only support using the flat table ensure the flag that marks which is in use is set correctly. We can't rely on this being set correctly as some firmware may set the indirect flag, e.g. booting from LinuxBoot. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D36873 (cherry picked from commit a0a4f5cf17236c7245250d1a9ec6fe39286f4a25) --- sys/arm64/arm64/gic_v3_reg.h | 3 +++ sys/arm64/arm64/gicv3_its.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/gic_v3_reg.h b/sys/arm64/arm64/gic_v3_reg.h index 94033d28cb01..b52fd0389d7f 100644 --- a/sys/arm64/arm64/gic_v3_reg.h +++ b/sys/arm64/arm64/gic_v3_reg.h @@ -351,6 +351,9 @@ #define GITS_BASER_VALID (1UL << 63) +#define GITS_BASER_INDIRECT_SHIFT 62 +#define GITS_BASER_INDIRECT (1UL << GITS_BASER_INDIRECT_SHIFT) + #define GITS_BASER_TYPE_SHIFT 56 #define GITS_BASER_TYPE(x) \ (((x) & GITS_BASER_TYPE_MASK) >> GITS_BASER_TYPE_SHIFT) diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index 82fd57cb42e8..afc334b91e7d 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -498,7 +498,7 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) nitspages = howmany(its_tbl_size, page_size); /* Clear the fields we will be setting */ - reg &= ~(GITS_BASER_VALID | + reg &= ~(GITS_BASER_VALID | GITS_BASER_INDIRECT | GITS_BASER_CACHE_MASK | GITS_BASER_TYPE_MASK | GITS_BASER_ESIZE_MASK | GITS_BASER_PA_MASK | GITS_BASER_SHARE_MASK | GITS_BASER_PSZ_MASK |