OSDN Git Service

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)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 21 Feb 2017 01:57:01 +0000 (12:57 +1100)
commit943db62c316c578f8e2cc6fb81a5f641096b29bf
treeee19a6be92c914f211b2541d05d008bb5af24a46
parenta311e738b6d81febae21f0447c5b31752f0d1634
powerpc/pseries: Revert 'Auto-online hotplugged memory'

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>
arch/powerpc/configs/pseries_defconfig
arch/powerpc/platforms/pseries/hotplug-memory.c