Patch "net: ena: add missing unmap bars on device removal" has been added to the 4.9-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
net: ena: add missing unmap bars on device removal
to the 4.9-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:
net-ena-add-missing-unmap-bars-on-device-removal.patch
and it can be found in the queue-4.9 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 foo@baz Mon Apr 9 17:09:24 CEST 2018
From: Netanel Belgazal <[email protected]>
Date: Sun, 11 Jun 2017 15:42:47 +0300
Subject: net: ena: add missing unmap bars on device removal
From: Netanel Belgazal <[email protected]>
[ Upstream commit 0857d92f71b6cb75281fde913554b2d5436c394b ]
This patch also change the mapping functions to devm_ functions
--- drivers/net/ethernet/amazon/ena/ena_netdev.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/net/ethernet/amazon/ena/ena_netdev.c +11 -4
@@ -2808,6 +2808,11 @@ static void ena_release_bars(struct ena_ {int release_bars; +if (ena_dev->mem_bar) +devm_iounmap (&pdev->dev, ena_dev->mem_bar); + +devm_iounmap (&pdev->dev, ena_dev->reg_bar); + release_bars =pci_select_bars (pdev,IORESOURCE_MEM ) &ENA_BAR_MASK ;pci_release_selected_regions (pdev, release_bars); }
@@ -2895,8 +2900,9 @@ static int ena_probe(struct pci_dev *pde goto err_free_ena_dev; } - ena_dev->reg_bar =ioremap (pci_resource_start (pdev,ENA_REG_BAR ), -pci_resource_len (pdev,ENA_REG_BAR )); + ena_dev->reg_bar =devm_ioremap (&pdev->dev, +pci_resource_start (pdev,ENA_REG_BAR ), +pci_resource_len (pdev,ENA_REG_BAR ));if (!ena_dev->reg_bar) {dev_err (&pdev->dev,"failed to remap regs bar\n" ); rc = -EFAULT ;
@@ -2916,8 +2922,9 @@ static int ena_probe(struct pci_dev *pdeena_set_push_mode (pdev, ena_dev, &get_feat_ctx);if (ena_dev->tx_mem_queue_type ==ENA_ADMIN_PLACEMENT_POLICY_DEV ) { - ena_dev->mem_bar =ioremap_wc (pci_resource_start (pdev,ENA_MEM_BAR ), -pci_resource_len (pdev,ENA_MEM_BAR )); + ena_dev->mem_bar =devm_ioremap_wc (&pdev->dev, +pci_resource_start (pdev,ENA_MEM_BAR ), +pci_resource_len (pdev,ENA_MEM_BAR ));if (!ena_dev->mem_bar) { rc = -EFAULT ; goto err_device_destroy;
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/net-ena-disable-admin-msix-while-working-in-polling-mode.patch queue-4.9/net-ena-fix-race-condition-between-submit-and-completion-admin-command.patch queue-4.9/net-ena-fix-rare-uncompleted-admin-command-false-alarm.patch queue-4.9/net-ena-add-missing-unmap-bars-on-device-removal.patch queue-4.9/net-ena-add-missing-return-when-ena_com_get_io_handlers-fails.patch