Commit fa5f508f authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Update DMAR table definitions. 



This patch updates DMAR table header definitions as such enhancement
has been made in ACPICA upstream already.  It ports that change to
the Linux source to reduce source code differences between Linux and
ACPICA upstream.

Build test done on x86-64 machine with the following configs enabled:
  CONFIG_DMAR_TABLE
  CONFIG_IRQ_REMAP
  CONFIG_INTEL_IOMMU

This patch does not affect the generation of the Linux kernel binary.

[rjw: Changelog]
Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 09b8b1fc

drivers/iommu/dmar.c

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static int __init dmar_parse_one_dev_scope(struct acpi_dmar_device_scope *scope, 
			pr_warn("Device scope bus [%d] not found\n", scope->bus);

			break;

		}

		pdev = pci_get_slot(bus, PCI_DEVFN(path->dev, path->fn));

		pdev = pci_get_slot(bus, PCI_DEVFN(path->device, path->function));

		if (!pdev) {

			/* warning will be printed below */

			break;
@@ -99,7 +99,7 @@ static int __init dmar_parse_one_dev_scope(struct acpi_dmar_device_scope *scope, 
	}

	if (!pdev) {

		pr_warn("Device scope device [%04x:%02x:%02x.%02x] not found\n",

			segment, scope->bus, path->dev, path->fn);

			segment, scope->bus, path->device, path->function);

		*dev = NULL;

		return 0;

	}

drivers/iommu/intel_irq_remapping.c

+4 −4
Original line number Diff line number Diff line
@@ -686,12 +686,12 @@ static void ir_parse_one_hpet_scope(struct acpi_dmar_device_scope *scope, 
		 * Access PCI directly due to the PCI

		 * subsystem isn't initialized yet.

		 */

		bus = read_pci_config_byte(bus, path->dev, path->fn,

		bus = read_pci_config_byte(bus, path->device, path->function,

					   PCI_SECONDARY_BUS);

		path++;

	}

	ir_hpet[ir_hpet_num].bus   = bus;

	ir_hpet[ir_hpet_num].devfn = PCI_DEVFN(path->dev, path->fn);

	ir_hpet[ir_hpet_num].devfn = PCI_DEVFN(path->device, path->function);

	ir_hpet[ir_hpet_num].iommu = iommu;

	ir_hpet[ir_hpet_num].id    = scope->enumeration_id;

	ir_hpet_num++;
@@ -714,13 +714,13 @@ static void ir_parse_one_ioapic_scope(struct acpi_dmar_device_scope *scope, 
		 * Access PCI directly due to the PCI

		 * subsystem isn't initialized yet.

		 */

		bus = read_pci_config_byte(bus, path->dev, path->fn,

		bus = read_pci_config_byte(bus, path->device, path->function,

					   PCI_SECONDARY_BUS);

		path++;

	}



	ir_ioapic[ir_ioapic_num].bus   = bus;

	ir_ioapic[ir_ioapic_num].devfn = PCI_DEVFN(path->dev, path->fn);

	ir_ioapic[ir_ioapic_num].devfn = PCI_DEVFN(path->device, path->function);

	ir_ioapic[ir_ioapic_num].iommu = iommu;

	ir_ioapic[ir_ioapic_num].id    = scope->enumeration_id;

	ir_ioapic_num++;

include/acpi/actbl2.h

+2 −2
Original line number Diff line number Diff line
@@ -444,8 +444,8 @@ enum acpi_dmar_scope_type { 
};



struct acpi_dmar_pci_path {

	u8 dev;

	u8 fn;

	u8 device;

	u8 function;

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE