From nobody Wed Mar 29 16:53:07 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 4Pmt0M5Xrzz42nTb; Wed, 29 Mar 2023 16:53:07 +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 4Pmt0M51twz4chH; Wed, 29 Mar 2023 16:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680108787; 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=68zrFtQysFubsKMDpTOf0dAUhfOEv6NSFvp/HHe0TmQ=; b=lEovmXnrbhjIR460tg10cXFIXAi5SG+gtM421+cJS8xCC1LZ3nHNdZBIqVZfwaQNKyJif/ P9IgVkdgqpIibrEgAuaRQS9s4C62p3m0ACZYU0Aq+n6rmC5vafvkNfpaSqCbS6s0ltSRti kN4g6NBzR+Hi+X6TB5AoWN/UH/OST4unVwtsGd4vD64slUEVe4UB8kDagiPASbTP8EkZCn TVCbKFF1nNPkiCB1mcFxdPmTZVans8pCUOHy1d84CCbarTmE6xsrrwJD5nKlabYs5LDcDW vLvmrJzjt4g+3IklIpmODdoRi15PstuNClsrHDC4CvVOw3LfbWMNVEo9iB5e5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680108787; 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=68zrFtQysFubsKMDpTOf0dAUhfOEv6NSFvp/HHe0TmQ=; b=xiOEBNM6XQPkkEiqXY3yBtE1DyxeR0ZntCwehjExf9UTW5Efdmvtek1R+iJK4mldNsBYih l9RrWKgKFEWikKs7XC0Qi6K5FFWoA7wVuidQclDxVOUa6QLQ8LImH1rbUeOfiCG40dBSyS YNtB2AN5M1OuMJRVSJNtlr5wPulUlkDvckdDlR13CgayQfsnl0yGMBFE+l3xGS1QvYtdbM 3+DGwpheasugU/hFzBmokpzXSWymsrFTXI4kliRg/nC4K3dUzZzMsD/wL5zTj2shpm89Gh X7A1H1dgV0aPhmCmMRU/496kOYvuNgbBkmxeMnnlEz9I2picuB+DFMZfalVNLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680108787; a=rsa-sha256; cv=none; b=iAkIOos9z9qUaAHlFyk9Hur3CHJAKUE6BzGqaVqNTkNyMBx3M7kHic3oL95WQqBej+XMOd zFQRyQqr0oNkcI5UufiKracOR4YCx+Ezc3AXQQcl3KVB9y46PTP90OgqxuB8VERSris2Gp 7e0gZzMBNQJ0SPrmVD9gzYFWLHdK+iDqdpKUsU8Kgvp3LtnDJnmaNZR4Am5qUf+avKfAUf hrTGXYXy9B2A4g303E05PR2+0z/4vzeW9eFOox125Icj9sZQSWOxjYaoQn1tUvR6gNl3BC hFgLzV5oOWStfz81nXybwImLB4uN5UG7DXjXWmJLAkMHXJ+16lejuz5oGulMGw== 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 4Pmt0M46mzzdqk; Wed, 29 Mar 2023 16:53:07 +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 32TGr7gY039749; Wed, 29 Mar 2023 16:53:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32TGr7Le039748; Wed, 29 Mar 2023 16:53:07 GMT (envelope-from git) Date: Wed, 29 Mar 2023 16:53:07 GMT Message-Id: <202303291653.32TGr7Le039748@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: 4abe99d02d2e - stable/13 - uhci(4): Add IDs for Zhaoxin USB controller 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4abe99d02d2e28dfa8290b305d735d61ffd9cbca Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=4abe99d02d2e28dfa8290b305d735d61ffd9cbca commit 4abe99d02d2e28dfa8290b305d735d61ffd9cbca Author: Dmitry Luhtionov AuthorDate: 2023-01-17 10:43:24 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-29 16:49:31 +0000 uhci(4): Add IDs for Zhaoxin USB controller Tested by: Weitao Wang MFC after: 1 week Sponsored by: NVIDIA Networking Differential Revision: https://reviews.freebsd.org/D38924 (cherry picked from commit 986c7be472bd8b29bb280e72b57e6cbf1851b26f) (cherry picked from commit b754d7faafd3536889bb6078b9fd11ef2e7717d7) --- sys/dev/usb/controller/uhci_pci.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/dev/usb/controller/uhci_pci.c b/sys/dev/usb/controller/uhci_pci.c index e9036aa9ce23..07bc25b644e3 100644 --- a/sys/dev/usb/controller/uhci_pci.c +++ b/sys/dev/usb/controller/uhci_pci.c @@ -82,6 +82,7 @@ __FBSDID("$FreeBSD$"); #define PCI_UHCI_VENDORID_HP 0x103c #define PCI_UHCI_VENDORID_VIA 0x1106 #define PCI_UHCI_VENDORID_VMWARE 0x15ad +#define PCI_UHCI_VENDORID_ZHAOXIN 0x1d17 /* PIIX4E has no separate stepping */ @@ -240,6 +241,10 @@ uhci_pci_match(device_t self) case 0x077415ad: return ("VMware USB controller"); + + case 0x30381d17: + return ("Zhaoxin ZX-100/ZX-200/ZX-E USB controller"); + default: break; } @@ -333,6 +338,9 @@ uhci_pci_attach(device_t self) case PCI_UHCI_VENDORID_VMWARE: sprintf(sc->sc_vendor, "VMware"); break; + case PCI_UHCI_VENDORID_ZHAOXIN: + sprintf(sc->sc_vendor, "Zhaoxin"); + break; default: if (bootverbose) { device_printf(self, "(New UHCI DeviceId=0x%08x)\n",