]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
fm10k: do not clear global mailbox interrupt bits
authorNgai-Mint Kwan <ngai-mint.kwan@intel.com>
Wed, 2 Nov 2016 23:44:47 +0000 (16:44 -0700)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sun, 8 Jan 2017 09:35:19 +0000 (01:35 -0800)
Partially revert commit 5e93cbadd3e9 ("fm10k: Reset mailbox global
interrupts", 2016-06-07)

The register bits related to this commit are now solely being handled by
the IES API. Recent changes in the IES API will allow an automatic
recovery from improper handling of these bits.

Signed-off-by: Ngai-Mint Kwan <ngai-mint.kwan@intel.com>
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/fm10k/fm10k_pf.c

index 23fb319fd2a048e7c8d788ce87636b97dbeea7b3..40ee0242a80ae49e10f595462ba3c05bb6880edc 100644 (file)
@@ -72,10 +72,6 @@ force_reset:
        fm10k_write_flush(hw);
        udelay(FM10K_RESET_TIMEOUT);
 
-       /* Reset mailbox global interrupts */
-       reg = FM10K_MBX_GLOBAL_REQ_INTERRUPT | FM10K_MBX_GLOBAL_ACK_INTERRUPT;
-       fm10k_write_reg(hw, FM10K_GMBX, reg);
-
        /* Verify we made it out of reset */
        reg = fm10k_read_reg(hw, FM10K_IP);
        if (!(reg & FM10K_IP_NOTINRESET))