Merge patch series "Initial support for RK3576 UFS controller"

Shawn Lin <shawn.lin@rock-chips.com> says:

This patchset adds initial UFS controller supprt for RK3576 SoC.
Patch 1 is the dt-bindings. Patch 2-4 deal with rpm and spm support
in advanced suggested by Ulf. Patch 5 exports two new APIs for host
driver. Patch 6 and 7 are the host driver and dtsi support.

Link: https://lore.kernel.org/r/1738736156-119203-1-git-send-email-shawn.lin@rock-chips.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/ufs/core/ufshcd.c
index d9bdac9dc34fe964a9d90d9484ccd56ad7264f61,40b28c61ef756521f674dfb5db9f2ee8cae6658a..4e1e214fc5a25c9175acfa147b5eaeb979b7c32c
--- 1/drivers/ufs/core/ufshcd.c
--- 2/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@@ -6246,13 -6201,8 +6233,13 @@@ static void ufshcd_exception_event_hand
                ufshcd_bkops_exception_event_handler(hba);
  
        if (status & hba->ee_drv_mask & MASK_EE_URGENT_TEMP)
-               ufshcd_temp_exception_event_handler(hba, status);
+               ufs_hwmon_notify_event(hba, status & MASK_EE_URGENT_TEMP);
  
 +      if (status & hba->ee_drv_mask & MASK_EE_HEALTH_CRITICAL) {
 +              hba->critical_health_count++;
 +              sysfs_notify(&hba->dev->kobj, NULL, "critical_health");
 +      }
 +
        ufs_debugfs_exception_event(hba, status);
  }
  
@@@ -9202,10 -9147,10 +9189,10 @@@ out
                        if (!IS_ERR_OR_NULL(clki->clk) && clki->enabled)
                                clk_disable_unprepare(clki->clk);
                }
-       } else if (!ret && on) {
+       } else if (!ret && on && hba->clk_gating.is_initialized) {
                scoped_guard(spinlock_irqsave, &hba->clk_gating.lock)
                        hba->clk_gating.state = CLKS_ON;
 -              trace_ufshcd_clk_gating(dev_name(hba->dev),
 +              trace_ufshcd_clk_gating(hba,
                                        hba->clk_gating.state);
        }
  

diff --cc drivers/ufs/host/ufshcd-pci.c
Simple merge

diff --cc include/ufs/ufs.h
Simple merge

diff --cc include/ufs/ufshcd.h
Simple merge

diff --cc tools/testing/selftests/filesystems/statmount/statmount_test.c
Simple merge