qcacld-3.0: Add API to get/set HT20/40 mode for easymesh

Add API to get/set HT20/40 mode for easymesh AP mode

Change-Id: Ic6b06b4bd05003537939a77cdd8daa82d2ecc5fa
CRs-Fixed: 3034726

core/hdd/src/wlan_hdd_hostapd.c

@@ -687,6 +687,29 @@ QDF_STATUS hdd_set_sap_ht2040_mode(struct hdd_adapter *adapter,
 	}
 	return QDF_STATUS_SUCCESS;
 }
+
+QDF_STATUS hdd_get_sap_ht2040_mode(struct hdd_adapter *adapter,
+				   enum eSirMacHTChannelType *channel_type)
+{
+	QDF_STATUS status = QDF_STATUS_E_FAILURE;
+	mac_handle_t mac_handle;
+
+	hdd_debug("get HT20/40 mode vdev_id %d", adapter->vdev_id);
+
+	if (adapter->device_mode == QDF_SAP_MODE) {
+		mac_handle = adapter->hdd_ctx->mac_handle;
+		if (!mac_handle) {
+			hdd_err("mac handle is null");
+			return status;
+		}
+		status = sme_get_ht2040_mode(mac_handle, adapter->vdev_id,
+					     channel_type);
+		if (QDF_IS_STATUS_ERROR(status))
+			hdd_err("Failed to get HT20/40 mode");
+	}
+
+	return status;
+}
 #endif
 
 /**

core/hdd/src/wlan_hdd_hostapd.h

@@ -250,6 +250,29 @@ void hdd_sap_context_destroy(struct hdd_context *hdd_ctx);
 #ifdef QCA_HT_2040_COEX
 QDF_STATUS hdd_set_sap_ht2040_mode(struct hdd_adapter *adapter,
 				   uint8_t channel_type);
+
+/**
+ * hdd_get_sap_ht2040_mode() - get ht2040 mode
+ * @adapter: pointer to adapter
+ * @channel_type: given channel type
+ *
+ * Return: QDF_STATUS_SUCCESS if successfully
+ */
+QDF_STATUS hdd_get_sap_ht2040_mode(struct hdd_adapter *adapter,
+				   enum eSirMacHTChannelType *channel_type);
+#else
+static inline QDF_STATUS hdd_set_sap_ht2040_mode(struct hdd_adapter *adapter,
+						 uint8_t channel_type)
+{
+	return QDF_STATUS_SUCCESS;
+}
+
+static inline QDF_STATUS hdd_get_sap_ht2040_mode(
+				struct hdd_adapter *adapter,
+				enum eSirMacHTChannelType *channel_type)
+{
+	return QDF_STATUS_E_FAILURE;
+}
 #endif
 
 int wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,

core/hdd/src/wlan_hdd_son.c

@@ -61,6 +61,137 @@ static uint32_t hdd_son_is_acs_in_progress(struct wlan_objmgr_vdev *vdev)
 	return in_progress;
 }
 
