Skip to content

Commit 634c55e

Browse files
db00leandb00lean
committed
soc: silabs: s2: Move RAIL interrupts installer
Move the RAIL interrupts installer from the Bluetooth HCI driver to the SoC layer so that it can be used by other subsystems as well. Signed-off-by: David Boullie <[email protected]>
1 parent dddd738 commit 634c55e

File tree

5 files changed

+109
-74
lines changed

5 files changed

+109
-74
lines changed

‎drivers/bluetooth/hci/hci_silabs_efr32.c‎

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <sl_hci_common_transport.h>
1212
#include <pa_conversions_efr32.h>
1313
#include <rail.h>
14+
#include <soc_radio.h>
1415

1516
#define LOG_LEVEL CONFIG_BT_HCI_DRIVER_LOG_LEVEL
1617
#include <zephyr/logging/log.h>
@@ -55,36 +56,6 @@ void BTLE_LL_Process(uint32_t events);
5556
int16_t BTLE_LL_SetMaxPower(int16_t power);
5657
bool sli_pending_btctrl_events(void);
5758

58-
#define RADIO_IRQN(name) DT_IRQ_BY_NAME(DT_NODELABEL(radio), name, irq)
59-
#define RADIO_IRQ_PRIO(name) DT_IRQ_BY_NAME(DT_NODELABEL(radio), name, priority)
60-
61-
void rail_isr_installer(void)
62-
{
63-
IRQ_CONNECT(RADIO_IRQN(agc), RADIO_IRQ_PRIO(agc), AGC_IRQHandler, NULL, 0);
64-
IRQ_CONNECT(RADIO_IRQN(bufc), RADIO_IRQ_PRIO(bufc), BUFC_IRQHandler, NULL, 0);
65-
IRQ_CONNECT(RADIO_IRQN(frc_pri), RADIO_IRQ_PRIO(frc_pri), FRC_PRI_IRQHandler, NULL, 0);
66-
IRQ_CONNECT(RADIO_IRQN(frc), RADIO_IRQ_PRIO(frc), FRC_IRQHandler, NULL, 0);
67-
IRQ_CONNECT(RADIO_IRQN(modem), RADIO_IRQ_PRIO(modem), MODEM_IRQHandler, NULL, 0);
68-
IRQ_CONNECT(RADIO_IRQN(protimer), RADIO_IRQ_PRIO(protimer), PROTIMER_IRQHandler, NULL, 0);
69-
IRQ_CONNECT(RADIO_IRQN(rac_rsm), RADIO_IRQ_PRIO(rac_rsm), RAC_RSM_IRQHandler, NULL, 0);
70-
IRQ_CONNECT(RADIO_IRQN(rac_seq), RADIO_IRQ_PRIO(rac_seq), RAC_SEQ_IRQHandler, NULL, 0);
71-
IRQ_CONNECT(RADIO_IRQN(synth), RADIO_IRQ_PRIO(synth), SYNTH_IRQHandler, NULL, 0);
72-
73-
/* Depending on the chip family, either HOSTMAILBOX, RDMAILBOX or neither is present */
74-
IF_ENABLED(DT_IRQ_HAS_NAME(DT_NODELABEL(radio), hostmailbox), ({
75-
IRQ_CONNECT(RADIO_IRQN(hostmailbox),
76-
RADIO_IRQ_PRIO(hostmailbox),
77-
HOSTMAILBOX_IRQHandler,
78-
NULL, 0);
79-
}));
80-
IF_ENABLED(DT_IRQ_HAS_NAME(DT_NODELABEL(radio), rdmailbox), ({
81-
IRQ_CONNECT(RADIO_IRQN(rdmailbox),
82-
RADIO_IRQ_PRIO(rdmailbox),
83-
RDMAILBOX_IRQHandler,
84-
NULL, 0);
85-
}));
86-
}
87-
8859
static bool slz_is_evt_discardable(const struct bt_hci_evt_hdr *hdr, const uint8_t *params,
8960
int16_t params_len)
9061
{

‎modules/hal_silabs/simplicity_sdk/src/blob_stubs.c‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -58,47 +58,3 @@ void *sli_btctrl_get_radio_context_handle(void)
5858
{
5959
return 0;
6060
}
61-
62-
void AGC_IRQHandler(void)
63-
{
64-
}
65-
66-
void BUFC_IRQHandler(void)
67-
{
68-
}
69-
70-
void FRC_IRQHandler(void)
71-
{
72-
}
73-
74-
void FRC_PRI_IRQHandler(void)
75-
{
76-
}
77-
78-
void MODEM_IRQHandler(void)
79-
{
80-
}
81-
82-
void PROTIMER_IRQHandler(void)
83-
{
84-
}
85-
86-
void RAC_RSM_IRQHandler(void)
87-
{
88-
}
89-
90-
void RAC_SEQ_IRQHandler(void)
91-
{
92-
}
93-
94-
void SYNTH_IRQHandler(void)
95-
{
96-
}
97-
98-
void HOSTMAILBOX_IRQHandler(void)
99-
{
100-
}
101-
102-
void RDMAILBOX_IRQHandler(void)
103-
{
104-
}

‎soc/silabs/silabs_s2/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
zephyr_sources(soc.c)
5+
zephyr_sources_ifdef(CONFIG_SOC_GECKO_HAS_RADIO soc_radio.c)
56
zephyr_sources_ifdef(CONFIG_SOC_SILABS_IMAGE_PROPERTIES soc_image_properties.c)
67
zephyr_linker_sources_ifdef(CONFIG_SOC_SILABS_IMAGE_PROPERTIES RODATA soc_image_properties.ld)

‎soc/silabs/silabs_s2/soc_radio.c‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
/*
2+
* Copyright (c) 2025 Silicon Laboratories Inc.
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
/**
8+
* @file
9+
* @brief Radio initialization for Silicon Labs Series 2 products
10+
*/
11+
12+
#include <zephyr/kernel.h>
13+
#include <rail.h>
14+
15+
#include <soc_radio.h>
16+
17+
#define RADIO_IRQN(name) DT_IRQ_BY_NAME(DT_NODELABEL(radio), name, irq)
18+
#define RADIO_IRQ_PRIO(name) DT_IRQ_BY_NAME(DT_NODELABEL(radio), name, priority)
19+
20+
#ifdef CONFIG_BUILD_ONLY_NO_BLOBS
21+
void AGC_IRQHandler(void)
22+
{
23+
}
24+
25+
void BUFC_IRQHandler(void)
26+
{
27+
}
28+
29+
void FRC_IRQHandler(void)
30+
{
31+
}
32+
33+
void FRC_PRI_IRQHandler(void)
34+
{
35+
}
36+
37+
void MODEM_IRQHandler(void)
38+
{
39+
}
40+
41+
void PROTIMER_IRQHandler(void)
42+
{
43+
}
44+
45+
void RAC_RSM_IRQHandler(void)
46+
{
47+
}
48+
49+
void RAC_SEQ_IRQHandler(void)
50+
{
51+
}
52+
53+
void SYNTH_IRQHandler(void)
54+
{
55+
}
56+
57+
void HOSTMAILBOX_IRQHandler(void)
58+
{
59+
}
60+
61+
void RDMAILBOX_IRQHandler(void)
62+
{
63+
}
64+
#endif /* CONFIG_BUILD_ONLY_NO_BLOBS */
65+
66+
void rail_isr_installer(void)
67+
{
68+
IRQ_CONNECT(RADIO_IRQN(agc), RADIO_IRQ_PRIO(agc), AGC_IRQHandler, NULL, 0);
69+
IRQ_CONNECT(RADIO_IRQN(bufc), RADIO_IRQ_PRIO(bufc), BUFC_IRQHandler, NULL, 0);
70+
IRQ_CONNECT(RADIO_IRQN(frc_pri), RADIO_IRQ_PRIO(frc_pri), FRC_PRI_IRQHandler, NULL, 0);
71+
IRQ_CONNECT(RADIO_IRQN(frc), RADIO_IRQ_PRIO(frc), FRC_IRQHandler, NULL, 0);
72+
IRQ_CONNECT(RADIO_IRQN(modem), RADIO_IRQ_PRIO(modem), MODEM_IRQHandler, NULL, 0);
73+
IRQ_CONNECT(RADIO_IRQN(protimer), RADIO_IRQ_PRIO(protimer), PROTIMER_IRQHandler, NULL, 0);
74+
IRQ_CONNECT(RADIO_IRQN(rac_rsm), RADIO_IRQ_PRIO(rac_rsm), RAC_RSM_IRQHandler, NULL, 0);
75+
IRQ_CONNECT(RADIO_IRQN(rac_seq), RADIO_IRQ_PRIO(rac_seq), RAC_SEQ_IRQHandler, NULL, 0);
76+
IRQ_CONNECT(RADIO_IRQN(synth), RADIO_IRQ_PRIO(synth), SYNTH_IRQHandler, NULL, 0);
77+
78+
/* Depending on the chip family, either HOSTMAILBOX, RDMAILBOX or neither is present */
79+
IF_ENABLED(DT_IRQ_HAS_NAME(DT_NODELABEL(radio), hostmailbox), ({
80+
IRQ_CONNECT(RADIO_IRQN(hostmailbox),
81+
RADIO_IRQ_PRIO(hostmailbox),
82+
HOSTMAILBOX_IRQHandler,
83+
NULL, 0);
84+
}));
85+
IF_ENABLED(DT_IRQ_HAS_NAME(DT_NODELABEL(radio), rdmailbox), ({
86+
IRQ_CONNECT(RADIO_IRQN(rdmailbox),
87+
RADIO_IRQ_PRIO(rdmailbox),
88+
RDMAILBOX_IRQHandler,
89+
NULL, 0);
90+
}));
91+
}

‎soc/silabs/silabs_s2/soc_radio.h‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* Copyright (c) 2025 Silicon Laboratories Inc.
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
/**
8+
* @file
9+
* @brief Declare radio functions for Silicon Labs Series 2 products
10+
*
11+
*/
12+
13+
/**
14+
* @brief Register RAIL IRQ handlers
15+
*/
16+
void rail_isr_installer(void);

0 commit comments

Comments
 (0)