From patchwork Sun Aug 23 20:59:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 248151 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:522:0:0:0:0 with SMTP id h2csp2056292ils; Sun, 23 Aug 2020 14:00:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzDdGO/OjtDmiqSAxfHDZ0NiR5MYRiyBiGNVJxKk7IV1ejmFKUHRP8l7e6n9mc5thhnCwia X-Received: by 2002:a05:6402:1a25:: with SMTP id be5mr2616211edb.62.1598216457107; Sun, 23 Aug 2020 14:00:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598216457; cv=none; d=google.com; s=arc-20160816; b=Qy3Ll6HRRdakI2OoYeTSEux7VNn9tVkybq0pbTyW07jDDxBefTvoB99uWFt7z4VGwe jloWxVwbwresheoxjQZZ8wS/BGEXhfmnq7kfEEuLUP2Jjk8+cHTQkA5b+y5vgUylvZOS VFH9oG8AkikycmlofaVmE3B5MftAtFDS03LRB8X1Lj4Hs0/eo4EZuKI7BAAkxnMmv+B7 6W7yXT9w10YOjcGiM7tJQYmMrZqV/EU2xt/AVMgSOdoVzDOBmQQ7Ea32kVudX19PIwck q12Jj5bpb/VVx6F+lDg49hjFnzQuS0iFNwS15NaKRrPbJxYClt+9pQad5IVlJWaHYfbA 0p4w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=o4o/RWuZSVyt2KxX1fFudlYA+bRugpK9nsAuSbD4TK0=; b=sHD2YS0DsTpmuakSdpqvhWJl8qB6iD2QsAQhv/hOeUWT8YKBZciQrwnK0wReZb+t4k UjgsFrypU1nbU41THpBKHwH/rSAQnruTC/sv24S5WDVrtCUgDMdJmmpforBlDGN5QQpZ 35kzdl09g4/4ecAiiNTJVfNqKNRcUNtPn+qFDkfMcb3nMiWPYndYxFWjH3y2TE1E0oLo nDWtalgdb+d4RePpOdfot+BuizI+8yO+rghDbzMBVo0EwmHsBQYxQpFAQSoudcHGhwLG 5lpK26ehPONNUr4JZVzqBcUWzWFPUgjxWx4jVnvYvMI04JiWJSWHP/BQi2OBTDgDoFXp YhVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XTeKMDZ+; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id mf26si821827ejb.665.2020.08.23.14.00.56; Sun, 23 Aug 2020 14:00:57 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-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=@linaro.org header.s=google header.b=XTeKMDZ+; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726816AbgHWVAz (ORCPT + 9 others); Sun, 23 Aug 2020 17:00:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725995AbgHWVAy (ORCPT ); Sun, 23 Aug 2020 17:00:54 -0400 Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F61AC061573 for ; Sun, 23 Aug 2020 14:00:54 -0700 (PDT) Received: by mail-lj1-x241.google.com with SMTP id i10so7393911ljn.2 for ; Sun, 23 Aug 2020 14:00:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o4o/RWuZSVyt2KxX1fFudlYA+bRugpK9nsAuSbD4TK0=; b=XTeKMDZ+OQwHT2AbGK01DqX1gidUgqaTmXRexHXdJQZGSoRCjIZue9zjTKjZlETg7M 19a2rGynO60OWfRIYD78Zc+28nA3giFOatcWM74/Zx1ktNkR46ioHg7c2QJb48EVLL1/ SPPXgHPr8OR8kL8TMwwtVjji2zTh7zLDzYIIqwKl0bHEVPK5BCLmjDd8fDnTclnHYap5 1TbG2eOUuaotfff0vhbgpbu6FlJ1prmd2Cev+B5QWnMkWRV75DDKaLqrk8Dg7q/njn5H UI8dEuw2tI02MRB5lBPFqP/HroJ5u3D8PNaHBDKKTxhS4bVWrgpgkxAxedNXoobzdCSc wI+w== 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:mime-version:content-transfer-encoding; bh=o4o/RWuZSVyt2KxX1fFudlYA+bRugpK9nsAuSbD4TK0=; b=P1tmw3kDUEFtSlXuCtGz/5fKRm/26cLBoHO/ZHnjrBe+NruL1oLGpejZiZK6Gw2kfT g/wjbHUw+GZ89Ax9zDZeqMInKLO17RRPuLDRTtMuohfbz2E6nHJJcfXIUX1q10AHMFUz P1mSc2MG2NXfttyapQKcw34BoZ5YHZO92z2I5SzNHk3lAzKt2IOKhHOiLIcVJYmTR7jt StcIh/xAZwzOuuKg7pgW2VENt9c2VG0YwbZzzt2UDpOLF8LEpigK3kjWTzR9GMvpdtTu TeOht5aYJ6IRr7wvemdpN/SOneh0rIltVDZJWBcD1sjuRDwI8MQ6hzRQcIP8jyjQkxJW oScQ== X-Gm-Message-State: AOAM533SaQHwKgqGAGfVfL4RD0mYCKWFzqOVQr162DTkcNR6+pSKMy3x fSRMVDhQkbnZqWrtdCSKFyDsMg== X-Received: by 2002:a2e:99d5:: with SMTP id l21mr1143354ljj.320.1598216452652; Sun, 23 Aug 2020 14:00:52 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-92d7225c.014-348-6c756e10.bbcust.telenor.se. [92.34.215.146]) by smtp.gmail.com with ESMTPSA id y9sm1786184ljm.89.2020.08.23.14.00.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Aug 2020 14:00:52 -0700 (PDT) From: Linus Walleij To: Andrew Lunn , Vivien Didelot , Florian Fainelli , netdev@vger.kernel.org, "David S . Miller" Cc: Linus Walleij Subject: [net-next PATCH 1/2] net: dsa: rtl8366: Check validity of passed VLANs Date: Sun, 23 Aug 2020 22:59:43 +0200 Message-Id: <20200823205944.127796-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200823205944.127796-1-linus.walleij@linaro.org> References: <20200823205944.127796-1-linus.walleij@linaro.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The rtl8366_set_vlan() and rtl8366_set_pvid() get invalid VLANs tossed at it, especially VLAN0, something the hardware and driver cannot handle. Check validity and bail out like we do in the other callbacks. Signed-off-by: Linus Walleij --- drivers/net/dsa/rtl8366.c | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.26.2 diff --git a/drivers/net/dsa/rtl8366.c b/drivers/net/dsa/rtl8366.c index 8f40fbf70a82..7c34c991c834 100644 --- a/drivers/net/dsa/rtl8366.c +++ b/drivers/net/dsa/rtl8366.c @@ -43,6 +43,9 @@ int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member, int ret; int i; + if (!smi->ops->is_vlan_valid(smi, vid)) + return -EINVAL; + dev_dbg(smi->dev, "setting VLAN%d 4k members: 0x%02x, untagged: 0x%02x\n", vid, member, untag); @@ -118,6 +121,9 @@ int rtl8366_set_pvid(struct realtek_smi *smi, unsigned int port, int ret; int i; + if (!smi->ops->is_vlan_valid(smi, vid)) + return -EINVAL; + /* Try to find an existing MC entry for this VID */ for (i = 0; i < smi->num_vlan_mc; i++) { ret = smi->ops->get_vlan_mc(smi, i, &vlanmc); From patchwork Sun Aug 23 20:59:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 248152 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:522:0:0:0:0 with SMTP id h2csp2056312ils; Sun, 23 Aug 2020 14:00:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDJRsp0yZviivIG0QkmGuN+yTJNiQ0atP3NKJzxcn9QlhAmdCUPjcGd1dp2+lKm32BQMhj X-Received: by 2002:aa7:c5c3:: with SMTP id h3mr2793782eds.246.1598216459250; Sun, 23 Aug 2020 14:00:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598216459; cv=none; d=google.com; s=arc-20160816; b=PVa9GYTiZ3nJdhIdHcwOJOq7+9PYqrxP+I/tso7gzzmDUCQUdEQzQPAKY0KSrq3wB8 Z6OICAe7kpyHYX/X/79Qz3oDcqouisfN2MgV5fQnaNiOZ8zVmJlr70zWtTnQKBLgeR8J hJ8mxB0NBWVbDAXLg+Rhu80Iy8zbsBE0t2GE6sZ7qXxS7YpR/zl0HRep1RKlfOmpe/Sz vXG3O0OBiVwrD2LNCDAnkDsWoteaGFavlm7SG1tFS1F6Q7tIo/coPK3s0eLJ2wHexYRl d6dwdy112wtYfb+gs6Ah37f/z44l2yHDfSHdOO/YgtLBW519rHs1FniHU4zg5w7aeOla 0CAw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=n/uQG4/eeVpHy56uC+GghYBZxeH2U6FillnYvCar+c0=; b=H5wHyU8SkS/T87KIZLns2QbLj1rhtNRUgURwAT/y2HZhFshV8N7kjU+G6CK8KYn0Ov z6R25aO22Spsq0UP77hyZuxz68X+VojWE2ix5OW7NCWGVAJiXfvVT8hwHcbgpssGlC1T X8TkZgBUTFT5mBbMxjXUz+1ovezCnSqMoJnGALf6qDo9ztEC7iBqTdByFEdab6870S3z xRHF4xfLIWMGm48OV/aRHWA36YUN2x+zKUF/uLSowosXtboV9eK/gfC4smvkSOHZjXYe pmDDkb9VW5klUi7fnv96BhlJj3bdd3JuqSiL3wx+Td8Fbu3DpO++Z/gCHmSvUnMNtDNn 49VA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GvfmVngG; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id mf26si821827ejb.665.2020.08.23.14.00.58; Sun, 23 Aug 2020 14:00:59 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-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=@linaro.org header.s=google header.b=GvfmVngG; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726832AbgHWVA6 (ORCPT + 9 others); Sun, 23 Aug 2020 17:00:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725995AbgHWVA5 (ORCPT ); Sun, 23 Aug 2020 17:00:57 -0400 Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 852EFC061573 for ; Sun, 23 Aug 2020 14:00:56 -0700 (PDT) Received: by mail-lj1-x243.google.com with SMTP id w25so7351404ljo.12 for ; Sun, 23 Aug 2020 14:00:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=n/uQG4/eeVpHy56uC+GghYBZxeH2U6FillnYvCar+c0=; b=GvfmVngGBKz4vYvmxSB361oZp1f40UdjlDjENbvlTYuHkbsbs0kOFMpvYOJjmM6u3F CjuuI3g/8835ZSfXXAXSz5RytwV0csOJ4NEVdkxDhIPdwTqhBn66T4Hb0W2fIO9zwVsC 4KChdivN76nG4kQKRTW43tF0fsPXSYjpkDn8/iDCdk4nH+3KoN3g+rcveZs6rI258o6f UAHOvHgFeoUJj+i1jXO+xncPWuiYCXIIH/0jPluY3ijj4K7m2nrusvX26GV4pHofqbA2 lLeZw/7xghFf4WpDs1obqK2WrARr+yGq+MWnxwMZr5TuFs2x/WwxnTgKCsjmbbjsyJeg J4cA== 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:mime-version:content-transfer-encoding; bh=n/uQG4/eeVpHy56uC+GghYBZxeH2U6FillnYvCar+c0=; b=lTinMUAxbt9adzXK0n9f6s+leKwK5E4nVRH04CRjsAMNNRDtBpGHqoOucQJsLfHVj/ snQyzbSDVQpz+D/4cHdj130TkkVfo/ufKwbBFIZVvQYNkwiWTBU7GvLepqSCUzLvLqXN s7wZql/rgJxt4zePL/PxqogFjo3Hc3C0HpsuVqJmO5ISX4B3aV3wEvqtZ/zjBhtVx0aN 3S+kQ0cMcU68a3dlHWfajYXAMzNZNAM9V3mNWiRtMLLFXM1jWnThacRI1JynQ34sv71X CjnIQ3174nZT6AgeIwswYLW2U27i2Lfi461AVE+4q5t0yXTJ4hml+rBTWFRrgm2RguiT sHbg== X-Gm-Message-State: AOAM530+XQj30XdyXMcmakkrhKWn90CdpXex9Q7ktbznaEpVoZfXQSu9 svZluC3Y2Eo2g8wMog+ShWjTgg== X-Received: by 2002:a2e:a28d:: with SMTP id k13mr1181292lja.11.1598216454452; Sun, 23 Aug 2020 14:00:54 -0700 (PDT) Received: from localhost.bredbandsbolaget (c-92d7225c.014-348-6c756e10.bbcust.telenor.se. [92.34.215.146]) by smtp.gmail.com with ESMTPSA id y9sm1786184ljm.89.2020.08.23.14.00.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Aug 2020 14:00:53 -0700 (PDT) From: Linus Walleij To: Andrew Lunn , Vivien Didelot , Florian Fainelli , netdev@vger.kernel.org, "David S . Miller" Cc: Linus Walleij Subject: [net-next PATCH 2/2] net: dsa: rtl8366: Refactor VLAN/PVID init Date: Sun, 23 Aug 2020 22:59:44 +0200 Message-Id: <20200823205944.127796-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200823205944.127796-1-linus.walleij@linaro.org> References: <20200823205944.127796-1-linus.walleij@linaro.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The VLANs and PVIDs on the RTL8366 utilizes a "member configuration" (MC) which is largely unexplained in the code. This set-up requires a special ordering: rtl8366_set_pvid() must be called first, followed by rtl8366_set_vlan(), else the MC will not be properly allocated. Relax this by factoring out the code obtaining an MC and reuse the helper in both rtl8366_set_pvid() and rtl8366_set_vlan() so we remove this strict ordering requirement. In the process, add some better comments and debug prints so people who read the code understand what is going on. Signed-off-by: Linus Walleij --- drivers/net/dsa/realtek-smi-core.h | 4 +- drivers/net/dsa/rtl8366.c | 277 +++++++++++++++-------------- 2 files changed, 150 insertions(+), 131 deletions(-) -- 2.26.2 diff --git a/drivers/net/dsa/realtek-smi-core.h b/drivers/net/dsa/realtek-smi-core.h index 9a63b51e1d82..6f2dab7e33d6 100644 --- a/drivers/net/dsa/realtek-smi-core.h +++ b/drivers/net/dsa/realtek-smi-core.h @@ -25,6 +25,9 @@ struct rtl8366_mib_counter { const char *name; }; +/** + * struct rtl8366_vlan_mc - Virtual LAN member configuration + */ struct rtl8366_vlan_mc { u16 vid; u16 untag; @@ -119,7 +122,6 @@ int realtek_smi_setup_mdio(struct realtek_smi *smi); int rtl8366_mc_is_used(struct realtek_smi *smi, int mc_index, int *used); int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member, u32 untag, u32 fid); -int rtl8366_get_pvid(struct realtek_smi *smi, int port, int *val); int rtl8366_set_pvid(struct realtek_smi *smi, unsigned int port, unsigned int vid); int rtl8366_enable_vlan4k(struct realtek_smi *smi, bool enable); diff --git a/drivers/net/dsa/rtl8366.c b/drivers/net/dsa/rtl8366.c index 7c34c991c834..c956d463bb1d 100644 --- a/drivers/net/dsa/rtl8366.c +++ b/drivers/net/dsa/rtl8366.c @@ -36,12 +36,116 @@ int rtl8366_mc_is_used(struct realtek_smi *smi, int mc_index, int *used) } EXPORT_SYMBOL_GPL(rtl8366_mc_is_used); +/** + * rtl8366_obtain_mc() - retrieve or allocate a VLAN member configuration + * @smi: the Realtek SMI device instance + * @vid: the VLAN ID to look up or allocate + * @vlanmc: the pointer will be assigned to a pointer to a valid member config + * if successful + * @index: the pointer will be assigned to the index of the valid member config + * if successful + * @return: 0 or error number + */ +static int rtl8366_obtain_mc(struct realtek_smi *smi, int vid, + struct rtl8366_vlan_mc *vlanmc, int *index) +{ + struct rtl8366_vlan_4k vlan4k; + int ret; + int i; + + /* Try to find an existing member config entry for this VID */ + for (i = 0; i < smi->num_vlan_mc; i++) { + ret = smi->ops->get_vlan_mc(smi, i, vlanmc); + if (ret) { + dev_err(smi->dev, "error searching for VLAN MC %d for VID %d\n", + i, vid); + return ret; + } + + if (vid == vlanmc->vid) { + *index = i; + return 0; + } + } + + /* We have no MC entry for this VID, try to find an empty one */ + for (i = 0; i < smi->num_vlan_mc; i++) { + ret = smi->ops->get_vlan_mc(smi, i, vlanmc); + if (ret) { + dev_err(smi->dev, "error searching for VLAN MC %d for VID %d\n", + i, vid); + return ret; + } + + if (vlanmc->vid == 0 && vlanmc->member == 0) { + /* Update the entry from the 4K table */ + ret = smi->ops->get_vlan_4k(smi, vid, &vlan4k); + if (ret) { + dev_err(smi->dev, "error looking for 4K VLAN MC %d for VID %d\n", + i, vid); + return ret; + } + + vlanmc->vid = vid; + vlanmc->member = vlan4k.member; + vlanmc->untag = vlan4k.untag; + vlanmc->fid = vlan4k.fid; + ret = smi->ops->set_vlan_mc(smi, i, vlanmc); + if (ret) { + dev_err(smi->dev, "unable to set/update VLAN MC %d for VID %d\n", + i, vid); + return ret; + } + + dev_dbg(smi->dev, "created new MC at index %d for VID %d\n", + i, vid); + *index = i; + return 0; + } + } + + /* MC table is full, try to find an unused entry and replace it */ + for (i = 0; i < smi->num_vlan_mc; i++) { + int used; + + ret = rtl8366_mc_is_used(smi, i, &used); + if (ret) + return ret; + + if (!used) { + /* Update the entry from the 4K table */ + ret = smi->ops->get_vlan_4k(smi, vid, &vlan4k); + if (ret) + return ret; + + vlanmc->vid = vid; + vlanmc->member = vlan4k.member; + vlanmc->untag = vlan4k.untag; + vlanmc->fid = vlan4k.fid; + ret = smi->ops->set_vlan_mc(smi, i, vlanmc); + if (ret) { + dev_err(smi->dev, "unable to set/update VLAN MC %d for VID %d\n", + i, vid); + return ret; + } + dev_dbg(smi->dev, "recycled MC at index %i for VID %d\n", + i, vid); + *index = i; + return 0; + } + } + + dev_err(smi->dev, "all VLAN member configurations are in use\n"); + return -EINVAL; +} + int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member, u32 untag, u32 fid) { + struct rtl8366_vlan_mc vlanmc; struct rtl8366_vlan_4k vlan4k; + int index; int ret; - int i; if (!smi->ops->is_vlan_valid(smi, vid)) return -EINVAL; @@ -66,136 +170,56 @@ int rtl8366_set_vlan(struct realtek_smi *smi, int vid, u32 member, "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; - - ret = smi->ops->get_vlan_mc(smi, i, &vlanmc); - if (ret) - return ret; - - if (vid == vlanmc.vid) { - /* update the MC entry */ - 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; - } - } - - return ret; -} -EXPORT_SYMBOL_GPL(rtl8366_set_vlan); - -int rtl8366_get_pvid(struct realtek_smi *smi, int port, int *val) -{ - struct rtl8366_vlan_mc vlanmc; - int ret; - int index; - - ret = smi->ops->get_mc_index(smi, port, &index); + /* Find or allocate a member config for this VID */ + ret = rtl8366_obtain_mc(smi, vid, &vlanmc, &index); if (ret) return ret; - ret = smi->ops->get_vlan_mc(smi, index, &vlanmc); + /* Update the MC entry */ + vlanmc.member |= member; + vlanmc.untag |= untag; + vlanmc.fid = fid; + + /* Commit updates to the MC entry */ + ret = smi->ops->set_vlan_mc(smi, index, &vlanmc); if (ret) - return ret; + dev_err(smi->dev, "failed to commit changes to VLAN MC index %d for VID %d\n", + index, vid); + else + dev_dbg(smi->dev, + "resulting VLAN%d MC members: 0x%02x, untagged: 0x%02x\n", + vid, vlanmc.member, vlanmc.untag); - *val = vlanmc.vid; - return 0; + return ret; } -EXPORT_SYMBOL_GPL(rtl8366_get_pvid); +EXPORT_SYMBOL_GPL(rtl8366_set_vlan); int rtl8366_set_pvid(struct realtek_smi *smi, unsigned int port, unsigned int vid) { struct rtl8366_vlan_mc vlanmc; - struct rtl8366_vlan_4k vlan4k; + int index; int ret; - int i; if (!smi->ops->is_vlan_valid(smi, vid)) return -EINVAL; - /* Try to find an existing MC entry for this VID */ - for (i = 0; i < smi->num_vlan_mc; i++) { - ret = smi->ops->get_vlan_mc(smi, i, &vlanmc); - if (ret) - return ret; - - if (vid == vlanmc.vid) { - ret = smi->ops->set_vlan_mc(smi, i, &vlanmc); - if (ret) - return ret; - - ret = smi->ops->set_mc_index(smi, port, i); - return ret; - } - } - - /* We have no MC entry for this VID, try to find an empty one */ - for (i = 0; i < smi->num_vlan_mc; i++) { - ret = smi->ops->get_vlan_mc(smi, i, &vlanmc); - if (ret) - return ret; - - if (vlanmc.vid == 0 && vlanmc.member == 0) { - /* Update the entry from the 4K table */ - ret = smi->ops->get_vlan_4k(smi, vid, &vlan4k); - if (ret) - return ret; - - vlanmc.vid = vid; - vlanmc.member = vlan4k.member; - vlanmc.untag = vlan4k.untag; - vlanmc.fid = vlan4k.fid; - ret = smi->ops->set_vlan_mc(smi, i, &vlanmc); - if (ret) - return ret; - - ret = smi->ops->set_mc_index(smi, port, i); - return ret; - } - } - - /* MC table is full, try to find an unused entry and replace it */ - for (i = 0; i < smi->num_vlan_mc; i++) { - int used; - - ret = rtl8366_mc_is_used(smi, i, &used); - if (ret) - return ret; - - if (!used) { - /* Update the entry from the 4K table */ - ret = smi->ops->get_vlan_4k(smi, vid, &vlan4k); - if (ret) - return ret; - - vlanmc.vid = vid; - vlanmc.member = vlan4k.member; - vlanmc.untag = vlan4k.untag; - vlanmc.fid = vlan4k.fid; - ret = smi->ops->set_vlan_mc(smi, i, &vlanmc); - if (ret) - return ret; + /* Find or allocate a member config for this VID */ + ret = rtl8366_obtain_mc(smi, vid, &vlanmc, &index); + if (ret) + return ret; - ret = smi->ops->set_mc_index(smi, port, i); - return ret; - } + ret = smi->ops->set_mc_index(smi, port, index); + if (ret) { + dev_err(smi->dev, "set PVID: failed to set MC index %d for port %d\n", + index, port); + return ret; } - dev_err(smi->dev, - "all VLAN member configurations are in use\n"); + dev_dbg(smi->dev, "set PVID: the PVID for port %d set to %d using existing MC index %d\n", + port, vid, index); - return -ENOSPC; + return 0; } EXPORT_SYMBOL_GPL(rtl8366_set_pvid); @@ -395,7 +419,8 @@ void rtl8366_vlan_add(struct dsa_switch *ds, int port, if (!smi->ops->is_vlan_valid(smi, vid)) return; - dev_info(smi->dev, "add VLAN on port %d, %s, %s\n", + dev_info(smi->dev, "add VLAN %d on port %d, %s, %s\n", + vlan->vid_begin, port, untagged ? "untagged" : "tagged", pvid ? " PVID" : "no PVID"); @@ -404,34 +429,26 @@ void rtl8366_vlan_add(struct dsa_switch *ds, int port, dev_err(smi->dev, "port is DSA or CPU port\n"); for (vid = vlan->vid_begin; vid <= vlan->vid_end; vid++) { - int pvid_val = 0; - - dev_info(smi->dev, "add VLAN %04x\n", vid); member |= BIT(port); if (untagged) untag |= BIT(port); - /* To ensure that we have a valid MC entry for this VLAN, - * initialize the port VLAN ID here. - */ - ret = rtl8366_get_pvid(smi, port, &pvid_val); - if (ret < 0) { - dev_err(smi->dev, "could not lookup PVID for port %d\n", - port); - return; - } - if (pvid_val == 0) { - ret = rtl8366_set_pvid(smi, port, vid); - if (ret < 0) - return; - } - ret = rtl8366_set_vlan(smi, vid, member, untag, 0); if (ret) dev_err(smi->dev, "failed to set up VLAN %04x", vid); + + ret = rtl8366_set_pvid(smi, port, vid); + if (ret) + dev_err(smi->dev, + "failed to set PVID on port %d to VLAN %04x", + port, vid); + + if (!ret) + dev_dbg(smi->dev, "VLAN add: added VLAN %04x with PVID on port %d\n", + vid, port); } } EXPORT_SYMBOL_GPL(rtl8366_vlan_add);