From patchwork Tue Feb 26 06:20:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 10829525 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 631AB139A for ; Tue, 26 Feb 2019 06:21:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EE072AF86 for ; Tue, 26 Feb 2019 06:21:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 430D12AFBC; Tue, 26 Feb 2019 06:21:39 +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 BEEF82AF86 for ; Tue, 26 Feb 2019 06:21:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726585AbfBZGUc (ORCPT ); Tue, 26 Feb 2019 01:20:32 -0500 Received: from mail-it1-f196.google.com ([209.85.166.196]:39230 "EHLO mail-it1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726575AbfBZGUc (ORCPT ); Tue, 26 Feb 2019 01:20:32 -0500 Received: by mail-it1-f196.google.com with SMTP id l15so2427615iti.4; Mon, 25 Feb 2019 22:20:31 -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=NSYXONgc0YFs4Y2t1zMwI+tANX39sYybTKNULj9IgA8=; b=u6f7IgN0+uoWseKPwG0S94lG6EwLmG2qil5bgbNx4k0WtnmsYJnTkvF0jfvDbBqHcY RKR671yFUn6DCzjSzjuJMpqRM772IuAL1buAsZPu916Qayfuhsc+27BKgKL0LWg0RlNu z7hi1yXY0Md1L3TvsPqoICCAg8mS0GEDUi/X3+Mb3LSgfxRct9nAEDMrSivJtRSWWbeM 4W0P8mHsN/+K1axpk1GnE6jS22a7MTAbRT0uAMAiooVPchygkWlOj2ds3EIs3EAfJoDo CYNueT5p35CM3QjMJVqiqanm8zovLM71Mopv2Uk8Odv59SquDlA/arokhSh0TlBnmMTw Cx5w== 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=NSYXONgc0YFs4Y2t1zMwI+tANX39sYybTKNULj9IgA8=; b=JXqY4uS0d24VE7b4P1XLlkUCAXA+Dn095Px7RBdpmvL89lKk+JcP3F+pQybzILONph +AJ8NsdQc+0pkjEku+8bRuGodwCY40hMCzrc2rYi81bjF8h18iE9t4bXCcvnlLB4U6s9 VxWVs5kD8xexH3o+8SYWYOTduxA1pFbrxDH0KFiF84tnKGnnCPPd5AVlqZtQYdup1zIF B2fFE2lHDqPqcDlzDR1pUYToH5xJIvt+W7ccF3wWXPsVakh6uh5q7GDl9jmA4xJW5GJg Gz/rP5RxbxZUB39V9k0VqQ0henTdKRNPxBkZNZOODVc1ujrEdVBw1FiNexUMwy2G79b7 RLgA== X-Gm-Message-State: AHQUAuaUhnuoHXTuY8jBaF9lRLKj7g23fO9WELpBok0V3/EMRSEKoJWm QGFB7Wg7kSubJMmFh3eeT74= X-Google-Smtp-Source: APXvYqz8VkZk0H6sLgkY0Reo3FbO+iW8labQI1rr8PbRYiDqTSMMC4XJI6coYDb+FMI40LVsQ1033A== X-Received: by 2002:a24:7a85:: with SMTP id a127mr1612194itc.46.1551162031239; Mon, 25 Feb 2019 22:20:31 -0800 (PST) Received: from kbl.lan (h66-222-56-144.cntcnh.dsl.dynamic.tds.net. [66.222.56.144]) by smtp.gmail.com with ESMTPSA id w8sm6431431ita.21.2019.02.25.22.20.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Feb 2019 22:20:30 -0800 (PST) From: Len Brown To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Zhang Rui , Len Brown , linux-pm@vger.kernel.org Subject: [PATCH 07/14] powercap/intel_rapl: Simplify rapl_find_package() Date: Tue, 26 Feb 2019 01:20:05 -0500 Message-Id: <4dd94a34999d6db4ced7a0759c02f7cd93729dc4.1551160674.git.len.brown@intel.com> X-Mailer: git-send-email 2.18.0-rc0 In-Reply-To: References: 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 Syntax only, no functional or semantic change. Simplify how the code to discover a package is called. Rename find_package_by_id() to rapl_find_package() Signed-off-by: Zhang Rui Signed-off-by: Len Brown Acked-by: Rafael J. Wysocki Cc: linux-pm@vger.kernel.org --- 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 26 06:20:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 10829523 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 469351399 for ; Tue, 26 Feb 2019 06:21:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2EDAB2AF86 for ; Tue, 26 Feb 2019 06:21:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1FD7E2AFBC; Tue, 26 Feb 2019 06:21:36 +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 9FA452AF86 for ; Tue, 26 Feb 2019 06:21:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726900AbfBZGV2 (ORCPT ); Tue, 26 Feb 2019 01:21:28 -0500 Received: from mail-it1-f195.google.com ([209.85.166.195]:51695 "EHLO mail-it1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726588AbfBZGUd (ORCPT ); Tue, 26 Feb 2019 01:20:33 -0500 Received: by mail-it1-f195.google.com with SMTP id e24so2331133itl.1; Mon, 25 Feb 2019 22:20:32 -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=ndV/o88VaJr2WeRWq3FjxA/p0ZeqMKH2+0t/LRYI9p0=; b=I8+lFqx/mxRE3VYbseZSgBTTfyP7C9x8xgkbMxEjMEYL0WdzyMMkjG7dpJj/hQ+m3q mllFc74D33X7ymqzfXmt7OO4KKBVRNJTvLVbeyH1VqVVdnPcI2BwLngrgd5ClcAn9UP0 g+dynDlIpTwQNp33mBP8h+iyOBpmzp8hT7Z4eZheHj69Pt5RUSk1VSRlHBax6MQ3UzeV M0bYksVwzgXobJC6T+H1ENS/7ZfDxGerhgM1qqFlsvwa2X5Bs+C9HQnQLZ577M2Hb28+ FNr0wOtcsB558XDAyLMQ/FJQcs5Y0FvdOxcq2hyr0mdSLM916hxaF75TnHRcgbVV1UMt TMfg== 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=ndV/o88VaJr2WeRWq3FjxA/p0ZeqMKH2+0t/LRYI9p0=; b=H7LKlGDzQUgxdLHepUD4Jg/wh7CUsDD1MW+drDzd7h7GIjg1ubVKWzpdzMXthjo0Uy dSpg6j2TiZ4zre9AIWF8GZKfMdDZhjr6P0eG41RBQUpByY2FskDkctiECO+YXiaX7JsW AeZPi2p6sXfCjhgT3knUVY0MLR2TiZ1ibwjeTa5jUqBNsPcsK9JUj+O+N6YqK65MsFAz MdUXQrnqa508dniToSVbB5jb7vy45J4jnBwy4sxsRH7x9u5Cek9tR5u2/iV8Uu+B/WDs Fk9Dktx2Monsnc7U583meFk0GZcBagNlWKO+wYQBB3UojMwroD/4efzAXrbo7fpsrnu2 iICQ== X-Gm-Message-State: AHQUAub9GQEm8rIX53stL16XDkmkD9pmQ6Gt0ejuRIhL7umucWBYZAmn hKdEEG/6X4+Bo4xtC797LJ4= X-Google-Smtp-Source: APXvYqys1bnp+G544nQoiLNgFbK6tiC+cT9TNEAn/YFLJc0qkwAYpO1TCwcAWG0X+V69zJCfEtBAdA== X-Received: by 2002:a24:7b8d:: with SMTP id q135mr1635811itc.30.1551162032530; Mon, 25 Feb 2019 22:20:32 -0800 (PST) Received: from kbl.lan (h66-222-56-144.cntcnh.dsl.dynamic.tds.net. [66.222.56.144]) by smtp.gmail.com with ESMTPSA id w8sm6431431ita.21.2019.02.25.22.20.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Feb 2019 22:20:31 -0800 (PST) From: Len Brown To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Zhang Rui , Len Brown , linux-pm@vger.kernel.org Subject: [PATCH 08/14] powercap/intel_rapl: Support multi-die/package Date: Tue, 26 Feb 2019 01:20:06 -0500 Message-Id: <680e11fe0dcc65e4cfa5bfeaa0d1cdbe7896e3c0.1551160674.git.len.brown@intel.com> X-Mailer: git-send-email 2.18.0-rc0 In-Reply-To: References: 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_logical_die_id() equals topology_physical_package_id(), thus there is no functional change. Signed-off-by: Zhang Rui Signed-off-by: Len Brown Acked-by: Rafael J. Wysocki Cc: linux-pm@vger.kernel.org --- 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..8723e9ae7436 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_logical_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_logical_die_id(cpu); struct rapl_package *rp; int ret; From patchwork Tue Feb 26 06:20:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 10829521 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 9ED70139A for ; Tue, 26 Feb 2019 06:21:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8AAA22AF86 for ; Tue, 26 Feb 2019 06:21:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7E47C2AFBC; Tue, 26 Feb 2019 06:21:12 +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 CCCA02AF86 for ; Tue, 26 Feb 2019 06:21:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726866AbfBZGVG (ORCPT ); Tue, 26 Feb 2019 01:21:06 -0500 Received: from mail-it1-f193.google.com ([209.85.166.193]:50916 "EHLO mail-it1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726685AbfBZGUg (ORCPT ); Tue, 26 Feb 2019 01:20:36 -0500 Received: by mail-it1-f193.google.com with SMTP id m137so2340538ita.0; Mon, 25 Feb 2019 22:20:35 -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=4adOQrdl4c642QSNhg2phcu3/nTqZukr19dnFZAbxho=; b=b8/Uud7tv+C/8sCa7TrPCRkVPpd7O6rZWW8VnUQDmqd8ILn9ZTMlMkHXTs7ioJhEkA xMag8pk3LRwOUE3IR25/IYXU2nabvqiS3h5IHc6UV4ifZ64O/DE+hhrtfZugZdxfz6He a8+qCliRQUcp5CglJaaI5gjz8qXWh0bjt1clXGSu/C3UAozbY0aM8gzhqBnXDB4m6x3h XnuP/sNTSDHVkwaexnJ95CsZClk8SidrRUD03N5eVqF244mMoo8YoEsT3DH3QGyAxByr S+dl39w4rKUJlweF3PlZFQUR+e/q/xahksHrCAxuqIdsBFgPXRprCpPy141Gz0jbQ02+ EZRQ== 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=4adOQrdl4c642QSNhg2phcu3/nTqZukr19dnFZAbxho=; b=evetPF4tqtEz0O04VixvvszUWR5rLqma9FOdlT+2CBXpC+7zeeGjgMl6O5c9uO6f2B IM1Bx7JfZ0BO0c2pAWUPNmzJHwY13nuF2TSNVAF/pxjKauxbd0cdvzow94J7o2mHsLM/ OU67c+/dlAPVKiX9tOy8c73eYR76jKiVTy/SnpL/LqcDDA3aQ2qU0aM6v5NwBFFfywSW Xrlr3sri0+nOzPHlNlcYwYF3u8jHVWVbAJ2+NyrRrvFg2WrRHLe0xMwqmayWzFIVSX8L s0dy6uyzoXetQqzfp8QXiwzXZ6EIsgxoo6laa1m9nRbHV/1oNPKN8ccxqTwtldT2N5mo oxzg== X-Gm-Message-State: AHQUAuZP/+DOQby24M6y/3vvc85Wh3R+SdRik6tgqV/x1MJ3RY2QMizN 6FvF4sYGtK+/tjypzLem9U+ztsib X-Google-Smtp-Source: AHgI3Ia6FMkgOP4pXFIuGMVIVGYgE7crsxfUbKkOpIWMneiRlLDndqN4jba/RU2Jx6rWErtvgulV3Q== X-Received: by 2002:a24:10c4:: with SMTP id 187mr1419251ity.31.1551162035246; Mon, 25 Feb 2019 22:20:35 -0800 (PST) Received: from kbl.lan (h66-222-56-144.cntcnh.dsl.dynamic.tds.net. [66.222.56.144]) by smtp.gmail.com with ESMTPSA id w8sm6431431ita.21.2019.02.25.22.20.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Feb 2019 22:20:34 -0800 (PST) From: Len Brown To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Zhang Rui , Len Brown , linux-pm@vger.kernel.org Subject: [PATCH 10/14] powercap/intel_rapl: update rapl domain name and debug messages Date: Tue, 26 Feb 2019 01:20:08 -0500 Message-Id: X-Mailer: git-send-email 2.18.0-rc0 In-Reply-To: References: 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 Acked-by: Rafael J. Wysocki Cc: linux-pm@vger.kernel.org --- 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 8723e9ae7436..47719c995f61 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_logical_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 26 06:20:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 10829517 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 243541399 for ; Tue, 26 Feb 2019 06:21:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 100622AFB3 for ; Tue, 26 Feb 2019 06:21:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 03D6C2AFD2; Tue, 26 Feb 2019 06:21:05 +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 8E67E2AFB3 for ; Tue, 26 Feb 2019 06:21:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726716AbfBZGUj (ORCPT ); Tue, 26 Feb 2019 01:20:39 -0500 Received: from mail-it1-f196.google.com ([209.85.166.196]:38175 "EHLO mail-it1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726707AbfBZGUh (ORCPT ); Tue, 26 Feb 2019 01:20:37 -0500 Received: by mail-it1-f196.google.com with SMTP id l66so2441052itg.3; Mon, 25 Feb 2019 22:20:36 -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=cOQ9Mqdvt9WYryBTzeuet0z6FEgVKdqlQkfL8BULl5A=; b=WZwfdiiMrL93Jstdw4WXOPnxuoyrRlMgaZxRpMglEyeRQ4GV5BZDzFGWP7gYFTqwcS X0MWlgKx9RucDvbhECv2HzqREyU4qA4Jf49p15Cs5kkndB9JqLdAWdR4rBgu2axFQWdt j4Cbj29Q6lw7s8b4lkd74TjRxs6l3Y78SDvbdYbcKqs/90EC6S5HnN9Azx1Nvmc1Y4f8 VK02LUcem6hVg3DFOylO5gbQc9x4WgDKPiqlA537gPYR3VY4xKryLREVvOFEH9aNaG2w lIB2k0yywghuCVXXQ/6uplteYGarAAJXYaCBjhdlTjb6MSZBJ8Pkab9RHAD3D18hA29Z 6xIw== 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=cOQ9Mqdvt9WYryBTzeuet0z6FEgVKdqlQkfL8BULl5A=; b=umk4h2zqENmN1vgaw2UCk+T4Uvki6nCn8JSTVlkfL3R8OZMAWv+oE3jjOrbJmyZu2W CVLKWOnIWwTTXrXkJ50sTFVUDUF5j3PiebIGAA25jJoFKhKwZZtFlkNJTd64EKqAhnz2 T0mLeJFQhEaOwcJVeXGr+LTerCCPRAipQ31WckRhZanVNi1RALrPJvbNqk74f5Ma0hgd j6BbOgE8ggVmZBi0GZTsep2cxsj+KYiT8o+888liaB/ZaECxyBx1cnOqNSXvs37hl90Z CmLF8RApR1qVeXZuAYboSKYYm9D+hJ8pH+SSB56NyUBRJ4YSBK9Wzc/OxV3sc5MtqpdQ t/GQ== X-Gm-Message-State: AHQUAuZJ6UgJf4OQJZKYdLYn3yX3W0roC/7wbDUh2FJb6vMueZDiX8fG VlDWC2mXYyaMNhXWjJhVJPs= X-Google-Smtp-Source: AHgI3IZuA55xfyqfkT3w9xHSTYUADogSzdPU98ulVcYeRwsV+acjLGynLjiFhe6SjINFtTNLUh2PbA== X-Received: by 2002:a02:8884:: with SMTP id n4mr11142324jaj.110.1551162036627; Mon, 25 Feb 2019 22:20:36 -0800 (PST) Received: from kbl.lan (h66-222-56-144.cntcnh.dsl.dynamic.tds.net. [66.222.56.144]) by smtp.gmail.com with ESMTPSA id w8sm6431431ita.21.2019.02.25.22.20.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Feb 2019 22:20:35 -0800 (PST) From: Len Brown To: x86@kernel.org Cc: linux-kernel@vger.kernel.org, Zhang Rui , Len Brown , linux-pm@vger.kernel.org, linux-hwmon@vger.kernel.org Subject: [PATCH 11/14] hwmon/coretemp: Support multi-die/package Date: Tue, 26 Feb 2019 01:20:09 -0500 Message-Id: X-Mailer: git-send-email 2.18.0-rc0 In-Reply-To: References: 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_logical_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 Acked-by: Guenter Roeck Cc: linux-pm@vger.kernel.org Cc: linux-hwmon@vger.kernel.org --- 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..57f348d43819 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_logical_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_logical_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_logical_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)