Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757931Ab2JQVRE (ORCPT ); Wed, 17 Oct 2012 17:17:04 -0400 Received: from g1t0029.austin.hp.com ([15.216.28.36]:42569 "EHLO g1t0029.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757881Ab2JQVRD (ORCPT ); Wed, 17 Oct 2012 17:17:03 -0400 From: Tom Mingarelli To: Alex Williamson , David Woodhouse , Don Dutile Cc: Shuah Khan , Tom Mingarelli , Linda Knippers , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Message-Id: <20121018021735.23962.51639.sendpatchset@RHEL63BL460c> Subject: [PATCH v3] Prevent devices with RMRRs from being placed into SI Domain Date: Wed, 17 Oct 2012 21:17:00 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2090 Lines: 62 This patch is to prevent devices that have RMRRs associated with them to not be placed into the SI Domain during init. We don't put USB devices into this category, however. This fixes the issue where the RMRR info for devices being placed in and out of the SI Domain gets lost. Signed-off-by: Thomas Mingarelli Tested-by: Shuah Khan ---- PATCH v1: https://lkml.org/lkml/2012/6/15/204 PATCH v2: https://lkml.org/lkml/2012/9/18/354 drivers/iommu/intel-iommu.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff -up ./drivers/iommu/intel-iommu.c.ORIG ./drivers/iommu/intel-iommu.c --- ./drivers/iommu/intel-iommu.c.ORIG 2012-10-16 09:34:23.148089944 -0500 +++ ./drivers/iommu/intel-iommu.c 2012-10-17 20:41:40.509642356 -0500 @@ -2320,8 +2320,38 @@ static int domain_add_dev_info(struct dm return 0; } +static bool device_has_rmrr(struct pci_dev *dev) +{ + struct dmar_rmrr_unit *rmrr; + int i; + + for_each_rmrr_units(rmrr) { + for (i = 0; i < rmrr->devices_cnt; i++) { + /* + * Here we are just concerned with checking each device + * that has an RMRR associated with it and not allow it + * to be placed into the SI Domain during startup. + */ + if (rmrr->devices[i] == dev) + return true; + } + } + return false; +} + static int iommu_should_identity_map(struct pci_dev *pdev, int startup) { + + /* + * This is where we will refuse any device that has an + * RMRR associated with it and is not a USB device and + * NOT allow it to be placed into the SI Domain. We don't + * need a separate bit for this because it could be ANY device. + */ + if (device_has_rmrr(pdev) && + (pdev->class >> 8) != PCI_CLASS_SERIAL_USB) + return 0; + if ((iommu_identity_mapping & IDENTMAP_AZALIA) && IS_AZALIA(pdev)) return 1; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/