Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manifest: update hal_nordic revision to have nrfx 3.7.0 release #79121

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

nika-nordic
Copy link
Collaborator

New nrfx 3.7.0 release contains nRF54H20 EngC support and multi-instanced PDM driver needed for nRF54L15 support.

@zephyrbot zephyrbot added the size: XS A PR changing only a single line of code label Sep 27, 2024
@zephyrbot
Copy link
Collaborator

zephyrbot commented Sep 27, 2024

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
hal_nordic zephyrproject-rtos/hal_nordic@6d4acb8 (master) zephyrproject-rtos/hal_nordic#223 zephyrproject-rtos/hal_nordic#223/files

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@zephyrbot zephyrbot added manifest manifest-hal_nordic DNM This PR should not be merged (Do Not Merge) labels Sep 27, 2024
@nika-nordic
Copy link
Collaborator Author

cc @mstasiaknordic @adamkondraciuk

Copy link
Member

@aescolar aescolar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't you need to update NRFX_CONFIG_API_VER_MINOR to 7? (Both in Zephyr side and in the templates)

@mstasiaknordic
Copy link

Don't you need to update NRFX_CONFIG_API_VER_MINOR to 7? (Both in Zephyr side and in the templates)

The release includes changes to PDM API, which are used with nrfx version 3.7. The version will be updated once Zephyr PDM driver is adjusted, not to cause build errors.

See https://github.com/zephyrproject-rtos/zephyr/pull/79177/files#diff-4b852647b675001f0093ac047dbf6b85483c8eb6919d45d3f202e2dbde6b58a4

@nika-nordic
Copy link
Collaborator Author

Don't you need to update NRFX_CONFIG_API_VER_MINOR to 7? (Both in Zephyr side and in the templates)

NRFX_CONFIG_API_VER_MINOR in templates it set to current_ver-2 (according to deprecation procedure captured here: https://github.com/NordicSemiconductor/nrfx/wiki/API-change-procedure) . It is the oldest version still supporting deprecated API

NRFX_CONFIG_API_VER_MINOR in Zephyr integration layer can be updated directly in PR integrating new nrfx revision or anytime later. In case of nrfx 3.7.0 it is updated in separate PR: #79177 to keep nrfx 3.7.0 integration PR as small as possible and thus (hopefully) merge it fast

Copy link
Member

@aescolar aescolar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Another needed change:

index 770cb70d8cc..5ecb3e0f735 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_dppi.h
@@ -149,7 +149,7 @@ static inline void hal_trigger_crypt_ppi_config(void)
 {
        nrf_radio_publish_set(NRF_RADIO,
                              NRF_RADIO_EVENT_ADDRESS, HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI);
-       nrf_ccm_subscribe_set(NRF_CCM, NRF_CCM_TASK_CRYPT, HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI);
+       nrf_ccm_subscribe_set(NRF_CCM, NRF_CCM_TASK_START, HAL_RADIO_RECV_TIMEOUT_CANCEL_PPI);
 }
 
 /*******************************************************************************
@@ -157,7 +157,7 @@ static inline void hal_trigger_crypt_ppi_config(void)
  */
 static inline void hal_trigger_crypt_ppi_disable(void)
 {
-       nrf_ccm_subscribe_clear(NRF_CCM, NRF_CCM_TASK_CRYPT);
+       nrf_ccm_subscribe_clear(NRF_CCM, NRF_CCM_TASK_START);
 }
 
 /*******************************************************************************

Copy link
Member

@aescolar aescolar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And

diff --git a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h
index b0d3948aefb..5230c9c354e 100644
--- a/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h
+++ b/subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf54lx.h
@@ -633,8 +633,8 @@ static inline uint32_t hal_radio_tx_power_value(int8_t tx_power_lvl)
                return RADIO_TXPOWER_TXPOWER_Neg20dBm;
        }
 
-       if (tx_power_lvl >= -26) {
-               return RADIO_TXPOWER_TXPOWER_Neg26dBm;
+       if (tx_power_lvl >= -28) {
+               return RADIO_TXPOWER_TXPOWER_Neg28dBm;
        }
 
        if (tx_power_lvl >= -40) {

New nrfx 3.7.0 release contains nRF54H20 EngC support
and multi-instanced PDM driver needed for nRF54L15 support.
Therefore support for PDM0 instance had to be added
in devicetree and Kconfig symbols.
Additionally, NRF_CCM_EVENT_ENDCRYPT was unified
and renamed to NRF_CCM_EVENT_END, so radio controller
and BabbleSim had to be aligned accordingly.

Signed-off-by: Nikodem Kastelik <[email protected]>
@nika-nordic nika-nordic force-pushed the integrate_nrfx_3_7_0_zephyrupstream branch from 7d254ef to e5b8594 Compare September 30, 2024 13:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: Audio area: Bluetooth Controller area: Bluetooth DNM This PR should not be merged (Do Not Merge) manifest manifest-hal_nordic platform: nRF Nordic nRFx size: XS A PR changing only a single line of code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants