From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227HOIM+3BWeMQ6/YzpR9VdP/hCChFpTeZgAOVHN3S2Ot9SqLmaLTkWJWowcN0e7LDdCvCaT ARC-Seal: i=1; a=rsa-sha256; t=1516611253; cv=none; d=google.com; s=arc-20160816; b=ZJXBaQSAraD8sgluHRUbXMDKcsyf91kaF9vEVRQJNZ3R+SbDQf1V0ERRVRIpMVwYd4 hdiD3kE6Aiwl0p1ABqT3wQgMHtSIx9tf8eFgU2Cgo6YJilnUEofs5hDKFW5i9hja/imn tGiR2Ui4SJNVwCFvAOv76X+pUB7+Yn3gbzSmckBYm+84AXi7QzEcrdrZJfffezwI87Qg 6u2YbC706gQXomj5mf1ro1fO27ALc4kVFtC1Z7Q98/jms9nJdmD8tL59aegXLgiz1opH a21RsLnIsf/fMQLv9vFRuKUMW8XjYAuJ3+tjuUB40Lop+psx7fMpqQYP698aaqHRHdxP MBtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=eazQ8OcrLl2be3iOC/r9jWlDP6uW09Yqv/FPML+N3Pk=; b=Uz+LnbMeI9uuH2Vrp+6+dTkwztbJZdnxk/h3Bhg1xIb+0us9tp9/kLNEvbTrrM692r nmtUfmlSRcJdALpzTSyagmsHqe3sUTfsgghGhCi4ExTkudg69T7cgA09jdR2dj7TAYvf kqA4vRwXm4dtSc1YBzLspYl37EoHFLADMwVpB4BhopWXKewMAfjr0YkXuOZHSNdLou/N bg5Iw4pM2GH/jOIIqtkd0bhrJhPk4g8CdsFflgBZdNOrCfxlc/W3XvfDoNsWJpEurTsf 21bgBYrzeQPc9o/SFuN3Crr7hcbHg9+iWyoW3ulW1cwaGx8kD5jhLCXSrScX2lwLh4+s xg3Q== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yan Markman , Antoine Tenart , "David S. Miller" Subject: [PATCH 4.14 89/89] net: mvpp2: do not disable GMAC padding Date: Mon, 22 Jan 2018 09:46:09 +0100 Message-Id: <20180122084003.441615515@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083954.683903493@linuxfoundation.org> References: <20180122083954.683903493@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590282161928307651?= X-GMAIL-MSGID: =?utf-8?q?1590282161928307651?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yan Markman commit e749aca84b10f3987b2ee1f76e0c7d8aacc5653c upstream. Short fragmented packets may never be sent by the hardware when padding is disabled. This patch stop modifying the GMAC padding bits, to leave them to their reset value (disabled). Fixes: 3919357fb0bb ("net: mvpp2: initialize the GMAC when using a port") Signed-off-by: Yan Markman [Antoine: commit message] Signed-off-by: Antoine Tenart Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/marvell/mvpp2.c | 9 --------- 1 file changed, 9 deletions(-) --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -4552,11 +4552,6 @@ static void mvpp2_port_mii_gmac_configur MVPP22_CTRL4_QSGMII_BYPASS_ACTIVE; val &= ~MVPP22_CTRL4_EXT_PIN_GMII_SEL; writel(val, port->base + MVPP22_GMAC_CTRL_4_REG); - - val = readl(port->base + MVPP2_GMAC_CTRL_2_REG); - val |= MVPP2_GMAC_DISABLE_PADDING; - val &= ~MVPP2_GMAC_FLOW_CTRL_MASK; - writel(val, port->base + MVPP2_GMAC_CTRL_2_REG); } else if (phy_interface_mode_is_rgmii(port->phy_interface)) { val = readl(port->base + MVPP22_GMAC_CTRL_4_REG); val |= MVPP22_CTRL4_EXT_PIN_GMII_SEL | @@ -4564,10 +4559,6 @@ static void mvpp2_port_mii_gmac_configur MVPP22_CTRL4_QSGMII_BYPASS_ACTIVE; val &= ~MVPP22_CTRL4_DP_CLK_SEL; writel(val, port->base + MVPP22_GMAC_CTRL_4_REG); - - val = readl(port->base + MVPP2_GMAC_CTRL_2_REG); - val &= ~MVPP2_GMAC_DISABLE_PADDING; - writel(val, port->base + MVPP2_GMAC_CTRL_2_REG); } /* The port is connected to a copper PHY */