Skip to content

L
linux
Commit f03ca957 authored by Li Yang's avatar Li Yang Committed by Kumar Gala
Browse files
Options

[POWERPC] ipic: add new interrupts introduced by new chip 

These interrupts are introduced by the latest Freescale SoC
such as MPC837x.
Signed-off-by: default avatarLi Yang <leoli@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent a58d5244
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 14 deletions
arch/powerpc/sysdev/ipic.c
View file @ f03ca957
...@@ -33,6 +33,30 @@ static struct ipic * primary_ipic; ...@@ -33,6 +33,30 @@ static struct ipic * primary_ipic;
static DEFINE_SPINLOCK(ipic_lock); static DEFINE_SPINLOCK(ipic_lock);
static struct ipic_info ipic_info[] = { static struct ipic_info ipic_info[] = {
[1] = {
.pend = IPIC_SIPNR_H,
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_C,
.force = IPIC_SIFCR_H,
.bit = 16,
.prio_mask = 0,
},
[2] = {
.pend = IPIC_SIPNR_H,
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_C,
.force = IPIC_SIFCR_H,
.bit = 17,
.prio_mask = 1,
},
[4] = {
.pend = IPIC_SIPNR_H,
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_C,
.force = IPIC_SIFCR_H,
.bit = 19,
.prio_mask = 3,
},
[9] = { [9] = {
.pend = IPIC_SIPNR_H, .pend = IPIC_SIPNR_H,
.mask = IPIC_SIMSR_H, .mask = IPIC_SIMSR_H,
...@@ -57,6 +81,22 @@ static struct ipic_info ipic_info[] = { ...@@ -57,6 +81,22 @@ static struct ipic_info ipic_info[] = {
.bit = 26, .bit = 26,
.prio_mask = 2, .prio_mask = 2,
}, },
[12] = {
.pend = IPIC_SIPNR_H,
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_D,
.force = IPIC_SIFCR_H,
.bit = 27,
.prio_mask = 3,
},
[13] = {
.pend = IPIC_SIPNR_H,
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_D,
.force = IPIC_SIFCR_H,
.bit = 28,
.prio_mask = 4,
},
[14] = { [14] = {
.pend = IPIC_SIPNR_H, .pend = IPIC_SIPNR_H,
.mask = IPIC_SIMSR_H, .mask = IPIC_SIMSR_H,
...@@ -201,6 +241,46 @@ static struct ipic_info ipic_info[] = { ...@@ -201,6 +241,46 @@ static struct ipic_info ipic_info[] = {
.bit = 7, .bit = 7,
.prio_mask = 7, .prio_mask = 7,
}, },
[42] = {
.pend = IPIC_SIPNR_H,
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_B,
.force = IPIC_SIFCR_H,
.bit = 10,
.prio_mask = 2,
},
[44] = {
.pend = IPIC_SIPNR_H,
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_B,
.force = IPIC_SIFCR_H,
.bit = 12,
.prio_mask = 4,
},
[45] = {
.pend = IPIC_SIPNR_H,
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_B,
.force = IPIC_SIFCR_H,
.bit = 13,
.prio_mask = 5,
},
[46] = {
.pend = IPIC_SIPNR_H,
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_B,
.force = IPIC_SIFCR_H,
.bit = 14,
.prio_mask = 6,
},
[47] = {
.pend = IPIC_SIPNR_H,
.mask = IPIC_SIMSR_H,
.prio = IPIC_SIPRR_B,
.force = IPIC_SIFCR_H,
.bit = 15,
.prio_mask = 7,
},
[48] = { [48] = {
.pend = IPIC_SEPNR, .pend = IPIC_SEPNR,
.mask = IPIC_SEMSR, .mask = IPIC_SEMSR,
...@@ -336,6 +416,20 @@ static struct ipic_info ipic_info[] = { ...@@ -336,6 +416,20 @@ static struct ipic_info ipic_info[] = {
.force = IPIC_SIFCR_L, .force = IPIC_SIFCR_L,
.bit = 16, .bit = 16,
}, },
[81] = {
.pend = IPIC_SIPNR_L,
.mask = IPIC_SIMSR_L,
.prio = 0,
.force = IPIC_SIFCR_L,
.bit = 17,
},
[82] = {
.pend = IPIC_SIPNR_L,
.mask = IPIC_SIMSR_L,
.prio = 0,
.force = IPIC_SIFCR_L,
.bit = 18,
},
[84] = { [84] = {
.pend = IPIC_SIPNR_L, .pend = IPIC_SIPNR_L,
.mask = IPIC_SIMSR_L, .mask = IPIC_SIMSR_L,
...@@ -350,6 +444,34 @@ static struct ipic_info ipic_info[] = { ...@@ -350,6 +444,34 @@ static struct ipic_info ipic_info[] = {
.force = IPIC_SIFCR_L, .force = IPIC_SIFCR_L,
.bit = 21, .bit = 21,
}, },
[86] = {
.pend = IPIC_SIPNR_L,
.mask = IPIC_SIMSR_L,
.prio = 0,
.force = IPIC_SIFCR_L,
.bit = 22,
},
[87] = {
.pend = IPIC_SIPNR_L,
.mask = IPIC_SIMSR_L,
.prio = 0,
.force = IPIC_SIFCR_L,
.bit = 23,
},
[88] = {
.pend = IPIC_SIPNR_L,
.mask = IPIC_SIMSR_L,
.prio = 0,
.force = IPIC_SIFCR_L,
.bit = 24,
},
[89] = {
.pend = IPIC_SIPNR_L,
.mask = IPIC_SIMSR_L,
.prio = 0,
.force = IPIC_SIFCR_L,
.bit = 25,
},
[90] = { [90] = {
.pend = IPIC_SIPNR_L, .pend = IPIC_SIPNR_L,
.mask = IPIC_SIMSR_L, .mask = IPIC_SIMSR_L,
...@@ -593,6 +715,10 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags) ...@@ -593,6 +715,10 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)
* configure SICFR accordingly */ * configure SICFR accordingly */
if (flags & IPIC_SPREADMODE_GRP_A) if (flags & IPIC_SPREADMODE_GRP_A)
temp |= SICFR_IPSA; temp |= SICFR_IPSA;
if (flags & IPIC_SPREADMODE_GRP_B)
temp |= SICFR_IPSB;
if (flags & IPIC_SPREADMODE_GRP_C)
temp |= SICFR_IPSC;
if (flags & IPIC_SPREADMODE_GRP_D) if (flags & IPIC_SPREADMODE_GRP_D)
temp |= SICFR_IPSD; temp |= SICFR_IPSD;
if (flags & IPIC_SPREADMODE_MIX_A) if (flags & IPIC_SPREADMODE_MIX_A)
...@@ -600,7 +726,7 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags) ...@@ -600,7 +726,7 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)
if (flags & IPIC_SPREADMODE_MIX_B) if (flags & IPIC_SPREADMODE_MIX_B)
temp |= SICFR_MPSB; temp |= SICFR_MPSB;
ipic_write(ipic->regs, IPIC_SICNR, temp); ipic_write(ipic->regs, IPIC_SICFR, temp);
/* handle MCP route */ /* handle MCP route */
temp = 0; temp = 0;
...@@ -672,10 +798,12 @@ void ipic_set_highest_priority(unsigned int virq) ...@@ -672,10 +798,12 @@ void ipic_set_highest_priority(unsigned int virq)
void ipic_set_default_priority(void) void ipic_set_default_priority(void)
{ {
ipic_write(primary_ipic->regs, IPIC_SIPRR_A, IPIC_SIPRR_A_DEFAULT); ipic_write(primary_ipic->regs, IPIC_SIPRR_A, IPIC_PRIORITY_DEFAULT);
ipic_write(primary_ipic->regs, IPIC_SIPRR_D, IPIC_SIPRR_D_DEFAULT); ipic_write(primary_ipic->regs, IPIC_SIPRR_B, IPIC_PRIORITY_DEFAULT);
ipic_write(primary_ipic->regs, IPIC_SMPRR_A, IPIC_SMPRR_A_DEFAULT); ipic_write(primary_ipic->regs, IPIC_SIPRR_C, IPIC_PRIORITY_DEFAULT);
ipic_write(primary_ipic->regs, IPIC_SMPRR_B, IPIC_SMPRR_B_DEFAULT); ipic_write(primary_ipic->regs, IPIC_SIPRR_D, IPIC_PRIORITY_DEFAULT);
ipic_write(primary_ipic->regs, IPIC_SMPRR_A, IPIC_PRIORITY_DEFAULT);
ipic_write(primary_ipic->regs, IPIC_SMPRR_B, IPIC_PRIORITY_DEFAULT);
} }
void ipic_enable_mcp(enum ipic_mcp_irq mcp_irq) void ipic_enable_mcp(enum ipic_mcp_irq mcp_irq)
......
arch/powerpc/sysdev/ipic.h
View file @ f03ca957
...@@ -23,13 +23,12 @@ ...@@ -23,13 +23,12 @@
#define IPIC_IRQ_EXT7 23 #define IPIC_IRQ_EXT7 23
/* Default Priority Registers */ /* Default Priority Registers */
#define IPIC_SIPRR_A_DEFAULT 0x05309770 #define IPIC_PRIORITY_DEFAULT 0x05309770
#define IPIC_SIPRR_D_DEFAULT 0x05309770
#define IPIC_SMPRR_A_DEFAULT 0x05309770
#define IPIC_SMPRR_B_DEFAULT 0x05309770
/* System Global Interrupt Configuration Register */ /* System Global Interrupt Configuration Register */
#define SICFR_IPSA 0x00010000 #define SICFR_IPSA 0x00010000
#define SICFR_IPSB 0x00020000
#define SICFR_IPSC 0x00040000
#define SICFR_IPSD 0x00080000 #define SICFR_IPSD 0x00080000
#define SICFR_MPSA 0x00200000 #define SICFR_MPSA 0x00200000
#define SICFR_MPSB 0x00400000 #define SICFR_MPSB 0x00400000
......
include/asm-powerpc/ipic.h
View file @ f03ca957
...@@ -20,11 +20,13 @@ ...@@ -20,11 +20,13 @@
/* Flags when we init the IPIC */ /* Flags when we init the IPIC */
#define IPIC_SPREADMODE_GRP_A 0x00000001 #define IPIC_SPREADMODE_GRP_A 0x00000001
#define IPIC_SPREADMODE_GRP_D 0x00000002 #define IPIC_SPREADMODE_GRP_B 0x00000002
#define IPIC_SPREADMODE_MIX_A 0x00000004 #define IPIC_SPREADMODE_GRP_C 0x00000004
#define IPIC_SPREADMODE_MIX_B 0x00000008 #define IPIC_SPREADMODE_GRP_D 0x00000008
#define IPIC_DISABLE_MCP_OUT 0x00000010 #define IPIC_SPREADMODE_MIX_A 0x00000010
#define IPIC_IRQ0_MCP 0x00000020 #define IPIC_SPREADMODE_MIX_B 0x00000020
#define IPIC_DISABLE_MCP_OUT 0x00000040
#define IPIC_IRQ0_MCP 0x00000080
/* IPIC registers offsets */ /* IPIC registers offsets */
#define IPIC_SICFR 0x00 /* System Global Interrupt Configuration Register */ #define IPIC_SICFR 0x00 /* System Global Interrupt Configuration Register */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7