From 8ef807f624f6b84355a6dfcbcdf4e57289c31b42 Mon Sep 17 00:00:00 2001
From: Yuriy Vynnychek <yura.vynnychek@telink-semi.com>
Date: Mon, 6 Dec 2021 13:52:47 +0200
Subject: [PATCH] drivers: ieee802154: b91: Fix Set Channel API and ACK
 detection

- B91 SoC requires to set RX mode again if channel is changed
- Fixed wrong ACK packet detection, mask should be used

Signed-off-by: Yuriy Vynnychek <yura.vynnychek@telink-semi.com>
---
 drivers/ieee802154/ieee802154_b91.c | 12 ++++++++++--
 drivers/ieee802154/ieee802154_b91.h |  2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/ieee802154/ieee802154_b91.c b/drivers/ieee802154/ieee802154_b91.c
index 555c016b38e..f373234c1b1 100644
--- a/drivers/ieee802154/ieee802154_b91.c
+++ b/drivers/ieee802154/ieee802154_b91.c
@@ -281,7 +281,7 @@ static void b91_rf_rx_isr(void)
 
 		/* handle acknowledge packet if enabled */
 		if ((length == (B91_ACK_FRAME_LEN + B91_FCS_LENGTH)) &&
-		    (payload[B91_FRAME_TYPE_OFFSET] == B91_ACK_TYPE)) {
+		    ((payload[B91_FRAME_TYPE_OFFSET] & B91_FRAME_TYPE_MASK) == B91_ACK_TYPE)) {
 			if (data.ack_handler_en) {
 				b91_handle_ack();
 			}
@@ -309,6 +309,7 @@ static void b91_rf_rx_isr(void)
 		/* update packet data */
 		if (net_pkt_write(pkt, payload, length)) {
 			LOG_ERR("Failed to write to a packet.");
+			net_pkt_unref(pkt);
 			goto exit;
 		}
 
@@ -347,6 +348,8 @@ static void b91_rf_isr(void)
 		b91_rf_rx_isr();
 	} else if (rf_get_irq_status(FLD_RF_IRQ_TX)) {
 		b91_rf_tx_isr();
+	} else {
+		rf_clr_irq_status(FLD_RF_IRQ_ALL);
 	}
 }
 
@@ -375,6 +378,7 @@ static int b91_init(const struct device *dev)
 	/* init data variables */
 	data.is_started = true;
 	data.ack_handler_en = false;
+	data.current_channel = 0;
 
 	return 0;
 }
@@ -427,7 +431,11 @@ static int b91_set_channel(const struct device *dev, uint16_t channel)
 		return -EINVAL;
 	}
 
-	rf_set_chn(B91_LOGIC_CHANNEL_TO_PHYSICAL(channel));
+	if (data.current_channel != channel) {
+		data.current_channel = channel;
+		rf_set_chn(B91_LOGIC_CHANNEL_TO_PHYSICAL(channel));
+		rf_set_rxmode();
+	}
 
 	return 0;
 }
diff --git a/drivers/ieee802154/ieee802154_b91.h b/drivers/ieee802154/ieee802154_b91.h
index 1bdceea71d2..acc06ed5e2e 100644
--- a/drivers/ieee802154/ieee802154_b91.h
+++ b/drivers/ieee802154/ieee802154_b91.h
@@ -16,6 +16,7 @@
 #define B91_PAYLOAD_MIN                     (5)
 #define B91_PAYLOAD_MAX                     (127)
 #define B91_FRAME_TYPE_OFFSET               (0)
+#define B91_FRAME_TYPE_MASK                 (0x07)
 #define B91_DEST_ADDR_TYPE_OFFSET           (1)
 #define B91_DEST_ADDR_TYPE_MASK             (0x0c)
 #define B91_DEST_ADDR_TYPE_SHORT            (8)
@@ -100,6 +101,7 @@ struct b91_data {
 	uint8_t filter_ieee_addr[B91_IEEE_ADDRESS_SIZE];
 	bool is_started;
 	bool ack_handler_en;
+	uint16_t current_channel;
 };
 
 #endif