From nobody Fri Dec 5 10:18:55 2025 X-Original-To: dev-commits-src-main@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 4dN6mJ0HRLz6Kmhw for ; Fri, 05 Dec 2025 10:18:56 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dN6mH5kJXz49fT for ; Fri, 05 Dec 2025 10:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764929935; 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=7HWJCNsRYYjkKXz7abnpZslUT7Qfh1Z8bwj49Sm+Nus=; b=EpIZmu3x5oEcykUwnKm0W+e6h2LdKIYgAOwjHhZqd9FQoDDWzLq6dmNW3HExDfdmUZMUxP zk54bw+wr8wQQYGTZs0DGuyLGP7brbQQrqhDn4f0cGPC3Mk45fGEEmVFaw6WH6fP18y7eb M7o5rCuvHFeWF58eFG6vS8qE1j+8rOiNhzu/hbcPK93r86QtMzzIma7FDDfKPsBq25Wp4E LS6PRCEcPXy2741ONl8fuSfBFIRmC0w7Cn8LSGbrGcHbRleXQeMsnEM/JHocjtYf5pEWIQ jL8zmEoWkKUM1ElD1URLoEvoEviOoaf4QdRUSH20esOdN1DeicWzX713fBQITw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764929935; 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=7HWJCNsRYYjkKXz7abnpZslUT7Qfh1Z8bwj49Sm+Nus=; b=A46cXi4hl5mpaRaX4SD3xWZbY+uqROXvtWbcTBogtQnBUzIx32+Av5TE1ILKDGvJLZkgD2 sBLP52DuhDkqlZdPjSeIZvrSfsyWfybhmK0N/bQX1rI5qQy5VSq+r6ST9goCqVlAqK8dmx W/8U09g+YR6CRdXYXDQ8Bzu8Y1JtfwmeLl/DnXwOW25BFQiEOGWXxaQeit++o6wf8IxmQO ULbMx4InvHGrHgYpPBe1Q7wYlZ+GpU2AXHelwKgXnkiTdE2CpfRvrdb+qNaSquuWfFPYr7 oo5iUb6HenXyLxOjaHxbcr4ej9TZRSYayhufxnbfw7EHj+4pDWDkOR6MT6TwOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764929935; a=rsa-sha256; cv=none; b=Ya0gTVHKIGoe4jsQfCIVyJH0YGvAfBGUMH4Py+4YQKkkxz2rjwSOAyk2efSjOBzK9SOlYG V/VmbLLc7qTPV6CMMKd9xRpJuYcnlYKYt6f7fKMqAaKckLXhudr8B4w9FMFaV6hs1RUh4u gluTgj8vd6ygS0FbAGwZmwV2n7TOysIYptc1Emf9ci6JA9qxAP4HyoJNBF0qGdodcd8V1k wWEY3GzSImnQEoqVl8IYg4bPnGo72qhiafumhQV6/p5ETVDpQ5KNfiZB7l4hkKAPFSnPqL Vu5fCLHK6w79MYG+/DL2/NnrPi7Ky0ez2eSwp7eoT9/OqtYUTNhZyXO1Jw0iuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dN6mH5J5kz14wW for ; Fri, 05 Dec 2025 10:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35dd2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 05 Dec 2025 10:18:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 234351604252 - main - xhci: Correct name of HCCPARAMS Register List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 234351604252cec485992cb7f5e76aa98c0a4380 Auto-Submitted: auto-generated Date: Fri, 05 Dec 2025 10:18:55 +0000 Message-Id: <6932b18f.35dd2.7be6b72d@gitrepo.freebsd.org> The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=234351604252cec485992cb7f5e76aa98c0a4380 commit 234351604252cec485992cb7f5e76aa98c0a4380 Author: Tom Jones AuthorDate: 2025-12-05 10:07:46 +0000 Commit: Tom Jones CommitDate: 2025-12-05 10:17:45 +0000 xhci: Correct name of HCCPARAMS Register On inital import the name of HCCPARAMS1 was misnamed as HCSPARAMS0. HCCPARAMS1 is defined in section 5.3.6 of xHCI Specification 1.2b (April 2023). Reviewed by: adrian Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53895 --- sys/dev/pci/pci.c | 2 +- sys/dev/usb/controller/xhci.c | 6 +++--- sys/dev/usb/controller/xhci_pci.c | 2 +- sys/dev/usb/controller/xhcireg.h | 2 +- usr.sbin/bhyve/pci_xhci.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index cde98cb62cef..ac6c9259b135 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -3764,7 +3764,7 @@ xhci_early_takeover(device_t self) if (res == NULL) return; - cparams = bus_read_4(res, XHCI_HCSPARAMS0); + cparams = bus_read_4(res, XHCI_HCCPARAMS1); eec = -1; diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c index 788b2b718062..3dad0985b39d 100644 --- a/sys/dev/usb/controller/xhci.c +++ b/sys/dev/usb/controller/xhci.c @@ -549,7 +549,7 @@ xhci_init(struct xhci_softc *sc, device_t self, uint8_t dma32) return (ENXIO); } - temp = XREAD4(sc, capa, XHCI_HCSPARAMS0); + temp = XREAD4(sc, capa, XHCI_HCCPARAMS1); DPRINTF("HCS0 = 0x%08x\n", temp); @@ -665,7 +665,7 @@ xhci_get_xecp(struct xhci_softc *sc) uint32_t eecp; bool first = true; - hccp1 = XREAD4(sc, capa, XHCI_HCSPARAMS0); + hccp1 = XREAD4(sc, capa, XHCI_HCCPARAMS1); if (XHCI_HCS0_XECP(hccp1) == 0) { device_printf(sc->sc_bus.parent, @@ -3511,7 +3511,7 @@ xhci_roothub_exec(struct usb_device *udev, goto done; } - v = XREAD4(sc, capa, XHCI_HCSPARAMS0); + v = XREAD4(sc, capa, XHCI_HCCPARAMS1); sc->sc_hub_desc.hubd = xhci_hubd; diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index e5424163baa6..d6691b616064 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -524,7 +524,7 @@ xhci_pci_take_controller(device_t self) uint16_t to; uint8_t bios_sem; - cparams = XREAD4(sc, capa, XHCI_HCSPARAMS0); + cparams = XREAD4(sc, capa, XHCI_HCCPARAMS1); eec = -1; diff --git a/sys/dev/usb/controller/xhcireg.h b/sys/dev/usb/controller/xhcireg.h index 821897155544..3e3ad278bcba 100644 --- a/sys/dev/usb/controller/xhcireg.h +++ b/sys/dev/usb/controller/xhcireg.h @@ -58,7 +58,7 @@ #define XHCI_HCSPARAMS3 0x0C /* RO structural parameters 3 */ #define XHCI_HCS3_U1_DEL(x) ((x) & 0xFF) #define XHCI_HCS3_U2_DEL(x) (((x) >> 16) & 0xFFFF) -#define XHCI_HCSPARAMS0 0x10 /* RO capability parameters */ +#define XHCI_HCCPARAMS1 0x10 /* RO capability parameters */ #define XHCI_HCS0_AC64(x) ((x) & 0x1) /* 64-bit capable */ #define XHCI_HCS0_BNC(x) (((x) >> 1) & 0x1) /* BW negotiation */ #define XHCI_HCS0_CSZ(x) (((x) >> 2) & 0x1) /* context size */ diff --git a/usr.sbin/bhyve/pci_xhci.c b/usr.sbin/bhyve/pci_xhci.c index ff12e40359e2..b3c9f387cca4 100644 --- a/usr.sbin/bhyve/pci_xhci.c +++ b/usr.sbin/bhyve/pci_xhci.c @@ -2354,7 +2354,7 @@ pci_xhci_hostcap_read(struct pci_xhci_softc *sc, uint64_t offset) value = sc->hcsparams3; break; - case XHCI_HCSPARAMS0: /* 0x10 */ + case XHCI_HCCPARAMS1: /* 0x10 */ value = sc->hccparams1; break;