From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F2961AA7A5; Mon, 14 Oct 2024 14:42:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728916958; cv=none; b=raDjA+YxMKnmjeM3Bl8ikkSTDopSOO24341QVYzLYJ9ucO7K2Ea08bSYJpAJOWjSTc15+2TOVqeRtS5Cn5fJkE37ey/Cm945OdkQWfSKTgkRWmHGbdmZmsHNfT10Qh1+2IfA/mwZs6GxgY6LbRAumJ+tVA/tRLNtDGRFZwJCgbg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728916958; c=relaxed/simple; bh=XCua2k03eyzHuHPbDyu5iAAp3plmULQlonsXJ7e0mlQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=owBdcE+vNcDmGays67A9ij4s7JUiv0xcz6SO7/wzwxJ3l4PZNMBH486dTy566Wrt1vh+xmzv9gVfybO5C0EloALxeZIVLa3wYnX3kOl/pqOusB5EPWBI7wrJjP2CBSRW3c95lUZ8RrmKg7q3+m1dhknRv9bwnubQ0HgI+i70+VI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TsfVzF+k; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="TsfVzF+k" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89FD3C4CEC3; Mon, 14 Oct 2024 14:42:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728916957; bh=XCua2k03eyzHuHPbDyu5iAAp3plmULQlonsXJ7e0mlQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TsfVzF+ktMqF9lzMRup31zAnt+S6ZAzPnlrl8s5MSGm0kprfyn1WMoR50G7N/YA2M HvT4lAXSMX70pmZwn1Uz7v7VpqMX4xEsC724FrMiUzW8jWilyzhFDyq43uQvC2d7BI ZWf+ydsiNdxr+EehvOrPYMsAgKyDIh4q10CBUL0k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, SiyuLi , WangYuli , Bjorn Helgaas , Takashi Iwai , Sasha Levin Subject: [PATCH 6.6 070/213] PCI: Add function 0 DMA alias quirk for Glenfly Arise chip Date: Mon, 14 Oct 2024 16:19:36 +0200 Message-ID: <20241014141045.716640185@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141042.954319779@linuxfoundation.org> References: <20241014141042.954319779@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: WangYuli [ Upstream commit 9246b487ab3c3b5993aae7552b7a4c541cc14a49 ] Add DMA support for audio function of Glenfly Arise chip, which uses Requester ID of function 0. Link: https://lore.kernel.org/r/CA2BBD087345B6D1+20240823095708.3237375-1-wangyuli@uniontech.com Signed-off-by: SiyuLi Signed-off-by: WangYuli [bhelgaas: lower-case hex to match local code, drop unused Device IDs] Signed-off-by: Bjorn Helgaas Reviewed-by: Takashi Iwai Signed-off-by: Sasha Levin --- drivers/pci/quirks.c | 4 ++++ include/linux/pci_ids.h | 2 ++ sound/pci/hda/hda_intel.c | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 0b08ac45effbb..a35f72b443cef 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4252,6 +4252,10 @@ static void quirk_dma_func0_alias(struct pci_dev *dev) DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_RICOH, 0xe832, quirk_dma_func0_alias); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_RICOH, 0xe476, quirk_dma_func0_alias); +/* Some Glenfly chips use function 0 as the PCIe Requester ID for DMA */ +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_GLENFLY, 0x3d40, quirk_dma_func0_alias); +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_GLENFLY, 0x3d41, quirk_dma_func0_alias); + static void quirk_dma_func1_alias(struct pci_dev *dev) { if (PCI_FUNC(dev->devfn) != 1) diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index abff4e3b6a58b..cebfd1bb9dfa1 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2653,6 +2653,8 @@ #define PCI_DEVICE_ID_DCI_PCCOM8 0x0002 #define PCI_DEVICE_ID_DCI_PCCOM2 0x0004 +#define PCI_VENDOR_ID_GLENFLY 0x6766 + #define PCI_VENDOR_ID_INTEL 0x8086 #define PCI_DEVICE_ID_INTEL_EESSC 0x0008 #define PCI_DEVICE_ID_INTEL_HDA_CML_LP 0x02c8 diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index a6a9d353fe635..134c6f6e0959a 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2682,7 +2682,7 @@ static const struct pci_device_id azx_ids[] = { .driver_data = AZX_DRIVER_ATIHDMI_NS | AZX_DCAPS_PRESET_ATI_HDMI_NS | AZX_DCAPS_PM_RUNTIME }, /* GLENFLY */ - { PCI_DEVICE(0x6766, PCI_ANY_ID), + { PCI_DEVICE(PCI_VENDOR_ID_GLENFLY, PCI_ANY_ID), .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8, .class_mask = 0xffffff, .driver_data = AZX_DRIVER_GFHDMI | AZX_DCAPS_POSFIX_LPIB | -- 2.43.0