summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Couzens <lynxis@fe80.eu>2021-02-27 23:58:56 +0100
committerMichael Niewöhner <foss@mniewoehner.de>2021-03-15 09:45:23 +0000
commit1295fa218fc2b02d5e143d15edb1c5c09221a508 (patch)
treed6b5981ba88d78c0fb349fe1d07e61e53e550385
parent1d242799c2d1f1674d8204a2fa4c99ff70b877e8 (diff)
mb/supermicro/x11-lga1151-series: add support of X11SSH-LN4F to X11SSH-F
The X11SSH-LN4F and X11SSH-F are very similiar. They both use the same PCB and use the same Supermicro BIOS ID. The X11SSH-LN4F has 4 NICs in difference to the X11SSH-F which only has 2 NICs. The two additional NICs aren't populated on the X11SSH-F. Enable the PCIe root ports connected to the two additional Intel NICs. Signed-off-by: Alexander Couzens <lynxis@fe80.eu> Change-Id: Id4e66be47ceef75905ba760b8d5a14284e130f63 Reviewed-on: https://review.coreboot.org/c/coreboot/+/51330 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
-rw-r--r--Documentation/mainboard/supermicro/x11-lga1151-series/x11-lga1151-series.md2
-rw-r--r--Documentation/mainboard/supermicro/x11-lga1151-series/x11ssh-f/x11ssh-f.md13
-rw-r--r--Documentation/security/vboot/list_vboot.md2
-rw-r--r--src/mainboard/supermicro/x11-lga1151-series/Kconfig2
-rw-r--r--src/mainboard/supermicro/x11-lga1151-series/Kconfig.name2
-rw-r--r--src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-f/overridetree.cb8
6 files changed, 22 insertions, 7 deletions
diff --git a/Documentation/mainboard/supermicro/x11-lga1151-series/x11-lga1151-series.md b/Documentation/mainboard/supermicro/x11-lga1151-series/x11-lga1151-series.md
index 495ae09859..692e5e377c 100644
--- a/Documentation/mainboard/supermicro/x11-lga1151-series/x11-lga1151-series.md
+++ b/Documentation/mainboard/supermicro/x11-lga1151-series/x11-lga1151-series.md
@@ -7,7 +7,7 @@ Controller etc.
## Supported boards
- [X11SSH-TF](x11ssh-tf/x11ssh-tf.md)
-- [X11SSH-F](x11ssh-f/x11ssh-f.md)
+- [X11SSH-F/LN4F](x11ssh-f/x11ssh-f.md)
- [X11SSM-F](x11ssm-f/x11ssm-f.md)
## Required proprietary blobs
diff --git a/Documentation/mainboard/supermicro/x11-lga1151-series/x11ssh-f/x11ssh-f.md b/Documentation/mainboard/supermicro/x11-lga1151-series/x11ssh-f/x11ssh-f.md
index f009bbe2ae..35b552fa53 100644
--- a/Documentation/mainboard/supermicro/x11-lga1151-series/x11ssh-f/x11ssh-f.md
+++ b/Documentation/mainboard/supermicro/x11-lga1151-series/x11ssh-f/x11ssh-f.md
@@ -1,6 +1,6 @@
-# Supermicro X11SSH-F
+# Supermicro X11SSH-F/X11SSH-LN4F
-This section details how to run coreboot on the [Supermicro X11SSH-F].
+This section details how to run coreboot on the [Supermicro X11SSH-F] or [Supermicro X11SSH-LN4F].
## Flashing coreboot
@@ -43,6 +43,11 @@ tasks, or for offloading graphics rendering via "muxless" [vga_witcheroo].
- S3 resume not working (vendor and coreboot)
- SeaBIOS cannot make use of VGA on Aspeed (even if IGD is disabled)
+## Difference between X11SSH-F and X11SSH-LN4F
+
+The PCB is identical. The X11SSH-F has 2 NICs, the X11SSH-LN4F has 4 NICs.
+So the X11SSH-F just doesn't have 2 NICs populated.
+
## ToDo
- Fix known issues
@@ -60,7 +65,8 @@ tasks, or for offloading graphics rendering via "muxless" [vga_witcheroo].
+------------------+--------------------------------------------------+
| Super I/O | ASPEED AST2400 |
+------------------+--------------------------------------------------+
-| Ethernet | 2x Intel I210-AT 1 GbE |
+| Ethernet | 2x Intel I210-AT 1 GbE (for X11SSH-F) |
+| | 4x Intel I210-AT 1 GbE (for X11SSH-LN4F) |
| | 1x dedicated BMC |
+------------------+--------------------------------------------------+
| PCIe slots | 1x 3.0 x8 |
@@ -95,6 +101,7 @@ tasks, or for offloading graphics rendering via "muxless" [vga_witcheroo].
- [Board manual]
[Supermicro X11SSH-F]: https://www.supermicro.com/en/products/motherboard/X11SSH-F
+[Supermicro X11SSH-LN4F]: https://www.supermicro.com/en/products/motherboard/X11SSH-LN4F
[Board manual]: https://www.supermicro.com/manuals/motherboard/C236/MNL-1778.pdf
[AST2400]: https://www.aspeedtech.com/products.php?fPath=20&rId=376
[IPMI]: ../../../../drivers/ipmi_kcs.md
diff --git a/Documentation/security/vboot/list_vboot.md b/Documentation/security/vboot/list_vboot.md
index 6372a4aaae..5a4a66c0b4 100644
--- a/Documentation/security/vboot/list_vboot.md
+++ b/Documentation/security/vboot/list_vboot.md
@@ -254,7 +254,7 @@
## Supermicro
- X11SSH-TF
- X11SSM-F
-- X11SSH-F
+- X11SSH-F/X11SSH-LN4F
## UP
- Squared
diff --git a/src/mainboard/supermicro/x11-lga1151-series/Kconfig b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
index b7057b07c9..3342b04ef3 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/Kconfig
+++ b/src/mainboard/supermicro/x11-lga1151-series/Kconfig
@@ -25,7 +25,7 @@ config MAINBOARD_PART_NUMBER
string
default "X11SSH-TF" if BOARD_SUPERMICRO_X11SSH_TF
default "X11SSM-F" if BOARD_SUPERMICRO_X11SSM_F
- default "X11SSH-F" if BOARD_SUPERMICRO_X11SSH_F
+ default "X11SSH-F/LN4F" if BOARD_SUPERMICRO_X11SSH_F
config MAINBOARD_DIR
string
diff --git a/src/mainboard/supermicro/x11-lga1151-series/Kconfig.name b/src/mainboard/supermicro/x11-lga1151-series/Kconfig.name
index 7cb19aea90..0f488a9683 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/Kconfig.name
+++ b/src/mainboard/supermicro/x11-lga1151-series/Kconfig.name
@@ -7,5 +7,5 @@ config BOARD_SUPERMICRO_X11SSM_F
select BOARD_SUPERMICRO_BASEBOARD_X11_LGA1151_SERIES
config BOARD_SUPERMICRO_X11SSH_F
- bool "X11SSH-F"
+ bool "X11SSH-F/LN4F"
select BOARD_SUPERMICRO_BASEBOARD_X11_LGA1151_SERIES
diff --git a/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-f/overridetree.cb b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-f/overridetree.cb
index c3f4bf1e6f..35825f8630 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-f/overridetree.cb
+++ b/src/mainboard/supermicro/x11-lga1151-series/variants/x11ssh-f/overridetree.cb
@@ -67,6 +67,14 @@ chip soc/intel/skylake
register "PcieRpEnable[1]" = "1"
device pci 00.0 on end # GbE
end
+ device pci 1c.2 on # PCI Express Port 3 only on -LN4F
+ register "PcieRpEnable[2]" = "1"
+ device pci 00.0 on end # GbE
+ end
+ device pci 1c.3 on # PCI Express Port 4 only on -LN4F
+ register "PcieRpEnable[3]" = "1"
+ device pci 00.0 on end # GbE
+ end
device pci 1c.4 on # PCI Express Port 5
register "PcieRpEnable[4]" = "1"
smbios_slot_desc "SlotTypeM2Socket3" "SlotLengthOther" "M.2 2280" "SlotDataBusWidth2X"