From patchwork Wed Jan 30 00:55:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1033095 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="WXGs+HIq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43q4jM3x7Xz9s9h for ; Wed, 30 Jan 2019 11:57:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727818AbfA3A5z (ORCPT ); Tue, 29 Jan 2019 19:57:55 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:34464 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727739AbfA3A5y (ORCPT ); Tue, 29 Jan 2019 19:57:54 -0500 Received: by mail-pg1-f193.google.com with SMTP id j10so9574068pga.1 for ; Tue, 29 Jan 2019 16:57:53 -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=WXGs+HIqOcTnyhh6RWPZsDK/uS3GlcDSuD5Ann2ZadV5YZ6Gx2tY38DQGIIp1yq4K4 Wfm3q6zpGCn+4/zIABRWlcEaPkGk3LcS5uOPWS4Z3Cqj07D/0xljuNjGFKMqAH/yZVtq NQ4vjdeU4jFZQOEdEawnStqiLkWZLbKZbqCvORidsqzE9HYjdEYLvGMb2qAP1szMtW0q ntRm++H26v9t7yI6zXUu6CUlfJvPVyDr+lzhI+BoVTQoe+7hpP8n+kwQ9Qcrv3D+khf7 Hx0a9n0QWQ0v4dxYspFPdCmfznhzmZsmChNIqbgZVLLD0Md7vicn+n5IqhYjdsCy4Nf6 cewQ== 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=EDyW8HuSWNQ3ZF6T5gU/goSNVVPEU1+3cztsuMl1qfuBvN5p6LJ9xIZUxM6EQw4wnD L5H0NqWOrDHzuZfvf5sD/LvoS5FPeRb0WCs2jMG4/QBrf/c3OZMSlYkoxIBDXkcaaoAt +qs/759Bjb46BvKbOSerO0bxFAu5Plf//vvWmopWIBgtgIi5X0x1izgNkUaOoG5Ka+3+ e24iFcUdCZx2EqjdPbTW5Sw589rZ2yRp9q2ZP77befkabcXUrIWfvlIhNboO4+9Mfky4 sfKoVSmlmdjrTt9j/FADn/W9Vp5uD+7xvbw9+FGqYSCen9BiWTp89DlGBETtIh0Q9FbX 9fCQ== X-Gm-Message-State: AJcUukcsjpmLYLhEjdXfod2iKg7fA/QVEt605L+u6ImQY2dYF2tiTCo+ 2ODgq9XTqGIAV9rzWTDsRCoCCxSh X-Google-Smtp-Source: ALg8bN5IHRwR2F2NM7qyIJB9dch0ZplpbWGo/BXjiacKO+rCWHp4H5MSnWtuAozZkjUuzGb+DMhjxA== X-Received: by 2002:a63:e156:: with SMTP id h22mr25761948pgk.255.1548809872582; Tue, 29 Jan 2019 16:57:52 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id v191sm67837137pgb.77.2019.01.29.16.57.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Jan 2019 16:57:51 -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 v2 04/12] net: systemport: Fix reception of BPDUs Date: Tue, 29 Jan 2019 16:55:40 -0800 Message-Id: <20190130005548.2212-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190130005548.2212-1-f.fainelli@gmail.com> References: <20190130005548.2212-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