Adjust to F15h, simplify code, fixup macros.
Signed-off-by: NBorislav Petkov <borislav.petkov@amd.com>