Merge pull request #902 from Dasharo/reorg_post_merge_fixes

Reorg post merge fixes

docs/guides/lab-assembly/protectli.md

@@ -33,9 +33,9 @@ connect ports 3 and 4 together with an additional RJ45 cable.
     * Power supply for the platform: 12V 5A
     * Micro-USB to USB-A male-male cable for console
 
-=== "VP46XX"
+=== "VP4630/VP4650/VP4670"
 
-    * VP46XX platform
+    * VP4630/VP4650/VP4670 platform
     * Sonoff S20 type E (relay unused due to disruptions in power during high CPU load)
     * USB-UART converter with 4-wire cable
     * 4-pin header 2.54 mm raster
@@ -51,9 +51,9 @@ connect ports 3 and 4 together with an additional RJ45 cable.
     * Power supply for the platform: 12V 4A
     * USB-C to USB-A male-male cable for console
 
-=== "VP66XX"
+=== "VP6630/VP6650/VP6670"
 
-    * VP66XX platform
+    * VP6630/VP6650/VP6670 platform
     * Sonoff S20 type E (relay unused due to disruptions in power during high CPU load)
     * USB-UART converter with 4-wire cable
     * 4-pin header 2.54 mm raster
@@ -74,7 +74,7 @@ connect ports 3 and 4 together with an additional RJ45 cable.
     External flashing not possible with Pomona clip, the flash chip lies under
     the SODIMM module.
 
-=== "VP46XX"
+=== "VP4630/VP4650/VP4670"
 
     Flash chip is socketed. One has to desolder the socket, solder the flash
     chip in place of the socket and connect the Pomona SOIC8 clip.
@@ -93,7 +93,7 @@ connect ports 3 and 4 together with an additional RJ45 cable.
     | J7 pin 5 (MISO)     | <TBD marking> pin 5 (MISO)             |
     | J7 pin 6 (MOSI)     | <TBD marking> pin 3 (MOSI)             |
 
-=== "VP66XX"
+=== "VP6630/VP6650/VP6670"
 
     Connect the J1 and J2 flash headers to the SPI header on RTE.
 
@@ -135,7 +135,7 @@ connect ports 3 and 4 together with an additional RJ45 cable.
 
     Resetting CMOS is required for proper external flashing.
 
-=== "VP46XX"
+=== "VP4630/VP4650/VP4670"
 
     Connect the RTE J11 header to the platform JCMOS1 header using 2.54mm to 2mm
     wires as described in the table:
@@ -159,7 +159,7 @@ connect ports 3 and 4 together with an additional RJ45 cable.
 
     Resetting CMOS is required for proper external flashing.
 
-=== "VP66XX"
+=== "VP6630/VP6650/VP6670"
 
     Connect the RTE J11 header to the platform JCMOS1 header using 2.54mm to 2mm
     wires as described in the table:
@@ -214,7 +214,7 @@ The method of setting and using serial connection is described in the
         rte_ctrl rel
         ```
 
-=== "VP46XX"
+=== "VP4630/VP4650/VP4670"
 
     Power supply controlling (in this case: controlling the state of Sonoff)
     should be performed based on the `sonoff.sh` script implemented in
@@ -250,7 +250,7 @@ The method of setting and using serial connection is described in the
         rte_ctrl rel
         ```
 
-=== "VP66XX"
+=== "VP6630/VP6650/VP6670"
 
     Power supply controlling (in this case: controlling the state of Sonoff)
     should be performed based on the `sonoff.sh` script implemented in

docs/unified/protectli/building-manual.md

@@ -21,7 +21,7 @@ To build Dasharo firmware image, first clone the coreboot repository:
     ```
 then follow the steps below:
 
-=== "fw6"
+=== "FW6"
 
     1. Checkout to the device's branch:
         ```bash
