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

[OTA Linux] Don't skip a call to OpenBasicCommissioningWindow() #13579

Closed
wants to merge 5 commits into from

Conversation

selissia
Copy link
Contributor

@selissia selissia commented Jan 14, 2022

Problem

Cannot commission multiple Matter instances in a single Linux node: #13429

Change overview

Revert a part of 360252c

The logic introduced in the above commit is not correct: It assumes that from GetFabricTable().FabricCount() != 0 it follows that the device is commissioned. This isn't the case: fabric count would be non-zero if the device simply loads the fabric table from storage upon init -- this does not guarantee that the device is commissioned.

The TV app issue that prompted the reverted commit needs to be revisited @xylophone21 .

Testing

Verified that the Linuix OTA scenario works.

@boring-cyborg boring-cyborg bot added the app label Jan 14, 2022
@github-actions
Copy link

PR #13579: Size comparison from b602b73 to 0a9493a

Increases (1 build for telink)
platform target config section b602b73 0a9493a change % change
telink lighting-app tlsr9518adk80d (read/write) 838462 838478 16 0.0
text 585618 585634 16 0.0
Full report (1 build for telink)
platform target config section b602b73 0a9493a change % change
telink lighting-app tlsr9518adk80d (read/write) 838462 838478 16 0.0
bss 87312 87312 0 0.0
noinit 37160 37160 0 0.0
text 585618 585634 16 0.0

@github-actions
Copy link

github-actions bot commented Jan 14, 2022

PR #13579: Size comparison from b602b73 to b39e365

Increases (6 builds for k32w, linux, p6, qpg, telink)
platform target config section b602b73 b39e365 change % change
k32w lock k32w061+release (read/write) 661604 661620 16 0.0
.text 576500 576516 16 0.0
linux thermostat-no-ble arm64 (read only) 2041980 2042044 64 0.0
.text 1697504 1697568 64 0.0
p6 all-clusters-app default (read/write) 2402304 2402320 16 0.0
.text 1360568 1360584 16 0.0
qpg lighting-app qpg6105+debug (read only) 561976 561992 16 0.0
.text 556656 556672 16 0.0
lock-app qpg6105+debug (read only) 515292 515308 16 0.0
.text 509972 509988 16 0.0
telink lighting-app tlsr9518adk80d (read/write) 838462 838478 16 0.0
text 585618 585634 16 0.0
Full report (11 builds for k32w, linux, p6, qpg, telink)
platform target config section b602b73 b39e365 change % change
k32w light k32w061+release (read/write) 657920 657920 0 0.0
.bss 77136 77136 0 0.0
.data 1852 1852 0 0.0
.text 573132 573132 0 0.0
lock k32w061+release (read/write) 661604 661620 16 0.0
.bss 77432 77432 0 0.0
.data 1872 1872 0 0.0
.text 576500 576516 16 0.0
linux chip-tool-ipv6only arm64 (read only) 8038420 8038420 0 0.0
(read/write) 370497 370497 0 0.0
.bss 55217 55217 0 0.0
.data 1096 1096 0 0.0
.data.rel.ro 245760 245760 0 0.0
.dynamic 560 560 0 0.0
.got 64728 64728 0 0.0
.init 24 24 0 0.0
.init_array 168 168 0 0.0
.rodata 419196 419196 0 0.0
.text 6830564 6830564 0 0.0
thermostat-no-ble arm64 (read only) 2041980 2042044 64 0.0
(read/write) 145969 145969 0 0.0
.bss 65089 65089 0 0.0
.data 880 880 0 0.0
.data.rel.ro 73016 73016 0 0.0
.dynamic 560 560 0 0.0
.got 4048 4048 0 0.0
.init 24 24 0 0.0
.init_array 304 304 0 0.0
.rodata 129884 129884 0 0.0
.text 1697504 1697568 64 0.0
p6 all-clusters-app default (read/write) 2402304 2402320 16 0.0
.bss 117484 117484 0 0.0
.data 2592 2592 0 0.0
.text 1360568 1360584 16 0.0
light-app default (read/write) 2327544 2327544 0 0.0
.bss 106064 106064 0 0.0
.data 2392 2392 0 0.0
.text 1285808 1285808 0 0.0
lock-app default (read/write) 2298456 2298456 0 0.0
.bss 104920 104920 0 0.0
.data 2344 2344 0 0.0
.text 1256720 1256720 0 0.0
qpg lighting-app qpg6105+debug (read only) 561976 561992 16 0.0
(read/write) 146936 146936 0 0.0
.bss 89952 89952 0 0.0
.data 1044 1044 0 0.0
.text 556656 556672 16 0.0
lock-app qpg6105+debug (read only) 515292 515308 16 0.0
(read/write) 146936 146936 0 0.0
.bss 88584 88584 0 0.0
.data 972 972 0 0.0
.text 509972 509988 16 0.0
persistent-storage-app qpg6105+debug (read only) 106848 106848 0 0.0
(read/write) 146940 146940 0 0.0
.bss 38512 38512 0 0.0
.data 288 288 0 0.0
.text 101528 101528 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 838462 838478 16 0.0
bss 87312 87312 0 0.0
noinit 37160 37160 0 0.0
text 585618 585634 16 0.0

