1. 22 Mar, 2009 9 commits
    • Ben Hutchings's avatar
      sfc: Work around unreliable legacy interrupt status · a9de9a74
      Ben Hutchings authored
      In rare cases, reading the legacy interrupt status register can
      acknowledge an event queue whose attention flag has not yet been set
      in the register.  Until we service this event queue it will not
      generate any more interrupts.  Therefore, as a secondary check, poll
      the next slot in each active event queue whose flag is not set.
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a9de9a74
    • Ben Hutchings's avatar
      sfc: Pad packets to 33 bytes to prevent TX packet parser lockup · bb145a9e
      Ben Hutchings authored
      The packet parser used in the TX data path for locating checksum
      fields can lose synchronisation with the TX queue manager when
      handling packets that look like IPv4 but are too short (17-32 bytes).
      Work around this by padding to 33 bytes.
      Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bb145a9e
    • Lennert Buytenhek's avatar
      dsa: add switch chip cascading support · e84665c9
      Lennert Buytenhek authored
      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: default avatarLennert Buytenhek <buytenh@marvell.com>
      Tested-by: default avatarGary Thomas <gary@mlbassoc.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e84665c9
    • Lennert Buytenhek's avatar
      dsa: add support for the Marvell 88E6095/6095F switch chips · 076d3e10
      Lennert Buytenhek authored
      Add support for the Marvell 88E6095/6095F switch chips.  These
      chips are similar to the 88e6131, so we can add the support to
      mv88e6131.c easily.
      
      Thanks to Gary Thomas <gary@mlbassoc.com> and Jesper Dangaard
      Brouer <hawk@diku.dk> for testing various patches.
      Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
      Tested-by: default avatarGary Thomas <gary@mlbassoc.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      076d3e10
    • Lennert Buytenhek's avatar
      dsa: set ->iflink on slave interfaces to the ifindex of the parent · c0840801
      Lennert Buytenhek authored
      ..so that we can parse the DSA topology from 'ip link' output:
      
      1: lo: <LOOPBACK,UP,LOWER_UP> mtu 16436 qdisc noqueue
      2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast qlen 1000
      3: eth1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast qlen 1000
      4: lan1@eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue
      5: lan2@eth0: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue
      6: lan3@eth0: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue
      7: lan4@eth0: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue
      Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c0840801
    • Stephen Hemminger's avatar
      aec464bb
    • Stephen Hemminger's avatar
      atm: fix non-const printk argument · 32f3dde5
      Stephen Hemminger authored
      Change printk() argument to fix compiler warning.
      Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      32f3dde5
    • Stephen Hemminger's avatar
      ipx: use constant for strings and desciptor · fa665ccf
      Stephen Hemminger authored
      Fix compiler warning about non-const format string.
      Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
      Acked-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fa665ccf
    • Stephen Hemminger's avatar
      snap: use const for descriptor · 7ca98fa2
      Stephen Hemminger authored
      Protocols should be able to use constant value for the descriptor.
      Minor whitespace cleanup as well
      Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
      Acked-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7ca98fa2
  2. 21 Mar, 2009 21 commits
  3. 20 Mar, 2009 10 commits