diff mbox

[v3] brcmfmac: prohibit ACPI power management for brcmfmac driver

Message ID 555016DC.804@linux.intel.com (mailing list archive)
State Accepted
Delegated to: Kalle Valo
Headers show

Commit Message

Fu, Zhonghui May 11, 2015, 2:41 a.m. UTC
ACPI will manage WiFi chip's power state during suspend/resume
process on some tablet platforms(such as ASUS T100TA). This is
not supported by brcmfmac driver now, and the context of WiFi
chip will be damaged after resume. This patch informs ACPI not
to manage WiFi chip's power state.

Signed-off-by: Zhonghui Fu <zhonghui.fu@linux.intel.com>
Acked-by: Arend van Spriel <arend@broadcom.com>
---
Changes in v3:
- Have the assignment separate for the if statement.

 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

-- 1.7.1

--
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

Comments

Fu, Zhonghui May 18, 2015, 6:26 a.m. UTC | #1
Hi guys,

Any comments about this patch?



Thanks,
Zhonghui

On 2015/5/11 10:41, Fu, Zhonghui wrote:
> ACPI will manage WiFi chip's power state during suspend/resume
> process on some tablet platforms(such as ASUS T100TA). This is
> not supported by brcmfmac driver now, and the context of WiFi
> chip will be damaged after resume. This patch informs ACPI not
> to manage WiFi chip's power state.
>
> Signed-off-by: Zhonghui Fu <zhonghui.fu@linux.intel.com>
> Acked-by: Arend van Spriel <arend@broadcom.com>
> ---
> Changes in v3:
> - Have the assignment separate for the if statement.
>
>  drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c |    9 +++++++++
>  1 files changed, 9 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> index 9b508bd..c960a12 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
> @@ -33,6 +33,7 @@
>  #include <linux/suspend.h>
>  #include <linux/errno.h>
>  #include <linux/module.h>
> +#include <linux/acpi.h>
>  #include <net/cfg80211.h>
>  
>  #include <defs.h>
> @@ -1114,6 +1115,8 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
>  	int err;
>  	struct brcmf_sdio_dev *sdiodev;
>  	struct brcmf_bus *bus_if;
> +	struct device *dev;
> +	struct acpi_device *adev;
>  
>  	brcmf_dbg(SDIO, "Enter\n");
>  	brcmf_dbg(SDIO, "Class=%x\n", func->class);
> @@ -1121,6 +1124,12 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
>  	brcmf_dbg(SDIO, "sdio device ID: 0x%04x\n", func->device);
>  	brcmf_dbg(SDIO, "Function#: %d\n", func->num);
>  
> +	/* prohibit ACPI power management for this device */
> +	dev = &func->dev;
> +	adev = ACPI_COMPANION(dev);
> +	if (adev)
> +		adev->flags.power_manageable = 0;
> +
>  	/* Consume func num 1 but dont do anything with it. */
>  	if (func->num == 1)
>  		return 0;
> -- 1.7.1
>

--
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
Arend van Spriel May 20, 2015, 9:02 a.m. UTC | #2
On 05/18/15 08:26, Fu, Zhonghui wrote:
>
> Hi guys,
>
> Any comments about this patch?

My acked is already there. I have not been able to test it, but I assume 
you did.

Regards,
Arend

> Thanks,
> Zhonghui
>
> On 2015/5/11 10:41, Fu, Zhonghui wrote:
>> ACPI will manage WiFi chip's power state during suspend/resume
>> process on some tablet platforms(such as ASUS T100TA). This is
>> not supported by brcmfmac driver now, and the context of WiFi
>> chip will be damaged after resume. This patch informs ACPI not
>> to manage WiFi chip's power state.
>>
>> Signed-off-by: Zhonghui Fu<zhonghui.fu@linux.intel.com>
>> Acked-by: Arend van Spriel<arend@broadcom.com>
>> ---
>> Changes in v3:
>> - Have the assignment separate for the if statement.
>>
>>   drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c |    9 +++++++++
>>   1 files changed, 9 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
>> index 9b508bd..c960a12 100644
>> --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
>> +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
>> @@ -33,6 +33,7 @@
>>   #include<linux/suspend.h>
>>   #include<linux/errno.h>
>>   #include<linux/module.h>
>> +#include<linux/acpi.h>
>>   #include<net/cfg80211.h>
>>
>>   #include<defs.h>
>> @@ -1114,6 +1115,8 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
>>   	int err;
>>   	struct brcmf_sdio_dev *sdiodev;
>>   	struct brcmf_bus *bus_if;
>> +	struct device *dev;
>> +	struct acpi_device *adev;
>>
>>   	brcmf_dbg(SDIO, "Enter\n");
>>   	brcmf_dbg(SDIO, "Class=%x\n", func->class);
>> @@ -1121,6 +1124,12 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
>>   	brcmf_dbg(SDIO, "sdio device ID: 0x%04x\n", func->device);
>>   	brcmf_dbg(SDIO, "Function#: %d\n", func->num);
>>
>> +	/* prohibit ACPI power management for this device */
>> +	dev =&func->dev;
>> +	adev = ACPI_COMPANION(dev);
>> +	if (adev)
>> +		adev->flags.power_manageable = 0;
>> +
>>   	/* Consume func num 1 but dont do anything with it. */
>>   	if (func->num == 1)
>>   		return 0;
>> -- 1.7.1
>>
>

