From patchwork Tue Jan 23 13:11:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 190934 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp329314dyi; Tue, 23 Jan 2024 05:24:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IEL0/h37ifAgkdpUsus4zJRYF6KWcPmhhTYJtdO3yLC2EmHy2m9+3Jz3+n9MMkrx30Kqep1 X-Received: by 2002:a05:622a:1103:b0:42a:4cb9:7b80 with SMTP id e3-20020a05622a110300b0042a4cb97b80mr796016qty.94.1706016288335; Tue, 23 Jan 2024 05:24:48 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706016288; cv=pass; d=google.com; s=arc-20160816; b=NbNC+JatHmLrHfUrrqJTLnLyKfUYE8rvxB9nEwtVBWq7l5MHC0nwjhxouiE/8P0rG3 R33lO4W71gciw/Vm8xaDz3F+CZbLw7K+i46PhaMqkpA2FTfA6j4OxILMG5TP+tHjIP1l UozqcYGDFoIxxh84y6toLPs6TAUpO7u8iEVURnSGsBGBdCZoN3iacQ/gkLzLZtTqbItB XA76sF4FdfgPk6m8jEDpjVYnKl8yHrlXYb5+h6oSDPa+qwkytqyhyIqrVBVW7vBiYbuY qArJoKf9HAaepeR/x/WFmq25RkBdxZYwegp751ySw3AZ2KrNgoGjBoKDc+OSP1zTrEI3 Pwwg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=date:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:subject:cc:to:from:dkim-signature :dkim-signature:message-id; bh=NtCn1qIjdDagUvktcocvZnySBrSVkEHTjg+7jYEXYkc=; fh=Te0fDPJ/sd+7p881M6fa/oF213lBbJvGdEFWr/TLqNA=; b=Qr1+TFUyrzA50Cp39MzVEJf7P/AqkcR2YHVNCofVTWUw6JKDIiVnSPmwx6nObJPj84 pGBaN/ndTWdm/F1Mxs4+hfyKr+Z5nP2BsKcEmj7TvnBGW6LilUKPx5zeFkO8BCydBcNt wA45xvw2G/Gimhuc2JBdm6ng2ZJilMPULfS52/l8vkJbnG+j4Vf6vQr2kZmSf5jyYbdq KzNcjIbKqeE6hQoaNI2YVYJZnrRwgio9adufA5o6BcZPcJe63+RanYJ3H4Gg8AxKXtoM BFB2JOe7sYBEkuq9ZzHfiYSjWCQjpLMxIAYVQrhxNuuPBa6vx2XUoYcpfU3i/x6z/DAT R36A== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=k3CVQvDR; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-35371-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-35371-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id l6-20020a05622a050600b0042a2ba15b34si7908165qtx.57.2024.01.23.05.24.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 05:24:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-35371-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=k3CVQvDR; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-35371-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-35371-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 01C691C2143E for ; Tue, 23 Jan 2024 13:24:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 43DE2679ED; Tue, 23 Jan 2024 13:11:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="k3CVQvDR"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="p9vjR1pw" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6015166B52 for ; Tue, 23 Jan 2024 13:11:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706015500; cv=none; b=oRHD2Ao2nhMEzHkBj9aVaz/TA2O5/TrQUvwAevvzvkPXE4CP9hC9Jc356IPcl2x7wrp63h5AMbzlaT5stLaSVyg79wju0UmOQkRHqiqgNj8BOQmZIJufu1AqPN5164SrQ4nRPmQTCtr6+Ow2naCXkBsK0RMSXOokMo7gWnoyN+s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706015500; c=relaxed/simple; bh=evvK7ga7udVVxA8A5oaBHks8qKmsIHUbst7bXfEr5X8=; h=Message-ID:From:To:Cc:Subject:References:MIME-Version: Content-Type:Date; b=Twc5v1z28aM602pCdVPoP6TTzpPXYMRgpo9ZR5CbHlKLPT2oF9GdLOIYbpgTVR05kw1Z50cMaBq+cjU3N65lpdqCYa/vfhES5SkaOIFxqDy9RuwhhQ5XvBPo6PX6Y61XvuKNk9+PcTjQlS8XG24I28ZQo649WLddf1h/Saqywfc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=k3CVQvDR; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=p9vjR1pw; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Message-ID: <20240118123650.140932565@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1706015496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=NtCn1qIjdDagUvktcocvZnySBrSVkEHTjg+7jYEXYkc=; b=k3CVQvDRCvPF8Cbv3D1LJfnFe8ZqE1LdOR7FDjch0AP3QqC0hhYkD0QGgYZZs7ZUyt/wm7 sKYgb9uxd4gTqvUIhzKosEMnJdqXdlEcBYBREpYKiXbnxP/vzlWleTbHRWqbNhIXG5QrcE m87Hsdd6WiFCJducFUQjuQzC1Cg7ddkSxlVEcXzNlaR//Hy+d3jPtLOcGEszMFTSwlbk7e dpdlwagIjP+iLB7F9D4Q/V+D4btoGE5tMxYFozFAk3/lFIfh6sKNvQ3NrhwAdwFkIDkdO0 DSFDGs/08aKK99Mna48/IBA3QsKq4dNE3X6sjwB05PcK5zs6zQfU6MgCWGFnsA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1706015496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=NtCn1qIjdDagUvktcocvZnySBrSVkEHTjg+7jYEXYkc=; b=p9vjR1pwtgtuA3dBWfSxIoL0FWoPIHhLKXg8yLXmUM1OvrR6oGFq7Aw3rx2FdQIHtLQ8eW cqCCd941UModO8BA== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Tom Lendacky , Andrew Cooper , Arjan van de Ven , Huang Rui , Juergen Gross , Dimitri Sivanich , Sohil Mehta , K Prateek Nayak , Kan Liang , Zhang Rui , "Paul E. McKenney" , Feng Tang , Andy Shevchenko , Michael Kelley , "Peter Zijlstra (Intel)" Subject: [patch v2 28/30] x86/cpu/topology: Rename topology_max_die_per_package() References: <20240118123127.055361964@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Tue, 23 Jan 2024 14:11:35 +0100 (CET) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788887735551347640 X-GMAIL-MSGID: 1788887735551347640 From: Thomas Gleixner The plural of die is dies. Signed-off-by: Thomas Gleixner --- arch/x86/events/intel/cstate.c | 2 +- arch/x86/events/intel/uncore.c | 2 +- arch/x86/events/intel/uncore_snbep.c | 2 +- arch/x86/events/rapl.c | 2 +- arch/x86/include/asm/topology.h | 2 +- drivers/hwmon/coretemp.c | 2 +- drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c | 2 +- drivers/powercap/intel_rapl_common.c | 2 +- drivers/thermal/intel/intel_hfi.c | 2 +- drivers/thermal/intel/intel_powerclamp.c | 2 +- drivers/thermal/intel/x86_pkg_temp_thermal.c | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) --- --- a/arch/x86/events/intel/cstate.c +++ b/arch/x86/events/intel/cstate.c @@ -834,7 +834,7 @@ static int __init cstate_init(void) } if (has_cstate_pkg) { - if (topology_max_die_per_package() > 1) { + if (topology_max_dies_per_package() > 1) { err = perf_pmu_register(&cstate_pkg_pmu, "cstate_die", -1); } else { --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -1893,7 +1893,7 @@ static int __init intel_uncore_init(void return -ENODEV; __uncore_max_dies = - topology_max_packages() * topology_max_die_per_package(); + topology_max_packages() * topology_max_dies_per_package(); id = x86_match_cpu(intel_uncore_match); if (!id) { --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -1406,7 +1406,7 @@ static int topology_gidnid_map(int nodei */ for (i = 0; i < 8; i++) { if (nodeid == GIDNIDMAP(gidnid, i)) { - if (topology_max_die_per_package() > 1) + if (topology_max_dies_per_package() > 1) die_id = i; else die_id = topology_phys_to_logical_pkg(i); --- a/arch/x86/events/rapl.c +++ b/arch/x86/events/rapl.c @@ -674,7 +674,7 @@ static const struct attribute_group *rap static int __init init_rapl_pmus(void) { - int maxdie = topology_max_packages() * topology_max_die_per_package(); + int maxdie = topology_max_packages() * topology_max_dies_per_package(); size_t size; size = sizeof(*rapl_pmus) + maxdie * sizeof(struct rapl_pmu *); --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h @@ -152,7 +152,7 @@ static inline unsigned int topology_max_ return __max_logical_packages; } -static inline unsigned int topology_max_die_per_package(void) +static inline unsigned int topology_max_dies_per_package(void) { return __max_dies_per_package; } --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c @@ -780,7 +780,7 @@ static int __init coretemp_init(void) if (!x86_match_cpu(coretemp_ids)) return -ENODEV; - max_zones = topology_max_packages() * topology_max_die_per_package(); + max_zones = topology_max_packages() * topology_max_dies_per_package(); zone_devices = kcalloc(max_zones, sizeof(struct platform_device *), GFP_KERNEL); if (!zone_devices) --- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c +++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency.c @@ -242,7 +242,7 @@ static int __init intel_uncore_init(void return -ENODEV; uncore_max_entries = topology_max_packages() * - topology_max_die_per_package(); + topology_max_dies_per_package(); uncore_instances = kcalloc(uncore_max_entries, sizeof(*uncore_instances), GFP_KERNEL); if (!uncore_instances) --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -1564,7 +1564,7 @@ struct rapl_package *rapl_add_package(in if (id_is_cpu) { rp->id = topology_logical_die_id(id); rp->lead_cpu = id; - if (topology_max_die_per_package() > 1) + if (topology_max_dies_per_package() > 1) snprintf(rp->name, PACKAGE_DOMAIN_NAME_LENGTH, "package-%d-die-%d", topology_physical_package_id(id), topology_die_id(id)); else --- a/drivers/thermal/intel/intel_hfi.c +++ b/drivers/thermal/intel/intel_hfi.c @@ -581,7 +581,7 @@ void __init intel_hfi_init(void) /* There is one HFI instance per die/package. */ max_hfi_instances = topology_max_packages() * - topology_max_die_per_package(); + topology_max_dies_per_package(); /* * This allocation may fail. CPU hotplug callbacks must check --- a/drivers/thermal/intel/intel_powerclamp.c +++ b/drivers/thermal/intel/intel_powerclamp.c @@ -616,7 +616,7 @@ static int powerclamp_idle_injection_reg poll_pkg_cstate_enable = false; if (cpumask_equal(cpu_present_mask, idle_injection_cpu_mask)) { ii_dev = idle_inject_register_full(idle_injection_cpu_mask, idle_inject_update); - if (topology_max_packages() == 1 && topology_max_die_per_package() == 1) + if (topology_max_packages() == 1 && topology_max_dies_per_package() == 1) poll_pkg_cstate_enable = true; } else { ii_dev = idle_inject_register(idle_injection_cpu_mask); --- a/drivers/thermal/intel/x86_pkg_temp_thermal.c +++ b/drivers/thermal/intel/x86_pkg_temp_thermal.c @@ -494,7 +494,7 @@ static int __init pkg_temp_thermal_init( if (!x86_match_cpu(pkg_temp_thermal_ids)) return -ENODEV; - max_id = topology_max_packages() * topology_max_die_per_package(); + max_id = topology_max_packages() * topology_max_dies_per_package(); zones = kcalloc(max_id, sizeof(struct zone_device *), GFP_KERNEL); if (!zones)