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

Commit fed4d59b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Reserve elfcorehdr memory in CONFIG_CRASH_DUMP
  [IA64] fix boot panic caused by offline CPUs
  [IA64] reorder Kconfig options to match x86
  [IA64] Build VT-D iommu support into generic kernel
  [IA64] remove dead BIO_VMERGE_BOUNDARY definition
  [IA64] remove duplicated #include from pci-dma.c
  [IA64] use common header for software IO/TLB
  [IA64] fix the difference between node_mem_map and node_start_pfn
  [IA64] Add error_recovery_info field to SAL section header
  [IA64] Add UV watchlist support.
  [IA64] Simplify SGI uv vs. sn2 driver issues
parents 8ec96e7b 17c1f07e

arch/ia64/Kconfig

+10 −9
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ config IA64_GENERIC 
	select ACPI_NUMA

	select SWIOTLB

	select PCI_MSI

	select DMAR

	help

	  This selects the system type of your hardware.  A "generic" kernel

	  will run on any supported IA-64 system.  However, if you configure
@@ -585,7 +586,7 @@ source "fs/Kconfig.binfmt" 


endmenu



menu "Power management and ACPI"

menu "Power management and ACPI options"



source "kernel/power/Kconfig"
@@ -641,6 +642,8 @@ source "net/Kconfig" 


source "drivers/Kconfig"



source "arch/ia64/hp/sim/Kconfig"



config MSPEC

	tristate "Memory special operations driver"

	depends on IA64
@@ -652,6 +655,12 @@ config MSPEC 


source "fs/Kconfig"



source "arch/ia64/Kconfig.debug"



source "security/Kconfig"



source "crypto/Kconfig"



source "arch/ia64/kvm/Kconfig"



source "lib/Kconfig"
@@ -678,11 +687,3 @@ config IRQ_PER_CPU 


config IOMMU_HELPER

	def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB)
 


source "arch/ia64/hp/sim/Kconfig"



source "arch/ia64/Kconfig.debug"



source "security/Kconfig"



source "crypto/Kconfig"

arch/ia64/hp/common/hwsw_iommu.c

+1 −8
Original line number Diff line number Diff line
@@ -13,19 +13,12 @@ 
 */



#include <linux/device.h>

#include <linux/swiotlb.h>



#include <asm/machvec.h>



/* swiotlb declarations & definitions: */

extern int swiotlb_late_init_with_default_size (size_t size);

extern ia64_mv_dma_alloc_coherent	swiotlb_alloc_coherent;

extern ia64_mv_dma_free_coherent	swiotlb_free_coherent;

extern ia64_mv_dma_map_single_attrs	swiotlb_map_single_attrs;

extern ia64_mv_dma_unmap_single_attrs	swiotlb_unmap_single_attrs;

extern ia64_mv_dma_map_sg_attrs		swiotlb_map_sg_attrs;

extern ia64_mv_dma_unmap_sg_attrs	swiotlb_unmap_sg_attrs;

extern ia64_mv_dma_supported		swiotlb_dma_supported;

extern ia64_mv_dma_mapping_error	swiotlb_dma_mapping_error;



/* hwiommu declarations & definitions: */

arch/ia64/include/asm/io.h

+0 −24
Original line number Diff line number Diff line
@@ -434,28 +434,4 @@ extern void memset_io(volatile void __iomem *s, int c, long n); 


# endif /* __KERNEL__ */



/*

 * Enabling BIO_VMERGE_BOUNDARY forces us to turn off I/O MMU bypassing.  It is said that

 * BIO-level virtual merging can give up to 4% performance boost (not verified for ia64).

 * On the other hand, we know that I/O MMU bypassing gives ~8% performance improvement on

 * SPECweb-like workloads on zx1-based machines.  Thus, for now we favor I/O MMU bypassing

 * over BIO-level virtual merging.

 */

extern unsigned long ia64_max_iommu_merge_mask;

#if 1

#define BIO_VMERGE_BOUNDARY	0

#else

/*

 * It makes no sense at all to have this BIO_VMERGE_BOUNDARY macro here.  Should be

 * replaced by dma_merge_mask() or something of that sort.  Note: the only way

 * BIO_VMERGE_BOUNDARY is used is to mask off bits.  Effectively, our definition gets

 * expanded into:

 *

 *	addr & ((ia64_max_iommu_merge_mask + 1) - 1) == (addr & ia64_max_iommu_vmerge_mask)

 *

 * which is precisely what we want.

 */

#define BIO_VMERGE_BOUNDARY	(ia64_max_iommu_merge_mask + 1)

#endif



#endif /* _ASM_IA64_IO_H */

arch/ia64/include/asm/machvec.h

+1 −21
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#define _ASM_IA64_MACHVEC_H



#include <linux/types.h>

#include <linux/swiotlb.h>



/* forward declarations: */

struct device;
@@ -297,27 +298,6 @@ extern void machvec_init_from_cmdline(const char *cmdline); 
#  error Unknown configuration.  Update arch/ia64/include/asm/machvec.h.

# endif /* CONFIG_IA64_GENERIC */



/*

 * Declare default routines which aren't declared anywhere else:

 */

extern ia64_mv_dma_init			swiotlb_init;

extern ia64_mv_dma_alloc_coherent	swiotlb_alloc_coherent;

extern ia64_mv_dma_free_coherent	swiotlb_free_coherent;

extern ia64_mv_dma_map_single		swiotlb_map_single;

extern ia64_mv_dma_map_single_attrs	swiotlb_map_single_attrs;

extern ia64_mv_dma_unmap_single		swiotlb_unmap_single;

extern ia64_mv_dma_unmap_single_attrs	swiotlb_unmap_single_attrs;

extern ia64_mv_dma_map_sg		swiotlb_map_sg;

extern ia64_mv_dma_map_sg_attrs		swiotlb_map_sg_attrs;

extern ia64_mv_dma_unmap_sg		swiotlb_unmap_sg;

extern ia64_mv_dma_unmap_sg_attrs	swiotlb_unmap_sg_attrs;

extern ia64_mv_dma_sync_single_for_cpu	swiotlb_sync_single_for_cpu;

extern ia64_mv_dma_sync_sg_for_cpu	swiotlb_sync_sg_for_cpu;

extern ia64_mv_dma_sync_single_for_device swiotlb_sync_single_for_device;

extern ia64_mv_dma_sync_sg_for_device	swiotlb_sync_sg_for_device;

extern ia64_mv_dma_mapping_error	swiotlb_dma_mapping_error;

extern ia64_mv_dma_supported		swiotlb_dma_supported;



/*

 * Define default versions so we can extend machvec for new platforms without having

 * to update the machvec files for all existing platforms.

arch/ia64/include/asm/meminit.h

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ extern int reserve_elfcorehdr(unsigned long *start, unsigned long *end); 
 */

#define GRANULEROUNDDOWN(n)	((n) & ~(IA64_GRANULE_SIZE-1))

#define GRANULEROUNDUP(n)	(((n)+IA64_GRANULE_SIZE-1) & ~(IA64_GRANULE_SIZE-1))

#define ORDERROUNDDOWN(n)	((n) & ~((PAGE_SIZE<<MAX_ORDER)-1))



#ifdef CONFIG_NUMA

  extern void call_pernode_memory (unsigned long start, unsigned long len, void *func);