Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755066AbbBDLVW (ORCPT ); Wed, 4 Feb 2015 06:21:22 -0500 Received: from foss-mx-na.foss.arm.com ([217.140.108.86]:41015 "EHLO foss-mx-na.foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751149AbbBDLVS (ORCPT ); Wed, 4 Feb 2015 06:21:18 -0500 Date: Wed, 4 Feb 2015 11:21:05 +0000 From: Catalin Marinas To: Hanjun Guo Cc: Mark Rutland , "Rafael J. Wysocki" , Olof Johansson , Arnd Bergmann , "grant.likely@linaro.org" , Will Deacon , Lorenzo Pieralisi , "graeme.gregory@linaro.org" , Sudeep Holla , "jcm@redhat.com" , Jason Cooper , Marc Zyngier , Bjorn Helgaas , Daniel Lezcano , Mark Brown , Rob Herring , Robert Richter , Randy Dunlap , Charles Garcia-Tobin , "phoenix.liyi@huawei.com" , Timur Tabi , Ashwin Chaugule , "suravee.suthikulpanit@amd.com" , Mark Langsdorf , "wangyijing@huawei.com" , "linux-acpi@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "linaro-acpi@lists.linaro.org" Subject: Re: [PATCH v8 14/21] ACPI / processor: Make it possible to get CPU hardware ID via GICC Message-ID: <20150204112105.GA26006@e104818-lin.cambridge.arm.com> References: <1422881149-8177-1-git-send-email-hanjun.guo@linaro.org> <1422881149-8177-15-git-send-email-hanjun.guo@linaro.org> <20150203141749.GA32536@leverpostej> <20150203200936.GA21731@e104818-lin.cambridge.arm.com> <54D1EAD5.4080105@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <54D1EAD5.4080105@linaro.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2536 Lines: 67 On Wed, Feb 04, 2015 at 09:48:05AM +0000, Hanjun Guo wrote: > On 2015年02月04日 04:09, Catalin Marinas wrote: > > diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h > > index ea4d2b35c57b..4fafd62b1b86 100644 > > --- a/arch/arm64/include/asm/acpi.h > > +++ b/arch/arm64/include/asm/acpi.h > > @@ -49,33 +49,12 @@ static inline void enable_acpi(void) > > acpi_noirq = 0; > > } > > > > -/* MPIDR value provided in GICC structure is 64 bits, but the > > - * existing phys_id (CPU hardware ID) using in acpi processor > > - * driver is 32-bit, to conform to the same datatype we need > > - * to repack the GICC structure MPIDR. > > - * > > - * bits other than following 32 bits are defined as 0, so it > > - * will be no information lost after repacked. > > - * > > - * Bits [0:7] Aff0; > > - * Bits [8:15] Aff1; > > - * Bits [16:23] Aff2; > > - * Bits [32:39] Aff3; > > - */ > > -static inline u32 pack_mpidr(u64 mpidr) > > -{ > > - return (u32) ((mpidr & 0xff00000000) >> 8) | mpidr; > > -} > > - > > /* > > * The ACPI processor driver for ACPI core code needs this macro > > * to find out this cpu was already mapped (mapping from CPU hardware > > * ID to CPU logical ID) or not. > > - * > > - * cpu_logical_map(cpu) is the mapping of MPIDR and the logical cpu, > > - * and MPIDR is the cpu hardware ID we needed to pack. > > */ > > -#define cpu_physical_id(cpu) pack_mpidr(cpu_logical_map(cpu)) > > +#define cpu_physical_id(cpu) cpu_logical_map(cpu) > > > > /* > > * It's used from ACPI core in kdump to boot UP system with SMP kernel, > > diff --git a/arch/arm64/include/asm/smp_plat.h b/arch/arm64/include/asm/smp_plat.h > > index 59e282311b58..a492276e008d 100644 > > --- a/arch/arm64/include/asm/smp_plat.h > > +++ b/arch/arm64/include/asm/smp_plat.h > > @@ -40,4 +40,6 @@ static inline u32 mpidr_hash_size(void) > > extern u64 __cpu_logical_map[NR_CPUS]; > > #define cpu_logical_map(cpu) __cpu_logical_map[cpu] > > > > +typedef u64 cpuid_t; > > I think cpuid_t is a little confused because people may recognize > it as cpu logical id, its original meaning is the physical cpu ID, > so how about: > > typedef u64 phys_id_t; ? I would keep "cpu" somewhere in the name as "phys" is too generic, maybe phys_cpuid_t. -- Catalin -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/