From patchwork Fri Feb 24 15:33:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_Povi=C5=A1er?= X-Patchwork-Id: 61376 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp983070wrd; Fri, 24 Feb 2023 07:45:39 -0800 (PST) X-Google-Smtp-Source: AK7set8dQKzowoY+HqeqyfPPjQpXViuvQdRMwpTCa89wsG7buB/akgXPuJLTKsfuJBFXMLIGt678 X-Received: by 2002:a17:903:2441:b0:196:5bac:e319 with SMTP id l1-20020a170903244100b001965bace319mr19089874pls.35.1677253538903; Fri, 24 Feb 2023 07:45:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677253538; cv=none; d=google.com; s=arc-20160816; b=DQ0F70KMnAIbSYWdWyfasS2gh1bTdVDcJndkEgvLmEKjrHUi31P372YArrjyls5yS0 xe97OlITPLX0Uin6KgjHWs5s88CgBx3tNR83e99gnkJE67hxpqK2q5p5eDwypZTt3269 QuqdQOMV+P1rzdgGKAzDTpYRNwx3s1avz3gVLqTXQfgaIW0SqDVdrODTzG1jjm+dN0GD xZkzHnW2sRR+dogjEM+39cPl6h7Ejx4OBNuKeNh9LYps6GRXkG/V4Z7fH5BXJ9KQ7yYL ulfU0wYncC9P6NRyBqAsWbhfSTqXO8UG77lqIPDI/BzZ/sPFoR6ZuZE01Fb8r19rQy84 CgZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:dkim-signature:from; bh=FNC6kTd6Z6n+zN6leJIOos4elgBgrZXAAOuIqFvhYUs=; b=GhiJ1IU9zZbWdQIsuAHugnA75MmDRKPpwsglu7tvsYFPywZqqyBi8lZJ84T5c2bQ9B PQdvZMgd+d5u1Ls1pUR4bDl8mOBPdwDbmXqGPGTFGljDSclh5KDwAU7MZ90JtL5JJ1tG Lv7nwPL858TQIrlgk9N2e2x9Ry57BUivJleIKnfp+1x0ELrFVx0A3BeqsenbMZ4KNcyG 5FhT1DFXTWGi/TkovQXKtXgwv01p7UIefwhiEom0ROxI8ceWRp7oIhh6ovQHz3VTDBzh Py+5XxPZUESM/Xc/lMAafZI/9kRNHEIP3epFcvrDv91QhimXunXe8dhFJ/L3NdwewFlB anOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cutebit.org header.s=mail header.b="kH/TERxB"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cutebit.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q18-20020a170902bd9200b0019ad22c40c7si4685515pls.132.2023.02.24.07.45.26; Fri, 24 Feb 2023 07:45:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@cutebit.org header.s=mail header.b="kH/TERxB"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cutebit.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229637AbjBXPdW (ORCPT + 99 others); Fri, 24 Feb 2023 10:33:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58334 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229817AbjBXPdU (ORCPT ); Fri, 24 Feb 2023 10:33:20 -0500 Received: from hutie.ust.cz (unknown [IPv6:2a03:3b40:fe:f0::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56A9015882 for ; Fri, 24 Feb 2023 07:33:17 -0800 (PST) From: =?utf-8?q?Martin_Povi=C5=A1er?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cutebit.org; s=mail; t=1677252795; bh=FNC6kTd6Z6n+zN6leJIOos4elgBgrZXAAOuIqFvhYUs=; h=From:To:Cc:Subject:Date; b=kH/TERxBETkz5SQRy/I6aJG4HrBNKpNvVhyYy2/SApa1r7qVGO8CKPOi0NtrKdgdK qVcyGffZTorEc3HsQWZnLIZDqdFj8fluDyIPvtHzD+pK8ZtIxw45SPqFmKyuJEM5pn R/chzDUc7u81R+uFsei6GAZT4kAD214iYUwJ8eRU= To: =?utf-8?q?Martin_Povi=C5=A1er?= , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Cc: asahi@lists.linux.dev, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] ASoC: apple: mca: Fix final status read on SERDES reset Date: Fri, 24 Feb 2023 16:33:00 +0100 Message-Id: <20230224153302.45365-1-povik+lin@cutebit.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_FAIL,SPF_HELO_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758727806979542095?= X-GMAIL-MSGID: =?utf-8?q?1758727806979542095?= From within the early trigger we are doing a reset of the SERDES unit, but the final status read is on a bad address. Add the missing SERDES unit offset in calculation of the address. Fixes: 3df5d0d97289 ("ASoC: apple: mca: Start new platform driver") Signed-off-by: Martin Povišer --- sound/soc/apple/mca.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/apple/mca.c b/sound/soc/apple/mca.c index 24381c42eb54..9cceeb259952 100644 --- a/sound/soc/apple/mca.c +++ b/sound/soc/apple/mca.c @@ -210,7 +210,7 @@ static void mca_fe_early_trigger(struct snd_pcm_substream *substream, int cmd, SERDES_CONF_SOME_RST); readl_relaxed(cl->base + serdes_conf); mca_modify(cl, serdes_conf, SERDES_STATUS_RST, 0); - WARN_ON(readl_relaxed(cl->base + REG_SERDES_STATUS) & + WARN_ON(readl_relaxed(cl->base + serdes_unit + REG_SERDES_STATUS) & SERDES_STATUS_RST); break; default: From patchwork Fri Feb 24 15:33:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_Povi=C5=A1er?= X-Patchwork-Id: 61378 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp983093wrd; Fri, 24 Feb 2023 07:45:41 -0800 (PST) X-Google-Smtp-Source: AK7set/Q33V4KUosYtPOl/LnOaSM6si1pSbG+Z5/vApPA5UdfJGSFoCbe9FPVCgHx5C2RINfEiHv X-Received: by 2002:a17:902:f690:b0:19a:80e6:2a1d with SMTP id l16-20020a170902f69000b0019a80e62a1dmr18818714plg.41.1677253541290; Fri, 24 Feb 2023 07:45:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677253541; cv=none; d=google.com; s=arc-20160816; b=evAGm/6O85GOjdrLQntzRR2xUegvUAJeZjDTzuI+4q9gudz9KE7C/l7lNOQCTuAiVo nKnq8qMo/bmM8rUDyXXfvbKawGZC+Nl6GBdhNx3SdfPjPVgIczjGmuNCsVTkoUfTaHq/ dXGoab1zxez9+Vse0kDgSSiIPFuFNpanWRxUd5REBmSMydQqrte548cX/KqNRZwzRy+F zqDLk8UlAkqkWYXw3HftBftj+YsQu4AxzvdaqysCe5LevAkiXiA/z2n6akHMxcWv/HVO +nDLXJbe+jwTEktdpGKUqv4a9CBX9YFG7TnWD9hb4GPJg4NmI4UJsKlfTeqS3vJYA/yv 8Y8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:dkim-signature :from; bh=+kyfNHJb1YUWgssduOtt+KjIRL6xvmqOGLr82KEtgl8=; b=Y3FhN6MiIxXdv9LvID8v5F4eQFtXq+z/H2ORPUJG+R80Quub9J8MrgxEiFQ96VSH7h 0ENAmZ9dWsZKtnKyPQLktIU36+JHOpA+nQK9s5AY1vWTryH3rTpZXoM0+SbrSUdh/P8h Uvd05AtsGjWOLm3P8sMVlTrjPxbbDykroLy5fvkR1+lOHxZPPLXsDYb59OJC7Oi9A1Sd 72IoyGNPsefTI6PuG+bjFyzgGsAjq74ET3Wwy73Who32+9oq+kW74joFoDSVqbN/Pyy/ 1EOjiI5Ll9Z2jNa7i+9DZohel8BuaZil8Qet6lAFCBR+v9QC44K74pLa//Qd3qBufnHm Mn0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cutebit.org header.s=mail header.b=GWnPLTv6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cutebit.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a1-20020a1709027e4100b0019ad7bad651si17561394pln.4.2023.02.24.07.45.29; Fri, 24 Feb 2023 07:45:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@cutebit.org header.s=mail header.b=GWnPLTv6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cutebit.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230259AbjBXPd0 (ORCPT + 99 others); Fri, 24 Feb 2023 10:33:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229883AbjBXPdV (ORCPT ); Fri, 24 Feb 2023 10:33:21 -0500 Received: from hutie.ust.cz (unknown [IPv6:2a03:3b40:fe:f0::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8ABC9193F0 for ; Fri, 24 Feb 2023 07:33:17 -0800 (PST) From: =?utf-8?q?Martin_Povi=C5=A1er?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cutebit.org; s=mail; t=1677252795; bh=+kyfNHJb1YUWgssduOtt+KjIRL6xvmqOGLr82KEtgl8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GWnPLTv6eKrOX4bcSNlgD9Mb7givR36pFAi7Gfi9KoVsZN70u7rXMBFrRzGOPVMwr jiceOeT+ToeMqjK1nGqWPppC36U+e9WjwjaoqY+A34rKdKjgkQcdU6/IrG25pJy6yr 4C8AjVoSeljoGitTwMFFiwThJXThpbDnVlzjZfW4= To: =?utf-8?q?Martin_Povi=C5=A1er?= , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Cc: asahi@lists.linux.dev, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] ASoC: apple: mca: Fix SERDES reset sequence Date: Fri, 24 Feb 2023 16:33:01 +0100 Message-Id: <20230224153302.45365-2-povik+lin@cutebit.org> In-Reply-To: <20230224153302.45365-1-povik+lin@cutebit.org> References: <20230224153302.45365-1-povik+lin@cutebit.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_FAIL,SPF_HELO_NONE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758727809278180788?= X-GMAIL-MSGID: =?utf-8?q?1758727809278180788?= Fix the reset sequence of reads and writes that we invoke from within the early trigger. It looks like there never was a SERDES_CONF_SOME_RST bit that should be involved in the reset sequence, and its presence in the driver code is a mistake from earlier. Instead, the reset sequence should go as follows: We should switch the the SERDES unit's SYNC_SEL mux to the value of 7 (so outside the range of 1...6 representing cluster's SYNCGEN units), then raise the RST bit in SERDES_STATUS and wait for it to clear. Properly resetting the SERDES unit fixes frame desynchronization hazard in case of long frames (longer than 4 used slots). The desynchronization manifests itself by rotating the PCM channels. Fixes: 3df5d0d97289 ("ASoC: apple: mca: Start new platform driver") Signed-off-by: Martin Povišer --- sound/soc/apple/mca.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/sound/soc/apple/mca.c b/sound/soc/apple/mca.c index 9cceeb259952..aea08c7b2ee8 100644 --- a/sound/soc/apple/mca.c +++ b/sound/soc/apple/mca.c @@ -101,7 +101,6 @@ #define SERDES_CONF_UNK3 BIT(14) #define SERDES_CONF_NO_DATA_FEEDBACK BIT(15) #define SERDES_CONF_SYNC_SEL GENMASK(18, 16) -#define SERDES_CONF_SOME_RST BIT(19) #define REG_TX_SERDES_BITSTART 0x08 #define REG_RX_SERDES_BITSTART 0x0c #define REG_TX_SERDES_SLOTMASK 0x0c @@ -203,15 +202,24 @@ static void mca_fe_early_trigger(struct snd_pcm_substream *substream, int cmd, case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + mca_modify(cl, serdes_conf, SERDES_CONF_SYNC_SEL, + FIELD_PREP(SERDES_CONF_SYNC_SEL, 0)); + mca_modify(cl, serdes_conf, SERDES_CONF_SYNC_SEL, + FIELD_PREP(SERDES_CONF_SYNC_SEL, 7)); mca_modify(cl, serdes_unit + REG_SERDES_STATUS, SERDES_STATUS_EN | SERDES_STATUS_RST, SERDES_STATUS_RST); - mca_modify(cl, serdes_conf, SERDES_CONF_SOME_RST, - SERDES_CONF_SOME_RST); - readl_relaxed(cl->base + serdes_conf); - mca_modify(cl, serdes_conf, SERDES_STATUS_RST, 0); + /* + * Experiments suggest that it takes at most ~1 us + * for the bit to clear, so wait 2 us for good measure. + */ + udelay(2); WARN_ON(readl_relaxed(cl->base + serdes_unit + REG_SERDES_STATUS) & SERDES_STATUS_RST); + mca_modify(cl, serdes_conf, SERDES_CONF_SYNC_SEL, + FIELD_PREP(SERDES_CONF_SYNC_SEL, 0)); + mca_modify(cl, serdes_conf, SERDES_CONF_SYNC_SEL, + FIELD_PREP(SERDES_CONF_SYNC_SEL, cl->no + 1)); break; default: break; From patchwork Fri Feb 24 15:33:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_Povi=C5=A1er?= X-Patchwork-Id: 61377 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp983084wrd; Fri, 24 Feb 2023 07:45:40 -0800 (PST) X-Google-Smtp-Source: AK7set+ZqxCJUf5YmiHAGPUaJOvrGkeGG9IF7S4LJwN4Coe6wWn37S4D7XpopKtiLxy875zUer+t X-Received: by 2002:a17:902:eccc:b0:19b:3549:53fc with SMTP id a12-20020a170902eccc00b0019b354953fcmr18326056plh.27.1677253540360; Fri, 24 Feb 2023 07:45:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677253540; cv=none; d=google.com; s=arc-20160816; b=EkklwMTc5Ku4+XOxZkfVim3PqDPp3UAzVx/szA/arcmL6EceClp2RpxrWIYfUt07EY RNUMHjEe+UKjDLUeHDi/L16mViYq7HIoRz56Fjf2P0oYZsg8iXJC50vB5FeRXEV73q47 Qmpf3VVRKjfruvcukxBQYR57d95p/dkKQyr8g3byRzFCeJKlGQzv4dLOKyPqm57ipzS2 18EIo61oOkgDzbLBursHMF0uiMcLxHVhcotTT1zXCHrKlHbov4pZOLvpdm/aLnMLsi04 3NFpTp/HMqRhNro80w4b+LFScsjoA8VTjz8VN3hb3XKucomo8scvkeOvbqZkravE/1e0 2M7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:dkim-signature :from; bh=YGinMNYfBj9tPJ7INLC5xM+c2L7Uf1eMU3rGvaMeVic=; b=aXf2ft/zREqAy8YfysJM2NQhy7wK3JXfIDEWP1aX42lTm/PdL8PbGcqocu9i4Qsror 3Zi1xB1lR6pfXNP32AqpkdanXeOJQKz4vM6Jhg1yL8eygpJ5QOK7GTK8p2rl/6djvfR0 IDlt9adoabxoKPt13w2/hy4Xf3qrKeuVQO+jj2taxVM9RQU8tQSvp1DhxPA78qJkLL+c HFKr51OwuO8TO1bPFsL9MRUYCHdmZAHS0orL1zDDl2ISHBGVTTg7hz/sVBROqXR1B67c Pta6HjEjnPGHfb6xmm6noqJAy8NkLWp+8bB09d4cSkantgmA5cOWZpkxX8AugEwKf2kd 1PAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cutebit.org header.s=mail header.b=gvMicpRv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cutebit.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q135-20020a632a8d000000b004fb7d5d316esi7691665pgq.404.2023.02.24.07.45.27; Fri, 24 Feb 2023 07:45:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@cutebit.org header.s=mail header.b=gvMicpRv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=cutebit.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230154AbjBXPdY (ORCPT + 99 others); Fri, 24 Feb 2023 10:33:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229909AbjBXPdV (ORCPT ); Fri, 24 Feb 2023 10:33:21 -0500 X-Greylist: delayed 648 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Fri, 24 Feb 2023 07:33:17 PST Received: from hutie.ust.cz (hutie.ust.cz [185.8.165.127]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8BF4199DC for ; Fri, 24 Feb 2023 07:33:17 -0800 (PST) From: =?utf-8?q?Martin_Povi=C5=A1er?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cutebit.org; s=mail; t=1677252796; bh=YGinMNYfBj9tPJ7INLC5xM+c2L7Uf1eMU3rGvaMeVic=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gvMicpRvMrcnvujo94b4P//HAZMsJSPEX6dUJTNPmGGqMUvLcOG0uoWY7QssQm5zC 6wMeg0oEXLabG9bZ+kMeiqnh9j0qrnKtUCbbXc7CJIf4oMyewt/MEqHeLXSkZHSzD4 0cM9EHBJ/VR3jl6vcqO+oLVgQsO4r5vJDLkTc81U= To: =?utf-8?q?Martin_Povi=C5=A1er?= , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Cc: asahi@lists.linux.dev, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] ASoC: apple: mca: Improve handling of unavailable DMA channels Date: Fri, 24 Feb 2023 16:33:02 +0100 Message-Id: <20230224153302.45365-3-povik+lin@cutebit.org> In-Reply-To: <20230224153302.45365-1-povik+lin@cutebit.org> References: <20230224153302.45365-1-povik+lin@cutebit.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758727807910677502?= X-GMAIL-MSGID: =?utf-8?q?1758727807910677502?= When we fail to obtain a DMA channel, don't return a blanket -EINVAL, instead return the original error code if there's one. This makes deferring work as it should. Also don't print an error message for -EPROBE_DEFER. Fixes: 4ec8179c212f ("ASoC: apple: mca: Postpone requesting of DMA channels") Signed-off-by: Martin Povišer --- sound/soc/apple/mca.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sound/soc/apple/mca.c b/sound/soc/apple/mca.c index aea08c7b2ee8..64750db9b963 100644 --- a/sound/soc/apple/mca.c +++ b/sound/soc/apple/mca.c @@ -950,10 +950,17 @@ static int mca_pcm_new(struct snd_soc_component *component, chan = mca_request_dma_channel(cl, i); if (IS_ERR_OR_NULL(chan)) { + mca_pcm_free(component, rtd->pcm); + + if (chan && PTR_ERR(chan) == -EPROBE_DEFER) + return PTR_ERR(chan); + dev_err(component->dev, "unable to obtain DMA channel (stream %d cluster %d): %pe\n", i, cl->no, chan); - mca_pcm_free(component, rtd->pcm); - return -EINVAL; + + if (!chan) + return -EINVAL; + return PTR_ERR(chan); } cl->dma_chans[i] = chan;