qcacld-3.0: Fix WLAN_SYSFS componentization

Move 11be_rate sysfs entry implementation from HDD EHT main body
to separate source files and define WLAN_SYSFS_EHT_RATE feature
flag accordingly in Kbuild.

All sysfs implementations shall be built only if CONFIG_WLAN_SYSFS=y.
Hence correct dp_tx_delay_stats and the closing endif.

Change-Id: I84aa7fc34aeff932bb51800e70c4c3611bf0d627
CRs-Fixed: 3309689

Kbuild

@@ -433,7 +433,6 @@ endif
 ifeq ($(CONFIG_WLAN_FREQ_LIST), y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_get_freq_for_pwr.o
 endif
-endif
 ifeq ($(CONFIG_WLAN_SYSFS_DP_STATS), y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_txrx_stats_console.o
 endif
@@ -446,6 +445,15 @@ ifeq ($(CONFIG_DP_TRAFFIC_END_INDICATION), y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_dp_traffic_end_indication.o
 endif
 
+ifeq ($(CONFIG_DP_HW_TX_DELAY_STATS_ENABLE), y)
+HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_dp_tx_delay_stats.o
+endif
+
+ifeq ($(CONFIG_WLAN_SYSFS_EHT_RATE), y)
+HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_eht_rate.o
+endif
+endif # CONFIG_WLAN_SYSFS
+
 ifeq ($(CONFIG_QCACLD_FEATURE_FW_STATE), y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_fw_state.o
 endif
@@ -533,10 +541,6 @@ ifeq ($(CONFIG_FEATURE_WDS), y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_wds.o
 endif
 
-ifeq ($(CONFIG_DP_HW_TX_DELAY_STATS_ENABLE), y)
-HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_dp_tx_delay_stats.o
-endif
-
 ifeq ($(CONFIG_WLAN_FEATURE_PEER_TXQ_FLUSH_CONF), y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_peer_txq_flush.o
 endif
@@ -3580,6 +3584,7 @@ cppflags-$(CONFIG_WLAN_SYSFS_CHANNEL) += -DWLAN_SYSFS_CHANNEL
 cppflags-$(CONFIG_FEATURE_BECN_STATS) += -DWLAN_FEATURE_BEACON_RECEPTION_STATS
 
 cppflags-$(CONFIG_WLAN_SYSFS_CONNECT_INFO) += -DWLAN_SYSFS_CONNECT_INFO
+cppflags-$(CONFIG_WLAN_SYSFS_EHT_RATE) += -DWLAN_SYSFS_EHT_RATE
 
 #Set RX_PERFORMANCE
 cppflags-$(CONFIG_RX_PERFORMANCE) += -DRX_PERFORMANCE

configs/kiwi_defconfig

@@ -5,6 +5,11 @@ include $(WLAN_ROOT)/configs/default_defconfig
 #Enable 11BE EHT
 CONFIG_WLAN_FEATURE_11BE := y
 
+# Enable EHT rate sysfs entry
+ifeq ($(CONFIG_WLAN_SYSFS), y)
+CONFIG_WLAN_SYSFS_EHT_RATE := y
+endif
+
 # Max Sta Vdev Config
 CONFIG_CFG_MAX_STA_VDEVS := 4
 

configs/kiwi_v2_defconfig

@@ -10,6 +10,11 @@ include $(WLAN_ROOT)/configs/default_defconfig
 #Enable 11BE EHT
 CONFIG_WLAN_FEATURE_11BE := y
 
+# Enable EHT rate sysfs entry
+ifeq ($(CONFIG_WLAN_SYSFS), y)
+CONFIG_WLAN_SYSFS_EHT_RATE := y
+endif
+
 # Max Sta Vdev Config
 CONFIG_CFG_MAX_STA_VDEVS := 4
 

configs/mango_defconfig

@@ -7,6 +7,11 @@ include $(WLAN_ROOT)/configs/default_defconfig
 #Enable 11BE EHT
 CONFIG_WLAN_FEATURE_11BE := y
 
+# Enable EHT rate sysfs entry
+ifeq ($(CONFIG_WLAN_SYSFS), y)
+CONFIG_WLAN_SYSFS_EHT_RATE := y
+endif
+
 # Max Sta Vdev Config
 CONFIG_CFG_MAX_STA_VDEVS := 4
 

core/hdd/inc/wlan_hdd_eht.h

@@ -101,22 +101,6 @@ void wlan_hdd_get_mlo_link_id(struct hdd_beacon_data *beacon,
  */
 int hdd_set_11be_rate_code(struct hdd_adapter *adapter, uint16_t rate_code);
 
-/**
- * hdd_sysfs_11be_rate_create() - Create sysfs entry to configure 11be rate
- * @adapter: net device adapter
- *
- * Return: None
- */
-void hdd_sysfs_11be_rate_create(struct hdd_adapter *adapter);
-
-/**
- * hdd_sysfs_11be_rate_destroy() - Destroy sysfs entry to configure 11be rate
- * @adapter: net device adapter
- *
- * Return: None
- */
-void hdd_sysfs_11be_rate_destroy(struct hdd_adapter *adapter);
-
 /**
  * wlan_hdd_fill_os_eht_rateflags() - Fill EHT related rate_info
  * @os_rate: rate info for os
@@ -153,14 +137,6 @@ hdd_set_11be_rate_code(struct hdd_adapter *adapter, uint16_t rate_code)
 	return 0;
 }
 
-static inline void hdd_sysfs_11be_rate_create(struct hdd_adapter *adapter)
-{
-}
-
-static inline void hdd_sysfs_11be_rate_destroy(struct hdd_adapter *adapter)
-{
-}
-
 static inline void wlan_hdd_get_mlo_link_id(struct hdd_beacon_data *beacon,
 					    uint8_t *link_id, uint8_t *num_link)
 {

core/hdd/src/wlan_hdd_eht.c

@@ -30,7 +30,6 @@
 #include "wlan_mlme_ucfg_api.h"
 #include "qc_sap_ioctl.h"
 #include "wma_api.h"
-#include "wlan_hdd_sysfs.h"
 #include "wlan_osif_features.h"
 #include "wlan_psoc_mlme_ucfg_api.h"
 
@@ -269,89 +268,6 @@ int hdd_set_11be_rate_code(struct hdd_adapter *adapter, uint16_t rate_code)
 	return ret;
 }
 
-static ssize_t
-__hdd_sysfs_set_11be_fixed_rate(struct net_device *net_dev, char const *buf,
-				size_t count)
-{
-	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(net_dev);
-	struct hdd_context *hdd_ctx;
-	char buf_local[MAX_SYSFS_USER_COMMAND_SIZE_LENGTH + 1];
-	int ret;
-	uint16_t rate_code;
-	char *sptr, *token;
-
-	if (hdd_validate_adapter(adapter)) {
-		hdd_err_rl("invalid adapter");
-		return -EINVAL;
-	}
-
-	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	ret = wlan_hdd_validate_context(hdd_ctx);
-	if (ret) {
-		hdd_err_rl("invalid hdd context");
-		return ret;
-	}
-
-	if (!wlan_hdd_validate_modules_state(hdd_ctx)) {
-		hdd_err_rl("invalid module state");
-		return -EINVAL;
-	}
-
-	ret = hdd_sysfs_validate_and_copy_buf(buf_local, sizeof(buf_local),
-					      buf, count);
-	if (ret) {
-		hdd_err_rl("invalid input");
-		return ret;
-	}
-
-	sptr = buf_local;
-	token = strsep(&sptr, " ");
-	if (!token || kstrtou16(token, 0, &rate_code)) {
-		hdd_err_rl("invalid input");
-		return -EINVAL;
-	}
-
-	hdd_set_11be_rate_code(adapter, rate_code);
-
-	return count;
-}
-
-static ssize_t hdd_sysfs_set_11be_fixed_rate(
-			     struct device *dev, struct device_attribute *attr,
-			     char const *buf, size_t count)
-{
-	struct net_device *net_dev = container_of(dev, struct net_device, dev);
-	struct osif_vdev_sync *vdev_sync;
-	ssize_t err_size;
-
-	err_size = osif_vdev_sync_op_start(net_dev, &vdev_sync);
-	if (err_size)
-		return err_size;
-
-	err_size = __hdd_sysfs_set_11be_fixed_rate(net_dev, buf, count);
-
-	osif_vdev_sync_op_stop(vdev_sync);
-
-	return err_size;
-}
-
-static DEVICE_ATTR(11be_rate, 0220, NULL, hdd_sysfs_set_11be_fixed_rate);
-
-void hdd_sysfs_11be_rate_create(struct hdd_adapter *adapter)
-{
-	int error;
-
-	error = device_create_file(&adapter->dev->dev, &dev_attr_11be_rate);
-	if (error)
-		hdd_err("could not create sysfs file to set 11be rate");
-
-}
-
-void hdd_sysfs_11be_rate_destroy(struct hdd_adapter *adapter)
-{
-	device_remove_file(&adapter->dev->dev, &dev_attr_11be_rate);
-}
-
 /**
  * hdd_map_eht_gi_to_os() - map txrate_gi to os guard interval
  * @guard_interval: guard interval get from fw rate

core/hdd/src/wlan_hdd_sysfs.c

@@ -87,6 +87,7 @@
 #include <wlan_hdd_sysfs_dp_tx_delay_stats.h>
 #include <wlan_hdd_sysfs_wifi_features.h>
 #include <wlan_hdd_sysfs_dp_traffic_end_indication.h>
+#include <wlan_hdd_sysfs_eht_rate.h>
 
 #define MAX_PSOC_ID_SIZE 10
 

core/hdd/src/wlan_hdd_sysfs_dp_tx_delay_stats.h

@@ -25,7 +25,7 @@
 #ifndef _WLAN_HDD_SYSFS_DP_TX_DELAY_STATS_H
 #define _WLAN_HDD_SYSFS_DP_TX_DELAY_STATS_H
 
-#ifdef HW_TX_DELAY_STATS_ENABLE
+#if defined(WLAN_SYSFS) && defined(HW_TX_DELAY_STATS_ENABLE)
 /**
  * hdd_sysfs_dp_tx_delay_stats_create() - API to create dp tx delay stats
  *  related sysfs entry

core/hdd/src/wlan_hdd_sysfs_eht_rate.c

@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. 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.
+ */
+
+/**
+ * DOC : wlan_hdd_sysfs_eht_rate.c
+ *
+ * implementation for creating sysfs file 11be_rate
+ *
+ */
+
+#include "wlan_hdd_main.h"
+#include "wlan_hdd_eht.h"
+#include "wlan_hdd_sysfs.h"
+#include "wlan_hdd_sysfs_eht_rate.h"
+#include "osif_sync.h"
+
+static ssize_t
+__hdd_sysfs_set_11be_fixed_rate(struct net_device *net_dev, char const *buf,
+				size_t count)
+{
+	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(net_dev);
+	struct hdd_context *hdd_ctx;
+	char buf_local[MAX_SYSFS_USER_COMMAND_SIZE_LENGTH + 1];
+	int ret;
+	uint16_t rate_code;
+	char *sptr, *token;
+
+	if (hdd_validate_adapter(adapter)) {
+		hdd_err_rl("invalid adapter");
+		return -EINVAL;
+	}
+
+	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
+	ret = wlan_hdd_validate_context(hdd_ctx);
+	if (ret) {
+		hdd_err_rl("invalid hdd context");
+		return ret;
+	}
+
+	if (!wlan_hdd_validate_modules_state(hdd_ctx)) {
+		hdd_err_rl("invalid module state");
+		return -EINVAL;
+	}
+
+	ret = hdd_sysfs_validate_and_copy_buf(buf_local, sizeof(buf_local),
+					      buf, count);
+	if (ret) {
+		hdd_err_rl("invalid input");
+		return ret;
+	}
+
+	sptr = buf_local;
+	token = strsep(&sptr, " ");
+	if (!token || kstrtou16(token, 0, &rate_code)) {
+		hdd_err_rl("invalid input");
+		return -EINVAL;
+	}
+
+	hdd_set_11be_rate_code(adapter, rate_code);
+
+	return count;
+}
+
+static ssize_t hdd_sysfs_set_11be_fixed_rate(
+			     struct device *dev, struct device_attribute *attr,
+			     char const *buf, size_t count)
+{
+	struct net_device *net_dev = container_of(dev, struct net_device, dev);
+	struct osif_vdev_sync *vdev_sync;
+	ssize_t err_size;
+
+	err_size = osif_vdev_sync_op_start(net_dev, &vdev_sync);
+	if (err_size)
+		return err_size;
+
+	err_size = __hdd_sysfs_set_11be_fixed_rate(net_dev, buf, count);
+
+	osif_vdev_sync_op_stop(vdev_sync);
+
+	return err_size;
+}
+
+static DEVICE_ATTR(11be_rate, 0220, NULL, hdd_sysfs_set_11be_fixed_rate);
+
+void hdd_sysfs_11be_rate_create(struct hdd_adapter *adapter)
+{
+	int error;
+
+	error = device_create_file(&adapter->dev->dev, &dev_attr_11be_rate);
+	if (error)
+		hdd_err("could not create sysfs file to set 11be rate");
+}
+
+void hdd_sysfs_11be_rate_destroy(struct hdd_adapter *adapter)
+{
+	device_remove_file(&adapter->dev->dev, &dev_attr_11be_rate);
+}
+

core/hdd/src/wlan_hdd_sysfs_eht_rate.h

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. 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.
+ */
+
+/**
+ * DOC: wlan_hdd_sysfs_eht_rate.h
+ *
+ * implementation for creating sysfs file 11be_rate
+ */
+
+#ifndef _WLAN_HDD_SYSFS_EHT_RATE_H
+#define _WLAN_HDD_SYSFS_EHT_RATE_H
+
+#if defined(WLAN_SYSFS) && defined(WLAN_SYSFS_EHT_RATE)
+
+/**
+ * hdd_sysfs_11be_rate_create() - Create sysfs entry to configure 11be rate
+ * @adapter: net device adapter
+ *
+ * Return: None
+ */
+void hdd_sysfs_11be_rate_create(struct hdd_adapter *adapter);
+
+/**
+ * hdd_sysfs_11be_rate_destroy() - Destroy sysfs entry to configure 11be rate
+ * @adapter: net device adapter
+ *
+ * Return: None
+ */
+void hdd_sysfs_11be_rate_destroy(struct hdd_adapter *adapter);
+#else
+static inline void hdd_sysfs_11be_rate_create(struct hdd_adapter *adapter)
+{
+}
+
+static inline void hdd_sysfs_11be_rate_destroy(struct hdd_adapter *adapter)
+{
+}
+#endif
+#endif /* _WLAN_HDD_SYSFS_EHT_RATE_H */