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

Merge tag 'xtensa-20230905' of https://github.com/jcmvbkbc/linux-xtensa 

Pull xtensa updates from Max Filippov:

 - enable MTD XIP support

 - fix base address of the xtensa perf module in newer hardware

* tag 'xtensa-20230905' of https://github.com/jcmvbkbc/linux-xtensa:
  xtensa: add XIP-aware MTD support
  xtensa: PMU: fix base address for the newer hardware
parents 78a06688 03ce34cf

arch/xtensa/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ config ARCH_HAS_ILOG2_U32 
config ARCH_HAS_ILOG2_U64

	def_bool n



config ARCH_MTD_XIP

	def_bool y



config NO_IOPORT_MAP

	def_bool n

arch/xtensa/include/asm/core.h

+9 −0
Original line number Diff line number Diff line
@@ -52,4 +52,13 @@ 
#define XTENSA_STACK_ALIGNMENT	16

#endif



#ifndef XCHAL_HW_MIN_VERSION

#if defined(XCHAL_HW_MIN_VERSION_MAJOR) && defined(XCHAL_HW_MIN_VERSION_MINOR)

#define XCHAL_HW_MIN_VERSION (XCHAL_HW_MIN_VERSION_MAJOR * 100 + \

			      XCHAL_HW_MIN_VERSION_MINOR)

#else

#define XCHAL_HW_MIN_VERSION 0

#endif

#endif



#endif

arch/xtensa/include/asm/mtd-xip.h

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



#ifndef _ASM_MTD_XIP_H

#define _ASM_MTD_XIP_H



#include <asm/processor.h>



#define xip_irqpending()	(xtensa_get_sr(interrupt) & xtensa_get_sr(intenable))

#define xip_currtime()		(xtensa_get_sr(ccount))

#define xip_elapsed_since(x)	((xtensa_get_sr(ccount) - (x)) / 1000) /* should work up to 1GHz */

#define xip_cpu_idle()		do { asm volatile ("waiti 0"); } while (0)



#endif /* _ASM_MTD_XIP_H */

arch/xtensa/include/asm/sections.h

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ extern char _SecondaryResetVector_text_start[]; 
extern char _SecondaryResetVector_text_end[];

#endif

#ifdef CONFIG_XIP_KERNEL

#ifdef CONFIG_VECTORS_ADDR

extern char _xip_text_start[];

extern char _xip_text_end[];

#endif

extern char _xip_start[];

extern char _xip_end[];

#endif

arch/xtensa/kernel/perf_event.c

+13 −4
Original line number Diff line number Diff line
@@ -13,17 +13,26 @@ 
#include <linux/perf_event.h>

#include <linux/platform_device.h>



#include <asm/core.h>

#include <asm/processor.h>

#include <asm/stacktrace.h>



#define XTENSA_HWVERSION_RG_2015_0	260000



#if XCHAL_HW_MIN_VERSION >= XTENSA_HWVERSION_RG_2015_0

#define XTENSA_PMU_ERI_BASE		0x00101000

#else

#define XTENSA_PMU_ERI_BASE		0x00001000

#endif



/* Global control/status for all perf counters */

#define XTENSA_PMU_PMG			0x1000

#define XTENSA_PMU_PMG			XTENSA_PMU_ERI_BASE

/* Perf counter values */

#define XTENSA_PMU_PM(i)		(0x1080 + (i) * 4)

#define XTENSA_PMU_PM(i)		(XTENSA_PMU_ERI_BASE + 0x80 + (i) * 4)

/* Perf counter control registers */

#define XTENSA_PMU_PMCTRL(i)		(0x1100 + (i) * 4)

#define XTENSA_PMU_PMCTRL(i)		(XTENSA_PMU_ERI_BASE + 0x100 + (i) * 4)

/* Perf counter status registers */

#define XTENSA_PMU_PMSTAT(i)		(0x1180 + (i) * 4)

#define XTENSA_PMU_PMSTAT(i)		(XTENSA_PMU_ERI_BASE + 0x180 + (i) * 4)



#define XTENSA_PMU_PMG_PMEN		0x1