From patchwork Tue Feb 19 03:22:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 10819147 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EEAA31399 for ; Tue, 19 Feb 2019 03:23:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D9CF82BD84 for ; Tue, 19 Feb 2019 03:23:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CCF7D2BDA4; Tue, 19 Feb 2019 03:23:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 673DC2BD84 for ; Tue, 19 Feb 2019 03:23:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726169AbfBSDXU (ORCPT ); Mon, 18 Feb 2019 22:23:20 -0500 Received: from mail-qt1-f194.google.com ([209.85.160.194]:32770 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726142AbfBSDXU (ORCPT ); Mon, 18 Feb 2019 22:23:20 -0500 Received: by mail-qt1-f194.google.com with SMTP id z39so21667208qtz.0 for ; Mon, 18 Feb 2019 19:23:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :reply-to:organization; bh=MAczlCx3mIAKVe8ps2sOQcXtmOH1S9j5/HyQaCUgiyQ=; b=CnlQn4wQRSJcP4azqKnzYIBQcaothVkcFmQM3dnIW1pkX8UGzaCgqnCbbJIhjl7CV+ csojRvENyajoUKcrBWBSyXduxFpQKRbcAeiGJ4ja3LWtZTcKXq8gLH17dtYnaLEroA5X KhFpbTLIt3u2LC5s6L8cyIeVGACTrgAMoF7yA8V0vNJZX+c6zdWSpOK9GROZT9P7xnIs bI8cvxCNBlDfTJ9sjv6SViMD70XNRrmg+SGXeJQW/Wy/6/c2k+cUGp3xpOO7vkGHayg6 4tjxs+diVvlvYVo+qUQ4aZ1on3fligFrq7X34p8w3DJcg7QG2+9PbsI2FZIUwGo0av+N vifQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:reply-to:organization; bh=MAczlCx3mIAKVe8ps2sOQcXtmOH1S9j5/HyQaCUgiyQ=; b=SMtFVGD62vMVA9G8H5mMvth6D7BbKakKgJ4AaKJReX7glqBgjEo9c4W3q7Nt2VTx4G 4/lSgc2YGH1g4m9tHuzhMw4WM7/CpALAp3fAmeEhc3CGOpJhu4pr7ZMnx5pt4cjR+2qa jmdBuqw8MLMQ/gU304HM2SQ844Oil65wO0LAhfMLnbJje6T5cb51M0D7TEZOdqNxzJOB pfJUxqtVrJP101MO55UJR2OPC/Hrms3WYgX9OiuJiwL4jXJFnFP9rfPjBWhC6p7CWYBZ NN4YdCRbxaerEatJB7PFGhXjbVlUmulbPijW/XPLSzDVaaJ313GpmSvnoJ1ZqHX8jTyR QIAQ== X-Gm-Message-State: AHQUAuY3C7h4dAQKmYpXvIKJN2yXNztf+LVae33HiO8VsSZR+MckXU8d oOTJiNHO6fSfr+e0EByi4M4= X-Google-Smtp-Source: AHgI3IYIUUams/Flhf3cYmgEBKwx0wtzqD3zuBjuDijZhD6ahcYXMij7y0CXgux25S92+y06RaR+yw== X-Received: by 2002:aed:3b58:: with SMTP id q24mr21542499qte.227.1550546599228; Mon, 18 Feb 2019 19:23:19 -0800 (PST) Received: from kbl.fios-router.home (pool-96-233-42-17.bstnma.fios.verizon.net. [96.233.42.17]) by smtp.gmail.com with ESMTPSA id l31sm205282qtb.20.2019.02.18.19.23.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Feb 2019 19:23:18 -0800 (PST) From: Len Brown X-Google-Original-From: Len Brown To: linux-drivers-review@linux.intel.com Cc: Zhang Rui , linux-pm@vger.kernel.org Subject: [PATCH 07/11] powercap/intel_rapl: simplify rapl_find_package() Date: Mon, 18 Feb 2019 22:22:55 -0500 Message-Id: X-Mailer: git-send-email 2.18.0-rc0 In-Reply-To: <635b2bf8b1151a191cd9299276b75791a818c0c2.1550545163.git.len.brown@intel.com> References: <635b2bf8b1151a191cd9299276b75791a818c0c2.1550545163.git.len.brown@intel.com> Reply-To: Len Brown Organization: Intel Open Source Technology Center Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Zhang Rui Simplify how the code to discover a package is called. Rename find_package_by_id() to rapl_find_package() No functional change. Signed-off-by: Zhang Rui Signed-off-by: Len Brown Cc: linux-pm@vger.kernel.org Signed-off-by: Len Brown Acked-by: Rafael J. Wysocki --- drivers/powercap/intel_rapl.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c index 6cdb2c14eee4..6057d9695fed 100644 --- a/drivers/powercap/intel_rapl.c +++ b/drivers/powercap/intel_rapl.c @@ -264,8 +264,9 @@ static struct powercap_control_type *control_type; /* PowerCap Controller */ static struct rapl_domain *platform_rapl_domain; /* Platform (PSys) domain */ /* caller to ensure CPU hotplug lock is held */ -static struct rapl_package *find_package_by_id(int id) +static struct rapl_package *rapl_find_package(int cpu) { + int id = topology_physical_package_id(cpu); struct rapl_package *rp; list_for_each_entry(rp, &rapl_packages, plist) { @@ -1298,7 +1299,7 @@ static int __init rapl_register_psys(void) rd->rpl[0].name = pl1_name; rd->rpl[1].prim_id = PL2_ENABLE; rd->rpl[1].name = pl2_name; - rd->rp = find_package_by_id(0); + rd->rp = rapl_find_package(0); power_zone = powercap_register_zone(&rd->power_zone, control_type, "psys", NULL, @@ -1454,8 +1455,9 @@ static void rapl_remove_package(struct rapl_package *rp) } /* called from CPU hotplug notifier, hotplug lock held */ -static struct rapl_package *rapl_add_package(int cpu, int pkgid) +static struct rapl_package *rapl_add_package(int cpu) { + int id = topology_physical_package_id(cpu); struct rapl_package *rp; int ret; @@ -1464,7 +1466,7 @@ static struct rapl_package *rapl_add_package(int cpu, int pkgid) return ERR_PTR(-ENOMEM); /* add the new package to the list */ - rp->id = pkgid; + rp->id = id; rp->lead_cpu = cpu; /* check if the package contains valid domains */ @@ -1495,12 +1497,11 @@ static struct rapl_package *rapl_add_package(int cpu, int pkgid) */ static int rapl_cpu_online(unsigned int cpu) { - int pkgid = topology_physical_package_id(cpu); struct rapl_package *rp; - rp = find_package_by_id(pkgid); + rp = rapl_find_package(cpu); if (!rp) { - rp = rapl_add_package(cpu, pkgid); + rp = rapl_add_package(cpu); if (IS_ERR(rp)) return PTR_ERR(rp); } @@ -1510,11 +1511,10 @@ static int rapl_cpu_online(unsigned int cpu) static int rapl_cpu_down_prep(unsigned int cpu) { - int pkgid = topology_physical_package_id(cpu); struct rapl_package *rp; int lead_cpu; - rp = find_package_by_id(pkgid); + rp = rapl_find_package(cpu); if (!rp) return 0;