Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile (18a1a7a1) · Commits · e / devices / android_kernel_teracube_2e

arch/tile/Kconfig

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3,6 +3,8 @@

	config TILE		config TILE
	def_bool y		def_bool y
			select HAVE_PERF_EVENTS
			select USE_PMC if PERF_EVENTS
	select HAVE_DMA_ATTRS		select HAVE_DMA_ATTRS
	select HAVE_DMA_API_DEBUG		select HAVE_DMA_API_DEBUG
	select HAVE_KVM if !TILEGX		select HAVE_KVM if !TILEGX
	@@ -66,6 +68,10 @@ config HUGETLB_SUPER_PAGES
	config GENERIC_TIME_VSYSCALL		config GENERIC_TIME_VSYSCALL
	def_bool y		def_bool y

			# Enable PMC if PERF_EVENTS, OPROFILE, or WATCHPOINTS are enabled.
			config USE_PMC
			bool

	# FIXME: tilegx can implement a more efficient rwsem.		# FIXME: tilegx can implement a more efficient rwsem.
	config RWSEM_GENERIC_SPINLOCK		config RWSEM_GENERIC_SPINLOCK
	def_bool y		def_bool y

arch/tile/include/asm/perf_event.h

0 → 100644

+22 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright 2014 Tilera Corporation. All Rights Reserved.
			*
			* This program is free software; you can redistribute it and/or
			* modify it under the terms of the GNU General Public License
			* as published by the Free Software Foundation, version 2.
			*
			* This program is distributed in the hope that it will be useful, but
			* WITHOUT ANY WARRANTY; without even the implied warranty of
			* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
			* NON INFRINGEMENT. See the GNU General Public License for
			* more details.
			*/

			#ifndef _ASM_TILE_PERF_EVENT_H
			#define _ASM_TILE_PERF_EVENT_H

			#include <linux/percpu.h>
			DECLARE_PER_CPU(u64, perf_irqs);

			unsigned long handle_syscall_link_address(void);
			#endif /* _ASM_TILE_PERF_EVENT_H */

arch/tile/include/asm/pmc.h

0 → 100644

+64 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright 2014 Tilera Corporation. All Rights Reserved.
			*
			* This program is free software; you can redistribute it and/or
			* modify it under the terms of the GNU General Public License
			* as published by the Free Software Foundation, version 2.
			*
			* This program is distributed in the hope that it will be useful, but
			* WITHOUT ANY WARRANTY; without even the implied warranty of
			* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
			* NON INFRINGEMENT. See the GNU General Public License for
			* more details.
			*/

			#ifndef _ASM_TILE_PMC_H
			#define _ASM_TILE_PMC_H

			#include <linux/ptrace.h>

			#define TILE_BASE_COUNTERS 2

			/* Bitfields below are derived from SPR PERF_COUNT_CTL*/
			#ifndef __tilegx__
			/* PERF_COUNT_CTL on TILEPro */
			#define TILE_CTL_EXCL_USER (1 << 7) /* exclude user level */
			#define TILE_CTL_EXCL_KERNEL (1 << 8) /* exclude kernel level */
			#define TILE_CTL_EXCL_HV (1 << 9) /* exclude hypervisor level */

			#define TILE_SEL_MASK 0x7f /* 7 bits for event SEL,
			COUNT_0_SEL */
			#define TILE_PLM_MASK 0x780 /* 4 bits priv level msks,
			COUNT_0_MASK*/
			#define TILE_EVENT_MASK (TILE_SEL_MASK \| TILE_PLM_MASK)

			#else /* __tilegx__*/
			/* PERF_COUNT_CTL on TILEGx*/
			#define TILE_CTL_EXCL_USER (1 << 10) /* exclude user level */
			#define TILE_CTL_EXCL_KERNEL (1 << 11) /* exclude kernel level */
			#define TILE_CTL_EXCL_HV (1 << 12) /* exclude hypervisor level */

			#define TILE_SEL_MASK 0x3f /* 6 bits for event SEL,
			COUNT_0_SEL*/
			#define TILE_BOX_MASK 0x1c0 /* 3 bits box msks,
			COUNT_0_BOX */
			#define TILE_PLM_MASK 0x3c00 /* 4 bits priv level msks,
			COUNT_0_MASK */
			#define TILE_EVENT_MASK (TILE_SEL_MASK \| TILE_BOX_MASK \| TILE_PLM_MASK)
			#endif /* __tilegx__*/

			/* Takes register and fault number. Returns error to disable the interrupt. */
			typedef int (perf_irq_t)(struct pt_regs , int);

			int userspace_perf_handler(struct pt_regs *regs, int fault);

			perf_irq_t reserve_pmc_hardware(perf_irq_t new_perf_irq);
			void release_pmc_hardware(void);

			unsigned long pmc_get_overflow(void);
			void pmc_ack_overflow(unsigned long status);

			void unmask_pmc_interrupts(void);
			void mask_pmc_interrupts(void);

			#endif /* _ASM_TILE_PMC_H */

