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.

Sign up for GitHub

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

Jump to bottom

[OTA] Update ProvderLocation struct with manual fabric index field #15826

Merged
merged 1 commit into from
Mar 4, 2022
Merged

[OTA] Update ProvderLocation struct with manual fabric index field #15826

merged 1 commit into from
Mar 4, 2022

Conversation

carol-apple
Copy link
Contributor

@carol-apple carol-apple commented Mar 3, 2022 •
edited by andy31415
Loading

Problem

The explicit fabric index field has been removed from the ProviderLocation struct. These are supposed to be automatically added for fabric scoped data. However, since the automatic bits will most likely not be in v1.0, this field still need to be manually added for now.

SPEC text:

Fabric-scoped data SHALL always include the FabricIndex field to indicate the associated fabric.
The FabricIndex field for fabric-scoped data SHALL NOT be 0 or null.

Fixes: #15435

Change overview

Add fabric index field manually with fieldId 0xFE

Testing

Tree compiled

@carol-apple carol-apple force-pushed the spec_ota_requestor_provider_location branch from 9ea376a to 1efa7ea Compare March 3, 2022 22:43
@github-actions
Copy link

github-actions bot commented Mar 3, 2022 •
edited
Loading

PR #15826: Size comparison from 050b4a7 to 1efa7ea

