From patchwork Thu Sep 16 16:00:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 513031 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp1433036jao; Thu, 16 Sep 2021 10:30:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwIP4GSs22K+40z8ud5B59LoMd/iadyHt+lLmZKtT5c8qL6SxJgOaQH9+kTJcteN9mux+C/ X-Received: by 2002:a50:8161:: with SMTP id 88mr7658453edc.54.1631813438697; Thu, 16 Sep 2021 10:30:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631813438; cv=none; d=google.com; s=arc-20160816; b=C0yTvNb01sebg5uCFkpivZKqRT3VyHByx3Fy8k7102SnYphwi5KKjBQz1vQUf9pe1M nxPOZI18WQzpcXlGiTlqntsIfaKmRP6eYybbwBgyRwuof3zCgohlW0SQ7oYOJNlBX0UT gpYsJcUVlHK//Bd0RsRfKe6lDDA9qF9FY2czTgDUYTFPeF7MthbH5zjpJydJSAYV039y j8CbMB09RIWQNynBLTIi7JU2PjPmOPGjBFPsaYC8r9qHeWSn6G6cjSmyWnCS58Yw22D1 p1gn4P1ihh9+Ax6YZdnd5Y7Yyyx64z/XEl4QFfcHXobPpWF2qTd1OmWz3U+ohgsbHZ3C se1A== 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=ZHAhGSLPoOLn3Zzufq1hMKYCyyI5mQT+ikoxd+7qqWQ=; b=E78lNVQPxaVK8qvluMUT3vhUl0rfhLcjvtkz3CxXUcL2cMlhWASPLSsvvykJLaed+R WBCSZ/OoU7f+Z7o7ODIOVwATw1b9K61nlTGeoz/P6aPFxkhM8zPfNwXE++WyYbQUOatW CPe8G8PC7Ova3/Rv0VSUDvC48iNweRsyxNHa2d8HqRJkePcvrPqUcblBUbvxItqaEBDu RxoB/eMhrzks3BbEQUwyvrkgkJTSn6y+7ci+XETainN/bkcInuhq4M843aeCihPAE5xq 4FQJaP7SZMl9SRNp2NwXVozqEyt/GVyqRrE1H3rHYlCaPYNSxyJa5FSCFicHILjn0jK6 5EmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DO9UZILp; 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 b21si4426439ejl.336.2021.09.16.10.30.38; Thu, 16 Sep 2021 10:30:38 -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=DO9UZILp; 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 S1347467AbhIPRbz (ORCPT + 11 others); Thu, 16 Sep 2021 13:31:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:47936 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353036AbhIPR3x (ORCPT ); Thu, 16 Sep 2021 13:29:53 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0656563156; Thu, 16 Sep 2021 16:46:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631810781; bh=uLZ/voZxpdGW5MEY6zifV7PeAzyie8gXGgGTSK/r0Kw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DO9UZILpQ0nFUIu0KG3qlsH5Td6k13OCUaZ7FXwNTV+V3kLq83tG7gnUsNxRAQi/k kzGwEY1oT4RE+9p1gOh8xJSXpG7o6weRIZxdNqf3Taogm5h8iaBuQLHCJy9zS7KftY nZpPbxT63moVVX6L0Y25DnquHEXyl0pUsBykQL3c= 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.14 264/432] net: ipa: fix IPA v4.9 interconnects Date: Thu, 16 Sep 2021 18:00:13 +0200 Message-Id: <20210916155819.772539221@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155810.813340753@linuxfoundation.org> References: <20210916155810.813340753@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 798d43e1eb13..4cce5dce9215 100644 --- a/drivers/net/ipa/ipa_data-v4.9.c +++ b/drivers/net/ipa/ipa_data-v4.9.c @@ -416,18 +416,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 */ },