diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-10-07 09:44:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-08 20:15:19 -0400 |
| commit | 91da11f870f00a3322b81c73042291d7f0be5a17 (patch) | |
| tree | 670fedb54ee3c8fa403e9095f6d7e95ee560f346 /net | |
| parent | 176eaa589b3d242f25f24e472883fcce5f196777 (diff) | |
net: Distributed Switch Architecture protocol support
Distributed Switch Architecture is a protocol for managing hardware
switch chips. It consists of a set of MII management registers and
commands to configure the switch, and an ethernet header format to
signal which of the ports of the switch a packet was received from
or is intended to be sent to.
The switches that this driver supports are typically embedded in
access points and routers, and a typical setup with a DSA switch
looks something like this:
+-----------+ +-----------+
| | RGMII | |
| +-------+ +------ 1000baseT MDI ("WAN")
| | | 6-port +------ 1000baseT MDI ("LAN1")
| CPU | | ethernet +------ 1000baseT MDI ("LAN2")
| |MIImgmt| switch +------ 1000baseT MDI ("LAN3")
| +-------+ w/5 PHYs +------ 1000baseT MDI ("LAN4")
| | | |
+-----------+ +-----------+
The switch driver presents each port on the switch as a separate
network interface to Linux, polls the switch to maintain software
link state of those ports, forwards MII management interface
accesses to those network interfaces (e.g. as done by ethtool) to
the switch, and exposes the switch's hardware statistics counters
via the appropriate Linux kernel interfaces.
This initial patch supports the MII management interface register
layout of the Marvell 88E6123, 88E6161 and 88E6165 switch chips, and
supports the "Ethertype DSA" packet tagging format.
(There is no officially registered ethertype for the Ethertype DSA
packet format, so we just grab a random one. The ethertype to use
is programmed into the switch, and the switch driver uses the value
of ETH_P_EDSA for this, so this define can be changed at any time in
the future if the one we chose is allocated to another protocol or
if Ethertype DSA gets its own officially registered ethertype, and
everything will continue to work.)
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Tested-by: Nicolas Pitre <nico@marvell.com>
Tested-by: Byron Bradley <byron.bbradley@gmail.com>
Tested-by: Tim Ellis <tim.ellis@mac.com>
Tested-by: Peter van Valderen <linux@ddcrew.com>
Tested-by: Dirk Teurlings <dirk@upexia.nl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/Kconfig | 1 | ||||
| -rw-r--r-- | net/Makefile | 1 | ||||
| -rw-r--r-- | net/dsa/Kconfig | 31 | ||||
| -rw-r--r-- | net/dsa/Makefile | 9 | ||||
| -rw-r--r-- | net/dsa/dsa.c | 369 | ||||
| -rw-r--r-- | net/dsa/dsa_priv.h | 110 | ||||
| -rw-r--r-- | net/dsa/mv88e6123_61_65.c | 417 | ||||
| -rw-r--r-- | net/dsa/mv88e6xxx.c | 377 | ||||
| -rw-r--r-- | net/dsa/mv88e6xxx.h | 77 | ||||
| -rw-r--r-- | net/dsa/slave.c | 288 | ||||
| -rw-r--r-- | net/dsa/tag_edsa.c | 213 |
11 files changed, 1893 insertions, 0 deletions
diff --git a/net/Kconfig b/net/Kconfig index 9103a16a77be..d789d79551ae 100644 --- a/net/Kconfig +++ b/net/Kconfig | |||
| @@ -180,6 +180,7 @@ source "net/tipc/Kconfig" | |||
| 180 | source "net/atm/Kconfig" | 180 | source "net/atm/Kconfig" |
| 181 | source "net/802/Kconfig" | 181 | source "net/802/Kconfig" |
| 182 | source "net/bridge/Kconfig" | 182 | source "net/bridge/Kconfig" |
| 183 | source "net/dsa/Kconfig" | ||
| 183 | source "net/8021q/Kconfig" | 184 | source "net/8021q/Kconfig" |
| 184 | source "net/decnet/Kconfig" | 185 | source "net/decnet/Kconfig" |
| 185 | source "net/llc/Kconfig" | 186 | source "net/llc/Kconfig" |
diff --git a/net/Makefile b/net/Makefile index acaf819f24aa..27d1f10dc0e0 100644 --- a/net/Makefile +++ b/net/Makefile | |||
| @@ -26,6 +26,7 @@ obj-$(CONFIG_PACKET) += packet/ | |||
| 26 | obj-$(CONFIG_NET_KEY) += key/ | 26 | obj-$(CONFIG_NET_KEY) += key/ |
| 27 | obj-$(CONFIG_NET_SCHED) += sched/ | 27 | obj-$(CONFIG_NET_SCHED) += sched/ |
| 28 | obj-$(CONFIG_BRIDGE) += bridge/ | 28 | obj-$(CONFIG_BRIDGE) += bridge/ |
| 29 | obj-$(CONFIG_NET_DSA) += dsa/ | ||
| 29 | obj-$(CONFIG_IPX) += ipx/ | 30 | obj-$(CONFIG_IPX) += ipx/ |
| 30 | obj-$(CONFIG_ATALK) += appletalk/ | 31 | obj-$(CONFIG_ATALK) += appletalk/ |
| 31 | obj-$(CONFIG_WAN_ROUTER) += wanrouter/ | 32 | obj-$(CONFIG_WAN_ROUTER) += wanrouter/ |
diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig new file mode 100644 index 000000000000..7cf55e5eb39f --- /dev/null +++ b/net/dsa/Kconfig | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | menuconfig NET_DSA | ||
| 2 | bool "Distributed Switch Architecture support" | ||
| 3 | default n | ||
| 4 | depends on EXPERIMENTAL | ||
| 5 | ---help--- | ||
| 6 | This allows you to use hardware switch chips that use | ||
| 7 | the Distributed Switch Architecture. | ||
| 8 | |||
| 9 | |||
| 10 | if NET_DSA | ||
| 11 | |||
| 12 | # tagging formats | ||
| 13 | config NET_DSA_TAG_EDSA | ||
| 14 | bool | ||
| 15 | default n | ||
| 16 | |||
| 17 | |||
| 18 | # switch drivers | ||
| 19 | config NET_DSA_MV88E6XXX | ||
| 20 | bool | ||
| 21 | default n | ||
| 22 | |||
| 23 | config NET_DSA_MV88E6123_61_65 | ||
| 24 | bool "Marvell 88E6123/6161/6165 ethernet switch chip support" | ||
| 25 | select NET_DSA_MV88E6XXX | ||
| 26 | select NET_DSA_TAG_EDSA | ||
| 27 | ---help--- | ||
| 28 | This enables support for the Marvell 88E6123/6161/6165 | ||
| 29 | ethernet switch chips. | ||
| 30 | |||
| 31 | endif | ||
diff --git a/net/dsa/Makefile b/net/dsa/Makefile new file mode 100644 index 000000000000..b59a6f6bcf56 --- /dev/null +++ b/net/dsa/Makefile | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | # tagging formats | ||
| 2 | obj-$(CONFIG_NET_DSA_TAG_EDSA) += tag_edsa.o | ||
| 3 | |||
| 4 | # switch drivers | ||
| 5 | obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o | ||
| 6 | obj-$(CONFIG_NET_DSA_MV88E6123_61_65) += mv88e6123_61_65.o | ||
| 7 | |||
| 8 | # the core | ||
| 9 | obj-$(CONFIG_NET_DSA) += dsa.o slave.o | ||
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c new file mode 100644 index 000000000000..6cc5be2ec7f1 --- /dev/null +++ b/net/dsa/dsa.c | |||
| @@ -0,0 +1,369 @@ | |||
| 1 | /* | ||
| 2 | * net/dsa/dsa.c - Hardware switch handling | ||
| 3 | * Copyright (c) 2008 Marvell Semiconductor | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify | ||
| 6 | * it under the terms of the GNU General Public License as published by | ||
| 7 | * the Free Software Foundation; either version 2 of the License, or | ||
| 8 | * (at your option) any later version. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/list.h> | ||
| 12 | #include <linux/netdevice.h> | ||
| 13 | #include <linux/platform_device.h> | ||
| 14 | #include <net/dsa.h> | ||
| 15 | #include "dsa_priv.h" | ||
| 16 | |||
| 17 | char dsa_driver_version[] = "0.1"; | ||
| 18 | |||
| 19 | |||
| 20 | /* switch driver registration ***********************************************/ | ||
| 21 | static DEFINE_MUTEX(dsa_switch_drivers_mutex); | ||
| 22 | static LIST_HEAD(dsa_switch_drivers); | ||
| 23 | |||
| 24 | void register_switch_driver(struct dsa_switch_driver *drv) | ||
| 25 | { | ||
| 26 | mutex_lock(&dsa_switch_drivers_mutex); | ||
| 27 | list_add_tail(&drv->list, &dsa_switch_drivers); | ||
| 28 | mutex_unlock(&dsa_switch_drivers_mutex); | ||
| 29 | } | ||
| 30 | |||
| 31 | void unregister_switch_driver(struct dsa_switch_driver *drv) | ||
| 32 | { | ||
| 33 | mutex_lock(&dsa_switch_drivers_mutex); | ||
| 34 | list_del_init(&drv->list); | ||
| 35 | mutex_unlock(&dsa_switch_drivers_mutex); | ||
| 36 | } | ||
| 37 | |||
| 38 | static struct dsa_switch_driver * | ||
| 39 | dsa_switch_probe(struct mii_bus *bus, int sw_addr, char **_name) | ||
| 40 | { | ||
| 41 | struct dsa_switch_driver *ret; | ||
| 42 | struct list_head *list; | ||
| 43 | char *name; | ||
| 44 | |||
| 45 | ret = NULL; | ||
| 46 | name = NULL; | ||
| 47 | |||
| 48 | mutex_lock(&dsa_switch_drivers_mutex); | ||
| 49 | list_for_each(list, &dsa_switch_drivers) { | ||
| 50 | struct dsa_switch_driver *drv; | ||
| 51 | |||
| 52 | drv = list_entry(list, struct dsa_switch_driver, list); | ||
| 53 | |||
| 54 | name = drv->probe(bus, sw_addr); | ||
| 55 | if (name != NULL) { | ||
| 56 | ret = drv; | ||
| 57 | break; | ||
| 58 | } | ||
| 59 | } | ||
| 60 | mutex_unlock(&dsa_switch_drivers_mutex); | ||
| 61 | |||
| 62 | *_name = name; | ||
| 63 | |||
| 64 | return ret; | ||
| 65 | } | ||
| 66 | |||
| 67 | |||
| 68 | /* basic switch operations **************************************************/ | ||
| 69 | static struct dsa_switch * | ||
| 70 | dsa_switch_setup(struct device *parent, struct dsa_platform_data *pd, | ||
| 71 | struct mii_bus *bus, struct net_device *dev) | ||
| 72 | { | ||
| 73 | struct dsa_switch *ds; | ||
| 74 | int ret; | ||
| 75 | struct dsa_switch_driver *drv; | ||
| 76 | char *name; | ||
| 77 | int i; | ||
| 78 | |||
| 79 | /* | ||
| 80 | * Probe for switch model. | ||
| 81 | */ | ||
| 82 | drv = dsa_switch_probe(bus, pd->sw_addr, &name); | ||
| 83 | if (drv == NULL) { | ||
| 84 | printk(KERN_ERR "%s: could not detect attached switch\n", | ||
| 85 | dev->name); | ||
| 86 | return ERR_PTR(-EINVAL); | ||
| 87 | } | ||
| 88 | printk(KERN_INFO "%s: detected a %s switch\n", dev->name, name); | ||
| 89 | |||
| 90 | |||
| 91 | /* | ||
| 92 | * Allocate and initialise switch state. | ||
| 93 | */ | ||
| 94 | ds = kzalloc(sizeof(*ds) + drv->priv_size, GFP_KERNEL); | ||
| 95 | if (ds == NULL) | ||
| 96 | return ERR_PTR(-ENOMEM); | ||
| 97 | |||
| 98 | ds->pd = pd; | ||
| 99 | ds->master_netdev = dev; | ||
| 100 | ds->master_mii_bus = bus; | ||
| 101 | |||
| 102 | ds->drv = drv; | ||
| 103 | ds->tag_protocol = drv->tag_protocol; | ||
| 104 | |||
| 105 | |||
| 106 | /* | ||
| 107 | * Validate supplied switch configuration. | ||
| 108 | */ | ||
| 109 | ds->cpu_port = -1; | ||
| 110 | for (i = 0; i < DSA_MAX_PORTS; i++) { | ||
| 111 | char *name; | ||
| 112 | |||
| 113 | name = pd->port_names[i]; | ||
| 114 | if (name == NULL) | ||
| 115 | continue; | ||
| 116 | |||
| 117 | if (!strcmp(name, "cpu")) { | ||
| 118 | if (ds->cpu_port != -1) { | ||
