Merge branch 'x86/geode' into x86/urgent (529d0e40) · Commits · e / devices / android_kernel_xiaomi_sm6125

arch/x86/kernel/mfgpt_32.c

+37 −15

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,8 @@
	#include <linux/module.h>		#include <linux/module.h>
	#include <asm/geode.h>		#include <asm/geode.h>

			#define MFGPT_DEFAULT_IRQ 7

	static struct mfgpt_timer_t {		static struct mfgpt_timer_t {
	unsigned int avail:1;		unsigned int avail:1;
	} mfgpt_timers[MFGPT_MAX_TIMERS];		} mfgpt_timers[MFGPT_MAX_TIMERS];
	@@ -157,29 +159,48 @@ int geode_mfgpt_toggle_event(int timer, int cmp, int event, int enable)
	}		}
	EXPORT_SYMBOL_GPL(geode_mfgpt_toggle_event);		EXPORT_SYMBOL_GPL(geode_mfgpt_toggle_event);

	int geode_mfgpt_set_irq(int timer, int cmp, int irq, int enable)		int geode_mfgpt_set_irq(int timer, int cmp, int *irq, int enable)
	{		{
	u32 val, dummy;		u32 zsel, lpc, dummy;
	int offset;		int shift;

	if (timer < 0 \|\| timer >= MFGPT_MAX_TIMERS)		if (timer < 0 \|\| timer >= MFGPT_MAX_TIMERS)
	return -EIO;		return -EIO;

	if (geode_mfgpt_toggle_event(timer, cmp, MFGPT_EVENT_IRQ, enable))		/*
			* Unfortunately, MFGPTs come in pairs sharing their IRQ lines. If VSA
			* is using the same CMP of the timer's Siamese twin, the IRQ is set to
			* 2, and we mustn't use nor change it.
			* XXX: Likewise, 2 Linux drivers might clash if the 2nd overwrites the
			* IRQ of the 1st. This can only happen if forcing an IRQ, calling this
			* with *irq==0 is safe. Currently there _are_ no 2 drivers.
			*/
			rdmsr(MSR_PIC_ZSEL_LOW, zsel, dummy);
			shift = ((cmp == MFGPT_CMP1 ? 0 : 4) + timer % 4) * 4;
			if (((zsel >> shift) & 0xF) == 2)
	return -EIO;		return -EIO;

	rdmsr(MSR_PIC_ZSEL_LOW, val, dummy);		/* Choose IRQ: if none supplied, keep IRQ already set or use default */
			if (!*irq)
			*irq = (zsel >> shift) & 0xF;
			if (!*irq)
			*irq = MFGPT_DEFAULT_IRQ;

	offset = (timer % 4) * 4;		/* Can't use IRQ if it's 0 (=disabled), 2, or routed to LPC */
			if (irq < 1 \|\| irq == 2 \|\| *irq > 15)
	val &= ~((0xF << offset) \| (0xF << (offset + 16)));		return -EIO;
			rdmsr(MSR_PIC_IRQM_LPC, lpc, dummy);
			if (lpc & (1 << *irq))
			return -EIO;

			/* All chosen and checked - go for it */
			if (geode_mfgpt_toggle_event(timer, cmp, MFGPT_EVENT_IRQ, enable))
			return -EIO;
	if (enable) {		if (enable) {
	val \|= (irq & 0x0F) << (offset);		zsel = (zsel & ~(0xF << shift)) \| (*irq << shift);
	val \|= (irq & 0x0F) << (offset + 16);		wrmsr(MSR_PIC_ZSEL_LOW, zsel, dummy);
	}		}

	wrmsr(MSR_PIC_ZSEL_LOW, val, dummy);
	return 0;		return 0;
	}		}

	@@ -242,7 +263,7 @@ EXPORT_SYMBOL_GPL(geode_mfgpt_alloc_timer);
	static unsigned int mfgpt_tick_mode = CLOCK_EVT_MODE_SHUTDOWN;		static unsigned int mfgpt_tick_mode = CLOCK_EVT_MODE_SHUTDOWN;
	static u16 mfgpt_event_clock;		static u16 mfgpt_event_clock;

	static int irq = 7;		static int irq;
	static int __init mfgpt_setup(char *str)		static int __init mfgpt_setup(char *str)
	{		{
	get_option(&str, &irq);		get_option(&str, &irq);
	@@ -346,7 +367,7 @@ int __init mfgpt_timer_setup(void)
	mfgpt_event_clock = timer;		mfgpt_event_clock = timer;

	/* Set up the IRQ on the MFGPT side */		/* Set up the IRQ on the MFGPT side */
	if (geode_mfgpt_setup_irq(mfgpt_event_clock, MFGPT_CMP2, irq)) {		if (geode_mfgpt_setup_irq(mfgpt_event_clock, MFGPT_CMP2, &irq)) {
	printk(KERN_ERR "mfgpt-timer: Could not set up IRQ %d\n", irq);		printk(KERN_ERR "mfgpt-timer: Could not set up IRQ %d\n", irq);
	return -EIO;		return -EIO;
	}		}
	@@ -374,13 +395,14 @@ int __init mfgpt_timer_setup(void)
	&mfgpt_clockevent);		&mfgpt_clockevent);

	printk(KERN_INFO		printk(KERN_INFO
	"mfgpt-timer: registering the MFGPT timer as a clock event.\n");		"mfgpt-timer: Registering MFGPT timer %d as a clock event, using IRQ %d\n",
			timer, irq);
	clockevents_register_device(&mfgpt_clockevent);		clockevents_register_device(&mfgpt_clockevent);

	return 0;		return 0;

	err:		err:
	geode_mfgpt_release_irq(mfgpt_event_clock, MFGPT_CMP2, irq);		geode_mfgpt_release_irq(mfgpt_event_clock, MFGPT_CMP2, &irq);
	printk(KERN_ERR		printk(KERN_ERR
	"mfgpt-timer: Unable to set up the MFGPT clock source\n");		"mfgpt-timer: Unable to set up the MFGPT clock source\n");
	return -EIO;		return -EIO;

