From patchwork Tue Jan 15 19:41:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1025389 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="GnYrdBRQ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43fLN31lT6z9s9G for ; Wed, 16 Jan 2019 06:42:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389434AbfAOTml (ORCPT ); Tue, 15 Jan 2019 14:42:41 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:38360 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389415AbfAOTmj (ORCPT ); Tue, 15 Jan 2019 14:42:39 -0500 Received: by mail-pg1-f193.google.com with SMTP id g189so1669235pgc.5 for ; Tue, 15 Jan 2019 11:42:38 -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=wLi++uDM9+2NnPAn6Vc7NFWtXwDgQL/o9s/qCZcheD0=; b=GnYrdBRQmhZ5Jz6JYH6y4GOGZOuIGaEtTXXWV6kmx9RBZ+BBB3hJVquMh59kux/rhs cfQFHe8HVRb+nrlc1F6o/hA7FVjOH1VF3mZxsbeQvj1+Y5PU0C9u8fDadSWYBu5JXxoN krAeEkNv6i21v1/tC5yr4Kjj1nupaDCL/9wIltNOArE36SOqOxnUYBAA84YShEJwrcU9 oOlzXEDlyWliGZNNiUynxIMswv4jwwpYAuulMr3tFk0ldCJ9vRG2YVR4cglr+ND53Ga1 sTneAJX9nbJ5mWsinHWbeiBtzzaQkNZgAJHuubTyufPQxGooJUK5r+pshh9A6mrhaSWV GJ3w== 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=wLi++uDM9+2NnPAn6Vc7NFWtXwDgQL/o9s/qCZcheD0=; b=cddknGv+zGRtlLF+3j39f4M8LKD3qi9yWX3NXLPOFgdEcRc8De+FAVCiZUeL+eGN/w RTZl8Hm5exIXjolGqvPwvB6LU+k7Q0kjTIKd5xvWwXCtYLgWHeXIKygxOMD2s9Hj7jhm ZgYFGfJy+a9vqDTeQDuLeASlEh+j2zOY5kxFMxhSyvAIctUDhv51BDbPHybD6q2mkbJm m3/yIxqbzfF5cDFDHC3b5f6bT/aJKHzgdamER3z4ZIHzoA9MDUZ59zHMEvjhIq9lRjH/ iN+f+xdSzYR1gU5n5VwFE1LX3mIcXYPcHR8L8JCLJsbiObrkrjWE01v/emlzCTWWNK16 S95A== X-Gm-Message-State: AJcUukd7ejtf+MuLmGSgPLnvSFhRtBL3LBFw+r3qMpXodK4QCpfnDMXk zn01qRXbVdml4TSI8MuKEIGJW6sR X-Google-Smtp-Source: ALg8bN72mMX7lybXtlBbRZ5yDfPCnBim08Xg8TlNnVnwJJ/prGpJBOJu4+AC4GJQBPdaNjkXz/dJbA== X-Received: by 2002:a65:6148:: with SMTP id o8mr5223237pgv.451.1547581357761; Tue, 15 Jan 2019 11:42:37 -0800 (PST) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id 128sm6954262pfu.129.2019.01.15.11.42.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Jan 2019 11:42:37 -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: [RFC net-next 04/14] net: systemport: Fix reception of BPDUs Date: Tue, 15 Jan 2019 11:41:20 -0800 Message-Id: <20190115194130.19896-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190115194130.19896-1-f.fainelli@gmail.com> References: <20190115194130.19896-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 4574275ef445..720dc3b59cdb 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