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

Repost "[esp32]: Do not setup DeviceInfoProvider within PlatformMgr" #21109

Merged
merged 1 commit into from
Jul 25, 2022
Merged

Repost "[esp32]: Do not setup DeviceInfoProvider within PlatformMgr" #21109

merged 1 commit into from
Jul 25, 2022

Conversation

yufengwangca
Copy link
Contributor

Problem

What is being fixed? Examples:

  • The ESP32 platform specific implementation of DeviceInfoProvider has no difference than the common one(examples/providers/DeviceInfoProvider), we should use the common implementation of this class like other platforms since DeviceInfoProviderImpl is not platform dependent.

Currently, we call SetDiagnosticDataProvider within PaltformMgr separately on ESP32 platform. And this will cause call DiagnosticDataProvider get set up on both client and server side.

Change overview

Use common DeviceInfoProvider implementation instead of platform specific version

Please note, currently, some functions of DeviceInfoProvider does not work since storage delegate has not been setup for DeviceInfoProvider. This PR does not solve this issue either, it will be addressed in a separate PR.

Testing

How was this tested? (at least one bullet point required)

  • Confirm we can still read information from DeviceInfoProvider with this change

@github-actions
Copy link

github-actions bot commented Jul 22, 2022

PR #21109: Size comparison from 27fc7b7 to 3081d4b

