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

Misc nRF54H20 updates #1681

Merged
merged 17 commits into from
May 14, 2024
Merged

Conversation

57300
Copy link
Contributor

@57300 57300 commented May 6, 2024

Alternative to #1642 which tracks latest.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented May 6, 2024

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

Name Old Revision New Revision Diff

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

@e-rk
Copy link
Contributor

e-rk commented May 8, 2024

@57300 would it be possible to split [nrf fromtree] boards: nordic: nrf54h20dk: Update memory map to a separate PR to merge it sooner? It is needed by multiple people who work on nRF54H20.

Edit: I have created #1688

@carlescufi carlescufi requested review from kl-cruz and gmarull May 8, 2024 09:16
modules/hal_nordic/CMakeLists.txt Outdated Show resolved Hide resolved
57300 and others added 6 commits May 10, 2024 14:11
This reverts commit 8a5c578.

A newer revision will be re-applied from the PR.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
…to nRF54H20"

This reverts commit 3be1bc0.

To be re-applied in the correct git history order.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
This definition is used in nrfx header files, so it shouldn't be added
using `zephyr_library_compile_definitions()`. This would cause the GRTC
driver to fail the build when CONFIG_NRF_GRTC_START_SYSCOUNTER=y.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 35e418f)
Add a VEVIF node to be used for communicating with SysCtrl (cpusys).
This is the only part of the SysCtrl VPR exposed to local domains.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 163cacb)
…SysCtrl

Add the default `zephyr,ipc-icmsg` nodes for communication with
Application and Radiocore.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 711abcd)
Interrupt handlers are expected to have a pototype
void (const void*)
but nrfx_grtc_irq_handler has just a void(void)
(with no input parameter).
Fix it by using a trampoline.

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
(cherry picked from commit 8e20b80)
lstnl and others added 11 commits May 10, 2024 14:20
Fixed order of mepc and _mcause in esf for 32bit stacking.
Added missing stack pointer alignement bit support.'

Signed-off-by: Lukasz Stepnicki <lukasz.stepnicki@nordicsemi.no>
(cherry picked from commit 37e3449)
Add missing USBHS node to list of global peripherals.

Signed-off-by: Håkon Amundsen <haakon.amundsen@nordicsemi.no>
(cherry picked from commit 5895be5)
Added EXMIF peripheral DTS description and bindings.
The peripheral operates as an SPI device.

Signed-off-by: Rafał Kuźnia <rafal.kuznia@nordicsemi.no>
(cherry picked from commit 4d30ccb)
Upstream PR: zephyrproject-rtos/zephyr#71536

If no HSFLL needs trimming, then `trim_hsfll()` should be compiled out.
This makes it easier to reuse the rest of `soc.c` out of tree.

Furthermore, some HSFLL instances can be trimmed before booting Zephyr,
so the FICR client properties in the DT binding should not be required.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 0803dc254b193dd10d94a99ca1289318d483087f)
Upstream PR: zephyrproject-rtos/zephyr#71536

Make the SoC initialization priority configurable.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit d5442da200a4b1e9ac3a11b4ea16c6a69666729c)
Upstream PR: zephyrproject-rtos/zephyr#71536

Add `CHECK_DT_REG()` entries for a few additional peripheral types:
BELLBOARD, CCM, GRTC, HSFLL, UICR, and VPR.

For peripheral instances outside of the Global Domain, such as DPPIC020,
use domain-specific defines like NRF_RADIOCORE_DPPIC020 when validating.
These are always defined by the MDK, while NRF_DPPIC020 isn't guaranteed
to exist in those cases. Revise existing macro checks accordingly.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 1750413c7f22a76d504c35a890d31eab469c9850)
Upstream PR: zephyrproject-rtos/zephyr#71609

Add devicetree nodes for the Reset Information registers on nRF54H20,
along with a new binding.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit 8fe636b4d583b7f3d119d7e80094e3b5bfa52099)
Upstream PR: zephyrproject-rtos/zephyr#71688

This commit aligns the GRTC driver to changes introduced in
hal_nordic. Some of the features regarding GRTC sleep/wakeup
functionality has been modified and moved out to the nrfx
driver's code.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 88a50aa5ee0a01fe029676b916329dc75ca5deea)
Upstream PR: zephyrproject-rtos/zephyr#71688

The `z_nrf_grtc_timer_get_ticks()` function converts system ticks
to GRTC ticks. It gets the current system tick to calculate an
absolute GRTC value. The same does the test function to provide
an argument to be converted. If the system tick occurs between those
`sys_clock_tick_get()` calls the `z_nrf_grtc_timer_get_ticks()` will
take into account the newer tick while the test estimate bases on
the old tick value. Due to that the maximum result error is 1 system
tick minus 1 GRTC tick which equals (`CYC_PER_TICK` - 1) for GRTC
ticks.

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 57713428a84d4a86290bae9c636a5d0606b9798f)
Upstream PR: zephyrproject-rtos/zephyr#72273

Access to this region should no longer be requested via UICR, because it
will be statically allocated by secure domain firmware.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
(cherry picked from commit d95aa856e98b6561d534cbe36ffc6e87de3deab2)
Each local RESETINFO instance can be used in samples.
Applied as `noup` because of conflicts.

Signed-off-by: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
@@ -0,0 +1,12 @@
# Copyright (c) 2024 Nordic Semiconductor ASA
Copy link
Contributor

Choose a reason for hiding this comment

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

Why is this commit in this PR? This change was already merged to sdk-zephyr main: 7ea6937

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The EXMIF patch is reverted and re-applied to avoid conflicts.

@carlescufi carlescufi merged commit 04cb694 into nrfconnect:main May 14, 2024
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants