From patchwork Mon Jul 19 18:23:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Woudstra X-Patchwork-Id: 12386737 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2320DC07E9B for ; Mon, 19 Jul 2021 20:27:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 187AE6109E for ; Mon, 19 Jul 2021 20:27:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1386777AbhGSTjM (ORCPT ); Mon, 19 Jul 2021 15:39:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1382997AbhGSRne (ORCPT ); Mon, 19 Jul 2021 13:43:34 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D654C061574; Mon, 19 Jul 2021 11:10:09 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id x17so25224918edd.12; Mon, 19 Jul 2021 11:24:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GTDmJR1iOKfFDErDtsKNCTnZp6PtcbXsQw6WcF7pPvg=; b=PslpkDnKg2RGc5dTIe6QuEL/PdAGxOH50++K7jvEb9AsGJdQuVgPVF16udXIHkm3Eh RJAGJnEk/SiAeWLydlAUKUXo2LaEKYa343WuDHHxcHAm5v5q993uIppkXag01cLPAKn6 CoA5HEp9yGZ6xiWQMnMRmicUtM8jzTE2sV0Ug5qhEns+rYT29TVonMfMUlofC6l6rQv0 N8uQhqJQ6+dYfdH2BsCeeL/x9RjaHesC6jJ+Jicl9bafGk2pQcuNN5IFdNFCOFC65n0o s8eshhOUrzf1gKVKFlOeZ27hSBcK333DopwqEJDxN1zEjmNE3Yni2v32gC0iREDkEo6n dnjA== 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:mime-version :content-transfer-encoding; bh=GTDmJR1iOKfFDErDtsKNCTnZp6PtcbXsQw6WcF7pPvg=; b=WpfIYwND6qNhDnD12S3kL6i0hBP59usxUP+sOdgGslvfa6Gk1AlNDZrGLcpLowE9Tg 6tRtJSQ6ysXasA+mIU4zVvERGjnzcnt0ci9Cuv4nejMJilq/eH3cedOTJB/IpvK4Mbpb nOwZS01amEPWjoKwIuVbq4v+mT0F4OZvp51DK+LHIzjBMuzUOJ3eHzU4LLiiisZFfZu/ NTZTzGyobfxzxWdV2NXCqWm5CPg+FcAiFIFBVpm2D0+Tmq6/HP5jQ1gZ7wpiRSXgRsR/ b6VfBAsrayjlptShJG0+imlwUeTTccIJZ38g7Mj+EibfFPLrddAe3h5WaELZlyXR+b5D 4tuw== X-Gm-Message-State: AOAM533cpj5ism/QsGcBBn4JzYvl5YUbMTzFoT0BA0XM/0DEYNIfp4zL 4MmGCtKM0elmQi3Nyyy4QZo= X-Google-Smtp-Source: ABdhPJyBB/iddbcYz2BAUsZkG8o/nGJccjkPG2a5IDIKGpHrQVAsLya06VIBhGkUOwYbpC0eV881ig== X-Received: by 2002:a05:6402:692:: with SMTP id f18mr36595704edy.327.1626719051135; Mon, 19 Jul 2021 11:24:11 -0700 (PDT) Received: from BLUE.mydomain.example (83-87-52-217.cable.dynamic.v4.ziggo.nl. [83.87.52.217]) by smtp.googlemail.com with ESMTPSA id i10sm8082141edf.12.2021.07.19.11.24.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jul 2021 11:24:10 -0700 (PDT) From: ericwouds@gmail.com To: Sean Wang , Landen Chao , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Jakub Kicinski , Matthias Brugger Cc: Eric Woudstra , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net] mt7530 mt7530_fdb_write only set ivl bit vid larger than 1 Date: Mon, 19 Jul 2021 20:23:57 +0200 Message-Id: <20210719182359.5262-1-ericwouds@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org From: Eric Woudstra Fixes my earlier patch which broke vlan unaware bridges. The IVL bit now only gets set for vid's larger than 1. Fixes: 11d8d98cbeef ("mt7530 fix mt7530_fdb_write vid missing ivl bit") Signed-off-by: Eric Woudstra Reviewed-by: Florian Fainelli --- drivers/net/dsa/mt7530.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 9e4df35f9..69f21b716 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -366,7 +366,8 @@ mt7530_fdb_write(struct mt7530_priv *priv, u16 vid, int i; reg[1] |= vid & CVID_MASK; - reg[1] |= ATA2_IVL; + if (vid > 1) + reg[1] |= ATA2_IVL; reg[2] |= (aging & AGE_TIMER_MASK) << AGE_TIMER; reg[2] |= (port_mask & PORT_MAP_MASK) << PORT_MAP; /* STATIC_ENT indicate that entry is static wouldn't