From nobody Fri Mar 17 17:31:28 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 4PdWQ86VClz3ycVx; Fri, 17 Mar 2023 17:31:28 +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 4PdWQ85vdzz4Q0S; Fri, 17 Mar 2023 17:31:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679074288; 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=6Ri9k2TDt1y5db3/puePEgog1gxsXEB/B0Z3pUDjsqQ=; b=BSHNl8dmhKOVaICPdHDLsW5dPK6dCc61hO5K8Y+X8luWprSiGvblrZAP2QnHviiZ/QHwFn DSy5BqkJn6td+P985dkA3PtVSUYHt3LCQW/+EyPt3Vdf4ZtOeB5YUByUMAZDkt603LxZZZ J+IT7L9Iuees4iSp7KknIk2zJ1OJ9WUA6gFnujSMJe1FXXCzNDIG96AkLG5P/js8wpHlpl k4Xg3Ylb05sVVcjYR6lVlHpY64XoCzueI+xvVXHT/bLiuZCMWeJWvnJjQ8iZoDpEP3fUZj A0oUGScVkvFbFe/6n6gw+zor57OxCM++JTsyPivfKS+vJGJHA77swXo2btqIng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679074288; 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=6Ri9k2TDt1y5db3/puePEgog1gxsXEB/B0Z3pUDjsqQ=; b=wCuWk0SaFzfO3toucDM9UQdhPVN42L3c70eeYZPjPo3l1CJRMNoCoBVe5aPld4fXHtjCE9 GMHfcSYZwwudSvBoQpU29rjTCDFyGmEx57xyPY+WWLBuIhzeCN7N/GmtR9jLb0Kn0JTHqd dGT6xcmCH22xuxWZTpGcUyXsv6pvJPQ05XWsyAoKN94vArzjqxAAyjQG5zz088bduf/xkT pL9l1D1ETMCR9WSLux8ul08rVyg74mSRLPOAKCG9ZNcHqKsn220UL2P3TPskzQ4e7834FH WkjWkFxhXXMZFP6CTDMJQgztX4clZK+pzU7cwOuD4YuubtHUXIY2sQm7fqQTgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679074288; a=rsa-sha256; cv=none; b=gVf5MPyxSg2eWrdK+TK5h3nARxT2D4jUOeG88Pz+2H2n3Zry0FeRBq6pjD2w/v1CKoUiH9 GOWmkGyXk/5MSHw7cvZ/X0rfGIK5+7qN60cCuKK6M8wo7a1Ut0D9xYoTMNmDjvmU5Hq1ps fzJOArzeyytC7O8XV58WrLqXZhu2hI9hj7k9Oc8zcSM56GjswfT+7WgsYq5yk7OiqS2p9i mEJnTqbTuWteZDPcqJoMOL0xsT75ALooO8yeIYqORUt2laEPOTp7O7ubb6d7dX4g23F8ng p6a6RdyYOAcBscDTGK59irwZFPJSxSmKTH8K5iHq7T3UQF2YP9UlbS5CJd9hmA== 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 4PdWQ8508zzZLf; Fri, 17 Mar 2023 17:31:28 +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 32HHVSOL070139; Fri, 17 Mar 2023 17:31:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32HHVSbA070138; Fri, 17 Mar 2023 17:31:28 GMT (envelope-from git) Date: Fri, 17 Mar 2023 17:31:28 GMT Message-Id: <202303171731.32HHVSbA070138@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: f50f53931edb - main - xhci(4): Correct PCI device IDs for Zhaoxin USB 3.0 controllers 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f50f53931edb24c5f30434603f5d1d3043effc0c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f50f53931edb24c5f30434603f5d1d3043effc0c commit f50f53931edb24c5f30434603f5d1d3043effc0c Author: Zhenlei Huang AuthorDate: 2023-03-17 17:12:30 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-17 17:30:18 +0000 xhci(4): Correct PCI device IDs for Zhaoxin USB 3.0 controllers And minor style fixes. Reviewed by: hselasky Tested by: Weitao Wang Fixes: 0d7064d58f89 xhci(4): Add new USB IDs Differential Revision: https://reviews.freebsd.org/D38921 --- sys/dev/usb/controller/xhci_pci.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index 3fff1ec1db01..5da68a156724 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$"); #define PCI_XHCI_VENDORID_AMD 0x1022 #define PCI_XHCI_VENDORID_INTEL 0x8086 #define PCI_XHCI_VENDORID_VMWARE 0x15ad -#define PCI_XHCI_VENDORID_ZHAOXIN 0x1d17 +#define PCI_XHCI_VENDORID_ZHAOXIN 0x1d17 static device_probe_t xhci_pci_probe; static device_detach_t xhci_pci_detach; @@ -206,12 +206,12 @@ xhci_pci_match(device_t self) case 0x1ada10de: return ("NVIDIA TU106 USB 3.1 controller"); - case 0x1d179202: - return ("Zhaoxin ZX-100 USB 3.0 controller"); - case 0x1d179203: - return ("Zhaoxin ZX-200 USB 3.0 controller"); - case 0x1d179204: - return ("Zhaoxin ZX-E USB 3.0 controller"); + case 0x92021d17: + return ("Zhaoxin ZX-100 USB 3.0 controller"); + case 0x92031d17: + return ("Zhaoxin ZX-200 USB 3.0 controller"); + case 0x92041d17: + return ("Zhaoxin ZX-E USB 3.0 controller"); default: break; @@ -401,9 +401,9 @@ xhci_pci_attach(device_t self) case PCI_XHCI_VENDORID_VMWARE: strlcpy(sc->sc_vendor, "VMware", sizeof(sc->sc_vendor)); break; - case PCI_XHCI_VENDORID_ZHAOXIN: - strlcpy(sc->sc_vendor, "Zhaoxin", sizeof(sc->sc_vendor)); - break; + case PCI_XHCI_VENDORID_ZHAOXIN: + strlcpy(sc->sc_vendor, "Zhaoxin", sizeof(sc->sc_vendor)); + break; default: if (bootverbose) device_printf(self, "(New XHCI DeviceId=0x%08x)\n",