Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[powerpc.git] / drivers / net / myri10ge / myri10ge_mcp.h

diff --git a/drivers/net/myri10ge/myri10ge_mcp.h b/drivers/net/myri10ge/myri10ge_mcp.h
index 0a6cae6..9519ae7 100644 (file)
--- a/drivers/net/myri10ge/myri10ge_mcp.h
+++ b/drivers/net/myri10ge/myri10ge_mcp.h
@@ -91,7 +91,19 @@ struct mcp_kreq_ether_recv {
 
 /* Commands */
 
-#define MXGEFW_CMD_OFFSET 0xf80000
+#define        MXGEFW_BOOT_HANDOFF     0xfc0000
+#define        MXGEFW_BOOT_DUMMY_RDMA  0xfc01c0
+
+#define        MXGEFW_ETH_CMD          0xf80000
+#define        MXGEFW_ETH_SEND_4       0x200000
+#define        MXGEFW_ETH_SEND_1       0x240000
+#define        MXGEFW_ETH_SEND_2       0x280000
+#define        MXGEFW_ETH_SEND_3       0x2c0000
+#define        MXGEFW_ETH_RECV_SMALL   0x300000
+#define        MXGEFW_ETH_RECV_BIG     0x340000
+
+#define        MXGEFW_ETH_SEND(n)              (0x200000 + (((n) & 0x03) * 0x40000))
+#define        MXGEFW_ETH_SEND_OFFSET(n)       (MXGEFW_ETH_SEND(n) - MXGEFW_ETH_SEND_4)
 
 enum myri10ge_mcp_cmd_type {
        MXGEFW_CMD_NONE = 0,
@@ -154,7 +166,7 @@ enum myri10ge_mcp_cmd_type {
        MXGEFW_CMD_SET_MTU,
        MXGEFW_CMD_GET_INTR_COAL_DELAY_OFFSET,  /* in microseconds */
        MXGEFW_CMD_SET_STATS_INTERVAL,  /* in microseconds */
-       MXGEFW_CMD_SET_STATS_DMA,
+       MXGEFW_CMD_SET_STATS_DMA_OBSOLETE,      /* replaced by SET_STATS_DMA_V2 */
 
        MXGEFW_ENABLE_PROMISC,
        MXGEFW_DISABLE_PROMISC,
@@ -168,7 +180,26 @@ enum myri10ge_mcp_cmd_type {
         * data2       = RDMA length (MSH), WDMA length (LSH)
         * command return data = repetitions (MSH), 0.5-ms ticks (LSH)
         */
-       MXGEFW_DMA_TEST
+       MXGEFW_DMA_TEST,
+
+       MXGEFW_ENABLE_ALLMULTI,
+       MXGEFW_DISABLE_ALLMULTI,
+
+       /* returns MXGEFW_CMD_ERROR_MULTICAST
+        * if there is no room in the cache
+        * data0,MSH(data1) = multicast group address */
+       MXGEFW_JOIN_MULTICAST_GROUP,
+       /* returns MXGEFW_CMD_ERROR_MULTICAST
+        * if the address is not in the cache,
+        * or is equal to FF-FF-FF-FF-FF-FF
+        * data0,MSH(data1) = multicast group address */
+       MXGEFW_LEAVE_MULTICAST_GROUP,
+       MXGEFW_LEAVE_ALL_MULTICAST_GROUPS,
+
+       MXGEFW_CMD_SET_STATS_DMA_V2,
+       /* data0, data1 = bus addr,
+        * data2 = sizeof(struct mcp_irq_data) from driver point of view, allows
+        * adding new stuff to mcp_irq_data without changing the ABI */
 };
 
 enum myri10ge_mcp_cmd_status {
@@ -180,11 +211,17 @@ enum myri10ge_mcp_cmd_status {
        MXGEFW_CMD_ERROR_CLOSED,
        MXGEFW_CMD_ERROR_HASH_ERROR,
        MXGEFW_CMD_ERROR_BAD_PORT,
-       MXGEFW_CMD_ERROR_RESOURCES
+       MXGEFW_CMD_ERROR_RESOURCES,
+       MXGEFW_CMD_ERROR_MULTICAST
 };
 
-/* 40 Bytes */
+#define MXGEFW_OLD_IRQ_DATA_LEN 40
+
 struct mcp_irq_data {
+       /* add new counters at the beginning */
+       u32 future_use[5];
+       u32 dropped_multicast_filtered;
+       /* 40 Bytes */
        u32 send_done_count;
 
        u32 link_up;