Increases (3 builds for cc13x2_26x2, cyw30739, nrfconnect)
platform target config section 27fc7b7 3081d4b change % change
cc13x2_26x2 all-clusters-minimal-app LP_CC2652R7 (read only) 633975 633983 8 0.0
.text 556100 556108 8 0.0
cyw30739 lock cyw930739m2evb_01 (read/write) 587990 587998 8 0.0
.app_xip_area 461652 461660 8 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1176911 1176927 16 0.0
text 812544 812548 4 0.0
Decreases (5 builds for esp32, k32w, nrfconnect, telink)
platform target config section 27fc7b7 3081d4b change % change
esp32 all-clusters-app c3devkit (read only) 1021930 1021926 -4 -0.0
(read/write) 1486290 1486274 -16 -0.0
.dram0.bss 70232 70224 -8 -0.0
.flash.text 1021930 1021926 -4 -0.0
m5stack (read only) 1075691 1075563 -128 -0.0
(read/write) 488312 488304 -8 -0.0
.dram0.bss 75752 75744 -8 -0.0
.flash.text 1070307 1070179 -128 -0.0
k32w light k32w061+release (read/write) 660816 660800 -16 -0.0
.text 583356 583340 -16 -0.0
nrfconnect all-clusters-minimal-app nrf52840dk_nrf52840 text 801864 801860 -4 -0.0
telink light-switch-app tlsr9518adk80d (read/write) 799468 799460 -8 -0.0
text 567186 567184 -2 -0.0
Full report (43 builds for bl602, cc13x2_26x2, cyw30739, efr32, esp32, k32w, linux, mbed, nrfconnect, p6, telink)
platform target config section 27fc7b7 3081d4b change % change
bl602 lighting-app bl602 (read/write) 1380794 1380794 0 0.0
.bss 117474 117474 0 0.0
.data 4480 4480 0 0.0
.text 1050932 1050932 0 0.0
bl602+rpc (read/write) 1426202 1426202 0 0.0
.bss 124922 124922 0 0.0
.data 4600 4600 0 0.0
.text 1082588 1082588 0 0.0
cc13x2_26x2 all-clusters-app LP_CC2652R7 (read only) 668383 668383 0 0.0
(read/write) 182960 182960 0 0.0
.bss 74236 74236 0 0.0
.data 3356 3356 0 0.0
.rodata 88327 88327 0 0.0
.text 579740 579740 0 0.0
all-clusters-minimal-app LP_CC2652R7 (read only) 633975 633983 8 0.0
(read/write) 157804 157804 0 0.0
.bss 73532 73532 0 0.0
.data 3356 3356 0 0.0
.rodata 77551 77551 0 0.0
.text 556100 556108 8 0.0
lock-ftd LP_CC2652R7 (read only) 671587 671587 0 0.0
(read/write) 169932 169932 0 0.0
.bss 71300 71300 0 0.0
.data 3280 3280 0 0.0
.rodata 76443 76443 0 0.0
.text 594664 594664 0 0.0
lock-mtd LP_CC2652R7 (read only) 653871 653871 0 0.0
(read/write) 183336 183336 0 0.0
.bss 66988 66988 0 0.0
.data 3280 3280 0 0.0
.rodata 101183 101183 0 0.0
.text 552208 552208 0 0.0
pump-app LP_CC2652R7 (read only) 681087 681087 0 0.0
(read/write) 161288 161288 0 0.0
.bss 71388 71388 0 0.0
.data 3280 3280 0 0.0
.rodata 89039 89039 0 0.0
.text 591564 591564 0 0.0
pump-controller-app LP_CC2652R7 (read only) 666863 666863 0 0.0
(read/write) 175632 175632 0 0.0
.bss 71508 71508 0 0.0
.data 3276 3276 0 0.0
.rodata 84895 84895 0 0.0
.text 581488 581488 0 0.0
shell LP_CC2652R7 (read only) 660858 660858 0 0.0
(read/write) 185988 185988 0 0.0
.bss 76540 76540 0 0.0
.data 3360 3360 0 0.0
.rodata 85098 85098 0 0.0
.text 575444 575444 0 0.0
cyw30739 light cyw930739m2evb_01 (read/write) 582082 582082 0 0.0
.app_xip_area 460472 460472 0 0.0
.bss 64404 64404 0 0.0
.data 716 716 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
lock cyw930739m2evb_01 (read/write) 587990 587998 8 0.0
.app_xip_area 461652 461660 8 0.0
.bss 69132 69132 0 0.0
.data 720 720 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
ota-requestor-no-progress-logging cyw930739m2evb_01 (read/write) 586286 586286 0 0.0
.app_xip_area 465524 465524 0 0.0
.bss 63612 63612 0 0.0
.data 660 660 0 0.0
.rodata 0 0 0 0.0
.text 112 112 0 0.0
efr32 lighting-app BRD4161A (read/write) 1087488 1087488 0 0.0
.bss 133220 133220 0 0.0
.data 2048 2048 0 0.0
.text 952200 952200 0 0.0
BRD4161A+rpc (read/write) 1141780 1141780 0 0.0
.bss 149892 149892 0 0.0
.data 2260 2260 0 0.0
.text 989604 989604 0 0.0
BRD4161A+rs911x (read/write) 972716 972716 0 0.0
.bss 161664 161664 0 0.0
.data 2048 2048 0 0.0
.text 808984 808984 0 0.0
lock-app BRD4161A+wf200 (read/write) 1128224 1128224 0 0.0
.bss 144304 144304 0 0.0
.data 2056 2056 0 0.0
.text 981844 981844 0 0.0
window-app BRD4161A (read/write) 1080980 1080980 0 0.0
.bss 134692 134692 0 0.0
.data 2076 2076 0 0.0
.text 944192 944192 0 0.0
esp32 all-clusters-app c3devkit (read only) 1021930 1021926 -4 -0.0
(read/write) 1486290 1486274 -16 -0.0
.dram0.bss 70232 70224 -8 -0.0
.dram0.data 14600 14600 0 0.0
.flash.rodata 216016 216016 0 0.0
.flash.text 1021930 1021926 -4 -0.0
.iram0.text 62902 62902 0 0.0
m5stack (read only) 1075691 1075563 -128 -0.0
(read/write) 488312 488304 -8 -0.0
.dram0.bss 75752 75744 -8 -0.0
.dram0.data 34144 34144 0 0.0
.flash.rodata 246420 246420 0 0.0
.flash.text 1070307 1070179 -128 -0.0
.iram0.text 123267 123267 0 0.0
k32w light k32w061+release (read/write) 660816 660800 -16 -0.0
.bss 69668 69668 0 0.0
.data 1992 1992 0 0.0
.text 583356 583340 -16 -0.0
lock k32w061+release (read/write) 687820 687820 0 0.0
.bss 70140 70140 0 0.0
.data 2004 2004 0 0.0
.text 609876 609876 0 0.0
linux all-clusters-app debug (read only) 2981177 2981177 0 0.0
(read/write) 155344 155344 0 0.0
.bss 61792 61792 0 0.0
.data 2064 2064 0 0.0
.data.rel.ro 85224 85224 0 0.0
.dynamic 608 608 0 0.0
.got 4568 4568 0 0.0
.init 27 27 0 0.0
.init_array 1064 1064 0 0.0
.rodata 265739 265739 0 0.0
.text 2537298 2537298 0 0.0
all-clusters-minimal-app debug (read only) 2827073 2827073 0 0.0
(read/write) 147016 147016 0 0.0
.bss 60992 60992 0 0.0
.data 2064 2064 0 0.0
.data.rel.ro 77784 77784 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 1056 1056 0 0.0
.rodata 266603 266603 0 0.0
.text 2385010 2385010 0 0.0
bridge-app debug+rpc (read only) 2341777 2341777 0 0.0
(read/write) 126920 126920 0 0.0
.bss 50080 50080 0 0.0
.data 3824 3824 0 0.0
.data.rel.ro 67240 67240 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 736 736 0 0.0
.rodata 199240 199240 0 0.0
.text 1980226 1980226 0 0.0
chip-tool debug (read only) 10349249 10349249 0 0.0
(read/write) 631912 631912 0 0.0
.bss 24760 24760 0 0.0
.data 3266 3266 0 0.0
.data.rel.ro 597480 597480 0 0.0
.dynamic 608 608 0 0.0
.got 5088 5088 0 0.0
.init 27 27 0 0.0
.init_array 648 648 0 0.0
.rodata 521813 521813 0 0.0
.text 8373844 8373844 0 0.0
chip-tool-ipv6only arm64 (read only) 9778876 9778876 0 0.0
(read/write) 679441 679441 0 0.0
.bss 32833 32833 0 0.0
.data 3272 3272 0 0.0
.data.rel.ro 624824 624824 0 0.0
.dynamic 560 560 0 0.0
.got 13552 13552 0 0.0
.init 24 24 0 0.0
.init_array 192 192 0 0.0
.rodata 457580 457580 0 0.0
.text 7736900 7736900 0 0.0
lighting-app debug+rpc (read only) 2564897 2564897 0 0.0
(read/write) 129888 129888 0 0.0
.bss 49632 49632 0 0.0
.data 2096 2096 0 0.0
.data.rel.ro 72296 72296 0 0.0
.dynamic 608 608 0 0.0
.got 4392 4392 0 0.0
.init 27 27 0 0.0
.init_array 824 824 0 0.0
.rodata 214896 214896 0 0.0
.text 2179602 2179602 0 0.0
lock-app debug (read only) 2529921 2529921 0 0.0
(read/write) 124872 124872 0 0.0
.bss 48032 48032 0 0.0
.data 1712 1712 0 0.0
.data.rel.ro 69272 69272 0 0.0
.dynamic 608 608 0 0.0
.got 4424 4424 0 0.0
.init 27 27 0 0.0
.init_array 800 800 0 0.0
.rodata 229936 229936 0 0.0
.text 2134386 2134386 0 0.0
ota-provider-app debug (read only) 2333505 2333505 0 0.0
(read/write) 118672 118672 0 0.0
.bss 47680 47680 0 0.0
.data 1936 1936 0 0.0
.data.rel.ro 63256 63256 0 0.0
.dynamic 608 608 0 0.0
.got 4488 4488 0 0.0
.init 27 27 0 0.0
.init_array 680 680 0 0.0
.rodata 204728 204728 0 0.0
.text 1965570 1965570 0 0.0
ota-requestor-app debug (read only) 2451961 2451961 0 0.0
(read/write) 125576 125576 0 0.0
.bss 50016 50016 0 0.0
.data 2240 2240 0 0.0
.data.rel.ro 67480 67480 0 0.0
.dynamic 608 608 0 0.0
.got 4480 4480 0 0.0
.init 27 27 0 0.0
.init_array 736 736 0 0.0
.rodata 208448 208448 0 0.0
.text 2071906 2071906 0 0.0
shell debug (read only) 2567785 2567785 0 0.0
(read/write) 141400 141400 0 0.0
.bss 57608 57608 0 0.0
.data 1248 1248 0 0.0
.data.rel.ro 76856 76856 0 0.0
.dynamic 608 608 0 0.0
.got 4136 4136 0 0.0
.init 27 27 0 0.0
.init_array 936 936 0 0.0
.rodata 229042 229042 0 0.0
.text 2181186 2181186 0 0.0
thermostat-no-ble arm64 (read only) 2341532 2341532 0 0.0
(read/write) 141265 141265 0 0.0
.bss 55233 55233 0 0.0
.data 1672 1672 0 0.0
.data.rel.ro 75616 75616 0 0.0
.dynamic 560 560 0 0.0
.got 4984 4984 0 0.0
.init 24 24 0 0.0
.init_array 400 400 0 0.0
.rodata 139444 139444 0 0.0
.text 1965248 1965248 0 0.0
tv-app debug (read only) 3115553 3115553 0 0.0
(read/write) 257024 257024 0 0.0
.bss 167064 167064 0 0.0
.data 4736 4736 0 0.0
.data.rel.ro 78792 78792 0 0.0
.dynamic 608 608 0 0.0
.got 4848 4848 0 0.0
.init 27 27 0 0.0
.init_array 960 960 0 0.0
.rodata 250440 250440 0 0.0
.text 2676690 2676690 0 0.0
tv-casting-app debug (read only) 5369265 5369265 0 0.0
(read/write) 158328 158328 0 0.0
.bss 51256 51256 0 0.0
.data 2432 2432 0 0.0
.data.rel.ro 98352 98352 0 0.0
.dynamic 608 608 0 0.0
.got 4736 4736 0 0.0
.init 27 27 0 0.0
.init_array 920 920 0 0.0
.rodata 334625 334625 0 0.0
.text 4768114 4768114 0 0.0
mbed lock-app CY8CPROTO_062_4343W+release (read only) 6224 6224 0 0.0
(read/write) 2449032 2449032 0 0.0
.bss 214444 214444 0 0.0
.data 5872 5872 0 0.0
.text 1411676 1411676 0 0.0
nrfconnect all-clusters-app nrf52840dk_nrf52840 (read/write) 1176911 1176927 16 0.0
bss 143068 143068 0 0.0
rodata 142440 142440 0 0.0
text 812544 812548 4 0.0
all-clusters-minimal-app nrf52840dk_nrf52840 (read/write) 1156979 1156979 0 0.0
bss 142304 142304 0 0.0
rodata 133972 133972 0 0.0
text 801864 801860 -4 -0.0
p6 all-clusters-app default (read only) 881632 881632 0 0.0
(read/write) 1686436 1686436 0 0.0
.bss 149064 149064 0 0.0
.data 2648 2648 0 0.0
.text 1526336 1526336 0 0.0
all-clusters-minimal-app default (read only) 882352 882352 0 0.0
(read/write) 1630540 1630540 0 0.0
.bss 148344 148344 0 0.0
.data 2648 2648 0 0.0
.text 1471160 1471160 0 0.0
light-app default (read only) 890656 890656 0 0.0
(read/write) 1550780 1550780 0 0.0
.bss 140248 140248 0 0.0
.data 2440 2440 0 0.0
.text 1399704 1399704 0 0.0
lock-app default (read only) 886184 886184 0 0.0
(read/write) 1588372 1588372 0 0.0
.bss 144704 144704 0 0.0
.data 2456 2456 0 0.0
.text 1432824 1432824 0 0.0
telink light-switch-app tlsr9518adk80d (read/write) 799468 799460 -8 -0.0
bss 70744 70744 0 0.0
noinit 40416 40416 0 0.0
text 567186 567184 -2 -0.0
lighting-app tlsr9518adk80d (read/write) 819508 819508 0 0.0
bss 71588 71588 0 0.0
noinit 40416 40416 0 0.0
text 583728 583728 0 0.0

