Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Rasmus Villemoes <rasmus.villemoes@prevas.dk>
To:     Andrew Lunn <andrew@lunn.ch>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Vladimir Oltean <olteanv@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>
Cc:     Rasmus Villemoes <rasmus.villemoes@prevas.dk>,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net-next v2] net: dsa: mv88e6xxx: don't set non-existing learn2all bit for 6220/6250
Date:   Thu, 10 Dec 2020 12:06:44 +0100
Message-Id: <20201210110645.27765-1-rasmus.villemoes@prevas.dk>
In-Reply-To: <20201208090109.363-1-rasmus.villemoes@prevas.dk>
References: <20201208090109.363-1-rasmus.villemoes@prevas.dk>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from prevas-ravi.prevas.se (5.186.115.188) by HE1PR0402CA0034.eurprd04.prod.outlook.com (2603:10a6:7:7c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.12 via Frontend Transport; Thu, 10 Dec 2020 11:06:59 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 30c99aab-f7a8-4038-d6c3-08d89cfbb7d9
X-MS-TrafficTypeDiagnostic: AM0PR10MB2964:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <AM0PR10MB29646245A649C985B383739D93CB0@AM0PR10MB2964.EURPRD10.PROD.OUTLOOK.COM>
X-MS-Oob-TLC-OOBClassifiers: OLM:8273;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: cYGOyNzUpm2KHmGVFkFADOIu0x4idSkWN9JcQzyIsehBGn0uIgDl69uX26vtOWinhoQP8uTNshWtl8ai2PfyzCY3bJCFBRhqM1ngcD43BEymBQlIFRHv+r35SD+R96h93n6QXydyvGKqoem1AwRws/drGTDdtpIgxQfVYQB6zAOvbaSopTuHq11eEezZulmpC3VRctKr/5LyqRE39l3DnV9BV7KgMlj1lnxPe6in/NFSacDN9mH8ZLeUg0H0cCaSr4tb6Ob8kFQUP0v9yW+eAM+cwABAjqp29NkJkfn5/tls6myH7HhkG/xkL+QU2b5uUUtS6VmhuI+B33REIUQekQ==
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(136003)(366004)(396003)(346002)(39840400004)(376002)(44832011)(4326008)(110136005)(2906002)(8976002)(186003)(478600001)(316002)(36756003)(16526019)(26005)(6512007)(1076003)(8676002)(2616005)(956004)(83380400001)(6666004)(66476007)(5660300002)(6506007)(86362001)(52116002)(6486002)(8936002)(66556008)(66946007);DIR:OUT;SFP:1102;
X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?qedOgQQrnUg3O69VkWEcrEf9dyREVUn9Ad3SQD6Tk3wWeb+uUTy+lYofjuvt?=
 =?us-ascii?Q?/lpvhqLEIq34/fdwB/ydJM7ju5uN86otgV1/9SgIJiNtD9Wiz6SD1HUt+Rir?=
 =?us-ascii?Q?QKkzaZH6wtdOVMqBa42je8SS0RQ54iCdFQvamKdUY9ApAZ9JoFd0iYz8zrso?=
 =?us-ascii?Q?HHr7sVzMaGFlPiCcT+1Pnf4T2B1rlmQzhexlJod81IDk/fsaSozzZo1GSyDA?=
 =?us-ascii?Q?eKkwvorVTHA+7/QdjWyalUTvjRgXPnnWFOlgwCF+O1e6IYY6NmpnW8tTnDoA?=
 =?us-ascii?Q?zH8OiVltrgsnfjeuLO/yGCUl7D0jfpZ98fEvTBQMPwu01LPEzDN+qoJ4qLri?=
 =?us-ascii?Q?lLJdsx1p/QrRz/LH2hFyM0x9e2bVzLK6vtROqJi5B3LlaSpjVUPKYeNLVY9r?=
 =?us-ascii?Q?mfzAw0JZaWlc0S15MW0gu9WOa8MyhdjW3a5I7122pjyAGZKv9S142g4CdxuE?=
 =?us-ascii?Q?dt8LZ6iMITdhNBg+ixbKxpMRk+pDLVOA5cUZn+LipqkybqYUQLOmAXfPtc3R?=
 =?us-ascii?Q?uCfQ+wVJ+IoEOIEDn9vaAVdQSL0KDkefhcVKy7dElagT8mXtGgyphy5pFWT0?=
 =?us-ascii?Q?cLpKlB37pJFqp/MhZtp/VgFzumQUloICdf0st7aNmVKfuf5b/MnnenNQZ64n?=
 =?us-ascii?Q?DjjvmQAeCSTTMH4CwFV4uCn+WpdLMXNGfGIbMtIIdNOpjjp8FGUbVEkiH9ro?=
 =?us-ascii?Q?LQZRz1BMwJttE/IFO/GQ35NncYtpCWFDMn2/HPB2mox/JRBE2W/b5b2rADRn?=
 =?us-ascii?Q?jnVV3D318mDMZhRPqVgEN8hyB1hJ6go9OD7TjsuXiN77wqvV7vFP1CMC5oTy?=
 =?us-ascii?Q?d/lKKtNeDIhjP4I3t7z/SkTmoIGEWyXyKVM4DcFshG6B19AfI0GS+SKqUJxg?=
 =?us-ascii?Q?9Sy18UyIomk9f2uWXtxwOhALJC9XY5jzwG+xvriIMMRDkaRpoIbDiJDyl2A8?=
 =?us-ascii?Q?XGWYTAIMD27zi4f+WPQxQyB+QRZqiS2n8eZLsfxP5y0j+WpivCNFjlNkJDKo?=
 =?us-ascii?Q?5eP+?=
X-OriginatorOrg: prevas.dk
X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB1874.EURPRD10.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Dec 2020 11:07:00.7786
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: d350cf71-778d-4780-88f5-071a4cb1ed61
X-MS-Exchange-CrossTenant-Network-Message-Id: 30c99aab-f7a8-4038-d6c3-08d89cfbb7d9
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ge1H458oUAYQisWyPPPQgsyDoz9QaczTeQmiPzNOTuxB7iid3AZ3NtY5Ll/Kd9/LTn2G0ZhuwZ35+YIzdxC1Z77AZ5dAXOSy9mgOxIaExls=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB2964
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The 6220 and 6250 switches do not have a learn2all bit in global1, ATU
control register; bit 3 is reserverd.

On the switches that do have that bit, it is used to control whether
learning frames are sent out the ports that have the message_port bit
set. So rather than adding yet another chip method, use the existence
of the ->port_setup_message_port method as a proxy for determining
whether the learn2all bit exists (and should be set).

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
---
v2: add comment explaining why ->port_setup_message_port is being used.

This doesn't fix anything from what I can tell, in particular not the
VLAN problems I'm having, so just tagging for net-next. But I do think
it's worth it on the general principle of not poking around in
undocumented/reserved bits.


 drivers/net/dsa/mv88e6xxx/chip.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index d68074a2f240..2068f2759fc9 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -1346,9 +1346,16 @@ static int mv88e6xxx_atu_setup(struct mv88e6xxx_chip *chip)
 	if (err)
 		return err;
 
-	err = mv88e6xxx_g1_atu_set_learn2all(chip, true);
-	if (err)
-		return err;
+	/* The chips that have a "learn2all" bit in Global1, ATU
+	 * Control are precisely those whose port registers have a
+	 * Message Port bit in Port Control 1 and hence implement
+	 * ->port_setup_message_port.
+	 */
+	if (chip->info->ops->port_setup_message_port) {
+		err = mv88e6xxx_g1_atu_set_learn2all(chip, true);
+		if (err)
+			return err;
+	}
 
 	return mv88e6xxx_g1_atu_set_age_time(chip, 300000);
 }
-- 
2.23.0