i40e: do not take NVM ownership for SR read
authorKamil Krawczyk <kamil.krawczyk@intel.com>
Wed, 4 Jun 2014 04:22:36 +0000 (04:22 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Thu, 26 Jun 2014 11:44:57 +0000 (04:44 -0700)
We do not need to acquire NVM for Shadow RAM XSUM calculation, as we only
read from SR through SRCTL register for which having the ownership is not
required.

Change-ID: Ie238a8f09917d1d25f24cc7cec271951ac7b98f2
Signed-off-by: Kamil Krawczyk <kamil.krawczyk@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/i40e/i40e_nvm.c

index 81299189a47d3e58b61e75dba58869a85e813f2e..66bcb15422daddc4de40d8d37bc4148e916ddfa8 100644 (file)
@@ -324,13 +324,9 @@ i40e_status i40e_validate_nvm_checksum(struct i40e_hw *hw,
        u16 checksum_sr = 0;
        u16 checksum_local = 0;
 
-       ret_code = i40e_acquire_nvm(hw, I40E_RESOURCE_READ);
-       if (ret_code)
-               goto i40e_validate_nvm_checksum_exit;
-
        ret_code = i40e_calc_nvm_checksum(hw, &checksum_local);
        if (ret_code)
-               goto i40e_validate_nvm_checksum_free;
+               goto i40e_validate_nvm_checksum_exit;
 
        /* Do not use i40e_read_nvm_word() because we do not want to take
         * the synchronization semaphores twice here.
@@ -347,9 +343,6 @@ i40e_status i40e_validate_nvm_checksum(struct i40e_hw *hw,
        if (checksum)
                *checksum = checksum_local;
 
-i40e_validate_nvm_checksum_free:
-       i40e_release_nvm(hw);
-
 i40e_validate_nvm_checksum_exit:
        return ret_code;
 }