Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67947125 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

Staging: et131x: kill RX_DMA_MAX_PKT_TIME 



Another one bits the dust ...

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 02cdb0b4

drivers/staging/et131x/et1310_address_map.h

+4 −13
Original line number Original line Diff line number Diff line
@@ -356,19 +356,10 @@ typedef union _RXDMA_NUM_PKT_DONE_t { 
/*

/*

 * structure for max packet time reg in rxdma address map

 * structure for max packet time reg in rxdma address map

 * located at address 0x2010

 * 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

 * 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_lo;				/*  0x2004 */

	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 */

	u32 max_pkt_time;				/*  0x2010 */

	u32 rxq_rd_addr;				/*  0x2014 */

	u32 rxq_rd_addr;				/*  0x2014 */

	u32 rxq_rd_addr_ext;			/*  0x2018 */

	u32 rxq_rd_addr_ext;			/*  0x2018 */

	u32 rxq_wr_addr;				/*  0x201C */

	u32 rxq_wr_addr;				/*  0x201C */

drivers/staging/et131x/et1310_rx.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -695,7 +695,7 @@ void ConfigRxDmaRegs(struct et131x_adapter *etdev) 
	 * regardless of whether we have received packets.

	 * regardless of whether we have received packets.

	 * This value gets updated once autoneg is complete.

	 * 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);

	spin_unlock_irqrestore(&etdev->RcvLock, flags);

}

}
@@ -711,7 +711,7 @@ void SetRxDmaTimer(struct et131x_adapter *etdev) 
	 */

	 */

	if ((etdev->linkspeed == TRUEPHY_SPEED_100MBPS) ||

	if ((etdev->linkspeed == TRUEPHY_SPEED_100MBPS) ||

	    (etdev->linkspeed == TRUEPHY_SPEED_10MBPS)) {

	    (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);

		writel(1, &etdev->regs->rxdma.num_pkt_done.value);

	}

	}

}

}