]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
net: ena: use SHUTDOWN as reset reason when closing interface
authorSameeh Jubran <sameehj@amazon.com>
Sun, 3 May 2020 09:52:19 +0000 (09:52 +0000)
committerThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Fri, 4 Sep 2020 19:28:51 +0000 (16:28 -0300)
BugLink: https://bugs.launchpad.net/bugs/1890845
commit c1c0e40b367efc92ad05bb802180817534a32343 upstream.

The 'ENA_REGS_RESET_SHUTDOWN' enum indicates a normal driver
shutdown / removal procedure.

Also, a comment is added to one of the reset reason assignments for
code clarity.

Signed-off-by: Shay Agroskin <shayagr@amazon.com>
Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: Sameeh Jubran <sameehj@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Khalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: Ian May <ian.may@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
drivers/net/ethernet/amazon/ena/ena_netdev.c

index 93dea58acb122f077676acaeef6bd9ddabe2b0f5..b72b3299d7eae066027b8c7edbf5e776a41e555a 100644 (file)
@@ -3439,6 +3439,7 @@ static void ena_destroy_device(struct ena_adapter *adapter, bool graceful)
 
        ena_com_mmio_reg_read_request_destroy(ena_dev);
 
+       /* return reset reason to default value */
        adapter->reset_reason = ENA_REGS_RESET_NORMAL;
 
        clear_bit(ENA_FLAG_TRIGGER_RESET, &adapter->flags);
@@ -4362,6 +4363,7 @@ static void __ena_shutoff(struct pci_dev *pdev, bool shutdown)
        cancel_work_sync(&adapter->reset_task);
 
        rtnl_lock(); /* lock released inside the below if-else block */
+       adapter->reset_reason = ENA_REGS_RESET_SHUTDOWN;
        ena_destroy_device(adapter, true);
        if (shutdown) {
                netif_device_detach(netdev);