Return-path: Received: from mail-io0-f196.google.com ([209.85.223.196]:33716 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750721AbcGKSAn (ORCPT ); Mon, 11 Jul 2016 14:00:43 -0400 MIME-Version: 1.0 In-Reply-To: <1468250301-10357-1-git-send-email-prarit@redhat.com> References: <1468250301-10357-1-git-send-email-prarit@redhat.com> From: Emmanuel Grumbach Date: Mon, 11 Jul 2016 21:00:41 +0300 Message-ID: (sfid-20160711_200111_360402_FFE775AC) Subject: Re: [PATCH RESEND] iwlwifi, Do not implement thermal zone unless ucode is loaded To: Prarit Bhargava Cc: "linux-kernel@vger.kernel.org" , Johannes Berg , Emmanuel Grumbach , Luca Coelho , Intel Linux Wireless , Kalle Valo , Chaya Rachel Ivgi , Sara Sharon , linux-wireless , "netdev@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: On Mon, Jul 11, 2016 at 6:18 PM, Prarit Bhargava wrote: > > Didn't get any feedback or review comments on this patch. Resending ... > > P. This change is obviously completely broken. It simply disables the registration to thermal zone core. > > ---8<--- > > The iwlwifi driver implements a thermal zone and hwmon device, but > returns -EIO on temperature reads if the firmware isn't loaded. This > results in the error > > iwlwifi-virtual-0 > Adapter: Virtual device > ERROR: Can't get value of subfeature temp1_input: I/O error > temp1: N/A > > being output when using sensors from the lm-sensors package. Since > the temperature cannot be read unless the ucode is loaded there is no > reason to add the interface only to have it return an error 100% of > the time. > > This patch moves the firmware check to iwl_mvm_thermal_zone_register() and > stops the thermal zone from being created if the ucode hasn't been loaded. > > Signed-off-by: Prarit Bhargava > Cc: Johannes Berg > Cc: Emmanuel Grumbach > Cc: Luca Coelho > Cc: Intel Linux Wireless > Cc: Kalle Valo > Cc: Chaya Rachel Ivgi > Cc: Sara Sharon > Cc: linux-wireless@vger.kernel.org > Cc: netdev@vger.kernel.org > --- > drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c > index 58fc7b3c711c..64802659711f 100644 > --- a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c > +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c > @@ -634,11 +634,6 @@ static int iwl_mvm_tzone_get_temp(struct thermal_zone_device *device, > > mutex_lock(&mvm->mutex); > > - if (!mvm->ucode_loaded || !(mvm->cur_ucode == IWL_UCODE_REGULAR)) { > - ret = -EIO; > - goto out; > - } > - > ret = iwl_mvm_get_temp(mvm, &temp); > if (ret) > goto out; > @@ -684,11 +679,6 @@ static int iwl_mvm_tzone_set_trip_temp(struct thermal_zone_device *device, > > mutex_lock(&mvm->mutex); > > - if (!mvm->ucode_loaded || !(mvm->cur_ucode == IWL_UCODE_REGULAR)) { > - ret = -EIO; > - goto out; > - } > - > if (trip < 0 || trip >= IWL_MAX_DTS_TRIPS) { > ret = -EINVAL; > goto out; > @@ -750,6 +740,9 @@ static void iwl_mvm_thermal_zone_register(struct iwl_mvm *mvm) > return; > } > > + if (!mvm->ucode_loaded || !(mvm->cur_ucode == IWL_UCODE_REGULAR)) > + return; > + > BUILD_BUG_ON(ARRAY_SIZE(name) >= THERMAL_NAME_LENGTH); > > mvm->tz_device.tzone = thermal_zone_device_register(name, > -- > 1.7.9.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html