From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM autolearn=unavailable autolearn_force=no version=3.4.1 X-Yandex-Fwd: 2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1653064203; bh=ZK5rb4mwsg0frwMV2cETnNuPGrO3HXk8kq48UYHPZRc=; h=Reply-To:In-Reply-To:References:Date:Subject:Cc:To:From: Message-Id; b=BzclKdl0Qo42AhjAS1braCmX6TRRojmGCMpRS64XoxBQUVt1JlK1f9lQ6wp6rjvJo BvBVdhpFnnZr2PwizFftPsbFN40LcNuL4FpBFumuEcgfvlYYc4HptAuoXcBl4tugE+ +FhqhHFX8vTAeSkV+LP9vVoh67Rmybinvki3rj3c= Authentication-Results: sas2-c5dc729a3184.qloud-c.yandex.net; dkim=pass header.i=@yandex.ru From: asheplyakov@yandex.ru To: devel@lists.altlinux.org Date: Fri, 20 May 2022 20:28:39 +0400 Message-Id: <20220520162849.1554351-26-asheplyakov@yandex.ru> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220520162849.1554351-1-asheplyakov@yandex.ru> References: <20220520162849.1554351-1-asheplyakov@yandex.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Cc: Vitaly Chikunov , Igor Chudov , Alexey Sheplyakov , Evgeny Sinelnikov Subject: [devel] [PATCH 25/35] (BROKEN) dwc-i2s: support Baikal-M SoC X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 May 2022 16:30:19 -0000 Archived-At: List-Archive: List-Post: From: Alexey Sheplyakov * dw_i2s_probe: request all IRQs specified in device tree * i2s_irq_handler: avoid flooding system with RX overrun warnings Note that the sound frequency is distorted (i.e. playing 440 Hz sine wave results in 467 Hz) X-feature-Baikal-M --- sound/soc/dwc/dwc-i2s.c | 36 ++++++++++++++++++++++++++---------- sound/soc/dwc/local.h | 1 + 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c index 1edac3e10f34..8503712014c4 100644 --- a/sound/soc/dwc/dwc-i2s.c +++ b/sound/soc/dwc/dwc-i2s.c @@ -100,6 +100,7 @@ static inline void i2s_enable_irqs(struct dw_i2s_dev *dev, u32 stream, static irqreturn_t i2s_irq_handler(int irq, void *dev_id) { + unsigned int rxor_count; struct dw_i2s_dev *dev = dev_id; bool irq_valid = false; u32 isr[4]; @@ -136,9 +137,13 @@ static irqreturn_t i2s_irq_handler(int irq, void *dev_id) irq_valid = true; } - /* Error Handling: TX */ + /* Error Handling: RX */ if (isr[i] & ISR_RXFO) { - dev_err(dev->dev, "RX overrun (ch_id=%d)\n", i); + rxor_count = READ_ONCE(dev->rx_overrun_count); + if (!(rxor_count & 0x3ff)) + dev_dbg(dev->dev, "RX overrun (ch_id=%d)\n", i); + rxor_count++; + WRITE_ONCE(dev->rx_overrun_count, rxor_count); irq_valid = true; } } @@ -629,7 +634,8 @@ static int dw_i2s_probe(struct platform_device *pdev) const struct i2s_platform_data *pdata = pdev->dev.platform_data; struct dw_i2s_dev *dev; struct resource *res; - int ret, irq; + int ret, irq, irq_count; + unsigned idx; struct snd_soc_dai_driver *dw_i2s_dai; const char *clk_id; @@ -649,13 +655,23 @@ static int dw_i2s_probe(struct platform_device *pdev) dev->dev = &pdev->dev; - irq = platform_get_irq_optional(pdev, 0); - if (irq >= 0) { - ret = devm_request_irq(&pdev->dev, irq, i2s_irq_handler, 0, - pdev->name, dev); - if (ret < 0) { - dev_err(&pdev->dev, "failed to request irq\n"); - return ret; + irq_count = platform_irq_count(pdev); + if (irq_count < 0) /* - EPROBE_DEFER */ + return irq_count; + else if (!irq_count) { + dev_err(&pdev->dev, "no IRQs found for device\n"); + return -ENODEV; + } + + for (idx = 0; idx < (unsigned)irq_count; idx++) { + irq = platform_get_irq_optional(pdev, idx); + if (irq >= 0) { + ret = devm_request_irq(&pdev->dev, irq, i2s_irq_handler, 0, + pdev->name, dev); + if (ret < 0) { + dev_err(&pdev->dev, "failed to request irq\n"); + return ret; + } } } diff --git a/sound/soc/dwc/local.h b/sound/soc/dwc/local.h index 1c361eb6127e..1d6b6fd870ca 100644 --- a/sound/soc/dwc/local.h +++ b/sound/soc/dwc/local.h @@ -117,6 +117,7 @@ struct dw_i2s_dev { bool *period_elapsed); unsigned int tx_ptr; unsigned int rx_ptr; + unsigned int rx_overrun_count; }; #if IS_ENABLED(CONFIG_SND_DESIGNWARE_PCM) -- 2.32.0