lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sh: intc register modify fix

Browse Source 
Make sure register modifications stay atomic. Fixes processors with
shared priority register masking. Dual bitmap masking is unaffected.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Magnus Damm
2008-04-24 21:53:07 +09:00
committed by Paul Mundt
parent 720be99006
commit 4370fe1c06
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/sh/kernel/cpu/irq/intc.c
View File

@@ -101,17 +101,26 @@ static void write_32(unsigned long addr, unsigned long h, unsigned long data)
static void modify_8(unsigned long addr, unsigned long h, unsigned long data) static void modify_8(unsigned long addr, unsigned long h, unsigned long data)
{ {
unsigned long flags;
local_irq_save(flags);
ctrl_outb(set_field(ctrl_inb(addr), data, h), addr); ctrl_outb(set_field(ctrl_inb(addr), data, h), addr);
local_irq_restore(flags);
} }
static void modify_16(unsigned long addr, unsigned long h, unsigned long data) static void modify_16(unsigned long addr, unsigned long h, unsigned long data)
{ {
unsigned long flags;
local_irq_save(flags);
ctrl_outw(set_field(ctrl_inw(addr), data, h), addr); ctrl_outw(set_field(ctrl_inw(addr), data, h), addr);
local_irq_restore(flags);
} }
static void modify_32(unsigned long addr, unsigned long h, unsigned long data) static void modify_32(unsigned long addr, unsigned long h, unsigned long data)
{ {
unsigned long flags;
local_irq_save(flags);
ctrl_outl(set_field(ctrl_inl(addr), data, h), addr); ctrl_outl(set_field(ctrl_inl(addr), data, h), addr);
local_irq_restore(flags);
} }
enum { REG_FN_ERR = 0, REG_FN_WRITE_BASE = 1, REG_FN_MODIFY_BASE = 5 }; enum { REG_FN_ERR = 0, REG_FN_WRITE_BASE = 1, REG_FN_MODIFY_BASE = 5 };