Copy link
Contributor

@woody-apple woody-apple left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dhrishi Can you please review?

@bzbarsky-apple
Copy link
Contributor

has no difference than the common one

This is a temporary state, per #18236 (comment), and the ESP32 implementation is meant to be modified to use factory data.

Please make sure that @dhrishi or @wqx6 approves this before merging it, since in the past they have explicitly asked for this change to not be made.

@dhrishi
Copy link
Contributor

dhrishi commented Jul 22, 2022

As discussed, @wqx6 may be unavailable due to SVE, we can merge this PR as this uses the generic DeviceInfoProvider. We will add a follow-on PR with any platform specific required changes required on top (cc @shubhamdp). Will approve this now.

@wqx6
Copy link
Contributor

wqx6 commented Jul 25, 2022

Sorry for the later replying due to sve. I have discussed with @shubhamdp and he will add the device info(Fixed label, SupportedLocales and SupportedCalendarTypes) in generate_esp32_chip_factory_bin.py and then we will add the DeviceInfoProviderImpl for ESP32 platform.

@shubhamdp
Copy link
Contributor

shubhamdp commented Jul 25, 2022

Had a discussion with @wqx6 offline and we can merge this PR. We'll add a PR for ESP32 for this along with the support for reading this configurations from the factory partition.

