Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp103180pxt; Wed, 4 Aug 2021 06:57:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxgp/D8UdiuSVFADJ1iULzndw/5XEHwoSvaY/ybNRZdBUOGsaxuPZ5rMuCsCnVbqR/X3X/g X-Received: by 2002:a05:6402:22ac:: with SMTP id cx12mr32781634edb.254.1628085477069; Wed, 04 Aug 2021 06:57:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628085477; cv=none; d=google.com; s=arc-20160816; b=oSjDHlIP9A9RumtMZM4zkQAKo8o3qdNi+9K5jQVsd/04EbbN6BmB2C7mOaURyknTdI QyPCBNu2gX7uqMEYEdfznMM35vYHdv6MQKs/s+S0rANVVO3q1XPfMrL8JfKcv40RDYKN bXUefNKIRKCc6m2yKgsA/EGWDhDHDzJPsiiK8LKOx68DE2V6ExXhY4s3ywoTKaXbDtAI OjawkADRmYaaZ+fnJz+ZVCArUgDhQnmjzmblu5U8QcNWh5YNzzp0sbPm46RBYX9IpsvK Ihc3T1934uAs/x/wKYf3ysLgGs4jPAOFjvMLws15uEm87bwdg70FtIhI0cCt5MLesfy+ yYdQ== 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=g50hMA8civVRQsXmP2D/YUX+vZIHViVyDmuVOssC7Q4=; b=CdhwnYCSjmi6LRgeGW9d3hUBiJ5h8EZsCdMwJYpLfu21XpP9Y2aPR6JAGg5G0sppvz knyU2EHbeyKewA9v/220dyCCEHwwEd/icxcxYEzc4SOvSuMykZY1mJXFl18NXvOSxD+w NaoHoa6MnzjSYxDx51ci+ns/PfyVFtD5Mdh7Ig/2ykja5gQCA7ARp67+xO7XCWNxzgWJ nn1O2/Bm+7iWrWqH7Dq9a78Y7mECv/jgO7TrUnxTSA2H3mVr8aL+aZXCmDx21nr3TPL1 nFK2HrIY0YYlWwrVD+AgDNSPjJheSKFw6D4R1Y44mtj2DDTLjjwRyVrUxACOx8AjKbPU SHrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=w30c93KU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v24si2045080ejb.348.2021.08.04.06.57.33; Wed, 04 Aug 2021 06:57:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=w30c93KU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238433AbhHDNyZ (ORCPT + 99 others); Wed, 4 Aug 2021 09:54:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238406AbhHDNyY (ORCPT ); Wed, 4 Aug 2021 09:54:24 -0400 Received: from mail-il1-x12e.google.com (mail-il1-x12e.google.com [IPv6:2607:f8b0:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED829C061798 for ; Wed, 4 Aug 2021 06:54:10 -0700 (PDT) Received: by mail-il1-x12e.google.com with SMTP id x7so1715152ilh.10 for ; Wed, 04 Aug 2021 06:54:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=g50hMA8civVRQsXmP2D/YUX+vZIHViVyDmuVOssC7Q4=; b=w30c93KUxVwBZ3VBYyjcQ5MRZNYgMyjG3joOSYAjPkcGbx20slrAlpUcwJK3ymPSY0 Esfmr/2LqmnuJibtqthwzXWppseDwGodWk8FQBv4oA2HIEaUMYhKwHs7qHw9RYXYeZ+0 mMLj5dniy1j9q/Dn3FdV5KNnUFUYxsJN4InedxNviIgAR4VseFUFx/t4w0g9n4wZ/xNl Yhqh1oAnX3I3z9BWONJoUg2HVip7b6ro0yufEN961cNy9T041HFIAkkJMDFk+LsgxNkd qXJ20dR9Eum9RlUnXtBs3vATn0Qofa9xvOUNWEGtEtun1j6h4MOxwGAseJIoKJYT00O4 O2lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=g50hMA8civVRQsXmP2D/YUX+vZIHViVyDmuVOssC7Q4=; b=f94KMZOz5Nut6zllcN1lTKqjNz+jhkIG/tH79eUxT+Ne1Y6QWsMjKr2ZfSnJkSNrkB ATP7aE8pGz3g9e14OZhTcCZULnoxs2uBvJgxXj3EriquXTb0W3LlnOwHzJszxZA/FMNe pZzg9RsqNnphLDVUIltvEQd31/RV2yH3c4HwfUjNrTaMwLI9ckbwZ8FfSEpnHizKPphF UwZUe03GS4b/hrfQRgSsz2gzfKHyq87pZgw/JsNKbYu5v9p8tFgZcSDXrd+PSlY0v3QE VnGIUJ61gdKVUwNOcMH6cljv71V+Cgx0brASjBk14nn/PDpHihMaPCNzio/iztvOdy// zkhQ== X-Gm-Message-State: AOAM531PeWg0yJPh2Ps8XFRB1CzjhQpFA0f5NFpf3SfHC/xvFZzkyDDX hDvWY2C+/JRQU6ItIIqjSAe/Nw== X-Received: by 2002:a92:dacf:: with SMTP id o15mr211090ilq.27.1628085250311; Wed, 04 Aug 2021 06:54:10 -0700 (PDT) Received: from presto.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id w8sm1062088ill.50.2021.08.04.06.54.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Aug 2021 06:54:09 -0700 (PDT) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: bjorn.andersson@linaro.org, evgreen@chromium.org, cpratapa@codeaurora.org, subashab@codeaurora.org, elder@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next] net: ipa: fix IPA v4.9 interconnects Date: Wed, 4 Aug 2021 08:54:07 -0500 Message-Id: <20210804135407.1358606-1-elder@linaro.org> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Three interconnects are defined for IPA version 4.9, but there should only be two. They should also use names that match what's used for other platforms (and specified in the Device Tree binding). Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_data-v4.9.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/ipa/ipa_data-v4.9.c b/drivers/net/ipa/ipa_data-v4.9.c index 6ab928266b5c1..8d83e14819e29 100644 --- a/drivers/net/ipa/ipa_data-v4.9.c +++ b/drivers/net/ipa/ipa_data-v4.9.c @@ -418,18 +418,13 @@ 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 = "ipa_to_llcc", + .name = "memory", .peak_bandwidth = 600000, /* 600 MBps */ .average_bandwidth = 150000, /* 150 MBps */ }, - { - .name = "llcc_to_ebi1", - .peak_bandwidth = 1804000, /* 1.804 GBps */ - .average_bandwidth = 150000, /* 150 MBps */ - }, /* Average rate is unused for the next interconnect */ { - .name = "appss_to_ipa", + .name = "config", .peak_bandwidth = 74000, /* 74 MBps */ .average_bandwidth = 0, /* unused */ }, -- 2.27.0