infra/common: modify ACS documentation for 2021.02.24 release

Update the ACS documentation with steps to do the test in manual mode
as kernel panic is observed with ACS 3.0 disk image. Also add steps to
skip the PCI excerciser tests from UEFI SBSA test.

Change-Id: I4220fb235d8b0d8f60d7ded513083324f09a6e39
Signed-off-by: Pranav Madhu <pranav.madhu@arm.com>

docs/infra/common/acs-test.rst

@@ -49,9 +49,9 @@ listed below.
 +--------------------------+-------------------------+
 | RD-E1-Edge               | rde1edge                |
 +--------------------------+-------------------------+
-| RD-Daniel Config-M       | rddaniel                |
+| RD-V1                    | rdv1                    |
 +--------------------------+-------------------------+
-| RD-Daniel Config-XLR     | rddanielxlr             |
+| RD-V1-MC (Quad Chip)     | rdv1mc                  |
 +--------------------------+-------------------------+
 | RD-N2                    | rdn2                    |
 +--------------------------+-------------------------+
@@ -128,7 +128,7 @@ Validate ACS conformance
 ------------------------
 
 For running the ACS tests, the ACS test suite disk image is required. The ACS
-test suite disk image can either by build from source by following the
+test suite disk image can either by built from source by following the
 documentation at `ACS build documentation <https://github.com/ARM-software/arm-enterprise-acs>`_
 or the latest available prebuilt image (luv-live-image) can be downloaded from
 `here <https://github.com/ARM-software/arm-enterprise-acs/tree/release/prebuilt_images>`_.
@@ -189,7 +189,8 @@ Example commands to perform the ACS tests are as listed below.
 
 - Command to start the execution of the RD-N2 model and perform the ACS tests.
   The ACS test suite disk image named 'luv-live-image-gpt.img' is picked up from
-  the location /tmp/luv-live-image-gpt.img.
+  the location /tmp/luv-live-image-gpt.img. Note: Follow the instructions below
+  for the steps to be performed to complete the tests.
 
   ::
 
@@ -199,21 +200,42 @@ Example commands to perform the ACS tests are as listed below.
   perform the ACS tests. The ACS test suite disk image named 'luv-live-image-gpt.img'
   is picked up from the location /tmp/luv-live-image-gpt.img. Additional
   parameters to the model are supplied using the -a command line parameter and
-  networking support is enabled by using the -n parameter.
+  networking support is enabled by using the -n parameter.  Note: Follow the
+  instructions below for the steps to be performed to complete the tests.
 
   ::
 
     ./acs.sh -p rdn2 -v /tmp/luv-live-image-gpt.img -n true -a "-C board.flash0.diagnostics=1"
 
 
-Note: UEFI SCT tests are currently not supported in RD Platforms because some of
-the SCT tests require reboot. The ACS test suite has the provision to skip SCT
-test and it is recommended to skip the SCT tests. After starting the ACS test
-using the command listed above, choose 'sbbr/sbsa' option from the grub menu.
-This will launch UEFI shell and the shell startup script will launch the ACS
-tests. The UEFI ACS test will prompt `Press any key to stop the EFI SCT running`,
-and the SCT tests can be skipped by pressing any key.
+The SBSA/SBBR tests are split into two phases - tests that execute from linux
+and the tests that execute from an EFI interface level. Note that, these two
+phases of tests have to be independently performed.
 
+Let the boot progress to the 'Grub' menu. To execute SBSA/SBBR tests from linux,
+choose the option 'luv' from Grub menu. This will launch the LuvOS. The LuvOS
+initiates the tests on boot and stores the results into the ACS disk image after
+the tests are complete. This completes the first phase of the SBSA/SBBR tests.
+
+To complete the second phase of the test, relaunch the model by repeating the
+execution of the command listed above. Let the boot progress to the 'Grub' menu.
+Choose the option 'sbbr/sbsa' from Grub menu, which will launch the EFI shell.
+Press Esc key to get into the shell. UEFI SCT tests (SBBR test) are currently
+not supported for the Neoverse reference design platforms because some of the
+SCT tests require reboot and so it is recommended to skip the SCT tests. On
+the SBSA UEFI test, the PCIe excerciser tests are also not supported as the GIC
+UEFI driver does not support LPI interrupt.
+
+At the EFI shell, execute the command listed below to execute the SBSA tests.
+This command skips the excerciser tests as well.
+
+  ::
+
+    Shell> FS<x>:EFI\BOOT\sbsa\Sbsa.efi -skip 800
+
+
+The test results will be available on console as the test proceeds to
+completion.
 
 Select a SBSA compliance level (optional)
 -----------------------------------------
@@ -223,7 +245,7 @@ level-7. The ACS disk image is typically configured for a default level. For ACS
 disk image v3.0, the default SBSA level is 4. For running the ACS tests for any
 higher or lower level, press ESC from UEFI shell and run the SBSA efi binary
 manually to select the appropriate compliance level to be tested. An example
-of the command to use to select the compliance level is listed below.
+of the command to be used to select the compliance level is listed below.
 
   ::
 
@@ -248,9 +270,8 @@ the first partition of ACS test suite disk image that was used for the test.
     sudo mount -o loop,offset=1048576 luv-live-image-gpt /tmp/acs-disk/
 
 The SBSA test results can be found in the folder 'sbsa_results' of this
-partition. There will be seperate folders for the UEFI log and Linux log.
+partition.
 
-  - UEFI test report  : /tmp/acs-disk/sbsa_results/uefi/SbsaResults.log
   - Linux test report : /tmp/acs-disk/sbsa_results/linux/SbsaResults.log
 
 The FWTS result will be in folder ‘luv-results*/parsed/fwts’ (Note: Choose the