| Message ID | 20221115001127.289890-1-russell.h.weight@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v1,1/1] fpga: m10bmc-sec: Fix kconfig dependencies | expand |
On 11/14/22 16:11, Russ Weight wrote: > The secure update driver depends on the firmware-upload functionality of > the firmware-loader. The firmware-loader is carried in the firmware-class > driver which is enabled with the tristate CONFIG_FW_LOADER option. The > firmware-upload functionality is included in the firmware-class driver if > the bool FW_UPLOAD config is set. > > The current dependency statement, "depends on FW_UPLOAD", is not adequate > because it does not implicitly turn on FW_LOADER. Instead of adding a > dependency, follow the convention used by drivers that require the > FW_LOADER_USER_HELPER functionality of the firmware-loader by using > select for both FW_LOADER and FW_UPLOAD. > > Fixes: bdf86d0e6ca3 ("fpga: m10bmc-sec: create max10 bmc secure update") > Reported-by: kernel test robot <lkp@intel.com> > Cc: stable@vger.kernel.org > Signed-off-by: Russ Weight <russell.h.weight@intel.com> Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested Thanks. > --- > drivers/fpga/Kconfig | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig > index d1a8107fdcb3..6ce143dafd04 100644 > --- a/drivers/fpga/Kconfig > +++ b/drivers/fpga/Kconfig > @@ -246,7 +246,9 @@ config FPGA_MGR_VERSAL_FPGA > > config FPGA_M10_BMC_SEC_UPDATE > tristate "Intel MAX10 BMC Secure Update driver" > - depends on MFD_INTEL_M10_BMC && FW_UPLOAD > + depends on MFD_INTEL_M10_BMC > + select FW_LOADER > + select FW_UPLOAD > help > Secure update support for the Intel MAX10 board management > controller.
On 2022-11-14 at 17:03:03 -0800, Randy Dunlap wrote: > > > On 11/14/22 16:11, Russ Weight wrote: > > The secure update driver depends on the firmware-upload functionality of > > the firmware-loader. The firmware-loader is carried in the firmware-class > > driver which is enabled with the tristate CONFIG_FW_LOADER option. The > > firmware-upload functionality is included in the firmware-class driver if > > the bool FW_UPLOAD config is set. > > > > The current dependency statement, "depends on FW_UPLOAD", is not adequate > > because it does not implicitly turn on FW_LOADER. Instead of adding a > > dependency, follow the convention used by drivers that require the > > FW_LOADER_USER_HELPER functionality of the firmware-loader by using > > select for both FW_LOADER and FW_UPLOAD. > > > > Fixes: bdf86d0e6ca3 ("fpga: m10bmc-sec: create max10 bmc secure update") > > Reported-by: kernel test robot <lkp@intel.com> > > Cc: stable@vger.kernel.org > > Signed-off-by: Russ Weight <russell.h.weight@intel.com> > > Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested Acked-by: Xu Yilun <yilun.xu@intel.com> Applied to for-6.1 > > Thanks. > > > --- > > drivers/fpga/Kconfig | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig > > index d1a8107fdcb3..6ce143dafd04 100644 > > --- a/drivers/fpga/Kconfig > > +++ b/drivers/fpga/Kconfig > > @@ -246,7 +246,9 @@ config FPGA_MGR_VERSAL_FPGA > > > > config FPGA_M10_BMC_SEC_UPDATE > > tristate "Intel MAX10 BMC Secure Update driver" > > - depends on MFD_INTEL_M10_BMC && FW_UPLOAD > > + depends on MFD_INTEL_M10_BMC > > + select FW_LOADER > > + select FW_UPLOAD > > help > > Secure update support for the Intel MAX10 board management > > controller. > > -- > ~Randy
diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig index d1a8107fdcb3..6ce143dafd04 100644 --- a/drivers/fpga/Kconfig +++ b/drivers/fpga/Kconfig @@ -246,7 +246,9 @@ config FPGA_MGR_VERSAL_FPGA config FPGA_M10_BMC_SEC_UPDATE tristate "Intel MAX10 BMC Secure Update driver" - depends on MFD_INTEL_M10_BMC && FW_UPLOAD + depends on MFD_INTEL_M10_BMC + select FW_LOADER + select FW_UPLOAD help Secure update support for the Intel MAX10 board management controller.
The secure update driver depends on the firmware-upload functionality of the firmware-loader. The firmware-loader is carried in the firmware-class driver which is enabled with the tristate CONFIG_FW_LOADER option. The firmware-upload functionality is included in the firmware-class driver if the bool FW_UPLOAD config is set. The current dependency statement, "depends on FW_UPLOAD", is not adequate because it does not implicitly turn on FW_LOADER. Instead of adding a dependency, follow the convention used by drivers that require the FW_LOADER_USER_HELPER functionality of the firmware-loader by using select for both FW_LOADER and FW_UPLOAD. Fixes: bdf86d0e6ca3 ("fpga: m10bmc-sec: create max10 bmc secure update") Reported-by: kernel test robot <lkp@intel.com> Cc: stable@vger.kernel.org Signed-off-by: Russ Weight <russell.h.weight@intel.com> --- drivers/fpga/Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)