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

Commit 5c895691 authored by Christian Lamparter's avatar Christian Lamparter Committed by John W. Linville
Browse files

carl9170: support firmware-based rx filter 



The hardware rx-filter was essentially disabled, because
of a serve, yet unidentifiable problem with iwlagn.
Due to these circumstances the driver and mac80211 were
left with the job of filtering.

This is very unfortunate and has proven to be expensive
in terms of latency, memory and load.

Therefore the new 1.8.8.3 firmware introduces a flexible
filtering infrastructure which allows the driver to
offload some of the checks (FCS & PLCP crc check,
RA match, control frame filter, etc...) whenever possible.

Note:
This patch also includes all changes to the
shared headers files since the inclusion.

Signed-off-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 85416a4f

drivers/net/wireless/ath/carl9170/carl9170.h

+2 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ struct ar9170 { 
		unsigned int beacon_max_len;

		bool rx_stream;

		bool tx_stream;

		bool rx_filter;

		unsigned int mem_blocks;

		unsigned int mem_block_size;

		unsigned int rx_size;
@@ -314,6 +315,7 @@ struct ar9170 { 
	u64 cur_mc_hash;

	u32 cur_filter;

	unsigned int filter_state;

	unsigned int rx_filter_caps;

	bool sniffer_enabled;



	/* MAC */

drivers/net/wireless/ath/carl9170/cmd.h

+10 −0
Original line number Diff line number Diff line
@@ -59,6 +59,16 @@ static inline int carl9170_flush_cab(struct ar9170 *ar, 
	return carl9170_bcn_ctrl(ar, vif_id, CARL9170_BCN_CTRL_DRAIN, 0, 0);

}



static inline int carl9170_rx_filter(struct ar9170 *ar,

				     const unsigned int _rx_filter)

{

	__le32 rx_filter = cpu_to_le32(_rx_filter);



	return carl9170_exec_cmd(ar, CARL9170_CMD_RX_FILTER,

				sizeof(rx_filter), (u8 *)&rx_filter,

				0, NULL);

}



struct carl9170_cmd *carl9170_cmd_buf(struct ar9170 *ar,

	const enum carl9170_cmd_oids cmd, const unsigned int len);

drivers/net/wireless/ath/carl9170/fw.c

+7 −0
Original line number Diff line number Diff line
@@ -257,6 +257,13 @@ static int carl9170_fw(struct ar9170 *ar, const __u8 *data, size_t len) 
	if (SUPP(CARL9170FW_USB_UP_STREAM))

		ar->fw.rx_stream = true;



	if (SUPP(CARL9170FW_RX_FILTER)) {

		ar->fw.rx_filter = true;

		ar->rx_filter_caps = FIF_FCSFAIL | FIF_PLCPFAIL |

			FIF_CONTROL | FIF_PSPOLL | FIF_OTHER_BSS |

			FIF_PROMISC_IN_BSS;

	}



	ar->fw.vif_num = otus_desc->vif_num;

	ar->fw.cmd_bufs = otus_desc->cmd_bufs;

	ar->fw.address = le32_to_cpu(otus_desc->fw_address);

drivers/net/wireless/ath/carl9170/fwcmd.h

+16 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ enum carl9170_cmd_oids { 
	CARL9170_CMD_REBOOT		= 0x04,

	CARL9170_CMD_BCN_CTRL		= 0x05,

	CARL9170_CMD_READ_TSF		= 0x06,

	CARL9170_CMD_RX_FILTER		= 0x07,



	/* CAM */

	CARL9170_CMD_EKEY		= 0x10,
@@ -153,6 +154,20 @@ struct carl9170_psm { 
} __packed;

#define CARL9170_PSM_SIZE		4



struct carl9170_rx_filter_cmd {

	__le32		rx_filter;

} __packed;

#define CARL9170_RX_FILTER_CMD_SIZE	4



#define CARL9170_RX_FILTER_BAD		0x01

#define CARL9170_RX_FILTER_OTHER_RA	0x02

#define CARL9170_RX_FILTER_DECRY_FAIL	0x04

#define CARL9170_RX_FILTER_CTL_OTHER	0x08

#define CARL9170_RX_FILTER_CTL_PSPOLL	0x10

#define CARL9170_RX_FILTER_CTL_BACKR	0x20

#define CARL9170_RX_FILTER_MGMT		0x40

#define CARL9170_RX_FILTER_DATA		0x80



struct carl9170_bcn_ctrl_cmd {

	__le32		vif_id;

	__le32		mode;
@@ -188,6 +203,7 @@ struct carl9170_cmd { 
		struct carl9170_rf_init		rf_init;

		struct carl9170_psm		psm;

		struct carl9170_bcn_ctrl_cmd	bcn_ctrl;

		struct carl9170_rx_filter_cmd	rx_filter;

		u8 data[CARL9170_MAX_CMD_PAYLOAD_LEN];

	} __packed;

} __packed;

drivers/net/wireless/ath/carl9170/fwdesc.h

+5 −1
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ enum carl9170fw_feature_list { 
	/* Firmware PSM support | CARL9170_CMD_PSM */

	CARL9170FW_PSM,



	/* Firmware RX filter | CARL9170_CMD_RX_FILTER */

	CARL9170FW_RX_FILTER,



	/* KEEP LAST */

	__CARL9170FW_FEATURE_NUM

};
@@ -142,7 +145,7 @@ struct carl9170fw_fix_desc { 
	(sizeof(struct carl9170fw_fix_desc))



#define CARL9170FW_DBG_DESC_MIN_VER			1

#define CARL9170FW_DBG_DESC_CUR_VER			2

#define CARL9170FW_DBG_DESC_CUR_VER			3

struct carl9170fw_dbg_desc {

	struct carl9170fw_desc_head head;
@@ -150,6 +153,7 @@ struct carl9170fw_dbg_desc { 
	__le32 counter_addr;

	__le32 rx_total_addr;

	__le32 rx_overrun_addr;

	__le32 rx_filter;



	/* Put your debugging definitions here */

} __packed;