On 09/29/2014 01:24 AM, Kalle Valo wrote:
> gree...@candelatech.com writes:
>
>> From: Ben Greear <gree...@candelatech.com>
>>
>> This gives user-space a normal-ish way to detect that
>> firmware has failed to start and that a reboot is
>> probably required.
>>
>> Signed-off-by: Ben Greear <gree...@candelatech.com>
>
> [...]
>
>> --- a/drivers/net/wireless/ath/ath10k/pci.c
>> +++ b/drivers/net/wireless/ath/ath10k/pci.c
>> @@ -1851,7 +1851,7 @@ static int ath10k_pci_hif_power_up(struct ath10k *ar)
>> ret);
>>
>> if (ath10k_pci_reset_mode == ATH10K_PCI_RESET_WARM_ONLY)
>> - return ret;
>> + goto out;
>>
>> ath10k_warn(ar, "trying cold reset\n");
>>
>> @@ -1859,11 +1859,17 @@ static int ath10k_pci_hif_power_up(struct ath10k *ar)
>> if (ret) {
>> ath10k_err(ar, "failed to power up target using cold
>> reset too (%d)\n",
>> ret);
>> - return ret;
>> + goto out;
>> }
>> }
>>
>> - return 0;
>> +out:
>> + /* If we have failed to power-up, it may take a reboot to
>> + * get the NIC back online.
>> + * Set flag accordinly so that user-space can know.
>> + */
>> + ar->fw_powerup_failed = !!ret;
>> + return ret;
>> }
>
> Would it be better to use ATH10K_STATE_WEDGED for this and then just
> export the state value to user space? Or should we have two different
> states, like FW_WEDGED and HW_WEDGED?
I didn't want to mess with the state machine. This counter
is just a clue to users that things might be badly wrong. Some systems
might recover with another hard reset, some will hang the entire
system hard, and some will just stick in this state unable to
recover. Some of my systems exhibit this last behaviour, so at
least with this patch I can warn the user that they need to
reboot to regain wifi functionality.
If you want to tie it to a state machine, that is OK with me, but
I don't want to mess with it because that code is already tricky
enough.
Thanks,
Ben
--
Ben Greear <gree...@candelatech.com>
Candela Technologies Inc http://www.candelatech.com
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