@selissia selissia changed the title Work in Progress: Revert https://github.com/project-chip/connectedhomeip/commit/360252c… [OTA Linux] Don't skip a call to OpenBasicCommissioningWindow() Jan 17, 2022
@selissia selissia marked this pull request as ready for review January 17, 2022 17:40
@github-actions
Copy link

github-actions bot commented Jan 17, 2022

PR #13579: Size comparison from de454db to 56a0a82

Increases (13 builds for efr32, esp32, k32w, linux, mbed, p6, qpg, telink)
platform target config section de454db 56a0a82 change % change
efr32 lighting-app BRD4161A+rpc (read only) 822232 822248 16 0.0
.text 822224 822240 16 0.0
window-app BRD4161A (read only) 805424 805440 16 0.0
.text 805416 805432 16 0.0
esp32 all-clusters-app c3devkit (read only) 912094 912104 10 0.0
.flash.text 912094 912104 10 0.0
m5stack (read only) 960883 960903 20 0.0
.flash.text 955499 955519 20 0.0
k32w light k32w061+release (read/write) 659064 659080 16 0.0
.text 574276 574292 16 0.0
lock k32w061+release (read/write) 661796 661812 16 0.0
.text 576692 576708 16 0.0
linux thermostat-no-ble arm64 (read only) 2042108 2042156 48 0.0
.text 1697632 1697680 48 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read/write) 2349856 2349920 64 0.0
.text 1312432 1312496 64 0.0
p6 all-clusters-app default (read/write) 2404744 2404760 16 0.0
.text 1363008 1363024 16 0.0
light-app default (read/write) 2330048 2330064 16 0.0
.text 1288312 1288328 16 0.0
qpg lighting-app qpg6105+debug (read only) 565072 565088 16 0.0
.text 559752 559768 16 0.0
lock-app qpg6105+debug (read only) 515484 515500 16 0.0
.text 510164 510180 16 0.0
telink lighting-app tlsr9518adk80d (read/write) 840778 840794 16 0.0
text 587748 587764 16 0.0
Full report (21 builds for efr32, esp32, k32w, linux, mbed, p6, qpg, telink)
platform target config section de454db 56a0a82 change % change
efr32 lighting-app BRD4161A (read only) 834852 834852 0 0.0
(read/write) 127628 127628 0 0.0
.bss 125744 125744 0 0.0
.data 1884 1884 0 0.0
.text 834844 834844 0 0.0
BRD4161A+rpc (read only) 822232 822248 16 0.0
(read/write) 144288 144288 0 0.0
.bss 142304 142304 0 0.0
.data 1984 1984 0 0.0
.text 822224 822240 16 0.0
window-app BRD4161A (read only) 805424 805440 16 0.0
(read/write) 126320 126320 0 0.0
.bss 124480 124480 0 0.0
.data 1836 1836 0 0.0
.text 805416 805432 16 0.0
esp32 all-clusters-app c3devkit (read only) 912094 912104 10 0.0
(read/write) 1316682 1316682 0 0.0
.dram0.bss 70520 70520 0 0.0
.dram0.data 14284 14284 0 0.0
.flash.rodata 178384 178384 0 0.0
.flash.text 912094 912104 10 0.0
.iram0.text 62056 62056 0 0.0
m5stack (read only) 960883 960903 20 0.0
(read/write) 448840 448840 0 0.0
.dram0.bss 74976 74976 0 0.0
.dram0.data 34064 34064 0 0.0
.flash.rodata 207672 207672 0 0.0
.flash.text 955499 955519 20 0.0
.iram0.text 123399 123399 0 0.0
k32w light k32w061+release (read/write) 659064 659080 16 0.0
.bss 77136 77136 0 0.0
.data 1852 1852 0 0.0
.text 574276 574292 16 0.0
lock k32w061+release (read/write) 661796 661812 16 0.0
.bss 77432 77432 0 0.0
.data 1872 1872 0 0.0
.text 576692 576708 16 0.0
linux chip-tool-ipv6only arm64 (read only) 8042100 8042100 0 0.0
(read/write) 370641 370641 0 0.0
.bss 55217 55217 0 0.0
.data 1096 1096 0 0.0
.data.rel.ro 245856 245856 0 0.0
.dynamic 560 560 0 0.0
.got 64776 64776 0 0.0
.init 24 24 0 0.0
.init_array 168 168 0 0.0
.rodata 419420 419420 0 0.0
.text 6833684 6833684 0 0.0
thermostat-no-ble arm64 (read only) 2042108 2042156 48 0.0
(read/write) 145969 145969 0 0.0
.bss 65089 65089 0 0.0
.data 880 880 0 0.0
.data.rel.ro 73016 73016 0 0.0
.dynamic 560 560 0 0.0
.got 4048 4048 0 0.0
.init 24 24 0 0.0
.init_array 304 304 0 0.0
.rodata 129884 129884 0 0.0
.text 1697632 1697680 48 0.0
mbed all-clusters-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2349856 2349920 64 0.0
.bss 189220 189220 0 0.0
.data 5320 5320 0 0.0
.text 1312432 1312496 64 0.0
lighting-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2334504 2334504 0 0.0
.bss 180760 180760 0 0.0
.data 5568 5568 0 0.0
.text 1297104 1297104 0 0.0
lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2304848 2304848 0 0.0
.bss 179768 179768 0 0.0
.data 5544 5544 0 0.0
.text 1267448 1267448 0 0.0
pigweed-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 1139712 1139712 0 0.0
.bss 11756 11756 0 0.0
.data 4368 4368 0 0.0
.text 103096 103096 0 0.0
shell CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2054464 2054464 0 0.0
.bss 156876 156876 0 0.0
.data 4864 4864 0 0.0
.text 1017064 1017064 0 0.0
p6 all-clusters-app default (read/write) 2404744 2404760 16 0.0
.bss 117556 117556 0 0.0
.data 2600 2600 0 0.0
.text 1363008 1363024 16 0.0
light-app default (read/write) 2330048 2330064 16 0.0
.bss 106128 106128 0 0.0
.data 2392 2392 0 0.0
.text 1288312 1288328 16 0.0
lock-app default (read/write) 2299072 2299072 0 0.0
.bss 104976 104976 0 0.0
.data 2344 2344 0 0.0
.text 1257336 1257336 0 0.0
qpg lighting-app qpg6105+debug (read only) 565072 565088 16 0.0
(read/write) 146940 146940 0 0.0
.bss 89960 89960 0 0.0
.data 1048 1048 0 0.0
.text 559752 559768 16 0.0
lock-app qpg6105+debug (read only) 515484 515500 16 0.0
(read/write) 146936 146936 0 0.0
.bss 88584 88584 0 0.0
.data 972 972 0 0.0
.text 510164 510180 16 0.0
persistent-storage-app qpg6105+debug (read only) 106848 106848 0 0.0
(read/write) 146940 146940 0 0.0
.bss 38512 38512 0 0.0
.data 288 288 0 0.0
.text 101528 101528 0 0.0
telink lighting-app tlsr9518adk80d (read/write) 840778 840794 16 0.0
bss 87316 87316 0 0.0
noinit 37160 37160 0 0.0
text 587748 587764 16 0.0

@selissia selissia closed this Jan 18, 2022
@selissia selissia deleted the ota_linux_fix branch January 18, 2022 22:10
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.

2 participants