From patchwork Fri Dec 10 16:37:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 12670155 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D2B0C433F5 for ; Fri, 10 Dec 2021 16:38:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240000AbhLJQlb (ORCPT ); Fri, 10 Dec 2021 11:41:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235195AbhLJQlZ (ORCPT ); Fri, 10 Dec 2021 11:41:25 -0500 Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55A68C0617A1 for ; Fri, 10 Dec 2021 08:37:50 -0800 (PST) Received: by mail-io1-xd2f.google.com with SMTP id 14so10985158ioe.2 for ; Fri, 10 Dec 2021 08:37:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n3CDcI54wXBndnATfaMcGfwDIMzZa57DanUaHDpclF8=; b=dsMAFy5prSCCxT2IzDIZiNSdPbgM5oi8w1R3G8KQ4QwfXmYwx/EVGIR5RV+lPoFZcl Qt94CzE5UZmng7MfvHRq+bnMemzdYy2G2InDx3SrPwnBnXMvbKIi4/kHJmQrFVEsqZgY mml9FRqHGen/TMuZo1tgICRl/dY3Oty7w6s07/CawJqDRl2PFn0WNCh+rcraJxGCMoio 8hgTBL3D8UDOoP8DMl8TyUxqtEQsP6FuwaOBq2UjQ/UhufaK9OKk4us9Cl+6q9k7JZta 4JGZf0IJ6fkng8PZLm13+bFU/khGtnOnt8dwk+OUhDTk9u3KxCAg0WP7ZoqBAV5+V3AR 29Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=n3CDcI54wXBndnATfaMcGfwDIMzZa57DanUaHDpclF8=; b=cASxEFjdA7BuC/LAKOBRsSi3ikY3Z1FtZ0EUl01lI98A8cI3u0+97ul4i1WYYjTUvd qr7MCAZ3kDyCHymbRYD7d9xpnByiikjYECHEqK2Eiym0us4jCO3zzVorfpENV0Fj0+/m wCYwF+0QdHBhdyBVkWtjoaea0n6qZNweLjgixqgEP6gTjHG9Y5TwlNTP78SdQSNkax7n +7bmep2jUvQ+SQ0zvLjzaauRgTdi5VyIsO0JNoR5EZu37FmpJuzAjRb8b/0JsriOJ+oh P/ti/ncI3X7xy0R8gwooCvwT1KNY24ySjw1TzTrV6DAsNTxWkBjzY+bsCL+6V5VYyO2L Y5yw== X-Gm-Message-State: AOAM530N713F+gBrmU4HgIqlsOqbM6I5h4MkHUn1VM8AQpbD1mm//NAT u3M7Wjt7bb9XrUPhMcc5oSZs6wdwMWeVKk9V X-Google-Smtp-Source: ABdhPJyDjPrJ+8imAtwL8PhNmfvMqc+00VzvlMSpFrD6KD0SLWbNB945FeVUe+D+kI2liCwA8FtErg== X-Received: by 2002:a05:6602:2a4d:: with SMTP id k13mr19245303iov.133.1639154269726; Fri, 10 Dec 2021 08:37:49 -0800 (PST) Received: from presto.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id p14sm2232642iod.38.2021.12.10.08.37.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Dec 2021 08:37:49 -0800 (PST) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: david@ixit.cz, manivannan.sadhasivam@linaro.org, jponduru@codeaurora.org, avuyyuru@codeaurora.org, bjorn.andersson@linaro.org, cpratapa@codeaurora.org, subashab@codeaurora.org, evgreen@chromium.org, elder@kernel.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 1/2] ARM: dts: qcom: sdx55: fix IPA interconnect definitions Date: Fri, 10 Dec 2021 10:37:44 -0600 Message-Id: <20211210163745.34748-2-elder@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211210163745.34748-1-elder@linaro.org> References: <20211210163745.34748-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The first two interconnects defined for IPA on the SDX55 SoC are really two parts of what should be represented as a single path between IPA and system memory. Fix this by combining the "memory-a" and "memory-b" interconnects into a single "memory" interconnect. Reported-by: David Heidelberg Tested-by: Manivannan Sadhasivam Signed-off-by: Alex Elder --- arch/arm/boot/dts/qcom-sdx55.dtsi | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/qcom-sdx55.dtsi b/arch/arm/boot/dts/qcom-sdx55.dtsi index 44526ad9d210b..eee2f63b9bbab 100644 --- a/arch/arm/boot/dts/qcom-sdx55.dtsi +++ b/arch/arm/boot/dts/qcom-sdx55.dtsi @@ -333,12 +333,10 @@ ipa: ipa@1e40000 { clocks = <&rpmhcc RPMH_IPA_CLK>; clock-names = "core"; - interconnects = <&system_noc MASTER_IPA &system_noc SLAVE_SNOC_MEM_NOC_GC>, - <&mem_noc MASTER_SNOC_GC_MEM_NOC &mc_virt SLAVE_EBI_CH0>, + interconnects = <&system_noc MASTER_IPA &mc_virt SLAVE_EBI_CH0>, <&system_noc MASTER_IPA &system_noc SLAVE_OCIMEM>, <&mem_noc MASTER_AMPSS_M0 &system_noc SLAVE_IPA_CFG>; - interconnect-names = "memory-a", - "memory-b", + interconnect-names = "memory", "imem", "config"; From patchwork Fri Dec 10 16:37:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 12670153 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF559C433FE for ; Fri, 10 Dec 2021 16:37:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243736AbhLJQlc (ORCPT ); Fri, 10 Dec 2021 11:41:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239936AbhLJQl2 (ORCPT ); Fri, 10 Dec 2021 11:41:28 -0500 Received: from mail-io1-xd2a.google.com (mail-io1-xd2a.google.com [IPv6:2607:f8b0:4864:20::d2a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A52B6C061D60 for ; Fri, 10 Dec 2021 08:37:51 -0800 (PST) Received: by mail-io1-xd2a.google.com with SMTP id y16so11024947ioc.8 for ; Fri, 10 Dec 2021 08:37:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CgSHoGMd3MZ0+RwfUhTHIWklywVMelQpZkd8mqp/LWA=; b=h9I0eI9TL9mZt8Dgdc2RYu1igsfIYeWryF/71YWTW0uxiQf5q1x/o5Sn0Hzx+eOLnu rWkrcJSfF8QrHMZc3EXkFUoZWuecSpSbjbHlQqzn08MpzR2zaB4c9Gs5rfga0iVE5X4U 2tqkbf2yWCPMDx3ZQXJlYYd5YYMA2oeQzg10emvxWyxaBifRLm/DZvQU1W/h374TCQQW deZIJ3m8A9nmeMqpRVLOhhIO0J4tN5GGSMtFHxBcJekAphomxwGOdq9jfx4fF26UnNVD AZ7P/6b4dKw/gZarwhf26d3d9dgHqUiVldEZnqHHkaVfYl0qPplUfdGdaJjSrorYqhv8 OQhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CgSHoGMd3MZ0+RwfUhTHIWklywVMelQpZkd8mqp/LWA=; b=uOYB4TnomECyg0txQoybRrQwO+0CS45oImf+9Bh4mdMPyPT3LYGdvqRovQHt6G127Y 2oPQa2WXSZtO40/Gd0DIy6NAdkDCE/Lp0Vpcidejrs/YEtHn0brIkufFWF9nEq0oxKDZ gYMzCANQF1i9G0N+XEGxTXEkfZxkCb9AiQIIh+N1XSk+XPIzu1ewfJNhnkkMYiDD+GUW 07q6f9sYz1frv60H4A8RXQ0SfVVxWl9IaF8H8r2h+ASi8kKFIqd5UxV349HRX/WbLgYd zT0GzkdafyKCR0tToXOOCahNPBpD3nohYNPs1zpAA/0DkYJacw+c4g7zwInuRvnCBEV0 s2+g== X-Gm-Message-State: AOAM533HsMBEDbaY85bruNyaavfzngrDyb+wGTs33nbmbu8k4wDruSTw DV4Y4sAxT1N/yyFmAt/5hSIYsQ== X-Google-Smtp-Source: ABdhPJyrLh49PWZhlPD/da4BA3vtRMoZj1q58/rI8uWVBrEwHjVOfGXO/DDmn1S5Nvk7LtUUuQ90xw== X-Received: by 2002:a05:6638:d46:: with SMTP id d6mr17993604jak.129.1639154271123; Fri, 10 Dec 2021 08:37:51 -0800 (PST) Received: from presto.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id p14sm2232642iod.38.2021.12.10.08.37.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Dec 2021 08:37:50 -0800 (PST) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: david@ixit.cz, manivannan.sadhasivam@linaro.org, jponduru@codeaurora.org, avuyyuru@codeaurora.org, bjorn.andersson@linaro.org, cpratapa@codeaurora.org, subashab@codeaurora.org, evgreen@chromium.org, elder@kernel.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/2] net: ipa: fix IPA v4.5 interconnect data Date: Fri, 10 Dec 2021 10:37:45 -0600 Message-Id: <20211210163745.34748-3-elder@linaro.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211210163745.34748-1-elder@linaro.org> References: <20211210163745.34748-1-elder@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Update the definition of the IPA interconnects for IPA v4.5 so the path between IPA and system memory is represented by a single "memory" interconnect. Tested-by: Manivannan Sadhasivam Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_data-v4.5.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/ipa/ipa_data-v4.5.c b/drivers/net/ipa/ipa_data-v4.5.c index e62ab9c3ac672..2da2c4194f2e6 100644 --- a/drivers/net/ipa/ipa_data-v4.5.c +++ b/drivers/net/ipa/ipa_data-v4.5.c @@ -420,15 +420,10 @@ static const struct ipa_mem_data ipa_mem_data = { /* Interconnect rates are in 1000 byte/second units */ static const struct ipa_interconnect_data ipa_interconnect_data[] = { { - .name = "memory-a", + .name = "memory", .peak_bandwidth = 600000, /* 600 MBps */ .average_bandwidth = 150000, /* 150 MBps */ }, - { - .name = "memory-b", - .peak_bandwidth = 1804000, /* 1.804 GBps */ - .average_bandwidth = 150000, /* 150 MBps */ - }, /* Average rate is unused for the next two interconnects */ { .name = "imem",