From: David S. Miller Date: Wed, 15 Jan 2014 02:59:33 +0000 (-0800) Subject: Merge branch 'intel-next' X-Git-Tag: firefly_0821_release~176^2~4570^2~176 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fb52cab54deaca28a90fc28d057a7f6487a132ae;p=firefly-linux-kernel-4.4.55.git Merge branch 'intel-next' Aaron Brown says: ==================== Intel Wired LAN Driver Updates, ixgbe: Add LER support The following patches add Live Error Recovery (LER) support to the ixgbe driver. This support also improves behavior in Thunderbolt environments. This involves checking all register reads for a value of all ones and when that is seen, to read the status register, which should never properly return all ones, to confirm whether the received value was correct. When this detects a removal, the hw_addr field is cleared to indicate the removal. This then blocks subsequent access to the device registers. All register access macros have been changed to static inline functions and all register accesses now use them.ยท Macro versions are temporarily provided. The __IXGBE_DOWN bit is no longer overloaded to also mean that device removal has been initiated. Now the bit can be used to protect ixgbe_down from multiple entry via test_and_set_bit. A needed smp_mb__before_clear_bit was also added. V2 Changes: - Use ACCESS_ONCE where needed, thanks to Ben Hutchings - Fix crash on module removal - Use boolean values for boolean returns instead of 0 and 1 - Reword Kconfig help text V3 Changes: - Drop config option, per David Miller - Drop tail register write checks, per Alexander Duyck - Change writeq implementation to a static inline, thanks to Joe Perches V4 Changes: - Change __IXGBE_REMOVE to __IXGBE_REMOVING, per Scott Feldman's comment - Add #define writeq writeq, per Alexander Duyck - Change static inline functions to lower case, per David Miller - Use new lower case names in added and modified register accesses - Provide temporary upper case macros for register access functions - Change IXGBE_REMOVED from macro to static inline and change references - Correct IXGBE_WRITE_FLUSH to properly enclose parameter expansion ==================== Signed-off-by: David S. Miller --- fb52cab54deaca28a90fc28d057a7f6487a132ae