Skip to content

Commit 29552dc

Browse files
wensbroonie
wens
authored and
broonie
committed
ASoC: mediatek: mt8183-afe-pcm: shorten mt8183_is_volatile_reg()
mt8183_is_volatile_reg() is a large switch-case block that lists out every register that is volatile. Since many pairs of registers have consecutive addresses, the cases can be compressed down with the ellipsis, i.e. GCC extension "case ranges" [1] to cover more addresses in one case, shortening the source code. This is not completely the same, since the addresses are 4-byte aligned, and using the case ranges feature adds all unaligned addresses in between. In practice this doesn't matter since the unaligned addresses are blocked by the regmap core. This also ends up compiling slightly smaller with a reduction of 128 bytes in the text section. [1] https://gcc.gnu.org/onlinedocs/gcc/Case-Ranges.html Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://patch.msgid.link/20250515073825.4155297-4-wenst@chromium.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 0be8898 commit 29552dc

File tree

1 file changed

+40
-112
lines changed

1 file changed

+40
-112
lines changed

‎sound/soc/mediatek/mt8183/mt8183-afe-pcm.c

Lines changed: 40 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -522,86 +522,46 @@ static bool mt8183_is_volatile_reg(struct device *dev, unsigned int reg)
522522
/* these auto-gen reg has read-only bit, so put it as volatile */
523523
/* volatile reg cannot be cached, so cannot be set when power off */
524524
switch (reg) {
525-
case AUDIO_TOP_CON0: /* reg bit controlled by CCF */
526-
case AUDIO_TOP_CON1: /* reg bit controlled by CCF */
525+
case AUDIO_TOP_CON0 ... AUDIO_TOP_CON1: /* reg bit controlled by CCF */
527526
case AUDIO_TOP_CON3:
528-
case AFE_DL1_CUR:
529-
case AFE_DL1_END:
530-
case AFE_DL2_CUR:
531-
case AFE_DL2_END:
532-
case AFE_AWB_END:
533-
case AFE_AWB_CUR:
534-
case AFE_VUL_END:
535-
case AFE_VUL_CUR:
536-
case AFE_MEMIF_MON0:
537-
case AFE_MEMIF_MON1:
538-
case AFE_MEMIF_MON2:
539-
case AFE_MEMIF_MON3:
540-
case AFE_MEMIF_MON4:
541-
case AFE_MEMIF_MON5:
542-
case AFE_MEMIF_MON6:
543-
case AFE_MEMIF_MON7:
544-
case AFE_MEMIF_MON8:
545-
case AFE_MEMIF_MON9:
546-
case AFE_ADDA_SRC_DEBUG_MON0:
547-
case AFE_ADDA_SRC_DEBUG_MON1:
548-
case AFE_ADDA_UL_SRC_MON0:
549-
case AFE_ADDA_UL_SRC_MON1:
527+
case AFE_DL1_CUR ... AFE_DL1_END:
528+
case AFE_DL2_CUR ... AFE_DL2_END:
529+
case AFE_AWB_END ... AFE_AWB_CUR:
530+
case AFE_VUL_END ... AFE_VUL_CUR:
531+
case AFE_MEMIF_MON0 ... AFE_MEMIF_MON9:
532+
case AFE_ADDA_SRC_DEBUG_MON0 ... AFE_ADDA_SRC_DEBUG_MON1:
533+
case AFE_ADDA_UL_SRC_MON0 ... AFE_ADDA_UL_SRC_MON1:
550534
case AFE_SIDETONE_MON:
551-
case AFE_SIDETONE_CON0:
552-
case AFE_SIDETONE_COEFF:
535+
case AFE_SIDETONE_CON0 ... AFE_SIDETONE_COEFF:
553536
case AFE_BUS_MON0:
554-
case AFE_MRGIF_MON0:
555-
case AFE_MRGIF_MON1:
556-
case AFE_MRGIF_MON2:
557-
case AFE_I2S_MON:
537+
case AFE_MRGIF_MON0 ... AFE_I2S_MON:
558538
case AFE_DAC_MON:
559-
case AFE_VUL2_END:
560-
case AFE_VUL2_CUR:
561-
case AFE_IRQ0_MCU_CNT_MON:
562-
case AFE_IRQ6_MCU_CNT_MON:
563-
case AFE_MOD_DAI_END:
564-
case AFE_MOD_DAI_CUR:
565-
case AFE_VUL_D2_END:
566-
case AFE_VUL_D2_CUR:
567-
case AFE_DL3_CUR:
568-
case AFE_DL3_END:
539+
case AFE_VUL2_END ... AFE_VUL2_CUR:
540+
case AFE_IRQ0_MCU_CNT_MON ... AFE_IRQ6_MCU_CNT_MON:
541+
case AFE_MOD_DAI_END ... AFE_MOD_DAI_CUR:
542+
case AFE_VUL_D2_END ... AFE_VUL_D2_CUR:
543+
case AFE_DL3_CUR ... AFE_DL3_END:
569544
case AFE_HDMI_OUT_CON0:
570-
case AFE_HDMI_OUT_CUR:
571-
case AFE_HDMI_OUT_END:
572-
case AFE_IRQ3_MCU_CNT_MON:
573-
case AFE_IRQ4_MCU_CNT_MON:
574-
case AFE_IRQ_MCU_STATUS:
575-
case AFE_IRQ_MCU_CLR:
545+
case AFE_HDMI_OUT_CUR ... AFE_HDMI_OUT_END:
546+
case AFE_IRQ3_MCU_CNT_MON... AFE_IRQ4_MCU_CNT_MON:
547+
case AFE_IRQ_MCU_STATUS ... AFE_IRQ_MCU_CLR:
576548
case AFE_IRQ_MCU_MON2:
577-
case AFE_IRQ1_MCU_CNT_MON:
578-
case AFE_IRQ2_MCU_CNT_MON:
579-
case AFE_IRQ1_MCU_EN_CNT_MON:
580-
case AFE_IRQ5_MCU_CNT_MON:
549+
case AFE_IRQ1_MCU_CNT_MON ... AFE_IRQ5_MCU_CNT_MON:
581550
case AFE_IRQ7_MCU_CNT_MON:
582551
case AFE_GAIN1_CUR:
583552
case AFE_GAIN2_CUR:
584553
case AFE_SRAM_DELSEL_CON0:
585-
case AFE_SRAM_DELSEL_CON2:
586-
case AFE_SRAM_DELSEL_CON3:
587-
case AFE_ASRC_2CH_CON12:
588-
case AFE_ASRC_2CH_CON13:
554+
case AFE_SRAM_DELSEL_CON2 ... AFE_SRAM_DELSEL_CON3:
555+
case AFE_ASRC_2CH_CON12 ... AFE_ASRC_2CH_CON13:
589556
case PCM_INTF_CON2:
590-
case FPGA_CFG0:
591-
case FPGA_CFG1:
592-
case FPGA_CFG2:
593-
case FPGA_CFG3:
594-
case AUDIO_TOP_DBG_MON0:
595-
case AUDIO_TOP_DBG_MON1:
596-
case AFE_IRQ8_MCU_CNT_MON:
597-
case AFE_IRQ11_MCU_CNT_MON:
598-
case AFE_IRQ12_MCU_CNT_MON:
557+
case FPGA_CFG0 ... FPGA_CFG1:
558+
case FPGA_CFG2 ... FPGA_CFG3:
559+
case AUDIO_TOP_DBG_MON0 ... AUDIO_TOP_DBG_MON1:
560+
case AFE_IRQ8_MCU_CNT_MON ... AFE_IRQ12_MCU_CNT_MON:
599561
case AFE_CBIP_MON0:
600-
case AFE_CBIP_SLV_MUX_MON0:
601-
case AFE_CBIP_SLV_DECODER_MON0:
562+
case AFE_CBIP_SLV_MUX_MON0 ... AFE_CBIP_SLV_DECODER_MON0:
602563
case AFE_ADDA6_SRC_DEBUG_MON0:
603-
case AFE_ADD6A_UL_SRC_MON0:
604-
case AFE_ADDA6_UL_SRC_MON1:
564+
case AFE_ADD6A_UL_SRC_MON0... AFE_ADDA6_UL_SRC_MON1:
605565
case AFE_DL1_CUR_MSB:
606566
case AFE_DL2_CUR_MSB:
607567
case AFE_AWB_CUR_MSB:
@@ -611,55 +571,23 @@ static bool mt8183_is_volatile_reg(struct device *dev, unsigned int reg)
611571
case AFE_VUL_D2_CUR_MSB:
612572
case AFE_DL3_CUR_MSB:
613573
case AFE_HDMI_OUT_CUR_MSB:
614-
case AFE_AWB2_END:
615-
case AFE_AWB2_CUR:
574+
case AFE_AWB2_END ... AFE_AWB2_CUR:
616575
case AFE_AWB2_CUR_MSB:
617-
case AFE_ADDA_DL_SDM_FIFO_MON:
618-
case AFE_ADDA_DL_SRC_LCH_MON:
619-
case AFE_ADDA_DL_SRC_RCH_MON:
620-
case AFE_ADDA_DL_SDM_OUT_MON:
621-
case AFE_CONNSYS_I2S_MON:
622-
case AFE_ASRC_2CH_CON0:
623-
case AFE_ASRC_2CH_CON2:
624-
case AFE_ASRC_2CH_CON3:
625-
case AFE_ASRC_2CH_CON4:
626-
case AFE_ASRC_2CH_CON5:
627-
case AFE_ASRC_2CH_CON7:
628-
case AFE_ASRC_2CH_CON8:
629-
case AFE_MEMIF_MON12:
630-
case AFE_MEMIF_MON13:
631-
case AFE_MEMIF_MON14:
632-
case AFE_MEMIF_MON15:
633-
case AFE_MEMIF_MON16:
634-
case AFE_MEMIF_MON17:
635-
case AFE_MEMIF_MON18:
636-
case AFE_MEMIF_MON19:
637-
case AFE_MEMIF_MON20:
638-
case AFE_MEMIF_MON21:
639-
case AFE_MEMIF_MON22:
640-
case AFE_MEMIF_MON23:
641-
case AFE_MEMIF_MON24:
642-
case AFE_ADDA_MTKAIF_MON0:
643-
case AFE_ADDA_MTKAIF_MON1:
576+
case AFE_ADDA_DL_SDM_FIFO_MON ... AFE_ADDA_DL_SDM_OUT_MON:
577+
case AFE_CONNSYS_I2S_MON ... AFE_ASRC_2CH_CON0:
578+
case AFE_ASRC_2CH_CON2 ... AFE_ASRC_2CH_CON5:
579+
case AFE_ASRC_2CH_CON7 ... AFE_ASRC_2CH_CON8:
580+
case AFE_MEMIF_MON12 ... AFE_MEMIF_MON24:
581+
case AFE_ADDA_MTKAIF_MON0 ... AFE_ADDA_MTKAIF_MON1:
644582
case AFE_AUD_PAD_TOP:
645583
case AFE_GENERAL1_ASRC_2CH_CON0:
646-
case AFE_GENERAL1_ASRC_2CH_CON2:
647-
case AFE_GENERAL1_ASRC_2CH_CON3:
648-
case AFE_GENERAL1_ASRC_2CH_CON4:
649-
case AFE_GENERAL1_ASRC_2CH_CON5:
650-
case AFE_GENERAL1_ASRC_2CH_CON7:
651-
case AFE_GENERAL1_ASRC_2CH_CON8:
652-
case AFE_GENERAL1_ASRC_2CH_CON12:
653-
case AFE_GENERAL1_ASRC_2CH_CON13:
584+
case AFE_GENERAL1_ASRC_2CH_CON2 ... AFE_GENERAL1_ASRC_2CH_CON5:
585+
case AFE_GENERAL1_ASRC_2CH_CON7 ... AFE_GENERAL1_ASRC_2CH_CON8:
586+
case AFE_GENERAL1_ASRC_2CH_CON12 ... AFE_GENERAL1_ASRC_2CH_CON13:
654587
case AFE_GENERAL2_ASRC_2CH_CON0:
655-
case AFE_GENERAL2_ASRC_2CH_CON2:
656-
case AFE_GENERAL2_ASRC_2CH_CON3:
657-
case AFE_GENERAL2_ASRC_2CH_CON4:
658-
case AFE_GENERAL2_ASRC_2CH_CON5:
659-
case AFE_GENERAL2_ASRC_2CH_CON7:
660-
case AFE_GENERAL2_ASRC_2CH_CON8:
661-
case AFE_GENERAL2_ASRC_2CH_CON12:
662-
case AFE_GENERAL2_ASRC_2CH_CON13:
588+
case AFE_GENERAL2_ASRC_2CH_CON2 ... AFE_GENERAL2_ASRC_2CH_CON5:
589+
case AFE_GENERAL2_ASRC_2CH_CON7 ... AFE_GENERAL2_ASRC_2CH_CON8:
590+
case AFE_GENERAL2_ASRC_2CH_CON12 ... AFE_GENERAL2_ASRC_2CH_CON13:
663591
return true;
664592
default:
665593
return false;

0 commit comments

Comments
 (0)