Patched in Tegra support.

8 files changed, 256 insertions, 56 deletions

diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig
index f5eede1d6cb..c53ded2a98d 100644
--- a/net/dsa/Kconfig
+++ b/net/dsa/Kconfig
@@ -1,24 +1,60 @@
-config HAVE_NET_DSA
-        def_bool y
-        depends on NETDEVICES && !S390
-
-# Drivers must select NET_DSA and the appropriate tagging format
-
-config NET_DSA
-        tristate
-        depends on HAVE_NET_DSA
+menuconfig NET_DSA
+        bool "Distributed Switch Architecture support"
+        default n
+        depends on EXPERIMENTAL && NETDEVICES && !S390
         select PHYLIB
+        ---help---
+          This allows you to use hardware switch chips that use
+          the Distributed Switch Architecture.
+
 
 if NET_DSA
 
 # tagging formats
 config NET_DSA_TAG_DSA
         bool
+        default n
 
 config NET_DSA_TAG_EDSA
         bool
+        default n
 
 config NET_DSA_TAG_TRAILER
         bool
+        default n
+
+
+# switch drivers
+config NET_DSA_MV88E6XXX
+        bool
+        default n
+
+config NET_DSA_MV88E6060
+        bool "Marvell 88E6060 ethernet switch chip support"
+        select NET_DSA_TAG_TRAILER
+        ---help---
+          This enables support for the Marvell 88E6060 ethernet switch
+          chip.
+
+config NET_DSA_MV88E6XXX_NEED_PPU
+        bool
+        default n
+
+config NET_DSA_MV88E6131
+        bool "Marvell 88E6085/6095/6095F/6131 ethernet switch chip support"
+        select NET_DSA_MV88E6XXX
+        select NET_DSA_MV88E6XXX_NEED_PPU
+        select NET_DSA_TAG_DSA
+        ---help---
+          This enables support for the Marvell 88E6085/6095/6095F/6131
+          ethernet switch chips.
+
+config NET_DSA_MV88E6123_61_65
+        bool "Marvell 88E6123/6161/6165 ethernet switch chip support"
+        select NET_DSA_MV88E6XXX
+        select NET_DSA_TAG_EDSA
+        ---help---
+          This enables support for the Marvell 88E6123/6161/6165
+          ethernet switch chips.
 
 endif
diff --git a/net/dsa/Makefile b/net/dsa/Makefile
index 7b9fcbbeda5..2374faff4de 100644
--- a/net/dsa/Makefile
+++ b/net/dsa/Makefile
@@ -1,8 +1,13 @@
-# the core
-obj-$(CONFIG_NET_DSA) += dsa_core.o
-dsa_core-y += dsa.o slave.o
-
 # tagging formats
-dsa_core-$(CONFIG_NET_DSA_TAG_DSA) += tag_dsa.o
-dsa_core-$(CONFIG_NET_DSA_TAG_EDSA) += tag_edsa.o
-dsa_core-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o
+obj-$(CONFIG_NET_DSA_TAG_DSA) += tag_dsa.o
+obj-$(CONFIG_NET_DSA_TAG_EDSA) += tag_edsa.o
+obj-$(CONFIG_NET_DSA_TAG_TRAILER) += tag_trailer.o
+
+# switch drivers
+obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o
+obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
+obj-$(CONFIG_NET_DSA_MV88E6123_61_65) += mv88e6123_61_65.o
+obj-$(CONFIG_NET_DSA_MV88E6131) += mv88e6131.o
+
+# the core
+obj-$(CONFIG_NET_DSA) += dsa.o slave.o
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 45295ca0957..3fb14b7c13c 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -12,7 +12,6 @@
 #include <linux/netdevice.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <net/dsa.h>
 #include "dsa_priv.h"
 
@@ -29,7 +28,6 @@ void register_switch_driver(struct dsa_switch_driver *drv)
         list_add_tail(&drv->list, &dsa_switch_drivers);
         mutex_unlock(&dsa_switch_drivers_mutex);
 }
-EXPORT_SYMBOL_GPL(register_switch_driver);
 
 void unregister_switch_driver(struct dsa_switch_driver *drv)
 {
@@ -37,7 +35,6 @@ void unregister_switch_driver(struct dsa_switch_driver *drv)
         list_del_init(&drv->list);
         mutex_unlock(&dsa_switch_drivers_mutex);
 }
-EXPORT_SYMBOL_GPL(unregister_switch_driver);
 
 static struct dsa_switch_driver *
 dsa_switch_probe(struct mii_bus *bus, int sw_addr, char **_name)
@@ -201,6 +198,29 @@ static void dsa_switch_destroy(struct dsa_switch *ds)
 }
 
 
