diff mbox series

[V5,2/2] ath11k: add debugfs for TWT debug calls

Message ID 20210222192651.1782-3-alokad@codeaurora.org
State New
Headers show
Series WMI and debugfs calls for TWT dialogs | expand

Commit Message

Aloka Dixit Feb. 22, 2021, 7:26 p.m. UTC
From: John Crispin <john@phrozen.org>

New debugfs files to manually add/delete/pause/resume TWT
dialogs for test/debug purposes.

The debugfs files expect the following parameters
(1) Add dialog
echo '<Peer_MAC> <Dialog_ID> <Wake_Interval_Usec> <Wake_Interval_Mantis>
<Wake_Duration_Usec> <First_SP_Offset> <TWT_Command> <1:Broadcast /
0:Individual> <1:Triggered / 0:Untriggered> <1:Unannounced /
0:Announced> <1:Protected / 0:Unprotected>' >
/sys/kernel/debug/ieee80211/phyX/netdev:wlanX/twt/add_dialog

Example (Non-triggered and un-announced):
echo '00:03:7F:20:13:52 1 102400 100 30720 20480 4 0 0 1 0' >
/sys/kernel/debug/ieee80211/phy0/netdev:wlan0/twt/add_dialog

(2) Delete dialog
echo '<Peer_MAC> <Dialog_ID>' >
/sys/kernel/debug/ieee80211/phyX/netdev:wlanX/twt/del_dialog

(3) Pause dialog
echo '<Peer_MAC> <Dialog_ID>' >
/sys/kernel/debug/ieee80211/phyX/netdev:wlanX/twt/pause_dialog

(4) Resume dialog
echo '<Peer_MAC> <Dialog_ID> <SP_Offset_Usec> <Next_TWT_Size>' >
/sys/kernel/debug/ieee80211/phyX/netdev:wlanX/twt/resume_dialog

Example:
echo '00:03:7F:20:13:52 1 2000000 3' >
/sys/kernel/debug/ieee80211/phy0/netdev:wlan0/twt/resume_dialog

Signed-off-by: John Crispin <john@phrozen.org>
Co-developed-by: Aloka Dixit <alokad@codeaurora.org>
Signed-off-by: Aloka Dixit <alokad@codeaurora.org>
---
Changes in V5
* TWT directory created during ath11k_mac_op_add_interface() instead
* of during TWT enable command.
* File write operation check for twt_enabled.
* Used CONFIG_ATH11K_DEBUGFS instead of CONFIG_MAC80211_DEBUGFS.
* Example commands in commit description.
---
 drivers/net/wireless/ath/ath11k/core.h  |   3 +
 drivers/net/wireless/ath/ath11k/debug.c | 224 ++++++++++++++++++++++++
 drivers/net/wireless/ath/ath11k/debug.h |  13 ++
 drivers/net/wireless/ath/ath11k/mac.c   |   3 +
 4 files changed, 243 insertions(+)

Comments

Kalle Valo March 9, 2021, 10:59 a.m. UTC | #1
Aloka Dixit <alokad@codeaurora.org> writes:

> From: John Crispin <john@phrozen.org>

>

> New debugfs files to manually add/delete/pause/resume TWT

> dialogs for test/debug purposes.

>

> The debugfs files expect the following parameters

> (1) Add dialog

> echo '<Peer_MAC> <Dialog_ID> <Wake_Interval_Usec> <Wake_Interval_Mantis>

> <Wake_Duration_Usec> <First_SP_Offset> <TWT_Command> <1:Broadcast /

> 0:Individual> <1:Triggered / 0:Untriggered> <1:Unannounced /

> 0:Announced> <1:Protected / 0:Unprotected>' >

> /sys/kernel/debug/ieee80211/phyX/netdev:wlanX/twt/add_dialog

>

> Example (Non-triggered and un-announced):

> echo '00:03:7F:20:13:52 1 102400 100 30720 20480 4 0 0 1 0' >

> /sys/kernel/debug/ieee80211/phy0/netdev:wlan0/twt/add_dialog

>

> (2) Delete dialog

> echo '<Peer_MAC> <Dialog_ID>' >

> /sys/kernel/debug/ieee80211/phyX/netdev:wlanX/twt/del_dialog

>

> (3) Pause dialog

> echo '<Peer_MAC> <Dialog_ID>' >

