From nobody Sat Apr 27 08:50:37 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 4VRNbK6wSyz5J9Vx; Sat, 27 Apr 2024 08:50:37 +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 4VRNbK3glmz4G7r; Sat, 27 Apr 2024 08:50:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714207837; 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=fM8yPE6dQkkUFK7kDCmnosxhVvEhdya3kvg+/KSuGrA=; b=A0PX0chgA0TXKbZ8NtdxZnmUb0zGSUCfFY3GPOzhNZbgf2NlzxmXHxCwEbQ5Ptf3aJtet3 Jv7NhypCKvxWgVWy8U0xVIPMLZR+U/RHvWgkb962uwQ+WG5DccUIUUqCPFOqKI1o8/jdAF uAQ3VrtBm3S3DrQAUg8nZh8fF+gl+kBekF1LaZrsmhSSL+9iNrFlWpo+eT1wzzcbuqxaU2 l2kU/TS/mNASt/ToXELiPrLNnDs+ZKKaYowoms0Q/Vuo1P1aTd1guEmjrfcEWfwAHalEKe dWmm0O8Wz4iEJJOoxGKTQH9cWCjvAjdQ1pp7suogiJnSXHUS5+XGMNngVS9AQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714207837; a=rsa-sha256; cv=none; b=DQ+Mgy5Qu0Jh51nZnMr14R1w61IjgaDl9cd8Dd++cCO2UuHEsHwp0OSASWToaR6FOAYdid x31W2d5CrwuAFPtBRhG2qpwhhpReuI7zVxpj5KPzF5xXwNkvDn9VKAqCMxNKzKfpequavK ILk3JSIib5Fhb6vuqh+1alCDiRiKK+X9AZjh/k8fjfd8N9nARoLkJHWF5o5VdprO5pbkr0 5Pq99A7kpwm0nEm3auhBgkZM1rvUeFMylOfQyQ1Ezhs/wFTyvJHrE0AxuoEbJNwcYXpzkZ u2k8czmr48QU9gjbhI7elo3UxoKkrReai+Vx7fALYjjvJudYZmKdTr5XYzSFUw== 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=1714207837; 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=fM8yPE6dQkkUFK7kDCmnosxhVvEhdya3kvg+/KSuGrA=; b=HQ9BZU9WlUnJK8JWP+GxRmHUtbWjeBVnARWq/RL6lH2g2Bu7/D/Ex8VliWY5Q5c1bVehPa /H/jOHdTQzEqT9ONcmrShdQIn1BqDYgXILlQOWF+cQRuyyEVsqbUV2+owoPs8Ia28lVPyj AC2nDFWEUJEckE8fMur/H1VFqBgPqiWwMdIh+Vi4dERE8eieIxer3o0yfcIEjeMAiKjZ3M Q88MybyJrDf4goS6f3itcuTZUyg0wml00+xWEKx17Lfp4GLssC5DvYS5eV+SzZo5YYkEUh UdsbekYdgs6n2ghvaRNtvzSAQe4obLmIxITyWfmdWtPMw9Wc8CCFvtg+plEeVg== 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 4VRNbK3HkYzJj2; Sat, 27 Apr 2024 08:50:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43R8obCC014582; Sat, 27 Apr 2024 08:50:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43R8obwS014578; Sat, 27 Apr 2024 08:50:37 GMT (envelope-from git) Date: Sat, 27 Apr 2024 08:50:37 GMT Message-Id: <202404270850.43R8obwS014578@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: 9718d4ab9938 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 9718d4ab99386918f5b5c207c58289eaade20623 Auto-Submitted: auto-generated The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=9718d4ab99386918f5b5c207c58289eaade20623 commit 9718d4ab99386918f5b5c207c58289eaade20623 Author: Florian Walpen AuthorDate: 2024-04-27 08:48:37 +0000 Commit: Ruslan Bukin CommitDate: 2024-04-27 08:48:37 +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 --- 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 0773362f2bc3..f9c36df359e3 100644 --- a/sys/dev/sound/pci/hdspe.c +++ b/sys/dev/sound/pci/hdspe.c @@ -474,7 +474,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 de20462170e7..daffeb4ddebc 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