From patchwork Wed Jul 27 09:08:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 12930248 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 00D6BC04A68 for ; Wed, 27 Jul 2022 09:07:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=SBV/w/lizqndfEN3ssWYhRnhEJaD5kgoU2K40en3/jE=; b=bAdRmWV3V42O/S K3erzIZTHQbxK3KR4VmTQ0QyfnIXAdO5seN/bE9c+oPnjHsEWZdWWLTx0iLrg34N7ozHQLYEb852X Fvy7tioVP6/UX7z6HJpIv6bQRA3BYit5S9DiKKpITsZoEy2YOy+qdCrZNTpJoT3d2h4wfNH2NxJUE 7qCKlVFLAiMxjMDjEASHncU+iYwJSH6PabsnMVifq1e1R2Yf7qZC7qnfuHFWJspGlOMVHwHrl/l79 nISEBWEoxO39NeyoPGKzArpk2Novj+stsJCfBMelPumgAYXPaH/51YJqPl//lx4diffIrcxhPA8TX UfoG1jqeQ4c83iNox4hQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oGd05-00BYCq-UL; Wed, 27 Jul 2022 09:06:42 +0000 Received: from esa.microchip.iphmx.com ([68.232.153.233]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oGczO-00BXfV-Fl for linux-arm-kernel@lists.infradead.org; Wed, 27 Jul 2022 09:06:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1658912758; x=1690448758; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NVXOybPJqEwP6MHqK15Tsb+Wcp2uLtsdOnoZ40Pv0zw=; b=NSDWa4tIyx/JoaO60iOsrMxJ8paatSh2ZbxmYv3lQ6oMIPV9x87xPByz FKUEuP56El2nmAbrHjzDBies8svf/K6OCOzM77omCTROEumYkIStl+KLU ePGZHxtPN4dMl3ra9truQXTNd9aU3otkhljBThm5wKsfLNC/ojRuX2fOi DglHIgEsdcVfbIKItkgBFESvMQj7v0sKTYx7Gv47BYgPeVCNhV7HocOEB YITaoVnDcnRIhljFvJ2fJvYiMhxaQSYh9UUFmPf8j2S1+DTfxEnk2YvMv 5uJ14SIlkSsjaUKuMFbzwKnW/sewbw2Pr161UNWqf993lzQIIBKQ4waHH Q==; X-IronPort-AV: E=Sophos;i="5.93,195,1654585200"; d="scan'208";a="183930488" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa1.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 27 Jul 2022 02:05:54 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Wed, 27 Jul 2022 02:05:53 -0700 Received: from localhost.localdomain (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2375.17 via Frontend Transport; Wed, 27 Jul 2022 02:05:51 -0700 From: Claudiu Beznea To: , , , , , CC: , , , Claudiu Beznea Subject: [PATCH v3 1/2] ASoC: mchp-spdifrx: disable end of block interrupt on failures Date: Wed, 27 Jul 2022 12:08:13 +0300 Message-ID: <20220727090814.2446111-2-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220727090814.2446111-1-claudiu.beznea@microchip.com> References: <20220727090814.2446111-1-claudiu.beznea@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220727_020558_572348_E31F77BF X-CRM114-Status: GOOD ( 12.12 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Disable end of block interrupt in case of wait for completion timeout or errors to undo previously enable operation (done in mchp_spdifrx_isr_blockend_en()). Otherwise we can end up with an unbalanced reference counter for this interrupt. Fixes: ef265c55c1ac ("ASoC: mchp-spdifrx: add driver for SPDIF RX") Signed-off-by: Claudiu Beznea --- sound/soc/atmel/mchp-spdifrx.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sound/soc/atmel/mchp-spdifrx.c b/sound/soc/atmel/mchp-spdifrx.c index 85d1d92a21db..ec0705cc40fa 100644 --- a/sound/soc/atmel/mchp-spdifrx.c +++ b/sound/soc/atmel/mchp-spdifrx.c @@ -288,15 +288,17 @@ static void mchp_spdifrx_isr_blockend_en(struct mchp_spdifrx_dev *dev) spin_unlock_irqrestore(&dev->blockend_lock, flags); } -/* called from atomic context only */ +/* called from atomic/non-atomic context */ static void mchp_spdifrx_isr_blockend_dis(struct mchp_spdifrx_dev *dev) { - spin_lock(&dev->blockend_lock); + unsigned long flags; + + spin_lock_irqsave(&dev->blockend_lock, flags); dev->blockend_refcount--; /* don't enable BLOCKEND interrupt if it's already enabled */ if (dev->blockend_refcount == 0) regmap_write(dev->regmap, SPDIFRX_IDR, SPDIFRX_IR_BLOCKEND); - spin_unlock(&dev->blockend_lock); + spin_unlock_irqrestore(&dev->blockend_lock, flags); } static irqreturn_t mchp_spdif_interrupt(int irq, void *dev_id) @@ -575,6 +577,7 @@ static int mchp_spdifrx_subcode_ch_get(struct mchp_spdifrx_dev *dev, if (ret <= 0) { dev_dbg(dev->dev, "user data for channel %d timeout\n", channel); + mchp_spdifrx_isr_blockend_dis(dev); return ret; } From patchwork Wed Jul 27 09:08:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudiu Beznea X-Patchwork-Id: 12930247 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1B1E0C19F29 for ; Wed, 27 Jul 2022 09:07:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ibVoF3LF0S/TXWQWhkdzGc/EGcr1hE3z6yJ28oBbqsw=; b=xkHZHAeXQHOtBj MJBIaBcSt1yKA94G66S4rcVOtpZgICTvwqROx4RtTqiAIt4MNwgAAWt/Q273RKYdNDfk8Ir/tRPKE W09M/Q+9c9l57daueC5Mbtz6L1ILTlabd/ogQDgnxJhduAojzBgTY6bkMRbmN/NhroEp+IxUp5qNC bl128FN1rYz/O9XifBwln9dS+9+ssNnMZPHx3PgOwMMz4rMD/h96rGnEji3Yjp1GCyeFL0VjXOOrC 7qvyGo750y/1YT4NT7gVwaRoHU/TQouV/pONYLSS2h4Nakt/4iNPFV6Psqf+EgfEQ/N1abymGFtlW Xmk4eJKO+DLwSCJi7Mhw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oGczl-00BXwc-7I; Wed, 27 Jul 2022 09:06:21 +0000 Received: from esa.microchip.iphmx.com ([68.232.154.123]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oGczN-00BXhI-TT for linux-arm-kernel@lists.infradead.org; Wed, 27 Jul 2022 09:05:59 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1658912757; x=1690448757; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CIUopwxdZIlwqjXMsHY6dSEUUehkgUCOaiTv2Ru/m5M=; b=Xn+4mlvMguuQUXijWrHjsZSnnvXbR57GoS/g/+E6R7o3w0+ZmZ5Ozo9v fMo2Wlqkz6ktxAtaanfHhhvXpztqFWsRVYTw6Ox2NJXezXTYQtG+HN9eV Q2OizPhtN1DZs3ydwEvo4fdEvq1CoUj9NWdQ/HtQMcuOGH+8YEKi+igdl +fVzlWUdIJLl+SmuH5rgTR2cyW+wXKffhOdKUMpml1cHumCX8qzg39k8b mSByFyA8QXokn+l1YZidGBnrJUMOsmCCR7kxwddo4YqlHElZ5a/Fpg7Qd U2R2vz5y+EOO2gCRM9im8zgRRGbAFi6Un8xh2D0NGoEKSwUnt9wIlds6G w==; X-IronPort-AV: E=Sophos;i="5.93,195,1654585200"; d="scan'208";a="169710970" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa2.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 27 Jul 2022 02:05:56 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Wed, 27 Jul 2022 02:05:56 -0700 Received: from localhost.localdomain (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2375.17 via Frontend Transport; Wed, 27 Jul 2022 02:05:54 -0700 From: Claudiu Beznea To: , , , , , CC: , , , Claudiu Beznea Subject: [PATCH v3 2/2] ASoC: mchp-spdiftx: remove references to mchp_i2s_caps Date: Wed, 27 Jul 2022 12:08:14 +0300 Message-ID: <20220727090814.2446111-3-claudiu.beznea@microchip.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220727090814.2446111-1-claudiu.beznea@microchip.com> References: <20220727090814.2446111-1-claudiu.beznea@microchip.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220727_020558_047281_84ACE2BC X-CRM114-Status: GOOD ( 10.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Remove references to struct mchp_i2s_caps as they are not used. Signed-off-by: Claudiu Beznea --- sound/soc/atmel/mchp-spdiftx.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sound/soc/atmel/mchp-spdiftx.c b/sound/soc/atmel/mchp-spdiftx.c index cb4d0140dfe0..4850a177803d 100644 --- a/sound/soc/atmel/mchp-spdiftx.c +++ b/sound/soc/atmel/mchp-spdiftx.c @@ -196,7 +196,6 @@ struct mchp_spdiftx_dev { struct clk *pclk; struct clk *gclk; unsigned int fmt; - const struct mchp_i2s_caps *caps; int gclk_enabled:1; }; @@ -765,8 +764,6 @@ MODULE_DEVICE_TABLE(of, mchp_spdiftx_dt_ids); static int mchp_spdiftx_probe(struct platform_device *pdev) { - struct device_node *np = pdev->dev.of_node; - const struct of_device_id *match; struct mchp_spdiftx_dev *dev; struct resource *mem; struct regmap *regmap; @@ -780,11 +777,6 @@ static int mchp_spdiftx_probe(struct platform_device *pdev) if (!dev) return -ENOMEM; - /* Get hardware capabilities. */ - match = of_match_node(mchp_spdiftx_dt_ids, np); - if (match) - dev->caps = match->data; - /* Map I/O registers. */ base = devm_platform_get_and_ioremap_resource(pdev, 0, &mem); if (IS_ERR(base))