ASoC: fsl: Fix lockups with recent cache changes
Subsystems (3)
Mark Brown
maintainerPATCH 1/1 ASoC: fsl: Fix lockups with recent cache changes
The recent series of changes to the caching in the SSI driver have caused a number of problems to appear in some test systems. These are still not fully understood but we're coming up to the merge window so for now let's revert commit 7de2763d9b3 (ASoC: fsl_ssi: Remove .num_reg_defaults_raw from regmap_config) as backing that out seems to resolve the problem on affected systems.
--- sound/soc/fsl/fsl_ssi.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/fsl/fsl_ssi.c +3 -0
@@ -177,6 +177,7 @@ static const struct regmap_config fsl_ssi_regconfig = { .val_bits = 32, .reg_stride = 4, .val_format_endian = REGMAP_ENDIAN_NATIVE, + .num_reg_defaults_raw = CCSR_SSI_SACCDIS / sizeof(uint32_t) + 1, .readable_reg = fsl_ssi_readable_reg, .volatile_reg = fsl_ssi_volatile_reg, .precious_reg = fsl_ssi_precious_reg,
@@ -1500,6 +1501,8 @@ static int fsl_ssi_probe(struct platform_device *pdev)* don't have SACC{ST,EN,DIS} regs. */ regconfig.max_register =CCSR_SSI_SRMSK ; + regconfig.num_reg_defaults_raw = +CCSR_SSI_SRMSK /sizeof (uint32_t ) +1 ; } ret =of_property_match_string (np,"clock-names" ,"ipg" );
Signature · 1 line
2.9.3
Quoted 10 lines · Mark Brown
The recent series of changes to the caching in the SSI driver have caused a number of problems to appear in some test systems. These are still not fully understood but we're coming up to the merge window so for now let's revert commit
7de2763d9b3(ASoC:fsl_ssi: Remove .num_reg_defaults_raw fromregmap_config) as backing that out seems to resolve the problem on affected systems.Reported-by Maciej S. Szmigiero" <[email protected]>Signed-off-by Mark Brown <[email protected]>Cc Marek Vasut <[email protected]>
I'll keep my eyes peeled for the issue, thanks for all the time you and Lars invested.
Quoted 26 lines
--- sound/soc/fsl/fsl_ssi.c | 3 +++ 1 file changed, 3 insertions(+)sound/soc/fsl/fsl_ssi.c +3
-0@@ -177,6 +177,7 @@ static const struct regmap_config fsl_ssi_regconfig = { .val_bits = 32, .reg_stride = 4, .val_format_endian = REGMAP_ENDIAN_NATIVE, + .num_reg_defaults_raw = CCSR_SSI_SACCDIS / sizeof(uint32_t) + 1, .readable_reg = fsl_ssi_readable_reg, .volatile_reg = fsl_ssi_volatile_reg, .precious_reg = fsl_ssi_precious_reg,@@ -1500,6 +1501,8 @@ static int fsl_ssi_probe(struct platform_device *pdev)* don't have SACC{ST,EN,DIS} regs. */ regconfig.max_register =CCSR_SSI_SRMSK ; + regconfig.num_reg_defaults_raw = +CCSR_SSI_SRMSK /sizeof (uint32_t ) +1 ; } ret =of_property_match_string (np,"clock-names" ,"ipg" );
Signature · 2 lines
Best regards, Marek Vasut