From patchwork Mon Aug 17 15:17:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 247826 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp2830135ilo; Mon, 17 Aug 2020 10:39:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxNydrq1zGb7JfCooKfg5rVeadMGjCrobZfEhkGrPwGQwn7jGOiY/B7LeYIG5WJE5qUlEwy X-Received: by 2002:a17:907:213c:: with SMTP id qo28mr15964379ejb.174.1597685980305; Mon, 17 Aug 2020 10:39:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597685980; cv=none; d=google.com; s=arc-20160816; b=FHEQ8foqCCScDYQBqpMNpY1PJPjhEXN9EFjlBeMwVkzQ3bArDFjGxrfMKZ7XLksTLZ Tt9KisrkbmTwnpPfc/61cQm/2ztwWPmFda09HiS7R7RTxc4H3LCv0VRiZ838g88ogadJ WA7D8Ar1Gq1FEPh6X6eTnKzs3WyDej1QhhUueNR64yeZK6MLjGCTd6I0OmsCp/ZKjFAT KQL+UrJdSNqatwYTC9ppKqlt9K2WoiXeO7HHE+pJESArMPwLc3mNzUxaosrCOOoryUQ+ +QsQeuwh+3Y3dCnhRCTon48VO/C21ihAnBEQW2Wu/JfCqCRMX6SegHDx3gluP9K8rpxw /qlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Um2cEAFnA9si8ja6GuMp+zeH/EGGu5qz/3bVVLPFPmw=; b=VPY8bnl/Ghg34pRdKKEBsU2O+84nH5zvQm/xPJXmFmXb6Zibqdj0qhGmlCSo+DTpfY E2WlMadYZ3gWYEDaVU9BaoF0gIPbW9JoRJY9AmxcUJ1mleR2huGrvrDmySc7FEYkX0KM hlBmd3INhMRJNK3ixqf6bCpBWDPoWarMOluzYmoVHVL5CSRW4ucxj/oHIqTAhzLVktMn VYT46+D+OqotehPv27Tu2YWw3EB+b9MmuZy2Mca0w0dFSGT+hr3IfVP7F/DHkWTt7MNP fFaQCUcMmJ66hVNJsoAMpUCK8i3gPNgboW7avKmvYwjx8Bv/+pv1xb332rOznP0I8dEN qTxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hJc2MIDd; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dm10si14619484ejc.432.2020.08.17.10.39.40; Mon, 17 Aug 2020 10:39:40 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hJc2MIDd; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731385AbgHQRji (ORCPT + 15 others); Mon, 17 Aug 2020 13:39:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:56056 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730860AbgHQQQk (ORCPT ); Mon, 17 Aug 2020 12:16:40 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8ACC922D2B; Mon, 17 Aug 2020 16:16:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597680986; bh=NfUegQHp701VI/9vB3DTU9av/uxtI0FjP/hSjjOVqIE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hJc2MIDdH9GWP/5y91RI6fM3zDZExvPXkPQDnTxo9NlwuEVxj5oeuj9ESnKtdK0Op 0MvTneK/wNEF7z4lSPX6OfVV67rDS7mNlxWHZOSY5MEqPZowo8LuLu6BV3mArqcnTq qzEd6Eh07XH3+o8YOCmPcvKIgvBS9L6JoFGN4VJE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, DENG Qingfang , Mauri Sandberg , Florian Fainelli , Linus Walleij , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 107/168] net: dsa: rtl8366: Fix VLAN semantics Date: Mon, 17 Aug 2020 17:17:18 +0200 Message-Id: <20200817143739.041697692@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817143733.692105228@linuxfoundation.org> References: <20200817143733.692105228@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij [ Upstream commit 15ab7906cc9290afb006df1bb1074907fbcc7061 ] The RTL8366 would not handle adding new members (ports) to a VLAN: the code assumed that ->port_vlan_add() was only called once for a single port. When intializing the switch with .configure_vlan_while_not_filtering set to true, the function is called numerous times for adding all ports to VLAN1, which was something the code could not handle. Alter rtl8366_set_vlan() to just |= new members and untagged flags to 4k and MC VLAN table entries alike. This makes it possible to just add new ports to a VLAN. Put in some helpful debug code that can be used to find any further bugs here. Cc: DENG Qingfang Cc: Mauri Sandberg Reviewed-by: Florian Fainelli Fixes: d8652956cf37 ("net: dsa: realtek-smi: Add Realtek SMI driver") Signed-off-by: Linus Walleij Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/dsa/rtl8366.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) -- 2.25.1 diff --git a/drivers/net/dsa/rtl8366.c b/drivers/net/dsa/rtl8366.c index c281c488a306f..145f34de7b416 100644 --- a/drivers/net/dsa/rtl8366.c +++ b/drivers/net/dsa/rtl8366.c @@ -43,18 +43,26 @@ int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member, int ret; int i; + dev_dbg(smi->dev, + "setting VLAN%d 4k members: 0x%02x, untagged: 0x%02x\n", + vid, member, untag); + /* Update the 4K table */ ret = smi->ops->get_vlan_4k(smi, vid, &vlan4k); if (ret) return ret; - vlan4k.member = member; - vlan4k.untag = untag; + vlan4k.member |= member; + vlan4k.untag |= untag; vlan4k.fid = fid; ret = smi->ops->set_vlan_4k(smi, &vlan4k); if (ret) return ret; + dev_dbg(smi->dev, + "resulting VLAN%d 4k members: 0x%02x, untagged: 0x%02x\n", + vid, vlan4k.member, vlan4k.untag); + /* Try to find an existing MC entry for this VID */ for (i = 0; i < smi->num_vlan_mc; i++) { struct rtl8366_vlan_mc vlanmc; @@ -65,11 +73,16 @@ int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member, if (vid == vlanmc.vid) { /* update the MC entry */ - vlanmc.member = member; - vlanmc.untag = untag; + vlanmc.member |= member; + vlanmc.untag |= untag; vlanmc.fid = fid; ret = smi->ops->set_vlan_mc(smi, i, &vlanmc); + + dev_dbg(smi->dev, + "resulting VLAN%d MC members: 0x%02x, untagged: 0x%02x\n", + vid, vlanmc.member, vlanmc.untag); + break; } }