From patchwork Wed Feb 28 22:06:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 130070 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp269946lja; Wed, 28 Feb 2018 14:07:24 -0800 (PST) X-Google-Smtp-Source: AH8x225BHnYzgXuBfrVShsXQLFYw9xNFYskMv3TZH4Dok5zHhSANc5HJMZp+XW22YZeXdJmaAhIT X-Received: by 10.98.210.70 with SMTP id c67mr19094145pfg.164.1519855644473; Wed, 28 Feb 2018 14:07:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519855644; cv=none; d=google.com; s=arc-20160816; b=uz+EpJbNLKtn6WqbxB+Jm05xvBc8TGc/WcQ4lBy10RVM8LunPP0jRR3pMl3xuA/i9Y vWJRPgXz2GpKDGTeWn+QUMGhaTSlIBUG+/UWKlHaf0jGIS/U0ZjniEsd//BCkGskrOdQ 4wDO8Lqor8kMUWW4DoSYVDczJQDFAmxHvAkzy7IFi79nrCaROQ5xHrmiKWZ4IlI75B+n Ctv15SGjqcsZon35JLKLgFarr62Grtfac4u9d6GRL7J0drUGjXHoxGFH8bs6SiY+eq1f Qt27kRlxdD2MCO6LyLk1FgKc0IpY0rLKN4DL1eOPw5HIqFiJY4t54d69Ewpyenick0yZ VpBw== 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=8NWZ8sT0R53qLbfcNMAzCXLEEN7L0I/NJnUvlKJnrns=; b=Zew4cxVXPDfZSETL5sDFWXJclcURkma/ZtFiHKnuRUQAcEn1iGIGnUgJXWGd++o4/j mXndGszk3BtpZZiGr8WSNTwH/3EqfYj4mMqFAyJwKtPhBH+PfFpwvcx1cjhPG9rh7Tin 4KrEQNpMvblaDuH+y1Feg0GdlojMrNlzKkQrU3po7AUdR9X/ubGQtiqHAurH2EJiCmFa rUe7Ha/KpNejKZX5oar/RoNB/SuOV7NKbwZX2oRomlroXCg604ae2+WeUorvzvJvxysi J0PeUkriIo6iVppziZG/uzDjubh9L3syQn56UAMLotS1xFh4Kv8IOF3rHoh7o9JXcshG ND+Q== 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 h8si1537312pgv.699.2018.02.28.14.07.24; Wed, 28 Feb 2018 14:07:24 -0800 (PST) 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 S935322AbeB1WHU (ORCPT + 28 others); Wed, 28 Feb 2018 17:07:20 -0500 Received: from foss.arm.com ([217.140.101.70]:57970 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935105AbeB1WHR (ORCPT ); Wed, 28 Feb 2018 17:07:17 -0500 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 8AFEA165C; Wed, 28 Feb 2018 14:07:17 -0800 (PST) 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 93CEF3F246; Wed, 28 Feb 2018 14:07:16 -0800 (PST) From: Jeremy Linton To: linux-acpi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, sudeep.holla@arm.com, lorenzo.pieralisi@arm.com, hanjun.guo@linaro.org, rjw@rjwysocki.net, will.deacon@arm.com, catalin.marinas@arm.com, gregkh@linuxfoundation.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, wangxiongfeng2@huawei.com, vkilari@codeaurora.org, ahs3@redhat.com, dietmar.eggemann@arm.com, morten.rasmussen@arm.com, palmer@sifive.com, lenb@kernel.org, john.garry@huawei.com, austinwc@codeaurora.org, tnowicki@caviumnetworks.com, Jeremy Linton Subject: [PATCH v7 03/13] cacheinfo: rename of_node to fw_token Date: Wed, 28 Feb 2018 16:06:09 -0600 Message-Id: <20180228220619.6992-4-jeremy.linton@arm.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180228220619.6992-1-jeremy.linton@arm.com> References: <20180228220619.6992-1-jeremy.linton@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rename and change the type of of_node to indicate it is a generic pointer which is generally only used for comparison purposes. In a later patch we will put an ACPI/PPTT token pointer in fw_token so that the code which builds the shared cpu masks can be reused. Signed-off-by: Jeremy Linton --- drivers/base/cacheinfo.c | 16 +++++++++------- include/linux/cacheinfo.h | 8 +++----- 2 files changed, 12 insertions(+), 12 deletions(-) -- 2.13.6 diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c index a872523e8951..597aacb233fc 100644 --- a/drivers/base/cacheinfo.c +++ b/drivers/base/cacheinfo.c @@ -35,7 +35,7 @@ struct cpu_cacheinfo *get_cpu_cacheinfo(unsigned int cpu) static inline bool cache_leaves_are_shared(struct cacheinfo *this_leaf, struct cacheinfo *sib_leaf) { - return sib_leaf->of_node == this_leaf->of_node; + return sib_leaf->fw_token == this_leaf->fw_token; } /* OF properties to query for a given cache type */ @@ -167,9 +167,10 @@ static int cache_setup_of_node(unsigned int cpu) struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu); unsigned int index = 0; - /* skip if of_node is already populated */ - if (this_cpu_ci->info_list->of_node) + /* skip if fw_token is already populated */ + if (this_cpu_ci->info_list->fw_token) { return 0; + } if (!cpu_dev) { pr_err("No cpu device for CPU %d\n", cpu); @@ -190,7 +191,7 @@ static int cache_setup_of_node(unsigned int cpu) if (!np) break; cache_of_set_props(this_leaf, np); - this_leaf->of_node = np; + this_leaf->fw_token = np; index++; } @@ -278,7 +279,7 @@ static void cache_shared_cpu_map_remove(unsigned int cpu) cpumask_clear_cpu(cpu, &sib_leaf->shared_cpu_map); cpumask_clear_cpu(sibling, &this_leaf->shared_cpu_map); } - of_node_put(this_leaf->of_node); + of_node_put(this_leaf->fw_token); } } @@ -323,8 +324,9 @@ static int detect_cache_attributes(unsigned int cpu) if (ret) goto free_ci; /* - * For systems using DT for cache hierarchy, of_node and shared_cpu_map - * will be set up here only if they are not populated already + * For systems using DT for cache hierarchy, fw_token + * and shared_cpu_map will be set up here only if they are + * not populated already */ ret = cache_shared_cpu_map_setup(cpu); if (ret) { diff --git a/include/linux/cacheinfo.h b/include/linux/cacheinfo.h index 3d9805297cda..0c6f658054d2 100644 --- a/include/linux/cacheinfo.h +++ b/include/linux/cacheinfo.h @@ -34,9 +34,8 @@ enum cache_type { * @shared_cpu_map: logical cpumask representing all the cpus sharing * this cache node * @attributes: bitfield representing various cache attributes - * @of_node: if devicetree is used, this represents either the cpu node in - * case there's no explicit cache node or the cache node itself in the - * device tree + * @fw_token: Unique value used to determine if different cacheinfo + * structures represent a single hardware cache instance. * @disable_sysfs: indicates whether this node is visible to the user via * sysfs or not * @priv: pointer to any private data structure specific to particular @@ -65,8 +64,7 @@ struct cacheinfo { #define CACHE_ALLOCATE_POLICY_MASK \ (CACHE_READ_ALLOCATE | CACHE_WRITE_ALLOCATE) #define CACHE_ID BIT(4) - - struct device_node *of_node; + void *fw_token; bool disable_sysfs; void *priv; };