Skip to content

Commit a249ca6

Browse files
committed
soc: ti: omap-prm: Fix reboot issue with invalid pcie reset map for dra7
Yongqin Liu <yongqin.liu@linaro.org> reported an issue where reboot hangs on beagleboard-x15. This started happening after commit 7078a5b ("soc: ti: omap-prm: Fix boot time errors for rst_map_012 bits 0 and 1"). We now assert any 012 type resets on init to prevent unconfigured accelerator MMUs getting enabled on init depending on the bootloader or kexec configured state. Turns out that we now also wrongly assert dra7 l3init domain PCIe reset bits causing a hang during reboot. Let's fix the l3init reset bits to use a 01 map instead of 012 map. There are only two rstctrl bits and not three. This is documented in TRM "Table 3-1647. RM_PCIESS_RSTCTRL". Fixes: 5a68c87 ("soc: ti: omap-prm: dra7: add genpd support for remaining PRM instances") Fixes: 7078a5b ("soc: ti: omap-prm: Fix boot time errors for rst_map_012 bits 0 and 1") Cc: Kishon Vijay Abraham I <kishon@ti.com> Reported-by: Yongqin Liu <yongqin.liu@linaro.org> Signed-off-by: Tony Lindgren <tony@atomide.com>
1 parent f40ddce commit a249ca6

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/soc/ti/omap_prm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ static const struct omap_prm_data dra7_prm_data[] = {
332332
{
333333
.name = "l3init", .base = 0x4ae07300,
334334
.pwrstctrl = 0x0, .pwrstst = 0x4, .dmap = &omap_prm_alwon,
335-
.rstctrl = 0x10, .rstst = 0x14, .rstmap = rst_map_012,
335+
.rstctrl = 0x10, .rstst = 0x14, .rstmap = rst_map_01,
336336
.clkdm_name = "pcie"
337337
},
338338
{

0 commit comments

Comments
 (0)