[V5,7/9] drm/amd/pm: add flood detection for wbrf events
Commit Message
To protect PMFW from being overloaded.
Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
---
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 30 +++++++++++++++----
drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 7 +++++
2 files changed, 32 insertions(+), 5 deletions(-)
Comments
Hi Evan,
kernel test robot noticed the following build warnings:
[auto build test WARNING on wireless-next/main]
[also build test WARNING on wireless/main v6.4]
[cannot apply to drm-misc/drm-misc-next linus/master next-20230630]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Evan-Quan/drivers-core-Add-support-for-Wifi-band-RF-mitigations/20230630-183633
base: https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git main
patch link: https://lore.kernel.org/r/20230630103240.1557100-8-evan.quan%40amd.com
patch subject: [PATCH V5 7/9] drm/amd/pm: add flood detection for wbrf events
config: x86_64-buildonly-randconfig-r003-20230630 (https://download.01.org/0day-ci/archive/20230630/202306302258.ZdzWnrmF-lkp@intel.com/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce: (https://download.01.org/0day-ci/archive/20230630/202306302258.ZdzWnrmF-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202306302258.ZdzWnrmF-lkp@intel.com/
All warnings (new ones prefixed by >>):
drivers/gpu/drm/amd/amdgpu/../pm/swsmu/amdgpu_smu.c: In function 'smu_wbrf_init':
>> drivers/gpu/drm/amd/amdgpu/../pm/swsmu/amdgpu_smu.c:1336:31: warning: unused variable 'adev' [-Wunused-variable]
1336 | struct amdgpu_device *adev = smu->adev;
| ^~~~
vim +/adev +1336 drivers/gpu/drm/amd/amdgpu/../pm/swsmu/amdgpu_smu.c
19fbe240b2627a Evan Quan 2023-06-30 1324
19fbe240b2627a Evan Quan 2023-06-30 1325 /**
19fbe240b2627a Evan Quan 2023-06-30 1326 * smu_wbrf_init - init driver wbrf support
19fbe240b2627a Evan Quan 2023-06-30 1327 *
19fbe240b2627a Evan Quan 2023-06-30 1328 * @smu: smu_context pointer
19fbe240b2627a Evan Quan 2023-06-30 1329 *
19fbe240b2627a Evan Quan 2023-06-30 1330 * Verifies the AMD ACPI interfaces and registers with the wbrf
19fbe240b2627a Evan Quan 2023-06-30 1331 * notifier chain if wbrf feature is supported.
19fbe240b2627a Evan Quan 2023-06-30 1332 * Returns 0 on success, error on failure.
19fbe240b2627a Evan Quan 2023-06-30 1333 */
19fbe240b2627a Evan Quan 2023-06-30 1334 static int smu_wbrf_init(struct smu_context *smu)
19fbe240b2627a Evan Quan 2023-06-30 1335 {
19fbe240b2627a Evan Quan 2023-06-30 @1336 struct amdgpu_device *adev = smu->adev;
19fbe240b2627a Evan Quan 2023-06-30 1337 int ret;
19fbe240b2627a Evan Quan 2023-06-30 1338
19fbe240b2627a Evan Quan 2023-06-30 1339 if (!smu->wbrf_supported)
19fbe240b2627a Evan Quan 2023-06-30 1340 return 0;
19fbe240b2627a Evan Quan 2023-06-30 1341
0b8224d2686865 Evan Quan 2023-06-30 1342 INIT_DELAYED_WORK(&smu->wbrf_delayed_work,
0b8224d2686865 Evan Quan 2023-06-30 1343 smu_wbrf_delayed_work_handler);
0b8224d2686865 Evan Quan 2023-06-30 1344
19fbe240b2627a Evan Quan 2023-06-30 1345 smu->wbrf_notifier.notifier_call = smu_wbrf_event_handler;
19fbe240b2627a Evan Quan 2023-06-30 1346 ret = wbrf_register_notifier(&smu->wbrf_notifier);
19fbe240b2627a Evan Quan 2023-06-30 1347 if (ret)
19fbe240b2627a Evan Quan 2023-06-30 1348 return ret;
19fbe240b2627a Evan Quan 2023-06-30 1349
19fbe240b2627a Evan Quan 2023-06-30 1350 /*
19fbe240b2627a Evan Quan 2023-06-30 1351 * Some wifiband exclusion ranges may be already there
19fbe240b2627a Evan Quan 2023-06-30 1352 * before our driver loaded. To make sure our driver
19fbe240b2627a Evan Quan 2023-06-30 1353 * is awared of those exclusion ranges.
19fbe240b2627a Evan Quan 2023-06-30 1354 */
0b8224d2686865 Evan Quan 2023-06-30 1355 schedule_delayed_work(&smu->wbrf_delayed_work,
0b8224d2686865 Evan Quan 2023-06-30 1356 msecs_to_jiffies(SMU_WBRF_EVENT_HANDLING_PACE));
19fbe240b2627a Evan Quan 2023-06-30 1357
0b8224d2686865 Evan Quan 2023-06-30 1358 return 0;
19fbe240b2627a Evan Quan 2023-06-30 1359 }
19fbe240b2627a Evan Quan 2023-06-30 1360
@@ -1278,7 +1278,8 @@ static int smu_wbrf_event_handler(struct notifier_block *nb,
switch (action) {
case WBRF_CHANGED:
- smu_wbrf_handle_exclusion_ranges(smu);
+ schedule_delayed_work(&smu->wbrf_delayed_work,
+ msecs_to_jiffies(SMU_WBRF_EVENT_HANDLING_PACE));
break;
default:
return NOTIFY_DONE;
@@ -1287,6 +1288,21 @@ static int smu_wbrf_event_handler(struct notifier_block *nb,
return NOTIFY_OK;
}
+/**
+ * smu_wbrf_delayed_work_handler - callback on delayed work timer expired
+ *
+ * @work: struct work_struct pointer
+ *
+ * Flood is over and driver will consume the latest exclusion ranges.
+ */
+static void smu_wbrf_delayed_work_handler(struct work_struct *work)
+{
+ struct smu_context *smu =
+ container_of(work, struct smu_context, wbrf_delayed_work.work);
+
+ smu_wbrf_handle_exclusion_ranges(smu);
+}
+
/**
* smu_wbrf_support_check - check wbrf support
*
@@ -1323,6 +1339,9 @@ static int smu_wbrf_init(struct smu_context *smu)
if (!smu->wbrf_supported)
return 0;
+ INIT_DELAYED_WORK(&smu->wbrf_delayed_work,
+ smu_wbrf_delayed_work_handler);
+
smu->wbrf_notifier.notifier_call = smu_wbrf_event_handler;
ret = wbrf_register_notifier(&smu->wbrf_notifier);
if (ret)
@@ -1333,11 +1352,10 @@ static int smu_wbrf_init(struct smu_context *smu)
* before our driver loaded. To make sure our driver
* is awared of those exclusion ranges.
*/
- ret = smu_wbrf_handle_exclusion_ranges(smu);
- if (ret)
- dev_err(adev->dev, "Failed to handle wbrf exclusion ranges\n");
+ schedule_delayed_work(&smu->wbrf_delayed_work,
+ msecs_to_jiffies(SMU_WBRF_EVENT_HANDLING_PACE));
- return ret;
+ return 0;
}
/**
@@ -1353,6 +1371,8 @@ static void smu_wbrf_fini(struct smu_context *smu)
return;
wbrf_unregister_notifier(&smu->wbrf_notifier);
+
+ cancel_delayed_work_sync(&smu->wbrf_delayed_work);
}
static int smu_smc_hw_setup(struct smu_context *smu)
@@ -480,6 +480,12 @@ struct stb_context {
#define WORKLOAD_POLICY_MAX 7
+/*
+ * Configure wbrf event handling pace as there can be only one
+ * event processed every SMU_WBRF_EVENT_HANDLING_PACE ms.
+ */
+#define SMU_WBRF_EVENT_HANDLING_PACE 10
+
struct smu_context
{
struct amdgpu_device *adev;
@@ -579,6 +585,7 @@ struct smu_context
/* data structures for wbrf feature support */
bool wbrf_supported;
struct notifier_block wbrf_notifier;
+ struct delayed_work wbrf_delayed_work;
};
struct i2c_adapter;