From 07d263283e98b50fe75c7817a95bfb7d5a93d392 Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com>
Date: Sat, 11 Jun 2022 19:00:06 +0300
Subject: [PATCH] sunxi-5.15: Switch version to the v5.15.46 tag (#3886)

---
 .../families/include/sunxi64_common.inc       |  2 +-
 .../sources/families/include/sunxi_common.inc |  2 +-
 ...-run-mailbox-while-timekeeping-is-su.patch | 20 ++++++++++---------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc
index ba59c39708..89cbd48e16 100644
--- a/config/sources/families/include/sunxi64_common.inc
+++ b/config/sources/families/include/sunxi64_common.inc
@@ -18,7 +18,7 @@ case $BRANCH in
 
 	current)
 		KERNEL_VERSION_LEVEL="5.15"
-		KERNELSWITCHOBJ="tag=v5.15.45"
+		KERNELSWITCHOBJ="tag=v5.15.46"
 		;;
 
 	edge)
diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc
index 09fdabfa30..bdc8193002 100644
--- a/config/sources/families/include/sunxi_common.inc
+++ b/config/sources/families/include/sunxi_common.inc
@@ -18,7 +18,7 @@ case $BRANCH in
 		;;
 	current)
 		KERNEL_VERSION_LEVEL="5.15"
-		KERNELSWITCHOBJ="tag=v5.15.45"
+		KERNELSWITCHOBJ="tag=v5.15.46"
 		;;
 	edge)
 		KERNEL_VERSION_LEVEL=${KERNEL_VERSION_LEVEL:-5.18}
diff --git a/patch/kernel/archive/sunxi-5.15/megous/mailbox-Allow-to-run-mailbox-while-timekeeping-is-su.patch b/patch/kernel/archive/sunxi-5.15/megous/mailbox-Allow-to-run-mailbox-while-timekeeping-is-su.patch
index ea642d4476..624d55f553 100644
--- a/patch/kernel/archive/sunxi-5.15/megous/mailbox-Allow-to-run-mailbox-while-timekeeping-is-su.patch
+++ b/patch/kernel/archive/sunxi-5.15/megous/mailbox-Allow-to-run-mailbox-while-timekeeping-is-su.patch
@@ -18,22 +18,24 @@ diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
 index 3e7d4b20a..82ca7c317 100644
 --- a/drivers/mailbox/mailbox.c
 +++ b/drivers/mailbox/mailbox.c
-@@ -84,9 +84,11 @@ static void msg_submit(struct mbox_chan *chan)
+@@ -83,10 +83,12 @@ static void msg_submit(struct mbox_chan *chan)
+ 	spin_unlock_irqrestore(&chan->lock, flags);
  
- 	/* kick start the timer immediately to avoid delays */
  	if (!err && (chan->txdone_method & TXDONE_BY_POLL)) {
--		/* but only if not already active */
--		if (!hrtimer_active(&chan->mbox->poll_hrt))
--			hrtimer_start(&chan->mbox->poll_hrt, 0, HRTIMER_MODE_REL);
+-		/* kick start the timer immediately to avoid delays */
+-		spin_lock_irqsave(&chan->mbox->poll_hrt_lock, flags);
+-		hrtimer_start(&chan->mbox->poll_hrt, 0, HRTIMER_MODE_REL);
+-		spin_unlock_irqrestore(&chan->mbox->poll_hrt_lock, flags);
 +		if (!timekeeping_suspended) {
-+			/* but only if not already active */
-+			if (!hrtimer_active(&chan->mbox->poll_hrt))
-+				hrtimer_start(&chan->mbox->poll_hrt, 0, HRTIMER_MODE_REL);
++			/* kick start the timer immediately to avoid delays */
++			spin_lock_irqsave(&chan->mbox->poll_hrt_lock, flags);
++			hrtimer_start(&chan->mbox->poll_hrt, 0, HRTIMER_MODE_REL);
++			spin_unlock_irqrestore(&chan->mbox->poll_hrt_lock, flags);
 +		}
  	}
  }
  
-@@ -262,6 +264,24 @@ int mbox_send_message(struct mbox_chan *chan, void *mssg)
+@@ -268,6 +270,24 @@ int mbox_send_message(struct mbox_chan *chan, void *mssg)
  
  	msg_submit(chan);