Skip to content

Commit f8244f2

Browse files
committed
mb/google/brya: Add PCIe RTD3 for NVMe root port where missing
Attach the PCIe RTD3 driver to the M.2 NVMe root port on each variant, with board-specific enable and reset GPIOs (EN_PP3300_SSD / SSD_PERST_L). Enables proper runtime D3 handling and power sequencing for the NVMe SSD, matching the pattern used for other variants/storage types. TEST=build/boot google/taeko, verify S0ix functional Change-Id: I956b5cb8fd01ca70596ec682646cbe5fadb844e2 Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
1 parent d1e0efd commit f8244f2

15 files changed

Lines changed: 107 additions & 1 deletion

File tree

src/mainboard/google/brya/variants/aurash/overridetree.cb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,13 @@ chip soc/intel/alderlake
123123
.clk_src = 0,
124124
.flags = PCIE_RP_LTR | PCIE_RP_AER,
125125
}"
126+
chip soc/intel/common/block/pcie/rtd3
127+
register "is_storage" = "true"
128+
register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_F14)"
129+
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_B4)"
130+
register "srcclk_pin" = "0"
131+
device generic 0 on end
132+
end
126133
probe STORAGE STORAGE_NVME
127134
probe STORAGE STORAGE_UNKNOWN
128135
end # SSD

src/mainboard/google/brya/variants/banshee/overridetree.cb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,13 @@ chip soc/intel/alderlake
223223
.clk_src = 0,
224224
.flags = PCIE_RP_LTR | PCIE_RP_AER,
225225
}"
226+
chip soc/intel/common/block/pcie/rtd3
227+
register "is_storage" = "true"
228+
register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A12)"
229+
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_B4)"
230+
register "srcclk_pin" = "0"
231+
device generic 0 on end
232+
end
226233
end
227234
device ref tbt_pcie_rp3 on end
228235
device ref cnvi_wifi on

src/mainboard/google/brya/variants/brask/overridetree.cb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,13 @@ chip soc/intel/alderlake
8888
.clk_src = 0,
8989
.flags = PCIE_RP_LTR | PCIE_RP_AER,
9090
}"
91+
chip soc/intel/common/block/pcie/rtd3
92+
register "is_storage" = "true"
93+
register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_F14)"
94+
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_B4)"
95+
register "srcclk_pin" = "0"
96+
device generic 0 on end
97+
end
9198
end
9299
device ref tcss_dma0 on
93100
chip drivers/intel/usb4/retimer

src/mainboard/google/brya/variants/crota/overridetree.cb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,13 @@ chip soc/intel/alderlake
237237
.clk_src = 0,
238238
.flags = PCIE_RP_LTR | PCIE_RP_AER,
239239
}"
240+
chip soc/intel/common/block/pcie/rtd3
241+
register "is_storage" = "true"
242+
register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D11)"
243+
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_B4)"
244+
register "srcclk_pin" = "0"
245+
device generic 0 on end
246+
end
240247
end
241248
device ref i2c0 on
242249
chip drivers/i2c/cs42l42

src/mainboard/google/brya/variants/dochi/overridetree.cb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,13 @@ chip soc/intel/alderlake
216216
.clk_src = 0,
217217
.flags = PCIE_RP_LTR | PCIE_RP_AER,
218218
}"
219+
chip soc/intel/common/block/pcie/rtd3
220+
register "is_storage" = "true"
221+
register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D11)"
222+
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_B4)"
223+
register "srcclk_pin" = "0"
224+
device generic 0 on end
225+
end
219226
probe STORAGE STORAGE_UNKNOWN
220227
probe STORAGE STORAGE_NVME
221228
end

src/mainboard/google/brya/variants/kano/overridetree.cb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,13 @@ chip soc/intel/alderlake
246246
.clk_src = 0,
247247
.flags = PCIE_RP_LTR | PCIE_RP_AER,
248248
}"
249+
chip soc/intel/common/block/pcie/rtd3
250+
register "is_storage" = "true"
251+
register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D11)"
252+
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_B4)"
253+
register "srcclk_pin" = "0"
254+
device generic 0 on end
255+
end
249256
end
250257
device ref tcss_dma0 on
251258
chip drivers/intel/usb4/retimer

src/mainboard/google/brya/variants/kinox/overridetree.cb

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,12 +285,19 @@ chip soc/intel/alderlake
285285
device ref pcie_rp9 off end
286286

287287
device ref pcie4_0 on
288-
# Enable CPU PCIE RP 1 using CLK 0
288+
# Enable CPU PCIE RP 1 using CLK 0
289289
register "cpu_pcie_rp[CPU_RP(1)]" = "{
290290
.clk_req = 0,
291291
.clk_src = 0,
292292
.flags = PCIE_RP_LTR | PCIE_RP_AER,
293293
}"
294+
chip soc/intel/common/block/pcie/rtd3
295+
register "is_storage" = "true"
296+
register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_F14)"
297+
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_B4)"
298+
register "srcclk_pin" = "0"
299+
device generic 0 on end
300+
end
294301
end
295302

296303
device ref cnvi_wifi on

src/mainboard/google/brya/variants/kuldax/overridetree.cb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,13 @@ chip soc/intel/alderlake
148148
.clk_src = 0,
149149
.flags = PCIE_RP_LTR | PCIE_RP_AER,
150150
}"
151+
chip soc/intel/common/block/pcie/rtd3
152+
register "is_storage" = "true"
153+
register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_F14)"
154+
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_B4)"
155+
register "srcclk_pin" = "0"
156+
device generic 0 on end
157+
end
151158
end
152159
device ref tbt_pcie_rp0 on
153160
probe MB_USBC TC_USB4

src/mainboard/google/brya/variants/moli/overridetree.cb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,13 @@ chip soc/intel/alderlake
124124
.clk_src = 0,
125125
.flags = PCIE_RP_LTR | PCIE_RP_AER,
126126
}"
127+
chip soc/intel/common/block/pcie/rtd3
128+
register "is_storage" = "true"
129+
register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_F14)"
130+
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_B4)"
131+
register "srcclk_pin" = "0"
132+
device generic 0 on end
133+
end
127134
probe STORAGE STORAGE_NVME
128135
probe STORAGE STORAGE_UNKNOWN
129136
end # SSD

src/mainboard/google/brya/variants/osiris/overridetree.cb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,13 @@ chip soc/intel/alderlake
210210
.clk_src = 0,
211211
.flags = PCIE_RP_LTR | PCIE_RP_AER,
212212
}"
213+
chip soc/intel/common/block/pcie/rtd3
214+
register "is_storage" = "true"
215+
register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D11)"
216+
register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_B4)"
217+
register "srcclk_pin" = "0"
218+
device generic 0 on end
219+
end
213220
end
214221
device ref cnvi_wifi on
215222
chip drivers/wifi/generic

0 commit comments

Comments
 (0)