michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: controller: Return FICR as a static address IR

Browse source 
Return the IR defined in FICR as the Identity Root for the static
address through the read static addresses command instead of providing
it through the Read Key Hierarchy Root command.
This is following the recommendations in the Zephyr HCI extension
document in doc/reference/bluetooth/hci.txt

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2019-12-05 12:36:41 +01:00 • committed by Carles Cufí
commit 091ebf905d
1 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

36
subsys/bluetooth/controller/hci/hci.c
View file

@ -1946,8 +1946,22 @@ static void vs_read_static_addrs(struct net_buf *buf, struct net_buf **evt)
*/
BT_ADDR_SET_STATIC(&addr->bdaddr);
/* Mark IR as invalid */
(void)memset(addr->ir, 0x00, sizeof(addr->ir));
/* If no public address is provided and a static address is
* available, then it is recommended to return an identity root
* key (if available) from this command.
*/
if ((NRF_FICR->IR[0] != UINT32_MAX) &&
(NRF_FICR->IR[1] != UINT32_MAX) &&
(NRF_FICR->IR[2] != UINT32_MAX) &&
(NRF_FICR->IR[3] != UINT32_MAX)) {
sys_put_le32(NRF_FICR->IR[0], &addr->ir[0]);
sys_put_le32(NRF_FICR->IR[1], &addr->ir[4]);
sys_put_le32(NRF_FICR->IR[2], &addr->ir[8]);
sys_put_le32(NRF_FICR->IR[3], &addr->ir[12]);
} else {
/* Mark IR as invalid */
(void)memset(addr->ir, 0x00, sizeof(addr->ir));
}
return;
}
@ -1967,19 +1981,11 @@ static void vs_read_key_hierarchy_roots(struct net_buf *buf,
rp->status = 0x00;
#if defined(CONFIG_SOC_COMPATIBLE_NRF)
/* Fill in IR if present */
if ((NRF_FICR->IR[0] != UINT32_MAX) &&
(NRF_FICR->IR[1] != UINT32_MAX) &&
(NRF_FICR->IR[2] != UINT32_MAX) &&
(NRF_FICR->IR[3] != UINT32_MAX)) {
sys_put_le32(NRF_FICR->IR[0], &rp->ir[0]);
sys_put_le32(NRF_FICR->IR[1], &rp->ir[4]);
sys_put_le32(NRF_FICR->IR[2], &rp->ir[8]);
sys_put_le32(NRF_FICR->IR[3], &rp->ir[12]);
} else {
/* Mark IR as invalid */
(void)memset(rp->ir, 0x00, sizeof(rp->ir));
}
/* Mark IR as invalid.
* No public address is available, and static address IR should be read
* using Read Static Addresses command.
*/
(void)memset(rp->ir, 0x00, sizeof(rp->ir));
/* Fill in ER if present */
if ((NRF_FICR->ER[0] != UINT32_MAX) &&