Skip to contentSkip to conversation

usb: gadget: g_dnl.c: Drop unused includes

PATCH In review Tom Rini 3 participants 7 messages Aug 17, 2023 – Nov 17, 2023

Subsystems (4)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/4 usb: gadget: g_dnl.c: Drop unused includes

We don't need <dfu.h> nor <thor.h> in this file, drop them.

---
 drivers/usb/gadget/g_dnl.c | 2 --
 1 file changed, 2 deletions(-)
drivers/usb/gadget/g_dnl.c +0 -2
index afb7b74f3057..8423da377ca9 100644
@@ -16,8 +16,6 @@
 
 #include <g_dnl.h>
 #include <usb_mass_storage.h>
-#include <dfu.h>
-#include <thor.h>
 
 #include <env_callback.h>
 
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 2/4 fwu-mdata: Make FWU_MDATA_GPT_BLK depend on DFU

The implementation of this option in lib/fwu_updates/fwu_gpt.c is wholly dependent on DFU, so make that a requirement here.

---
I'm honestly not sure how to best proceed here as drivers/fwu-mdata/gpt_blk.c doesn't need DFU, but both files are controlled by this single symbol.

Cc Masami Hiramatsu <[email protected]>
Cc Jassi Brar <[email protected]>
Cc Sughosh Ganu <[email protected]>
Cc Ilias Apalodimas <[email protected]>
Cc Heinrich Schuchardt <[email protected]>
---
 drivers/fwu-mdata/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/fwu-mdata/Kconfig +1 -1
index 42736a5e43b0..0bd5fef4abfa 100644
@@ -15,7 +15,7 @@ config FWU_MDATA_GPT_BLK
 	bool "FWU Metadata access for GPT partitioned Block devices"
 	select PARTITION_TYPE_GUID
 	select PARTITION_UUIDS
-	depends on FWU_MDATA && BLK && EFI_PARTITION
+	depends on FWU_MDATA && BLK && EFI_PARTITION && DFU
 	help
 	  Enable support for accessing FWU Metadata on GPT partitioned
 	  block devices.
Signature · 1 line
2.34.1
#2 lore raw

Re: [PATCH 2/4] fwu-mdata: Make FWU_MDATA_GPT_BLK depend on DFU

Quoted 23 lines · Tom Rini

The implementation of this option in lib/fwu_updates/fwu_gpt.c is wholly dependent on DFU, so make that a requirement here.

---
I'm honestly not sure how to best proceed here as drivers/fwu-mdata/gpt_blk.c doesn't need DFU, but both files are controlled by this single symbol.

Cc Masami Hiramatsu <[email protected]>
Cc Jassi Brar <[email protected]>
Cc Sughosh Ganu <[email protected]>
Cc Ilias Apalodimas <[email protected]>
Cc Heinrich Schuchardt <[email protected]>
---
  drivers/fwu-mdata/Kconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/fwu-mdata/Kconfig +0 -0
index 42736a5e43b0..0bd5fef4abfa 100644

drivers/fwu-mdata/Kconfig config FWU_MDATA_GPT_BLK · line 18

Quoted 5 lines
drivers/fwu-mdata/Kconfig +1 -1
@@ -15,7 +15,7 @@ config FWU_MDATA_GPT_BLK
  	bool "FWU Metadata access for GPT partitioned Block devices"
  	select PARTITION_TYPE_GUID
  	select PARTITION_UUIDS
-	depends on FWU_MDATA && BLK && EFI_PARTITION
+	depends on FWU_MDATA && BLK && EFI_PARTITION && DFU

Hello Tom,

This looks like the wrong level of configuration to add a DFU dependency.

EFI_CAPSULE_FIRMWARE_FIT and EFI_CAPSULE_FIRMWARE_RAW select DFU and EFI_CAPSULE_FIRMWARE.

We probably should let CONFIG_FWU_MDATA depend on EFI_CAPSULE_ON_DISK.

Best regards

Heinrich

Quoted 3 lines
drivers/fwu-mdata/Kconfig +0 -0
  	help
  	  Enable support for accessing FWU Metadata on GPT partitioned
  	  block devices.
author
#3 lore raw

Re: [PATCH 2/4] fwu-mdata: Make FWU_MDATA_GPT_BLK depend on DFU

Quoted 32 lines · Heinrich Schuchardt
Quoted 23 lines · Tom Rini

The implementation of this option in lib/fwu_updates/fwu_gpt.c is wholly dependent on DFU, so make that a requirement here.

---
I'm honestly not sure how to best proceed here as drivers/fwu-mdata/gpt_blk.c doesn't need DFU, but both files are controlled by this single symbol.

Cc Masami Hiramatsu <[email protected]>
Cc Jassi Brar <[email protected]>
Cc Sughosh Ganu <[email protected]>
Cc Ilias Apalodimas <[email protected]>
Cc Heinrich Schuchardt <[email protected]>
---
  drivers/fwu-mdata/Kconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/fwu-mdata/Kconfig +0 -0
index 42736a5e43b0..0bd5fef4abfa 100644

drivers/fwu-mdata/Kconfig config FWU_MDATA_GPT_BLK · line 18

Quoted 5 lines
drivers/fwu-mdata/Kconfig +1 -1
@@ -15,7 +15,7 @@ config FWU_MDATA_GPT_BLK
  	bool "FWU Metadata access for GPT partitioned Block devices"
  	select PARTITION_TYPE_GUID
  	select PARTITION_UUIDS
