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

Make Software Diagnostics not claim to support ResetWatermarks if it's not supported. #19536

Merged

Conversation

bzbarsky-apple
Copy link
Contributor

This modifies the AcceptedCommandList for Software Diagnostics to only
list ResetWatermarks if the command is in fact supported (which makes
it match the feature map).

Also makes the response UNSUPPORTED_COMMAND instead of FAILURE when
it's not supported.

Problem

We claim to accept a command we actually don't support.

Change overview

Make all our command metadata and error codes match our feature map for software diagnostics.

Testing

Made sure that the behavior is correct when SupportsWatermarks() returns both true and false.

…s not supported.

This modifies the AcceptedCommandList for Software Diagnostics to only
list ResetWatermarks if the command is in fact supported (which makes
it match the feature map).

Also makes the response UNSUPPORTED_COMMAND instead of FAILURE when
it's not supported.
@github-actions
Copy link

github-actions bot commented Jun 13, 2022

PR #19536: Size comparison from e38e2a6 to a14ec9f

Increases above 0.2%:

platform target config section e38e2a6 a14ec9f change % change
linux bridge-app debug+rpc .rodata 191040 191552 512 0.3
shell debug .rodata 229778 230290 512 0.2
tv-app debug .rodata 242720 243232 512 0.2
Increases (36 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section e38e2a6 a14ec9f change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 658295 658479 184 0.0
.bss 73780 73796 16 0.0
.rodata 87023 87047 24 0.0
.text 570960 571120 160 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 644835 645027 192 0.0
(read/write) 157276 157292 16 0.0
.bss 73004 73020 16 0.0
.rodata 90035 90067 32 0.0
.text 554480 554640 160 0.0
lock-ftd LP_CC2652R7 (read only) 687707 687875 168 0.0
.bss 71740 71756 16 0.0
.rodata 98859 98883 24 0.0
.text 588364 588508 144 0.0
lock-mtd LP_CC2652R7 (read only) 637115 637283 168 0.0
(read/write) 144872 144888 16 0.0
.bss 67476 67492 16 0.0
.rodata 98739 98763 24 0.0
.text 537884 538028 144 0.0
pump-controller-app LP_CC2652R7 (read only) 659655 659823 168 0.0
.bss 71988 72004 16 0.0
.rodata 84879 84903 24 0.0
.text 574292 574436 144 0.0
shell LP_CC2652R7 (read only) 688446 688630 184 0.0
.bss 76076 76092 16 0.0
.rodata 110094 110118 24 0.0
.text 578040 578200 160 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 606554 606746 192 0.0
.app_xip_area 465052 465228 176 0.0
.bss 84432 84448 16 0.0
lock cyw930739m2evb_01 (read/write) 603678 603862 184 0.0
.app_xip_area 462032 462200 168 0.0
.bss 84608 84624 16 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 611374 611382 8 0.0
.app_xip_area 470800 470808 8 0.0
efr32 lighting-app BRD4161A (read only) 919264 919472 208 0.0
(read/write) 133440 133456 16 0.0
.bss 131320 131336 16 0.0
.text 919256 919464 208 0.0
BRD4161A+rpc (read only) 953436 953644 208 0.0
(read/write) 150128 150144 16 0.0
.bss 147808 147824 16 0.0
.text 953428 953636 208 0.0
BRD4161A+rs911x (read only) 794388 794588 200 0.0
(read/write) 129720 129736 16 0.0
.bss 127596 127612 16 0.0
.text 794380 794580 200 0.0
lock-app BRD4161A+wf200 (read only) 962532 962716 184 0.0
(read/write) 130060 130076 16 0.0
.bss 127972 127988 16 0.0
.text 962524 962708 184 0.0
window-app BRD4161A (read only) 904168 904368 200 0.0
(read/write) 133512 133528 16 0.0
.bss 131400 131416 16 0.0
.text 904160 904360 200 0.0
esp32 all-clusters-app c3devkit (read only) 1012668 1012810 142 0.0
(read/write) 1483282 1483330 48 0.0
.dram0.bss 69408 69424 16 0.0
.flash.rodata 213744 213776 32 0.0
.flash.text 1012668 1012810 142 0.0
m5stack (read only) 1066979 1067131 152 0.0
(read/write) 485392 485432 40 0.0
.dram0.bss 74936 74952 16 0.0
.flash.rodata 244236 244260 24 0.0
.flash.text 1061595 1061747 152 0.0
k32w light k32w061+release (read/write) 657248 657424 176 0.0
.bss 69748 69764 16 0.0
.text 579672 579832 160 0.0
lock k32w061+release (read/write) 718860 719044 184 0.0
.bss 70180 70196 16 0.0
.text 640880 641048 168 0.0
linux all-clusters-app debug (read only) 2923761 2924585 824 0.0
(read/write) 188528 188624 96 0.1
.bss 95776 95808 32 0.0
.data.rel.ro 84488 84552 64 0.1
.rodata 258205 258333 128 0.0
.text 2489906 2490482 576 0.0
all-clusters-minimal-app debug (read only) 2769193 2770145 952 0.0
(read/write) 179888 179984 96 0.1
.bss 94944 94976 32 0.0
.data.rel.ro 76872 76936 64 0.1
.rodata 258621 258749 128 0.0
.text 2337458 2338162 704 0.0
bridge-app debug+rpc (read only) 2247553 2249713 2160 0.1
(read/write) 158752 158880 128 0.1
.bss 82976 83008 32 0.0
.data.rel.ro 66232 66344 112 0.2
.rodata 191040 191552 512 0.3
.text 1896530 1897986 1456 0.1
lighting-app debug+rpc (read only) 2497465 2498257 792 0.0
(read/write) 163416 163512 96 0.1
.bss 84288 84320 32 0.0
.data.rel.ro 71176 71240 64 0.1
.rodata 207144 207240 96 0.0
.text 2122130 2122706 576 0.0
lock-app debug (read only) 2443465 2444257 792 0.0
(read/write) 158488 158584 96 0.1
.bss 82944 82976 32 0.0
.data.rel.ro 68120 68184 64 0.1
.rodata 221192 221288 96 0.0
.text 2059074 2059650 576 0.0
shell debug (read only) 2604841 2606873 2032 0.1
(read/write) 219384 219544 160 0.1
.bss 134568 134600 32 0.0
.data.rel.ro 77672 77800 128 0.2
.rodata 229778 230290 512 0.2
.text 2215746 2217074 1328 0.1
thermostat-no-ble arm64 (read only) 2557916 2558700 784 0.0
(read/write) 191409 191489 80 0.0
.bss 99377 99393 16 0.0
.data.rel.ro 82376 82432 56 0.1
.text 2158912 2159568 656 0.0
tv-app debug (read only) 3050873 3053033 2160 0.1
(read/write) 289864 289992 128 0.0
.bss 200200 200232 32 0.0
.data.rel.ro 78528 78624 96 0.1
.rodata 242720 243232 512 0.2
.text 2622370 2623826 1456 0.1
tv-casting-app debug (read only) 5349977 5352201 2224 0.0
(read/write) 232312 232440 128 0.1
.bss 88072 88104 32 0.0
.data.rel.ro 135528 135624 96 0.1
.rodata 342368 342912 544 0.2
.text 4656338 4657826 1488 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read/write) 2432808 2432960 152 0.0
.bss 208988 209004 16 0.0
.text 1395452 1395604 152 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1198315 1198503 188 0.0
bss 141617 141633 16 0.0
rodata 156100 156128 28 0.0
text 821648 821800 152 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1143531 1143735 204 0.0
bss 140808 140824 16 0.0
rodata 131828 131856 28 0.0
text 791972 792140 168 0.0
p6 all-clusters-app default (read/write) 2551672 2551872 200 0.0
.bss 143408 143424 16 0.0
.text 1509936 1510136 200 0.0
all-clusters-minimal-app default (read/write) 2494128 2494368 240 0.0
.bss 142624 142640 16 0.0
.text 1452392 1452632 240 0.0
light-app default (read/write) 2425560 2425760 200 0.0
.bss 135736 135752 16 0.0
.text 1383824 1384024 200 0.0
lock-app default (read/write) 2445968 2446168 200 0.0
.bss 135560 135576 16 0.0
.text 1404232 1404432 200 0.0
telink light-switch-app tlsr9518adk80d (read/write) 786716 786944 228 0.0
bss 70876 70892 16 0.0
text 556632 556814 182 0.0
lighting-app tlsr9518adk80d (read/write) 806704 806932 228 0.0
bss 71128 71144 16 0.0
text 573324 573508 184 0.0
Decreases (4 builds for cc13x2_26x2)
platform target config section e38e2a6 a14ec9f change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read/write) 192592 192424 -168 -0.1
lock-ftd LP_CC2652R7 (read/write) 154252 154100 -152 -0.1
pump-controller-app LP_CC2652R7 (read/write) 183320 183168 -152 -0.1
shell LP_CC2652R7 (read/write) 157936 157768 -168 -0.1
Full report (41 builds for cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section e38e2a6 a14ec9f change % change
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 658295 658479 184 0.0
(read/write) 192592 192424 -168 -0.1
.bss 73780 73796 16 0.0
.data 3416 3416 0 0.0
.rodata 87023 87047 24 0.0
.text 570960 571120 160 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 644835 645027 192 0.0
(read/write) 157276 157292 16 0.0
.bss 73004 73020 16 0.0
.data 3356 3356 0 0.0
.rodata 90035 90067 32 0.0
.text 554480 554640 160 0.0
lock-ftd LP_CC2652R7 (read only) 687707 687875 168 0.0
(read/write) 154252 154100 -152 -0.1
.bss 71740 71756 16 0.0
.data 3280 3280 0 0.0
.rodata 98859 98883 24 0.0
.text 588364 588508 144 0.0
lock-mtd LP_CC2652R7 (read only) 637115 637283 168 0.0
(read/write) 144872 144888 16 0.0
.bss 67476 67492 16 0.0
.data 3280 3280 0 0.0
.rodata 98739 98763 24 0.0
.text 537884 538028 144 0.0
pump-app LP_CC2652R7 (read only) 669083 669083 0 0.0
(read/write) 173788 173788 0 0.0
.bss 71884 71884 0 0.0
.data 3316 3316 0 0.0
.rodata 86979 86979 0 0.0
.text 581620 581620 0 0.0
pump-controller-app LP_CC2652R7 (read only) 659655 659823 168 0.0
(read/write) 183320 183168 -152 -0.1
.bss 71988 72004 16 0.0
.data 3276 3276 0 0.0
.rodata 84879 84903 24 0.0
.text 574292 574436 144 0.0
shell LP_CC2652R7 (read only) 688446 688630 184 0.0
(read/write) 157936 157768 -168 -0.1
.bss 76076 76092 16 0.0
.data 3420 3420 0 0.0
.rodata 110094 110118 24 0.0
.text 578040 578200 160 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 606554 606746 192 0.0
.app_xip_area 465052 465228 176 0.0
.bss 84432 84448 16 0.0
.data 756 756 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 603678 603862 184 0.0
.app_xip_area 462032 462200 168 0.0
.bss 84608 84624 16 0.0
.data 724 724 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 611374 611382 8 0.0
.app_xip_area 470800 470808 8 0.0
.bss 83616 83616 0 0.0
.data 644 644 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read only) 919264 919472 208 0.0
(read/write) 133440 133456 16 0.0
.bss 131320 131336 16 0.0
.data 2116 2116 0 0.0
.text 919256 919464 208 0.0
BRD4161A+rpc (read only) 953436 953644 208 0.0
(read/write) 150128 150144 16 0.0
.bss 147808 147824 16 0.0
.data 2320 2320 0 0.0
.text 953428 953636 208 0.0
BRD4161A+rs911x (read only) 794388 794588 200 0.0
(read/write) 129720 129736 16 0.0
.bss 127596 127612 16 0.0
.data 2124 2124 0 0.0
.text 794380 794580 200 0.0
lock-app BRD4161A+wf200 (read only) 962532 962716 184 0.0
(read/write) 130060 130076 16 0.0
.bss 127972 127988 16 0.0
.data 2088 2088 0 0.0
.text 962524 962708 184 0.0
window-app BRD4161A (read only) 904168 904368 200 0.0
(read/write) 133512 133528 16 0.0
.bss 131400 131416 16 0.0
.data 2108 2108 0 0.0
.text 904160 904360 200 0.0
esp32 all-clusters-app c3devkit (read only) 1012668 1012810 142 0.0
(read/write) 1483282 1483330 48 0.0
.dram0.bss 69408 69424 16 0.0
.dram0.data 14696 14696 0 0.0
.flash.rodata 213744 213776 32 0.0
.flash.text 1012668 1012810 142 0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1066979 1067131 152 0.0
(read/write) 485392 485432 40 0.0
.dram0.bss 74936 74952 16 0.0
.dram0.data 34224 34224 0 0.0
.flash.rodata 244236 244260 24 0.0
.flash.text 1061595 1061747 152 0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 657248 657424 176 0.0
.bss 69748 69764 16 0.0
.data 2028 2028 0 0.0
.text 579672 579832 160 0.0
lock k32w061+release (read/write) 718860 719044 184 0.0
.bss 70180 70196 16 0.0
.data 2000 2000 0 0.0
.text 640880 641048 168 0.0
linux all-clusters-app debug (read only) 2923761 2924585 824 0.0
(read/write) 188528 188624 96 0.1
.bss 95776 95808 32 0.0
.data 2048 2048 0 0.0
.data.rel.ro 84488 84552 64 0.1
.dynamic 608 608 0 0.0
.got 4544 4544 0 0.0
.init 27 27 0 0.0
.init_array 1032 1032 0 0.0
.rodata 258205 258333 128 0.0
.text 2489906 2490482 576 0.0
all-clusters-minimal-app debug (read only) 2769193 2770145 952 0.0
(read/write) 179888 179984 96 0.1
.bss 94944 94976 32 0.0
.data 1920 1920 0 0.0
.data.rel.ro 76872 76936 64 0.1
.dynamic 608 608 0 0.0
.got 4496 4496 0 0.0
.init 27 27 0 0.0
.init_array 1032 1032 0 0.0
.rodata 258621 258749 128 0.0
.text 2337458 2338162 704 0.0
bridge-app debug+rpc (read only) 2247553 2249713 2160 0.1
(read/write) 158752 158880 128 0.1
.bss 82976 83008 32 0.0
.data 3760 3760 0 0.0
.data.rel.ro 66232 66344 112 0.2
.dynamic 608 608 0 0.0
.got 4400 4400 0 0.0
.init 27 27 0 0.0
.init_array 728 728 0 0.0
.rodata 191040 191552 512 0.3
.text 1896530 1897986 1456 0.1
chip-tool debug (read only) 9815973 9815973 0 0.0
(read/write) 623496 623496 0 0.0
.bss 25440 25440 0 0.0
.data 1088 1088 0 0.0
.data.rel.ro 590696 590696 0 0.0
.dynamic 624 624 0 0.0
.got 5000 5000 0 0.0
.init 27 27 0 0.0
.init_array 640 640 0 0.0
.rodata 506805 506805 0 0.0
.text 7868549 7868549 0 0.0
chip-tool-no-interactive-ipv6only arm64 (read only) 9563860 9563860 0 0.0
(read/write) 689841 689841 0 0.0
.bss 43697 43697 0 0.0
.data 1152 1152 0 0.0
.data.rel.ro 626128 626128 0 0.0
.dynamic 528 528 0 0.0
.got 15056 15056 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 468788 468788 0 0.0
.text 7518980 7518980 0 0.0
lighting-app debug+rpc (read only) 2497465 2498257 792 0.0
(read/write) 163416 163512 96 0.1
.bss 84288 84320 32 0.0
.data 2064 2064 0 0.0
.data.rel.ro 71176 71240 64 0.1
.dynamic 608 608 0 0.0
.got 4432 4432 0 0.0
.init 27 27 0 0.0
.init_array 816 816 0 0.0
.rodata 207144 207240 96 0.0
.text 2122130 2122706 576 0.0
lock-app debug (read only) 2443465 2444257 792 0.0
(read/write) 158488 158584 96 0.1
.bss 82944 82976 32 0.0
.data 1552 1552 0 0.0
.data.rel.ro 68120 68184 64 0.1
.dynamic 608 608 0 0.0
.got 4432 4432 0 0.0
.init 27 27 0 0.0
.init_array 784 784 0 0.0
.rodata 221192 221288 96 0.0
.text 2059074 2059650 576 0.0
ota-provider-app debug (read only) 2281729 2281729 0 0.0
(read/write) 152688 152688 0 0.0
.bss 82624 82624 0 0.0
.data 1784 1784 0 0.0
.data.rel.ro 62456 62456 0 0.0
.dynamic 608 608 0 0.0
.got 4496 4496 0 0.0
.init 27 27 0 0.0
.init_array 680 680 0 0.0
.rodata 197336 197336 0 0.0
.text 1923202 1923202 0 0.0
ota-requestor-app debug (read only) 2329289 2329289 0 0.0
(read/write) 155504 155504 0 0.0
.bss 83328 83328 0 0.0
.data 1976 1976 0 0.0
.data.rel.ro 64392 64392 0 0.0
.dynamic 608 608 0 0.0
.got 4456 4456 0 0.0
.init 27 27 0 0.0
.init_array 712 712 0 0.0
.rodata 199520 199520 0 0.0
.text 1964738 1964738 0 0.0
shell debug (read only) 2604841 2606873 2032 0.1
(read/write) 219384 219544 160 0.1
.bss 134568 134600 32 0.0
.data 1392 1392 0 0.0
.data.rel.ro 77672 77800 128 0.2
.dynamic 608 608 0 0.0
.got 4176 4176 0 0.0
.init 27 27 0 0.0
.init_array 936 936 0 0.0
.rodata 229778 230290 512 0.2
.text 2215746 2217074 1328 0.1
thermostat-no-ble arm64 (read only) 2557916 2558700 784 0.0
(read/write) 191409 191489 80 0.0
.bss 99377 99393 16 0.0
.data 1560 1560 0 0.0
.data.rel.ro 82376 82432 56 0.1
.dynamic 528 528 0 0.0
.got 5080 5080 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 161332 161332 0 0.0
.text 2158912 2159568 656 0.0
tv-app debug (read only) 3050873 3053033 2160 0.1
(read/write) 289864 289992 128 0.0
.bss 200200 200232 32 0.0
.data 4688 4688 0 0.0
.data.rel.ro 78528 78624 96 0.1
.dynamic 608 608 0 0.0
.got 4848 4848 0 0.0
.init 27 27 0 0.0
.init_array 952 952 0 0.0
.rodata 242720 243232 512 0.2
.text 2622370 2623826 1456 0.1
tv-casting-app debug (read only) 5349977 5352201 2224 0.0
(read/write) 232312 232440 128 0.1
.bss 88072 88104 32 0.0
.data 2480 2480 0 0.0
.data.rel.ro 135528 135624 96 0.1
.dynamic 608 608 0 0.0
.got 4712 4712 0 0.0
.init 27 27 0 0.0
.init_array 872 872 0 0.0
.rodata 342368 342912 544 0.2
.text 4656338 4657826 1488 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2432808 2432960 152 0.0
.bss 208988 209004 16 0.0
.data 5888 5888 0 0.0
.text 1395452 1395604 152 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1198315 1198503 188 0.0
bss 141617 141633 16 0.0
rodata 156100 156128 28 0.0
text 821648 821800 152 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1143531 1143735 204 0.0
bss 140808 140824 16 0.0
rodata 131828 131856 28 0.0
text 791972 792140 168 0.0
p6 all-clusters-app default (read/write) 2551672 2551872 200 0.0
.bss 143408 143424 16 0.0
.data 2832 2832 0 0.0
.text 1509936 1510136 200 0.0
all-clusters-minimal-app default (read/write) 2494128 2494368 240 0.0
.bss 142624 142640 16 0.0
.data 2776 2776 0 0.0
.text 1452392 1452632 240 0.0
light-app default (read/write) 2425560 2425760 200 0.0
.bss 135736 135752 16 0.0
.data 2624 2624 0 0.0
.text 1383824 1384024 200 0.0
lock-app default (read/write) 2445968 2446168 200 0.0
.bss 135560 135576 16 0.0
.data 2600 2600 0 0.0
.text 1404232 1404432 200 0.0
telink light-switch-app tlsr9518adk80d (read/write) 786716 786944 228 0.0
bss 70876 70892 16 0.0
noinit 40416 40416 0 0.0
text 556632 556814 182 0.0
lighting-app tlsr9518adk80d (read/write) 806704 806932 228 0.0
bss 71128 71144 16 0.0
noinit 40416 40416 0 0.0
text 573324 573508 184 0.0

@bzbarsky-apple bzbarsky-apple merged commit 075dd3e into project-chip:master Jun 14, 2022
@bzbarsky-apple bzbarsky-apple deleted the software-diagnostics-sanity branch June 14, 2022 03:03
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.

3 participants