| Message ID | 20190918122815.155657-1-maowenan@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Luca Coelho |
| Headers | show |
| Series | [net] iwlwifi: add dependency of THERMAL with IWLMVM | expand |
Mao Wenan <maowenan@huawei.com> writes: > If CONFIG_IWLMVM=y, CONFIG_THERMAL=n, below error can be found: > drivers/net/wireless/intel/iwlwifi/mvm/fw.o: In function `iwl_mvm_up': > fw.c:(.text+0x2c26): undefined reference to `iwl_mvm_send_temp_report_ths_cmd' > make: *** [vmlinux] Error 1 > > After commit 242d9c8b9a93 ("iwlwifi: mvm: use FW thermal > monitoring regardless of CONFIG_THERMAL"), iwl_mvm_up() > calls iwl_mvm_send_temp_report_ths_cmd(), but this function > is under CONFIG_THERMAL, which is depended on CONFIG_THERMAL. > > Fixes: 242d9c8b9a93 ("iwlwifi: mvm: use FW thermal monitoring regardless of CONFIG_THERMAL") > Signed-off-by: Mao Wenan <maowenan@huawei.com> Luca, should I apply this directly to wireless-drivers?
On Wed, 2019-09-18 at 16:08 +0300, Kalle Valo wrote: > Mao Wenan <maowenan@huawei.com> writes: > > > If CONFIG_IWLMVM=y, CONFIG_THERMAL=n, below error can be found: > > drivers/net/wireless/intel/iwlwifi/mvm/fw.o: In function `iwl_mvm_up': > > fw.c:(.text+0x2c26): undefined reference to `iwl_mvm_send_temp_report_ths_cmd' > > make: *** [vmlinux] Error 1 > > > > After commit 242d9c8b9a93 ("iwlwifi: mvm: use FW thermal > > monitoring regardless of CONFIG_THERMAL"), iwl_mvm_up() > > calls iwl_mvm_send_temp_report_ths_cmd(), but this function > > is under CONFIG_THERMAL, which is depended on CONFIG_THERMAL. > > > > Fixes: 242d9c8b9a93 ("iwlwifi: mvm: use FW thermal monitoring regardless of CONFIG_THERMAL") > > Signed-off-by: Mao Wenan <maowenan@huawei.com> > > Luca, should I apply this directly to wireless-drivers? No, this patch defeats the point of the patch it fixes. We have a proper fix already internally, which I haven't sent out yet, that moves a couple of #ifdef's around to solve the issue. I'll send the patch in a sec. -- Cheers, Luca.
diff --git a/drivers/net/wireless/intel/iwlwifi/Kconfig b/drivers/net/wireless/intel/iwlwifi/Kconfig index 7dbc0d3..801aa0f 100644 --- a/drivers/net/wireless/intel/iwlwifi/Kconfig +++ b/drivers/net/wireless/intel/iwlwifi/Kconfig @@ -65,6 +65,7 @@ config IWLMVM tristate "Intel Wireless WiFi MVM Firmware support" select WANT_DEV_COREDUMP depends on MAC80211 + depends on THERMAL help This is the driver that supports the MVM firmware. The list of the devices that use this firmware is available here:
If CONFIG_IWLMVM=y, CONFIG_THERMAL=n, below error can be found: drivers/net/wireless/intel/iwlwifi/mvm/fw.o: In function `iwl_mvm_up': fw.c:(.text+0x2c26): undefined reference to `iwl_mvm_send_temp_report_ths_cmd' make: *** [vmlinux] Error 1 After commit 242d9c8b9a93 ("iwlwifi: mvm: use FW thermal monitoring regardless of CONFIG_THERMAL"), iwl_mvm_up() calls iwl_mvm_send_temp_report_ths_cmd(), but this function is under CONFIG_THERMAL, which is depended on CONFIG_THERMAL. Fixes: 242d9c8b9a93 ("iwlwifi: mvm: use FW thermal monitoring regardless of CONFIG_THERMAL") Signed-off-by: Mao Wenan <maowenan@huawei.com> --- drivers/net/wireless/intel/iwlwifi/Kconfig | 1 + 1 file changed, 1 insertion(+)