Skip to content

L
linux
Commit 356c74b4 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files
Options

Staging: et131x: clean up DMA10/DMA4 types 

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f2c98d27
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 201 deletions
drivers/staging/et131x/et1310_address_map.h
View file @ 356c74b4
...@@ -329,94 +329,40 @@ typedef union _TXDMA_PR_NUM_DES_t { ...@@ -329,94 +329,40 @@ typedef union _TXDMA_PR_NUM_DES_t {
} TXDMA_PR_NUM_DES_t, *PTXDMA_PR_NUM_DES_t; } TXDMA_PR_NUM_DES_t, *PTXDMA_PR_NUM_DES_t;
typedef union _DMA10W_t { #define ET_DMA10_MASK 0x3FF /* 10 bit mask for DMA10W types */
u32 value; #define ET_DMA10_WRAP 0x400
struct { #define ET_DMA4_MASK 0x00F /* 4 bit mask for DMA4W types */
#ifdef _BIT_FIELDS_HTOL #define ET_DMA4_WRAP 0x010
u32 unused:21; /* bits 11-31 */
u32 wrap:1; /* bit 10 */
u32 val:10; /* bits 0-9 */
#else
u32 val:10; /* bits 0-9 */
u32 wrap:1; /* bit 10 */
u32 unused:21; /* bits 11-31 */
#endif
} bits;
} DMA10W_t, *PDMA10W_t;
/*
* structure for txdma tx queue write address reg in txdma address map
* located at address 0x1010
* Defined earlier (DMA10W_t)
*/
/*
* structure for txdma tx queue write address external reg in txdma address map
* located at address 0x1014
* Defined earlier (DMA10W_t)
*/
/*
* structure for txdma tx queue read address reg in txdma address map
* located at address 0x1018
* Defined earlier (DMA10W_t)
*/
/*
* structure for txdma status writeback address hi reg in txdma address map
* located at address 0x101C
* Defined earlier (u32)
*/
/*
* structure for txdma status writeback address lo reg in txdma address map
* located at address 0x1020
* Defined earlier (u32)
*/
/*
* structure for txdma service request reg in txdma address map
* located at address 0x1024
* Defined earlier (DMA10W_t)
*/
/* #define INDEX10(x) ((x) & ET_DMA10_MASK)
* structure for txdma service complete reg in txdma address map #define INDEX4(x) ((x) & ET_DMA4_MASK)
* located at address 0x1028
* Defined earlier (DMA10W_t)
*/
typedef union _DMA4W_t { extern inline void add_10bit(u32 *v, int n)
u32 value; {
struct { *v = INDEX10(*v + n);
#ifdef _BIT_FIELDS_HTOL }
u32 unused:27; /* bits 5-31 */
u32 wrap:1; /* bit 4 */
u32 val:4; /* bit 0-3 */
#else
u32 val:4; /* bits 0-3 */
u32 wrap:1; /* bit 4 */
u32 unused:27; /* bits 5-31 */
#endif
} bits;
} DMA4W_t, *PDMA4W_t;
/* /*
* structure for txdma tx descriptor cache read index reg in txdma address map * 10bit DMA with wrap
* located at address 0x102C * txdma tx queue write address reg in txdma address map at 0x1010
* Defined earlier (DMA4W_t) * txdma tx queue write address external reg in txdma address map at 0x1014
*/ * txdma tx queue read address reg in txdma address map at 0x1018
*
/* * u32
* structure for txdma tx descriptor cache write index reg in txdma address map * txdma status writeback address hi reg in txdma address map at0x101C
* located at address 0x1030 * txdma status writeback address lo reg in txdma address map at 0x1020
* Defined earlier (DMA4W_t) *
* 10bit DMA with wrap
* txdma service request reg in txdma address map at 0x1024
* structure for txdma service complete reg in txdma address map at 0x1028
*
* 4bit DMA with wrap
* txdma tx descriptor cache read index reg in txdma address map at 0x102C
* txdma tx descriptor cache write index reg in txdma address map at 0x1030
*
* txdma error reg in txdma address map at address 0x1034
*/ */
/*
* structure for txdma error reg in txdma address map
* located at address 0x1034
*/
typedef union _TXDMA_ERROR_t { typedef union _TXDMA_ERROR_t {
u32 value; u32 value;
struct { struct {
...@@ -453,15 +399,15 @@ typedef struct _TXDMA_t { /* Location: */ ...@@ -453,15 +399,15 @@ typedef struct _TXDMA_t { /* Location: */
u32 pr_base_hi; /* 0x1004 */ u32 pr_base_hi; /* 0x1004 */
u32 pr_base_lo; /* 0x1008 */ u32 pr_base_lo; /* 0x1008 */
TXDMA_PR_NUM_DES_t pr_num_des; /* 0x100C */ TXDMA_PR_NUM_DES_t pr_num_des; /* 0x100C */
DMA10W_t txq_wr_addr; /* 0x1010 */ u32 txq_wr_addr; /* 0x1010 */
DMA10W_t txq_wr_addr_ext; /* 0x1014 */ u32 txq_wr_addr_ext; /* 0x1014 */
DMA10W_t txq_rd_addr; /* 0x1018 */ u32 txq_rd_addr; /* 0x1018 */
u32 dma_wb_base_hi; /* 0x101C */ u32 dma_wb_base_hi; /* 0x101C */
u32 dma_wb_base_lo; /* 0x1020 */ u32 dma_wb_base_lo; /* 0x1020 */
DMA10W_t service_request; /* 0x1024 */ u32 service_request; /* 0x1024 */
DMA10W_t service_complete; /* 0x1028 */ u32 service_complete; /* 0x1028 */
DMA4W_t cache_rd_index; /* 0x102C */ u32 cache_rd_index; /* 0x102C */
DMA4W_t cache_wr_index; /* 0x1030 */ u32 cache_wr_index; /* 0x1030 */
TXDMA_ERROR_t TxDmaError; /* 0x1034 */ TXDMA_ERROR_t TxDmaError; /* 0x1034 */
u32 DescAbortCount; /* 0x1038 */ u32 DescAbortCount; /* 0x1038 */
u32 PayloadAbortCnt; /* 0x103c */ u32 PayloadAbortCnt; /* 0x103c */
...@@ -473,7 +419,7 @@ typedef struct _TXDMA_t { /* Location: */ ...@@ -473,7 +419,7 @@ typedef struct _TXDMA_t { /* Location: */
u32 PayloadErrorCnt; /* 0x1054 */ u32 PayloadErrorCnt; /* 0x1054 */
u32 WriteBackErrorCnt; /* 0x1058 */ u32 WriteBackErrorCnt; /* 0x1058 */
u32 DroppedTLPCount; /* 0x105c */ u32 DroppedTLPCount; /* 0x105c */
DMA10W_t NewServiceComplete; /* 0x1060 */ u32 NewServiceComplete; /* 0x1060 */
u32 EthernetPacketCount; /* 0x1064 */ u32 EthernetPacketCount; /* 0x1064 */
} TXDMA_t, *PTXDMA_t; } TXDMA_t, *PTXDMA_t;
...@@ -574,19 +520,19 @@ typedef union _RXDMA_MAX_PKT_TIME_t { ...@@ -574,19 +520,19 @@ typedef union _RXDMA_MAX_PKT_TIME_t {
/* /*
* structure for rx queue read address reg in rxdma address map * structure for rx queue read address reg in rxdma address map
* located at address 0x2014 * located at address 0x2014
* Defined earlier (DMA10W_t) * Defined earlier (u32)
*/ */
/* /*
* structure for rx queue read address external reg in rxdma address map * structure for rx queue read address external reg in rxdma address map
* located at address 0x2018 * located at address 0x2018
* Defined earlier (DMA10W_t) * Defined earlier (u32)
*/ */
/* /*
* structure for rx queue write address reg in rxdma address map * structure for rx queue write address reg in rxdma address map
* located at address 0x201C * located at address 0x201C
* Defined earlier (DMA10W_t) * Defined earlier (u32)
*/ */
/* /*
...@@ -722,13 +668,13 @@ typedef union _RXDMA_FBR_NUM_DES_t { ...@@ -722,13 +668,13 @@ typedef union _RXDMA_FBR_NUM_DES_t {
/* /*
* structure for free buffer ring 0 available offset reg in rxdma address map * structure for free buffer ring 0 available offset reg in rxdma address map
* located at address 0x2048 * located at address 0x2048
* Defined earlier (DMA10W_t) * Defined earlier (u32)
*/ */
/* /*
* structure for free buffer ring 0 full offset reg in rxdma address map * structure for free buffer ring 0 full offset reg in rxdma address map
* located at address 0x204C * located at address 0x204C
* Defined earlier (DMA10W_t) * Defined earlier (u32)
*/ */
/* /*
...@@ -811,9 +757,9 @@ typedef struct _RXDMA_t { /* Location: */ ...@@ -811,9 +757,9 @@ typedef struct _RXDMA_t { /* Location: */
u32 dma_wb_base_hi; /* 0x2008 */ u32 dma_wb_base_hi; /* 0x2008 */
RXDMA_NUM_PKT_DONE_t num_pkt_done; /* 0x200C */ RXDMA_NUM_PKT_DONE_t num_pkt_done; /* 0x200C */
RXDMA_MAX_PKT_TIME_t max_pkt_time; /* 0x2010 */ RXDMA_MAX_PKT_TIME_t max_pkt_time; /* 0x2010 */
DMA10W_t rxq_rd_addr; /* 0x2014 */ u32 rxq_rd_addr; /* 0x2014 */
DMA10W_t rxq_rd_addr_ext; /* 0x2018 */ u32 rxq_rd_addr_ext; /* 0x2018 */
DMA10W_t rxq_wr_addr; /* 0x201C */ u32 rxq_wr_addr; /* 0x201C */
u32 psr_base_lo; /* 0x2020 */ u32 psr_base_lo; /* 0x2020 */
u32 psr_base_hi; /* 0x2024 */ u32 psr_base_hi; /* 0x2024 */
RXDMA_PSR_NUM_DES_t psr_num_des; /* 0x2028 */ RXDMA_PSR_NUM_DES_t psr_num_des; /* 0x2028 */
...@@ -824,15 +770,15 @@ typedef struct _RXDMA_t { /* Location: */ ...@@ -824,15 +770,15 @@ typedef struct _RXDMA_t { /* Location: */
u32 fbr0_base_lo; /* 0x203C */ u32 fbr0_base_lo; /* 0x203C */
u32 fbr0_base_hi; /* 0x2040 */ u32 fbr0_base_hi; /* 0x2040 */
RXDMA_FBR_NUM_DES_t fbr0_num_des; /* 0x2044 */ RXDMA_FBR_NUM_DES_t fbr0_num_des; /* 0x2044 */
DMA10W_t fbr0_avail_offset; /* 0x2048 */ u32 fbr0_avail_offset; /* 0x2048 */
DMA10W_t fbr0_full_offset; /* 0x204C */ u32 fbr0_full_offset; /* 0x204C */
RXDMA_FBC_RD_INDEX_t fbr0_rd_index; /* 0x2050 */ RXDMA_FBC_RD_INDEX_t fbr0_rd_index; /* 0x2050 */
RXDMA_FBR_MIN_DES_t fbr0_min_des; /* 0x2054 */ RXDMA_FBR_MIN_DES_t fbr0_min_des; /* 0x2054 */
u32 fbr1_base_lo; /* 0x2058 */ u32 fbr1_base_lo; /* 0x2058 */
u32 fbr1_base_hi; /* 0x205C */ u32 fbr1_base_hi; /* 0x205C */
RXDMA_FBR_NUM_DES_t fbr1_num_des; /* 0x2060 */ RXDMA_FBR_NUM_DES_t fbr1_num_des; /* 0x2060 */
DMA10W_t fbr1_avail_offset; /* 0x2064 */ u32 fbr1_avail_offset; /* 0x2064 */
DMA10W_t fbr1_full_offset; /* 0x2068 */ u32 fbr1_full_offset; /* 0x2068 */
RXDMA_FBC_RD_INDEX_t fbr1_rd_index; /* 0x206C */ RXDMA_FBC_RD_INDEX_t fbr1_rd_index; /* 0x206C */
RXDMA_FBR_MIN_DES_t fbr1_min_des; /* 0x2070 */ RXDMA_FBR_MIN_DES_t fbr1_min_des; /* 0x2070 */
} RXDMA_t, *PRXDMA_t; } RXDMA_t, *PRXDMA_t;
......
drivers/staging/et131x/et1310_rx.c
View file @ 356c74b4
...@@ -739,20 +739,12 @@ void ConfigRxDmaRegs(struct et131x_adapter *etdev) ...@@ -739,20 +739,12 @@ void ConfigRxDmaRegs(struct et131x_adapter *etdev)
writel((uint32_t) (pRxLocal->Fbr1Realpa >> 32), &rx_dma->fbr1_base_hi); writel((uint32_t) (pRxLocal->Fbr1Realpa >> 32), &rx_dma->fbr1_base_hi);
writel((uint32_t) pRxLocal->Fbr1Realpa, &rx_dma->fbr1_base_lo); writel((uint32_t) pRxLocal->Fbr1Realpa, &rx_dma->fbr1_base_lo);
writel(pRxLocal->Fbr1NumEntries - 1, &rx_dma->fbr1_num_des.value); writel(pRxLocal->Fbr1NumEntries - 1, &rx_dma->fbr1_num_des.value);
writel(ET_DMA10_WRAP, &rx_dma->fbr1_full_offset);
{
DMA10W_t fbr1_full = { 0 };
fbr1_full.bits.val = 0;
fbr1_full.bits.wrap = 1;
writel(fbr1_full.value, &rx_dma->fbr1_full_offset.value);
}
/* This variable tracks the free buffer ring 1 full position, so it /* This variable tracks the free buffer ring 1 full position, so it
* has to match the above. * has to match the above.
*/ */
pRxLocal->local_Fbr1_full.bits.val = 0; pRxLocal->local_Fbr1_full = ET_DMA10_WRAP;
pRxLocal->local_Fbr1_full.bits.wrap = 1;
writel(((pRxLocal->Fbr1NumEntries * LO_MARK_PERCENT_FOR_RX) / 100) - 1, writel(((pRxLocal->Fbr1NumEntries * LO_MARK_PERCENT_FOR_RX) / 100) - 1,
&rx_dma->fbr1_min_des.value); &rx_dma->fbr1_min_des.value);
...@@ -769,20 +761,12 @@ void ConfigRxDmaRegs(struct et131x_adapter *etdev) ...@@ -769,20 +761,12 @@ void ConfigRxDmaRegs(struct et131x_adapter *etdev)
writel((uint32_t) (pRxLocal->Fbr0Realpa >> 32), &rx_dma->fbr0_base_hi); writel((uint32_t) (pRxLocal->Fbr0Realpa >> 32), &rx_dma->fbr0_base_hi);
writel((uint32_t) pRxLocal->Fbr0Realpa, &rx_dma->fbr0_base_lo); writel((uint32_t) pRxLocal->Fbr0Realpa, &rx_dma->fbr0_base_lo);
writel(pRxLocal->Fbr0NumEntries - 1, &rx_dma->fbr0_num_des.value); writel(pRxLocal->Fbr0NumEntries - 1, &rx_dma->fbr0_num_des.value);
writel(ET_DMA10_WRAP, &rx_dma->fbr0_full_offset);
{
DMA10W_t fbr0_full = { 0 };
fbr0_full.bits.val = 0;
fbr0_full.bits.wrap = 1;
writel(fbr0_full.value, &rx_dma->fbr0_full_offset.value);
}
/* This variable tracks the free buffer ring 0 full position, so it /* This variable tracks the free buffer ring 0 full position, so it
* has to match the above. * has to match the above.
*/ */
pRxLocal->local_Fbr0_full.bits.val = 0; pRxLocal->local_Fbr0_full = ET_DMA10_WRAP;
pRxLocal->local_Fbr0_full.bits.wrap = 1;
writel(((pRxLocal->Fbr0NumEntries * LO_MARK_PERCENT_FOR_RX) / 100) - 1, writel(((pRxLocal->Fbr0NumEntries * LO_MARK_PERCENT_FOR_RX) / 100) - 1,
&rx_dma->fbr0_min_des.value); &rx_dma->fbr0_min_des.value);
#endif #endif
...@@ -1282,6 +1266,16 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *etdev) ...@@ -1282,6 +1266,16 @@ void et131x_handle_recv_interrupt(struct et131x_adapter *etdev)
DBG_RX_LEAVE(et131x_dbginfo); DBG_RX_LEAVE(et131x_dbginfo);
} }
static inline u32 bump_fbr(u32 *fbr, u32 limit)
{
u32 v = *fbr;
add_10bit(&v, 1);
if (v > limit)
v = (*fbr & ~ET_DMA10_MASK) ^ ET_DMA10_WRAP;
*fbr = v;
return v;
}
/** /**
* NICReturnRFD - Recycle a RFD and put it back onto the receive list * NICReturnRFD - Recycle a RFD and put it back onto the receive list
* @etdev: pointer to our adapter * @etdev: pointer to our adapter
...@@ -1310,7 +1304,7 @@ void nic_return_rfd(struct et131x_adapter *etdev, PMP_RFD pMpRfd) ...@@ -1310,7 +1304,7 @@ void nic_return_rfd(struct et131x_adapter *etdev, PMP_RFD pMpRfd)
if (ri == 1) { if (ri == 1) {
PFBR_DESC_t pNextDesc = PFBR_DESC_t pNextDesc =
(PFBR_DESC_t) (rx_local->pFbr1RingVa) + (PFBR_DESC_t) (rx_local->pFbr1RingVa) +
rx_local->local_Fbr1_full.bits.val; INDEX10(rx_local->local_Fbr1_full);
/* Handle the Free Buffer Ring advancement here. Write /* Handle the Free Buffer Ring advancement here. Write
* the PA / Buffer Index for the returned buffer into * the PA / Buffer Index for the returned buffer into
...@@ -1320,20 +1314,15 @@ void nic_return_rfd(struct et131x_adapter *etdev, PMP_RFD pMpRfd) ...@@ -1320,20 +1314,15 @@ void nic_return_rfd(struct et131x_adapter *etdev, PMP_RFD pMpRfd)
pNextDesc->addr_lo = rx_local->Fbr[1]->PALow[bi]; pNextDesc->addr_lo = rx_local->Fbr[1]->PALow[bi];
pNextDesc->word2.value = bi; pNextDesc->word2.value = bi;
if (++rx_local->local_Fbr1_full.bits.val > writel(bump_fbr(&rx_local->local_Fbr1_full,
(rx_local->Fbr1NumEntries - 1)) { rx_local->Fbr1NumEntries - 1),
rx_local->local_Fbr1_full.bits.val = 0; &rx_dma->fbr1_full_offset);
rx_local->local_Fbr1_full.bits.wrap ^= 1;
}
writel(rx_local->local_Fbr1_full.value,
&rx_dma->fbr1_full_offset.value);
} }
#ifdef USE_FBR0 #ifdef USE_FBR0
else { else {
PFBR_DESC_t pNextDesc = PFBR_DESC_t pNextDesc =
(PFBR_DESC_t) rx_local->pFbr0RingVa + (PFBR_DESC_t) rx_local->pFbr0RingVa +
rx_local->local_Fbr0_full.bits.val; INDEX10(rx_local->local_Fbr0_full);
/* Handle the Free Buffer Ring advancement here. Write /* Handle the Free Buffer Ring advancement here. Write
* the PA / Buffer Index for the returned buffer into * the PA / Buffer Index for the returned buffer into
...@@ -1343,14 +1332,9 @@ void nic_return_rfd(struct et131x_adapter *etdev, PMP_RFD pMpRfd) ...@@ -1343,14 +1332,9 @@ void nic_return_rfd(struct et131x_adapter *etdev, PMP_RFD pMpRfd)
pNextDesc->addr_lo = rx_local->Fbr[0]->PALow[bi]; pNextDesc->addr_lo = rx_local->Fbr[0]->PALow[bi];
pNextDesc->word2.value = bi; pNextDesc->word2.value = bi;
if (++rx_local->local_Fbr0_full.bits.val > writel(bump_fbr(&rx_local->local_Fbr0_full,
(rx_local->Fbr0NumEntries - 1)) { rx_local->Fbr0NumEntries - 1),
rx_local->local_Fbr0_full.bits.val = 0; &rx_dma->fbr0_full_offset);
rx_local->local_Fbr0_full.bits.wrap ^= 1;
}
writel(rx_local->local_Fbr0_full.value,
&rx_dma->fbr0_full_offset.value);
} }
#endif #endif
spin_unlock_irqrestore(&etdev->FbrLock, flags); spin_unlock_irqrestore(&etdev->FbrLock, flags);
......
drivers/staging/et131x/et1310_rx.h
View file @ 356c74b4
...@@ -302,7 +302,7 @@ typedef struct _rx_ring_t { ...@@ -302,7 +302,7 @@ typedef struct _rx_ring_t {
dma_addr_t Fbr0MemPa[MAX_DESC_PER_RING_RX / FBR_CHUNKS]; dma_addr_t Fbr0MemPa[MAX_DESC_PER_RING_RX / FBR_CHUNKS];
uint64_t Fbr0Realpa; uint64_t Fbr0Realpa;
uint64_t Fbr0offset; uint64_t Fbr0offset;
DMA10W_t local_Fbr0_full; u32 local_Fbr0_full;
u32 Fbr0NumEntries; u32 Fbr0NumEntries;
u32 Fbr0BufferSize; u32 Fbr0BufferSize;
#endif #endif
...@@ -313,7 +313,7 @@ typedef struct _rx_ring_t { ...@@ -313,7 +313,7 @@ typedef struct _rx_ring_t {
uint64_t Fbr1Realpa; uint64_t Fbr1Realpa;
uint64_t Fbr1offset; uint64_t Fbr1offset;
FBRLOOKUPTABLE *Fbr[2]; FBRLOOKUPTABLE *Fbr[2];
DMA10W_t local_Fbr1_full; u32 local_Fbr1_full;
u32 Fbr1NumEntries; u32 Fbr1NumEntries;
u32 Fbr1BufferSize; u32 Fbr1BufferSize;
......
drivers/staging/et131x/et1310_tx.c
View file @ 356c74b4
...@@ -275,8 +275,8 @@ void ConfigTxDmaRegs(struct et131x_adapter *etdev) ...@@ -275,8 +275,8 @@ void ConfigTxDmaRegs(struct et131x_adapter *etdev)
memset(etdev->TxRing.pTxStatusVa, 0, sizeof(TX_STATUS_BLOCK_t)); memset(etdev->TxRing.pTxStatusVa, 0, sizeof(TX_STATUS_BLOCK_t));
writel(0, &txdma->service_request.value); writel(0, &txdma->service_request);
etdev->TxRing.txDmaReadyToSend.value = 0; etdev->TxRing.txDmaReadyToSend = 0;
DBG_LEAVE(et131x_dbginfo); DBG_LEAVE(et131x_dbginfo);
} }
...@@ -601,8 +601,7 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb) ...@@ -601,8 +601,7 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb)
"filling desc entry %d, " "filling desc entry %d, "
"TCB: 0x%p\n", "TCB: 0x%p\n",
(pPacket->len - pPacket->data_len), (pPacket->len - pPacket->data_len),
etdev->TxRing.txDmaReadyToSend.bits. etdev->TxRing.txDmaReadyToSend, pMpTcb);
val, pMpTcb);
CurDesc[FragmentNumber].DataBufferPtrHigh = 0; CurDesc[FragmentNumber].DataBufferPtrHigh = 0;
...@@ -630,8 +629,7 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb) ...@@ -630,8 +629,7 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb)
"filling desc entry %d, " "filling desc entry %d, "
"TCB: 0x%p\n", "TCB: 0x%p\n",
(pPacket->len - pPacket->data_len), (pPacket->len - pPacket->data_len),
etdev->TxRing.txDmaReadyToSend.bits. etdev->TxRing.txDmaReadyToSend, pMpTcb);
val, pMpTcb);
CurDesc[FragmentNumber].DataBufferPtrHigh = 0; CurDesc[FragmentNumber].DataBufferPtrHigh = 0;
...@@ -682,7 +680,7 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb) ...@@ -682,7 +680,7 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb)
"filling desc entry %d\n" "filling desc entry %d\n"
"TCB: 0x%p\n", "TCB: 0x%p\n",
pFragList[loopIndex].size, pFragList[loopIndex].size,
etdev->TxRing.txDmaReadyToSend.bits.val, etdev->TxRing.txDmaReadyToSend,
pMpTcb); pMpTcb);
CurDesc[FragmentNumber].DataBufferPtrHigh = 0; CurDesc[FragmentNumber].DataBufferPtrHigh = 0;
...@@ -729,8 +727,8 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb) ...@@ -729,8 +727,8 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb)
spin_lock_irqsave(&etdev->SendHWLock, flags); spin_lock_irqsave(&etdev->SendHWLock, flags);
thiscopy = thiscopy = NUM_DESC_PER_RING_TX -
NUM_DESC_PER_RING_TX - etdev->TxRing.txDmaReadyToSend.bits.val; INDEX10(etdev->TxRing.txDmaReadyToSend);
if (thiscopy >= FragmentNumber) { if (thiscopy >= FragmentNumber) {
remainder = 0; remainder = 0;
...@@ -740,18 +738,15 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb) ...@@ -740,18 +738,15 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb)
} }
memcpy(etdev->TxRing.pTxDescRingVa + memcpy(etdev->TxRing.pTxDescRingVa +
etdev->TxRing.txDmaReadyToSend.bits.val, CurDesc, INDEX10(etdev->TxRing.txDmaReadyToSend), CurDesc,
sizeof(TX_DESC_ENTRY_t) * thiscopy); sizeof(TX_DESC_ENTRY_t) * thiscopy);
etdev->TxRing.txDmaReadyToSend.bits.val += thiscopy; add_10bit(&etdev->TxRing.txDmaReadyToSend, thiscopy);
if ((etdev->TxRing.txDmaReadyToSend.bits.val == 0) || if (INDEX10(etdev->TxRing.txDmaReadyToSend)== 0 ||
(etdev->TxRing.txDmaReadyToSend.bits.val == INDEX10(etdev->TxRing.txDmaReadyToSend) == NUM_DESC_PER_RING_TX) {
NUM_DESC_PER_RING_TX)) { etdev->TxRing.txDmaReadyToSend &= ~ET_DMA10_MASK;
if (etdev->TxRing.txDmaReadyToSend.bits.wrap) etdev->TxRing.txDmaReadyToSend ^= ET_DMA10_WRAP;
etdev->TxRing.txDmaReadyToSend.value = 0;
else
etdev->TxRing.txDmaReadyToSend.value = 0x400;
} }
if (remainder) { if (remainder) {
...@@ -759,18 +754,16 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb) ...@@ -759,18 +754,16 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb)
CurDesc + thiscopy, CurDesc + thiscopy,
sizeof(TX_DESC_ENTRY_t) * remainder); sizeof(TX_DESC_ENTRY_t) * remainder);
etdev->TxRing.txDmaReadyToSend.bits.val += remainder; add_10bit(&etdev->TxRing.txDmaReadyToSend, remainder);
} }
if (etdev->TxRing.txDmaReadyToSend.bits.val == 0) { if (INDEX10(etdev->TxRing.txDmaReadyToSend) == 0) {
if (etdev->TxRing.txDmaReadyToSend.value) if (etdev->TxRing.txDmaReadyToSend)
pMpTcb->WrIndex.value = NUM_DESC_PER_RING_TX - 1; pMpTcb->WrIndex = NUM_DESC_PER_RING_TX - 1;
else else
pMpTcb->WrIndex.value = pMpTcb->WrIndex= ET_DMA10_WRAP | (NUM_DESC_PER_RING_TX - 1);
0x400 | (NUM_DESC_PER_RING_TX - 1);
} else } else
pMpTcb->WrIndex.value = pMpTcb->WrIndex = etdev->TxRing.txDmaReadyToSend - 1;
etdev->TxRing.txDmaReadyToSend.value - 1;
spin_lock(&etdev->TCBSendQLock); spin_lock(&etdev->TCBSendQLock);
...@@ -788,8 +781,8 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb) ...@@ -788,8 +781,8 @@ static int nic_send_packet(struct et131x_adapter *etdev, PMP_TCB pMpTcb)
spin_unlock(&etdev->TCBSendQLock); spin_unlock(&etdev->TCBSendQLock);
/* Write the new write pointer back to the device. */ /* Write the new write pointer back to the device. */
writel(etdev->TxRing.txDmaReadyToSend.value, writel(etdev->TxRing.txDmaReadyToSend,
&etdev->regs->txdma.service_request.value); &etdev->regs->txdma.service_request);
/* For Gig only, we use Tx Interrupt coalescing. Enable the software /* For Gig only, we use Tx Interrupt coalescing. Enable the software
* timer to wake us up if this packet isn't followed by N more. * timer to wake us up if this packet isn't followed by N more.
...@@ -1258,23 +1251,18 @@ inline void et131x_free_send_packet(struct et131x_adapter *etdev, ...@@ -1258,23 +1251,18 @@ inline void et131x_free_send_packet(struct et131x_adapter *etdev,
"TCB : 0x%p\n" "TCB : 0x%p\n"
"TCB Next : 0x%p\n" "TCB Next : 0x%p\n"
"TCB PacketLength : %d\n" "TCB PacketLength : %d\n"
"TCB WrIndex.value : 0x%08x\n" "TCB WrIndexS.value : 0x%08x\n"
"TCB WrIndex.bits.val : %d\n" "TCB WrIndex.value : 0x%08x\n",
"TCB WrIndex.value : 0x%08x\n"
"TCB WrIndex.bits.val : %d\n",
pMpTcb, pMpTcb,
pMpTcb->Next, pMpTcb->Next,
pMpTcb->PacketLength, pMpTcb->PacketLength,
pMpTcb->WrIndexStart.value, pMpTcb->WrIndexStart,
pMpTcb->WrIndexStart.bits.val, pMpTcb->WrIndex);
pMpTcb->WrIndex.value,
pMpTcb->WrIndex.bits.val);
do { do {
desc = desc =
(TX_DESC_ENTRY_t *) (etdev->TxRing. (TX_DESC_ENTRY_t *) (etdev->TxRing.pTxDescRingVa +
pTxDescRingVa + INDEX10(pMpTcb->WrIndexStart));
pMpTcb->WrIndexStart.bits.val);
DBG_TX(et131x_dbginfo, DBG_TX(et131x_dbginfo,
"CURRENT DESCRIPTOR\n" "CURRENT DESCRIPTOR\n"
...@@ -1293,15 +1281,14 @@ inline void et131x_free_send_packet(struct et131x_adapter *etdev, ...@@ -1293,15 +1281,14 @@ inline void et131x_free_send_packet(struct et131x_adapter *etdev,
desc->DataBufferPtrLow, desc->DataBufferPtrLow,
desc->word2.value, PCI_DMA_TODEVICE); desc->word2.value, PCI_DMA_TODEVICE);
if (++pMpTcb->WrIndexStart.bits.val >= add_10bit(&pMpTcb->WrIndexStart, 1);
if (INDEX10(pMpTcb->WrIndexStart) >=
NUM_DESC_PER_RING_TX) { NUM_DESC_PER_RING_TX) {
if (pMpTcb->WrIndexStart.bits.wrap) pMpTcb->WrIndexStart &= ~ET_DMA10_MASK;
pMpTcb->WrIndexStart.value = 0; pMpTcb->WrIndexStart ^= ET_DMA10_WRAP;
else
pMpTcb->WrIndexStart.value = 0x400;
} }
} while (desc != (etdev->TxRing.pTxDescRingVa + } while (desc != (etdev->TxRing.pTxDescRingVa +
pMpTcb->WrIndex.bits.val)); INDEX10(pMpTcb->WrIndex)));
DBG_TX(et131x_dbginfo, DBG_TX(et131x_dbginfo,
"Free Packet (SKB) : 0x%p\n", pMpTcb->Packet); "Free Packet (SKB) : 0x%p\n", pMpTcb->Packet);
...@@ -1431,11 +1418,12 @@ void et131x_handle_send_interrupt(struct et131x_adapter *etdev) ...@@ -1431,11 +1418,12 @@ void et131x_handle_send_interrupt(struct et131x_adapter *etdev)
static void et131x_update_tcb_list(struct et131x_adapter *etdev) static void et131x_update_tcb_list(struct et131x_adapter *etdev)
{ {
unsigned long flags; unsigned long flags;
DMA10W_t ServiceComplete; u32 ServiceComplete;
PMP_TCB pMpTcb; PMP_TCB pMpTcb;
u32 index;
ServiceComplete.value = ServiceComplete = readl(&etdev->regs->txdma.NewServiceComplete);
readl(&etdev->regs->txdma.NewServiceComplete.value); index = INDEX10(ServiceComplete);
/* Has the ring wrapped? Process any descriptors that do not have /* Has the ring wrapped? Process any descriptors that do not have
* the same "wrap" indicator as the current completion indicator * the same "wrap" indicator as the current completion indicator
...@@ -1443,9 +1431,10 @@ static void et131x_update_tcb_list(struct et131x_adapter *etdev) ...@@ -1443,9 +1431,10 @@ static void et131x_update_tcb_list(struct et131x_adapter *etdev)
spin_lock_irqsave(&etdev->TCBSendQLock, flags); spin_lock_irqsave(&etdev->TCBSendQLock, flags);
pMpTcb = etdev->TxRing.CurrSendHead; pMpTcb = etdev->TxRing.CurrSendHead;
while (pMpTcb && while (pMpTcb &&
ServiceComplete.bits.wrap != pMpTcb->WrIndex.bits.wrap && ((ServiceComplete ^ pMpTcb->WrIndex) & ET_DMA10_WRAP) &&
ServiceComplete.bits.val < pMpTcb->WrIndex.bits.val) { index < INDEX10(pMpTcb->WrIndex)) {
etdev->TxRing.nBusySend--; etdev->TxRing.nBusySend--;
etdev->TxRing.CurrSendHead = pMpTcb->Next; etdev->TxRing.CurrSendHead = pMpTcb->Next;
if (pMpTcb->Next == NULL) if (pMpTcb->Next == NULL)
...@@ -1459,8 +1448,8 @@ static void et131x_update_tcb_list(struct et131x_adapter *etdev) ...@@ -1459,8 +1448,8 @@ static void et131x_update_tcb_list(struct et131x_adapter *etdev)
pMpTcb = etdev->TxRing.CurrSendHead; pMpTcb = etdev->TxRing.CurrSendHead;
} }
while (pMpTcb && while (pMpTcb &&
ServiceComplete.bits.wrap == pMpTcb->WrIndex.bits.wrap && !((ServiceComplete ^ pMpTcb->WrIndex) & ET_DMA10_WRAP)
ServiceComplete.bits.val > pMpTcb->WrIndex.bits.val) { && index > (pMpTcb->WrIndex & ET_DMA10_MASK)) {
etdev->TxRing.nBusySend--; etdev->TxRing.nBusySend--;
etdev->TxRing.CurrSendHead = pMpTcb->Next; etdev->TxRing.CurrSendHead = pMpTcb->Next;
if (pMpTcb->Next == NULL) if (pMpTcb->Next == NULL)
......
drivers/staging/et131x/et1310_tx.h
View file @ 356c74b4
...@@ -166,8 +166,8 @@ typedef struct _MP_TCB { ...@@ -166,8 +166,8 @@ typedef struct _MP_TCB {
u32 PacketStaleCount; u32 PacketStaleCount;
struct sk_buff *Packet; struct sk_buff *Packet;
u32 PacketLength; u32 PacketLength;
DMA10W_t WrIndex; u32 WrIndex;
DMA10W_t WrIndexStart; u32 WrIndexStart;
} MP_TCB, *PMP_TCB; } MP_TCB, *PMP_TCB;
/* Structure to hold the skb's in a list */ /* Structure to hold the skb's in a list */
...@@ -206,7 +206,7 @@ typedef struct _tx_ring_t { ...@@ -206,7 +206,7 @@ typedef struct _tx_ring_t {
uint64_t TxDescOffset; uint64_t TxDescOffset;
/* ReadyToSend indicates where we last wrote to in the descriptor ring. */ /* ReadyToSend indicates where we last wrote to in the descriptor ring. */
DMA10W_t txDmaReadyToSend; u32 txDmaReadyToSend;
/* The location of the write-back status block */ /* The location of the write-back status block */
PTX_STATUS_BLOCK_t pTxStatusVa; PTX_STATUS_BLOCK_t pTxStatusVa;
......
drivers/staging/et131x/et131x_netdev.c
View file @ 356c74b4
...@@ -648,14 +648,14 @@ void et131x_tx_timeout(struct net_device *netdev) ...@@ -648,14 +648,14 @@ void et131x_tx_timeout(struct net_device *netdev)
*(etdev->TxRing.pTxStatusVa); *(etdev->TxRing.pTxStatusVa);
PTX_DESC_ENTRY_t pDesc = PTX_DESC_ENTRY_t pDesc =
etdev->TxRing.pTxDescRingVa + etdev->TxRing.pTxDescRingVa +
pMpTcb->WrIndex.bits.val; INDEX10(pMpTcb->WrIndex);
#endif #endif
TX_DESC_ENTRY_t StuckDescriptors[10]; TX_DESC_ENTRY_t StuckDescriptors[10];
if (pMpTcb->WrIndex.bits.val > 7) { if (INDEX10(pMpTcb->WrIndex) > 7) {
memcpy(StuckDescriptors, memcpy(StuckDescriptors,
etdev->TxRing.pTxDescRingVa + etdev->TxRing.pTxDescRingVa +
pMpTcb->WrIndex.bits.val - 6, INDEX10(pMpTcb->WrIndex) - 6,
sizeof(TX_DESC_ENTRY_t) * 10); sizeof(TX_DESC_ENTRY_t) * 10);
} }
...@@ -664,7 +664,7 @@ void et131x_tx_timeout(struct net_device *netdev) ...@@ -664,7 +664,7 @@ void et131x_tx_timeout(struct net_device *netdev)
DBG_WARNING(et131x_dbginfo, DBG_WARNING(et131x_dbginfo,
"Send stuck - reset. pMpTcb->WrIndex %x, Flags 0x%08x\n", "Send stuck - reset. pMpTcb->WrIndex %x, Flags 0x%08x\n",
pMpTcb->WrIndex.bits.val, pMpTcb->WrIndex,
pMpTcb->Flags); pMpTcb->Flags);
DBG_WARNING(et131x_dbginfo, DBG_WARNING(et131x_dbginfo,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7