From patchwork Mon Aug 3 20:03:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1340467 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=20161025 header.b=aCgsaSY3; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BL83b5hXFz9sTM for ; Tue, 4 Aug 2020 06:04:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728752AbgHCUEC (ORCPT ); Mon, 3 Aug 2020 16:04:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728229AbgHCUEA (ORCPT ); Mon, 3 Aug 2020 16:04:00 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43C49C06174A for ; Mon, 3 Aug 2020 13:04:00 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id o5so2695389pgb.2 for ; Mon, 03 Aug 2020 13:04:00 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=CSseXwXnluq7t5g5Wz8yrvikyKfhawFC9+F/2pv8ZFg=; b=aCgsaSY3ChwkzckfsxeXRowR9n6wmc//OdxxNf9aLB40/AkFI3pJHLEq8RHqC6dw04 iD6c4pKEirUDr3J9AJVPDdzPy7JL9qLzqQNSjNryYYeddM8sU9TymNLslICLUTpwWWS+ X8ICBkrXfVGtMBv2eBTiELZwHMTyVWlwtGmsBR2E0eThEiEgzkEco91Pxe4QMzYx8x9J YMK6rRJ3Z9E8kndRep3NaI556UJ02AV+qP5zS+PglY3JQytyvJv5hd+v4qShKZzImlYD 06sPtybhpJlZ93aDXgTlzJm4YS62wSb+ZfvgU5acrmDebeiXSjDtSNoEgL/osqhROYAz 1gCA== 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=CSseXwXnluq7t5g5Wz8yrvikyKfhawFC9+F/2pv8ZFg=; b=LR6uWkxKGonEGdCbBxcrcwQp5zf+Mp4kq/4SqfkpibThmAfDrNmDSWrKzvUBCV8Bdm mp0WfdvVySW7MTMlvzrGKXiYgDvk2rixNGz1vwcbCaPQZLqEKdjfrSGTytxP/CcOd7fr 2f2q699lR71Pr55bORiLz+Ify22QyWh8zXv4xpQqXMthB083pSCQwnMXQfCVBub7VrGX A5WeQv/1h1YCWdjlhgtKvuA7Uob2dmNQbLQknvJ02Crh/7+ez1b8FoCd8uY4nOea8rlS vRs8hrVZX/LrugV53s3uw44vQRoqJlnYKkM8M347hYnPyznPagF58MtKBbGGmEYkV+0R ZTxg== X-Gm-Message-State: AOAM532oAv8Dc4NzXRzP/W/bkphjMQ31EEgDN8y9xUifjUBGM0dizHwb bnfTUzlMajAxf2+JJD4Nl4GYJBCu X-Google-Smtp-Source: ABdhPJzngm4Wq6hpyfjOXtf0pbBQ6TlOcmu66idBMfVAmJtcmCDNjldkLpJ1Do0HDDt49ANGqFGyGg== X-Received: by 2002:a63:6dc2:: with SMTP id i185mr15005648pgc.104.1596485039429; Mon, 03 Aug 2020 13:03:59 -0700 (PDT) Received: from localhost.localdomain (ip68-111-84-250.oc.oc.cox.net. [68.111.84.250]) by smtp.gmail.com with ESMTPSA id u24sm20017521pfm.211.2020.08.03.13.03.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2020 13:03:58 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Andrew Lunn , Vivien Didelot , "David S. Miller" , Jakub Kicinski Subject: [PATCH net-next 1/5] net: dsa: loop: PVID should be per-port Date: Mon, 3 Aug 2020 13:03:50 -0700 Message-Id: <20200803200354.45062-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200803200354.45062-1-f.fainelli@gmail.com> References: <20200803200354.45062-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The PVID should be per-port, this is a preliminary change to support a 802.1Q data path in the driver. Signed-off-by: Florian Fainelli Reviewed-by: Andrew Lunn --- drivers/net/dsa/dsa_loop.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c index f8bc85a6e670..4a57238cdfd8 100644 --- a/drivers/net/dsa/dsa_loop.c +++ b/drivers/net/dsa/dsa_loop.c @@ -45,6 +45,7 @@ static struct dsa_loop_mib_entry dsa_loop_mibs[] = { struct dsa_loop_port { struct dsa_loop_mib_entry mib[__DSA_LOOP_CNT_MAX]; + u16 pvid; }; #define DSA_LOOP_VLANS 5 @@ -55,7 +56,6 @@ struct dsa_loop_priv { struct dsa_loop_vlan vlans[DSA_LOOP_VLANS]; struct net_device *netdev; struct dsa_loop_port ports[DSA_MAX_PORTS]; - u16 pvid; }; static struct phy_device *phydevs[PHY_MAX_ADDR]; @@ -224,7 +224,7 @@ static void dsa_loop_port_vlan_add(struct dsa_switch *ds, int port, } if (pvid) - ps->pvid = vid; + ps->ports[port].pvid = vid; } static int dsa_loop_port_vlan_del(struct dsa_switch *ds, int port, @@ -234,7 +234,7 @@ static int dsa_loop_port_vlan_del(struct dsa_switch *ds, int port, struct dsa_loop_priv *ps = ds->priv; struct mii_bus *bus = ps->bus; struct dsa_loop_vlan *vl; - u16 vid, pvid = ps->pvid; + u16 vid, pvid = ps->ports[port].pvid; /* Just do a sleeping operation to make lockdep checks effective */ mdiobus_read(bus, ps->port_base + port, MII_BMSR); @@ -252,7 +252,7 @@ static int dsa_loop_port_vlan_del(struct dsa_switch *ds, int port, dev_dbg(ds->dev, "%s: port: %d vlan: %d, %stagged, pvid: %d\n", __func__, port, vid, untagged ? "un" : "", pvid); } - ps->pvid = pvid; + ps->ports[port].pvid = pvid; return 0; } From patchwork Mon Aug 3 20:03:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1340463 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=20161025 header.b=oBIsRWXR; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BL83S5YB3z9sTM for ; Tue, 4 Aug 2020 06:04:04 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728794AbgHCUEC (ORCPT ); Mon, 3 Aug 2020 16:04:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728714AbgHCUEB (ORCPT ); Mon, 3 Aug 2020 16:04:01 -0400 Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6763C06174A for ; Mon, 3 Aug 2020 13:04:01 -0700 (PDT) Received: by mail-pl1-x641.google.com with SMTP id q17so21456990pls.9 for ; Mon, 03 Aug 2020 13:04:01 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=YVPszMbwLuPAYUh6gtr8v5TkolvvDU333qnxOlVp1Sg=; b=oBIsRWXRuMFgeiJIimoFC5QisEjNJkhqvL7ikXhCZAuYX8wj+4IGa5hyFweng4+trp oDqGLejN5W/vAWIhzM2kGIQTE3V8wYjtYz6ZLpCFJ68VghsMAgGWLchCMMBSxGNe/J8T wf2zxTomvp0ldgVa/40v3L5b+cIw9z6Po5C6n+7AB9CsAr9PrFqnfKKBas9f94s33HaM IaUpqPzQWvOgWJfdaGBsfjVq1K4LjK3sm71AJ9i8IGv8GmyxuovekPEX5hHyALkeEDEW OjsDDla0yKfNvBSikO8r6HL5GRyoHf6U13novQ8YEVutrxI/d4Tl97YpUKwNYkvuj8Cv 6YSA== 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=YVPszMbwLuPAYUh6gtr8v5TkolvvDU333qnxOlVp1Sg=; b=mBEL8brGNxV6Mcsri0PLQGIceCB73eRA0+Qd0/FEp4iAFKNebjbMt7bKIoQ+HOT1Dw 3QcQYtazaaWeWjdBFa0ZqYypwUdP/O90MC31NS8jfkp1PGKJJ1QqqRUJYIuBC1zS0idJ 9vD7othgvVYC2Vl/Ip1gKFXBik1VwEtWzm1k2zkabifbKan+d+Vpj/iz1kQ5wCgLSEPF JlDvB3BKUs89GoYvunr6ROAG8dEXkJ0egUGc4dKdT11WHGYtPziFyJGP8z+Jym0ZZ5bs U5Sr8r2FPfiUcxk1j0yjWLe1b68zAlYvwYbaMnTLtR7e2UEkPBAx0JjDohGDqIEXqUQX yZPA== X-Gm-Message-State: AOAM53243ZFiHmmNgiSOIqHYCt02CBRJs+HOtVGRsnMGMkABKVPhbsQw I2R0hivfvnUr8eq0DOsp7+kMBONC X-Google-Smtp-Source: ABdhPJyUq/ZpvCUE7+MPrdYX430X7MNrrsxF/4EeXlFlQwYpjRQsV0lFtGfI+suD+fhmHxJ5DpvRMA== X-Received: by 2002:a17:902:b943:: with SMTP id h3mr16680350pls.38.1596485040924; Mon, 03 Aug 2020 13:04:00 -0700 (PDT) Received: from localhost.localdomain (ip68-111-84-250.oc.oc.cox.net. [68.111.84.250]) by smtp.gmail.com with ESMTPSA id u24sm20017521pfm.211.2020.08.03.13.03.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2020 13:04:00 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Andrew Lunn , Vivien Didelot , "David S. Miller" , Jakub Kicinski Subject: [PATCH net-next 2/5] net: dsa: loop: Support 4K VLANs Date: Mon, 3 Aug 2020 13:03:51 -0700 Message-Id: <20200803200354.45062-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200803200354.45062-1-f.fainelli@gmail.com> References: <20200803200354.45062-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Allocate a 4K array of VLANs instead of limiting ourselves to just 5 which is arbitrary. Signed-off-by: Florian Fainelli Reviewed-by: Andrew Lunn --- drivers/net/dsa/dsa_loop.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c index 4a57238cdfd8..6e97b44c6f3f 100644 --- a/drivers/net/dsa/dsa_loop.c +++ b/drivers/net/dsa/dsa_loop.c @@ -48,12 +48,10 @@ struct dsa_loop_port { u16 pvid; }; -#define DSA_LOOP_VLANS 5 - struct dsa_loop_priv { struct mii_bus *bus; unsigned int port_base; - struct dsa_loop_vlan vlans[DSA_LOOP_VLANS]; + struct dsa_loop_vlan vlans[VLAN_N_VID]; struct net_device *netdev; struct dsa_loop_port ports[DSA_MAX_PORTS]; }; @@ -191,7 +189,7 @@ dsa_loop_port_vlan_prepare(struct dsa_switch *ds, int port, /* Just do a sleeping operation to make lockdep checks effective */ mdiobus_read(bus, ps->port_base + port, MII_BMSR); - if (vlan->vid_end > DSA_LOOP_VLANS) + if (vlan->vid_end > ARRAY_SIZE(ps->vlans)) return -ERANGE; return 0; From patchwork Mon Aug 3 20:03:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1340466 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=20161025 header.b=tM/fuRuW; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BL83Y6njJz9sTS for ; Tue, 4 Aug 2020 06:04:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728816AbgHCUEF (ORCPT ); Mon, 3 Aug 2020 16:04:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728714AbgHCUED (ORCPT ); Mon, 3 Aug 2020 16:04:03 -0400 Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B61ACC06174A for ; Mon, 3 Aug 2020 13:04:03 -0700 (PDT) Received: by mail-pg1-x543.google.com with SMTP id t6so20698059pgq.1 for ; Mon, 03 Aug 2020 13:04:03 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=6219eW0CRVUqlw/+reyzl7L8d8bWSx4EXYUvMNU5nBY=; b=tM/fuRuW/udxU6ZYnUqC8Jd4ff8GVmzr+1YW/IUIDcIrePPwAUZH98A+jiMHlIt60T xH9kIBxQEyd6JBoAAa6gepUSc6gYRIlcBt5C0xbxkpr2EVhqC+m4oWN4xVUutd8J3d5i XEeyIQTpihM5VKGPkNxaApgUmJOg6P8YGYaixOfDROf2zUJ4meZ7FveEQcBrcoJhGJW4 /sIdvIWlSibS7yM6oEc7SsrqeEHEwh+zmzT8XaCykxSyBaMAJcohDioLd9a/F/FcJdgu OvY4nsku6m3cq1WlNvOR5LyOfNmkdkL19IMliclaqWYEdJVfYMDhjIehnLYCRiheADmc U2ZQ== 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=6219eW0CRVUqlw/+reyzl7L8d8bWSx4EXYUvMNU5nBY=; b=e1k/h9sXUn4g15fahHFxho0oQFtkwInW0KtqiLAOYgg2yH80QYreR0EffuREn4cB0n Xx+sa1IeRuE9aagZgZsfFSJ6nHSdAffDANs9NcNsfTVRse8lEcN1rHYdZW/HF7OrQy+o khAXOSL9zAypFGz5718Lx6JmnzrwSrDLhWbwH0dFbiflknskOpJI2OeHTVXkAsgg9pFy gB4yYudncj8EDRckgg8odORCtrJFWCH2PuRpYwfXk/blZXR0VJE4laP4bPLH2BvHXE90 XJCDyv5n6nw7AxDmAk2DPOBFgKjRR7URXdzgi4zX3BWAsvIFMpTF2KhPRh3XI+NQwKcY xyWQ== X-Gm-Message-State: AOAM532ERv+wPX4y6FZ74tg44z6NUSKI5MtY5e/lolAFhj4RJMstg48u 4xwn4BUC2SybhAqMqzJVVLKbaHpg X-Google-Smtp-Source: ABdhPJzZwzIHHr+KJ66KNMIb9+Z2pAlAdqBJoLkIfcE2RSV7vsYBmYKxRNoL4zqnECYxwpINA74CRQ== X-Received: by 2002:a63:5049:: with SMTP id q9mr119664pgl.219.1596485042359; Mon, 03 Aug 2020 13:04:02 -0700 (PDT) Received: from localhost.localdomain (ip68-111-84-250.oc.oc.cox.net. [68.111.84.250]) by smtp.gmail.com with ESMTPSA id u24sm20017521pfm.211.2020.08.03.13.04.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2020 13:04:01 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Andrew Lunn , Vivien Didelot , "David S. Miller" , Jakub Kicinski Subject: [PATCH net-next 3/5] net: dsa: loop: Move data structures to header Date: Mon, 3 Aug 2020 13:03:52 -0700 Message-Id: <20200803200354.45062-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200803200354.45062-1-f.fainelli@gmail.com> References: <20200803200354.45062-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In preparation for adding support for a mockup data path, move the driver data structures to include/linux/dsa/loop.h such that we can share them between net/dsa/ and drivers/net/dsa/ later on. Signed-off-by: Florian Fainelli --- drivers/net/dsa/dsa_loop.c | 32 +----------------------------- include/linux/dsa/loop.h | 40 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 31 deletions(-) create mode 100644 include/linux/dsa/loop.h diff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c index 6e97b44c6f3f..ed0b580c9944 100644 --- a/drivers/net/dsa/dsa_loop.c +++ b/drivers/net/dsa/dsa_loop.c @@ -14,28 +14,11 @@ #include #include #include +#include #include #include "dsa_loop.h" -struct dsa_loop_vlan { - u16 members; - u16 untagged; -}; - -struct dsa_loop_mib_entry { - char name[ETH_GSTRING_LEN]; - unsigned long val; -}; - -enum dsa_loop_mib_counters { - DSA_LOOP_PHY_READ_OK, - DSA_LOOP_PHY_READ_ERR, - DSA_LOOP_PHY_WRITE_OK, - DSA_LOOP_PHY_WRITE_ERR, - __DSA_LOOP_CNT_MAX, -}; - static struct dsa_loop_mib_entry dsa_loop_mibs[] = { [DSA_LOOP_PHY_READ_OK] = { "phy_read_ok", }, [DSA_LOOP_PHY_READ_ERR] = { "phy_read_err", }, @@ -43,19 +26,6 @@ static struct dsa_loop_mib_entry dsa_loop_mibs[] = { [DSA_LOOP_PHY_WRITE_ERR] = { "phy_write_err", }, }; -struct dsa_loop_port { - struct dsa_loop_mib_entry mib[__DSA_LOOP_CNT_MAX]; - u16 pvid; -}; - -struct dsa_loop_priv { - struct mii_bus *bus; - unsigned int port_base; - struct dsa_loop_vlan vlans[VLAN_N_VID]; - struct net_device *netdev; - struct dsa_loop_port ports[DSA_MAX_PORTS]; -}; - static struct phy_device *phydevs[PHY_MAX_ADDR]; static enum dsa_tag_protocol dsa_loop_get_protocol(struct dsa_switch *ds, diff --git a/include/linux/dsa/loop.h b/include/linux/dsa/loop.h new file mode 100644 index 000000000000..bb39401a8056 --- /dev/null +++ b/include/linux/dsa/loop.h @@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef DSA_LOOP_H +#define DSA_LOOP_H + +#include +#include +#include + +struct dsa_loop_vlan { + u16 members; + u16 untagged; +}; + +struct dsa_loop_mib_entry { + char name[ETH_GSTRING_LEN]; + unsigned long val; +}; + +enum dsa_loop_mib_counters { + DSA_LOOP_PHY_READ_OK, + DSA_LOOP_PHY_READ_ERR, + DSA_LOOP_PHY_WRITE_OK, + DSA_LOOP_PHY_WRITE_ERR, + __DSA_LOOP_CNT_MAX, +}; + +struct dsa_loop_port { + struct dsa_loop_mib_entry mib[__DSA_LOOP_CNT_MAX]; + u16 pvid; +}; + +struct dsa_loop_priv { + struct mii_bus *bus; + unsigned int port_base; + struct dsa_loop_vlan vlans[VLAN_N_VID]; + struct net_device *netdev; + struct dsa_loop_port ports[DSA_MAX_PORTS]; +}; + +#endif /* DSA_LOOP_H */ From patchwork Mon Aug 3 20:03:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1340464 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=20161025 header.b=Mo+zSk4u; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BL83W3nmpz9sTM for ; Tue, 4 Aug 2020 06:04:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728823AbgHCUEG (ORCPT ); Mon, 3 Aug 2020 16:04:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728800AbgHCUEF (ORCPT ); Mon, 3 Aug 2020 16:04:05 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34C80C06174A for ; Mon, 3 Aug 2020 13:04:05 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id e8so20671229pgc.5 for ; Mon, 03 Aug 2020 13:04:05 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=w3YhjIQaukEPPLH/jNkBUf/vMt37cfb63+G9c5Z5O/k=; b=Mo+zSk4uIxSmEmPk2t1x6aYKKTaLxhIOFmVd6EUr2gfAc7ULE7st8V54SGJGCtzWk/ 0mPru642TUHRdumqCed1yhdIw08JaDiJYMoryDsTvLVz9kSRz5i2NMk/qq6cw0/NnPVl waSPpm0pkEqgku1zaUu/wT0U2xX0LWXlgxr+NzTPYpT0VHbqv9e+H3iiS54mdCXHxL4b jPSUZOtbyQfIfXWLSEyroNUJqw7nuyGMAU9wELwrguLYi89n8L4qPLQGACO6mr0PV4YS GADGG3ZAaOYmryC6wiZaFDAqWiWO9x9L+MDBYczPNJv36jTlCd/hwKPBfMujzO1joGtW zq0Q== 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=w3YhjIQaukEPPLH/jNkBUf/vMt37cfb63+G9c5Z5O/k=; b=i43sWVwe5QtwfCOoMPeiRrf4hwUYY+E1aH7WLH+pbdYtM8Ayy1Mtb5HmOm/XhQeJPO 0u0SeJnSKLqZX5RLKqKsNXTnn8zp+IBkCC+uZA/JoSDnaKWk/ukWu81gZgiMZkHa6+Mh /shz1A2QSWupT2V9VEQBU3k983Uii+gWSQ7Jg03N/HUt1K3STUcbKZniKXDLbRNGzSRC hG5bjFFO6hKYcMeis5KIkq3WGFRufic1Noxk+jBOTYfbaaYoX+0Yw0gqDZV1X0awb/Yv v+67rLQcvhqKznwMKLHagKKS/o5xK+z+GGdkNi8ZaL6PYwXP9MUEUPeB6uv/MO4cj2zy hWQA== X-Gm-Message-State: AOAM530FyJrs1k7XFOsvqDObm79HywAkmE9miu0L281X6LwCuIDqp0s5 +ZrpcdvDJ99MfKlq8PV+yRW1Ig3m X-Google-Smtp-Source: ABdhPJzaRXBkckWdfsE4UYuvLcxCJPwMFz5gtNSCB+GwGcXYNYIjvhnrAmcLbKPYMVMf91L9/HqWzA== X-Received: by 2002:a62:6302:: with SMTP id x2mr17005957pfb.26.1596485044363; Mon, 03 Aug 2020 13:04:04 -0700 (PDT) Received: from localhost.localdomain (ip68-111-84-250.oc.oc.cox.net. [68.111.84.250]) by smtp.gmail.com with ESMTPSA id u24sm20017521pfm.211.2020.08.03.13.04.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2020 13:04:03 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Andrew Lunn , Vivien Didelot , "David S. Miller" , Jakub Kicinski Subject: [PATCH net-next 4/5] net: dsa: loop: Wire-up MTU callbacks Date: Mon, 3 Aug 2020 13:03:53 -0700 Message-Id: <20200803200354.45062-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200803200354.45062-1-f.fainelli@gmail.com> References: <20200803200354.45062-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org For now we simply store the port MTU into a per-port member. Signed-off-by: Florian Fainelli Reviewed-by: Andrew Lunn --- drivers/net/dsa/dsa_loop.c | 17 +++++++++++++++++ include/linux/dsa/loop.h | 1 + 2 files changed, 18 insertions(+) diff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c index ed0b580c9944..6a7d661b5a59 100644 --- a/drivers/net/dsa/dsa_loop.c +++ b/drivers/net/dsa/dsa_loop.c @@ -225,6 +225,21 @@ static int dsa_loop_port_vlan_del(struct dsa_switch *ds, int port, return 0; } +static int dsa_loop_port_change_mtu(struct dsa_switch *ds, int port, + int new_mtu) +{ + struct dsa_loop_priv *priv = ds->priv; + + priv->ports[port].mtu = new_mtu; + + return 0; +} + +static int dsa_loop_port_max_mtu(struct dsa_switch *ds, int port) +{ + return ETH_MAX_MTU; +} + static const struct dsa_switch_ops dsa_loop_driver = { .get_tag_protocol = dsa_loop_get_protocol, .setup = dsa_loop_setup, @@ -241,6 +256,8 @@ static const struct dsa_switch_ops dsa_loop_driver = { .port_vlan_prepare = dsa_loop_port_vlan_prepare, .port_vlan_add = dsa_loop_port_vlan_add, .port_vlan_del = dsa_loop_port_vlan_del, + .port_change_mtu = dsa_loop_port_change_mtu, + .port_max_mtu = dsa_loop_port_max_mtu, }; static int dsa_loop_drv_probe(struct mdio_device *mdiodev) diff --git a/include/linux/dsa/loop.h b/include/linux/dsa/loop.h index bb39401a8056..5a3470bcc8a7 100644 --- a/include/linux/dsa/loop.h +++ b/include/linux/dsa/loop.h @@ -27,6 +27,7 @@ enum dsa_loop_mib_counters { struct dsa_loop_port { struct dsa_loop_mib_entry mib[__DSA_LOOP_CNT_MAX]; u16 pvid; + int mtu; }; struct dsa_loop_priv { From patchwork Mon Aug 3 20:03:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1340465 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=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; 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.a=rsa-sha256 header.s=20161025 header.b=rc7Xij9Y; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BL83Y0VMYz9sTM for ; Tue, 4 Aug 2020 06:04:09 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728493AbgHCUEI (ORCPT ); Mon, 3 Aug 2020 16:04:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728800AbgHCUEG (ORCPT ); Mon, 3 Aug 2020 16:04:06 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E780C06174A for ; Mon, 3 Aug 2020 13:04:06 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id o5so2695662pgb.2 for ; Mon, 03 Aug 2020 13:04:06 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=EldVOy+QJIUng9Vai17ILIFgbD/qmlvnl8hO2VV5nAQ=; b=rc7Xij9YXdMEjQZ/kPWOhMxqVLuEp5ebItse6DOHQlWjRtShv79JOIfgiy36Kv08M+ gh4i/ueZ3SET6keaf9oqKpXx+MTftrJvFq01JnOr6gQLCXUGGS91onE9uajndQx3Atkq EYo4bmMS2aGtRrDHyTpgJxhrdu60Nre1ltMT7B8oqXPwnDoGa0nCMs6C15SL0gWvbzY2 xBqa/fN7msb0/ddFoZ2HwzMLpwEHZktka1s+vGYYwmRF2GQTzftWHEJpmeokT/sQ/lbE MgxnybkTt6bKYXds2igxOO275KQwCU7FL1HVPGmNNTSlVVPm0sdoxTWORgbCwM1zZNGN vBFA== 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=EldVOy+QJIUng9Vai17ILIFgbD/qmlvnl8hO2VV5nAQ=; b=k3Ezlz39TUtxUOxMRlmpTKiW8srMCcqLjABrVdoQeNweFwb7FvOXiCAlSOZ6hJO1G8 mF6buudChIdjO6Bmh0CNlYe15qWFtenL57Iw/wXhReMzbXyRZv2VepkKujTV8xZ7Txtv 11RZBFxs8FGQpWRMCufcrccVjYHCZEIUdfuKbB9olfEf8813/jPHN42KlYnwDxVoGkpq yTiPh6LHzk3FmIILhcuVIyVy77wR0I0A2NdVz4694A3WP+FQqY1WOgUdASOnbbKZ5lfe e6AMe7v1c8La+9QGROaXE/u8PC/qDXFzY23SYRlAAlu97xXAiM+NpzFLS8gaIgMIuKvF ivCw== X-Gm-Message-State: AOAM531lUxwbMe6euNVK8otOn+qXEsSiDFZxkLz1+MrTX6jQCyWF+UO0 FFGhp4M/SpjPyb0LzbcUU5WHOnzp X-Google-Smtp-Source: ABdhPJyz6ew7TiurmKuFmITYV1MRKKsJs9tYzWSJhae7fmyBBHyB2XDhqZc8GEVCVxvRlb9rfPD5YQ== X-Received: by 2002:a63:1d51:: with SMTP id d17mr5495514pgm.162.1596485045806; Mon, 03 Aug 2020 13:04:05 -0700 (PDT) Received: from localhost.localdomain (ip68-111-84-250.oc.oc.cox.net. [68.111.84.250]) by smtp.gmail.com with ESMTPSA id u24sm20017521pfm.211.2020.08.03.13.04.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Aug 2020 13:04:05 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Andrew Lunn , Vivien Didelot , "David S. Miller" , Jakub Kicinski Subject: [PATCH net-next 5/5] net: dsa: loop: Set correct number of ports Date: Mon, 3 Aug 2020 13:03:54 -0700 Message-Id: <20200803200354.45062-6-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200803200354.45062-1-f.fainelli@gmail.com> References: <20200803200354.45062-1-f.fainelli@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We only support DSA_LOOP_NUM_PORTS in the switch, do not tell the DSA core to allocate up to DSA_MAX_PORTS which is nearly the double (6 vs. 11). Signed-off-by: Florian Fainelli Reviewed-by: Andrew Lunn --- drivers/net/dsa/dsa_loop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c index 6a7d661b5a59..eb600b3dbf26 100644 --- a/drivers/net/dsa/dsa_loop.c +++ b/drivers/net/dsa/dsa_loop.c @@ -275,7 +275,7 @@ static int dsa_loop_drv_probe(struct mdio_device *mdiodev) return -ENOMEM; ds->dev = &mdiodev->dev; - ds->num_ports = DSA_MAX_PORTS; + ds->num_ports = DSA_LOOP_NUM_PORTS; ps = devm_kzalloc(&mdiodev->dev, sizeof(*ps), GFP_KERNEL); if (!ps)