net-next: vmxnet3 fixes [2/5] Interrupt control bitmap (6929fe8a) · Commits · 戴 / test

drivers/net/vmxnet3/vmxnet3_defs.h

+5 −1

Original line number	Diff line number	Diff line
		@@ -464,6 +464,9 @@ enum vmxnet3_intr_type {
		/* addition 1 for events */
		#define VMXNET3_MAX_INTRS 25

		/* value of intrCtrl */
		#define VMXNET3_IC_DISABLE_ALL 0x1 /* bit 0 */


		struct Vmxnet3_IntrConf {
		bool autoMask;
		@@ -471,7 +474,8 @@ struct Vmxnet3_IntrConf {
		u8 eventIntrIdx;
		u8 modLevels[VMXNET3_MAX_INTRS]; /* moderation level for
		* each intr */
		__le32 reserved[3];
		__le32 intrCtrl;
		__le32 reserved[2];
		};

		/* one bit per VLAN ID, the size is in the units of u32 */

+5 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,8 @@ vmxnet3_enable_all_intrs(struct vmxnet3_adapter *adapter)

		for (i = 0; i < adapter->intr.num_intrs; i++)
		vmxnet3_enable_intr(adapter, i);
		adapter->shared->devRead.intrConf.intrCtrl &=
		cpu_to_le32(~VMXNET3_IC_DISABLE_ALL);
		}


		@@ -80,6 +82,8 @@ vmxnet3_disable_all_intrs(struct vmxnet3_adapter *adapter)
		{
		int i;

		adapter->shared->devRead.intrConf.intrCtrl \|=
		cpu_to_le32(VMXNET3_IC_DISABLE_ALL);
		for (i = 0; i < adapter->intr.num_intrs; i++)
		vmxnet3_disable_intr(adapter, i);
		}
		@@ -1825,6 +1829,7 @@ vmxnet3_setup_driver_shared(struct vmxnet3_adapter *adapter)
		devRead->intrConf.modLevels[i] = adapter->intr.mod_levels[i];

		devRead->intrConf.eventIntrIdx = adapter->intr.event_intr_idx;
		devRead->intrConf.intrCtrl \|= cpu_to_le32(VMXNET3_IC_DISABLE_ALL);

		/* rx filter settings */
		devRead->rxFilterConf.rxMode = 0;