rpms/kernel/F-12 linux-2.6-intel-iommu-updates.patch,1.3,1.4

[David Woodhouse]

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23378

Modified Files:
	linux-2.6-intel-iommu-updates.patch 
Log Message:
make it build

linux-2.6-intel-iommu-updates.patch:
 Documentation/Intel-IOMMU.txt  |    6 
 arch/ia64/kernel/pci-swiotlb.c |    2 
 arch/x86/kernel/pci-swiotlb.c  |    5 
 drivers/pci/dmar.c             |   37 ++-
 drivers/pci/intel-iommu.c      |  399 ++++++++++++++++++++++++-----------------
 drivers/pci/intr_remapping.c   |    8 
 drivers/pci/iova.c             |   16 -
 include/linux/intel-iommu.h    |    2 
 include/linux/iova.h           |    1 
 9 files changed, 282 insertions(+), 194 deletions(-)

Index: linux-2.6-intel-iommu-updates.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6-intel-iommu-updates.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- linux-2.6-intel-iommu-updates.patch	30 Sep 2009 19:24:09 -0000	1.3
+++ linux-2.6-intel-iommu-updates.patch	30 Sep 2009 19:42:24 -0000	1.4
@@ -1,4 +1,5 @@
 (Reverted the part which kills BROKEN_GFX_WA)
+(...and the HARDWARE_AFFINITY bit)
 
 commit e0fc7e0b4b5e69616f10a894ab9afff3c64be74e
 Author: David Woodhouse <David.Woodhouse at intel.com>
@@ -483,42 +484,6 @@ diff --git a/drivers/pci/dmar.c b/driver
 index 7b287cb..708176d 100644
 --- a/drivers/pci/dmar.c
 +++ b/drivers/pci/dmar.c
-@@ -353,6 +353,7 @@ dmar_table_print_dmar_entry(struct acpi_dmar_header *header)
- 	struct acpi_dmar_hardware_unit *drhd;
- 	struct acpi_dmar_reserved_memory *rmrr;
- 	struct acpi_dmar_atsr *atsr;
-+	struct acpi_dmar_rhsa *rhsa;
- 
- 	switch (header->type) {
- 	case ACPI_DMAR_TYPE_HARDWARE_UNIT:
-@@ -374,6 +375,12 @@ dmar_table_print_dmar_entry(struct acpi_dmar_header *header)
- 		atsr = container_of(header, struct acpi_dmar_atsr, header);
- 		printk(KERN_INFO PREFIX "ATSR flags: %#x\n", atsr->flags);
- 		break;
-+	case ACPI_DMAR_HARDWARE_AFFINITY:
-+		rhsa = container_of(header, struct acpi_dmar_rhsa, header);
-+		printk(KERN_INFO PREFIX "RHSA base: %#016Lx proximity domain: %#x\n",
-+		       (unsigned long long)rhsa->base_address,
-+		       rhsa->proximity_domain);
-+		break;
- 	}
- }
- 
-@@ -452,9 +459,13 @@ parse_dmar_table(void)
- 			ret = dmar_parse_one_atsr(entry_header);
- #endif
- 			break;
-+		case ACPI_DMAR_HARDWARE_AFFINITY:
-+			/* We don't do anything with RHSA (yet?) */
-+			break;
- 		default:
- 			printk(KERN_WARNING PREFIX
--				"Unknown DMAR structure type\n");
-+				"Unknown DMAR structure type %d\n",
-+				entry_header->type);
- 			ret = 0; /* for forward compatibility */
- 			break;
- 		}
 @@ -570,9 +581,6 @@ int __init dmar_table_init(void)
  		printk(KERN_INFO PREFIX "No ATSR found\n");
  #endif