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

Commit 28318daf authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

x86_64: use the global PIT lock 



Replace the pcspkr private PIT lock by the global PIT lock to serialize the
PIT access all over the place.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 021daae2

arch/x86_64/kernel/time.c

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <acpi/acpi_bus.h>

#endif

#include <asm/8253pit.h>

#include <asm/i8253.h>

#include <asm/pgtable.h>

#include <asm/vsyscall.h>

#include <asm/timex.h>
@@ -51,6 +52,7 @@ static char *timename = NULL; 
DEFINE_SPINLOCK(rtc_lock);

EXPORT_SYMBOL(rtc_lock);

DEFINE_SPINLOCK(i8253_lock);

EXPORT_SYMBOL(i8253_lock);



volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES;

drivers/input/misc/pcspkr.c

+8 −3
Original line number Diff line number Diff line
@@ -24,7 +24,12 @@ MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); 
MODULE_DESCRIPTION("PC Speaker beeper driver");

MODULE_LICENSE("GPL");



static DEFINE_SPINLOCK(i8253_beep_lock);

#ifdef CONFIG_X86

/* Use the global PIT lock ! */

#include <asm/i8253.h>

#else

static DEFINE_SPINLOCK(i8253_lock);

#endif



static int pcspkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)

{
@@ -43,7 +48,7 @@ static int pcspkr_event(struct input_dev *dev, unsigned int type, unsigned int c 
	if (value > 20 && value < 32767)

		count = PIT_TICK_RATE / value;



	spin_lock_irqsave(&i8253_beep_lock, flags);

	spin_lock_irqsave(&i8253_lock, flags);



	if (count) {

		/* enable counter 2 */
@@ -58,7 +63,7 @@ static int pcspkr_event(struct input_dev *dev, unsigned int type, unsigned int c 
		outb(inb_p(0x61) & 0xFC, 0x61);

	}



	spin_unlock_irqrestore(&i8253_beep_lock, flags);

	spin_unlock_irqrestore(&i8253_lock, flags);



	return 0;

}

include/asm-x86_64/i8253.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#ifndef __ASM_I8253_H__

#define __ASM_I8253_H__



extern spinlock_t i8253_lock;



#endif	/* __ASM_I8253_H__ */