Commit 3e859477 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xtensa-20190715' of git://github.com/jcmvbkbc/linux-xtensa 

Pull Xtensa updates from Max Filippov:

 - clean up PCI support code

 - add defconfig and DTS for the 'virt' board

 - abstract 'entry' and 'retw' uses in xtensa assembly in preparation
   for XEA3/NX pipeline support

 - random small cleanups

* tag 'xtensa-20190715' of git://github.com/jcmvbkbc/linux-xtensa:
  xtensa: virt: add defconfig and DTS
  xtensa: abstract 'entry' and 'retw' in assembly code
  xtensa: One function call less in bootmem_init()
  xtensa: remove arch/xtensa/include/asm/types.h
  xtensa: use generic pcibios_set_master and pcibios_enable_device
  xtensa: drop dead PCI support code
  xtensa/PCI: Remove unused variable
parents 1ec4013b 775f1f7e

arch/xtensa/boot/dts/virt.dts

0 → 100644
+72 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/dts-v1/;



/ {

	compatible = "cdns,xtensa-iss";

	#address-cells = <1>;

	#size-cells = <1>;

	interrupt-parent = <&pic>;



	chosen {

		bootargs = "console=ttyS0,115200n8 debug";

	};



	memory@0 {

		device_type = "memory";

		reg = <0x00000000 0x80000000>;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;

		cpu@0 {

			compatible = "cdns,xtensa-cpu";

			reg = <0>;

			clocks = <&osc>;

		};

	};



	clocks {

		osc: osc {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <40000000>;

		};

	};



	pic: pic {

		compatible = "cdns,xtensa-pic";

		/* one cell: internal irq number,

		 * two cells: second cell == 0: internal irq number

		 *            second cell == 1: external irq number

		 */

		#address-cells = <0>;

		#interrupt-cells = <2>;

		interrupt-controller;

	};



	pci {

		compatible = "pci-host-ecam-generic";

		device_type = "pci";

		#address-cells = <3>;

		#size-cells = <2>;

		#interrupt-cells = <0x1>;



		bus-range = <0x0 0x3f>;

		reg = <0xc0000000 0x04000000>;



		     // BUS_ADDRESS(3)  CPU_PHYSICAL(1)  SIZE(2)

		ranges = <0x01000000 0x0 0xc4000000  0xc4000000  0x0 0x04000000>,

			 <0x02000000 0x0 0xc8000000  0xc8000000  0x0 0x18000000>;



		     // PCI_DEVICE(3)  INT#(1)  CONTROLLER(PHANDLE)  CONTROLLER_DATA(2)

		interrupt-map = <

			0x0000 0x0 0x0  0x1  &pic  0x0 0x1

			0x0800 0x0 0x0  0x1  &pic  0x1 0x1

			0x1000 0x0 0x0  0x1  &pic  0x2 0x1

			0x1800 0x0 0x0  0x1  &pic  0x3 0x1

			>;



		interrupt-map-mask = <0x1800 0x0 0x0  0x7>;

	};

};

arch/xtensa/configs/virt_defconfig

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

CONFIG_POSIX_MQUEUE=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT=y

CONFIG_IRQ_TIME_ACCOUNTING=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_MEMCG=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CGROUP_DEVICE=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_DEBUG=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_PERF_EVENTS=y

CONFIG_XTENSA_VARIANT_DC233C=y

CONFIG_XTENSA_UNALIGNED_USER=y

CONFIG_VECTORS_OFFSET=0x00002000

CONFIG_XTENSA_KSEG_512M=y

CONFIG_HIGHMEM=y

CONFIG_CMDLINE_BOOL=y

CONFIG_CMDLINE="console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug memmap=0x80000000@0"

CONFIG_USE_OF=y

CONFIG_BUILTIN_DTB_SOURCE="virt"

# CONFIG_PARSE_BOOTPARAM is not set

CONFIG_JUMP_LABEL=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_COMPACTION 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_PCI=y

CONFIG_PCI_HOST_GENERIC=y

CONFIG_UEVENT_HELPER=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_VIRTIO_BLK=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_NETDEVICES=y

