Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48377 )
Change subject: soc/intel/skylake: Shorten SATA mode enum values ......................................................................
soc/intel/skylake: Shorten SATA mode enum values
The Skylake FSP isn't used by coreboot anymore. Therefore, drop the misleading comment and "KBLFSP" extension from the names of these enums.
Also, drop the "MODE" extension to make their names shorter in general, since it doesn't add any more value.
Built clevo/n130wu with BUILD_TIMELESS=1, coreboot.rom remains identical.
Change-Id: If37d40e4e1dfd11e9315039acde7cafee0ac60f0 Signed-off-by: Felix Singer felixsinger@posteo.net --- M src/mainboard/clevo/kbl-u/variants/n13xwu/devicetree.cb M src/mainboard/kontron/bsl6/devicetree.cb M src/mainboard/supermicro/x11-lga1151-series/devicetree.cb M src/soc/intel/skylake/chip.h 4 files changed, 5 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/77/48377/1
diff --git a/src/mainboard/clevo/kbl-u/variants/n13xwu/devicetree.cb b/src/mainboard/clevo/kbl-u/variants/n13xwu/devicetree.cb index 55c5a69..f65a3d3 100644 --- a/src/mainboard/clevo/kbl-u/variants/n13xwu/devicetree.cb +++ b/src/mainboard/clevo/kbl-u/variants/n13xwu/devicetree.cb @@ -80,7 +80,7 @@ device pci 16.3 off end # Management Engine KT Redirection device pci 16.4 off end # Management Engine Interface 3 device pci 17.0 on # SATA - register "SataMode" = "KBLFSP_SATA_MODE_AHCI" + register "SataMode" = "SATA_AHCI" register "SataSalpSupport" = "0" # Ports register "SataPortsEnable[0]" = "1" diff --git a/src/mainboard/kontron/bsl6/devicetree.cb b/src/mainboard/kontron/bsl6/devicetree.cb index ef1f0d4..9b3b8bf 100644 --- a/src/mainboard/kontron/bsl6/devicetree.cb +++ b/src/mainboard/kontron/bsl6/devicetree.cb @@ -95,7 +95,7 @@ device pci 16.3 off end # Management Engine KT Redirection device pci 16.4 off end # Management Engine Interface 3 device pci 17.0 on # SATA - register "SataMode" = "KBLFSP_SATA_MODE_AHCI" + register "SataMode" = "SATA_AHCI" register "SataSalpSupport" = "1" register "SataPortsEnable[0]" = "1" register "SataPortsEnable[1]" = "1" diff --git a/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb b/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb index c021372..422cd84 100644 --- a/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb +++ b/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb @@ -5,7 +5,7 @@ register "SaGv" = "SaGv_Disabled"
# SATA configuration - register "SataMode" = "KBLFSP_SATA_MODE_AHCI" + register "SataMode" = "SATA_AHCI" register "SataSalpSupport" = "1" register "SataPortsEnable" = "{ \ [0] = 1, \ diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h index 0bab45a..58d172f 100644 --- a/src/soc/intel/skylake/chip.h +++ b/src/soc/intel/skylake/chip.h @@ -142,11 +142,8 @@
/* SATA related */ enum { - /* Documentation and header files of Skylake FSP disagree on - the values, Kaby Lake FSP (KabylakeFsp0001 on github) uses - these: */ - KBLFSP_SATA_MODE_AHCI = 0, - KBLFSP_SATA_MODE_RAID = 1, + SATA_AHCI = 0, + SATA_RAID = 1, } SataMode; u8 SataSalpSupport; u8 SataPortsEnable[8];
Hello Nico Huber, Michael Niewöhner, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/48377
to look at the new patch set (#2).
Change subject: soc/intel/skylake: Shorten SATA mode enum value names ......................................................................
soc/intel/skylake: Shorten SATA mode enum value names
The Skylake FSP isn't used by coreboot anymore. Therefore, drop the misleading comment and the "KBLFSP" extension from the names of these enums.
Also, drop the "MODE" extension to make their names shorter in general, since it doesn't add any more value.
Built clevo/n130wu with BUILD_TIMELESS=1, coreboot.rom remains identical.
Change-Id: If37d40e4e1dfd11e9315039acde7cafee0ac60f0 Signed-off-by: Felix Singer felixsinger@posteo.net --- M src/mainboard/clevo/kbl-u/variants/n13xwu/devicetree.cb M src/mainboard/kontron/bsl6/devicetree.cb M src/mainboard/supermicro/x11-lga1151-series/devicetree.cb M src/soc/intel/skylake/chip.h 4 files changed, 5 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/77/48377/2
Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48377 )
Change subject: soc/intel/skylake: Shorten SATA mode enum value names ......................................................................
Patch Set 2: Code-Review+1
Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48377 )
Change subject: soc/intel/skylake: Shorten SATA mode enum value names ......................................................................
Patch Set 3: Code-Review+2
Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48377 )
Change subject: soc/intel/skylake: Shorten SATA mode enum value names ......................................................................
soc/intel/skylake: Shorten SATA mode enum value names
The Skylake FSP isn't used by coreboot anymore. Therefore, drop the misleading comment and the "KBLFSP" extension from the names of these enums.
Also, drop the "MODE" extension to make their names shorter in general, since it doesn't add any more value.
Built clevo/n130wu with BUILD_TIMELESS=1, coreboot.rom remains identical.
Change-Id: If37d40e4e1dfd11e9315039acde7cafee0ac60f0 Signed-off-by: Felix Singer felixsinger@posteo.net Reviewed-on: https://review.coreboot.org/c/coreboot/+/48377 Reviewed-by: Michael Niewöhner foss@mniewoehner.de Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/clevo/kbl-u/variants/n13xwu/devicetree.cb M src/mainboard/kontron/bsl6/devicetree.cb M src/mainboard/supermicro/x11-lga1151-series/devicetree.cb M src/soc/intel/skylake/chip.h 4 files changed, 5 insertions(+), 8 deletions(-)
Approvals: build bot (Jenkins): Verified Michael Niewöhner: Looks good to me, approved
diff --git a/src/mainboard/clevo/kbl-u/variants/n13xwu/devicetree.cb b/src/mainboard/clevo/kbl-u/variants/n13xwu/devicetree.cb index 55c5a69..f65a3d3 100644 --- a/src/mainboard/clevo/kbl-u/variants/n13xwu/devicetree.cb +++ b/src/mainboard/clevo/kbl-u/variants/n13xwu/devicetree.cb @@ -80,7 +80,7 @@ device pci 16.3 off end # Management Engine KT Redirection device pci 16.4 off end # Management Engine Interface 3 device pci 17.0 on # SATA - register "SataMode" = "KBLFSP_SATA_MODE_AHCI" + register "SataMode" = "SATA_AHCI" register "SataSalpSupport" = "0" # Ports register "SataPortsEnable[0]" = "1" diff --git a/src/mainboard/kontron/bsl6/devicetree.cb b/src/mainboard/kontron/bsl6/devicetree.cb index ef1f0d4..9b3b8bf 100644 --- a/src/mainboard/kontron/bsl6/devicetree.cb +++ b/src/mainboard/kontron/bsl6/devicetree.cb @@ -95,7 +95,7 @@ device pci 16.3 off end # Management Engine KT Redirection device pci 16.4 off end # Management Engine Interface 3 device pci 17.0 on # SATA - register "SataMode" = "KBLFSP_SATA_MODE_AHCI" + register "SataMode" = "SATA_AHCI" register "SataSalpSupport" = "1" register "SataPortsEnable[0]" = "1" register "SataPortsEnable[1]" = "1" diff --git a/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb b/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb index c021372..422cd84 100644 --- a/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb +++ b/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb @@ -5,7 +5,7 @@ register "SaGv" = "SaGv_Disabled"
# SATA configuration - register "SataMode" = "KBLFSP_SATA_MODE_AHCI" + register "SataMode" = "SATA_AHCI" register "SataSalpSupport" = "1" register "SataPortsEnable" = "{ \ [0] = 1, \ diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h index 0bab45a..58d172f 100644 --- a/src/soc/intel/skylake/chip.h +++ b/src/soc/intel/skylake/chip.h @@ -142,11 +142,8 @@
/* SATA related */ enum { - /* Documentation and header files of Skylake FSP disagree on - the values, Kaby Lake FSP (KabylakeFsp0001 on github) uses - these: */ - KBLFSP_SATA_MODE_AHCI = 0, - KBLFSP_SATA_MODE_RAID = 1, + SATA_AHCI = 0, + SATA_RAID = 1, } SataMode; u8 SataSalpSupport; u8 SataPortsEnable[8];
-
Felix Singer (Code Review) -
Michael Niewöhner (Code Review)