From patchwork Fri Jun 30 10:32:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evan Quan X-Patchwork-Id: 114666 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp10258405vqr; Fri, 30 Jun 2023 03:43:57 -0700 (PDT) X-Google-Smtp-Source: APBJJlFlZSzxIrCeqrva9rAoQHPdQOHl34OjMwcU8wHwIB2EO+pweZQ11lUPJX2J3Wim88/sJi/K X-Received: by 2002:a05:6870:80c9:b0:1b0:1087:4475 with SMTP id r9-20020a05687080c900b001b010874475mr3048751oab.26.1688121836917; Fri, 30 Jun 2023 03:43:56 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1688121836; cv=pass; d=google.com; s=arc-20160816; b=bpRvgH2P+wibdcsb2eXepu5wQGR0hOcJ5vJxOiTDaK7nBP9aa/J5WMJjGfDLJ+hZQd 5aC43PAkjzGOUEylBxURolPcMDyQWVaTvRs7QqW/d7kCoo9GU0NmUV/ojtLvfnl9IYJh UfnDqBSa/vLU+38XizBHr3wa04gG5Ps/AwIIDJ7CZJDq6AtGIKDeKpiikdrlq4PHAgOt rACNrTuweNVfdXEm8t+l1uQmrdIgHj7wbYN2+7paQWdp3v8m9Ym9SXBRI0VGMpIy52ND CUj3TNHDXqezInGKZRUjdM3bnb/4fAHefY4/3Obzz17HlsQp4cmA6IepYMLnKMkmTIrO 8snQ== 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=cfth29BrWZrzk+qu1CaoTQ6BbwxlunM+2D18Jm9HX9w=; fh=7yAUDM/fW7MjH1A34f3XGs5dG3yJvcsrWz5pWYGU/Dc=; b=0/6KXt/DDMr/Dqcy0rs3V0Z+rDqcUFzOO0cOdpf9sOVnMknACSxpnIlvpjsqW5+J77 L8vfHLG1W9OGsmFA7OYl1tClKp2NJfOhRO4g4rc4JtR/Ine/fS3VDB13RuuyJ0EysjtA RluuLe2aB4hLKPOierx0ay0zkDUTQBi4ae5JiHSWZwIXyBLh4e+Xr9h0fD5p7vY2Q3ha JC9hi8dxjqija06AC0SHxmWZ0g7eRURJHUWImNTK5uW7zb89mJaYImcxEbqydVTy0G69 A2g01xT4WdxhOBv8Wg4/OBbliRpkC6BV+/t396g4Ygbesbai/GSeqziSihuHVt1PjFm7 fY0A== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=fdj7mstP; 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 s10-20020a170902ea0a00b001b8698d619asi1602845plg.602.2023.06.30.03.43.44; Fri, 30 Jun 2023 03:43:56 -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=fdj7mstP; 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 S232835AbjF3KiN (ORCPT + 99 others); Fri, 30 Jun 2023 06:38:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232674AbjF3KhF (ORCPT ); Fri, 30 Jun 2023 06:37:05 -0400 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85B954681; Fri, 30 Jun 2023 03:35:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=an9t2hp4OGSK7KXcymIj9sZ+OTaVXcigFQrMAbCM4j5i+ojBaFwa5dUaC5U+7nIbWnDAgCmmMBg4sIi0PR92EuzqwF9BalYvK/RndsueVJIrzWwyFfjpgacZloVXT0ZUQss1RN1CBxCGKnfegyh6MqEHXUxdAsIOAYCJI0CzeRJY2Um7F90hEGgydpeerNCY1SYp+amgJBo0VGy2ZkiJrsq2e4j0ohmCdTmujxInztfsoBobQPCnvhsQDMdVDaxDUlUfrqU1PP8TpFdP+aQGxpr5D287mYdVwv9793ORNuqO3ZcA6TnF1Rj6TFkFdbSg7fA3Dhe2ZDaqXVjrj2cvHw== 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=cfth29BrWZrzk+qu1CaoTQ6BbwxlunM+2D18Jm9HX9w=; b=hSj67nbxuuLhLIPfDzXeffrQCMVv5jOBhY1cS4tZOhs1DawN1uB0pWUarap8wqYN1GUFTMARSHWxoCPfXFHJsjhI2M1ekpT0bAQmO9fWWMWMxH6gl/phD5UFnp1S5C+TmgXSf+jfYcfbbmc4sFJTv43GgCvlMCVTHlms43ZBoPYia5WFz0uzonopp+S9XQLPvUfHHpTdJJ6fxg2n/qpHAkGvgmWH3+FvGB5XYNWsSGwvRJuQpiqSC2ApgobWP7hnwagbsmlCITc9Po0PPQh1oifEZADqsIOLuTa1Lz/iMBEQYcFasPDQ6kcpelvFdcGgpcmkwrH5DfNPB5ZfclE3yQ== 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=cfth29BrWZrzk+qu1CaoTQ6BbwxlunM+2D18Jm9HX9w=; b=fdj7mstPKgfFd6nme2B0SKu4II8yZUXtIPwkn7cJVZHFA9zLxctlcDmHnXoQWexrrP+qpwEiNrztr8kl8N8ny8n/wyeIGeR3EskHWmDmVE0k2Ft5PLDdIJWIMdhdiX9OWlSztEfpS5F9rUy9dBCOJCoLchvzbLqtFvnhrS39XuA= Received: from DS7PR03CA0238.namprd03.prod.outlook.com (2603:10b6:5:3ba::33) by IA1PR12MB8357.namprd12.prod.outlook.com (2603:10b6:208:3ff::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Fri, 30 Jun 2023 10:35:34 +0000 Received: from DM6NAM11FT066.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3ba:cafe::a3) by DS7PR03CA0238.outlook.office365.com (2603:10b6:5:3ba::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.22 via Frontend Transport; Fri, 30 Jun 2023 10:35: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 DM6NAM11FT066.mail.protection.outlook.com (10.13.173.179) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6500.49 via Frontend Transport; Fri, 30 Jun 2023 10:35:33 +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, 30 Jun 2023 05:35:26 -0500 From: Evan Quan To: , , , , , , , , , , , , , , , , , , , , , , , , CC: , , , , , , Evan Quan , Mario Limonciello Subject: [PATCH V5 9/9] drm/amd/pm: enable Wifi RFI mitigation feature support for SMU13.0.7 Date: Fri, 30 Jun 2023 18:32:40 +0800 Message-ID: <20230630103240.1557100-10-evan.quan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230630103240.1557100-1-evan.quan@amd.com> References: <20230630103240.1557100-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: DM6NAM11FT066:EE_|IA1PR12MB8357:EE_ X-MS-Office365-Filtering-Correlation-Id: ec17b99f-5e18-4126-1f48-08db7955bc37 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Gc9QSWXbnkwvEF9SJSkxyi880uE5eYjV8yoxgAYdLgwTMNrCCZ+gPx8N4GQOpcc53RubPd2v35iOyQPyoLbVDRhpETZV3rq8SF7m5H1ZNKUMxM2r6R6INe3JMjeIOSGOH/+uqPalyyBZiUBYqhKpIGz1qOKvfKUZqsruv1VAuUO1WYdmDkyfjD3ysWTVoDZYV9oCOyg5SUd5KUkm2z8m8zEsarP5yj83J7jH9rA3Yawv/woBIG4EZX/0029wkM4IoCWLhAaW36KZhMZUSNFyCZtb4ZtO6y9bTEh3TWTUvVNjBI62rq2SZ6VQMdpnktJGI8Cvvq5xmVHrtzdbUJ6X6kP0UNZYV9UKk/V0WJhH05RXoQmhBc9FF3CNtBc33tSod/OGZFn/5Xs8x7qk/j1QRTEPmNnF341EAgpDicStTm+E2Q3op6rpLCftM/iXCXSFlSfl8yFDg1yzVcKTLZM9XXXZU13pbKvW8ZGve2RVJcd2lGvbtQQmxZrSXCc292i/eXMBDcvbFcy/h/2+hcRoXBxLCuPPQYc2DcIoazgpGLZdRevIt6jroJeSIN8x/Q2Sj0SOWmRkmwfPL9mL3+O5W3kTGRaq1TgDHJJE8Rz26bT/cLGu6rM+aAcru2GyNl1OLfXyDBXQqha/47N3RgLlaGeSzNVodJL9DRWKLGD2aveZD6IpvdOd1QoWCSYnDrlIXg+/aMjZ3TcUJT5H49By/uG6U1wUL3CNP3znSjnAUdRHYQsUww9Rd6Tj3qZe2bdmW6So3ww+agFgARimksPMt0bqxHiExhM6GKvqnBChvJfpNib9WMVkx9JYNQumirnQSa+byb0kdWWnXNLlp2hCZw== 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)(396003)(136003)(39860400002)(376002)(346002)(451199021)(46966006)(36840700001)(40470700004)(426003)(83380400001)(336012)(47076005)(316002)(6666004)(110136005)(8676002)(7696005)(4326008)(8936002)(41300700001)(40460700003)(36860700001)(36756003)(54906003)(40480700001)(82310400005)(82740400003)(86362001)(81166007)(356005)(921005)(2616005)(70586007)(44832011)(7416002)(5660300002)(478600001)(70206006)(2906002)(186003)(16526019)(26005)(1076003)(2101003)(83996005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2023 10:35:33.9186 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ec17b99f-5e18-4126-1f48-08db7955bc37 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: DM6NAM11FT066.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8357 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?1770124043215367258?= X-GMAIL-MSGID: =?utf-8?q?1770124043215367258?= 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 bba621615abf..4a680756208b 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 @@ -126,6 +126,7 @@ static struct cmn2asic_msg_mapping smu_v13_0_7_message_map[SMU_MSG_MAX_COUNT] = MSG_MAP(AllowGpo, PPSMC_MSG_SetGpoAllow, 0), MSG_MAP(GetPptLimit, PPSMC_MSG_GetPptLimit, 0), MSG_MAP(NotifyPowerSource, PPSMC_MSG_NotifyPowerSource, 0), + MSG_MAP(EnableUCLKShadow, PPSMC_MSG_EnableUCLKShadow, 0), }; static struct cmn2asic_mapping smu_v13_0_7_clk_map[SMU_CLK_COUNT] = { @@ -206,6 +207,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] = { @@ -488,6 +490,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) @@ -1722,6 +1727,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, @@ -1787,6 +1843,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)