> /sys/kernel/debug/ieee80211/phyX/netdev:wlanX/twt/pause_dialog

>

> (4) Resume dialog

> echo '<Peer_MAC> <Dialog_ID> <SP_Offset_Usec> <Next_TWT_Size>' >

> /sys/kernel/debug/ieee80211/phyX/netdev:wlanX/twt/resume_dialog

>

> Example:

> echo '00:03:7F:20:13:52 1 2000000 3' >

> /sys/kernel/debug/ieee80211/phy0/netdev:wlan0/twt/resume_dialog

>

> Signed-off-by: John Crispin <john@phrozen.org>

> Co-developed-by: Aloka Dixit <alokad@codeaurora.org>

> Signed-off-by: Aloka Dixit <alokad@codeaurora.org>


[...]

> --- a/drivers/net/wireless/ath/ath11k/debug.c

> +++ b/drivers/net/wireless/ath/ath11k/debug.c

> @@ -104,3 +104,227 @@ void ath11k_dbg_dump(struct ath11k_base *ab,

>  EXPORT_SYMBOL(ath11k_dbg_dump);

>  

>  #endif /* CONFIG_ATH11K_DEBUG */

> +

> +#ifdef CONFIG_ATH11K_DEBUGFS

> +static ssize_t ath11k_write_twt_add_dialog(struct file *file,

> +					   const char __user *ubuf,

> +					   size_t count, loff_t *ppos)

> +{

> +	struct ath11k_vif *arvif = file->private_data;

> +	struct wmi_twt_add_dialog_params params = { 0 };

> +	u8 buf[128] = {0};

> +	int ret;

> +

> +	if (arvif->ar->twt_enabled == 0) {

> +		ath11k_err(arvif->ar->ab, "TWT support is not enabled\n");

> +		return -EOPNOTSUPP;

> +	}

> +

> +	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, ubuf, count);

> +	if (ret < 0)

> +		return ret;

> +

> +	buf[ret] = '\0';

> +	ret = sscanf(buf,

> +		     "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %u %u %u %u %u %hhu %hhu %hhu %hhu %hhu",

> +		     &params.peer_macaddr[0],

> +		     &params.peer_macaddr[1],

> +		     &params.peer_macaddr[2],

> +		     &params.peer_macaddr[3],

> +		     &params.peer_macaddr[4],

> +		     &params.peer_macaddr[5],

> +		     &params.dialog_id,

> +		     &params.wake_intvl_us,

> +		     &params.wake_intvl_mantis,

> +		     &params.wake_dura_us,

> +		     &params.sp_offset_us,

> +		     &params.twt_cmd,

> +		     &params.flag_bcast,

> +		     &params.flag_trigger,

> +		     &params.flag_flow_type,

> +		     &params.flag_protection);

> +	if (ret != 16)

> +		return -EINVAL;

> +

> +	params.vdev_id = arvif->vdev_id;

> +

> +	ret = ath11k_wmi_send_twt_add_dialog_cmd(arvif->ar, &params);

> +	if (ret)

> +		return ret;

> +

> +	return count;

> +}

> +

> +static ssize_t ath11k_write_twt_del_dialog(struct file *file,

> +					   const char __user *ubuf,

> +					   size_t count, loff_t *ppos)

> +{

> +	struct ath11k_vif *arvif = file->private_data;

> +	struct wmi_twt_del_dialog_params params = { 0 };

> +	u8 buf[64] = {0};

> +	int ret;

> +

> +	if (arvif->ar->twt_enabled == 0) {

> +		ath11k_err(arvif->ar->ab, "TWT support is not enabled\n");

> +		return -EOPNOTSUPP;

> +	}

> +

> +	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, ubuf, count);

> +	if (ret < 0)

> +		return ret;

> +

> +	buf[ret] = '\0';

> +	ret = sscanf(buf, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %u",

> +		     &params.peer_macaddr[0],

> +		     &params.peer_macaddr[1],

> +		     &params.peer_macaddr[2],

> +		     &params.peer_macaddr[3],

> +		     &params.peer_macaddr[4],

> +		     &params.peer_macaddr[5],

> +		     &params.dialog_id);

> +	if (ret != 7)

> +		return -EINVAL;

> +

> +	params.vdev_id = arvif->vdev_id;

> +

> +	ret = ath11k_wmi_send_twt_del_dialog_cmd(arvif->ar, &params);

> +	if (ret)

