]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
powerpc/pseries: Revert 'Auto-online hotplugged memory'
authorNathan Fontenot <nfont@linux.vnet.ibm.com>
Wed, 15 Feb 2017 18:45:30 +0000 (13:45 -0500)
committerTim Gardner <tim.gardner@canonical.com>
Mon, 6 Mar 2017 21:20:15 +0000 (14:20 -0700)
commit849d9b98df759519cf616875a60b54cb3f02d104
tree82a9a22df554ea39a254fcd79d5c9847dc369254
parentcb212819cb8f8d2c414f0a92cfb0c183c465f77d
powerpc/pseries: Revert 'Auto-online hotplugged memory'

BugLink: http://bugs.launchpad.net/bugs/1670315
This reverts commit ec999072442a ("powerpc/pseries: Auto-online
hotplugged memory"), and 9dc512819e4b ("powerpc: Fix unused function
warning 'lmb_to_memblock'").

Using the auto-online acpability does online added memory but does not
update the associated device struct to indicate that the memory is
online. This causes the pseries memory DLPAR code to fail when trying to
remove a LMB that was previously removed and added back. This happens
when validating that the LMB is removable.

This patch reverts to the previous behavior of calling device_online()
to online the LMB when it is DLPAR added and moves the lmb_to_memblock()
routine out of CONFIG_MEMORY_HOTREMOVE now that we call it for add.

Fixes: ec999072442a ("powerpc/pseries: Auto-online hotplugged memory")
Cc: stable@vger.kernel.org # v4.8+
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
(cherry picked from commit 943db62c316c578f8e2cc6fb81a5f641096b29bf)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
arch/powerpc/configs/pseries_defconfig
arch/powerpc/platforms/pseries/hotplug-memory.c