Commit 3510ca19 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xtensa-20151108' of git://github.com/czankel/xtensa-linux 

Pull xtensa updates from Chris Zankel:

 - fix remaining issues with noMMU cores
 - fix build for cores w/o cache or zero overhead loop options
 - fix boot of secondary cores in SMP configuration
 - add support for DMA to high memory pages
 - add dma_to_phys and phys_to_dma functions.

* tag 'xtensa-20151108' of git://github.com/czankel/xtensa-linux:
  xtensa: implement dma_to_phys and phys_to_dma
  xtensa: support DMA to high memory
  Revert "xtensa: cache inquiry and unaligned cache handling functions"
  xtensa: drop unused sections and remapped reset handlers
  xtensa: fix secondary core boot in SMP
  xtensa: add FORCE_MAX_ZONEORDER to Kconfig
  xtensa: nommu: provide defconfig for de212 on kc705
  xtensa: nommu: xtfpga: add kc705 DTS
  xtensa: add de212 core variant
  xtensa: nommu: select HAVE_FUTEX_CMPXCHG
  xtensa: nommu: fix default memory start address
  xtensa: nommu: provide correct KIO addresses
  xtensa: nommu: fix USER_RING definition
  xtensa: xtfpga: fix integer overflow in TASK_SIZE
  xtensa: fix build for configs without cache options
  xtensa: fixes for configs without loop option
parents e4da7e9a afaa7c54

arch/xtensa/Kconfig

+16 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ config XTENSA 
	select HAVE_DMA_API_DEBUG

	select HAVE_DMA_ATTRS

	select HAVE_FUNCTION_TRACER

	select HAVE_FUTEX_CMPXCHG if !MMU

	select HAVE_IRQ_TIME_ACCOUNTING

	select HAVE_OPROFILE

	select HAVE_PERF_EVENTS
@@ -397,6 +398,20 @@ config SIMDISK1_FILENAME 


source "mm/Kconfig"



config FORCE_MAX_ZONEORDER

	int "Maximum zone order"

	default "11"

	help

	  The kernel memory allocator divides physically contiguous memory

	  blocks into "zones", where each zone is a power of two number of

	  pages.  This option selects the largest power of two that the kernel

	  keeps in the memory allocator.  If you need to allocate very large

	  blocks of physically contiguous memory, then you may need to

	  increase this value.



	  This config option is actually maximum order plus one. For example,

	  a value of 11 means that the largest free memory block is 2^10 pages.



source "drivers/pcmcia/Kconfig"



source "drivers/pci/hotplug/Kconfig"
@@ -408,7 +423,7 @@ config DEFAULT_MEM_START 
	hex "Physical address of the default memory area start"

	depends on PLATFORM_WANT_DEFAULT_MEM

	default 0x00000000 if MMU

	default 0x40000000 if !MMU

	default 0x60000000 if !MMU

	help

	  This is a fallback start address of the default memory area, it is

	  used when no physical memory size is passed through DTB or through

arch/xtensa/boot/boot-elf/boot.lds.S

+0 −13
Original line number Diff line number Diff line
@@ -40,17 +40,4 @@ SECTIONS 
		*(.bss)

		__bss_end = .;

	}



#ifdef CONFIG_MMU

	/*

	 * This is a remapped copy of the Reset Vector Code.

	 * It keeps gdb in sync with the PC after switching

	 * to the temporary mapping used while setting up

	 * the V2 MMU mappings for Linux.

	 */

	.ResetVector.remapped_text 0x46000000 (INFO):

	{

		*(.ResetVector.remapped_text)

	}

#endif

}

arch/xtensa/boot/boot-elf/bootstrap.S

+0 −28
Original line number Diff line number Diff line
@@ -58,8 +58,6 @@ _SetupMMU: 
	wsr	a0, ps

	rsync



	Offset = _SetupMMU - _ResetVector



#ifndef CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX

	initialize_mmu

#endif
@@ -74,29 +72,3 @@ reset: 
	movi	a3, 0

	movi	a4, 0

	jx      a0
 