@@ -42,7 +42,7 @@ then follow the steps below:
         ./build.sh fw6
         ```
 
-=== "v1000-series"
+=== "V1000-series"
 
     1. Checkout the desired version, e.g. `v0.9.3`:
 
@@ -101,7 +101,7 @@ then follow the steps below:
     `protectli_V1210.rom`, `protectli_V1410.rom` or `protectli_V1610.rom`
     respectvely.
 
-=== "vp46xx"
+=== "VP4630/VP4650/VP4670"
 
     Since version v1.0.18 VP4630 and VP4650 use different configuration file than
     VP4670. Versions v1.0.17 and older do not support VP4650 and VP4670 at all.
@@ -166,7 +166,7 @@ then follow the steps below:
                 The resulting coreboot image will be placed in the coreboot
                 directory as `protectli_vault_cml_<version>_vp4670.rom`.
 
-=== "vp66xx"
+=== "VP6630/VP6650/VP6670"
 
     1. Checkout the desired version, e.g. `v0.9.0`:
 
@@ -190,7 +190,7 @@ then follow the steps below:
     The resulting coreboot image will be placed in the coreboot directory as
     `protectli_vp66xx.rom`.
 
-=== "vp2410"
+=== "VP2410"
 
     1. Checkout the desired version, e.g. `v1.0.15`:
 
@@ -229,7 +229,7 @@ then follow the steps below:
     The resulting coreboot image will be placed in the coreboot directory as
     `protectli_vp2410_<version>.rom`.
 
-=== "vp2420"
+=== "VP2420"
 
     1. Checkout the desired version, e.g. `v1.1.0`:
 

docs/unified/protectli/firmware-update.md

@@ -34,15 +34,15 @@ medium lock and Secure Boot:
 The settings of all the above options can be restored after a firmware
 update.
 
-=== "v1000-series"
+=== "V1000-series"
 
     ## Updating Dasharo
 
     ```bash
     flashrom -p internal -w protectli_<variant>_v<version>.rom --fmap -i COREBOOT
     ```
 
-=== "vp46xx"
+=== "VP4630/VP4650/VP4670"
 
     ## Updating to Dasharo v1.2.0
 
@@ -89,15 +89,15 @@ update.
     flashrom -p internal -w protectli_vault_cml_v1.0.13.rom --ifd -i bios
     ```
 
-=== "vp66xx"
+=== "VP6630/VP6650/VP6670"
 
     ## Updating Dasharo
 
     ```bash
     flashrom -p internal -w protectli_vp66xx_v<version>.rom --fmap -i RW_SECTION_A
     ```
 
-=== "vp2410"
+=== "VP2410"
 
     ## Updating minor versions v1.x.y (e.g. from v1.0.x to v1.1.0)
 
@@ -118,7 +118,7 @@ update.
 
     This command also preserves Dasharo UEFI settings and the boot order.
 
-=== "vp2420"
+=== "VP2420"
 
     ## Updating minor versions v1.x.y
 

docs/unified/protectli/initial-deployment.md

@@ -19,7 +19,7 @@ flashrom -p internal -r dump.rom
 
 ## Flashing Dasharo
 
-=== "fw6"
+=== "FW6"
 
     To flash Dasharo on the platform, execute the following command - replace `[path]`
     with the path to the Dasharo image you want to flash, e.g. `protectli_fw6_DF_v1.0.14.rom`.
@@ -30,7 +30,7 @@ flashrom -p internal -r dump.rom
 
     After successful operation reboot the platform.
 
-=== "v1000-series"
+=== "V1000-series"
 
     To flash Dasharo on the platform, execute the following command - replace
     `[path]` with the path to the Dasharo image you want to flash, e.g.
@@ -43,7 +43,7 @@ flashrom -p internal -r dump.rom
     This will flash the BIOS region only. After the operation is successful,
     reboot the platform.
 
-=== "vp46xx"
+=== "VP4630/VP4650/VP4670"
 
     To flash Dasharo on the platform, execute the following command -
     replace `[path]` with the path to the Dasharo image you want to flash, e.g.
@@ -66,7 +66,7 @@ flashrom -p internal -r dump.rom
     5. The platform should power on normally now. You can connect the battery
         back if it was disconnected.
 
-=== "v66xx"
+=== "VP6630/VP6650/VP6670"
 
     To flash Dasharo on the platform, execute the following command - replace
     `[path]` with the path to the Dasharo image you want to flash, e.g.
@@ -79,7 +79,7 @@ flashrom -p internal -r dump.rom
     This will flash the BIOS region only. After the operation is successful,
     reboot the platform.
 
