From patchwork Fri Jun 16 06:57:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evan Quan X-Patchwork-Id: 108887 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1141079vqr; Fri, 16 Jun 2023 00:11:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6z5YBmYD8eiiFSvgemaoypQvcuxVdzOi3EjXg99mqn3ublV6Tu6THOBYRGZFei081C9M7W X-Received: by 2002:a17:90a:430a:b0:259:bff8:17a2 with SMTP id q10-20020a17090a430a00b00259bff817a2mr9286565pjg.0.1686899488409; Fri, 16 Jun 2023 00:11:28 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1686899488; cv=pass; d=google.com; s=arc-20160816; b=csLzrlUDP+DHSbiK5GR8IaY3JMC7gv3zJaZ7Dah9YMPJv0OQ+iC2YD3X7ENsHECSN2 hw6vdaMj6/bKNENsXKtKWrb7MtHl8t19rpjBa4993RVv31l9C7M08Lfn8ukOt7KnHVvT Yhdr5G8j1VGjM7SKND5oeNH2bRN7b1clsXkJnWaCLB4eT0NKqPs8p2Q05oytygEWLMh6 DrHO/w0b2gntZ/zOke5TxPhoi59fWy27ldpx1rrO8Fzyqft5NVEg/zYCIeGRm8XqfpNR PIDW2LAmjGYBz3jUpCpQyht9+WDst6enYaM3AVs65i6CvESbnc1433vkOeUoXYLLXsak 5LNg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=uE+bqOMK/vEPNCeadJJAJvY4Ncouei1S5fSDGvN5UTc=; b=I9SZVm+MFH5U7vsSAeuNozo8k4H1RT1Ba7AYPjwjhHS3ZzYhI1BRXxQT7ehEtYmaS8 zyD/jlMSV61BA+mhmP+A4UF+tesNxkIJoORfJMS+12VbOQJ++nvj6d9y95V6g+brPrXc 7u1sTwfI+AOgzjNklm+TO/bkZsTKyvDxuNfvDX5Im9M2GtYkUr51M9lCaEHaTWiuYDg0 ALJbYymvlwOnFjswfGyQAm3YMIgcs8NZPsikOD/xdp+v8kFos6unD8Qd6H6OC2CvA8PF b9TNCNEr6MciUQKJqekY3Zzw1bog0wCGXeh9lYL8gZzYskLIah2FhYLJWmHc56sEqCRs hu5Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=NVejxeaI; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a6-20020a17090abe0600b00259b538399csi991801pjs.46.2023.06.16.00.11.13; Fri, 16 Jun 2023 00:11:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=NVejxeaI; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243365AbjFPHAf (ORCPT + 99 others); Fri, 16 Jun 2023 03:00:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244285AbjFPG75 (ORCPT ); Fri, 16 Jun 2023 02:59:57 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2078.outbound.protection.outlook.com [40.107.94.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F23435B8; Thu, 15 Jun 2023 23:59:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eM3ALuLW2bO38Yg5AmFc2WGSc04j0AtSRzZpExnBfIvfvC1NHPyQJ4XalH490mTkKtMEujYxkqcs7WPGAXOw6pl6n4zIaz+boWlsdFemkvOpQCfw7pdeszB0yr3RIYZoGMquKt3DAVrx0TP2P6E+e8h+98TG4c5UB6Hez8g6BZmaTmnvYoUcmeo+SqGtNHLvhIsWgsu0NxVXtYNojH6FhIBmISkDRYt6ukLl4Xg0MYMchn4HcrBZEbVwXps2QPdfpK0ITiKzIq3acKuZmyrm7VFizgAm75AeH4V0kWUpd15pfD5qAJgCCh1CLMQmbcr97MOLTZEqVLSmVYlC3mR6Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uE+bqOMK/vEPNCeadJJAJvY4Ncouei1S5fSDGvN5UTc=; b=DaVrbSVmz/65cXUrJRlwzWmrZRdQuDzcTjyzTF5KOAs4M3n13LaV1Ea0os+Sx2NdBKpkhUVF9aMnpJFXXOFTXerkUzp6ILDX07E3gQgdp9YH7q/ke1C2Ci9dZby76Ni/b254UkCdPjAooCN3pUh0xyKelZg8XxEvnSp3rNYxYx5o2ZaBiRr5pOj47LXnA4rYeRw+LckwUDLBu6sbseHt4zo+gvy2GEudzRAx8dvaricCh2nZXg4MmQzp0BwfRpYOgo9teT//kYZnOwRnNozTmNTyZbhbv5q8ZCgDLGhejQ5fAfeD2uJe2A94JnbEXodGSii5ykxvE9U+SGCPEJQ14A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uE+bqOMK/vEPNCeadJJAJvY4Ncouei1S5fSDGvN5UTc=; b=NVejxeaInamfF1ktLA8XLLOBDvq+Mg6Nu0MA7Nshnb8x4b7u/ifItgN9aeZCKT6aqJ6LxjqV0+dOI1zu4t5X8z7NYA35ukB1Kpbatup1goEKvwiZFCkuJ7LF6MczeK6ojQaY8DmWH2fXU/ZTwHggMr8fL+zkLwGCGOz4y6JMyWA= Received: from BN7PR02CA0009.namprd02.prod.outlook.com (2603:10b6:408:20::22) by IA0PR12MB8645.namprd12.prod.outlook.com (2603:10b6:208:48f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.25; Fri, 16 Jun 2023 06:59:34 +0000 Received: from BN8NAM11FT021.eop-nam11.prod.protection.outlook.com (2603:10b6:408:20:cafe::61) by BN7PR02CA0009.outlook.office365.com (2603:10b6:408:20::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.29 via Frontend Transport; Fri, 16 Jun 2023 06:59:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT021.mail.protection.outlook.com (10.13.177.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6500.29 via Frontend Transport; Fri, 16 Jun 2023 06:59:34 +0000 Received: from equan-buildpc.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Fri, 16 Jun 2023 01:59:28 -0500 From: Evan Quan To: , , , , , , , , , , , , , , , , CC: , , , , , Evan Quan Subject: [PATCH V3 7/7] drm/amd/pm: enable Wifi RFI mitigation feature support for SMU13.0.7 Date: Fri, 16 Jun 2023 14:57:57 +0800 Message-ID: <20230616065757.1054422-8-evan.quan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230616065757.1054422-1-evan.quan@amd.com> References: <20230616065757.1054422-1-evan.quan@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT021:EE_|IA0PR12MB8645:EE_ X-MS-Office365-Filtering-Correlation-Id: 04d2a67b-b03e-485d-d802-08db6e373e02 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MremAtLguZwFMuHBILadQECqMSpjCQHzqvGTwBLvJxdCYtH54pC9CyMmkctWC6hb6Quk7U8i/oCbhJskpyYdyvroyXzcY3xWreXsCInBg3j+uLIFcc5esyZT1mrXNlgvtWN4hzrtaocnr8VtH7NsUzBYK37YOOLYMGAsrhgpyEa+d5ysetaH3GwHfVbW2H0fpYQeVMe+ffxwCdBy/NOp2GqOzoz5FbeH2stxkF8M+691WtWCQNUvSOv6DMgMCyWvSaf/YDjo0HonDg6AKQ54VPGpZ7GHFPtWgn7tlCwCvthPSi+ZB+V/CrQpsgUTBPdK/qtwqUPi4j/QxnnT1LyVwyCK1YIwyKvayW8oNL4pDZFw1K77487ACLr4Yil/AGM7AbYSiOcWxN1XTcj8gbQ6LtMf+ZeRVHM+VuEl9T14ti6QFy345D7B8DWHJtNt0h2bAtBTSErz7xHvQXWGle2k356hpbZ3vjgJURFwTbHcJTy4nuv+/7rOMhUUMQIP64V094/i+2EHFT57kglgnMlcp9SL6RHREDU2yj9yxoTmw/SaHs/oRIKmd71hbWZMpfvnYRvk+/FrtWo/v/o4bPUuunDGDyZMK21rCoaLUJhr3/nJgeEEj0e25RYm9+o7VgIQU+ZegtteWFz2loRK076RR6Qx3QhILbl9KavB911LeRVQ6uXky5L4Ur2aqulHMcjGuOoP/vx9+HYkEPfRYcPGfWZgtb5kahbfkeLw16+NuGWFQEE0G+MU8j4JaXt1BN4t+rIg64KpJfZiERRsIb3LuQDVSA0bRQ2smdmYvz4rUCM= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(136003)(396003)(376002)(39860400002)(346002)(451199021)(40470700004)(36840700001)(46966006)(44832011)(7416002)(70586007)(4326008)(86362001)(2906002)(316002)(6636002)(70206006)(41300700001)(110136005)(5660300002)(8676002)(8936002)(54906003)(356005)(40480700001)(82310400005)(478600001)(81166007)(921005)(7696005)(6666004)(82740400003)(40460700003)(47076005)(83380400001)(186003)(26005)(16526019)(1076003)(36756003)(2616005)(426003)(336012)(36860700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 06:59:34.5218 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 04d2a67b-b03e-485d-d802-08db6e373e02 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT021.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8645 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768842317801064518?= X-GMAIL-MSGID: =?utf-8?q?1768842317801064518?= Fulfill the SMU13.0.7 support for Wifi RFI mitigation feature. Signed-off-by: Evan Quan Reviewed-by: Mario Limonciello --- .../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)