From patchwork Wed Oct 25 14:45:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 158147 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6359:6b8b:b0:164:83eb:24d7 with SMTP id ta11csp2709402rwb; Wed, 25 Oct 2023 07:48:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEIMK5dbfUyblqg2wDGq+eTLTBmWm11LLX0i6Il9j1PjQ9QrWCEYGhaZdX1QS7nkTaS39YP X-Received: by 2002:a05:6830:4d3:b0:6b8:6785:ed0b with SMTP id s19-20020a05683004d300b006b86785ed0bmr16120921otd.30.1698245281950; Wed, 25 Oct 2023 07:48:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698245281; cv=none; d=google.com; s=arc-20160816; b=AunmKDi3k4piNDZxvbhr9iLQi6SPbSUrpuSnzGnhfNDI59SIfInhWchPIsvF+0rGO3 Y4kSQTtr2nLgE+IwXVA/Ihzlz2WKlPcbRp7Fr5r8XVGNbYqmF4udNFClNL4+xafIdQmf MZuz3CRInPrs98e6KQdidbhCCxpE5ajin09ZOLD1rGPsenEcoDhYRfDKUt9wq3icw82S /JNf9/93E5Kz4mbEhkTfdnKzsjogEVtd/lraijeCmdwgdrEUl+n1FExV9fkNEwWGDO3W nqq1hS2rMYK3bDufqbgOo4z31ZSZT2Mye/XyurDuFyUgHZP2R8BbHuSF9gUsiGwZOg9u xWNQ== 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:from:dkim-signature; bh=7fCndReggPj8sG1syb2HDBs4AgKt0DkohlqpGAodX1o=; fh=0IMklXoNDxSQfUW/sO2WqdlCNejaMsImVRlXPU3ckDY=; b=oglx9wuQ10ccXfvJnRBTViFGJP3kZ5Z21Y9gdG7HqCJBUlPEF7XENpuJprypjdZEAn lUqvKKqTOp9b3LPwqFpz9dsEwS0GSjiuncQRLOVal9Lmp6B17uN3ZCtLEss77fD6JAyI 6od7/T4zLpcLWsQjClxDsyy0cwvcpdMENACEYSioAibj1o/D/CVF14WtsGj/FeX0k3WD cE35zGycD48DKwW0ANXEDZxA+maWPdquniMg2thzBoDw5mcVXtkeR4Gk7bAEa80nF3Hm jBVW7te3sgM3RU2Yb0FfUVxDPdCChiHTNwJFqHnGueyJBdnIUQSxk7e9WMiy/3ACAC1h Nqrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FKuEN7Ll; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id a13-20020a81bb4d000000b00586518ef7besi11107699ywl.60.2023.10.25.07.47.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 07:48:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FKuEN7Ll; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 3B15E8070E10; Wed, 25 Oct 2023 07:46:48 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234704AbjJYOqa (ORCPT + 26 others); Wed, 25 Oct 2023 10:46:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344109AbjJYOq0 (ORCPT ); Wed, 25 Oct 2023 10:46:26 -0400 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B34B1A7 for ; Wed, 25 Oct 2023 07:46:10 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-507bd64814fso8323026e87.1 for ; Wed, 25 Oct 2023 07:46:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698245168; x=1698849968; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7fCndReggPj8sG1syb2HDBs4AgKt0DkohlqpGAodX1o=; b=FKuEN7LlUjU3EuB1MvIf+R5ndIIbioVnEoXnbS24KtQZm0kOKTcxDKN8Dg3mq95fhg 7Ob66Y95QWJXVrV3TzmAGOuG/80QP5Hn04qS/W9KTdZxfRVfW9KSE7w/ehX/c0EBiOnJ hjdJtQZvYKpmulRi7UoRCD3rMk3SmdHWc9gSUkZa8JDmaUB3dvArV8cSKHNBNHuvLd0L lFLFjgrm6i0BAIqI6gRIQHkLvOK5WsIMePMKNjeBBf3ToEjWHO4cV2YkekPF/5IYkGXD mLj+AaN2DR5OgsVVOyw2ENyafV8cb4Aw8FU2LRIH2O8vN7hh00lKY/vBaTUHVKxKLZ/a 8sDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698245168; x=1698849968; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7fCndReggPj8sG1syb2HDBs4AgKt0DkohlqpGAodX1o=; b=xRsGLuHiTw/4ZU4JgakS7D/nWwaoQ/vO07e5C7+qxXEiZURYuJz8ZkBP05lcvkhD26 9pKrR3ttrVzxKQ/4tLz8p6hHeJs3/7YFB83ImLqTQOBsay3gr8IgYHKUHL+OazuqnVk2 wN+A7qL3FktfIpSZAGUJiCtDxUxT6WNbm5zBm0IDiU+AB22boVRqYzZ3prs8AySfITWh MR7s2jsMA7iV9W3wXclzQXTpP4FK0+msgNFSAvaky3jzF5ILGn0b9WtMUOs3mSfLgOvG xhqTsLyU1wv3MvaZwMU8wZ41tyPNEeLexkMSg3trMLQxKUGE3zrTLLjj2J59MZipxPLN 5OKg== X-Gm-Message-State: AOJu0YztrHVQI7Tci7vlBxWrBjDv2BZHGhS7q7FHos0KtyLrceJC6pqG su/YEAo9Tv3GGT4bFaxx2C+c/w== X-Received: by 2002:a19:7419:0:b0:4fd:c715:5667 with SMTP id v25-20020a197419000000b004fdc7155667mr10143878lfe.20.1698245168251; Wed, 25 Oct 2023 07:46:08 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id i1-20020a05600011c100b0032dcb08bf94sm12267138wrx.60.2023.10.25.07.46.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 07:46:07 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Bard Liao , Pierre-Louis Bossart , Sanyog Kale , Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 1/3] soundwire: qcom: drop unneeded DAI .set_stream callback Date: Wed, 25 Oct 2023 16:45:59 +0200 Message-Id: <20231025144601.268645-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 25 Oct 2023 07:46:48 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780739245042819101 X-GMAIL-MSGID: 1780739245042819101 Qualcomm Soundwire controller drivers do not support multi-link setups, so DAI .set_stream() callback will not be used. What's more, if called it will overwrite the sdw_stream_runtime runtime set in DAI .startup (qcom_swrm_startup()) causing issues (unsupported multi-link error) when two Soundwire controllers are passed as codec DAIs. Signed-off-by: Krzysztof Kozlowski --- drivers/soundwire/qcom.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index f1b8d6ac5140..fe65c26c5281 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -1267,16 +1267,6 @@ static int qcom_swrm_hw_free(struct snd_pcm_substream *substream, return 0; } -static int qcom_swrm_set_sdw_stream(struct snd_soc_dai *dai, - void *stream, int direction) -{ - struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(dai->dev); - - ctrl->sruntime[dai->id] = stream; - - return 0; -} - static void *qcom_swrm_get_sdw_stream(struct snd_soc_dai *dai, int direction) { struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(dai->dev); @@ -1349,7 +1339,6 @@ static const struct snd_soc_dai_ops qcom_swrm_pdm_dai_ops = { .hw_free = qcom_swrm_hw_free, .startup = qcom_swrm_startup, .shutdown = qcom_swrm_shutdown, - .set_stream = qcom_swrm_set_sdw_stream, .get_stream = qcom_swrm_get_sdw_stream, }; From patchwork Wed Oct 25 14:46:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 158143 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp1224vqb; Wed, 25 Oct 2023 07:47:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEYSJtDvcGuSewgLLvyM8e9ay5Ha0I/L9Ata6URSKciuGhvENeWruz5Eu70wiNLbgb+iFxC X-Received: by 2002:a0d:d8cd:0:b0:5a7:af65:4ec6 with SMTP id a196-20020a0dd8cd000000b005a7af654ec6mr18689417ywe.32.1698245226234; Wed, 25 Oct 2023 07:47:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698245226; cv=none; d=google.com; s=arc-20160816; b=WJe9jL2co1KBGhmLQ78Y9VZuZHFBMCsB5ESSFoAimS+Gw18MKPwMOyKrNwu/xuJ6BL FCtyqPzrdba9jtr90LjAVTvW3EGN9G4c1Ww2YlhaIh13LT0pfxrvqmftJIFmxM95TllO cAH0inTJgzI/lVM0vH7q7le0nU05/N6uQjxoy+i7/YSHM10NGDvjzvRKKdUpS2QkFFZI eNoNFsW44YmBUj8xFe2BTg4w4mFsZ0nnUGxMLXkGbgmUZXOzTK6xq09PQA+KQdSXW+z9 f7FH1+xhaV1gLZNanp9rBL4+dOQO20oFkfA96DMIB85ma2VLfKR0pajgHOK4wavKQSJO JmPA== 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:from :dkim-signature; bh=UXAGRRDQU3qBmM4PuKRmO3omKxsrPu1G2pV7PjgXi9w=; fh=0IMklXoNDxSQfUW/sO2WqdlCNejaMsImVRlXPU3ckDY=; b=Fd7cpWEYyfy4yUqjTbzPwccjAA3vlsD8Hv+JSvu+bglaHKyrYVEv9joiwfZ5i9R/6a IBvLsJRH+rJXuPyeavVXR4RQ0gaCLZOVygfNcxxurVqH/D0cZxDNXOq0pKefyRKNqFTH QFOsdm9kTdHWDNBS1Rb2TTci9Po/4Pyxr2mYTUQxFW7z1sx4oGsfA8JjqPWm+aluJmOu UsEfl+aP5NFJNogzuKK9MBrLARF+S27oDSumObvSbpMEoYI3g17FvXhZQhTbZXj7c1Ab DYcG1UFTXkO6+5QNeRnjAuiiBIjOLDimhqRj1471EiZXwJrs4pPllqLA6u5FzCuylkFp 6yhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PMHCUUkv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id j65-20020a0de044000000b005a210c4511dsi11376872ywe.488.2023.10.25.07.46.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 07:47:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PMHCUUkv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 6AC6B801C9C8; Wed, 25 Oct 2023 07:46:57 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344403AbjJYOqf (ORCPT + 26 others); Wed, 25 Oct 2023 10:46:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344178AbjJYOq0 (ORCPT ); Wed, 25 Oct 2023 10:46:26 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 697541B8 for ; Wed, 25 Oct 2023 07:46:11 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-5079f9675c6so9043637e87.2 for ; Wed, 25 Oct 2023 07:46:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698245170; x=1698849970; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UXAGRRDQU3qBmM4PuKRmO3omKxsrPu1G2pV7PjgXi9w=; b=PMHCUUkvrSK1fb6li3YzbfhtQFF+2mSVW9sqvnHEJ2NsjD/4R5TY2D3PVukGooQgY4 8J/KsbHB5enFa2DAYE7098OvQk1e6rPQYcBZjWd+fx1eOd3+V3+8fXV8QxzuXZX24jU0 bqiCr3YCTIGmyZMqTZCgwkUoHWrkyoTa3qCWMuWh7aN9s1IqDkwBsyM7eLuUzcOx5pxx gjfZHzZEW3fE4mhhwXkKbu7nAAAF8jRlYjbDeuwpp9DiZTqt0Rk8hzLadAVJ3NaA3ZJ0 zxY9YHeNZIhJz85YnpRTv47KrZisUFzLSsSLb5QCei4DuKeEZ7LhR6EGaGQ5d0v0Mzld dmug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698245170; x=1698849970; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UXAGRRDQU3qBmM4PuKRmO3omKxsrPu1G2pV7PjgXi9w=; b=cYpoVAZL4JCrDWbV0hGVjjPWbhPsLY/OoWSoKyAph3LMplQcNvXkrDhVGGj1XP7CzY t+1/OZ5ODsAi1dxKQMdzyitEWiMFQ+715KQGWaL/eYVfhvW6L6w7eruT9Ku79aIDbR6D 0feo59Xv/ZmlKbe1Ig1Qf2i9T8yY7t/D/XsHAp1h+We5O39y5oAAPH8dPUXMRD/C9qHb 2XpVoRhQfyTypeBCnEO5IZ3Msm49lX3qbeo5Hd2ePwjivicS1LcFCsSVUg8g9ebMAI1I UTIDDNpjtj7syt9f1B1aF88RnL0CtE7/rVjAz8KpOgcNZbMzgy76iw6+B7ZuVn6iJoUc eXLQ== X-Gm-Message-State: AOJu0Yy+wslxkjSudONAP4HYPV0IvUKmsHFp0Ysvh/aWXOyjK+woH85l eckR/LHlp9DDtUaeC0976gGp/Q== X-Received: by 2002:ac2:597a:0:b0:507:9623:8ae8 with SMTP id h26-20020ac2597a000000b0050796238ae8mr11125024lfp.29.1698245169886; Wed, 25 Oct 2023 07:46:09 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id i1-20020a05600011c100b0032dcb08bf94sm12267138wrx.60.2023.10.25.07.46.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 07:46:09 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Bard Liao , Pierre-Louis Bossart , Sanyog Kale , Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 2/3] soundwire: qcom: set owner device of runtime stream Date: Wed, 25 Oct 2023 16:46:00 +0200 Message-Id: <20231025144601.268645-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231025144601.268645-1-krzysztof.kozlowski@linaro.org> References: <20231025144601.268645-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Wed, 25 Oct 2023 07:46:57 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780739186410243130 X-GMAIL-MSGID: 1780739186410243130 From: Srinivas Kandagatla Store the pointer to struct device of Soundwire controller owning this runtime stream. This can be later used by Soundwire devices, to check if their DAI prepare callback is called for the same bus, in cases where multiple Soundwire buses are used in same soundcard codec list. Signed-off-by: Srinivas Kandagatla Co-developed-by: Krzysztof Kozlowski Signed-off-by: Krzysztof Kozlowski --- drivers/soundwire/qcom.c | 1 + include/linux/soundwire/sdw.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index fe65c26c5281..a95f39563b47 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -1298,6 +1298,7 @@ static int qcom_swrm_startup(struct snd_pcm_substream *substream, goto err_alloc; } + sruntime->dev = ctrl->bus.dev; ctrl->sruntime[dai->id] = sruntime; for_each_rtd_codec_dais(rtd, i, codec_dai) { diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h index 4f3d14bb1538..650334adc261 100644 --- a/include/linux/soundwire/sdw.h +++ b/include/linux/soundwire/sdw.h @@ -1023,6 +1023,7 @@ struct sdw_stream_params { * master_list can contain only one m_rt per Master instance * for a stream * @m_rt_count: Count of Master runtime(s) in this stream + * @dev: SoundWire controller owning this runtime stream */ struct sdw_stream_runtime { const char *name; @@ -1031,6 +1032,7 @@ struct sdw_stream_runtime { enum sdw_stream_type type; struct list_head master_list; int m_rt_count; + struct device *dev; }; struct sdw_stream_runtime *sdw_alloc_stream(const char *stream_name); From patchwork Wed Oct 25 14:46:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 158146 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp1327vqb; Wed, 25 Oct 2023 07:47:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHaFET2uyWkvzkSN0Cgd0TgccLi269EnsOB5Z6p8MwUfzWUDq5ng9qThVyPj9VTKDO8vLAi X-Received: by 2002:a25:e74b:0:b0:d9a:c8a1:70d0 with SMTP id e72-20020a25e74b000000b00d9ac8a170d0mr14378275ybh.30.1698245237936; Wed, 25 Oct 2023 07:47:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698245237; cv=none; d=google.com; s=arc-20160816; b=IacryCoFQmHkcexybJCGUXaLFp77t/l4thqLQFVLbE+50fyjB1vOPM4Z3VZXWClVwn 1AMrkV9aQdeXlw85wCYCAUgv1wUvmuFDDMVnQ6Ofohm5hbC6GPKhrQkml3wMDxKirsgu ef9Np/+IR4Mhj6YwEdfjnpk47Io2248cwxP0rliW+NbfuRjxHPnVf1p4d3ZUa9O0C54/ FsggPvAF3nTIMSaUSVvZpAXAVKj9Uv5z+OvVc2+WcGl53MWdKObUDZDkCHFR/A7FcE8T QQ795mx5DoI8T0DQ9bsOKvhE+VYnxCcbgc9kbFzW0aPj/YLXNGdEXTEYfgUyttWwEgj5 C2cw== 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:from :dkim-signature; bh=NSOu9HyrCio0gozoTkpNTmqH+O6Zq1CFoJPsJwIyKFk=; fh=0IMklXoNDxSQfUW/sO2WqdlCNejaMsImVRlXPU3ckDY=; b=fPXuIYlVI0BFYP2rqyYs5S5ot2BtiFM/55bspN8UwF9Y52QqfVeXeIvj3KX6zwIxDf UHAJXaFfavYF1NkYsTPQdrI6PwGFPZMHog+hwr9Phw9evGAK2ZpnwDOarECd97WnEHP1 jtQVdWZQynJ4uzBLJrgrUpBsXWOXKKciwEYTF73zRerXahtas+weKlYGPGtpBLF1dqQV 7IFgBlNmSYV/LJNtmb6EaosIA/3cfo+Q5pOk4r3a8rZo823WCqBWO//72e5rYPkLgxjg +gago88wfi3D6yY06Od2kly9dkq/HqVejOwhmVSqcVQpVNifNKdopbkrOX6qUHblMPgQ keJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ir03GcM4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id 187-20020a250dc4000000b00da03c35d038si4562880ybn.60.2023.10.25.07.47.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 07:47:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ir03GcM4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 26225801CBD8; Wed, 25 Oct 2023 07:47:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344265AbjJYOqk (ORCPT + 26 others); Wed, 25 Oct 2023 10:46:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344256AbjJYOq1 (ORCPT ); Wed, 25 Oct 2023 10:46:27 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 255BD10C3 for ; Wed, 25 Oct 2023 07:46:14 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-32db8924201so3820969f8f.1 for ; Wed, 25 Oct 2023 07:46:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698245173; x=1698849973; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NSOu9HyrCio0gozoTkpNTmqH+O6Zq1CFoJPsJwIyKFk=; b=ir03GcM4JjTGgpWml7lWgkgK2ckpwILqtIrTm9q4KhyRigpY898RqJJCNES4/vvdTv baHMS4Yxwjul9DkjWn7GdfzeGgzDh0QbHf+Hqs8k86kLI3kdjrpqlEWF4J1cWPCJsy3j OPI7wbOmGUNVKicb97ehJZEkwPH6YmIF0ge4UNNdalYrfEfLiPunPAgsTvyHqwG0whGb k3iUjKepO+B2Dn3jiBObOvy5rEvJIrrn8RSQbS6j+X4ZpTsBcU17smg10bQo4kK/ITbe g7cbBObGQNrfjOkf9YGvH1ODeR+x44gdv79owO56qrZr2hHhol52rIbrJACa7wNmP434 wD8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698245173; x=1698849973; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NSOu9HyrCio0gozoTkpNTmqH+O6Zq1CFoJPsJwIyKFk=; b=l4z1SaAeQhJ1RP3sUiPmEdnMUs/XlyHl9QuO3TTKP5nKffCfeLU2qVf/hBWV4IGodV IT099Ey7OXQ0TRgAKgQeEx/pU1Z0+zKoEvrCVBPcJrqbUSqlDBoSqcgCbherOHYesuAv g5ZXcRo9H8l2uhvQ2DrJumVXo/yrEENG0e2bDLCpcV4mcvHFjMkR8mqte5IPcsQ7HEBw YbnvZpSUaXMAQNwPQER9U9OqQsRy4gpFhG79Jo0BRVxPC1ByCAibSQD3lQe+DGiF8Kuq 9n1lIagi0LnEI7K6r9y/vVTHfu+Ov5jwWbZJOi46RpZq3LcvUf5aE8sJwBGsXY86ngZq ICxQ== X-Gm-Message-State: AOJu0YwDuVid67ylc4cVZaSVkjBscrqLANtO+xRmJXGPLCMBJN8VeFG5 +tEzDX4YA3nFyE+JX3bP7nrxNA== X-Received: by 2002:adf:f711:0:b0:32d:b051:9a2b with SMTP id r17-20020adff711000000b0032db0519a2bmr11838769wrp.2.1698245172872; Wed, 25 Oct 2023 07:46:12 -0700 (PDT) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id i1-20020a05600011c100b0032dcb08bf94sm12267138wrx.60.2023.10.25.07.46.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 07:46:12 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Bard Liao , Pierre-Louis Bossart , Sanyog Kale , Srinivas Kandagatla , Banajit Goswami , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 3/3] ASoC: codecs: wsa884x: check if set_stream is called for proper bus Date: Wed, 25 Oct 2023 16:46:01 +0200 Message-Id: <20231025144601.268645-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231025144601.268645-1-krzysztof.kozlowski@linaro.org> References: <20231025144601.268645-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Wed, 25 Oct 2023 07:47:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780739198695293709 X-GMAIL-MSGID: 1780739198695293709 From: Srinivas Kandagatla If multiple WSA8840 speakers, from two separate Soundwire buses, are used in one codec DAI link, the set_stream() should ignore calls for setting stream from other Soundwire controller. Signed-off-by: Srinivas Kandagatla Co-developed-by: Krzysztof Kozlowski Signed-off-by: Krzysztof Kozlowski --- sound/soc/codecs/wsa884x.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/codecs/wsa884x.c b/sound/soc/codecs/wsa884x.c index bee6e763c700..91205e8c96f1 100644 --- a/sound/soc/codecs/wsa884x.c +++ b/sound/soc/codecs/wsa884x.c @@ -1775,6 +1775,12 @@ static int wsa884x_set_stream(struct snd_soc_dai *dai, void *stream, int direction) { struct wsa884x_priv *wsa884x = dev_get_drvdata(dai->dev); + struct sdw_stream_runtime *sruntime = stream; + struct sdw_slave *sdw = dev_to_sdw_dev(dai->dev); + + /* Check if this belongs to same bus */ + if (sdw->bus->dev != sruntime->dev) + return 0; wsa884x->sruntime = stream;