Increases (3 builds for esp32, linux, telink)
platform target config section 050b4a7 1efa7ea change % change
esp32 all-clusters-app c3devkit (read only) 953132 953148 16 0.0
.flash.text 953132 953148 16 0.0
linux lighting-app debug+rpc (read only) 2078625 2078641 16 0.0
.text 1757106 1757122 16 0.0
telink lighting-app tlsr9518adk80d (read/write) 887462 887470 8 0.0
text 626986 627000 14 0.0
Decreases (13 builds for cyw30739, efr32, esp32, k32w, linux, nrfconnect, qpg)
platform target config section 050b4a7 1efa7ea change % change
cyw30739 light cyw930739m2evb_01 (read/write) 600294 600286 -8 -0.0
.app_xip_area 505316 505308 -8 -0.0
lock cyw930739m2evb_01 (read/write) 558290 558282 -8 -0.0
.app_xip_area 464848 464840 -8 -0.0
ota-requestor cyw930739m2evb_01 (read/write) 580290 580210 -80 -0.0
.app_xip_area 477128 477096 -32 -0.0
.bss 85524 85484 -40 -0.0
.data 600 592 -8 -1.3
efr32 lighting-app BRD4161A (read only) 919804 919772 -32 -0.0
(read/write) 128840 128784 -56 -0.0
.bss 126752 126704 -48 -0.0
.data 2088 2080 -8 -0.4
.text 919796 919764 -32 -0.0
BRD4161A+rpc (read only) 949880 949848 -32 -0.0
(read/write) 145784 145728 -56 -0.0
.bss 143528 143480 -48 -0.0
.data 2252 2244 -8 -0.4
.text 949872 949840 -32 -0.0
esp32 all-clusters-app m5stack (read only) 1008407 1008399 -8 -0.0
.flash.text 1003023 1003015 -8 -0.0
k32w light k32w061+release (read/write) 694008 693912 -96 -0.0
.bss 77680 77640 -40 -0.1
.data 1972 1964 -8 -0.4
.text 608556 608508 -48 -0.0
linux chip-tool debug (read only) 9399325 9399293 -32 -0.0
.text 8240453 8240421 -32 -0.0
chip-tool-ipv6only arm64 (read only) 9097844 9097812 -32 -0.0
.text 7706468 7706436 -32 -0.0
ota-requestor-app debug (read only) 1891737 1891705 -32 -0.0
(read/write) 117144 116984 -160 -0.1
.bss 51360 51200 -160 -0.3
.text 1589506 1589474 -32 -0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1078115 1077971 -144 -0.0
bss 128900 128844 -56 -0.0
text 731896 731872 -24 -0.0
qpg lighting-app qpg6105+debug (read only) 603152 603112 -40 -0.0
.bss 91056 91016 -40 -0.0
.data 1172 1164 -8 -0.7
.text 597832 597792 -40 -0.0
lock-app qpg6105+debug (read only) 568836 568812 -24 -0.0
.bss 91064 91024 -40 -0.0
.data 1124 1116 -8 -0.7
.text 563516 563492 -24 -0.0
Full report (31 builds for cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, qpg, telink)
platform target config section 050b4a7 1efa7ea change % change
cyw30739 light cyw930739m2evb_01 (read/write) 600294 600286 -8 -0.0
.app_xip_area 505316 505308 -8 -0.0
.bss 77660 77660 0 0.0
.data 660 660 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
lock cyw930739m2evb_01 (read/write) 558290 558282 -8 -0.0
.app_xip_area 464848 464840 -8 -0.0
.bss 76164 76164 0 0.0
.data 624 624 0 0.0
.rodata 0 0 0 0.0
.text 0 0 0 0.0
ota-requestor cyw930739m2evb_01 (read/write) 580290 580210 -80 -0.0
.app_xip_area 477128 477096 -32 -0.0
.bss 85524 85484 -40 -0.0
.data 600 592 -8 -1.3
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 919804 919772 -32 -0.0
(read/write) 128840 128784 -56 -0.0
.bss 126752 126704 -48 -0.0
.data 2088 2080 -8 -0.4
.text 919796 919764 -32 -0.0
BRD4161A+rpc (read only) 949880 949848 -32 -0.0
(read/write) 145784 145728 -56 -0.0
.bss 143528 143480 -48 -0.0
.data 2252 2244 -8 -0.4
.text 949872 949840 -32 -0.0
lock-app BRD4161A+wf200 (read only) 988140 988140 0 0.0
(read/write) 120312 120312 0 0.0
.bss 118380 118380 0 0.0
.data 1932 1932 0 0.0
.text 988132 988132 0 0.0
window-app BRD4161A (read only) 853136 853136 0 0.0
(read/write) 126784 126784 0 0.0
.bss 124856 124856 0 0.0
.data 1924 1924 0 0.0
.text 853128 853128 0 0.0
esp32 all-clusters-app c3devkit (read only) 953132 953148 16 0.0
(read/write) 1392570 1392570 0 0.0
.dram0.bss 62536 62536 0 0.0
.dram0.data 14236 14236 0 0.0
.flash.rodata 196880 196880 0 0.0
.flash.text 953132 953148 16 0.0
.iram0.text 62016 62016 0 0.0
m5stack (read only) 1008407 1008399 -8 -0.0
(read/write) 459692 459692 0 0.0
.dram0.bss 68056 68056 0 0.0
.dram0.data 34080 34080 0 0.0
.flash.rodata 225720 225720 0 0.0
.flash.text 1003023 1003015 -8 -0.0
.iram0.text 123107 123107 0 0.0
k32w light k32w061+release (read/write) 694008 693912 -96 -0.0
.bss 77680 77640 -40 -0.1
.data 1972 1964 -8 -0.4
.text 608556 608508 -48 -0.0
lock k32w061+release (read/write) 695760 695760 0 0.0
.bss 77616 77616 0 0.0
.data 1972 1972 0 0.0
.text 610372 610372 0 0.0
linux all-clusters-app debug (read only) 2402689 2402689 0 0.0
(read/write) 144600 144600 0 0.0
.bss 59104 59104 0 0.0
.data 1392 1392 0 0.0
.data.rel.ro 78408 78408 0 0.0
.dynamic 592 592 0 0.0
.got 4160 4160 0 0.0
.init 27 27 0 0.0
.init_array 912 912 0 0.0
.rodata 205093 205093 0 0.0
.text 2034802 2034802 0 0.0
bridge-app debug+rpc (read only) 1728573 1728573 0 0.0
(read/write) 92560 92560 0 0.0
.bss 47400 47400 0 0.0
.data 2048 2048 0 0.0
.data.rel.ro 38056 38056 0 0.0
.dynamic 592 592 0 0.0
.got 3912 3912 0 0.0
.init 27 27 0 0.0
.init_array 544 544 0 0.0
.rodata 141652 141652 0 0.0
.text 1471093 1471093 0 0.0
chip-tool debug (read only) 9399325 9399293 -32 -0.0
(read/write) 305768 305768 0 0.0
.bss 25440 25440 0 0.0
.data 1136 1136 0 0.0
.data.rel.ro 273168 273168 0 0.0
.dynamic 608 608 0 0.0
.got 4760 4760 0 0.0
.init 27 27 0 0.0
.init_array 608 608 0 0.0
.rodata 497781 497781 0 0.0
.text 8240453 8240421 -32 -0.0
chip-tool-ipv6only arm64 (read only) 9097844 9097812 -32 -0.0
(read/write) 418529 418529 0 0.0
.bss 43761 43761 0 0.0
.data 1192 1192 0 0.0
.data.rel.ro 317936 317936 0 0.0
.dynamic 560 560 0 0.0
.got 51856 51856 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 473628 473628 0 0.0
.text 7706468 7706436 -32 -0.0
door-lock-app debug (read only) 1943129 1943129 0 0.0
(read/write) 119008 119008 0 0.0
.bss 50400 50400 0 0.0
.data 1056 1056 0 0.0
.data.rel.ro 62184 62184 0 0.0
.dynamic 592 592 0 0.0
.got 4096 4096 0 0.0
.init 27 27 0 0.0
.init_array 664 664 0 0.0
.rodata 173596 173596 0 0.0
.text 1621026 1621026 0 0.0
lighting-app debug+rpc (read only) 2078625 2078641 16 0.0
(read/write) 124432 124432 0 0.0
.bss 51328 51328 0 0.0
.data 1472 1472 0 0.0
.data.rel.ro 66152 66152 0 0.0
.dynamic 608 608 0 0.0
.got 4128 4128 0 0.0
.init 27 27 0 0.0
.init_array 712 712 0 0.0
.rodata 166044 166044 0 0.0
.text 1757106 1757122 16 0.0
ota-provider-app debug (read only) 1875425 1875425 0 0.0
(read/write) 114640 114640 0 0.0
.bss 50208 50208 0 0.0
.data 1352 1352 0 0.0
.data.rel.ro 57464 57464 0 0.0
.dynamic 608 608 0 0.0
.got 4352 4352 0 0.0
.init 27 27 0 0.0
.init_array 616 616 0 0.0
.rodata 158835 158835 0 0.0
.text 1566002 1566002 0 0.0
ota-requestor-app debug (read only) 1891737 1891705 -32 -0.0
(read/write) 117144 116984 -160 -0.1
.bss 51360 51200 -160 -0.3
.data 1512 1512 0 0.0
.data.rel.ro 58856 58856 0 0.0
.dynamic 592 592 0 0.0
.got 4144 4144 0 0.0
.init 27 27 0 0.0
.init_array 624 624 0 0.0
.rodata 153004 153004 0 0.0
.text 1589506 1589474 -32 -0.0
shell debug (read only) 2371721 2371721 0 0.0
(read/write) 146832 146832 0 0.0
.bss 67176 67176 0 0.0
.data 864 864 0 0.0
.data.rel.ro 73144 73144 0 0.0
.dynamic 592 592 0 0.0
.got 4144 4144 0 0.0
.init 27 27 0 0.0
.init_array 896 896 0 0.0
.rodata 205074 205074 0 0.0
.text 2010066 2010066 0 0.0
thermostat-no-ble arm64 (read only) 2169156 2169156 0 0.0
(read/write) 148417 148417 0 0.0
.bss 65121 65121 0 0.0
.data 1072 1072 0 0.0
.data.rel.ro 75048 75048 0 0.0
.dynamic 560 560 0 0.0
.got 4216 4216 0 0.0
.init 24 24 0 0.0
.init_array 352 352 0 0.0
.rodata 132900 132900 0 0.0
.text 1817984 1817984 0 0.0
tv-app debug (read only) 2610105 2610105 0 0.0
(read/write) 250744 250744 0 0.0
.bss 167904 167904 0 0.0
.data 3200 3200 0 0.0
.data.rel.ro 73616 73616 0 0.0
.dynamic 592 592 0 0.0
.got 4528 4528 0 0.0
.init 27 27 0 0.0
.init_array 880 880 0 0.0
.rodata 199133 199133 0 0.0
.text 2236994 2236994 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2350772 2350772 0 0.0
.bss 187036 187036 0 0.0
.data 5784 5784 0 0.0
.text 1313372 1313372 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1078115 1077971 -144 -0.0
bss 128900 128844 -56 -0.0
rodata 142028 142028 0 0.0
text 731896 731872 -24 -0.0
p6 all-clusters-app default (read/write) 2489608 2489608 0 0.0
.bss 118608 118608 0 0.0
.data 2696 2696 0 0.0
.text 1447872 1447872 0 0.0
light-app default (read/write) 2396728 2396728 0 0.0
.bss 112920 112920 0 0.0
.data 2544 2544 0 0.0
.text 1354992 1354992 0 0.0
lock-app default (read/write) 2360240 2360240 0 0.0
.bss 112664 112664 0 0.0
.data 2504 2504 0 0.0
.text 1318504 1318504 0 0.0
qpg lighting-app qpg6105+debug (read only) 603152 603112 -40 -0.0
(read/write) 146936 146936 0 0.0
.bss 91056 91016 -40 -0.0
.data 1172 1164 -8 -0.7
.text 597832 597792 -40 -0.0
lock-app qpg6105+debug (read only) 568836 568812 -24 -0.0
(read/write) 146936 146936 0 0.0
.bss 91064 91024 -40 -0.0
.data 1124 1116 -8 -0.7
.text 563516 563492 -24 -0.0
persistent-storage-app qpg6105+debug (read only) 99520 99520 0 0.0
(read/write) 146940 146940 0 0.0
.bss 24004 24004 0 0.0
.data 176 176 0 0.0
.text 94200 94200 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 887462 887470 8 0.0
bss 86864 86864 0 0.0
noinit 37160 37160 0 0.0
text 626986 627000 14 0.0

