Merge tag 'xtensa-20200410' of git://github.com/jcmvbkbc/linux-xtensa (9539303a) · Commits · 戴 / test

arch/xtensa/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -122,7 +122,7 @@ config XTENSA_VARIANT_CUSTOM_NAME
		help
		Provide the name of a custom Xtensa processor variant.
		This CORENAME selects arch/xtensa/variant/CORENAME.
		Dont forget you have to select MMU if you have one.
		Don't forget you have to select MMU if you have one.

		config XTENSA_VARIANT_NAME
		string

+0 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@ HOSTFLAGS += -Iarch/$(ARCH)/boot/include

		BIG_ENDIAN := $(shell echo __XTENSA_EB__ \| $(CC) -E - \| grep -v "\#")

		export ccflags-y
		export BIG_ENDIAN

		subdir-y := lib

+2 −6

Original line number	Diff line number	Diff line
		@@ -53,16 +53,12 @@ static void system_flush_invalidate_dcache_range(unsigned long start,
		#define IPI_IRQ 0

		static irqreturn_t ipi_interrupt(int irq, void *dev_id);
		static struct irqaction ipi_irqaction = {
		.handler = ipi_interrupt,
		.flags = IRQF_PERCPU,
		.name = "ipi",
		};

		void ipi_init(void)
		{
		unsigned irq = irq_create_mapping(NULL, IPI_IRQ);
		setup_irq(irq, &ipi_irqaction);
		if (request_irq(irq, ipi_interrupt, IRQF_PERCPU, "ipi", NULL))
		pr_err("Failed to request irq %u (ipi)\n", irq);
		}

		static inline unsigned int get_core_count(void)

+5 −7

Original line number	Diff line number	Diff line
		@@ -128,12 +128,6 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
		return IRQ_HANDLED;
		}

		static struct irqaction timer_irqaction = {
		.handler = timer_interrupt,
		.flags = IRQF_TIMER,
		.name = "timer",
		};

		void local_timer_setup(unsigned cpu)
		{
		struct ccount_timer *timer = &per_cpu(ccount_timer, cpu);
		@@ -184,6 +178,8 @@ static inline void calibrate_ccount(void)

		void __init time_init(void)
		{
		int irq;

		of_clk_init(NULL);
		#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
		pr_info("Calibrating CPU frequency ");
		@@ -199,7 +195,9 @@ void __init time_init(void)
		__func__);
		clocksource_register_hz(&ccount_clocksource, ccount_freq);
		local_timer_setup(0);
		setup_irq(this_cpu_ptr(&ccount_timer)->evt.irq, &timer_irqaction);
		irq = this_cpu_ptr(&ccount_timer)->evt.irq;
		if (request_irq(irq, timer_interrupt, IRQF_TIMER, "timer", NULL))
		pr_err("Failed to request irq %d (timer)\n", irq);
		sched_clock_register(ccount_sched_clock_read, 32, ccount_freq);
		timer_probe();
		}