-	depends on FWU_MDATA && BLK && EFI_PARTITION
+	depends on FWU_MDATA && BLK && EFI_PARTITION && DFU

Hello Tom,

Quoted 6 lines

This looks like the wrong level of configuration to add a DFU dependency.

EFI_CAPSULE_FIRMWARE_FIT and EFI_CAPSULE_FIRMWARE_RAW select DFU and EFI_CAPSULE_FIRMWARE.

We probably should let CONFIG_FWU_MDATA depend on EFI_CAPSULE_ON_DISK.

OK, but that doesn't address the dependency? The code in lib/fwu_updates/fwu_gpt.c needs DFU and is under FWU_MDATA_GPT_BLK. It provides fwu_plat_get_alt_num() which is called by fwu_get_image_index() and is under FWU_MULTI_BANK_UPDATE and in turn called by efi_firmware_raw_set_image() which is under EFI_CAPSULE_FIRMWARE_RAW. If both lib/fwu_updates/fwu_gpt.c and drivers/fwu-mdata/gpt_blk.c should be under the same symbol then it needs to depend on DFU, since it's a direct dependency in the code. We could change it up to EFI_CAPSULE_FIRMWARE_RAW I guess, but I'm not sure that's cleaner.

Signature · 1 line
Tom
author
#4 lore raw

PATCH 3/4 xilinx: zynqmp: Move dfu.h include to be with the code

In reply to Tom Rini

Move where we include <dfu.h> to be guarded by a DFU-related Kconfig option.

---
This becomes an issue with
https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
applied as now we can't include <dfu.h> without CONFIG_DFU_NAME_MAX_SIZE set (or we have a dummy value for ifndef). Another option would be to restructure the code to move the dfu code to another file, but I don't know if that will make the rest of the real use cases here easier or harder.

Cc Michal Simek <[email protected]>
---
 board/xilinx/zynqmp/zynqmp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
board/xilinx/zynqmp/zynqmp.c +1 -1
index 309f24a5f43d..367c3c65a9dc 100644
@@ -8,7 +8,6 @@
 #include <command.h>
 #include <cpu_func.h>
 #include <debug_uart.h>
-#include <dfu.h>
 #include <env.h>
 #include <env_internal.h>
 #include <init.h>
@@ -606,6 +605,7 @@ enum env_location env_get_location(enum env_operation op, int prio)
 }
 
 #if defined(CONFIG_SET_DFU_ALT_INFO)
+#include <dfu.h>
 
 #define DFU_ALT_BUF_LEN		SZ_1K
 
Signature · 1 line
2.34.1
maintainer Reviewed-by on v1 3/4
#5 lore raw

Re: [PATCH 3/4] xilinx: zynqmp: Move dfu.h include to be with the code

Quoted 31 lines · Tom Rini

Move where we include <dfu.h> to be guarded by a DFU-related Kconfig option.

---
This becomes an issue with
https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
applied as now we can't include <dfu.h> without CONFIG_DFU_NAME_MAX_SIZE set (or we have a dummy value for ifndef). Another option would be to restructure the code to move the dfu code to another file, but I don't know if that will make the rest of the real use cases here easier or harder.

Cc Michal Simek <[email protected]>
---
  board/xilinx/zynqmp/zynqmp.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
board/xilinx/zynqmp/zynqmp.c +0 -1
index 309f24a5f43d..367c3c65a9dc 100644
@@ -8,7 +8,6 @@
  #include <command.h>
  #include <cpu_func.h>
  #include <debug_uart.h>
-#include <dfu.h>
  #include <env.h>
  #include <env_internal.h>
  #include <init.h>

board/xilinx/zynqmp/zynqmp.c enum env_location env_get_location(enum env_operation op, int prio) · line 611

Quoted 7 lines
board/xilinx/zynqmp/zynqmp.c +1 -0
@@ -606,6 +605,7 @@ enum env_location env_get_location(enum env_operation op, int prio)
  }
 
  #if defined(CONFIG_SET_DFU_ALT_INFO)
+#include <dfu.h>
 
  #define DFU_ALT_BUF_LEN		SZ_1K
 

Thanks,
Michal

author
#6 lore raw

PATCH 4/4 ti: mach-k3: Move dfu.h include to be with the code

In reply to Tom Rini

Move where we include <dfu.h> to be guarded by a DFU-related Kconfig option.

---
This becomes an issue with
https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
applied as now we can't include <dfu.h> without CONFIG_DFU_NAME_MAX_SIZE set (or we have a dummy value for ifndef).

---
 arch/arm/mach-k3/sysfw-loader.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-k3/sysfw-loader.c +2 -1
index 9be2d9eaea26..a8edc4a92d11 100644
@@ -18,7 +18,6 @@
 #include <linux/soc/ti/ti_sci_protocol.h>
 #include <g_dnl.h>
 #include <usb.h>
-#include <dfu.h>
 #include <dm/uclass-internal.h>
 #include <spi_flash.h>
 
@@ -297,6 +296,8 @@ static void k3_sysfw_configure_using_fit(void *fit,
 }
 
 #if CONFIG_IS_ENABLED(DFU)
+#include <dfu.h>
+
 static int k3_sysfw_dfu_download(void *addr)
 {
 	char dfu_str[50];
Signature · 1 line
2.34.1