Skip to contentSkip to conversation

core: devres: optionally build devres into the SPL

PATCH In review Angus Ainslie 2 participants 6 messages Feb 28, 2022 – Mar 28, 2022

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 core: devres: optionally build devres into the SPL

Add a CONFIG_SPL_DEVRES option

---

Changes since v1:

Instead of gaurding the source add an SPL_DEVRES option

 drivers/core/Kconfig  | 13 +++++++++++++
 drivers/core/Makefile |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
drivers/core/Kconfig +13 -0
index 8f7703c8b5..7e666708fe 100644
@@ -206,6 +206,19 @@ config DEVRES
 	  non-managed variants.  For example, devres_alloc() to kzalloc(),
 	  devm_kmalloc() to kmalloc(), etc.
 
+config SPL_DEVRES
+	bool "Managed device resources in the SPL"
+	depends on DM
+	help
+	  This option enables the Managed device resources core support.
+	  Device resources managed by the devres framework are automatically
+	  released whether initialization fails half-way or the device gets
+	  detached.
+
+	  If this option is disabled, devres functions fall back to
+	  non-managed variants.  For example, devres_alloc() to kzalloc(),
+	  devm_kmalloc() to kmalloc(), etc.
+
 config DEBUG_DEVRES
 	bool "Managed device resources debugging functions"
 	depends on DEVRES
drivers/core/Makefile +1 -1
index 5edd4e4135..0cbc3ab217 100644
@@ -4,7 +4,7 @@
 
 obj-y	+= device.o fdtaddr.o lists.o root.o uclass.o util.o
 obj-$(CONFIG_$(SPL_TPL_)ACPIGEN) += acpi.o
-obj-$(CONFIG_DEVRES) += devres.o
+obj-$(CONFIG_$(SPL_TPL_)DEVRES) += devres.o
 obj-$(CONFIG_$(SPL_)DM_DEVICE_REMOVE)	+= device-remove.o
 obj-$(CONFIG_$(SPL_)SIMPLE_BUS)	+= simple-bus.o
 obj-$(CONFIG_SIMPLE_PM_BUS)	+= simple-pm-bus.o
Signature · 1 line
2.25.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 6 lines · Angus Ainslie

Add a CONFIG_SPL_DEVRES option

---

Quoted 7 lines

Changes since v1:

Instead of gaurding the source add an SPL_DEVRES option

 drivers/core/Kconfig  | 13 +++++++++++++
 drivers/core/Makefile |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
#2 lore raw

Hi Angus,

Quoted 8 lines · Simon Glass
Quoted 6 lines · Angus Ainslie

Add a CONFIG_SPL_DEVRES option

---

Quoted 7 lines
Quoted 7 lines

Changes since v1:

Instead of gaurding the source add an SPL_DEVRES option

 drivers/core/Kconfig  | 13 +++++++++++++
 drivers/core/Makefile |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

Unfortunately this break the tests, e.g. building sandbox_spl - can you please take a look?

sandbox_spl: +make O=build-sandbox_spl -s sandbox_spl_defconfig +make O=build-sandbox_spl -s -j4
/usr/bin/ld: /tmp/ccsYY64W.ltrans0.ltrans.o: in function `device_unbind':
build-sandbox_spl/spl/../../drivers/core/device-remove.c:120:
undefined reference to `devres_release_all'
/usr/bin/ld: /tmp/ccsYY64W.ltrans0.ltrans.o: in function `device_free':
build-sandbox_spl/spl/../../drivers/core/device-remove.c:157:
undefined reference to `devres_release_probe'
collect2: error: ld returned 1 exit status
make[3]: *** [../scripts/Makefile.spl:509: spl/u-boot-spl] Error 1 make[2]: *** [Makefile:2094: spl/u-boot-spl] Error 2
make[1]: *** [Makefile:177: sub-make] Error 2
Exit code: 2

Regards,
Simon

#3 lore raw

Hi Simon,

Quoted 22 lines · Simon Glass

Hi Angus,

