Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Fri, 12 Sep 2025 00:37:09 +0000 (17:37 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 25 Sep 2025 18:00:59 +0000 (11:00 -0700)
Cross-merge networking fixes after downstream PR (net-6.17-rc8).

Conflicts:

drivers/net/can/spi/hi311x.c
  6b6968084721 ("can: hi311x: fix null pointer dereference when resuming from sleep before interface was enabled")
  27ce71e1ce81 ("net: WQ_PERCPU added to alloc_workqueue users")
https://lore.kernel.org/72ce7599-1b5b-464a-a5de-228ff9724701@kernel.org

net/smc/smc_loopback.c
drivers/dibs/dibs_loopback.c
  a35c04de2565 ("net/smc: fix warning in smc_rx_splice() when calling get_page()")
  cc21191b584c ("dibs: Move data path to dibs layer")
https://lore.kernel.org/74368a5c-48ac-4f8e-a198-40ec1ed3cf5f@kernel.org

Adjacent changes:

drivers/net/dsa/lantiq/lantiq_gswip.c
  c0054b25e2f1 ("net: dsa: lantiq_gswip: move gswip_add_single_port_br() call to port_setup()")
  7a1eaef0a791 ("net: dsa: lantiq_gswip: support model-specific mac_select_pcs()")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
12 files changed:
1  2 
MAINTAINERS
drivers/dibs/dibs_loopback.c
drivers/net/can/spi/hi311x.c
drivers/net/dsa/lantiq/lantiq_gswip.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/marvell/octeontx2/af/cgx.c
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
drivers/net/tun.c
include/uapi/linux/ptp_clock.h
net/core/skbuff.c
net/ipv4/nexthop.c

diff --cc MAINTAINERS
Simple merge
index b3fd0f8,0000000..aa029e2
mode 100644,000000..100644
--- /dev/null
@@@ -1,356 -1,0 +1,361 @@@
-       dmb_node->cpu_addr = kzalloc(dmb_node->len, GFP_KERNEL |
-                                    __GFP_NOWARN | __GFP_NORETRY |
-                                    __GFP_NOMEMALLOC);
-       if (!dmb_node->cpu_addr) {
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + *  Functions for dibs loopback/loopback-ism device.
 + *
 + *  Copyright (c) 2024, Alibaba Inc.
 + *
 + *  Author: Wen Gu <guwen@linux.alibaba.com>
 + *          Tony Lu <tonylu@linux.alibaba.com>
 + *
 + */
 +
 +#include <linux/bitops.h>
 +#include <linux/device.h>
 +#include <linux/dibs.h>
++#include <linux/mm.h>
 +#include <linux/slab.h>
 +#include <linux/spinlock.h>
 +#include <linux/types.h>
 +
 +#include "dibs_loopback.h"
 +
 +#define DIBS_LO_SUPPORT_NOCOPY        0x1
 +#define DIBS_DMA_ADDR_INVALID (~(dma_addr_t)0)
 +
 +static const char dibs_lo_dev_name[] = "lo";
 +/* global loopback device */
 +static struct dibs_lo_dev *lo_dev;
 +
 +static u16 dibs_lo_get_fabric_id(struct dibs_dev *dibs)
 +{
 +      return DIBS_LOOPBACK_FABRIC;
 +}
 +
 +static int dibs_lo_query_rgid(struct dibs_dev *dibs, const uuid_t *rgid,
 +                            u32 vid_valid, u32 vid)
 +{
 +      /* rgid should be the same as lgid */
 +      if (!uuid_equal(rgid, &dibs->gid))
 +              return -ENETUNREACH;
 +      return 0;
 +}
 +
 +static int dibs_lo_max_dmbs(void)
 +{
 +      return DIBS_LO_MAX_DMBS;
 +}
 +
 +static int dibs_lo_register_dmb(struct dibs_dev *dibs, struct dibs_dmb *dmb,
 +                              struct dibs_client *client)
 +{
 +      struct dibs_lo_dmb_node *dmb_node, *tmp_node;
 +      struct dibs_lo_dev *ldev;
++      struct folio *folio;
 +      unsigned long flags;
 +      int sba_idx, rc;
 +
 +      ldev = dibs->drv_priv;
 +      sba_idx = dmb->idx;
 +      /* check space for new dmb */
 +      for_each_clear_bit(sba_idx, ldev->sba_idx_mask, DIBS_LO_MAX_DMBS) {
 +              if (!test_and_set_bit(sba_idx, ldev->sba_idx_mask))
 +                      break;
 +      }
 +      if (sba_idx == DIBS_LO_MAX_DMBS)
 +              return -ENOSPC;
 +
 +      dmb_node = kzalloc(sizeof(*dmb_node), GFP_KERNEL);
 +      if (!dmb_node) {
 +              rc = -ENOMEM;
 +              goto err_bit;
 +      }
 +
 +      dmb_node->sba_idx = sba_idx;
 +      dmb_node->len = dmb->dmb_len;
-       kfree(dmb_node->cpu_addr);
++
++      /* not critical; fail under memory pressure and fallback to TCP */
++      folio = folio_alloc(GFP_KERNEL | __GFP_NOWARN | __GFP_NOMEMALLOC |
++                          __GFP_NORETRY | __GFP_ZERO,
++                          get_order(dmb_node->len));
++      if (!folio) {
 +              rc = -ENOMEM;
 +              goto err_node;
 +      }
++      dmb_node->cpu_addr = folio_address(folio);
 +      dmb_node->dma_addr = DIBS_DMA_ADDR_INVALID;
 +      refcount_set(&dmb_node->refcnt, 1);
 +
 +again:
 +      /* add new dmb into hash table */
 +      get_random_bytes(&dmb_node->token, sizeof(dmb_node->token));
 +      write_lock_bh(&ldev->dmb_ht_lock);
 +      hash_for_each_possible(ldev->dmb_ht, tmp_node, list, dmb_node->token) {
 +              if (tmp_node->token == dmb_node->token) {
 +                      write_unlock_bh(&ldev->dmb_ht_lock);
 +                      goto again;
 +              }
 +      }
 +      hash_add(ldev->dmb_ht, &dmb_node->list, dmb_node->token);
 +      write_unlock_bh(&ldev->dmb_ht_lock);
 +      atomic_inc(&ldev->dmb_cnt);
 +
 +      dmb->idx = dmb_node->sba_idx;
 +      dmb->dmb_tok = dmb_node->token;
 +      dmb->cpu_addr = dmb_node->cpu_addr;
 +      dmb->dma_addr = dmb_node->dma_addr;
 +      dmb->dmb_len = dmb_node->len;
 +
 +      spin_lock_irqsave(&dibs->lock, flags);
 +      dibs->dmb_clientid_arr[sba_idx] = client->id;
 +      spin_unlock_irqrestore(&dibs->lock, flags);
 +
 +      return 0;
 +
 +err_node:
 +      kfree(dmb_node);
 +err_bit:
 +      clear_bit(sba_idx, ldev->sba_idx_mask);
 +      return rc;
 +}
 +
 +static void __dibs_lo_unregister_dmb(struct dibs_lo_dev *ldev,
 +                                   struct dibs_lo_dmb_node *dmb_node)
 +{
 +      /* remove dmb from hash table */
 +      write_lock_bh(&ldev->dmb_ht_lock);
 +      hash_del(&dmb_node->list);
 +      write_unlock_bh(&ldev->dmb_ht_lock);
 +
 +      clear_bit(dmb_node->sba_idx, ldev->sba_idx_mask);
++      folio_put(virt_to_folio(dmb_node->cpu_addr));
 +      kfree(dmb_node);
 +
 +      if (atomic_dec_and_test(&ldev->dmb_cnt))
 +              wake_up(&ldev->ldev_release);
 +}
 +
 +static int dibs_lo_unregister_dmb(struct dibs_dev *dibs, struct dibs_dmb *dmb)
 +{
 +      struct dibs_lo_dmb_node *dmb_node = NULL, *tmp_node;
 +      struct dibs_lo_dev *ldev;
 +      unsigned long flags;
 +
 +      ldev = dibs->drv_priv;
 +
 +      /* find dmb from hash table */
 +      read_lock_bh(&ldev->dmb_ht_lock);
 +      hash_for_each_possible(ldev->dmb_ht, tmp_node, list, dmb->dmb_tok) {
 +              if (tmp_node->token == dmb->dmb_tok) {
 +                      dmb_node = tmp_node;
 +                      break;
 +              }
 +      }
 +      read_unlock_bh(&ldev->dmb_ht_lock);
 +      if (!dmb_node)
 +              return -EINVAL;
 +
 +      if (refcount_dec_and_test(&dmb_node->refcnt)) {
 +              spin_lock_irqsave(&dibs->lock, flags);
 +              dibs->dmb_clientid_arr[dmb_node->sba_idx] = NO_DIBS_CLIENT;
 +              spin_unlock_irqrestore(&dibs->lock, flags);
 +
 +              __dibs_lo_unregister_dmb(ldev, dmb_node);
 +      }
 +      return 0;
 +}
 +
 +static int dibs_lo_support_dmb_nocopy(struct dibs_dev *dibs)
 +{
 +      return DIBS_LO_SUPPORT_NOCOPY;
 +}
 +
 +static int dibs_lo_attach_dmb(struct dibs_dev *dibs, struct dibs_dmb *dmb)
 +{
 +      struct dibs_lo_dmb_node *dmb_node = NULL, *tmp_node;
 +      struct dibs_lo_dev *ldev;
 +
 +      ldev = dibs->drv_priv;
 +
 +      /* find dmb_node according to dmb->dmb_tok */
 +      read_lock_bh(&ldev->dmb_ht_lock);
 +      hash_for_each_possible(ldev->dmb_ht, tmp_node, list, dmb->dmb_tok) {
 +              if (tmp_node->token == dmb->dmb_tok) {
 +                      dmb_node = tmp_node;
 +                      break;
 +              }
 +      }
 +      if (!dmb_node) {
 +              read_unlock_bh(&ldev->dmb_ht_lock);
 +              return -EINVAL;
 +      }
 +      read_unlock_bh(&ldev->dmb_ht_lock);
 +
 +      if (!refcount_inc_not_zero(&dmb_node->refcnt))
 +              /* the dmb is being unregistered, but has
 +               * not been removed from the hash table.
 +               */
 +              return -EINVAL;
 +
 +      /* provide dmb information */
 +      dmb->idx = dmb_node->sba_idx;
 +      dmb->dmb_tok = dmb_node->token;
 +      dmb->cpu_addr = dmb_node->cpu_addr;
 +      dmb->dma_addr = dmb_node->dma_addr;
 +      dmb->dmb_len = dmb_node->len;
 +      return 0;
 +}
 +
 +static int dibs_lo_detach_dmb(struct dibs_dev *dibs, u64 token)
 +{
 +      struct dibs_lo_dmb_node *dmb_node = NULL, *tmp_node;
 +      struct dibs_lo_dev *ldev;
 +
 +      ldev = dibs->drv_priv;
 +
 +      /* find dmb_node according to dmb->dmb_tok */
 +      read_lock_bh(&ldev->dmb_ht_lock);
 +      hash_for_each_possible(ldev->dmb_ht, tmp_node, list, token) {
 +              if (tmp_node->token == token) {
 +                      dmb_node = tmp_node;
 +                      break;
 +              }
 +      }
 +      if (!dmb_node) {
 +              read_unlock_bh(&ldev->dmb_ht_lock);
 +              return -EINVAL;
 +      }
 +      read_unlock_bh(&ldev->dmb_ht_lock);
 +
 +      if (refcount_dec_and_test(&dmb_node->refcnt))
 +              __dibs_lo_unregister_dmb(ldev, dmb_node);
 +      return 0;
 +}
 +
 +static int dibs_lo_move_data(struct dibs_dev *dibs, u64 dmb_tok,
 +                           unsigned int idx, bool sf, unsigned int offset,
 +                           void *data, unsigned int size)
 +{
 +      struct dibs_lo_dmb_node *rmb_node = NULL, *tmp_node;
 +      struct dibs_lo_dev *ldev;
 +      u16 s_mask;
 +      u8 client_id;
 +      u32 sba_idx;
 +
 +      ldev = dibs->drv_priv;
 +
 +      read_lock_bh(&ldev->dmb_ht_lock);
 +      hash_for_each_possible(ldev->dmb_ht, tmp_node, list, dmb_tok) {
 +              if (tmp_node->token == dmb_tok) {
 +                      rmb_node = tmp_node;
 +                      break;
 +              }
 +      }
 +      if (!rmb_node) {
 +              read_unlock_bh(&ldev->dmb_ht_lock);
 +              return -EINVAL;
 +      }
 +      memcpy((char *)rmb_node->cpu_addr + offset, data, size);
 +      sba_idx = rmb_node->sba_idx;
 +      read_unlock_bh(&ldev->dmb_ht_lock);
 +
 +      if (!sf)
 +              return 0;
 +
 +      spin_lock(&dibs->lock);
 +      client_id = dibs->dmb_clientid_arr[sba_idx];
 +      s_mask = ror16(0x1000, idx);
 +      if (likely(client_id != NO_DIBS_CLIENT && dibs->subs[client_id]))
 +              dibs->subs[client_id]->ops->handle_irq(dibs, sba_idx, s_mask);
 +      spin_unlock(&dibs->lock);
 +
 +      return 0;
 +}
 +
 +static const struct dibs_dev_ops dibs_lo_ops = {
 +      .get_fabric_id = dibs_lo_get_fabric_id,
 +      .query_remote_gid = dibs_lo_query_rgid,
 +      .max_dmbs = dibs_lo_max_dmbs,
 +      .register_dmb = dibs_lo_register_dmb,
 +      .unregister_dmb = dibs_lo_unregister_dmb,
 +      .move_data = dibs_lo_move_data,
 +      .support_mmapped_rdmb = dibs_lo_support_dmb_nocopy,
 +      .attach_dmb = dibs_lo_attach_dmb,
 +      .detach_dmb = dibs_lo_detach_dmb,
 +};
 +
 +static void dibs_lo_dev_init(struct dibs_lo_dev *ldev)
 +{
 +      rwlock_init(&ldev->dmb_ht_lock);
 +      hash_init(ldev->dmb_ht);
 +      atomic_set(&ldev->dmb_cnt, 0);
 +      init_waitqueue_head(&ldev->ldev_release);
 +}
 +
 +static void dibs_lo_dev_exit(struct dibs_lo_dev *ldev)
 +{
 +      if (atomic_read(&ldev->dmb_cnt))
 +              wait_event(ldev->ldev_release, !atomic_read(&ldev->dmb_cnt));
 +}
 +
 +static int dibs_lo_dev_probe(void)
 +{
 +      struct dibs_lo_dev *ldev;
 +      struct dibs_dev *dibs;
 +      int ret;
 +
 +      ldev = kzalloc(sizeof(*ldev), GFP_KERNEL);
 +      if (!ldev)
 +              return -ENOMEM;
 +
 +      dibs = dibs_dev_alloc();
 +      if (!dibs) {
 +              kfree(ldev);
 +              return -ENOMEM;
 +      }
 +
 +      ldev->dibs = dibs;
 +      dibs->drv_priv = ldev;
 +      dibs_lo_dev_init(ldev);
 +      uuid_gen(&dibs->gid);
 +      dibs->ops = &dibs_lo_ops;
 +
 +      dibs->dev.parent = NULL;
 +      dev_set_name(&dibs->dev, "%s", dibs_lo_dev_name);
 +
 +      ret = dibs_dev_add(dibs);
 +      if (ret)
 +              goto err_reg;
 +      lo_dev = ldev;
 +      return 0;
 +
 +err_reg:
 +      kfree(dibs->dmb_clientid_arr);
 +      /* pairs with dibs_dev_alloc() */
 +      put_device(&dibs->dev);
 +      kfree(ldev);
 +
 +      return ret;
 +}
 +
 +static void dibs_lo_dev_remove(void)
 +{
 +      if (!lo_dev)
 +              return;
 +
 +      dibs_dev_del(lo_dev->dibs);
 +      dibs_lo_dev_exit(lo_dev);
 +      /* pairs with dibs_dev_alloc() */
 +      put_device(&lo_dev->dibs->dev);
 +      kfree(lo_dev);
 +      lo_dev = NULL;
 +}
 +
 +int dibs_loopback_init(void)
 +{
 +      return dibs_lo_dev_probe();
 +}
 +
 +void dibs_loopback_exit(void)
 +{
 +      dibs_lo_dev_remove();
 +}
@@@ -909,6 -896,15 +896,16 @@@ static int hi3110_can_probe(struct spi_
        if (ret)
                goto out_clk;
  
 -      priv->wq = alloc_workqueue("hi3110_wq", WQ_FREEZABLE | WQ_MEM_RECLAIM,
++      priv->wq = alloc_workqueue("hi3110_wq",
++                                 WQ_FREEZABLE | WQ_MEM_RECLAIM | WQ_PERCPU,
+                                  0);
+       if (!priv->wq) {
+               ret = -ENOMEM;
+               goto out_clk;
+       }
+       INIT_WORK(&priv->tx_work, hi3110_tx_work_handler);
+       INIT_WORK(&priv->restart_work, hi3110_restart_work_handler);
        priv->spi = spi;
        mutex_init(&priv->hi3110_lock);
  
index 1e991d7,0000000..2169c08
mode 100644,000000..100644
--- /dev/null
@@@ -1,2087 -1,0 +1,2098 @@@
- static int gswip_port_enable(struct dsa_switch *ds, int port,
-                            struct phy_device *phydev)
 +// SPDX-License-Identifier: GPL-2.0
 +/*
 + * Lantiq / Intel GSWIP switch driver for VRX200, xRX300 and xRX330 SoCs
 + *
 + * Copyright (C) 2010 Lantiq Deutschland
 + * Copyright (C) 2012 John Crispin <john@phrozen.org>
 + * Copyright (C) 2017 - 2019 Hauke Mehrtens <hauke@hauke-m.de>
 + *
 + * The VLAN and bridge model the GSWIP hardware uses does not directly
 + * matches the model DSA uses.
 + *
 + * The hardware has 64 possible table entries for bridges with one VLAN
 + * ID, one flow id and a list of ports for each bridge. All entries which
 + * match the same flow ID are combined in the mac learning table, they
 + * act as one global bridge.
 + * The hardware does not support VLAN filter on the port, but on the
 + * bridge, this driver converts the DSA model to the hardware.
 + *
 + * The CPU gets all the exception frames which do not match any forwarding
 + * rule and the CPU port is also added to all bridges. This makes it possible
 + * to handle all the special cases easily in software.
 + * At the initialization the driver allocates one bridge table entry for
 + * each switch port which is used when the port is used without an
 + * explicit bridge. This prevents the frames from being forwarded
 + * between all LAN ports by default.
 + */
 +
 +#include "lantiq_gswip.h"
 +#include "lantiq_pce.h"
 +
 +#include <linux/delay.h>
 +#include <linux/etherdevice.h>
 +#include <linux/firmware.h>
 +#include <linux/if_bridge.h>
 +#include <linux/if_vlan.h>
 +#include <linux/iopoll.h>
 +#include <linux/mfd/syscon.h>
 +#include <linux/module.h>
 +#include <linux/of_mdio.h>
 +#include <linux/of_net.h>
 +#include <linux/of_platform.h>
 +#include <linux/phy.h>
 +#include <linux/phylink.h>
 +#include <dt-bindings/mips/lantiq_rcu_gphy.h>
 +
 +struct xway_gphy_match_data {
 +      char *fe_firmware_name;
 +      char *ge_firmware_name;
 +};
 +
 +struct gswip_pce_table_entry {
 +      u16 index;      // PCE_TBL_ADDR.ADDR = pData->table_index
 +      u16 table;      // PCE_TBL_CTRL.ADDR = pData->table
 +      u16 key[8];
 +      u16 val[5];
 +      u16 mask;
 +      u8 gmap;
 +      bool type;
 +      bool valid;
 +      bool key_mode;
 +};
 +
 +struct gswip_rmon_cnt_desc {
 +      unsigned int size;
 +      unsigned int offset;
 +      const char *name;
 +};
 +
 +#define MIB_DESC(_size, _offset, _name) {.size = _size, .offset = _offset, .name = _name}
 +
 +static const struct gswip_rmon_cnt_desc gswip_rmon_cnt[] = {
 +      /** Receive Packet Count (only packets that are accepted and not discarded). */
 +      MIB_DESC(1, 0x1F, "RxGoodPkts"),
 +      MIB_DESC(1, 0x23, "RxUnicastPkts"),
 +      MIB_DESC(1, 0x22, "RxMulticastPkts"),
 +      MIB_DESC(1, 0x21, "RxFCSErrorPkts"),
 +      MIB_DESC(1, 0x1D, "RxUnderSizeGoodPkts"),
 +      MIB_DESC(1, 0x1E, "RxUnderSizeErrorPkts"),
 +      MIB_DESC(1, 0x1B, "RxOversizeGoodPkts"),
 +      MIB_DESC(1, 0x1C, "RxOversizeErrorPkts"),
 +      MIB_DESC(1, 0x20, "RxGoodPausePkts"),
 +      MIB_DESC(1, 0x1A, "RxAlignErrorPkts"),
 +      MIB_DESC(1, 0x12, "Rx64BytePkts"),
 +      MIB_DESC(1, 0x13, "Rx127BytePkts"),
 +      MIB_DESC(1, 0x14, "Rx255BytePkts"),
 +      MIB_DESC(1, 0x15, "Rx511BytePkts"),
 +      MIB_DESC(1, 0x16, "Rx1023BytePkts"),
 +      /** Receive Size 1024-1522 (or more, if configured) Packet Count. */
 +      MIB_DESC(1, 0x17, "RxMaxBytePkts"),
 +      MIB_DESC(1, 0x18, "RxDroppedPkts"),
 +      MIB_DESC(1, 0x19, "RxFilteredPkts"),
 +      MIB_DESC(2, 0x24, "RxGoodBytes"),
 +      MIB_DESC(2, 0x26, "RxBadBytes"),
 +      MIB_DESC(1, 0x11, "TxAcmDroppedPkts"),
 +      MIB_DESC(1, 0x0C, "TxGoodPkts"),
 +      MIB_DESC(1, 0x06, "TxUnicastPkts"),
 +      MIB_DESC(1, 0x07, "TxMulticastPkts"),
 +      MIB_DESC(1, 0x00, "Tx64BytePkts"),
 +      MIB_DESC(1, 0x01, "Tx127BytePkts"),
 +      MIB_DESC(1, 0x02, "Tx255BytePkts"),
 +      MIB_DESC(1, 0x03, "Tx511BytePkts"),
 +      MIB_DESC(1, 0x04, "Tx1023BytePkts"),
 +      /** Transmit Size 1024-1522 (or more, if configured) Packet Count. */
 +      MIB_DESC(1, 0x05, "TxMaxBytePkts"),
 +      MIB_DESC(1, 0x08, "TxSingleCollCount"),
 +      MIB_DESC(1, 0x09, "TxMultCollCount"),
 +      MIB_DESC(1, 0x0A, "TxLateCollCount"),
 +      MIB_DESC(1, 0x0B, "TxExcessCollCount"),
 +      MIB_DESC(1, 0x0D, "TxPauseCount"),
 +      MIB_DESC(1, 0x10, "TxDroppedPkts"),
 +      MIB_DESC(2, 0x0E, "TxGoodBytes"),
 +};
 +
 +static u32 gswip_switch_r(struct gswip_priv *priv, u32 offset)
 +{
 +      return __raw_readl(priv->gswip + (offset * 4));
 +}
 +
 +static void gswip_switch_w(struct gswip_priv *priv, u32 val, u32 offset)
 +{
 +      __raw_writel(val, priv->gswip + (offset * 4));
 +}
 +
 +static void gswip_switch_mask(struct gswip_priv *priv, u32 clear, u32 set,
 +                            u32 offset)
 +{
 +      u32 val = gswip_switch_r(priv, offset);
 +
 +      val &= ~(clear);
 +      val |= set;
 +      gswip_switch_w(priv, val, offset);
 +}
 +
 +static u32 gswip_switch_r_timeout(struct gswip_priv *priv, u32 offset,
 +                                u32 cleared)
 +{
 +      u32 val;
 +
 +      return readx_poll_timeout(__raw_readl, priv->gswip + (offset * 4), val,
 +                                (val & cleared) == 0, 20, 50000);
 +}
 +
 +static u32 gswip_mdio_r(struct gswip_priv *priv, u32 offset)
 +{
 +      return __raw_readl(priv->mdio + (offset * 4));
 +}
 +
 +static void gswip_mdio_w(struct gswip_priv *priv, u32 val, u32 offset)
 +{
 +      __raw_writel(val, priv->mdio + (offset * 4));
 +}
 +
 +static void gswip_mdio_mask(struct gswip_priv *priv, u32 clear, u32 set,
 +                          u32 offset)
 +{
 +      u32 val = gswip_mdio_r(priv, offset);
 +
 +      val &= ~(clear);
 +      val |= set;
 +      gswip_mdio_w(priv, val, offset);
 +}
 +
 +static u32 gswip_mii_r(struct gswip_priv *priv, u32 offset)
 +{
 +      return __raw_readl(priv->mii + (offset * 4));
 +}
 +
 +static void gswip_mii_w(struct gswip_priv *priv, u32 val, u32 offset)
 +{
 +      __raw_writel(val, priv->mii + (offset * 4));
 +}
 +
 +static void gswip_mii_mask(struct gswip_priv *priv, u32 clear, u32 set,
 +                         u32 offset)
 +{
 +      u32 val = gswip_mii_r(priv, offset);
 +
 +      val &= ~(clear);
 +      val |= set;
 +      gswip_mii_w(priv, val, offset);
 +}
 +
 +static void gswip_mii_mask_cfg(struct gswip_priv *priv, u32 clear, u32 set,
 +                             int port)
 +{
 +      int reg_port;
 +
 +      /* MII_CFG register only exists for MII ports */
 +      if (!(priv->hw_info->mii_ports & BIT(port)))
 +              return;
 +
 +      reg_port = port + priv->hw_info->mii_port_reg_offset;
 +
 +      gswip_mii_mask(priv, clear, set, GSWIP_MII_CFGp(reg_port));
 +}
 +
 +static void gswip_mii_mask_pcdu(struct gswip_priv *priv, u32 clear, u32 set,
 +                              int port)
 +{
 +      int reg_port;
 +
 +      /* MII_PCDU register only exists for MII ports */
 +      if (!(priv->hw_info->mii_ports & BIT(port)))
 +              return;
 +
 +      reg_port = port + priv->hw_info->mii_port_reg_offset;
 +
 +      switch (reg_port) {
 +      case 0:
 +              gswip_mii_mask(priv, clear, set, GSWIP_MII_PCDU0);
 +              break;
 +      case 1:
 +              gswip_mii_mask(priv, clear, set, GSWIP_MII_PCDU1);
 +              break;
 +      case 5:
 +              gswip_mii_mask(priv, clear, set, GSWIP_MII_PCDU5);
 +              break;
 +      }
 +}
 +
 +static int gswip_mdio_poll(struct gswip_priv *priv)
 +{
 +      int cnt = 100;
 +
 +      while (likely(cnt--)) {
 +              u32 ctrl = gswip_mdio_r(priv, GSWIP_MDIO_CTRL);
 +
 +              if ((ctrl & GSWIP_MDIO_CTRL_BUSY) == 0)
 +                      return 0;
 +              usleep_range(20, 40);
 +      }
 +
 +      return -ETIMEDOUT;
 +}
 +
 +static int gswip_mdio_wr(struct mii_bus *bus, int addr, int reg, u16 val)
 +{
 +      struct gswip_priv *priv = bus->priv;
 +      int err;
 +
 +      err = gswip_mdio_poll(priv);
 +      if (err) {
 +              dev_err(&bus->dev, "waiting for MDIO bus busy timed out\n");
 +              return err;
 +      }
 +
 +      gswip_mdio_w(priv, val, GSWIP_MDIO_WRITE);
 +      gswip_mdio_w(priv, GSWIP_MDIO_CTRL_BUSY | GSWIP_MDIO_CTRL_WR |
 +              ((addr & GSWIP_MDIO_CTRL_PHYAD_MASK) << GSWIP_MDIO_CTRL_PHYAD_SHIFT) |
 +              (reg & GSWIP_MDIO_CTRL_REGAD_MASK),
 +              GSWIP_MDIO_CTRL);
 +
 +      return 0;
 +}
 +
 +static int gswip_mdio_rd(struct mii_bus *bus, int addr, int reg)
 +{
 +      struct gswip_priv *priv = bus->priv;
 +      int err;
 +
 +      err = gswip_mdio_poll(priv);
 +      if (err) {
 +              dev_err(&bus->dev, "waiting for MDIO bus busy timed out\n");
 +              return err;
 +      }
 +
 +      gswip_mdio_w(priv, GSWIP_MDIO_CTRL_BUSY | GSWIP_MDIO_CTRL_RD |
 +              ((addr & GSWIP_MDIO_CTRL_PHYAD_MASK) << GSWIP_MDIO_CTRL_PHYAD_SHIFT) |
 +              (reg & GSWIP_MDIO_CTRL_REGAD_MASK),
 +              GSWIP_MDIO_CTRL);
 +
 +      err = gswip_mdio_poll(priv);
 +      if (err) {
 +              dev_err(&bus->dev, "waiting for MDIO bus busy timed out\n");
 +              return err;
 +      }
 +
 +      return gswip_mdio_r(priv, GSWIP_MDIO_READ);
 +}
 +
 +static int gswip_mdio(struct gswip_priv *priv)
 +{
 +      struct device_node *mdio_np, *switch_np = priv->dev->of_node;
 +      struct device *dev = priv->dev;
 +      struct mii_bus *bus;
 +      int err = 0;
 +
 +      mdio_np = of_get_compatible_child(switch_np, "lantiq,xrx200-mdio");
 +      if (!mdio_np)
 +              mdio_np = of_get_child_by_name(switch_np, "mdio");
 +
 +      if (!of_device_is_available(mdio_np))
 +              goto out_put_node;
 +
 +      bus = devm_mdiobus_alloc(dev);
 +      if (!bus) {
 +              err = -ENOMEM;
 +              goto out_put_node;
 +      }
 +
 +      bus->priv = priv;
 +      bus->read = gswip_mdio_rd;
 +      bus->write = gswip_mdio_wr;
 +      bus->name = "lantiq,xrx200-mdio";
 +      snprintf(bus->id, MII_BUS_ID_SIZE, "%s-mii", dev_name(priv->dev));
 +      bus->parent = priv->dev;
 +
 +      err = devm_of_mdiobus_register(dev, bus, mdio_np);
 +
 +out_put_node:
 +      of_node_put(mdio_np);
 +
 +      return err;
 +}
 +
 +static int gswip_pce_table_entry_read(struct gswip_priv *priv,
 +                                    struct gswip_pce_table_entry *tbl)
 +{
 +      int i;
 +      int err;
 +      u16 crtl;
 +      u16 addr_mode = tbl->key_mode ? GSWIP_PCE_TBL_CTRL_OPMOD_KSRD :
 +                                      GSWIP_PCE_TBL_CTRL_OPMOD_ADRD;
 +
 +      mutex_lock(&priv->pce_table_lock);
 +
 +      err = gswip_switch_r_timeout(priv, GSWIP_PCE_TBL_CTRL,
 +                                   GSWIP_PCE_TBL_CTRL_BAS);
 +      if (err) {
 +              mutex_unlock(&priv->pce_table_lock);
 +              return err;
 +      }
 +
 +      gswip_switch_w(priv, tbl->index, GSWIP_PCE_TBL_ADDR);
 +      gswip_switch_mask(priv, GSWIP_PCE_TBL_CTRL_ADDR_MASK |
 +                              GSWIP_PCE_TBL_CTRL_OPMOD_MASK,
 +                        tbl->table | addr_mode | GSWIP_PCE_TBL_CTRL_BAS,
 +                        GSWIP_PCE_TBL_CTRL);
 +
 +      err = gswip_switch_r_timeout(priv, GSWIP_PCE_TBL_CTRL,
 +                                   GSWIP_PCE_TBL_CTRL_BAS);
 +      if (err) {
 +              mutex_unlock(&priv->pce_table_lock);
 +              return err;
 +      }
 +
 +      for (i = 0; i < ARRAY_SIZE(tbl->key); i++)
 +              tbl->key[i] = gswip_switch_r(priv, GSWIP_PCE_TBL_KEY(i));
 +
 +      for (i = 0; i < ARRAY_SIZE(tbl->val); i++)
 +              tbl->val[i] = gswip_switch_r(priv, GSWIP_PCE_TBL_VAL(i));
 +
 +      tbl->mask = gswip_switch_r(priv, GSWIP_PCE_TBL_MASK);
 +
 +      crtl = gswip_switch_r(priv, GSWIP_PCE_TBL_CTRL);
 +
 +      tbl->type = !!(crtl & GSWIP_PCE_TBL_CTRL_TYPE);
 +      tbl->valid = !!(crtl & GSWIP_PCE_TBL_CTRL_VLD);
 +      tbl->gmap = (crtl & GSWIP_PCE_TBL_CTRL_GMAP_MASK) >> 7;
 +
 +      mutex_unlock(&priv->pce_table_lock);
 +
 +      return 0;
 +}
 +
 +static int gswip_pce_table_entry_write(struct gswip_priv *priv,
 +                                     struct gswip_pce_table_entry *tbl)
 +{
 +      int i;
 +      int err;
 +      u16 crtl;
 +      u16 addr_mode = tbl->key_mode ? GSWIP_PCE_TBL_CTRL_OPMOD_KSWR :
 +                                      GSWIP_PCE_TBL_CTRL_OPMOD_ADWR;
 +
 +      mutex_lock(&priv->pce_table_lock);
 +
 +      err = gswip_switch_r_timeout(priv, GSWIP_PCE_TBL_CTRL,
 +                                   GSWIP_PCE_TBL_CTRL_BAS);
 +      if (err) {
 +              mutex_unlock(&priv->pce_table_lock);
 +              return err;
 +      }
 +
 +      gswip_switch_w(priv, tbl->index, GSWIP_PCE_TBL_ADDR);
 +      gswip_switch_mask(priv, GSWIP_PCE_TBL_CTRL_ADDR_MASK |
 +                              GSWIP_PCE_TBL_CTRL_OPMOD_MASK,
 +                        tbl->table | addr_mode,
 +                        GSWIP_PCE_TBL_CTRL);
 +
 +      for (i = 0; i < ARRAY_SIZE(tbl->key); i++)
 +              gswip_switch_w(priv, tbl->key[i], GSWIP_PCE_TBL_KEY(i));
 +
 +      for (i = 0; i < ARRAY_SIZE(tbl->val); i++)
 +              gswip_switch_w(priv, tbl->val[i], GSWIP_PCE_TBL_VAL(i));
 +
 +      gswip_switch_mask(priv, GSWIP_PCE_TBL_CTRL_ADDR_MASK |
 +                              GSWIP_PCE_TBL_CTRL_OPMOD_MASK,
 +                        tbl->table | addr_mode,
 +                        GSWIP_PCE_TBL_CTRL);
 +
 +      gswip_switch_w(priv, tbl->mask, GSWIP_PCE_TBL_MASK);
 +
 +      crtl = gswip_switch_r(priv, GSWIP_PCE_TBL_CTRL);
 +      crtl &= ~(GSWIP_PCE_TBL_CTRL_TYPE | GSWIP_PCE_TBL_CTRL_VLD |
 +                GSWIP_PCE_TBL_CTRL_GMAP_MASK);
 +      if (tbl->type)
 +              crtl |= GSWIP_PCE_TBL_CTRL_TYPE;
 +      if (tbl->valid)
 +              crtl |= GSWIP_PCE_TBL_CTRL_VLD;
 +      crtl |= (tbl->gmap << 7) & GSWIP_PCE_TBL_CTRL_GMAP_MASK;
 +      crtl |= GSWIP_PCE_TBL_CTRL_BAS;
 +      gswip_switch_w(priv, crtl, GSWIP_PCE_TBL_CTRL);
 +
 +      err = gswip_switch_r_timeout(priv, GSWIP_PCE_TBL_CTRL,
 +                                   GSWIP_PCE_TBL_CTRL_BAS);
 +
 +      mutex_unlock(&priv->pce_table_lock);
 +
 +      return err;
 +}
 +
 +/* Add the LAN port into a bridge with the CPU port by
 + * default. This prevents automatic forwarding of
 + * packages between the LAN ports when no explicit
 + * bridge is configured.
 + */
 +static int gswip_add_single_port_br(struct gswip_priv *priv, int port, bool add)
 +{
 +      struct gswip_pce_table_entry vlan_active = {0,};
 +      struct gswip_pce_table_entry vlan_mapping = {0,};
 +      int err;
 +
 +      vlan_active.index = port + 1;
 +      vlan_active.table = GSWIP_TABLE_ACTIVE_VLAN;
 +      vlan_active.key[0] = 0; /* vid */
 +      vlan_active.val[0] = port + 1 /* fid */;
 +      vlan_active.valid = add;
 +      err = gswip_pce_table_entry_write(priv, &vlan_active);
 +      if (err) {
 +              dev_err(priv->dev, "failed to write active VLAN: %d\n", err);
 +              return err;
 +      }
 +
 +      if (!add)
 +              return 0;
 +
 +      vlan_mapping.index = port + 1;
 +      vlan_mapping.table = GSWIP_TABLE_VLAN_MAPPING;
 +      vlan_mapping.val[0] = 0 /* vid */;
 +      vlan_mapping.val[1] = BIT(port) | dsa_cpu_ports(priv->ds);
 +      vlan_mapping.val[2] = 0;
 +      err = gswip_pce_table_entry_write(priv, &vlan_mapping);
 +      if (err) {
 +              dev_err(priv->dev, "failed to write VLAN mapping: %d\n", err);
 +              return err;
 +      }
 +
 +      return 0;
 +}
 +
-               u32 mdio_phy = 0;
++static int gswip_port_setup(struct dsa_switch *ds, int port)
 +{
 +      struct gswip_priv *priv = ds->priv;
 +      int err;
 +
 +      if (!dsa_is_cpu_port(ds, port)) {
-               return -EINVAL;
 +              err = gswip_add_single_port_br(priv, port, true);
 +              if (err)
 +                      return err;
++      }
++
++      return 0;
++}
++
++static int gswip_port_enable(struct dsa_switch *ds, int port,
++                           struct phy_device *phydev)
++{
++      struct gswip_priv *priv = ds->priv;
++
++      if (!dsa_is_cpu_port(ds, port)) {
++              u32 mdio_phy = 0;
 +
 +              if (phydev)
 +                      mdio_phy = phydev->mdio.addr & GSWIP_MDIO_PHY_ADDR_MASK;
 +
 +              gswip_mdio_mask(priv, GSWIP_MDIO_PHY_ADDR_MASK, mdio_phy,
 +                              GSWIP_MDIO_PHYp(port));
 +      }
 +
 +      /* RMON Counter Enable for port */
 +      gswip_switch_w(priv, GSWIP_BM_PCFG_CNTEN, GSWIP_BM_PCFGp(port));
 +
 +      /* enable port fetch/store dma & VLAN Modification */
 +      gswip_switch_mask(priv, 0, GSWIP_FDMA_PCTRL_EN |
 +                                 GSWIP_FDMA_PCTRL_VLANMOD_BOTH,
 +                       GSWIP_FDMA_PCTRLp(port));
 +      gswip_switch_mask(priv, 0, GSWIP_SDMA_PCTRL_EN,
 +                        GSWIP_SDMA_PCTRLp(port));
 +
 +      return 0;
 +}
 +
 +static void gswip_port_disable(struct dsa_switch *ds, int port)
 +{
 +      struct gswip_priv *priv = ds->priv;
 +
 +      gswip_switch_mask(priv, GSWIP_FDMA_PCTRL_EN, 0,
 +                        GSWIP_FDMA_PCTRLp(port));
 +      gswip_switch_mask(priv, GSWIP_SDMA_PCTRL_EN, 0,
 +                        GSWIP_SDMA_PCTRLp(port));
 +}
 +
 +static int gswip_pce_load_microcode(struct gswip_priv *priv)
 +{
 +      int i;
 +      int err;
 +
 +      gswip_switch_mask(priv, GSWIP_PCE_TBL_CTRL_ADDR_MASK |
 +                              GSWIP_PCE_TBL_CTRL_OPMOD_MASK,
 +                        GSWIP_PCE_TBL_CTRL_OPMOD_ADWR, GSWIP_PCE_TBL_CTRL);
 +      gswip_switch_w(priv, 0, GSWIP_PCE_TBL_MASK);
 +
 +      for (i = 0; i < priv->hw_info->pce_microcode_size; i++) {
 +              gswip_switch_w(priv, i, GSWIP_PCE_TBL_ADDR);
 +              gswip_switch_w(priv, (*priv->hw_info->pce_microcode)[i].val_0,
 +                             GSWIP_PCE_TBL_VAL(0));
 +              gswip_switch_w(priv, (*priv->hw_info->pce_microcode)[i].val_1,
 +                             GSWIP_PCE_TBL_VAL(1));
 +              gswip_switch_w(priv, (*priv->hw_info->pce_microcode)[i].val_2,
 +                             GSWIP_PCE_TBL_VAL(2));
 +              gswip_switch_w(priv, (*priv->hw_info->pce_microcode)[i].val_3,
 +                             GSWIP_PCE_TBL_VAL(3));
 +
 +              /* start the table access: */
 +              gswip_switch_mask(priv, 0, GSWIP_PCE_TBL_CTRL_BAS,
 +                                GSWIP_PCE_TBL_CTRL);
 +              err = gswip_switch_r_timeout(priv, GSWIP_PCE_TBL_CTRL,
 +                                           GSWIP_PCE_TBL_CTRL_BAS);
 +              if (err)
 +                      return err;
 +      }
 +
 +      /* tell the switch that the microcode is loaded */
 +      gswip_switch_mask(priv, 0, GSWIP_PCE_GCTRL_0_MC_VALID,
 +                        GSWIP_PCE_GCTRL_0);
 +
 +      return 0;
 +}
 +
 +static int gswip_port_vlan_filtering(struct dsa_switch *ds, int port,
 +                                   bool vlan_filtering,
 +                                   struct netlink_ext_ack *extack)
 +{
 +      struct net_device *bridge = dsa_port_bridge_dev_get(dsa_to_port(ds, port));
 +      struct gswip_priv *priv = ds->priv;
 +
 +      /* Do not allow changing the VLAN filtering options while in bridge */
 +      if (bridge && !!(priv->port_vlan_filter & BIT(port)) != vlan_filtering) {
 +              NL_SET_ERR_MSG_MOD(extack,
 +                                 "Dynamic toggling of vlan_filtering not supported");
 +              return -EIO;
 +      }
 +
 +      if (vlan_filtering) {
 +              /* Use tag based VLAN */
 +              gswip_switch_mask(priv,
 +                                GSWIP_PCE_VCTRL_VSR,
 +                                GSWIP_PCE_VCTRL_UVR | GSWIP_PCE_VCTRL_VIMR |
 +                                GSWIP_PCE_VCTRL_VEMR,
 +                                GSWIP_PCE_VCTRL(port));
 +              gswip_switch_mask(priv, GSWIP_PCE_PCTRL_0_TVM, 0,
 +                                GSWIP_PCE_PCTRL_0p(port));
 +      } else {
 +              /* Use port based VLAN */
 +              gswip_switch_mask(priv,
 +                                GSWIP_PCE_VCTRL_UVR | GSWIP_PCE_VCTRL_VIMR |
 +                                GSWIP_PCE_VCTRL_VEMR,
 +                                GSWIP_PCE_VCTRL_VSR,
 +                                GSWIP_PCE_VCTRL(port));
 +              gswip_switch_mask(priv, 0, GSWIP_PCE_PCTRL_0_TVM,
 +                                GSWIP_PCE_PCTRL_0p(port));
 +      }
 +
 +      return 0;
 +}
 +
 +static int gswip_setup(struct dsa_switch *ds)
 +{
 +      unsigned int cpu_ports = dsa_cpu_ports(ds);
 +      struct gswip_priv *priv = ds->priv;
 +      struct dsa_port *cpu_dp;
 +      int err, i;
 +
 +      gswip_switch_w(priv, GSWIP_SWRES_R0, GSWIP_SWRES);
 +      usleep_range(5000, 10000);
 +      gswip_switch_w(priv, 0, GSWIP_SWRES);
 +
 +      /* disable port fetch/store dma on all ports */
 +      for (i = 0; i < priv->hw_info->max_ports; i++) {
 +              gswip_port_disable(ds, i);
 +              gswip_port_vlan_filtering(ds, i, false, NULL);
 +      }
 +
 +      /* enable Switch */
 +      gswip_mdio_mask(priv, 0, GSWIP_MDIO_GLOB_ENABLE, GSWIP_MDIO_GLOB);
 +
 +      err = gswip_pce_load_microcode(priv);
 +      if (err) {
 +              dev_err(priv->dev, "writing PCE microcode failed, %i\n", err);
 +              return err;
 +      }
 +
 +      /* Default unknown Broadcast/Multicast/Unicast port maps */
 +      gswip_switch_w(priv, cpu_ports, GSWIP_PCE_PMAP1);
 +      gswip_switch_w(priv, cpu_ports, GSWIP_PCE_PMAP2);
 +      gswip_switch_w(priv, cpu_ports, GSWIP_PCE_PMAP3);
 +
 +      /* Deactivate MDIO PHY auto polling. Some PHYs as the AR8030 have an
 +       * interoperability problem with this auto polling mechanism because
 +       * their status registers think that the link is in a different state
 +       * than it actually is. For the AR8030 it has the BMSR_ESTATEN bit set
 +       * as well as ESTATUS_1000_TFULL and ESTATUS_1000_XFULL. This makes the
 +       * auto polling state machine consider the link being negotiated with
 +       * 1Gbit/s. Since the PHY itself is a Fast Ethernet RMII PHY this leads
 +       * to the switch port being completely dead (RX and TX are both not
 +       * working).
 +       * Also with various other PHY / port combinations (PHY11G GPHY, PHY22F
 +       * GPHY, external RGMII PEF7071/7072) any traffic would stop. Sometimes
 +       * it would work fine for a few minutes to hours and then stop, on
 +       * other device it would no traffic could be sent or received at all.
 +       * Testing shows that when PHY auto polling is disabled these problems
 +       * go away.
 +       */
 +      gswip_mdio_w(priv, 0x0, GSWIP_MDIO_MDC_CFG0);
 +
 +      /* Configure the MDIO Clock 2.5 MHz */
 +      gswip_mdio_mask(priv, 0xff, 0x09, GSWIP_MDIO_MDC_CFG1);
 +
 +      /* bring up the mdio bus */
 +      err = gswip_mdio(priv);
 +      if (err) {
 +              dev_err(priv->dev, "mdio bus setup failed\n");
 +              return err;
 +      }
 +
 +      /* Disable the xMII interface and clear it's isolation bit */
 +      for (i = 0; i < priv->hw_info->max_ports; i++)
 +              gswip_mii_mask_cfg(priv,
 +                                 GSWIP_MII_CFG_EN | GSWIP_MII_CFG_ISOLATE,
 +                                 0, i);
 +
 +      dsa_switch_for_each_cpu_port(cpu_dp, ds) {
 +              /* enable special tag insertion on cpu port */
 +              gswip_switch_mask(priv, 0, GSWIP_FDMA_PCTRL_STEN,
 +                                GSWIP_FDMA_PCTRLp(cpu_dp->index));
 +
 +              /* accept special tag in ingress direction */
 +              gswip_switch_mask(priv, 0, GSWIP_PCE_PCTRL_0_INGRESS,
 +                                GSWIP_PCE_PCTRL_0p(cpu_dp->index));
 +      }
 +
 +      gswip_switch_mask(priv, 0, GSWIP_BM_QUEUE_GCTRL_GL_MOD,
 +                        GSWIP_BM_QUEUE_GCTRL);
 +
 +      /* VLAN aware Switching */
 +      gswip_switch_mask(priv, 0, GSWIP_PCE_GCTRL_0_VLAN, GSWIP_PCE_GCTRL_0);
 +
 +      /* Flush MAC Table */
 +      gswip_switch_mask(priv, 0, GSWIP_PCE_GCTRL_0_MTFL, GSWIP_PCE_GCTRL_0);
 +
 +      err = gswip_switch_r_timeout(priv, GSWIP_PCE_GCTRL_0,
 +                                   GSWIP_PCE_GCTRL_0_MTFL);
 +      if (err) {
 +              dev_err(priv->dev, "MAC flushing didn't finish\n");
 +              return err;
 +      }
 +
 +      ds->mtu_enforcement_ingress = true;
 +
 +      ds->configure_vlan_while_not_filtering = false;
 +
 +      return 0;
 +}
 +
 +static enum dsa_tag_protocol gswip_get_tag_protocol(struct dsa_switch *ds,
 +                                                  int port,
 +                                                  enum dsa_tag_protocol mp)
 +{
 +      struct gswip_priv *priv = ds->priv;
 +
 +      return priv->hw_info->tag_protocol;
 +}
 +
 +static int gswip_vlan_active_create(struct gswip_priv *priv,
 +                                  struct net_device *bridge,
 +                                  int fid, u16 vid)
 +{
 +      struct gswip_pce_table_entry vlan_active = {0,};
 +      unsigned int max_ports = priv->hw_info->max_ports;
 +      int idx = -1;
 +      int err;
 +      int i;
 +
 +      /* Look for a free slot */
 +      for (i = max_ports; i < ARRAY_SIZE(priv->vlans); i++) {
 +              if (!priv->vlans[i].bridge) {
 +                      idx = i;
 +                      break;
 +              }
 +      }
 +
 +      if (idx == -1)
 +              return -ENOSPC;
 +
 +      if (fid == -1)
 +              fid = idx;
 +
 +      vlan_active.index = idx;
 +      vlan_active.table = GSWIP_TABLE_ACTIVE_VLAN;
 +      vlan_active.key[0] = vid;
 +      vlan_active.val[0] = fid;
 +      vlan_active.valid = true;
 +
 +      err = gswip_pce_table_entry_write(priv, &vlan_active);
 +      if (err) {
 +              dev_err(priv->dev, "failed to write active VLAN: %d\n", err);
 +              return err;
 +      }
 +
 +      priv->vlans[idx].bridge = bridge;
 +      priv->vlans[idx].vid = vid;
 +      priv->vlans[idx].fid = fid;
 +
 +      return idx;
 +}
 +
 +static int gswip_vlan_active_remove(struct gswip_priv *priv, int idx)
 +{
 +      struct gswip_pce_table_entry vlan_active = {0,};
 +      int err;
 +
 +      vlan_active.index = idx;
 +      vlan_active.table = GSWIP_TABLE_ACTIVE_VLAN;
 +      vlan_active.valid = false;
 +      err = gswip_pce_table_entry_write(priv, &vlan_active);
 +      if (err)
 +              dev_err(priv->dev, "failed to delete active VLAN: %d\n", err);
 +      priv->vlans[idx].bridge = NULL;
 +
 +      return err;
 +}
 +
 +static int gswip_vlan_add_unaware(struct gswip_priv *priv,
 +                                struct net_device *bridge, int port)
 +{
 +      struct gswip_pce_table_entry vlan_mapping = {0,};
 +      unsigned int max_ports = priv->hw_info->max_ports;
 +      bool active_vlan_created = false;
 +      int idx = -1;
 +      int i;
 +      int err;
 +
 +      /* Check if there is already a page for this bridge */
 +      for (i = max_ports; i < ARRAY_SIZE(priv->vlans); i++) {
 +              if (priv->vlans[i].bridge == bridge) {
 +                      idx = i;
 +                      break;
 +              }
 +      }
 +
 +      /* If this bridge is not programmed yet, add a Active VLAN table
 +       * entry in a free slot and prepare the VLAN mapping table entry.
 +       */
 +      if (idx == -1) {
 +              idx = gswip_vlan_active_create(priv, bridge, -1, 0);
 +              if (idx < 0)
 +                      return idx;
 +              active_vlan_created = true;
 +
 +              vlan_mapping.index = idx;
 +              vlan_mapping.table = GSWIP_TABLE_VLAN_MAPPING;
 +              /* VLAN ID byte, maps to the VLAN ID of vlan active table */
 +              vlan_mapping.val[0] = 0;
 +      } else {
 +              /* Read the existing VLAN mapping entry from the switch */
 +              vlan_mapping.index = idx;
 +              vlan_mapping.table = GSWIP_TABLE_VLAN_MAPPING;
 +              err = gswip_pce_table_entry_read(priv, &vlan_mapping);
 +              if (err) {
 +                      dev_err(priv->dev, "failed to read VLAN mapping: %d\n",
 +                              err);
 +                      return err;
 +              }
 +      }
 +
 +      /* Update the VLAN mapping entry and write it to the switch */
 +      vlan_mapping.val[1] |= dsa_cpu_ports(priv->ds);
 +      vlan_mapping.val[1] |= BIT(port);
 +      err = gswip_pce_table_entry_write(priv, &vlan_mapping);
 +      if (err) {
 +              dev_err(priv->dev, "failed to write VLAN mapping: %d\n", err);
 +              /* In case an Active VLAN was creaetd delete it again */
 +              if (active_vlan_created)
 +                      gswip_vlan_active_remove(priv, idx);
 +              return err;
 +      }
 +
 +      gswip_switch_w(priv, 0, GSWIP_PCE_DEFPVID(port));
 +      return 0;
 +}
 +
 +static int gswip_vlan_add_aware(struct gswip_priv *priv,
 +                              struct net_device *bridge, int port,
 +                              u16 vid, bool untagged,
 +                              bool pvid)
 +{
 +      struct gswip_pce_table_entry vlan_mapping = {0,};
 +      unsigned int max_ports = priv->hw_info->max_ports;
 +      unsigned int cpu_ports = dsa_cpu_ports(priv->ds);
 +      bool active_vlan_created = false;
 +      int idx = -1;
 +      int fid = -1;
 +      int i;
 +      int err;
 +
 +      /* Check if there is already a page for this bridge */
 +      for (i = max_ports; i < ARRAY_SIZE(priv->vlans); i++) {
 +              if (priv->vlans[i].bridge == bridge) {
 +                      if (fid != -1 && fid != priv->vlans[i].fid)
 +                              dev_err(priv->dev, "one bridge with multiple flow ids\n");
 +                      fid = priv->vlans[i].fid;
 +                      if (priv->vlans[i].vid == vid) {
 +                              idx = i;
 +                              break;
 +                      }
 +              }
 +      }
 +
 +      /* If this bridge is not programmed yet, add a Active VLAN table
 +       * entry in a free slot and prepare the VLAN mapping table entry.
 +       */
 +      if (idx == -1) {
 +              idx = gswip_vlan_active_create(priv, bridge, fid, vid);
 +              if (idx < 0)
 +                      return idx;
 +              active_vlan_created = true;
 +
 +              vlan_mapping.index = idx;
 +              vlan_mapping.table = GSWIP_TABLE_VLAN_MAPPING;
 +              /* VLAN ID byte, maps to the VLAN ID of vlan active table */
 +              vlan_mapping.val[0] = vid;
 +      } else {
 +              /* Read the existing VLAN mapping entry from the switch */
 +              vlan_mapping.index = idx;
 +              vlan_mapping.table = GSWIP_TABLE_VLAN_MAPPING;
 +              err = gswip_pce_table_entry_read(priv, &vlan_mapping);
 +              if (err) {
 +                      dev_err(priv->dev, "failed to read VLAN mapping: %d\n",
 +                              err);
 +                      return err;
 +              }
 +      }
 +
 +      vlan_mapping.val[0] = vid;
 +      /* Update the VLAN mapping entry and write it to the switch */
 +      vlan_mapping.val[1] |= cpu_ports;
 +      vlan_mapping.val[2] |= cpu_ports;
 +      vlan_mapping.val[1] |= BIT(port);
 +      if (untagged)
 +              vlan_mapping.val[2] &= ~BIT(port);
 +      else
 +              vlan_mapping.val[2] |= BIT(port);
 +      err = gswip_pce_table_entry_write(priv, &vlan_mapping);
 +      if (err) {
 +              dev_err(priv->dev, "failed to write VLAN mapping: %d\n", err);
 +              /* In case an Active VLAN was creaetd delete it again */
 +              if (active_vlan_created)
 +                      gswip_vlan_active_remove(priv, idx);
 +              return err;
 +      }
 +
 +      if (pvid)
 +              gswip_switch_w(priv, idx, GSWIP_PCE_DEFPVID(port));
 +
 +      return 0;
 +}
 +
 +static int gswip_vlan_remove(struct gswip_priv *priv,
 +                           struct net_device *bridge, int port,
 +                           u16 vid, bool pvid, bool vlan_aware)
 +{
 +      struct gswip_pce_table_entry vlan_mapping = {0,};
 +      unsigned int max_ports = priv->hw_info->max_ports;
 +      int idx = -1;
 +      int i;
 +      int err;
 +
 +      /* Check if there is already a page for this bridge */
 +      for (i = max_ports; i < ARRAY_SIZE(priv->vlans); i++) {
 +              if (priv->vlans[i].bridge == bridge &&
 +                  (!vlan_aware || priv->vlans[i].vid == vid)) {
 +                      idx = i;
 +                      break;
 +              }
 +      }
 +
 +      if (idx == -1) {
 +              dev_err(priv->dev, "bridge to leave does not exists\n");
 +              return -ENOENT;
 +      }
 +
 +      vlan_mapping.index = idx;
 +      vlan_mapping.table = GSWIP_TABLE_VLAN_MAPPING;
 +      err = gswip_pce_table_entry_read(priv, &vlan_mapping);
 +      if (err) {
 +              dev_err(priv->dev, "failed to read VLAN mapping: %d\n", err);
 +              return err;
 +      }
 +
 +      vlan_mapping.val[1] &= ~BIT(port);
 +      vlan_mapping.val[2] &= ~BIT(port);
 +      err = gswip_pce_table_entry_write(priv, &vlan_mapping);
 +      if (err) {
 +              dev_err(priv->dev, "failed to write VLAN mapping: %d\n", err);
 +              return err;
 +      }
 +
 +      /* In case all ports are removed from the bridge, remove the VLAN */
 +      if (!(vlan_mapping.val[1] & ~dsa_cpu_ports(priv->ds))) {
 +              err = gswip_vlan_active_remove(priv, idx);
 +              if (err) {
 +                      dev_err(priv->dev, "failed to write active VLAN: %d\n",
 +                              err);
 +                      return err;
 +              }
 +      }
 +
 +      /* GSWIP 2.2 (GRX300) and later program here the VID directly. */
 +      if (pvid)
 +              gswip_switch_w(priv, 0, GSWIP_PCE_DEFPVID(port));
 +
 +      return 0;
 +}
 +
 +static int gswip_port_bridge_join(struct dsa_switch *ds, int port,
 +                                struct dsa_bridge bridge,
 +                                bool *tx_fwd_offload,
 +                                struct netlink_ext_ack *extack)
 +{
 +      struct net_device *br = bridge.dev;
 +      struct gswip_priv *priv = ds->priv;
 +      int err;
 +
 +      /* When the bridge uses VLAN filtering we have to configure VLAN
 +       * specific bridges. No bridge is configured here.
 +       */
 +      if (!br_vlan_enabled(br)) {
 +              err = gswip_vlan_add_unaware(priv, br, port);
 +              if (err)
 +                      return err;
 +              priv->port_vlan_filter &= ~BIT(port);
 +      } else {
 +              priv->port_vlan_filter |= BIT(port);
 +      }
 +      return gswip_add_single_port_br(priv, port, false);
 +}
 +
 +static void gswip_port_bridge_leave(struct dsa_switch *ds, int port,
 +                                  struct dsa_bridge bridge)
 +{
 +      struct net_device *br = bridge.dev;
 +      struct gswip_priv *priv = ds->priv;
 +
 +      gswip_add_single_port_br(priv, port, true);
 +
 +      /* When the bridge uses VLAN filtering we have to configure VLAN
 +       * specific bridges. No bridge is configured here.
 +       */
 +      if (!br_vlan_enabled(br))
 +              gswip_vlan_remove(priv, br, port, 0, true, false);
 +}
 +
 +static int gswip_port_vlan_prepare(struct dsa_switch *ds, int port,
 +                                 const struct switchdev_obj_port_vlan *vlan,
 +                                 struct netlink_ext_ack *extack)
 +{
 +      struct net_device *bridge = dsa_port_bridge_dev_get(dsa_to_port(ds, port));
 +      struct gswip_priv *priv = ds->priv;
 +      unsigned int max_ports = priv->hw_info->max_ports;
 +      int pos = max_ports;
 +      int i, idx = -1;
 +
 +      /* We only support VLAN filtering on bridges */
 +      if (!dsa_is_cpu_port(ds, port) && !bridge)
 +              return -EOPNOTSUPP;
 +
 +      /* Check if there is already a page for this VLAN */
 +      for (i = max_ports; i < ARRAY_SIZE(priv->vlans); i++) {
 +              if (priv->vlans[i].bridge == bridge &&
 +                  priv->vlans[i].vid == vlan->vid) {
 +                      idx = i;
 +                      break;
 +              }
 +      }
 +
 +      /* If this VLAN is not programmed yet, we have to reserve
 +       * one entry in the VLAN table. Make sure we start at the
 +       * next position round.
 +       */
 +      if (idx == -1) {
 +              /* Look for a free slot */
 +              for (; pos < ARRAY_SIZE(priv->vlans); pos++) {
 +                      if (!priv->vlans[pos].bridge) {
 +                              idx = pos;
 +                              pos++;
 +                              break;
 +                      }
 +              }
 +
 +              if (idx == -1) {
 +                      NL_SET_ERR_MSG_MOD(extack, "No slot in VLAN table");
 +                      return -ENOSPC;
 +              }
 +      }
 +
 +      return 0;
 +}
 +
 +static int gswip_port_vlan_add(struct dsa_switch *ds, int port,
 +                             const struct switchdev_obj_port_vlan *vlan,
 +                             struct netlink_ext_ack *extack)
 +{
 +      struct net_device *bridge = dsa_port_bridge_dev_get(dsa_to_port(ds, port));
 +      struct gswip_priv *priv = ds->priv;
 +      bool untagged = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED;
 +      bool pvid = vlan->flags & BRIDGE_VLAN_INFO_PVID;
 +      int err;
 +
 +      err = gswip_port_vlan_prepare(ds, port, vlan, extack);
 +      if (err)
 +              return err;
 +
 +      /* We have to receive all packets on the CPU port and should not
 +       * do any VLAN filtering here. This is also called with bridge
 +       * NULL and then we do not know for which bridge to configure
 +       * this.
 +       */
 +      if (dsa_is_cpu_port(ds, port))
 +              return 0;
 +
 +      return gswip_vlan_add_aware(priv, bridge, port, vlan->vid,
 +                                  untagged, pvid);
 +}
 +
 +static int gswip_port_vlan_del(struct dsa_switch *ds, int port,
 +                             const struct switchdev_obj_port_vlan *vlan)
 +{
 +      struct net_device *bridge = dsa_port_bridge_dev_get(dsa_to_port(ds, port));
 +      struct gswip_priv *priv = ds->priv;
 +      bool pvid = vlan->flags & BRIDGE_VLAN_INFO_PVID;
 +
 +      /* We have to receive all packets on the CPU port and should not
 +       * do any VLAN filtering here. This is also called with bridge
 +       * NULL and then we do not know for which bridge to configure
 +       * this.
 +       */
 +      if (dsa_is_cpu_port(ds, port))
 +              return 0;
 +
 +      return gswip_vlan_remove(priv, bridge, port, vlan->vid, pvid, true);
 +}
 +
 +static void gswip_port_fast_age(struct dsa_switch *ds, int port)
 +{
 +      struct gswip_priv *priv = ds->priv;
 +      struct gswip_pce_table_entry mac_bridge = {0,};
 +      int i;
 +      int err;
 +
 +      for (i = 0; i < 2048; i++) {
 +              mac_bridge.table = GSWIP_TABLE_MAC_BRIDGE;
 +              mac_bridge.index = i;
 +
 +              err = gswip_pce_table_entry_read(priv, &mac_bridge);
 +              if (err) {
 +                      dev_err(priv->dev, "failed to read mac bridge: %d\n",
 +                              err);
 +                      return;
 +              }
 +
 +              if (!mac_bridge.valid)
 +                      continue;
 +
 +              if (mac_bridge.val[1] & GSWIP_TABLE_MAC_BRIDGE_VAL1_STATIC)
 +                      continue;
 +
 +              if (port != FIELD_GET(GSWIP_TABLE_MAC_BRIDGE_VAL0_PORT,
 +                                    mac_bridge.val[0]))
 +                      continue;
 +
 +              mac_bridge.valid = false;
 +              err = gswip_pce_table_entry_write(priv, &mac_bridge);
 +              if (err) {
 +                      dev_err(priv->dev, "failed to write mac bridge: %d\n",
 +                              err);
 +                      return;
 +              }
 +      }
 +}
 +
 +static void gswip_port_stp_state_set(struct dsa_switch *ds, int port, u8 state)
 +{
 +      struct gswip_priv *priv = ds->priv;
 +      u32 stp_state;
 +
 +      switch (state) {
 +      case BR_STATE_DISABLED:
 +              gswip_switch_mask(priv, GSWIP_SDMA_PCTRL_EN, 0,
 +                                GSWIP_SDMA_PCTRLp(port));
 +              return;
 +      case BR_STATE_BLOCKING:
 +      case BR_STATE_LISTENING:
 +              stp_state = GSWIP_PCE_PCTRL_0_PSTATE_LISTEN;
 +              break;
 +      case BR_STATE_LEARNING:
 +              stp_state = GSWIP_PCE_PCTRL_0_PSTATE_LEARNING;
 +              break;
 +      case BR_STATE_FORWARDING:
 +              stp_state = GSWIP_PCE_PCTRL_0_PSTATE_FORWARDING;
 +              break;
 +      default:
 +              dev_err(priv->dev, "invalid STP state: %d\n", state);
 +              return;
 +      }
 +
 +      gswip_switch_mask(priv, 0, GSWIP_SDMA_PCTRL_EN,
 +                        GSWIP_SDMA_PCTRLp(port));
 +      gswip_switch_mask(priv, GSWIP_PCE_PCTRL_0_PSTATE_MASK, stp_state,
 +                        GSWIP_PCE_PCTRL_0p(port));
 +}
 +
 +static int gswip_port_fdb(struct dsa_switch *ds, int port,
 +                        const unsigned char *addr, u16 vid, bool add)
 +{
 +      struct net_device *bridge = dsa_port_bridge_dev_get(dsa_to_port(ds, port));
 +      struct gswip_priv *priv = ds->priv;
 +      struct gswip_pce_table_entry mac_bridge = {0,};
 +      unsigned int max_ports = priv->hw_info->max_ports;
 +      int fid = -1;
 +      int i;
 +      int err;
 +
++      /* Operation not supported on the CPU port, don't throw errors */
 +      if (!bridge)
++              return 0;
 +
 +      for (i = max_ports; i < ARRAY_SIZE(priv->vlans); i++) {
 +              if (priv->vlans[i].bridge == bridge) {
 +                      fid = priv->vlans[i].fid;
 +                      break;
 +              }
 +      }
 +
 +      if (fid == -1) {
 +              dev_err(priv->dev, "no FID found for bridge %s\n",
 +                      bridge->name);
 +              return -EINVAL;
 +      }
 +
 +      mac_bridge.table = GSWIP_TABLE_MAC_BRIDGE;
 +      mac_bridge.key_mode = true;
 +      mac_bridge.key[0] = addr[5] | (addr[4] << 8);
 +      mac_bridge.key[1] = addr[3] | (addr[2] << 8);
 +      mac_bridge.key[2] = addr[1] | (addr[0] << 8);
 +      mac_bridge.key[3] = FIELD_PREP(GSWIP_TABLE_MAC_BRIDGE_KEY3_FID, fid);
 +      mac_bridge.val[0] = add ? BIT(port) : 0; /* port map */
 +      mac_bridge.val[1] = GSWIP_TABLE_MAC_BRIDGE_VAL1_STATIC;
 +      mac_bridge.valid = add;
 +
 +      err = gswip_pce_table_entry_write(priv, &mac_bridge);
 +      if (err)
 +              dev_err(priv->dev, "failed to write mac bridge: %d\n", err);
 +
 +      return err;
 +}
 +
 +static int gswip_port_fdb_add(struct dsa_switch *ds, int port,
 +                            const unsigned char *addr, u16 vid,
 +                            struct dsa_db db)
 +{
 +      return gswip_port_fdb(ds, port, addr, vid, true);
 +}
 +
 +static int gswip_port_fdb_del(struct dsa_switch *ds, int port,
 +                            const unsigned char *addr, u16 vid,
 +                            struct dsa_db db)
 +{
 +      return gswip_port_fdb(ds, port, addr, vid, false);
 +}
 +
 +static int gswip_port_fdb_dump(struct dsa_switch *ds, int port,
 +                             dsa_fdb_dump_cb_t *cb, void *data)
 +{
 +      struct gswip_priv *priv = ds->priv;
 +      struct gswip_pce_table_entry mac_bridge = {0,};
 +      unsigned char addr[ETH_ALEN];
 +      int i;
 +      int err;
 +
 +      for (i = 0; i < 2048; i++) {
 +              mac_bridge.table = GSWIP_TABLE_MAC_BRIDGE;
 +              mac_bridge.index = i;
 +
 +              err = gswip_pce_table_entry_read(priv, &mac_bridge);
 +              if (err) {
 +                      dev_err(priv->dev,
 +                              "failed to read mac bridge entry %d: %d\n",
 +                              i, err);
 +                      return err;
 +              }
 +
 +              if (!mac_bridge.valid)
 +                      continue;
 +
 +              addr[5] = mac_bridge.key[0] & 0xff;
 +              addr[4] = (mac_bridge.key[0] >> 8) & 0xff;
 +              addr[3] = mac_bridge.key[1] & 0xff;
 +              addr[2] = (mac_bridge.key[1] >> 8) & 0xff;
 +              addr[1] = mac_bridge.key[2] & 0xff;
 +              addr[0] = (mac_bridge.key[2] >> 8) & 0xff;
 +              if (mac_bridge.val[1] & GSWIP_TABLE_MAC_BRIDGE_VAL1_STATIC) {
 +                      if (mac_bridge.val[0] & BIT(port)) {
 +                              err = cb(addr, 0, true, data);
 +                              if (err)
 +                                      return err;
 +                      }
 +              } else {
 +                      if (port == FIELD_GET(GSWIP_TABLE_MAC_BRIDGE_VAL0_PORT,
 +                                            mac_bridge.val[0])) {
 +                              err = cb(addr, 0, false, data);
 +                              if (err)
 +                                      return err;
 +                      }
 +              }
 +      }
 +      return 0;
 +}
 +
 +static int gswip_port_max_mtu(struct dsa_switch *ds, int port)
 +{
 +      /* Includes 8 bytes for special header. */
 +      return GSWIP_MAX_PACKET_LENGTH - VLAN_ETH_HLEN - ETH_FCS_LEN;
 +}
 +
 +static int gswip_port_change_mtu(struct dsa_switch *ds, int port, int new_mtu)
 +{
 +      struct gswip_priv *priv = ds->priv;
 +
 +      /* CPU port always has maximum mtu of user ports, so use it to set
 +       * switch frame size, including 8 byte special header.
 +       */
 +      if (dsa_is_cpu_port(ds, port)) {
 +              new_mtu += 8;
 +              gswip_switch_w(priv, VLAN_ETH_HLEN + new_mtu + ETH_FCS_LEN,
 +                             GSWIP_MAC_FLEN);
 +      }
 +
 +      /* Enable MLEN for ports with non-standard MTUs, including the special
 +       * header on the CPU port added above.
 +       */
 +      if (new_mtu != ETH_DATA_LEN)
 +              gswip_switch_mask(priv, 0, GSWIP_MAC_CTRL_2_MLEN,
 +                                GSWIP_MAC_CTRL_2p(port));
 +      else
 +              gswip_switch_mask(priv, GSWIP_MAC_CTRL_2_MLEN, 0,
 +                                GSWIP_MAC_CTRL_2p(port));
 +
 +      return 0;
 +}
 +
 +static void gswip_xrx200_phylink_get_caps(struct dsa_switch *ds, int port,
 +                                        struct phylink_config *config)
 +{
 +      switch (port) {
 +      case 0:
 +      case 1:
 +              phy_interface_set_rgmii(config->supported_interfaces);
 +              __set_bit(PHY_INTERFACE_MODE_MII,
 +                        config->supported_interfaces);
 +              __set_bit(PHY_INTERFACE_MODE_REVMII,
 +                        config->supported_interfaces);
 +              __set_bit(PHY_INTERFACE_MODE_RMII,
 +                        config->supported_interfaces);
 +              break;
 +
 +      case 2:
 +      case 3:
 +      case 4:
 +      case 6:
 +              __set_bit(PHY_INTERFACE_MODE_INTERNAL,
 +                        config->supported_interfaces);
 +              break;
 +
 +      case 5:
 +              phy_interface_set_rgmii(config->supported_interfaces);
 +              __set_bit(PHY_INTERFACE_MODE_INTERNAL,
 +                        config->supported_interfaces);
 +              break;
 +      }
 +
 +      config->mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
 +              MAC_10 | MAC_100 | MAC_1000;
 +}
 +
 +static void gswip_xrx300_phylink_get_caps(struct dsa_switch *ds, int port,
 +                                        struct phylink_config *config)
 +{
 +      switch (port) {
 +      case 0:
 +              phy_interface_set_rgmii(config->supported_interfaces);
 +              __set_bit(PHY_INTERFACE_MODE_GMII,
 +                        config->supported_interfaces);
 +              __set_bit(PHY_INTERFACE_MODE_RMII,
 +                        config->supported_interfaces);
 +              break;
 +
 +      case 1:
 +      case 2:
 +      case 3:
 +      case 4:
 +      case 6:
 +              __set_bit(PHY_INTERFACE_MODE_INTERNAL,
 +                        config->supported_interfaces);
 +              break;
 +
 +      case 5:
 +              phy_interface_set_rgmii(config->supported_interfaces);
 +              __set_bit(PHY_INTERFACE_MODE_INTERNAL,
 +                        config->supported_interfaces);
 +              __set_bit(PHY_INTERFACE_MODE_RMII,
 +                        config->supported_interfaces);
 +              break;
 +      }
 +
 +      config->mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
 +              MAC_10 | MAC_100 | MAC_1000;
 +}
 +
 +static void gswip_phylink_get_caps(struct dsa_switch *ds, int port,
 +                                 struct phylink_config *config)
 +{
 +      struct gswip_priv *priv = ds->priv;
 +
 +      priv->hw_info->phylink_get_caps(ds, port, config);
 +}
 +
 +static void gswip_port_set_link(struct gswip_priv *priv, int port, bool link)
 +{
 +      u32 mdio_phy;
 +
 +      if (link)
 +              mdio_phy = GSWIP_MDIO_PHY_LINK_UP;
 +      else
 +              mdio_phy = GSWIP_MDIO_PHY_LINK_DOWN;
 +
 +      gswip_mdio_mask(priv, GSWIP_MDIO_PHY_LINK_MASK, mdio_phy,
 +                      GSWIP_MDIO_PHYp(port));
 +}
 +
 +static void gswip_port_set_speed(struct gswip_priv *priv, int port, int speed,
 +                               phy_interface_t interface)
 +{
 +      u32 mdio_phy = 0, mii_cfg = 0, mac_ctrl_0 = 0;
 +
 +      switch (speed) {
 +      case SPEED_10:
 +              mdio_phy = GSWIP_MDIO_PHY_SPEED_M10;
 +
 +              if (interface == PHY_INTERFACE_MODE_RMII)
 +                      mii_cfg = GSWIP_MII_CFG_RATE_M50;
 +              else
 +                      mii_cfg = GSWIP_MII_CFG_RATE_M2P5;
 +
 +              mac_ctrl_0 = GSWIP_MAC_CTRL_0_GMII_MII;
 +              break;
 +
 +      case SPEED_100:
 +              mdio_phy = GSWIP_MDIO_PHY_SPEED_M100;
 +
 +              if (interface == PHY_INTERFACE_MODE_RMII)
 +                      mii_cfg = GSWIP_MII_CFG_RATE_M50;
 +              else
 +                      mii_cfg = GSWIP_MII_CFG_RATE_M25;
 +
 +              mac_ctrl_0 = GSWIP_MAC_CTRL_0_GMII_MII;
 +              break;
 +
 +      case SPEED_1000:
 +              mdio_phy = GSWIP_MDIO_PHY_SPEED_G1;
 +
 +              mii_cfg = GSWIP_MII_CFG_RATE_M125;
 +
 +              mac_ctrl_0 = GSWIP_MAC_CTRL_0_GMII_RGMII;
 +              break;
 +      }
 +
 +      gswip_mdio_mask(priv, GSWIP_MDIO_PHY_SPEED_MASK, mdio_phy,
 +                      GSWIP_MDIO_PHYp(port));
 +      gswip_mii_mask_cfg(priv, GSWIP_MII_CFG_RATE_MASK, mii_cfg, port);
 +      gswip_switch_mask(priv, GSWIP_MAC_CTRL_0_GMII_MASK, mac_ctrl_0,
 +                        GSWIP_MAC_CTRL_0p(port));
 +}
 +
 +static void gswip_port_set_duplex(struct gswip_priv *priv, int port, int duplex)
 +{
 +      u32 mac_ctrl_0, mdio_phy;
 +
 +      if (duplex == DUPLEX_FULL) {
 +              mac_ctrl_0 = GSWIP_MAC_CTRL_0_FDUP_EN;
 +              mdio_phy = GSWIP_MDIO_PHY_FDUP_EN;
 +      } else {
 +              mac_ctrl_0 = GSWIP_MAC_CTRL_0_FDUP_DIS;
 +              mdio_phy = GSWIP_MDIO_PHY_FDUP_DIS;
 +      }
 +
 +      gswip_switch_mask(priv, GSWIP_MAC_CTRL_0_FDUP_MASK, mac_ctrl_0,
 +                        GSWIP_MAC_CTRL_0p(port));
 +      gswip_mdio_mask(priv, GSWIP_MDIO_PHY_FDUP_MASK, mdio_phy,
 +                      GSWIP_MDIO_PHYp(port));
 +}
 +
 +static void gswip_port_set_pause(struct gswip_priv *priv, int port,
 +                               bool tx_pause, bool rx_pause)
 +{
 +      u32 mac_ctrl_0, mdio_phy;
 +
 +      if (tx_pause && rx_pause) {
 +              mac_ctrl_0 = GSWIP_MAC_CTRL_0_FCON_RXTX;
 +              mdio_phy = GSWIP_MDIO_PHY_FCONTX_EN |
 +                         GSWIP_MDIO_PHY_FCONRX_EN;
 +      } else if (tx_pause) {
 +              mac_ctrl_0 = GSWIP_MAC_CTRL_0_FCON_TX;
 +              mdio_phy = GSWIP_MDIO_PHY_FCONTX_EN |
 +                         GSWIP_MDIO_PHY_FCONRX_DIS;
 +      } else if (rx_pause) {
 +              mac_ctrl_0 = GSWIP_MAC_CTRL_0_FCON_RX;
 +              mdio_phy = GSWIP_MDIO_PHY_FCONTX_DIS |
 +                         GSWIP_MDIO_PHY_FCONRX_EN;
 +      } else {
 +              mac_ctrl_0 = GSWIP_MAC_CTRL_0_FCON_NONE;
 +              mdio_phy = GSWIP_MDIO_PHY_FCONTX_DIS |
 +                         GSWIP_MDIO_PHY_FCONRX_DIS;
 +      }
 +
 +      gswip_switch_mask(priv, GSWIP_MAC_CTRL_0_FCON_MASK,
 +                        mac_ctrl_0, GSWIP_MAC_CTRL_0p(port));
 +      gswip_mdio_mask(priv,
 +                      GSWIP_MDIO_PHY_FCONTX_MASK |
 +                      GSWIP_MDIO_PHY_FCONRX_MASK,
 +                      mdio_phy, GSWIP_MDIO_PHYp(port));
 +}
 +
 +static void gswip_phylink_mac_config(struct phylink_config *config,
 +                                   unsigned int mode,
 +                                   const struct phylink_link_state *state)
 +{
 +      struct dsa_port *dp = dsa_phylink_to_port(config);
 +      struct gswip_priv *priv = dp->ds->priv;
 +      int port = dp->index;
 +      u32 miicfg = 0;
 +
 +      miicfg |= GSWIP_MII_CFG_LDCLKDIS;
 +
 +      switch (state->interface) {
 +      case PHY_INTERFACE_MODE_SGMII:
 +      case PHY_INTERFACE_MODE_1000BASEX:
 +      case PHY_INTERFACE_MODE_2500BASEX:
 +              return;
 +      case PHY_INTERFACE_MODE_MII:
 +      case PHY_INTERFACE_MODE_INTERNAL:
 +              miicfg |= GSWIP_MII_CFG_MODE_MIIM;
 +              break;
 +      case PHY_INTERFACE_MODE_REVMII:
 +              miicfg |= GSWIP_MII_CFG_MODE_MIIP;
 +              break;
 +      case PHY_INTERFACE_MODE_RMII:
 +              miicfg |= GSWIP_MII_CFG_MODE_RMIIM;
 +              break;
 +      case PHY_INTERFACE_MODE_RGMII:
 +      case PHY_INTERFACE_MODE_RGMII_ID:
 +      case PHY_INTERFACE_MODE_RGMII_RXID:
 +      case PHY_INTERFACE_MODE_RGMII_TXID:
 +              miicfg |= GSWIP_MII_CFG_MODE_RGMII;
 +              break;
 +      case PHY_INTERFACE_MODE_GMII:
 +              miicfg |= GSWIP_MII_CFG_MODE_GMII;
 +              break;
 +      default:
 +              dev_err(dp->ds->dev,
 +                      "Unsupported interface: %d\n", state->interface);
 +              return;
 +      }
 +
 +      gswip_mii_mask_cfg(priv,
 +                         GSWIP_MII_CFG_MODE_MASK | GSWIP_MII_CFG_RMII_CLK |
 +                         GSWIP_MII_CFG_RGMII_IBS | GSWIP_MII_CFG_LDCLKDIS,
 +                         miicfg, port);
 +
 +      switch (state->interface) {
 +      case PHY_INTERFACE_MODE_RGMII_ID:
 +              gswip_mii_mask_pcdu(priv, GSWIP_MII_PCDU_TXDLY_MASK |
 +                                        GSWIP_MII_PCDU_RXDLY_MASK, 0, port);
 +              break;
 +      case PHY_INTERFACE_MODE_RGMII_RXID:
 +              gswip_mii_mask_pcdu(priv, GSWIP_MII_PCDU_RXDLY_MASK, 0, port);
 +              break;
 +      case PHY_INTERFACE_MODE_RGMII_TXID:
 +              gswip_mii_mask_pcdu(priv, GSWIP_MII_PCDU_TXDLY_MASK, 0, port);
 +              break;
 +      default:
 +              break;
 +      }
 +}
 +
 +static void gswip_phylink_mac_link_down(struct phylink_config *config,
 +                                      unsigned int mode,
 +                                      phy_interface_t interface)
 +{
 +      struct dsa_port *dp = dsa_phylink_to_port(config);
 +      struct gswip_priv *priv = dp->ds->priv;
 +      int port = dp->index;
 +
 +      gswip_mii_mask_cfg(priv, GSWIP_MII_CFG_EN, 0, port);
 +
 +      if (!dsa_port_is_cpu(dp))
 +              gswip_port_set_link(priv, port, false);
 +}
 +
 +static void gswip_phylink_mac_link_up(struct phylink_config *config,
 +                                    struct phy_device *phydev,
 +                                    unsigned int mode,
 +                                    phy_interface_t interface,
 +                                    int speed, int duplex,
 +                                    bool tx_pause, bool rx_pause)
 +{
 +      struct dsa_port *dp = dsa_phylink_to_port(config);
 +      struct gswip_priv *priv = dp->ds->priv;
 +      int port = dp->index;
 +
 +      if (!dsa_port_is_cpu(dp)) {
 +              gswip_port_set_link(priv, port, true);
 +              gswip_port_set_speed(priv, port, speed, interface);
 +              gswip_port_set_duplex(priv, port, duplex);
 +              gswip_port_set_pause(priv, port, tx_pause, rx_pause);
 +      }
 +
 +      gswip_mii_mask_cfg(priv, 0, GSWIP_MII_CFG_EN, port);
 +}
 +
 +static void gswip_get_strings(struct dsa_switch *ds, int port, u32 stringset,
 +                            uint8_t *data)
 +{
 +      int i;
 +
 +      if (stringset != ETH_SS_STATS)
 +              return;
 +
 +      for (i = 0; i < ARRAY_SIZE(gswip_rmon_cnt); i++)
 +              ethtool_puts(&data, gswip_rmon_cnt[i].name);
 +}
 +
 +static u32 gswip_bcm_ram_entry_read(struct gswip_priv *priv, u32 table,
 +                                  u32 index)
 +{
 +      u32 result;
 +      int err;
 +
 +      gswip_switch_w(priv, index, GSWIP_BM_RAM_ADDR);
 +      gswip_switch_mask(priv, GSWIP_BM_RAM_CTRL_ADDR_MASK |
 +                              GSWIP_BM_RAM_CTRL_OPMOD,
 +                            table | GSWIP_BM_RAM_CTRL_BAS,
 +                            GSWIP_BM_RAM_CTRL);
 +
 +      err = gswip_switch_r_timeout(priv, GSWIP_BM_RAM_CTRL,
 +                                   GSWIP_BM_RAM_CTRL_BAS);
 +      if (err) {
 +              dev_err(priv->dev, "timeout while reading table: %u, index: %u\n",
 +                      table, index);
 +              return 0;
 +      }
 +
 +      result = gswip_switch_r(priv, GSWIP_BM_RAM_VAL(0));
 +      result |= gswip_switch_r(priv, GSWIP_BM_RAM_VAL(1)) << 16;
 +
 +      return result;
 +}
 +
 +static void gswip_get_ethtool_stats(struct dsa_switch *ds, int port,
 +                                  uint64_t *data)
 +{
 +      struct gswip_priv *priv = ds->priv;
 +      const struct gswip_rmon_cnt_desc *rmon_cnt;
 +      int i;
 +      u64 high;
 +
 +      for (i = 0; i < ARRAY_SIZE(gswip_rmon_cnt); i++) {
 +              rmon_cnt = &gswip_rmon_cnt[i];
 +
 +              data[i] = gswip_bcm_ram_entry_read(priv, port,
 +                                                 rmon_cnt->offset);
 +              if (rmon_cnt->size == 2) {
 +                      high = gswip_bcm_ram_entry_read(priv, port,
 +                                                      rmon_cnt->offset + 1);
 +                      data[i] |= high << 32;
 +              }
 +      }
 +}
 +
 +static int gswip_get_sset_count(struct dsa_switch *ds, int port, int sset)
 +{
 +      if (sset != ETH_SS_STATS)
 +              return 0;
 +
 +      return ARRAY_SIZE(gswip_rmon_cnt);
 +}
 +
 +static struct phylink_pcs *gswip_phylink_mac_select_pcs(struct phylink_config *config,
 +                                                      phy_interface_t interface)
 +{
 +      struct dsa_port *dp = dsa_phylink_to_port(config);
 +      struct gswip_priv *priv = dp->ds->priv;
 +
 +      if (priv->hw_info->mac_select_pcs)
 +              return priv->hw_info->mac_select_pcs(config, interface);
 +
 +      return NULL;
 +}
 +
 +static const struct phylink_mac_ops gswip_phylink_mac_ops = {
 +      .mac_config             = gswip_phylink_mac_config,
 +      .mac_link_down          = gswip_phylink_mac_link_down,
 +      .mac_link_up            = gswip_phylink_mac_link_up,
 +      .mac_select_pcs         = gswip_phylink_mac_select_pcs,
 +};
 +
 +static const struct dsa_switch_ops gswip_switch_ops = {
 +      .get_tag_protocol       = gswip_get_tag_protocol,
 +      .setup                  = gswip_setup,
++      .port_setup             = gswip_port_setup,
 +      .port_enable            = gswip_port_enable,
 +      .port_disable           = gswip_port_disable,
 +      .port_bridge_join       = gswip_port_bridge_join,
 +      .port_bridge_leave      = gswip_port_bridge_leave,
 +      .port_fast_age          = gswip_port_fast_age,
 +      .port_vlan_filtering    = gswip_port_vlan_filtering,
 +      .port_vlan_add          = gswip_port_vlan_add,
 +      .port_vlan_del          = gswip_port_vlan_del,
 +      .port_stp_state_set     = gswip_port_stp_state_set,
 +      .port_fdb_add           = gswip_port_fdb_add,
 +      .port_fdb_del           = gswip_port_fdb_del,
 +      .port_fdb_dump          = gswip_port_fdb_dump,
 +      .port_change_mtu        = gswip_port_change_mtu,
 +      .port_max_mtu           = gswip_port_max_mtu,
 +      .phylink_get_caps       = gswip_phylink_get_caps,
 +      .get_strings            = gswip_get_strings,
 +      .get_ethtool_stats      = gswip_get_ethtool_stats,
 +      .get_sset_count         = gswip_get_sset_count,
 +};
 +
 +static const struct xway_gphy_match_data xrx200a1x_gphy_data = {
 +      .fe_firmware_name = "lantiq/xrx200_phy22f_a14.bin",
 +      .ge_firmware_name = "lantiq/xrx200_phy11g_a14.bin",
 +};
 +
 +static const struct xway_gphy_match_data xrx200a2x_gphy_data = {
 +      .fe_firmware_name = "lantiq/xrx200_phy22f_a22.bin",
 +      .ge_firmware_name = "lantiq/xrx200_phy11g_a22.bin",
 +};
 +
 +static const struct xway_gphy_match_data xrx300_gphy_data = {
 +      .fe_firmware_name = "lantiq/xrx300_phy22f_a21.bin",
 +      .ge_firmware_name = "lantiq/xrx300_phy11g_a21.bin",
 +};
 +
 +static const struct of_device_id xway_gphy_match[] __maybe_unused = {
 +      { .compatible = "lantiq,xrx200-gphy-fw", .data = NULL },
 +      { .compatible = "lantiq,xrx200a1x-gphy-fw", .data = &xrx200a1x_gphy_data },
 +      { .compatible = "lantiq,xrx200a2x-gphy-fw", .data = &xrx200a2x_gphy_data },
 +      { .compatible = "lantiq,xrx300-gphy-fw", .data = &xrx300_gphy_data },
 +      { .compatible = "lantiq,xrx330-gphy-fw", .data = &xrx300_gphy_data },
 +      {},
 +};
 +
 +static int gswip_gphy_fw_load(struct gswip_priv *priv, struct gswip_gphy_fw *gphy_fw)
 +{
 +      struct device *dev = priv->dev;
 +      const struct firmware *fw;
 +      void *fw_addr;
 +      dma_addr_t dma_addr;
 +      dma_addr_t dev_addr;
 +      size_t size;
 +      int ret;
 +
 +      ret = clk_prepare_enable(gphy_fw->clk_gate);
 +      if (ret)
 +              return ret;
 +
 +      reset_control_assert(gphy_fw->reset);
 +
 +      /* The vendor BSP uses a 200ms delay after asserting the reset line.
 +       * Without this some users are observing that the PHY is not coming up
 +       * on the MDIO bus.
 +       */
 +      msleep(200);
 +
 +      ret = request_firmware(&fw, gphy_fw->fw_name, dev);
 +      if (ret)
 +              return dev_err_probe(dev, ret, "failed to load firmware: %s\n",
 +                                   gphy_fw->fw_name);
 +
 +      /* GPHY cores need the firmware code in a persistent and contiguous
 +       * memory area with a 16 kB boundary aligned start address.
 +       */
 +      size = fw->size + XRX200_GPHY_FW_ALIGN;
 +
 +      fw_addr = dmam_alloc_coherent(dev, size, &dma_addr, GFP_KERNEL);
 +      if (fw_addr) {
 +              fw_addr = PTR_ALIGN(fw_addr, XRX200_GPHY_FW_ALIGN);
 +              dev_addr = ALIGN(dma_addr, XRX200_GPHY_FW_ALIGN);
 +              memcpy(fw_addr, fw->data, fw->size);
 +      } else {
 +              release_firmware(fw);
 +              return -ENOMEM;
 +      }
 +
 +      release_firmware(fw);
 +
 +      ret = regmap_write(priv->rcu_regmap, gphy_fw->fw_addr_offset, dev_addr);
 +      if (ret)
 +              return ret;
 +
 +      reset_control_deassert(gphy_fw->reset);
 +
 +      return ret;
 +}
 +
 +static int gswip_gphy_fw_probe(struct gswip_priv *priv,
 +                             struct gswip_gphy_fw *gphy_fw,
 +                             struct device_node *gphy_fw_np, int i)
 +{
 +      struct device *dev = priv->dev;
 +      u32 gphy_mode;
 +      int ret;
 +      char gphyname[10];
 +
 +      snprintf(gphyname, sizeof(gphyname), "gphy%d", i);
 +
 +      gphy_fw->clk_gate = devm_clk_get(dev, gphyname);
 +      if (IS_ERR(gphy_fw->clk_gate)) {
 +              return dev_err_probe(dev, PTR_ERR(gphy_fw->clk_gate),
 +                                   "Failed to lookup gate clock\n");
 +      }
 +
 +      ret = of_property_read_u32(gphy_fw_np, "reg", &gphy_fw->fw_addr_offset);
 +      if (ret)
 +              return ret;
 +
 +      ret = of_property_read_u32(gphy_fw_np, "lantiq,gphy-mode", &gphy_mode);
 +      /* Default to GE mode */
 +      if (ret)
 +              gphy_mode = GPHY_MODE_GE;
 +
 +      switch (gphy_mode) {
 +      case GPHY_MODE_FE:
 +              gphy_fw->fw_name = priv->gphy_fw_name_cfg->fe_firmware_name;
 +              break;
 +      case GPHY_MODE_GE:
 +              gphy_fw->fw_name = priv->gphy_fw_name_cfg->ge_firmware_name;
 +              break;
 +      default:
 +              return dev_err_probe(dev, -EINVAL, "Unknown GPHY mode %d\n",
 +                                   gphy_mode);
 +      }
 +
 +      gphy_fw->reset = of_reset_control_array_get_exclusive(gphy_fw_np);
 +      if (IS_ERR(gphy_fw->reset))
 +              return dev_err_probe(dev, PTR_ERR(gphy_fw->reset),
 +                                   "Failed to lookup gphy reset\n");
 +
 +      return gswip_gphy_fw_load(priv, gphy_fw);
 +}
 +
 +static void gswip_gphy_fw_remove(struct gswip_priv *priv,
 +                               struct gswip_gphy_fw *gphy_fw)
 +{
 +      int ret;
 +
 +      /* check if the device was fully probed */
 +      if (!gphy_fw->fw_name)
 +              return;
 +
 +      ret = regmap_write(priv->rcu_regmap, gphy_fw->fw_addr_offset, 0);
 +      if (ret)
 +              dev_err(priv->dev, "can not reset GPHY FW pointer\n");
 +
 +      clk_disable_unprepare(gphy_fw->clk_gate);
 +
 +      reset_control_put(gphy_fw->reset);
 +}
 +
 +static int gswip_gphy_fw_list(struct gswip_priv *priv,
 +                            struct device_node *gphy_fw_list_np, u32 version)
 +{
 +      struct device *dev = priv->dev;
 +      struct device_node *gphy_fw_np;
 +      const struct of_device_id *match;
 +      int err;
 +      int i = 0;
 +
 +      /* The VRX200 rev 1.1 uses the GSWIP 2.0 and needs the older
 +       * GPHY firmware. The VRX200 rev 1.2 uses the GSWIP 2.1 and also
 +       * needs a different GPHY firmware.
 +       */
 +      if (of_device_is_compatible(gphy_fw_list_np, "lantiq,xrx200-gphy-fw")) {
 +              switch (version) {
 +              case GSWIP_VERSION_2_0:
 +                      priv->gphy_fw_name_cfg = &xrx200a1x_gphy_data;
 +                      break;
 +              case GSWIP_VERSION_2_1:
 +                      priv->gphy_fw_name_cfg = &xrx200a2x_gphy_data;
 +                      break;
 +              default:
 +                      return dev_err_probe(dev, -ENOENT,
 +                                           "unknown GSWIP version: 0x%x\n",
 +                                           version);
 +              }
 +      }
 +
 +      match = of_match_node(xway_gphy_match, gphy_fw_list_np);
 +      if (match && match->data)
 +              priv->gphy_fw_name_cfg = match->data;
 +
 +      if (!priv->gphy_fw_name_cfg)
 +              return dev_err_probe(dev, -ENOENT,
 +                                   "GPHY compatible type not supported\n");
 +
 +      priv->num_gphy_fw = of_get_available_child_count(gphy_fw_list_np);
 +      if (!priv->num_gphy_fw)
 +              return -ENOENT;
 +
 +      priv->rcu_regmap = syscon_regmap_lookup_by_phandle(gphy_fw_list_np,
 +                                                         "lantiq,rcu");
 +      if (IS_ERR(priv->rcu_regmap))
 +              return PTR_ERR(priv->rcu_regmap);
 +
 +      priv->gphy_fw = devm_kmalloc_array(dev, priv->num_gphy_fw,
 +                                         sizeof(*priv->gphy_fw),
 +                                         GFP_KERNEL | __GFP_ZERO);
 +      if (!priv->gphy_fw)
 +              return -ENOMEM;
 +
 +      for_each_available_child_of_node(gphy_fw_list_np, gphy_fw_np) {
 +              err = gswip_gphy_fw_probe(priv, &priv->gphy_fw[i],
 +                                        gphy_fw_np, i);
 +              if (err) {
 +                      of_node_put(gphy_fw_np);
 +                      goto remove_gphy;
 +              }
 +              i++;
 +      }
 +
 +      /* The standalone PHY11G requires 300ms to be fully
 +       * initialized and ready for any MDIO communication after being
 +       * taken out of reset. For the SoC-internal GPHY variant there
 +       * is no (known) documentation for the minimum time after a
 +       * reset. Use the same value as for the standalone variant as
 +       * some users have reported internal PHYs not being detected
 +       * without any delay.
 +       */
 +      msleep(300);
 +
 +      return 0;
 +
 +remove_gphy:
 +      for (i = 0; i < priv->num_gphy_fw; i++)
 +              gswip_gphy_fw_remove(priv, &priv->gphy_fw[i]);
 +      return err;
 +}
 +
 +static int gswip_validate_cpu_port(struct dsa_switch *ds)
 +{
 +      struct gswip_priv *priv = ds->priv;
 +      struct dsa_port *cpu_dp;
 +      int cpu_port = -1;
 +
 +      dsa_switch_for_each_cpu_port(cpu_dp, ds) {
 +              if (cpu_port != -1)
 +                      return dev_err_probe(ds->dev, -EINVAL,
 +                                           "only a single CPU port is supported\n");
 +
 +              cpu_port = cpu_dp->index;
 +      }
 +
 +      if (cpu_port == -1)
 +              return dev_err_probe(ds->dev, -EINVAL, "no CPU port defined\n");
 +
 +      if (BIT(cpu_port) & ~priv->hw_info->allowed_cpu_ports)
 +              return dev_err_probe(ds->dev, -EINVAL,
 +                                   "unsupported CPU port defined\n");
 +
 +      return 0;
 +}
 +
 +static int gswip_probe(struct platform_device *pdev)
 +{
 +      struct device_node *np, *gphy_fw_np;
 +      struct device *dev = &pdev->dev;
 +      struct gswip_priv *priv;
 +      int err;
 +      int i;
 +      u32 version;
 +
 +      priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
 +      if (!priv)
 +              return -ENOMEM;
 +
 +      priv->gswip = devm_platform_ioremap_resource(pdev, 0);
 +      if (IS_ERR(priv->gswip))
 +              return PTR_ERR(priv->gswip);
 +
 +      priv->mdio = devm_platform_ioremap_resource(pdev, 1);
 +      if (IS_ERR(priv->mdio))
 +              return PTR_ERR(priv->mdio);
 +
 +      priv->mii = devm_platform_ioremap_resource(pdev, 2);
 +      if (IS_ERR(priv->mii))
 +              return PTR_ERR(priv->mii);
 +
 +      priv->hw_info = of_device_get_match_data(dev);
 +      if (!priv->hw_info)
 +              return -EINVAL;
 +
 +      priv->ds = devm_kzalloc(dev, sizeof(*priv->ds), GFP_KERNEL);
 +      if (!priv->ds)
 +              return -ENOMEM;
 +
 +      priv->ds->dev = dev;
 +      priv->ds->num_ports = priv->hw_info->max_ports;
 +      priv->ds->priv = priv;
 +      priv->ds->ops = &gswip_switch_ops;
 +      priv->ds->phylink_mac_ops = &gswip_phylink_mac_ops;
 +      priv->dev = dev;
 +      mutex_init(&priv->pce_table_lock);
 +      version = gswip_switch_r(priv, GSWIP_VERSION);
 +
 +      /* The hardware has the 'major/minor' version bytes in the wrong order
 +       * preventing numerical comparisons. Construct a 16-bit unsigned integer
 +       * having the REV field as most significant byte and the MOD field as
 +       * least significant byte. This is effectively swapping the two bytes of
 +       * the version variable, but other than using swab16 it doesn't affect
 +       * the source variable.
 +       */
 +      priv->version = GSWIP_VERSION_REV(version) << 8 |
 +                      GSWIP_VERSION_MOD(version);
 +
 +      np = dev->of_node;
 +      switch (version) {
 +      case GSWIP_VERSION_2_0:
 +      case GSWIP_VERSION_2_1:
 +              if (!of_device_is_compatible(np, "lantiq,xrx200-gswip"))
 +                      return -EINVAL;
 +              break;
 +      case GSWIP_VERSION_2_2:
 +      case GSWIP_VERSION_2_2_ETC:
 +              if (!of_device_is_compatible(np, "lantiq,xrx300-gswip") &&
 +                  !of_device_is_compatible(np, "lantiq,xrx330-gswip"))
 +                      return -EINVAL;
 +              break;
 +      default:
 +              return dev_err_probe(dev, -ENOENT,
 +                                   "unknown GSWIP version: 0x%x\n", version);
 +      }
 +
 +      /* bring up the mdio bus */
 +      gphy_fw_np = of_get_compatible_child(dev->of_node, "lantiq,gphy-fw");
 +      if (gphy_fw_np) {
 +              err = gswip_gphy_fw_list(priv, gphy_fw_np, version);
 +              of_node_put(gphy_fw_np);
 +              if (err)
 +                      return dev_err_probe(dev, err,
 +                                           "gphy fw probe failed\n");
 +      }
 +
 +      err = dsa_register_switch(priv->ds);
 +      if (err) {
 +              dev_err_probe(dev, err, "dsa switch registration failed\n");
 +              goto gphy_fw_remove;
 +      }
 +
 +      err = gswip_validate_cpu_port(priv->ds);
 +      if (err)
 +              goto disable_switch;
 +
 +      platform_set_drvdata(pdev, priv);
 +
 +      dev_info(dev, "probed GSWIP version %lx mod %lx\n",
 +               GSWIP_VERSION_REV(version), GSWIP_VERSION_MOD(version));
 +      return 0;
 +
 +disable_switch:
 +      gswip_mdio_mask(priv, GSWIP_MDIO_GLOB_ENABLE, 0, GSWIP_MDIO_GLOB);
 +      dsa_unregister_switch(priv->ds);
 +gphy_fw_remove:
 +      for (i = 0; i < priv->num_gphy_fw; i++)
 +              gswip_gphy_fw_remove(priv, &priv->gphy_fw[i]);
 +      return err;
 +}
 +
 +static void gswip_remove(struct platform_device *pdev)
 +{
 +      struct gswip_priv *priv = platform_get_drvdata(pdev);
 +      int i;
 +
 +      if (!priv)
 +              return;
 +
 +      /* disable the switch */
 +      gswip_mdio_mask(priv, GSWIP_MDIO_GLOB_ENABLE, 0, GSWIP_MDIO_GLOB);
 +
 +      dsa_unregister_switch(priv->ds);
 +
 +      for (i = 0; i < priv->num_gphy_fw; i++)
 +              gswip_gphy_fw_remove(priv, &priv->gphy_fw[i]);
 +}
 +
 +static void gswip_shutdown(struct platform_device *pdev)
 +{
 +      struct gswip_priv *priv = platform_get_drvdata(pdev);
 +
 +      if (!priv)
 +              return;
 +
 +      dsa_switch_shutdown(priv->ds);
 +
 +      platform_set_drvdata(pdev, NULL);
 +}
 +
 +static const struct gswip_hw_info gswip_xrx200 = {
 +      .max_ports = 7,
 +      .allowed_cpu_ports = BIT(6),
 +      .mii_ports = BIT(0) | BIT(1) | BIT(5),
 +      .mii_port_reg_offset = 0,
 +      .phylink_get_caps = gswip_xrx200_phylink_get_caps,
 +      .pce_microcode = &gswip_pce_microcode,
 +      .pce_microcode_size = ARRAY_SIZE(gswip_pce_microcode),
 +      .tag_protocol = DSA_TAG_PROTO_GSWIP,
 +};
 +
 +static const struct gswip_hw_info gswip_xrx300 = {
 +      .max_ports = 7,
 +      .allowed_cpu_ports = BIT(6),
 +      .mii_ports = BIT(0) | BIT(5),
 +      .mii_port_reg_offset = 0,
 +      .phylink_get_caps = gswip_xrx300_phylink_get_caps,
 +      .pce_microcode = &gswip_pce_microcode,
 +      .pce_microcode_size = ARRAY_SIZE(gswip_pce_microcode),
 +      .tag_protocol = DSA_TAG_PROTO_GSWIP,
 +};
 +
 +static const struct of_device_id gswip_of_match[] = {
 +      { .compatible = "lantiq,xrx200-gswip", .data = &gswip_xrx200 },
 +      { .compatible = "lantiq,xrx300-gswip", .data = &gswip_xrx300 },
 +      { .compatible = "lantiq,xrx330-gswip", .data = &gswip_xrx300 },
 +      {},
 +};
 +MODULE_DEVICE_TABLE(of, gswip_of_match);
 +
 +static struct platform_driver gswip_driver = {
 +      .probe = gswip_probe,
 +      .remove = gswip_remove,
 +      .shutdown = gswip_shutdown,
 +      .driver = {
 +              .name = "gswip",
 +              .of_match_table = gswip_of_match,
 +      },
 +};
 +
 +module_platform_driver(gswip_driver);
 +
 +MODULE_FIRMWARE("lantiq/xrx300_phy11g_a21.bin");
 +MODULE_FIRMWARE("lantiq/xrx300_phy22f_a21.bin");
 +MODULE_FIRMWARE("lantiq/xrx200_phy11g_a14.bin");
 +MODULE_FIRMWARE("lantiq/xrx200_phy11g_a22.bin");
 +MODULE_FIRMWARE("lantiq/xrx200_phy22f_a14.bin");
 +MODULE_FIRMWARE("lantiq/xrx200_phy22f_a22.bin");
 +MODULE_AUTHOR("Hauke Mehrtens <hauke@hauke-m.de>");
 +MODULE_DESCRIPTION("Lantiq / Intel GSWIP driver");
 +MODULE_LICENSE("GPL v2");
Simple merge
Simple merge
Simple merge
Simple merge