]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
e1000e: e1000e_cyclecounter_read(): incvalue is 32 bits, not 64
authorDenys Vlasenko <dvlasenk@redhat.com>
Wed, 20 Apr 2016 15:45:54 +0000 (17:45 +0200)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 22 Jun 2017 06:24:39 +0000 (23:24 -0700)
"incvalue" variable holds a result of "er32(TIMINCA) &
E1000_TIMINCA_INCVALUE_MASK" and used in "do_div(temp, incvalue)"
as a divisor.

Thus, "u64 incvalue" declaration is probably a mistake.
Even though it seems to be a harmless one, let's fix it.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Orabug: 26243014
(cherry picked from commit fb5277f2c2e4db4a29740ff071072a688892d2df)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
Reviewed-by: Ethan Zhao <ethan.zhao@oracle.com>
drivers/net/ethernet/intel/e1000e/netdev.c

index 7adb34cd245f0417930c2910130a7b39f7867aa6..6c2cce4744548b56dfa29cd8e67dbeee2ac000a9 100644 (file)
@@ -4300,7 +4300,8 @@ static cycle_t e1000e_cyclecounter_read(const struct cyclecounter *cc)
        }
 
        if ((hw->mac.type == e1000_82574) || (hw->mac.type == e1000_82583)) {
-               u64 incvalue, time_delta, rem, temp;
+               u64 time_delta, rem, temp;
+               u32 incvalue;
                int i;
 
                /* errata for 82574/82583 possible bad bits read from SYSTIMH/L