CONFIG_VIRTIO_NET=y

# CONFIG_ETHERNET is not set

# CONFIG_WLAN is not set

CONFIG_INPUT_MOUSEDEV=y

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_VIRTIO=y

# CONFIG_HWMON is not set

CONFIG_DRM=y

CONFIG_DRM_VGEM=y

CONFIG_DRM_VIRTIO_GPU=y

CONFIG_FB_MODE_HELPERS=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

# CONFIG_USB_SUPPORT is not set

CONFIG_VIRTIO_PCI=y

CONFIG_VIRTIO_INPUT=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT3_FS=y

CONFIG_FANOTIFY=y

CONFIG_VFAT_FS=y

CONFIG_PROC_KCORE=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=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_CRYPTO_ECHAINIV=y

CONFIG_CRYPTO_DEFLATE=y

CONFIG_CRYPTO_LZO=y

CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_CRYPTO_DEV_VIRTIO=y

CONFIG_FONTS=y

CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO=y

CONFIG_MAGIC_SYSRQ=y

# CONFIG_SCHED_DEBUG is not set

CONFIG_SCHEDSTATS=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_S32C1I_SELFTEST is not set

arch/xtensa/include/asm/asmmacro.h

+46 −0
Original line number Diff line number Diff line
@@ -191,4 +191,50 @@ 
#endif

	.endm



#define XTENSA_STACK_ALIGNMENT		16



#if defined(__XTENSA_WINDOWED_ABI__)

#define XTENSA_FRAME_SIZE_RESERVE	16

#define XTENSA_SPILL_STACK_RESERVE	32



#define abi_entry(frame_size) \

	entry sp, (XTENSA_FRAME_SIZE_RESERVE + \

		   (((frame_size) + XTENSA_STACK_ALIGNMENT - 1) & \

		    -XTENSA_STACK_ALIGNMENT))

#define abi_entry_default abi_entry(0)



#define abi_ret(frame_size) retw

#define abi_ret_default retw



#elif defined(__XTENSA_CALL0_ABI__)



#define XTENSA_SPILL_STACK_RESERVE	0



#define abi_entry(frame_size) __abi_entry (frame_size)



	.macro	__abi_entry frame_size

	.ifgt \frame_size

	addi sp, sp, -(((\frame_size) + XTENSA_STACK_ALIGNMENT - 1) & \

		       -XTENSA_STACK_ALIGNMENT)

	.endif

	.endm



#define abi_entry_default



#define abi_ret(frame_size) __abi_ret (frame_size)



	.macro	__abi_ret frame_size

	.ifgt \frame_size

	addi sp, sp, (((\frame_size) + XTENSA_STACK_ALIGNMENT - 1) & \

		      -XTENSA_STACK_ALIGNMENT)

	.endif

	ret

	.endm



#define abi_ret_default ret



#else

#error Unsupported Xtensa ABI

#endif



#endif /* _XTENSA_ASMMACRO_H */

arch/xtensa/include/asm/platform.h

+0 −10
Original line number Diff line number Diff line
@@ -54,16 +54,6 @@ extern void platform_idle (void); 
 */

extern void platform_heartbeat (void);



/*

 * platform_pcibios_init is called to allow the platform to setup the pci bus.

 */

extern void platform_pcibios_init (void);



/*

 * platform_pcibios_fixup allows to modify the PCI configuration.

 */

extern int platform_pcibios_fixup (void);



/*

 * platform_calibrate_ccount calibrates cpu clock freq (CONFIG_XTENSA_CALIBRATE)

 */

arch/xtensa/include/asm/types.h

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
/*

 * include/asm-xtensa/types.h

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 2001 - 2005 Tensilica Inc.

 */

#ifndef _XTENSA_TYPES_H

#define _XTENSA_TYPES_H



#include <uapi/asm/types.h>



#ifndef __ASSEMBLY__

/*

 * These aren't exported outside the kernel to avoid name space clashes

 */



#define BITS_PER_LONG 32



#endif

#endif	/* _XTENSA_TYPES_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE