Merge "wil6210: add sysfs for thermal throttling configuration" (f695a5d7) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/net/wireless/ath/wil6210/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ wil6210-y += netdev.o
		wil6210-y += cfg80211.o
		wil6210-y += pcie_bus.o
		wil6210-$(CONFIG_WIL6210_DEBUGFS) += debugfs.o
		wil6210-y += sysfs.o
		wil6210-y += wmi.o
		wil6210-y += interrupt.o
		wil6210-y += txrx.o
		@@ -20,6 +21,7 @@ wil6210-y += wil_platform.o
		wil6210-y += ethtool.o
		wil6210-y += wil_crash_dump.o
		wil6210-y += p2p.o
		wil6210-y += ftm.o

		# for tracing framework to find trace.h
		CFLAGS_trace.o := -I$(src)

drivers/net/wireless/ath/wil6210/cfg80211.c

+73 −13

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: ISC
		/*
		* Copyright (c) 2012-2017 Qualcomm Atheros, Inc.
		* Copyright (c) 2018, The Linux Foundation. All rights reserved.
		*
		* Permission to use, copy, modify, and/or distribute this software for any
		* purpose with or without fee is hereby granted, provided that the above
		* copyright notice and this permission notice appear in all copies.
		*
		* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
		* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
		* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
		* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
		* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
		* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
		* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
		* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
		*/

		#include <linux/etherdevice.h>
		@@ -21,6 +10,7 @@
		#include <net/cfg80211.h>
		#include "wil6210.h"
		#include "wmi.h"
		#include "ftm.h"
		#include "fw.h"

		#define WIL_MAX_ROC_DURATION_MS 5000
		@@ -118,6 +108,15 @@ nla_policy wil_rf_sector_cfg_policy[QCA_ATTR_DMG_RF_SECTOR_CFG_MAX + 1] = {
		};

		enum qca_nl80211_vendor_subcmds {
		QCA_NL80211_VENDOR_SUBCMD_LOC_GET_CAPA = 128,
		QCA_NL80211_VENDOR_SUBCMD_FTM_START_SESSION = 129,
		QCA_NL80211_VENDOR_SUBCMD_FTM_ABORT_SESSION = 130,
		QCA_NL80211_VENDOR_SUBCMD_FTM_MEAS_RESULT = 131,
		QCA_NL80211_VENDOR_SUBCMD_FTM_SESSION_DONE = 132,
		QCA_NL80211_VENDOR_SUBCMD_FTM_CFG_RESPONDER = 133,
		QCA_NL80211_VENDOR_SUBCMD_AOA_MEAS = 134,
		QCA_NL80211_VENDOR_SUBCMD_AOA_ABORT_MEAS = 135,
		QCA_NL80211_VENDOR_SUBCMD_AOA_MEAS_RESULT = 136,
		QCA_NL80211_VENDOR_SUBCMD_DMG_RF_GET_SECTOR_CFG = 139,
		QCA_NL80211_VENDOR_SUBCMD_DMG_RF_SET_SECTOR_CFG = 140,
		QCA_NL80211_VENDOR_SUBCMD_DMG_RF_GET_SELECTED_SECTOR = 141,
		@@ -139,6 +138,48 @@ static int wil_rf_sector_set_selected(struct wiphy *wiphy,

		/* vendor specific commands */
		static const struct wiphy_vendor_command wil_nl80211_vendor_commands[] = {
		{
		.info.vendor_id = QCA_NL80211_VENDOR_ID,
		.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_LOC_GET_CAPA,
		.flags = WIPHY_VENDOR_CMD_NEED_WDEV \|
		WIPHY_VENDOR_CMD_NEED_RUNNING,
		.doit = wil_ftm_get_capabilities
		},
		{
		.info.vendor_id = QCA_NL80211_VENDOR_ID,
		.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_FTM_START_SESSION,
		.flags = WIPHY_VENDOR_CMD_NEED_WDEV \|
		WIPHY_VENDOR_CMD_NEED_RUNNING,
		.doit = wil_ftm_start_session
		},
		{
		.info.vendor_id = QCA_NL80211_VENDOR_ID,
		.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_FTM_ABORT_SESSION,
		.flags = WIPHY_VENDOR_CMD_NEED_WDEV \|
		WIPHY_VENDOR_CMD_NEED_RUNNING,
		.doit = wil_ftm_abort_session
		},
		{
		.info.vendor_id = QCA_NL80211_VENDOR_ID,
		.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_FTM_CFG_RESPONDER,
		.flags = WIPHY_VENDOR_CMD_NEED_WDEV \|
		WIPHY_VENDOR_CMD_NEED_RUNNING,
		.doit = wil_ftm_configure_responder
		},
		{
		.info.vendor_id = QCA_NL80211_VENDOR_ID,
		.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_AOA_MEAS,
		.flags = WIPHY_VENDOR_CMD_NEED_WDEV \|
		WIPHY_VENDOR_CMD_NEED_RUNNING,
		.doit = wil_aoa_start_measurement
		},
		{
		.info.vendor_id = QCA_NL80211_VENDOR_ID,
		.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_AOA_ABORT_MEAS,
		.flags = WIPHY_VENDOR_CMD_NEED_WDEV \|
		WIPHY_VENDOR_CMD_NEED_RUNNING,
		.doit = wil_aoa_abort_measurement
		},
		{
		.info.vendor_id = QCA_NL80211_VENDOR_ID,
		.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_DMG_RF_GET_SECTOR_CFG,
		@@ -171,6 +212,22 @@ static const struct wiphy_vendor_command wil_nl80211_vendor_commands[] = {
		},
		};

		/* vendor specific events */
		static const struct nl80211_vendor_cmd_info wil_nl80211_vendor_events[] = {
		[QCA_EVENT_FTM_MEAS_RESULT_INDEX] = {
		.vendor_id = QCA_NL80211_VENDOR_ID,
		.subcmd = QCA_NL80211_VENDOR_SUBCMD_FTM_MEAS_RESULT
		},
		[QCA_EVENT_FTM_SESSION_DONE_INDEX] = {
		.vendor_id = QCA_NL80211_VENDOR_ID,
		.subcmd = QCA_NL80211_VENDOR_SUBCMD_FTM_SESSION_DONE
		},
		[QCA_EVENT_AOA_MEAS_RESULT_INDEX] = {
		.vendor_id = QCA_NL80211_VENDOR_ID,
		.subcmd = QCA_NL80211_VENDOR_SUBCMD_AOA_MEAS_RESULT
		},
		};

		static struct ieee80211_supported_band wil_band_60ghz = {
		.channels = wil_60ghz_channels,
		.n_channels = ARRAY_SIZE(wil_60ghz_channels),
		@@ -1950,6 +2007,7 @@ static int wil_cfg80211_suspend(struct wiphy *wiphy,

		mutex_lock(&wil->mutex);
		mutex_lock(&wil->vif_mutex);
		wil_ftm_stop_operations(wil);
		wil_p2p_stop_radio_operations(wil);
		wil_abort_scan_all_vifs(wil, true);
		mutex_unlock(&wil->vif_mutex);
		@@ -2113,6 +2171,8 @@ static void wil_wiphy_init(struct wiphy *wiphy)

		wiphy->n_vendor_commands = ARRAY_SIZE(wil_nl80211_vendor_commands);
		wiphy->vendor_commands = wil_nl80211_vendor_commands;
		wiphy->vendor_events = wil_nl80211_vendor_events;
		wiphy->n_vendor_events = ARRAY_SIZE(wil_nl80211_vendor_events);

		#ifdef CONFIG_PM
		wiphy->wowlan = &wil_wowlan_support;