From patchwork Fri Aug 11 10:25:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sivaprasad Tummala X-Patchwork-Id: 130157 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1DE4443033; Fri, 11 Aug 2023 12:26:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 07B7E40F16; Fri, 11 Aug 2023 12:26:35 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2061.outbound.protection.outlook.com [40.107.220.61]) by mails.dpdk.org (Postfix) with ESMTP id CAA3A40E03 for ; Fri, 11 Aug 2023 12:26:33 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=A2hkQGPzJCq6ow/mUjSbkVN6mBzF3wRioffjfvibvXoLgBWhtJ9NTwJg0aIiNZuPXtOm6rsFUUTPsNeKfT340MMQYb4aSxMKpC8CyNMiMnb5P/SQaZJCc52dHwF+a8GLKJea+4hToYctHx+EDT7Fj5Df1n+Zxgqc+v7SUSsmocVRJ1dmrbaCSBdb7G/ha9+gjMHoQAXZYCuEQlYhVi8ey/n4DoIl4OlnVERWPUt/pikpbvWCCZBw0ZpuLVu/EfC86n+3QJ6fr8B/7rmmWptmVEP1yn7IMs40WZFhZOW6xocp5KBGm9dodXM2uZsI4gNtULwWUqEFqtBu4cy0rtzLIQ== 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=cM8qwMTOF7BH82qrUi/Yr8NetsjAONJ8xtZoVnI1ysg=; b=evn4HzBXdOm+puzwS0ZmFUOAraNZrU0Hj5sPeQO4gk/zSDgAeecrxl1bPMRICxlarulXD7hPYcN1QO2q0FNY/AGFmeMYW5MI4xcVf6PHr12dy4oIui3pKXOu+lF9axp1x6fPVTdimzdnU7aSkESrUqn0iLgYh8/s2ok65MnF3G7070gYz2E8b1YFAmJu0/+k4diwY4T67yYSIubMwiSZOpDECnx+hQsplr8Kc37UcPuCSSy71k28mvI45m575CaHBcypjVhxZ9wOErFGI2C93ZiUu2eQKbQ1XstgFQ5Nzosq9/QXQiOKn/2qTMEuxCaABZVE/48eZgMi4SE/t1Z4FQ== 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 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=cM8qwMTOF7BH82qrUi/Yr8NetsjAONJ8xtZoVnI1ysg=; b=HOQYYM+EkO/yWe2xWLy2gfyhYSPCLVdx6VgdOnBFIPT1VsHkcc3ODRitPHV6bKPXtdcyEulIpztWfEuDb7J9PRrg/PgSWbt6cC7kmXpUvSmmwrBtpNcOpFadS3NMQFZn8EW9jhZpbp+3zXZXrBeEEUbkC6wG3coAqm5A1aQkjIQ= Received: from CY5PR15CA0017.namprd15.prod.outlook.com (2603:10b6:930:14::7) by MN2PR12MB4342.namprd12.prod.outlook.com (2603:10b6:208:264::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.20; Fri, 11 Aug 2023 10:26:31 +0000 Received: from CY4PEPF0000EE38.namprd03.prod.outlook.com (2603:10b6:930:14:cafe::45) by CY5PR15CA0017.outlook.office365.com (2603:10b6:930:14::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.31 via Frontend Transport; Fri, 11 Aug 2023 10:26:31 +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 CY4PEPF0000EE38.mail.protection.outlook.com (10.167.242.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6652.19 via Frontend Transport; Fri, 11 Aug 2023 10:26:30 +0000 Received: from telco-siena.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.27; Fri, 11 Aug 2023 05:26:28 -0500 From: Sivaprasad Tummala To: , , CC: Subject: [PATCH v1 1/2] power: refactor uncore power management interfaces Date: Fri, 11 Aug 2023 03:25:33 -0700 Message-ID: <20230811102534.491000-1-sivaprasad.tummala@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230503170349.740528-1-sivaprasad.tummala@amd.com> References: <20230503170349.740528-1-sivaprasad.tummala@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: CY4PEPF0000EE38:EE_|MN2PR12MB4342:EE_ X-MS-Office365-Filtering-Correlation-Id: 8e76a576-52a1-4e40-8e92-08db9a556ded X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LwtI+eSQgEy7yKLNDPsMyL6DS3InA0YV4b5Ob5dt94ZE+xFMueoRiIvfOCZBNCKJpZODv4ztGBd1zrcRY2ZzGPKpZHPJdQHwUjyMFTraYIYa3J7a2cQAT/BWsN5bwZ54W1vcR4pUiqM3fhC32+heKl3UYeqw8xAHQrEJ4/or2MUboXgfUC0lkMZAB/Fhg0tBGwTMbQ27ge33Rgz6vnj6x9VzTRlFfEaptpFico9siqrjXzu/n7dPz7SYTeE6hUfInC1+fZWcL83dzxP5Dnjs1I98i9VmQqS2GrmWdwgFo6Mnr1r8dSXs+/FO9dNT/dGFC1JDbQR7Qa1vrHMbHN3JHjwTM8FDkuQjdpfap7cUMxE67K49IcopLd52ToC4+sUMryfzV3UftO6s6tZXKv467YYdLMMOPfSrY7o2e6lIH3DuLUrhZPE+t8SwGwHDG2kuG+P9qRB/KgyekuCK/Jp8Y6ccay0BLaUvLB4SPC2fJYOEpB9fi1w+DEoNT1R8+nnGMiAgZjWRHlwxmdsUzotp+x6Ox1JiDIKuuGOa0YNFbnA2wp69L1wFUHfbILA+Xu6svF7RGkIQc1bURE56v/m8UF95ZomyQO/rg8l3mjWZtgu9kaNw/N/XGlllw9oCfzMo5JGsUB7q/z0TxEQYyGnNPtDjW8oiA0xaFZ9Rpf51R0Io2FIGrGShAdOabkhJicqmVWJUZ6mSeEeJgdOBtdiTT6GMAFvjkfgJfie59GA2kfi5b5XrSSPVl5f8V8SSPUTJ2XQUJsB7lQmkeJABOeg1OA== 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)(376002)(396003)(39860400002)(136003)(346002)(82310400008)(1800799006)(186006)(451199021)(46966006)(36840700001)(40470700004)(2906002)(44832011)(5660300002)(70586007)(41300700001)(8676002)(4326008)(8936002)(70206006)(6636002)(478600001)(36860700001)(7696005)(6666004)(2616005)(1076003)(40460700003)(26005)(336012)(83380400001)(316002)(110136005)(426003)(86362001)(40480700001)(47076005)(36756003)(82740400003)(16526019)(81166007)(356005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2023 10:26:30.9146 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8e76a576-52a1-4e40-8e92-08db9a556ded 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: CY4PEPF0000EE38.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4342 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 currently the uncore power management implementation is vendor specific. Added new vendor agnostic uncore power interface similar to rte_power and rename specific implementations ("rte_power_intel_uncore") to "power_intel_uncore" along with functions. Signed-off-by: Sivaprasad Tummala --- lib/power/rte_power_uncore.h | 254 +++++++++++++++++++++++++++++++++++ 1 file changed, 254 insertions(+) create mode 100644 lib/power/rte_power_uncore.h diff --git a/lib/power/rte_power_uncore.h b/lib/power/rte_power_uncore.h new file mode 100644 index 0000000000..e27f483eae --- /dev/null +++ b/lib/power/rte_power_uncore.h @@ -0,0 +1,254 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2022 Intel Corporation + * Copyright(c) 2023 AMD Corporation + */ + +#ifndef RTE_POWER_UNCORE_H +#define RTE_POWER_UNCORE_H + +/** + * @file + * RTE Uncore Frequency Management + */ + +#include +#include "rte_power.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/* Uncore Power Management Environment */ +enum uncore_power_mgmt_env { UNCORE_PM_ENV_NOT_SET, + UNCORE_PM_ENV_INTEL_UNCORE, UNCORE_PM_ENV_AMD_HSMP}; + +/** + * Initialize uncore frequency management for specific die on a package. + * It will get the available frequencies and prepare to set new die frequencies. + * + * This function should NOT be called in the fast path. + * + * @param pkg + * Package number. + * Each physical CPU in a system is referred to as a package. + * @param die + * Die number. + * Each package can have several dies connected together via the uncore mesh. + * + * @return + * - 0 on success. + * - Negative on error. + */ +__rte_experimental +int +rte_power_uncore_init(unsigned int pkg, unsigned int die); + +/** + * Exit uncore frequency management on a specific die on a package. + * It will restore uncore min and* max values to previous values + * before initialization of API. + * + * This function should NOT be called in the fast path. + * + * @param pkg + * Package number. + * Each physical CPU in a system is referred to as a package. + * @param die + * Die number. + * Each package can have several dies connected together via the uncore mesh. + * + * @return + * - 0 on success. + * - Negative on error. + */ +__rte_experimental +int +rte_power_uncore_exit(unsigned int pkg, unsigned int die); + +/** + * Return the current index of available frequencies of a specific die on a package. + * It should be protected outside of this function for threadsafe. + * + * This function should NOT be called in the fast path. + * + * @param pkg + * Package number. + * Each physical CPU in a system is referred to as a package. + * @param die + * Die number. + * Each package can have several dies connected together via the uncore mesh. + * + * @return + * The current index of available frequencies. + * If error, it will return 'RTE_POWER_INVALID_FREQ_INDEX = (~0)'. + */ +typedef uint32_t (*rte_power_get_uncore_freq_t)(unsigned int pkg, unsigned int die); + +extern rte_power_get_uncore_freq_t rte_power_get_uncore_freq; + +/** + * Set minimum and maximum uncore frequency for specified die on a package + * to specified index value. + * It should be protected outside of this function for threadsafe. + * + * This function should NOT be called in the fast path. + * + * @param pkg + * Package number. + * Each physical CPU in a system is referred to as a package. + * @param die + * Die number. + * Each package can have several dies connected together via the uncore mesh. + * @param index + * The index of available frequencies. + * + * @return + * - 1 on success with frequency changed. + * - 0 on success without frequency changed. + * - Negative on error. + */ +typedef int (*rte_power_set_uncore_freq_t)(unsigned int pkg, unsigned int die, uint32_t index); + +extern rte_power_set_uncore_freq_t rte_power_set_uncore_freq; + +/** + * Function pointer definition for generic frequency change functions. + * + * @param pkg + * Package number. + * Each physical CPU in a system is referred to as a package. + * @param die + * Die number. + * Each package can have several dies connected together via the uncore mesh. + * + * @return + * - 1 on success with frequency changed. + * - 0 on success without frequency changed. + * - Negative on error. + */ +typedef int (*rte_power_uncore_freq_change_t)(unsigned int pkg, unsigned int die); + +/** + * Set minimum and maximum uncore frequency for specified die on a package + * to maximum value according to the available frequencies. + * It should be protected outside of this function for threadsafe. + * + * This function should NOT be called in the fast path. + * + * @param pkg + * Package number. + * Each physical CPU in a system is referred to as a package. + * @param die + * Die number. + * Each package can have several dies connected together via the uncore mesh. + * + * @return + * - 1 on success with frequency changed. + * - 0 on success without frequency changed. + * - Negative on error. + */ +extern rte_power_uncore_freq_change_t rte_power_uncore_freq_max; + +/** + * Set minimum and maximum uncore frequency for specified die on a package + * to minimum value according to the available frequencies. + * It should be protected outside of this function for threadsafe. + * + * This function should NOT be called in the fast path. + * + * @param pkg + * Package number. + * Each physical CPU in a system is referred to as a package. + * @param die + * Die number. + * Each package can have several dies connected together via the uncore mesh. + * + * @return + * - 1 on success with frequency changed. + * - 0 on success without frequency changed. + * - Negative on error. + */ +extern rte_power_uncore_freq_change_t rte_power_uncore_freq_min; + +/** + * Return the list of available frequencies in the index array. + * + * This function should NOT be called in the fast path. + * + * @param pkg + * Package number. + * Each physical CPU in a system is referred to as a package. + * @param die + * Die number. + * Each package can have several dies connected together via the uncore mesh. + * @param freqs + * The buffer array to save the frequencies. + * @param num + * The number of frequencies to get. + * + * @return + * - The number of available index's in frequency array. + * - Negative on error. + */ +typedef int (*rte_power_uncore_freqs_t)(unsigned int pkg, unsigned int die, + uint32_t *freqs, uint32_t num); + +extern rte_power_uncore_freqs_t rte_power_uncore_freqs; + +/** + * Return the list length of available frequencies in the index array. + * + * This function should NOT be called in the fast path. + * + * @param pkg + * Package number. + * Each physical CPU in a system is referred to as a package. + * @param die + * Die number. + * Each package can have several dies connected together via the uncore mesh. + * + * @return + * - The number of available index's in frequency array. + * - Negative on error. + */ +typedef int (*rte_power_uncore_get_num_freqs_t)(unsigned int pkg, unsigned int die); + +extern rte_power_uncore_get_num_freqs_t rte_power_uncore_get_num_freqs; + +/** + * Return the number of packages (CPUs) on a system + * by parsing the uncore sysfs directory. + * + * This function should NOT be called in the fast path. + * + * @return + * - Zero on error. + * - Number of package on system on success. + */ +typedef unsigned int (*rte_power_uncore_get_num_pkgs_t)(void); + +extern rte_power_uncore_get_num_pkgs_t rte_power_uncore_get_num_pkgs; + +/** + * Return the number of dies for pakckages (CPUs) specified + * from parsing the uncore sysfs directory. + * + * This function should NOT be called in the fast path. + * + * @param pkg + * Package number. + * Each physical CPU in a system is referred to as a package. + * + * @return + * - Zero on error. + * - Number of dies for package on sucecss. + */ +typedef unsigned int (*rte_power_uncore_get_num_dies_t)(unsigned int pkg); + +extern rte_power_uncore_get_num_dies_t rte_power_uncore_get_num_dies; + +#ifdef __cplusplus +} +#endif + +#endif /* RTE_POWER_UNCORE_H */ From patchwork Fri Aug 11 10:25:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sivaprasad Tummala X-Patchwork-Id: 130158 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 831B843033; Fri, 11 Aug 2023 12:26:39 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3435143257; Fri, 11 Aug 2023 12:26:37 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2040.outbound.protection.outlook.com [40.107.92.40]) by mails.dpdk.org (Postfix) with ESMTP id D197543251 for ; Fri, 11 Aug 2023 12:26:35 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kHaqREWpmdB9yB+hl4tQKu6aFb1fwsL57Hc7l7d7xSBfY80knVnjlGC2qVNFO11ooHjOUQaGlvzNTc7a6f44hQBxfhRf5xg3vC3scESlrZLebMd9ZF4BK4n/7axCIEUzuiBk+uZXNJifk/YdWjv2QgaNIjQFqHF8vTIfToaLlKHapIg8V7qV+SRpkhBAL435A1F2Ze7vjDq5zF41iXLctv74eKTTYijTUTB2kEhj6ksYZkw6gTWzCMKDx7/7OvYsHGUWpk24OGHx4mlvoc+oo9bEsu5aZiuiiqoRj8eK3OcgSiilv/PaIN1KW+GeBzyyaaAEr6j6zUwGQNAMAAHfBg== 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=52CZ+TOyhKoWAZoZQI9R+yTWieBT46tAGNi3CPjY1JE=; b=f+Wmcnu8zQByEkzYb2dLo3q+hnHuUSSUzE4DiCrTzdgQfH9U7o+hIhIMXrliU1AvsSR3hqW/wnDTMneTNubE6cRIMMkYyiaQ38K2qxF0f7dFO8Yql1x8R0K2qxGXxDmsYlLUKQ+ml7h76hAqE5SlQofZabd9P1KU4ORtgvQossDQDVxTau/5ltJk/rhUcXAfw/eUMzVhLPs/uOe0AQ34DgD4OACJ9brGiwvPinv6LF9XMBdkQ9wReGJYyyKK1ubsInTouIsKuuXw/F1ienJyd6P8AkNMespUpmKC/Rax5li2h91nlB3Fx2B6h4bbNaicd1Ui7jaGzVFquOkeSK5m2w== 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 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=52CZ+TOyhKoWAZoZQI9R+yTWieBT46tAGNi3CPjY1JE=; b=lvvHTqtH/zL8M5tYLGInObEMoANrVmaKztOopus1lF+FCYIOMc0DUI1MYL7AA91/wiKO4csyFsQG0D/p4CTtL2Z8MSTddjkm0EshkmcrON1C6rzfHnJ0ncqporLAUWlN2VoRkn0ZVVqY20TEfTaES/MhLwz9Lx1VGWQMoucw7o0= Received: from CY5PR15CA0010.namprd15.prod.outlook.com (2603:10b6:930:14::15) by DM4PR12MB6661.namprd12.prod.outlook.com (2603:10b6:8:b7::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.20; Fri, 11 Aug 2023 10:26:32 +0000 Received: from CY4PEPF0000EE38.namprd03.prod.outlook.com (2603:10b6:930:14:cafe::8d) by CY5PR15CA0010.outlook.office365.com (2603:10b6:930:14::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.31 via Frontend Transport; Fri, 11 Aug 2023 10:26:31 +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 CY4PEPF0000EE38.mail.protection.outlook.com (10.167.242.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6652.19 via Frontend Transport; Fri, 11 Aug 2023 10:26:31 +0000 Received: from telco-siena.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.27; Fri, 11 Aug 2023 05:26:29 -0500 From: Sivaprasad Tummala To: , , CC: Subject: [PATCH v1 2/2] power: refactor uncore power management implementation Date: Fri, 11 Aug 2023 03:25:34 -0700 Message-ID: <20230811102534.491000-2-sivaprasad.tummala@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230811102534.491000-1-sivaprasad.tummala@amd.com> References: <20230503170349.740528-1-sivaprasad.tummala@amd.com> <20230811102534.491000-1-sivaprasad.tummala@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: CY4PEPF0000EE38:EE_|DM4PR12MB6661:EE_ X-MS-Office365-Filtering-Correlation-Id: b0f92306-c621-4340-b02b-08db9a556e70 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MOKCajpj6OpzlFymA+zJZa2Ry3VvV+GNeSzxvjUocAyVoYaZfgXPMW5PHPRprQfGjhM9mLxXBgHo/CJ5tX0fuMNnEpnOYa84U5/dHgzm5l546k1HlohPeYukqLqoJRYbzP0mZw8JKdwFrS2aTH+cb9uH3m0MsoXZEPE1EmSWAIIxrU17FO5twM1uD4dzYd9prkNkPqAYWB4FvX5lUMEfKLg2FnvcXToeGUG6OVqTxsQQy9Us01G7xEnMUV31j+w5fMwq4ekhAp3q2TQ9jBcJVLFHiZKlJ43rkOZA+b7I9/A2K5NXxRJuD/k/lEujaocf2U3lemXKOZXGYzw/Y3xMsmUZltdBXADWrmS78EzgMWbwiREul3I8HUEeg5vInDrnNFSqV0Vwsx+nz/0VfXfIkT6djsqD39o6fmT5lHJ/K9vRRGqUNazMSVuln6BD3C9zK80XFR5IE8HteZSu0ylEUXSXs5HswlVr+hoTSnchZVnCrjWh04HTpnt3yTnLolF5Yr7MS+gG4kInmH6H6HOWJ2lAtLuLnfqr17XhSKf5dS4phvcO1MUQXXk1ZTGz5h5if0c3xg8xk5STaDTAdY3vrefqqey8sDQFv6mClO9BYk/UE/Beh1ZQn8Ed7Cws/0MkrHLhKVQBbBYyPzVSK4/1Dski+ZUuaUxDsDUzxFnJwm64YOrMtXNvCGS5Z+rngyJFUPvP5b9/FzzMHb6HehKDO51pGTkQt3vqcof10OrMf+vUOv+x7Z8kCLW1AH7eG8LB+qCLerZ5W03wPBnVex2P0A== 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)(346002)(376002)(136003)(39860400002)(451199021)(1800799006)(186006)(82310400008)(40470700004)(46966006)(36840700001)(40460700003)(36756003)(2616005)(5660300002)(6666004)(82740400003)(356005)(4326008)(8676002)(8936002)(81166007)(40480700001)(110136005)(86362001)(70586007)(70206006)(47076005)(83380400001)(16526019)(478600001)(26005)(2906002)(7696005)(6636002)(316002)(44832011)(36860700001)(41300700001)(336012)(426003)(1076003)(30864003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2023 10:26:31.7739 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b0f92306-c621-4340-b02b-08db9a556e70 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: CY4PEPF0000EE38.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6661 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 currently the uncore power management implementation is vendor specific. Added new vendor agnostic uncore power management implementation similar to rte_power and rename specific implementations ("rte_power_intel_uncore") to "power_intel_uncore" along with functions. Signed-off-by: Sivaprasad Tummala --- app/test/meson.build | 2 +- ...wer_intel_uncore.c => test_power_uncore.c} | 43 ++++++- config/rte_config.h | 1 + examples/l3fwd-power/main.c | 2 +- lib/power/meson.build | 5 +- ...er_intel_uncore.c => power_intel_uncore.c} | 53 +++++--- ...er_intel_uncore.h => power_intel_uncore.h} | 66 +++++----- lib/power/rte_power_uncore.c | 118 ++++++++++++++++++ lib/power/version.map | 3 + 9 files changed, 239 insertions(+), 54 deletions(-) rename app/test/{test_power_intel_uncore.c => test_power_uncore.c} (87%) rename lib/power/{rte_power_intel_uncore.c => power_intel_uncore.c} (90%) rename lib/power/{rte_power_intel_uncore.h => power_intel_uncore.h} (77%) create mode 100644 lib/power/rte_power_uncore.c diff --git a/app/test/meson.build b/app/test/meson.build index 66897c14a3..23ef7a8094 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -99,7 +99,7 @@ test_sources = files( 'test_power.c', 'test_power_cpufreq.c', 'test_power_kvm_vm.c', - 'test_power_intel_uncore.c', + 'test_power_uncore.c', 'test_prefetch.c', 'test_rand_perf.c', 'test_rawdev.c', diff --git a/app/test/test_power_intel_uncore.c b/app/test/test_power_uncore.c similarity index 87% rename from app/test/test_power_intel_uncore.c rename to app/test/test_power_uncore.c index 31163af84e..5fe7434a4c 100644 --- a/app/test/test_power_intel_uncore.c +++ b/app/test/test_power_uncore.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2010-2022 Intel Corporation + * Copyright(c) 2023 AMD Corporation */ #include "test.h" @@ -7,14 +8,14 @@ #ifndef RTE_LIB_POWER static int -test_power_intel_uncore(void) +test_power_uncore(void) { printf("Power management library not supported, skipping test\n"); return TEST_SKIPPED; } #else -#include +#include #include #define MAX_UNCORE_FREQS 32 @@ -155,6 +156,32 @@ check_power_uncore_freq_min(void) return 0; } +static int +check_power_uncore_get_freqs(void) +{ + int ret; + uint32_t freqs[RTE_MAX_UNCORE_FREQS]; + + /* Successfully get uncore freq */ + ret = rte_power_uncore_freqs(VALID_PKG, VALID_DIE, freqs, RTE_MAX_UNCORE_FREQS); + if (ret < 0) { + printf("Failed to get uncore frequencies for pkg %u die %u\n", + VALID_PKG, VALID_DIE); + return -1; + } + + /* Unsuccessful Test */ + ret = rte_power_uncore_freqs(INVALID_PKG, INVALID_DIE, freqs, + RTE_MAX_UNCORE_FREQS); + if (ret >= 0) { + printf("Unexpectedly got invalid frequencies for pkg %u die %u\n", + INVALID_PKG, INVALID_DIE); + return -1; + } + + return 0; +} + static int check_power_uncore_get_num_freqs(void) { @@ -172,7 +199,7 @@ check_power_uncore_get_num_freqs(void) ret = rte_power_uncore_get_num_freqs(INVALID_PKG, INVALID_DIE); if (ret >= 0) { printf("Unexpectedly got number of invalid frequencies for pkg %u die %u\n", - INVALID_PKG, INVALID_DIE); + INVALID_PKG, INVALID_DIE); return -1; } @@ -242,7 +269,7 @@ check_power_uncore_exit(void) } static int -test_power_intel_uncore(void) +test_power_uncore(void) { int ret; @@ -274,7 +301,11 @@ test_power_intel_uncore(void) if (ret < 0) goto fail_all; - ret = check_power_uncore_get_num_freqs(); + ret = check_power_uncore_get_freqs(); + if (ret < 0) + goto fail_all; + + ret = check_power_uncore_get_freqs(); if (ret < 0) goto fail_all; @@ -298,4 +329,4 @@ test_power_intel_uncore(void) } #endif -REGISTER_TEST_COMMAND(power_intel_uncore_autotest, test_power_intel_uncore); +REGISTER_TEST_COMMAND(power_uncore_autotest, test_power_uncore); diff --git a/config/rte_config.h b/config/rte_config.h index 400e44e3cf..ccca68b4f3 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -87,6 +87,7 @@ /* rte_power defines */ #define RTE_MAX_LCORE_FREQS 64 +#define RTE_MAX_UNCORE_FREQS 64 /* rte_graph defines */ #define RTE_GRAPH_BURST_SIZE 256 diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index 3f01cbd9e2..a34a7958f0 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include "perf_core.h" #include "main.h" diff --git a/lib/power/meson.build b/lib/power/meson.build index 1ce8b7c07d..9693c3ba7d 100644 --- a/lib/power/meson.build +++ b/lib/power/meson.build @@ -18,13 +18,14 @@ sources = files( 'power_cppc_cpufreq.c', 'power_kvm_vm.c', 'power_pstate_cpufreq.c', + 'power_intel_uncore.c', 'rte_power.c', - 'rte_power_intel_uncore.c', + 'rte_power_uncore.c', 'rte_power_pmd_mgmt.c', ) headers = files( 'rte_power.h', - 'rte_power_intel_uncore.h', + 'rte_power_uncore.h', 'rte_power_pmd_mgmt.h', 'rte_power_guest_channel.h', ) diff --git a/lib/power/rte_power_intel_uncore.c b/lib/power/power_intel_uncore.c similarity index 90% rename from lib/power/rte_power_intel_uncore.c rename to lib/power/power_intel_uncore.c index 3b8724385f..7c8fd7a21c 100644 --- a/lib/power/rte_power_intel_uncore.c +++ b/lib/power/power_intel_uncore.c @@ -8,7 +8,7 @@ #include -#include "rte_power_intel_uncore.h" +#include "power_intel_uncore.h" #include "power_common.h" #define MAX_UNCORE_FREQS 32 @@ -196,7 +196,7 @@ power_init_for_setting_uncore_freq(struct uncore_power_info *ui) fclose(f_base_max); /* f_min and f_max are stored, no need to close */ - return 0; +return 0; err: if (f_base_min != NULL) @@ -246,7 +246,7 @@ static int check_pkg_die_values(unsigned int pkg, unsigned int die) { unsigned int max_pkgs, max_dies; - max_pkgs = rte_power_uncore_get_num_pkgs(); + max_pkgs = power_intel_uncore_get_num_pkgs(); if (max_pkgs == 0) return -1; if (pkg >= max_pkgs) { @@ -255,7 +255,7 @@ check_pkg_die_values(unsigned int pkg, unsigned int die) return -1; } - max_dies = rte_power_uncore_get_num_dies(pkg); + max_dies = power_intel_uncore_get_num_dies(pkg); if (max_dies == 0) return -1; if (die >= max_dies) { @@ -268,7 +268,7 @@ check_pkg_die_values(unsigned int pkg, unsigned int die) } int -rte_power_uncore_init(unsigned int pkg, unsigned int die) +power_intel_uncore_init(unsigned int pkg, unsigned int die) { struct uncore_power_info *ui; @@ -298,7 +298,7 @@ rte_power_uncore_init(unsigned int pkg, unsigned int die) } int -rte_power_uncore_exit(unsigned int pkg, unsigned int die) +power_intel_uncore_exit(unsigned int pkg, unsigned int die) { struct uncore_power_info *ui; @@ -333,7 +333,7 @@ rte_power_uncore_exit(unsigned int pkg, unsigned int die) } uint32_t -rte_power_get_uncore_freq(unsigned int pkg, unsigned int die) +power_get_intel_uncore_freq(unsigned int pkg, unsigned int die) { int ret = check_pkg_die_values(pkg, die); if (ret < 0) @@ -343,7 +343,7 @@ rte_power_get_uncore_freq(unsigned int pkg, unsigned int die) } int -rte_power_set_uncore_freq(unsigned int pkg, unsigned int die, uint32_t index) +power_set_intel_uncore_freq(unsigned int pkg, unsigned int die, uint32_t index) { int ret = check_pkg_die_values(pkg, die); if (ret < 0) @@ -353,7 +353,7 @@ rte_power_set_uncore_freq(unsigned int pkg, unsigned int die, uint32_t index) } int -rte_power_uncore_freq_max(unsigned int pkg, unsigned int die) +power_intel_uncore_freq_max(unsigned int pkg, unsigned int die) { int ret = check_pkg_die_values(pkg, die); if (ret < 0) @@ -364,7 +364,7 @@ rte_power_uncore_freq_max(unsigned int pkg, unsigned int die) int -rte_power_uncore_freq_min(unsigned int pkg, unsigned int die) +power_intel_uncore_freq_min(unsigned int pkg, unsigned int die) { int ret = check_pkg_die_values(pkg, die); if (ret < 0) @@ -376,7 +376,32 @@ rte_power_uncore_freq_min(unsigned int pkg, unsigned int die) } int -rte_power_uncore_get_num_freqs(unsigned int pkg, unsigned int die) +power_intel_uncore_freqs(unsigned int pkg, unsigned int die, + uint32_t *freqs, uint32_t num) +{ + struct uncore_power_info *ui; + + int ret = check_pkg_die_values(pkg, die); + if (ret < 0) + return -1; + + if (freqs == NULL) { + RTE_LOG(ERR, POWER, "NULL buffer supplied\n"); + return 0; + } + + ui = &uncore_info[pkg][die]; + if (num < ui->nb_freqs) { + RTE_LOG(ERR, POWER, "Buffer size is not enough\n"); + return 0; + } + rte_memcpy(freqs, ui->freqs, ui->nb_freqs * sizeof(uint32_t)); + + return ui->nb_freqs; +} + +int +power_intel_uncore_get_num_freqs(unsigned int pkg, unsigned int die) { int ret = check_pkg_die_values(pkg, die); if (ret < 0) @@ -386,7 +411,7 @@ rte_power_uncore_get_num_freqs(unsigned int pkg, unsigned int die) } unsigned int -rte_power_uncore_get_num_pkgs(void) +power_intel_uncore_get_num_pkgs(void) { DIR *d; struct dirent *dir; @@ -416,14 +441,14 @@ rte_power_uncore_get_num_pkgs(void) } unsigned int -rte_power_uncore_get_num_dies(unsigned int pkg) +power_intel_uncore_get_num_dies(unsigned int pkg) { DIR *d; struct dirent *dir; unsigned int count = 0, max_pkgs; char filter[FILTER_LENGTH]; - max_pkgs = rte_power_uncore_get_num_pkgs(); + max_pkgs = power_intel_uncore_get_num_pkgs(); if (max_pkgs == 0) return 0; if (pkg >= max_pkgs) { diff --git a/lib/power/rte_power_intel_uncore.h b/lib/power/power_intel_uncore.h similarity index 77% rename from lib/power/rte_power_intel_uncore.h rename to lib/power/power_intel_uncore.h index 0bd9f193a1..32d6b1f7a4 100644 --- a/lib/power/rte_power_intel_uncore.h +++ b/lib/power/power_intel_uncore.h @@ -2,8 +2,8 @@ * Copyright(c) 2022 Intel Corporation */ -#ifndef RTE_POWER_INTEL_UNCORE_H -#define RTE_POWER_INTEL_UNCORE_H +#ifndef POWER_INTEL_UNCORE_H +#define POWER_INTEL_UNCORE_H /** * @file @@ -12,6 +12,7 @@ #include #include "rte_power.h" +#include "rte_power_uncore.h" #ifdef __cplusplus extern "C" { @@ -34,9 +35,7 @@ extern "C" { * - 0 on success. * - Negative on error. */ -__rte_experimental -int -rte_power_uncore_init(unsigned int pkg, unsigned int die); +int power_intel_uncore_init(unsigned int pkg, unsigned int die); /** * Exit uncore frequency management on a specific die on a package. @@ -56,9 +55,7 @@ rte_power_uncore_init(unsigned int pkg, unsigned int die); * - 0 on success. * - Negative on error. */ -__rte_experimental -int -rte_power_uncore_exit(unsigned int pkg, unsigned int die); +int power_intel_uncore_exit(unsigned int pkg, unsigned int die); /** * Return the current index of available frequencies of a specific die on a package. @@ -77,9 +74,7 @@ rte_power_uncore_exit(unsigned int pkg, unsigned int die); * The current index of available frequencies. * If error, it will return 'RTE_POWER_INVALID_FREQ_INDEX = (~0)'. */ -__rte_experimental -uint32_t -rte_power_get_uncore_freq(unsigned int pkg, unsigned int die); +uint32_t power_get_intel_uncore_freq(unsigned int pkg, unsigned int die); /** * Set minimum and maximum uncore frequency for specified die on a package @@ -102,9 +97,7 @@ rte_power_get_uncore_freq(unsigned int pkg, unsigned int die); * - 0 on success without frequency changed. * - Negative on error. */ -__rte_experimental -int -rte_power_set_uncore_freq(unsigned int pkg, unsigned int die, uint32_t index); +int power_set_intel_uncore_freq(unsigned int pkg, unsigned int die, uint32_t index); /** * Set minimum and maximum uncore frequency for specified die on a package @@ -125,9 +118,7 @@ rte_power_set_uncore_freq(unsigned int pkg, unsigned int die, uint32_t index); * - 0 on success without frequency changed. * - Negative on error. */ -__rte_experimental -int -rte_power_uncore_freq_max(unsigned int pkg, unsigned int die); +int power_intel_uncore_freq_max(unsigned int pkg, unsigned int die); /** * Set minimum and maximum uncore frequency for specified die on a package @@ -148,9 +139,30 @@ rte_power_uncore_freq_max(unsigned int pkg, unsigned int die); * - 0 on success without frequency changed. * - Negative on error. */ -__rte_experimental -int -rte_power_uncore_freq_min(unsigned int pkg, unsigned int die); +int power_intel_uncore_freq_min(unsigned int pkg, unsigned int die); + +/** + * Return the list of available frequencies in the index array. + * + * This function should NOT be called in the fast path. + * + * @param pkg + * Package number. + * Each physical CPU in a system is referred to as a package. + * @param die + * Die number. + * Each package can have several dies connected together via the uncore mesh. + * @param freqs + * The buffer array to save the frequencies. + * @param num + * The number of frequencies to get. + * + * @return + * - The number of available index's in frequency array. + * - Negative on error. + */ +int power_intel_uncore_freqs(unsigned int pkg, unsigned int die, + unsigned int *freqs, unsigned int num); /** * Return the list length of available frequencies in the index array. @@ -168,9 +180,7 @@ rte_power_uncore_freq_min(unsigned int pkg, unsigned int die); * - The number of available index's in frequency array. * - Negative on error. */ -__rte_experimental -int -rte_power_uncore_get_num_freqs(unsigned int pkg, unsigned int die); +int power_intel_uncore_get_num_freqs(unsigned int pkg, unsigned int die); /** * Return the number of packages (CPUs) on a system @@ -182,9 +192,7 @@ rte_power_uncore_get_num_freqs(unsigned int pkg, unsigned int die); * - Zero on error. * - Number of package on system on success. */ -__rte_experimental -unsigned int -rte_power_uncore_get_num_pkgs(void); +unsigned int power_intel_uncore_get_num_pkgs(void); /** * Return the number of dies for pakckages (CPUs) specified @@ -200,12 +208,10 @@ rte_power_uncore_get_num_pkgs(void); * - Zero on error. * - Number of dies for package on sucecss. */ -__rte_experimental -unsigned int -rte_power_uncore_get_num_dies(unsigned int pkg); +unsigned int power_intel_uncore_get_num_dies(unsigned int pkg); #ifdef __cplusplus } #endif -#endif /* RTE_POWER_INTEL_UNCORE_H */ +#endif /* POWER_INTEL_UNCORE_H */ diff --git a/lib/power/rte_power_uncore.c b/lib/power/rte_power_uncore.c new file mode 100644 index 0000000000..e88477fdd2 --- /dev/null +++ b/lib/power/rte_power_uncore.c @@ -0,0 +1,118 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation + * Copyright(c) 2023 AMD Corporation + */ + +#include + +#include +#include + +#include "rte_power_uncore.h" +#include "power_intel_uncore.h" + +enum uncore_power_mgmt_env default_uncore_env = UNCORE_PM_ENV_NOT_SET; + +static rte_spinlock_t global_env_cfg_lock = RTE_SPINLOCK_INITIALIZER; + +/* function pointers */ +rte_power_get_uncore_freq_t rte_power_get_uncore_freq; +rte_power_set_uncore_freq_t rte_power_set_uncore_freq; +rte_power_uncore_freq_change_t rte_power_uncore_freq_max; +rte_power_uncore_freq_change_t rte_power_uncore_freq_min; +rte_power_uncore_freqs_t rte_power_uncore_freqs; +rte_power_uncore_get_num_freqs_t rte_power_uncore_get_num_freqs; +rte_power_uncore_get_num_pkgs_t rte_power_uncore_get_num_pkgs; +rte_power_uncore_get_num_dies_t rte_power_uncore_get_num_dies; + +static void +reset_power_uncore_function_ptrs(void) +{ + rte_power_get_uncore_freq = NULL; + rte_power_set_uncore_freq = NULL; + rte_power_uncore_freq_max = NULL; + rte_power_uncore_freq_min = NULL; + rte_power_uncore_freqs = NULL; + rte_power_uncore_get_num_freqs = NULL; + rte_power_uncore_get_num_pkgs = NULL; + rte_power_uncore_get_num_dies = NULL; +} + +static int +power_set_uncore_env(enum uncore_power_mgmt_env env) +{ + rte_spinlock_lock(&global_env_cfg_lock); + + if (default_uncore_env != UNCORE_PM_ENV_NOT_SET) { + RTE_LOG(ERR, POWER, "Uncore Power Management Env already set.\n"); + rte_spinlock_unlock(&global_env_cfg_lock); + return -1; + } + + int ret = 0; + + if (env == UNCORE_PM_ENV_INTEL_UNCORE) { + rte_power_get_uncore_freq = power_get_intel_uncore_freq; + rte_power_set_uncore_freq = power_set_intel_uncore_freq; + rte_power_uncore_freq_min = power_intel_uncore_freq_min; + rte_power_uncore_freq_max = power_intel_uncore_freq_max; + rte_power_uncore_freqs = power_intel_uncore_freqs; + rte_power_uncore_get_num_freqs = power_intel_uncore_get_num_freqs; + rte_power_uncore_get_num_pkgs = power_intel_uncore_get_num_pkgs; + rte_power_uncore_get_num_dies = power_intel_uncore_get_num_dies; + } else { + RTE_LOG(ERR, POWER, "Invalid Power Management Environment(%d) set\n", + env); + ret = -1; + } + + if (ret == 0) + default_uncore_env = env; + else { + default_uncore_env = UNCORE_PM_ENV_NOT_SET; + reset_power_uncore_function_ptrs(); + } + + rte_spinlock_unlock(&global_env_cfg_lock); + return ret; +} + +int +rte_power_uncore_init(unsigned int pkg, unsigned int die) +{ + int ret = -1; + + switch (default_uncore_env) { + case UNCORE_PM_ENV_INTEL_UNCORE: + return power_intel_uncore_init(pkg, die); + default: + RTE_LOG(INFO, POWER, "Uncore Env isn't set yet!\n"); + } + + /* Auto detect Environment */ + RTE_LOG(INFO, POWER, "Attempting to initialise Intel Uncore power mgmt...\n"); + ret = power_intel_uncore_init(pkg, die); + if (ret == 0) { + power_set_uncore_env(UNCORE_PM_ENV_INTEL_UNCORE); + goto out; + } + + RTE_LOG(ERR, POWER, "Unable to set Power Management Environment for package " + "%u Die %u\n", pkg, die); +out: + return ret; +} + +int +rte_power_uncore_exit(unsigned int pkg, unsigned int die) +{ + switch (default_uncore_env) { + case UNCORE_PM_ENV_INTEL_UNCORE: + return power_intel_uncore_exit(pkg, die); + default: + RTE_LOG(ERR, POWER, "Uncore Env has not been set," + "unable to exit gracefully\n"); + } + return -1; + +} diff --git a/lib/power/version.map b/lib/power/version.map index b8b54f768e..ca002ec5b4 100644 --- a/lib/power/version.map +++ b/lib/power/version.map @@ -52,4 +52,7 @@ EXPERIMENTAL { rte_power_uncore_get_num_freqs; rte_power_uncore_get_num_pkgs; rte_power_uncore_init; + + # added in 23.11 + rte_power_uncore_freqs; };