arch/tile/kernel/Makefile

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,8 @@ obj-$(CONFIG_PCI) += pci_gx.o
	else		else
	obj-$(CONFIG_PCI) += pci.o		obj-$(CONFIG_PCI) += pci.o
	endif		endif
			obj-$(CONFIG_PERF_EVENTS) += perf_event.o
			obj-$(CONFIG_USE_PMC) += pmc.o
	obj-$(CONFIG_TILE_USB) += usb.o		obj-$(CONFIG_TILE_USB) += usb.o
	obj-$(CONFIG_TILE_HVGLUE_TRACE) += hvglue_trace.o		obj-$(CONFIG_TILE_HVGLUE_TRACE) += hvglue_trace.o
	obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o mcount_64.o		obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o mcount_64.o

arch/tile/kernel/intvec_32.S

+18 −6

Original line number	Original line	Diff line number	Diff line
	@@ -313,13 +313,13 @@ intvec_\vecname:
	movei r3, 0		movei r3, 0
	}		}
	.else		.else
	.ifc \c_routine, op_handle_perf_interrupt		.ifc \c_routine, handle_perf_interrupt
	{		{
	mfspr r2, PERF_COUNT_STS		mfspr r2, PERF_COUNT_STS
	movei r3, -1 /* not used, but set for consistency */		movei r3, -1 /* not used, but set for consistency */
	}		}
	.else		.else
	.ifc \c_routine, op_handle_aux_perf_interrupt		.ifc \c_routine, handle_perf_interrupt
	{		{
	mfspr r2, AUX_PERF_COUNT_STS		mfspr r2, AUX_PERF_COUNT_STS
	movei r3, -1 /* not used, but set for consistency */		movei r3, -1 /* not used, but set for consistency */
	@@ -946,6 +946,13 @@ STD_ENTRY(interrupt_return)
	bzt r30, .Lrestore_regs		bzt r30, .Lrestore_regs
	3:		3:

			/* We are relying on INT_PERF_COUNT at 33, and AUX_PERF_COUNT at 48 */
			{
			moveli r0, lo16(1 << (INT_PERF_COUNT - 32))
			bz r31, .Lrestore_regs
			}
			auli r0, r0, ha16(1 << (INT_AUX_PERF_COUNT - 32))
			mtspr SPR_INTERRUPT_MASK_RESET_K_1, r0

	/*		/*
	* We now commit to returning from this interrupt, since we will be		* We now commit to returning from this interrupt, since we will be
	@@ -1171,6 +1178,10 @@ handle_nmi:
	PTREGS_PTR(r0, PTREGS_OFFSET_BASE)		PTREGS_PTR(r0, PTREGS_OFFSET_BASE)
	}		}
	FEEDBACK_REENTER(handle_nmi)		FEEDBACK_REENTER(handle_nmi)
			{
			movei r30, 1
			seq r31, r0, zero
			}
	j interrupt_return		j interrupt_return
	STD_ENDPROC(handle_nmi)		STD_ENDPROC(handle_nmi)

	@@ -1835,8 +1846,9 @@ int_unalign:
	/* Include .intrpt array of interrupt vectors */		/* Include .intrpt array of interrupt vectors */
	.section ".intrpt", "ax"		.section ".intrpt", "ax"

	#define op_handle_perf_interrupt bad_intr		#ifndef CONFIG_USE_PMC
	#define op_handle_aux_perf_interrupt bad_intr		#define handle_perf_interrupt bad_intr
			#endif

	#ifndef CONFIG_HARDWALL		#ifndef CONFIG_HARDWALL
	#define do_hardwall_trap bad_intr		#define do_hardwall_trap bad_intr
	@@ -1877,7 +1889,7 @@ int_unalign:
	int_hand INT_IDN_AVAIL, IDN_AVAIL, bad_intr		int_hand INT_IDN_AVAIL, IDN_AVAIL, bad_intr
	int_hand INT_UDN_AVAIL, UDN_AVAIL, bad_intr		int_hand INT_UDN_AVAIL, UDN_AVAIL, bad_intr
	int_hand INT_PERF_COUNT, PERF_COUNT, \		int_hand INT_PERF_COUNT, PERF_COUNT, \
	op_handle_perf_interrupt, handle_nmi		handle_perf_interrupt, handle_nmi
	int_hand INT_INTCTRL_3, INTCTRL_3, bad_intr		int_hand INT_INTCTRL_3, INTCTRL_3, bad_intr
	#if CONFIG_KERNEL_PL == 2		#if CONFIG_KERNEL_PL == 2
	dc_dispatch INT_INTCTRL_2, INTCTRL_2		dc_dispatch INT_INTCTRL_2, INTCTRL_2
	@@ -1902,7 +1914,7 @@ int_unalign:
	int_hand INT_SN_CPL, SN_CPL, bad_intr		int_hand INT_SN_CPL, SN_CPL, bad_intr
	int_hand INT_DOUBLE_FAULT, DOUBLE_FAULT, do_trap		int_hand INT_DOUBLE_FAULT, DOUBLE_FAULT, do_trap
	int_hand INT_AUX_PERF_COUNT, AUX_PERF_COUNT, \		int_hand INT_AUX_PERF_COUNT, AUX_PERF_COUNT, \
	op_handle_aux_perf_interrupt, handle_nmi		handle_perf_interrupt, handle_nmi

	/* Synthetic interrupt delivered only by the simulator */		/* Synthetic interrupt delivered only by the simulator */
	int_hand INT_BREAKPOINT, BREAKPOINT, do_breakpoint		int_hand INT_BREAKPOINT, BREAKPOINT, do_breakpoint