@yufengwangca yufengwangca requested a review from woody-apple July 25, 2022 14:50
@bzbarsky-apple bzbarsky-apple dismissed woody-apple’s stale review July 25, 2022 14:59

Platform owners OKed this.

@bzbarsky-apple bzbarsky-apple merged commit 35e13a9 into project-chip:master Jul 25, 2022
marius-alex-tache added a commit to NXP/matter that referenced this pull request Jul 26, 2022
Use common example for DeviceInfoProvider implementation.
Also see this PR: project-chip#21109

Signed-off-by: Marius Tache <[email protected]>
marius-alex-tache added a commit to NXP/matter that referenced this pull request Jul 29, 2022
Use common example for DeviceInfoProvider implementation.
Also see this PR: project-chip#21109

Signed-off-by: Marius Tache <[email protected]>
marius-alex-tache added a commit to NXP/matter that referenced this pull request Aug 5, 2022
Use common example for DeviceInfoProvider implementation.
Also see this PR: project-chip#21109

Signed-off-by: Marius Tache <[email protected]>
marius-alex-tache added a commit to NXP/matter that referenced this pull request Aug 16, 2022
Use common example for DeviceInfoProvider implementation.
Also see this PR: project-chip#21109

Signed-off-by: Marius Tache <[email protected]>
marius-alex-tache added a commit to NXP/matter that referenced this pull request Aug 18, 2022
Use common example for DeviceInfoProvider implementation.
Also see this PR: project-chip#21109

Signed-off-by: Marius Tache <[email protected]>
isiu-apple pushed a commit to isiu-apple/connectedhomeip that referenced this pull request Sep 16, 2022
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.

We should not setup various provider within PlatformMgr on each platform
7 participants