Re: [PATCH 2/8] [MV643XX_ETH] Move ethernet register definitions into private header
On Fri, Oct 19, 2007 at 05:56:54AM -0700, Dale Farnsworth wrote: Isn't it a little too confusing to have two headers with the same name, one in drivers/net and one in include/linux? Perhaps we can fold the drivers/net one into drivers/net/mv643xx_eth.c? Since nothing else includes drivers/net/mv643xx_eth.h anyway, there's not much point in having it separate. Sounds good to me. Please add a patch to do so. Okay. - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/8] [MV643XX_ETH] Move ethernet register definitions into private header
On Fri, Oct 19, 2007 at 01:09:57PM +0200, Lennert Buytenhek wrote: On Fri, Oct 19, 2007 at 09:30:48AM +0100, Christoph Hellwig wrote: Isn't it a little too confusing to have two headers with the same name, one in drivers/net and one in include/linux? Perhaps we can fold the drivers/net one into drivers/net/mv643xx_eth.c? Since nothing else includes drivers/net/mv643xx_eth.h anyway, there's not much point in having it separate. Sounds good to me. Please add a patch to do so. -Dale - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/8] [MV643XX_ETH] Move ethernet register definitions into private header
On Fri, Oct 19, 2007 at 09:30:48AM +0100, Christoph Hellwig wrote: Move the mv643xx's ethernet-related register definitions from include/linux/mv643xx.h into drivers/net/mv643xx_eth.h, since they aren't of any use outside the ethernet driver. Signed-off-by: Lennert Buytenhek [EMAIL PROTECTED] Acked-by: Tzachi Perelstein [EMAIL PROTECTED] Index: linux-2.6/drivers/net/mv643xx_eth.h === --- linux-2.6.orig/drivers/net/mv643xx_eth.h +++ linux-2.6/drivers/net/mv643xx_eth.h @@ -7,7 +7,7 @@ #include linux/workqueue.h #include linux/mii.h -#include linux/mv643xx.h +#include linux/mv643xx_eth.h Isn't it a little too confusing to have two headers with the same name, one in drivers/net and one in include/linux? Perhaps we can fold the drivers/net one into drivers/net/mv643xx_eth.c? Since nothing else includes drivers/net/mv643xx_eth.h anyway, there's not much point in having it separate. - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/8] [MV643XX_ETH] Move ethernet register definitions into private header
On Fri, Oct 19, 2007 at 04:10:10AM +0200, Lennert Buytenhek wrote: Move the mv643xx's ethernet-related register definitions from include/linux/mv643xx.h into drivers/net/mv643xx_eth.h, since they aren't of any use outside the ethernet driver. Signed-off-by: Lennert Buytenhek [EMAIL PROTECTED] Acked-by: Tzachi Perelstein [EMAIL PROTECTED] Index: linux-2.6/drivers/net/mv643xx_eth.h === --- linux-2.6.orig/drivers/net/mv643xx_eth.h +++ linux-2.6/drivers/net/mv643xx_eth.h @@ -7,7 +7,7 @@ #include linux/workqueue.h #include linux/mii.h -#include linux/mv643xx.h +#include linux/mv643xx_eth.h Isn't it a little too confusing to have two headers with the same name, one in drivers/net and one in include/linux? - To unsubscribe from this list: send the line unsubscribe netdev in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/8] [MV643XX_ETH] Move ethernet register definitions into private header
Move the mv643xx's ethernet-related register definitions from include/linux/mv643xx.h into drivers/net/mv643xx_eth.h, since they aren't of any use outside the ethernet driver. Signed-off-by: Lennert Buytenhek [EMAIL PROTECTED] Acked-by: Tzachi Perelstein [EMAIL PROTECTED] Index: linux-2.6/drivers/net/mv643xx_eth.h === --- linux-2.6.orig/drivers/net/mv643xx_eth.h +++ linux-2.6/drivers/net/mv643xx_eth.h @@ -7,7 +7,7 @@ #include linux/workqueue.h #include linux/mii.h -#include linux/mv643xx.h +#include linux/mv643xx_eth.h #include asm/dma-mapping.h @@ -51,6 +51,312 @@ ETH_VLAN_HLEN + ETH_FCS_LEN) #define ETH_RX_SKB_SIZE(dev-mtu + ETH_WRAPPER_LEN + dma_get_cache_alignment()) +// +/*Ethernet Unit Registers */ +// + +#define MV643XX_ETH_PHY_ADDR_REG0x2000 +#define MV643XX_ETH_SMI_REG 0x2004 +#define MV643XX_ETH_UNIT_DEFAULT_ADDR_REG 0x2008 +#define MV643XX_ETH_UNIT_DEFAULTID_REG 0x200c +#define MV643XX_ETH_UNIT_INTERRUPT_CAUSE_REG0x2080 +#define MV643XX_ETH_UNIT_INTERRUPT_MASK_REG 0x2084 +#define MV643XX_ETH_UNIT_INTERNAL_USE_REG 0x24fc +#define MV643XX_ETH_UNIT_ERROR_ADDR_REG 0x2094 +#define MV643XX_ETH_BAR_0 0x2200 +#define MV643XX_ETH_BAR_1 0x2208 +#define MV643XX_ETH_BAR_2 0x2210 +#define MV643XX_ETH_BAR_3 0x2218 +#define MV643XX_ETH_BAR_4 0x2220 +#define MV643XX_ETH_BAR_5 0x2228 +#define MV643XX_ETH_SIZE_REG_0 0x2204 +#define MV643XX_ETH_SIZE_REG_1 0x220c +#define MV643XX_ETH_SIZE_REG_2 0x2214 +#define MV643XX_ETH_SIZE_REG_3 0x221c +#define MV643XX_ETH_SIZE_REG_4 0x2224 +#define MV643XX_ETH_SIZE_REG_5 0x222c +#define MV643XX_ETH_HEADERS_RETARGET_BASE_REG 0x2230 +#define MV643XX_ETH_HEADERS_RETARGET_CONTROL_REG0x2234 +#define MV643XX_ETH_HIGH_ADDR_REMAP_REG_0 0x2280 +#define MV643XX_ETH_HIGH_ADDR_REMAP_REG_1 0x2284 +#define MV643XX_ETH_HIGH_ADDR_REMAP_REG_2 0x2288 +#define MV643XX_ETH_HIGH_ADDR_REMAP_REG_3 0x228c +#define MV643XX_ETH_BASE_ADDR_ENABLE_REG0x2290 +#define MV643XX_ETH_ACCESS_PROTECTION_REG(port)(0x2294 + (port2)) +#define MV643XX_ETH_MIB_COUNTERS_BASE(port)(0x3000 + (port7)) +#define MV643XX_ETH_PORT_CONFIG_REG(port) (0x2400 + (port10)) +#define MV643XX_ETH_PORT_CONFIG_EXTEND_REG(port) (0x2404 + (port10)) +#define MV643XX_ETH_MII_SERIAL_PARAMETRS_REG(port) (0x2408 + (port10)) +#define MV643XX_ETH_GMII_SERIAL_PARAMETRS_REG(port)(0x240c + (port10)) +#define MV643XX_ETH_VLAN_ETHERTYPE_REG(port) (0x2410 + (port10)) +#define MV643XX_ETH_MAC_ADDR_LOW(port) (0x2414 + (port10)) +#define MV643XX_ETH_MAC_ADDR_HIGH(port)(0x2418 + (port10)) +#define MV643XX_ETH_SDMA_CONFIG_REG(port) (0x241c + (port10)) +#define MV643XX_ETH_DSCP_0(port) (0x2420 + (port10)) +#define MV643XX_ETH_DSCP_1(port) (0x2424 + (port10)) +#define MV643XX_ETH_DSCP_2(port) (0x2428 + (port10)) +#define MV643XX_ETH_DSCP_3(port) (0x242c + (port10)) +#define MV643XX_ETH_DSCP_4(port) (0x2430 + (port10)) +#define MV643XX_ETH_DSCP_5(port) (0x2434 + (port10)) +#define MV643XX_ETH_DSCP_6(port) (0x2438 + (port10)) +#define MV643XX_ETH_PORT_SERIAL_CONTROL_REG(port) (0x243c + (port10)) +#define MV643XX_ETH_VLAN_PRIORITY_TAG_TO_PRIORITY(port)(0x2440 + (port10)) +#define MV643XX_ETH_PORT_STATUS_REG(port) (0x2444 + (port10)) +#define MV643XX_ETH_TRANSMIT_QUEUE_COMMAND_REG(port) (0x2448 + (port10)) +#define MV643XX_ETH_TX_QUEUE_FIXED_PRIORITY(port) (0x244c + (port10)) +#define
