]> www.infradead.org Git - users/jedix/linux-maple.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)
committerChuck Anderson <chuck.anderson@oracle.com>
Sun, 26 Feb 2017 06:08:25 +0000 (22:08 -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>
Orabug: 25394529
(cherry picked from commit f0524955177c3e5cea89ceec56ad9d538530fe4f)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
drivers/net/ethernet/intel/fm10k/fm10k_pf.c

index b02bdd32031f908ba70ae398eaf2bd7287164549..04881004345a1f76c59aa0bb1fdf681b13792464 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))