Quoted 8 lines · Simon Glass
Quoted 6 lines · Angus Ainslie

Add a CONFIG_SPL_DEVRES option

---

Quoted 7 lines
Quoted 7 lines

Changes since v1:

Instead of gaurding the source add an SPL_DEVRES option

 drivers/core/Kconfig  | 13 +++++++++++++
 drivers/core/Makefile |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

Unfortunately this break the tests, e.g. building sandbox_spl - can you please take a look?

Quoted 14 lines

sandbox_spl: +make O=build-sandbox_spl -s sandbox_spl_defconfig +make O=build-sandbox_spl -s -j4
/usr/bin/ld: /tmp/ccsYY64W.ltrans0.ltrans.o: in function `device_unbind':
build-sandbox_spl/spl/../../drivers/core/device-remove.c:120:
undefined reference to `devres_release_all'
/usr/bin/ld: /tmp/ccsYY64W.ltrans0.ltrans.o: in function `device_free':
build-sandbox_spl/spl/../../drivers/core/device-remove.c:157:
undefined reference to `devres_release_probe'
collect2: error: ld returned 1 exit status
make[3]: *** [../scripts/Makefile.spl:509: spl/u-boot-spl] Error 1 make[2]: *** [Makefile:2094: spl/u-boot-spl] Error 2
make[1]: *** [Makefile:177: sub-make] Error 2
Exit code: 2

So the problem here is that CONFIG_DM_DEVICE_REMOVE can be defined without CONFIG_DEVRES being defined.

Is there a way to make DM_DEVICE_REMOVE dependant on DEVRES or do I need to add "&& CONFIG_IS_ENABLED(DEVRES)" everywhere that I find "CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)" ?

Thanks
Angus

Quoted 2 lines

Regards,
Simon

#4 lore raw
Quoted 40 lines · Angus Ainslie

Hi Simon,

Quoted 22 lines · Simon Glass

Hi Angus,

Quoted 8 lines · Simon Glass
Quoted 6 lines · Angus Ainslie

Add a CONFIG_SPL_DEVRES option

---

Quoted 7 lines
Quoted 7 lines

Changes since v1:

Instead of gaurding the source add an SPL_DEVRES option

 drivers/core/Kconfig  | 13 +++++++++++++
 drivers/core/Makefile |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

Unfortunately this break the tests, e.g. building sandbox_spl - can you please take a look?

Quoted 14 lines

sandbox_spl: +make O=build-sandbox_spl -s sandbox_spl_defconfig +make O=build-sandbox_spl -s -j4
/usr/bin/ld: /tmp/ccsYY64W.ltrans0.ltrans.o: in function `device_unbind':
build-sandbox_spl/spl/../../drivers/core/device-remove.c:120:
undefined reference to `devres_release_all'
/usr/bin/ld: /tmp/ccsYY64W.ltrans0.ltrans.o: in function `device_free':
build-sandbox_spl/spl/../../drivers/core/device-remove.c:157:
undefined reference to `devres_release_probe'
collect2: error: ld returned 1 exit status
make[3]: *** [../scripts/Makefile.spl:509: spl/u-boot-spl] Error 1 make[2]: *** [Makefile:2094: spl/u-boot-spl] Error 2
make[1]: *** [Makefile:177: sub-make] Error 2
Exit code: 2

Quoted 7 lines

So the problem here is that CONFIG_DM_DEVICE_REMOVE can be defined without CONFIG_DEVRES being defined.

Is there a way to make DM_DEVICE_REMOVE dependant on DEVRES or do I need to add "&& CONFIG_IS_ENABLED(DEVRES)" everywhere that I find "CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)" ?

The test failure can be "fixed" using this

configs/sandbox_noinst_defconfig +1 -0
index ec912cf0ec8..69c97921744 100644
@@ -105,6 +105,7 @@ CONFIG_SYSCON=y
 CONFIG_SPL_SYSCON=y
 CONFIG_DEVRES=y
 CONFIG_DEBUG_DEVRES=y
