powerpc/[booke|4xx]: Don't clobber TCR[WP] when setting TCR[DIE]
authorIvan Mikhaylov <ivan@de.ibm.com>
Fri, 19 May 2017 15:47:05 +0000 (18:47 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 13 Apr 2018 17:50:14 +0000 (19:50 +0200)
commit6c9fe4770b1ae81e182114358184e370e1d78dd4
treee9cc5f9a42a324ca219bdeb72a61be4333fcdb3d
parentd88cbbe7ba0c9d75846d82e0ad6d7d82ef246e31
powerpc/[booke|4xx]: Don't clobber TCR[WP] when setting TCR[DIE]

[ Upstream commit 6e2f03e292ef46eed2b31b0a344a91d514f9cd81 ]

Prevent a kernel panic caused by unintentionally clearing TCR watchdog
bits. At this point in the kernel boot, the watchdog may have already
been enabled by u-boot. The original code's attempt to write to the TCR
register results in an inadvertent clearing of the watchdog
configuration bits, causing the 476 to reset.

Signed-off-by: Ivan Mikhaylov <ivan@de.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/powerpc/kernel/time.c