| Message ID | 20180831182434.14499-2-afd@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] ASoC: tlv320aic31xx: Add short circuit detection support | expand |
On Fri, Aug 31, 2018 at 01:24:32PM -0500, Andrew F. Davis wrote: > Similar to short circuit detection, when the ADC/DAC is saturated and > overflows poor audio quality can result and should be reported to the > user. This device support Automatic Dynamic Range Compression (DRC) > to reduce this but it is not enabled currently in this driver. > + if (value & AIC31XX_DAC_OF_LEFT) > + dev_err(dev, "Left-channel DAC overflow has occurred\n"); > + if (value & AIC31XX_DAC_OF_RIGHT) > + dev_err(dev, "Right-channel DAC overflow has occurred\n"); So, this will sound terrible but I'm not sure that unconditionally shouting in the logs is the right thing to do here - people do sometimes put non-audio signals through sound cards (using them as generic DACs and ADCs) and it seems like it could get very spammy. Perhaps a lower level warning message, some counters or even some control that allows the warnings to be masked.
On 09/03/2018 08:03 AM, Mark Brown wrote: > On Fri, Aug 31, 2018 at 01:24:32PM -0500, Andrew F. Davis wrote: >> Similar to short circuit detection, when the ADC/DAC is saturated and >> overflows poor audio quality can result and should be reported to the >> user. This device support Automatic Dynamic Range Compression (DRC) >> to reduce this but it is not enabled currently in this driver. > >> + if (value & AIC31XX_DAC_OF_LEFT) >> + dev_err(dev, "Left-channel DAC overflow has occurred\n"); >> + if (value & AIC31XX_DAC_OF_RIGHT) >> + dev_err(dev, "Right-channel DAC overflow has occurred\n"); > > So, this will sound terrible but I'm not sure that unconditionally > shouting in the logs is the right thing to do here - people do sometimes > put non-audio signals through sound cards (using them as generic DACs > and ADCs) and it seems like it could get very spammy. Perhaps a lower > level warning message, some counters or even some control that allows > the warnings to be masked. > As these events do not stop the function of the sound card, I agree warnings would be more appropriate than errors, I'll make that change. Andrew
diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index d8783af7d31c..c49f6796b086 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -1356,7 +1356,7 @@ static irqreturn_t aic31xx_irq(int irq, void *data) if (value) handled = true; else - goto exit; + goto read_overflow; if (value & AIC31XX_HPLSCDETECT) dev_err(dev, "Short circuit on Left output is detected\n"); @@ -1366,6 +1366,35 @@ static irqreturn_t aic31xx_irq(int irq, void *data) AIC31XX_HPRSCDETECT)) dev_err(dev, "Unknown DAC interrupt flags: 0x%08x\n", value); +read_overflow: + ret = regmap_read(aic31xx->regmap, AIC31XX_OFFLAG, &value); + if (ret) { + dev_err(dev, "Failed to read overflow flag: %d\n", ret); + goto exit; + } + + if (value) + handled = true; + else + goto exit; + + if (value & AIC31XX_DAC_OF_LEFT) + dev_err(dev, "Left-channel DAC overflow has occurred\n"); + if (value & AIC31XX_DAC_OF_RIGHT) + dev_err(dev, "Right-channel DAC overflow has occurred\n"); + if (value & AIC31XX_DAC_OF_SHIFTER) + dev_err(dev, "DAC barrel shifter overflow has occurred\n"); + if (value & AIC31XX_ADC_OF) + dev_err(dev, "ADC overflow has occurred\n"); + if (value & AIC31XX_ADC_OF_SHIFTER) + dev_err(dev, "ADC barrel shifter overflow has occurred\n"); + if (value & ~(AIC31XX_DAC_OF_LEFT | + AIC31XX_DAC_OF_RIGHT | + AIC31XX_DAC_OF_SHIFTER | + AIC31XX_ADC_OF | + AIC31XX_ADC_OF_SHIFTER)) + dev_err(dev, "Unknown overflow interrupt flags: 0x%08x\n", value); + exit: if (handled) return IRQ_HANDLED; @@ -1447,7 +1476,8 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c, AIC31XX_GPIO1_FUNC_SHIFT); regmap_write(aic31xx->regmap, AIC31XX_INT1CTRL, - AIC31XX_SC); + AIC31XX_SC | + AIC31XX_ENGINE); ret = devm_request_threaded_irq(aic31xx->dev, aic31xx->irq, NULL, aic31xx_irq, diff --git a/sound/soc/codecs/tlv320aic31xx.h b/sound/soc/codecs/tlv320aic31xx.h index 52e171988906..2636f2c6bc79 100644 --- a/sound/soc/codecs/tlv320aic31xx.h +++ b/sound/soc/codecs/tlv320aic31xx.h @@ -173,6 +173,13 @@ struct aic31xx_pdata { #define AIC31XX_HPRDRVPWRSTATUS_MASK BIT(1) #define AIC31XX_SPRDRVPWRSTATUS_MASK BIT(0) +/* AIC31XX_OFFLAG */ +#define AIC31XX_DAC_OF_LEFT BIT(7) +#define AIC31XX_DAC_OF_RIGHT BIT(6) +#define AIC31XX_DAC_OF_SHIFTER BIT(5) +#define AIC31XX_ADC_OF BIT(3) +#define AIC31XX_ADC_OF_SHIFTER BIT(1) + /* AIC31XX_INTRDACFLAG */ #define AIC31XX_HPLSCDETECT BIT(7) #define AIC31XX_HPRSCDETECT BIT(6)
Similar to short circuit detection, when the ADC/DAC is saturated and overflows poor audio quality can result and should be reported to the user. This device support Automatic Dynamic Range Compression (DRC) to reduce this but it is not enabled currently in this driver. Signed-off-by: Andrew F. Davis <afd@ti.com> --- sound/soc/codecs/tlv320aic31xx.c | 34 ++++++++++++++++++++++++++++++-- sound/soc/codecs/tlv320aic31xx.h | 7 +++++++ 2 files changed, 39 insertions(+), 2 deletions(-)