From nobody Sun Jul 28 20:21:03 2024 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 4WXCYW58bQz5Rb6x; Sun, 28 Jul 2024 20:21:03 +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 4WXCYW1bK9z4CQX; Sun, 28 Jul 2024 20:21:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722198063; 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=axW4SbGmQ4S9EAbAycCCzMJ1RRmCEtt5wsYw3b25F9A=; b=mPB+GVcwIqDp7AS1HlPTYxYVLpMCQahf/vwJWtLXhu33j/RuIoOLeJkvDksfMDMs7H9Z2l vn+I1/kRx19Et4jj1Mgs2AIhWueWvKpyVUFOGUx8KVaEHuwRkEog3+G37CEEfLud/3hpCA 1wRauS+HRmmRUPqSsjuIti6C+rjBd+5PSxQF1JJrXWh+Lq948swQCt0MNBqcKnfh2QQHZa yYFnacB53Q4iufB8ISse9Y6lwYN5A6JHMh4EKzONcP5Hs6lm19FHKo+93yKEjJLhxQXxAS 3Kqwo0gujmjkW0TST4oXkIxPKHr+m2dtBXxVRBWTm/ProOgYgmPiXbYLGXoB2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722198063; a=rsa-sha256; cv=none; b=fYmrCApX1gb1jmt0KipaOv7WSBgkeSFK8WA229dnRKXOSIVrROk3MzUp1fRbXlrDm8XY2x y79E6HVfWyIWQXoX2JgwKJP0fLqPG43XxwT79MAFcsd2smuVdYoqbBsJgyyenVgL/149Us uvJSC5zACYzNGMxRBMR3sPIHAraHhzOvjtAhAqQ/J/vjhLEbJRxUKcE0ocYSOzmwsUyhBj 6LHBwBpguHVTERkWpGy2WiJ7DBRTtT+ilw7XAFIDF9fFFtWvT6Wvq35K0pZ3dv6DT2Mtcw nUU7cAR2/4YTWNSqH7kVKAyTYQqsSMMVISWx0PH17WZ4Mk1ry9i8GE7SzTDpqQ== 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=1722198063; 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=axW4SbGmQ4S9EAbAycCCzMJ1RRmCEtt5wsYw3b25F9A=; b=Z8v4/13eB/xL6fOOkAz4Wh+84TvvJfBk2t8iicFbzQRYd4YOOF4Lq4CE/UiF7GAUfh4U7S vBHWweBDu+MkiFL/zzfMGMnT3Oa6FR3f8d55gayWg1OUiYoHopYQd5fG6HhfC41SW3m+/d Up1PW1rvrq6JsBuXKWPKJPnIgDtrEt99WwGdg8SstEoY/p8bFE5+Nc0T7yHUlcq4WK5NyR AaBHcUNYzE3KMWMRYNJOFghfISXpYg8gRNg8N45g/SvTHXwm2YBanWn1qoiPEF5WcZYHKG htUan95lwd8jXWX4K8K5Fdee7NvFZNrdM2EGRKO0wF1cHYN+727M5jYva7IQ/g== 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 4WXCYW1BKtz14cb; Sun, 28 Jul 2024 20:21:03 +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 46SKL3X2045865; Sun, 28 Jul 2024 20:21:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46SKL3Vl045862; Sun, 28 Jul 2024 20:21:03 GMT (envelope-from git) Date: Sun, 28 Jul 2024 20:21:03 GMT Message-Id: <202407282021.46SKL3Vl045862@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ruslan Bukin Subject: git: 301ced3b69fb - stable/13 - snd_hdspe(4): Recognize newer firmware's PCI vendor id. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 301ced3b69fb162bb157043c4a8da483cfff56e7 Auto-Submitted: auto-generated The branch stable/13 has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=301ced3b69fb162bb157043c4a8da483cfff56e7 commit 301ced3b69fb162bb157043c4a8da483cfff56e7 Author: Florian Walpen AuthorDate: 2024-04-27 08:48:37 +0000 Commit: Ruslan Bukin CommitDate: 2024-07-28 20:20:04 +0000 snd_hdspe(4): Recognize newer firmware's PCI vendor id. At least for HDSPe RayDAT cards, newer firmware comes with RME's own PCI vendor id instead of the Xilinx one. Other HDSPe cards are probably also affected. Update snd_hdspe(4) to recognize both the old Xilinx and the new RME vendor ids. Differential Revision: https://reviews.freebsd.org/D44978 MFC after: 1 day (cherry picked from commit 9718d4ab99386918f5b5c207c58289eaade20623) --- sys/dev/sound/pci/hdspe.c | 3 ++- sys/dev/sound/pci/hdspe.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c index 7289bd3401dc..9bd7bc449c70 100644 --- a/sys/dev/sound/pci/hdspe.c +++ b/sys/dev/sound/pci/hdspe.c @@ -231,7 +231,8 @@ hdspe_probe(device_t dev) { uint32_t rev; - if (pci_get_vendor(dev) == PCI_VENDOR_XILINX && + if ((pci_get_vendor(dev) == PCI_VENDOR_XILINX || + pci_get_vendor(dev) == PCI_VENDOR_RME) && pci_get_device(dev) == PCI_DEVICE_XILINX_HDSPE) { rev = pci_get_revid(dev); switch (rev) { diff --git a/sys/dev/sound/pci/hdspe.h b/sys/dev/sound/pci/hdspe.h index 7056a75a66c1..fc2af2972d1c 100644 --- a/sys/dev/sound/pci/hdspe.h +++ b/sys/dev/sound/pci/hdspe.h @@ -27,6 +27,7 @@ */ #define PCI_VENDOR_XILINX 0x10ee +#define PCI_VENDOR_RME 0x1d18 /* Newer firmware versions. */ #define PCI_DEVICE_XILINX_HDSPE 0x3fc6 /* AIO, MADI, AES, RayDAT */ #define PCI_CLASS_REVISION 0x08 #define PCI_REVISION_AIO 212