-=== "vp2410"
+=== "VP2410"
 
     To flash Dasharo on the platform, execute the following command -
     replace `[path]` with the path to the Dasharo image you want to flash,
@@ -100,7 +100,7 @@ flashrom -p internal -r dump.rom
 
     This command also preserves Dasharo UEFI settings and the boot order.
 
-=== "vp2420"
+=== "VP2420"
 
     To flash Dasharo on the platform, execute the following command - replace
     `[path]` with the path to the Dasharo image you want to flash, e.g.

docs/unified/protectli/overview.md

@@ -21,7 +21,7 @@ Select Model:
         ./test-matrix.md) - validation
         scope for the Protectli FW6
 
-=== "v1000-series"
+=== "V1000-series"
     The Vault is a small form network appliance built for use as a firewall /
     router, virtualization platform, a daily-driven personal computer, and more.
     The V1000 series feature an Intel Jasper Lake CPU, soldered down LPDDR4X
@@ -62,7 +62,7 @@ Select Model:
         - describes validation scope used during
         Dasharo firmware validation procedure.
 
-=== "vp46xx"
+=== "VP4630/VP4650/VP4670"
     The Vault is a small form network appliance built for use as a firewall /
     router, virtualization platform, a daily-driven personal computer, and more.
     The VP46XX is the second platform of the Vault Pro series with higher
@@ -81,6 +81,10 @@ Select Model:
         https://github.com/intel/FSP/tree/master/
         CometLakeFspBinPkg#differentiating-cometlake1-and-cometlake2))
 
