From patchwork Wed Jan 16 20:00:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1026166 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LHGTSbxH"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fynd4pLQz9sDX for ; Thu, 17 Jan 2019 07:03:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732158AbfAPUDa (ORCPT ); Wed, 16 Jan 2019 15:03:30 -0500 Received: from mail-yw1-f67.google.com ([209.85.161.67]:36325 "EHLO mail-yw1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732142AbfAPUD1 (ORCPT ); Wed, 16 Jan 2019 15:03:27 -0500 Received: by mail-yw1-f67.google.com with SMTP id i73so2922587ywg.3 for ; Wed, 16 Jan 2019 12:03:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HsO5n9L+refplPrRxaqotuOTnOW7UOzseqSjzGqsugI=; b=LHGTSbxHfbTk80lzH4RkTcDyBJB538z996S89BKmuBzIxSMHL4KnxwpdmPvE6y4SzE 2jQaVefGAFxahv1l7v4IaKJHNige8D0ecv6YtjYu+2wYmBUUclEEyE3KDhKJJSSiDoHN x5m80hR6AnpCFDxwgu4VNez+WAhNWIQgue3voLBVAvdI63MCxzZWadQ3D4AwvJXU1Prk 3eSohRWzfRSLVaxx/Dlo984ObT9MVFHn3naZJuD4gx9tJLMTrF1yVbZW/IUo+e/Vg/+L +JZn00GeadX3VDq+0kAriR1ocU8fO3sfrmXiqXwHmxV6sN3xlwPzqLHwhfLoeIgVhEwj mawg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HsO5n9L+refplPrRxaqotuOTnOW7UOzseqSjzGqsugI=; b=M894yShMlPzOZOAIGwd2+8D6xVdYkGSuSXUY2f1gteo+RMOaw7TKehK4ZpCvosdwWy b9tNG/qxmXGibQID3J0UVmh8z1tqccPt7UNyCL7LrmI7DagN/JlWEA+y4D684gpAWfZF S/fAFzJ0CXrBswZHlhJLKY5oAUL30ww+Yv+CN61yW+tismR8HLezeH6vt5AC7qtEukEk 1dbfUYU7DPqvAUaYU8zXAH9paX2gQ7SX/Z1J1tW+aZrYmawvLyVDQID+gplJAUkN5528 /foLr1jZR81UghS/GHu/TTGh1WY3Iazk0hNV3+6H45NLob6D1KNwQ1ou9mbXs6CONj4y nuOw== X-Gm-Message-State: AJcUukez6pmlnbLZcU9PMHwmf4Da6y9FGYclLiHZAKqb8+n+giddHchH 2ucyPWaFZysh40Aw2CJbsCVRG0bL X-Google-Smtp-Source: ALg8bN6mFNRivaFMtfMuGJ4Tk16Eqxarrd9zfa0EdA9U2/hR0Eu2dkVwfGzoijdNT/biS8QEktMzWw== X-Received: by 2002:a81:67d6:: with SMTP id b205mr9321231ywc.94.1547669006103; Wed, 16 Jan 2019 12:03:26 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id v128sm2475295ywf.44.2019.01.16.12.03.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 12:03:25 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , andrew@lunn.ch, vivien.didelot@gmail.com, davem@davemloft.net, idosch@mellanox.com, jiri@mellanox.com, ilias.apalodimas@linaro.org, ivan.khoronzhuk@linaro.org, roopa@cumulusnetworks.com, nikolay@cumulusnetworks.com Subject: [PATCH net-next 04/14] net: systemport: Fix reception of BPDUs Date: Wed, 16 Jan 2019 12:00:52 -0800 Message-Id: <20190116200102.2749-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190116200102.2749-1-f.fainelli@gmail.com> References: <20190116200102.2749-1-f.fainelli@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org SYSTEMPORT has its RXCHK parser block that attempts to validate the packet structures, unfortunately setting the L2 header check bit will cause Bridge PDUs (BPDUs) to be incorrectly rejected because they look like LLC/SNAP packets with a non-IPv4 or non-IPv6 Ethernet Type. Fixes: 4e8aedfe78c7 ("net: systemport: Turn on offloads by default") Signed-off-by: Florian Fainelli --- drivers/net/ethernet/broadcom/bcmsysport.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index f9521d0274b7..f374c8ddf719 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -134,6 +134,10 @@ static void bcm_sysport_set_rx_csum(struct net_device *dev, priv->rx_chk_en = !!(wanted & NETIF_F_RXCSUM); reg = rxchk_readl(priv, RXCHK_CONTROL); + /* Clear L2 header checks, which would prevent BPDUs + * from being received. + */ + reg &= ~RXCHK_L2_HDR_DIS; if (priv->rx_chk_en) reg |= RXCHK_EN; else