From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932465AbcHOX1m (ORCPT ); Mon, 15 Aug 2016 19:27:42 -0400 Received: from mail-bl2nam02on0041.outbound.protection.outlook.com ([104.47.38.41]:28992 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753093AbcHOX1f (ORCPT ); Mon, 15 Aug 2016 19:27:35 -0400 X-Greylist: delayed 1930 seconds by postgrey-1.27 at vger.kernel.org; Mon, 15 Aug 2016 19:27:34 EDT Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=David.Daney@cavium.com; Message-ID: <57B24852.5090108@caviumnetworks.com> Date: Mon, 15 Aug 2016 15:55:14 -0700 From: David Daney User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130625 Thunderbird/17.0.7 MIME-Version: 1.0 To: Catalin Marinas CC: David Daney , Will Deacon , , Mark Rutland , Tony Luck , Fenghua Yu , "Thomas Gleixner" , Ingo Molnar , "H. Peter Anvin" , , "Rafael J. Wysocki" , Len Brown , Rob Herring , Frank Rowand , Grant Likely , Robert Moore , Lv Zheng , Hanjun Guo , Marc Zyngier , , , , Robert Richter , Ganapatrao Kulkarni , , David Daney Subject: Re: [PATCH v7 14/15] arm64, acpi, numa: NUMA support based on SRAT and SLIT References: <1464129345-18985-1-git-send-email-ddaney.cavm@gmail.com> <1464129345-18985-15-git-send-email-ddaney.cavm@gmail.com> <20160815153546.GF22320@e104818-lin.cambridge.arm.com> In-Reply-To: <20160815153546.GF22320@e104818-lin.cambridge.arm.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [50.233.148.156] X-ClientProxiedBy: BN1PR07CA0072.namprd07.prod.outlook.com (10.255.193.47) To SN1PR07MB2144.namprd07.prod.outlook.com (10.164.47.14) X-MS-Office365-Filtering-Correlation-Id: c5fc9b8e-f2de-49e4-cd13-08d3c55f3bfe X-Microsoft-Exchange-Diagnostics: 1;SN1PR07MB2144;2:bj6iJS8ni+OQy/eaQK/PT4N7804qgRWgHQVzPC1fvutXI7UCt+6pysJXPadxaxwTPR7rgcrlkuwgL50BtwKUboHEB4wT3Ju+lqqBECrRtOWfJA0sIsgt/mElxylw79KMPx6ssTDBtmwP8W6jQpcWHZlQ8+LrhQ3HQTAsUySTtJfyG4M4UnhppNl5jeNanFqf;3:CnD+9/jOAnON4NL+2YLF68zPugu95rJ6ffKdWhbU01n7VsegPI8xxIJniSZMDtC6zXUruT69GH+RwHuBQ7Vj2H/A+AZ8vxwZZy2BuFMgVbHZqMoJIP+skXOMpLT9hp+F;25:pHPjAUgbJn/p3Q4UyU0V9KUJamYJ0rj4i+jARey73T6QzO6pxC7YH5VuvdvuS82SSxOgM4cLqMtXQNagR6eSuRs38KPA5C3B3Lqwi3UQi6IYqxZRDlbP5j+oRsX6WXqcFmBBMF4gG42vZ5if4vZ/lPdJ0AZfn2pPiS340+wPAAqIN8RPYzKDVsxMpsmERBuETGQx7Wz6iKwT9lk7x9cFG+ZDpu43JvFUocFIdv252rGaDil6UCUhG7OIk1Mnr9mAlyvmznsYUsyB71bGk/Kz0HRxXbD2ZIsK//3EEx6Igze9VQ2ePQiYAsJ4Jb0cdbLPwknFbSIkDjxwaIeLwNDBfV91KzisBcaY1eiYbKUVRxw0UMzwvYa5k+vWv+9iKgeHFBG1LNCdP1cfILRkCVnQVcVhBp76DGPm4ak1vRRl/DI= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR07MB2144; X-Microsoft-Exchange-Diagnostics: 1;SN1PR07MB2144;31:KONdeRQB6SBEE5c6FDkKjpM1VgrD1oZ8+29wtrw5wkR3/h5BqUAfxNV0WwyDmwG118c/hQjO5qiJe5yV86V2sBltIlsJudIK4b/twA0cRsy57n02jdxToKKFqe8WgAIgPx6pghn7FT0hyE6j5f5vE8Lu+5NRkbFTjkUtfHwcPv1c+1FVDB0nYT12JCYjOdaGQzD8asnJLThJYx7eTqsYWkgx1AeaWyTI8BHSFDAu2V8=;20:43Fq0aYNne7OiOg9kCGSLiILX31CWpu61mwWwLQ/UTeJEcApEz/th9HPiXXWefIW3vfwNjvjH1X+g2bnL7aQoSha4ovYWN2a8npUY+lOcEGvgGYfwkhQc2DZlhz5Z1ME6mgaMFlU9R+7d8CPqTSNcdwKwxFy2Sj3ChhbmHYTXEZlFKpbR2WgkT/VLL7miubflEG8YLphwbv8xd8klW+jB2iSLvroAJh3VIWFEsPZvjpDJSn1aAh4nrmzGWTQxvxFmuagF5tb1nXPTmoE23Ab9FBCYb5KrxWsxACBJ/uCQXO3KS0vP/+PZveSrzchZlZJhnMpmS+hRGnvlUH06sANcCVG90nf788azE4G1dcIMYpJlJRd4k436Bu2tm1NwlABhdmnmot0Cr5uJMJHNd1Mu3S8z+ZD9Rbq+RriU1w/7H9oTWn/OjVSyL3psUrBia7QSiIquA+U1zsxUkWDQAHS58lI5CFqEOsgGSOuCM1UUEYIjBD9PGNgsjsfSwckdgiUgoDg8poUFrUQt6pLWD53J8x9M+Pg0/eJWfFa+FyfaVx1zhiigz1ZfS7X8y3eCCulTlj2t1kxTd//dNjpV5YfvkFJwkoArOH5V5w+pFiLKTg= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046);SRVR:SN1PR07MB2144;BCL:0;PCL:0;RULEID:;SRVR:SN1PR07MB2144; X-Microsoft-Exchange-Diagnostics: 1;SN1PR07MB2144;4:Z/aIQ6TgfiQ/GWrYaThOdugtWpWnoNu60cxhy+RF+fHSS90Vv6lI/Cnv+rreJvhZWMwBwKgfbMwpem6Bft24gfErrtxsRCawqnDHteGzGlCc1gGpj75ZycEhZaqP1bFYQ6xLt+6x/k/9rMizHaAxqLdXTmJSUjmapuajC0Bxq1Dp9L7yx6VkZircr2EQuiRA9uMbXzo7WcvbsoFXAFv1we+EQ54EXnhQJMlqRXVOOGfJiFnBOchg4iiitSJ8hMvw7JKEfwubny9T0+1fXCmgD0qLrOaT4djhIsJSn4eushCzj4gKlwS9Tqjrcel8fIZ3k71DitZsAsh01eJv4CB4AQUO4WjZ795Hmwc/anpRD09JaZcWmR2FfOPflRsgRRLo9/QFnfk1UFeR9IXH3TiVrG8mSmsJorOeSH1H5xrD0far/oUcD6gWuJQItyHajH1w X-Forefront-PRVS: 0035B15214 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(199003)(377454003)(24454002)(189002)(7846002)(586003)(106356001)(81166006)(81156014)(2950100001)(4001430100002)(575784001)(69596002)(68736007)(8676002)(77096005)(107886002)(110136002)(189998001)(92566002)(33656002)(7416002)(101416001)(3846002)(36756003)(6116002)(97736004)(53416004)(2906002)(47776003)(42186005)(65956001)(66066001)(65806001)(7736002)(76176999)(65816999)(87266999)(80316001)(54356999)(4326007)(50986999)(59896002)(19580395003)(4001350100001)(2870700001)(50466002)(105586002)(305945005)(19580405001)(83506001)(23676002)(64126003);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR07MB2144;H:dl.caveonetworks.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtTTjFQUjA3TUIyMTQ0OzIzOlUyNGFER29UZnRsbjNIQUZEQWk1bnJzMlZs?= =?utf-8?B?WmlNVXVWYWR3aTJ1VkZwdW1JMjNKbjRHWHVLSldOZTU5eG5oNmdzL2FFS1JE?= =?utf-8?B?OEVIVkRrYUJxQy9NVlB1My9aK3VpMWk2RHhtNTVrZCtVOVl6SHgwTUNuQ2R3?= =?utf-8?B?OTVjTWM5NnI5MFVEWTVFRWtaZFRMNFhDdTIzZzhzTUNheTdVb0xUOVlLbGZk?= =?utf-8?B?QzJ4Q0J1ZFZZN09FSHRSdWJXQ1h6ZkU3dm82ZnRNelZzOWdKSzhQalVVTGw3?= =?utf-8?B?M3JrejBaMTN0bTk4Z1pGRnRqRFd4NVU2WUVycWVXNWp1M2FTL3N1NjAvSDVp?= =?utf-8?B?WmQrcjhBQVJiYng1cU0xNHg1VUxSUGZsTFRzVGMxam1QQkw0YzN1aTBxR0RX?= =?utf-8?B?UzRxQ1p1UWowSlBZT2twbVcwMW1xdGdvYVZhaGpqanNHRWdxanZJbHhWVnZR?= =?utf-8?B?TEQvRk5yK0g0eDdkN0tEZkc3emhKeXNpd0FONEpYU3I0WDF3dGppdWRqbmpS?= =?utf-8?B?L0cvMkVucWQ3RkN5SHpuaXQ2Ym9Gc0EyQ2gyYmJqZGVVRTRuYTVQM216NTJV?= =?utf-8?B?M2tVVUNqc09STStEbXQ0LzBpdWNEK1J1TE1lcDJuNlBOUzYvcTRzY3N1dWpN?= =?utf-8?B?eUwraG15SlJkcmprRGFoUEVjUDhKc3ZwaG82d1hMOXRDWEtmSGlMMnNWUVY3?= =?utf-8?B?ZXJvZGxsWnpyeTFQd00vTXpDRGxJdnpQY2tVRE9nSHlhOVNsVXVNQmxnc0k0?= =?utf-8?B?WDd0dmlSbUlhZ242OVlKcjVvNEpjVy9iKzc3WjZsbXFrN2hudHBKZFlibm5w?= =?utf-8?B?T2Uvc2s1VDFNRXBMWHV6aUVVcFdSdmNaMWlFTGEvcWVvaU9sT29FZDZwNkFV?= =?utf-8?B?bm1DQ01QUE95czJtKzFpa3pFZUVLNjZkc2FHMzU0RFN0VDlwOUt0SmVIR1h3?= =?utf-8?B?VTY5c1d5UkxKMWR6MjN2THMxTFJzZEdyLzNLOU1xN2dqMkYraWlmOW96WmFq?= =?utf-8?B?SVR5U0hXM3IycVhDWFplVkRUemU3dlVrQVBaMlRDR0o5cllUU2lIdWw0Sm5u?= =?utf-8?B?NkZrY0FUSUF0VFZ5U3hBNWFUM3Mra3JYVXpCU2hONXg4M0FjWlY0WmMvN0l5?= =?utf-8?B?N3QrTGRieklKbkEzbE90eDlzaTNPdlFYMUdOY2ZDMjVhZzVwNVVMbHFZSUE2?= =?utf-8?B?MVVQQThTZzdQblQxQzYrd3o4dU5HSzhGM0FTaE91Z200cXh3ZlJJYUYzdi92?= =?utf-8?B?eFpKS2p2UkFWdnZmUkt3aVZOQi9MS2hyZURBbGlhZngwOElHalZKeUZnbG9U?= =?utf-8?B?c2FDd1V2SlBXYjQra3hsUzB3SEtPbUFKSW9QL3FVOWhKWVliNFhPSEJFbXNu?= =?utf-8?B?VEtPVk1TNkZWVmZkTXJhNjU5T2JZbTdwVlhTNFd6dk93MkJ6MHFnWHZ5RUp1?= =?utf-8?B?UE1peTBEakN4aEllOGhxYUJ1Yll4UGhvSFozam5CTjdhaG02cEdDSTlqaVR4?= =?utf-8?B?WUJEUVY5WnJlbTY1dnpQMDRPVC9weDFSbEZUd1BmSFd0NlFuNno2bDg5eHEr?= =?utf-8?B?b0d6WjZ1NXdkRTgzTGoxSDVCMzlQWjVhbUhnOXBaSlV4N1hBWHhmOEgwRjFq?= =?utf-8?B?TXU3S2N4UVlROG5JOTV1TGpLSFdIRi9KMThNVUp3U0JqaTZiei9FL3phYjJ1?= =?utf-8?B?VFZrQkM1RUlsTjVSUVlyYUZBa2dsN0pXWjRIdzRyTUU0bm1DQjhKYm9mdklE?= =?utf-8?B?K0s4a29sSEtjTEVHbEZLK0lndXhSRDdwcDdIcGYxT1dKM2RQcy9iN0llVStB?= =?utf-8?B?d2VaQ3lTRUowdktwN1Zwbkc2TGhDVUxERHJUVlZHZndMZWtuOTBxdW9mMmMr?= =?utf-8?Q?g5Sfp+DpmMJVOelas8ovJLlLEwOhx199?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR07MB2144;6:wZb6MRDBVgNFs9crIq3v9PwgqpnQEZmc+nT62nLa7oKeHb3Fz4soQ84HO8B8PE/gfDRJNRCRMCFxjKUkdLf2xxDLGgxjn6A80SBPVoDEa9sWi0rxV0kweCCLmgHy+vmhTP8qs0B35Sf+nOvo5WgqYxgcH2hL8RcWhx4gALuqY2jlt7U8jblZIj2+5YqoiLwKK/B1uuY0voLNq9v5NJx/duxjqPII9gN5s4X41lIOMD0dkgmgedCMAOTyaTsqIAMJRUFHoSpdYbWXXp5dyumHan+AEWJUZFDd2cwy+LrmUR0=;5:QDTW0IgHcc6HRESAYwqXivyKtOOMxB0Ul8jZB5lrpn1jI9tsn0l8DUyMpnB/AGBQ3Ky2LzxkVtT2JN82F32iCu1ANNPVH+Se4ic//jpvao9T6d/Bc+mHsy9q9gPqn/38w7f0dDr2y4Lzbqzplet4RA==;24:848O6jltdl1GEOg2xuxe26vXjnUVB4Fb4y10Ub+yTdZHFWFc5vnnbR32sLuqt0l2yJu+SzbP+IIEnPRgjczI7dvGzEzqZeoTpx2L8b1knSo=;7:Dv8cy5gE59/WNQwUHmwggnJwO+Ir/XoNHwCsr/ArFHWb3PhnjYzKQlPauJLvEv31Iv3by62sESu1GMvplA4XscOSFzpxvYKs4bXYvc3FQMCc9wETGrYzyEJCfA/sqHpX6v2qBeCw7lZJ1/0iLY2qnAhhsGPOJ+Q8pXLi+oaLLj8a6WrAgPOZcY2MV1ajPxqqX7TBWSQcm+FIMWbrPEkfr7xUdD6axjIiNf5zoeCroz75NIB33vngEXOI1QAGfrQb SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Aug 2016 22:55:17.9726 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR07MB2144 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 08/15/2016 08:35 AM, Catalin Marinas wrote: > On Tue, May 24, 2016 at 03:35:44PM -0700, David Daney wrote: >> diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h >> index aee323b..4b13ecd 100644 >> --- a/arch/arm64/include/asm/acpi.h >> +++ b/arch/arm64/include/asm/acpi.h >> @@ -113,4 +113,12 @@ static inline const char *acpi_get_enable_method(int cpu) >> pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr); >> #endif >> >> +#ifdef CONFIG_ACPI_NUMA >> +int arm64_acpi_numa_init(void); >> +int acpi_numa_get_nid(unsigned int cpu, u64 hwid); >> +#else >> +static inline int arm64_acpi_numa_init(void) { return -ENOSYS; } >> +static inline int acpi_numa_get_nid(unsigned int cpu, u64 hwid) { return NUMA_NO_NODE; } >> +#endif /* CONFIG_ACPI_NUMA */ >> + >> #endif /*_ASM_ACPI_H*/ > > Apparently this doesn't always build since asm/acpi.h is conditionally > included from linux/acpi.h only when CONFIG_ACPI is enabled. Disabling > this option on arm64 leads to: > > arch/arm64/mm/numa.c: In function ‘arm64_numa_init’: > arch/arm64/mm/numa.c:395:24: error: ‘arm64_acpi_numa_init’ undeclared (first use in this function) > if (!acpi_disabled && !numa_init(arm64_acpi_numa_init)) > > I'll fix it in arch/arm64 by including asm/acpi.h directly as we do in a > couple of other files: Sounds good. Thanks for fixing it. David > > ------------------8<------------------------------ > From 9a83bf400e0b4ef066b83eeaecdbca909b8491ea Mon Sep 17 00:00:00 2001 > From: Catalin Marinas > Date: Mon, 15 Aug 2016 16:33:10 +0100 > Subject: [PATCH] arm64: Fix NUMA build error when !CONFIG_ACPI > MIME-Version: 1.0 > Content-Type: text/plain; charset=UTF-8 > Content-Transfer-Encoding: 8bit > > Since asm/acpi.h is only included by linux/acpi.h when CONFIG_ACPI is > enabled, disabling the latter leads to the following build error on > arm64: > > arch/arm64/mm/numa.c: In function ‘arm64_numa_init’: > arch/arm64/mm/numa.c:395:24: error: ‘arm64_acpi_numa_init’ undeclared (first use in this function) > if (!acpi_disabled && !numa_init(arm64_acpi_numa_init)) > > This patch include the asm/acpi.h explicitly in arch/arm64/mm/numa.c for > the arm64_acpi_numa_init() definition. > > Fixes: d8b47fca8c23 ("arm64, ACPI, NUMA: NUMA support based on SRAT and SLIT") > Signed-off-by: Catalin Marinas > --- > arch/arm64/mm/numa.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c > index c7fe3ec70774..5bb15eab6f00 100644 > --- a/arch/arm64/mm/numa.c > +++ b/arch/arm64/mm/numa.c > @@ -23,6 +23,8 @@ > #include > #include > > +#include > + > struct pglist_data *node_data[MAX_NUMNODES] __read_mostly; > EXPORT_SYMBOL(node_data); > nodemask_t numa_nodes_parsed __initdata; >