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 05EA81F4FA4; Fri, 4 Oct 2024 18:22:44 +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=1728066164; cv=none; b=VQ1VXXNTnZIt7Don9BkAavBksk2+Pbdo11ItT23vg1SP1DPJ/9uFrir9tzS1zcyIVaxK4Z5HUyMmaKig9U/aYMXdHqi3Y8ZV8AOJUpjIUQq6RE5fwFnmiacbFLfcS8WZKSW/yy52kVDEBaKEabGiWaCeVHH+PJlSegD1Nbnaev4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728066164; c=relaxed/simple; bh=B4qOlQx1wK5Ec41iDX5tDfLR8M1j8hNkWSUOF2DcAR0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YmbPMgrPf/TA8Q9D2zAs6eBAgNv4RzK/1drfLLd6uT52sK4aojdkYc/FRe3q9nThPD307Pzf27Qx6pg3XkAuYP+kM9koyeCmBEfvndFUQUVx5bxvK/r2k0RRCyptfMpG6dMued2zBONnebQINvS+1Fc1fZmgMsInoIDMbgMkly4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DcejJ1Uc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DcejJ1Uc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1DD91C4CEC6; Fri, 4 Oct 2024 18:22:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728066163; bh=B4qOlQx1wK5Ec41iDX5tDfLR8M1j8hNkWSUOF2DcAR0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DcejJ1UcSe2aCvPOmDMEx2LvNlPEPOIvkQOdaBGcjlI3Pjdh5E/sVRLZ485GyL5Z7 BHmUQnJ8ji97GYTUnb8T+8KbIAUtdi6oFRGiGxSoY+NucKx2mn05IO6DtyzAb3TgAh /ojP+ooHSoxuTeA1g517p7igyaD2frw0zZmXJHTuXdG/M5k+gnPQTBAtRytHWiPYfp uhVWcG30AgXF7KBhX+lc4RDmKKzdcWczksyRRJ8D95rSMLr+7/nOjRma86SzyZk8nR RgebsHmOBp90neiT6Ub6w4iotZgeBWCOW5QHIbcPryCIJjaZS/6C2sHLiZjUDz8cc3 I5d/WDe+CNNoQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: WangYuli , SiyuLi , Bjorn Helgaas , Takashi Iwai , Sasha Levin , perex@perex.cz, tiwai@suse.com, pierre-louis.bossart@linux.dev, peter.ujfalusi@linux.intel.com, maarten.lankhorst@linux.intel.com, kai.vehmanen@linux.intel.com, rsalvaterra@gmail.com, linux-pci@vger.kernel.org, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 6.10 23/70] PCI: Add function 0 DMA alias quirk for Glenfly Arise chip Date: Fri, 4 Oct 2024 14:20:21 -0400 Message-ID: <20241004182200.3670903-23-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241004182200.3670903-1-sashal@kernel.org> References: <20241004182200.3670903-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.10.13 Content-Transfer-Encoding: 8bit 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 568410e64ce64..2c327ddd7f83e 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4246,6 +4246,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 677aea20d3e11..5b24012057ddc 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2659,6 +2659,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 87203b819dd47..61ddb17cca477 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2677,7 +2677,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