From nobody Wed Mar 29 16:53:06 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 4Pmt0L5Ctnz42nTT; Wed, 29 Mar 2023 16:53: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 4Pmt0L4MDtz4cKp; Wed, 29 Mar 2023 16:53:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680108786; 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=2DaNyADKBdFPnSQRIu+FLDeROo02qgnxKYZ8DWVPeRA=; b=YfZRAZR/wpB7D9SFVB6IksjevszxJqtQCMIAylrApX/qCkz21LoLSBK+MqbnSqTD2ecZ7U 7qnhZxe8zMW9Ho1Q5TLA1FdcDI1D5whwWqIdIn34QHNlXkAadrv9fDwmJaqPzSB/5E7Gg3 WGLdr6Vg794rUGDnTPU/yW8p9rD/Iv37dPJpKdEC58fMRt80fUFJk+fkNzDjzvInCl5JWS SQq+uJPddlcLZqF+wQ8PeoX7lysXcbmMsK915JDZkxl3APpOi/sGKMjX/ah9Aac2kHfw0W CIc4SD7Mrw5gCf2PtqXMxwfe99jY8ft/GZwJD0p2nkdQccM38AwD8mj4LvAl9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680108786; 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=2DaNyADKBdFPnSQRIu+FLDeROo02qgnxKYZ8DWVPeRA=; b=vyQ+z8zeHvBHkCB97SFMkW+FcfVRJ2tFJBJJ/pLcuEli/uBjHaxSN+9BGCLi4iW6Vzvohb wtfrKAPc2AQHH2JsVLKbpxQgEY2dGrcSSLgO2CXSc4VENlz5ua/27WBzCZ9mJGg+TyvK0H bOeNm3gzGqD54cpz0J432ZZgQSx0c7w24huBjG+/uAOBUJIMX/Oj0JJKwAxf2O15NQurXR K072EClbTDjk6CSZAKVjtDwyp8a3tI9NNTvYPnEH8VvKOScroYJyr7zHchT9pJVIsYX8FN guWQAAWz5/PHM9q4WyrjvWx/oi70nigkQPFqDvfEdynZEXFf8jlyHHma3c5LfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680108786; a=rsa-sha256; cv=none; b=XH3ZZlKFxtyMBaP/f16XjCP5pAf+QjzEE8eCyi/UzWXVemHh8WxqgUo2jY4wL4FwNK8VP+ gonkb7/j1AdmlbpxXjiTt4CzrsGJ+iP5mG998RTpJv01t3idpdCm9jm9T4zEFb7ylJxsXE WuUOs17ejiv0y1Fkt7ee0K1rP/217fyiP1kgThO1ewaEvObNmSqoUJp30izVIcn+Sw3Sqm uGstdWWafSgIvQQDVmTbLgXMFHvmWMjK5XfMkyGVARvShfjo5vTAxQfT2etorNZPife3Q/ T+J5WT98SdTCKs77QnA5f2bgHAS9jK1o4+P6jz7Eihj7kNS/AMiZesaVctnxLQ== 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 4Pmt0L3RgNzdcF; Wed, 29 Mar 2023 16:53: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 32TGr65k039725; Wed, 29 Mar 2023 16:53:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TGr630039724; Wed, 29 Mar 2023 16:53:06 GMT (envelope-from git) Date: Wed, 29 Mar 2023 16:53:06 GMT Message-Id: <202303291653.32TGr630039724@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: ffb8b19f767d - stable/13 - ehci(4): Add IDs for for Zhaoxin USB 2.0 controller 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/stable/13 X-Git-Reftype: branch X-Git-Commit: ffb8b19f767da0c36a67fb76cbaa9f47457af184 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ffb8b19f767da0c36a67fb76cbaa9f47457af184 commit ffb8b19f767da0c36a67fb76cbaa9f47457af184 Author: Dmitry Luhtionov AuthorDate: 2023-01-17 10:43:33 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-29 16:49:21 +0000 ehci(4): Add IDs for for Zhaoxin USB 2.0 controller Tested by: Weitao Wang MFC after: 1 week Sponsored by: NVIDIA Networking Differential Revision: https://reviews.freebsd.org/D38923 (cherry picked from commit f9237e1937a4e399e08ca8e5bd88a60910e74be6) (cherry picked from commit 95b2d16b38a720108a51f9e8ce0685244e3e3ea4) --- sys/dev/usb/controller/ehci_pci.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c index b536ea02b649..9018b2e4db40 100644 --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -96,6 +96,7 @@ __FBSDID("$FreeBSD$"); #define PCI_EHCI_VENDORID_NVIDIA2 0x10DE #define PCI_EHCI_VENDORID_VIA 0x1106 #define PCI_EHCI_VENDORID_VMWARE 0x15ad +#define PCI_EHCI_VENDORID_ZHAOXIN 0x1d17 static device_probe_t ehci_pci_probe; static device_attach_t ehci_pci_attach; @@ -224,6 +225,10 @@ ehci_pci_match(device_t self) case 0x077015ad: return ("VMware USB 2.0 controller"); + + case 0x31041d17: + return ("Zhaoxin ZX-100/ZX-200/ZX-E USB 2.0 controller"); + default: break; } @@ -409,6 +414,9 @@ ehci_pci_attach(device_t self) case PCI_EHCI_VENDORID_VMWARE: sprintf(sc->sc_vendor, "VMware"); break; + case PCI_EHCI_VENDORID_ZHAOXIN: + sprintf(sc->sc_vendor, "Zhaoxin"); + break; default: if (bootverbose) device_printf(self, "(New EHCI DeviceId=0x%08x)\n",