include/asm-x86/geode.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -50,6 +50,7 @@ extern int geode_get_dev_base(unsigned int dev);
	#define MSR_PIC_YSEL_HIGH 0x51400021		#define MSR_PIC_YSEL_HIGH 0x51400021
	#define MSR_PIC_ZSEL_LOW 0x51400022		#define MSR_PIC_ZSEL_LOW 0x51400022
	#define MSR_PIC_ZSEL_HIGH 0x51400023		#define MSR_PIC_ZSEL_HIGH 0x51400023
			#define MSR_PIC_IRQM_LPC 0x51400025

	#define MSR_MFGPT_IRQ 0x51400028		#define MSR_MFGPT_IRQ 0x51400028
	#define MSR_MFGPT_NR 0x51400029		#define MSR_MFGPT_NR 0x51400029
	@@ -237,7 +238,7 @@ static inline u16 geode_mfgpt_read(int timer, u16 reg)
	}		}

	extern int geode_mfgpt_toggle_event(int timer, int cmp, int event, int enable);		extern int geode_mfgpt_toggle_event(int timer, int cmp, int event, int enable);
	extern int geode_mfgpt_set_irq(int timer, int cmp, int irq, int enable);		extern int geode_mfgpt_set_irq(int timer, int cmp, int *irq, int enable);
	extern int geode_mfgpt_alloc_timer(int timer, int domain);		extern int geode_mfgpt_alloc_timer(int timer, int domain);

	#define geode_mfgpt_setup_irq(t, c, i) geode_mfgpt_set_irq((t), (c), (i), 1)		#define geode_mfgpt_setup_irq(t, c, i) geode_mfgpt_set_irq((t), (c), (i), 1)