From nobody Thu Jan 26 20:27:06 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 4P2sgt5YMfz3btDr; Thu, 26 Jan 2023 20:27:06 +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 4P2sgt4Rllz3QXV; Thu, 26 Jan 2023 20:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674764826; 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=Ym77O3B/E7141q2CBvEY7cJdTaXoX+P7QeWzwFUwP64=; b=nnUCVZQZSCsTReD4iHt3XMQgNFsYEPBr2eeWE2aCeW7t3w3jQRsCv9HjSSrDB8aAKSyrGY bF2Uq8j2qvg9QJxsDtkrcgknpS1DRCt7usy9kbUBzIH1I38Z/xGa9sMy1KaL3GXU7XyfjE 7Tj3wAF6BHIad7a3l6MAt0GGmJw34INyWAkXqMOjJs5JkG1ELUaHm0IpGiKIYrij4ob/QQ Tt1AnNxYXQojMFqaZYSB4LnHcv3sVRYwYAtyTzD3cQwkuvfmMwu7COH5x3CmecQQr0Jwkq VXgOFrSJSKseDXQ4ukEdqbT0WGcxn9tUotDAHahXPiC4V71vpf7on/Dw86Q7fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674764826; 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=Ym77O3B/E7141q2CBvEY7cJdTaXoX+P7QeWzwFUwP64=; b=bn9lchmliHqhepZECaYCa84XoyBcYB29S2a//GWYxgE2dcEEW/MqiFPxfk4cBlQLezQOvL z1vQsz4ZMN2cDcE7+PRXROfoWhw02HfN7E/UnUKMiDGd+hDo1x7sRj8fv2BMcMcLreNsNo aIpgc6giC09xX3szS72kTnpnvFKf09jHtXgXX0x9/+sF18WQq47MuWY8R/0FDmVwln6YQU 1IA58oIpGdEo7FJNufQLNlJuwTzJ4atj5yfaOlkyoDp6PjHADKsgqvPPPh/NyjDMiMCQLt Bn+1Mc45RQkXUO7m/WJGyL8NRdSluz/SkjGHVCiPAuKvy7dZahAXZUYxIPNhnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674764826; a=rsa-sha256; cv=none; b=c3U+Z1jjYbZjYp2s2iBmjOqFN1XhHzasKYAv1w/RKZkuevogJQkeEL5MZTtYc2wW//WqKR VIpL2XSOl8DIQjHguOvZ500uk1EKBq97VRS3FajnNEqisUWjcwV9lGq4Scnwzm8Kna9M68 LEHLCUQ74RkSKDH0S/06u8hDh8gnDXieT8OK6H4hK8t8mLBeK5DNHVM/+kTpLR2D6vGWQY XtJpDkUfCXhoHRLDbM6yu1OZfo2w9GHRHisoOwm4+0RZBEwQUsQvxDBa5cHhzybYsyXba0 KbLc9Q1kTEtTZKwhdxubd2zfWCvOgVRf+SdHgpNtynZeF4A92qEEjH545aQgAQ== 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 4P2sgt2qYqzjRr; Thu, 26 Jan 2023 20:27:06 +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 30QKR6Xr064606; Thu, 26 Jan 2023 20:27:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QKR6CU064605; Thu, 26 Jan 2023 20:27:06 GMT (envelope-from git) Date: Thu, 26 Jan 2023 20:27:06 GMT Message-Id: <202301262027.30QKR6CU064605@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: c8a6e51a4f86 - stable/13 - bhyve: Avoid using a packed struct for xhci port registers 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c8a6e51a4f866f5c497546f9657e44fe1ae0ff66 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c8a6e51a4f866f5c497546f9657e44fe1ae0ff66 commit c8a6e51a4f866f5c497546f9657e44fe1ae0ff66 Author: Mark Johnston AuthorDate: 2022-11-18 19:07:38 +0000 Commit: John Baldwin CommitDate: 2023-01-26 20:06:39 +0000 bhyve: Avoid using a packed struct for xhci port registers I believe the __packed annotation is there only because pci_xhci_portregs_read() is treating the register set as an array of uint32_t. clang warns about taking the address of portregs->portsc because it is a packed member and thus might not have expected alignment. Fix the problem by simply selecting the field to read with a switch statement. This mimics pci_xhci_portregs_write(). While here, switch to using some symbolic constants. There is a small semantic change here in that pci_xhci_portregs_read() would silently truncate unaligned offsets. For consistency with pci_xhci_portregs_write(), which does not do that, return all ones for unaligned reads instead. MFC after: 2 weeks Reviewed by: corvink, jhb Differential Revision: https://reviews.freebsd.org/D37408 (cherry picked from commit 0705b7f4e64fdbad49a3a6d9131029a9734deb2c) --- usr.sbin/bhyve/pci_xhci.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c index 1f3d78a4cfea..f95f62fbf0e5 100644 --- a/usr.sbin/bhyve/pci_xhci.c +++ b/usr.sbin/bhyve/pci_xhci.c @@ -568,6 +568,10 @@ pci_xhci_portregs_write(struct pci_xhci_softc *sc, uint64_t offset, */ p->porthlpmc = value; break; + default: + DPRINTF(("pci_xhci: unaligned portreg write offset %#lx", + offset)); + break; } } @@ -2132,12 +2136,13 @@ pci_xhci_portregs_read(struct pci_xhci_softc *sc, uint64_t offset) { struct pci_xhci_portregs *portregs; int port; - uint32_t *p; + uint32_t reg; if (sc->portregs == NULL) return (0); - port = (offset - 0x3F0) / 0x10; + port = (offset - XHCI_PORTREGS_PORT0) / XHCI_PORTREGS_SETSZ; + offset = (offset - XHCI_PORTREGS_PORT0) % XHCI_PORTREGS_SETSZ; if (port > XHCI_MAX_DEVS) { DPRINTF(("pci_xhci: portregs_read port %d >= XHCI_MAX_DEVS", @@ -2147,16 +2152,31 @@ pci_xhci_portregs_read(struct pci_xhci_softc *sc, uint64_t offset) return (XHCI_PS_SPEED_SET(3)); } - offset = (offset - 0x3F0) % 0x10; - portregs = XHCI_PORTREG_PTR(sc, port); - p = &portregs->portsc; - p += offset / sizeof(uint32_t); + switch (offset) { + case 0: + reg = portregs->portsc; + break; + case 4: + reg = portregs->portpmsc; + break; + case 8: + reg = portregs->portli; + break; + case 12: + reg = portregs->porthlpmc; + break; + default: + DPRINTF(("pci_xhci: unaligned portregs read offset %#lx", + offset)); + reg = 0xffffffff; + break; + } DPRINTF(("pci_xhci: portregs read offset 0x%lx port %u -> 0x%x", - offset, port, *p)); + offset, port, reg)); - return (*p); + return (reg); } static void