@andy31415 andy31415 merged commit a0a73a1 into project-chip:master Mar 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andy31415 andy31415 andy31415 approved these changes

@shubhamdp shubhamdp shubhamdp approved these changes

@bzbarsky-apple bzbarsky-apple bzbarsky-apple approved these changes

@Damian-Nordic Damian-Nordic Damian-Nordic approved these changes

@anush-apple anush-apple Awaiting requested review from anush-apple

@balducci-apple balducci-apple Awaiting requested review from balducci-apple

@Byungjoo-Lee Byungjoo-Lee Awaiting requested review from Byungjoo-Lee

@cecille cecille Awaiting requested review from cecille

@chrisdecenzo chrisdecenzo Awaiting requested review from chrisdecenzo

@chshu chshu Awaiting requested review from chshu

@chulspro chulspro Awaiting requested review from chulspro

@dhrishi dhrishi Awaiting requested review from dhrishi

@electrocucaracha electrocucaracha Awaiting requested review from electrocucaracha

@emargolis emargolis Awaiting requested review from emargolis

@erjiaqing erjiaqing Awaiting requested review from erjiaqing

@franck-apple franck-apple Awaiting requested review from franck-apple

@gjc13 gjc13 Awaiting requested review from gjc13

@harimau-qirex harimau-qirex Awaiting requested review from harimau-qirex

