From d1c33aeef4f8effbaacc54be99f9b7c5dd9fbcc5 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Thu, 13 Jul 2023 00:58:36 +0200 Subject: [PATCH] mb/amd,google/*/port_descriptors: use dxio_link_hotplug_type enum values Use the proper dxio_link_hotplug_type enum values for the link_hotplug field in the DXIO descriptors to replace the magic values in the code. Signed-off-by: Felix Held Change-Id: Ieb1513737e6022a668287dc80a39d96cda2b18d5 Reviewed-on: https://review.coreboot.org/c/coreboot/+/76439 Reviewed-by: Matt DeVillier Tested-by: build bot (Jenkins) --- .../amd/birman/port_descriptors_glinda.c | 6 +++--- .../amd/birman/port_descriptors_phoenix.c | 18 +++++++++--------- src/mainboard/amd/chausie/port_descriptors.c | 6 +++--- src/mainboard/amd/mayan/port_descriptors.c | 8 ++++---- src/mainboard/google/myst/port_descriptors.c | 2 +- src/mainboard/google/skyrim/port_descriptors.c | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/mainboard/amd/birman/port_descriptors_glinda.c b/src/mainboard/amd/birman/port_descriptors_glinda.c index df961bfce6..a0dbd17b34 100644 --- a/src/mainboard/amd/birman/port_descriptors_glinda.c +++ b/src/mainboard/amd/birman/port_descriptors_glinda.c @@ -19,7 +19,7 @@ static const fsp_dxio_descriptor birman_dxio_descriptors[] = { .link_speed_capability = GEN3, .turn_off_unused_lanes = true, .link_aspm = 2, - .link_hotplug = 3, + .link_hotplug = HOTPLUG_ENHANCED, .clk_req = CLK_REQ3, }, { @@ -32,7 +32,7 @@ static const fsp_dxio_descriptor birman_dxio_descriptors[] = { .link_speed_capability = GEN3, .turn_off_unused_lanes = true, .link_aspm = 2, - .link_hotplug = 3, + .link_hotplug = HOTPLUG_ENHANCED, .clk_req = CLK_REQ1, }, { @@ -45,7 +45,7 @@ static const fsp_dxio_descriptor birman_dxio_descriptors[] = { .link_speed_capability = GEN3, .turn_off_unused_lanes = true, .link_aspm = 2, - .link_hotplug = 3, + .link_hotplug = HOTPLUG_ENHANCED, .gpio_group_id = GPIO_27, .clk_req = CLK_REQ0, }, diff --git a/src/mainboard/amd/birman/port_descriptors_phoenix.c b/src/mainboard/amd/birman/port_descriptors_phoenix.c index 5f4b1788bb..ffd5e3a3d2 100644 --- a/src/mainboard/amd/birman/port_descriptors_phoenix.c +++ b/src/mainboard/amd/birman/port_descriptors_phoenix.c @@ -17,7 +17,7 @@ .link_speed_capability = GEN3, \ .turn_off_unused_lanes = true, \ .link_aspm = ASPM_L1, \ - .link_hotplug = 0, \ + .link_hotplug = HOTPLUG_DISABLED, \ .clk_req = CLK_REQ0, \ } @@ -32,7 +32,7 @@ .link_speed_capability = GEN3, \ .turn_off_unused_lanes = true, \ .link_aspm = ASPM_L1, \ - .link_hotplug = 0, \ + .link_hotplug = HOTPLUG_DISABLED, \ .clk_req = CLK_REQ0, \ } @@ -46,7 +46,7 @@ .link_speed_capability = GEN3, \ .turn_off_unused_lanes = true, \ .link_aspm = ASPM_L1, \ - .link_hotplug = 0, \ + .link_hotplug = HOTPLUG_DISABLED, \ .clk_req = CLK_REQ1, \ } @@ -61,7 +61,7 @@ .link_speed_capability = GEN3, \ .turn_off_unused_lanes = true, \ .link_aspm = ASPM_L1, \ - .link_hotplug = 0, \ + .link_hotplug = HOTPLUG_DISABLED, \ .clk_req = CLK_REQ1, \ } @@ -75,7 +75,7 @@ .link_speed_capability = GEN3, \ .turn_off_unused_lanes = true, \ .link_aspm = ASPM_L1, \ - .link_hotplug = 0, \ + .link_hotplug = HOTPLUG_DISABLED, \ .clk_req = CLK_REQ6, \ } @@ -89,7 +89,7 @@ .link_speed_capability = GEN3, \ .turn_off_unused_lanes = true, \ .link_aspm = ASPM_L1, \ - .link_hotplug = 0, \ + .link_hotplug = HOTPLUG_DISABLED, \ .clk_req = CLK_REQ5, \ } @@ -103,7 +103,7 @@ .link_speed_capability = GEN3, \ .turn_off_unused_lanes = true, \ .link_aspm = ASPM_L1, \ - .link_hotplug = 0, \ + .link_hotplug = HOTPLUG_DISABLED, \ .clk_req = CLK_REQ4, \ } @@ -117,7 +117,7 @@ .link_speed_capability = GEN3, \ .turn_off_unused_lanes = true, \ .link_aspm = ASPM_L1, \ - .link_hotplug = 0, \ + .link_hotplug = HOTPLUG_DISABLED, \ .clk_req = CLK_REQ3, \ } @@ -131,7 +131,7 @@ .link_speed_capability = GEN3, \ .turn_off_unused_lanes = true, \ .link_aspm = ASPM_L1, \ - .link_hotplug = 0, \ + .link_hotplug = HOTPLUG_DISABLED, \ .clk_req = CLK_REQ2, \ } diff --git a/src/mainboard/amd/chausie/port_descriptors.c b/src/mainboard/amd/chausie/port_descriptors.c index 3105cf0c60..9a8c2740db 100644 --- a/src/mainboard/amd/chausie/port_descriptors.c +++ b/src/mainboard/amd/chausie/port_descriptors.c @@ -17,7 +17,7 @@ static const fsp_dxio_descriptor chausie_dxio_descriptors[] = { .link_speed_capability = GEN3, .turn_off_unused_lanes = true, .link_aspm = 2, - .link_hotplug = 3, + .link_hotplug = HOTPLUG_ENHANCED, .clk_req = CLK_REQ3, }, { /* WIFI */ @@ -30,7 +30,7 @@ static const fsp_dxio_descriptor chausie_dxio_descriptors[] = { .link_speed_capability = GEN3, .turn_off_unused_lanes = true, .link_aspm = 2, - .link_hotplug = 3, + .link_hotplug = HOTPLUG_ENHANCED, .clk_req = CLK_REQ1, }, { /* NVMe SSD */ @@ -43,7 +43,7 @@ static const fsp_dxio_descriptor chausie_dxio_descriptors[] = { .link_speed_capability = GEN3, .turn_off_unused_lanes = true, .link_aspm = 2, - .link_hotplug = 3, + .link_hotplug = HOTPLUG_ENHANCED, .gpio_group_id = GPIO_27, .clk_req = CLK_REQ0, }, diff --git a/src/mainboard/amd/mayan/port_descriptors.c b/src/mainboard/amd/mayan/port_descriptors.c index c2e267c7cc..7d14e8c52c 100644 --- a/src/mainboard/amd/mayan/port_descriptors.c +++ b/src/mainboard/amd/mayan/port_descriptors.c @@ -22,7 +22,7 @@ static const fsp_dxio_descriptor mayan_dxio_descriptors[] = { .link_aspm = ASPM_L1, .link_aspm_L1_1 = true, .link_aspm_L1_2 = true, - .link_hotplug = false, + .link_hotplug = HOTPLUG_DISABLED, .gpio_group_id = 4, .clk_pm_support = true, .clk_req = CLK_REQ0, @@ -42,7 +42,7 @@ static const fsp_dxio_descriptor mayan_dxio_descriptors[] = { .link_aspm = ASPM_L1, .link_aspm_L1_1 = true, .link_aspm_L1_2 = true, - .link_hotplug = false, + .link_hotplug = HOTPLUG_DISABLED, .gpio_group_id = 27, .clk_pm_support = true, .clk_req = CLK_REQ4, @@ -62,7 +62,7 @@ static const fsp_dxio_descriptor mayan_dxio_descriptors[] = { .link_aspm = ASPM_L1, .link_aspm_L1_1 = true, .link_aspm_L1_2 = true, - .link_hotplug = false, + .link_hotplug = HOTPLUG_DISABLED, .clk_pm_support = true, .clk_req = CLK_REQ2, .eq_preset = 3, @@ -81,7 +81,7 @@ static const fsp_dxio_descriptor mayan_dxio_descriptors[] = { .link_aspm = ASPM_L1, .link_aspm_L1_1 = true, .link_aspm_L1_2 = true, - .link_hotplug = false, + .link_hotplug = HOTPLUG_DISABLED, .clk_pm_support = true, .clk_req = CLK_REQ1, .eq_preset = 3, diff --git a/src/mainboard/google/myst/port_descriptors.c b/src/mainboard/google/myst/port_descriptors.c index 2c9985c298..7c3ddb3825 100644 --- a/src/mainboard/google/myst/port_descriptors.c +++ b/src/mainboard/google/myst/port_descriptors.c @@ -39,7 +39,7 @@ static fsp_dxio_descriptor myst_dxio_descriptors[] = { .function_number = PCI_FUNC(SD_DEVFN), .link_speed_capability = GEN1, .turn_off_unused_lanes = true, - .link_hotplug = 3, + .link_hotplug = HOTPLUG_ENHANCED, .clk_req = CLK_REQ1, }, [DXIO_STORAGE] = { 0 }, diff --git a/src/mainboard/google/skyrim/port_descriptors.c b/src/mainboard/google/skyrim/port_descriptors.c index 80839a0b0c..5a9539f051 100644 --- a/src/mainboard/google/skyrim/port_descriptors.c +++ b/src/mainboard/google/skyrim/port_descriptors.c @@ -32,7 +32,7 @@ static const fsp_dxio_descriptor skyrim_mdn_dxio_descriptors[] = { .function_number = PCI_FUNC(SD_DEVFN), .link_speed_capability = GEN3, .turn_off_unused_lanes = true, - .link_hotplug = 3, + .link_hotplug = HOTPLUG_ENHANCED, .link_aspm = ASPM_L1, .link_aspm_L1_1 = true, .gpio_group_id = GPIO_27,