From nobody Tue Aug 27 17:50:44 2024 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 4WtZpD72SJz52Y9B; Tue, 27 Aug 2024 17:50:44 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WtZpD6WMXz4XVH; Tue, 27 Aug 2024 17:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724781044; 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=NDenC6Iz+pnugF5a5xT0xRLVVIJ5kIWATj6IdM9Qg4I=; b=o4ZjJz2Fp4ek1uuD42Z1wXABGgARxiC0eyeTHSTki8TSyb3Oqj1NLoleBcFeN5UGyuRLMN pFIVwMxpP3OH6mAvCi7j9CtR1Vt78Vib19WtCfc+Js1rsqMbIuifsavr12y4nDBdKt3BP6 qDktPLevFAgMHY1UggQbonhiNeZpbCmPY4GrrKISv5ji7qjY+woEIjvbQugcetTMXvBSbA 4rNJ4sYqKULIQ+YJp0TbKigcwfihdeG65Zsj1dsoEury0tciZkgCylX7o2mlyVJERM2ghM c7td0T0K3iXz9SdLhYB7sL8QzBrmaOlvGZcHvKddzgw7iLmw2wKY3Xcjd7FUNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724781044; a=rsa-sha256; cv=none; b=Q9OqOl3xq6uJW8+Eh73XiEPDkzgyNiwU62hL7uKUVDHMZX0RybIOvCWgXm2+Ee/qtfU0lY PLfeCFsR+ER9cNDeMX3+w4SDMZoZW6gjViscJustEVXzYIjx29QSkCESqeo56kAx4oHazi PQiDBvRPaEXWgEs8odeY575erTQ61qDwvqY7XL6HE9vAkSVSOfErv2xxr4fNKkWKxu+sP3 P7LAbUREweYWQShV7c8olec46sUGPycACbnBOmx3ezbH7iiknNZc14b0HTpenxS21KVBkt Iw/sMDmYvInyIhR2JC/D32kwgR7yk+nIM355yz/HWmwkgoltB8A3VWMGd5E0cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724781044; 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=NDenC6Iz+pnugF5a5xT0xRLVVIJ5kIWATj6IdM9Qg4I=; b=CUaLsJeAM/ne91yZ1Vv+eIvCGFKdFPstTtOb4TMLa3Guhqns46WaDSZz2Awk4IouWjGLAz UClhJyBNfSSVseq1xIcGa7rA8utAIxdnqt1kVJzoumbaAPlae8WWaedhu3PZ/cR3S5RYd9 tKzu+PlNbI20W7JbOz6tsLaXxxkC9jOGaoWgCNB2Adq2HKwR4V5eHF26o6fntADAWTcUiY hQqZujYoOrjM3pPM94AZcgXX/mD07n91ZBEqaf32fkZMVOx1pfSJBEH5bhqs2PnnMMCe93 /F58iKFUAaxTIGnu5R6jgttlWF5fer4/PAcTDp/5PeTbZJ6M59LI9D5+bgR1oQ== 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 4WtZpD66dGz103f; Tue, 27 Aug 2024 17:50:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47RHoigs067700; Tue, 27 Aug 2024 17:50:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47RHoiaK067697; Tue, 27 Aug 2024 17:50:44 GMT (envelope-from git) Date: Tue, 27 Aug 2024 17:50:44 GMT Message-Id: <202408271750.47RHoiaK067697@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 9c0cce328363 - main - usb: correct the rtw8821cu quirk and add another wireless rtw88 device 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c0cce328363bd62f3c9add67bea7422208d9903 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9c0cce328363bd62f3c9add67bea7422208d9903 commit 9c0cce328363bd62f3c9add67bea7422208d9903 Author: Bjoern A. Zeeb AuthorDate: 2024-07-31 08:10:24 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-08-27 17:48:43 +0000 usb: correct the rtw8821cu quirk and add another wireless rtw88 device The RTW8821CU_CD entry in quirks has an invalid lo_rev/hi_rev match entry. Use the different USB_QUIRK macro to match on all of these; the value we currently see is 0x0200 on two different wifi sticks. [1] Also add an entry for the DLINK DWA-181 rev A1, rtw88 USB. Submitted by: phk Tested by: phk Fixes: b3b6a959c85af3aabbde3ef2b80dbd4bf5b6f5a7 [1] Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D46189 --- sys/dev/usb/quirk/usb_quirk.c | 2 +- sys/dev/usb/usbdevs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index d6ddeafd7195..8c49f048ecb3 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -534,7 +534,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { UQ_MSC_NO_INQUIRY, UQ_CFG_INDEX_0), USB_QUIRK(SMART2, G2MEMKEY, UQ_MSC_NO_INQUIRY), USB_QUIRK_REV(RALINK, RT_STOR, 0x0001, 0x0001, UQ_MSC_IGNORE), - USB_QUIRK_REV(REALTEK, RTW8821CU_CD, 0x0001, 0x0001, UQ_MSC_IGNORE), + USB_QUIRK(REALTEK, RTW8821CU_CD, UQ_MSC_IGNORE), /* Non-standard USB MIDI devices */ USB_QUIRK(ROLAND, UM1, UQ_AU_VENDOR_CLASS), USB_QUIRK(ROLAND, SC8850, UQ_AU_VENDOR_CLASS), diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index ea011f54b075..e02289521095 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1729,6 +1729,7 @@ product DLINK DWA180A1 0x3316 DWA-180 rev A1 product DLINK DWA172A1 0x3318 DWA-172 rev A1 product DLINK DWA131E1 0x3319 DWA-131 rev E1 product DLINK DWA182D1 0x331c DWA-182 rev D1 +product DLINK DWA181A1 0x331e DWA-181 rev A1 product DLINK DWL122 0x3700 DWL-122 product DLINK DWLG120 0x3701 DWL-G120 product DLINK DWL120F 0x3702 DWL-120 rev F