wil6210: remove suspend time statistics

Currently suspend time statistics are showed through debugfs.
Remove time statistics in suspend state since the timing may
not be accurate in that state.

Signed-off-by: Lazar Alexei <qca_ailizaro@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c
index 06b9c56bf4b581049d30f9525a0c0b1fca28de71..edaab0f5a11edefd52c6ce44316f1bd596c8be03 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/debugfs.c
+++ b/drivers/net/wireless/ath/wil6210/debugfs.c
@@ -1632,8 +1632,6 @@ static ssize_t wil_write_suspend_stats(struct file *file,
        struct wil6210_priv *wil = file->private_data;
 
        memset(&wil->suspend_stats, 0, sizeof(wil->suspend_stats));
-       wil->suspend_stats.min_suspend_time = ULONG_MAX;
-       wil->suspend_stats.collection_start = ktime_get();
 
        return len;
 }
@@ -1645,27 +1643,18 @@ static ssize_t wil_read_suspend_stats(struct file *file,
        struct wil6210_priv *wil = file->private_data;
        static char text[400];
        int n;
-       unsigned long long stats_collection_time =
-               ktime_to_us(ktime_sub(ktime_get(),
-                                     wil->suspend_stats.collection_start));
 
        n = snprintf(text, sizeof(text),
                     "Suspend statistics:\n"
                     "successful suspends:%ld failed suspends:%ld\n"
                     "successful resumes:%ld failed resumes:%ld\n"
-                    "rejected by host:%ld rejected by device:%ld\n"
-                    "total suspend time:%lld min suspend time:%lld\n"
-                    "max suspend time:%lld stats collection time: %lld\n",
+                    "rejected by host:%ld rejected by device:%ld\n",
                     wil->suspend_stats.successful_suspends,
                     wil->suspend_stats.failed_suspends,
                     wil->suspend_stats.successful_resumes,
                     wil->suspend_stats.failed_resumes,
                     wil->suspend_stats.rejected_by_host,
-                    wil->suspend_stats.rejected_by_device,
-                    wil->suspend_stats.total_suspend_time,
-                    wil->suspend_stats.min_suspend_time,
-                    wil->suspend_stats.max_suspend_time,
-                    stats_collection_time);
+                    wil->suspend_stats.rejected_by_device);
 
        n = min_t(int, n, sizeof(text));
 
@@ -1836,8 +1825,6 @@ int wil6210_debugfs_init(struct wil6210_priv *wil)
 
        wil6210_debugfs_create_ITR_CNT(wil, dbg);
 
-       wil->suspend_stats.collection_start = ktime_get();
-
        return 0;
 }
 

diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index e92fd35a43368f92b80ad1ae968009de5297fc92..1b53cd3f272b70d0670475d5cfee242eb7eb7b6d 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -579,7 +579,6 @@ int wil_priv_init(struct wil6210_priv *wil)
        wil->wakeup_trigger = WMI_WAKEUP_TRIGGER_UCAST |
                              WMI_WAKEUP_TRIGGER_BCAST;
        memset(&wil->suspend_stats, 0, sizeof(wil->suspend_stats));
-       wil->suspend_stats.min_suspend_time = ULONG_MAX;
        wil->vring_idle_trsh = 16;
 
        return 0;

diff --git a/drivers/net/wireless/ath/wil6210/pm.c b/drivers/net/wireless/ath/wil6210/pm.c
index 6fd5420e3e9d01510a37ed8df7abe0eec61f4232..9fba237be358f47ae954195b75490b53a08f6eff 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/pm.c
+++ b/drivers/net/wireless/ath/wil6210/pm.c
@@ -323,16 +323,12 @@ int wil_suspend(struct wil6210_priv *wil, bool is_runtime, bool keep_radio_on)
        wil_dbg_pm(wil, "suspend: %s => %d\n",
                   is_runtime ? "runtime" : "system", rc);
 
-       if (!rc)
-               wil->suspend_stats.suspend_start_time = ktime_get();
-
        return rc;
 }
 
 int wil_resume(struct wil6210_priv *wil, bool is_runtime, bool keep_radio_on)
 {
        int rc = 0;
-       unsigned long long suspend_time_usec = 0;
 
        wil_dbg_pm(wil, "resume: %s\n", is_runtime ? "runtime" : "system");
 
@@ -350,21 +346,9 @@ int wil_resume(struct wil6210_priv *wil, bool is_runtime, bool keep_radio_on)
        else
                rc = wil_resume_radio_off(wil);
 
-       if (rc)
-               goto out;
-
-       suspend_time_usec =
-               ktime_to_us(ktime_sub(ktime_get(),
-                                     wil->suspend_stats.suspend_start_time));
-       wil->suspend_stats.total_suspend_time += suspend_time_usec;
-       if (suspend_time_usec < wil->suspend_stats.min_suspend_time)
-               wil->suspend_stats.min_suspend_time = suspend_time_usec;
-       if (suspend_time_usec > wil->suspend_stats.max_suspend_time)
-               wil->suspend_stats.max_suspend_time = suspend_time_usec;
-
 out:
-       wil_dbg_pm(wil, "resume: %s => %d, suspend time %lld usec\n",
-                  is_runtime ? "runtime" : "system", rc, suspend_time_usec);
+       wil_dbg_pm(wil, "resume: %s => %d\n", is_runtime ? "runtime" : "system",
+                  rc);
        return rc;
 }
 

diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
index 7e017b13d14e809c24beeaddc37e0f40e0da610c..ea04117f2adfaaf2e9f9f301d23db83f215da135 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -89,11 +89,6 @@ struct wil_suspend_stats {
        unsigned long failed_resumes;
        unsigned long rejected_by_device;
        unsigned long rejected_by_host;
-       unsigned long long total_suspend_time;
-       unsigned long long min_suspend_time;
-       unsigned long long max_suspend_time;
-       ktime_t collection_start;
-       ktime_t suspend_start_time;
 };
 
 /* Calculate MAC buffer size for the firmware. It includes all overhead,