--- wikisrc/security/meltdown_spectre.mdwn	2018/05/22 08:24:53	1.31
+++ wikisrc/security/meltdown_spectre.mdwn	2018/05/22 10:26:00	1.32
@@ -102,10 +102,10 @@ software change is required.
 [[!table data="""
 Port		|Vendor/Model	|Spectre (V4)	|NetBSD-7	|NetBSD-8	|NetBSD-current
 amd64		|Intel		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigE]
-amd64		|AMD		|Unknown	|		|		|
+amd64		|AMD		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigF]
 amd64		|VIA		|Unknown	|		|		|
 i386		|Intel		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigE]
-i386		|AMD		|Unknown	|		|		|
+i386		|AMD		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigF]
 i386		|VIA		|Unknown	|		|		|
 """]]
 
@@ -126,10 +126,10 @@ Three sysctls exist, under the machdep.s
 [[!template id=programlisting text="""
 machdep.spectre_v2.hwmitigated = {0/1} user-settable
 machdep.spectre_v2.swmitigated = {0/1} set by the kernel
-machdep.spectre_v2.method = {string} set by the kernel
+machdep.spectre_v2.method = {string} constructed by the kernel
 """]]
 
-Only hwmitigated can be set by the user. When set to one, the kernel will
+Only "hwmitigated" can be set by the user. When set to one, the kernel will
 determine the best hardware mitigation available for the currently
 running CPU, and will apply it.
 
@@ -150,11 +150,29 @@ dynamically enabled/disabled by changing
 Software mitigation. It is enabled by default in GENERIC. When enabled,
 the "swmitigated" sysctl is set to one.
 
-### Mitigation E: Intel SSBD
+### Mitigations E, F
 
-SpectreV4 can be mitigated with the SSBD method (Intel only for now). It
-can be dynamically enabled by changing the "machdep.spectre_v4.mitigated"
-sysctl.
+There are two available mitigations for SpectreV4. Their availability
+depends on the CPU model and the microcode or BIOS revision.
+
+[[!template id=programlisting text="""
+machdep.spectre_v4.mitigated = {0/1} user-settable
+machdep.spectre_v4.method = {string} constructed by the kernel
+"""]]
+
+Only "mitigated" can be set by the user. When set to one, the kernel will
+determine the best hardware mitigation available for the currently
+running CPU, and will apply it.
+
+#### Mitigation E: Intel SSBD
+
+Available on Intel only for now. It can be dynamically enabled/disabled by
+changing the "mitigated" sysctl.
+
+#### Mitigation F: AMD NONARCH
+
+Available only on AMD families 15h and 16h. It can be dynamically
+enabled/disabled by changing the "mitigated" sysctl.
 
 ## External Resources