Re: [Xen-users] Xen IOMMU disabled due to IVRS table... Blah blah blah

[feral <blistovmhz@xxxxxxxxx>]

Perhaps my brain is stupid today, but I just noticed this reply and am trying to apply the patch, but both hunks are failing against 4.2.2.

bens@octillion ~/Downloads/xen-4.2.2 $ patch -p1 < ivrs.patch 

patching file xen/drivers/passthrough/amd/iommu_acpi.c

Hunk #1 FAILED at 674.

Hunk #2 FAILED at 694.

2 out of 2 hunks FAILED -- saving rejects to file xen/drivers/passthrough/amd/iommu_acpi.c.rej

On Fri, May 31, 2013 at 12:21 PM, nbhs <santellads@xxxxxxxxx> wrote:

for 4.2.2:

--- a/xen/drivers/passthrough/amd/iommu_acpi.c  2013-04-23 16:42:55.000000000
+0000
+++ b/xen/drivers/passthrough/amd/iommu_acpi.c  2013-05-31 16:21:14.733159937
+0000
@@ -674,19 +674,19 @@ static u16 __init parse_ivhd_device_spec

      */
     for ( apic = 0; apic < nr_ioapics; apic++ )
     {

-        if ( IO_APIC_ID(apic) != special->handle )
+        if ( ioapic_sbdf[IO_APIC_ID(apic)].bdf !=
ioapic_sbdf[special->handle].bdf )
             continue;

-        if ( ioapic_sbdf[special->handle].pin_setup )
+        if ( ioapic_sbdf[IO_APIC_ID(apic)].pin_setup )
         {
-            if ( ioapic_sbdf[special->handle].bdf == bdf &&
-                 ioapic_sbdf[special->handle].seg == seg )
+            if ( ioapic_sbdf[IO_APIC_ID(apic)].bdf == bdf &&
+                 ioapic_sbdf[IO_APIC_ID(apic)].seg == seg )

                 AMD_IOMMU_DEBUG("IVHD Warning: Duplicate IO-APIC %#x
entries\n",

-                                special->handle);

+                                IO_APIC_ID(apic));
             else
             {
                 printk(XENLOG_ERR "IVHD Error: Conflicting IO-APIC %#x
entries\n",

-                       special->handle);

+                       IO_APIC_ID(apic));
                 if ( amd_iommu_perdev_intremap )
                     return 0;
             }

@@ -694,10 +694,10 @@ static u16 __init parse_ivhd_device_spec

         else
         {
             /* set device id of ioapic */

-            ioapic_sbdf[special->handle].bdf = bdf;
-            ioapic_sbdf[special->handle].seg = seg;
+            ioapic_sbdf[IO_APIC_ID(apic)].bdf = bdf;
+            ioapic_sbdf[IO_APIC_ID(apic)].seg = seg;

-            ioapic_sbdf[special->handle].pin_setup = xzalloc_array(
+            ioapic_sbdf[IO_APIC_ID(apic)].pin_setup = xzalloc_array(
                 unsigned long, BITS_TO_LONGS(nr_ioapic_entries[apic]));
             if ( nr_ioapic_entries[apic] &&
                  !ioapic_sbdf[IO_APIC_ID(apic)].pin_setup )




--
View this message in context: http://xen.1045712.n5.nabble.com/Xen-IOMMU-disabled-due-to-IVRS-table-Blah-blah-blah-tp5716461p5716583.html

Sent from the Xen - User mailing list archive at Nabble.com.

_______________________________________________
Xen-users mailing list
Xen-users@xxxxxxxxxxxxx
http://lists.xen.org/xen-users

--
_____
Fact:
1. Ninjas are mammals.
2. Ninjas fight ALL the time.
3. The purpose of the ninja is to flip out and kill people.

_______________________________________________
Xen-users mailing list
Xen-users@xxxxxxxxxxxxx
http://lists.xen.org/xen-users