+/* hooks for ethertype-less tagging formats *********************************/
+/*
+ * The original DSA tag format and some other tag formats have no
+ * ethertype, which means that we need to add a little hack to the
+ * networking receive path to make sure that received frames get
+ * the right ->protocol assigned to them when one of those tag
+ * formats is in use.
+ */
+bool dsa_uses_dsa_tags(void *dsa_ptr)
+{
+        struct dsa_switch_tree *dst = dsa_ptr;
+
+        return !!(dst->tag_protocol == htons(ETH_P_DSA));
+}
+
+bool dsa_uses_trailer_tags(void *dsa_ptr)
+{
+        struct dsa_switch_tree *dst = dsa_ptr;
+
+        return !!(dst->tag_protocol == htons(ETH_P_TRAILER));
+}
+
+
 /* link polling *************************************************************/
 static void dsa_link_poll_work(struct work_struct *ugly)
 {
@@ -370,7 +390,7 @@ static int dsa_remove(struct platform_device *pdev)
         if (dst->link_poll_needed)
                 del_timer_sync(&dst->link_poll_timer);
 
-        flush_work(&dst->link_poll_work);
+        flush_work_sync(&dst->link_poll_work);
 
         for (i = 0; i < dst->pd->nr_chips; i++) {
                 struct dsa_switch *ds = dst->ds[i];
@@ -398,36 +418,12 @@ static struct platform_driver dsa_driver = {
 
 static int __init dsa_init_module(void)
 {
-        int rc;
-
-        rc = platform_driver_register(&dsa_driver);
-        if (rc)
-                return rc;
-
-#ifdef CONFIG_NET_DSA_TAG_DSA
-        dev_add_pack(&dsa_packet_type);
-#endif
-#ifdef CONFIG_NET_DSA_TAG_EDSA
-        dev_add_pack(&edsa_packet_type);
-#endif
-#ifdef CONFIG_NET_DSA_TAG_TRAILER
-        dev_add_pack(&trailer_packet_type);
-#endif
-        return 0;
+        return platform_driver_register(&dsa_driver);
 }
 module_init(dsa_init_module);
 
 static void __exit dsa_cleanup_module(void)
 {
-#ifdef CONFIG_NET_DSA_TAG_TRAILER
-        dev_remove_pack(&trailer_packet_type);
-#endif
-#ifdef CONFIG_NET_DSA_TAG_EDSA
-        dev_remove_pack(&edsa_packet_type);
-#endif
-#ifdef CONFIG_NET_DSA_TAG_DSA
-        dev_remove_pack(&dsa_packet_type);
-#endif
         platform_driver_unregister(&dsa_driver);
 }
 module_exit(dsa_cleanup_module);
diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index d4cf5cc747e..4b0ea054044 100644
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -11,9 +11,97 @@
 #ifndef __DSA_PRIV_H
 #define __DSA_PRIV_H
 
+#include <linux/list.h>
 #include <linux/phy.h>
+#include <linux/timer.h>
+#include <linux/workqueue.h>
 #include <net/dsa.h>
 
+struct dsa_switch {
+        /*
+         * Parent switch tree, and switch index.
+         */
+        struct dsa_switch_tree  *dst;
+        int                     index;
+
+        /*
+         * Configuration data for this switch.
+         */
+        struct dsa_chip_data    *pd;
+
+        /*
+         * The used switch driver.
+         */
+        struct dsa_switch_driver        *drv;
+
+        /*
+         * Reference to mii bus to use.
+         */
+        struct mii_bus          *master_mii_bus;
+
+        /*
+         * Slave mii_bus and devices for the individual ports.
+         */
+        u32                     dsa_port_mask;
+        u32                     phys_port_mask;
+        struct mii_bus          *slave_mii_bus;
+        struct net_device       *ports[DSA_MAX_PORTS];
+};
+
+struct dsa_switch_tree {
+        /*
+         * Configuration data for the platform device that owns
+         * this dsa switch tree instance.
+         */
+        struct dsa_platform_data        *pd;
+
+        /*
+         * Reference to network device to use, and which tagging
+         * protocol to use.
+         */
+        struct net_device       *master_netdev;
+        __be16                  tag_protocol;
+
+        /*
+         * The switch and port to which the CPU is attached.
+         */
+        s8                      cpu_switch;
+        s8                      cpu_port;
+
+        /*
+         * Link state polling.
+         */
+        int                     link_poll_needed;
+        struct work_struct      link_poll_work;
+        struct timer_list       link_poll_timer;
+
+        /*
+         * Data for the individual switch chips.
+         */
+        struct dsa_switch       *ds[DSA_MAX_SWITCHES];
+};
+
+static inline bool dsa_is_cpu_port(struct dsa_switch *ds, int p)
+{
+        return !!(ds->index == ds->dst->cpu_switch && p == ds->dst->cpu_port);
+}
+
+static inline u8 dsa_upstream_port(struct dsa_switch *ds)
+{
+        struct dsa_switch_tree *dst = ds->dst;
+
+        /*
+         * If this is the root switch (i.e. the switch that connects
+         * to the CPU), return the cpu port number on this switch.
+         * Else return the (DSA) port number that connects to the
+         * switch that is one hop closer to the cpu.
+         */
+        if (dst->cpu_switch == ds->index)
+                return dst->cpu_port;
+        else
+                return ds->pd->rtable[dst->cpu_switch];
+}
+
 struct dsa_slave_priv {
         /*
          * The linux network interface corresponding to this
@@ -35,8 +123,44 @@ struct dsa_slave_priv {
         struct phy_device       *phy;
 };
 
+struct dsa_switch_driver {
+        struct list_head        list;
+
+        __be16                  tag_protocol;
+        int                     priv_size;
+
+        /*
+         * Probing and setup.
+         */
+        char    *(*probe)(struct mii_bus *bus, int sw_addr);
+        int     (*setup)(struct dsa_switch *ds);
+        int     (*set_addr)(struct dsa_switch *ds, u8 *addr);
+
+        /*
+         * Access to the switch's PHY registers.
+         */
+        int     (*phy_read)(struct dsa_switch *ds, int port, int regnum);
+        int     (*phy_write)(struct dsa_switch *ds, int port,
+                             int regnum, u16 val);
+
+        /*
+         * Link state polling and IRQ handling.
+         */
+        void    (*poll_link)(struct dsa_switch *ds);
+
+        /*
+         * ethtool hardware statistics.
+         */
+        void    (*get_strings)(struct dsa_switch *ds, int port, uint8_t *data);
+        void    (*get_ethtool_stats)(struct dsa_switch *ds,
+                                     int port, uint64_t *data);
+        int     (*get_sset_count)(struct dsa_switch *ds);
+};
+
 /* dsa.c */
 extern char dsa_driver_version[];
+void register_switch_driver(struct dsa_switch_driver *type);
+void unregister_switch_driver(struct dsa_switch_driver *type);
 
 /* slave.c */
 void dsa_slave_mii_bus_init(struct dsa_switch *ds);
@@ -46,15 +170,12 @@ struct net_device *dsa_slave_create(struct dsa_switch *ds,
 
 /* tag_dsa.c */
 netdev_tx_t dsa_xmit(struct sk_buff *skb, struct net_device *dev);
-extern struct packet_type dsa_packet_type;
 
 /* tag_edsa.c */
 netdev_tx_t edsa_xmit(struct sk_buff *skb, struct net_device *dev);
-extern struct packet_type edsa_packet_type;
 
 /* tag_trailer.c */
 netdev_tx_t trailer_xmit(struct sk_buff *skb, struct net_device *dev);
-extern struct packet_type trailer_packet_type;
 
 
 #endif
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index e32083d5d8f..0a47b6c3703 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -66,7 +66,7 @@ static int dsa_slave_open(struct net_device *dev)
         if (!(master->flags & IFF_UP))
                 return -ENETDOWN;
 
-        if (!ether_addr_equal(dev->dev_addr, master->dev_addr)) {
+        if (compare_ether_addr(dev->dev_addr, master->dev_addr)) {
                 err = dev_uc_add(master, dev->dev_addr);
                 if (err < 0)
                         goto out;
@@ -89,7 +89,7 @@ clear_allmulti:
         if (dev->flags & IFF_ALLMULTI)
                 dev_set_allmulti(master, -1);
 del_unicast:
-        if (!ether_addr_equal(dev->dev_addr, master->dev_addr))
+        if (compare_ether_addr(dev->dev_addr, master->dev_addr))
                 dev_uc_del(master, dev->dev_addr);
 out:
         return err;
@@ -107,7 +107,7 @@ static int dsa_slave_close(struct net_device *dev)
         if (dev->flags & IFF_PROMISC)
                 dev_set_promiscuity(master, -1);
 
-        if (!ether_addr_equal(dev->dev_addr, master->dev_addr))
+        if (compare_ether_addr(dev->dev_addr, master->dev_addr))
                 dev_uc_del(master, dev->dev_addr);
 
         return 0;
@@ -146,13 +146,13 @@ static int dsa_slave_set_mac_address(struct net_device *dev, void *a)
         if (!(dev->flags & IFF_UP))
                 goto out;
 
-        if (!ether_addr_equal(addr->sa_data, master->dev_addr)) {
+        if (compare_ether_addr(addr->sa_data, master->dev_addr)) {
                 err = dev_uc_add(master, addr->sa_data);
                 if (err < 0)
                         return err;
         }
 
-        if (!ether_addr_equal(dev->dev_addr, master->dev_addr))
+        if (compare_ether_addr(dev->dev_addr, master->dev_addr))
                 dev_uc_del(master, dev->dev_addr);
 
 out:
@@ -301,6 +301,7 @@ static const struct net_device_ops dsa_netdev_ops = {
         .ndo_start_xmit         = dsa_xmit,
         .ndo_change_rx_flags    = dsa_slave_change_rx_flags,
         .ndo_set_rx_mode        = dsa_slave_set_rx_mode,
+        .ndo_set_multicast_list = dsa_slave_set_rx_mode,
         .ndo_set_mac_address    = dsa_slave_set_mac_address,
         .ndo_do_ioctl           = dsa_slave_ioctl,
 };
@@ -313,6 +314,7 @@ static const struct net_device_ops edsa_netdev_ops = {
         .ndo_start_xmit         = edsa_xmit,
         .ndo_change_rx_flags    = dsa_slave_change_rx_flags,
         .ndo_set_rx_mode        = dsa_slave_set_rx_mode,
+        .ndo_set_multicast_list = dsa_slave_set_rx_mode,
         .ndo_set_mac_address    = dsa_slave_set_mac_address,
         .ndo_do_ioctl           = dsa_slave_ioctl,
 };
@@ -325,6 +327,7 @@ static const struct net_device_ops trailer_netdev_ops = {
         .ndo_start_xmit         = trailer_xmit,
         .ndo_change_rx_flags    = dsa_slave_change_rx_flags,
         .ndo_set_rx_mode        = dsa_slave_set_rx_mode,
+        .ndo_set_multicast_list = dsa_slave_set_rx_mode,
         .ndo_set_mac_address    = dsa_slave_set_mac_address,
         .ndo_do_ioctl           = dsa_slave_ioctl,
 };
diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c
index cacce1e22f9..98dfe80b453 100644
--- a/net/dsa/tag_dsa.c
+++ b/net/dsa/tag_dsa.c
@@ -186,7 +186,20 @@ out:
         return 0;
 }
 
-struct packet_type dsa_packet_type __read_mostly = {
+static struct packet_type dsa_packet_type __read_mostly = {
         .type   = cpu_to_be16(ETH_P_DSA),
         .func   = dsa_rcv,
 };
+
+static int __init dsa_init_module(void)
+{
+        dev_add_pack(&dsa_packet_type);
+        return 0;
+}
+module_init(dsa_init_module);
+
+static void __exit dsa_cleanup_module(void)
+{
+        dev_remove_pack(&dsa_packet_type);
+}
+module_exit(dsa_cleanup_module);
diff --git a/net/dsa/tag_edsa.c b/net/dsa/tag_edsa.c
index e70c43c25e6..6f383322ad2 100644
--- a/net/dsa/tag_edsa.c
+++ b/net/dsa/tag_edsa.c
@@ -205,7 +205,20 @@ out:
         return 0;
 }
 
-struct packet_type edsa_packet_type __read_mostly = {
+static struct packet_type edsa_packet_type __read_mostly = {
         .type   = cpu_to_be16(ETH_P_EDSA),
         .func   = edsa_rcv,
 };
+
+static int __init edsa_init_module(void)
+{
+        dev_add_pack(&edsa_packet_type);
+        return 0;
+}
+module_init(edsa_init_module);
+
+static void __exit edsa_cleanup_module(void)
+{
+        dev_remove_pack(&edsa_packet_type);
+}
+module_exit(edsa_cleanup_module);
diff --git a/net/dsa/tag_trailer.c b/net/dsa/tag_trailer.c
index 94bc260d015..d6d7d0add3c 100644
--- a/net/dsa/tag_trailer.c
+++ b/net/dsa/tag_trailer.c
@@ -114,7 +114,20 @@ out:
         return 0;
 }
 
-struct packet_type trailer_packet_type __read_mostly = {
+static struct packet_type trailer_packet_type __read_mostly = {
         .type   = cpu_to_be16(ETH_P_TRAILER),
         .func   = trailer_rcv,
 };
+
+static int __init trailer_init_module(void)
+{
+        dev_add_pack(&trailer_packet_type);
+        return 0;
+}
+module_init(trailer_init_module);
+
+static void __exit trailer_cleanup_module(void)
+{
+        dev_remove_pack(&trailer_packet_type);
+}
+module_exit(trailer_cleanup_module);