Patch "mwifiex: pcie: don't leak DMA buffers when removing" has been added to the 4.10-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
mwifiex: pcie: don't leak DMA buffers when removing
to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mwifiex-pcie-don-t-leak-dma-buffers-when-removing.patch
and it can be found in the queue-4.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
4e841d3eb9294ce4137fdb5d0a88f1bceab9c212Mon Sep 17 00:00:00 2001
From: Brian Norris <[email protected]>
Date: Fri, 10 Mar 2017 17:39:21 -0800
Subject: mwifiex: pcie: don't leak DMA buffers when removing
From: Brian Norris <[email protected]>
commit 4e841d3eb9294ce4137fdb5d0a88f1bceab9c212 upstream.
When PCIe FLR support was added, much of the remove/release code for PCIe was migrated to ->down_dev(), but ->down_dev() is never called for device removal. Let's refactor the cleanup to be done in both cases.
Also, drop the comments above mwifiex_cleanup_pcie(), because they were clearly wrong, and it's better to have clear and obvious code than to detail the code steps in comments anyway.
--- drivers/net/wireless/marvell/mwifiex/pcie.c | 38 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-)
drivers/net/wireless/marvell/mwifiex/pcie.c +19 -19
@@ -2742,6 +2742,21 @@ static void mwifiex_pcie_device_dump(strschedule_work (&pcie_work); } +static void mwifiex_pcie_free_buffers (struct mwifiex_adapter *adapter) +{ +struct pcie_service_card *card = adapter->card; +const struct mwifiex_pcie_card_reg *reg = card->pcie.reg; + +if (reg->sleep_cookie) +mwifiex_pcie_delete_sleep_cookie_buf (adapter); + +mwifiex_pcie_delete_cmdrsp_buf (adapter); +mwifiex_pcie_delete_evtbd_ring (adapter); +mwifiex_pcie_delete_rxbd_ring (adapter); +mwifiex_pcie_delete_txbd_ring (adapter); + card->cmdrsp_buf =NULL ; +} +/* * This function initializes the PCI-E host memory space, WCB rings, etc. *
@@ -2853,13 +2868,6 @@ err_enable_dev:/* * This function cleans up the allocated card buffers. -* -* The following are freed by this function - -* - TXBD ring buffers -* - RXBD ring buffers -* - Event BD ring buffers -* - Command response ring buffer -* - Sleep cookie buffer */ static void mwifiex_pcie_cleanup (struct mwifiex_adapter *adapter) {
@@ -2875,6 +2883,8 @@ static void mwifiex_pcie_cleanup(struct "Failed to write driver not-ready signature\n"); } +mwifiex_pcie_free_buffers (adapter); +if (pdev) {pci_iounmap (pdev, card->pci_mmap);pci_iounmap (pdev, card->pci_mmap1);
@@ -3115,10 +3125,7 @@ err_cre_txbd:pci_iounmap (pdev, card->pci_mmap1); } -/* This function cleans up the PCI-E host memory space. -* Some code is extracted from mwifiex_unregister_dev() -* -*/ +/* This function cleans up the PCI-E host memory space. */ static void mwifiex_pcie_down_dev (struct mwifiex_adapter *adapter) {struct pcie_service_card *card = adapter->card;
@@ -3130,14 +3137,7 @@ static void mwifiex_pcie_down_dev(struct adapter->seq_num =0 ; adapter->tx_buf_size =MWIFIEX_TX_DATA_BUF_SIZE_4K ; -if (reg->sleep_cookie) -mwifiex_pcie_delete_sleep_cookie_buf (adapter); - -mwifiex_pcie_delete_cmdrsp_buf (adapter); -mwifiex_pcie_delete_evtbd_ring (adapter); -mwifiex_pcie_delete_rxbd_ring (adapter); -mwifiex_pcie_delete_txbd_ring (adapter); - card->cmdrsp_buf =NULL ; +mwifiex_pcie_free_buffers (adapter); }static struct mwifiex_if_ops pcie_ops = {
Patches currently in stable-queue which might be from [email protected] are
queue-4.10/mmc-core-fix-access-to-hs400-es-devices.patch queue-4.10/mwifiex-pcie-don-t-leak-dma-buffers-when-removing.patch