From 1ba5cea3addc972f4c1be1fece67dbe9e361ccdf Mon Sep 17 00:00:00 2001
From: Carolyn Gjertsen <Carolyn.Gjertsen@amd.com>
Date: Thu, 14 May 2026 16:50:55 -0500
Subject: [PATCH] Doc/TestCaseSpec: Update GetNextDevice for dual behavior
 (Mantis 2359)

Update EFI_ATA_PASS_THRU_PROTOCOL.GetNextDevice() test documentation
to accept both EFI_NOT_FOUND and EFI_SUCCESS + 0xFFFF as valid
terminal conditions per UEFI 2.10 Errata A (Mantis 2359). Note that
conformance checkpoints now use WARNING/skip when no port multiplier
is present.

Cc: PR #352
Signed-off-by: Carolyn Gjertsen <Carolyn.Gjertsen@amd.com>
---
 .../09_Protocols_Bootable_Image_Support_Test.md | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/uefi-sct/Doc/TestCaseSpec/09_Protocols_Bootable_Image_Support_Test.md b/uefi-sct/Doc/TestCaseSpec/09_Protocols_Bootable_Image_Support_Test.md
index 9f8f3f9b0..bd11858fc 100644
--- a/uefi-sct/Doc/TestCaseSpec/09_Protocols_Bootable_Image_Support_Test.md
+++ b/uefi-sct/Doc/TestCaseSpec/09_Protocols_Bootable_Image_Support_Test.md
@@ -5577,19 +5577,30 @@ available port and <em>PortMultiplierPort</em> being invalid.</p>
 <td><p><strong>EFI_ATA_PASS_THRU_PROTOCOL.GetNextDevice –</strong>
 <strong>GetNextDevice()</strong></p>
 <p>could iterate all available</p>
-<p>devices on one port.</p></td>
+<p>devices on one port (accepts dual terminal behavior per Mantis 2359).</p></td>
 <td><p>1.<strong>GetNextPort()</strong> with <em>Port</em> as</p>
 <p><strong>0xFFFF</strong>to start iterate ports.</p>
 <p>2. Call <strong>GetNextPort()</strong> with <em>Port</em></p>
 <p>as one available port and</p>
 <p><em>PortMultiplierPort</em> as 0xFFFF to</p>
 <p>start iterate devicess.</p>
-<p>3. The iteration should ended up with a return code
-<strong>EFI_NOT_FOUND</strong>.</p></td>
+<p>3. The iteration should end with either:</p>
+<p>(a) A return code of <strong>EFI_NOT_FOUND</strong>, or</p>
+<p>(b) <strong>EFI_SUCCESS</strong> with <em>PortMultiplierPort</em>
+set to <strong>0xFFFF</strong> (broadcast address indicating no port
+multiplier connected, per Mantis 2359).</p>
+<p>Both behaviors are spec-compliant per UEFI 2.10 Errata A.</p></td>
 </tr>
 </tbody>
 </table>
 
+**Note (Mantis 2359):** UEFI 2.10 Errata A clarified that when a port
+multiplier is not connected, **GetNextDevice()** may return either
+**EFI_NOT_FOUND** or **EFI_SUCCESS** with *PortMultiplierPort* set to
+**0xFFFF**. Both behaviors are now accepted. The conformance test
+checkpoints 1 and 2 (5.7.8.6.1 and 5.7.8.6.2) record **WARNING** and
+skip when no devices are enumerable, rather than hard-failing.
+
 ### PassThru()
 
 <table>