Merge android12-gs-pixel-5.10-sc-v2 into android13-gs-pixel-5.10

Bug: 199698959
Signed-off-by: Robin Peng <robinpeng@google.com>
Change-Id: Ib2750d4add51f3fba347948a9bd35dd048eb9f71

5 files changed, 39 insertions, 35 deletions

diff --git a/kernel/drivers/net/ieee802154/dw3000_calib.c b/kernel/drivers/net/ieee802154/dw3000_calib.c
index 1020552..9112ea5 100644
--- a/kernel/drivers/net/ieee802154/dw3000_calib.c
+++ b/kernel/drivers/net/ieee802154/dw3000_calib.c
@@ -288,16 +288,6 @@ int dw3000_calib_update_config(struct dw3000 *dw)
 	int ant_rf1, ant_rf2, antpair;
 	int chanidx, prfidx;
 
-	ant_rf1 = config->ant[0];
-	ant_rf2 = config->ant[1];
-	/* At least, RF1 port must have a valid antenna */
-	if (ant_rf1 < 0)
-		/* Not configured yet, does nothing. */
-		return 0;
-	if (ant_rf1 >= ANTMAX)
-		return -1;
-	ant_calib = &dw->calib_data.ant[ant_rf1];
-
 	dw->llhw->hw->phy->supported.channels[4] = DW3000_SUPPORTED_CHANNELS &
 						   ~dw->restricted_channels;
 	/* Change channel if the current one is restricted. */
@@ -308,6 +298,16 @@ int dw3000_calib_update_config(struct dw3000 *dw)
 		dw->llhw->hw->phy->current_channel = config->chan;
 	}
 
+	ant_rf1 = config->ant[0];
+	ant_rf2 = config->ant[1];
+	/* At least, RF1 port must have a valid antenna */
+	if (ant_rf1 < 0)
+		/* Not configured yet, does nothing. */
+		return 0;
+	if (ant_rf1 >= ANTMAX)
+		return -1;
+	ant_calib = &dw->calib_data.ant[ant_rf1];
+
 	/* Convert config into index of array. */
 	chanidx = config->chan == 9 ? DW3000_CALIBRATION_CHANNEL_9 :
 				      DW3000_CALIBRATION_CHANNEL_5;
diff --git a/kernel/drivers/net/ieee802154/dw3000_spi.c b/kernel/drivers/net/ieee802154/dw3000_spi.c
index f4d73b7..52f9432 100644
--- a/kernel/drivers/net/ieee802154/dw3000_spi.c
+++ b/kernel/drivers/net/ieee802154/dw3000_spi.c
@@ -123,7 +123,7 @@ static int dw3000_spi_probe(struct spi_device *spi)
 	}
 	dw->sp0_rx_antenna = dw3000_sp0_rx_antenna;
 
-	dev_info(dw->dev, "Loading driver UWBM-2.2.2-21102101");
+	dev_info(dw->dev, "Loading driver UWBM-2.0.0-21112301");
 	dw3000_sysfs_init(dw);
 
 	/* Setup SPI parameters */
diff --git a/kernel/drivers/net/ieee802154/dw3000_stm.c b/kernel/drivers/net/ieee802154/dw3000_stm.c
index 4b0f1cb..918ec9f 100644
--- a/kernel/drivers/net/ieee802154/dw3000_stm.c
+++ b/kernel/drivers/net/ieee802154/dw3000_stm.c
@@ -55,10 +55,10 @@ void dw3000_enqueue(struct dw3000 *dw, unsigned long work)
 	struct dw3000_state *stm = &dw->stm;
 	unsigned long flags;
 
-	spin_lock_irqsave(&stm->work_wq.lock, flags);
+	spin_lock_irqsave(&stm->lock, flags);
 	stm->pending_work |= work;
 	wake_up_locked(&stm->work_wq);
-	spin_unlock_irqrestore(&stm->work_wq.lock, flags);
+	spin_unlock_irqrestore(&stm->lock, flags);
 }
 
 /* Enqueue a generic work and wait for execution */
