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;