X-Git-Url: https://bbs.cooldavid.org/git/?p=jme.git;a=blobdiff_plain;f=jme.h;h=1f37cf3500feeba713049ee573b11461c0b385a1;hp=944cf631438db978ff95c4e7e79d6ac28c392366;hb=refs%2Fheads%2Fmsix_test;hpb=8d27293f4a6c7c2bfde177c16714956ba3764c96

diff --git a/jme.h b/jme.h
index 944cf63..1f37cf3 100644
--- a/jme.h
+++ b/jme.h
@@ -24,7 +24,7 @@
 #include <linux/version.h>
 
 #define DRV_NAME	"jme"
-#define DRV_VERSION	"0.9d"
+#define DRV_VERSION	"0.9d-msix"
 #define PFX DRV_NAME	": "
 
 #define JME_GE_DEVICE 0x250
@@ -73,14 +73,6 @@
 #define jeprintk(devname, fmt, args...) \
         printk(KERN_ERR "%s: " fmt, devname, ## args)
 
-#define DEFAULT_MSG_ENABLE        \
-	(NETIF_MSG_DRV          | \
-	 NETIF_MSG_PROBE        | \
-	 NETIF_MSG_LINK         | \
-	 NETIF_MSG_TIMER        | \
-	 NETIF_MSG_RX_ERR       | \
-	 NETIF_MSG_TX_ERR)
-
 #define PCI_CONF_DCSR_MRRS	0x59
 #define PCI_CONF_DCSR_MRRS_MASK 0x70
 enum pci_conf_dcsr_mrrs_vals {
@@ -95,6 +87,54 @@ enum pci_conf_dcsr_mrrs_vals {
 #define MAX_ETHERNET_JUMBO_PACKET_SIZE 9216
 #define MIN_ETHERNET_PACKET_SIZE 60
 
+
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,21)
+#define NET_STAT(priv) priv->stats
+#define NETDEV_GET_STATS(netdev, fun_ptr) \
+	netdev->get_stats = fun_ptr
+#define DECLARE_NET_DEVICE_STATS struct net_device_stats stats;
+#else
+#define NET_STAT(priv) priv->dev->stats
+#define NETDEV_GET_STATS(netdev, fun_ptr)
+#define DECLARE_NET_DEVICE_STATS
+#endif
+
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,23)
+#define DECLARE_NAPI_STRUCT
+#define NETIF_NAPI_SET(dev, napis, pollfn, q) \
+	dev->poll = pollfn; \
+	dev->weight = q;
+#define JME_NAPI_HOLDER(holder) struct net_device *holder
+#define JME_NAPI_WEIGHT(w) int *w
+#define JME_NAPI_WEIGHT_VAL(w) *w
+#define JME_NAPI_WEIGHT_SET(w, r) *w = r
+#define JME_RX_COMPLETE(dev, napis) netif_rx_complete(dev)
+#define JME_NAPI_ENABLE(priv) netif_poll_enable(priv->dev);
+#define JME_NAPI_DISABLE(priv) netif_poll_disable(priv->dev);
+#define JME_RX_SCHEDULE_PREP(priv) \
+	netif_rx_schedule_prep(priv->dev)
+#define JME_RX_SCHEDULE(priv) \
+	__netif_rx_schedule(priv->dev);
+#else
+#define DECLARE_NAPI_STRUCT struct napi_struct napi;
+#define NETIF_NAPI_SET(dev, napis, pollfn, q) \
+	netif_napi_add(dev, napis, pollfn, q);
+#define JME_NAPI_HOLDER(holder) struct napi_struct *holder
+#define JME_NAPI_WEIGHT(w) int w
+#define JME_NAPI_WEIGHT_VAL(w) w
+#define JME_NAPI_WEIGHT_SET(w, r)
+#define JME_RX_COMPLETE(dev, napis) netif_rx_complete(dev, napis)
+#define JME_NAPI_ENABLE(priv) napi_enable(&priv->napi);
+#define JME_NAPI_DISABLE(priv) \
+	if(!napi_disable_pending(&priv->napi)) \
+		napi_disable(&priv->napi);
+#define JME_RX_SCHEDULE_PREP(priv) \
+	netif_rx_schedule_prep(priv->dev, &priv->napi)
+#define JME_RX_SCHEDULE(priv) \
+	__netif_rx_schedule(priv->dev, &priv->napi);
+#endif
+
+
 enum dynamic_pcc_values {
 	PCC_OFF		= 0,
 	PCC_P1		= 1,
@@ -339,51 +379,13 @@ struct jme_ring {
 	atomic_t nr_free;
 };
 
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,21)
-#define NET_STAT(priv) priv->stats
-#define NETDEV_GET_STATS(netdev, fun_ptr) \
-	netdev->get_stats = fun_ptr
-#define DECLARE_NET_DEVICE_STATS struct net_device_stats stats;
-#else
-#define NET_STAT(priv) priv->dev->stats
-#define NETDEV_GET_STATS(netdev, fun_ptr)
-#define DECLARE_NET_DEVICE_STATS
-#endif
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,23)
-#define DECLARE_NAPI_STRUCT
-#define NETIF_NAPI_SET(dev, napis, pollfn, q) \
-	dev->poll = pollfn; \
-	dev->weight = q;
-#define JME_NAPI_HOLDER(holder) struct net_device *holder
-#define JME_NAPI_WEIGHT(w) int *w
-#define JME_NAPI_WEIGHT_VAL(w) *w
-#define JME_NAPI_WEIGHT_SET(w, r) *w = r
-#define JME_RX_COMPLETE(dev, napis) netif_rx_complete(dev)
-#define JME_NAPI_ENABLE(priv) netif_poll_enable(priv->dev);
-#define JME_NAPI_DISABLE(priv) netif_poll_disable(priv->dev);
-#define JME_RX_SCHEDULE_PREP(priv) \
-	netif_rx_schedule_prep(priv->dev)
-#define JME_RX_SCHEDULE(priv) \
-	__netif_rx_schedule(priv->dev);
-#else
-#define DECLARE_NAPI_STRUCT struct napi_struct napi;
-#define NETIF_NAPI_SET(dev, napis, pollfn, q) \
-	netif_napi_add(dev, napis, pollfn, q);
-#define JME_NAPI_HOLDER(holder) struct napi_struct *holder
-#define JME_NAPI_WEIGHT(w) int w
-#define JME_NAPI_WEIGHT_VAL(w) w
-#define JME_NAPI_WEIGHT_SET(w, r)
-#define JME_RX_COMPLETE(dev, napis) netif_rx_complete(dev, napis)
-#define JME_NAPI_ENABLE(priv) napi_enable(&priv->napi);
-#define JME_NAPI_DISABLE(priv) \
-	if(!napi_disable_pending(&priv->napi)) \
-		napi_disable(&priv->napi);
-#define JME_RX_SCHEDULE_PREP(priv) \
-	netif_rx_schedule_prep(priv->dev, &priv->napi)
-#define JME_RX_SCHEDULE(priv) \
-	__netif_rx_schedule(priv->dev, &priv->napi);
-#endif
+#define JME_MSIX_VEC_NR		3
+struct jme_msix_info {
+	irq_handler_t	handler;
+	__u16		vector;
+	__u8		requested;
+	char		name[16];
+};
 
 /*
  * Jmac Adapter Private data
@@ -406,6 +408,7 @@ struct jme_adapter {
 	struct tasklet_struct	txclean_task;
 	struct tasklet_struct	linkch_task;
 	struct tasklet_struct	pcc_task;
+	struct jme_msix_info	msix[JME_MSIX_VEC_NR];
 	__u32			flags;
 	__u32			reg_txcs;
 	__u32			reg_txpfc;
@@ -443,10 +446,11 @@ enum shadow_reg_val {
 };
 enum jme_flags_bits {
 	JME_FLAG_MSI		= 0x00000001,
-	JME_FLAG_SSET		= 0x00000002,
-	JME_FLAG_TXCSUM		= 0x00000004,
-	JME_FLAG_TSO		= 0x00000008,
-	JME_FLAG_POLL		= 0x00000010,
+	JME_FLAG_MSIX		= 0x00000002,
+	JME_FLAG_SSET		= 0x00000004,
+	JME_FLAG_TXCSUM		= 0x00000008,
+	JME_FLAG_TSO		= 0x00000010,
+	JME_FLAG_POLL		= 0x00000020,
 };
 #define WAIT_TASKLET_TIMEOUT	500 /* 500 ms */
 #define TX_TIMEOUT		(5*HZ)
@@ -524,6 +528,7 @@ enum jme_iomap_regs {
 	JME_TMCSR	= JME_MISC| 0x00, /* Timer Control/Status Register */
 	JME_GPREG0	= JME_MISC| 0x08, /* General purpose REG-0 */
 	JME_GPREG1	= JME_MISC| 0x0C, /* General purpose REG-1 */
+	JME_MSIX_ENT	= JME_MISC| 0x10, /* MSIX Entry table */
 	JME_IEVE	= JME_MISC| 0x20, /* Interrupt Event Status */
 	JME_IREQ	= JME_MISC| 0x24, /* Interrupt Req Status(For Debug) */
 	JME_IENS	= JME_MISC| 0x28, /* Interrupt Enable - Setting Port */
@@ -929,8 +934,7 @@ enum jme_gpreg0_vals {
 /*
  * Interrupt Status Bits
  */
-enum jme_interrupt_bits
-{
+enum jme_interrupt_bits {
 	INTR_SWINTR	= 0x80000000,
 	INTR_TMINTR	= 0x40000000,
 	INTR_LINKCH	= 0x20000000,
@@ -964,14 +968,25 @@ enum jme_interrupt_bits
 	INTR_TX1	= 0x00000002,
 	INTR_TX0	= 0x00000001,
 };
-static const __u32 INTR_ENABLE = INTR_SWINTR |
-				 INTR_TMINTR |
-				 INTR_LINKCH |
-				 INTR_PCCRX0TO |
-				 INTR_PCCRX0 |
-				 INTR_PCCTXTO |
-				 INTR_PCCTX |
-				 INTR_RX0EMP;
+enum jme_interrupt_enables {
+	INTR_ENABLE =	INTR_SWINTR |
+			INTR_TMINTR |
+			INTR_LINKCH |
+			INTR_PCCRX0TO |
+			INTR_PCCRX0 |
+			INTR_PCCTXTO |
+			INTR_PCCTX |
+			INTR_RX0EMP,
+
+	INTR_EN_TX =	INTR_PCCTXTO |
+			INTR_PCCTX,
+
+	INTR_EN_RX0 =	INTR_PCCRX0TO |
+			INTR_PCCRX0 | 
+			INTR_RX0EMP,
+
+	INTR_EN_MISC =	INTR_ENABLE & ~(INTR_EN_TX | INTR_EN_RX0),
+};
 
 /*
  * PCC Control Registers