Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2643 commits
Select commit Hold shift + click to select a range
d28c320
[nrf fromtree] Bluetooth: Controller: Fix single timer s/w switch whe…
cvinayak Jan 1, 2025
230c063
[nrf fromtree] Bluetooth: Controller: Fix single timer s/w switch bas…
cvinayak Jan 1, 2025
8aa1511
[nrf fromtree] Bluetooth: Controller: Add radio_sim_nrf54l.h file
cvinayak Jan 15, 2025
c778e38
[nrf fromtree] Bluetooth: Controller: Fix nRF5 radio and event timer …
cvinayak Jan 1, 2025
af1dea4
[nrf fromtree] Bluetooth: Controller: Restrict ISO Sync Receiver sube…
cvinayak Jan 3, 2025
cf84a74
[nrf fromtree] Revert "Bluetooth: Controller: Fix ext conn create whe…
cvinayak Jan 2, 2025
a3a1f4b
[nrf fromtree] Bluetooth: Controller: Single timer use Extended Adver…
cvinayak Jul 6, 2024
a77836f
[nrf fromtree] Bluetooth: Controller: Single timer use Extended Scann…
cvinayak Dec 29, 2024
01bec65
[nrf fromtree] Bluetooth: Controller: Single timer use Conn Schedulin…
cvinayak Dec 29, 2024
8479874
[nrf fromtree] Bluetooth: Controller: Single timer use Periodic Adv S…
cvinayak Dec 29, 2024
1e36a81
[nrf fromtree] Bluetooth: Controller: Single timer use ISO Receive nR…
cvinayak Dec 29, 2024
7525c0e
[nrf fromtree] Bluetooth: Controller: Single timer use ISO Central nR…
cvinayak Dec 29, 2024
218b06f
[nrf fromtree] Bluetooth: Controller: Single timer use ISO Peripheral…
cvinayak Dec 29, 2024
6b8ec1e
[nrf fromtree] Bluetooth: Controller: Minor fix defines and condition…
cvinayak Dec 25, 2024
fe73c8b
[nrf fromtree] Bluetooth: Controller: Align DDPI usage with nRF54L po…
cvinayak Dec 25, 2024
b85af47
[nrf fromtree] Bluetooth: Controller: Add NRF_CCM support in nRF54L15…
cvinayak Sep 23, 2024
6de6e75
[nrf fromtree] Bluetooth: Controller: BUILD_ASSERT ticker nodes excee…
cvinayak Dec 28, 2024
0a614a3
[nrf fromtree] Bluetooth: Controller: Fix regression in connection up…
cvinayak Jan 17, 2025
32d63d8
[nrf fromtree] Bluetooth: Controller: Fix reset of drift_skip count
cvinayak Jan 17, 2025
8995779
[nrf fromtree] Bluetooth: Controller: Fix uninitialized is_aborted in…
cvinayak Jan 18, 2025
7318bd1
[nrf fromtree] Bluetooth: Controller: Fix regression in Code PHY S2 R…
cvinayak Jan 20, 2025
87de55b
[nrf fromtree] Bluetooth: Controller: Fix connection event busy check
cvinayak Jan 25, 2025
f28150c
[nrf fromtree] Bluetooth: Controller: Fix incorrect drift comp on PHY…
cvinayak Jan 25, 2025
34a8e0e
[nrf fromtree] Bluetooth: Controller: Workaround HCTO for BabbleSIM
cvinayak Jan 26, 2025
bae52a8
[nrf fromtree] Bluetooth: Controller: Fix Central ISO related to elap…
cvinayak Jan 28, 2025
e252e62
[nrf fromtree] Bluetooth: Controller: Fix Connected ISO to use accumu…
cvinayak Jan 28, 2025
cf5bed0
[nrf fromtree] Bluetooth: Controller: Fix incorrect event_count when …
cvinayak Jan 28, 2025
4a2ebc4
[nrf fromtree] Bluetooth: Controller: Fix coverity issue for cis == NULL
Thalley Feb 4, 2025
c368cd7
[nrf fromtree] Bluetooth: Controller: Fix LE Create BIG Complete even…
MariuszSkamra Feb 6, 2025
855ecdb
[nrf fromtree] Bluetooth: Controller: Fix casting in radio_aa_set for…
Thalley Feb 4, 2025
59ae559
[nrf fromtree] Bluetooth: Controller: Fix BT_CTLR_LOW_LAT_ULL conditi…
cvinayak Oct 4, 2024
02e2866
[nrf fromtree] Bluetooth: Controller: Fix device address in Periodic …
cvinayak Jan 30, 2025
7e22b4a
[nrf fromtree] Bluetooth: Controller: Fix sync_delay and latency in L…
cvinayak Feb 7, 2025
686b58e
[nrf fromtree] Bluetooth: Controller: Fix Periodic Sync for multiple …
cvinayak Feb 7, 2025
84483b8
[nrf fromtree] Bluetooth: Controller: Fix assertion terminating Perio…
cvinayak Feb 7, 2025
8d6cd64
[nrf fromtree] Bluetooth: Controller: Fix to release aux context stor…
cvinayak Feb 7, 2025
ba88cc2
[nrf fromtree] Bluetooth: Controller: Fix regression in scan aux release
cvinayak Feb 13, 2025
47cad3b
[nrf fromtree] Bluetooth: Controller: Fix redundant reset of sync aux…
cvinayak Feb 13, 2025
6eb30df
[nrf fromtree] soc: nordic: nrf54l: Fix num of irq for nRF54L20
adamkondraciuk Feb 13, 2025
f01cc4c
[nrf fromtree] manifest: Update hal_nordic with new cracen hal and rn…
aescolar Jan 14, 2025
88ce8e0
[nrf fromtree] manifest: update hal_nordic revision to integrate nrfx…
nika-nordic Jan 21, 2025
ae94cdf
[nrf fromtree] drivers: nrfx: Avoid unhandled event calling assert fu…
mah-eiSmart Jan 17, 2025
6b77915
[nrf fromtree] drivers: clock_control: nrf: ignore XOTUNE-related eve…
nika-nordic Jan 22, 2025
dd2b35e
Revert "[nrf noup] drivers: hwinfo: Support for reset reasons in nRF5…
nika-nordic Feb 13, 2025
0d6e8cf
[nrf fromtree] drivers: hwinfo: Support for reset reasons in nRF54H20
kl-cruz Nov 22, 2024
fd0f27a
[nrf fromtree] modules: hal_nordic: nrfx_config: Customize NRFX_SPIM_…
nordic-krch Dec 4, 2024
67c011b
Revert "[nrf noup] modules: hal_nordic: adjust nrfx reservations to NCS"
nika-nordic Feb 11, 2025
6f794f9
[nrf fromtree] modules: hal_nordic: nrfx: use templates from hal_nordic
masz-nordic Nov 20, 2024
75ec3a1
[nrf fromtree] modules: hal_nordic: nrfx: cleanup
masz-nordic Nov 20, 2024
3c9c7af
[nrf noup] modules: hal_nordic: adjust nrfx reservations to NCS
e-rk Oct 22, 2024
cd49156
[nrf noup] modules: hal_nordic: use Kconfig symbols in NCS reservation
nika-nordic Feb 12, 2025
3ed21ed
[nrf fromtree] modules: hal_nordic: nrfx: Move some defines back to C…
nordic-krch Jan 16, 2025
16dc0c6
[nrf fromtree] tests: drivers: pwm: Update gpio config
Jan 8, 2025
b91aa4f
[nrf noup] soc: nrf54l: Non-XIP KMU reserved memory fix
Vge0rge Feb 17, 2025
cd78af5
[nrf fromtree] tests: bluetooth: tester: Add PBP support
Frodevan Jan 24, 2025
0aa2141
[nrf fromlist] drivers: bluetooth: hci: Add retries for IPC interface
dchat-nordic Feb 12, 2025
7bba252
Revert "[nrf noup] samples: bluetooth: update autoconf.h header path"
nordic-krch Feb 17, 2025
a12ec54
Revert "[nrf noup] soc: nordic: nrf54l Fix for wait lasting half expe…
nordic-krch Feb 17, 2025
938c437
Revert "[nrf noup] soc: nordic: nrf54l: Port Soc.c to be compatible w…
nordic-krch Feb 17, 2025
43f054e
[nrf fromtree] tests: kernel: timer: timer_api: Tweak test_timer_rema…
nordic-krch Jan 14, 2025
61c3d47
[nrf fromtree] soc: nordic: nrf54l: Set SystemCoreClock using frequen…
nordic-krch Jan 17, 2025
9f0c5c9
[nrf fromtree] dts: common: nordic: nrf54l: Add clocks to cpu
nordic-krch Jan 3, 2025
fdc20c9
[nrf fromtree] boards: nordic: Set 64M CPU frequency for nrf54l20pdk …
nordic-krch Jan 3, 2025
8bd9e16
[nrf fromlist] soc: nordic: nrf54l: Setup power and clock only on sec…
nordic-krch Feb 17, 2025
d1d8c78
[nrf fromlist] soc: nordic: nrf54l: Explicitly include autoconf.h
nordic-krch Feb 17, 2025
00cfdc0
[nrf fromlist] drivers: clock_control: nrf: Move NRF_PERIPH_GET_FREQU…
nordic-krch Feb 18, 2025
25cc8b5
[nrf fromtree] drivers: i2c: i2c_nrfx_twis: patch dma buf mem section
bjarki-andreasen Feb 6, 2025
d6072d4
[nrf fromtree] tests: drivers: i2c: target_api: add nrf54h20
bjarki-andreasen Feb 6, 2025
73c8d65
[nrf fromtree] tests: drivers: i2c: target_api: add nrf54l15 to test …
bjarki-andreasen Feb 6, 2025
5f86809
[nrf fromtree] drivers: i2c: nrfx_twim_rtio: fix dma buf section attr
bjarki-andreasen Feb 11, 2025
47a8e12
[nrf fromtree] drivers: i2c: nrfx_twim_rtio: use msg_buf for rx if re…
bjarki-andreasen Feb 11, 2025
90c0360
[nrf fromtree] samples: drivers: i2c: rtio_loopback: add nrf boards
bjarki-andreasen Jan 8, 2025
a37c99e
[nrf fromtree] samples: drivers: i2c: rtio_loopback: add nrf54h20
bjarki-andreasen Feb 11, 2025
ca2d61e
[nrf fromtree] drivers: i2c: nrfx_twim_rtio: cast buf to non-const
bjarki-andreasen Jan 9, 2025
4cba24b
[nrf fromtree] samples: drivers: i2c: rtio_loopback: add fixture
bjarki-andreasen Feb 13, 2025
50128e3
[nrf fromtree] samples: drivers: i2c: rtio_loopback: change harness t…
bjarki-andreasen Feb 20, 2025
a22f20f
[nrf fromtree] manifest: Update bsim to version v2.5
aescolar Jan 20, 2025
5d28a5e
[nrf fromtree] doc boards nrfbsim: Update list of supported HW
aescolar Jan 23, 2025
b2d2019
[nrf fromtree] boards: nrf*_bsim: Detect attempt to configure not exi…
nordic-krch Jan 27, 2025
9a6076a
[nrf fromtree] manifest: Update nRF hw models to latest and leave bra…
aescolar Jan 28, 2025
73d52ac
[nrf fromtree] boards: nrf52_bsim: Remove disabling of LOG_BACKEND_UART
rugeGerritsen Jan 27, 2025
dc87df4
[nrf fromtree] boards: nrf_bsim: Set chosen console dts entry
rugeGerritsen Jan 27, 2025
63aa79c
[nrf fromtree] boards: nrf_bsim: Document how to use the console with…
rugeGerritsen Jan 27, 2025
6b3d347
[nrf fromtree] manifest: Update nRF hw models to latest
aescolar Feb 11, 2025
072a6f7
[nrf fromtree] manifest: Update nRF hw models to latest
aescolar Feb 13, 2025
912cca9
[nrf fromtree] manifest: Update nRF hw models to latest
rugeGerritsen Feb 17, 2025
c7ceba7
[nrf fromtree] drivers: pwm: nrfx: 0/100% duty for PWM120
mstasiaknordic Jan 30, 2025
65d9b7d
[nrf fromlist] dts: common: nordic: Add power node to nRF54L20
e-rk Feb 17, 2025
0b58ccd
[nrf fromlist] modules: hal_nordic: nrf_802154: enable constant latency
e-rk Feb 14, 2025
2bdfdda
[nrf fromlist] cmake: reports: Fix report targets
nordicjm Feb 20, 2025
dab6e40
[nrf fromlist] cmake: reports: Fix file prefix for tfm/bl2
nordicjm Feb 20, 2025
7b4d2eb
[nrf noup] tests: drivers: mspi: api: nRF54L15 fix frequency
magp-nordic Feb 19, 2025
1eff55d
[nrf fromtree] logging: frontends: stmesp: Fix logging single argumen…
nordic-krch Jan 22, 2025
e95813f
Revert "[nrf noup] samples: bluetooth: mesh: Disable secure storage f…
alxelax Feb 25, 2025
d445231
[nrf noup] samples: bluetooth: mesh: Disable secure storage for real …
alxelax Feb 25, 2025
097b37e
[nrf fromtree] Bluetooth: TMAP: Remove double definitions of TMAP rol…
Thalley Jan 3, 2025
a1cfd81
[nrf fromtree] drivers: adc: nrf_saadc: add pm device support
bjarki-andreasen Feb 10, 2025
b36b947
[nrf fromtree] dts: nordic,nrf-saadc: set pm device runtime auto
bjarki-andreasen Feb 10, 2025
a35da4f
[nrf fromlist] Bluetooth: Host: Use `memset` to initialize `psa_mac_o…
theob-pro Feb 20, 2025
4545832
[nrf fromtree] soc: nordic: nrf54h: gpd: yield() to not block if main…
bjarki-andreasen Jan 27, 2025
1bf500b
[nrf fromlist] drivers: mbox: nrf_vevif_event_tx: Fix errata 16 worka…
nordic-krch Feb 24, 2025
7e1ff38
[nrf fromlist] drivers: clock_control: nrf fll16 remove closed loop impl
bjarki-andreasen Feb 26, 2025
aaad8ca
[nrf fromlist] tests: drivers: clock_control: nrf_clock_control: upda…
bjarki-andreasen Feb 26, 2025
a596b2d
[nrf fromlist] tests: kernel: usage: thread_runtime_stats: Improve te…
nordic-krch Feb 21, 2025
6147494
[nrf fromlist] logging: frontend_stmesp: Fix string addresses from re…
nordic-krch Feb 4, 2025
769a573
[nrf fromlist] ipc: ipc_service: Parametrize workqueue stack size
adamkondraciuk Feb 20, 2025
71b0e2c
[nrf fromlist] Revert "tests: arm_thread_swap: Add overlay for nRF54H20"
adamkondraciuk Feb 20, 2025
acc0066
[nrf fromtree] soc: nordic: poweroff: remove disabling of emul l05/l1…
nika-nordic Jan 24, 2025
9a75fac
[nrf fromtree] soc: nordic: nrf53: kconfig: mark RAM CTRL as supported
nika-nordic Jan 24, 2025
c720f62
[nrf fromtree] tests: drivers: retained_mem: add support for nRF5340 DK
nika-nordic Jan 24, 2025
83d751b
[nrf fromtree] samples: nordic: system_off: add retained_mem variant …
nika-nordic Jan 24, 2025
afc1b46
[nrf noup] tests: drivers: mspi: api: fix for nRF54L15
magp-nordic Feb 26, 2025
b70deaa
[nrf fromtree] Bluetooth: Host: Fix buffer allocation warnings in sys…
jhedberg Feb 21, 2025
3850f28
[nrf fromlist] mbox: temporary workaround for missing ic-msg
meijemac Feb 28, 2025
7fe2732
[nrf fromlist] tests: drivers: spi: Tests SPI at 16 and 32 MHz on nRF…
nordic-segl Feb 19, 2025
e72a650
[nrf fromtree] Tests: Bluetooth: Fix stack overflow for tester
theob-pro Feb 28, 2025
f57f171
[nrf fromtree] drivers: clock_control: nrf: Add workaround for XO sta…
nordic-krch Feb 17, 2025
b3d63c6
[nrf noup] samples: bluetooth: hci_ipc: increase main stack size for …
gordonklaus Feb 28, 2025
93f72ad
[nrf noup] include: net: socket_ncs: remove leftover
MirkoCovizzi Feb 17, 2025
10eb60b
[nrf noup] include: net: socket_ncs: prevent overlaps
MirkoCovizzi Feb 17, 2025
6971f74
[nrf fromlist] soc: nordic: nrf54l: Fix num of irq for nRF54L09
adamkondraciuk Feb 26, 2025
bda111b
[nrf fromlist] include: common: sys_bitops: Specify sign when bitshif…
rugeGerritsen Mar 4, 2025
1299951
[nrf fromlist] dts: nordic: nrf54: add nRF54L20 FLPR core
mstasiaknordic Sep 26, 2024
a7dfb72
[nrf fromlist] soc: nordic: nrf54: add nRF54L20 FLPR core
mstasiaknordic Sep 26, 2024
0cc20f2
[nrf fromlist] modules: hal_nordic: nrfx: add nRF54L20 FLPR core
mstasiaknordic Sep 26, 2024
9b95c91
[nrf fromlist] boards: nordic: add FLPR core to nRF54L20pdk
mstasiaknordic Sep 27, 2024
d7581bf
[nrf fromlist] snippets: add nRF54L20pdk FLPR core snippet
mstasiaknordic Oct 10, 2024
a7e820a
[nrf fromlist] drivers: flash: spi_nor: add define for Quad Enable bit
masz-nordic Feb 10, 2025
b44731a
[nrf fromlist] drivers: flash: mspi_nor: support MODE_SINGLE and MODE…
masz-nordic Feb 7, 2025
6dc8dcd
[nrf fromlist] dts: nordic: nrf54l09: add clocks to GRTC
mstasiaknordic Mar 6, 2025
c3407f0
Revert "[nrf fromlist] drivers: flash: mspi_nor: support MODE_SINGLE …
masz-nordic Mar 6, 2025
ee6cc76
[nrf fromlist] drivers: flash: mspi_nor: support MODE_SINGLE and MODE…
masz-nordic Feb 7, 2025
96716d4
[nrf fromlist] soc: nordic: enable west commands for nRF54L20 Enga cp…
mstasiaknordic Mar 6, 2025
c63d142
[nrf noup] Revert "[nrf fromlist] boards: nordic: add FLPR core to nR…
mstasiaknordic Mar 7, 2025
7f22cd3
[nrf fromlist] boards: nordic: add FLPR core to nRF54L20pdk
mstasiaknordic Sep 27, 2024
11ba5c5
[nrf fromtree] boards: nordic: nRF91x1: update jlink device name
JordanYates Jan 11, 2025
e12cd33
[nrf fromtree] doc: releases: introduce release notes and migration g…
kartben Feb 17, 2025
a72ee93
[nrf fromlist] boards: nrf: Default to nRF Util for flashing
carlescufi Mar 6, 2025
4995572
[nrf noup] tests: drivers: mpsi: api: remove SDP overlay
masz-nordic Mar 7, 2025
e0803fe
[nrf fromtree] samples: esp32c3: Add USB variant
nordic-segl Mar 6, 2025
353dcf9
[nrf fromtree] samples: enable flash samples for s32z board
nordic-segl Feb 19, 2025
7e6bdc5
[nrf fromtree] samples: settings: Enable NVS backend on mimxrt1020_ev…
nordic-segl Mar 6, 2025
c91988c
[nrf fromtree] samples: adc: esp32s2: Fix unsupported resolution
nordic-segl Mar 6, 2025
17e54e8
[nrf fromtree] boards: esp32c3: remove invalid adc1 entry.
nordic-segl Mar 6, 2025
3411e13
[nrf fromtree] samples: drivers: counter: add nRF54L09 config
nordic-segl Mar 6, 2025
236d29b
[nrf fromtree] samples: Simplify ESP32 overlays moving to socs
nordic-segl Mar 6, 2025
9476b04
[nrf fromtree] samples: settings: cleanup and use filters
nordic-segl Dec 18, 2024
163004a
[nrf fromlist] Bluetooth: Host: Fix Advertising Coding Selection as p…
Thomas-Deppe Mar 6, 2025
5715c89
[nrf fromlist] logging: frontends: stmesp: Fix sending string location
nordic-krch Mar 6, 2025
d50b6cd
[nrf fromtree] manifest: Update nRF hw models to latest
aescolar Feb 27, 2025
42c5718
[nrf fromtree] boards: nordic: nrf54l20pdk: Add dmic to supported per…
nordic-segl Feb 13, 2025
dc1318d
[nrf fromtree] tests: drivers: audio: dmic_api: Enable test on nRF54L…
nordic-segl Feb 13, 2025
4791894
[nrf fromtree] samples: drivers: aduio: dmic: Enable sample on nRF54L…
nordic-segl Feb 13, 2025
d9c1ff2
Revert "[nrf fromlist] drivers: flash: mspi_nor: support MODE_SINGLE …
masz-nordic Mar 10, 2025
8b7a842
Revert "[nrf fromlist] samples: code_relocation_nocopy: Add configura…
masz-nordic Mar 10, 2025
08d8d95
Revert "[nrf fromlist] boards: nrf54h20dk: Add XIP region definition …
masz-nordic Mar 10, 2025
a333036
Revert "[nrf fromlist] samples|tests: drivers: flash: Add support for…
masz-nordic Mar 10, 2025
1d116c8
Revert "[nrf fromlist] dts: nordic: Change compatible property for EX…
masz-nordic Mar 10, 2025
5b18b72
Revert "[nrf noup] drivers: spi_dw: Bring back custom EXMIF periphera…
masz-nordic Mar 10, 2025
764fd06
Revert "[nrf noup] drivers: pinctrl_nrf: Add support for EXMIF pins"
masz-nordic Mar 10, 2025
309817e
Revert "[nrf fromlist] drivers: flash: Add generic NOR flash driver f…
masz-nordic Mar 10, 2025
ff9b79f
Revert "[nrf fromlist] drivers: mspi: Add driver for DesignWare SSI b…
masz-nordic Mar 10, 2025
b36fdd8
Revert "[nrf noup] entropy: Add fake entropy nRF PRNG driver"
masz-nordic Mar 10, 2025
9180bd0
[nrf fromtree] drivers: mspi: Add driver for DesignWare SSI based con…
anangl Oct 17, 2024
5d6b2c5
[nrf fromtree] drivers: flash: Add generic NOR flash driver for MSPI …
anangl Oct 17, 2024
1e15d20
[nrf fromtree] drivers: pinctrl_nrf: Add support for EXMIF pins
anangl Oct 17, 2024
eeb989e
[nrf fromtree] boards: nrf9280pdk: remove can enablement
gmarull Feb 6, 2025
45a4bc3
[nrf noup] entropy: Add fake entropy nRF PRNG driver
Apr 9, 2024
21fc3ec
[nrf fromtree] dts: nordic: Change compatible property for EXMIF node
anangl Oct 17, 2024
6ee4929
[nrf fromtree] samples|tests: drivers: flash: Add support for "jedec,…
anangl Oct 18, 2024
b8c0616
[nrf fromtree] boards: nrf54h20dk: Add XIP region definition to memor…
anangl Dec 3, 2024
b46c37f
[nrf fromtree] samples: code_relocation_nocopy: Add configuration for…
anangl Dec 3, 2024
dd02c86
[nrf fromlist] drivers: flash: mspi_nor: support MODE_SINGLE and MODE…
masz-nordic Feb 7, 2025
a17094e
[nrf noup] drivers: spi_dw: Bring back custom EXMIF peripheral handling
anangl Dec 17, 2024
361d8cf
[nrf fromlist] soc: nordic: nrf54h: Add SCB retention for s2ram
adamkondraciuk Mar 6, 2025
b358585
[nrf fromlist] dts: nordic: nrf54: Add nRF54L09 FLPR
adamkondraciuk Feb 6, 2025
79b52ed
[nrf fromlist] soc: nordic: Add nRF54L09 FLPR
adamkondraciuk Feb 6, 2025
e2c01ec
[nrf fromlist] modules: hal_nordic: Add nRF54L09 FLPR
adamkondraciuk Feb 6, 2025
3b02030
[nrf fromlist] boards: nordic: Add nRF54L09 FLPR
adamkondraciuk Feb 6, 2025
859d7c1
[nrf fromlist] snippets: nordic: Add nRF54L09 FLPR
adamkondraciuk Feb 6, 2025
4c92a51
[nrf noup] samples: Fix smp_svr sample for external memory using PM
de-nordic Feb 14, 2025
3fedc12
[nrf fromtree] bluetooth: tester: btp: refactors OOB legacy selection
kedMertens Feb 7, 2025
84fc26d
[nrf fromtree] bluetooth: tester: btp: refactors privacy selection
kedMertens Feb 7, 2025
4559b50
[nrf fromtree] bluetooth: tester: btp: fixes ext adv selection
kedMertens Feb 10, 2025
f50821f
[nrf fromtree] bluetooth: tester: btp: refactors LE secure pairing se…
kedMertens Feb 10, 2025
c2b3981
[nrf fromtree] bluetooth: tester: btp: refactors periodic adv selection
kedMertens Feb 10, 2025
e3e3308
[nrf fromtree] tests: bluetooth: tester: Fix invalid checks in oob_da…
sjanc Feb 24, 2025
3985512
[nrf fromtree] tests: bluetooth: tester: Make brcst_source_stop synch…
alexsven Mar 4, 2025
ff01b5f
[nrf fromtree] tests: bluetooth: tester: Implement BAP/BSRC/SCC/BV-38-C
gWacey Jan 30, 2025
a49a1eb
[nrf fromtree] drivers: regulator: npm1300: workaround for LDO HW bug
seov-nordic Jan 10, 2025
1f9ba42
[nrf fromtree] drivers: regulator: npm1300: add reference to anomaly 38
seov-nordic Feb 13, 2025
3d1d0af
[nrf noup] include: net: socket_ncs: reduce NCS_BASE
MirkoCovizzi Mar 4, 2025
b869365
[nrf fromtree] modules: hal_nordic: Adding SWEXT service
Rafal-Nordic Jan 27, 2025
affbd0c
[nrf fromtree] modules: hal_nordic: update version to include USBREG fix
jfischer-no Feb 20, 2025
1e24904
[nrf fromtree] drivers: usb: do not enabled nRF USBREG interrupt
jfischer-no Feb 20, 2025
8a381ae
[nrf noup] Revert "[nrf fromlist] modules: hal_nordic: nrfx: add nRF5…
mstasiaknordic Mar 12, 2025
b717237
[nrf noup] Revert "[nrf fromlist] modules: hal_nordic: Add nRF54L09 F…
mstasiaknordic Mar 12, 2025
1bcbe9d
[nrf fromlist] manifest: update hal_nordic revision to integrate nrfx…
nika-nordic Feb 24, 2025
6f10bfe
[nrf fromlist] Revert "drivers: clock_control: nrf: Add workaround fo…
nika-nordic Feb 24, 2025
f5d8367
[nrf fromlist] modules: hal_nordic: nrfx: align nRF54L09/L20 symbols …
nika-nordic Feb 24, 2025
ead6f90
[nrf fromlist] drivers: clock_control: nrf: ifdef optional events
nika-nordic Feb 25, 2025
6081aac
[nrf fromlist] drivers: serial: nrf: set default frame size and endia…
nika-nordic Feb 26, 2025
fe6447b
[nrf noup] modules: hal_nordic: nrfx: align nRF54L FLPR naming to nrf…
mstasiaknordic Mar 12, 2025
71f3da0
[nrf fromtree] drivers: serial: nrfx_uarte: Deprecate non-legacy shim
nordic-krch Nov 18, 2024
4b905a3
[nrf fromtree] drivers: hci: ipc: Make IPC endpoint bound timeout con…
ppryga-nordic Mar 7, 2025
9f33ae8
[nrf fromtree] tests: drivers: watchdog: Add test for initialization …
nordic-segl Feb 24, 2025
67872be
[nrf fromtree] tests: kernel: timer: timer_behavior: Reduce tick freq…
nordic-krch Jan 14, 2025
ec9f2e7
[nrf fromtree] drivers: mfd: npm2100: Fix shiphold flag
nordic-auko Jan 3, 2025
8c3c19c
[nrf fromtree] drivers: mfd: npm2100: Add hibernate_pt mode support
nordic-auko Jan 3, 2025
c8e0a24
[nrf fromtree] drivers: mfd: npm2100: align formatting
seov-nordic Jan 7, 2025
a676c71
[nrf fromtree] drivers: npm2100: remove SHPHLD button reconfiguration
seov-nordic Jan 7, 2025
faf28c0
[nrf fromtree] drivers: audio: dmic_nrfx: improvements to driver
nordic-segl Mar 13, 2025
3cccc7c
[nrf fromtree] bluetooth: Host: Rename CS tone antenna configurations
olivier-le-sage Feb 21, 2025
dab4986
[nrf fromtree] tests: boards: nrf: hwinfo: Extend test with RESET_CPU…
nordic-segl Mar 3, 2025
7e66910
Revert "[nrf noup] moduled: hal_nordic: require nrf-regtool"
karstenkoenig Mar 10, 2025
6015fd3
[nrf fromtree] modules: hal_nordic: bump regtool to 8.1.3
karstenkoenig Feb 27, 2025
6ec9d10
[nrf noup] moduled: hal_nordic: require nrf-regtool
gmarull Oct 30, 2024
3dc3435
[nrf fromtree] boards: nordic: nrf54l20pdk: Add SPI to the supported …
nordic-segl Feb 18, 2025
5ace1dc
[nrf fromtree] tests: drivers: audio: dmic_api: Enable test execution…
nordic-segl Dec 3, 2024
5319cfc
[nrf fromtree] drivers: timer: nrf_rtc_timer: do not start LFCLK unle…
lemrey Mar 7, 2025
34f8850
[nrf fromlist] mcumgr/img_mgmt: Allow erase pending image by default
nvlsianpu Mar 13, 2025
f59e0f1
Revert "[nrf noup] drivers: pinctrl: Add SDP MSPI pin configuration"
adamkondraciuk Feb 20, 2025
cdd7b6b
[nrf fromlist] soc: nordic_nrf: add support for TDM
adamkondraciuk Nov 27, 2024
812f932
[nrf fromlist] modules: hal_nordic: add support for TDM
adamkondraciuk Nov 27, 2024
0377f37
[nrf fromlist] drivers: pinctrl: nrf: Add support for TDM peripheral
adamkondraciuk Nov 27, 2024
7d44195
[nrf fromlist] dts: nordic: nrf54: add TDM support for nRF54
adamkondraciuk Nov 27, 2024
a4e63c8
[nrf fromlist] drivers: i2s: Add support for nRF TDM peripherals
adamkondraciuk Nov 27, 2024
3c0b184
[nrf fromlist] tests: drivers: i2s: Align tests to TDM peripheral
adamkondraciuk Jan 14, 2025
6fa629b
[nrf noup] drivers: pinctrl: Add SDP MSPI pin configuration
jaz1-nordic Nov 25, 2024
16f9163
[nrf fromtree] scripts: runners: nrfutil: Switch to command-line args…
carlescufi Jan 12, 2025
9278113
[nrf fromtree] scripts: runners: nrf: Fix a missing indirection
carlescufi Jan 29, 2025
ae8acbd
[nrf fromtree] scripts: runners: nrf: Remove the nRF5340 special hand…
carlescufi Jan 28, 2025
471b1d0
[nrf fromtree] scripts: runners: nrf: Add UICR ranges for nRF54L
carlescufi Jan 28, 2025
11a055b
[nrf fromtree] scripts: runners: nrfjprog: Remove erasepage handling
carlescufi Jan 30, 2025
d04e8a3
[nrf fromtree] scripts: runners: nrf: Implement the erase command
carlescufi Jan 30, 2025
3446a62
[nrf fromtree] scripts: runners: nrf: Fix missing kind in erase opera…
carlescufi Feb 4, 2025
54ddea4
[nrf fromtree] scripts: runners: nrf: Default to soft reset for the n…
carlescufi Jan 30, 2025
90e94f4
[nrf fromtree] test: bluetooth: tester: Fix regression in PBP
alexsven Mar 13, 2025
7ee4bc9
[nrf fromtree] scripts: runners: nrf: Fix flashing of FLPR/PPR on nRF…
carlescufi Feb 6, 2025
3efacf1
[nrf fromtree] shell: Set default max argc count when WiFi shell is e…
D-Triveni Mar 12, 2025
6bf2702
[nrf fromtree] drivers: nrf_wifi: Set default stack size of net_mgmt …
D-Triveni Mar 13, 2025
004da6d
[nrf fromtree] soc: nordic: allow use of TWIM frequency workaround
mstasiaknordic Mar 14, 2025
56bea02
[nrf fromtree] tests: drivers: i2s: Add tests at typical audio sample…
nordic-segl Feb 4, 2025
70f9032
[nrf fromtree] drivers: adc: nrfx_saadc: Add support for AIN8-AIN13 o…
nordic-krch Feb 13, 2025
567d10c
[nrf fromtree] samples: drivers: adc: adc_sequence: Update nrf54h20 c…
nordic-krch Mar 6, 2025
dcda1a7
[nrf fromlist] drivers: timer: nrf_grtc_timer: Move up GRTC clock sel…
adamkondraciuk Feb 18, 2025
e109db3
[nrf fromlist] modules: hal_nordic: nrfx: switch off auto clksel for …
adamkondraciuk Mar 17, 2025
7712393
Revert "[nrf noup] modules: mbedtls: Disable configurations in Kconfi…
de-nordic Mar 19, 2025
5694920
[nrf fromlist] modules: mbedtls: Expose MBEDTLS_RSA_C
de-nordic Mar 19, 2025
cf7042f
[nrf noup] modules: mbedtls: Disable configurations in Kconfig.tls-ge…
frkv Sep 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
407 changes: 407 additions & 0 deletions .github/test-spec.yml

Large diffs are not rendered by default.

28 changes: 28 additions & 0 deletions .github/workflows/commit-tags.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Commit tags

on:
pull_request:
types: [synchronize, opened, reopened, edited, labeled, unlabeled,
milestoned, demilestoned, assigned, unassigned, ready_for_review,
review_requested]

jobs:
commit_tags:
runs-on: ubuntu-22.04
name: Run commit tags checks on patch series (PR)
steps:
- name: Update PATH for west
run: |
echo "$HOME/.local/bin" >> $GITHUB_PATH

- name: Checkout the code
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 0

- name: Run the commit tags
uses: nrfconnect/action-commit-tags@main
with:
target: .
upstream: zephyrproject-rtos/zephyr/main
6 changes: 3 additions & 3 deletions .github/workflows/compliance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ jobs:
git config --global user.name "Your Name"
git remote -v
# Ensure there's no merge commits in the PR
[[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
(echo "::error ::Merge commits not allowed, rebase instead";false)
#[[ "$(git rev-list --merges --count origin/${BASE_REF}..)" == "0" ]] || \
#(echo "::error ::Merge commits not allowed, rebase instead";false)
rm -fr ".git/rebase-apply"
rm -fr ".git/rebase-merge"
git rebase origin/${BASE_REF}
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
# Increase rename limit to allow for large PRs
git config diff.renameLimit 10000
./scripts/ci/check_compliance.py --annotate -e KconfigBasic -e ClangFormat \
-c origin/${BASE_REF}..
-e Kconfig -e KconfigBasicNoModules -e ModulesMaintainers -c origin/${BASE_REF}..

- name: upload-results
uses: actions/upload-artifact@v4
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/manifest-PR.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: handle manifest PR
on:
pull_request_target:
types: [opened, synchronize, closed]
branches:
- main


jobs:
call-manifest-pr-action:
runs-on: ubuntu-latest
steps:
- name: handle manifest PR
uses: nrfconnect/action-manifest-pr@main
with:
token: ${{ secrets.NCS_GITHUB_TOKEN }}
manifest-pr-title-details: ${{ github.event.pull_request.title }}
5 changes: 5 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@Library("CI_LIB") _

def pipeline = new ncs.sdk_zephyr.Main()

pipeline.run(JOB_NAME)
1 change: 0 additions & 1 deletion MAINTAINERS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,6 @@ Documentation:
- doc/images/Zephyr-Kite-in-tree.png
- doc/index-tex.rst
- doc/index.rst
- doc/kconfig.rst
- doc/templates/sample.tmpl
- doc/templates/board.tmpl
- boards/index.rst
Expand Down
2 changes: 1 addition & 1 deletion arch/arc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ config ARC_CURRENT_THREAD_USE_NO_TLS
RGF_NUM_BANKS the parameter is disabled by-default because banks syncronization
requires significant time, and it slows down performance.
ARCMWDT works with tls pointer in different way then GCC. Optimized access to
TLS pointer via arch_current_thread() does not provide significant advantages
TLS pointer via the _current symbol does not provide significant advantages
in case of MetaWare.

config GEN_ISR_TABLES
Expand Down
2 changes: 1 addition & 1 deletion arch/arc/core/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ static bool z_check_thread_stack_fail(const uint32_t fault_addr, uint32_t sp)
{
#if defined(CONFIG_MULTITHREADING)
uint32_t guard_end, guard_start;
const struct k_thread *thread = arch_current_thread();
const struct k_thread *thread = _current;

if (!thread) {
/* TODO: Under what circumstances could we get here ? */
Expand Down
4 changes: 2 additions & 2 deletions arch/arc/core/irq_offload.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ void arch_irq_offload(irq_offload_routine_t routine, const void *parameter)

__asm__ volatile("sync");

/* If arch_current_thread() was aborted in the offload routine, we shouldn't be here */
__ASSERT_NO_MSG((arch_current_thread()->base.thread_state & _THREAD_DEAD) == 0);
/* If _current was aborted in the offload routine, we shouldn't be here */
__ASSERT_NO_MSG((_current->base.thread_state & _THREAD_DEAD) == 0);
}

/* need to be executed on every core in the system */
Expand Down
16 changes: 8 additions & 8 deletions arch/arc/core/thread.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack,
#ifdef CONFIG_MULTITHREADING
void *z_arch_get_next_switch_handle(struct k_thread **old_thread)
{
*old_thread = arch_current_thread();
*old_thread = _current;

return z_get_next_switch_handle(NULL);
}
Expand All @@ -227,16 +227,16 @@ void *z_arch_get_next_switch_handle(struct k_thread **old_thread)
FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
void *p1, void *p2, void *p3)
{
setup_stack_vars(arch_current_thread());
setup_stack_vars(_current);

/* possible optimizaiton: no need to load mem domain anymore */
/* need to lock cpu here ? */
configure_mpu_thread(arch_current_thread());
configure_mpu_thread(_current);

z_arc_userspace_enter(user_entry, p1, p2, p3,
(uint32_t)arch_current_thread()->stack_info.start,
(arch_current_thread()->stack_info.size -
arch_current_thread()->stack_info.delta), arch_current_thread());
(uint32_t)_current->stack_info.start,
(_current->stack_info.size -
_current->stack_info.delta), _current);
CODE_UNREACHABLE;
}
#endif
Expand Down Expand Up @@ -336,7 +336,7 @@ int arc_vpx_lock(k_timeout_t timeout)

id = _current_cpu->id;
#if (CONFIG_MP_MAX_NUM_CPUS > 1) && defined(CONFIG_SCHED_CPU_MASK)
__ASSERT(!arch_is_in_isr() && (arch_current_thread()->base.cpu_mask == BIT(id)), "");
__ASSERT(!arch_is_in_isr() && (_current->base.cpu_mask == BIT(id)), "");
#endif
k_spin_unlock(&lock, key);

Expand All @@ -355,7 +355,7 @@ void arc_vpx_unlock(void)

key = k_spin_lock(&lock);
#if (CONFIG_MP_MAX_NUM_CPUS > 1) && defined(CONFIG_SCHED_CPU_MASK)
__ASSERT(!arch_is_in_isr() && (arch_current_thread()->base.cpu_mask == BIT(id)), "");
__ASSERT(!arch_is_in_isr() && (_current->base.cpu_mask == BIT(id)), "");
#endif
id = _current_cpu->id;
k_spin_unlock(&lock, key);
Expand Down
2 changes: 1 addition & 1 deletion arch/arc/core/tls.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ size_t arch_tls_stack_setup(struct k_thread *new_thread, char *stack_ptr)

void *_Preserve_flags _mwget_tls(void)
{
return (void *)(arch_current_thread()->tls);
return (void *)(_current->tls);
}

#else
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/core/cortex_a_r/fault.c
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ bool z_arm_fault_undef_instruction_fp(void)
* context because it is about to be overwritten.
*/
if (((_current_cpu->nested == 2)
&& (arch_current_thread()->base.user_options & K_FP_REGS))
&& (_current->base.user_options & K_FP_REGS))
|| ((_current_cpu->nested > 2)
&& (spill_esf->undefined & FPEXC_EN))) {
/*
Expand All @@ -196,7 +196,7 @@ bool z_arm_fault_undef_instruction_fp(void)
* means that a thread that uses the VFP does not have to,
* but should, set K_FP_REGS on thread creation.
*/
arch_current_thread()->base.user_options |= K_FP_REGS;
_current->base.user_options |= K_FP_REGS;
}

return false;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/core/cortex_a_r/swap_helper.S
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ SECTION_FUNC(TEXT, z_arm_do_swap)

#if defined(CONFIG_FPU_SHARING)
ldrb r0, [r2, #_thread_offset_to_user_options]
tst r0, #K_FP_REGS /* arch_current_thread()->base.user_options & K_FP_REGS */
tst r0, #K_FP_REGS /* _current->base.user_options & K_FP_REGS */
beq out_fp_inactive

mov ip, #FPEXC_EN
Expand Down Expand Up @@ -152,7 +152,7 @@ out_fp_inactive:

#if defined(CONFIG_FPU_SHARING)
ldrb r0, [r2, #_thread_offset_to_user_options]
tst r0, #K_FP_REGS /* arch_current_thread()->base.user_options & K_FP_REGS */
tst r0, #K_FP_REGS /* _current->base.user_options & K_FP_REGS */
beq in_fp_inactive

mov r3, #FPEXC_EN
Expand Down
36 changes: 18 additions & 18 deletions arch/arm/core/cortex_a_r/thread.c
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
{

/* Set up privileged stack before entering user mode */
arch_current_thread()->arch.priv_stack_start =
(uint32_t)z_priv_stack_find(arch_current_thread()->stack_obj);
_current->arch.priv_stack_start =
(uint32_t)z_priv_stack_find(_current->stack_obj);
#if defined(CONFIG_MPU_STACK_GUARD)
#if defined(CONFIG_THREAD_STACK_INFO)
/* We're dropping to user mode which means the guard area is no
Expand All @@ -208,37 +208,37 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
* which accounted for memory borrowed from the thread stack.
*/
#if FP_GUARD_EXTRA_SIZE > 0
if ((arch_current_thread()->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) {
arch_current_thread()->stack_info.start -= FP_GUARD_EXTRA_SIZE;
arch_current_thread()->stack_info.size += FP_GUARD_EXTRA_SIZE;
if ((_current->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) {
_current->stack_info.start -= FP_GUARD_EXTRA_SIZE;
_current->stack_info.size += FP_GUARD_EXTRA_SIZE;
}
#endif /* FP_GUARD_EXTRA_SIZE */
arch_current_thread()->stack_info.start -= MPU_GUARD_ALIGN_AND_SIZE;
arch_current_thread()->stack_info.size += MPU_GUARD_ALIGN_AND_SIZE;
_current->stack_info.start -= MPU_GUARD_ALIGN_AND_SIZE;
_current->stack_info.size += MPU_GUARD_ALIGN_AND_SIZE;
#endif /* CONFIG_THREAD_STACK_INFO */

/* Stack guard area reserved at the bottom of the thread's
* privileged stack. Adjust the available (writable) stack
* buffer area accordingly.
*/
#if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
arch_current_thread()->arch.priv_stack_start +=
((arch_current_thread()->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) ?
_current->arch.priv_stack_start +=
((_current->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) ?
MPU_GUARD_ALIGN_AND_SIZE_FLOAT : MPU_GUARD_ALIGN_AND_SIZE;
#else
arch_current_thread()->arch.priv_stack_start += MPU_GUARD_ALIGN_AND_SIZE;
_current->arch.priv_stack_start += MPU_GUARD_ALIGN_AND_SIZE;
#endif /* CONFIG_FPU && CONFIG_FPU_SHARING */
#endif /* CONFIG_MPU_STACK_GUARD */

#if defined(CONFIG_CPU_AARCH32_CORTEX_R)
arch_current_thread()->arch.priv_stack_end =
arch_current_thread()->arch.priv_stack_start + CONFIG_PRIVILEGED_STACK_SIZE;
_current->arch.priv_stack_end =
_current->arch.priv_stack_start + CONFIG_PRIVILEGED_STACK_SIZE;
#endif

z_arm_userspace_enter(user_entry, p1, p2, p3,
(uint32_t)arch_current_thread()->stack_info.start,
arch_current_thread()->stack_info.size -
arch_current_thread()->stack_info.delta);
(uint32_t)_current->stack_info.start,
_current->stack_info.size -
_current->stack_info.delta);
CODE_UNREACHABLE;
}

Expand Down Expand Up @@ -304,7 +304,7 @@ EXPORT_SYMBOL(z_arm_thread_is_in_user_mode);
uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp)
{
#if defined(CONFIG_MULTITHREADING)
const struct k_thread *thread = arch_current_thread();
const struct k_thread *thread = _current;

if (thread == NULL) {
return 0;
Expand All @@ -314,7 +314,7 @@ uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp
#if (defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)) && \
defined(CONFIG_MPU_STACK_GUARD)
uint32_t guard_len =
((arch_current_thread()->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) ?
((_current->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) ?
MPU_GUARD_ALIGN_AND_SIZE_FLOAT : MPU_GUARD_ALIGN_AND_SIZE;
#else
/* If MPU_STACK_GUARD is not enabled, the guard length is
Expand Down Expand Up @@ -377,7 +377,7 @@ uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp
#if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
int arch_float_disable(struct k_thread *thread)
{
if (thread != arch_current_thread()) {
if (thread != _current) {
return -EINVAL;
}

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/core/cortex_m/swap_helper.S
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ in_fp_endif:
#if defined(CONFIG_MPU_STACK_GUARD) || defined(CONFIG_USERSPACE)
/* Re-program dynamic memory map */
push {r2,lr}
mov r0, r2 /* arch_current_thread() thread */
mov r0, r2 /* _current thread */
bl z_arm_configure_dynamic_mpu_regions
pop {r2,lr}
#endif
Expand Down
34 changes: 17 additions & 17 deletions arch/arm/core/cortex_m/thread.c
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
{

/* Set up privileged stack before entering user mode */
arch_current_thread()->arch.priv_stack_start =
(uint32_t)z_priv_stack_find(arch_current_thread()->stack_obj);
_current->arch.priv_stack_start =
(uint32_t)z_priv_stack_find(_current->stack_obj);
#if defined(CONFIG_MPU_STACK_GUARD)
#if defined(CONFIG_THREAD_STACK_INFO)
/* We're dropping to user mode which means the guard area is no
Expand All @@ -241,32 +241,32 @@ FUNC_NORETURN void arch_user_mode_enter(k_thread_entry_t user_entry,
* which accounted for memory borrowed from the thread stack.
*/
#if FP_GUARD_EXTRA_SIZE > 0
if ((arch_current_thread()->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) {
arch_current_thread()->stack_info.start -= FP_GUARD_EXTRA_SIZE;
arch_current_thread()->stack_info.size += FP_GUARD_EXTRA_SIZE;
if ((_current->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) {
_current->stack_info.start -= FP_GUARD_EXTRA_SIZE;
_current->stack_info.size += FP_GUARD_EXTRA_SIZE;
}
#endif /* FP_GUARD_EXTRA_SIZE */
arch_current_thread()->stack_info.start -= MPU_GUARD_ALIGN_AND_SIZE;
arch_current_thread()->stack_info.size += MPU_GUARD_ALIGN_AND_SIZE;
_current->stack_info.start -= MPU_GUARD_ALIGN_AND_SIZE;
_current->stack_info.size += MPU_GUARD_ALIGN_AND_SIZE;
#endif /* CONFIG_THREAD_STACK_INFO */

/* Stack guard area reserved at the bottom of the thread's
* privileged stack. Adjust the available (writable) stack
* buffer area accordingly.
*/
#if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
arch_current_thread()->arch.priv_stack_start +=
((arch_current_thread()->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) ?
_current->arch.priv_stack_start +=
((_current->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) ?
MPU_GUARD_ALIGN_AND_SIZE_FLOAT : MPU_GUARD_ALIGN_AND_SIZE;
#else
arch_current_thread()->arch.priv_stack_start += MPU_GUARD_ALIGN_AND_SIZE;
_current->arch.priv_stack_start += MPU_GUARD_ALIGN_AND_SIZE;
#endif /* CONFIG_FPU && CONFIG_FPU_SHARING */
#endif /* CONFIG_MPU_STACK_GUARD */

z_arm_userspace_enter(user_entry, p1, p2, p3,
(uint32_t)arch_current_thread()->stack_info.start,
arch_current_thread()->stack_info.size -
arch_current_thread()->stack_info.delta);
(uint32_t)_current->stack_info.start,
_current->stack_info.size -
_current->stack_info.delta);
CODE_UNREACHABLE;
}

Expand Down Expand Up @@ -379,7 +379,7 @@ void configure_builtin_stack_guard(struct k_thread *thread)
uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp)
{
#if defined(CONFIG_MULTITHREADING)
const struct k_thread *thread = arch_current_thread();
const struct k_thread *thread = _current;

if (thread == NULL) {
return 0;
Expand All @@ -389,7 +389,7 @@ uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp
#if (defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)) && \
defined(CONFIG_MPU_STACK_GUARD)
uint32_t guard_len =
((arch_current_thread()->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) ?
((_current->arch.mode & Z_ARM_MODE_MPU_GUARD_FLOAT_Msk) != 0) ?
MPU_GUARD_ALIGN_AND_SIZE_FLOAT : MPU_GUARD_ALIGN_AND_SIZE;
#else
/* If MPU_STACK_GUARD is not enabled, the guard length is
Expand Down Expand Up @@ -452,7 +452,7 @@ uint32_t z_check_thread_stack_fail(const uint32_t fault_addr, const uint32_t psp
#if defined(CONFIG_FPU) && defined(CONFIG_FPU_SHARING)
int arch_float_disable(struct k_thread *thread)
{
if (thread != arch_current_thread()) {
if (thread != _current) {
return -EINVAL;
}

Expand Down Expand Up @@ -522,7 +522,7 @@ void arch_switch_to_main_thread(struct k_thread *main_thread, char *stack_ptr,
{
z_arm_prepare_switch_to_main();

arch_current_thread_set(main_thread);
z_current_thread_set(main_thread);

#if defined(CONFIG_THREAD_LOCAL_STORAGE)
/* On Cortex-M, TLS uses a global variable as pointer to
Expand Down
Loading
Loading