From patchwork Thu Sep 14 18:49:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 112636 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1107473qgf; Thu, 14 Sep 2017 11:49:40 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCggdgdJ/MdHinjlQYbFVNQsEVorwHtbl3Sovy6a41dUAdBNNTR3yhyP7EOk8BpKbY7tMJF X-Received: by 10.84.233.70 with SMTP id k6mr1769298plt.138.1505414980774; Thu, 14 Sep 2017 11:49:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505414980; cv=none; d=google.com; s=arc-20160816; b=yffNkfn1HlY7uD7g05P/bqOZln17q/GhtSMuMqhyihYGmBirmixXwNSuqMZpsCpQvb ylxLhMVYzcJLpRjhTbF5O/wmITJcTdYT0VI/Oa3XCyft63GxOlRvk3DGEKpWyCWMuKME Yuh3utp3KUwGCeUxZDXUF/oLAMuOud+DstlGH3fRgOknEg5G9YTvsnBftkglx2XiFhLq Y0O6YqKYjoTREoaGhMDwAvOayamNnIzFfci+lR9CE0rR0fYGxWtcXvkNYjFn9lwvV4QH ywRecOG6wL6ddAXJFHZLg6t1umN/1xwr8UyiU40cyRVyrF/h+41432N9NNCkQlFQbKGa 9nDA== 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=YLvUV95ZpI0KZdsp6FBFJTayrUvxbgSdQVMTr4TEWrM=; b=Op9AvzIl4XWa40Kee36s7IAgXcKF8i+hnbPjBoQiunqCjzILHZ+frarUlnhhT1eU/f 4rCjFpSYLm41z3UlhfAxAAVQnsfvG+AKy8bQXfX00EkH0N3FHd3qm5sFyXkysk51i53i pl+GPA5wo6jxl2FM0rPitqhL4uZQhFHXW7HO5OpEP6FYPBQuE4tAkPGx2jN11MFe7syG sXMqOnf4FveQy0kvm7eGeZdTQVdraEqJMmrAfOtdT2zZAF6VPAZm2Wv448P2kLeBvLC5 PtEH21reLM2EPVu34CGlFg6Qc0GvbjPnYbVt3lJCD+VU/2FykVpVlQOuWU7kqbiDpE8c 2m/A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-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 v3si12664320plk.436.2017.09.14.11.49.40; Thu, 14 Sep 2017 11:49:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-acpi-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-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751623AbdINStj (ORCPT + 7 others); Thu, 14 Sep 2017 14:49:39 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:39666 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751621AbdINSti (ORCPT ); Thu, 14 Sep 2017 14:49:38 -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 B085E1B2D; Thu, 14 Sep 2017 11:49:38 -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 D75193F483; Thu, 14 Sep 2017 11:49:37 -0700 (PDT) From: Jeremy Linton To: linux-acpi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, wangxiongfeng2@huawei.com, hanjun.guo@linaro.org, jhugo@codeaurora.org, john.garry@huawei.com, austinwc@codeaurora.org, sudeep.holla@arm.com, lorenzo.pieralisi@arm.com, rjw@rjwysocki.net, will.deacon@arm.com, catalin.marinas@arm.com, Jeremy Linton Subject: [PATCH 5/6] arm64: Fixup users of topology_physical_package_id Date: Thu, 14 Sep 2017 13:49:17 -0500 Message-Id: <20170914184918.20406-13-jeremy.linton@arm.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170914184918.20406-1-jeremy.linton@arm.com> References: <20170914184918.20406-1-jeremy.linton@arm.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@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 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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. */