+    > Starting with Dasharo [v1.0.19](releases.md#v1019-2022-12-08) Intel ME
+    > (Management Engine) is
+    > [soft-disabled](../../osf-trivia-list/me.md#soft-disabling-me).
+
     For more information please refer to the references below.
 
     ## References
@@ -97,7 +101,7 @@ Select Model:
     * [Initial deployment](
         ./initial-deployment.md) -
         describes initial Dasharo
-        deployment methods (i. e. flashing new firmware) for Protectli VP46xx.
+        deployment methods (i. e. flashing new firmware) for Protectli VP46XX.
     * [Firmware update](./firmware-update.md) -
         explains supported Dasharo
         open-source firmware update methods.
@@ -114,7 +118,7 @@ Select Model:
         Dasharo firmware validation procedure.
     * [Post-installation setup](./post-install.md)
 
-=== "vp2410"
+=== "VP2410"
     The Vault Pro is a small form network appliance built for use as a firewall
     / router, virtualization platform, a daily-driven personal computer,
     and more. The VP2410 is based on a 4 network port design that leverages
@@ -134,7 +138,11 @@ Select Model:
     * Intel® AES-NI support
     * Fanless and Silent
     * Included 12v Power Supply, VESA mount kit, Serial Console Cable,
-    SATA data and power cables for internal SSD, Quick Start Guide
+      SATA data and power cables for internal SSD, Quick Start Guide
+
+    > On VP2410 Intel ME (Management Engine) is not supported by coreboot
+    > causing Intel ME to enter recovery mode giving similar results to
+    > disabled ME.
 
     For more information please refer to the references below.
 
@@ -162,7 +170,7 @@ Select Model:
     * [Test matrix](./test-matrix.md) - describes
         validation scope used during Dasharo firmware validation procedure.
 
-=== "vp2420"
+=== "VP2420"
     The Vault Pro is a small form network appliance built for use as a firewall
     / router, virtualization platform, a daily-driven personal computer,
     and more. The VP2420 is based on a 4 x 2.5 G network port design that
@@ -184,7 +192,12 @@ Select Model:
     * Intel® AES-NI support
     * Fanless and Silent
     * Included 12v Power Supply, VESA mount kit, Serial Console Cable,
-    SATA data and power cables for internal SSD, Quick Start Guide
+      SATA data and power cables for internal SSD, Quick Start Guide
+
+    > Starting with Dasharo [v1.2.0](releases.md#v120-2024-05-16), Intel ME
+    > (Management Engine) is
+    > [soft-disabled](../../osf-trivia-list/me.md#soft-disabling-me) by
+    > default.
 
     For more information please refer to the references below.`
 
@@ -212,7 +225,7 @@ Select Model:
     * [Test matrix](./test-matrix.md) - describes
         validation scope used during Dasharo firmware validation procedure.
 
-=== "vp66xx"
+=== "VP6630/VP6650/VP6670"
     The Vault is a small form network appliance built for use as a firewall /
     router, virtualization platform, a daily-driven personal computer, and more.
     The VP6630/VP6650/VP6670 feature an Intel Alder Lake-P CPU, 2x DDR5 SODIMM
@@ -225,6 +238,9 @@ Select Model:
     * VP6650 - Intel® Core™ i5 -1235U
     * VP6670 - Intel® Core™ i7 -1255U
 
+    > On VP66XX Intel ME (Management Engine) is disabled by using the
+    > [HAP bit](../../osf-trivia-list/me.md#hap-altmedisable-bit-aka-disabling-me).
+
     ## Documentation sections
 
     * [Releases](../../variants/protectli_vp66xx/releases.md) - groups

docs/unified/protectli/post-install.md

@@ -3,37 +3,36 @@
 This document contains extra steps to perform after installing Dasharo in order
 to enable full functionality.
 
-=== "VPx6xx"
-    ## Windows
+## Windows
 
-    This section covers Windows post-install steps tested on Windows 11.
+This section covers Windows post-install steps tested on Windows 11.
 
-    ### Qualcomm Atheros cards may be missing driver
+### Qualcomm Atheros cards may be missing driver
 
-    If you experience Windows to fail to recognize Qualcomm Atheros WiFi cards,
-    you may need to install the necessary driver manually.
+If you experience Windows to fail to recognize Qualcomm Atheros WiFi cards,
+you may need to install the necessary driver manually.
 
-    Download the Windows driver from [ath-drivers.eu](https://www.ath-drivers.eu/download-driver-nr-382-for-atheros-QCA6174A-and-Windows10.html)
-    Using `Device Manager`, select `Update Driver` for `Network Device` located in
-    `Other devices` and choose to install the downloaded driver.
+Download the Windows driver from [ath-drivers.eu](https://www.ath-drivers.eu/download-driver-nr-382-for-atheros-QCA6174A-and-Windows10.html)
+Using `Device Manager`, select `Update Driver` for `Network Device` located in
+`Other devices` and choose to install the downloaded driver.
 
-    ## Linux
+## Linux
 
-    This section covers Linux post-install steps tested on Ubuntu 22.04. It is
-    likely that similar procedures would for others Linux distributions as well.
+This section covers Linux post-install steps tested on Ubuntu 22.04. It is
+likely that similar procedures would for others Linux distributions as well.
 
-    ### Cards using ath10k_pci driver report a firmware failure at module load
+### Cards using ath10k_pci driver report a firmware failure at module load
 
-    If you experience ath10k_pci failing to load with error in dmesg similar to:
+If you experience ath10k_pci failing to load with error in dmesg similar to:
 
-    ```text
-    [   11.098547] ath10k_pci 0000:07:00.0: wmi unified ready event not received
-    [   11.148567] ath10k_pci 0000:07:00.0: device has crashed during init
-    [   11.176535] ath10k_pci 0000:07:00.0: device has crashed during init
-    [   11.176539] ath10k_pci 0000:07:00.0: failed to wait for target init: -70
-    [   11.177684] ath10k_pci 0000:07:00.0: could not init core (-110)
-    [   11.177711] ath10k_pci 0000:07:00.0: could not probe fw (-110)
-    ```
+```text
+[   11.098547] ath10k_pci 0000:07:00.0: wmi unified ready event not received
+[   11.148567] ath10k_pci 0000:07:00.0: device has crashed during init
+[   11.176535] ath10k_pci 0000:07:00.0: device has crashed during init
+[   11.176539] ath10k_pci 0000:07:00.0: failed to wait for target init: -70
+[   11.177684] ath10k_pci 0000:07:00.0: could not init core (-110)
+[   11.177711] ath10k_pci 0000:07:00.0: could not probe fw (-110)
+```
 
-    follow https://kb.protectli.com/kb/wifi-on-the-vault/ (Firmware Fix section)
-    to fix the problem.
+follow https://kb.protectli.com/kb/wifi-on-the-vault/ (Firmware Fix section)
+to fix the problem.