mochabin/mwifiex
1
0
Fork 0
mirror of https://github.com/nxp-imx/mwifiex.git synced 2024-11-13 02:31:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

mxm_wifiex: update to mxm5x17247.p1 release

Browse source 
changes:
1. Fixed compilation errors for 5.12 kernel.
2. Fixed an issue with suspend/resume for PCIE9098 with 5.10.9 kernel.

Signed-off-by: Sherry Sun <sherry.sun@nxp.com>
Reviewed-by: yang.tian <yang.tian@nxp.com>
This commit is contained in:
Sherry Sun 2021-05-07 12:38:32 +08:00 committed by yang.tian
parent 6746a7a3d5
commit 61f21f1a18
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mxm_wifiex/wlan_src/mlan/mlan_decl.h
View file

@ -24,7 +24,7 @@
#define _MLAN_DECL_H_ #define _MLAN_DECL_H_
/** MLAN release version */ /** MLAN release version */
#define MLAN_RELEASE_VERSION "247" #define MLAN_RELEASE_VERSION "247.p1"
/** Re-define generic data types for MLAN/MOAL */ /** Re-define generic data types for MLAN/MOAL */
/** Signed char (1-byte) */ /** Signed char (1-byte) */

2
mxm_wifiex/wlan_src/mlinux/mlan_decl.h
View file

@ -24,7 +24,7 @@
#define _MLAN_DECL_H_ #define _MLAN_DECL_H_
/** MLAN release version */ /** MLAN release version */
#define MLAN_RELEASE_VERSION "247" #define MLAN_RELEASE_VERSION "247.p1"
/** Re-define generic data types for MLAN/MOAL */ /** Re-define generic data types for MLAN/MOAL */
/** Signed char (1-byte) */ /** Signed char (1-byte) */

12
mxm_wifiex/wlan_src/mlinux/moal_main.c
View file

@ -8766,7 +8766,7 @@ void woal_regist_oob_wakeup_irq(moal_handle *handle)
ENTER(); ENTER();
node = of_find_compatible_node(NULL, NULL, "nxp,host-wake"); node = of_find_compatible_node(NULL, NULL, "nxp,wifi-wake-host");
if (!node) if (!node)
goto err_exit; goto err_exit;
@ -8777,7 +8777,8 @@ void woal_regist_oob_wakeup_irq(moal_handle *handle)
} }
ret = devm_request_irq(dev, handle->irq_oob_wakeup, ret = devm_request_irq(dev, handle->irq_oob_wakeup,
woal_oob_wakeup_irq_handler, IRQF_TRIGGER_LOW, woal_oob_wakeup_irq_handler,
IRQF_TRIGGER_LOW | IRQF_SHARED,
"wifi_oob_wakeup", handle); "wifi_oob_wakeup", handle);
if (ret) { if (ret) {
dev_err(dev, "Failed to request irq_oob_wakeup %d (%d)\n", dev_err(dev, "Failed to request irq_oob_wakeup %d (%d)\n",
@ -8810,7 +8811,10 @@ void woal_unregist_oob_wakeup_irq(moal_handle *handle)
struct device *dev = handle->hotplug_device; struct device *dev = handle->hotplug_device;
ENTER(); ENTER();
devm_free_irq(dev, handle->irq_oob_wakeup, handle); if (handle->irq_oob_wakeup >= 0) {
device_init_wakeup(dev, false);
devm_free_irq(dev, handle->irq_oob_wakeup, handle);
}
LEAVE(); LEAVE();
} }
@ -8827,7 +8831,7 @@ void woal_disable_oob_wakeup_irq(moal_handle *handle)
if (handle->irq_oob_wakeup >= 0) { if (handle->irq_oob_wakeup >= 0) {
if (handle->wake_by_wifi) if (handle->wake_by_wifi)
return; disable_irq_wake(handle->irq_oob_wakeup);
else { else {
disable_irq_wake(handle->irq_oob_wakeup); disable_irq_wake(handle->irq_oob_wakeup);
disable_irq(handle->irq_oob_wakeup); disable_irq(handle->irq_oob_wakeup);

8
mxm_wifiex/wlan_src/mlinux/moal_pcie.c
View file

@ -642,12 +642,12 @@ static int woal_pcie_suspend(struct pci_dev *pdev, pm_message_t state)
handle->surprise_removed = MTRUE; handle->surprise_removed = MTRUE;
handle->is_suspended = MTRUE; handle->is_suspended = MTRUE;
} }
pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);
pci_save_state(pdev);
pci_set_power_state(pdev, pci_choose_state(pdev, state));
#ifdef IMX_SUPPORT #ifdef IMX_SUPPORT
woal_enable_oob_wakeup_irq(handle); woal_enable_oob_wakeup_irq(handle);
#endif /* IMX_SUPPORT */ #endif /* IMX_SUPPORT */
pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);
pci_save_state(pdev);
pci_set_power_state(pdev, pci_choose_state(pdev, state));
done: done:
PRINTM(MCMND, "<--- Leave woal_pcie_suspend --->\n"); PRINTM(MCMND, "<--- Leave woal_pcie_suspend --->\n");
LEAVE(); LEAVE();
@ -1114,8 +1114,10 @@ static mlan_status woal_pcie_preinit(struct pci_dev *pdev)
{ {
int ret; int ret;
#ifndef IMX_SUPPORT
if (pdev->multifunction) if (pdev->multifunction)
device_disable_async_suspend(&pdev->dev); device_disable_async_suspend(&pdev->dev);
#endif
ret = pci_enable_device(pdev); ret = pci_enable_device(pdev);