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

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

Merge tag 'arc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull ARC updates from Vineet Gupta:

 - perf fixes/improvements

 - misc cleanups

* tag 'arc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: perf: don't add code for impossible case
  ARC: perf: Rename DT binding to not confuse with power mgmt
  ARC: perf: add user space attribution in callchains
  ARC: perf: Add kernel callchain support
  ARC: perf: support cache hit/miss ratio
  ARC: perf: Add some comments/debug stuff
  ARC: perf: make @arc_pmu static global
  ARC: mem init spring cleaning - No functional changes
  ARC: Fix RTT boot printing
  ARC: fold __builtin_constant_p() into test_bit()
  ARC: rename unhandled exception handler
  ARC: cosmetic: Remove unused ECR bitfield masks
  ARC: Fix WRITE_BCR
  ARC: [nsimosci] Update defconfig
  arc: copy_thread(): rename 'arg' argument to 'kthread_arg'
parents 860448cf d8f6ad85

Documentation/devicetree/bindings/arc/pct.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
* ARC Performance Counters



The ARC700 can be configured with a pipeline performance monitor for counting

CPU and cache events like cache misses and hits. Like conventional PCT there

are 100+ hardware conditions dynamically mapped to upto 32 counters



Note that:

 * The ARC 700 PCT does not support interrupts; although HW events may be

   counted, the HW events themselves cannot serve as a trigger for a sample.



Required properties:



- compatible : should contain

	"snps,arc700-pct"



Example:



pmu {

        compatible = "snps,arc700-pct";

};

Documentation/devicetree/bindings/arc/pmu.txt

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
* ARC Performance Monitor Unit



The ARC 700 can be configured with a pipeline performance monitor for counting

CPU and cache events like cache misses and hits.



Note that:

 * ARC 700 refers to a family of ARC processor cores;

   - There is only one type of PMU available for the whole family;

   - The PMU may support different sets of events; supported events are probed

     at boot time, as required by the reference manual.



 * The ARC 700 PMU does not support interrupts; although HW events may be

   counted, the HW events themselves cannot serve as a trigger for a sample.



Required properties:



- compatible : should contain

	"snps,arc700-pmu"



Example:



pmu {

        compatible = "snps,arc700-pmu";

};

arch/arc/boot/dts/angel4.dts

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
		};



		arcpmu0: pmu {

			compatible = "snps,arc700-pmu";

			compatible = "snps,arc700-pct";

		};

	};

};

arch/arc/configs/nsimosci_defconfig

+9 −10
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ CONFIG_CROSS_COMPILE="arc-linux-uclibc-" 
# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_DEFAULT_HOSTNAME="ARCLinux"

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

# CONFIG_CROSS_MEMORY_ATTACH is not set

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y
@@ -9,7 +12,7 @@ CONFIG_NAMESPACES=y 
# CONFIG_UTS_NS is not set

# CONFIG_PID_NS is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE="../arc_initramfs"

CONFIG_INITRAMFS_SOURCE="../arc_initramfs/"

CONFIG_KALLSYMS_ALL=y

CONFIG_EMBEDDED=y

# CONFIG_SLUB_DEBUG is not set
@@ -21,12 +24,9 @@ CONFIG_MODULES=y 
# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARC_PLAT_FPGA_LEGACY=y

# CONFIG_ARC_IDE is not set

# CONFIG_ARCTANGENT_EMAC is not set

# CONFIG_ARC_HAS_RTSC is not set

CONFIG_ARC_BUILTIN_DTB_NAME="nsimosci"

# CONFIG_COMPACTION is not set

# CONFIG_CROSS_MEMORY_ATTACH is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -39,23 +39,23 @@ CONFIG_INET=y 
# CONFIG_FIRMWARE_IN_KERNEL is not set

# CONFIG_BLK_DEV is not set

CONFIG_NETDEVICES=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_MOUSE_PS2_ALPS is not set

# CONFIG_MOUSE_PS2_LOGIPS2PP is not set

# CONFIG_MOUSE_PS2_SYNAPTICS is not set

# CONFIG_MOUSE_PS2_CYPRESS is not set

# CONFIG_MOUSE_PS2_TRACKPOINT is not set

CONFIG_MOUSE_PS2_TOUCHKIT=y

# CONFIG_SERIO_I8042 is not set

# CONFIG_SERIO_SERPORT is not set

CONFIG_SERIO_ARC_PS2=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_DW=y

CONFIG_SERIAL_8250_NR_UARTS=1

CONFIG_SERIAL_8250_RUNTIME_UARTS=1

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_ARC=y

CONFIG_SERIAL_ARC_CONSOLE=y

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

CONFIG_FB=y
@@ -72,4 +72,3 @@ CONFIG_TMPFS=y 
CONFIG_NFS_FS=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set
 
CONFIG_XZ_DEC=y

arch/arc/include/asm/arcregs.h

+6 −8
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#define ARC_REG_D_UNCACH_BCR	0x6A

#define ARC_REG_BPU_BCR		0xc0

#define ARC_REG_ISA_CFG_BCR	0xc1

#define ARC_REG_RTT_BCR		0xF2

#define ARC_REG_SMART_BCR	0xFF



/* status32 Bits Positions */
@@ -50,11 +51,7 @@ 
 * [15: 8] = Exception Cause Code

 * [ 7: 0] = Exception Parameters (for certain types only)

 */

#define ECR_VEC_MASK			0xff0000

#define ECR_CODE_MASK			0x00ff00

#define ECR_PARAM_MASK			0x0000ff



/* Exception Cause Vector Values */

#define ECR_V_MEM_ERR			0x01

#define ECR_V_INSN_ERR			0x02

#define ECR_V_MACH_CHK			0x20

#define ECR_V_ITLB_MISS			0x21
@@ -62,7 +59,8 @@ 
#define ECR_V_PROTV			0x23

#define ECR_V_TRAP			0x25



/* Protection Violation Exception Cause Code Values */

/* DTLB Miss and Protection Violation Cause Codes */



#define ECR_C_PROTV_INST_FETCH		0x00

#define ECR_C_PROTV_LOAD		0x01

#define ECR_C_PROTV_STORE		0x02
@@ -173,11 +171,11 @@ 
	}						\

}



#define WRITE_BCR(reg, into)				\

#define WRITE_AUX(reg, into)				\

{							\

	unsigned int tmp;				\

	if (sizeof(tmp) == sizeof(into)) {		\

		tmp = (*(unsigned int *)(into));	\

		tmp = (*(unsigned int *)&(into));	\

		write_aux_reg(reg, tmp);		\

	} else  {					\

		extern void bogus_undefined(void);	\