b43: Fix upload of beacon packets to the hardware (e66fee6a) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/net/wireless/b43/b43.h

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -651,6 +651,12 @@ struct b43_wl {
	u8 nr_devs;		u8 nr_devs;

	bool radiotap_enabled;		bool radiotap_enabled;

			/* The beacon we are currently using (AP or IBSS mode).
			* This beacon stuff is protected by the irq_lock. */
			struct sk_buff *current_beacon;
			bool beacon0_uploaded;
			bool beacon1_uploaded;
	};		};

	/* Pointers to the firmware data and meta information about it. */		/* Pointers to the firmware data and meta information about it. */
	@@ -745,9 +751,6 @@ struct b43_wldev {
	u8 max_nr_keys;		u8 max_nr_keys;
	struct b43_key key[58];		struct b43_key key[58];

	/* Cached beacon template while uploading the template. */
	struct sk_buff *cached_beacon;

	/* Firmware data */		/* Firmware data */
	struct b43_firmware fw;		struct b43_firmware fw;

drivers/net/wireless/b43/main.c

+145 −77

Original line number	Original line	Diff line number	Diff line
	@@ -1148,15 +1148,58 @@ static void b43_write_beacon_template(struct b43_wldev *dev,
	u16 ram_offset,		u16 ram_offset,
	u16 shm_size_offset, u8 rate)		u16 shm_size_offset, u8 rate)
	{		{
	int len;		int i, len;
	const u8 *data;		const struct ieee80211_mgmt *bcn;
			const u8 *ie;
			bool tim_found = 0;

	B43_WARN_ON(!dev->cached_beacon);		bcn = (const struct ieee80211_mgmt *)(dev->wl->current_beacon->data);
	len = min((size_t) dev->cached_beacon->len,		len = min((size_t) dev->wl->current_beacon->len,
	0x200 - sizeof(struct b43_plcp_hdr6));		0x200 - sizeof(struct b43_plcp_hdr6));
	data = (const u8 *)(dev->cached_beacon->data);
	b43_write_template_common(dev, data,		b43_write_template_common(dev, (const u8 *)bcn,
	len, ram_offset, shm_size_offset, rate);		len, ram_offset, shm_size_offset, rate);

			/* Find the position of the TIM and the DTIM_period value
			* and write them to SHM. */
			ie = bcn->u.beacon.variable;
			for (i = 0; i < len - 2; ) {
			uint8_t ie_id, ie_len;

			ie_id = ie[i];
			ie_len = ie[i + 1];
			if (ie_id == 5) {
			u16 tim_position;
			u16 dtim_period;
			/* This is the TIM Information Element */

			/* Check whether the ie_len is in the beacon data range. */
			if (len < ie_len + 2 + i)
			break;
			/* A valid TIM is at least 4 bytes long. */
			if (ie_len < 4)
			break;
			tim_found = 1;

			tim_position = sizeof(struct b43_plcp_hdr6);
			tim_position += offsetof(struct ieee80211_mgmt, u.beacon.variable);
			tim_position += i;

			dtim_period = ie[i + 3];

			b43_shm_write16(dev, B43_SHM_SHARED,
			B43_SHM_SH_TIMBPOS, tim_position);
			b43_shm_write16(dev, B43_SHM_SHARED,
			B43_SHM_SH_DTIMPER, dtim_period);
			break;
			}
			i += ie_len + 2;
			}
			if (!tim_found) {
			b43warn(dev->wl, "Did not find a valid TIM IE in "
			"the beacon template packet. AP or IBSS operation "
			"may be broken.\n");
			}
	}		}

	static void b43_write_probe_resp_plcp(struct b43_wldev *dev,		static void b43_write_probe_resp_plcp(struct b43_wldev *dev,
	@@ -1184,7 +1227,7 @@ static void b43_write_probe_resp_plcp(struct b43_wldev *dev,
	* 2) Patching duration field		* 2) Patching duration field
	* 3) Stripping TIM		* 3) Stripping TIM
	*/		*/
	static u8 b43_generate_probe_resp(struct b43_wldev dev,		static const u8 * b43_generate_probe_resp(struct b43_wldev *dev,
	u16 *dest_size, u8 rate)		u16 *dest_size, u8 rate)
	{		{
	const u8 *src_data;		const u8 *src_data;
	@@ -1192,33 +1235,36 @@ static u8 b43_generate_probe_resp(struct b43_wldev dev,
	u16 src_size, elem_size, src_pos, dest_pos;		u16 src_size, elem_size, src_pos, dest_pos;
	__le16 dur;		__le16 dur;
	struct ieee80211_hdr *hdr;		struct ieee80211_hdr *hdr;
			size_t ie_start;

			src_size = dev->wl->current_beacon->len;
			src_data = (const u8 *)dev->wl->current_beacon->data;

	B43_WARN_ON(!dev->cached_beacon);		/* Get the start offset of the variable IEs in the packet. */
	src_size = dev->cached_beacon->len;		ie_start = offsetof(struct ieee80211_mgmt, u.probe_resp.variable);
	src_data = (const u8 *)dev->cached_beacon->data;		B43_WARN_ON(ie_start != offsetof(struct ieee80211_mgmt, u.beacon.variable));

	if (unlikely(src_size < 0x24)) {		if (B43_WARN_ON(src_size < ie_start))
	b43dbg(dev->wl, "b43_generate_probe_resp: " "invalid beacon\n");
	return NULL;		return NULL;
	}

	dest_data = kmalloc(src_size, GFP_ATOMIC);		dest_data = kmalloc(src_size, GFP_ATOMIC);
	if (unlikely(!dest_data))		if (unlikely(!dest_data))
	return NULL;		return NULL;

	/* 0x24 is offset of first variable-len Information-Element		/* Copy the static data and all Information Elements, except the TIM. */
	* in beacon frame.		memcpy(dest_data, src_data, ie_start);
	*/		src_pos = ie_start;
	memcpy(dest_data, src_data, 0x24);		dest_pos = ie_start;
	src_pos = dest_pos = 0x24;
	for ( ; src_pos < src_size - 2; src_pos += elem_size) {		for ( ; src_pos < src_size - 2; src_pos += elem_size) {
	elem_size = src_data[src_pos + 1] + 2;		elem_size = src_data[src_pos + 1] + 2;
	if (src_data[src_pos] != 0x05) { /* TIM */		if (src_data[src_pos] == 5) {
			/* This is the TIM. */
			continue;
			}
	memcpy(dest_data + dest_pos, src_data + src_pos,		memcpy(dest_data + dest_pos, src_data + src_pos,
	elem_size);		elem_size);
	dest_pos += elem_size;		dest_pos += elem_size;
	}		}
	}
	*dest_size = dest_pos;		*dest_size = dest_pos;
	hdr = (struct ieee80211_hdr *)dest_data;		hdr = (struct ieee80211_hdr *)dest_data;

	@@ -1237,11 +1283,10 @@ static void b43_write_probe_resp_template(struct b43_wldev *dev,
	u16 ram_offset,		u16 ram_offset,
	u16 shm_size_offset, u8 rate)		u16 shm_size_offset, u8 rate)
	{		{
	u8 *probe_resp_data;		const u8 *probe_resp_data;
	u16 size;		u16 size;

	B43_WARN_ON(!dev->cached_beacon);		size = dev->wl->current_beacon->len;
	size = dev->cached_beacon->len;
	probe_resp_data = b43_generate_probe_resp(dev, &size, rate);		probe_resp_data = b43_generate_probe_resp(dev, &size, rate);
	if (unlikely(!probe_resp_data))		if (unlikely(!probe_resp_data))
	return;		return;
	@@ -1260,39 +1305,26 @@ static void b43_write_probe_resp_template(struct b43_wldev *dev,
	kfree(probe_resp_data);		kfree(probe_resp_data);
	}		}

	static int b43_refresh_cached_beacon(struct b43_wldev *dev,		/* Asynchronously update the packet templates in template RAM. */
	struct sk_buff *beacon)		static void b43_update_templates(struct b43_wl wl, struct sk_buff beacon)
	{
	if (dev->cached_beacon)
	kfree_skb(dev->cached_beacon);
	dev->cached_beacon = beacon;

	return 0;
	}

	static void b43_update_templates(struct b43_wldev *dev)
	{		{
	u32 cmd;		unsigned long flags;

	B43_WARN_ON(!dev->cached_beacon);

	b43_write_beacon_template(dev, 0x68, 0x18, B43_CCK_RATE_1MB);		/* This is the top half of the ansynchronous beacon update.
	b43_write_beacon_template(dev, 0x468, 0x1A, B43_CCK_RATE_1MB);		* The bottom half is the beacon IRQ.
	b43_write_probe_resp_template(dev, 0x268, 0x4A, B43_CCK_RATE_11MB);		* Beacon update must be asynchronous to avoid sending an
			* invalid beacon. This can happen for example, if the firmware
			* transmits a beacon while we are updating it. */

	cmd = b43_read32(dev, B43_MMIO_MACCMD);		spin_lock_irqsave(&wl->irq_lock, flags);
	cmd \|= B43_MACCMD_BEACON0_VALID \| B43_MACCMD_BEACON1_VALID;
	b43_write32(dev, B43_MMIO_MACCMD, cmd);
	}

	static void b43_refresh_templates(struct b43_wldev dev, struct sk_buff beacon)		if (wl->current_beacon)
	{		dev_kfree_skb_any(wl->current_beacon);
	int err;		wl->current_beacon = beacon;
			wl->beacon0_uploaded = 0;
			wl->beacon1_uploaded = 0;

	err = b43_refresh_cached_beacon(dev, beacon);		spin_unlock_irqrestore(&wl->irq_lock, flags);
	if (unlikely(err))
	return;
	b43_update_templates(dev);
	}		}

	static void b43_set_ssid(struct b43_wldev dev, const u8 ssid, u8 ssid_len)		static void b43_set_ssid(struct b43_wldev dev, const u8 ssid, u8 ssid_len)
	@@ -1328,33 +1360,34 @@ static void b43_set_beacon_int(struct b43_wldev *dev, u16 beacon_int)

	static void handle_irq_beacon(struct b43_wldev *dev)		static void handle_irq_beacon(struct b43_wldev *dev)
	{		{
	u32 status;		struct b43_wl *wl = dev->wl;
			u32 cmd;

	if (!b43_is_mode(dev->wl, IEEE80211_IF_TYPE_AP))		if (!b43_is_mode(wl, IEEE80211_IF_TYPE_AP))
	return;		return;

	dev->irq_savedstate &= ~B43_IRQ_BEACON;		/* This is the bottom half of the asynchronous beacon update. */
	status = b43_read32(dev, B43_MMIO_MACCMD);

	if (!dev->cached_beacon \|\| ((status & 0x1) && (status & 0x2))) {		cmd = b43_read32(dev, B43_MMIO_MACCMD);
	/* ACK beacon IRQ. */		if (!(cmd & B43_MACCMD_BEACON0_VALID)) {
	b43_write32(dev, B43_MMIO_GEN_IRQ_REASON, B43_IRQ_BEACON);		if (!wl->beacon0_uploaded) {
	dev->irq_savedstate \|= B43_IRQ_BEACON;		b43_write_beacon_template(dev, 0x68, 0x18,
	if (dev->cached_beacon)		B43_CCK_RATE_1MB);
	kfree_skb(dev->cached_beacon);		b43_write_probe_resp_template(dev, 0x268, 0x4A,
	dev->cached_beacon = NULL;		B43_CCK_RATE_11MB);
	return;		wl->beacon0_uploaded = 1;
	}		}
	if (!(status & 0x1)) {		cmd \|= B43_MACCMD_BEACON0_VALID;
	b43_write_beacon_template(dev, 0x68, 0x18, B43_CCK_RATE_1MB);
	status \|= 0x1;
	b43_write32(dev, B43_MMIO_MACCMD, status);
	}		}
	if (!(status & 0x2)) {		if (!(cmd & B43_MACCMD_BEACON1_VALID)) {
	b43_write_beacon_template(dev, 0x468, 0x1A, B43_CCK_RATE_1MB);		if (!wl->beacon1_uploaded) {
	status \|= 0x2;		b43_write_beacon_template(dev, 0x468, 0x1A,
	b43_write32(dev, B43_MMIO_MACCMD, status);		B43_CCK_RATE_1MB);
			wl->beacon1_uploaded = 1;
	}		}
			cmd \|= B43_MACCMD_BEACON1_VALID;
			}
			b43_write32(dev, B43_MMIO_MACCMD, cmd);
	}		}

	static void handle_irq_ucode_debug(struct b43_wldev *dev)		static void handle_irq_ucode_debug(struct b43_wldev *dev)
	@@ -2949,7 +2982,7 @@ static int b43_op_config_interface(struct ieee80211_hw *hw,
	B43_WARN_ON(conf->type != IEEE80211_IF_TYPE_AP);		B43_WARN_ON(conf->type != IEEE80211_IF_TYPE_AP);
	b43_set_ssid(dev, conf->ssid, conf->ssid_len);		b43_set_ssid(dev, conf->ssid, conf->ssid_len);
	if (conf->beacon)		if (conf->beacon)
	b43_refresh_templates(dev, conf->beacon);		b43_update_templates(wl, conf->beacon);
	}		}
	b43_write_mac_bssid_templates(dev);		b43_write_mac_bssid_templates(dev);
	}		}
	@@ -3295,6 +3328,11 @@ static void b43_wireless_core_exit(struct b43_wldev *dev)
	kfree(phy->tssi2dbm);		kfree(phy->tssi2dbm);
	kfree(phy->lo_control);		kfree(phy->lo_control);
	phy->lo_control = NULL;		phy->lo_control = NULL;
			if (dev->wl->current_beacon) {
			dev_kfree_skb_any(dev->wl->current_beacon);
			dev->wl->current_beacon = NULL;
			}

	ssb_device_disable(dev->dev, 0);		ssb_device_disable(dev->dev, 0);
	ssb_bus_may_powerdown(dev->dev->bus);		ssb_bus_may_powerdown(dev->dev->bus);
	}		}
	@@ -3556,6 +3594,34 @@ static int b43_op_set_retry_limit(struct ieee80211_hw *hw,
	return err;		return err;
	}		}

			static int b43_op_beacon_set_tim(struct ieee80211_hw *hw, int aid, int set)
			{
			struct b43_wl *wl = hw_to_b43_wl(hw);
			struct sk_buff *beacon;

			/* We could modify the existing beacon and set the aid bit in
			* the TIM field, but that would probably require resizing and
			* moving of data within the beacon template.
			* Simply request a new beacon and let mac80211 do the hard work. */
			beacon = ieee80211_beacon_get(hw, wl->vif, NULL);
			if (unlikely(!beacon))
			return -ENOMEM;
			b43_update_templates(wl, beacon);

			return 0;
			}

			static int b43_op_ibss_beacon_update(struct ieee80211_hw *hw,
			struct sk_buff *beacon,
			struct ieee80211_tx_control *ctl)
			{
			struct b43_wl *wl = hw_to_b43_wl(hw);

			b43_update_templates(wl, beacon);

			return 0;
			}

	static const struct ieee80211_ops b43_hw_ops = {		static const struct ieee80211_ops b43_hw_ops = {
	.tx = b43_op_tx,		.tx = b43_op_tx,
	.conf_tx = b43_op_conf_tx,		.conf_tx = b43_op_conf_tx,
	@@ -3570,6 +3636,8 @@ static const struct ieee80211_ops b43_hw_ops = {
	.start = b43_op_start,		.start = b43_op_start,
	.stop = b43_op_stop,		.stop = b43_op_stop,
	.set_retry_limit = b43_op_set_retry_limit,		.set_retry_limit = b43_op_set_retry_limit,
			.set_tim = b43_op_beacon_set_tim,
			.beacon_update = b43_op_ibss_beacon_update,
	};		};

	/* Hard-reset the chip. Do not call this directly.		/* Hard-reset the chip. Do not call this directly.