From patchwork Thu Sep 16 15:59:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 513004 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp1396061jao; Thu, 16 Sep 2021 09:50:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyk5n90oCHlK7//4VlSlvCJ8JJXQIRy9GwRfxn9WmYkyvj8AI4h2y8srJ3Q87gTxzw/5np+ X-Received: by 2002:a17:906:8981:: with SMTP id gg1mr7334387ejc.95.1631811059243; Thu, 16 Sep 2021 09:50:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631811059; cv=none; d=google.com; s=arc-20160816; b=GcQ7cen/v5dKMPj0UBcnOnsaAyMTusbqxep3rHFx06jySy3nDz+KhH3rJ3aNRpMeV2 upwtdVoer96/6yMt37HIL4vK/P4vAFQrXMg7eA4wWohMxKP4QPlCdfwOYbUEUHYBHlZT SckAi4bVGUkGy2n8bK6S05QZUwIjM8zMno85ooNhKLqePHbK5STsgtyUuYDEzH3aDEmb 0Y+sSP62KZ0tLepDhKHkrPcIcGfJV4RWZE/ZKaaFx/ByKt5a+arCv8IdBWoOnfyN/7qE 4Q/mULL5vMqV4wjjVQvWyg5DvbS0x/NGeu2TBeqsNRRCd+3Lkn5WqqxVRSx1wV7QpPiz SsGg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9SnRSqDnBxfIlCjMDfybuNMYpgBlzxegJSfbn1Yhckg=; b=Ahbn8u0eRIJlqD/uJdVawJDy9L4VW6hCEdgTayRJGQ6oKyKnL0G6oTSVvAYBrd6K5q 1V7Fp+XSFvIuYl8wF+P4HaAnaQXXZOx0ju793vna8JHqxi5jUdBFDhPbIgxHt1v71ojz 7dH6647RQPxKUwQyaoeOWc+pBfVNiQgyR62Hub3LJpVL51IBQFkP+dsdnNZxEWQW6Cfm ppKoRnfaZlCret0kOfOuSATQiTx1si2tyvuz+o9chK5Ixj6RarwnYXLxOlAByJjMQE95 IuSDk7Vwp+R8YwKbNKYxvWl10s0aGdTtDVj/L3jcN0xkKKyPAoMYEugtGkkxzKTwTzO1 th4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Z6PUnu2m; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e10si5341164edj.183.2021.09.16.09.50.58; Thu, 16 Sep 2021 09:50:59 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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=@linuxfoundation.org header.s=korg header.b=Z6PUnu2m; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242514AbhIPQwB (ORCPT + 11 others); Thu, 16 Sep 2021 12:52:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:36928 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344711AbhIPQsi (ORCPT ); Thu, 16 Sep 2021 12:48:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 48DE461A78; Thu, 16 Sep 2021 16:27:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631809656; bh=PrlHO9V//nsNUl1uc4NBsy5zgOjPEtrfBnv8qKKmAsU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z6PUnu2mIdMsknjX0gHY1eAW7sAS+RQFeP61hE/hmCb92LG9Z00wDo+fPpbokRISt W6jbFQttXPVmShA/PbFY0mILbeF6w8CRk/WiHju5vBNhBXUNam0PE3U8JvNSjtnxnK 8iAGAr5xXeoJddQLa/+2unRo767GV85LZE+xBISE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alex Elder , "David S. Miller" , Sasha Levin Subject: [PATCH 5.13 234/380] net: ipa: fix IPA v4.9 interconnects Date: Thu, 16 Sep 2021 17:59:51 +0200 Message-Id: <20210916155812.038187946@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155803.966362085@linuxfoundation.org> References: <20210916155803.966362085@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Alex Elder [ Upstream commit 0fd75f5760b6a7a7f35dff46a6cdc4f6d1a86ee8 ] 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 Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ipa/ipa_data-v4.9.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) -- 2.30.2 diff --git a/drivers/net/ipa/ipa_data-v4.9.c b/drivers/net/ipa/ipa_data-v4.9.c index e41be790f45e..75b50a50e348 100644 --- a/drivers/net/ipa/ipa_data-v4.9.c +++ b/drivers/net/ipa/ipa_data-v4.9.c @@ -392,18 +392,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 */ },