Skip to content

Conversation

@57300
Copy link
Contributor

@57300 57300 commented Oct 8, 2024

manifest-pr-skip

@hakonfam
Copy link
Contributor

hakonfam commented Oct 15, 2024

Please update all commits to fromtree

@57300 57300 force-pushed the nordic-owned-memory-update-ncs branch from 32fc68f to 982297e Compare October 15, 2024 08:48
@57300 57300 changed the title [nrf fromlist] dts: bindings: Update Nordic owned memory bindings [nrf fromtree] dts: bindings: Update Nordic owned memory bindings Oct 15, 2024
@57300 57300 requested a review from hakonfam October 15, 2024 08:49
@57300 57300 changed the title [nrf fromtree] dts: bindings: Update Nordic owned memory bindings nrf-regtool 7.0.0 + nordic,access + PRs #2040, #2070 Oct 16, 2024
@57300 57300 force-pushed the nordic-owned-memory-update-ncs branch from 7723959 to fe04ab1 Compare October 16, 2024 14:33
@57300 57300 changed the title nrf-regtool 7.0.0 + nordic,access + PRs #2040, #2070 nrf-regtool 7.0.0 + nordic,access + J-Link scripts Oct 16, 2024
@57300 57300 force-pushed the nordic-owned-memory-update-ncs branch 2 times, most recently from 19ef544 to fd123a5 Compare October 17, 2024 09:56
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 17, 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.

@57300 57300 changed the title nrf-regtool 7.0.0 + nordic,access + J-Link scripts nrf-regtool 7.0.0 + nordic,access + GDPWR + J-Link scripts Oct 17, 2024
@57300 57300 changed the title nrf-regtool 7.0.0 + nordic,access + GDPWR + J-Link scripts nrf-regtool 7.0.0 + nordic,access + J-Link scripts Oct 17, 2024
jonathannilsen and others added 8 commits October 17, 2024 18:27
…DACv2

Version 2 of the ADAC interface implemented by secure domain firmware
changes the ADAC RESET command used in the custom reset handling in
the JLink support scripts. The command has been split into two
commands, RESET and START, and has different semantics from
the previous RESET command. The new RESET command resets both the
application and radio domains without starting the CPUs again, and the
START command must then be used to start the CPUs.

Update the JLink support scripts for nrf54h20dk/nrf54h20/cpuapp,
nrf54h20dk/nrf54h20/cpurad, nrf9280pdk/nrf9280/cpuapp and
nrf9280pdk/nrf9280/cpurad so that they read out the ADAC interface
version from the device and use the newer commands if ADAC version 2 is
detected. If the version is lower than 2, the legacy implementation is
used.

Also improve the CTRL-AP MAILBOX transaction implementation
to avoid the need for arbitrary sleeps or unnecessary polling of
the MAILBOX. This should improve stability when using the script.

Signed-off-by: Jonathan Nilsen <[email protected]>
(cherry picked from commit d403d73)
…er for cpurad

Some tests are failing on nrf54h20 cpurad in non-obvious manner
because of this memory region being too small.
Instead of adding overlays to each individual application,
make this region larger at expense of cpuapp equivalent.

Signed-off-by: Nikodem Kastelik <[email protected]>
(cherry picked from commit e0860eb)
This concerns both `nordic,owned-memory` and `nordic,owned-partitions`.

Introduce a property named `nordic,access`, which is meant to replace
the `owner-id` and `perm-*` properties. It allows for describing how
multiple domains should access a single memory region, possibly with
different permissions per owner, but without having to create more than
one DT node for this purpose.

This change is also motivated by updated memory protection requirements
on the nRF54H20, which mandate that a given memory region must only be
reserved by one domain, even if multiple domains can have access to it.
This restriction is now described in the binding itself.

Signed-off-by: Grzegorz Swiderski <[email protected]>
(cherry picked from commit 365e9d6)
… bindings

Apply the following changes to `nrf54h20dk` and `nrf9280pdk`:

* Convert `perm-*` properties to the newly introduced `nordic,access`,
  both in board files and tests.

* Redefine shared regions to specify multiple access owners per node,
  and ensure that each such region is reserved by one domain at a time.
  `cpuapp_cpurad_ram0x_region` is only enabled by Radiocore, while
  `cpuapp_cpucell_ram0x_region` is only enabled by Application core.

* Divide `shared_ram3x_region` so that each sub-region is owned by a
  different domain. Their addresses must be rounded down to fit the
  current UICR format.

Signed-off-by: Grzegorz Swiderski <[email protected]>
(cherry picked from commit 13b1cfa)
Update the default memory maps for `nrf54h20dk` and `nrf9280pdk` to
remove the `shared_ram20_region` and `shared_ram3x_region` nodes,
because their child nodes no longer need to be grouped together:

  * IPC buffers in RAM20 are statically allocated.
  * DMA buffers in RAM3x have separate access owners.

Signed-off-by: Grzegorz Swiderski <[email protected]>
(cherry picked from commit 85b0394)
This reverts commit 30b5300.

Signed-off-by: Grzegorz Swiderski <[email protected]>
Upstream PR: zephyrproject-rtos/zephyr#79925

This new version introduces a new sub-command `uicr-compile`, which will
generate `uicr.hex` based on a new binary format required by an upcoming
release of Secure Domain Firmware (SDFW) closer to production.

Since this is a breaking change, and SDFW is not finalized yet, we need
to support two nrf-regtool versions for a short time, and use different
CLI invocations based on which version is installed. Hence, the minimum
required version is unchanged.

Additionally, retire CONFIG_NRF_REGTOOL_EXTRA_GENERATE_ARGS. There will
be no use for it moving forward.

Signed-off-by: Grzegorz Swiderski <[email protected]>
(cherry picked from commit 6c4eb43567fc82935ccff21ebfe843ccc1ac88e1)
This will be replaced by a different solution upstream (NCSDK-27673).

Migrate the existing BICR bindings from NCS 2.4.99-cs3 to NCS 2.7.0.
They are updated to remove obsoleted values. Enable generating bicr.hex
for Application core by default.

LFXO CLOAD value is a resualt of DK's characterization.

The BICR LFOSC.LFXOCONFIG.MODE field supports disabling the usage of an
external crystal oscillator to disable LFXO as LF clock source.

Signed-off-by: Grzegorz Swiderski <[email protected]>
Signed-off-by: Karol Lisak <[email protected]>
Signed-off-by: Karsten Koenig <[email protected]>
@carlescufi carlescufi merged commit 3bedb2d into nrfconnect:main Oct 17, 2024
21 checks passed
@thst-nordic
Copy link
Contributor

thst-nordic commented Oct 18, 2024

was there no sdk-nrf manifest PR for this change?

edit: sry, not sure how i missed it.

@57300
Copy link
Contributor Author

57300 commented Oct 18, 2024

was there no sdk-nrf manifest PR for this change?

It's this one: nrfconnect/sdk-nrf#17717

@57300 57300 deleted the nordic-owned-memory-update-ncs branch April 9, 2025 15:22
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.

9 participants