From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5866C28EB3 for ; Thu, 6 Jun 2019 14:25:20 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9AD3320665 for ; Thu, 6 Jun 2019 14:25:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="CJZeRRxL"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="pKVVhqCd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9AD3320665 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+infradead-linux-riscv=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:References: To:From:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=2NWdekaJ0HuzGzL2lmoMQbylH8CogyZCgpe7OtyXm44=; b=CJZeRRxLY/jRm99JT8Bvps1Az qSgN0qUJIA7kpAdLsTsw/RoakyLSZLJ3G6rM5IOlOSGqb2FlyGx77++aXZyXqUTT2JtHIqxdBCFmd 7uYzMABzMnwbES8nbK5Hs7fUTGEIjNZLdZwcxkwpCzxLxpqu5eza/PRBiJgagzb1qUscWvoB/4eg7 MginIJUBpuOlzuSgnOyBVJDC9ScyE4Ej8UkwZOdUT6rY4UIXK+92tAFFobnQB8+QMGipwMl9KzF91 zL6oUdfDxjuPVvLrwom1g8UuOtERP4NaxhQfRry30C+FmFa0XcOrEakpEZW2mwLMl5dxPx0kVXRlS GOuN+iNkA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hYtKN-0005O5-GT; Thu, 06 Jun 2019 14:25:15 +0000 Received: from esa5.hgst.iphmx.com ([216.71.153.144]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hYtKG-00050B-1E; Thu, 06 Jun 2019 14:25:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1559831108; x=1591367108; h=subject:from:to:cc:references:message-id:date: mime-version:in-reply-to:content-transfer-encoding; bh=rEjq0xdKk1JknlqpDZ/HFtUuPxL/PyV36Pg5yw6K8x8=; b=pKVVhqCdbBSYGEZLUG5PgBiEKUTxcf+n9YmJzCPuV/oIc+mbyWLjE2er +6+wy1H0xRt0no2jvq3aqk4Of33GD32KcnVA2TFlpFoXFV94xEyWCfesx NNOsZRf8CAoRqE/Q+rhPwtvw9RCThqmGaV1Hdec7hrUy8MbQqJQmcQ7vX NsSWtfiIzslUPGcMm8NPtgc+FKvZz4t3PluZxGkSOfLBI8ntNWxZQKeMO 3HbYKgGZI3JDDSG9WTAmdj35i9RRJzYDDr7orL2oWXfaMpNN5MKhWTPVN KB6FJWocXBOe2TXagpM8f4OVi2f7j3qm1CqYlah7yVpXncuVt1hELcEZB Q==; X-IronPort-AV: E=Sophos;i="5.63,559,1557158400"; d="scan'208";a="111231364" Received: from h199-255-45-14.hgst.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 06 Jun 2019 22:25:06 +0800 IronPort-SDR: c7N3q52vC59WwkGX7Yi0qcFbZZtw1bqjrN9ZtNOVo+jIBek3FXoVcGj/L9r+kB94OjKyVfisXt uPaI5iiaGpIlAupdbFlmB8g0w57XnYRJZzVcidrTMl76X4p9aEDLAHsCCp6fuYlM0DA6OxIRFw MUWqVDHIOmmheaiBCSNpiKRRQt+bQNVfhdofTQdkLeZsCtieFCULaAwqV9iW9IWhXF4YO8+8Rq w0CYwNKyWeUMQbhf3s0l8TmnEfrq71OKVvC23E3tazn77pnFl/IEZnMcjebEpQDkmrMS2pCSJ9 mUQoV4FLOafbT06dA8aLVRHM Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP; 06 Jun 2019 07:00:00 -0700 IronPort-SDR: JqEwNtP0feyi0QP+GRXCTEoS3x5m3WoXZziRmFdN3rKtyRAPs9vOm53tX5nskpiktumA46i+W9 mlxE6e/rQTVqV7TWiQXbfkoerYBZ6MvQzrej7ZXjqM7fzntLr5Z0eTDNYnFVudBcZnZhp3rq7z lP4v9BOcGsSQi5wgxrO+KSFYEFnPsfwRUA5b3P2H7K8kBUp0Lg3jmXXdMOwcEl1S5+bdr+k3qz 2bGBaWELQYdCXO7MPlSrMWJSWx+E8yDrFw9/SGH1ZUfWvdh9ZLM4/sLFtXhOeJSUoYuM1Appv6 N1c= Received: from unknown (HELO [10.225.105.220]) ([10.225.105.220]) by uls-op-cesaip01.wdc.com with ESMTP; 06 Jun 2019 07:25:04 -0700 Subject: Re: [PATCH v6 4/7] arm: Use common cpu_topology structure and functions. From: Atish Patra To: Russell King References: <20190529211340.17087-1-atish.patra@wdc.com> <20190529211340.17087-5-atish.patra@wdc.com> Message-ID: Date: Thu, 6 Jun 2019 07:25:01 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <20190529211340.17087-5-atish.patra@wdc.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190606_072508_215693_ECC99854 X-CRM114-Status: GOOD ( 29.48 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , "Rafael J. Wysocki" , "Peter Zijlstra \(Intel\)" , Catalin Marinas , Linus Walleij , Palmer Dabbelt , Will Deacon , Mauro Carvalho Chehab , "linux-riscv@lists.infradead.org" , Ingo Molnar , Anup Patel , Morten Rasmussen , "devicetree@vger.kernel.org" , Albert Ou , Rob Herring , Paul Walmsley , Thomas Gleixner , "linux-arm-kernel@lists.infradead.org" , Greg Kroah-Hartman , "linux-kernel@vger.kernel.org" , Jeremy Linton , Otto Sabart , Sudeep Holla , "David S. Miller" Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-riscv" Errors-To: linux-riscv-bounces+infradead-linux-riscv=archiver.kernel.org@lists.infradead.org On 5/29/19 2:15 PM, Atish Patra wrote: > Currently, ARM32 and ARM64 uses different data structures to represent > their cpu topologies. Since, we are moving the ARM64 topology to common > code to be used by other architectures, we can reuse that for ARM32 as > well. > > Take this opprtunity to remove the redundant functions from ARM32 and > reuse the common code instead. > > To: Russell King > Signed-off-by: Atish Patra > Tested-by: Sudeep Holla (on TC2) > Reviewed-by : Sudeep Holla > > --- > Hi Russell, > Can we get a ACK for this patch ? We are hoping that the entire > series can be merged at one go. > --- > arch/arm/include/asm/topology.h | 20 ----------- > arch/arm/kernel/topology.c | 60 ++++----------------------------- > drivers/base/arch_topology.c | 4 ++- > include/linux/arch_topology.h | 6 ++-- > 4 files changed, 11 insertions(+), 79 deletions(-) > > diff --git a/arch/arm/include/asm/topology.h b/arch/arm/include/asm/topology.h > index 2a786f54d8b8..8a0fae94d45e 100644 > --- a/arch/arm/include/asm/topology.h > +++ b/arch/arm/include/asm/topology.h > @@ -5,26 +5,6 @@ > #ifdef CONFIG_ARM_CPU_TOPOLOGY > > #include > - > -struct cputopo_arm { > - int thread_id; > - int core_id; > - int socket_id; > - cpumask_t thread_sibling; > - cpumask_t core_sibling; > -}; > - > -extern struct cputopo_arm cpu_topology[NR_CPUS]; > - > -#define topology_physical_package_id(cpu) (cpu_topology[cpu].socket_id) > -#define topology_core_id(cpu) (cpu_topology[cpu].core_id) > -#define topology_core_cpumask(cpu) (&cpu_topology[cpu].core_sibling) > -#define topology_sibling_cpumask(cpu) (&cpu_topology[cpu].thread_sibling) > - > -void init_cpu_topology(void); > -void store_cpu_topology(unsigned int cpuid); > -const struct cpumask *cpu_coregroup_mask(int cpu); > - > #include > > /* Replace task scheduler's default frequency-invariant accounting */ > diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c > index 60e375ce1ab2..238f1da0219c 100644 > --- a/arch/arm/kernel/topology.c > +++ b/arch/arm/kernel/topology.c > @@ -177,17 +177,6 @@ static inline void parse_dt_topology(void) {} > static inline void update_cpu_capacity(unsigned int cpuid) {} > #endif > > - /* > - * cpu topology table > - */ > -struct cputopo_arm cpu_topology[NR_CPUS]; > -EXPORT_SYMBOL_GPL(cpu_topology); > - > -const struct cpumask *cpu_coregroup_mask(int cpu) > -{ > - return &cpu_topology[cpu].core_sibling; > -} > - > /* > * The current assumption is that we can power gate each core independently. > * This will be superseded by DT binding once available. > @@ -197,32 +186,6 @@ const struct cpumask *cpu_corepower_mask(int cpu) > return &cpu_topology[cpu].thread_sibling; > } > > -static void update_siblings_masks(unsigned int cpuid) > -{ > - struct cputopo_arm *cpu_topo, *cpuid_topo = &cpu_topology[cpuid]; > - int cpu; > - > - /* update core and thread sibling masks */ > - for_each_possible_cpu(cpu) { > - cpu_topo = &cpu_topology[cpu]; > - > - if (cpuid_topo->socket_id != cpu_topo->socket_id) > - continue; > - > - cpumask_set_cpu(cpuid, &cpu_topo->core_sibling); > - if (cpu != cpuid) > - cpumask_set_cpu(cpu, &cpuid_topo->core_sibling); > - > - if (cpuid_topo->core_id != cpu_topo->core_id) > - continue; > - > - cpumask_set_cpu(cpuid, &cpu_topo->thread_sibling); > - if (cpu != cpuid) > - cpumask_set_cpu(cpu, &cpuid_topo->thread_sibling); > - } > - smp_wmb(); > -} > - > /* > * store_cpu_topology is called at boot when only one cpu is running > * and with the mutex cpu_hotplug.lock locked, when several cpus have booted, > @@ -230,7 +193,7 @@ static void update_siblings_masks(unsigned int cpuid) > */ > void store_cpu_topology(unsigned int cpuid) > { > - struct cputopo_arm *cpuid_topo = &cpu_topology[cpuid]; > + struct cpu_topology *cpuid_topo = &cpu_topology[cpuid]; > unsigned int mpidr; > > /* If the cpu topology has been already set, just return */ > @@ -250,12 +213,12 @@ void store_cpu_topology(unsigned int cpuid) > /* core performance interdependency */ > cpuid_topo->thread_id = MPIDR_AFFINITY_LEVEL(mpidr, 0); > cpuid_topo->core_id = MPIDR_AFFINITY_LEVEL(mpidr, 1); > - cpuid_topo->socket_id = MPIDR_AFFINITY_LEVEL(mpidr, 2); > + cpuid_topo->package_id = MPIDR_AFFINITY_LEVEL(mpidr, 2); > } else { > /* largely independent cores */ > cpuid_topo->thread_id = -1; > cpuid_topo->core_id = MPIDR_AFFINITY_LEVEL(mpidr, 0); > - cpuid_topo->socket_id = MPIDR_AFFINITY_LEVEL(mpidr, 1); > + cpuid_topo->package_id = MPIDR_AFFINITY_LEVEL(mpidr, 1); > } > } else { > /* > @@ -265,7 +228,7 @@ void store_cpu_topology(unsigned int cpuid) > */ > cpuid_topo->thread_id = -1; > cpuid_topo->core_id = 0; > - cpuid_topo->socket_id = -1; > + cpuid_topo->package_id = -1; > } > > update_siblings_masks(cpuid); > @@ -275,7 +238,7 @@ void store_cpu_topology(unsigned int cpuid) > pr_info("CPU%u: thread %d, cpu %d, socket %d, mpidr %x\n", > cpuid, cpu_topology[cpuid].thread_id, > cpu_topology[cpuid].core_id, > - cpu_topology[cpuid].socket_id, mpidr); > + cpu_topology[cpuid].package_id, mpidr); > } > > static inline int cpu_corepower_flags(void) > @@ -298,18 +261,7 @@ static struct sched_domain_topology_level arm_topology[] = { > */ > void __init init_cpu_topology(void) > { > - unsigned int cpu; > - > - /* init core mask and capacity */ > - for_each_possible_cpu(cpu) { > - struct cputopo_arm *cpu_topo = &(cpu_topology[cpu]); > - > - cpu_topo->thread_id = -1; > - cpu_topo->core_id = -1; > - cpu_topo->socket_id = -1; > - cpumask_clear(&cpu_topo->core_sibling); > - cpumask_clear(&cpu_topo->thread_sibling); > - } > + reset_cpu_topology(); > smp_wmb(); > > parse_dt_topology(); > diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c > index 5781bb4c457c..797e3cd71bea 100644 > --- a/drivers/base/arch_topology.c > +++ b/drivers/base/arch_topology.c > @@ -426,6 +426,7 @@ static int __init parse_dt_topology(void) > of_node_put(cn); > return ret; > } > +#endif > > /* > * cpu topology table > @@ -491,7 +492,7 @@ static void clear_cpu_topology(int cpu) > cpumask_set_cpu(cpu, &cpu_topo->thread_sibling); > } > > -static void __init reset_cpu_topology(void) > +void __init reset_cpu_topology(void) > { > unsigned int cpu; > > @@ -526,6 +527,7 @@ __weak int __init parse_acpi_topology(void) > return 0; > } > > +#if defined(CONFIG_ARM64) || defined(CONFIG_RISCV) > void __init init_cpu_topology(void) > { > reset_cpu_topology(); > diff --git a/include/linux/arch_topology.h b/include/linux/arch_topology.h > index d4e76e0a283f..d4311127970d 100644 > --- a/include/linux/arch_topology.h > +++ b/include/linux/arch_topology.h > @@ -54,11 +54,9 @@ extern struct cpu_topology cpu_topology[NR_CPUS]; > void init_cpu_topology(void); > void store_cpu_topology(unsigned int cpuid); > const struct cpumask *cpu_coregroup_mask(int cpu); > -#endif > - > -#if defined(CONFIG_ARM64) || defined(CONFIG_RISCV) > void update_siblings_masks(unsigned int cpu); > -#endif > void remove_cpu_topology(unsigned int cpuid); > +void reset_cpu_topology(void); > +#endif > > #endif /* _LINUX_ARCH_TOPOLOGY_H_ */ > Hi Russell, Can we get an ACK for ARM if you don't have any objection to the series ? -- Regards, Atish _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv