From patchwork Tue Sep 19 18:47:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 113055 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp5259484qgf; Tue, 19 Sep 2017 11:48:24 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDYAOzli30SnyjcYX/VMJNqzwS+Pv3evCZCxClGbQRBEy8YpSTczG/+CtgVurnH8zULZNHp X-Received: by 10.99.9.65 with SMTP id 62mr2149571pgj.395.1505846904459; Tue, 19 Sep 2017 11:48:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505846904; cv=none; d=google.com; s=arc-20160816; b=k7IA9ZDwunmVKZEudXrjsD0qs+wIAjslKjnE/sXGEeX4xJYMQ2DxC1RWYe/iyFSe6z Zqy2jUI7v4GRS8CdTD22MU3OCeLlfFPCcvDX6eSjGxB//PSzH8QHT9ePi7DrZzrwu2Uo fZ3GzpzlAnel+9E1Z5Q8PLp/4Xtty5igEdpDqZ3SyCMlYz+t6l5Cdricm9aJ3txRNqSS dSoPE492wCb1pzifW0OxMx8F1Rrx2IRljvHTMs4HPKOUQ4H/dELP1h9DkNPkrs4InKpo zK8yKqZrX5ua+x05lSPJJTjJWEj6gdCB2BNCIED9mfi0Oo9nNUB2/TA2BaIbCrDGjmS3 Wqpw== 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=SA60wroeAjtPixuHDBr37u030LnpUW5yV3oGpXgU5Bc=; b=kiRzkQqT91Xwhog0ToQS3CkbcYcKfIlATLE302Dlz0DpwWWZARDQ7pv8rauP/xSNyd UZu2oCxlTxbf22yL3aH9YTk9jR2xafFNvoKmwDFwAZ897MbQMwCpHxie2kb31C6DNXfU 8bquCp5AeLFb1doVII6J9/u69KmdbmSA4L4lTumFY05LyV95IL4OaA40tqBJTCXp7aSZ c7SAboTyW4WLz6rU965fsrEDEtcujnDClFnG6U4vFE6trUqbXRrEkH2tDFsu1HXsOPy/ aoFEyEpLP8Z3J1bHfQV3X6d0uCHZEttb3+HCz5A5WASNUDDPE6FJcm41SDeb31cMaK4B DsWQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 j8si1826809pgp.526.2017.09.19.11.48.24; Tue, 19 Sep 2017 11:48:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751572AbdISSsX (ORCPT + 12 others); Tue, 19 Sep 2017 14:48:23 -0400 Received: from foss.arm.com ([217.140.101.70]:54118 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751724AbdISSsR (ORCPT ); Tue, 19 Sep 2017 14:48:17 -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 7DF49168F; Tue, 19 Sep 2017 11:48:16 -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 3E5683F483; Tue, 19 Sep 2017 11:48:15 -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, mturquette@baylibre.com, sboyd@codeaurora.org, viresh.kumar@linaro.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, jhugo@codeaurora.org, wangxiongfeng2@huawei.com, Jonathan.Zhang@cavium.com, ahs3@redhat.com, Jeremy Linton Subject: [PATCH v2 5/6] arm64: Fixup users of topology_physical_package_id Date: Tue, 19 Sep 2017 13:47:50 -0500 Message-Id: <20170919184751.25110-6-jeremy.linton@arm.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170919184751.25110-1-jeremy.linton@arm.com> References: <20170919184751.25110-1-jeremy.linton@arm.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@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/clk/clk-mb86s7x.c | 2 +- drivers/cpufreq/arm_big_little.c | 2 +- drivers/firmware/psci_checker.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 2.13.5 Acked-by: Stephen Boyd diff --git a/drivers/clk/clk-mb86s7x.c b/drivers/clk/clk-mb86s7x.c index 2a83a3ff1d09..da4b456f9afc 100644 --- a/drivers/clk/clk-mb86s7x.c +++ b/drivers/clk/clk-mb86s7x.c @@ -338,7 +338,7 @@ static struct clk_hw *mb86s7x_clclk_register(struct device *cpu_dev) return ERR_PTR(-ENOMEM); clc->hw.init = &init; - clc->cluster = topology_physical_package_id(cpu_dev->id); + clc->cluster = topology_cod_id(cpu_dev->id); init.name = dev_name(cpu_dev); init.ops = &clk_clc_ops; 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. */