Patch "i3c: master: svc: Modify enabled_events bit 7:0 to act as IBI enable counter" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    i3c: master: svc: Modify enabled_events bit 7:0 to act as IBI enable counter

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     i3c-master-svc-modify-enabled_events-bit-7-0-to-act-.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 5cdaa81a2156869b5af26770f22fc3e3d373744b
Author: Frank Li <Frank.Li@xxxxxxx>
Date:   Fri Nov 1 12:50:02 2024 -0400

    i3c: master: svc: Modify enabled_events bit 7:0 to act as IBI enable counter
    
    [ Upstream commit 25bc99be5fe53853053ceeaa328068c49dc1e799 ]
    
    Fix issue where disabling IBI on one device disables the entire IBI
    interrupt. Modify bit 7:0 of enabled_events to serve as an IBI enable
    counter, ensuring that the system IBI interrupt is disabled only when all
    I3C devices have IBI disabled.
    
    Cc: stable@xxxxxxxxxx
    Fixes: 7ff730ca458e ("i3c: master: svc: enable the interrupt in the enable ibi function")
    Reviewed-by: Miquel Raynal <miquel.raynal@xxxxxxxxxxx>
    Signed-off-by: Frank Li <Frank.Li@xxxxxxx>
    Link: https://lore.kernel.org/r/20241101165002.2479794-1-Frank.Li@xxxxxxx
    Signed-off-by: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/i3c/master/svc-i3c-master.c b/drivers/i3c/master/svc-i3c-master.c
index 3dc34b31767d9..8f0da6e2d9d82 100644
--- a/drivers/i3c/master/svc-i3c-master.c
+++ b/drivers/i3c/master/svc-i3c-master.c
@@ -128,8 +128,8 @@
 /* This parameter depends on the implementation and may be tuned */
 #define SVC_I3C_FIFO_SIZE 16
 
-#define SVC_I3C_EVENT_IBI	BIT(0)
-#define SVC_I3C_EVENT_HOTJOIN	BIT(1)
+#define SVC_I3C_EVENT_IBI	GENMASK(7, 0)
+#define SVC_I3C_EVENT_HOTJOIN	BIT(31)
 
 struct svc_i3c_cmd {
 	u8 addr;
@@ -204,7 +204,7 @@ struct svc_i3c_master {
 		spinlock_t lock;
 	} ibi;
 	struct mutex lock;
-	int enabled_events;
+	u32 enabled_events;
 	u32 mctrl_config;
 };
 
@@ -1541,7 +1541,7 @@ static int svc_i3c_master_enable_ibi(struct i3c_dev_desc *dev)
 		return ret;
 	}
 
-	master->enabled_events |= SVC_I3C_EVENT_IBI;
+	master->enabled_events++;
 	svc_i3c_master_enable_interrupts(master, SVC_I3C_MINT_SLVSTART);
 
 	return i3c_master_enec_locked(m, dev->info.dyn_addr, I3C_CCC_EVENT_SIR);
@@ -1553,7 +1553,7 @@ static int svc_i3c_master_disable_ibi(struct i3c_dev_desc *dev)
 	struct svc_i3c_master *master = to_svc_i3c_master(m);
 	int ret;
 
-	master->enabled_events &= ~SVC_I3C_EVENT_IBI;
+	master->enabled_events--;
 	if (!master->enabled_events)
 		svc_i3c_master_disable_interrupts(master);