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; From patchwork Tue Feb 19 03:22:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 10819149 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 BD1E117D5 for ; Tue, 19 Feb 2019 03:23:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A93F12BD84 for ; Tue, 19 Feb 2019 03:23:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9D5582BDA4; Tue, 19 Feb 2019 03:23:22 +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 44EDD2BD84 for ; Tue, 19 Feb 2019 03:23:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726209AbfBSDXV (ORCPT ); Mon, 18 Feb 2019 22:23:21 -0500 Received: from mail-qt1-f193.google.com ([209.85.160.193]:42305 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726142AbfBSDXV (ORCPT ); Mon, 18 Feb 2019 22:23:21 -0500 Received: by mail-qt1-f193.google.com with SMTP id b8so21564838qtr.9 for ; Mon, 18 Feb 2019 19:23:20 -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=0bkBhlZLwP0+CkBpq0MCToedKfvIRPENpISccQCmWHc=; b=nHbnE+66c+NnTU1Gt78bukCU1O+mpisZzahTJD98v/YjWO2egVpyJ1DJH/BhVYWneg RnwWOsnL/bx4X49U0HLTn92oGp2VhW4aGo5czhM4rDIgzL73I/iVWmnVZqn0epFSSx/O ROqI3pmdWFnS1eBaD4TZ0Ny8mXwZZFu+8fR/sbEV7e2SWDMuN7t2bXx/t+oJD1qum62h M9R+0YwlhtyXHpu9blrVBUNQt6my6JRqZOZROku+WGR/tIupziOAd/R3rg/QWpYeV4Ur DVn6WxTHErKSUic9O2/yScmqb2dpIalgiDYw0DimUXxDPkXaEs6n6XN7C/TSutfIiu+Q kLuQ== 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=0bkBhlZLwP0+CkBpq0MCToedKfvIRPENpISccQCmWHc=; b=LSvTAswpK2nXmU/W6gKIisvDHvnSh7gxDFdHmkDMAQS0ro5cbORYmB8CDEqZXS3+7/ cE4bfHVYgbZJZU61ZjopZuy1bySu3hbbN+djyXSFu3hOunxsTfVXNatZ51/ajXmgI/en 8ZydTUHnHuKUdk3GGWiMiFKH6qYfibaUg1RN2wx9A7o62Xsuol84w5anqZyXnmog/oq4 8/b2SS3A057oij/wJvk8nzJ4HnRC6C6z9ksR+O7zPKYzDG5gXdo4foRLHMlzuZeSwR1F LDC/BnfMZa8fbk7BazKFNL/M1+cj6eJE+UxM+P8A/AO81fasSYXNHw/1frGHcDNL/dBt tllw== X-Gm-Message-State: AHQUAubx+hOqbneeYc1LqV0ida1aIG+LMdBqmuWOMiuoatNU8EYQwoM3 mrQZQPHeWHTEcJoAB2xUsA8g+5/R X-Google-Smtp-Source: AHgI3IYJBDE9LLRHGEt5nepi+/Z9+OAcA91rJX+RCXLLBhOabSlgpGlOSZssdruyXaFwp4ZHTQLTog== X-Received: by 2002:ac8:354e:: with SMTP id z14mr21042803qtb.131.1550546600477; Mon, 18 Feb 2019 19:23:20 -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.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Feb 2019 19:23:19 -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 08/11] powercap/intel_rapl: Support multi-die/package Date: Mon, 18 Feb 2019 22:22:56 -0500 Message-Id: <3349c9e551eecbfe849320c0e938daf4e0126734.1550545163.git.len.brown@intel.com> 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 On the new dual-die/package systems, the RAPL MSR becomes die-scope. Thus instead of one powercap device per physical package, now there should be one powercap device for each unique die on these systems. This patch introduces intel_rapl driver support for new dual-die/package systems. On the hardwares that do not have multi-die, topology_unique_die_id() equals topology_physical_package_id(), thus there is 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c index 6057d9695fed..e004707283da 100644 --- a/drivers/powercap/intel_rapl.c +++ b/drivers/powercap/intel_rapl.c @@ -266,7 +266,7 @@ static struct rapl_domain *platform_rapl_domain; /* Platform (PSys) domain */ /* caller to ensure CPU hotplug lock is held */ static struct rapl_package *rapl_find_package(int cpu) { - int id = topology_physical_package_id(cpu); + int id = topology_unique_die_id(cpu); struct rapl_package *rp; list_for_each_entry(rp, &rapl_packages, plist) { @@ -1457,7 +1457,7 @@ 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 id = topology_physical_package_id(cpu); + int id = topology_unique_die_id(cpu); struct rapl_package *rp; int ret; From patchwork Tue Feb 19 03:22:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 10819151 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 036E817D5 for ; Tue, 19 Feb 2019 03:23:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E3D392BD84 for ; Tue, 19 Feb 2019 03:23:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D85AF2BDA4; Tue, 19 Feb 2019 03:23:24 +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 B61FA2BD84 for ; Tue, 19 Feb 2019 03:23:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726214AbfBSDXX (ORCPT ); Mon, 18 Feb 2019 22:23:23 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:38604 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726142AbfBSDXX (ORCPT ); Mon, 18 Feb 2019 22:23:23 -0500 Received: by mail-qt1-f196.google.com with SMTP id 2so21614127qtb.5 for ; Mon, 18 Feb 2019 19:23:22 -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=kE0vLAMF2xKGBrwq8WppmzzgNu3Piviln0s9+qxvuPk=; b=Z645kjVU+jt41k1v9BG0chJj//fmNNcaX8P+yYeRupej2sybSHjzYBS2G2VE8ulgzd M7mmr8SDxewP3pwaR/8qi0enWtH/F0ymzItVX4jAJgcwJxbO4KsEMNwVfyxsdQB7MZWr OFr5cqiouSSQI5J5wPjfMMLoepdHnvg2pFyAR4pGivOSTtGre0yeiB27vOp6J1N2xzY2 RjLzCGTORvGqi6+ZkEQAYE8JpIw1kmBlTy+j1rGnceCGh8UKmkOSK4f4gByDt/gMmjsd jNHSUf9wH2l2ZMvo2Opay6CkULkNdMe4636iKjq2EbGzG98d+KVo1qQtZ3/zNvOfO1GL zh7A== 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=kE0vLAMF2xKGBrwq8WppmzzgNu3Piviln0s9+qxvuPk=; b=IncoAOcsFiRZ2WqJQ1esUpS+T18Qz/bDDEFC0kUJAdLtkqqQEyHDnp0QNzvnzoqc0j CZQy5bRKSCdfvcgrfN2wN7CkpXV7U1Kz5HftWBc9OfucxVL+oFlnfpE3aNKiyK3x0+Nb uJgTXr18YULf611EM91frr8aUak8PzrdOihMJeJ1Pp9P1zVXq5OZTFDlcU6dvQfJpVfM xoeKKWjDXLWIZ7jeLJbi5BnocI8hceYP7yAAduyxDNZa40TZNO3lK7wY3BzWutv4eLml UhBGYlpn0qekxel+vIgM3hZLUmdQYltAbsqYba+jQ3rKbZ2gd+FeIyPIhqfqaBTxjXSG hoYw== X-Gm-Message-State: AHQUAub9xoemPx4fvsgNB9eLNKqlvNVMJNIhx1aPFXR1XzuNUx2ODVDL GTkV2+rGLP0kLslr/tP91Sk= X-Google-Smtp-Source: AHgI3IZqUB3o9L9tF4/WS7if0GAZclulyPQ4R6tLp9PcPQpKgRSwpUm+rdabEYH1ID0j+02M8YZpIA== X-Received: by 2002:ac8:2805:: with SMTP id 5mr21088780qtq.75.1550546601633; Mon, 18 Feb 2019 19:23:21 -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.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Feb 2019 19:23:21 -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 09/11] powercap/intel_rapl: update rapl domain name and debug messages Date: Mon, 18 Feb 2019 22:22:57 -0500 Message-Id: <5b1116912102ce6d0753fa1fedefc1a4e62837fe.1550545163.git.len.brown@intel.com> 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 The RAPL domain "name" attribute contains "Package-N", which is ambiguous on multi-die per-package systems. Update the name to "package-X-die-Y" on those systems. No change on systems without multi-die. Driver debug messages are also updated. 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 | 57 ++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c index e004707283da..c990eee45239 100644 --- a/drivers/powercap/intel_rapl.c +++ b/drivers/powercap/intel_rapl.c @@ -178,12 +178,15 @@ struct rapl_domain { #define power_zone_to_rapl_domain(_zone) \ container_of(_zone, struct rapl_domain, power_zone) +/* maximum rapl package domain name: package-%d-die-%d */ +#define PACKAGE_DOMAIN_NAME_LENGTH 30 -/* Each physical package contains multiple domains, these are the common + +/* Each rapl package contains multiple domains, these are the common * data across RAPL domains within a package. */ struct rapl_package { - unsigned int id; /* physical package/socket id */ + unsigned int id; /* logical die id, equals physical 1-die systems */ unsigned int nr_domains; unsigned long domain_map; /* bit map of active domains */ unsigned int power_unit; @@ -198,6 +201,7 @@ struct rapl_package { int lead_cpu; /* one active cpu per package for access */ /* Track active cpus */ struct cpumask cpumask; + char name[PACKAGE_DOMAIN_NAME_LENGTH]; }; struct rapl_defaults { @@ -926,8 +930,8 @@ static int rapl_check_unit_core(struct rapl_package *rp, int cpu) value = (msr_val & TIME_UNIT_MASK) >> TIME_UNIT_OFFSET; rp->time_unit = 1000000 / (1 << value); - pr_debug("Core CPU package %d energy=%dpJ, time=%dus, power=%duW\n", - rp->id, rp->energy_unit, rp->time_unit, rp->power_unit); + pr_debug("Core CPU %s energy=%dpJ, time=%dus, power=%duW\n", + rp->name, rp->energy_unit, rp->time_unit, rp->power_unit); return 0; } @@ -951,8 +955,8 @@ static int rapl_check_unit_atom(struct rapl_package *rp, int cpu) value = (msr_val & TIME_UNIT_MASK) >> TIME_UNIT_OFFSET; rp->time_unit = 1000000 / (1 << value); - pr_debug("Atom package %d energy=%dpJ, time=%dus, power=%duW\n", - rp->id, rp->energy_unit, rp->time_unit, rp->power_unit); + pr_debug("Atom %s energy=%dpJ, time=%dus, power=%duW\n", + rp->name, rp->energy_unit, rp->time_unit, rp->power_unit); return 0; } @@ -1179,7 +1183,7 @@ static void rapl_update_domain_data(struct rapl_package *rp) u64 val; for (dmn = 0; dmn < rp->nr_domains; dmn++) { - pr_debug("update package %d domain %s data\n", rp->id, + pr_debug("update %s domain %s data\n", rp->name, rp->domains[dmn].name); /* exclude non-raw primitives */ for (prim = 0; prim < NR_RAW_PRIMITIVES; prim++) { @@ -1204,7 +1208,6 @@ static void rapl_unregister_powercap(void) static int rapl_package_register_powercap(struct rapl_package *rp) { struct rapl_domain *rd; - char dev_name[17]; /* max domain name = 7 + 1 + 8 for int + 1 for null*/ struct powercap_zone *power_zone = NULL; int nr_pl, ret; @@ -1215,20 +1218,16 @@ static int rapl_package_register_powercap(struct rapl_package *rp) for (rd = rp->domains; rd < rp->domains + rp->nr_domains; rd++) { if (rd->id == RAPL_DOMAIN_PACKAGE) { nr_pl = find_nr_power_limit(rd); - pr_debug("register socket %d package domain %s\n", - rp->id, rd->name); - memset(dev_name, 0, sizeof(dev_name)); - snprintf(dev_name, sizeof(dev_name), "%s-%d", - rd->name, rp->id); + pr_debug("register package domain %s\n", rp->name); power_zone = powercap_register_zone(&rd->power_zone, control_type, - dev_name, NULL, + rp->name, NULL, &zone_ops[rd->id], nr_pl, &constraint_ops); if (IS_ERR(power_zone)) { - pr_debug("failed to register package, %d\n", - rp->id); + pr_debug("failed to register power zone %s\n", + rp->name); return PTR_ERR(power_zone); } /* track parent zone in per package/socket data */ @@ -1254,8 +1253,8 @@ static int rapl_package_register_powercap(struct rapl_package *rp) &constraint_ops); if (IS_ERR(power_zone)) { - pr_debug("failed to register power_zone, %d:%s:%s\n", - rp->id, rd->name, dev_name); + pr_debug("failed to register power_zone, %s:%s\n", + rp->name, rd->name); ret = PTR_ERR(power_zone); goto err_cleanup; } @@ -1268,7 +1267,7 @@ static int rapl_package_register_powercap(struct rapl_package *rp) * failed after the first domain setup. */ while (--rd >= rp->domains) { - pr_debug("unregister package %d domain %s\n", rp->id, rd->name); + pr_debug("unregister %s domain %s\n", rp->name, rd->name); powercap_unregister_zone(control_type, &rd->power_zone); } @@ -1378,8 +1377,8 @@ static void rapl_detect_powerlimit(struct rapl_domain *rd) /* check if the domain is locked by BIOS, ignore if MSR doesn't exist */ if (!rapl_read_data_raw(rd, FW_LOCK, false, &val64)) { if (val64) { - pr_info("RAPL package %d domain %s locked by BIOS\n", - rd->rp->id, rd->name); + pr_info("RAPL %s domain %s locked by BIOS\n", + rd->rp->name, rd->name); rd->state |= DOMAIN_STATE_BIOS_LOCKED; } } @@ -1408,10 +1407,10 @@ static int rapl_detect_domains(struct rapl_package *rp, int cpu) } rp->nr_domains = bitmap_weight(&rp->domain_map, RAPL_DOMAIN_MAX); if (!rp->nr_domains) { - pr_debug("no valid rapl domains found in package %d\n", rp->id); + pr_debug("no valid rapl domains found in %s\n", rp->name); return -ENODEV; } - pr_debug("found %d domains on package %d\n", rp->nr_domains, rp->id); + pr_debug("found %d domains on %s\n", rp->nr_domains, rp->name); rp->domains = kcalloc(rp->nr_domains + 1, sizeof(struct rapl_domain), GFP_KERNEL); @@ -1444,8 +1443,8 @@ static void rapl_remove_package(struct rapl_package *rp) rd_package = rd; continue; } - pr_debug("remove package, undo power limit on %d: %s\n", - rp->id, rd->name); + pr_debug("remove package, undo power limit on %s: %s\n", + rp->name, rd->name); powercap_unregister_zone(control_type, &rd->power_zone); } /* do parent zone last */ @@ -1459,6 +1458,7 @@ static struct rapl_package *rapl_add_package(int cpu) { int id = topology_unique_die_id(cpu); struct rapl_package *rp; + struct cpuinfo_x86 *c = &cpu_data(cpu); int ret; rp = kzalloc(sizeof(struct rapl_package), GFP_KERNEL); @@ -1469,6 +1469,13 @@ static struct rapl_package *rapl_add_package(int cpu) rp->id = id; rp->lead_cpu = cpu; + if (c->x86_max_dies > 1) + snprintf(rp->name, PACKAGE_DOMAIN_NAME_LENGTH, + "package-%d-die-%d", c->phys_proc_id, c->cpu_die_id); + else + snprintf(rp->name, PACKAGE_DOMAIN_NAME_LENGTH, "package-%d", + c->phys_proc_id); + /* check if the package contains valid domains */ if (rapl_detect_domains(rp, cpu) || rapl_defaults->check_unit(rp, cpu)) { From patchwork Tue Feb 19 03:22:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 10819155 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 8A41A17FB for ; Tue, 19 Feb 2019 03:23:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B5932BD84 for ; Tue, 19 Feb 2019 03:23:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6FCA32BDA4; Tue, 19 Feb 2019 03:23:26 +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=unavailable 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 1A10B2BD85 for ; Tue, 19 Feb 2019 03:23:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726219AbfBSDXZ (ORCPT ); Mon, 18 Feb 2019 22:23:25 -0500 Received: from mail-qt1-f195.google.com ([209.85.160.195]:34986 "EHLO mail-qt1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726142AbfBSDXZ (ORCPT ); Mon, 18 Feb 2019 22:23:25 -0500 Received: by mail-qt1-f195.google.com with SMTP id p48so21632424qtk.2; Mon, 18 Feb 2019 19:23:24 -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=4x3YEbY+b8iwgi6V4Vw/GKRAcVXI/s5Wldf/gvM/ryc=; b=OqJ9NF9ZAEUOxqM4o5nWZh8RW0Q+lUveBjwdDzwPpVVqPX4wKovI8cTGVODL9dI8x6 hXXI5SPf9FlrCy/Y6LVayFMQUq0+gEp74DCi36uGIx3IIJnP3Y8gjK0xSMUHaUbHaIYK 48/wPyziCyfxfgSJzxJgOnQal3RoWa9wDwQhgFJ8mYmUuwbUjXrVTXVCgfo4TR7eFi+L GNkKNgLfcBKlP7rZz48cOYuSVT8wUZ6z0mkZyu3IN5FtbIJk/YxjVIw9rF3xxQybLacr ix/NUB2VsorgD5yM3/gw/RL2XLJVQhN393ka/lqzY4onlBC29YUd+qoIKBC/Cl7lNMbU vRuQ== 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=4x3YEbY+b8iwgi6V4Vw/GKRAcVXI/s5Wldf/gvM/ryc=; b=aRgS03W8dtt2nYDvRk/88hHSIoH/0cESBOwgS1TCRu/vCJDE8pwHRWUIbuDZ3XCPHv 7e9gFsQOz2t2SZCfWjVHN/t1uvR7rJRUZOsEkBROLepBHdQLXeQ5RdWNPJmyGLLEof4I oXDCzeyMkhsgoFFoz09g0mKNxKUUkjUszNYHoQLNTB3lFhiEUBoIC5ftapuyGGpAoQLN PyLAKR9G8M4hsgdtUokKzbowTT2aGGR3JiUFfExLwm3m7NkJqE7uL0vJ74qbkkxEEnzu Im8aQlFEH8rZtXVPKDVJzKu72w4nPEthH4m0Bd9I4QwXdsJaDM/OlRwPdcNUnOIOjA4b 9AUQ== X-Gm-Message-State: AHQUAuZuO6aDekF8LeshkBQEy60l3cFeO/Ar8HTPuBcVTMy4nRNb4Ylc ELkkDAS/brW+IW4EGY1z4Nw= X-Google-Smtp-Source: AHgI3IYrdsaWwtncsz97jnIh54kOJUb2zfz2QdpVSKBKahk8G08eMi1/Hw7cgPTX7GsJhfZhsjYLLg== X-Received: by 2002:a0c:eac9:: with SMTP id y9mr6209132qvp.82.1550546604317; Mon, 18 Feb 2019 19:23:24 -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.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Feb 2019 19:23:23 -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, linux-hwmon@vger.kernel.org Subject: [PATCH 11/11] hwmon/coretemp: Support multi-die/package Date: Mon, 18 Feb 2019 22:22:59 -0500 Message-Id: <8ce75b95ef6105ebe5fb8c9e43b33f06516e3c16.1550545163.git.len.brown@intel.com> 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 This patch introduces coretemp driver support for new dual-die/package systems. On the new dual-die/package systems, the package temperature MSRs becomes die-scope. Thus instead of one hwmon device per physical package, now there should be one hwmon device for each die on these systems. On the hardwares that do not have multi-die support, topology_unique_die_id() equals topology_physical_package_id(), thus the only difference is that physical package id is used as the coretemp platform device id, instead of logical package id on these systems. Signed-off-by: Zhang Rui Signed-off-by: Len Brown Cc: linux-pm@vger.kernel.org Cc: linux-hwmon@vger.kernel.org Signed-off-by: Len Brown Acked-by: Guenter Roeck Acked-by: Guenter Roeck --- drivers/hwmon/coretemp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index 5d34f7271e67..a0b6b2247c3a 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -435,7 +435,7 @@ static int chk_ucode_version(unsigned int cpu) static struct platform_device *coretemp_get_pdev(unsigned int cpu) { - int pkgid = topology_logical_package_id(cpu); + int pkgid = topology_unique_die_id(cpu); if (pkgid >= 0 && pkgid < max_packages) return pkg_devices[pkgid]; @@ -579,7 +579,7 @@ static struct platform_driver coretemp_driver = { static struct platform_device *coretemp_device_add(unsigned int cpu) { - int err, pkgid = topology_logical_package_id(cpu); + int err, pkgid = topology_unique_die_id(cpu); struct platform_device *pdev; if (pkgid < 0) @@ -703,7 +703,7 @@ static int coretemp_cpu_offline(unsigned int cpu) * the rest. */ if (cpumask_empty(&pd->cpumask)) { - pkg_devices[topology_logical_package_id(cpu)] = NULL; + pkg_devices[topology_unique_die_id(cpu)] = NULL; platform_device_unregister(pdev); return 0; } @@ -732,6 +732,7 @@ static enum cpuhp_state coretemp_hp_online; static int __init coretemp_init(void) { int err; + struct cpuinfo_x86 *c = &cpu_data(0); /* * CPUID.06H.EAX[0] indicates whether the CPU has thermal @@ -741,7 +742,7 @@ static int __init coretemp_init(void) if (!x86_match_cpu(coretemp_ids)) return -ENODEV; - max_packages = topology_max_packages(); + max_packages = topology_max_packages() * c->x86_max_dies; pkg_devices = kcalloc(max_packages, sizeof(struct platform_device *), GFP_KERNEL); if (!pkg_devices)