@@ -83,13 +83,14 @@ int dw3000_enqueue_generic(struct dw3000 *dw, struct dw3000_stm_command *cmd)
 		return -EINTR;
 	}
 	/* Slow path if not in STM thread context */
-	spin_lock_irqsave(&stm->work_wq.lock, flags);
+	spin_lock_irqsave(&stm->lock, flags);
 	stm->pending_work |= work;
 	stm->generic_work = cmd;
-	wake_up_locked(&stm->work_wq);
-	wait_event_interruptible_locked_irq(stm->work_wq,
-					    !(stm->pending_work & work));
-	spin_unlock_irqrestore(&stm->work_wq.lock, flags);
+	wake_up(&stm->work_wq);
+	wait_event_lock_irq(stm->work_wq,
+						!(stm->pending_work & work),
+						stm->lock);
+	spin_unlock_irqrestore(&stm->lock, flags);
 	mutex_unlock(&stm->mtx);
 	return cmd->ret;
 }
@@ -102,10 +103,10 @@ void dw3000_enqueue_timer(struct dw3000 *dw, struct dw3000_stm_command *cmd)
 	struct dw3000_state *stm = &dw->stm;
 	unsigned long flags;
 
-	spin_lock_irqsave(&stm->work_wq.lock, flags);
+	spin_lock_irqsave(&stm->lock, flags);
 	if (stm->pending_work & DW3000_TIMER_WORK) {
 		/* A timer cmd is already queued. */
-		spin_unlock_irqrestore(&stm->work_wq.lock, flags);
+		spin_unlock_irqrestore(&stm->lock, flags);
 		dev_err(dw->dev,
 			"A timer cmd is already queued, this cmd will be ignored\n");
 		return;
@@ -120,7 +121,7 @@ void dw3000_enqueue_timer(struct dw3000 *dw, struct dw3000_stm_command *cmd)
 	 * occurs in call_timer_fn().
 	 * So, it's less bad to unlock here.
 	 */
-	spin_unlock_irqrestore(&stm->work_wq.lock, flags);
+	spin_unlock_irqrestore(&stm->lock, flags);
 	/* Can't return cmd->ret because it's not yet executed. */
 }
 
@@ -130,10 +131,10 @@ void dw3000_dequeue(struct dw3000 *dw, unsigned long work)
 	struct dw3000_state *stm = &dw->stm;
 	unsigned long flags;
 
-	spin_lock_irqsave(&stm->work_wq.lock, flags);
+	spin_lock_irqsave(&stm->lock, flags);
 	stm->pending_work &= ~work;
 	wake_up_locked(&stm->work_wq);
-	spin_unlock_irqrestore(&stm->work_wq.lock, flags);
+	spin_unlock_irqrestore(&stm->lock, flags);
 }
 
 /* Enqueue IRQ work */
@@ -142,13 +143,13 @@ void dw3000_enqueue_irq(struct dw3000 *dw)
 	struct dw3000_state *stm = &dw->stm;
 	unsigned long flags;
 
-	spin_lock_irqsave(&stm->work_wq.lock, flags);
+	spin_lock_irqsave(&stm->lock, flags);
 	if (!(stm->pending_work & DW3000_IRQ_WORK)) {
 		stm->pending_work |= DW3000_IRQ_WORK;
 		disable_irq_nosync(dw->spi->irq);
 	}
 	wake_up_locked(&stm->work_wq);
-	spin_unlock_irqrestore(&stm->work_wq.lock, flags);
+	spin_unlock_irqrestore(&stm->lock, flags);
 }
 
 void dw3000_clear_irq(struct dw3000 *dw)
@@ -156,10 +157,10 @@ void dw3000_clear_irq(struct dw3000 *dw)
 	struct dw3000_state *stm = &dw->stm;
 	unsigned long flags;
 
-	spin_lock_irqsave(&stm->work_wq.lock, flags);
+	spin_lock_irqsave(&stm->lock, flags);
 	stm->pending_work &= ~DW3000_IRQ_WORK;
 	enable_irq(dw->spi->irq);
