e84665c9cb
The initial version of the DSA driver only supported a single switch
chip per network interface, while DSA-capable switch chips can be
interconnected to form a tree of switch chips. This patch adds support
for multiple switch chips on a network interface.
An example topology for a 16-port device with an embedded CPU is as
follows:
+-----+ +--------+ +--------+
| |eth0 10| switch |9 10| switch |
| CPU +----------+ +-------+ |
| | | chip 0 | | chip 1 |
+-----+ +---++---+ +---++---+
|| ||
|| ||
||1000baseT ||1000baseT
||ports 1-8 ||ports 9-16
This requires a couple of interdependent changes in the DSA layer:
- The dsa platform driver data needs to be extended: there is still
only one netdevice per DSA driver instance (eth0 in the example
above), but each of the switch chips in the tree needs its own
mii_bus device pointer, MII management bus address, and port name
array. (include/net/dsa.h) The existing in-tree dsa users need
some small changes to deal with this. (arch/arm)
- The DSA and Ethertype DSA tagging modules need to be extended to
use the DSA device ID field on receive and demultiplex the packet
accordingly, and fill in the DSA device ID field on transmit
according to which switch chip the packet is heading to.
(net/dsa/tag_{dsa,edsa}.c)
- The concept of "CPU port", which is the switch chip port that the
CPU is connected to (port 10 on switch chip 0 in the example), needs
to be extended with the concept of "upstream port", which is the
port on the switch chip that will bring us one hop closer to the CPU
(port 10 for both switch chips in the example above).
- The dsa platform data needs to specify which ports on which switch
chips are links to other switch chips, so that we can enable DSA
tagging mode on them. (For inter-switch links, we always use
non-EtherType DSA tagging, since it has lower overhead. The CPU
link uses dsa or edsa tagging depending on what the 'root' switch
chip supports.) This is done by specifying "dsa" for the given
port in the port array.
- The dsa platform data needs to be extended with information on via
which port to reach any given switch chip from any given switch chip.
This info is specified via the per-switch chip data struct ->rtable[]
array, which gives the nexthop ports for each of the other switches
in the tree.
For the example topology above, the dsa platform data would look
something like this:
static struct dsa_chip_data sw[2] = {
{
.mii_bus = &foo,
.sw_addr = 1,
.port_names[0] = "p1",
.port_names[1] = "p2",
.port_names[2] = "p3",
.port_names[3] = "p4",
.port_names[4] = "p5",
.port_names[5] = "p6",
.port_names[6] = "p7",
.port_names[7] = "p8",
.port_names[9] = "dsa",
.port_names[10] = "cpu",
.rtable = (s8 []){ -1, 9, },
}, {
.mii_bus = &foo,
.sw_addr = 2,
.port_names[0] = "p9",
.port_names[1] = "p10",
.port_names[2] = "p11",
.port_names[3] = "p12",
.port_names[4] = "p13",
.port_names[5] = "p14",
.port_names[6] = "p15",
.port_names[7] = "p16",
.port_names[10] = "dsa",
.rtable = (s8 []){ 10, -1, },
},
},
static struct dsa_platform_data pd = {
.netdev = &foo,
.nr_switches = 2,
.sw = sw,
};
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Tested-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
135 lines
3.3 KiB
C
135 lines
3.3 KiB
C
/*
|
|
* arch/arm/mach-orion5x/rd88f6183-ap-ge-setup.c
|
|
*
|
|
* Marvell Orion-1-90 AP GE Reference Design Setup
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/mtd/physmap.h>
|
|
#include <linux/mv643xx_eth.h>
|
|
#include <linux/spi/spi.h>
|
|
#include <linux/spi/orion_spi.h>
|
|
#include <linux/spi/flash.h>
|
|
#include <linux/ethtool.h>
|
|
#include <net/dsa.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/gpio.h>
|
|
#include <asm/leds.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/pci.h>
|
|
#include <mach/orion5x.h>
|
|
#include "common.h"
|
|
#include "mpp.h"
|
|
|
|
static struct mv643xx_eth_platform_data rd88f6183ap_ge_eth_data = {
|
|
.phy_addr = -1,
|
|
.speed = SPEED_1000,
|
|
.duplex = DUPLEX_FULL,
|
|
};
|
|
|
|
static struct dsa_chip_data rd88f6183ap_ge_switch_chip_data = {
|
|
.port_names[0] = "lan1",
|
|
.port_names[1] = "lan2",
|
|
.port_names[2] = "lan3",
|
|
.port_names[3] = "lan4",
|
|
.port_names[4] = "wan",
|
|
.port_names[5] = "cpu",
|
|
};
|
|
|
|
static struct dsa_platform_data rd88f6183ap_ge_switch_plat_data = {
|
|
.nr_chips = 1,
|
|
.chip = &rd88f6183ap_ge_switch_chip_data,
|
|
};
|
|
|
|
static struct mtd_partition rd88f6183ap_ge_partitions[] = {
|
|
{
|
|
.name = "kernel",
|
|
.offset = 0x00000000,
|
|
.size = 0x00200000,
|
|
}, {
|
|
.name = "rootfs",
|
|
.offset = 0x00200000,
|
|
.size = 0x00500000,
|
|
}, {
|
|
.name = "nvram",
|
|
.offset = 0x00700000,
|
|
.size = 0x00080000,
|
|
},
|
|
};
|
|
|
|
static struct flash_platform_data rd88f6183ap_ge_spi_slave_data = {
|
|
.type = "m25p64",
|
|
.nr_parts = ARRAY_SIZE(rd88f6183ap_ge_partitions),
|
|
.parts = rd88f6183ap_ge_partitions,
|
|
};
|
|
|
|
static struct spi_board_info __initdata rd88f6183ap_ge_spi_slave_info[] = {
|
|
{
|
|
.modalias = "m25p80",
|
|
.platform_data = &rd88f6183ap_ge_spi_slave_data,
|
|
.irq = NO_IRQ,
|
|
.max_speed_hz = 20000000,
|
|
.bus_num = 0,
|
|
.chip_select = 0,
|
|
},
|
|
};
|
|
|
|
static void __init rd88f6183ap_ge_init(void)
|
|
{
|
|
/*
|
|
* Setup basic Orion functions. Need to be called early.
|
|
*/
|
|
orion5x_init();
|
|
|
|
/*
|
|
* Configure peripherals.
|
|
*/
|
|
orion5x_ehci0_init();
|
|
orion5x_eth_init(&rd88f6183ap_ge_eth_data);
|
|
orion5x_eth_switch_init(&rd88f6183ap_ge_switch_plat_data,
|
|
gpio_to_irq(3));
|
|
spi_register_board_info(rd88f6183ap_ge_spi_slave_info,
|
|
ARRAY_SIZE(rd88f6183ap_ge_spi_slave_info));
|
|
orion5x_spi_init();
|
|
orion5x_uart0_init();
|
|
}
|
|
|
|
static struct hw_pci rd88f6183ap_ge_pci __initdata = {
|
|
.nr_controllers = 2,
|
|
.swizzle = pci_std_swizzle,
|
|
.setup = orion5x_pci_sys_setup,
|
|
.scan = orion5x_pci_sys_scan_bus,
|
|
.map_irq = orion5x_pci_map_irq,
|
|
};
|
|
|
|
static int __init rd88f6183ap_ge_pci_init(void)
|
|
{
|
|
if (machine_is_rd88f6183ap_ge()) {
|
|
orion5x_pci_disable();
|
|
pci_common_init(&rd88f6183ap_ge_pci);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
subsys_initcall(rd88f6183ap_ge_pci_init);
|
|
|
|
MACHINE_START(RD88F6183AP_GE, "Marvell Orion-1-90 AP GE Reference Design")
|
|
/* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */
|
|
.phys_io = ORION5X_REGS_PHYS_BASE,
|
|
.io_pg_offst = ((ORION5X_REGS_VIRT_BASE) >> 18) & 0xFFFC,
|
|
.boot_params = 0x00000100,
|
|
.init_machine = rd88f6183ap_ge_init,
|
|
.map_io = orion5x_map_io,
|
|
.init_irq = orion5x_init_irq,
|
|
.timer = &orion5x_timer,
|
|
.fixup = tag_fixup_mem32,
|
|
MACHINE_END
|