[Sound-open-firmware] [PATCH 1/2] interrupt: apollolake: cleanup interrupt mask
We don't have SOFTWARE1 interrupt on apollolake, but have SOFTWARE10, here correct it.
Signed-off-by: Keyon Jie yang.jie@linux.intel.com --- src/platform/apollolake/include/platform/interrupt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/platform/apollolake/include/platform/interrupt.h b/src/platform/apollolake/include/platform/interrupt.h index 2fddea1..5c63da8 100644 --- a/src/platform/apollolake/include/platform/interrupt.h +++ b/src/platform/apollolake/include/platform/interrupt.h @@ -144,7 +144,6 @@ #define IRQ_MASK_SOFTWARE0 (1 << IRQ_NUM_SOFTWARE0) #define IRQ_MASK_TIMER1 (1 << IRQ_NUM_TIMER1) #define IRQ_MASK_EXT_LEVEL1 (1 << IRQ_NUM_EXT_LEVEL1) -#define IRQ_MASK_SOFTWARE1 (1 << IRQ_NUM_SOFTWARE1) #define IRQ_MASK_SOFTWARE2 (1 << IRQ_NUM_SOFTWARE2) #define IRQ_MASK_TIMER2 (1 << IRQ_NUM_TIMER2) #define IRQ_MASK_EXT_LEVEL2 (1 << IRQ_NUM_EXT_LEVEL2) @@ -161,6 +160,7 @@ #define IRQ_MASK_EXT_LEVEL6 (1 << IRQ_NUM_EXT_LEVEL6) #define IRQ_MASK_EXT_LEVEL7 (1 << IRQ_NUM_EXT_LEVEL7) #define IRQ_MASK_SOFTWARE9 (1 << IRQ_NUM_SOFTWARE9) +#define IRQ_MASK_SOFTWARE10 (1 << IRQ_NUM_SOFTWARE10)
void platform_interrupt_init(void);
We don't have SOFTWARE1 interrupt on cannonlake, but have SOFTWARE10, here correct it.
Signed-off-by: Keyon Jie yang.jie@linux.intel.com --- src/platform/cannonlake/include/platform/interrupt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/platform/cannonlake/include/platform/interrupt.h b/src/platform/cannonlake/include/platform/interrupt.h index 4735ddc..fcbac65 100644 --- a/src/platform/cannonlake/include/platform/interrupt.h +++ b/src/platform/cannonlake/include/platform/interrupt.h @@ -141,7 +141,6 @@ #define IRQ_MASK_SOFTWARE0 (1 << IRQ_NUM_SOFTWARE0) #define IRQ_MASK_TIMER1 (1 << IRQ_NUM_TIMER1) #define IRQ_MASK_EXT_LEVEL1 (1 << IRQ_NUM_EXT_LEVEL1) -#define IRQ_MASK_SOFTWARE1 (1 << IRQ_NUM_SOFTWARE1) #define IRQ_MASK_SOFTWARE2 (1 << IRQ_NUM_SOFTWARE2) #define IRQ_MASK_TIMER2 (1 << IRQ_NUM_TIMER2) #define IRQ_MASK_EXT_LEVEL2 (1 << IRQ_NUM_EXT_LEVEL2) @@ -158,6 +157,7 @@ #define IRQ_MASK_EXT_LEVEL6 (1 << IRQ_NUM_EXT_LEVEL6) #define IRQ_MASK_EXT_LEVEL7 (1 << IRQ_NUM_EXT_LEVEL7) #define IRQ_MASK_SOFTWARE9 (1 << IRQ_NUM_SOFTWARE9) +#define IRQ_MASK_SOFTWARE10 (1 << IRQ_NUM_SOFTWARE10)
void platform_interrupt_init(void);
On Mon, 2018-03-12 at 17:17 +0800, Keyon Jie wrote:
We don't have SOFTWARE1 interrupt on apollolake, but have SOFTWARE10, here correct it.
Signed-off-by: Keyon Jie yang.jie@linux.intel.com
src/platform/apollolake/include/platform/interrupt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/platform/apollolake/include/platform/interrupt.h b/src/platform/apollolake/include/platform/interrupt.h index 2fddea1..5c63da8 100644 --- a/src/platform/apollolake/include/platform/interrupt.h +++ b/src/platform/apollolake/include/platform/interrupt.h @@ -144,7 +144,6 @@ #define IRQ_MASK_SOFTWARE0 (1 << IRQ_NUM_SOFTWARE0) #define IRQ_MASK_TIMER1 (1 << IRQ_NUM_TIMER1) #define IRQ_MASK_EXT_LEVEL1 (1 << IRQ_NUM_EXT_LEVEL1) -#define IRQ_MASK_SOFTWARE1 (1 << IRQ_NUM_SOFTWARE1) #define IRQ_MASK_SOFTWARE2 (1 << IRQ_NUM_SOFTWARE2) #define IRQ_MASK_TIMER2 (1 << IRQ_NUM_TIMER2) #define IRQ_MASK_EXT_LEVEL2 (1 << IRQ_NUM_EXT_LEVEL2) @@ -161,6 +160,7 @@ #define IRQ_MASK_EXT_LEVEL6 (1 << IRQ_NUM_EXT_LEVEL6) #define IRQ_MASK_EXT_LEVEL7 (1 << IRQ_NUM_EXT_LEVEL7) #define IRQ_MASK_SOFTWARE9 (1 << IRQ_NUM_SOFTWARE9) +#define IRQ_MASK_SOFTWARE10 (1 << IRQ_NUM_SOFTWARE10)
void platform_interrupt_init(void);
Shouldn't this patch being doing the opposite ? i.e. removing 10 and adding 1 otherwise we have a gap.
Liam
-----Original Message----- From: Liam Girdwood [mailto:liam.r.girdwood@linux.intel.com] Sent: Monday, March 12, 2018 7:32 PM To: Keyon Jie yang.jie@linux.intel.com; sound-open-firmware@alsa- project.org Cc: Jie, Yang yang.jie@intel.com Subject: Re: [Sound-open-firmware] [PATCH 1/2] interrupt: apollolake: cleanup interrupt mask
On Mon, 2018-03-12 at 17:17 +0800, Keyon Jie wrote:
We don't have SOFTWARE1 interrupt on apollolake, but have SOFTWARE10, here correct it.
Signed-off-by: Keyon Jie yang.jie@linux.intel.com
src/platform/apollolake/include/platform/interrupt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/platform/apollolake/include/platform/interrupt.h b/src/platform/apollolake/include/platform/interrupt.h index 2fddea1..5c63da8 100644 --- a/src/platform/apollolake/include/platform/interrupt.h +++ b/src/platform/apollolake/include/platform/interrupt.h @@ -144,7 +144,6 @@ #define IRQ_MASK_SOFTWARE0 (1 << IRQ_NUM_SOFTWARE0) #define IRQ_MASK_TIMER1 (1 << IRQ_NUM_TIMER1) #define IRQ_MASK_EXT_LEVEL1 (1 << IRQ_NUM_EXT_LEVEL1) -#define IRQ_MASK_SOFTWARE1 (1 << IRQ_NUM_SOFTWARE1) #define IRQ_MASK_SOFTWARE2 (1 << IRQ_NUM_SOFTWARE2) #define IRQ_MASK_TIMER2 (1 << IRQ_NUM_TIMER2) #define IRQ_MASK_EXT_LEVEL2 (1 << IRQ_NUM_EXT_LEVEL2) @@ -161,6 +160,7 @@ #define IRQ_MASK_EXT_LEVEL6 (1 << IRQ_NUM_EXT_LEVEL6) #define IRQ_MASK_EXT_LEVEL7 (1 << IRQ_NUM_EXT_LEVEL7) #define IRQ_MASK_SOFTWARE9 (1 << IRQ_NUM_SOFTWARE9) +#define IRQ_MASK_SOFTWARE10 (1 << IRQ_NUM_SOFTWARE10)
void platform_interrupt_init(void);
Shouldn't this patch being doing the opposite ? i.e. removing 10 and adding 1 otherwise we have a gap.
Um, intended to make it matched(the mapping between SOFTWAREN with INT number) as more as possible with that in baytrail.
After revisit to them, looks removing 10 and adding 1 can make them matched even more, except that we need change the usage of them at the same time, e.g. those for schedule.
Let me change the together.
Thanks, ~Keyon
Liam
participants (3)
-
Jie, Yang -
Keyon Jie -
Liam Girdwood