From patchwork Tue Nov 28 15:00:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 170845 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp3984880vqx; Tue, 28 Nov 2023 07:02:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IFGFf2WleCWw9fyfX6b6AMUzdUiKR1dPyKiVm2x21asXFkfvau4UUXa0c1Cl5hDGbMM214m X-Received: by 2002:a25:db83:0:b0:d9a:d894:7b51 with SMTP id g125-20020a25db83000000b00d9ad8947b51mr14720980ybf.57.1701183726040; Tue, 28 Nov 2023 07:02:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701183726; cv=none; d=google.com; s=arc-20160816; b=s0w43PigLxwX5z/m3BKAw4N8BYaur1qtf8isGRrGW2P5z1Ytc9j46xbhda107bR13R 47OmVMDTZyZNlR/KUAM5c1IxEyT5Fz0xDQs9OXz+qfnp25hQeszLj/dLYDJ6/Lej5SCa vd7pfB75nKvsMM3qcsg28p88Ih3xc4MNWxFFQXJmiZ0N7EZ0ZNFUdeh85n4TWl9N8V/H wm5iUAY/hxp4sU72GnF7jFAa2aQQI8vWx50ZimNmzHBuv292TUXe8irnzG9YgPz0ruHl AJtX+yugkjjathZ+W/PejFXhZbpGJ9Y99naC4pPqPzMfLPOgO7UHMbawKQfo1znjr7aW gWqg== 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=wtzvOORU1m23t60LTV9e86QfYgBtpGNq+GKxLg73wN0=; fh=YlQoVevKj+hT39FR1nhQZgrASptj91JvH92FryZQhXU=; b=ct8D2VtnUgWdMZCFRpQe6gH8q0GjuzR4iE1/9vRmU1IYLemDxBW3sp5gL3dxc2qb6g Xce/ot7KZzwBMbUAcuIYN2NfxpwH5BEMEp8JpO+XKpVDQ+oPBqwd/8cs/KN9BkXf16Al 0nFn21RCt1XSinfo6ulNDs3StomYEJ9X7QncevMMMFwv42hvVD4k/HPuw7PTsYQWP0f+ WThOYIudiVHgHbKZtkWTs2c8azRh+GwTEi/5j3yygdKbr1ax0Xk4UlkWU4PvtT3TeUQd 0XUM5o/IoWhvkRzgwW6GCLI4k35eLj/UIWQ+3J/++NbTZ04LiKniLGZnZpjOsSTsAqiK YKcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ejtjY852; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id j125-20020a252383000000b00da160dbe3a2si7866932ybj.355.2023.11.28.07.02.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 07:02:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ejtjY852; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id A291F8080EE3; Tue, 28 Nov 2023 07:01:04 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345929AbjK1PAz (ORCPT + 99 others); Tue, 28 Nov 2023 10:00:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346583AbjK1PAu (ORCPT ); Tue, 28 Nov 2023 10:00:50 -0500 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9AACB1B5 for ; Tue, 28 Nov 2023 07:00:55 -0800 (PST) Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-a06e59384b6so713506566b.1 for ; Tue, 28 Nov 2023 07:00:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701183654; x=1701788454; 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=wtzvOORU1m23t60LTV9e86QfYgBtpGNq+GKxLg73wN0=; b=ejtjY8529E3nFL4LIhsfe8bBS6KpGkjhRp8zSx4DuzMsKut5DGM++ZukDJ/y1/RGrO /0NwESXxPWlgIYA6ZpbGhFLyF4VWZopVQSGB30VuMhZWDoIbbjCC0rSmRgFSXgDmegWk KlncRi1HwHfOBEp9RzUx9FYXws9laNZSXu7ELI238UgI3dhlEzScMkuUmYExP1Jm0BrR yiY+tWgnmtQlTtG2dSZytilF//Mjkm7+jDLXdVhWNx2FcloaZPaPnR7Mc+zcSdwlsb3E pGGD851aemp4TCnzLIo7y4V6eGfA7jO53I1dsBmsAvfrPv2q7tdwvHgeg/QFc6Olu0j/ lACg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701183654; x=1701788454; 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=wtzvOORU1m23t60LTV9e86QfYgBtpGNq+GKxLg73wN0=; b=iH8fW6IBklNjQcEt/nEPeeAxP54p7AkdHl5LJ2VaHpcHpVRUdQu0rg1QKoY4O8EVm5 92iOY9UBSuS8gj+V6vosd9qkIKMISQxvpy7of+qwmKsSMcMcArbbZLe9Y8qk7hic95CY iDGPHJfladmum9V4qefZxcQxsZtKMzWehKDXKoig8X4aWvtfC7dzssGZZJ0DWuNIgDDx IGVJkpR0aG67Z0BcgaBT97TIGGJt5AAxifXj9RxoPBEjul8hQXyQlKAsw3zbAFuZy3Za mO+ID7TFtwqcPC0xok3MGKYZbsIscpHphtoWpuDK3089D0P565WbRdzTpNahYdYUWMNi AEkg== X-Gm-Message-State: AOJu0YxCpErpvRtCWBaiLR/QsXgqXrdB3s6k8382SR5wU90OgFgJPO7U hQKW4MFNGyz/rrHNcclGFFLYRQ== X-Received: by 2002:a17:907:1687:b0:a12:9aa8:c560 with SMTP id cx7-20020a170907168700b00a129aa8c560mr1808321ejd.59.1701183654099; Tue, 28 Nov 2023 07:00:54 -0800 (PST) Received: from krzk-bin.. ([178.197.223.109]) by smtp.gmail.com with ESMTPSA id xo25-20020a170907bb9900b00a0b6541b592sm4433071ejc.88.2023.11.28.07.00.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 07:00:53 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Bard Liao , Pierre-Louis Bossart , Sanyog Kale , linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , Mark Brown Subject: [PATCH] soundwire: qcom: allow multi-link on newer devices Date: Tue, 28 Nov 2023 16:00:49 +0100 Message-Id: <20231128150049.412236-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Tue, 28 Nov 2023 07:01:05 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783820426465494538 X-GMAIL-MSGID: 1783820426465494538 Newer Qualcomm SoCs like X1E80100 might come with four speakers spread over two Soundwire controllers, thus they need a multi-link Soundwire stream runtime. Cc: Mark Brown Cc: alsa-devel@alsa-project.org Signed-off-by: Krzysztof Kozlowski Reviewed-by: Pierre-Louis Bossart --- This is an entirely different approach than my previous try here: https://lore.kernel.org/all/20231025144601.268645-1-krzysztof.kozlowski@linaro.org/ --- drivers/soundwire/qcom.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 412b8e663a0a..57943724f0eb 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -920,6 +920,18 @@ static int qcom_swrm_init(struct qcom_swrm_ctrl *ctrl) return 0; } +static int qcom_swrm_read_prop(struct sdw_bus *bus) +{ + struct qcom_swrm_ctrl *ctrl = to_qcom_sdw(bus); + + if (ctrl->version >= SWRM_VERSION_2_0_0) { + bus->multi_link = true; + bus->hw_sync_min_links = 3; + } + + return 0; +} + static enum sdw_command_response qcom_swrm_xfer_msg(struct sdw_bus *bus, struct sdw_msg *msg) { @@ -1078,6 +1090,7 @@ static const struct sdw_master_port_ops qcom_swrm_port_ops = { }; static const struct sdw_master_ops qcom_swrm_ops = { + .read_prop = qcom_swrm_read_prop, .xfer_msg = qcom_swrm_xfer_msg, .pre_bank_switch = qcom_swrm_pre_bank_switch, .post_bank_switch = qcom_swrm_post_bank_switch, @@ -1196,6 +1209,15 @@ static int qcom_swrm_stream_alloc_ports(struct qcom_swrm_ctrl *ctrl, mutex_lock(&ctrl->port_lock); list_for_each_entry(m_rt, &stream->master_list, stream_node) { + /* + * For streams with multiple masters: + * Allocate ports only for devices connected to this master. + * Such devices will have ports allocated by their own master + * and its qcom_swrm_stream_alloc_ports() call. + */ + if (ctrl->bus.id != m_rt->bus->id) + continue; + if (m_rt->direction == SDW_DATA_DIR_RX) { maxport = ctrl->num_dout_ports; port_mask = &ctrl->dout_port_mask;