3 files changed, 18 insertions, 12 deletions

diff --git a/drivers/net/can/mttcan/native/m_ttcan_linux.c b/drivers/net/can/mttcan/native/m_ttcan_linux.c
index 6829f9bde..820eb47fd 100644
--- a/drivers/net/can/mttcan/native/m_ttcan_linux.c
+++ b/drivers/net/can/mttcan/native/m_ttcan_linux.c
@@ -104,6 +104,8 @@ static __init int mttcan_hw_init(struct mttcan_priv *priv)
 
         ttcan_print_version(ttcan);
 
+        raw_spin_lock_init(&priv->tc_lock);
+
         return err;
 }
 
diff --git a/drivers/platform/tegra/ptp-notifier.c b/drivers/platform/tegra/ptp-notifier.c
index 2bd047586..50dac5b54 100644
--- a/drivers/platform/tegra/ptp-notifier.c
+++ b/drivers/platform/tegra/ptp-notifier.c
@@ -18,8 +18,9 @@
 
 #include <linux/notifier.h>
 
-static u64 (*get_systime)(void);
-static DEFINE_SPINLOCK(ptp_notifier_lock);
+static u64 (*get_systime)(void *);
+static void *param;
+static DEFINE_RAW_SPINLOCK(ptp_notifier_lock);
 static ATOMIC_NOTIFIER_HEAD(tegra_hwtime_chain_head);
 
 /* Clients register for notification of hwtime change events */
@@ -44,13 +45,14 @@ int tegra_hwtime_notifier_call_chain(unsigned int val, void *v)
         return notifier_to_errno(ret);
 }
 
-void tegra_register_hwtime_source(u64 (*func)(void))
+void tegra_register_hwtime_source(u64 (*func)(void *), void *data)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&ptp_notifier_lock, flags);
+        raw_spin_lock_irqsave(&ptp_notifier_lock, flags);
         get_systime = func;
-        spin_unlock_irqrestore(&ptp_notifier_lock, flags);
+        param = data;
+        raw_spin_unlock_irqrestore(&ptp_notifier_lock, flags);
 
         /* Notify HW time stamp update to registered clients.
          * NULL callback parameter. We use a separate timestamp
@@ -64,9 +66,10 @@ void tegra_unregister_hwtime_source(void)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&ptp_notifier_lock, flags);
+        raw_spin_lock_irqsave(&ptp_notifier_lock, flags);
         get_systime = NULL;
-        spin_unlock_irqrestore(&ptp_notifier_lock, flags);
+        param = NULL;
+        raw_spin_unlock_irqrestore(&ptp_notifier_lock, flags);
 }
 EXPORT_SYMBOL(tegra_unregister_hwtime_source);
 
@@ -75,12 +78,12 @@ u64 get_ptp_hwtime(void)
         unsigned long flags;
         u64 ns;
 
-        spin_lock_irqsave(&ptp_notifier_lock, flags);
+        raw_spin_lock_irqsave(&ptp_notifier_lock, flags);
         if (get_systime)
-                ns = get_systime();
+                ns = get_systime(param);
         else
                 ns = ktime_to_ns(ktime_get_raw());
-        spin_unlock_irqrestore(&ptp_notifier_lock, flags);
+        raw_spin_unlock_irqrestore(&ptp_notifier_lock, flags);
 
         return ns;
 }
diff --git a/include/linux/platform/tegra/ptp-notifier.h b/include/linux/platform/tegra/ptp-notifier.h
index 57a7b0070..17bd5e52c 100644
--- a/include/linux/platform/tegra/ptp-notifier.h
+++ b/include/linux/platform/tegra/ptp-notifier.h
@@ -21,7 +21,7 @@
 
 #if IS_ENABLED(CONFIG_TEGRA_PTP_NOTIFIER)
 /* register / unregister HW time source */
-void tegra_register_hwtime_source(u64 (*func)(void));
+void tegra_register_hwtime_source(u64 (*func)(void *), void *data);
 void tegra_unregister_hwtime_source(void);
 
 /* clients registering / unregistering for time update events */
@@ -41,7 +41,8 @@ u64 get_ptp_hwtime(void);
 #else /* CONFIG_TEGRA_PTP_NOTIFIER */
 
 /* register / unregister HW time source */
-static inline void tegra_register_hwtime_source(u64 (*func)(void))
+static inline void tegra_register_hwtime_source(u64 (*func)(void *),
+                                                void *data)
 {
 }