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

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