From nobody Thu Feb 24 10:04:17 2022 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 B165519DFDE0; Thu, 24 Feb 2022 10:04:17 +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 4K47mK4YqJz3Q6v; Thu, 24 Feb 2022 10:04:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645697057; 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=KvCMGPrk99BNkl2dLkZoS7PAjPlpPiLkfTssknZJTNQ=; b=OsXPm9UtCDlnfsT2IQUHsRvelsTL30el2e1hUGS+tfNbJDZ2/SswvUuENwzlQkUjdyyWLZ C+hE5O3GqLv6ExCM1sd2kcJ41k0dTj+XU/Y01rKtbL5ujTCNAAFfzWIP7g6I/Srf5myil/ c4VV8Ww64/42HED03rWtMyquDgtvNviR3539VyMwKTTNnGnMVsyujPgYsKafzUXQLlc6uX 6lz3M8+jV/Sg13dIy3IAWjie+tWMSvim1Q6Moy/8ge+kEnZIJE1CZEiligaH3qqRPLsT7a yIGY5ICAOstbF0PyD8WFeNX2fbuCD1WLpNoIePeULZgAqRgX0n2u8lYRnMThpA== 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 7CC1C1A7C; Thu, 24 Feb 2022 10:04:17 +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 21OA4HYf003492; Thu, 24 Feb 2022 10:04:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21OA4HPo003491; Thu, 24 Feb 2022 10:04:17 GMT (envelope-from git) Date: Thu, 24 Feb 2022 10:04:17 GMT Message-Id: <202202241004.21OA4HPo003491@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: d9addaa0ba45 - stable/13 - Add new USB host controller PCI ID's. 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: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d9addaa0ba450aad9ed40371059cbea0d10d3d2e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645697057; 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=KvCMGPrk99BNkl2dLkZoS7PAjPlpPiLkfTssknZJTNQ=; b=TVqgX9A/K0V9GG6UudY0UoxJIVaMP1i+JnqeI25GlVF46/pokaZGBUkWqg8g2RUq/Rvr6V KcbIE0LABHlteK2Uo1AvDpSSLhlkQkl3oqSqlcJZm3OZhBGykTp/AYzxDEJI8T7oH3IrTp lVQdb56TtNeWJUIIXru4UG1bX2fpW0wfIM0eikKKOsPgI30Irl86lo7+N8O8jA1re8puPw YGCHaze53XzUBruFQaqjxxK/IKNz0SsgfXxzOhNVSfrzUco7dnYjZTwMPaFnBgCJ9cd2Ie pVkydZCtewAaboBkwX74w+Kdc4ddFjzUryLV7j2Fv1+YZGU2VJgCOPL3c38Axg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645697057; a=rsa-sha256; cv=none; b=PpqWixrbEn32Slscw9HE150C6OkerqicbQ9vB0xKjKMJVYin54Zmckk8+BgEHtNojkB2n2 b6JrOnX7mBnKVw8bRcIgpAKGgNec+KBob/zMTbDmwcjGYhc2m2d3YBxGHDMFXBnqaWgsvU 8GhzMbfM7PJuijOxzJ8ReO6KX6n2wb1+mMu5wQjRaTWeJo+EMPq37exZA4WPOIlpAi+F7g +Wgih4VHlak+m14WgNM58plMRXD/Ig1akR5JyluGU5ZInwserPnHA3vFM1wB9q5rSWzFr8 aPNdr+Ehr/yeI/cPRLS22JGIIng8AiQ7RxyCHa7oxwPyTpwUwK0cUnWMlhdNbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=d9addaa0ba450aad9ed40371059cbea0d10d3d2e commit d9addaa0ba450aad9ed40371059cbea0d10d3d2e Author: Hans Petter Selasky AuthorDate: 2022-02-24 09:58:16 +0000 Commit: Hans Petter Selasky CommitDate: 2022-02-24 09:58:16 +0000 Add new USB host controller PCI ID's. Submitted by: Dmitry Luhtionov Sponsored by: NVIDIA Networking (cherry picked from commit 42cf33dd1a8d6ff2548c8a7fb267879734ddfde3) --- sys/dev/usb/controller/ehci_pci.c | 2 ++ sys/dev/usb/controller/xhci_pci.c | 21 ++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c index 7783c157046f..dbc2def5b8d2 100644 --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -117,6 +117,8 @@ ehci_pci_match(device_t self) return ("AMD CS5536 (Geode) USB 2.0 controller"); case 0x78081022: return ("AMD FCH USB 2.0 controller"); + case 0x79081022: + return ("AMD FCH USB 2.0 controller"); case 0x43451002: return "ATI SB200 USB 2.0 controller"; diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index f1c567ac6ded..b5d327ad6cd7 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -62,6 +62,9 @@ __FBSDID("$FreeBSD$"); #include #include "usb_if.h" +#define PCI_XHCI_VENDORID_AMD 0x1022 +#define PCI_XHCI_VENDORID_INTEL 0x8086 + static device_probe_t xhci_pci_probe; static device_detach_t xhci_pci_detach; static usb_take_controller_t xhci_pci_take_controller; @@ -102,6 +105,8 @@ xhci_pci_match(device_t self) return ("AMD 300 Series USB 3.0 controller"); case 0x78141022: return ("AMD FCH USB 3.0 controller"); + case 0x79141022: + return ("AMD FCH USB 3.0 controller"); case 0x145f1d94: return ("Hygon USB 3.0 controller"); @@ -358,7 +363,21 @@ xhci_pci_attach(device_t self) } device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus); - sprintf(sc->sc_vendor, "0x%04x", pci_get_vendor(self)); + switch (pci_get_vendor(self)) { + case PCI_XHCI_VENDORID_AMD: + strlcpy(sc->sc_vendor, "AMD", sizeof(sc->sc_vendor)); + break; + case PCI_XHCI_VENDORID_INTEL: + strlcpy(sc->sc_vendor, "Intel", sizeof(sc->sc_vendor)); + break; + default: + if (bootverbose) + device_printf(self, "(New XHCI DeviceId=0x%08x)\n", + pci_get_devid(self)); + snprintf(sc->sc_vendor, sizeof(sc->sc_vendor), + "(0x%04x)", pci_get_vendor(self)); + break; + } if (sc->sc_irq_res != NULL) { err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,