From patchwork Mon Oct 16 18:53:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 132654 X-Patchwork-Delegate: david.marchand@redhat.com 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 DC43643181; Mon, 16 Oct 2023 20:53:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C59C740DCA; Mon, 16 Oct 2023 20:53:15 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 4D8AF402F0 for ; Mon, 16 Oct 2023 20:53:12 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id A7B6E20B74C1; Mon, 16 Oct 2023 11:53:11 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com A7B6E20B74C1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1697482391; bh=b93AE7/E0tAcOCCrMt8cTSSlyq51ibSTgYrQU5KH7ds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XdNgiwfYckSs/NH/6t4hc3cEsR8nJ3dRnQEJKbekxqffOb1soy0Ubu7atIvg0v4x3 YubkYQIcIJxKrcTlM99xScONbneosUkCefS92yoQvIEI7hjHH+Jocl1Y2c7LfwfJDr NsKflBOhKMVC91x9htSXVKHd9J5KZ1xmPPqF886w= From: Tyler Retzlaff To: dev@dpdk.org, david.marchand@redhat.com Cc: Anatoly Burakov , David Hunt , Pavan Nikhilesh , Shijith Thotton , Sivaprasad Tummala , Tyler Retzlaff Subject: [PATCH 1/2] power: fix use of rte stdatomic Date: Mon, 16 Oct 2023 11:53:09 -0700 Message-Id: <1697482390-32106-2-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1697482390-32106-1-git-send-email-roretzla@linux.microsoft.com> References: <1697482390-32106-1-git-send-email-roretzla@linux.microsoft.com> 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 * rte stdatomic functions operate on RTE_ATOMIC(T) specified types not regular T add missing specifier for amd_pstate_power_info state field * use rte_memory_order_xxx instead of __ATOMIC_XXX Fixes: 1ed04d33cf19 ("power: support amd-pstate cpufreq driver") Cc: sivaprasad.tummala@amd.com Signed-off-by: Tyler Retzlaff --- lib/power/power_amd_pstate_cpufreq.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/power/power_amd_pstate_cpufreq.c b/lib/power/power_amd_pstate_cpufreq.c index ee58395..dbd9d2b 100644 --- a/lib/power/power_amd_pstate_cpufreq.c +++ b/lib/power/power_amd_pstate_cpufreq.c @@ -47,7 +47,7 @@ enum power_state { */ struct amd_pstate_power_info { uint32_t lcore_id; /**< Logical core id */ - uint32_t state; /**< Power in use state */ + RTE_ATOMIC(uint32_t) state; /**< Power in use state */ FILE *f; /**< FD of scaling_setspeed */ char governor_ori[28]; /**< Original governor name */ uint32_t curr_idx; /**< Freq index in freqs array */ @@ -370,7 +370,7 @@ struct amd_pstate_power_info { */ if (!rte_atomic_compare_exchange_strong_explicit(&(pi->state), &exp_state, POWER_ONGOING, - __ATOMIC_ACQUIRE, __ATOMIC_RELAXED)) { + rte_memory_order_acquire, rte_memory_order_relaxed)) { RTE_LOG(INFO, POWER, "Power management of lcore %u is " "in use\n", lcore_id); return -1; @@ -408,12 +408,12 @@ struct amd_pstate_power_info { RTE_LOG(INFO, POWER, "Initialized successfully for lcore %u " "power management\n", lcore_id); - rte_atomic_store_explicit(&(pi->state), POWER_USED, __ATOMIC_RELEASE); + rte_atomic_store_explicit(&(pi->state), POWER_USED, rte_memory_order_release); return 0; fail: - rte_atomic_store_explicit(&(pi->state), POWER_UNKNOWN, __ATOMIC_RELEASE); + rte_atomic_store_explicit(&(pi->state), POWER_UNKNOWN, rte_memory_order_release); return -1; } @@ -448,7 +448,7 @@ struct amd_pstate_power_info { */ if (!rte_atomic_compare_exchange_strong_explicit(&(pi->state), &exp_state, POWER_ONGOING, - __ATOMIC_ACQUIRE, __ATOMIC_RELAXED)) { + rte_memory_order_acquire, rte_memory_order_relaxed)) { RTE_LOG(INFO, POWER, "Power management of lcore %u is " "not used\n", lcore_id); return -1; @@ -468,12 +468,12 @@ struct amd_pstate_power_info { RTE_LOG(INFO, POWER, "Power management of lcore %u has exited from " "'userspace' mode and been set back to the " "original\n", lcore_id); - rte_atomic_store_explicit(&(pi->state), POWER_IDLE, __ATOMIC_RELEASE); + rte_atomic_store_explicit(&(pi->state), POWER_IDLE, rte_memory_order_release); return 0; fail: - rte_atomic_store_explicit(&(pi->state), POWER_UNKNOWN, __ATOMIC_RELEASE); + rte_atomic_store_explicit(&(pi->state), POWER_UNKNOWN, rte_memory_order_release); return -1; } From patchwork Mon Oct 16 18:53:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 132653 X-Patchwork-Delegate: david.marchand@redhat.com 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 0227043181; Mon, 16 Oct 2023 20:53:18 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A2BC14068E; Mon, 16 Oct 2023 20:53:14 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 59C8640633 for ; Mon, 16 Oct 2023 20:53:12 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id B514820B74C2; Mon, 16 Oct 2023 11:53:11 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com B514820B74C2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1697482391; bh=VG1/JXHCSWV9+BEqUeA3b2u/kRfFBStKvr0tuD/mgqo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o4+kFbNOB4ZHqOaNRg8fe7nztHzg2s/I4imo+YAavj7SY6nUmJq/EnPJOleQMSrgQ YG+sGPWGqXpL/umiWs5Nz1Hm8tHKs82xoH5mx1qtXsiTRhPBX2Lu49oU1IN7Ff3t14 DstVSqP3F/JbNYrCZn1foerJo0bpqx88wkyztpak= From: Tyler Retzlaff To: dev@dpdk.org, david.marchand@redhat.com Cc: Anatoly Burakov , David Hunt , Pavan Nikhilesh , Shijith Thotton , Sivaprasad Tummala , Tyler Retzlaff Subject: [PATCH 2/2] event/cnxk: remove single use of rte stdatomic Date: Mon, 16 Oct 2023 11:53:10 -0700 Message-Id: <1697482390-32106-3-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1697482390-32106-1-git-send-email-roretzla@linux.microsoft.com> References: <1697482390-32106-1-git-send-email-roretzla@linux.microsoft.com> 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 The variable operated on by the single use of rte stdatomic was not RTE_ATOMIC(T) specified. Remove the use of stdatomic for now to fix LLVM build with enable_stdatomic=true. event/cnxk will be converted to rte stdatomic in a later series. Fixes: 14a4aa9eae71 ("event/cnxk: support get remaining ticks") Cc: pbhagavatula@marvell.com Signed-off-by: Tyler Retzlaff --- drivers/event/cnxk/cnxk_tim_worker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/event/cnxk/cnxk_tim_worker.c b/drivers/event/cnxk/cnxk_tim_worker.c index ae4bf33..944490d 100644 --- a/drivers/event/cnxk/cnxk_tim_worker.c +++ b/drivers/event/cnxk/cnxk_tim_worker.c @@ -193,7 +193,7 @@ return -ENOENT; bkt = (struct cnxk_tim_bkt *)evtim->impl_opaque[1]; - sema = rte_atomic_load_explicit(&bkt->w1, rte_memory_order_acquire); + sema = __atomic_load_n(&bkt->w1, rte_memory_order_acquire); if (cnxk_tim_bkt_get_hbt(sema) || !cnxk_tim_bkt_get_nent(sema)) return -ENOENT;