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 DD2E51EC018; Tue, 15 Oct 2024 12:08:15 +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=1728994096; cv=none; b=C1QMBU8luoT3y/XNO7gpc/FBTbdqnpjIWbrUol5Q2xp8F49NSu+YqR3z0MIOEOSPr13lBz5eyzsgLW/ZqT2uINRee4We3JysMMirn7gtyVCJApquITKfZLly02tUhBwfNv3djLTNIfBeqX/7m/I/m3A+pIiRfmBAvkEApnQd5zI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728994096; c=relaxed/simple; bh=n3xpJElzQ8qZfEGV3oXLFFcZ3RPLVlvbbV+BPzTc07o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o//P5Uhum/oL3sj9g/jr3PiTuYYMmAO+XzeI2nu4WDOy2pQzs18JvYJgtVBanxkh5ebpnBnU/uAuj2E2TLjyAjlqcj2W8i0M0LyEg/GYZThHtrzZ0l+iVX2h3pRuAcfQrhsmunKDUCwY2K1YDhu4UQg5MbBfT1LANZD+7aiCtdw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LB1qMwkU; 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="LB1qMwkU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5ED8FC4CECE; Tue, 15 Oct 2024 12:08:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728994095; bh=n3xpJElzQ8qZfEGV3oXLFFcZ3RPLVlvbbV+BPzTc07o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LB1qMwkUpDRS05RtfpjGXtw50TWn6qV4ocd/p727XzYQiJFPftvvqSSE1yaGhx27I LokLUw5+z4u6JJTB8igqN0rVXGCH8FX9aujt+7PRwSe4As3eUJFWKxNSaygsYeKiXm XD3Zfjg65+aP+ZbZEtdIJDa9jdPbjjq+uzChj680= 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 5.15 605/691] PCI: Add function 0 DMA alias quirk for Glenfly Arise chip Date: Tue, 15 Oct 2024 13:29:13 +0200 Message-ID: <20241015112504.353420567@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241015112440.309539031@linuxfoundation.org> References: <20241015112440.309539031@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-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 4d4267105cd2b..2d648967aa85f 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4118,6 +4118,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 66e95df2e6867..d1997eda6b1ad 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2635,6 +2635,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_PXHD_0 0x0320 diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index dd4d802c9e71c..6913d113bb4ea 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2715,7 +2715,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