From nobody Mon Sep 25 11:01:13 2023 X-Original-To: dev-commits-src-all@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 4RvKgF4ZYwz4vNh7; Mon, 25 Sep 2023 11:01:13 +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 4RvKgF2xkfz3NLg; Mon, 25 Sep 2023 11:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695639673; 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=mahipoSA2gYWuBN3SSc+VCsCwzoPmSn1qW2ULbZg+ss=; b=Rz/uzlNsSUunN/36fIqpL5IFVp/q7MqnDIzE+j4ebbGwKsIeESukZc+sO1rB+/W6XivXvo oCOuBZX4uKSLfkJYUB0+Wnf/mTBB0R0XarcK1qreGiiEf2aiK4LcXgdc0mljT5VDfVndIH h61SxbiywfQLPTx9o5hIIYjtKln4m0h9oIPuV+bVDhGLMEU+m0U5+/c52rCHRXjBhqoEOj Ji8vCpJ95M8Pb7ZmOxMd5nNQMupQpkChSrcCRoAuxTUJtbaMytD3SvEsshOd7i1v+9DB5S C0ItrvDA6BqAGr1mCeU8E5WurXEVsCkwSIQ4rNGCZhd2KRGiodmPIkXNYxQcAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695639673; a=rsa-sha256; cv=none; b=ptHLa574Px0Y/Ae2NATMuSKxynKjeEhOLA8nLqu8cbvV9RfsA0NZNfZ1f1tuGBKrlzZwy/ p2nBCksY4bcSXzx2tGLhUcx+sObf02xL/+fjX9DVwWXdDgqs9JkiJZnIM8ne2tqDMxV6wM FVZUaWmWs/yZwQ1GWkNGbO7Idgz89jKb555EG3lkOdZMXGOWiz+jexolgaS4SVT/LiANfQ MZX0JO03L25Ob+6+Pkn9EfbXmwGn7TeeaRxjELvoD9KRLpqL0Bl5h/PeE+P24nq7eyFgS4 Bgx5xpOp03M2qXQiJNMyI3toDoptE325iilSjy084CJ/ALB/LAgRkL1R2x6odA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695639673; 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=mahipoSA2gYWuBN3SSc+VCsCwzoPmSn1qW2ULbZg+ss=; b=nmdWfo/dG2Odw7bXJD+14OJdfDXntPlpGDMizBrl1C24kAkz8ecWbOxmkd045ILp8XBZhe ZjIp+20gjds40aFgT9g6FEc6tDfJ+XXtubQB9y5fCewg6IKvgWRaLcqURcEmYVundelSZi 0bOrsG21qwPR5viXghiMyPF+vGBlwE5CWYd/DJQEzB0Phkb87eanratIr5h3jrym0u9L9i h69wst0Brhu9Hhqcxx2v6CukeKm4Vja//ByxfBXwRhQikBTfQ9x/ao2Z+c8aNqzYX09qXS 6/Wb7xPg51a+Ip8wf1LEHqhbXrNdx8yS/06VLlUtty/OQxw4rms22Bk17L3s6w== 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 4RvKgF23DQz1QjV; Mon, 25 Sep 2023 11:01:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38PB1DKP053578; Mon, 25 Sep 2023 11:01:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38PB1D1n053574; Mon, 25 Sep 2023 11:01:13 GMT (envelope-from git) Date: Mon, 25 Sep 2023 11:01:13 GMT Message-Id: <202309251101.38PB1D1n053574@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: 90ab0c7356b6 - stable/13 - gicv3: Split out finding the page size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 90ab0c7356b648584303a26b75b3ee793c27436f Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=90ab0c7356b648584303a26b75b3ee793c27436f commit 90ab0c7356b648584303a26b75b3ee793c27436f Author: Andrew Turner AuthorDate: 2023-08-22 10:51:26 +0000 Commit: Andrew Turner CommitDate: 2023-09-25 10:50:14 +0000 gicv3: Split out finding the page size When adding indirect (2 level) tabled we will need to know the page size to calculate the size of the level 1 table. To allow for this find the page size before entering the loop to calculate the final register value. Reviewed by: gallatin, imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41551 (cherry picked from commit 3fc4f7c88085dc94c88348839074b8db6f19fae1) --- sys/arm64/arm64/gicv3_its.c | 72 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 58 insertions(+), 14 deletions(-) diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index 677e40877ac9..2747bf7f4ce3 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -421,6 +421,52 @@ gicv3_its_cmdq_init(struct gicv3_its_softc *sc) gic_its_write_8(sc, GITS_CWRITER, 0x0); } +static int +gicv3_its_table_page_size(struct gicv3_its_softc *sc, int table) +{ + uint64_t reg, tmp; + int page_size; + + page_size = PAGE_SIZE_64K; + reg = gic_its_read_8(sc, GITS_BASER(table)); + + while (1) { + reg &= GITS_BASER_PSZ_MASK; + switch (page_size) { + case PAGE_SIZE_4K: /* 4KB */ + reg |= GITS_BASER_PSZ_4K << GITS_BASER_PSZ_SHIFT; + break; + case PAGE_SIZE_16K: /* 16KB */ + reg |= GITS_BASER_PSZ_16K << GITS_BASER_PSZ_SHIFT; + break; + case PAGE_SIZE_64K: /* 64KB */ + reg |= GITS_BASER_PSZ_64K << GITS_BASER_PSZ_SHIFT; + break; + } + + /* Write the new page size */ + gic_its_write_8(sc, GITS_BASER(table), reg); + + /* Read back to check */ + tmp = gic_its_read_8(sc, GITS_BASER(table)); + + /* The page size is correct */ + if ((tmp & GITS_BASER_PSZ_MASK) == (reg & GITS_BASER_PSZ_MASK)) + return (page_size); + + switch (page_size) { + default: + return (-1); + case PAGE_SIZE_16K: + page_size = PAGE_SIZE_4K; + break; + case PAGE_SIZE_64K: + page_size = PAGE_SIZE_16K; + break; + } + } +} + static int gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) { @@ -457,20 +503,30 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) cache = GITS_BASER_CACHE_WAWB; } share = GITS_BASER_SHARE_IS; - page_size = PAGE_SIZE_64K; for (i = 0; i < GITS_BASER_NUM; i++) { reg = gic_its_read_8(sc, GITS_BASER(i)); /* The type of table */ type = GITS_BASER_TYPE(reg); + if (type == GITS_BASER_TYPE_UNIMPL) + continue; + /* The table entry size */ esize = GITS_BASER_ESIZE(reg); + /* Find the tables page size */ + page_size = gicv3_its_table_page_size(sc, i); + if (page_size == -1) { + device_printf(dev, "No valid page size for table %d\n", + i); + return (EINVAL); + } + switch(type) { case GITS_BASER_TYPE_DEV: nidents = (1 << devbits); its_tbl_size = esize * nidents; - its_tbl_size = roundup2(its_tbl_size, PAGE_SIZE_64K); + its_tbl_size = roundup2(its_tbl_size, page_size); break; case GITS_BASER_TYPE_VP: case GITS_BASER_TYPE_PP: /* Undocumented? */ @@ -537,18 +593,6 @@ gicv3_its_table_init(device_t dev, struct gicv3_its_softc *sc) continue; } - if ((tmp & GITS_BASER_PSZ_MASK) != - (reg & GITS_BASER_PSZ_MASK)) { - switch (page_size) { - case PAGE_SIZE_16K: - page_size = PAGE_SIZE_4K; - continue; - case PAGE_SIZE_64K: - page_size = PAGE_SIZE_16K; - continue; - } - } - if (tmp != reg) { device_printf(dev, "GITS_BASER%d: " "unable to be updated: %lx != %lx\n",