From 9ede8cd87eaf741464f63d073fa3d0f511975f7c Mon Sep 17 00:00:00 2001 From: Vinayak Kariappa Chettimada Date: Wed, 17 May 2023 06:01:59 +0530 Subject: [PATCH] dts: nRF: Add missing headermask binding for NRF_CCM Add missing headermask binding for NRF_CCM peripheral and define HAS_HW_NRF_CCM_HEADERMASK Kconfig. Signed-off-by: Vinayak Kariappa Chettimada --- dts/arm/nordic/nrf52820.dtsi | 1 + dts/arm/nordic/nrf52833.dtsi | 1 + dts/arm/nordic/nrf5340_cpunet.dtsi | 1 + dts/bindings/crypto/nordic,nrf-ccm.yaml | 7 +++++++ soc/arm/nordic_nrf/Kconfig.peripherals | 3 +++ 5 files changed, 13 insertions(+) diff --git a/dts/arm/nordic/nrf52820.dtsi b/dts/arm/nordic/nrf52820.dtsi index 66fd7263caa..6d2f5eb02fe 100644 --- a/dts/arm/nordic/nrf52820.dtsi +++ b/dts/arm/nordic/nrf52820.dtsi @@ -245,6 +245,7 @@ reg = <0x4000f000 0x1000>; interrupts = <15 NRF_DEFAULT_IRQ_PRIORITY>; length-field-length-8-bits; + headermask-supported; status = "okay"; }; diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi index 677ebd815d6..08c806cc99b 100644 --- a/dts/arm/nordic/nrf52833.dtsi +++ b/dts/arm/nordic/nrf52833.dtsi @@ -265,6 +265,7 @@ reg = <0x4000f000 0x1000>; interrupts = <15 NRF_DEFAULT_IRQ_PRIORITY>; length-field-length-8-bits; + headermask-supported; status = "okay"; }; diff --git a/dts/arm/nordic/nrf5340_cpunet.dtsi b/dts/arm/nordic/nrf5340_cpunet.dtsi index 13e39a2a968..63c7e920f81 100644 --- a/dts/arm/nordic/nrf5340_cpunet.dtsi +++ b/dts/arm/nordic/nrf5340_cpunet.dtsi @@ -144,6 +144,7 @@ reg = <0x4100e000 0x1000>; interrupts = <14 NRF_DEFAULT_IRQ_PRIORITY>; length-field-length-8-bits; + headermask-supported; status = "okay"; }; diff --git a/dts/bindings/crypto/nordic,nrf-ccm.yaml b/dts/bindings/crypto/nordic,nrf-ccm.yaml index 6a43ebb758e..fbcfbc4023d 100644 --- a/dts/bindings/crypto/nordic,nrf-ccm.yaml +++ b/dts/bindings/crypto/nordic,nrf-ccm.yaml @@ -20,3 +20,10 @@ properties: Indicates whether the CCM peripheral supports the extended length (8 bits) of the LENGTH field in encrypted/decrypted packets. If not set, only the default length (5 bits) is supported. + + headermask-supported: + type: boolean + description: | + Indicates whether the CCM peripheral supports the headermask register to + set the PDU header bitmask used to derive the additional authentication + data (AAD) in CCM for Bluetooth Low Energy ACL, BIS and CIS PDUs. diff --git a/soc/arm/nordic_nrf/Kconfig.peripherals b/soc/arm/nordic_nrf/Kconfig.peripherals index e81d195b2a0..c7bfb552409 100644 --- a/soc/arm/nordic_nrf/Kconfig.peripherals +++ b/soc/arm/nordic_nrf/Kconfig.peripherals @@ -24,6 +24,9 @@ config HAS_HW_NRF_CCM config HAS_HW_NRF_CCM_LFLEN_8BIT def_bool $(dt_nodelabel_bool_prop,ccm,length-field-length-8-bits) +config HAS_HW_NRF_CCM_HEADERMASK + def_bool $(dt_nodelabel_bool_prop,ccm,headermask-supported) + config HAS_HW_NRF_CLOCK def_bool $(dt_compat_enabled,$(DT_COMPAT_NORDIC_NRF_CLOCK))