+CONFIG_SPL_DEVRES=y
 # CONFIG_SPL_SIMPLE_BUS is not set
 CONFIG_ADC=y
 CONFIG_ADC_SANDBOX=y
configs/sandbox_spl_defconfig +1 -0
index 1687ccf4530..2fcda46dfd1 100644
@@ -107,6 +107,7 @@ CONFIG_SYSCON=y
 CONFIG_SPL_SYSCON=y
 CONFIG_DEVRES=y
 CONFIG_DEBUG_DEVRES=y
+CONFIG_SPL_DEVRES=y
 # CONFIG_SPL_SIMPLE_BUS is not set
 CONFIG_ADC=y
 CONFIG_ADC_SANDBOX=y

But is that the right way based on the questions above ?

Quoted 5 lines

Thanks
Angus

Quoted 2 lines

Regards,
Simon

#5 lore raw

Hi Angus,

Quoted 81 lines · Angus Ainslie
Quoted 42 lines · Angus Ainslie

Hi Simon,

Quoted 22 lines · Simon Glass

Hi Angus,

Quoted 8 lines · Simon Glass
Quoted 6 lines · Angus Ainslie

Add a CONFIG_SPL_DEVRES option

---

Quoted 7 lines
Quoted 7 lines

Changes since v1:

Instead of gaurding the source add an SPL_DEVRES option

 drivers/core/Kconfig  | 13 +++++++++++++
 drivers/core/Makefile |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

Unfortunately this break the tests, e.g. building sandbox_spl - can you please take a look?

Quoted 16 lines

sandbox_spl: +make O=build-sandbox_spl -s sandbox_spl_defconfig +make O=build-sandbox_spl -s -j4
/usr/bin/ld: /tmp/ccsYY64W.ltrans0.ltrans.o: in function `device_unbind':
build-sandbox_spl/spl/../../drivers/core/device-remove.c:120:
undefined reference to devres_release_all' /usr/bin/ld: /tmp/ccsYY64W.ltrans0.ltrans.o: in function device_free':
build-sandbox_spl/spl/../../drivers/core/device-remove.c:157:
undefined reference to `devres_release_probe'
collect2: error: ld returned 1 exit status
make[3]: *** [../scripts/Makefile.spl:509: spl/u-boot-spl] Error 1 make[2]: *** [Makefile:2094: spl/u-boot-spl] Error 2 make[1]: *** [Makefile:177: sub-make] Error 2
Exit code: 2

Quoted 7 lines

So the problem here is that CONFIG_DM_DEVICE_REMOVE can be defined without CONFIG_DEVRES being defined.

Is there a way to make DM_DEVICE_REMOVE dependant on DEVRES or do I need to add "&& CONFIG_IS_ENABLED(DEVRES)" everywhere that I find "CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)" ?

The test failure can be "fixed" using this

configs/sandbox_noinst_defconfig +1 -0
index ec912cf0ec8..69c97921744 100644
@@ -105,6 +105,7 @@ CONFIG_SYSCON=y
  CONFIG_SPL_SYSCON=y
  CONFIG_DEVRES=y
  CONFIG_DEBUG_DEVRES=y
+CONFIG_SPL_DEVRES=y
  # CONFIG_SPL_SIMPLE_BUS is not set
  CONFIG_ADC=y
  CONFIG_ADC_SANDBOX=y
configs/sandbox_spl_defconfig +1 -0
index 1687ccf4530..2fcda46dfd1 100644
@@ -107,6 +107,7 @@ CONFIG_SYSCON=y
  CONFIG_SPL_SYSCON=y
  CONFIG_DEVRES=y
  CONFIG_DEBUG_DEVRES=y
+CONFIG_SPL_DEVRES=y
  # CONFIG_SPL_SIMPLE_BUS is not set
  CONFIG_ADC=y
  CONFIG_ADC_SANDBOX=y
Quoted 1 line

But is that the right way based on the questions above ?

I just sent a patch to update DEVRES to only be enabled on SPL. I think DM_DEVICE_REMOVE should not depend on DEVRES., but perhaps the other way around would make sense?

Regards,
Simon