Commit a15a82f4 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:
  Revert "x86: default to reboot via ACPI"
  x86: align DirectMap in /proc/meminfo
  AMD IOMMU: fix lazy IO/TLB flushing in unmap path
  x86: add smp_mb() before sending INVALIDATE_TLB_VECTOR
  x86: remove VISWS and PARAVIRT around NR_IRQS puzzle
  x86: mention ACPI in top-level Kconfig menu
  x86: size NR_IRQS on 32-bit systems the same way as 64-bit
  x86: don't allow nr_irqs > NR_IRQS
  x86/docs: remove noirqbalance param docs
  x86: don't use tsc_khz to calculate lpj if notsc is passed
  x86, voyager: fix smp_intr_init() compile breakage
  AMD IOMMU: fix detection of NP capable IOMMUs
parents 9144f382 8d00450d

Documentation/kernel-parameters.txt

+0 −2
Original line number Diff line number Diff line
@@ -1472,8 +1472,6 @@ and is between 256 and 4096 characters. It is defined in the file 
			Valid arguments: on, off

			Default: on



	noirqbalance	[X86-32,SMP,KNL] Disable kernel irq balancing



	noirqdebug	[X86-32] Disables the code which attempts to detect and

			disable unhandled interrupt sources.

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1494,7 +1494,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID 
	def_bool X86_64

	depends on NUMA



menu "Power management options"

menu "Power management and ACPI options"

	depends on !X86_VOYAGER



config ARCH_HIBERNATION_HEADER

arch/x86/include/asm/irq_vectors.h

+6 −14
Original line number Diff line number Diff line
@@ -101,31 +101,23 @@ 
#define LAST_VM86_IRQ		15

#define invalid_vm86_irq(irq)	((irq) < 3 || (irq) > 15)



#ifdef CONFIG_X86_64

#if defined(CONFIG_X86_IO_APIC) && !defined(CONFIG_X86_VOYAGER)

# if NR_CPUS < MAX_IO_APICS

#  define NR_IRQS (NR_VECTORS + (32 * NR_CPUS))

# else

#  define NR_IRQS (NR_VECTORS + (32 * MAX_IO_APICS))

# endif



#elif !defined(CONFIG_X86_VOYAGER)



# if defined(CONFIG_X86_IO_APIC) || defined(CONFIG_PARAVIRT) || defined(CONFIG_X86_VISWS)

#elif defined(CONFIG_X86_VOYAGER)



# define NR_IRQS		224



# else /* IO_APIC || PARAVIRT */

#else /* IO_APIC || VOYAGER */



# define NR_IRQS		16



#endif



#else /* !VISWS && !VOYAGER */



# define NR_IRQS		224



#endif /* VISWS */



/* Voyager specific defines */

/* These define the CPIs we use in linux */

#define VIC_CPI_LEVEL0			0

arch/x86/include/asm/voyager.h

+1 −0
Original line number Diff line number Diff line
@@ -520,6 +520,7 @@ extern void voyager_restart(void); 
extern void voyager_cat_power_off(void);

extern void voyager_cat_do_common_interrupt(void);

extern void voyager_handle_nmi(void);

extern void voyager_smp_intr_init(void);

/* Commands for the following are */

#define	VOYAGER_PSI_READ	0

#define VOYAGER_PSI_WRITE	1

arch/x86/kernel/amd_iommu.c

+7 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static int dma_ops_unity_map(struct dma_ops_domain *dma_dom, 
/* returns !0 if the IOMMU is caching non-present entries in its TLB */

static int iommu_has_npcache(struct amd_iommu *iommu)

{

	return iommu->cap & IOMMU_CAP_NPCACHE;

	return iommu->cap & (1UL << IOMMU_CAP_NPCACHE);

}



/****************************************************************************
@@ -536,6 +536,9 @@ 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)

		dom->need_flush = true;

}



/****************************************************************************
@@ -992,8 +995,10 @@ static void __unmap_single(struct amd_iommu *iommu, 


	dma_ops_free_addresses(dma_dom, dma_addr, pages);



	if (amd_iommu_unmap_flush)

	if (amd_iommu_unmap_flush || dma_dom->need_flush) {

		iommu_flush_pages(iommu, dma_dom->domain.id, dma_addr, size);

		dma_dom->need_flush = false;

	}

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE