[intel] Expose functionality to be shared with intelx driver

The Intel 10 Gigabit NICs have a datapath that is almost
register-compatible with the Intel 1 Gigabit NICs.  Expose common
functionality to avoid duplication of code in the new "intelx" driver.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/drivers/net/intel.c b/src/drivers/net/intel.c
index 2533fbee268ffe3b82338977830738fc262363fa..c3a7d407e4d40d0c4dc31defc8f8f1059a1853d3 100644 (file)
--- a/src/drivers/net/intel.c
+++ b/src/drivers/net/intel.c
@@ -360,8 +360,7 @@ static void intel_check_link ( struct net_device *netdev ) {
  * @v ring             Descriptor ring
  * @ret rc             Return status code
  */
-static int intel_create_ring ( struct intel_nic *intel,
-                              struct intel_ring *ring ) {
+int intel_create_ring ( struct intel_nic *intel, struct intel_ring *ring ) {
        physaddr_t address;
        uint32_t dctl;
 
@@ -412,8 +411,7 @@ static int intel_create_ring ( struct intel_nic *intel,
  * @v intel            Intel device
  * @v ring             Descriptor ring
  */
-static void intel_destroy_ring ( struct intel_nic *intel,
-                                struct intel_ring *ring ) {
+void intel_destroy_ring ( struct intel_nic *intel, struct intel_ring *ring ) {
 
        /* Clear ring length */
        writel ( 0, ( intel->regs + ring->reg + INTEL_xDLEN ) );
@@ -434,7 +432,7 @@ static void intel_destroy_ring ( struct intel_nic *intel,
  *
  * @v intel            Intel device
  */
-static void intel_refill_rx ( struct intel_nic *intel ) {
+void intel_refill_rx ( struct intel_nic *intel ) {
        struct intel_descriptor *rx;
        struct io_buffer *iobuf;
        unsigned int rx_idx;
@@ -476,6 +474,21 @@ static void intel_refill_rx ( struct intel_nic *intel ) {
        }
 }
 
+/**
+ * Discard unused receive I/O buffers
+ *
+ * @v intel            Intel device
+ */
+void intel_empty_rx ( struct intel_nic *intel ) {
+       unsigned int i;
+
+       for ( i = 0 ; i < INTEL_NUM_RX_DESC ; i++ ) {
+               if ( intel->rx_iobuf[i] )
+                       free_iob ( intel->rx_iobuf[i] );
+               intel->rx_iobuf[i] = NULL;
+       }
+}
+
 /**
  * Open network device
  *
@@ -540,7 +553,6 @@ static int intel_open ( struct net_device *netdev ) {
  */
 static void intel_close ( struct net_device *netdev ) {
        struct intel_nic *intel = netdev->priv;
-       unsigned int i;
 
        /* Disable receiver */
        writel ( 0, intel->regs + INTEL_RCTL );
@@ -552,11 +564,7 @@ static void intel_close ( struct net_device *netdev ) {
        intel_destroy_ring ( intel, &intel->rx );
 
        /* Discard any unused receive buffers */
-       for ( i = 0 ; i < INTEL_NUM_RX_DESC ; i++ ) {
-               if ( intel->rx_iobuf[i] )
-                       free_iob ( intel->rx_iobuf[i] );
-               intel->rx_iobuf[i] = NULL;
-       }
+       intel_empty_rx ( intel );
 
        /* Destroy transmit descriptor ring */
        intel_destroy_ring ( intel, &intel->tx );
@@ -572,8 +580,7 @@ static void intel_close ( struct net_device *netdev ) {
  * @v iobuf            I/O buffer
  * @ret rc             Return status code
  */
-static int intel_transmit ( struct net_device *netdev,
-                              struct io_buffer *iobuf ) {
+int intel_transmit ( struct net_device *netdev, struct io_buffer *iobuf ) {
        struct intel_nic *intel = netdev->priv;
        struct intel_descriptor *tx;
        unsigned int tx_idx;
@@ -613,7 +620,7 @@ static int intel_transmit ( struct net_device *netdev,
  *
  * @v netdev           Network device
  */
-static void intel_poll_tx ( struct net_device *netdev ) {
+void intel_poll_tx ( struct net_device *netdev ) {
        struct intel_nic *intel = netdev->priv;
        struct intel_descriptor *tx;
        unsigned int tx_idx;
@@ -642,7 +649,7 @@ static void intel_poll_tx ( struct net_device *netdev ) {
  *
  * @v netdev           Network device
  */
-static void intel_poll_rx ( struct net_device *netdev ) {
+void intel_poll_rx ( struct net_device *netdev ) {
        struct intel_nic *intel = netdev->priv;
        struct intel_descriptor *rx;
        struct io_buffer *iobuf;

diff --git a/src/drivers/net/intel.h b/src/drivers/net/intel.h
index 18a86ea3a2a6fe369491d5c484230b8274e157f0..20b4255e1c299f76e591428ac94780bd8f52bf6f 100644 (file)
--- a/src/drivers/net/intel.h
+++ b/src/drivers/net/intel.h
@@ -242,4 +242,15 @@ struct intel_nic {
        struct io_buffer *rx_iobuf[INTEL_NUM_RX_DESC];
 };
 
+extern int intel_create_ring ( struct intel_nic *intel,
+                              struct intel_ring *ring );
+extern void intel_destroy_ring ( struct intel_nic *intel,
+                                struct intel_ring *ring );
+extern void intel_refill_rx ( struct intel_nic *intel );
+extern void intel_empty_rx ( struct intel_nic *intel );
+extern int intel_transmit ( struct net_device *netdev,
+                           struct io_buffer *iobuf );
+extern void intel_poll_tx ( struct net_device *netdev );
+extern void intel_poll_rx ( struct net_device *netdev );
+
 #endif /* _INTEL_H */