forked from rpms/kernel
		
	Linux v4.9-rc1-145-gf4814e6
This commit is contained in:
		
							parent
							
								
									7be869a650
								
							
						
					
					
						commit
						75c5656f26
					
				| @ -1,61 +0,0 @@ | ||||
| From patchwork Mon Oct 17 14:56:49 2016 | ||||
| Content-Type: text/plain; charset="utf-8" | ||||
| MIME-Version: 1.0 | ||||
| Content-Transfer-Encoding: 7bit | ||||
| Subject: [v2] arm64: kernel: numa: fix ACPI boot cpu numa node mapping | ||||
| From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> | ||||
| X-Patchwork-Id: 9379531 | ||||
| Message-Id: <20161017145649.6189-1-lorenzo.pieralisi@arm.com> | ||||
| To: linux-arm-kernel@lists.infradead.org | ||||
| Cc: Andrew Jones <drjones@redhat.com>, | ||||
|  Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, | ||||
|  Catalin Marinas <catalin.marinas@arm.com>, | ||||
|  Will Deacon <will.deacon@arm.com>,  | ||||
|  linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, | ||||
|  Hanjun Guo <hanjun.guo@linaro.org>, | ||||
|  Zhen Lei <thunder.leizhen@huawei.com>, Laszlo Ersek <lersek@redhat.com> | ||||
| Date: Mon, 17 Oct 2016 15:56:49 +0100 | ||||
| 
 | ||||
| Commit 7ba5f605f3a0 ("arm64/numa: remove the limitation that cpu0 must | ||||
| bind to node0") removed the numa cpu<->node mapping restriction whereby | ||||
| logical cpu 0 always corresponds to numa node 0; removing the | ||||
| restriction was correct, in that it does not really exist in practice | ||||
| but the commit only updated the early mapping of logical cpu 0 to its | ||||
| real numa node for the DT boot path, missing the ACPI one, leading to | ||||
| boot failures on ACPI systems owing to missing cpu<->node map for | ||||
| logical cpu 0. | ||||
| 
 | ||||
| Fix the issue by updating the ACPI boot path with code that carries out | ||||
| the early cpu<->node mapping also for the boot cpu (ie cpu 0), mirroring | ||||
| what is currently done in the DT boot path. | ||||
| 
 | ||||
| Fixes: 7ba5f605f3a0 ("arm64/numa: remove the limitation that cpu0 must bind to node0") | ||||
| Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> | ||||
| Tested-by: Laszlo Ersek <lersek@redhat.com> | ||||
| Reported-by: Laszlo Ersek <lersek@redhat.com> | ||||
| Cc: Will Deacon <will.deacon@arm.com> | ||||
| Cc: Laszlo Ersek <lersek@redhat.com> | ||||
| Cc: Hanjun Guo <hanjun.guo@linaro.org> | ||||
| Cc: Andrew Jones <drjones@redhat.com> | ||||
| Cc: Zhen Lei <thunder.leizhen@huawei.com> | ||||
| Cc: Catalin Marinas <catalin.marinas@arm.com> | ||||
| Acked-by: Hanjun Guo <hanjun.guo@linaro.org> | ||||
| ---
 | ||||
| v1 -> v2 | ||||
| 	- Updated commit log to reflect boot failures set-ups | ||||
|   | ||||
|  arch/arm64/kernel/smp.c | 1 + | ||||
|  1 file changed, 1 insertion(+) | ||||
| 
 | ||||
| diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
 | ||||
| index d3f151c..8507703 100644
 | ||||
| --- a/arch/arm64/kernel/smp.c
 | ||||
| +++ b/arch/arm64/kernel/smp.c
 | ||||
| @@ -544,6 +544,7 @@ acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor)
 | ||||
|  			return; | ||||
|  		} | ||||
|  		bootcpu_valid = true; | ||||
| +		early_map_cpu_to_node(0, acpi_numa_get_nid(0, hwid));
 | ||||
|  		return; | ||||
|  	} | ||||
|   | ||||
							
								
								
									
										2
									
								
								gitrev
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								gitrev
									
									
									
									
									
								
							| @ -1 +1 @@ | ||||
| 1a1891d762d6e64daf07b5be4817e3fbb29e3c59 | ||||
| f4814e61836f5571d2b89169ba2e9ea59e2bc8c8 | ||||
|  | ||||
| @ -69,7 +69,7 @@ Summary: The Linux kernel | ||||
| # The rc snapshot level | ||||
| %global rcrev 1 | ||||
| # The git snapshot level | ||||
| %define gitrev 2 | ||||
| %define gitrev 3 | ||||
| # Set rpm version accordingly | ||||
| %define rpmversion 4.%{upstream_sublevel}.0 | ||||
| %endif | ||||
| @ -606,9 +606,6 @@ Patch848: 0001-cpupower-Correct-return-type-of-cpu_power_is_cpu_onl.patch | ||||
| #ongoing complaint, full discussion delayed until ksummit/plumbers | ||||
| Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch | ||||
| 
 | ||||
| #rhbz 1384701 | ||||
| Patch850: 0001-arm64-kernel-numa-fix-ACPI-boot-cpu-numa-node-mappin.patch | ||||
| 
 | ||||
| # END OF PATCH DEFINITIONS | ||||
| 
 | ||||
| %endif | ||||
| @ -2147,6 +2144,9 @@ fi | ||||
| # | ||||
| # | ||||
| %changelog | ||||
| * Thu Oct 20 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.9.0-0.rc1.git3.1 | ||||
| - Linux v4.9-rc1-145-gf4814e6 | ||||
| 
 | ||||
| * Wed Oct 19 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc1.git2.1 | ||||
| - Linux v4.9-rc1-67-g1a1891d | ||||
| - Switch to v2 of the aarch64 boot regression patch | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user