Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f7dbc7f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: more general identifier for Phoenix BIOS
  AMD IOMMU: check for next_bit also in unmapped area
  AMD IOMMU: fix fullflush comparison length
  AMD IOMMU: enable device isolation per default
  AMD IOMMU: add parameter to disable device isolation
  x86, PEBS/DS: fix code flow in ds_request()
  x86: add rdtsc barrier to TSC sync check
  xen: fix scrub_page()
  x86: fix es7000 compiling
  x86, bts: fix unlock problem in ds.c
  x86, voyager: fix smp generic helper voyager breakage
  x86: move iomap.h to the new include location
parents 9f92f471 73f56c0d

Documentation/kernel-parameters.txt

+3 −1
Original line number Diff line number Diff line
@@ -294,7 +294,9 @@ and is between 256 and 4096 characters. It is defined in the file 
			Possible values are:

			isolate - enable device isolation (each device, as far

			          as possible, will get its own protection

			          domain)

			          domain) [default]

			share - put every device behind one IOMMU into the

				same protection domain

			fullflush - enable flushing of IO/TLB entries when

				    they are unmapped. Otherwise they are

				    flushed before they will be reused, which

arch/x86/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -167,9 +167,12 @@ config GENERIC_PENDING_IRQ 
config X86_SMP

	bool

	depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64)

	select USE_GENERIC_SMP_HELPERS

	default y



config USE_GENERIC_SMP_HELPERS

	def_bool y

	depends on SMP



config X86_32_SMP

	def_bool y

	depends on X86_32 && SMP

include/asm-x86/iomap.h→arch/x86/include/asm/iomap.h

+0 −0

File moved.

View file

arch/x86/kernel/amd_iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ static void dma_ops_free_addresses(struct dma_ops_domain *dom, 
	address >>= PAGE_SHIFT;

	iommu_area_free(dom->bitmap, address, pages);



	if (address + pages >= dom->next_bit)

	if (address >= dom->next_bit)

		dom->need_flush = true;

}

arch/x86/kernel/amd_iommu_init.c

+4 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ u16 amd_iommu_last_bdf; /* largest PCI device id we have 
LIST_HEAD(amd_iommu_unity_map);		/* a list of required unity mappings

					   we find in ACPI */

unsigned amd_iommu_aperture_order = 26; /* size of aperture in power of 2 */

int amd_iommu_isolate;			/* if 1, device isolation is enabled */

int amd_iommu_isolate = 1;		/* if 1, device isolation is enabled */

bool amd_iommu_unmap_flush;		/* if true, flush on every unmap */



LIST_HEAD(amd_iommu_list);		/* list of all AMD IOMMUs in the
@@ -1213,7 +1213,9 @@ static int __init parse_amd_iommu_options(char *str) 
	for (; *str; ++str) {

		if (strncmp(str, "isolate", 7) == 0)

			amd_iommu_isolate = 1;

		if (strncmp(str, "fullflush", 11) == 0)

		if (strncmp(str, "share", 5) == 0)

			amd_iommu_isolate = 0;

		if (strncmp(str, "fullflush", 9) == 0)

			amd_iommu_unmap_flush = true;

	}