+/**
+ * hdd_son_chan_ext_offset_to_chan_type() - translate son chan extend offset
+ *                                          to chan type
+ * @son_chan_ext_offset: son chan ext offset
+ *
+ * Return: tSirMacHTChannelType
+ */
+static tSirMacHTChannelType hdd_son_chan_ext_offset_to_chan_type(
+				enum sec20_chan_offset son_chan_ext_offset)
+{
+	tSirMacHTChannelType chan_type;
+
+	switch (son_chan_ext_offset) {
+	case EXT_CHAN_OFFSET_ABOVE:
+		chan_type = eHT_CHAN_HT40PLUS;
+		break;
+	case EXT_CHAN_OFFSET_BELOW:
+		chan_type = eHT_CHAN_HT40MINUS;
+		break;
+	default:
+		chan_type = eHT_CHAN_HT20;
+		break;
+	}
+
+	return chan_type;
+}
+
+/**
+ * hdd_son_set_chan_ext_offset() - set son chan extend offset
+ * @vdev: vdev
+ * @son_chan_ext_offset: son chan extend offset
+ *
+ * Return: 0 on success, negative errno on failure
+ */
+static int hdd_son_set_chan_ext_offset(
+				struct wlan_objmgr_vdev *vdev,
+				enum sec20_chan_offset son_chan_ext_offset)
+{
+	enum eSirMacHTChannelType chan_type;
+	QDF_STATUS status;
+	int retval = -EINVAL;
+	struct hdd_adapter *adapter;
+
+	if (!vdev) {
+		hdd_err("null vdev");
+		return retval;
+	}
+	adapter = wlan_hdd_get_adapter_from_objmgr(vdev);
+	if (!adapter) {
+		hdd_err("null adapter");
+		return retval;
+	}
+	if (!hdd_adapter_is_ap(adapter)) {
+		hdd_err("vdev id %d is not AP", adapter->vdev_id);
+		return retval;
+	}
+
+	retval = 0;
+	chan_type = hdd_son_chan_ext_offset_to_chan_type(son_chan_ext_offset);
+	status = hdd_set_sap_ht2040_mode(adapter, chan_type);
+	if (status != QDF_STATUS_SUCCESS) {
+		hdd_err("Cannot set SAP HT20/40 mode!");
+		retval = -EINVAL;
+	}
+
+	return retval;
+}
+
+/**
+ * hdd_chan_type_to_son_chan_ext_offset() - translate tSirMacHTChannelType
+ *                                          to son chan extend offset
+ * @chan_type: tSirMacHTChannelType
+ *
+ * Return: son chan extend offset
+ */
+static enum sec20_chan_offset hdd_chan_type_to_son_chan_ext_offset(
+				tSirMacHTChannelType chan_type)
+{
+	enum sec20_chan_offset son_chan_ext_offset;
+
+	switch (chan_type) {
+	case eHT_CHAN_HT40PLUS:
+		son_chan_ext_offset = EXT_CHAN_OFFSET_ABOVE;
+		break;
+	case eHT_CHAN_HT40MINUS:
+		son_chan_ext_offset = EXT_CHAN_OFFSET_BELOW;
+		break;
+	default:
+		son_chan_ext_offset = EXT_CHAN_OFFSET_NA;
+		break;
+	}
+
+	return son_chan_ext_offset;
+}
+
+/**
+ * hdd_son_get_chan_ext_offset() - get chan extend offset
+ * @vdev: vdev
+ *
+ * Return: enum sec20_chan_offset
+ */
+static enum sec20_chan_offset hdd_son_get_chan_ext_offset(
+						struct wlan_objmgr_vdev *vdev)
+{
+	enum eSirMacHTChannelType chan_type;
+	QDF_STATUS status;
+	struct hdd_adapter *adapter;
+
+	if (!vdev) {
+		hdd_err("null vdev");
+		return 0;
+	}
+	adapter = wlan_hdd_get_adapter_from_objmgr(vdev);
+	if (!adapter) {
+		hdd_err("null adapter");
+		return 0;
+	}
+	if (!hdd_adapter_is_ap(adapter)) {
+		hdd_err("vdev id %d is not AP", adapter->vdev_id);
+		return 0;
+	}
+
+	status = hdd_get_sap_ht2040_mode(adapter, &chan_type);
+	if (status != QDF_STATUS_SUCCESS) {
+		hdd_err("Cannot set SAP HT20/40 mode!");
+		return 0;
+	}
+
+	return hdd_chan_type_to_son_chan_ext_offset(chan_type);
+}
+
 /**
  * hdd_son_bandwidth_to_phymode() - get new eCsrPhyMode according
  *                                  to son band width
@@ -396,6 +527,8 @@ void hdd_son_register_callbacks(struct hdd_context *hdd_ctx)
 	struct son_callbacks cb_obj = {0};
 
 	cb_obj.os_if_is_acs_in_progress = hdd_son_is_acs_in_progress;
+	cb_obj.os_if_set_chan_ext_offset = hdd_son_set_chan_ext_offset;
+	cb_obj.os_if_get_chan_ext_offset = hdd_son_get_chan_ext_offset;
 	cb_obj.os_if_set_bandwidth = hdd_son_set_bandwidth;
 	cb_obj.os_if_get_bandwidth = hdd_son_get_bandwidth;
 	cb_obj.os_if_set_chan = hdd_son_set_chan;

core/sme/inc/sme_api.h

@@ -1212,6 +1212,17 @@ QDF_STATUS sme_notify_ht2040_mode(mac_handle_t mac_handle,
 				  uint8_t channel_type);
 QDF_STATUS sme_set_ht2040_mode(mac_handle_t mac_handle, uint8_t sessionId,
 			       uint8_t channel_type, bool obssEnabled);
+
+/**
+ * sme_get_ht2040_mode() - get ht operation mode
+ * @mac_handle: pointer to mac context
+ * @vdev_id: vdev id
+ * @channel_type: channel type to provide
+ *
+ * Return QDF_STATUS
+ */
+QDF_STATUS sme_get_ht2040_mode(mac_handle_t mac_handle, uint8_t vdev_id,
+			       enum eSirMacHTChannelType *channel_type);
 #endif
 
 /**

core/sme/src/common/sme_api.c

@@ -7701,6 +7701,38 @@ QDF_STATUS sme_set_ht2040_mode(mac_handle_t mac_handle, uint8_t sessionId,
 	return status;
 }
 
+QDF_STATUS sme_get_ht2040_mode(mac_handle_t mac_handle, uint8_t vdev_id,
+			       enum eSirMacHTChannelType *channel_type)
+{
+	struct mac_context *mac = MAC_CONTEXT(mac_handle);
+	struct csr_roam_session *session;
+
+	if (!CSR_IS_SESSION_VALID(mac, vdev_id)) {
+		sme_err("Session not valid for session id %d", vdev_id);
+		return QDF_STATUS_E_INVAL;
+	}
+	session = CSR_GET_SESSION(mac, vdev_id);
+	sme_debug("Get HT operation beacon IE, channel_type=%d cur cbmode %d",
+		  *channel_type, session->bssParams.cbMode);
+
+	switch (session->bssParams.cbMode) {
+	case PHY_SINGLE_CHANNEL_CENTERED:
+		*channel_type = eHT_CHAN_HT20;
+		break;
+	case PHY_DOUBLE_CHANNEL_HIGH_PRIMARY:
+		*channel_type = eHT_CHAN_HT40MINUS;
+		break;
+	case PHY_DOUBLE_CHANNEL_LOW_PRIMARY:
+		*channel_type = eHT_CHAN_HT40PLUS;
+		break;
+	default:
+		sme_err("Error!!! Invalid HT20/40 mode !");
+		return QDF_STATUS_E_FAILURE;
+	}
+
+	return QDF_STATUS_SUCCESS;
+}
+
 #endif
 
 /*

os_if/son/inc/os_if_son.h

@@ -35,6 +35,8 @@
 /**
  * struct son_callbacks - struct containing callback to non-converged driver
  * @os_if_is_acs_in_progress: whether acs is in progress or not
+ * @os_if_set_chan_ext_offset: set chan extend offset
+ * @os_if_get_chan_ext_offset: get chan extend offset
  * @os_if_set_bandwidth: set band width
  * @os_if_get_bandwidth: get band width
  * @os_if_set_chan: set chan
@@ -42,6 +44,11 @@
  */
 struct son_callbacks {
 	uint32_t (*os_if_is_acs_in_progress)(struct wlan_objmgr_vdev *vdev);
+	int (*os_if_set_chan_ext_offset)(
+				struct wlan_objmgr_vdev *vdev,
+				enum sec20_chan_offset son_chan_ext_offset);
+	enum sec20_chan_offset (*os_if_get_chan_ext_offset)(
+				struct wlan_objmgr_vdev *vdev);
 	int (*os_if_set_bandwidth)(struct wlan_objmgr_vdev *vdev,
 				   uint32_t son_bandwidth);
 	uint32_t (*os_if_get_bandwidth)(struct wlan_objmgr_vdev *vdev);
@@ -86,6 +93,25 @@ uint32_t os_if_son_is_acs_in_progress(struct wlan_objmgr_vdev *vdev);
  */
 uint32_t os_if_son_is_cac_in_progress(struct wlan_objmgr_vdev *vdev);
 
+/**
+ * os_if_son_set_chan_ext_offset() - set chan extend offset
+ * @vdev: vdev
+ * @son_chan_ext_offset son chan extend offset
+ *
+ * Return: 0 on success, negative errno on failure
+ */
+int os_if_son_set_chan_ext_offset(struct wlan_objmgr_vdev *vdev,
+				  enum sec20_chan_offset son_chan_ext_offset);
+
+/**
+ * os_if_son_get_chan_ext_offset() - get chan extend offset
+ * @vdev: vdev
+ *
+ * Return: enum sec20_chan_offset
+ */
+enum sec20_chan_offset os_if_son_get_chan_ext_offset(
+					struct wlan_objmgr_vdev *vdev);
+
 /**
  * os_if_son_set_bandwidth() - set band width
  * @vdev: vdev

os_if/son/src/os_if_son.c

@@ -99,6 +99,43 @@ uint32_t os_if_son_is_cac_in_progress(struct wlan_objmgr_vdev *vdev)
 }
 qdf_export_symbol(os_if_son_is_cac_in_progress);
 
+int os_if_son_set_chan_ext_offset(struct wlan_objmgr_vdev *vdev,
+				  enum sec20_chan_offset son_chan_ext_offset)
+{
+	int ret;
+
+	if (!vdev) {
+		osif_err("null vdev");
+		return 0;
+	}
+
+	ret = g_son_os_if_cb.os_if_set_chan_ext_offset(vdev,
+						       son_chan_ext_offset);
+	osif_debug("vdev %d set_chan_ext_offset %d, ret %d",
+		   wlan_vdev_get_id(vdev), son_chan_ext_offset, ret);
+
+	return ret;
+}
+qdf_export_symbol(os_if_son_set_chan_ext_offset);
+
+enum sec20_chan_offset os_if_son_get_chan_ext_offset(
+						struct wlan_objmgr_vdev *vdev)
+{
+	enum sec20_chan_offset chan_ext_offset;
+
+	if (!vdev) {
+		osif_err("null vdev");
+		return 0;
+	}
+
+	chan_ext_offset = g_son_os_if_cb.os_if_get_chan_ext_offset(vdev);
+	osif_debug("vdev %d chan_ext_offset %d",
+		   wlan_vdev_get_id(vdev), chan_ext_offset);
+
+	return chan_ext_offset;
+}
+qdf_export_symbol(os_if_son_get_chan_ext_offset);
+
 int os_if_son_set_bandwidth(struct wlan_objmgr_vdev *vdev,
 			    uint32_t son_bandwidth)
 {