--
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
Fu, Zhonghui May 26, 2015, 3:52 a.m. UTC | #3
On 2015/5/20 17:02, Arend van Spriel wrote:
> On 05/18/15 08:26, Fu, Zhonghui wrote:
>>
>> Hi guys,
>>
>> Any comments about this patch?
>
> My acked is already there. I have not been able to test it, but I assume you did.

Yes, I have verified this patch on ASUS T100TA.

Thanks,
Zhonghui
>
> Regards,
> Arend
>
>> Thanks,
>> Zhonghui
>>
>> On 2015/5/11 10:41, Fu, Zhonghui wrote:
>>> ACPI will manage WiFi chip's power state during suspend/resume
>>> process on some tablet platforms(such as ASUS T100TA). This is
>>> not supported by brcmfmac driver now, and the context of WiFi
>>> chip will be damaged after resume. This patch informs ACPI not
>>> to manage WiFi chip's power state.
>>>
>>> Signed-off-by: Zhonghui Fu<zhonghui.fu@linux.intel.com>
>>> Acked-by: Arend van Spriel<arend@broadcom.com>
>>> ---
>>> Changes in v3:
>>> - Have the assignment separate for the if statement.
>>>
>>>   drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c |    9 +++++++++
>>>   1 files changed, 9 insertions(+), 0 deletions(-)
>>>
>>> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
>>> index 9b508bd..c960a12 100644
>>> --- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
>>> +++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
>>> @@ -33,6 +33,7 @@
>>>   #include<linux/suspend.h>
>>>   #include<linux/errno.h>
>>>   #include<linux/module.h>
>>> +#include<linux/acpi.h>
>>>   #include<net/cfg80211.h>
>>>
>>>   #include<defs.h>
>>> @@ -1114,6 +1115,8 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
>>>       int err;
>>>       struct brcmf_sdio_dev *sdiodev;
>>>       struct brcmf_bus *bus_if;
>>> +    struct device *dev;
>>> +    struct acpi_device *adev;
>>>
>>>       brcmf_dbg(SDIO, "Enter\n");
>>>       brcmf_dbg(SDIO, "Class=%x\n", func->class);
>>> @@ -1121,6 +1124,12 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
>>>       brcmf_dbg(SDIO, "sdio device ID: 0x%04x\n", func->device);
>>>       brcmf_dbg(SDIO, "Function#: %d\n", func->num);
>>>
>>> +    /* prohibit ACPI power management for this device */
>>> +    dev =&func->dev;
>>> +    adev = ACPI_COMPANION(dev);
>>> +    if (adev)
>>> +        adev->flags.power_manageable = 0;
>>> +
>>>       /* Consume func num 1 but dont do anything with it. */
>>>       if (func->num == 1)
>>>           return 0;
>>> -- 1.7.1
>>>
>>
>

--
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
Kalle Valo May 26, 2015, 10:46 a.m. UTC | #4
"Fu, Zhonghui" <zhonghui.fu@linux.intel.com> writes:

> ACPI will manage WiFi chip's power state during suspend/resume
> process on some tablet platforms(such as ASUS T100TA). This is
> not supported by brcmfmac driver now, and the context of WiFi
> chip will be damaged after resume. This patch informs ACPI not
> to manage WiFi chip's power state.
>
> Signed-off-by: Zhonghui Fu <zhonghui.fu@linux.intel.com>
> Acked-by: Arend van Spriel <arend@broadcom.com>

Thanks, applied to wireless-drivers-next.git.
diff mbox

Patch

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index 9b508bd..c960a12 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -33,6 +33,7 @@ 
 #include <linux/suspend.h>
 #include <linux/errno.h>
 #include <linux/module.h>
+#include <linux/acpi.h>
 #include <net/cfg80211.h>
 
 #include <defs.h>
@@ -1114,6 +1115,8 @@  static int brcmf_ops_sdio_probe(struct sdio_func *func,
 	int err;
 	struct brcmf_sdio_dev *sdiodev;
 	struct brcmf_bus *bus_if;
+	struct device *dev;
+	struct acpi_device *adev;
 
 	brcmf_dbg(SDIO, "Enter\n");
 	brcmf_dbg(SDIO, "Class=%x\n", func->class);
@@ -1121,6 +1124,12 @@  static int brcmf_ops_sdio_probe(struct sdio_func *func,
 	brcmf_dbg(SDIO, "sdio device ID: 0x%04x\n", func->device);
 	brcmf_dbg(SDIO, "Function#: %d\n", func->num);
 
+	/* prohibit ACPI power management for this device */
+	dev = &func->dev;
+	adev = ACPI_COMPANION(dev);
+	if (adev)
+		adev->flags.power_manageable = 0;
+
 	/* Consume func num 1 but dont do anything with it. */
 	if (func->num == 1)
 		return 0;