Merge branch 'wl12xx-next' into for-linville (5b37649b) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/net/wireless/ti/wl1251/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		menuconfig WL1251
		tristate "TI wl1251 driver support"
		depends on MAC80211 && EXPERIMENTAL && GENERIC_HARDIRQS
		depends on MAC80211 && GENERIC_HARDIRQS
		select FW_LOADER
		select CRC7
		---help---

drivers/net/wireless/ti/wl12xx/Makefile

+1 −1

Original line number	Diff line number	Diff line
		wl12xx-objs = main.o cmd.o acx.o debugfs.o
		wl12xx-objs = main.o cmd.o acx.o debugfs.o scan.o event.o

		obj-$(CONFIG_WL12XX) += wl12xx.o

drivers/net/wireless/ti/wl12xx/cmd.c

+37 −0

Original line number	Diff line number	Diff line
		@@ -284,3 +284,40 @@ int wl128x_cmd_radio_parms(struct wl1271 *wl)
		kfree(radio_parms);
		return ret;
		}

		int wl12xx_cmd_channel_switch(struct wl1271 *wl,
		struct wl12xx_vif *wlvif,
		struct ieee80211_channel_switch *ch_switch)
		{
		struct wl12xx_cmd_channel_switch *cmd;
		int ret;

		wl1271_debug(DEBUG_ACX, "cmd channel switch");

		cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
		if (!cmd) {
		ret = -ENOMEM;
		goto out;
		}

		cmd->role_id = wlvif->role_id;
		cmd->channel = ch_switch->channel->hw_value;
		cmd->switch_time = ch_switch->count;
		cmd->stop_tx = ch_switch->block_tx;

		/* FIXME: control from mac80211 in the future */
		/* Enable TX on the target channel */
		cmd->post_switch_tx_disable = 0;

		ret = wl1271_cmd_send(wl, CMD_CHANNEL_SWITCH, cmd, sizeof(*cmd), 0);
		if (ret < 0) {
		wl1271_error("failed to send channel switch command");
		goto out_free;
		}

		out_free:
		kfree(cmd);

		out:
		return ret;
		}

drivers/net/wireless/ti/wl12xx/cmd.h

+20 −0

Original line number	Diff line number	Diff line
		@@ -103,10 +103,30 @@ struct wl1271_ext_radio_parms_cmd {
		u8 padding[3];
		} __packed;

		struct wl12xx_cmd_channel_switch {
		struct wl1271_cmd_header header;

		u8 role_id;

		/* The new serving channel */
		u8 channel;
		/* Relative time of the serving channel switch in TBTT units */
		u8 switch_time;
		/* Stop the role TX, should expect it after radar detection */
		u8 stop_tx;
		/* The target channel tx status 1-stopped 0-open*/
		u8 post_switch_tx_disable;

		u8 padding[3];
		} __packed;

		int wl1271_cmd_general_parms(struct wl1271 *wl);
		int wl128x_cmd_general_parms(struct wl1271 *wl);
		int wl1271_cmd_radio_parms(struct wl1271 *wl);
		int wl128x_cmd_radio_parms(struct wl1271 *wl);
		int wl1271_cmd_ext_radio_parms(struct wl1271 *wl);
		int wl12xx_cmd_channel_switch(struct wl1271 *wl,
		struct wl12xx_vif *wlvif,
		struct ieee80211_channel_switch *ch_switch);

		#endif /* __WL12XX_CMD_H__ */

drivers/net/wireless/ti/wl12xx/event.c

0 → 100644

+116 −0

Original line number	Diff line number	Diff line
		/*
		* This file is part of wl12xx
		*
		* Copyright (C) 2012 Texas Instruments. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public License
		* version 2 as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful, but
		* WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
		* 02110-1301 USA
		*
		*/

		#include "event.h"
		#include "scan.h"
		#include "../wlcore/cmd.h"
		#include "../wlcore/debug.h"

		int wl12xx_wait_for_event(struct wl1271 *wl, enum wlcore_wait_event event,
		bool *timeout)
		{
		u32 local_event;

		switch (event) {
		case WLCORE_EVENT_ROLE_STOP_COMPLETE:
		local_event = ROLE_STOP_COMPLETE_EVENT_ID;
		break;

		case WLCORE_EVENT_PEER_REMOVE_COMPLETE:
		local_event = PEER_REMOVE_COMPLETE_EVENT_ID;
		break;

		default:
		/* event not implemented */
		return 0;
		}
		return wlcore_cmd_wait_for_event_or_timeout(wl, local_event, timeout);
		}

		int wl12xx_process_mailbox_events(struct wl1271 *wl)
		{
		struct wl12xx_event_mailbox *mbox = wl->mbox;
		u32 vector;


		vector = le32_to_cpu(mbox->events_vector);
		vector &= ~(le32_to_cpu(mbox->events_mask));

		wl1271_debug(DEBUG_EVENT, "MBOX vector: 0x%x", vector);

		if (vector & SCAN_COMPLETE_EVENT_ID) {
		wl1271_debug(DEBUG_EVENT, "status: 0x%x",
		mbox->scheduled_scan_status);

		if (wl->scan_wlvif)
		wl12xx_scan_completed(wl, wl->scan_wlvif);
		}

		if (vector & PERIODIC_SCAN_REPORT_EVENT_ID) {
		wl1271_debug(DEBUG_EVENT,
		"PERIODIC_SCAN_REPORT_EVENT (status 0x%0x)",
		mbox->scheduled_scan_status);

		wlcore_scan_sched_scan_results(wl);
		}

		if (vector & PERIODIC_SCAN_COMPLETE_EVENT_ID)
		wlcore_event_sched_scan_completed(wl,
		mbox->scheduled_scan_status);
		if (vector & SOFT_GEMINI_SENSE_EVENT_ID)
		wlcore_event_soft_gemini_sense(wl,
		mbox->soft_gemini_sense_info);

		if (vector & BSS_LOSE_EVENT_ID)
		wlcore_event_beacon_loss(wl, 0xff);

		if (vector & RSSI_SNR_TRIGGER_0_EVENT_ID)
		wlcore_event_rssi_trigger(wl, mbox->rssi_snr_trigger_metric);

		if (vector & BA_SESSION_RX_CONSTRAINT_EVENT_ID)
		wlcore_event_ba_rx_constraint(wl,
		BIT(mbox->role_id),
		mbox->rx_ba_allowed);

		if (vector & CHANNEL_SWITCH_COMPLETE_EVENT_ID)
		wlcore_event_channel_switch(wl, 0xff,
		mbox->channel_switch_status);

		if (vector & DUMMY_PACKET_EVENT_ID)
		wlcore_event_dummy_packet(wl);

		/*
		* "TX retries exceeded" has a different meaning according to mode.
		* In AP mode the offending station is disconnected.
		*/
		if (vector & MAX_TX_RETRY_EVENT_ID)
		wlcore_event_max_tx_failure(wl,
		le16_to_cpu(mbox->sta_tx_retry_exceeded));

		if (vector & INACTIVE_STA_EVENT_ID)
		wlcore_event_inactive_sta(wl,
		le16_to_cpu(mbox->sta_aging_status));

		if (vector & REMAIN_ON_CHANNEL_COMPLETE_EVENT_ID)
		wlcore_event_roc_complete(wl);

		return 0;
		}