From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937129AbdAFQ6y (ORCPT ); Fri, 6 Jan 2017 11:58:54 -0500 Received: from us01smtprelay-2.synopsys.com ([198.182.60.111]:45865 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754375AbdAFQ6q (ORCPT ); Fri, 6 Jan 2017 11:58:46 -0500 Subject: Re: [PATCH v3] net: stmmac: fix maxmtu assignment to be within valid range To: "Kweh, Hock Leong" , "David S. Miller" , Joao Pinto , "Giuseppe CAVALLARO" , , Jarod Wilson , Andy Shevchenko References: <1483750143-11966-1-git-send-email-hock.leong.kweh@intel.com> CC: Alexandre TORGUE , Joachim Eastwood , Niklas Cassel , Johan Hovold , , , netdev , LKML From: Joao Pinto Message-ID: Date: Fri, 6 Jan 2017 16:57:55 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <1483750143-11966-1-git-send-email-hock.leong.kweh@intel.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.107.19.116] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Wilson, Ās 12:49 AM de 1/7/2017, Kweh, Hock Leong escreveu: > From: "Kweh, Hock Leong" > > There is no checking valid value of maxmtu when getting it from device tree. > This resolution added the checking condition to ensure the assignment is > made within a valid range. > > Signed-off-by: Kweh, Hock Leong > --- > changelog v3: > * print the warning message only if maxmtu < min_mtu > * add maxmtu = JUMBO_LEN at stmmac_pci.c to follow stmmac_platform.c > > changelog v2: > * correction of "devicetree" to "device tree" reported by Andy > * print warning message while maxmtu is not in valid range > > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 8 +++++++- > drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 4 ++++ > 2 files changed, 11 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index 92ac006..ce74ae6 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -3345,8 +3345,14 @@ int stmmac_dvr_probe(struct device *device, > ndev->max_mtu = JUMBO_LEN; > else > ndev->max_mtu = SKB_MAX_HEAD(NET_SKB_PAD + NET_IP_ALIGN); > - if (priv->plat->maxmtu < ndev->max_mtu) > + > + if ((priv->plat->maxmtu < ndev->max_mtu) && > + (priv->plat->maxmtu >= ndev->min_mtu)) > ndev->max_mtu = priv->plat->maxmtu; > + else if (priv->plat->maxmtu < ndev->min_mtu) > + netdev_warn(priv->dev, > + "%s: warning: maxmtu having invalid value (%d)\n", > + __func__, priv->plat->maxmtu); > > if (flow_ctrl) > priv->flow_ctrl = FLOW_AUTO; /* RX/TX pause on */ > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c > index a283177..e539afe 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c > @@ -204,6 +204,10 @@ static int stmmac_pci_probe(struct pci_dev *pdev, > > pci_set_master(pdev); > > + /* Set the maxmtu to a default of JUMBO_LEN in case the > + * parameter is not defined for the device. > + */ > + plat->maxmtu = JUMBO_LEN; I suggest to put this configuration in one of the default config functions. Tahnks. > if (info) { > info->pdev = pdev; > if (info->setup) { >