target/linux/mediatek/patches-4.9/0096-dsa-multi-cpu.patch

   1 Index: linux-4.9.20/drivers/net/dsa/mt7530.c
   2 ===================================================================
   3 --- linux-4.9.20.orig/drivers/net/dsa/mt7530.c
   4 +++ linux-4.9.20/drivers/net/dsa/mt7530.c
   5 @@ -996,15 +996,7 @@ err:
   6  static enum dsa_tag_protocol
   7  mtk_get_tag_protocol(struct dsa_switch *ds)
   8  {
   9 -       struct mt7530_priv *priv = ds->priv;
  10 -
  11 -       if (!dsa_is_cpu_port(ds, MT7530_CPU_PORT)) {
  12 -               dev_warn(priv->dev,
  13 -                        "port not matched with tagging CPU port\n");
  14 -               return DSA_TAG_PROTO_NONE;
  15 -       } else {
  16 -               return DSA_TAG_PROTO_MTK;
  17 -       }
  18 +       return DSA_TAG_PROTO_MTK;
  19  }
  20
  21  static struct dsa_switch_ops mt7530_switch_ops = {
  22 Index: linux-4.9.20/include/net/dsa.h
  23 ===================================================================
  24 --- linux-4.9.20.orig/include/net/dsa.h
  25 +++ linux-4.9.20/include/net/dsa.h
  26 @@ -145,6 +145,8 @@ struct dsa_port {
  27         struct device_node      *dn;
  28         unsigned int            ageing_time;
  29         u8                      stp_state;
  30 +       struct net_device       *ethernet;
  31 +       int                     upstream;
  32  };
  33
  34  struct dsa_switch {
  35 @@ -205,7 +207,7 @@ struct dsa_switch {
  36
  37  static inline bool dsa_is_cpu_port(struct dsa_switch *ds, int p)
  38  {
  39 -       return !!(ds->index == ds->dst->cpu_switch && p == ds->dst->cpu_port);
  40 +       return !!(ds->cpu_port_mask & (1 << p));
  41  }
  42
  43  static inline bool dsa_is_dsa_port(struct dsa_switch *ds, int p)
  44 @@ -218,6 +220,11 @@ static inline bool dsa_is_port_initializ
  45         return ds->enabled_port_mask & (1 << p) && ds->ports[p].netdev;
  46  }
  47
  48 +static inline bool dsa_is_upstream_port(struct dsa_switch *ds, int p)
  49 +{
  50 +       return dsa_is_cpu_port(ds, p) || dsa_is_dsa_port(ds, p);
  51 +}
  52 +
  53  static inline u8 dsa_upstream_port(struct dsa_switch *ds)
  54  {
  55         struct dsa_switch_tree *dst = ds->dst;
  56 @@ -234,6 +241,18 @@ static inline u8 dsa_upstream_port(struc
  57                 return ds->rtable[dst->cpu_switch];
  58  }
  59
  60 +static inline u8 dsa_port_upstream_port(struct dsa_switch *ds, int port)
  61 +{
  62 +       /*
  63 +        * If this port has a specific upstream cpu port, use it,
  64 +        * otherwise use the switch default.
  65 +        */
  66 +       if (ds->ports[port].upstream)
  67 +               return ds->ports[port].upstream;
  68 +       else
  69 +               return dsa_upstream_port(ds);
  70 +}
  71 +
  72  struct switchdev_trans;
  73  struct switchdev_obj;
  74  struct switchdev_obj_port_fdb;
  75 Index: linux-4.9.20/net/dsa/dsa2.c
  76 ===================================================================
  77 --- linux-4.9.20.orig/net/dsa/dsa2.c
  78 +++ linux-4.9.20/net/dsa/dsa2.c
  79 @@ -248,8 +248,6 @@ static int dsa_cpu_port_apply(struct dev
  80                 return err;
  81         }
  82
  83 -       ds->cpu_port_mask |= BIT(index);
  84 -
  85         return 0;
  86  }
  87
  88 @@ -259,6 +257,10 @@ static void dsa_cpu_port_unapply(struct
  89         dsa_cpu_dsa_destroy(port);
  90         ds->cpu_port_mask &= ~BIT(index);
  91
  92 +       if (ds->ports[index].ethernet) {
  93 +               dev_put(ds->ports[index].ethernet);
  94 +               ds->ports[index].ethernet = NULL;
  95 +       }
  96  }
  97
  98  static int dsa_user_port_apply(struct device_node *port, u32 index,
  99 @@ -479,6 +481,29 @@ static int dsa_cpu_parse(struct device_n
 100
 101         dst->rcv = dst->tag_ops->rcv;
 102
 103 +       dev_hold(ethernet_dev);
 104 +       ds->ports[index].ethernet = ethernet_dev;
 105 +       ds->cpu_port_mask |= BIT(index);
 106 +
 107 +       return 0;
 108 +}
 109 +
 110 +static int dsa_user_parse(struct device_node *port, u32 index,
 111 +                         struct dsa_switch *ds)
 112 +{
 113 +       struct device_node *cpu_port;
 114 +       const unsigned int *cpu_port_reg;
 115 +       int cpu_port_index;
 116 +
 117 +       cpu_port = of_parse_phandle(port, "cpu", 0);
 118 +       if (cpu_port) {
 119 +               cpu_port_reg = of_get_property(cpu_port, "reg", NULL);
 120 +               if (!cpu_port_reg)
 121 +                       return -EINVAL;
 122 +               cpu_port_index = be32_to_cpup(cpu_port_reg);
 123 +               ds->ports[index].upstream = cpu_port_index;
 124 +       }
 125 +
 126         return 0;
 127  }
 128
 129 @@ -486,18 +511,19 @@ static int dsa_ds_parse(struct dsa_switc
 130  {
 131         struct device_node *port;
 132         u32 index;
 133 -       int err;
 134 +       int err = 0;
 135
 136         for (index = 0; index < DSA_MAX_PORTS; index++) {
 137                 port = ds->ports[index].dn;
 138                 if (!port)
 139                         continue;
 140
 141 -               if (dsa_port_is_cpu(port)) {
 142 +               if (dsa_port_is_cpu(port))
 143                         err = dsa_cpu_parse(port, index, dst, ds);
 144 -                       if (err)
 145 -                               return err;
 146 -               }
 147 +               else if (!dsa_port_is_dsa(port))
 148 +                       err = dsa_user_parse(port, index,  ds);
 149 +               if (err)
 150 +                       return err;
 151         }
 152
 153         pr_info("DSA: switch %d %d parsed\n", dst->tree, ds->index);
 154 Index: linux-4.9.20/net/dsa/dsa_priv.h
 155 ===================================================================
 156 --- linux-4.9.20.orig/net/dsa/dsa_priv.h
 157 +++ linux-4.9.20/net/dsa/dsa_priv.h
 158 @@ -43,6 +43,7 @@ struct dsa_slave_priv {
 159         int                     old_duplex;
 160
 161         struct net_device       *bridge_dev;
 162 +       struct net_device       *master;
 163  #ifdef CONFIG_NET_POLL_CONTROLLER
 164         struct netpoll          *netpoll;
 165  #endif
 166 Index: linux-4.9.20/net/dsa/slave.c
 167 ===================================================================
 168 --- linux-4.9.20.orig/net/dsa/slave.c
 169 +++ linux-4.9.20/net/dsa/slave.c
 170 @@ -61,7 +61,7 @@ static int dsa_slave_get_iflink(const st
 171  {
 172         struct dsa_slave_priv *p = netdev_priv(dev);
 173
 174 -       return p->parent->dst->master_netdev->ifindex;
 175 +       return p->master->ifindex;
 176  }
 177
 178  static inline bool dsa_port_is_bridged(struct dsa_slave_priv *p)
 179 @@ -96,7 +96,7 @@ static void dsa_port_set_stp_state(struc
 180  static int dsa_slave_open(struct net_device *dev)
 181  {
 182         struct dsa_slave_priv *p = netdev_priv(dev);
 183 -       struct net_device *master = p->parent->dst->master_netdev;
 184 +       struct net_device *master = p->master;
 185         struct dsa_switch *ds = p->parent;
 186         u8 stp_state = dsa_port_is_bridged(p) ?
 187                         BR_STATE_BLOCKING : BR_STATE_FORWARDING;
 188 @@ -151,7 +151,7 @@ out:
 189  static int dsa_slave_close(struct net_device *dev)
 190  {
 191         struct dsa_slave_priv *p = netdev_priv(dev);
 192 -       struct net_device *master = p->parent->dst->master_netdev;
 193 +       struct net_device *master = p->master;
 194         struct dsa_switch *ds = p->parent;
 195
 196         if (p->phy)
 197 @@ -178,7 +178,7 @@ static int dsa_slave_close(struct net_de
 198  static void dsa_slave_change_rx_flags(struct net_device *dev, int change)
 199  {
 200         struct dsa_slave_priv *p = netdev_priv(dev);
 201 -       struct net_device *master = p->parent->dst->master_netdev;
 202 +       struct net_device *master = p->master;
 203
 204         if (change & IFF_ALLMULTI)
 205                 dev_set_allmulti(master, dev->flags & IFF_ALLMULTI ? 1 : -1);
 206 @@ -189,7 +189,7 @@ static void dsa_slave_change_rx_flags(st
 207  static void dsa_slave_set_rx_mode(struct net_device *dev)
 208  {
 209         struct dsa_slave_priv *p = netdev_priv(dev);
 210 -       struct net_device *master = p->parent->dst->master_netdev;
 211 +       struct net_device *master = p->master;
 212
 213         dev_mc_sync(master, dev);
 214         dev_uc_sync(master, dev);
 215 @@ -198,7 +198,7 @@ static void dsa_slave_set_rx_mode(struct
 216  static int dsa_slave_set_mac_address(struct net_device *dev, void *a)
 217  {
 218         struct dsa_slave_priv *p = netdev_priv(dev);
 219 -       struct net_device *master = p->parent->dst->master_netdev;
 220 +       struct net_device *master = p->master;
 221         struct sockaddr *addr = a;
 222         int err;
 223
 224 @@ -633,7 +633,7 @@ static netdev_tx_t dsa_slave_xmit(struct
 225         /* Queue the SKB for transmission on the parent interface, but
 226          * do not modify its EtherType
 227          */
 228 -       nskb->dev = p->parent->dst->master_netdev;
 229 +       nskb->dev = p->master;
 230         dev_queue_xmit(nskb);
 231
 232         return NETDEV_TX_OK;
 233 @@ -945,7 +945,7 @@ static int dsa_slave_netpoll_setup(struc
 234  {
 235         struct dsa_slave_priv *p = netdev_priv(dev);
 236         struct dsa_switch *ds = p->parent;
 237 -       struct net_device *master = ds->dst->master_netdev;
 238 +       struct net_device *master = p->master;
 239         struct netpoll *netpoll;
 240         int err = 0;
 241
 242 @@ -1235,11 +1235,16 @@ int dsa_slave_create(struct dsa_switch *
 243         struct net_device *master;
 244         struct net_device *slave_dev;
 245         struct dsa_slave_priv *p;
 246 +       int port_cpu = ds->ports[port].upstream;
 247         int ret;
 248
 249 -       master = ds->dst->master_netdev;
 250 -       if (ds->master_netdev)
 251 +       if (port_cpu && ds->ports[port_cpu].ethernet)
 252 +               master = ds->ports[port_cpu].ethernet;
 253 +       else if (ds->master_netdev)
 254                 master = ds->master_netdev;
 255 +       else
 256 +               master = ds->dst->master_netdev;
 257 +       master->dsa_ptr = (void *)ds->dst;
 258
 259         slave_dev = alloc_netdev(sizeof(struct dsa_slave_priv), name,
 260                                  NET_NAME_UNKNOWN, ether_setup);
 261 @@ -1265,6 +1270,7 @@ int dsa_slave_create(struct dsa_switch *
 262         p->parent = ds;
 263         p->port = port;
 264         p->xmit = dst->tag_ops->xmit;
 265 +       p->master = master;
 266
 267         p->old_pause = -1;
 268         p->old_link = -1;