x86: Fix saying arch_cpu_init_dm in debug/docs
Subsystems (6)
PATCH 1/2 x86: Fix saying arch_cpu_init_dm in debug/docs
The function arch_cpu_init_dm was renamed to fsp_setup_pinctrl in these cases, so rename debug / docs to match.
--- arch/x86/lib/spl.c | 2 +- doc/board/google/chromebook_coral.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/lib/spl.c +1 -1
@@ -92,7 +92,7 @@ static int x86_spl_init(void)#ifndef CONFIG_TPL ret =fsp_setup_pinctrl (NULL ,NULL );if (ret) { -debug ("%s: arch_cpu_init_dm() failed\n" , __func__); +debug ("%s: fsp_setup_pinctrl() failed\n" , __func__);return ret; }#endif
doc/board/google/chromebook_coral.rst +1 -1
@@ -259,7 +259,7 @@ Boot flow - U-Boot pre-relocation U-Boot (running from start_from_spl.S) starts running in RAM and uses the same stack as SPL. It does various init activities before relocation. Notably -arch_cpu_init_dm() sets up the pin muxing for the chip using a very large table +fsp_setup_pinctrl() sets up the pin muxing for the chip using a very large table in the device tree. PCI auto-config is not used before relocation, but CONFIG_PCI of course is
Signature · 1 line
2.25.1
PATCH 2/2 event: Correct dependencies on the EVENT framework
The event framework is just that, a framework. Enabling it by itself does nothing, so we shouldn't ask the user about it. Reword (and correct typos) around this the option and help text. This also applies to DM_EVENT, so reword as well.
With this, it's time to address the larger problems. When functionality uses events, typically via EVENT_SPY, the appropriate framework then must be select'd and NOT imply'd. As the functionality will cease to work (and so, platforms will fail to boot) this is non-optional and where select is appropriate. Audit the current users of EVENT_SPY to have a more fine-grained approach to select'ing the framework where used.
--- arch/Kconfig | 6 +++--- arch/arm/Kconfig | 9 ++++----- arch/arm/mach-omap2/Kconfig | 3 +++ arch/mips/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/cpu/baytrail/Kconfig | 1 + arch/x86/cpu/broadwell/Kconfig | 1 + arch/x86/cpu/ivybridge/Kconfig | 1 + arch/x86/cpu/quark/Kconfig | 1 + board/google/Kconfig | 1 + board/keymile/Kconfig | 1 + boot/Kconfig | 1 + cmd/Kconfig | 1 + common/Kconfig | 17 ++++++++--------- drivers/core/Kconfig | 9 +++++---- drivers/cpu/Kconfig | 1 - lib/efi_loader/Kconfig | 5 ++--- 18 files changed, 36 insertions(+), 26 deletions(-)
arch/Kconfig +3 -3
@@ -93,7 +93,7 @@ config NIOS2 bool "Nios II architecture" select CPU select DM - imply DM_EVENT + select DM_EVENT select OF_CONTROL select SUPPORT_OF_CONTROL imply CMD_DM
@@ -111,9 +111,9 @@ config RISCV select SUPPORT_OF_CONTROL select OF_CONTROL select DM + select DM_EVENT imply SPL_SEPARATE_BSS if SPL imply DM_SERIAL - imply DM_EVENT imply DM_MMC imply DM_SPI imply DM_SPI_FLASH
@@ -136,6 +136,7 @@ config SANDBOX select BZIP2 select CMD_POWEROFF select DM + select DM_EVENT select DM_FUZZING_ENGINE select DM_GPIO select DM_I2C
@@ -240,7 +241,6 @@ config X86 imply CMD_SF imply CMD_SF_TEST imply CMD_ZBOOT - imply DM_EVENT imply DM_GPIO imply DM_KEYBOARD imply DM_MMC
arch/arm/Kconfig +4 -5
@@ -778,7 +778,6 @@ config ARCH_OMAP2PLUS select SUPPORT_SPL imply TI_SYSC if DM && OF_CONTROL imply FIT - imply DM_EVENT imply SPL_SEPARATE_BSS config ARCH_MESON
@@ -823,11 +822,11 @@ config ARCH_IMX8 select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE select DM + select DM_EVENT select GPIO_EXTRA_HEADER select MACH_IMX select OF_CONTROL select ENABLE_ARM_SOC_BOOT0_HOOK - imply DM_EVENT config ARCH_IMX8M bool "NXP i.MX8M platform"
@@ -839,14 +838,15 @@ config ARCH_IMX8M select SYS_FSL_SEC_LE select SYS_I2C_MXC select DM + select DM_EVENT if CLK select SUPPORT_SPL imply CMD_DM - imply DM_EVENT config ARCH_IMX8ULP bool "NXP i.MX8ULP platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select OF_CONTROL select SUPPORT_SPL
@@ -854,19 +854,18 @@ config ARCH_IMX8ULP select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMX9 bool "NXP i.MX9 platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select SUPPORT_SPL select GPIO_EXTRA_HEADER select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMXRT bool "NXP i.MXRT platform"
arch/arm/mach-omap2/Kconfig +3 -0
@@ -31,6 +31,7 @@ config OMAP34XX config OMAP44XX bool "OMAP44XX SoC" + select DM_EVENT select SPL_USE_TINY_PRINTF select SPL_SYS_NO_VECTOR_TABLE if SPL imply NAND_OMAP_ELM
@@ -55,6 +56,7 @@ config OMAP54XX bool "OMAP54XX SoC" select ARM_CORTEX_A15_CVE_2017_5715 select ARM_ERRATA_798870 + select DM_EVENT select SYS_THUMB_BUILD imply NAND_OMAP_ELM imply NAND_OMAP_GPMC
@@ -111,6 +113,7 @@ config AM43XX config AM33XX bool "AM33XX SoC" select ARM_CORTEX_A8_CVE_2017_5715 + select DM_EVENT select SPECIFY_CONSOLE_INDEX imply NAND_OMAP_ELM imply NAND_OMAP_GPMC
arch/mips/Kconfig +1 -1
@@ -121,6 +121,7 @@ config MACH_PIC32 bool "Support Microchip PIC32" select HAS_FIXED_TIMER_FREQUENCY select DM + select DM_EVENT select OF_CONTROL imply CMD_DM
@@ -128,7 +129,6 @@ config TARGET_BOSTON bool "Support Boston" select HAS_FIXED_TIMER_FREQUENCY select DM - imply DM_EVENT select DM_SERIAL select MIPS_CM select SYS_CACHE_SHIFT_6
arch/powerpc/cpu/mpc85xx/Kconfig +1 -0
@@ -248,6 +248,7 @@ config TARGET_KMP204X config TARGET_KMCENT2 bool "Support kmcent2" select VENDOR_KM + select EVENT select FSL_CORENET select SYS_DPAA_FMAN select SYS_DPAA_PME
arch/x86/Kconfig +1 -0
@@ -395,6 +395,7 @@ config FSP_VERSION1 config FSP_VERSION2 bool "FSP version 2.x" + select DM_EVENT help This covers versions 2.0 and 2.1. See here for details: https://github.com/IntelFsp/fsp/wiki
arch/x86/cpu/baytrail/Kconfig +1 -0
@@ -7,6 +7,7 @@ config INTEL_BAYTRAIL select HAVE_FSP select ARCH_MISC_INIT select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCI
arch/x86/cpu/broadwell/Kconfig +1 -0
@@ -6,6 +6,7 @@ config INTEL_BROADWELL bool select CACHE_MRC_BIN + select DM_EVENT select ARCH_EARLY_INIT_R imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE
arch/x86/cpu/ivybridge/Kconfig +1 -0
@@ -8,6 +8,7 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE bool select CACHE_MRC_BIN if HAVE_MRC + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCI
arch/x86/cpu/quark/Kconfig +1 -0
@@ -7,6 +7,7 @@ config INTEL_QUARK select HAVE_RMU select ARCH_EARLY_INIT_R select ARCH_MISC_INIT + select DM_EVENT imply ENABLE_MRC_CACHE imply ETH_DESIGNWARE imply ICH_SPI
board/google/Kconfig +1 -0
@@ -18,6 +18,7 @@ choice config TARGET_CHROMEBOOK_CORAL bool "Chromebook coral" select BIOSEMU + select EVENT help This is a range of Intel-based laptops released in 2018. They use an Intel Apollo Lake SoC. The design supports WiFi, 4GB to 16GB of
board/keymile/Kconfig +1 -0
@@ -124,6 +124,7 @@ config SYS_IVM_EEPROM_PAGE_LEN config PG_WCOM_UBOOT_UPDATE_SUPPORTED bool "Enable U-boot Field Fail-Safe Update Functionality" + select EVENT default n help Indicates that field fail-safe u-boot update is supported.
boot/Kconfig +1 -0
@@ -474,6 +474,7 @@ config BOOTMETH_VBE depends on FIT default y select BOOTMETH_GLOBAL + select EVENT help Enables support for VBE boot. This is a standard boot method which supports selection of various firmware components, seleciton of an OS to
cmd/Kconfig +1 -0
@@ -2622,6 +2622,7 @@ config CMD_DIAG config CMD_EVENT bool "event - Show information about events" + depends on EVENT default y if EVENT_DEBUG help This enables the 'event' command which provides information about
common/Kconfig +8 -9
@@ -604,24 +604,23 @@ config CYCLIC_MAX_CPU_TIME_US endif # CYCLIC config EVENT - bool "General-purpose event-handling mechanism" - default y if SANDBOX + bool help - This enables sending and processing of events, to allow interested - parties to be alerted when something happens. This is an attempt to - stem the flow of weak functions, hooks, functions in board_f.c - and board_r.c and the Kconfig options below. + This adds a framework for general purpose sending and processing of + events, to allow interested parties to be alerted when something + happens. This is an attempt to stem the flow of weak functions, + hooks, functions in board_f.c and board_r.c and the Kconfig options + below. See doc/develop/event.rst for more information. if EVENT config EVENT_DYNAMIC - bool "Support event registration at runtime" - default y if SANDBOX + bool help Enable this to support adding an event spy at runtime, without adding - it to the EVENT_SPy() linker list. This increases code size slightly + it to the EVENT_SPY() linker list. This increases code size slightly but provides more flexibility for boards and subsystems that need it. config EVENT_DEBUG
drivers/core/Kconfig +5 -4
@@ -109,13 +109,14 @@ config DM_DEVICE_REMOVE causes USB host controllers to not be stopped when booting the OS. config DM_EVENT - bool "Support events with driver model" - depends on DM && EVENT - default y if SANDBOX + bool + depends on DM + select EVENT help This enables support for generating events related to driver model operations, such as prbing or removing a device. Subsystems can - register a 'spy' function that is called when the event occurs. + register a 'spy' function that is called when the event occurs. Such + subsystems must select this option. config SPL_DM_DEVICE_REMOVE bool "Support device removal in SPL"
drivers/cpu/Kconfig +0 -1
@@ -23,7 +23,6 @@ config CPU_RISCV config CPU_MICROBLAZE bool "Enable Microblaze CPU driver" depends on CPU && MICROBLAZE - select EVENT select DM_EVENT select XILINX_MICROBLAZE0_PVR help
lib/efi_loader/Kconfig +2 -3
@@ -14,9 +14,8 @@ config EFI_LOADER depends on !EFI_APP default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8 select CHARSET - select DM_EVENT - select EVENT - select EVENT_DYNAMIC + select DM_EVENT if PARTITIONS + select EVENT_DYNAMIC if EVENT select LIB_UUID imply PARTITION_UUIDS select REGEX
Signature · 1 line
2.25.1
Re: [PATCH 2/2] event: Correct dependencies on the EVENT framework
Hi Tom,
Quoted 30 lines · Tom Rini
The event framework is just that, a framework. Enabling it by itself does nothing, so we shouldn't ask the user about it. Reword (and correct typos) around this the option and help text. This also applies to
DM_EVENT, so reword as well.With this, it's time to address the larger problems. When functionality uses events, typically via
EVENT_SPY, the appropriate framework then must be select'd and NOT imply'd. As the functionality will cease to work (and so, platforms will fail to boot) this is non-optional and where select is appropriate. Audit the current users ofEVENT_SPYto have a more fine-grained approach to select'ing the framework where used.Cc Simon Glass <[email protected]>Reported-by Oliver Graute <[email protected]>Reported-by Francesco Dolcini <[email protected]>Fixes 7fe32b3442f0 ("event: Convert arch_cpu_init_dm() to use events")Fixes 42fdcebf859f ("event: Convert misc_init_f() to use events")Signed-off-by Tom Rini <[email protected]>--- arch/Kconfig | 6 +++--- arch/arm/Kconfig | 9 ++++----- arch/arm/mach-omap2/Kconfig | 3 +++ arch/mips/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/cpu/baytrail/Kconfig | 1 + arch/x86/cpu/broadwell/Kconfig | 1 + arch/x86/cpu/ivybridge/Kconfig | 1 +
Quoted 8 lines
arch/x86/cpu/quark/Kconfig | 1 + board/google/Kconfig | 1 + board/keymile/Kconfig | 1 + boot/Kconfig | 1 + cmd/Kconfig | 1 + common/Kconfig | 17 ++++++++--------- drivers/core/Kconfig | 9 +++++---- drivers/cpu/Kconfig | 1 -
Tested on chromebook-coral:
I am not quite sure what the effective difference is between select and imply. Doesn't this suggest that there are some conflicting config options? The only way imply would be disabled ( I thought) is if a board does it explicitly?
Regards,
Simon
Re: [PATCH 2/2] event: Correct dependencies on the EVENT framework
Quoted 44 lines · Simon Glass
Hi Tom,
Quoted 30 lines · Tom Rini
The event framework is just that, a framework. Enabling it by itself does nothing, so we shouldn't ask the user about it. Reword (and correct typos) around this the option and help text. This also applies to
DM_EVENT, so reword as well.With this, it's time to address the larger problems. When functionality uses events, typically via
EVENT_SPY, the appropriate framework then must be select'd and NOT imply'd. As the functionality will cease to work (and so, platforms will fail to boot) this is non-optional and where select is appropriate. Audit the current users ofEVENT_SPYto have a more fine-grained approach to select'ing the framework where used.Cc Simon Glass <[email protected]>Reported-by Oliver Graute <[email protected]>Reported-by Francesco Dolcini <[email protected]>Fixes 7fe32b3442f0 ("event: Convert arch_cpu_init_dm() to use events")Fixes 42fdcebf859f ("event: Convert misc_init_f() to use events")Signed-off-by Tom Rini <[email protected]>--- arch/Kconfig | 6 +++--- arch/arm/Kconfig | 9 ++++----- arch/arm/mach-omap2/Kconfig | 3 +++ arch/mips/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/cpu/baytrail/Kconfig | 1 + arch/x86/cpu/broadwell/Kconfig | 1 + arch/x86/cpu/ivybridge/Kconfig | 1 +Quoted 8 lines
arch/x86/cpu/quark/Kconfig | 1 + board/google/Kconfig | 1 + board/keymile/Kconfig | 1 + boot/Kconfig | 1 + cmd/Kconfig | 1 + common/Kconfig | 17 ++++++++--------- drivers/core/Kconfig | 9 +++++---- drivers/cpu/Kconfig | 1 -Reviewed-by Simon Glass <[email protected]>
Quoted 7 lines
Tested on chromebook-coral:
Tested-by Simon Glass <[email protected]>I am not quite sure what the effective difference is between select and imply. Doesn't this suggest that there are some conflicting config options? The only way imply would be disabled ( I thought) is if a board does it explicitly?
So there's two parts to it. As a framework, the option needs to be select'd, not implied. It doesn't make sense to disable the event framework and then wonder why VBE doesn't work. The next part however is
should have been part of it too. That commit turned all of the platforms which had imply DM_EVENT (and so from DM_EVENT, imply EVENT) in to depends on EVENT being set, and if it wasn't set (or select'd, only EFI_LOADER was select'ing it at the time) in to not enabling DM_EVENT, and since imply options can be off, no warnings were thrown by the build system. And since all of the non-dynamic EVENT stuff is linker-based, no binary size changes happened either.
Signature · 1 line
Tom
Re: [PATCH 2/2] event: Correct dependencies on the EVENT framework
Hi Tom,
Quoted 54 lines · Tom Rini
Quoted 44 lines · Simon Glass
Hi Tom,
Quoted 30 lines · Tom Rini
The event framework is just that, a framework. Enabling it by itself does nothing, so we shouldn't ask the user about it. Reword (and correct typos) around this the option and help text. This also applies to
DM_EVENT, so reword as well.With this, it's time to address the larger problems. When functionality uses events, typically via
EVENT_SPY, the appropriate framework then must be select'd and NOT imply'd. As the functionality will cease to work (and so, platforms will fail to boot) this is non-optional and where select is appropriate. Audit the current users ofEVENT_SPYto have a more fine-grained approach to select'ing the framework where used.Cc Simon Glass <[email protected]>Reported-by Oliver Graute <[email protected]>Reported-by Francesco Dolcini <[email protected]>Fixes 7fe32b3442f0 ("event: Convert arch_cpu_init_dm() to use events")Fixes 42fdcebf859f ("event: Convert misc_init_f() to use events")Signed-off-by Tom Rini <[email protected]>--- arch/Kconfig | 6 +++--- arch/arm/Kconfig | 9 ++++----- arch/arm/mach-omap2/Kconfig | 3 +++ arch/mips/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/cpu/baytrail/Kconfig | 1 + arch/x86/cpu/broadwell/Kconfig | 1 + arch/x86/cpu/ivybridge/Kconfig | 1 +Quoted 8 lines
arch/x86/cpu/quark/Kconfig | 1 + board/google/Kconfig | 1 + board/keymile/Kconfig | 1 + boot/Kconfig | 1 + cmd/Kconfig | 1 + common/Kconfig | 17 ++++++++--------- drivers/core/Kconfig | 9 +++++---- drivers/cpu/Kconfig | 1 -Reviewed-by Simon Glass <[email protected]>Quoted 7 lines
Tested on chromebook-coral:
Tested-by Simon Glass <[email protected]>I am not quite sure what the effective difference is between select and imply. Doesn't this suggest that there are some conflicting config options? The only way imply would be disabled ( I thought) is if a board does it explicitly?
Quoted 5 lines
So there's two parts to it. As a framework, the option needs to be select'd, not implied. It doesn't make sense to disable the event framework and then wonder why VBE doesn't work. The next part however is
Fixes c5ef2025579e ("dm: fix DM_EVENT dependencies")
OK
Quoted 8 lines
should have been part of it too. That commit turned all of the platforms which had imply
DM_EVENT(and so fromDM_EVENT, imply EVENT) in to depends on EVENT being set, and if it wasn't set (or select'd, onlyEFI_LOADERwas select'ing it at the time) in to not enablingDM_EVENT, and since imply options can be off, no warnings were thrown by the build system. And since all of the non-dynamic EVENT stuff is linker-based, no binary size changes happened either.
So does this mean that select is 'forcing' the option to be enabled, even if it conflicts with something else, or depends on something which is not set?
I'd quite like to understand this better for the future. Could you point to a board that was broken and now fixed, so I can have a fiddle with it?
Thanks,
Simon
Re: [PATCH 2/2] event: Correct dependencies on the EVENT framework
Quoted 74 lines · Simon Glass
Hi Tom,
Quoted 54 lines · Tom Rini
Quoted 44 lines · Simon Glass
Hi Tom,
Quoted 30 lines · Tom Rini
The event framework is just that, a framework. Enabling it by itself does nothing, so we shouldn't ask the user about it. Reword (and correct typos) around this the option and help text. This also applies to
DM_EVENT, so reword as well.With this, it's time to address the larger problems. When functionality uses events, typically via
EVENT_SPY, the appropriate framework then must be select'd and NOT imply'd. As the functionality will cease to work (and so, platforms will fail to boot) this is non-optional and where select is appropriate. Audit the current users ofEVENT_SPYto have a more fine-grained approach to select'ing the framework where used.Cc Simon Glass <[email protected]>Reported-by Oliver Graute <[email protected]>Reported-by Francesco Dolcini <[email protected]>Fixes 7fe32b3442f0 ("event: Convert arch_cpu_init_dm() to use events")Fixes 42fdcebf859f ("event: Convert misc_init_f() to use events")Signed-off-by Tom Rini <[email protected]>--- arch/Kconfig | 6 +++--- arch/arm/Kconfig | 9 ++++----- arch/arm/mach-omap2/Kconfig | 3 +++ arch/mips/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/cpu/baytrail/Kconfig | 1 + arch/x86/cpu/broadwell/Kconfig | 1 + arch/x86/cpu/ivybridge/Kconfig | 1 +Quoted 8 lines
arch/x86/cpu/quark/Kconfig | 1 + board/google/Kconfig | 1 + board/keymile/Kconfig | 1 + boot/Kconfig | 1 + cmd/Kconfig | 1 + common/Kconfig | 17 ++++++++--------- drivers/core/Kconfig | 9 +++++---- drivers/cpu/Kconfig | 1 -Reviewed-by Simon Glass <[email protected]>Quoted 7 lines
Tested on chromebook-coral:
Tested-by Simon Glass <[email protected]>I am not quite sure what the effective difference is between select and imply. Doesn't this suggest that there are some conflicting config options? The only way imply would be disabled ( I thought) is if a board does it explicitly?
Quoted 5 lines
So there's two parts to it. As a framework, the option needs to be select'd, not implied. It doesn't make sense to disable the event framework and then wonder why VBE doesn't work. The next part however is
Fixes c5ef2025579e ("dm: fix DM_EVENT dependencies")OK
Quoted 8 lines
should have been part of it too. That commit turned all of the platforms which had imply
DM_EVENT(and so fromDM_EVENT, imply EVENT) in to depends on EVENT being set, and if it wasn't set (or select'd, onlyEFI_LOADERwas select'ing it at the time) in to not enablingDM_EVENT, and since imply options can be off, no warnings were thrown by the build system. And since all of the non-dynamic EVENT stuff is linker-based, no binary size changes happened either.
Quoted 7 lines
So does this mean that select is 'forcing' the option to be enabled, even if it conflicts with something else, or depends on something which is not set?
I'd quite like to understand this better for the future. Could you point to a board that was broken and now fixed, so I can have a fiddle with it?
While kernel centric at times (of course)
https://www.kernel.org/doc/html/latest/kbuild/kconfig-language.html#menu-attributes
covers things well, especially for the language itself. So yes, select forces the option to be enabled. If there's an unmet (depends on ...) dependency, then it will emit a warning to tell you as such. An example of a previously broken board would be apalis-imx8 as it does not enable EFI_LOADER so no DM_EVENT / EVENT and so:
arch/arm/mach-imx/imx8/cpu.c:EVENT_SPY(EVT_DM_POST_INIT, imx8_init_mu); wasn't called and the platform would silently fail to boot.
Signature · 1 line
Tom
Re: [PATCH 2/2] event: Correct dependencies on the EVENT framework
Hi Tom,
Quoted 84 lines · Tom Rini
Quoted 74 lines · Simon Glass
Hi Tom,
Quoted 54 lines · Tom Rini
Quoted 44 lines · Simon Glass
Hi Tom,
Quoted 30 lines · Tom Rini
The event framework is just that, a framework. Enabling it by itself does nothing, so we shouldn't ask the user about it. Reword (and correct typos) around this the option and help text. This also applies to
DM_EVENT, so reword as well.With this, it's time to address the larger problems. When functionality uses events, typically via
EVENT_SPY, the appropriate framework then must be select'd and NOT imply'd. As the functionality will cease to work (and so, platforms will fail to boot) this is non-optional and where select is appropriate. Audit the current users ofEVENT_SPYto have a more fine-grained approach to select'ing the framework where used.Cc Simon Glass <[email protected]>Reported-by Oliver Graute <[email protected]>Reported-by Francesco Dolcini <[email protected]>Fixes 7fe32b3442f0 ("event: Convert arch_cpu_init_dm() to use events")Fixes 42fdcebf859f ("event: Convert misc_init_f() to use events")Signed-off-by Tom Rini <[email protected]>--- arch/Kconfig | 6 +++--- arch/arm/Kconfig | 9 ++++----- arch/arm/mach-omap2/Kconfig | 3 +++ arch/mips/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/cpu/baytrail/Kconfig | 1 + arch/x86/cpu/broadwell/Kconfig | 1 + arch/x86/cpu/ivybridge/Kconfig | 1 +Quoted 8 lines
arch/x86/cpu/quark/Kconfig | 1 + board/google/Kconfig | 1 + board/keymile/Kconfig | 1 + boot/Kconfig | 1 + cmd/Kconfig | 1 + common/Kconfig | 17 ++++++++--------- drivers/core/Kconfig | 9 +++++---- drivers/cpu/Kconfig | 1 -Reviewed-by Simon Glass <[email protected]>Quoted 7 lines
Tested on chromebook-coral:
Tested-by Simon Glass <[email protected]>I am not quite sure what the effective difference is between select and imply. Doesn't this suggest that there are some conflicting config options? The only way imply would be disabled ( I thought) is if a board does it explicitly?
Quoted 5 lines
So there's two parts to it. As a framework, the option needs to be select'd, not implied. It doesn't make sense to disable the event framework and then wonder why VBE doesn't work. The next part however is
Fixes c5ef2025579e ("dm: fix DM_EVENT dependencies")OK
Quoted 8 lines
should have been part of it too. That commit turned all of the platforms which had imply
DM_EVENT(and so fromDM_EVENT, imply EVENT) in to depends on EVENT being set, and if it wasn't set (or select'd, onlyEFI_LOADERwas select'ing it at the time) in to not enablingDM_EVENT, and since imply options can be off, no warnings were thrown by the build system. And since all of the non-dynamic EVENT stuff is linker-based, no binary size changes happened either.Quoted 7 lines
So does this mean that select is 'forcing' the option to be enabled, even if it conflicts with something else, or depends on something which is not set?
I'd quite like to understand this better for the future. Could you point to a board that was broken and now fixed, so I can have a fiddle with it?
Quoted 9 lines
While kernel centric at times (of course)
https://www.kernel.org/doc/html/latest/kbuild/kconfig-language.html#menu-attributes
covers things well, especially for the language itself. So yes, select forces the option to be enabled. If there's an unmet (depends on ...) dependency, then it will emit a warning to tell you as such. An example of a previously broken board would be apalis-imx8 as it does not enableEFI_LOADERso noDM_EVENT/ EVENT and so:
arch/arm/mach-imx/imx8/cpu.c:EVENT_SPY(EVT_DM_POST_INIT,imx8_init_mu); wasn't called and the platform would silently fail to boot.
Thanks for the info. So in that case, since DM_EVENT depended on EVENT and DM_EVENT was only implied (but EVENT was not enabled), it didn't work.
Yes I agree 'select' is better here, to force it. But in this case the 'select EVENT' in 'DM_EVENT' is enough (as would be an 'imply EVENT'). I am quite happy with how it has turned out, but I do want to use 'select' sparingly as it limits what boards can modify.
Regards,
Simon
Re: [PATCH 2/2] event: Correct dependencies on the EVENT framework
In reply to Tom RiniHi Tom,
Quoted 14 lines · Tom Rini
The event framework is just that, a framework. Enabling it by itself does nothing, so we shouldn't ask the user about it. Reword (and correct typos) around this the option and help text. This also applies to
DM_EVENT, so reword as well.With this, it's time to address the larger problems. When functionality uses events, typically via
EVENT_SPY, the appropriate framework then must be select'd and NOT imply'd. As the functionality will cease to work (and so, platforms will fail to boot) this is non-optional and where select is appropriate. Audit the current users ofEVENT_SPYto have a more fine-grained approach to select'ing the framework where used.
Quoted 6 lines
Cc Simon Glass <[email protected]>Reported-by Oliver Graute <[email protected]>Reported-by Francesco Dolcini <[email protected]>Fixes 7fe32b3442f0 ("event: Convert arch_cpu_init_dm() to use events")Fixes 42fdcebf859f ("event: Convert misc_init_f() to use events")Signed-off-by Tom Rini <[email protected]>
Thanks for investigating and providing a proper fix:
Re: [PATCH 2/2] event: Correct dependencies on the EVENT framework
In reply to Tom RiniHi Tom,
Quoted 388 lines · Tom Rini
The event framework is just that, a framework. Enabling it by itself does nothing, so we shouldn't ask the user about it. Reword (and correct typos) around this the option and help text. This also applies to
DM_EVENT, so reword as well.With this, it's time to address the larger problems. When functionality uses events, typically via
EVENT_SPY, the appropriate framework then must be select'd and NOT imply'd. As the functionality will cease to work (and so, platforms will fail to boot) this is non-optional and where select is appropriate. Audit the current users ofEVENT_SPYto have a more fine-grained approach to select'ing the framework where used.Cc Simon Glass <[email protected]>Reported-by Oliver Graute <[email protected]>Reported-by Francesco Dolcini <[email protected]>Fixes 7fe32b3442f0 ("event: Convert arch_cpu_init_dm() to use events")Fixes 42fdcebf859f ("event: Convert misc_init_f() to use events")Signed-off-by Tom Rini <[email protected]>--- arch/Kconfig | 6 +++--- arch/arm/Kconfig | 9 ++++----- arch/arm/mach-omap2/Kconfig | 3 +++ arch/mips/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/cpu/baytrail/Kconfig | 1 + arch/x86/cpu/broadwell/Kconfig | 1 + arch/x86/cpu/ivybridge/Kconfig | 1 + arch/x86/cpu/quark/Kconfig | 1 + board/google/Kconfig | 1 + board/keymile/Kconfig | 1 + boot/Kconfig | 1 + cmd/Kconfig | 1 + common/Kconfig | 17 ++++++++--------- drivers/core/Kconfig | 9 +++++---- drivers/cpu/Kconfig | 1 - lib/efi_loader/Kconfig | 5 ++--- 18 files changed, 36 insertions(+), 26 deletions(-)arch/Kconfig +3
-3@@ -93,7 +93,7 @@ config NIOS2 bool "Nios II architecture" select CPU select DM - imply DM_EVENT + select DM_EVENT select OF_CONTROL select SUPPORT_OF_CONTROL imply CMD_DM@@ -111,9 +111,9 @@ config RISCV select SUPPORT_OF_CONTROL select OF_CONTROL select DM + select DM_EVENT imply SPL_SEPARATE_BSS if SPL imply DM_SERIAL - imply DM_EVENT imply DM_MMC imply DM_SPI imply DM_SPI_FLASH@@ -136,6 +136,7 @@ config SANDBOX select BZIP2 select CMD_POWEROFF select DM + select DM_EVENT select DM_FUZZING_ENGINE select DM_GPIO select DM_I2C@@ -240,7 +241,6 @@ config X86 imply CMD_SF imply CMD_SF_TEST imply CMD_ZBOOT - imply DM_EVENT imply DM_GPIO imply DM_KEYBOARD imply DM_MMCarch/arm/Kconfig +4
-5@@ -778,7 +778,6 @@ config ARCH_OMAP2PLUS select SUPPORT_SPL imply TI_SYSC if DM && OF_CONTROL imply FIT - imply DM_EVENT imply SPL_SEPARATE_BSS config ARCH_MESON@@ -823,11 +822,11 @@ config ARCH_IMX8 select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE select DM + select DM_EVENT select GPIO_EXTRA_HEADER select MACH_IMX select OF_CONTROL select ENABLE_ARM_SOC_BOOT0_HOOK - imply DM_EVENT config ARCH_IMX8M bool "NXP i.MX8M platform"@@ -839,14 +838,15 @@ config ARCH_IMX8M select SYS_FSL_SEC_LE select SYS_I2C_MXC select DM + select DM_EVENT if CLK select SUPPORT_SPL imply CMD_DM - imply DM_EVENT config ARCH_IMX8ULP bool "NXP i.MX8ULP platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select OF_CONTROL select SUPPORT_SPL@@ -854,19 +854,18 @@ config ARCH_IMX8ULP select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMX9 bool "NXP i.MX9 platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select SUPPORT_SPL select GPIO_EXTRA_HEADER select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMXRT bool "NXP i.MXRT platform"arch/arm/mach-omap2/Kconfig +3
-0@@ -31,6 +31,7 @@ config OMAP34XX config OMAP44XX bool "OMAP44XX SoC" + select DM_EVENT select SPL_USE_TINY_PRINTF select SPL_SYS_NO_VECTOR_TABLE if SPL imply NAND_OMAP_ELM@@ -55,6 +56,7 @@ config OMAP54XX bool "OMAP54XX SoC" select ARM_CORTEX_A15_CVE_2017_5715 select ARM_ERRATA_798870 + select DM_EVENT select SYS_THUMB_BUILD imply NAND_OMAP_ELM imply NAND_OMAP_GPMC@@ -111,6 +113,7 @@ config AM43XX config AM33XX bool "AM33XX SoC" select ARM_CORTEX_A8_CVE_2017_5715 + select DM_EVENT select SPECIFY_CONSOLE_INDEX imply NAND_OMAP_ELM imply NAND_OMAP_GPMCarch/mips/Kconfig +1
-1@@ -121,6 +121,7 @@ config MACH_PIC32 bool "Support Microchip PIC32" select HAS_FIXED_TIMER_FREQUENCY select DM + select DM_EVENT select OF_CONTROL imply CMD_DM@@ -128,7 +129,6 @@ config TARGET_BOSTON bool "Support Boston" select HAS_FIXED_TIMER_FREQUENCY select DM - imply DM_EVENT select DM_SERIAL select MIPS_CM select SYS_CACHE_SHIFT_6arch/powerpc/cpu/mpc85xx/Kconfig +1
-0@@ -248,6 +248,7 @@ config TARGET_KMP204X config TARGET_KMCENT2 bool "Support kmcent2" select VENDOR_KM + select EVENT select FSL_CORENET select SYS_DPAA_FMAN select SYS_DPAA_PMEarch/x86/Kconfig +1
-0@@ -395,6 +395,7 @@ config FSP_VERSION1 config FSP_VERSION2 bool "FSP version 2.x" + select DM_EVENT help This covers versions 2.0 and 2.1. See here for details: https://github.com/IntelFsp/fsp/wikiarch/x86/cpu/baytrail/Kconfig +1
-0@@ -7,6 +7,7 @@ config INTEL_BAYTRAIL select HAVE_FSP select ARCH_MISC_INIT select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCIarch/x86/cpu/broadwell/Kconfig +1
-0@@ -6,6 +6,7 @@ config INTEL_BROADWELL bool select CACHE_MRC_BIN + select DM_EVENT select ARCH_EARLY_INIT_R imply HAVE_INTEL_ME imply ENABLE_MRC_CACHEarch/x86/cpu/ivybridge/Kconfig +1
-0@@ -8,6 +8,7 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE bool select CACHE_MRC_BIN if HAVE_MRC + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCIarch/x86/cpu/quark/Kconfig +1
-0@@ -7,6 +7,7 @@ config INTEL_QUARK select HAVE_RMU select ARCH_EARLY_INIT_R select ARCH_MISC_INIT + select DM_EVENT imply ENABLE_MRC_CACHE imply ETH_DESIGNWARE imply ICH_SPIboard/google/Kconfig +1
-0@@ -18,6 +18,7 @@ choice config TARGET_CHROMEBOOK_CORAL bool "Chromebook coral" select BIOSEMU + select EVENT help This is a range of Intel-based laptops released in 2018. They use an Intel Apollo Lake SoC. The design supports WiFi, 4GB to 16GB ofboard/keymile/Kconfig +1
-0@@ -124,6 +124,7 @@ config SYS_IVM_EEPROM_PAGE_LEN config PG_WCOM_UBOOT_UPDATE_SUPPORTED bool "Enable U-boot Field Fail-Safe Update Functionality" + select EVENT default n help Indicates that field fail-safe u-boot update is supported.boot/Kconfig +1
-0@@ -474,6 +474,7 @@ config BOOTMETH_VBE depends on FIT default y select BOOTMETH_GLOBAL + select EVENT help Enables support for VBE boot. This is a standard boot method which supports selection of various firmware components, seleciton of an OS tocmd/Kconfig +1
-0@@ -2622,6 +2622,7 @@ config CMD_DIAG config CMD_EVENT bool "event - Show information about events" + depends on EVENT default y if EVENT_DEBUG help This enables the 'event' command which provides information aboutcommon/Kconfig +8
-9@@ -604,24 +604,23 @@ config CYCLIC_MAX_CPU_TIME_US endif # CYCLIC config EVENT - bool "General-purpose event-handling mechanism" - default y if SANDBOX + bool help - This enables sending and processing of events, to allow interested - parties to be alerted when something happens. This is an attempt to - stem the flow of weak functions, hooks, functions in board_f.c - and board_r.c and the Kconfig options below. + This adds a framework for general purpose sending and processing of + events, to allow interested parties to be alerted when something + happens. This is an attempt to stem the flow of weak functions, + hooks, functions in board_f.c and board_r.c and the Kconfig options + below. See doc/develop/event.rst for more information. if EVENT config EVENT_DYNAMIC - bool "Support event registration at runtime" - default y if SANDBOX + bool help Enable this to support adding an event spy at runtime, without adding - it to the EVENT_SPy() linker list. This increases code size slightly + it to the EVENT_SPY() linker list. This increases code size slightly but provides more flexibility for boards and subsystems that need it. config EVENT_DEBUGdrivers/core/Kconfig +5
-4@@ -109,13 +109,14 @@ config DM_DEVICE_REMOVE causes USB host controllers to not be stopped when booting the OS. config DM_EVENT - bool "Support events with driver model" - depends on DM && EVENT - default y if SANDBOX + bool + depends on DM + select EVENT help This enables support for generating events related to driver model operations, such as prbing or removing a device. Subsystems can - register a 'spy' function that is called when the event occurs. + register a 'spy' function that is called when the event occurs. Such + subsystems must select this option. config SPL_DM_DEVICE_REMOVE bool "Support device removal in SPL"drivers/cpu/Kconfig +0
-1@@ -23,7 +23,6 @@ config CPU_RISCV config CPU_MICROBLAZE bool "Enable Microblaze CPU driver" depends on CPU && MICROBLAZE - select EVENT select DM_EVENT select XILINX_MICROBLAZE0_PVR helplib/efi_loader/Kconfig +0
-0
lib/efi_loader/Kconfig config EFI_LOADER · line 18
Quoted 8 lines
lib/efi_loader/Kconfig +2
-3@@ -14,9 +14,8 @@ config EFI_LOADER depends on !EFI_APP default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8 select CHARSET - select DM_EVENT - select EVENT - select EVENT_DYNAMIC + select DM_EVENT if PARTITIONS + select EVENT_DYNAMIC if EVENT
Since UEFI subsystem, in particular efi_disk, uses event_register() or EVENT_DYNAMIC directly, adding 'if EVENT' looks strange. Instead, I suggest that 'select EVENT' be added to CONFIG_EVENT_DYNAMIC and then we can safely
select EVENT_DYNAMIC if PARTITIONS
here.
-Takahiro Akashi
Quoted 6 lines
lib/efi_loader/Kconfig +0
-0select LIB_UUID imply PARTITION_UUIDS select REGEXSignature · 1 line
2.25.1
Re: [PATCH 2/2] event: Correct dependencies on the EVENT framework
Quoted 398 lines · AKASHI Takahiro
Hi Tom,
Quoted 395 lines · Tom Rini
The event framework is just that, a framework. Enabling it by itself does nothing, so we shouldn't ask the user about it. Reword (and correct typos) around this the option and help text. This also applies to
DM_EVENT, so reword as well.With this, it's time to address the larger problems. When functionality uses events, typically via
EVENT_SPY, the appropriate framework then must be select'd and NOT imply'd. As the functionality will cease to work (and so, platforms will fail to boot) this is non-optional and where select is appropriate. Audit the current users ofEVENT_SPYto have a more fine-grained approach to select'ing the framework where used.Cc Simon Glass <[email protected]>Reported-by Oliver Graute <[email protected]>Reported-by Francesco Dolcini <[email protected]>Fixes 7fe32b3442f0 ("event: Convert arch_cpu_init_dm() to use events")Fixes 42fdcebf859f ("event: Convert misc_init_f() to use events")Signed-off-by Tom Rini <[email protected]>--- arch/Kconfig | 6 +++--- arch/arm/Kconfig | 9 ++++----- arch/arm/mach-omap2/Kconfig | 3 +++ arch/mips/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/cpu/baytrail/Kconfig | 1 + arch/x86/cpu/broadwell/Kconfig | 1 + arch/x86/cpu/ivybridge/Kconfig | 1 + arch/x86/cpu/quark/Kconfig | 1 + board/google/Kconfig | 1 + board/keymile/Kconfig | 1 + boot/Kconfig | 1 + cmd/Kconfig | 1 + common/Kconfig | 17 ++++++++--------- drivers/core/Kconfig | 9 +++++---- drivers/cpu/Kconfig | 1 - lib/efi_loader/Kconfig | 5 ++--- 18 files changed, 36 insertions(+), 26 deletions(-)arch/Kconfig +3
-3@@ -93,7 +93,7 @@ config NIOS2 bool "Nios II architecture" select CPU select DM - imply DM_EVENT + select DM_EVENT select OF_CONTROL select SUPPORT_OF_CONTROL imply CMD_DM@@ -111,9 +111,9 @@ config RISCV select SUPPORT_OF_CONTROL select OF_CONTROL select DM + select DM_EVENT imply SPL_SEPARATE_BSS if SPL imply DM_SERIAL - imply DM_EVENT imply DM_MMC imply DM_SPI imply DM_SPI_FLASH@@ -136,6 +136,7 @@ config SANDBOX select BZIP2 select CMD_POWEROFF select DM + select DM_EVENT select DM_FUZZING_ENGINE select DM_GPIO select DM_I2C@@ -240,7 +241,6 @@ config X86 imply CMD_SF imply CMD_SF_TEST imply CMD_ZBOOT - imply DM_EVENT imply DM_GPIO imply DM_KEYBOARD imply DM_MMCarch/arm/Kconfig +4
-5@@ -778,7 +778,6 @@ config ARCH_OMAP2PLUS select SUPPORT_SPL imply TI_SYSC if DM && OF_CONTROL imply FIT - imply DM_EVENT imply SPL_SEPARATE_BSS config ARCH_MESON@@ -823,11 +822,11 @@ config ARCH_IMX8 select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE select DM + select DM_EVENT select GPIO_EXTRA_HEADER select MACH_IMX select OF_CONTROL select ENABLE_ARM_SOC_BOOT0_HOOK - imply DM_EVENT config ARCH_IMX8M bool "NXP i.MX8M platform"@@ -839,14 +838,15 @@ config ARCH_IMX8M select SYS_FSL_SEC_LE select SYS_I2C_MXC select DM + select DM_EVENT if CLK select SUPPORT_SPL imply CMD_DM - imply DM_EVENT config ARCH_IMX8ULP bool "NXP i.MX8ULP platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select OF_CONTROL select SUPPORT_SPL@@ -854,19 +854,18 @@ config ARCH_IMX8ULP select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMX9 bool "NXP i.MX9 platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select SUPPORT_SPL select GPIO_EXTRA_HEADER select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMXRT bool "NXP i.MXRT platform"arch/arm/mach-omap2/Kconfig +3
-0@@ -31,6 +31,7 @@ config OMAP34XX config OMAP44XX bool "OMAP44XX SoC" + select DM_EVENT select SPL_USE_TINY_PRINTF select SPL_SYS_NO_VECTOR_TABLE if SPL imply NAND_OMAP_ELM@@ -55,6 +56,7 @@ config OMAP54XX bool "OMAP54XX SoC" select ARM_CORTEX_A15_CVE_2017_5715 select ARM_ERRATA_798870 + select DM_EVENT select SYS_THUMB_BUILD imply NAND_OMAP_ELM imply NAND_OMAP_GPMC@@ -111,6 +113,7 @@ config AM43XX config AM33XX bool "AM33XX SoC" select ARM_CORTEX_A8_CVE_2017_5715 + select DM_EVENT select SPECIFY_CONSOLE_INDEX imply NAND_OMAP_ELM imply NAND_OMAP_GPMCarch/mips/Kconfig +1
-1@@ -121,6 +121,7 @@ config MACH_PIC32 bool "Support Microchip PIC32" select HAS_FIXED_TIMER_FREQUENCY select DM + select DM_EVENT select OF_CONTROL imply CMD_DM@@ -128,7 +129,6 @@ config TARGET_BOSTON bool "Support Boston" select HAS_FIXED_TIMER_FREQUENCY select DM - imply DM_EVENT select DM_SERIAL select MIPS_CM select SYS_CACHE_SHIFT_6arch/powerpc/cpu/mpc85xx/Kconfig +1
-0@@ -248,6 +248,7 @@ config TARGET_KMP204X config TARGET_KMCENT2 bool "Support kmcent2" select VENDOR_KM + select EVENT select FSL_CORENET select SYS_DPAA_FMAN select SYS_DPAA_PMEarch/x86/Kconfig +1
-0@@ -395,6 +395,7 @@ config FSP_VERSION1 config FSP_VERSION2 bool "FSP version 2.x" + select DM_EVENT help This covers versions 2.0 and 2.1. See here for details: https://github.com/IntelFsp/fsp/wikiarch/x86/cpu/baytrail/Kconfig +1
-0@@ -7,6 +7,7 @@ config INTEL_BAYTRAIL select HAVE_FSP select ARCH_MISC_INIT select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCIarch/x86/cpu/broadwell/Kconfig +1
-0@@ -6,6 +6,7 @@ config INTEL_BROADWELL bool select CACHE_MRC_BIN + select DM_EVENT select ARCH_EARLY_INIT_R imply HAVE_INTEL_ME imply ENABLE_MRC_CACHEarch/x86/cpu/ivybridge/Kconfig +1
-0@@ -8,6 +8,7 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE bool select CACHE_MRC_BIN if HAVE_MRC + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCIarch/x86/cpu/quark/Kconfig +1
-0@@ -7,6 +7,7 @@ config INTEL_QUARK select HAVE_RMU select ARCH_EARLY_INIT_R select ARCH_MISC_INIT + select DM_EVENT imply ENABLE_MRC_CACHE imply ETH_DESIGNWARE imply ICH_SPIboard/google/Kconfig +1
-0@@ -18,6 +18,7 @@ choice config TARGET_CHROMEBOOK_CORAL bool "Chromebook coral" select BIOSEMU + select EVENT help This is a range of Intel-based laptops released in 2018. They use an Intel Apollo Lake SoC. The design supports WiFi, 4GB to 16GB ofboard/keymile/Kconfig +1
-0@@ -124,6 +124,7 @@ config SYS_IVM_EEPROM_PAGE_LEN config PG_WCOM_UBOOT_UPDATE_SUPPORTED bool "Enable U-boot Field Fail-Safe Update Functionality" + select EVENT default n help Indicates that field fail-safe u-boot update is supported.boot/Kconfig +1
-0@@ -474,6 +474,7 @@ config BOOTMETH_VBE depends on FIT default y select BOOTMETH_GLOBAL + select EVENT help Enables support for VBE boot. This is a standard boot method which supports selection of various firmware components, seleciton of an OS tocmd/Kconfig +1
-0@@ -2622,6 +2622,7 @@ config CMD_DIAG config CMD_EVENT bool "event - Show information about events" + depends on EVENT default y if EVENT_DEBUG help This enables the 'event' command which provides information aboutcommon/Kconfig +8
-9@@ -604,24 +604,23 @@ config CYCLIC_MAX_CPU_TIME_US endif # CYCLIC config EVENT - bool "General-purpose event-handling mechanism" - default y if SANDBOX + bool help - This enables sending and processing of events, to allow interested - parties to be alerted when something happens. This is an attempt to - stem the flow of weak functions, hooks, functions in board_f.c - and board_r.c and the Kconfig options below. + This adds a framework for general purpose sending and processing of + events, to allow interested parties to be alerted when something + happens. This is an attempt to stem the flow of weak functions, + hooks, functions in board_f.c and board_r.c and the Kconfig options + below. See doc/develop/event.rst for more information. if EVENT config EVENT_DYNAMIC - bool "Support event registration at runtime" - default y if SANDBOX + bool help Enable this to support adding an event spy at runtime, without adding - it to the EVENT_SPy() linker list. This increases code size slightly + it to the EVENT_SPY() linker list. This increases code size slightly but provides more flexibility for boards and subsystems that need it. config EVENT_DEBUGdrivers/core/Kconfig +5
-4@@ -109,13 +109,14 @@ config DM_DEVICE_REMOVE causes USB host controllers to not be stopped when booting the OS. config DM_EVENT - bool "Support events with driver model" - depends on DM && EVENT - default y if SANDBOX + bool + depends on DM + select EVENT help This enables support for generating events related to driver model operations, such as prbing or removing a device. Subsystems can - register a 'spy' function that is called when the event occurs. + register a 'spy' function that is called when the event occurs. Such + subsystems must select this option. config SPL_DM_DEVICE_REMOVE bool "Support device removal in SPL"drivers/cpu/Kconfig +0
-1@@ -23,7 +23,6 @@ config CPU_RISCV config CPU_MICROBLAZE bool "Enable Microblaze CPU driver" depends on CPU && MICROBLAZE - select EVENT select DM_EVENT select XILINX_MICROBLAZE0_PVR helplib/efi_loader/Kconfig +1
-3@@ -14,9 +14,8 @@ config EFI_LOADER depends on !EFI_APP default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8 select CHARSET - select DM_EVENT - select EVENT - select EVENT_DYNAMIC + select DM_EVENT if PARTITIONS
Quoted 8 lines
lib/efi_loader/Kconfig config EFI_LOADER · line 18
Quoted 1 line
lib/efi_loader/Kconfig +1
-0+ select EVENT_DYNAMIC if EVENTSince UEFI subsystem, in particular
efi_disk, usesevent_register()orEVENT_DYNAMICdirectly, adding 'if EVENT' looks strange. Instead, I suggest that 'select EVENT' be added toCONFIG_EVENT_DYNAMICand then we can safely
selectEVENT_DYNAMICif PARTITIONS
here.
How about "if PARTITIONS" for both? Dynamic events can be for any of the types, so the EFI_LOADER part should be select'ing DM_EVENT and EVENT_DYNAMIC. And the dynamic event code is a subset of the regular event code.
Signature · 1 line
Tom
Re: [PATCH 2/2] event: Correct dependencies on the EVENT framework
Quoted 408 lines · Tom Rini
Quoted 398 lines · AKASHI Takahiro
Hi Tom,
Quoted 395 lines · Tom Rini
The event framework is just that, a framework. Enabling it by itself does nothing, so we shouldn't ask the user about it. Reword (and correct typos) around this the option and help text. This also applies to
DM_EVENT, so reword as well.With this, it's time to address the larger problems. When functionality uses events, typically via
EVENT_SPY, the appropriate framework then must be select'd and NOT imply'd. As the functionality will cease to work (and so, platforms will fail to boot) this is non-optional and where select is appropriate. Audit the current users ofEVENT_SPYto have a more fine-grained approach to select'ing the framework where used.Cc Simon Glass <[email protected]>Reported-by Oliver Graute <[email protected]>Reported-by Francesco Dolcini <[email protected]>Fixes 7fe32b3442f0 ("event: Convert arch_cpu_init_dm() to use events")Fixes 42fdcebf859f ("event: Convert misc_init_f() to use events")Signed-off-by Tom Rini <[email protected]>--- arch/Kconfig | 6 +++--- arch/arm/Kconfig | 9 ++++----- arch/arm/mach-omap2/Kconfig | 3 +++ arch/mips/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/cpu/baytrail/Kconfig | 1 + arch/x86/cpu/broadwell/Kconfig | 1 + arch/x86/cpu/ivybridge/Kconfig | 1 + arch/x86/cpu/quark/Kconfig | 1 + board/google/Kconfig | 1 + board/keymile/Kconfig | 1 + boot/Kconfig | 1 + cmd/Kconfig | 1 + common/Kconfig | 17 ++++++++--------- drivers/core/Kconfig | 9 +++++---- drivers/cpu/Kconfig | 1 - lib/efi_loader/Kconfig | 5 ++--- 18 files changed, 36 insertions(+), 26 deletions(-)arch/Kconfig +3
-3@@ -93,7 +93,7 @@ config NIOS2 bool "Nios II architecture" select CPU select DM - imply DM_EVENT + select DM_EVENT select OF_CONTROL select SUPPORT_OF_CONTROL imply CMD_DM@@ -111,9 +111,9 @@ config RISCV select SUPPORT_OF_CONTROL select OF_CONTROL select DM + select DM_EVENT imply SPL_SEPARATE_BSS if SPL imply DM_SERIAL - imply DM_EVENT imply DM_MMC imply DM_SPI imply DM_SPI_FLASH@@ -136,6 +136,7 @@ config SANDBOX select BZIP2 select CMD_POWEROFF select DM + select DM_EVENT select DM_FUZZING_ENGINE select DM_GPIO select DM_I2C@@ -240,7 +241,6 @@ config X86 imply CMD_SF imply CMD_SF_TEST imply CMD_ZBOOT - imply DM_EVENT imply DM_GPIO imply DM_KEYBOARD imply DM_MMCarch/arm/Kconfig +4
-5@@ -778,7 +778,6 @@ config ARCH_OMAP2PLUS select SUPPORT_SPL imply TI_SYSC if DM && OF_CONTROL imply FIT - imply DM_EVENT imply SPL_SEPARATE_BSS config ARCH_MESON@@ -823,11 +822,11 @@ config ARCH_IMX8 select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE select DM + select DM_EVENT select GPIO_EXTRA_HEADER select MACH_IMX select OF_CONTROL select ENABLE_ARM_SOC_BOOT0_HOOK - imply DM_EVENT config ARCH_IMX8M bool "NXP i.MX8M platform"@@ -839,14 +838,15 @@ config ARCH_IMX8M select SYS_FSL_SEC_LE select SYS_I2C_MXC select DM + select DM_EVENT if CLK select SUPPORT_SPL imply CMD_DM - imply DM_EVENT config ARCH_IMX8ULP bool "NXP i.MX8ULP platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select OF_CONTROL select SUPPORT_SPL@@ -854,19 +854,18 @@ config ARCH_IMX8ULP select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMX9 bool "NXP i.MX9 platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select SUPPORT_SPL select GPIO_EXTRA_HEADER select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMXRT bool "NXP i.MXRT platform"arch/arm/mach-omap2/Kconfig +3
-0@@ -31,6 +31,7 @@ config OMAP34XX config OMAP44XX bool "OMAP44XX SoC" + select DM_EVENT select SPL_USE_TINY_PRINTF select SPL_SYS_NO_VECTOR_TABLE if SPL imply NAND_OMAP_ELM@@ -55,6 +56,7 @@ config OMAP54XX bool "OMAP54XX SoC" select ARM_CORTEX_A15_CVE_2017_5715 select ARM_ERRATA_798870 + select DM_EVENT select SYS_THUMB_BUILD imply NAND_OMAP_ELM imply NAND_OMAP_GPMC@@ -111,6 +113,7 @@ config AM43XX config AM33XX bool "AM33XX SoC" select ARM_CORTEX_A8_CVE_2017_5715 + select DM_EVENT select SPECIFY_CONSOLE_INDEX imply NAND_OMAP_ELM imply NAND_OMAP_GPMCarch/mips/Kconfig +1
-1@@ -121,6 +121,7 @@ config MACH_PIC32 bool "Support Microchip PIC32" select HAS_FIXED_TIMER_FREQUENCY select DM + select DM_EVENT select OF_CONTROL imply CMD_DM@@ -128,7 +129,6 @@ config TARGET_BOSTON bool "Support Boston" select HAS_FIXED_TIMER_FREQUENCY select DM - imply DM_EVENT select DM_SERIAL select MIPS_CM select SYS_CACHE_SHIFT_6arch/powerpc/cpu/mpc85xx/Kconfig +1
-0@@ -248,6 +248,7 @@ config TARGET_KMP204X config TARGET_KMCENT2 bool "Support kmcent2" select VENDOR_KM + select EVENT select FSL_CORENET select SYS_DPAA_FMAN select SYS_DPAA_PMEarch/x86/Kconfig +1
-0@@ -395,6 +395,7 @@ config FSP_VERSION1 config FSP_VERSION2 bool "FSP version 2.x" + select DM_EVENT help This covers versions 2.0 and 2.1. See here for details: https://github.com/IntelFsp/fsp/wikiarch/x86/cpu/baytrail/Kconfig +1
-0@@ -7,6 +7,7 @@ config INTEL_BAYTRAIL select HAVE_FSP select ARCH_MISC_INIT select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCIarch/x86/cpu/broadwell/Kconfig +1
-0@@ -6,6 +6,7 @@ config INTEL_BROADWELL bool select CACHE_MRC_BIN + select DM_EVENT select ARCH_EARLY_INIT_R imply HAVE_INTEL_ME imply ENABLE_MRC_CACHEarch/x86/cpu/ivybridge/Kconfig +1
-0@@ -8,6 +8,7 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE bool select CACHE_MRC_BIN if HAVE_MRC + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCIarch/x86/cpu/quark/Kconfig +1
-0@@ -7,6 +7,7 @@ config INTEL_QUARK select HAVE_RMU select ARCH_EARLY_INIT_R select ARCH_MISC_INIT + select DM_EVENT imply ENABLE_MRC_CACHE imply ETH_DESIGNWARE imply ICH_SPIboard/google/Kconfig +1
-0@@ -18,6 +18,7 @@ choice config TARGET_CHROMEBOOK_CORAL bool "Chromebook coral" select BIOSEMU + select EVENT help This is a range of Intel-based laptops released in 2018. They use an Intel Apollo Lake SoC. The design supports WiFi, 4GB to 16GB ofboard/keymile/Kconfig +1
-0@@ -124,6 +124,7 @@ config SYS_IVM_EEPROM_PAGE_LEN config PG_WCOM_UBOOT_UPDATE_SUPPORTED bool "Enable U-boot Field Fail-Safe Update Functionality" + select EVENT default n help Indicates that field fail-safe u-boot update is supported.boot/Kconfig +1
-0@@ -474,6 +474,7 @@ config BOOTMETH_VBE depends on FIT default y select BOOTMETH_GLOBAL + select EVENT help Enables support for VBE boot. This is a standard boot method which supports selection of various firmware components, seleciton of an OS tocmd/Kconfig +1
-0@@ -2622,6 +2622,7 @@ config CMD_DIAG config CMD_EVENT bool "event - Show information about events" + depends on EVENT default y if EVENT_DEBUG help This enables the 'event' command which provides information aboutcommon/Kconfig +8
-9@@ -604,24 +604,23 @@ config CYCLIC_MAX_CPU_TIME_US endif # CYCLIC config EVENT - bool "General-purpose event-handling mechanism" - default y if SANDBOX + bool help - This enables sending and processing of events, to allow interested - parties to be alerted when something happens. This is an attempt to - stem the flow of weak functions, hooks, functions in board_f.c - and board_r.c and the Kconfig options below. + This adds a framework for general purpose sending and processing of + events, to allow interested parties to be alerted when something + happens. This is an attempt to stem the flow of weak functions, + hooks, functions in board_f.c and board_r.c and the Kconfig options + below. See doc/develop/event.rst for more information. if EVENT config EVENT_DYNAMIC - bool "Support event registration at runtime" - default y if SANDBOX + bool help Enable this to support adding an event spy at runtime, without adding - it to the EVENT_SPy() linker list. This increases code size slightly + it to the EVENT_SPY() linker list. This increases code size slightly but provides more flexibility for boards and subsystems that need it. config EVENT_DEBUGdrivers/core/Kconfig +5
-4@@ -109,13 +109,14 @@ config DM_DEVICE_REMOVE causes USB host controllers to not be stopped when booting the OS. config DM_EVENT - bool "Support events with driver model" - depends on DM && EVENT - default y if SANDBOX + bool + depends on DM + select EVENT help This enables support for generating events related to driver model operations, such as prbing or removing a device. Subsystems can - register a 'spy' function that is called when the event occurs. + register a 'spy' function that is called when the event occurs. Such + subsystems must select this option. config SPL_DM_DEVICE_REMOVE bool "Support device removal in SPL"drivers/cpu/Kconfig +0
-1@@ -23,7 +23,6 @@ config CPU_RISCV config CPU_MICROBLAZE bool "Enable Microblaze CPU driver" depends on CPU && MICROBLAZE - select EVENT select DM_EVENT select XILINX_MICROBLAZE0_PVR helplib/efi_loader/Kconfig +1
-3@@ -14,9 +14,8 @@ config EFI_LOADER depends on !EFI_APP default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8 select CHARSET - select DM_EVENT - select EVENT - select EVENT_DYNAMIC + select DM_EVENT if PARTITIONSQuoted 8 lines
lib/efi_loader/Kconfig config EFI_LOADER · line 18
Quoted 1 line
lib/efi_loader/Kconfig +1
-0+ select EVENT_DYNAMIC if EVENTSince UEFI subsystem, in particular
efi_disk, usesevent_register()orEVENT_DYNAMICdirectly, adding 'if EVENT' looks strange. Instead, I suggest that 'select EVENT' be added toCONFIG_EVENT_DYNAMICand then we can safely
selectEVENT_DYNAMICif PARTITIONS
here.
Quoted 4 lines
How about "if PARTITIONS" for both? Dynamic events can be for any of the types, so the
EFI_LOADERpart should be select'ingDM_EVENTandEVENT_DYNAMIC. And the dynamic event code is a subset of the regular event code.
Okay, that is what I meant.
-Takahiro Akashi
Quoted 3 lines
Signature · 2 lines
-- Tom
Re: [PATCH 2/2] event: Correct dependencies on the EVENT framework
Quoted 409 lines · AKASHI Takahiro
Quoted 408 lines · Tom Rini
Quoted 406 lines · AKASHI Takahiro
Hi Tom,
Quoted 388 lines · Tom Rini
The event framework is just that, a framework. Enabling it by itself does nothing, so we shouldn't ask the user about it. Reword (and correct typos) around this the option and help text. This also applies to
DM_EVENT, so reword as well.With this, it's time to address the larger problems. When functionality uses events, typically via
EVENT_SPY, the appropriate framework then must be select'd and NOT imply'd. As the functionality will cease to work (and so, platforms will fail to boot) this is non-optional and where select is appropriate. Audit the current users ofEVENT_SPYto have a more fine-grained approach to select'ing the framework where used.Cc Simon Glass <[email protected]>Reported-by Oliver Graute <[email protected]>Reported-by Francesco Dolcini <[email protected]>Fixes 7fe32b3442f0 ("event: Convert arch_cpu_init_dm() to use events")Fixes 42fdcebf859f ("event: Convert misc_init_f() to use events")Signed-off-by Tom Rini <[email protected]>--- arch/Kconfig | 6 +++--- arch/arm/Kconfig | 9 ++++----- arch/arm/mach-omap2/Kconfig | 3 +++ arch/mips/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/cpu/baytrail/Kconfig | 1 + arch/x86/cpu/broadwell/Kconfig | 1 + arch/x86/cpu/ivybridge/Kconfig | 1 + arch/x86/cpu/quark/Kconfig | 1 + board/google/Kconfig | 1 + board/keymile/Kconfig | 1 + boot/Kconfig | 1 + cmd/Kconfig | 1 + common/Kconfig | 17 ++++++++--------- drivers/core/Kconfig | 9 +++++---- drivers/cpu/Kconfig | 1 - lib/efi_loader/Kconfig | 5 ++--- 18 files changed, 36 insertions(+), 26 deletions(-)arch/Kconfig +3
-3@@ -93,7 +93,7 @@ config NIOS2 bool "Nios II architecture" select CPU select DM - imply DM_EVENT + select DM_EVENT select OF_CONTROL select SUPPORT_OF_CONTROL imply CMD_DM@@ -111,9 +111,9 @@ config RISCV select SUPPORT_OF_CONTROL select OF_CONTROL select DM + select DM_EVENT imply SPL_SEPARATE_BSS if SPL imply DM_SERIAL - imply DM_EVENT imply DM_MMC imply DM_SPI imply DM_SPI_FLASH@@ -136,6 +136,7 @@ config SANDBOX select BZIP2 select CMD_POWEROFF select DM + select DM_EVENT select DM_FUZZING_ENGINE select DM_GPIO select DM_I2C@@ -240,7 +241,6 @@ config X86 imply CMD_SF imply CMD_SF_TEST imply CMD_ZBOOT - imply DM_EVENT imply DM_GPIO imply DM_KEYBOARD imply DM_MMCarch/arm/Kconfig +4
-5@@ -778,7 +778,6 @@ config ARCH_OMAP2PLUS select SUPPORT_SPL imply TI_SYSC if DM && OF_CONTROL imply FIT - imply DM_EVENT imply SPL_SEPARATE_BSS config ARCH_MESON@@ -823,11 +822,11 @@ config ARCH_IMX8 select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE select DM + select DM_EVENT select GPIO_EXTRA_HEADER select MACH_IMX select OF_CONTROL select ENABLE_ARM_SOC_BOOT0_HOOK - imply DM_EVENT config ARCH_IMX8M bool "NXP i.MX8M platform"@@ -839,14 +838,15 @@ config ARCH_IMX8M select SYS_FSL_SEC_LE select SYS_I2C_MXC select DM + select DM_EVENT if CLK select SUPPORT_SPL imply CMD_DM - imply DM_EVENT config ARCH_IMX8ULP bool "NXP i.MX8ULP platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select OF_CONTROL select SUPPORT_SPL@@ -854,19 +854,18 @@ config ARCH_IMX8ULP select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMX9 bool "NXP i.MX9 platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select SUPPORT_SPL select GPIO_EXTRA_HEADER select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMXRT bool "NXP i.MXRT platform"arch/arm/mach-omap2/Kconfig +3
-0@@ -31,6 +31,7 @@ config OMAP34XX config OMAP44XX bool "OMAP44XX SoC" + select DM_EVENT select SPL_USE_TINY_PRINTF select SPL_SYS_NO_VECTOR_TABLE if SPL imply NAND_OMAP_ELM@@ -55,6 +56,7 @@ config OMAP54XX bool "OMAP54XX SoC" select ARM_CORTEX_A15_CVE_2017_5715 select ARM_ERRATA_798870 + select DM_EVENT select SYS_THUMB_BUILD imply NAND_OMAP_ELM imply NAND_OMAP_GPMC@@ -111,6 +113,7 @@ config AM43XX config AM33XX bool "AM33XX SoC" select ARM_CORTEX_A8_CVE_2017_5715 + select DM_EVENT select SPECIFY_CONSOLE_INDEX imply NAND_OMAP_ELM imply NAND_OMAP_GPMCarch/mips/Kconfig +1
-1@@ -121,6 +121,7 @@ config MACH_PIC32 bool "Support Microchip PIC32" select HAS_FIXED_TIMER_FREQUENCY select DM + select DM_EVENT select OF_CONTROL imply CMD_DM@@ -128,7 +129,6 @@ config TARGET_BOSTON bool "Support Boston" select HAS_FIXED_TIMER_FREQUENCY select DM - imply DM_EVENT select DM_SERIAL select MIPS_CM select SYS_CACHE_SHIFT_6arch/powerpc/cpu/mpc85xx/Kconfig +1
-0@@ -248,6 +248,7 @@ config TARGET_KMP204X config TARGET_KMCENT2 bool "Support kmcent2" select VENDOR_KM + select EVENT select FSL_CORENET select SYS_DPAA_FMAN select SYS_DPAA_PMEarch/x86/Kconfig +1
-0@@ -395,6 +395,7 @@ config FSP_VERSION1 config FSP_VERSION2 bool "FSP version 2.x" + select DM_EVENT help This covers versions 2.0 and 2.1. See here for details: https://github.com/IntelFsp/fsp/wikiarch/x86/cpu/baytrail/Kconfig +1
-0@@ -7,6 +7,7 @@ config INTEL_BAYTRAIL select HAVE_FSP select ARCH_MISC_INIT select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCIarch/x86/cpu/broadwell/Kconfig +1
-0@@ -6,6 +6,7 @@ config INTEL_BROADWELL bool select CACHE_MRC_BIN + select DM_EVENT select ARCH_EARLY_INIT_R imply HAVE_INTEL_ME imply ENABLE_MRC_CACHEarch/x86/cpu/ivybridge/Kconfig +1
-0@@ -8,6 +8,7 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE bool select CACHE_MRC_BIN if HAVE_MRC + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCIarch/x86/cpu/quark/Kconfig +1
-0@@ -7,6 +7,7 @@ config INTEL_QUARK select HAVE_RMU select ARCH_EARLY_INIT_R select ARCH_MISC_INIT + select DM_EVENT imply ENABLE_MRC_CACHE imply ETH_DESIGNWARE imply ICH_SPIboard/google/Kconfig +1
-0@@ -18,6 +18,7 @@ choice config TARGET_CHROMEBOOK_CORAL bool "Chromebook coral" select BIOSEMU + select EVENT help This is a range of Intel-based laptops released in 2018. They use an Intel Apollo Lake SoC. The design supports WiFi, 4GB to 16GB ofboard/keymile/Kconfig +1
-0@@ -124,6 +124,7 @@ config SYS_IVM_EEPROM_PAGE_LEN config PG_WCOM_UBOOT_UPDATE_SUPPORTED bool "Enable U-boot Field Fail-Safe Update Functionality" + select EVENT default n help Indicates that field fail-safe u-boot update is supported.boot/Kconfig +1
-0@@ -474,6 +474,7 @@ config BOOTMETH_VBE depends on FIT default y select BOOTMETH_GLOBAL + select EVENT help Enables support for VBE boot. This is a standard boot method which supports selection of various firmware components, seleciton of an OS tocmd/Kconfig +1
-0@@ -2622,6 +2622,7 @@ config CMD_DIAG config CMD_EVENT bool "event - Show information about events" + depends on EVENT default y if EVENT_DEBUG help This enables the 'event' command which provides information aboutcommon/Kconfig +8
-9@@ -604,24 +604,23 @@ config CYCLIC_MAX_CPU_TIME_US endif # CYCLIC config EVENT - bool "General-purpose event-handling mechanism" - default y if SANDBOX + bool help - This enables sending and processing of events, to allow interested - parties to be alerted when something happens. This is an attempt to - stem the flow of weak functions, hooks, functions in board_f.c - and board_r.c and the Kconfig options below. + This adds a framework for general purpose sending and processing of + events, to allow interested parties to be alerted when something + happens. This is an attempt to stem the flow of weak functions, + hooks, functions in board_f.c and board_r.c and the Kconfig options + below. See doc/develop/event.rst for more information. if EVENT config EVENT_DYNAMIC - bool "Support event registration at runtime" - default y if SANDBOX + bool help Enable this to support adding an event spy at runtime, without adding - it to the EVENT_SPy() linker list. This increases code size slightly + it to the EVENT_SPY() linker list. This increases code size slightly but provides more flexibility for boards and subsystems that need it. config EVENT_DEBUGdrivers/core/Kconfig +5
-4@@ -109,13 +109,14 @@ config DM_DEVICE_REMOVE causes USB host controllers to not be stopped when booting the OS. config DM_EVENT - bool "Support events with driver model" - depends on DM && EVENT - default y if SANDBOX + bool + depends on DM + select EVENT help This enables support for generating events related to driver model operations, such as prbing or removing a device. Subsystems can - register a 'spy' function that is called when the event occurs. + register a 'spy' function that is called when the event occurs. Such + subsystems must select this option. config SPL_DM_DEVICE_REMOVE bool "Support device removal in SPL"drivers/cpu/Kconfig +0
-1@@ -23,7 +23,6 @@ config CPU_RISCV config CPU_MICROBLAZE bool "Enable Microblaze CPU driver" depends on CPU && MICROBLAZE - select EVENT select DM_EVENT select XILINX_MICROBLAZE0_PVR helplib/efi_loader/Kconfig +0
-0lib/efi_loader/Kconfig config EFI_LOADER · line 18
Quoted 8 lines
lib/efi_loader/Kconfig +2
-3@@ -14,9 +14,8 @@ config EFI_LOADER depends on !EFI_APP default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8 select CHARSET - select DM_EVENT - select EVENT - select EVENT_DYNAMIC + select DM_EVENT if PARTITIONS + select EVENT_DYNAMIC if EVENTSince UEFI subsystem, in particular
efi_disk, usesevent_register()orEVENT_DYNAMICdirectly, adding 'if EVENT' looks strange. Instead, I suggest that 'select EVENT' be added toCONFIG_EVENT_DYNAMICand then we can safely
selectEVENT_DYNAMICif PARTITIONS
here.
Quoted 6 lines
Quoted 4 lines
How about "if PARTITIONS" for both? Dynamic events can be for any of the types, so the
EFI_LOADERpart should be select'ingDM_EVENTandEVENT_DYNAMIC. And the dynamic event code is a subset of the regular event code.Okay, that is what I meant.
I have to correct myself.
The fact is that event mechanism is used to detect not only partitions but also raw block devices, then DM_EVENT & EVENT_DYNAMIC must always be selected even if CONFIG_PARTITIONS is disabled (it's unlikely, though).
Please note that EFI_LOADER itself has a dependency on BLK.
So the correct fix would be:
1. remove 'select EVENT' from EFI_LOADER
2. add 'select EVENT' to EVENT_DYNAMIC
-Takahiro Akashi
Quoted 7 lines
-Takahiro Akashi
Quoted 3 lines
Signature · 2 lines
-- Tom
Re: [PATCH 2/2] event: Correct dependencies on the EVENT framework
Quoted 423 lines · AKASHI Takahiro
Quoted 409 lines · AKASHI Takahiro
Quoted 408 lines · Tom Rini
Quoted 406 lines · AKASHI Takahiro
Hi Tom,
Quoted 388 lines · Tom Rini
The event framework is just that, a framework. Enabling it by itself does nothing, so we shouldn't ask the user about it. Reword (and correct typos) around this the option and help text. This also applies to
DM_EVENT, so reword as well.With this, it's time to address the larger problems. When functionality uses events, typically via
EVENT_SPY, the appropriate framework then must be select'd and NOT imply'd. As the functionality will cease to work (and so, platforms will fail to boot) this is non-optional and where select is appropriate. Audit the current users ofEVENT_SPYto have a more fine-grained approach to select'ing the framework where used.Cc Simon Glass <[email protected]>Reported-by Oliver Graute <[email protected]>Reported-by Francesco Dolcini <[email protected]>Fixes 7fe32b3442f0 ("event: Convert arch_cpu_init_dm() to use events")Fixes 42fdcebf859f ("event: Convert misc_init_f() to use events")Signed-off-by Tom Rini <[email protected]>--- arch/Kconfig | 6 +++--- arch/arm/Kconfig | 9 ++++----- arch/arm/mach-omap2/Kconfig | 3 +++ arch/mips/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/cpu/baytrail/Kconfig | 1 + arch/x86/cpu/broadwell/Kconfig | 1 + arch/x86/cpu/ivybridge/Kconfig | 1 + arch/x86/cpu/quark/Kconfig | 1 + board/google/Kconfig | 1 + board/keymile/Kconfig | 1 + boot/Kconfig | 1 + cmd/Kconfig | 1 + common/Kconfig | 17 ++++++++--------- drivers/core/Kconfig | 9 +++++---- drivers/cpu/Kconfig | 1 - lib/efi_loader/Kconfig | 5 ++--- 18 files changed, 36 insertions(+), 26 deletions(-)arch/Kconfig +3
-3@@ -93,7 +93,7 @@ config NIOS2 bool "Nios II architecture" select CPU select DM - imply DM_EVENT + select DM_EVENT select OF_CONTROL select SUPPORT_OF_CONTROL imply CMD_DM@@ -111,9 +111,9 @@ config RISCV select SUPPORT_OF_CONTROL select OF_CONTROL select DM + select DM_EVENT imply SPL_SEPARATE_BSS if SPL imply DM_SERIAL - imply DM_EVENT imply DM_MMC imply DM_SPI imply DM_SPI_FLASH@@ -136,6 +136,7 @@ config SANDBOX select BZIP2 select CMD_POWEROFF select DM + select DM_EVENT select DM_FUZZING_ENGINE select DM_GPIO select DM_I2C@@ -240,7 +241,6 @@ config X86 imply CMD_SF imply CMD_SF_TEST imply CMD_ZBOOT - imply DM_EVENT imply DM_GPIO imply DM_KEYBOARD imply DM_MMCarch/arm/Kconfig +4
-5@@ -778,7 +778,6 @@ config ARCH_OMAP2PLUS select SUPPORT_SPL imply TI_SYSC if DM && OF_CONTROL imply FIT - imply DM_EVENT imply SPL_SEPARATE_BSS config ARCH_MESON@@ -823,11 +822,11 @@ config ARCH_IMX8 select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE select DM + select DM_EVENT select GPIO_EXTRA_HEADER select MACH_IMX select OF_CONTROL select ENABLE_ARM_SOC_BOOT0_HOOK - imply DM_EVENT config ARCH_IMX8M bool "NXP i.MX8M platform"@@ -839,14 +838,15 @@ config ARCH_IMX8M select SYS_FSL_SEC_LE select SYS_I2C_MXC select DM + select DM_EVENT if CLK select SUPPORT_SPL imply CMD_DM - imply DM_EVENT config ARCH_IMX8ULP bool "NXP i.MX8ULP platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select OF_CONTROL select SUPPORT_SPL@@ -854,19 +854,18 @@ config ARCH_IMX8ULP select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMX9 bool "NXP i.MX9 platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select SUPPORT_SPL select GPIO_EXTRA_HEADER select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMXRT bool "NXP i.MXRT platform"arch/arm/mach-omap2/Kconfig +3
-0@@ -31,6 +31,7 @@ config OMAP34XX config OMAP44XX bool "OMAP44XX SoC" + select DM_EVENT select SPL_USE_TINY_PRINTF select SPL_SYS_NO_VECTOR_TABLE if SPL imply NAND_OMAP_ELM@@ -55,6 +56,7 @@ config OMAP54XX bool "OMAP54XX SoC" select ARM_CORTEX_A15_CVE_2017_5715 select ARM_ERRATA_798870 + select DM_EVENT select SYS_THUMB_BUILD imply NAND_OMAP_ELM imply NAND_OMAP_GPMC@@ -111,6 +113,7 @@ config AM43XX config AM33XX bool "AM33XX SoC" select ARM_CORTEX_A8_CVE_2017_5715 + select DM_EVENT select SPECIFY_CONSOLE_INDEX imply NAND_OMAP_ELM imply NAND_OMAP_GPMCarch/mips/Kconfig +1
-1@@ -121,6 +121,7 @@ config MACH_PIC32 bool "Support Microchip PIC32" select HAS_FIXED_TIMER_FREQUENCY select DM + select DM_EVENT select OF_CONTROL imply CMD_DM@@ -128,7 +129,6 @@ config TARGET_BOSTON bool "Support Boston" select HAS_FIXED_TIMER_FREQUENCY select DM - imply DM_EVENT select DM_SERIAL select MIPS_CM select SYS_CACHE_SHIFT_6arch/powerpc/cpu/mpc85xx/Kconfig +1
-0@@ -248,6 +248,7 @@ config TARGET_KMP204X config TARGET_KMCENT2 bool "Support kmcent2" select VENDOR_KM + select EVENT select FSL_CORENET select SYS_DPAA_FMAN select SYS_DPAA_PMEarch/x86/Kconfig +1
-0@@ -395,6 +395,7 @@ config FSP_VERSION1 config FSP_VERSION2 bool "FSP version 2.x" + select DM_EVENT help This covers versions 2.0 and 2.1. See here for details: https://github.com/IntelFsp/fsp/wikiarch/x86/cpu/baytrail/Kconfig +1
-0@@ -7,6 +7,7 @@ config INTEL_BAYTRAIL select HAVE_FSP select ARCH_MISC_INIT select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCIarch/x86/cpu/broadwell/Kconfig +1
-0@@ -6,6 +6,7 @@ config INTEL_BROADWELL bool select CACHE_MRC_BIN + select DM_EVENT select ARCH_EARLY_INIT_R imply HAVE_INTEL_ME imply ENABLE_MRC_CACHEarch/x86/cpu/ivybridge/Kconfig +1
-0@@ -8,6 +8,7 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE bool select CACHE_MRC_BIN if HAVE_MRC + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCIarch/x86/cpu/quark/Kconfig +1
-0@@ -7,6 +7,7 @@ config INTEL_QUARK select HAVE_RMU select ARCH_EARLY_INIT_R select ARCH_MISC_INIT + select DM_EVENT imply ENABLE_MRC_CACHE imply ETH_DESIGNWARE imply ICH_SPIboard/google/Kconfig +1
-0@@ -18,6 +18,7 @@ choice config TARGET_CHROMEBOOK_CORAL bool "Chromebook coral" select BIOSEMU + select EVENT help This is a range of Intel-based laptops released in 2018. They use an Intel Apollo Lake SoC. The design supports WiFi, 4GB to 16GB ofboard/keymile/Kconfig +1
-0@@ -124,6 +124,7 @@ config SYS_IVM_EEPROM_PAGE_LEN config PG_WCOM_UBOOT_UPDATE_SUPPORTED bool "Enable U-boot Field Fail-Safe Update Functionality" + select EVENT default n help Indicates that field fail-safe u-boot update is supported.boot/Kconfig +1
-0@@ -474,6 +474,7 @@ config BOOTMETH_VBE depends on FIT default y select BOOTMETH_GLOBAL + select EVENT help Enables support for VBE boot. This is a standard boot method which supports selection of various firmware components, seleciton of an OS tocmd/Kconfig +1
-0@@ -2622,6 +2622,7 @@ config CMD_DIAG config CMD_EVENT bool "event - Show information about events" + depends on EVENT default y if EVENT_DEBUG help This enables the 'event' command which provides information aboutcommon/Kconfig +8
-9@@ -604,24 +604,23 @@ config CYCLIC_MAX_CPU_TIME_US endif # CYCLIC config EVENT - bool "General-purpose event-handling mechanism" - default y if SANDBOX + bool help - This enables sending and processing of events, to allow interested - parties to be alerted when something happens. This is an attempt to - stem the flow of weak functions, hooks, functions in board_f.c - and board_r.c and the Kconfig options below. + This adds a framework for general purpose sending and processing of + events, to allow interested parties to be alerted when something + happens. This is an attempt to stem the flow of weak functions, + hooks, functions in board_f.c and board_r.c and the Kconfig options + below. See doc/develop/event.rst for more information. if EVENT config EVENT_DYNAMIC - bool "Support event registration at runtime" - default y if SANDBOX + bool help Enable this to support adding an event spy at runtime, without adding - it to the EVENT_SPy() linker list. This increases code size slightly + it to the EVENT_SPY() linker list. This increases code size slightly but provides more flexibility for boards and subsystems that need it. config EVENT_DEBUGdrivers/core/Kconfig +5
-4@@ -109,13 +109,14 @@ config DM_DEVICE_REMOVE causes USB host controllers to not be stopped when booting the OS. config DM_EVENT - bool "Support events with driver model" - depends on DM && EVENT - default y if SANDBOX + bool + depends on DM + select EVENT help This enables support for generating events related to driver model operations, such as prbing or removing a device. Subsystems can - register a 'spy' function that is called when the event occurs. + register a 'spy' function that is called when the event occurs. Such + subsystems must select this option. config SPL_DM_DEVICE_REMOVE bool "Support device removal in SPL"drivers/cpu/Kconfig +0
-1@@ -23,7 +23,6 @@ config CPU_RISCV config CPU_MICROBLAZE bool "Enable Microblaze CPU driver" depends on CPU && MICROBLAZE - select EVENT select DM_EVENT select XILINX_MICROBLAZE0_PVR helplib/efi_loader/Kconfig +0
-0lib/efi_loader/Kconfig config EFI_LOADER · line 18
Quoted 8 lines
lib/efi_loader/Kconfig +2
-3@@ -14,9 +14,8 @@ config EFI_LOADER depends on !EFI_APP default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8 select CHARSET - select DM_EVENT - select EVENT - select EVENT_DYNAMIC + select DM_EVENT if PARTITIONS + select EVENT_DYNAMIC if EVENTSince UEFI subsystem, in particular
efi_disk, usesevent_register()orEVENT_DYNAMICdirectly, adding 'if EVENT' looks strange. Instead, I suggest that 'select EVENT' be added toCONFIG_EVENT_DYNAMICand then we can safely
selectEVENT_DYNAMICif PARTITIONS
here.Quoted 6 lines
Quoted 4 lines
How about "if PARTITIONS" for both? Dynamic events can be for any of the types, so the
EFI_LOADERpart should be select'ingDM_EVENTandEVENT_DYNAMIC. And the dynamic event code is a subset of the regular event code.Okay, that is what I meant.
I have to correct myself.
The fact is that event mechanism is used to detect not only partitions but also raw block devices, thenDM_EVENT&EVENT_DYNAMICmust always be selected even ifCONFIG_PARTITIONSis disabled (it's unlikely, though).
Please note thatEFI_LOADERitself has a dependency on BLK.
Quoted 3 lines
So the correct fix would be:
1. remove 'select EVENT' fromEFI_LOADER
2. add 'select EVENT' toEVENT_DYNAMIC
Unless I'm missing something, lib/efi_driver/efi_block_device.c is only built with PARTITIONS=y, and that's where the event_notify calls are. And again, EVENT_DYNAMIC is a feature of the event framework, it does not make sense to enable it by itself.
Signature · 1 line
Tom
Quoted 4 lines · Tom Rini
The function
arch_cpu_init_dmwas renamed tofsp_setup_pinctrlin these cases, so rename debug / docs to match.
Quoted 8 lines
Cc Simon Glass <[email protected]>Fixes 7fe32b3442f0 ("event: Convert arch_cpu_init_dm() to use events")Signed-off-by Tom Rini <[email protected]>--- arch/x86/lib/spl.c | 2 +- doc/board/google/chromebook_coral.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
PATCH v3 2/2 event: Correct dependencies on the EVENT framework
In reply to Tom RiniThe event framework is just that, a framework. Enabling it by itself does nothing, so we shouldn't ask the user about it. Reword (and correct typos) around this the option and help text. This also applies to DM_EVENT and EVENT_DYNAMIC. Only EVENT_DEBUG and CMD_EVENT should be visible to the user to select, when EVENT is selected.
With this, it's time to address the larger problems. When functionality uses events, typically via EVENT_SPY, the appropriate framework then must be select'd and NOT imply'd. As the functionality will cease to work (and so, platforms will fail to boot) this is non-optional and where select is appropriate. Audit the current users of EVENT_SPY to have a more fine-grained approach to select'ing the framework where used. Also ensure the current users of event_register and also select EVENT_DYNAMIC.
---
Changes in v3:
- Drop guards around when EFI_LOADER selects DM_EVENT / EVENT_DYNAMIC, keep comment.
Changes in v2:
- Collect tags
- Reword the commit message a little, reword and comment on the EFI_LOADER case.
- Add the rest of the VBE cases I had forgotten.
--- arch/Kconfig | 6 +++--- arch/arm/Kconfig | 9 ++++----- arch/arm/mach-omap2/Kconfig | 3 +++ arch/mips/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/cpu/baytrail/Kconfig | 1 + arch/x86/cpu/broadwell/Kconfig | 1 + arch/x86/cpu/ivybridge/Kconfig | 1 + arch/x86/cpu/quark/Kconfig | 1 + board/google/Kconfig | 1 + board/keymile/Kconfig | 1 + boot/Kconfig | 3 +++ cmd/Kconfig | 1 + common/Kconfig | 17 ++++++++--------- drivers/core/Kconfig | 9 +++++---- drivers/cpu/Kconfig | 1 - lib/efi_loader/Kconfig | 2 +- 18 files changed, 37 insertions(+), 24 deletions(-)
arch/Kconfig +3 -3
@@ -93,7 +93,7 @@ config NIOS2 bool "Nios II architecture" select CPU select DM - imply DM_EVENT + select DM_EVENT select OF_CONTROL select SUPPORT_OF_CONTROL imply CMD_DM
@@ -111,9 +111,9 @@ config RISCV select SUPPORT_OF_CONTROL select OF_CONTROL select DM + select DM_EVENT imply SPL_SEPARATE_BSS if SPL imply DM_SERIAL - imply DM_EVENT imply DM_MMC imply DM_SPI imply DM_SPI_FLASH
@@ -136,6 +136,7 @@ config SANDBOX select BZIP2 select CMD_POWEROFF select DM + select DM_EVENT select DM_FUZZING_ENGINE select DM_GPIO select DM_I2C
@@ -240,7 +241,6 @@ config X86 imply CMD_SF imply CMD_SF_TEST imply CMD_ZBOOT - imply DM_EVENT imply DM_GPIO imply DM_KEYBOARD imply DM_MMC
arch/arm/Kconfig +4 -5
@@ -778,7 +778,6 @@ config ARCH_OMAP2PLUS select SUPPORT_SPL imply TI_SYSC if DM && OF_CONTROL imply FIT - imply DM_EVENT imply SPL_SEPARATE_BSS config ARCH_MESON
@@ -823,11 +822,11 @@ config ARCH_IMX8 select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE select DM + select DM_EVENT select GPIO_EXTRA_HEADER select MACH_IMX select OF_CONTROL select ENABLE_ARM_SOC_BOOT0_HOOK - imply DM_EVENT config ARCH_IMX8M bool "NXP i.MX8M platform"
@@ -839,14 +838,15 @@ config ARCH_IMX8M select SYS_FSL_SEC_LE select SYS_I2C_MXC select DM + select DM_EVENT if CLK select SUPPORT_SPL imply CMD_DM - imply DM_EVENT config ARCH_IMX8ULP bool "NXP i.MX8ULP platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select OF_CONTROL select SUPPORT_SPL
@@ -854,19 +854,18 @@ config ARCH_IMX8ULP select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMX9 bool "NXP i.MX9 platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select SUPPORT_SPL select GPIO_EXTRA_HEADER select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMXRT bool "NXP i.MXRT platform"
arch/arm/mach-omap2/Kconfig +3 -0
@@ -31,6 +31,7 @@ config OMAP34XX config OMAP44XX bool "OMAP44XX SoC" + select DM_EVENT select SPL_USE_TINY_PRINTF select SPL_SYS_NO_VECTOR_TABLE if SPL imply NAND_OMAP_ELM
@@ -55,6 +56,7 @@ config OMAP54XX bool "OMAP54XX SoC" select ARM_CORTEX_A15_CVE_2017_5715 select ARM_ERRATA_798870 + select DM_EVENT select SYS_THUMB_BUILD imply NAND_OMAP_ELM imply NAND_OMAP_GPMC
@@ -111,6 +113,7 @@ config AM43XX config AM33XX bool "AM33XX SoC" select ARM_CORTEX_A8_CVE_2017_5715 + select DM_EVENT select SPECIFY_CONSOLE_INDEX imply NAND_OMAP_ELM imply NAND_OMAP_GPMC
arch/mips/Kconfig +1 -1
@@ -121,6 +121,7 @@ config MACH_PIC32 bool "Support Microchip PIC32" select HAS_FIXED_TIMER_FREQUENCY select DM + select DM_EVENT select OF_CONTROL imply CMD_DM
@@ -128,7 +129,6 @@ config TARGET_BOSTON bool "Support Boston" select HAS_FIXED_TIMER_FREQUENCY select DM - imply DM_EVENT select DM_SERIAL select MIPS_CM select SYS_CACHE_SHIFT_6
arch/powerpc/cpu/mpc85xx/Kconfig +1 -0
@@ -248,6 +248,7 @@ config TARGET_KMP204X config TARGET_KMCENT2 bool "Support kmcent2" select VENDOR_KM + select EVENT select FSL_CORENET select SYS_DPAA_FMAN select SYS_DPAA_PME
arch/x86/Kconfig +1 -0
@@ -395,6 +395,7 @@ config FSP_VERSION1 config FSP_VERSION2 bool "FSP version 2.x" + select DM_EVENT help This covers versions 2.0 and 2.1. See here for details: https://github.com/IntelFsp/fsp/wiki
arch/x86/cpu/baytrail/Kconfig +1 -0
@@ -7,6 +7,7 @@ config INTEL_BAYTRAIL select HAVE_FSP select ARCH_MISC_INIT select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCI
arch/x86/cpu/broadwell/Kconfig +1 -0
@@ -6,6 +6,7 @@ config INTEL_BROADWELL bool select CACHE_MRC_BIN + select DM_EVENT select ARCH_EARLY_INIT_R imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE
arch/x86/cpu/ivybridge/Kconfig +1 -0
@@ -8,6 +8,7 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE bool select CACHE_MRC_BIN if HAVE_MRC + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCI
arch/x86/cpu/quark/Kconfig +1 -0
@@ -7,6 +7,7 @@ config INTEL_QUARK select HAVE_RMU select ARCH_EARLY_INIT_R select ARCH_MISC_INIT + select DM_EVENT imply ENABLE_MRC_CACHE imply ETH_DESIGNWARE imply ICH_SPI
board/google/Kconfig +1 -0
@@ -18,6 +18,7 @@ choice config TARGET_CHROMEBOOK_CORAL bool "Chromebook coral" select BIOSEMU + select EVENT help This is a range of Intel-based laptops released in 2018. They use an Intel Apollo Lake SoC. The design supports WiFi, 4GB to 16GB of
board/keymile/Kconfig +1 -0
@@ -124,6 +124,7 @@ config SYS_IVM_EEPROM_PAGE_LEN config PG_WCOM_UBOOT_UPDATE_SUPPORTED bool "Enable U-boot Field Fail-Safe Update Functionality" + select EVENT default n help Indicates that field fail-safe u-boot update is supported.
boot/Kconfig +3 -0
@@ -474,6 +474,7 @@ config BOOTMETH_VBE depends on FIT default y select BOOTMETH_GLOBAL + select EVENT help Enables support for VBE boot. This is a standard boot method which supports selection of various firmware components, seleciton of an OS to
@@ -482,6 +483,7 @@ config BOOTMETH_VBE config SPL_BOOTMETH_VBE bool "Bootdev support for Verified Boot for Embedded (SPL)" depends on SPL && FIT + select EVENT default y if VPL help Enables support for VBE boot. This is a standard boot method which
@@ -491,6 +493,7 @@ config SPL_BOOTMETH_VBE config VPL_BOOTMETH_VBE bool "Bootdev support for Verified Boot for Embedded (VPL)" depends on VPL && FIT + select EVENT default y help Enables support for VBE boot. This is a standard boot method which
cmd/Kconfig +1 -0
@@ -2622,6 +2622,7 @@ config CMD_DIAG config CMD_EVENT bool "event - Show information about events" + depends on EVENT default y if EVENT_DEBUG help This enables the 'event' command which provides information about
common/Kconfig +8 -9
@@ -604,24 +604,23 @@ config CYCLIC_MAX_CPU_TIME_US endif # CYCLIC config EVENT - bool "General-purpose event-handling mechanism" - default y if SANDBOX + bool help - This enables sending and processing of events, to allow interested - parties to be alerted when something happens. This is an attempt to - stem the flow of weak functions, hooks, functions in board_f.c - and board_r.c and the Kconfig options below. + This adds a framework for general purpose sending and processing of + events, to allow interested parties to be alerted when something + happens. This is an attempt to stem the flow of weak functions, + hooks, functions in board_f.c and board_r.c and the Kconfig options + below. See doc/develop/event.rst for more information. if EVENT config EVENT_DYNAMIC - bool "Support event registration at runtime" - default y if SANDBOX + bool help Enable this to support adding an event spy at runtime, without adding - it to the EVENT_SPy() linker list. This increases code size slightly + it to the EVENT_SPY() linker list. This increases code size slightly but provides more flexibility for boards and subsystems that need it. config EVENT_DEBUG
drivers/core/Kconfig +5 -4
@@ -109,13 +109,14 @@ config DM_DEVICE_REMOVE causes USB host controllers to not be stopped when booting the OS. config DM_EVENT - bool "Support events with driver model" - depends on DM && EVENT - default y if SANDBOX + bool + depends on DM + select EVENT help This enables support for generating events related to driver model operations, such as prbing or removing a device. Subsystems can - register a 'spy' function that is called when the event occurs. + register a 'spy' function that is called when the event occurs. Such + subsystems must select this option. config SPL_DM_DEVICE_REMOVE bool "Support device removal in SPL"
drivers/cpu/Kconfig +0 -1
@@ -23,7 +23,6 @@ config CPU_RISCV config CPU_MICROBLAZE bool "Enable Microblaze CPU driver" depends on CPU && MICROBLAZE - select EVENT select DM_EVENT select XILINX_MICROBLAZE0_PVR help
lib/efi_loader/Kconfig +1 -1
@@ -14,8 +14,8 @@ config EFI_LOADER depends on !EFI_APP default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8 select CHARSET + # We need to send DM events, dynamically, in the EFI block driver select DM_EVENT - select EVENT select EVENT_DYNAMIC select LIB_UUID imply PARTITION_UUIDS
Signature · 1 line
2.25.1
Re: [v3 2/2] event: Correct dependencies on the EVENT framework
Quoted 369 lines · Tom Rini
The event framework is just that, a framework. Enabling it by itself does nothing, so we shouldn't ask the user about it. Reword (and correct typos) around this the option and help text. This also applies to
DM_EVENTandEVENT_DYNAMIC. OnlyEVENT_DEBUGandCMD_EVENTshould be visible to the user to select, when EVENT is selected.With this, it's time to address the larger problems. When functionality uses events, typically via
EVENT_SPY, the appropriate framework then must be select'd and NOT imply'd. As the functionality will cease to work (and so, platforms will fail to boot) this is non-optional and where select is appropriate. Audit the current users ofEVENT_SPYto have a more fine-grained approach to select'ing the framework where used. Also ensure the current users ofevent_registerand also selectEVENT_DYNAMIC.Cc AKASHI Takahiro <[email protected]>Cc Heinrich Schuchardt <[email protected]>Reported-by Oliver Graute <[email protected]>Reported-by Francesco Dolcini <[email protected]>Fixes 7fe32b3442f0 ("event: Convert arch_cpu_init_dm() to use events")Fixes 42fdcebf859f ("event: Convert misc_init_f() to use events")Fixes c5ef2025579e ("dm: fix DM_EVENT dependencies")Signed-off-by Tom Rini <[email protected]>Tested-by Simon Glass <[email protected]>Reviewed-by Simon Glass <[email protected]>Reviewed-by Fabio Estevam <[email protected]>---
Changes in v3:
- Drop guards around whenEFI_LOADERselectsDM_EVENT/EVENT_DYNAMIC, keep comment.Changes in v2:
- Collect tags
- Reword the commit message a little, reword and comment on theEFI_LOADERcase.
- Add the rest of the VBE cases I had forgotten.--- arch/Kconfig | 6 +++--- arch/arm/Kconfig | 9 ++++----- arch/arm/mach-omap2/Kconfig | 3 +++ arch/mips/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/cpu/baytrail/Kconfig | 1 + arch/x86/cpu/broadwell/Kconfig | 1 + arch/x86/cpu/ivybridge/Kconfig | 1 + arch/x86/cpu/quark/Kconfig | 1 + board/google/Kconfig | 1 + board/keymile/Kconfig | 1 + boot/Kconfig | 3 +++ cmd/Kconfig | 1 + common/Kconfig | 17 ++++++++--------- drivers/core/Kconfig | 9 +++++---- drivers/cpu/Kconfig | 1 - lib/efi_loader/Kconfig | 2 +- 18 files changed, 37 insertions(+), 24 deletions(-)arch/Kconfig +3
-3@@ -93,7 +93,7 @@ config NIOS2 bool "Nios II architecture" select CPU select DM - imply DM_EVENT + select DM_EVENT select OF_CONTROL select SUPPORT_OF_CONTROL imply CMD_DM@@ -111,9 +111,9 @@ config RISCV select SUPPORT_OF_CONTROL select OF_CONTROL select DM + select DM_EVENT imply SPL_SEPARATE_BSS if SPL imply DM_SERIAL - imply DM_EVENT imply DM_MMC imply DM_SPI imply DM_SPI_FLASH@@ -136,6 +136,7 @@ config SANDBOX select BZIP2 select CMD_POWEROFF select DM + select DM_EVENT select DM_FUZZING_ENGINE select DM_GPIO select DM_I2C@@ -240,7 +241,6 @@ config X86 imply CMD_SF imply CMD_SF_TEST imply CMD_ZBOOT - imply DM_EVENT imply DM_GPIO imply DM_KEYBOARD imply DM_MMCarch/arm/Kconfig +4
-5@@ -778,7 +778,6 @@ config ARCH_OMAP2PLUS select SUPPORT_SPL imply TI_SYSC if DM && OF_CONTROL imply FIT - imply DM_EVENT imply SPL_SEPARATE_BSS config ARCH_MESON@@ -823,11 +822,11 @@ config ARCH_IMX8 select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE select DM + select DM_EVENT select GPIO_EXTRA_HEADER select MACH_IMX select OF_CONTROL select ENABLE_ARM_SOC_BOOT0_HOOK - imply DM_EVENT config ARCH_IMX8M bool "NXP i.MX8M platform"@@ -839,14 +838,15 @@ config ARCH_IMX8M select SYS_FSL_SEC_LE select SYS_I2C_MXC select DM + select DM_EVENT if CLK select SUPPORT_SPL imply CMD_DM - imply DM_EVENT config ARCH_IMX8ULP bool "NXP i.MX8ULP platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select OF_CONTROL select SUPPORT_SPL@@ -854,19 +854,18 @@ config ARCH_IMX8ULP select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMX9 bool "NXP i.MX9 platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select SUPPORT_SPL select GPIO_EXTRA_HEADER select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMXRT bool "NXP i.MXRT platform"arch/arm/mach-omap2/Kconfig +3
-0@@ -31,6 +31,7 @@ config OMAP34XX config OMAP44XX bool "OMAP44XX SoC" + select DM_EVENT select SPL_USE_TINY_PRINTF select SPL_SYS_NO_VECTOR_TABLE if SPL imply NAND_OMAP_ELM@@ -55,6 +56,7 @@ config OMAP54XX bool "OMAP54XX SoC" select ARM_CORTEX_A15_CVE_2017_5715 select ARM_ERRATA_798870 + select DM_EVENT select SYS_THUMB_BUILD imply NAND_OMAP_ELM imply NAND_OMAP_GPMC@@ -111,6 +113,7 @@ config AM43XX config AM33XX bool "AM33XX SoC" select ARM_CORTEX_A8_CVE_2017_5715 + select DM_EVENT select SPECIFY_CONSOLE_INDEX imply NAND_OMAP_ELM imply NAND_OMAP_GPMCarch/mips/Kconfig +1
-1@@ -121,6 +121,7 @@ config MACH_PIC32 bool "Support Microchip PIC32" select HAS_FIXED_TIMER_FREQUENCY select DM + select DM_EVENT select OF_CONTROL imply CMD_DM@@ -128,7 +129,6 @@ config TARGET_BOSTON bool "Support Boston" select HAS_FIXED_TIMER_FREQUENCY select DM - imply DM_EVENT select DM_SERIAL select MIPS_CM select SYS_CACHE_SHIFT_6arch/powerpc/cpu/mpc85xx/Kconfig +1
-0@@ -248,6 +248,7 @@ config TARGET_KMP204X config TARGET_KMCENT2 bool "Support kmcent2" select VENDOR_KM + select EVENT select FSL_CORENET select SYS_DPAA_FMAN select SYS_DPAA_PMEarch/x86/Kconfig +1
-0@@ -395,6 +395,7 @@ config FSP_VERSION1 config FSP_VERSION2 bool "FSP version 2.x" + select DM_EVENT help This covers versions 2.0 and 2.1. See here for details: https://github.com/IntelFsp/fsp/wikiarch/x86/cpu/baytrail/Kconfig +1
-0@@ -7,6 +7,7 @@ config INTEL_BAYTRAIL select HAVE_FSP select ARCH_MISC_INIT select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCIarch/x86/cpu/broadwell/Kconfig +1
-0@@ -6,6 +6,7 @@ config INTEL_BROADWELL bool select CACHE_MRC_BIN + select DM_EVENT select ARCH_EARLY_INIT_R imply HAVE_INTEL_ME imply ENABLE_MRC_CACHEarch/x86/cpu/ivybridge/Kconfig +1
-0@@ -8,6 +8,7 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE bool select CACHE_MRC_BIN if HAVE_MRC + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCIarch/x86/cpu/quark/Kconfig +1
-0@@ -7,6 +7,7 @@ config INTEL_QUARK select HAVE_RMU select ARCH_EARLY_INIT_R select ARCH_MISC_INIT + select DM_EVENT imply ENABLE_MRC_CACHE imply ETH_DESIGNWARE imply ICH_SPIboard/google/Kconfig +1
-0@@ -18,6 +18,7 @@ choice config TARGET_CHROMEBOOK_CORAL bool "Chromebook coral" select BIOSEMU + select EVENT help This is a range of Intel-based laptops released in 2018. They use an Intel Apollo Lake SoC. The design supports WiFi, 4GB to 16GB ofboard/keymile/Kconfig +1
-0@@ -124,6 +124,7 @@ config SYS_IVM_EEPROM_PAGE_LEN config PG_WCOM_UBOOT_UPDATE_SUPPORTED bool "Enable U-boot Field Fail-Safe Update Functionality" + select EVENT default n help Indicates that field fail-safe u-boot update is supported.boot/Kconfig +3
-0@@ -474,6 +474,7 @@ config BOOTMETH_VBE depends on FIT default y select BOOTMETH_GLOBAL + select EVENT help Enables support for VBE boot. This is a standard boot method which supports selection of various firmware components, seleciton of an OS to@@ -482,6 +483,7 @@ config BOOTMETH_VBE config SPL_BOOTMETH_VBE bool "Bootdev support for Verified Boot for Embedded (SPL)" depends on SPL && FIT + select EVENT default y if VPL help Enables support for VBE boot. This is a standard boot method which@@ -491,6 +493,7 @@ config SPL_BOOTMETH_VBE config VPL_BOOTMETH_VBE bool "Bootdev support for Verified Boot for Embedded (VPL)" depends on VPL && FIT + select EVENT default y help Enables support for VBE boot. This is a standard boot method whichcmd/Kconfig +1
-0@@ -2622,6 +2622,7 @@ config CMD_DIAG config CMD_EVENT bool "event - Show information about events" + depends on EVENT default y if EVENT_DEBUG help This enables the 'event' command which provides information aboutcommon/Kconfig +6
-6@@ -604,24 +604,23 @@ config CYCLIC_MAX_CPU_TIME_US endif # CYCLIC config EVENT - bool "General-purpose event-handling mechanism" - default y if SANDBOX + bool help - This enables sending and processing of events, to allow interested - parties to be alerted when something happens. This is an attempt to - stem the flow of weak functions, hooks, functions in board_f.c - and board_r.c and the Kconfig options below. + This adds a framework for general purpose sending and processing of + events, to allow interested parties to be alerted when something + happens. This is an attempt to stem the flow of weak functions, + hooks, functions in board_f.c and board_r.c and the Kconfig options + below. See doc/develop/event.rst for more information. if EVENT
common/Kconfig config CYCLIC_MAX_CPU_TIME_US · line 624
Quoted 10 lines
common/Kconfig +2
-3config EVENT_DYNAMIC - bool "Support event registration at runtime" - default y if SANDBOX + bool help Enable this to support adding an event spy at runtime, without adding - it to the EVENT_SPy() linker list. This increases code size slightly + it to the EVENT_SPY() linker list. This increases code size slightly but provides more flexibility for boards and subsystems that need it.
The long text does not cover register_event() which is also a reason to select this setting.
Best regards
Heinrich
Quoted 51 lines
common/Kconfig +0
-0config EVENT_DEBUGdrivers/core/Kconfig +5
-4@@ -109,13 +109,14 @@ config DM_DEVICE_REMOVE causes USB host controllers to not be stopped when booting the OS. config DM_EVENT - bool "Support events with driver model" - depends on DM && EVENT - default y if SANDBOX + bool + depends on DM + select EVENT help This enables support for generating events related to driver model operations, such as prbing or removing a device. Subsystems can - register a 'spy' function that is called when the event occurs. + register a 'spy' function that is called when the event occurs. Such + subsystems must select this option. config SPL_DM_DEVICE_REMOVE bool "Support device removal in SPL"drivers/cpu/Kconfig +0
-1@@ -23,7 +23,6 @@ config CPU_RISCV config CPU_MICROBLAZE bool "Enable Microblaze CPU driver" depends on CPU && MICROBLAZE - select EVENT select DM_EVENT select XILINX_MICROBLAZE0_PVR helplib/efi_loader/Kconfig +1
-1@@ -14,8 +14,8 @@ config EFI_LOADER depends on !EFI_APP default y if !ARM || SYS_CPU = armv7 || SYS_CPU = armv8 select CHARSET + # We need to send DM events, dynamically, in the EFI block driver select DM_EVENT - select EVENT select EVENT_DYNAMIC select LIB_UUID imply PARTITION_UUIDS
Re: [v3 2/2] event: Correct dependencies on the EVENT framework
Quoted 371 lines · Heinrich Schuchardt
Quoted 370 lines · Tom Rini
The event framework is just that, a framework. Enabling it by itself does nothing, so we shouldn't ask the user about it. Reword (and correct typos) around this the option and help text. This also applies to
DM_EVENTandEVENT_DYNAMIC. OnlyEVENT_DEBUGandCMD_EVENTshould be visible to the user to select, when EVENT is selected.With this, it's time to address the larger problems. When functionality uses events, typically via
EVENT_SPY, the appropriate framework then must be select'd and NOT imply'd. As the functionality will cease to work (and so, platforms will fail to boot) this is non-optional and where select is appropriate. Audit the current users ofEVENT_SPYto have a more fine-grained approach to select'ing the framework where used. Also ensure the current users ofevent_registerand also selectEVENT_DYNAMIC.Cc AKASHI Takahiro <[email protected]>Cc Heinrich Schuchardt <[email protected]>Reported-by Oliver Graute <[email protected]>Reported-by Francesco Dolcini <[email protected]>Fixes 7fe32b3442f0 ("event: Convert arch_cpu_init_dm() to use events")Fixes 42fdcebf859f ("event: Convert misc_init_f() to use events")Fixes c5ef2025579e ("dm: fix DM_EVENT dependencies")Signed-off-by Tom Rini <[email protected]>Tested-by Simon Glass <[email protected]>Reviewed-by Simon Glass <[email protected]>Reviewed-by Fabio Estevam <[email protected]>---
Changes in v3:
- Drop guards around whenEFI_LOADERselectsDM_EVENT/EVENT_DYNAMIC, keep comment.Changes in v2:
- Collect tags
- Reword the commit message a little, reword and comment on theEFI_LOADERcase.
- Add the rest of the VBE cases I had forgotten.--- arch/Kconfig | 6 +++--- arch/arm/Kconfig | 9 ++++----- arch/arm/mach-omap2/Kconfig | 3 +++ arch/mips/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/cpu/baytrail/Kconfig | 1 + arch/x86/cpu/broadwell/Kconfig | 1 + arch/x86/cpu/ivybridge/Kconfig | 1 + arch/x86/cpu/quark/Kconfig | 1 + board/google/Kconfig | 1 + board/keymile/Kconfig | 1 + boot/Kconfig | 3 +++ cmd/Kconfig | 1 + common/Kconfig | 17 ++++++++--------- drivers/core/Kconfig | 9 +++++---- drivers/cpu/Kconfig | 1 - lib/efi_loader/Kconfig | 2 +- 18 files changed, 37 insertions(+), 24 deletions(-)arch/Kconfig +3
-3@@ -93,7 +93,7 @@ config NIOS2 bool "Nios II architecture" select CPU select DM - imply DM_EVENT + select DM_EVENT select OF_CONTROL select SUPPORT_OF_CONTROL imply CMD_DM@@ -111,9 +111,9 @@ config RISCV select SUPPORT_OF_CONTROL select OF_CONTROL select DM + select DM_EVENT imply SPL_SEPARATE_BSS if SPL imply DM_SERIAL - imply DM_EVENT imply DM_MMC imply DM_SPI imply DM_SPI_FLASH@@ -136,6 +136,7 @@ config SANDBOX select BZIP2 select CMD_POWEROFF select DM + select DM_EVENT select DM_FUZZING_ENGINE select DM_GPIO select DM_I2C@@ -240,7 +241,6 @@ config X86 imply CMD_SF imply CMD_SF_TEST imply CMD_ZBOOT - imply DM_EVENT imply DM_GPIO imply DM_KEYBOARD imply DM_MMCarch/arm/Kconfig +4
-5@@ -778,7 +778,6 @@ config ARCH_OMAP2PLUS select SUPPORT_SPL imply TI_SYSC if DM && OF_CONTROL imply FIT - imply DM_EVENT imply SPL_SEPARATE_BSS config ARCH_MESON@@ -823,11 +822,11 @@ config ARCH_IMX8 select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE select DM + select DM_EVENT select GPIO_EXTRA_HEADER select MACH_IMX select OF_CONTROL select ENABLE_ARM_SOC_BOOT0_HOOK - imply DM_EVENT config ARCH_IMX8M bool "NXP i.MX8M platform"@@ -839,14 +838,15 @@ config ARCH_IMX8M select SYS_FSL_SEC_LE select SYS_I2C_MXC select DM + select DM_EVENT if CLK select SUPPORT_SPL imply CMD_DM - imply DM_EVENT config ARCH_IMX8ULP bool "NXP i.MX8ULP platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select OF_CONTROL select SUPPORT_SPL@@ -854,19 +854,18 @@ config ARCH_IMX8ULP select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMX9 bool "NXP i.MX9 platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select SUPPORT_SPL select GPIO_EXTRA_HEADER select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMXRT bool "NXP i.MXRT platform"arch/arm/mach-omap2/Kconfig +3
-0@@ -31,6 +31,7 @@ config OMAP34XX config OMAP44XX bool "OMAP44XX SoC" + select DM_EVENT select SPL_USE_TINY_PRINTF select SPL_SYS_NO_VECTOR_TABLE if SPL imply NAND_OMAP_ELM@@ -55,6 +56,7 @@ config OMAP54XX bool "OMAP54XX SoC" select ARM_CORTEX_A15_CVE_2017_5715 select ARM_ERRATA_798870 + select DM_EVENT select SYS_THUMB_BUILD imply NAND_OMAP_ELM imply NAND_OMAP_GPMC@@ -111,6 +113,7 @@ config AM43XX config AM33XX bool "AM33XX SoC" select ARM_CORTEX_A8_CVE_2017_5715 + select DM_EVENT select SPECIFY_CONSOLE_INDEX imply NAND_OMAP_ELM imply NAND_OMAP_GPMCarch/mips/Kconfig +1
-1@@ -121,6 +121,7 @@ config MACH_PIC32 bool "Support Microchip PIC32" select HAS_FIXED_TIMER_FREQUENCY select DM + select DM_EVENT select OF_CONTROL imply CMD_DM@@ -128,7 +129,6 @@ config TARGET_BOSTON bool "Support Boston" select HAS_FIXED_TIMER_FREQUENCY select DM - imply DM_EVENT select DM_SERIAL select MIPS_CM select SYS_CACHE_SHIFT_6arch/powerpc/cpu/mpc85xx/Kconfig +1
-0@@ -248,6 +248,7 @@ config TARGET_KMP204X config TARGET_KMCENT2 bool "Support kmcent2" select VENDOR_KM + select EVENT select FSL_CORENET select SYS_DPAA_FMAN select SYS_DPAA_PMEarch/x86/Kconfig +1
-0@@ -395,6 +395,7 @@ config FSP_VERSION1 config FSP_VERSION2 bool "FSP version 2.x" + select DM_EVENT help This covers versions 2.0 and 2.1. See here for details: https://github.com/IntelFsp/fsp/wikiarch/x86/cpu/baytrail/Kconfig +1
-0@@ -7,6 +7,7 @@ config INTEL_BAYTRAIL select HAVE_FSP select ARCH_MISC_INIT select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCIarch/x86/cpu/broadwell/Kconfig +1
-0@@ -6,6 +6,7 @@ config INTEL_BROADWELL bool select CACHE_MRC_BIN + select DM_EVENT select ARCH_EARLY_INIT_R imply HAVE_INTEL_ME imply ENABLE_MRC_CACHEarch/x86/cpu/ivybridge/Kconfig +1
-0@@ -8,6 +8,7 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE bool select CACHE_MRC_BIN if HAVE_MRC + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCIarch/x86/cpu/quark/Kconfig +1
-0@@ -7,6 +7,7 @@ config INTEL_QUARK select HAVE_RMU select ARCH_EARLY_INIT_R select ARCH_MISC_INIT + select DM_EVENT imply ENABLE_MRC_CACHE imply ETH_DESIGNWARE imply ICH_SPIboard/google/Kconfig +1
-0@@ -18,6 +18,7 @@ choice config TARGET_CHROMEBOOK_CORAL bool "Chromebook coral" select BIOSEMU + select EVENT help This is a range of Intel-based laptops released in 2018. They use an Intel Apollo Lake SoC. The design supports WiFi, 4GB to 16GB ofboard/keymile/Kconfig +1
-0@@ -124,6 +124,7 @@ config SYS_IVM_EEPROM_PAGE_LEN config PG_WCOM_UBOOT_UPDATE_SUPPORTED bool "Enable U-boot Field Fail-Safe Update Functionality" + select EVENT default n help Indicates that field fail-safe u-boot update is supported.boot/Kconfig +3
-0@@ -474,6 +474,7 @@ config BOOTMETH_VBE depends on FIT default y select BOOTMETH_GLOBAL + select EVENT help Enables support for VBE boot. This is a standard boot method which supports selection of various firmware components, seleciton of an OS to@@ -482,6 +483,7 @@ config BOOTMETH_VBE config SPL_BOOTMETH_VBE bool "Bootdev support for Verified Boot for Embedded (SPL)" depends on SPL && FIT + select EVENT default y if VPL help Enables support for VBE boot. This is a standard boot method which@@ -491,6 +493,7 @@ config SPL_BOOTMETH_VBE config VPL_BOOTMETH_VBE bool "Bootdev support for Verified Boot for Embedded (VPL)" depends on VPL && FIT + select EVENT default y help Enables support for VBE boot. This is a standard boot method whichcmd/Kconfig +1
-0@@ -2622,6 +2622,7 @@ config CMD_DIAG config CMD_EVENT bool "event - Show information about events" + depends on EVENT default y if EVENT_DEBUG help This enables the 'event' command which provides information aboutcommon/Kconfig +6
-6@@ -604,24 +604,23 @@ config CYCLIC_MAX_CPU_TIME_US endif # CYCLIC config EVENT - bool "General-purpose event-handling mechanism" - default y if SANDBOX + bool help - This enables sending and processing of events, to allow interested - parties to be alerted when something happens. This is an attempt to - stem the flow of weak functions, hooks, functions in board_f.c - and board_r.c and the Kconfig options below. + This adds a framework for general purpose sending and processing of + events, to allow interested parties to be alerted when something + happens. This is an attempt to stem the flow of weak functions, + hooks, functions in board_f.c and board_r.c and the Kconfig options + below. See doc/develop/event.rst for more information. if EVENT
Quoted 12 lines
common/Kconfig config CYCLIC_MAX_CPU_TIME_US · line 624
Quoted 9 lines
common/Kconfig +2
-3config EVENT_DYNAMIC - bool "Support event registration at runtime" - default y if SANDBOX + bool help Enable this to support adding an event spy at runtime, without adding - it to the EVENT_SPy() linker list. This increases code size slightly + it to the EVENT_SPY() linker list. This increases code size slightly but provides more flexibility for boards and subsystems that need it.The long text does not cover
register_event()which is also a reason to select this setting.
event_register also isn't in doc/develop/event.rst so a follow-up to expand on this would be good, yes, as the help text should generally point towards the rST docs, especially for non-user options.
Signature · 1 line
Tom
Re: [v3 2/2] event: Correct dependencies on the EVENT framework
Hi Tom,
Quoted 386 lines · Tom Rini
Quoted 371 lines · Heinrich Schuchardt
Quoted 370 lines · Tom Rini
The event framework is just that, a framework. Enabling it by itself does nothing, so we shouldn't ask the user about it. Reword (and correct typos) around this the option and help text. This also applies to
DM_EVENTandEVENT_DYNAMIC. OnlyEVENT_DEBUGandCMD_EVENTshould be visible to the user to select, when EVENT is selected.With this, it's time to address the larger problems. When functionality uses events, typically via
EVENT_SPY, the appropriate framework then must be select'd and NOT imply'd. As the functionality will cease to work (and so, platforms will fail to boot) this is non-optional and where select is appropriate. Audit the current users ofEVENT_SPYto have a more fine-grained approach to select'ing the framework where used. Also ensure the current users ofevent_registerand also selectEVENT_DYNAMIC.Cc AKASHI Takahiro <[email protected]>Cc Heinrich Schuchardt <[email protected]>Reported-by Oliver Graute <[email protected]>Reported-by Francesco Dolcini <[email protected]>Fixes 7fe32b3442f0 ("event: Convert arch_cpu_init_dm() to use events")Fixes 42fdcebf859f ("event: Convert misc_init_f() to use events")Fixes c5ef2025579e ("dm: fix DM_EVENT dependencies")Signed-off-by Tom Rini <[email protected]>Tested-by Simon Glass <[email protected]>Reviewed-by Simon Glass <[email protected]>Reviewed-by Fabio Estevam <[email protected]>---
Changes in v3:
- Drop guards around whenEFI_LOADERselectsDM_EVENT/EVENT_DYNAMIC, keep comment.Changes in v2:
- Collect tags
- Reword the commit message a little, reword and comment on theEFI_LOADERcase.
- Add the rest of the VBE cases I had forgotten.--- arch/Kconfig | 6 +++--- arch/arm/Kconfig | 9 ++++----- arch/arm/mach-omap2/Kconfig | 3 +++ arch/mips/Kconfig | 2 +- arch/powerpc/cpu/mpc85xx/Kconfig | 1 + arch/x86/Kconfig | 1 + arch/x86/cpu/baytrail/Kconfig | 1 + arch/x86/cpu/broadwell/Kconfig | 1 + arch/x86/cpu/ivybridge/Kconfig | 1 + arch/x86/cpu/quark/Kconfig | 1 + board/google/Kconfig | 1 + board/keymile/Kconfig | 1 + boot/Kconfig | 3 +++ cmd/Kconfig | 1 + common/Kconfig | 17 ++++++++--------- drivers/core/Kconfig | 9 +++++---- drivers/cpu/Kconfig | 1 - lib/efi_loader/Kconfig | 2 +- 18 files changed, 37 insertions(+), 24 deletions(-)arch/Kconfig +3
-3@@ -93,7 +93,7 @@ config NIOS2 bool "Nios II architecture" select CPU select DM - imply DM_EVENT + select DM_EVENT select OF_CONTROL select SUPPORT_OF_CONTROL imply CMD_DM@@ -111,9 +111,9 @@ config RISCV select SUPPORT_OF_CONTROL select OF_CONTROL select DM + select DM_EVENT imply SPL_SEPARATE_BSS if SPL imply DM_SERIAL - imply DM_EVENT imply DM_MMC imply DM_SPI imply DM_SPI_FLASH@@ -136,6 +136,7 @@ config SANDBOX select BZIP2 select CMD_POWEROFF select DM + select DM_EVENT select DM_FUZZING_ENGINE select DM_GPIO select DM_I2C@@ -240,7 +241,6 @@ config X86 imply CMD_SF imply CMD_SF_TEST imply CMD_ZBOOT - imply DM_EVENT imply DM_GPIO imply DM_KEYBOARD imply DM_MMCarch/arm/Kconfig +4
-5@@ -778,7 +778,6 @@ config ARCH_OMAP2PLUS select SUPPORT_SPL imply TI_SYSC if DM && OF_CONTROL imply FIT - imply DM_EVENT imply SPL_SEPARATE_BSS config ARCH_MESON@@ -823,11 +822,11 @@ config ARCH_IMX8 select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE select DM + select DM_EVENT select GPIO_EXTRA_HEADER select MACH_IMX select OF_CONTROL select ENABLE_ARM_SOC_BOOT0_HOOK - imply DM_EVENT config ARCH_IMX8M bool "NXP i.MX8M platform"@@ -839,14 +838,15 @@ config ARCH_IMX8M select SYS_FSL_SEC_LE select SYS_I2C_MXC select DM + select DM_EVENT if CLK select SUPPORT_SPL imply CMD_DM - imply DM_EVENT config ARCH_IMX8ULP bool "NXP i.MX8ULP platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select OF_CONTROL select SUPPORT_SPL@@ -854,19 +854,18 @@ config ARCH_IMX8ULP select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMX9 bool "NXP i.MX9 platform" select ARM64 select DM + select DM_EVENT select MACH_IMX select SUPPORT_SPL select GPIO_EXTRA_HEADER select MISC select IMX_SENTINEL imply CMD_DM - imply DM_EVENT config ARCH_IMXRT bool "NXP i.MXRT platform"arch/arm/mach-omap2/Kconfig +3
-0@@ -31,6 +31,7 @@ config OMAP34XX config OMAP44XX bool "OMAP44XX SoC" + select DM_EVENT select SPL_USE_TINY_PRINTF select SPL_SYS_NO_VECTOR_TABLE if SPL imply NAND_OMAP_ELM@@ -55,6 +56,7 @@ config OMAP54XX bool "OMAP54XX SoC" select ARM_CORTEX_A15_CVE_2017_5715 select ARM_ERRATA_798870 + select DM_EVENT select SYS_THUMB_BUILD imply NAND_OMAP_ELM imply NAND_OMAP_GPMC@@ -111,6 +113,7 @@ config AM43XX config AM33XX bool "AM33XX SoC" select ARM_CORTEX_A8_CVE_2017_5715 + select DM_EVENT select SPECIFY_CONSOLE_INDEX imply NAND_OMAP_ELM imply NAND_OMAP_GPMCarch/mips/Kconfig +1
-1@@ -121,6 +121,7 @@ config MACH_PIC32 bool "Support Microchip PIC32" select HAS_FIXED_TIMER_FREQUENCY select DM + select DM_EVENT select OF_CONTROL imply CMD_DM@@ -128,7 +129,6 @@ config TARGET_BOSTON bool "Support Boston" select HAS_FIXED_TIMER_FREQUENCY select DM - imply DM_EVENT select DM_SERIAL select MIPS_CM select SYS_CACHE_SHIFT_6arch/powerpc/cpu/mpc85xx/Kconfig +1
-0@@ -248,6 +248,7 @@ config TARGET_KMP204X config TARGET_KMCENT2 bool "Support kmcent2" select VENDOR_KM + select EVENT select FSL_CORENET select SYS_DPAA_FMAN select SYS_DPAA_PMEarch/x86/Kconfig +1
-0@@ -395,6 +395,7 @@ config FSP_VERSION1 config FSP_VERSION2 bool "FSP version 2.x" + select DM_EVENT help This covers versions 2.0 and 2.1. See here for details: https://github.com/IntelFsp/fsp/wikiarch/x86/cpu/baytrail/Kconfig +1
-0@@ -7,6 +7,7 @@ config INTEL_BAYTRAIL select HAVE_FSP select ARCH_MISC_INIT select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCIarch/x86/cpu/broadwell/Kconfig +1
-0@@ -6,6 +6,7 @@ config INTEL_BROADWELL bool select CACHE_MRC_BIN + select DM_EVENT select ARCH_EARLY_INIT_R imply HAVE_INTEL_ME imply ENABLE_MRC_CACHEarch/x86/cpu/ivybridge/Kconfig +1
-0@@ -8,6 +8,7 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE bool select CACHE_MRC_BIN if HAVE_MRC + select DM_EVENT imply HAVE_INTEL_ME imply ENABLE_MRC_CACHE imply AHCI_PCIarch/x86/cpu/quark/Kconfig +1
-0@@ -7,6 +7,7 @@ config INTEL_QUARK select HAVE_RMU select ARCH_EARLY_INIT_R select ARCH_MISC_INIT + select DM_EVENT imply ENABLE_MRC_CACHE imply ETH_DESIGNWARE imply ICH_SPIboard/google/Kconfig +1
-0@@ -18,6 +18,7 @@ choice config TARGET_CHROMEBOOK_CORAL bool "Chromebook coral" select BIOSEMU + select EVENT help This is a range of Intel-based laptops released in 2018. They use an Intel Apollo Lake SoC. The design supports WiFi, 4GB to 16GB ofboard/keymile/Kconfig +1
-0@@ -124,6 +124,7 @@ config SYS_IVM_EEPROM_PAGE_LEN config PG_WCOM_UBOOT_UPDATE_SUPPORTED bool "Enable U-boot Field Fail-Safe Update Functionality" + select EVENT default n help Indicates that field fail-safe u-boot update is supported.boot/Kconfig +3
-0@@ -474,6 +474,7 @@ config BOOTMETH_VBE depends on FIT default y select BOOTMETH_GLOBAL + select EVENT help Enables support for VBE boot. This is a standard boot method which supports selection of various firmware components, seleciton of an OS to@@ -482,6 +483,7 @@ config BOOTMETH_VBE config SPL_BOOTMETH_VBE bool "Bootdev support for Verified Boot for Embedded (SPL)" depends on SPL && FIT + select EVENT default y if VPL help Enables support for VBE boot. This is a standard boot method which@@ -491,6 +493,7 @@ config SPL_BOOTMETH_VBE config VPL_BOOTMETH_VBE bool "Bootdev support for Verified Boot for Embedded (VPL)" depends on VPL && FIT + select EVENT default y help Enables support for VBE boot. This is a standard boot method whichcmd/Kconfig +1
-0@@ -2622,6 +2622,7 @@ config CMD_DIAG config CMD_EVENT bool "event - Show information about events" + depends on EVENT default y if EVENT_DEBUG help This enables the 'event' command which provides information aboutcommon/Kconfig +6
-6@@ -604,24 +604,23 @@ config CYCLIC_MAX_CPU_TIME_US endif # CYCLIC config EVENT - bool "General-purpose event-handling mechanism" - default y if SANDBOX + bool help - This enables sending and processing of events, to allow interested - parties to be alerted when something happens. This is an attempt to - stem the flow of weak functions, hooks, functions in board_f.c - and board_r.c and the Kconfig options below. + This adds a framework for general purpose sending and processing of + events, to allow interested parties to be alerted when something + happens. This is an attempt to stem the flow of weak functions, + hooks, functions in board_f.c and board_r.c and the Kconfig options + below. See doc/develop/event.rst for more information. if EVENTQuoted 12 lines
common/Kconfig config CYCLIC_MAX_CPU_TIME_US · line 624
Quoted 9 lines
common/Kconfig +2
-3config EVENT_DYNAMIC - bool "Support event registration at runtime" - default y if SANDBOX + bool help Enable this to support adding an event spy at runtime, without adding - it to the EVENT_SPy() linker list. This increases code size slightly + it to the EVENT_SPY() linker list. This increases code size slightly but provides more flexibility for boards and subsystems that need it.The long text does not cover
register_event()which is also a reason to select this setting.
Quoted 3 lines
event_registeralso isn't indoc/develop/event.rstso a follow-up to expand on this would be good, yes, as the help text should generally point towards the rST docs, especially for non-user options.
https://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
Regards,
Simon
Re: [v3 2/2] event: Correct dependencies on the EVENT framework
In reply to Tom RiniQuoted 15 lines · Tom Rini
The event framework is just that, a framework. Enabling it by itself does nothing, so we shouldn't ask the user about it. Reword (and correct typos) around this the option and help text. This also applies to
DM_EVENTandEVENT_DYNAMIC. OnlyEVENT_DEBUGandCMD_EVENTshould be visible to the user to select, when EVENT is selected.With this, it's time to address the larger problems. When functionality uses events, typically via
EVENT_SPY, the appropriate framework then must be select'd and NOT imply'd. As the functionality will cease to work (and so, platforms will fail to boot) this is non-optional and where select is appropriate. Audit the current users ofEVENT_SPYto have a more fine-grained approach to select'ing the framework where used. Also ensure the current users ofevent_registerand also selectEVENT_DYNAMIC.
Quoted 11 lines
Cc AKASHI Takahiro <[email protected]>Cc Heinrich Schuchardt <[email protected]>Reported-by Oliver Graute <[email protected]>Reported-by Francesco Dolcini <[email protected]>Fixes 7fe32b3442f0 ("event: Convert arch_cpu_init_dm() to use events")Fixes 42fdcebf859f ("event: Convert misc_init_f() to use events")Fixes c5ef2025579e ("dm: fix DM_EVENT dependencies")Signed-off-by Tom Rini <[email protected]>Tested-by Simon Glass <[email protected]>Reviewed-by Simon Glass <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
Quoted 7 lines · Tom Rini
The function
arch_cpu_init_dmwas renamed tofsp_setup_pinctrlin these cases, so rename debug / docs to match.Cc Simon Glass <[email protected]>Fixes 7fe32b3442f0 ("event: Convert arch_cpu_init_dm() to use events")Signed-off-by Tom Rini <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom