Commit 66acb021 authored by Chris Zankel's avatar Chris Zankel
Browse files

Merge tag 'xtensa-for-next-20141021-1' of git://github.com/jcmvbkbc/linux-xtensa into for_next 

Xtensa improvements for 3.18:

- add seccomp, getrandom, and memfd_create syscalls;
- add defconfigs for KC705 and SMP LX200;
- fix ISS and xtfpga Kconfig dependencies so that more randconfigs
  are buildable;
- fix umount syscall;
- implement pgprot_noncached.
parents a13926db 3ce2ce1c

arch/xtensa/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -319,8 +319,8 @@ config XTENSA_PLATFORM_S6105 


config XTENSA_PLATFORM_XTFPGA

	bool "XTFPGA"

	select ETHOC if ETHERNET

	select SERIAL_CONSOLE

	select ETHOC

	select XTENSA_CALIBRATE_CCOUNT

	help

	  XTFPGA is the name of Tensilica board family (LX60, LX110, LX200, ML605).
@@ -367,7 +367,7 @@ config BUILTIN_DTB 
config BLK_DEV_SIMDISK

	tristate "Host file-based simulated block device support"

	default n

	depends on XTENSA_PLATFORM_ISS

	depends on XTENSA_PLATFORM_ISS && BLOCK

	help

	  Create block devices that map to files in the host file system.

	  Device binding to host file may be changed at runtime via proc

arch/xtensa/boot/dts/lx200mx.dts

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

/include/ "xtfpga.dtsi"

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



/ {

	compatible = "cdns,xtensa-lx200";

	memory@0 {

		device_type = "memory";

		reg = <0x00000000 0x06000000>;

	};

	pic: pic {

		compatible = "cdns,xtensa-mx";

		#interrupt-cells = <2>;

		interrupt-controller;

	};

};

arch/xtensa/configs/generic_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_RESOURCE_COUNTERS=y

CONFIG_MEMCG=y

CONFIG_NAMESPACES=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_RELAY=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_KALLSYMS_ALL=y

CONFIG_PROFILING=y

CONFIG_OPROFILE=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_XTENSA_VARIANT_DC233C=y

CONFIG_XTENSA_UNALIGNED_USER=y

CONFIG_PREEMPT=y

CONFIG_HIGHMEM=y

# CONFIG_PCI is not set

CONFIG_XTENSA_PLATFORM_XTFPGA=y

CONFIG_CMDLINE_BOOL=y

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

CONFIG_USE_OF=y

CONFIG_BUILTIN_DTB="kc705"

# CONFIG_COMPACTION is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

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_MTD_PHYSMAP_OF=y

CONFIG_MTD_UBI=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_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC 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_IOMMU_SUPPORT is not set

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS=y

CONFIG_FANOTIFY=y

CONFIG_VFAT_FS=y

CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_UBIFS_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_MAGIC_SYSRQ=y

CONFIG_LOCKUP_DETECTOR=y

# CONFIG_SCHED_DEBUG is not set

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_TRACE=y

# CONFIG_FTRACE is not set

CONFIG_LD_NO_RELAX=y

# CONFIG_S32C1I_SELFTEST is not set

CONFIG_CRYPTO_ANSI_CPRNG=y

arch/xtensa/configs/smp_lx200_defconfig

0 → 100644
+135 −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_RESOURCE_COUNTERS=y

CONFIG_MEMCG=y

CONFIG_NAMESPACES=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_RELAY=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_KALLSYMS_ALL=y

CONFIG_PROFILING=y

CONFIG_OPROFILE=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="test_mmuhifi_c3"

CONFIG_XTENSA_UNALIGNED_USER=y

CONFIG_PREEMPT=y

CONFIG_HAVE_SMP=y

CONFIG_SMP=y

CONFIG_HOTPLUG_CPU=y

# CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX is not set

# CONFIG_PCI is not set

CONFIG_XTENSA_PLATFORM_XTFPGA=y

CONFIG_CMDLINE_BOOL=y

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

CONFIG_USE_OF=y

CONFIG_BUILTIN_DTB="lx200mx"

# CONFIG_COMPACTION is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

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_MTD_PHYSMAP_OF=y

CONFIG_MTD_UBI=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_SAMSUNG is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC 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_IOMMU_SUPPORT is not set

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS=y

CONFIG_FANOTIFY=y

CONFIG_VFAT_FS=y

CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_UBIFS_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_MAGIC_SYSRQ=y

CONFIG_DEBUG_VM=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_TRACE=y

# CONFIG_FTRACE is not set

CONFIG_LD_NO_RELAX=y

# CONFIG_S32C1I_SELFTEST is not set

CONFIG_CRYPTO_ANSI_CPRNG=y

arch/xtensa/include/asm/pgtable.h

+2 −0
Original line number Diff line number Diff line
@@ -277,6 +277,8 @@ static inline pte_t pte_mkwrite(pte_t pte) 
static inline pte_t pte_mkspecial(pte_t pte)

	{ return pte; }



#define pgprot_noncached(prot) (__pgprot(pgprot_val(prot) & ~_PAGE_CA_MASK))



/*

 * Conversion functions: convert a page and protection to a page entry,

 * and a page entry and page directory to the page they refer to.

CRA Git | Maintained and supported by SUSTech CRA and CCSE