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

Matter 1.4 upmerge #512

Merged
merged 2,171 commits into from
Nov 28, 2024
Merged

Matter 1.4 upmerge #512

merged 2,171 commits into from
Nov 28, 2024

Conversation

adigie
Copy link
Member

@adigie adigie commented Nov 15, 2024

restyled-commits and others added 30 commits October 1, 2024 13:57
…re if the exit code is not 0 AND if the process was responding (we ignore cases where the process is stuck) (#35817)
* Make Subprocess wrapper class even more generic

* Add ECOINFO_2_1 to CI

* Add ECOINFO_2_2 to CI

* Rewrite TC_MCORE_FS CI arguments to YAML

* [Testing] Convenience property for checking PICS_SDK_CI_ONLY

* Guard CI prerequisites setup with PICS SDK CI

* Fix typo
* General updates needed for camera spec

* Generated via ./scripts/tools/zap_regen_all.py

* Apply review suggestions from project-chip/connectedhomeip#35775

* Re-generated using ./scripts/tools/zap_regen_all.py after pigweed update
* Updated PICS Generator to match 1.4 PICS

* Add script to validate PICS and cluster macthing

* Updated based on review feedback

* Apply suggestions from code review

Co-authored-by: C Freeman <[email protected]>
Co-authored-by: Andrei Litvin <[email protected]>

* Add XMLPICSValidator to wordlist

* Restyled by prettier-markdown

* Restyled by isort

---------

Co-authored-by: C Freeman <[email protected]>
Co-authored-by: Andrei Litvin <[email protected]>
Co-authored-by: Restyled.io <[email protected]>
* Adding endpoint information to test steps methods and hooks along with logging.

Also, the TC_ACE_1_3 and TC_BOOLCFG_2_1 tests were updated to demonstrate how to
used the updated hooks to inform the endpoint associated with every step.

* Rolling back the test stop unnecessary exception parameter

* Updating TestDecoratorHooks with endpoint as well.

* Minor grammar fix

Co-authored-by: Boris Zbarsky <[email protected]>

---------

Co-authored-by: Boris Zbarsky <[email protected]>
* Fix Android resolve exception issue

* Restyled by google-java-format

---------

Co-authored-by: Restyled.io <[email protected]>
* fan rocksetting; thermostat dry mode

* revert change
* Update rootnode_waterleakdetector_0b067acfa3.zap

Add Power Source cluster to EP1 to simulate a battery

* Update rootnode_waterleakdetector_0b067acfa3.matter

Add Power Source cluster to EP1 to Matter file

* Update rootnode_waterleakdetector_0b067acfa3.matter

* Update rootnode_waterleakdetector_0b067acfa3.zap

* Update rootnode_waterleakdetector_0b067acfa3.matter

Remove Scenes Management Cluster

* Manual correction of device type order due to ZAP tool bug

* Update rootnode_waterleakdetector_0b067acfa3.zap

* Update rootnode_waterleakdetector_0b067acfa3.zap

* Update rootnode_waterleakdetector_0b067acfa3.zap

* Update rootnode_waterleakdetector_0b067acfa3.matter

* Update rootnode_waterleakdetector_0b067acfa3.zap

* Update rootnode_waterleakdetector_0b067acfa3.matter
* [feat] Add littlefs to access flash storage

* fix restyle

* update ci build job and remove regex in BLConfig_littlefs.cpp

* fix restyle

* fix compile error

* fix restyle

* fix compile error after restyle

* fix restyle with include order
* Remove event list attribute support

* Restyle

* Restyled by clang-format

* Remove matter event list from defaults and from cmake builds

---------

Co-authored-by: Restyled.io <[email protected]>
…t is runned with atexit into its own autorelease pool (#35878)
…OL instead of DISPATCH_QUEUE_SERIAL (#35876)
* getter for air quality

* Added Air Quality Sample app for silabs

* Restyled by whitespace

* Restyled by clang-format

* Restyled by prettier-markdown

* added build in CI

* minor fix

* Revert "added build in CI"

This reverts commit 5a1fcda96096a172f1e7fb36fdbe8d269fce741d.

* Revert "minor fix"

This reverts commit 8fa8df289dcbfe6840e425d2330d3ee740577e6b.

* added build for app

* added app to target

* resolved comments

* Restyled by whitespace

* Restyled by clang-format

* using schedulework

* using schedulework instead of chiplock

* Restyled by clang-format

* removing unneccessary loggs, resolved memory leak

---------

Co-authored-by: Restyled.io <[email protected]>
…rsion checks (#35863)

* Update repoting Engine to be able to use DataModel::Provider for version checks.

* Restyle

* Fix an include

* Fix an include

* Fix an include

* Restyled by clang-format

* Update src/app/reporting/Read-Ember.cpp

Co-authored-by: Boris Zbarsky <[email protected]>

---------

Co-authored-by: Andrei Litvin <[email protected]>
Co-authored-by: Restyled.io <[email protected]>
Co-authored-by: Boris Zbarsky <[email protected]>
…heckEventSupportStatus from ember-compatibility) (#35873)

* Update event support checks

* Fix an include

* Restyled by clang-format

* Fix typo

* Restyled by clang-format

* Added a EndpointExists call to the datamodel provider along with a default implementation

* Remove missing config use after merge with master

* Restyled by clang-format

---------

Co-authored-by: Restyled.io <[email protected]>
* Reuse Subprocess in run_python_test.py script

* Add --app-ready-pattern option to run_python_test.py

* Replace script-start-delay with app-ready-pattern

* Drop support for script-start-delay

* Use rmtree() instead of explicit "rm -rf" calls

* Update missed python.md section

* Silence output from tests

* Fix removing files

* Restyled by prettier-markdown

* Fix documentation builder warning

* Remove unused import

* Fix Metadata unit test

---------

Co-authored-by: Restyled.io <[email protected]>
* [Chef] Update Refrigerator to TemperatureNumber

* Restyled by clang-format

* Restyled by gn

* Fix comformance issues

checked by

python ./src/python_testing/TC_DeviceBasicComposition.py  --storage-path admin_storage.json --manual-code 34970112332 --bool-arg ignore_in_progress:True allow_provisional:True --PICS src/app/tests/suites/certification/ci-pics-values

python ./src/python_testing/TC_DeviceConformance.py  --storage-path admin_storage.json --manual-code 34970112332 --bool-arg ignore_in_progress:True allow_provisional:True --PICS src/app/tests/suites/certification/ci-pics-values

* Add taglist to Endpoints to fix conformance issue

Caused by  test_TC_DESC_2_2:
 For device types with more than one endpoint listed, ensure each of the listed endpoints has a tag attribute and the tag attributes are not the same

* Restyled by clang-format

* Use MATTER_DM_PLUGIN_REFRIGERATOR_ALARM_SERVER

Use MATTER_DM_PLUGIN_REFRIGERATOR_ALARM_SERVER to enable TagList for
refrigerator since
MATTER_DM_PLUGIN_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SERVER
could be used by oven

* Use unique_ptr instead of new

* Restyled by clang-format

---------

Co-authored-by: Restyled.io <[email protected]>
We don't want the LoggerForModule() implementation to call retain/autorelease
on the logger, because its unnecessary, and because LoggerForModule() can be
called from a C++ context without an auto-release pool in place.

To avoid this, we can have LoggerForModule() return a raw pointer, and handle
the bridge cast to os_log_t on the caller side. This also avoids unnecessary
code on the caller side that would otherwise attempt to rescue the
presumed-autoreleased logger object from the ARP.
…perature control cluster support (#35857)

* Add chef laundry dryer sample app with operation state cluster support

* Restyled by prettier-json

* Use TL feature instead of TN for tempereature control cluster

---------

Co-authored-by: Restyled.io <[email protected]>
…mmandHandler. (#35868)

We want do to that before we actually fetch the credential we are trying to get
the status of, since determining the next occupied credential index might stomp
on data returned by emberAfPluginDoorLockGetCredential.
ArekBalysNordic and others added 26 commits November 28, 2024 09:30
We should use psa_crypto_config only if PSA SSF crypto client
is in use.

(cherry picked from commit ea40e41)
Signed-off-by: Adrian Gielniewski <[email protected]>
SHELL_WILDCARD is not supported for Matter devices in the newest
Zephyr version because it selects POSIX_C_LIB_EXT, so we need to
disable it.

(cherry picked from commit a5bd017)
Signed-off-by: Adrian Gielniewski <[email protected]>
Added nRF54L15 DK NS to configuration.

Signed-off-by: Arkadiusz Balys <[email protected]>
(cherry picked from commit 06a873e)
Signed-off-by: Adrian Gielniewski <[email protected]>
We need cache processing for SUIT purposes both for Matter OTA
and DFU over BLE SMP.

(cherry picked from commit 632ea12)
Signed-off-by: Adrian Gielniewski <[email protected]>
Aligned the MCUmgr Bluetooth transport Kconfig with the latest
changes from Zephyr.

Ref: NCSDK-29061

Signed-off-by: Kamil Piszczek <[email protected]>
(cherry picked from commit 5a55d60)
Signed-off-by: Adrian Gielniewski <[email protected]>
It is better to call the ScheduleFactoryReset method from
the Server, because it also removes all fabrics and emits the Leave
event whereas calling InitiateFactoryReset() removes only the
persistent storage entries.

In this way, the Matter Shell command works in the same way as
other factory reset sources.

We cannot upmerge it in an easy way because many vendors do not
use chip server and there are multiple building issues.

Signed-off-by: Arkadiusz Balys <[email protected]>
(cherry picked from commit 973259c)
Signed-off-by: Adrian Gielniewski <[email protected]>
This commit updates the IPv6 multicast subscription mechanism by
explicitly using the MLDv2 join procedure. This change ensures proper
registration for multicast addresses, improving reliability in multicast
communication.

Signed-off-by: Łukasz Duda <[email protected]>
(cherry picked from commit 08acaf4)
Signed-off-by: Adrian Gielniewski <[email protected]>
This commit makes in clear which crypto driver is enabled by default.
Additionally, stack overflow has been fixed for CC3XX variant, and
mbedTLS Heap is disabled for TF-M variant.

Signed-off-by: Łukasz Duda <[email protected]>
(cherry picked from commit bdec5fd)
Signed-off-by: Adrian Gielniewski <[email protected]>
The upstream WPA supplicant uses k_heap instead of libc_heap, so,
move the heap to k_heap.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 8c09c31)
Signed-off-by: Adrian Gielniewski <[email protected]>
By default nRF70 driver allocates a higher heap to handle most cases,
but as Matter doesn't use much heap, enable the ignore minimum warning
configuration.

Signed-off-by: Chaitanya Tata <[email protected]>
(cherry picked from commit 5c19b19)
Signed-off-by: Adrian Gielniewski <[email protected]>
When using nRF54L15 the stack size required for crypto operations
by OpenThread is bigger and must be increased.

Signed-off-by: Kamil Kasperczyk <[email protected]>
(cherry picked from commit 3567e53)
Signed-off-by: Adrian Gielniewski <[email protected]>
Added a possibility to use ZMS fs backend in Zephyr.
NVS fs backend imply is now controlled by the nrfconnect platform
configuration directly.
All other platforms use NVS fs backend by default.

Signed-off-by: Arkadiusz Balys <[email protected]>
(cherry picked from commit 0c49058)
Signed-off-by: Adrian Gielniewski <[email protected]>

[nrf toup] Fix defines for ZMS

It can be squashed with the 0c49058 commit.

Signed-off-by: Arkadiusz Balys <[email protected]>
(cherry picked from commit 5148b72)
Signed-off-by: Adrian Gielniewski <[email protected]>
Disabled NVS and enabled ZMS fs backend for all devices that
uses RRAM.

Signed-off-by: Arkadiusz Balys <[email protected]>
(cherry picked from commit 9a4ea8e)
Signed-off-by: Adrian Gielniewski <[email protected]>
When a Matter application provides the VERSION file, the
Matter software version string is set to 4-number string,
such as "2.7.99+0" and the EXTRAVERSION field, which is
typically used to denote the branch or tag name, such as
"dev" or "rc1", is ignored.

If the EXTRAVERSION field is non-empty, set the Matter
software version string to a string such as "2.7.99-dev+0".

(cherry picked from commit 731aac5)
Signed-off-by: Adrian Gielniewski <[email protected]>
Added support for multi-image dfu target while using SUIT.

Signed-off-by: Arkadiusz Balys <[email protected]>
(cherry picked from commit 7486fd3)
Signed-off-by: Adrian Gielniewski <[email protected]>
Targets using cracen crypto backend requires bigger CHIP
stack size.

Signed-off-by: Kamil Kasperczyk <[email protected]>
(cherry picked from commit 1fb9792)
Signed-off-by: Adrian Gielniewski <[email protected]>
On nRF54L devices we can use KMU to store the DAC private key,
and allow using it directly by CRACEN.
By default the DAC private key is encrypted so it needs
4 KMU slots.

Signed-off-by: Arkadiusz Balys <[email protected]>
(cherry picked from commit 5580536)
Signed-off-by: Adrian Gielniewski <[email protected]>
Enabled DAC migration for all targets using Thread protocol,
as Wi-Fi does not support PSA yet.

Signed-off-by: Kamil Kasperczyk <[email protected]>
(cherry picked from commit 700233b)
Signed-off-by: Adrian Gielniewski <[email protected]>
- Fixed wrong dependency in Kconfigs
- Fixed wrong bracket placement that causes overwriting DAC private
key.

Signed-off-by: Arkadiusz Balys <[email protected]>
(cherry picked from commit 668f104)
Signed-off-by: Adrian Gielniewski <[email protected]>
Until we do not have a proper solution for merging the factory data
hex file with the firmware hex file, we need to flash the factory
data manually. This commit allows doing that on nRF54H20 DK.

Signed-off-by: Arkadiusz Balys <[email protected]>
(cherry picked from commit 95a8c0f)
Signed-off-by: Adrian Gielniewski <[email protected]>
Enabled storing the DAC private key in KMU if it is available.
It enables storing the DAC private key in KMU for nRF54L15 device.

Signed-off-by: Arkadiusz Balys <[email protected]>
(cherry picked from commit aa968a6)
Signed-off-by: Adrian Gielniewski <[email protected]>
`FPROTECT` should be disabled for nRF54L15 in app to allow
correctly protecting whole region of mcuboot

Signed-off-by: Maciej Baczmanski <[email protected]>
(cherry picked from commit 81eb1e9)
Signed-off-by: Adrian Gielniewski <[email protected]>
* Disable `Backwards compatibility check`
* Disable `Check for changes to data_model directory without a sha
update`

Signed-off-by: Adrian Gielniewski <[email protected]>
Signed-off-by: Adrian Gielniewski <[email protected]>
fixup! [nrf noup] config: Add initial sysbuild files

Adds support for factory data generation using devicetree data from
the primary sysbuild image, if partition manager is not enabled for
a build

Signed-off-by: Jamie McCrae <[email protected]>
(cherry picked from commit 93c712e)
Signed-off-by: Adrian Gielniewski <[email protected]>
When Spake2+ implementation for PSA crypto API is enabled:
- do not build the generic Spake2p nor its subclasses
- do not build Spake2pVerifier::Generate method that
  generates the verifier key out of the passcode, salt and
  iteration count.

Instead, provide the implementation Spake2pVerifier::Generate
that uses PSA crypto API.

Note that using Spake2pVerifier::Generate requires setting
CONFIG_PSA_WANT_ALG_PBKDF2_HMAC and
CONFIG_PSA_WANT_KEY_TYPE_SPAKE2P_KEY_PAIR_DERIVE Kconfig
options.

Signed-off-by: Damian Krolik <[email protected]>
(cherry picked from commit aa2e056)
Signed-off-by: Adrian Gielniewski <[email protected]>
@ArekBalysNordic ArekBalysNordic merged commit 9cfd6e1 into nrfconnect:master Nov 28, 2024
12 checks passed
@adigie adigie deleted the upmerge-1.4 branch November 28, 2024 15:11
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.