From patchwork Mon Nov 2 17:34:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 11874701 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88AF6C00A89 for ; Mon, 2 Nov 2020 17:34:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 23B672224E for ; Mon, 2 Nov 2020 17:34:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="YN7mW/nr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727932AbgKBReo (ORCPT ); Mon, 2 Nov 2020 12:34:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727524AbgKBReo (ORCPT ); Mon, 2 Nov 2020 12:34:44 -0500 Received: from mail-il1-x144.google.com (mail-il1-x144.google.com [IPv6:2607:f8b0:4864:20::144]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0647CC061A04 for ; Mon, 2 Nov 2020 09:34:44 -0800 (PST) Received: by mail-il1-x144.google.com with SMTP id a20so13654684ilk.13 for ; Mon, 02 Nov 2020 09:34:43 -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:mime-version :content-transfer-encoding; bh=BxMzrdZcjEL0JJ6yvBsXBlKvsrYvjjyVf7t7mWyl/QY=; b=YN7mW/nri9xNNNunEygc4Y8mTJ8WA86uI2PVrndkO42SUdcyGK1LXt3X4Cq8Z5b5/l WcswdaiGtCdwVGH17HdZ8DnfpncVzstYpufEte4YHQluwisYrXkWgVMZiUqS79VdgZi+ LPgRYrRgc/MNKT7p/T/Iy/PXFvMih9vQTMCHl7wSZwJnLkLFLuuyqFzZOk75FcF2Jcdl 70Re9u2Rw5prU5BqFAbw6+63L7GuuXP52zq4B4DdXU0gjPN4BJ7ZgrsYpKFuorsyzXNM 7VU/V5ZqEzVMb5l1gACbrTHHbJ50qxbmIwdOE0kRUng27N7XbRp6FzEj1LuI+i0DPsix ow6A== 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=BxMzrdZcjEL0JJ6yvBsXBlKvsrYvjjyVf7t7mWyl/QY=; b=hpq0rn+s9golbHtTEcCl8FdayBe/wM3A5s1kzYwcwBObxD2YcweQfbg/XVTco4ZJjN yVHYvNtmqWffJiUj/WFgHVmnurdQ2Z79ah1GySzxwQra3347F124X+BGxA8FlYJzVVjx rsjSkuYCm/DBUiDSLUGnXe1Y4Y0MR9bvfkwtxMU8nwIZx3J0YVPFdwtfDTozuU+HVsgf a6WPTm7vAv8MTyXonojkPUw0JIkqz73kK7SC1a6jtXpmeEcpbUEJZUb+Lf4/VBH8zml9 L35OpCCmWpZRI9Sk54kX8wpAYNdvyw5YpvWwYg/ZUBeWBdcS3CQEFzGryX6A7thFhj7p SnPg== X-Gm-Message-State: AOAM530ANopvRP8BaL8yeVpAGM6OVv5xsK7BdbHs/iFG/2qnu9hUzWCw i0+4JA+WZkufmFGsGP8LoYwuNQ== X-Google-Smtp-Source: ABdhPJxFLCublLFiKxPcBrsz/nOyGqz3ZlA28rV+BeouRxTKfd5HoWCHLqmRDZm4LFIV91ZObX6fIg== X-Received: by 2002:a92:6810:: with SMTP id d16mr5010881ilc.153.1604338483325; Mon, 02 Nov 2020 09:34:43 -0800 (PST) Received: from beast.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id u8sm10963432ilm.36.2020.11.02.09.34.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 09:34:42 -0800 (PST) From: Alex Elder To: davem@davemloft.net, kuba@kernel.org Cc: evgreen@chromium.org, subashab@codeaurora.org, cpratapa@codeaurora.org, bjorn.andersson@linaro.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next] net: ipa: restrict special reset to IPA v3.5.1 Date: Mon, 2 Nov 2020 11:34:35 -0600 Message-Id: <20201102173435.5987-1-elder@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org With IPA v3.5.1, if IPA aggregation is active at the time an underlying GSI channel reset is performed, some special handling is required. There is logic in ipa_endpoint_reset() that arranges for that special handling, but it's done for all hardware versions, not just IPA v3.5.1. Fix the logic to properly restrict the special behavior. Signed-off-by: Alex Elder --- drivers/net/ipa/ipa_endpoint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ipa/ipa_endpoint.c b/drivers/net/ipa/ipa_endpoint.c index 7386e10615d99..6f79028910e3c 100644 --- a/drivers/net/ipa/ipa_endpoint.c +++ b/drivers/net/ipa/ipa_endpoint.c @@ -1314,7 +1314,7 @@ static void ipa_endpoint_reset(struct ipa_endpoint *endpoint) */ legacy = ipa->version == IPA_VERSION_3_5_1; special = !endpoint->toward_ipa && endpoint->data->aggregation; - if (special && ipa_endpoint_aggr_active(endpoint)) + if (legacy && special && ipa_endpoint_aggr_active(endpoint)) ret = ipa_endpoint_reset_rx_aggr(endpoint); else gsi_channel_reset(&ipa->gsi, channel_id, legacy);