From: Mario Limonciello <mario.limonciello@amd.com>
To: Evan Quan <evan.quan@amd.com>,
rafael@kernel.org, lenb@kernel.org, Alexander.Deucher@amd.com,
Christian.Koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com,
daniel@ffwll.ch, kvalo@kernel.org, nbd@nbd.name,
lorenzo@kernel.org, ryder.lee@mediatek.com,
shayne.chen@mediatek.com, sean.wang@mediatek.com,
matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com,
Lijo.Lazar@amd.com
Cc: linux-acpi@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
amd-gfx@lists.freedesktop.org
Subject: Re: [PATCH V3 7/7] drm/amd/pm: enable Wifi RFI mitigation feature support for SMU13.0.7
Date: Sun, 18 Jun 2023 21:27:37 -0500 [thread overview]
Message-ID: <2bf4e20b-b206-6337-dcee-d8a13804db50@amd.com> (raw)
In-Reply-To: <20230616065757.1054422-8-evan.quan@amd.com>
On 6/16/23 01:57, Evan Quan wrote:
> Fulfill the SMU13.0.7 support for Wifi RFI mitigation feature.
>
> Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
> ---
> .../drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 59 +++++++++++++++++++
> 1 file changed, 59 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
> index 98a33f8ee209..16c1c04e2034 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
> @@ -125,6 +125,7 @@ static struct cmn2asic_msg_mapping smu_v13_0_7_message_map[SMU_MSG_MAX_COUNT] =
> MSG_MAP(ArmD3, PPSMC_MSG_ArmD3, 0),
> MSG_MAP(AllowGpo, PPSMC_MSG_SetGpoAllow, 0),
> MSG_MAP(GetPptLimit, PPSMC_MSG_GetPptLimit, 0),
> + MSG_MAP(EnableUCLKShadow, PPSMC_MSG_EnableUCLKShadow, 0),
> };
>
> static struct cmn2asic_mapping smu_v13_0_7_clk_map[SMU_CLK_COUNT] = {
> @@ -205,6 +206,7 @@ static struct cmn2asic_mapping smu_v13_0_7_table_map[SMU_TABLE_COUNT] = {
> TAB_MAP(DRIVER_SMU_CONFIG),
> TAB_MAP(ACTIVITY_MONITOR_COEFF),
> [SMU_TABLE_COMBO_PPTABLE] = {1, TABLE_COMBO_PPTABLE},
> + TAB_MAP(WIFIBAND),
> };
>
> static struct cmn2asic_mapping smu_v13_0_7_pwr_src_map[SMU_POWER_SOURCE_COUNT] = {
> @@ -487,6 +489,9 @@ static int smu_v13_0_7_tables_init(struct smu_context *smu)
> AMDGPU_GEM_DOMAIN_VRAM);
> SMU_TABLE_INIT(tables, SMU_TABLE_COMBO_PPTABLE, MP0_MP1_DATA_REGION_SIZE_COMBOPPTABLE,
> PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
> + SMU_TABLE_INIT(tables, SMU_TABLE_WIFIBAND,
> + sizeof(WifiBandEntryTable_t), PAGE_SIZE,
> + AMDGPU_GEM_DOMAIN_VRAM);
>
> smu_table->metrics_table = kzalloc(sizeof(SmuMetricsExternal_t), GFP_KERNEL);
> if (!smu_table->metrics_table)
> @@ -1721,6 +1726,57 @@ static int smu_v13_0_7_set_df_cstate(struct smu_context *smu,
> NULL);
> }
>
> +static bool smu_v13_0_7_wbrf_support_check(struct smu_context *smu)
> +{
> + return smu->smc_fw_version > 0x00524600;
> +}
> +
> +static int smu_v13_0_7_set_wbrf_exclusion_ranges(struct smu_context *smu,
> + struct exclusion_range *exclusion_ranges)
> +{
> + WifiBandEntryTable_t wifi_bands;
> + int valid_entries = 0;
> + int ret, i;
> +
> + memset(&wifi_bands, 0, sizeof(wifi_bands));
> + for (i = 0; i < ARRAY_SIZE(wifi_bands.WifiBandEntry); i++) {
> + if (!exclusion_ranges[i].start &&
> + !exclusion_ranges[i].end)
> + break;
> +
> + /* PMFW expects the inputs to be in Mhz unit */
> + wifi_bands.WifiBandEntry[valid_entries].LowFreq =
> + DIV_ROUND_DOWN_ULL(exclusion_ranges[i].start, HZ_IN_MHZ);
> + wifi_bands.WifiBandEntry[valid_entries++].HighFreq =
> + DIV_ROUND_UP_ULL(exclusion_ranges[i].end, HZ_IN_MHZ);
> + }
> + wifi_bands.WifiBandEntryNum = valid_entries;
> +
> + /*
> + * Per confirm with PMFW team, WifiBandEntryNum = 0 is a valid setting.
> + * Considering the scenarios below:
> + * - At first the wifi device adds an exclusion range e.g. (2400,2500) to
> + * BIOS and our driver gets notified. We will set WifiBandEntryNum = 1
> + * and pass the WifiBandEntry (2400, 2500) to PMFW.
> + *
> + * - Later the wifi device removes the wifiband list added above and
> + * our driver gets notified again. At this time, driver will set
> + * WifiBandEntryNum = 0 and pass an empty WifiBandEntry list to PMFW.
> + * - PMFW may still need to do some uclk shadow update(e.g. switching
> + * from shadow clock back to primary clock) on receiving this.
> + */
> +
> + ret = smu_cmn_update_table(smu,
> + SMU_TABLE_WIFIBAND,
> + 0,
> + (void *)(&wifi_bands),
> + true);
> + if (ret)
> + dev_err(smu->adev->dev, "Failed to set wifiband!");
> +
> + return ret;
> +}
> +
> static const struct pptable_funcs smu_v13_0_7_ppt_funcs = {
> .get_allowed_feature_mask = smu_v13_0_7_get_allowed_feature_mask,
> .set_default_dpm_table = smu_v13_0_7_set_default_dpm_table,
> @@ -1786,6 +1842,9 @@ static const struct pptable_funcs smu_v13_0_7_ppt_funcs = {
> .set_mp1_state = smu_v13_0_7_set_mp1_state,
> .set_df_cstate = smu_v13_0_7_set_df_cstate,
> .gpo_control = smu_v13_0_gpo_control,
> + .is_asic_wbrf_supported = smu_v13_0_7_wbrf_support_check,
> + .enable_uclk_shadow = smu_v13_0_enable_uclk_shadow,
> + .set_wbrf_exclusion_ranges = smu_v13_0_7_set_wbrf_exclusion_ranges,
> };
>
> void smu_v13_0_7_set_ppt_funcs(struct smu_context *smu)
prev parent reply other threads:[~2023-06-19 2:27 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-16 6:57 [PATCH V3 0/7] Support Wifi RFI interference mitigation feature Evan Quan
2023-06-16 6:57 ` [PATCH V3 1/7] drivers/acpi: Add support for Wifi band RF mitigations Evan Quan
2023-06-19 2:04 ` Mario Limonciello
2023-06-21 1:26 ` Quan, Evan
2023-06-16 6:57 ` [PATCH V3 2/7] wifi: mac80211: Add support for ACPI WBRF Evan Quan
2023-06-19 2:17 ` Mario Limonciello
2023-06-19 8:24 ` Johannes Berg
2023-06-21 1:04 ` Quan, Evan
2023-06-21 1:24 ` Quan, Evan
2023-06-16 6:57 ` [PATCH V3 3/7] drm/amd/pm: update driver_if and ppsmc headers for coming wbrf feature Evan Quan
2023-06-19 2:18 ` Mario Limonciello
2023-06-16 6:57 ` [PATCH V3 4/7] drm/amd/pm: setup the framework to support Wifi RFI mitigation feature Evan Quan
2023-06-19 2:22 ` Mario Limonciello
2023-06-19 14:54 ` Lazar, Lijo
2023-06-21 0:34 ` Quan, Evan
2023-06-16 6:57 ` [PATCH V3 5/7] drm/amd/pm: add flood detection for wbrf events Evan Quan
2023-06-19 2:22 ` Mario Limonciello
2023-06-16 6:57 ` [PATCH V3 6/7] drm/amd/pm: enable Wifi RFI mitigation feature support for SMU13.0.0 Evan Quan
2023-06-19 2:26 ` Mario Limonciello
2023-06-16 6:57 ` [PATCH V3 7/7] drm/amd/pm: enable Wifi RFI mitigation feature support for SMU13.0.7 Evan Quan
2023-06-19 2:27 ` Mario Limonciello [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2bf4e20b-b206-6337-dcee-d8a13804db50@amd.com \
--to=mario.limonciello@amd.com \
--cc=Alexander.Deucher@amd.com \
--cc=Christian.Koenig@amd.com \
--cc=Lijo.Lazar@amd.com \
--cc=Xinhui.Pan@amd.com \
--cc=airlied@gmail.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=angelogioacchino.delregno@collabora.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=evan.quan@amd.com \
--cc=kvalo@kernel.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lorenzo@kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=nbd@nbd.name \
--cc=rafael@kernel.org \
--cc=ryder.lee@mediatek.com \
--cc=sean.wang@mediatek.com \
--cc=shayne.chen@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).