stable inclusion
from linux-4.19.155
commit 9b1f935ae4daefbc6ff8929526875d55b7a53121

--------------------------------

commit 2a632815 upstream.

On some platform of AMD, S3 fails with HCE and SRE errors. To fix this,
need to disable a bit which is enable in sparse controller.

Cc: stable@vger.kernel.org #v4.19+
Signed-off-by: NSanket Goswami <Sanket.Goswami@amd.com>
Signed-off-by: NSandeep Singh <sandeep.singh@amd.com>
Signed-off-by: NMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20201028203124.375344-3-mathias.nyman@linux.intel.comSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>