riscv: Fix arch_hugetlb_migration_supported() for NAPOT

[platform/kernel/linux-starfive.git] / drivers / bus / ti-sysc.c

diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index d57bc06..9ed9239 100644 (file)
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -2158,13 +2158,23 @@ static int sysc_reset(struct sysc *ddata)
                sysc_val = sysc_read_sysconfig(ddata);
                sysc_val |= sysc_mask;
                sysc_write(ddata, sysc_offset, sysc_val);
-               /* Flush posted write */
+
+               /*
+                * Some devices need a delay before reading registers
+                * after reset. Presumably a srst_udelay is not needed
+                * for devices that use a rstctrl register reset.
+                */
+               if (ddata->cfg.srst_udelay)
+                       fsleep(ddata->cfg.srst_udelay);
+
+               /*
+                * Flush posted write. For devices needing srst_udelay
+                * this should trigger an interconnect error if the
+                * srst_udelay value is needed but not configured.
+                */
                sysc_val = sysc_read_sysconfig(ddata);
        }
 
-       if (ddata->cfg.srst_udelay)
-               fsleep(ddata->cfg.srst_udelay);
-
        if (ddata->post_reset_quirk)
                ddata->post_reset_quirk(ddata);