> +		return ret;

> +

> +	return count;

> +}

> +

> +static ssize_t ath11k_write_twt_pause_dialog(struct file *file,

> +					     const char __user *ubuf,

> +					     size_t count, loff_t *ppos)

> +{

> +	struct ath11k_vif *arvif = file->private_data;

> +	struct wmi_twt_pause_dialog_params params = { 0 };

> +	u8 buf[64] = {0};

> +	int ret;

> +

> +	if (arvif->ar->twt_enabled == 0) {

> +		ath11k_err(arvif->ar->ab, "TWT support is not enabled\n");

> +		return -EOPNOTSUPP;

> +	}

> +

> +	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, ubuf, count);

> +	if (ret < 0)

> +		return ret;

> +

> +	buf[ret] = '\0';

> +	ret = sscanf(buf, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %u",

> +		     &params.peer_macaddr[0],

> +		     &params.peer_macaddr[1],

> +		     &params.peer_macaddr[2],

> +		     &params.peer_macaddr[3],

> +		     &params.peer_macaddr[4],

> +		     &params.peer_macaddr[5],

> +		     &params.dialog_id);

> +	if (ret != 7)

> +		return -EINVAL;

> +

> +	params.vdev_id = arvif->vdev_id;

> +

> +	ret = ath11k_wmi_send_twt_pause_dialog_cmd(arvif->ar, &params);

> +	if (ret)

> +		return ret;

> +

> +	return count;

> +}

> +

> +static ssize_t ath11k_write_twt_resume_dialog(struct file *file,

> +					      const char __user *ubuf,

> +					      size_t count, loff_t *ppos)

> +{

> +	struct ath11k_vif *arvif = file->private_data;

> +	struct wmi_twt_resume_dialog_params params = { 0 };

> +	u8 buf[64] = {0};

> +	int ret;

> +

> +	if (arvif->ar->twt_enabled == 0) {

> +		ath11k_err(arvif->ar->ab, "TWT support is not enabled\n");

> +		return -EOPNOTSUPP;

> +	}

> +

> +	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, ubuf, count);

> +	if (ret < 0)

> +		return ret;

> +

> +	buf[ret] = '\0';

> +	ret = sscanf(buf, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %u %u %u",

> +		     &params.peer_macaddr[0],

> +		     &params.peer_macaddr[1],

> +		     &params.peer_macaddr[2],

> +		     &params.peer_macaddr[3],

> +		     &params.peer_macaddr[4],

> +		     &params.peer_macaddr[5],

> +		     &params.dialog_id,

> +		     &params.sp_offset_us,

> +		     &params.next_twt_size);

> +	if (ret != 9)

> +		return -EINVAL;

> +

> +	params.vdev_id = arvif->vdev_id;

> +

> +	ret = ath11k_wmi_send_twt_resume_dialog_cmd(arvif->ar, &params);

> +	if (ret)

> +		return ret;

> +

> +	return count;

> +}

> +

> +static const struct file_operations ath11k_fops_twt_add_dialog = {

> +	.write = ath11k_write_twt_add_dialog,

> +	.open = simple_open

> +};

> +

> +static const struct file_operations ath11k_fops_twt_del_dialog = {

> +	.write = ath11k_write_twt_del_dialog,

> +	.open = simple_open

> +};

> +

> +static const struct file_operations ath11k_fops_twt_pause_dialog = {

> +	.write = ath11k_write_twt_pause_dialog,

> +	.open = simple_open

> +};

> +

> +static const struct file_operations ath11k_fops_twt_resume_dialog = {

> +	.write = ath11k_write_twt_resume_dialog,

> +	.open = simple_open

> +};

> +

> +void ath11k_debugfs_add_interface(struct ath11k_vif *arvif)

> +{

> +	if (arvif->vif->type == NL80211_IFTYPE_AP && !arvif->debugfs_twt) {

> +		arvif->debugfs_twt = debugfs_create_dir("twt",

> +							arvif->vif->debugfs_dir);

> +		if (IS_ERR_OR_NULL(arvif->debugfs_twt)) {

> +			ath11k_warn(arvif->ar->ab,

> +				    "failed to create twt debugfs: %p\n",

> +				    arvif->debugfs_twt);

> +			arvif->debugfs_twt = NULL;

> +			return;

> +		}

> +

> +		debugfs_create_file("add_dialog", 0200, arvif->debugfs_twt,

> +				    arvif, &ath11k_fops_twt_add_dialog);

> +

> +		debugfs_create_file("del_dialog", 0200, arvif->debugfs_twt,

> +				    arvif, &ath11k_fops_twt_del_dialog);

> +

> +		debugfs_create_file("pause_dialog", 0200, arvif->debugfs_twt,

> +				    arvif, &ath11k_fops_twt_pause_dialog);

> +

> +		debugfs_create_file("resume_dialog", 0200, arvif->debugfs_twt,

> +				    arvif, &ath11k_fops_twt_resume_dialog);

> +	}

> +}

