From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1A51143B55; Tue, 20 Feb 2024 16:33:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 056AC4067C; Tue, 20 Feb 2024 16:33:55 +0100 (CET) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2086.outbound.protection.outlook.com [40.107.102.86]) by mails.dpdk.org (Postfix) with ESMTP id C0E034067A for ; Tue, 20 Feb 2024 16:33:53 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XxF+ABWqvppiUXWS/ZADszzf6KkQjQmIxupNpkCOH45S5ls3g3x5eugWqu6xeGwcY/GzMc5aWy0U034InFIEW+IdYl3jkpOKN08876NuVqrlU/evzXXYqo3ChK45jEttaowc0Nw4Z5nwiZwjs0/dSAWTvN8ikJjYvTeSIwW2UzxhhTiEOb/ZEunnT8gRnBqBqUDXyM6M4DhkaTFvJMVdgnYVaGS3fRWJAvtt+wO+AJY61DnoeYg6yLlqlWbI+GFMFm9KfDn3cszQpQTXz4XePn5ea5cMB+rCF2T+CMW7QiIGqjuJOZfYYgK9Ca/O6PvGDQT8k+XA7Z/0CAAH8p5i0Q== 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=5UM0zD4alm6SjS+pewyEc1dlkep/TpixZLwZx3SxOhU=; b=MIwmPWS4oE5tIv3JEkFVIm7EGkku8sJyH8aX0+e/myD2Vzji6JhNFLz9eRsxt3socul3wVJV962YOpNO5lHE82vJrz7oKW+okh4gayUtOrOFwPLe8xEgNYb71uepst0xnFDE8MF5SE6nMSZ7qSmA/1yAjRutGR6fBw+jxdqdehLYYdenieFwnzvIJkfNWSZNjlxC7zu6txYavHIbMImtitWGRypstQWIdGm2ycf/BdUTjvgnWrruk3BftezXgyQChY/pdsT7s/DnT1yzI6GA2qMGoCCxFfF0XnBkpBe//j9QqpK69GtqYboVdoxqjVzqgm5arbSFCcE1uOzcHmRn6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=intel.com 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 (0) 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=5UM0zD4alm6SjS+pewyEc1dlkep/TpixZLwZx3SxOhU=; b=BIotiUZD4UOjB/6Y/YVRvHlg1hFo6+MGNqRrCa19xWdSq0Bnzli8zVV2ke+pLBEtFTwtizP5Un8xQBKuq0cEp0MrT7AG4bNGcfmbkvkdaxvk+DamvBcQAEbeIku7Trbg31Gtr/dzUTEdrHESOCDF+E1VCGglOnK+UQOF2GGX9uM= Received: from BN9PR03CA0497.namprd03.prod.outlook.com (2603:10b6:408:130::22) by BN9PR12MB5274.namprd12.prod.outlook.com (2603:10b6:408:11f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.21; Tue, 20 Feb 2024 15:33:50 +0000 Received: from BN1PEPF00004687.namprd05.prod.outlook.com (2603:10b6:408:130:cafe::13) by BN9PR03CA0497.outlook.office365.com (2603:10b6:408:130::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.40 via Frontend Transport; Tue, 20 Feb 2024 15:33:50 +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 BN1PEPF00004687.mail.protection.outlook.com (10.167.243.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7292.25 via Frontend Transport; Tue, 20 Feb 2024 15:33:50 +0000 Received: from ubuntu2004.linuxvmimages.local (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.35; Tue, 20 Feb 2024 09:33:45 -0600 From: Sivaprasad Tummala To: , , , , , , , CC: Subject: [RFC PATCH 1/2] power: refactor core power management library Date: Tue, 20 Feb 2024 16:33:25 +0100 Message-ID: <20240220153326.6236-3-sivaprasad.tummala@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240220153326.6236-1-sivaprasad.tummala@amd.com> References: <20240220153326.6236-1-sivaprasad.tummala@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: BN1PEPF00004687:EE_|BN9PR12MB5274:EE_ X-MS-Office365-Filtering-Correlation-Id: 7eb539a2-ac55-4d84-8b3c-08dc3229563e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1Z43RmKiC+oAtXLr/MYXQO3+vJ1i7neNZSbsBT8PKm9mbXuYt2UKZ4PrLcqR/NRcOvoq/jnlAwtct4ihro1bVS6V+aKPlyP12fAEO6qjseYOjXCT5z+d24xUVktAXxoStpup8p6Dtf8WqYSKW2QTarW12MwOvTkLG40Y7Eajnj+lLtMi1lD44U3DeKMmiJK5ErrBJMnIayXfWrAbRFkaarGvkPjdkn3blQpSYnq5O31vjC82yf0nrqOoudg1E0rigKyrE5ENJUQ9DY+hX7XsRpbSkw/YJzb/iGOKwpx5oKWPTe30t2IrZ9nl3v47fx5z5HgX7QFWMh+Gf9ce8ObKtw7TojEFbZwNp8IbMT7hjGJKeLDYOL+nMm9stLtfBUcX2fx6jxLiWk2B2VVEZ16RaE9jz+f03dxej/UE8jk7vgXgpgS1DJg3yGBEpAR+srSDGPOmIXS5Htf8a9YwgPRhIJzodYI31hxlex6fMCauuqNL+bogk0IfU2O2gQ9pV6WtfFwSV+zfJoYNX1Ru+Wh/Oq8eKLENKvT4wZCUzYcT6uLpLdlaszltNIVaySG4qt7F4105MGxTepWoqg+wYVWOeE2le849DZS9F3yRSXbS9ZYhyPEP7FiGo8V4L9aM6ATAjbdTfVxZV9cMdLaW1ZOR4Xf2QoxSCfNuKvUFIvTcr1E= 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:(13230031)(36860700004)(40470700004)(46966006); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2024 15:33:50.1286 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7eb539a2-ac55-4d84-8b3c-08dc3229563e 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: BN1PEPF00004687.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5274 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This patch introduces a comprehensive refactor to the core power management library. The primary focus is on improving modularity and organization by relocating specific driver implementations from the 'lib/power' directory to dedicated directories within 'drivers/power/core/*'. The adjustment of meson.build files enables the selective activation of individual drivers. These changes contribute to a significant enhancement in code organization, providing a clearer structure for driver implementations. The refactor aims to improve overall code clarity and boost maintainability. Additionally, it establishes a foundation for future development, allowing for more focused work on individual drivers and seamless integration of forthcoming enhancements. Signed-off-by: Sivaprasad Tummala --- drivers/meson.build | 1 + drivers/power/core/acpi/meson.build | 8 + .../power/core/acpi}/power_acpi_cpufreq.c | 19 ++ .../power/core/acpi}/power_acpi_cpufreq.h | 0 drivers/power/core/amd-pstate/meson.build | 8 + .../amd-pstate}/power_amd_pstate_cpufreq.c | 19 ++ .../amd-pstate}/power_amd_pstate_cpufreq.h | 0 drivers/power/core/cppc/meson.build | 8 + .../power/core/cppc}/power_cppc_cpufreq.c | 19 ++ .../power/core/cppc}/power_cppc_cpufreq.h | 0 .../power/core/kvm-vm}/guest_channel.c | 0 .../power/core/kvm-vm}/guest_channel.h | 0 drivers/power/core/kvm-vm/meson.build | 20 ++ .../power/core/kvm-vm}/power_kvm_vm.c | 19 ++ .../power/core/kvm-vm}/power_kvm_vm.h | 0 drivers/power/core/meson.build | 12 + drivers/power/core/pstate/meson.build | 8 + .../power/core/pstate}/power_pstate_cpufreq.c | 19 ++ .../power/core/pstate}/power_pstate_cpufreq.h | 0 drivers/power/meson.build | 8 + lib/power/meson.build | 6 - lib/power/power_common.h | 11 + lib/power/rte_power.c | 305 ++++++++---------- lib/power/rte_power.h | 207 ++++++++++-- lib/power/version.map | 12 + 25 files changed, 506 insertions(+), 203 deletions(-) create mode 100644 drivers/power/core/acpi/meson.build rename {lib/power => drivers/power/core/acpi}/power_acpi_cpufreq.c (95%) rename {lib/power => drivers/power/core/acpi}/power_acpi_cpufreq.h (100%) create mode 100644 drivers/power/core/amd-pstate/meson.build rename {lib/power => drivers/power/core/amd-pstate}/power_amd_pstate_cpufreq.c (95%) rename {lib/power => drivers/power/core/amd-pstate}/power_amd_pstate_cpufreq.h (100%) create mode 100644 drivers/power/core/cppc/meson.build rename {lib/power => drivers/power/core/cppc}/power_cppc_cpufreq.c (96%) rename {lib/power => drivers/power/core/cppc}/power_cppc_cpufreq.h (100%) rename {lib/power => drivers/power/core/kvm-vm}/guest_channel.c (100%) rename {lib/power => drivers/power/core/kvm-vm}/guest_channel.h (100%) create mode 100644 drivers/power/core/kvm-vm/meson.build rename {lib/power => drivers/power/core/kvm-vm}/power_kvm_vm.c (83%) rename {lib/power => drivers/power/core/kvm-vm}/power_kvm_vm.h (100%) create mode 100644 drivers/power/core/meson.build create mode 100644 drivers/power/core/pstate/meson.build rename {lib/power => drivers/power/core/pstate}/power_pstate_cpufreq.c (96%) rename {lib/power => drivers/power/core/pstate}/power_pstate_cpufreq.h (100%) create mode 100644 drivers/power/meson.build diff --git a/drivers/meson.build b/drivers/meson.build index f2be71bc05..e293c3945f 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -28,6 +28,7 @@ subdirs = [ 'event', # depends on common, bus, mempool and net. 'baseband', # depends on common and bus. 'gpu', # depends on common and bus. + 'power', # depends on common (in future). ] if meson.is_cross_build() diff --git a/drivers/power/core/acpi/meson.build b/drivers/power/core/acpi/meson.build new file mode 100644 index 0000000000..d10ec8ee94 --- /dev/null +++ b/drivers/power/core/acpi/meson.build @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2024 AMD Limited + +sources = files('power_acpi_cpufreq.c') + +headers = files('power_acpi_cpufreq.h') + +deps += ['power'] diff --git a/lib/power/power_acpi_cpufreq.c b/drivers/power/core/acpi/power_acpi_cpufreq.c similarity index 95% rename from lib/power/power_acpi_cpufreq.c rename to drivers/power/core/acpi/power_acpi_cpufreq.c index f8d978d03d..69d80ad2ae 100644 --- a/lib/power/power_acpi_cpufreq.c +++ b/drivers/power/core/acpi/power_acpi_cpufreq.c @@ -577,3 +577,22 @@ int power_acpi_get_capabilities(unsigned int lcore_id, return 0; } + +static struct rte_power_ops acpi_ops = { + .init = power_acpi_cpufreq_init, + .exit = power_acpi_cpufreq_exit, + .check_env_support = power_acpi_cpufreq_check_supported, + .get_avail_freqs = power_acpi_cpufreq_freqs, + .get_freq = power_acpi_cpufreq_get_freq, + .set_freq = power_acpi_cpufreq_set_freq, + .freq_down = power_acpi_cpufreq_freq_down, + .freq_up = power_acpi_cpufreq_freq_up, + .freq_max = power_acpi_cpufreq_freq_max, + .freq_min = power_acpi_cpufreq_freq_min, + .turbo_status = power_acpi_turbo_status, + .enable_turbo = power_acpi_enable_turbo, + .disable_turbo = power_acpi_disable_turbo, + .get_caps = power_acpi_get_capabilities +}; + +RTE_POWER_REGISTER_OPS(acpi_ops); diff --git a/lib/power/power_acpi_cpufreq.h b/drivers/power/core/acpi/power_acpi_cpufreq.h similarity index 100% rename from lib/power/power_acpi_cpufreq.h rename to drivers/power/core/acpi/power_acpi_cpufreq.h diff --git a/drivers/power/core/amd-pstate/meson.build b/drivers/power/core/amd-pstate/meson.build new file mode 100644 index 0000000000..8ec4c960f5 --- /dev/null +++ b/drivers/power/core/amd-pstate/meson.build @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2024 AMD Limited + +sources = files('power_amd_pstate_cpufreq.c') + +headers = files('power_amd_pstate_cpufreq.h') + +deps += ['power'] diff --git a/lib/power/power_amd_pstate_cpufreq.c b/drivers/power/core/amd-pstate/power_amd_pstate_cpufreq.c similarity index 95% rename from lib/power/power_amd_pstate_cpufreq.c rename to drivers/power/core/amd-pstate/power_amd_pstate_cpufreq.c index 028f84416b..9938de72a6 100644 --- a/lib/power/power_amd_pstate_cpufreq.c +++ b/drivers/power/core/amd-pstate/power_amd_pstate_cpufreq.c @@ -700,3 +700,22 @@ power_amd_pstate_get_capabilities(unsigned int lcore_id, return 0; } + +static struct rte_power_ops amd_pstate_ops = { + .init = power_amd_pstate_cpufreq_init, + .exit = power_amd_pstate_cpufreq_exit, + .check_env_support = power_amd_pstate_cpufreq_check_supported, + .get_avail_freqs = power_amd_pstate_cpufreq_freqs, + .get_freq = power_amd_pstate_cpufreq_get_freq, + .set_freq = power_amd_pstate_cpufreq_set_freq, + .freq_down = power_amd_pstate_cpufreq_freq_down, + .freq_up = power_amd_pstate_cpufreq_freq_up, + .freq_max = power_amd_pstate_cpufreq_freq_max, + .freq_min = power_amd_pstate_cpufreq_freq_min, + .turbo_status = power_amd_pstate_turbo_status, + .enable_turbo = power_amd_pstate_enable_turbo, + .disable_turbo = power_amd_pstate_disable_turbo, + .get_caps = power_amd_pstate_get_capabilities +}; + +RTE_POWER_REGISTER_OPS(amd_pstate_ops); diff --git a/lib/power/power_amd_pstate_cpufreq.h b/drivers/power/core/amd-pstate/power_amd_pstate_cpufreq.h similarity index 100% rename from lib/power/power_amd_pstate_cpufreq.h rename to drivers/power/core/amd-pstate/power_amd_pstate_cpufreq.h diff --git a/drivers/power/core/cppc/meson.build b/drivers/power/core/cppc/meson.build new file mode 100644 index 0000000000..06f3b99bb8 --- /dev/null +++ b/drivers/power/core/cppc/meson.build @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2024 AMD Limited + +sources = files('power_cppc_cpufreq.c') + +headers = files('power_cppc_cpufreq.h') + +deps += ['power'] diff --git a/lib/power/power_cppc_cpufreq.c b/drivers/power/core/cppc/power_cppc_cpufreq.c similarity index 96% rename from lib/power/power_cppc_cpufreq.c rename to drivers/power/core/cppc/power_cppc_cpufreq.c index 3ddf39bd76..605f633309 100644 --- a/lib/power/power_cppc_cpufreq.c +++ b/drivers/power/core/cppc/power_cppc_cpufreq.c @@ -685,3 +685,22 @@ power_cppc_get_capabilities(unsigned int lcore_id, return 0; } + +static struct rte_power_ops cppc_ops = { + .init = power_cppc_cpufreq_init, + .exit = power_cppc_cpufreq_exit, + .check_env_support = power_cppc_cpufreq_check_supported, + .get_avail_freqs = power_cppc_cpufreq_freqs, + .get_freq = power_cppc_cpufreq_get_freq, + .set_freq = power_cppc_cpufreq_set_freq, + .freq_down = power_cppc_cpufreq_freq_down, + .freq_up = power_cppc_cpufreq_freq_up, + .freq_max = power_cppc_cpufreq_freq_max, + .freq_min = power_cppc_cpufreq_freq_min, + .turbo_status = power_cppc_turbo_status, + .enable_turbo = power_cppc_enable_turbo, + .disable_turbo = power_cppc_disable_turbo, + .get_caps = power_cppc_get_capabilities +}; + +RTE_POWER_REGISTER_OPS(cppc_ops); diff --git a/lib/power/power_cppc_cpufreq.h b/drivers/power/core/cppc/power_cppc_cpufreq.h similarity index 100% rename from lib/power/power_cppc_cpufreq.h rename to drivers/power/core/cppc/power_cppc_cpufreq.h diff --git a/lib/power/guest_channel.c b/drivers/power/core/kvm-vm/guest_channel.c similarity index 100% rename from lib/power/guest_channel.c rename to drivers/power/core/kvm-vm/guest_channel.c diff --git a/lib/power/guest_channel.h b/drivers/power/core/kvm-vm/guest_channel.h similarity index 100% rename from lib/power/guest_channel.h rename to drivers/power/core/kvm-vm/guest_channel.h diff --git a/drivers/power/core/kvm-vm/meson.build b/drivers/power/core/kvm-vm/meson.build new file mode 100644 index 0000000000..3150c6674b --- /dev/null +++ b/drivers/power/core/kvm-vm/meson.build @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(C) 2024 AMD Limited. +# + +if not is_linux + build = false + reason = 'only supported on Linux' + subdir_done() +endif + +sources = files( + 'guest_channel.c', + 'power_kvm_vm.c', +) + +headers = files( + 'guest_channel.h', + 'power_kvm_vm.h', +) +deps += ['power'] diff --git a/lib/power/power_kvm_vm.c b/drivers/power/core/kvm-vm/power_kvm_vm.c similarity index 83% rename from lib/power/power_kvm_vm.c rename to drivers/power/core/kvm-vm/power_kvm_vm.c index f15be8fac5..a5d6984d26 100644 --- a/lib/power/power_kvm_vm.c +++ b/drivers/power/core/kvm-vm/power_kvm_vm.c @@ -137,3 +137,22 @@ int power_kvm_vm_get_capabilities(__rte_unused unsigned int lcore_id, POWER_LOG(ERR, "rte_power_get_capabilities is not implemented for Virtual Machine Power Management"); return -ENOTSUP; } + +static struct rte_power_ops kvm_vm_ops = { + .init = power_kvm_vm_init, + .exit = power_kvm_vm_exit, + .check_env_support = power_kvm_vm_check_supported, + .get_avail_freqs = power_kvm_vm_freqs, + .get_freq = power_kvm_vm_get_freq, + .set_freq = power_kvm_vm_set_freq, + .freq_down = power_kvm_vm_freq_down, + .freq_up = power_kvm_vm_freq_up, + .freq_max = power_kvm_vm_freq_max, + .freq_min = power_kvm_vm_freq_min, + .turbo_status = power_kvm_vm_turbo_status, + .enable_turbo = power_kvm_vm_enable_turbo, + .disable_turbo = power_kvm_vm_disable_turbo, + .get_caps = power_kvm_vm_get_capabilities +}; + +RTE_POWER_REGISTER_OPS(kvm_vm_ops); diff --git a/lib/power/power_kvm_vm.h b/drivers/power/core/kvm-vm/power_kvm_vm.h similarity index 100% rename from lib/power/power_kvm_vm.h rename to drivers/power/core/kvm-vm/power_kvm_vm.h diff --git a/drivers/power/core/meson.build b/drivers/power/core/meson.build new file mode 100644 index 0000000000..4081dafaa0 --- /dev/null +++ b/drivers/power/core/meson.build @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2024 AMD Limited + +drivers = [ + 'acpi', + 'amd-pstate', + 'cppc', + 'kvm-vm', + 'pstate' +] + +std_deps = ['power'] diff --git a/drivers/power/core/pstate/meson.build b/drivers/power/core/pstate/meson.build new file mode 100644 index 0000000000..1025c64e48 --- /dev/null +++ b/drivers/power/core/pstate/meson.build @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2024 AMD Limited + +sources = files('power_pstate_cpufreq.c') + +headers = files('power_pstate_cpufreq.h') + +deps += ['power'] diff --git a/lib/power/power_pstate_cpufreq.c b/drivers/power/core/pstate/power_pstate_cpufreq.c similarity index 96% rename from lib/power/power_pstate_cpufreq.c rename to drivers/power/core/pstate/power_pstate_cpufreq.c index 73138dc4e4..d4c3645ff8 100644 --- a/lib/power/power_pstate_cpufreq.c +++ b/drivers/power/core/pstate/power_pstate_cpufreq.c @@ -888,3 +888,22 @@ int power_pstate_get_capabilities(unsigned int lcore_id, return 0; } + +static struct rte_power_ops pstate_ops = { + .init = power_pstate_cpufreq_init, + .exit = power_pstate_cpufreq_exit, + .check_env_support = power_pstate_cpufreq_check_supported, + .get_avail_freqs = power_pstate_cpufreq_freqs, + .get_freq = power_pstate_cpufreq_get_freq, + .set_freq = power_pstate_cpufreq_set_freq, + .freq_down = power_pstate_cpufreq_freq_down, + .freq_up = power_pstate_cpufreq_freq_up, + .freq_max = power_pstate_cpufreq_freq_max, + .freq_min = power_pstate_cpufreq_freq_min, + .turbo_status = power_pstate_turbo_status, + .enable_turbo = power_pstate_enable_turbo, + .disable_turbo = power_pstate_disable_turbo, + .get_caps = power_pstate_get_capabilities +}; + +RTE_POWER_REGISTER_OPS(pstate_ops); diff --git a/lib/power/power_pstate_cpufreq.h b/drivers/power/core/pstate/power_pstate_cpufreq.h similarity index 100% rename from lib/power/power_pstate_cpufreq.h rename to drivers/power/core/pstate/power_pstate_cpufreq.h diff --git a/drivers/power/meson.build b/drivers/power/meson.build new file mode 100644 index 0000000000..7d9034c7ac --- /dev/null +++ b/drivers/power/meson.build @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2024 AMD Limited + +drivers = [ + 'core', +] + +std_deps = ['power'] diff --git a/lib/power/meson.build b/lib/power/meson.build index b8426589b2..207d96d877 100644 --- a/lib/power/meson.build +++ b/lib/power/meson.build @@ -12,14 +12,8 @@ if not is_linux reason = 'only supported on Linux' endif sources = files( - 'guest_channel.c', - 'power_acpi_cpufreq.c', - 'power_amd_pstate_cpufreq.c', 'power_common.c', - 'power_cppc_cpufreq.c', - 'power_kvm_vm.c', 'power_intel_uncore.c', - 'power_pstate_cpufreq.c', 'rte_power.c', 'rte_power_uncore.c', 'rte_power_pmd_mgmt.c', diff --git a/lib/power/power_common.h b/lib/power/power_common.h index 30966400ba..c90b611f4f 100644 --- a/lib/power/power_common.h +++ b/lib/power/power_common.h @@ -23,13 +23,24 @@ extern int power_logtype; #endif /* check if scaling driver matches one we want */ +__rte_internal int cpufreq_check_scaling_driver(const char *driver); + +__rte_internal int power_set_governor(unsigned int lcore_id, const char *new_governor, char *orig_governor, size_t orig_governor_len); + +__rte_internal int open_core_sysfs_file(FILE **f, const char *mode, const char *format, ...) __rte_format_printf(3, 4); + +__rte_internal int read_core_sysfs_u32(FILE *f, uint32_t *val); + +__rte_internal int read_core_sysfs_s(FILE *f, char *buf, unsigned int len); + +__rte_internal int write_core_sysfs_s(FILE *f, const char *str); #endif /* _POWER_COMMON_H_ */ diff --git a/lib/power/rte_power.c b/lib/power/rte_power.c index 36c3f3da98..70176807f4 100644 --- a/lib/power/rte_power.c +++ b/lib/power/rte_power.c @@ -8,64 +8,80 @@ #include #include "rte_power.h" -#include "power_acpi_cpufreq.h" -#include "power_cppc_cpufreq.h" #include "power_common.h" -#include "power_kvm_vm.h" -#include "power_pstate_cpufreq.h" -#include "power_amd_pstate_cpufreq.h" enum power_management_env global_default_env = PM_ENV_NOT_SET; static rte_spinlock_t global_env_cfg_lock = RTE_SPINLOCK_INITIALIZER; +static struct rte_power_ops rte_power_ops[PM_ENV_MAX]; -/* function pointers */ -rte_power_freqs_t rte_power_freqs = NULL; -rte_power_get_freq_t rte_power_get_freq = NULL; -rte_power_set_freq_t rte_power_set_freq = NULL; -rte_power_freq_change_t rte_power_freq_up = NULL; -rte_power_freq_change_t rte_power_freq_down = NULL; -rte_power_freq_change_t rte_power_freq_max = NULL; -rte_power_freq_change_t rte_power_freq_min = NULL; -rte_power_freq_change_t rte_power_turbo_status; -rte_power_freq_change_t rte_power_freq_enable_turbo; -rte_power_freq_change_t rte_power_freq_disable_turbo; -rte_power_get_capabilities_t rte_power_get_capabilities; - -static void -reset_power_function_ptrs(void) +/* register the ops struct in rte_power_ops, return 0 on success. */ +int +rte_power_register_ops(const struct rte_power_ops *op) +{ + struct rte_power_ops *ops; + + if (op->env >= PM_ENV_MAX) { + POWER_LOG(ERR, "Unsupported power management environment\n"); + return -EINVAL; + } + + if (op->status != 0) { + POWER_LOG(ERR, "Power management env[%d] ops registered already\n", + op->env); + return -EINVAL; + } + + if (!op->init || !op->exit || !op->check_env_support || + !op->get_avail_freqs || !op->get_freq || !op->set_freq || + !op->freq_up || !op->freq_down || !op->freq_max || + !op->freq_min || !op->turbo_status || !op->enable_turbo || + !op->disable_turbo || !op->get_caps) { + POWER_LOG(ERR, "Missing callbacks while registering power ops\n"); + return -EINVAL; + } + + ops = &rte_power_ops[op->env]; + ops->env = op->env; + ops->init = op->init; + ops->exit = op->exit; + ops->check_env_support = op->check_env_support; + ops->get_avail_freqs = op->get_avail_freqs; + ops->get_freq = op->get_freq; + ops->set_freq = op->set_freq; + ops->freq_up = op->freq_up; + ops->freq_down = op->freq_down; + ops->freq_max = op->freq_max; + ops->freq_min = op->freq_min; + ops->turbo_status = op->turbo_status; + ops->enable_turbo = op->enable_turbo; + ops->disable_turbo = op->disable_turbo; + ops->status = 1; /* registered */ + + return 0; +} + +struct rte_power_ops * +rte_power_get_ops(int ops_index) { - rte_power_freqs = NULL; - rte_power_get_freq = NULL; - rte_power_set_freq = NULL; - rte_power_freq_up = NULL; - rte_power_freq_down = NULL; - rte_power_freq_max = NULL; - rte_power_freq_min = NULL; - rte_power_turbo_status = NULL; - rte_power_freq_enable_turbo = NULL; - rte_power_freq_disable_turbo = NULL; - rte_power_get_capabilities = NULL; + RTE_VERIFY((ops_index >= PM_ENV_NOT_SET) && (ops_index < PM_ENV_MAX)); + RTE_VERIFY(rte_power_ops[ops_index].status != 0); + + return &rte_power_ops[ops_index]; } int rte_power_check_env_supported(enum power_management_env env) { - switch (env) { - case PM_ENV_ACPI_CPUFREQ: - return power_acpi_cpufreq_check_supported(); - case PM_ENV_PSTATE_CPUFREQ: - return power_pstate_cpufreq_check_supported(); - case PM_ENV_KVM_VM: - return power_kvm_vm_check_supported(); - case PM_ENV_CPPC_CPUFREQ: - return power_cppc_cpufreq_check_supported(); - case PM_ENV_AMD_PSTATE_CPUFREQ: - return power_amd_pstate_cpufreq_check_supported(); - default: - rte_errno = EINVAL; - return -1; + struct rte_power_ops *ops; + + if ((env > PM_ENV_NOT_SET) && (env < PM_ENV_MAX)) { + ops = rte_power_get_ops(env); + return ops->check_env_support(); } + + rte_errno = EINVAL; + return -1; } int @@ -80,80 +96,26 @@ rte_power_set_env(enum power_management_env env) } int ret = 0; + struct rte_power_ops *ops; + + if ((env == PM_ENV_NOT_SET) || (env >= PM_ENV_MAX)) { + POWER_LOG(ERR, "Invalid Power Management Environment(%d)" + " set\n", env); + ret = -1; + } - if (env == PM_ENV_ACPI_CPUFREQ) { - rte_power_freqs = power_acpi_cpufreq_freqs; - rte_power_get_freq = power_acpi_cpufreq_get_freq; - rte_power_set_freq = power_acpi_cpufreq_set_freq; - rte_power_freq_up = power_acpi_cpufreq_freq_up; - rte_power_freq_down = power_acpi_cpufreq_freq_down; - rte_power_freq_min = power_acpi_cpufreq_freq_min; - rte_power_freq_max = power_acpi_cpufreq_freq_max; - rte_power_turbo_status = power_acpi_turbo_status; - rte_power_freq_enable_turbo = power_acpi_enable_turbo; - rte_power_freq_disable_turbo = power_acpi_disable_turbo; - rte_power_get_capabilities = power_acpi_get_capabilities; - } else if (env == PM_ENV_KVM_VM) { - rte_power_freqs = power_kvm_vm_freqs; - rte_power_get_freq = power_kvm_vm_get_freq; - rte_power_set_freq = power_kvm_vm_set_freq; - rte_power_freq_up = power_kvm_vm_freq_up; - rte_power_freq_down = power_kvm_vm_freq_down; - rte_power_freq_min = power_kvm_vm_freq_min; - rte_power_freq_max = power_kvm_vm_freq_max; - rte_power_turbo_status = power_kvm_vm_turbo_status; - rte_power_freq_enable_turbo = power_kvm_vm_enable_turbo; - rte_power_freq_disable_turbo = power_kvm_vm_disable_turbo; - rte_power_get_capabilities = power_kvm_vm_get_capabilities; - } else if (env == PM_ENV_PSTATE_CPUFREQ) { - rte_power_freqs = power_pstate_cpufreq_freqs; - rte_power_get_freq = power_pstate_cpufreq_get_freq; - rte_power_set_freq = power_pstate_cpufreq_set_freq; - rte_power_freq_up = power_pstate_cpufreq_freq_up; - rte_power_freq_down = power_pstate_cpufreq_freq_down; - rte_power_freq_min = power_pstate_cpufreq_freq_min; - rte_power_freq_max = power_pstate_cpufreq_freq_max; - rte_power_turbo_status = power_pstate_turbo_status; - rte_power_freq_enable_turbo = power_pstate_enable_turbo; - rte_power_freq_disable_turbo = power_pstate_disable_turbo; - rte_power_get_capabilities = power_pstate_get_capabilities; - - } else if (env == PM_ENV_CPPC_CPUFREQ) { - rte_power_freqs = power_cppc_cpufreq_freqs; - rte_power_get_freq = power_cppc_cpufreq_get_freq; - rte_power_set_freq = power_cppc_cpufreq_set_freq; - rte_power_freq_up = power_cppc_cpufreq_freq_up; - rte_power_freq_down = power_cppc_cpufreq_freq_down; - rte_power_freq_min = power_cppc_cpufreq_freq_min; - rte_power_freq_max = power_cppc_cpufreq_freq_max; - rte_power_turbo_status = power_cppc_turbo_status; - rte_power_freq_enable_turbo = power_cppc_enable_turbo; - rte_power_freq_disable_turbo = power_cppc_disable_turbo; - rte_power_get_capabilities = power_cppc_get_capabilities; - } else if (env == PM_ENV_AMD_PSTATE_CPUFREQ) { - rte_power_freqs = power_amd_pstate_cpufreq_freqs; - rte_power_get_freq = power_amd_pstate_cpufreq_get_freq; - rte_power_set_freq = power_amd_pstate_cpufreq_set_freq; - rte_power_freq_up = power_amd_pstate_cpufreq_freq_up; - rte_power_freq_down = power_amd_pstate_cpufreq_freq_down; - rte_power_freq_min = power_amd_pstate_cpufreq_freq_min; - rte_power_freq_max = power_amd_pstate_cpufreq_freq_max; - rte_power_turbo_status = power_amd_pstate_turbo_status; - rte_power_freq_enable_turbo = power_amd_pstate_enable_turbo; - rte_power_freq_disable_turbo = power_amd_pstate_disable_turbo; - rte_power_get_capabilities = power_amd_pstate_get_capabilities; - } else { - POWER_LOG(ERR, "Invalid Power Management Environment(%d) set", - env); + ops = rte_power_get_ops(env); + if (ops->status == 0) { + POWER_LOG(ERR, WER, + "Power Management Environment(%d) not" + " registered\n", env); ret = -1; } if (ret == 0) global_default_env = env; - else { + else global_default_env = PM_ENV_NOT_SET; - reset_power_function_ptrs(); - } rte_spinlock_unlock(&global_env_cfg_lock); return ret; @@ -164,7 +126,6 @@ rte_power_unset_env(void) { rte_spinlock_lock(&global_env_cfg_lock); global_default_env = PM_ENV_NOT_SET; - reset_power_function_ptrs(); rte_spinlock_unlock(&global_env_cfg_lock); } @@ -177,59 +138,76 @@ int rte_power_init(unsigned int lcore_id) { int ret = -1; + struct rte_power_ops *ops; - switch (global_default_env) { - case PM_ENV_ACPI_CPUFREQ: - return power_acpi_cpufreq_init(lcore_id); - case PM_ENV_KVM_VM: - return power_kvm_vm_init(lcore_id); - case PM_ENV_PSTATE_CPUFREQ: - return power_pstate_cpufreq_init(lcore_id); - case PM_ENV_CPPC_CPUFREQ: - return power_cppc_cpufreq_init(lcore_id); - case PM_ENV_AMD_PSTATE_CPUFREQ: - return power_amd_pstate_cpufreq_init(lcore_id); - default: - POWER_LOG(INFO, "Env isn't set yet!"); + if (global_default_env != PM_ENV_NOT_SET) { + ops = &rte_power_ops[global_default_env]; + if (!ops->status) { + POWER_LOG(ERR, "Power management env[%d] not" + " supported\n", global_default_env); + goto out; + } + return ops->init(lcore_id); } + POWER_LOG(INFO, POWER, "Env isn't set yet!\n"); /* Auto detect Environment */ - POWER_LOG(INFO, "Attempting to initialise ACPI cpufreq power management..."); - ret = power_acpi_cpufreq_init(lcore_id); - if (ret == 0) { - rte_power_set_env(PM_ENV_ACPI_CPUFREQ); - goto out; + POWER_LOG(INFO, "Attempting to initialise ACPI cpufreq" + " power management...\n"); + ops = &rte_power_ops[PM_ENV_ACPI_CPUFREQ]; + if (ops->status) { + ret = ops->init(lcore_id); + if (ret == 0) { + rte_power_set_env(PM_ENV_ACPI_CPUFREQ); + goto out; + } } - POWER_LOG(INFO, "Attempting to initialise PSTAT power management..."); - ret = power_pstate_cpufreq_init(lcore_id); - if (ret == 0) { - rte_power_set_env(PM_ENV_PSTATE_CPUFREQ); - goto out; + POWER_LOG(INFO, "Attempting to initialise PSTAT" + " power management...\n"); + ops = &rte_power_ops[PM_ENV_PSTATE_CPUFREQ]; + if (ops->status) { + ret = ops->init(lcore_id); + if (ret == 0) { + rte_power_set_env(PM_ENV_PSTATE_CPUFREQ); + goto out; + } } - POWER_LOG(INFO, "Attempting to initialise AMD PSTATE power management..."); - ret = power_amd_pstate_cpufreq_init(lcore_id); - if (ret == 0) { - rte_power_set_env(PM_ENV_AMD_PSTATE_CPUFREQ); - goto out; + POWER_LOG(INFO, "Attempting to initialise AMD PSTATE" + " power management...\n"); + ops = &rte_power_ops[PM_ENV_AMD_PSTATE_CPUFREQ]; + if (ops->status) { + ret = ops->init(lcore_id); + if (ret == 0) { + rte_power_set_env(PM_ENV_AMD_PSTATE_CPUFREQ); + goto out; + } } - POWER_LOG(INFO, "Attempting to initialise CPPC power management..."); - ret = power_cppc_cpufreq_init(lcore_id); - if (ret == 0) { - rte_power_set_env(PM_ENV_CPPC_CPUFREQ); - goto out; + POWER_LOG(INFO, "Attempting to initialise CPPC power" + " management...\n"); + ops = &rte_power_ops[PM_ENV_CPPC_CPUFREQ]; + if (ops->status) { + ret = ops->init(lcore_id); + if (ret == 0) { + rte_power_set_env(PM_ENV_CPPC_CPUFREQ); + goto out; + } } - POWER_LOG(INFO, "Attempting to initialise VM power management..."); - ret = power_kvm_vm_init(lcore_id); - if (ret == 0) { - rte_power_set_env(PM_ENV_KVM_VM); - goto out; + POWER_LOG(INFO, "Attempting to initialise VM power" + " management...\n"); + ops = &rte_power_ops[PM_ENV_KVM_VM]; + if (ops->status) { + ret = ops->init(lcore_id); + if (ret == 0) { + rte_power_set_env(PM_ENV_KVM_VM); + goto out; + } } - POWER_LOG(ERR, "Unable to set Power Management Environment for lcore " - "%u", lcore_id); + POWER_LOG(ERR, "Unable to set Power Management Environment" + " for lcore %u\n", lcore_id); out: return ret; } @@ -237,21 +215,14 @@ rte_power_init(unsigned int lcore_id) int rte_power_exit(unsigned int lcore_id) { - switch (global_default_env) { - case PM_ENV_ACPI_CPUFREQ: - return power_acpi_cpufreq_exit(lcore_id); - case PM_ENV_KVM_VM: - return power_kvm_vm_exit(lcore_id); - case PM_ENV_PSTATE_CPUFREQ: - return power_pstate_cpufreq_exit(lcore_id); - case PM_ENV_CPPC_CPUFREQ: - return power_cppc_cpufreq_exit(lcore_id); - case PM_ENV_AMD_PSTATE_CPUFREQ: - return power_amd_pstate_cpufreq_exit(lcore_id); - default: - POWER_LOG(ERR, "Environment has not been set, unable to exit gracefully"); + struct rte_power_ops *ops; + if (global_default_env != PM_ENV_NOT_SET) { + ops = &rte_power_ops[global_default_env]; + return ops->exit(lcore_id); } - return -1; + POWER_LOG(ERR, "Environment has not been set, unable " + "to exit gracefully\n"); + return -1; } diff --git a/lib/power/rte_power.h b/lib/power/rte_power.h index 4fa4afe399..749bb823ab 100644 --- a/lib/power/rte_power.h +++ b/lib/power/rte_power.h @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2010-2014 Intel Corporation + * Copyright(c) 2024 AMD Limited */ #ifndef _RTE_POWER_H @@ -21,7 +22,7 @@ extern "C" { /* Power Management Environment State */ enum power_management_env {PM_ENV_NOT_SET, PM_ENV_ACPI_CPUFREQ, PM_ENV_KVM_VM, PM_ENV_PSTATE_CPUFREQ, PM_ENV_CPPC_CPUFREQ, - PM_ENV_AMD_PSTATE_CPUFREQ}; + PM_ENV_AMD_PSTATE_CPUFREQ, PM_ENV_MAX}; /** * Check if a specific power management environment type is supported on a @@ -66,6 +67,97 @@ void rte_power_unset_env(void); */ enum power_management_env rte_power_get_env(void); +typedef int (*rte_power_cpufreq_init_t)(unsigned int lcore_id); +typedef int (*rte_power_cpufreq_exit_t)(unsigned int lcore_id); +typedef int (*rte_power_check_env_support_t)(void); + +typedef uint32_t (*rte_power_freqs_t)(unsigned int lcore_id, uint32_t *freqs, + uint32_t num); +typedef uint32_t (*rte_power_get_freq_t)(unsigned int lcore_id); +typedef int (*rte_power_set_freq_t)(unsigned int lcore_id, uint32_t index); +typedef int (*rte_power_freq_change_t)(unsigned int lcore_id); + +/** + * Function pointer definition for generic frequency change functions. Review + * each environments specific documentation for usage. + * + * @param lcore_id + * lcore id. + * + * @return + * - 1 on success with frequency changed. + * - 0 on success without frequency changed. + * - Negative on error. + */ + +/** + * Power capabilities summary. + */ +struct rte_power_core_capabilities { + union { + uint64_t capabilities; + struct { + uint64_t turbo:1; /**< Turbo can be enabled. */ + uint64_t priority:1; /**< SST-BF high freq core */ + }; + }; +}; + +typedef int (*rte_power_get_capabilities_t)(unsigned int lcore_id, + struct rte_power_core_capabilities *caps); + +/** Structure defining core power operations structure */ +struct rte_power_ops { +uint8_t status; /**< ops register status. */ + enum power_management_env env; /**< power mgmt env. */ + rte_power_cpufreq_init_t init; /**< Initialize power management. */ + rte_power_cpufreq_exit_t exit; /**< Exit power management. */ + rte_power_check_env_support_t check_env_support; /**< verify env is supported. */ + rte_power_freqs_t get_avail_freqs; /**< Get the available frequencies. */ + rte_power_get_freq_t get_freq; /**< Get frequency index. */ + rte_power_set_freq_t set_freq; /**< Set frequency index. */ + rte_power_freq_change_t freq_up; /**< Scale up frequency. */ + rte_power_freq_change_t freq_down; /**< Scale down frequency. */ + rte_power_freq_change_t freq_max; /**< Scale up frequency to highest. */ + rte_power_freq_change_t freq_min; /**< Scale up frequency to lowest. */ + rte_power_freq_change_t turbo_status; /**< Get Turbo status. */ + rte_power_freq_change_t enable_turbo; /**< Enable Turbo. */ + rte_power_freq_change_t disable_turbo; /**< Disable Turbo. */ + rte_power_get_capabilities_t get_caps; /**< power capabilities. */ +} __rte_cache_aligned; + +/** + * Register power cpu frequency operations. + * + * @param ops + * Pointer to an ops structure to register. + * @return + * - >=0: Success; return the index of the ops struct in the table. + * - -EINVAL - error while registering ops struct. + */ +__rte_internal +int rte_power_register_ops(const struct rte_power_ops *ops); + +/** + * Macro to statically register the ops of a cpufreq driver. + */ +#define RTE_POWER_REGISTER_OPS(ops) \ + (RTE_INIT(power_hdlr_init_##ops) \ + { \ + rte_power_register_ops(&ops); \ + }) + +/** + * @internal Get the power ops struct from its index. + * + * @param ops_index + * The index of the ops struct in the ops struct table. + * @return + * The pointer to the ops struct in the table if registered. + */ +struct rte_power_ops * +rte_power_get_ops(int ops_index); + /** * Initialize power management for a specific lcore. If rte_power_set_env() has * not been called then an auto-detect of the environment will start and @@ -108,10 +200,14 @@ int rte_power_exit(unsigned int lcore_id); * @return * The number of available frequencies. */ -typedef uint32_t (*rte_power_freqs_t)(unsigned int lcore_id, uint32_t *freqs, - uint32_t num); +static inline uint32_t +rte_power_freqs(unsigned int lcore_id, uint32_t *freqs, uint32_t n) +{ + struct rte_power_ops *ops; -extern rte_power_freqs_t rte_power_freqs; + ops = rte_power_get_ops(rte_power_get_env()); + return ops->get_avail_freqs(lcore_id, freqs, n); +} /** * Return the current index of available frequencies of a specific lcore. @@ -124,9 +220,14 @@ extern rte_power_freqs_t rte_power_freqs; * @return * The current index of available frequencies. */ -typedef uint32_t (*rte_power_get_freq_t)(unsigned int lcore_id); +static inline uint32_t +rte_power_get_freq(unsigned int lcore_id) +{ + struct rte_power_ops *ops; -extern rte_power_get_freq_t rte_power_get_freq; + ops = rte_power_get_ops(rte_power_get_env()); + return ops->get_freq(lcore_id); +} /** * Set the new frequency for a specific lcore by indicating the index of @@ -144,9 +245,14 @@ extern rte_power_get_freq_t rte_power_get_freq; * - 0 on success without frequency changed. * - Negative on error. */ -typedef int (*rte_power_set_freq_t)(unsigned int lcore_id, uint32_t index); +static inline uint32_t +rte_power_set_freq(unsigned int lcore_id, uint32_t index) +{ + struct rte_power_ops *ops; -extern rte_power_set_freq_t rte_power_set_freq; + ops = rte_power_get_ops(rte_power_get_env()); + return ops->set_freq(lcore_id, index); +} /** * Function pointer definition for generic frequency change functions. Review @@ -167,59 +273,95 @@ typedef int (*rte_power_freq_change_t)(unsigned int lcore_id); * frequencies. * Review each environments specific documentation for usage. */ -extern rte_power_freq_change_t rte_power_freq_up; +static inline int +rte_power_freq_up(unsigned int lcore_id) +{ + struct rte_power_ops *ops; + + ops = rte_power_get_ops(rte_power_get_env()); + return ops->freq_up(lcore_id); +} /** * Scale down the frequency of a specific lcore according to the available * frequencies. * Review each environments specific documentation for usage. */ -extern rte_power_freq_change_t rte_power_freq_down; +static inline int +rte_power_freq_down(unsigned int lcore_id) +{ + struct rte_power_ops *ops; + + ops = rte_power_get_ops(rte_power_get_env()); + return ops->freq_down(lcore_id); +} /** * Scale up the frequency of a specific lcore to the highest according to the * available frequencies. * Review each environments specific documentation for usage. */ -extern rte_power_freq_change_t rte_power_freq_max; +static inline int +rte_power_freq_max(unsigned int lcore_id) +{ + struct rte_power_ops *ops; + + ops = rte_power_get_ops(rte_power_get_env()); + return ops->freq_max(lcore_id); +} /** * Scale down the frequency of a specific lcore to the lowest according to the * available frequencies. * Review each environments specific documentation for usage.. */ -extern rte_power_freq_change_t rte_power_freq_min; +static inline int +rte_power_freq_min(unsigned int lcore_id) +{ + struct rte_power_ops *ops; + + ops = rte_power_get_ops(rte_power_get_env()); + return ops->freq_min(lcore_id); +} /** * Query the Turbo Boost status of a specific lcore. * Review each environments specific documentation for usage.. */ -extern rte_power_freq_change_t rte_power_turbo_status; +static inline int +rte_power_turbo_status(unsigned int lcore_id) +{ + struct rte_power_ops *ops; + + ops = rte_power_get_ops(rte_power_get_env()); + return ops->turbo_status(lcore_id); +} /** * Enable Turbo Boost for this lcore. * Review each environments specific documentation for usage.. */ -extern rte_power_freq_change_t rte_power_freq_enable_turbo; +static inline int +rte_power_freq_enable_turbo(unsigned int lcore_id) +{ + struct rte_power_ops *ops; + + ops = rte_power_get_ops(rte_power_get_env()); + return ops->enable_turbo(lcore_id); +} /** * Disable Turbo Boost for this lcore. * Review each environments specific documentation for usage.. */ -extern rte_power_freq_change_t rte_power_freq_disable_turbo; +static inline int +rte_power_freq_disable_turbo(unsigned int lcore_id) +{ + struct rte_power_ops *ops; -/** - * Power capabilities summary. - */ -struct rte_power_core_capabilities { - union { - uint64_t capabilities; - struct { - uint64_t turbo:1; /**< Turbo can be enabled. */ - uint64_t priority:1; /**< SST-BF high freq core */ - }; - }; -}; + ops = rte_power_get_ops(rte_power_get_env()); + return ops->disable_turbo(lcore_id); +} /** * Returns power capabilities for a specific lcore. @@ -235,10 +377,15 @@ struct rte_power_core_capabilities { * - 0 on success. * - Negative on error. */ -typedef int (*rte_power_get_capabilities_t)(unsigned int lcore_id, - struct rte_power_core_capabilities *caps); +static inline int +rte_power_get_capabilities(unsigned int lcore_id, + struct rte_power_core_capabilities *caps) +{ + struct rte_power_ops *ops; -extern rte_power_get_capabilities_t rte_power_get_capabilities; + ops = rte_power_get_ops(rte_power_get_env()); + return ops->get_caps(lcore_id, caps); +} #ifdef __cplusplus } diff --git a/lib/power/version.map b/lib/power/version.map index ad92a65f91..2f89645ec2 100644 --- a/lib/power/version.map +++ b/lib/power/version.map @@ -52,3 +52,15 @@ EXPERIMENTAL { rte_power_uncore_freqs; rte_power_unset_uncore_env; }; + +INTERNAL { + global: + + rte_power_register_ops; + cpufreq_check_scaling_driver; + power_set_governor; + open_core_sysfs_file; + read_core_sysfs_u32; + read_core_sysfs_s; + write_core_sysfs_s; +}; -- 2.25.1