Staging: et131x: Kill MIF_CTL_t (dcb0789b) · Commits · github.com / kvm-riscv / linux

drivers/staging/et131x/et1310_address_map.h

+5 −15

Original line number	Diff line number	Diff line
		@@ -883,21 +883,11 @@ typedef union _RXMAC_UNI_PF_ADDR3_t {
		/*
		* structure for management interface reg in rxmac address map.
		* located at address 0x4098
		*
		* 31-18: reserved
		* 17: drop_pkt_en
		* 16-0: drop_pkt_mask
		*/
		typedef union _RXMAC_MIF_CTL_t {
		u32 value;
		struct {
		#ifdef _BIT_FIELDS_HTOL
		u32 reserve:14; /* bits 18-31 */
		u32 drop_pkt_en:1; /* bit 17 */
		u32 drop_pkt_mask:17; /* bits 0-16 */
		#else
		u32 drop_pkt_mask:17; /* bits 0-16 */
		u32 drop_pkt_en:1; /* bit 17 */
		u32 reserve:14; /* bits 18-31 */
		#endif
		} bits;
		} RXMAC_MIF_CTL_t, *PRXMAC_MIF_CTL_t;

		/*
		* structure for Error reg in rxmac address map.
		@@ -965,7 +955,7 @@ typedef struct _RXMAC_t { /* Location: */
		u32 rxq_diag; /* 0x4090 */
		u32 space_avail; /* 0x4094 */

		RXMAC_MIF_CTL_t mif_ctrl; /* 0x4098 */
		u32 mif_ctrl; /* 0x4098 */
		RXMAC_ERROR_REG_t err_reg; /* 0x409C */
		} RXMAC_t, *PRXMAC_t;

+3 −3

Original line number	Diff line number	Diff line
		@@ -333,7 +333,7 @@ void ConfigRxMacRegs(struct et131x_adapter *etdev)
		writel(0, &pRxMac->mcif_water_mark);

		/* Initialize the MIF control */
		writel(0, &pRxMac->mif_ctrl.value);
		writel(0, &pRxMac->mif_ctrl);

		/* Initialize the Space Available Register */
		writel(0, &pRxMac->space_avail);
		@@ -352,9 +352,9 @@ void ConfigRxMacRegs(struct et131x_adapter *etdev)
		* bit 17: Drop packet enable
		*/
		if (etdev->linkspeed == TRUEPHY_SPEED_100MBPS)
		writel(0x30038, &pRxMac->mif_ctrl.value);
		writel(0x30038, &pRxMac->mif_ctrl);
		else
		writel(0x30030, &pRxMac->mif_ctrl.value);
		writel(0x30030, &pRxMac->mif_ctrl);

		/* Finally we initialize RxMac to be enabled & WOL disabled. Packet
		* filter is always enabled since it is where the runt packets are