From patchwork Tue Dec 5 02:09:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 134837 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 D0F31433FD; Tue, 5 Dec 2023 03:14:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C692442D7B; Tue, 5 Dec 2023 03:14:00 +0100 (CET) Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) by mails.dpdk.org (Postfix) with ESMTP id E24EF42D6A for ; Tue, 5 Dec 2023 03:13:57 +0100 (CET) Received: by mail-ot1-f43.google.com with SMTP id 46e09a7af769-6d857f6f1c0so2941091a34.0 for ; Mon, 04 Dec 2023 18:13:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1701742437; x=1702347237; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=a1/xVlFD1kXMRcwIkELTLNb0MTYKN5SdcelWBJKjgp0=; b=Xu/D6vhsjMIz6OUTwCdePJiXMB5rLt8yGneKbZgRifzRrsNjvsmCruJGnLoFXQw701 XPF3Z3D+pycJKXQEobg8iYF/aCt20bN8osQH8GDjyOzxPE0XeSNsIrIGWFAf2kty46fr 3ewsAJB+n8FMuFTg7Aq1ICeJM3CqkzCxTDaKeNwzllheRsSIODjijXN+OLizqD8WWiu5 HjEF4KlC1G0QWg6jZ9/W+xI0xOp/K+27zbYZR9iBYl0e0peU9xl5v0p/xM51MNudTES7 ULFrsBOOf/zoea/NWFk/djQ+87wxlWkyXwTRmJK/eWf+ch0tKMQq7/1bzva6KntkdjZm eXzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701742437; x=1702347237; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a1/xVlFD1kXMRcwIkELTLNb0MTYKN5SdcelWBJKjgp0=; b=RyTZH5+hqDih05nDUnW27ljPxjk9Nxv6YvVvaw7tgELDj2/VHPPup+MrvEAqLu/PtF 5B3DzeGSpRSIgguklZaW5uSr3JDJbEQVqaDWv1ANGbvtBlxM2ik+gLXB99293a18ueOQ wp6va4m/lf65jmlrVndu0yFc0nI21zXoRfPh6qWLijrz4XsnfDGCjnv+GtLmKSLC30VL Qd00hPvdlCjh3b7T9N4M3O2jhvcKN8+lqk9pBQqjdF8kIRADpSA+vbBedtKGUmRs8z/n GqDbnvDWLQkrwjsSBPhzFNdCuNTxGEbar3bkd7nU4R7amDUSX/QHvLquX9RmtiBgJH7U mFSg== X-Gm-Message-State: AOJu0YyeumE85LT1SKj1UmKuZ6YCG3/0xo7F7LMBiqn2wKfbnUQ5JP66 N3mbiMEygHK5ltpyDaZt1ATxkYMSxjxH7NyittM= X-Google-Smtp-Source: AGHT+IFqFhURD7zBoImKwsLWqg0/wU2O94p3S0nJ/k4YHvPFuQ/NhAKhjq0o5utBZIdCyIwuzWFONA== X-Received: by 2002:a05:6830:1e0c:b0:6d9:65f5:b6bf with SMTP id s12-20020a0568301e0c00b006d965f5b6bfmr2877236otr.30.1701742437232; Mon, 04 Dec 2023 18:13:57 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id p26-20020a62b81a000000b0069346777241sm355958pfe.97.2023.12.04.18.13.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 18:13:56 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , David Hunt , Anatoly Burakov , Sivaprasad Tummala Subject: [PATCH 09/18] power: convert RTE_LOGTYPE_POWER to dynamic type Date: Mon, 4 Dec 2023 18:09:47 -0800 Message-ID: <20231205021330.260017-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205021330.260017-1-stephen@networkplumber.org> References: <20230329234049.11071-1-stephen@networkplumber.org> <20231205021330.260017-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Use dynamic log type for power library. Signed-off-by: Stephen Hemminger Acked-by: David Hunt --- lib/log/log.c | 1 - lib/log/rte_log.h | 2 +- lib/power/power_common.c | 2 ++ lib/power/power_common.h | 2 ++ lib/power/power_kvm_vm.c | 1 + lib/power/rte_power.c | 1 + lib/power/rte_power_uncore.c | 1 + 7 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/log/log.c b/lib/log/log.c index 49ee89ffdd97..70b3a0995e2e 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -357,7 +357,6 @@ static const struct logtype logtype_strings[] = { {RTE_LOGTYPE_PMD, "pmd"}, {RTE_LOGTYPE_HASH, "lib.hash"}, {RTE_LOGTYPE_LPM, "lib.lpm"}, - {RTE_LOGTYPE_POWER, "lib.power"}, {RTE_LOGTYPE_METER, "lib.meter"}, {RTE_LOGTYPE_SCHED, "lib.sched"}, {RTE_LOGTYPE_PORT, "lib.port"}, diff --git a/lib/log/rte_log.h b/lib/log/rte_log.h index 0c651f58b58e..0cdff28e12d6 100644 --- a/lib/log/rte_log.h +++ b/lib/log/rte_log.h @@ -36,7 +36,7 @@ extern "C" { #define RTE_LOGTYPE_LPM 7 /**< Log related to LPM. */ /* was RTE_LOGTYPE_KNI */ /* was RTE_LOGTYPE_ACL */ -#define RTE_LOGTYPE_POWER 10 /**< Log related to power. */ + /* was RTE_LOGTYPE_POWER */ #define RTE_LOGTYPE_METER 11 /**< Log related to QoS meter. */ #define RTE_LOGTYPE_SCHED 12 /**< Log related to QoS port scheduler. */ #define RTE_LOGTYPE_PORT 13 /**< Log related to port. */ diff --git a/lib/power/power_common.c b/lib/power/power_common.c index 1e09facb863f..bf77eafa886b 100644 --- a/lib/power/power_common.c +++ b/lib/power/power_common.c @@ -12,6 +12,8 @@ #include "power_common.h" +RTE_LOG_REGISTER_DEFAULT(power_logtype, INFO); + #define POWER_SYSFILE_SCALING_DRIVER \ "/sys/devices/system/cpu/cpu%u/cpufreq/scaling_driver" #define POWER_SYSFILE_GOVERNOR \ diff --git a/lib/power/power_common.h b/lib/power/power_common.h index c1c713927621..c3fcbf4c1000 100644 --- a/lib/power/power_common.h +++ b/lib/power/power_common.h @@ -10,6 +10,8 @@ #define RTE_POWER_INVALID_FREQ_INDEX (~0) +extern int power_logtype; +#define RTE_LOGTYPE_POWER power_logtype #ifdef RTE_LIBRTE_POWER_DEBUG #define POWER_DEBUG_TRACE(fmt, args...) \ diff --git a/lib/power/power_kvm_vm.c b/lib/power/power_kvm_vm.c index 6a8109d44959..db031f43105a 100644 --- a/lib/power/power_kvm_vm.c +++ b/lib/power/power_kvm_vm.c @@ -8,6 +8,7 @@ #include "rte_power_guest_channel.h" #include "guest_channel.h" +#include "power_common.h" #include "power_kvm_vm.h" #define FD_PATH "/dev/virtio-ports/virtio.serial.port.poweragent" diff --git a/lib/power/rte_power.c b/lib/power/rte_power.c index 48c2e6b428d8..1502612b0a15 100644 --- a/lib/power/rte_power.c +++ b/lib/power/rte_power.c @@ -10,6 +10,7 @@ #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" diff --git a/lib/power/rte_power_uncore.c b/lib/power/rte_power_uncore.c index ce027bbeb829..9c20fe150d46 100644 --- a/lib/power/rte_power_uncore.c +++ b/lib/power/rte_power_uncore.c @@ -8,6 +8,7 @@ #include #include +#include "power_common.h" #include "rte_power_uncore.h" #include "power_intel_uncore.h"