@hawk248 hawk248 Awaiting requested review from hawk248

@harsha-rajendran harsha-rajendran Awaiting requested review from harsha-rajendran

@isiu-apple isiu-apple Awaiting requested review from isiu-apple

@jelderton jelderton Awaiting requested review from jelderton

@jepenven-silabs jepenven-silabs Awaiting requested review from jepenven-silabs

@jmartinez-silabs jmartinez-silabs Awaiting requested review from jmartinez-silabs

@kpschoedel kpschoedel Awaiting requested review from kpschoedel

@lazarkov lazarkov Awaiting requested review from lazarkov

@LuDuda LuDuda Awaiting requested review from LuDuda

@lzgrablic02 lzgrablic02 Awaiting requested review from lzgrablic02

@mrjerryjohns mrjerryjohns Awaiting requested review from mrjerryjohns

@msandstedt msandstedt Awaiting requested review from msandstedt

@robszewczyk robszewczyk Awaiting requested review from robszewczyk

@sagar-apple sagar-apple Awaiting requested review from sagar-apple

@saurabhst saurabhst Awaiting requested review from saurabhst

@selissia selissia Awaiting requested review from selissia

@tecimovic tecimovic Awaiting requested review from tecimovic

@turon turon Awaiting requested review from turon

@vijs vijs Awaiting requested review from vijs

@vivien-apple vivien-apple Awaiting requested review from vivien-apple

@wbschiller wbschiller Awaiting requested review from wbschiller

@woody-apple woody-apple Awaiting requested review from woody-apple

@xylophone21 xylophone21 Awaiting requested review from xylophone21

Assignees
No one assigned
Labels
app controller darwin examples review - approved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Remove fabric index field from the ProviderLocation struct
5 participants
@carol-apple @andy31415 @shubhamdp @bzbarsky-apple @Damian-Nordic