#ifdef CONFIG_MMU

	.align 4



	.section	.ResetVector.remapped_text, "x"

	.global         _RemappedResetVector



	/* Do org before literals */

	.org 0



_RemappedResetVector:

	.begin  no-absolute-literals

	.literal_position



	_j	_RemappedSetupMMU



	/* Position Remapped code at the same location as the original code */

	. = _RemappedResetVector + Offset



_RemappedSetupMMU:

#ifndef CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX

	initialize_mmu

#endif



	.end    no-absolute-literals

#endif

arch/xtensa/boot/dts/kc705_nommu.dts

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/dts-v1/;

/include/ "xtfpga.dtsi"

/include/ "xtfpga-flash-128m.dtsi"



/ {

	compatible = "cdns,xtensa-kc705";

	chosen {

		bootargs = "earlycon=uart8250,mmio32,0x9d050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug";

	};

	memory@0 {

		device_type = "memory";

		reg = <0x60000000 0x10000000>;

	};

	soc {

		ranges = <0x00000000 0x90000000 0x10000000>;

	};

};

arch/xtensa/configs/nommu_kc705_defconfig

0 → 100644
+131 −0
Original line number Diff line number Diff line 
CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_IRQ_DOMAIN_DEBUG=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IRQ_TIME_ACCOUNTING=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_CGROUP_DEBUG=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_MEMCG=y

CONFIG_NAMESPACES=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_RELAY=y

CONFIG_BLK_DEV_INITRD=y

# CONFIG_RD_BZIP2 is not set

# CONFIG_RD_LZMA is not set

# CONFIG_RD_XZ is not set

# CONFIG_RD_LZO is not set

# CONFIG_RD_LZ4 is not set

CONFIG_EXPERT=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_KALLSYMS_ALL=y

CONFIG_PERF_EVENTS=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_XTENSA_VARIANT_CUSTOM=y

CONFIG_XTENSA_VARIANT_CUSTOM_NAME="de212"

# CONFIG_XTENSA_VARIANT_MMU is not set

CONFIG_XTENSA_UNALIGNED_USER=y

CONFIG_PREEMPT=y

# CONFIG_PCI is not set

CONFIG_XTENSA_PLATFORM_XTFPGA=y

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="earlycon=uart8250,mmio32,0x9d050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug"

CONFIG_USE_OF=y

CONFIG_BUILTIN_DTB="kc705_nommu"

CONFIG_DEFAULT_MEM_SIZE=0x10000000

CONFIG_BINFMT_FLAT=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_IP_PNP_RARP=y

# CONFIG_IPV6 is not set

CONFIG_NETFILTER=y

# CONFIG_WIRELESS is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

CONFIG_MTD=y

CONFIG_MTD_CFI=y

CONFIG_MTD_JEDECPROBE=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_CFI_STAA=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_VIA is not set

# CONFIG_NET_VENDOR_WIZNET is not set

CONFIG_MARVELL_PHY=y

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

CONFIG_SERIAL_8250=y

# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_HW_RANDOM=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_SOFT_WATCHDOG=y

# CONFIG_VGA_CONSOLE is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS=y

CONFIG_FANOTIFY=y

CONFIG_VFAT_FS=y

CONFIG_JFFS2_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V4=y

CONFIG_NFS_SWAP=y

CONFIG_ROOT_NFS=y

CONFIG_SUNRPC_DEBUG=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO=y

# CONFIG_FRAME_POINTER is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_VM=y

CONFIG_DEBUG_NOMMU_REGIONS=y

CONFIG_DEBUG_SHIRQ=y

CONFIG_LOCKUP_DETECTOR=y

CONFIG_SCHEDSTATS=y

CONFIG_TIMER_STATS=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_ATOMIC_SLEEP=y

CONFIG_STACKTRACE=y

# CONFIG_RCU_CPU_STALL_INFO is not set

CONFIG_RCU_TRACE=y

# CONFIG_FTRACE is not set

# CONFIG_LD_NO_RELAX is not set

# CONFIG_CRYPTO_ECHAINIV is not set

CONFIG_CRYPTO_ANSI_CPRNG=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE