From nobody Sun Jul 28 20:23:59 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 4WXCcw0FBzz5RbjK; Sun, 28 Jul 2024 20:24:00 +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 4WXCcv4x9bz4DW8; Sun, 28 Jul 2024 20:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722198239; 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=491oJw0Y1wH/KweK8hq3opCQp4u9VG2PEEd6Om03gZg=; b=Cch4ledGIztynVp4WUUyAAbLXvW1H8fe2DJ3I2FEUXGjy3ZbUG8BCR668m8wQzsSiGBt7j ZUoklMcFuy/wC9dZ3I7ECWzrar7AOM5R7LmNLEToI5E0VpGB/c//dmm0i3PVgDR0+htbvd QUMXNuFBFtyVr0G2Q2xuy/qAkA2IATc3dJvqV7pz13zMBWdRKHl7Y/yDUu273qxWj4Ivcp uohQj4JUXZmE6M+s5hpJrjwyLrIGJaxMD+ofqQrGcKG8v5wE3Xn8a5hAqAnC+Bx+40w/Ux lHAw1Df/9X6XhG0zyYz9w7rZNd0RrPRz+7AOxr0kZmjao4CAA6D6YpNUibWqRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722198239; a=rsa-sha256; cv=none; b=QrzEJDbffsRLxoV/hJXxp2GasfsdoOZYA641InLogd8ah9cBhbxmZ/Br17BQ5HC0bmlWqY Z/Pz7x21pL56TpaIEcNvdx3IIy0Ts0vyyz5kB+yGNn7kg7s92hjZojT7gdb96oHN95oBXb 7zDODJYeKYqgHfnlSPrOewHcAvWnrVBB0A6E5QC0ik3E4255V5L4w9x90/R1tA6J/N3ybC Sq5ASrMVfrDtVdU+zE+/N2HXdNOejtOQ0UxtJ8hfFxhOMeC05smgq+fCcYYuq+Nbz5+z4N BStCeksZRN0IgA78twbn6LfrERcdiqpIqE+yE9vAV8t9dQaNpHK+K8p/ZOPgiw== 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=1722198239; 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=491oJw0Y1wH/KweK8hq3opCQp4u9VG2PEEd6Om03gZg=; b=QsUOKVcyvpnzc1x9RpF2BHRRVjWVu2FTkpwYUxHKakCy3kAGXMSWe0d8gXmL1kaC4y3Gkc d5Q9PfZf2r9pkDXdZhFcUvQnX4aWgHgnQFlQR8vz6GIPjShnE13NaA4SS2cw93+LgKxYcO vARSMEzy9zpYcAej3eb4zN9doy+jgoJKwP4HZmrz1Y6WfCyUlAIa6ISmcfO57t1T5dCiEk yrFIlo7o26h98CrBJadVBTq4eHtxaEjYwmnPb3e/RSI3GHicj2JLlX38ghfe9fqHdq5dR7 GWwmcFRM1OacYefT8mo9aSdDWapVdwKHB3C58eVr6sqIsClkpwyUfHKSPvpQFw== 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 4WXCcv4Wrqz14Sx; Sun, 28 Jul 2024 20:23:59 +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 46SKNxRg050384; Sun, 28 Jul 2024 20:23:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46SKNxXP050381; Sun, 28 Jul 2024 20:23:59 GMT (envelope-from git) Date: Sun, 28 Jul 2024 20:23:59 GMT Message-Id: <202407282023.46SKNxXP050381@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: 12f6e0a4d2d5 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 12f6e0a4d2d5e51c403a45dcaf34928572a88345 Auto-Submitted: auto-generated The branch stable/14 has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=12f6e0a4d2d5e51c403a45dcaf34928572a88345 commit 12f6e0a4d2d5e51c403a45dcaf34928572a88345 Author: Florian Walpen AuthorDate: 2024-04-27 08:48:37 +0000 Commit: Ruslan Bukin CommitDate: 2024-07-28 20:23:07 +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 91d1f3ee1bf6..0b378cc3d8f4 100644 --- a/sys/dev/sound/pci/hdspe.c +++ b/sys/dev/sound/pci/hdspe.c @@ -395,7 +395,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 d5d8dd46e580..56b928b23abd 100644 --- a/sys/dev/sound/pci/hdspe.h +++ b/sys/dev/sound/pci/hdspe.h @@ -28,6 +28,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