> +

> +void ath11k_debugfs_remove_interface(struct ath11k_vif *arvif)

> +{

> +	debugfs_remove_recursive(arvif->debugfs_twt);

> +	arvif->debugfs_twt = NULL;

> +}

> +

> +#endif /* CONFIG_ATH11K_DEBUGFS */


Shouldn't these functions be in debugfs.c?

> diff --git a/drivers/net/wireless/ath/ath11k/debug.h b/drivers/net/wireless/ath/ath11k/debug.h

> index 659a275e2eb3..2b41cefb68b5 100644

> --- a/drivers/net/wireless/ath/ath11k/debug.h

> +++ b/drivers/net/wireless/ath/ath11k/debug.h

> @@ -64,4 +64,17 @@ do {								\

>  		__ath11k_dbg(ar, dbg_mask, fmt, ##__VA_ARGS__);	\

>  } while (0)

>  

> +#ifdef CONFIG_ATH11K_DEBUGFS

> +void ath11k_debugfs_add_interface(struct ath11k_vif *arvif);

> +void ath11k_debugfs_remove_interface(struct ath11k_vif *arvif);

> +#else /* CONFIG_ATH11K_DEBUGFS */

> +static inline void ath11k_debugfs_add_interface(struct ath11k_vif *arvif)

> +{

> +}

> +

> +static inline void ath11k_debugfs_remove_interface(struct ath11k_vif *arvif)

> +{

> +}

> +#endif /* CONFIG_ATH11K_DEBUGFS */


And these in debugfs.h?

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
diff mbox series

Patch

diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h
index a7d5333485aa..944a9f88ed17 100644
--- a/drivers/net/wireless/ath/ath11k/core.h
+++ b/drivers/net/wireless/ath/ath11k/core.h
@@ -241,6 +241,9 @@  struct ath11k_vif {
 	bool rsnie_present;
 	bool wpaie_present;
 	struct ieee80211_chanctx_conf chanctx;
+#ifdef CONFIG_ATH11K_DEBUGFS
+	struct dentry *debugfs_twt;
+#endif /* CONFIG_ATH11K_DEBUGFS */
 };
 
 struct ath11k_vif_iter {
diff --git a/drivers/net/wireless/ath/ath11k/debug.c b/drivers/net/wireless/ath/ath11k/debug.c
index c86de95fbdc5..781b472ae987 100644
--- a/drivers/net/wireless/ath/ath11k/debug.c
+++ b/drivers/net/wireless/ath/ath11k/debug.c
@@ -104,3 +104,227 @@  void ath11k_dbg_dump(struct ath11k_base *ab,
 EXPORT_SYMBOL(ath11k_dbg_dump);
 
 #endif /* CONFIG_ATH11K_DEBUG */
+
+#ifdef CONFIG_ATH11K_DEBUGFS
+static ssize_t ath11k_write_twt_add_dialog(struct file *file,
+					   const char __user *ubuf,
+					   size_t count, loff_t *ppos)
+{
+	struct ath11k_vif *arvif = file->private_data;
+	struct wmi_twt_add_dialog_params params = { 0 };
+	u8 buf[128] = {0};
+	int ret;
+
+	if (arvif->ar->twt_enabled == 0) {
+		ath11k_err(arvif->ar->ab, "TWT support is not enabled\n");
+		return -EOPNOTSUPP;
+	}
+
+	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, ubuf, count);
+	if (ret < 0)
+		return ret;
+
+	buf[ret] = '\0';
+	ret = sscanf(buf,
+		     "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %u %u %u %u %u %hhu %hhu %hhu %hhu %hhu",
+		     &params.peer_macaddr[0],
+		     &params.peer_macaddr[1],
+		     &params.peer_macaddr[2],
+		     &params.peer_macaddr[3],
+		     &params.peer_macaddr[4],
+		     &params.peer_macaddr[5],
+		     &params.dialog_id,
+		     &params.wake_intvl_us,
+		     &params.wake_intvl_mantis,
+		     &params.wake_dura_us,
+		     &params.sp_offset_us,
+		     &params.twt_cmd,
+		     &params.flag_bcast,
+		     &params.flag_trigger,
+		     &params.flag_flow_type,
+		     &params.flag_protection);
+	if (ret != 16)
+		return -EINVAL;
+
+	params.vdev_id = arvif->vdev_id;
+
+	ret = ath11k_wmi_send_twt_add_dialog_cmd(arvif->ar, &params);
+	if (ret)
+		return ret;
+
+	return count;
+}
+
+static ssize_t ath11k_write_twt_del_dialog(struct file *file,
+					   const char __user *ubuf,
+					   size_t count, loff_t *ppos)
+{
+	struct ath11k_vif *arvif = file->private_data;
+	struct wmi_twt_del_dialog_params params = { 0 };
+	u8 buf[64] = {0};
+	int ret;
+
+	if (arvif->ar->twt_enabled == 0) {
+		ath11k_err(arvif->ar->ab, "TWT support is not enabled\n");
+		return -EOPNOTSUPP;
+	}
+
+	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, ubuf, count);
+	if (ret < 0)
+		return ret;
+
+	buf[ret] = '\0';
+	ret = sscanf(buf, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %u",
+		     &params.peer_macaddr[0],
+		     &params.peer_macaddr[1],
+		     &params.peer_macaddr[2],
+		     &params.peer_macaddr[3],
+		     &params.peer_macaddr[4],
+		     &params.peer_macaddr[5],
+		     &params.dialog_id);
+	if (ret != 7)
+		return -EINVAL;
+
+	params.vdev_id = arvif->vdev_id;
+
+	ret = ath11k_wmi_send_twt_del_dialog_cmd(arvif->ar, &params);
+	if (ret)
+		return ret;
+
+	return count;
+}
+
+static ssize_t ath11k_write_twt_pause_dialog(struct file *file,
+					     const char __user *ubuf,
+					     size_t count, loff_t *ppos)
+{
+	struct ath11k_vif *arvif = file->private_data;
+	struct wmi_twt_pause_dialog_params params = { 0 };
+	u8 buf[64] = {0};
+	int ret;
+
+	if (arvif->ar->twt_enabled == 0) {
+		ath11k_err(arvif->ar->ab, "TWT support is not enabled\n");
+		return -EOPNOTSUPP;
+	}
+
+	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, ubuf, count);
+	if (ret < 0)
+		return ret;
+
+	buf[ret] = '\0';
+	ret = sscanf(buf, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %u",
+		     &params.peer_macaddr[0],
+		     &params.peer_macaddr[1],
+		     &params.peer_macaddr[2],
+		     &params.peer_macaddr[3],
+		     &params.peer_macaddr[4],
+		     &params.peer_macaddr[5],
+		     &params.dialog_id);
+	if (ret != 7)
+		return -EINVAL;
+
+	params.vdev_id = arvif->vdev_id;
+
+	ret = ath11k_wmi_send_twt_pause_dialog_cmd(arvif->ar, &params);
+	if (ret)
+		return ret;
+
+	return count;
+}
+
+static ssize_t ath11k_write_twt_resume_dialog(struct file *file,
+					      const char __user *ubuf,
+					      size_t count, loff_t *ppos)
+{
+	struct ath11k_vif *arvif = file->private_data;
+	struct wmi_twt_resume_dialog_params params = { 0 };
+	u8 buf[64] = {0};
+	int ret;
+
+	if (arvif->ar->twt_enabled == 0) {
+		ath11k_err(arvif->ar->ab, "TWT support is not enabled\n");
+		return -EOPNOTSUPP;
+	}
+
+	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, ubuf, count);
+	if (ret < 0)
+		return ret;
+
+	buf[ret] = '\0';
+	ret = sscanf(buf, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %u %u %u",
+		     &params.peer_macaddr[0],
+		     &params.peer_macaddr[1],
+		     &params.peer_macaddr[2],
+		     &params.peer_macaddr[3],
+		     &params.peer_macaddr[4],
+		     &params.peer_macaddr[5],
+		     &params.dialog_id,
+		     &params.sp_offset_us,
+		     &params.next_twt_size);
+	if (ret != 9)
+		return -EINVAL;
+
+	params.vdev_id = arvif->vdev_id;
+
+	ret = ath11k_wmi_send_twt_resume_dialog_cmd(arvif->ar, &params);
+	if (ret)
+		return ret;
+
+	return count;
+}
+
+static const struct file_operations ath11k_fops_twt_add_dialog = {
+	.write = ath11k_write_twt_add_dialog,
+	.open = simple_open
+};
+
+static const struct file_operations ath11k_fops_twt_del_dialog = {
+	.write = ath11k_write_twt_del_dialog,
+	.open = simple_open
+};
+
+static const struct file_operations ath11k_fops_twt_pause_dialog = {
+	.write = ath11k_write_twt_pause_dialog,
+	.open = simple_open
+};
+
+static const struct file_operations ath11k_fops_twt_resume_dialog = {
+	.write = ath11k_write_twt_resume_dialog,
+	.open = simple_open
+};
+
+void ath11k_debugfs_add_interface(struct ath11k_vif *arvif)
+{
+	if (arvif->vif->type == NL80211_IFTYPE_AP && !arvif->debugfs_twt) {
+		arvif->debugfs_twt = debugfs_create_dir("twt",
+							arvif->vif->debugfs_dir);
+		if (IS_ERR_OR_NULL(arvif->debugfs_twt)) {
+			ath11k_warn(arvif->ar->ab,
+				    "failed to create twt debugfs: %p\n",
+				    arvif->debugfs_twt);
+			arvif->debugfs_twt = NULL;
+			return;
+		}
+
+		debugfs_create_file("add_dialog", 0200, arvif->debugfs_twt,
+				    arvif, &ath11k_fops_twt_add_dialog);
+
+		debugfs_create_file("del_dialog", 0200, arvif->debugfs_twt,
+				    arvif, &ath11k_fops_twt_del_dialog);
+
+		debugfs_create_file("pause_dialog", 0200, arvif->debugfs_twt,
+				    arvif, &ath11k_fops_twt_pause_dialog);
+
+		debugfs_create_file("resume_dialog", 0200, arvif->debugfs_twt,
+				    arvif, &ath11k_fops_twt_resume_dialog);
+	}
+}
+
+void ath11k_debugfs_remove_interface(struct ath11k_vif *arvif)
+{
+	debugfs_remove_recursive(arvif->debugfs_twt);
+	arvif->debugfs_twt = NULL;
+}
+
+#endif /* CONFIG_ATH11K_DEBUGFS */
diff --git a/drivers/net/wireless/ath/ath11k/debug.h b/drivers/net/wireless/ath/ath11k/debug.h
index 659a275e2eb3..2b41cefb68b5 100644
--- a/drivers/net/wireless/ath/ath11k/debug.h
+++ b/drivers/net/wireless/ath/ath11k/debug.h
@@ -64,4 +64,17 @@  do {								\
 		__ath11k_dbg(ar, dbg_mask, fmt, ##__VA_ARGS__);	\
 } while (0)
 
+#ifdef CONFIG_ATH11K_DEBUGFS
+void ath11k_debugfs_add_interface(struct ath11k_vif *arvif);
+void ath11k_debugfs_remove_interface(struct ath11k_vif *arvif);
+#else /* CONFIG_ATH11K_DEBUGFS */
+static inline void ath11k_debugfs_add_interface(struct ath11k_vif *arvif)
+{
+}
+
+static inline void ath11k_debugfs_remove_interface(struct ath11k_vif *arvif)
+{
+}
+#endif /* CONFIG_ATH11K_DEBUGFS */
+
 #endif /* _ATH11K_DEBUG_H_ */
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 335d49af7dd5..aa0f2b65d10c 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -4766,6 +4766,7 @@  static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,
 	}
 
 	ath11k_dp_vdev_tx_attach(ar, arvif);
+	ath11k_debugfs_add_interface(arvif);
 
 	mutex_unlock(&ar->conf_mutex);
 
@@ -4885,6 +4886,8 @@  static void ath11k_mac_op_remove_interface(struct ieee80211_hw *hw,
 
 	/* TODO: recal traffic pause state based on the available vdevs */
 
+	ath11k_debugfs_remove_interface(arvif);
+
 	mutex_unlock(&ar->conf_mutex);
 }