sh: fix sh7722 SDHI support using INTC force_disable
PATCH 1/1 sh: fix sh7722 SDHI support using INTC force_disable
From: Magnus Damm <[email protected]>
Update the sh7722 INTC tables with force_enable support to mask out pending unsupported SDHI interrupt sources.
Without this patch the kernel locks up due to a pending SDHI interrupt that the tmio_mmc driver cannot handle.
---
arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/sh/kernel/cpu/sh4a/setup-sh7722.c +3 -1
@@ -447,6 +447,7 @@ void __init plat_early_device_setup(voidenum {UNUSED =0 ,ENABLED , +DISABLED ,/* interrupt sources */ IRQ0 ,IRQ1 ,IRQ2 ,IRQ3 ,IRQ4 ,IRQ5 ,IRQ6 ,IRQ7 ,
@@ -534,7 +535,7 @@ static struct intc_mask_reg mask_registe {I2C_DTEI ,I2C_WAITI ,I2C_TACKI ,I2C_ALI , FLCTL_FLTREQ1I, FLCTL_FLTREQ0I, FLCTL_FLENDI, FLCTL_FLSTEI } }, {0xa40800a0 ,0xa40800e0 ,8 ,/* IMR8 / IMCR8 */ - { 0, 0, ENABLED, ENABLED, 0, 0, TWODG, SIU } }, + { DISABLED, DISABLED, ENABLED, ENABLED, 0, 0, TWODG, SIU } }, { 0xa40800a4, 0xa40800e4, 8, /* IMR9 / IMCR9 */ { 0, 0, 0, CMT, 0, USB_USBI1, USB_USBI0, } }, { 0xa40800a8, 0xa40800e8, 8, /* IMR10 / IMCR10 */
@@ -575,6 +576,7 @@ static struct intc_mask_reg ack_registerstatic struct intc_desc intc_desc__initdata = { .name ="sh7722" , .force_enable =ENABLED , + .force_disable =DISABLED , .hw =INTC_HW_DESC (vectors, groups, mask_registers, prio_registers, sense_registers, ack_registers), };
Paul Mundt
AppliedQuoted 5 lines · Magnus Damm
Update the sh7722 INTC tables with
force_enablesupport to mask out pending unsupported SDHI interrupt sources.Without this patch the kernel locks up due to a pending SDHI interrupt that the
tmio_mmcdriver cannot handle.
Quoted 5 lines · Magnus Damm
Update the sh7723 INTC tables with
force_enablesupport to mask out pending unsupported SDHI interrupt sources.Without this patch the kernel locks up due to a pending SDHI interrupt that the
tmio_mmcdriver cannot handle.
Applied.