Re: [PATCH RESEND] iwlwifi, Do not implement thermal zone unless ucode is loaded

On Mon, 2016-07-11 at 14:19 -0400, Prarit Bhargava wrote:

On 07/11/2016 02:00 PM, Emmanuel Grumbach wrote:

quoted

On Mon, Jul 11, 2016 at 6:18 PM, Prarit Bhargava <prarit@redhat.com

quoted

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.

No it is not broken, and yes, that is exactly what should happen IMO.

The problem is that the iwlwifi driver implements the thermal zone
even when the
device doesn't support it.

We implement thermal zone because we do support it, but the problem is
that we need the firmware to be loaded for that. So you can argue that
we should register *later* when the firmware is loaded. But this is
really not helping all that much because the firmware can also be
stopped at any time. So you'd want us to register / unregister the
thermal zone anytime the firmware is loaded / unloaded?
I guess that works, but it seems wrong to me. Usually, registration
should happen only upon INIT, and yes, at that time the firmware is not
ready to provide the information yet.
Maybe returning -EBUSY would help lm-sensors not to get confused?

As can be seen in the current code base, iwl_mvm_tzone_get_temp()
will return
-EIO 100% of the time when the firmware doesn't support reading the
temperature[1].  In this case a read of sysfs will result in a return
of -EIO,
and this breaks existing userspace programs such as lm-sensors (which
by all
accounts is bad to do).

Right, but I don't understand why the userspace is broken because of
that? Unless we register / unregister anytime the firmware is loaded, I
don't see any proper way to fix this. And yes, I'd expect the userspace
to handle gracefully failures in its requests.

Note that in my patch I have removed the -EIO return in favor of not
registering
the non-existent thermal zone.  I'm not removing any functionality by
changing
this, nor am I adding functionality.  In both cases the thermal zone
is not
functional, and with my patch userspace continues to work.

You are removing the thermal zone functionality since even when the
firmware will be loaded (which typically happens fairly quickly),
thermal zone won't work.

P.

[1] iwl_mvm_tzone_set_trip_temp() also returns -EIO, so setting and
getting of
the temperature is non-functional.

quoted

quoted

---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 <redacted>
Cc: Johannes Berg <redacted>
Cc: Emmanuel Grumbach <redacted>
Cc: Luca Coelho <redacted>
Cc: Intel Linux Wireless <redacted>
Cc: Kalle Valo <redacted>
Cc: Chaya Rachel Ivgi <redacted>
Cc: Sara Sharon <redacted>
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