From patchwork Wed Apr 27 13:53:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Meng, Li \(Jassmine\)" X-Patchwork-Id: 568711 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F2E2C433EF for ; Wed, 27 Apr 2022 13:54:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236802AbiD0N5o (ORCPT ); Wed, 27 Apr 2022 09:57:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236713AbiD0N5l (ORCPT ); Wed, 27 Apr 2022 09:57:41 -0400 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2077.outbound.protection.outlook.com [40.107.237.77]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67AFF18B2B; Wed, 27 Apr 2022 06:54:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AptdQA796wFnylpVjyqJs/lqkMkGRCsT75UTYoiH0GLEXm6PGBRMxj+K5UBlwwHIvXz6bULYQ3UqulhwGagFl+JeTIDo2ziWurbYjnxndqVPkedd5UYbCQzU9+XUrhJcU8u0fCu/h9oKh9f/0XNX+oljYltSeIk77olQg1aiCjhIMX5pBZ2W6qLrtwmnm+8j8XDrFrL2VyuJSHQQhJ+2GT5CKjaZt+iGvMnX+DDls6z7QrrU+AB7bOGQEqbclws00ek429GRQMUmph4nYLqjEAtTSvHOVkCv5vLmqM9Ve8uacH/pAUkXDDCdV9YY2DfSv9z4/TinY0Gpo27AgovLxQ== 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=b+wOfCdRwgj/6ZeQwgXf03nEyYTE16Ul9UFK/lXk0nQ=; b=Mc3pKdIFHZWt+HwPi0uB+ezdj/ju3E9GGmPCjVedDLvv5NkTnXeu8qmpLUZb1Yk/UlwOknFJ+hEnllRoE0mV0AO/Q0dV+4i2Os6YZBx7wpevG0+q9gTlCjzHJR6fdWUW8GH7Brsv5HCgddFjy6UvYSVFspYZx5j3xHimGdylXJsDCdcTAn3QgmNs/AdEKeEveF7wSqPIL/szODEDOYqMNPcDqp4RtRB/qHmqX0cl7WgBjbPyR9vHhSn3pj9w9a717pAA4ER1SKeGu3mmTpTKNgRjNrQVgiWMkthQDsKk8RLxo0LZVE/YPS/8Tx56Ly92Zb5U2x+6zpQ1r63EA5Rz5w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linuxfoundation.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=b+wOfCdRwgj/6ZeQwgXf03nEyYTE16Ul9UFK/lXk0nQ=; b=CkjCtTT4DUwzMIFWqJn9aFaj3vXDrXnhreTG/QdmjFMJ68hc6ahnJ5I98BIV33hyob+XmS6pJpV1QsOgyw0bWt5LkFFus725ES8Z+DD2iDY1Amn6J/5Gd4eNAcdvbbBEnNPkIMYzwupfAVqsl3U2IgKMcDTXnpejidmyR/dmnKc= Received: from BN9PR03CA0841.namprd03.prod.outlook.com (2603:10b6:408:13d::6) by SJ0PR12MB5438.namprd12.prod.outlook.com (2603:10b6:a03:3ba::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Wed, 27 Apr 2022 13:54:28 +0000 Received: from BN8NAM11FT045.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13d:cafe::17) by BN9PR03CA0841.outlook.office365.com (2603:10b6:408:13d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13 via Frontend Transport; Wed, 27 Apr 2022 13:54:27 +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; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT045.mail.protection.outlook.com (10.13.177.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5206.12 via Frontend Transport; Wed, 27 Apr 2022 13:54:25 +0000 Received: from jasmine-meng.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.2375.24; Wed, 27 Apr 2022 08:54:21 -0500 From: Meng Li To: Shuah Khan , Huang Rui , CC: "Rafael J . Wysocki" , Nathan Fontenot , Deepak Sharma , "Alex Deucher" , Mario Limonciello , Jinzhou Su , Perry Yuan , Xiaojian Du , Viresh Kumar , Borislav Petkov , , Meng Li Subject: [PATCH V4 1/3] cpufreq: amd-pstate: Expose struct amd_cpudata Date: Wed, 27 Apr 2022 21:53:13 +0800 Message-ID: <20220427135315.3447550-2-li.meng@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220427135315.3447550-1-li.meng@amd.com> References: <20220427135315.3447550-1-li.meng@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1e23dc67-ab47-49c3-b8d4-08da285570e4 X-MS-TrafficTypeDiagnostic: SJ0PR12MB5438:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xUTAWm8V3Hwdw8b1R+aXqnkiLcJiERzL9AMKEkMFWvDzZyIWuW4XwkFyHJVfnvkNC5J9CJYYbzmhmH2oHneddSD/26z9LskAUfgKbLkD8LxzNYqDmSyL+Q+gIPgg3rC3ixLBw9nO4WGh0nRIP2yhhKleQuJ7rYb9N6iMUnlRGQMAYer9AwZ3CoZI73DYbX9eVx5mBPW9jz3z5SamM6ssdwIjQX/iJn5KV+Zq3CI+5hoKIDxBf3CNrnrJ7m8rxEH3BWQ4Lu/4+hkRg4RMpzuyWibRL8SpTPDhhUvBhZag6u4kqe9WS1ZnhI4TxGafuEJMYjlO6VQNXO+d3YRKJLLoVZtzEuR5BW5wyXaUy+BAIcJFRPkZ8ZqCwC615OvwTZhpEjhmxeHURAguL0MpRao1e0ByykKayrKK+PlSPY1o4vJ7Q9M+aXcLzpPhHJwccX09WxvaKV1LYVapF07v+MmgJy7W2AhNhDRrj3Uu6Em5oOZNQAri9C8XWtUuMnzeFeO3/vqWrQZBXkvnLVdczDRxzvT0hUSD+jXe5avpYFuZpoHQl8LsKTt0ddiRVPLCluciO0OVJ780criugUSephXKhCzMMvzIg0PfFxkUhrULEm1doOeXX0s5svi0OyK5NXQkX78mp0whTE91xuYt0xF8ZtF7A84tNHYvNHvFCGvqZHLi8GZekGa9Ks8cS2+UtUBH30Iwq2BiGNf+lWqouPEMjw== 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:ErrorRetry; CAT:NONE; SFS:(13230001)(4636009)(40470700004)(46966006)(36840700001)(508600001)(26005)(83380400001)(356005)(81166007)(70586007)(82310400005)(70206006)(6666004)(7696005)(316002)(86362001)(8676002)(4326008)(36860700001)(110136005)(40460700003)(5660300002)(36756003)(426003)(1076003)(336012)(2616005)(8936002)(47076005)(16526019)(186003)(2906002)(54906003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2022 13:54:25.7090 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1e23dc67-ab47-49c3-b8d4-08da285570e4 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: BN8NAM11FT045.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB5438 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Expose struct amd_cpudata to AMD P-State unit test module. This data struct will be used on the following AMD P-State unit test (amd-pstate-ut) module. The amd-pstate-ut module can get some AMD infomations by this data struct. For example: highest perf, nominal perf, boost supported etc. Signed-off-by: Meng Li --- MAINTAINERS | 1 + drivers/cpufreq/amd-pstate.c | 60 +--------------------------- include/linux/amd-pstate.h | 77 ++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 59 deletions(-) create mode 100644 include/linux/amd-pstate.h diff --git a/MAINTAINERS b/MAINTAINERS index 61d9f114c37f..6f814eda95b5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1020,6 +1020,7 @@ L: linux-pm@vger.kernel.org S: Supported F: Documentation/admin-guide/pm/amd-pstate.rst F: drivers/cpufreq/amd-pstate* +F: include/linux/amd-pstate.h F: tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py AMD PTDMA DRIVER diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c index 7be38bc6a673..5f7a00a64f76 100644 --- a/drivers/cpufreq/amd-pstate.c +++ b/drivers/cpufreq/amd-pstate.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -65,65 +66,6 @@ MODULE_PARM_DESC(shared_mem, static struct cpufreq_driver amd_pstate_driver; -/** - * struct amd_aperf_mperf - * @aperf: actual performance frequency clock count - * @mperf: maximum performance frequency clock count - * @tsc: time stamp counter - */ -struct amd_aperf_mperf { - u64 aperf; - u64 mperf; - u64 tsc; -}; - -/** - * struct amd_cpudata - private CPU data for AMD P-State - * @cpu: CPU number - * @req: constraint request to apply - * @cppc_req_cached: cached performance request hints - * @highest_perf: the maximum performance an individual processor may reach, - * assuming ideal conditions - * @nominal_perf: the maximum sustained performance level of the processor, - * assuming ideal operating conditions - * @lowest_nonlinear_perf: the lowest performance level at which nonlinear power - * savings are achieved - * @lowest_perf: the absolute lowest performance level of the processor - * @max_freq: the frequency that mapped to highest_perf - * @min_freq: the frequency that mapped to lowest_perf - * @nominal_freq: the frequency that mapped to nominal_perf - * @lowest_nonlinear_freq: the frequency that mapped to lowest_nonlinear_perf - * @cur: Difference of Aperf/Mperf/tsc count between last and current sample - * @prev: Last Aperf/Mperf/tsc count value read from register - * @freq: current cpu frequency value - * @boost_supported: check whether the Processor or SBIOS supports boost mode - * - * The amd_cpudata is key private data for each CPU thread in AMD P-State, and - * represents all the attributes and goals that AMD P-State requests at runtime. - */ -struct amd_cpudata { - int cpu; - - struct freq_qos_request req[2]; - u64 cppc_req_cached; - - u32 highest_perf; - u32 nominal_perf; - u32 lowest_nonlinear_perf; - u32 lowest_perf; - - u32 max_freq; - u32 min_freq; - u32 nominal_freq; - u32 lowest_nonlinear_freq; - - struct amd_aperf_mperf cur; - struct amd_aperf_mperf prev; - - u64 freq; - bool boost_supported; -}; - static inline int pstate_enable(bool enable) { return wrmsrl_safe(MSR_AMD_CPPC_ENABLE, enable); diff --git a/include/linux/amd-pstate.h b/include/linux/amd-pstate.h new file mode 100644 index 000000000000..4dffb7db3807 --- /dev/null +++ b/include/linux/amd-pstate.h @@ -0,0 +1,77 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * linux/include/linux/amd-pstate.h + * + * Copyright (C) 2007-2010 Advanced Micro Devices, Inc. + * + * Author: Meng Li + */ + +#ifndef _LINUX_AMD_PSTATE_H +#define _LINUX_AMD_PSTATE_H + +#include + +/********************************************************************* + * AMD P-state INTERFACE * + *********************************************************************/ +/** + * struct amd_aperf_mperf + * @aperf: actual performance frequency clock count + * @mperf: maximum performance frequency clock count + * @tsc: time stamp counter + */ +struct amd_aperf_mperf { + u64 aperf; + u64 mperf; + u64 tsc; +}; + +/** + * struct amd_cpudata - private CPU data for AMD P-State + * @cpu: CPU number + * @req: constraint request to apply + * @cppc_req_cached: cached performance request hints + * @highest_perf: the maximum performance an individual processor may reach, + * assuming ideal conditions + * @nominal_perf: the maximum sustained performance level of the processor, + * assuming ideal operating conditions + * @lowest_nonlinear_perf: the lowest performance level at which nonlinear power + * savings are achieved + * @lowest_perf: the absolute lowest performance level of the processor + * @max_freq: the frequency that mapped to highest_perf + * @min_freq: the frequency that mapped to lowest_perf + * @nominal_freq: the frequency that mapped to nominal_perf + * @lowest_nonlinear_freq: the frequency that mapped to lowest_nonlinear_perf + * @cur: Difference of Aperf/Mperf/tsc count between last and current sample + * @prev: Last Aperf/Mperf/tsc count value read from register + * @freq: current cpu frequency value + * @boost_supported: check whether the Processor or SBIOS supports boost mode + * + * The amd_cpudata is key private data for each CPU thread in AMD P-State, and + * represents all the attributes and goals that AMD P-State requests at runtime. + */ +struct amd_cpudata { + int cpu; + + struct freq_qos_request req[2]; + u64 cppc_req_cached; + + u32 highest_perf; + u32 nominal_perf; + u32 lowest_nonlinear_perf; + u32 lowest_perf; + + u32 max_freq; + u32 min_freq; + u32 nominal_freq; + u32 lowest_nonlinear_freq; + + struct amd_aperf_mperf cur; + struct amd_aperf_mperf prev; + + u64 freq; + bool boost_supported; +}; + +#endif /* _LINUX_AMD_PSTATE_H */