From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=unavailable 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 10428C28EBD for ; Sun, 9 Jun 2019 17:19:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D43D720652 for ; Sun, 9 Jun 2019 17:19:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560100772; bh=bvmGVxDktvuZtgkDpHt1Zo5XSOeIlP4VhxJB8X4IWPg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GOGSmaG9d0gZ4TLni8DQpPFTNL9EV2/NPRPcZOnE6p1m7m6vZty+m0J48qp41KcZ2 VdwEi8uWuEJu8M6qf7E7YgrbyIY0K+70inRebzt1A6QnvAPm4B+F8KiqMjRcd7mRoi xum0VbHtVvRzkNenXhX4bfrJVdeRgiRuslePWEOU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731280AbfFIQso (ORCPT ); Sun, 9 Jun 2019 12:48:44 -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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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);