-	spin_unlock_irqrestore(&stm->work_wq.lock, flags);
+	spin_unlock_irqrestore(&stm->lock, flags);
 }
 
 /* Wait for new work in the queue */
@@ -168,10 +169,9 @@ void dw3000_wait_pending_work(struct dw3000 *dw)
 	struct dw3000_state *stm = &dw->stm;
 	unsigned long flags;
 
-	spin_lock_irqsave(&stm->work_wq.lock, flags);
-	wait_event_interruptible_locked_irq(
-		stm->work_wq, stm->pending_work || kthread_should_stop());
-	spin_unlock_irqrestore(&stm->work_wq.lock, flags);
+	spin_lock_irqsave(&stm->lock, flags);
+	wait_event_lock_irq(stm->work_wq, stm->pending_work || kthread_should_stop(), stm->lock);
+	spin_unlock_irqrestore(&stm->lock, flags);
 }
 
 /* Read work queue state */
@@ -181,9 +181,9 @@ unsigned long dw3000_get_pending_work(struct dw3000 *dw)
 	unsigned long work;
 	unsigned long flags;
 
-	spin_lock_irqsave(&stm->work_wq.lock, flags);
+	spin_lock_irqsave(&stm->lock, flags);
 	work = stm->pending_work;
-	spin_unlock_irqrestore(&stm->work_wq.lock, flags);
+	spin_unlock_irqrestore(&stm->lock, flags);
 
 	return work;
 }
@@ -297,6 +297,7 @@ int dw3000_state_init(struct dw3000 *dw, int cpu)
 	mutex_init(&stm->mtx);
 
 	/* SKIP: Setup timers (state timeout and ADC timers) */
+	spin_lock_init(&stm->lock);
 
 	/* Init event handler thread */
 	stm->mthread = kthread_create(dw3000_event_thread, dw, "dw3000-%s",
@@ -327,9 +328,9 @@ int dw3000_state_start(struct dw3000 *dw)
 
 	/* Ensure spurious IRQ that may come during dw3000_setup_irq() (because
 	   IRQ pin is already HIGH) isn't handle by the STM thread. */
-	spin_lock_irqsave(&stm->work_wq.lock, flags);
+	spin_lock_irqsave(&stm->lock, flags);
 	stm->pending_work &= ~DW3000_IRQ_WORK;
-	spin_unlock_irqrestore(&stm->work_wq.lock, flags);
+	spin_unlock_irqrestore(&stm->lock, flags);
 
 	/* Start state machine thread */
 	wake_up_process(stm->mthread);
diff --git a/kernel/drivers/net/ieee802154/dw3000_stm.h b/kernel/drivers/net/ieee802154/dw3000_stm.h
index 81a67dd..caedec3 100644
--- a/kernel/drivers/net/ieee802154/dw3000_stm.h
+++ b/kernel/drivers/net/ieee802154/dw3000_stm.h
@@ -58,6 +58,7 @@ struct dw3000_state {
 	wait_queue_head_t work_wq;
 	/* Enqueue generic mutex */
 	struct mutex mtx;
+	spinlock_t lock;
 };
 
 /* Event handler of the state machine */
diff --git a/mac/ops.c b/mac/ops.c
index 4137847..04c9d6f 100644
--- a/mac/ops.c
+++ b/mac/ops.c
@@ -37,6 +37,8 @@ static int mcps802154_start(struct ieee802154_hw *hw)
 	WARN_ON(local->started);
 
 	mutex_lock(&local->fsm_lock);
+	if ( local->pib.phy_current_channel.channel != local->llhw.hw->phy->current_channel)
+		local->pib.phy_current_channel.channel = local->llhw.hw->phy->current_channel;
 	r = llhw_set_channel(local, local->pib.phy_current_channel.page,
 			     local->pib.phy_current_channel.channel,
 			     local->pib.phy_current_channel.preamble_code);