From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-901460-1516769584-2-4148238957025299987 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516769584; b=ViAUTSmfEL1DHzhYYAiP4loZF2M/ceYACi2uc7Nl9BrZWJd oQ03jwrgTx/IaW5AzbQFVGFJeUtqwzhH7EVJ71LqD2BrhLnyjszHpDJDDx7F0GjF hMjf+P1cE2VmyVtz7L2Tqiefu7H+N3AdXUP49JiZVoKzNHx3oXIlQkJjODOWVHU2 kpp2H+2aaI6X4rMadLxVRslqxK8X9zboU8tTFJ7MYQbil3lMVYnxm5O8rvYpgLnA 2TfCJn1loSc9Bx/GjAlAoA4Z+6ipOmKgaDRsg7oJPGgq1rYck5Jt+wKwMHAXqYb3 D1fPh11t/5au6N7R25+GT3JjXWxJFL0S5GoYF4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1516769584; bh=YO+C72 mwiwLhC2oLWwUXrHbmec9W4lkLJAsLHHeA+zU=; b=m2VD3WYWEDQp2liDgTOSRf gKBFnx3X/ntDF3rik6N7WIGRMgScts1FQ9bWvAi4IXnyDRXSitsXoOuhXYWsOl72 ELE9e5k6GAM9+WQXa/NnLsnXOHNaiiP3zpMQ+brm8SzsFUpJDXUXWcgRL6kMQSga 8GwVlYN/2a166OZy5AruBVBvVIRb5dcBvrsVXb8nnyfiUlQetPkSztoYiZxwzvui GTOY4Nj+eNbJ+zmMCw3S4q0h9bL1mMVRn4L8EDcfg23VOxRT8A4VemUzOt8StZzT LOkBKqjB2Rjd2tpnYX/cXt+hKs9u/jxLC3HoXyhqToR9mCRRQxrGlMzZuqx0zLPA == ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=cm6vbZ6l x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=cm6vbZ6l x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932462AbeAXEwf (ORCPT ); Tue, 23 Jan 2018 23:52:35 -0500 Received: from mail-sn1nam01on0105.outbound.protection.outlook.com ([104.47.32.105]:55328 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932445AbeAXEQB (ORCPT ); Tue, 23 Jan 2018 23:16:01 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Yan Markman , Antoine Tenart , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 066/100] net: mvpp2: do not disable GMAC padding Thread-Topic: [PATCH AUTOSEL for 4.14 066/100] net: mvpp2: do not disable GMAC padding Thread-Index: AQHTlMnlypYpRLWKrkaFUh9/HxHEpw== Date: Wed, 24 Jan 2018 04:14:58 +0000 Message-ID: <20180124041414.32065-66-alexander.levin@microsoft.com> References: <20180124041414.32065-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041414.32065-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB1015;6:ym4nGzZUT1BjolohQkNKVhyjhzYznJpBA20QN666Txag4HGXqn6KYIK6Ij1P/KU/aDk6dQH7XQwfHqrbgR3NdbiQPQ4buJ61XtpzXOOYtA+/B0SoVV31O0yWwKcPoBO5nqULxCHc2k4AZmw0ltaOrWzST4bI1XT2ZUpyhmjlk70kB5A/OPh1Rc8yNeZv0uRfASCvbd6S5+4gsaeLrWO7aFVNA/jcygqSXaifVBjAo0xIgfCVOXEB/4tRnZ/mPgFR3IWOL7X6UrNcY673R+sC+SolfltmxlLKBFIfksu8GRbBtdc7Xoe2pbe1Hv/O9QAFboSl6Ex6O0jsTBKz2V0r8JdMOjsKb9DHgvc4ugdojY+sjynlweSFf8jBpcnk4jR5;5:SKRAk6ln1C34redAQjZH1gfnHb9OKU3wtyzQABVjkdeQLqkD8cBMcP5kXlOvBtZS2dwnsZyFQASS+9Bjlw9XQF3wX9VTOU2fKs+BPYU5O1uOQPFgSinLpRsUVF7wXLqZqeWjE4+Gkg6eMZynFkFcAPbH6WpE+wD7q2goehNiMgY=;24:Xpm5JqinCmVlkNN1mkzs0kYM7+0nuzvsHelArJ2peWH9PURsf1R0I/tJ9Ujy6MFQk7dG9CzMrlLPaQ3HxzNrtCmJvtE8O42AbJxO+BI2kuE=;7:V7ujyFo/azHLZOzae0QxZ/OJ1KbZ8fRr943UJGbNqjNQI5sxigpuiYqzMQG9xLmBxl/UgX0f7JriTixp+nEoiL07lPemza7hFwEgshJBUpbWWK24ZaHU3EBPfkHIhz+doOuGuP3zydilEpPzPV61vAwXbVXnJgThz3McekDZzbOpHXfWEkysGwqL85hTDQ3mOs3JNcm9PgI3uavgyXDyu/XuVvntdpOgNEnG4Tm/YKSf4xsmrFtJo/0iy3C8T9o0 x-ms-office365-filtering-correlation-id: f94905fc-361a-4d19-e1d7-08d562e129d0 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020);SRVR:DM5PR2101MB1015; x-ms-traffictypediagnostic: DM5PR2101MB1015: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(58145275503218); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(10201501046)(3231046)(2400081)(944501161)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR2101MB1015;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1015; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39380400002)(376002)(366004)(39860400002)(346002)(199004)(189003)(478600001)(106356001)(6512007)(53936002)(2900100001)(36756003)(102836004)(2950100002)(2501003)(10290500003)(97736004)(14454004)(81166006)(72206003)(8936002)(6486002)(1076002)(10090500001)(6346003)(26005)(54906003)(4326008)(575784001)(76176011)(99286004)(86362001)(3660700001)(105586002)(6116002)(8676002)(68736007)(22452003)(66066001)(25786009)(6506007)(5660300001)(305945005)(59450400001)(7736002)(3280700002)(5250100002)(2906002)(107886003)(86612001)(6436002)(316002)(81156014)(3846002)(110136005)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1015;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: t4F49k9aZ7Xxt2x2fIKvVuWVk15JP+FRRwsrUNWgzb3GQMjE5bswzZ58B4TPmUHUh6W17Qy1EMHgA5oRYbIv5Q== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: f94905fc-361a-4d19-e1d7-08d562e129d0 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:14:58.6040 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1015 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Yan Markman [ Upstream commit e749aca84b10f3987b2ee1f76e0c7d8aacc5653c ] 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: Sasha Levin --- drivers/net/ethernet/marvell/mvpp2.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/ma= rvell/mvpp2.c index 8044cfb0b667..1dd3a1264a53 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -4552,11 +4552,6 @@ static void mvpp2_port_mii_gmac_configure_mode(struc= t mvpp2_port *port) MVPP22_CTRL4_QSGMII_BYPASS_ACTIVE; val &=3D ~MVPP22_CTRL4_EXT_PIN_GMII_SEL; writel(val, port->base + MVPP22_GMAC_CTRL_4_REG); - - val =3D readl(port->base + MVPP2_GMAC_CTRL_2_REG); - val |=3D MVPP2_GMAC_DISABLE_PADDING; - val &=3D ~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 =3D readl(port->base + MVPP22_GMAC_CTRL_4_REG); val |=3D MVPP22_CTRL4_EXT_PIN_GMII_SEL | @@ -4564,10 +4559,6 @@ static void mvpp2_port_mii_gmac_configure_mode(struc= t mvpp2_port *port) MVPP22_CTRL4_QSGMII_BYPASS_ACTIVE; val &=3D ~MVPP22_CTRL4_DP_CLK_SEL; writel(val, port->base + MVPP22_GMAC_CTRL_4_REG); - - val =3D readl(port->base + MVPP2_GMAC_CTRL_2_REG); - val &=3D ~MVPP2_GMAC_DISABLE_PADDING; - writel(val, port->base + MVPP2_GMAC_CTRL_2_REG); } =20 /* The port is connected to a copper PHY */ --=20 2.11.0