UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Staging: et131x: kill RX_DMA_MAX_PKT_TIME 

Another one bits the dust ...

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox 2009-11-18 14:07:41 +00:00 committed by Greg Kroah-Hartman
parent 02cdb0b427
commit 6794712519
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/staging/et131x/et1310_address_map.h
View File

@ -356,19 +356,10 @@ typedef union _RXDMA_NUM_PKT_DONE_t {
/*
* structure for max packet time reg in rxdma address map
* located at address 0x2010
*
* 31-18: unused
* 17-0: time done
*/
typedef union _RXDMA_MAX_PKT_TIME_t {
u32 value;
struct {
#ifdef _BIT_FIELDS_HTOL
u32 unused:14; /* bits 18-31 */
u32 time_done:18; /* bits 0-17 */
#else
u32 time_done:18; /* bits 0-17 */
u32 unused:14; /* bits 18-31 */
#endif
} bits;
} RXDMA_MAX_PKT_TIME_t, *PRXDMA_MAX_PKT_TIME_t;
/*
* structure for rx queue read address reg in rxdma address map
@ -609,7 +600,7 @@ typedef struct _RXDMA_t { /* Location: */
u32 dma_wb_base_lo; /* 0x2004 */
u32 dma_wb_base_hi; /* 0x2008 */
RXDMA_NUM_PKT_DONE_t num_pkt_done; /* 0x200C */
RXDMA_MAX_PKT_TIME_t max_pkt_time; /* 0x2010 */
u32 max_pkt_time; /* 0x2010 */
u32 rxq_rd_addr; /* 0x2014 */
u32 rxq_rd_addr_ext; /* 0x2018 */
u32 rxq_wr_addr; /* 0x201C */

4
drivers/staging/et131x/et1310_rx.c
View File

@ -695,7 +695,7 @@ void ConfigRxDmaRegs(struct et131x_adapter *etdev)
* regardless of whether we have received packets.
* This value gets updated once autoneg is complete.
*/
writel(PARM_RX_TIME_INT_DEF, &rx_dma->max_pkt_time.value);
writel(PARM_RX_TIME_INT_DEF, &rx_dma->max_pkt_time);
spin_unlock_irqrestore(&etdev->RcvLock, flags);
}
@ -711,7 +711,7 @@ void SetRxDmaTimer(struct et131x_adapter *etdev)
*/
if ((etdev->linkspeed == TRUEPHY_SPEED_100MBPS) ||
(etdev->linkspeed == TRUEPHY_SPEED_10MBPS)) {
writel(0, &etdev->regs->rxdma.max_pkt_time.value);
writel(0, &etdev->regs->rxdma.max_pkt_time);
writel(1, &etdev->regs->rxdma.num_pkt_done.value);
}
}