From: "Steven L. Kinney" Subject: [PATCH 1/3] AMD x86 quirks: Quirk for enabling IOMMUv2 PC feature Date: Mon, 21 Jan 2013 14:20:56 -0600 Message-ID: <1358799658-6236-2-git-send-email-steven.kinney@amd.com> References: <1358799658-6236-1-git-send-email-steven.kinney@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1358799658-6236-1-git-send-email-steven.kinney-5C7GfCeVMHo@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, Joerg Roedel Cc: Kukjin Kim , Peter Zijlstra , Stephen Warren , Greg Kroah-Hartman , "Steven L. Kinney" , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, Cyrill Gorcunov , Sebastian Andrzej Siewior , Andi Kleen , Paul Mackerras , Arnaldo Carvalho de Melo , Jiri Kosina , Bjorn Helgaas , Myron Stowe , Thomas Renninger List-Id: iommu@lists.linux-foundation.org From: "Steven L. Kinney" Original code base by Andreas Herrmann at AMD with minor changes. Signed-off-by: Steven L. Kinney --- arch/x86/kernel/quirks.c | 17 +++++++++++++++++ include/linux/pci_ids.h | 2 ++ 2 files changed, 19 insertions(+) diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c index 26ee48a..ab27b88 100644 --- a/arch/x86/kernel/quirks.c +++ b/arch/x86/kernel/quirks.c @@ -567,3 +567,20 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F5, quirk_amd_nb_node); #endif + +#if defined(CONFIG_PCI) && defined(CONFIG_AMD_IOMMU_V2_PC) + +static void amd_force_iommu_v2_pc(struct pci_dev *dev) +{ + u32 val; + + pci_read_config_dword(dev, 0x70, &val); + val |= (1<<9); + pci_write_config_dword(dev, 0x70, val); + dev_printk(KERN_DEBUG, &dev->dev, "Enabled IOMMUv2 PC\n"); +} + +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M10H_IOMMU, + amd_force_iommu_v2_pc); + +#endif diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 0eb6579..c6ce47b 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -396,6 +396,8 @@ /* AMD RD890 Chipset */ #define PCI_DEVICE_ID_RD890_IOMMU 0x5a23 +#define PCI_DEVICE_ID_AMD_15H_M10H_IOMMU 0x1419 + #define PCI_VENDOR_ID_ADL 0x1005 #define PCI_DEVICE_ID_ADL_2301 0x2301 -- 1.7.9.5