From patchwork Thu Oct 12 19:48:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 115670 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2309097qgn; Thu, 12 Oct 2017 12:49:36 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAk22cldbGgYYS1wTesrWnCS3vu5bJaAopYzOHnF6Bu1mavG0I5HHae6qx+MoQG3EOI6uDR X-Received: by 10.98.190.7 with SMTP id l7mr3086849pff.309.1507837776195; Thu, 12 Oct 2017 12:49:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507837776; cv=none; d=google.com; s=arc-20160816; b=aHN5uSngrBiZUiZ7Z2/EQkfcX39v/9MDFnPCRn4hbbxd08eUG8QnFS5GPWwPDB6ml3 xeFRENcTrL/TbJ952i8a00hzuKlvXFUvOT55iLbuXZM6alnB5iCufQaRSCttugzq6FIo K36bmTb97yomOV/mgy8hMv1wXJZpueE/aW/UL3T9cIOsJYb3uVw0JI45wKeJbTGa0Ffr F63R7/dU8PuDNWX+v8t6dpAOE6aXRgDEh2zN0JZ1BqFRAhdWOf8aEB6BR9jtH2h+VPzW FnvRcvrc3+oIJEuW4oF8b04JZX1LBHeeZhclksTE1bjwAb44ycSNlZwxXXKiuOYclLyr 8bsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=qhiJwCUrNMkoitkDeX+fOzoZ3g9jqBLpaUJiTxGgLTk=; b=KyqoXx3K0Uy11usIvftBqTcTsaxzPHPG8vq4FDjo/1AZbVCrByoqUJZucBQfGkWP4b ysMgluN9I6HM14M+mI2sQEGYuKYEOcts3wC9OLWejBghkypSFuaPEDZUVBiJl6OMCY5/ UdbDp2l8/qaK/g1ColfJjskbw4L9maEwob/64w8MJKM0sy+kZ3Cz9tX4jmO+uRLJyAtW QdyBnCPST5HGIBfyvndvmsh7JMzwWV8u2S0c90rczwpITBHZumvTzY65gmpP+cBDZYdF NOyluBGkuSWyTMsWesYxE4NtG97+IGTkVMT/J+bCsDMS1EQGCytuErJYmNNsqBNMG7l6 m6Dw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p14si11682716pgq.601.2017.10.12.12.49.35; Thu, 12 Oct 2017 12:49:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755729AbdJLTtc (ORCPT + 27 others); Thu, 12 Oct 2017 15:49:32 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:51696 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755307AbdJLTtZ (ORCPT ); Thu, 12 Oct 2017 15:49:25 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 80B0A1435; Thu, 12 Oct 2017 12:49:25 -0700 (PDT) Received: from beelzebub.austin.arm.com (beelzebub.austin.arm.com [10.118.12.119]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A465F3F58C; Thu, 12 Oct 2017 12:49:24 -0700 (PDT) From: Jeremy Linton To: linux-acpi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, sudeep.holla@arm.com, hanjun.guo@linaro.org, lorenzo.pieralisi@arm.com, rjw@rjwysocki.net, will.deacon@arm.com, catalin.marinas@arm.com, gregkh@linuxfoundation.org, viresh.kumar@linaro.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, jhugo@codeaurora.org, wangxiongfeng2@huawei.com, Jonathan.Zhang@cavium.com, ahs3@redhat.com, Jayachandran.Nair@cavium.com, austinwc@codeaurora.org, Jeremy Linton Subject: [PATCH v3 5/7] arm64: Fixup users of topology_physical_package_id Date: Thu, 12 Oct 2017 14:48:54 -0500 Message-Id: <20171012194856.13844-6-jeremy.linton@arm.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20171012194856.13844-1-jeremy.linton@arm.com> References: <20171012194856.13844-1-jeremy.linton@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There are a few arm64 specific users (cpufreq, psci, etc) which really want the cluster rather than the topology_physical_package_id(). Lets convert those users to topology_cod_id(). That way when we start differentiating the socket/cluster they will continue to behave correctly. Signed-off-by: Jeremy Linton --- drivers/cpufreq/arm_big_little.c | 2 +- drivers/firmware/psci_checker.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.13.5 diff --git a/drivers/cpufreq/arm_big_little.c b/drivers/cpufreq/arm_big_little.c index 17504129fd77..6ee69b3820de 100644 --- a/drivers/cpufreq/arm_big_little.c +++ b/drivers/cpufreq/arm_big_little.c @@ -72,7 +72,7 @@ static struct mutex cluster_lock[MAX_CLUSTERS]; static inline int raw_cpu_to_cluster(int cpu) { - return topology_physical_package_id(cpu); + return topology_cod_id(cpu); } static inline int cpu_to_cluster(int cpu) diff --git a/drivers/firmware/psci_checker.c b/drivers/firmware/psci_checker.c index 6523ce962865..a9465f5d344a 100644 --- a/drivers/firmware/psci_checker.c +++ b/drivers/firmware/psci_checker.c @@ -202,7 +202,7 @@ static int hotplug_tests(void) */ for (i = 0; i < nb_cluster; ++i) { int cluster_id = - topology_physical_package_id(cpumask_any(clusters[i])); + topology_cod_id(cpumask_any(clusters[i])); ssize_t len = cpumap_print_to_pagebuf(true, page_buf, clusters[i]); /* Remove trailing newline. */