From patchwork Sun Jun 9 16:41:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 166231 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp53592ilk; Sun, 9 Jun 2019 09:48:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqysUPjOcntc60vtVnPUouskgDcegSMF/nQfZBdrHSB3wCqqyKGUm2HeQ42lk4vrStviYtcC X-Received: by 2002:a62:5883:: with SMTP id m125mr7584366pfb.248.1560098927059; Sun, 09 Jun 2019 09:48:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560098927; cv=none; d=google.com; s=arc-20160816; b=ULqleQ/zCNao8ASk4BqjrR86RuvjrBmI4gs28P7PjYt4fVNcklU4QqfU2rbnngo/TW C1gi0k+BuV26WksZRj5nyq0CmjlMfksjX86eZIbOLBGiInLrta5vA/RCu1MV8ebq80sP RPIkcXXO0cYYvG54ta8+8dZeY7WdMlA/aGCGSooNzEwLxk35y7ZSQQy6rkjd1tM9K7yZ 91LunThBf2nccfYwTUuEF5a5HAh49qWOLajSKGqRmY8VHbKDWDZjcd+cE4ISR1h0xA8E f21dFQLe1XInXQHZjCLKv2Sp9si9WiEW2gHYNhu/2SIIgkItOuc1QCyLX1ikvKJCV5QQ wYUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2FDHYbOmjzePq70FRHZoswHxFi0h488tXlvCHXWHavw=; b=DMmsVKGIlGQFFgUbye7DUj09SY71ouOLfe+1/J0mtgdsd1F5pcBClG9WQWHi28euFh pYWzlFOkQCJcYuSKrjAbO8wBeuIA+dPHJkOZJCaTl81qlhtMbS5ka+CXX7KAF1Kvnkmh Gx3yIkQ7t87rGDL2VAtHR/5HW3fM8Ql3luaKuYK17cFv/PtvhLPFEtF7dyR8ePN0HEKn 4l95ra4aDRn4Ft9Iyx3EWTDwGRhpbsvJuV0ccERWXDlFvI70MtQCm0D4hg74pFlADl7U CTQO3WG/Sxupn+QLOZE8mpwwjWLpJoK3qKMnn5TGNTdRFYC2FvkyZffLF2alRD/GYDZJ 0jSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pmU2stW+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r20si7572313pls.389.2019.06.09.09.48.46; Sun, 09 Jun 2019 09:48:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=pmU2stW+; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731293AbfFIQsp (ORCPT + 30 others); Sun, 9 Jun 2019 12:48:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:47912 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731232AbfFIQsn (ORCPT ); Sun, 9 Jun 2019 12:48:43 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 61063206C3; Sun, 9 Jun 2019 16:48:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560098922; bh=bvmGVxDktvuZtgkDpHt1Zo5XSOeIlP4VhxJB8X4IWPg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pmU2stW+baaMDV9p9nw+vjaexsxeaKyDrpGxYr0V2RFvPU+84IGTeYgaa5WxuuY8Q qCOXwqpLdXuoUWRePuqpc9fYy92tyedy7dILriPVnIiQyemFjTLyg5Io75WjgpW1yS noEvM7j2r7mMhqMGgz8hDc5zGUMU66ZVSKzy3pkc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ivan Khoronzhuk , Grygorii Strashko , "David S. Miller" Subject: [PATCH 4.19 06/51] net: ethernet: ti: cpsw_ethtool: fix ethtool ring param set Date: Sun, 9 Jun 2019 18:41:47 +0200 Message-Id: <20190609164127.486751888@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190609164127.123076536@linuxfoundation.org> References: <20190609164127.123076536@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ivan Khoronzhuk [ Upstream commit 09faf5a7d7c0bcb07faba072f611937af9dd5788 ] Fix ability to set RX descriptor number, the reason - initially "tx_max_pending" was set incorrectly, but the issue appears after adding sanity check, so fix is for "sanity" patch. Fixes: 37e2d99b59c476 ("ethtool: Ensure new ring parameters are within bounds during SRINGPARAM") Signed-off-by: Ivan Khoronzhuk Reviewed-by: Grygorii Strashko Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/ti/cpsw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -2978,7 +2978,7 @@ static void cpsw_get_ringparam(struct ne struct cpsw_common *cpsw = priv->cpsw; /* not supported */ - ering->tx_max_pending = 0; + ering->tx_max_pending = descs_pool_size - CPSW_MAX_QUEUES; ering->tx_pending = cpdma_get_num_tx_descs(cpsw->dma); ering->rx_max_pending = descs_pool_size - CPSW_MAX_QUEUES; ering->rx_pending = cpdma_get_num_rx_descs(cpsw->dma);