Patch "x86 EDAC, sb_edac.c: Take account of channel hashing when needed" has been added to the 4.5-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
x86 EDAC, sb_edac.c: Take account of channel hashing when needed
to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-edac-sb_edac.c-take-account-of-channel-hashing-when-needed.patch
and it can be found in the queue-4.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
ea5dfb5fae81939f777ca569d8cfb599252da2e8Mon Sep 17 00:00:00 2001
From: Tony Luck <[email protected]>
Date: Thu, 14 Apr 2016 10:22:02 -0700
Subject: x86 EDAC, sb_edac.c: Take account of channel hashing when needed
From: Tony Luck <[email protected]>
commit ea5dfb5fae81939f777ca569d8cfb599252da2e8 upstream.
Haswell and Broadwell can be configured to hash the channel interleave function using bits [27:12] of the physical address.
On those processor models we must check to see if hashing is enabled (bit21 of the HASWELL_HASYSDEFEATURE2 register) and act accordingly.
Based on a patch by patrickg <[email protected]>
--- drivers/edac/sb_edac.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)
drivers/edac/sb_edac.c +23 -1
@@ -362,6 +362,7 @@ struct sbridge_pvt {/* Memory type detection */ bool is_mirrored, is_lockstep, is_close_pg; +bool is_chan_hash;/* Fifo double buffers */ struct mce mce_entry[MCE_LOG_LEN ];
@@ -1060,6 +1061,20 @@ static inline u8 sad_pkg_ha(u8 pkg)return (pkg >>2 ) &0x1 ; } +static int haswell_chan_hash (int idx,u64 addr) +{ +int i; + +/* +* XOR even bits from 12:26 to bit0 of idx, +* odd bits from 13:27 to bit1 +*/ +for (i =12 ; i <28 ; i +=2 ) + idx ^= (addr >> i) &3 ; + +return idx; +} +/**************************************************************************** Memory check routines ****************************************************************************/
@@ -1616,6 +1631,10 @@ static int get_dimm_config(struct mem_ct KNL_MAX_CHANNELS :NUM_CHANNELS ;u64 knl_mc_sizes[KNL_MAX_CHANNELS ]; +if (pvt->info.type ==HASWELL || pvt->info.type ==BROADWELL ) { +pci_read_config_dword (pvt->pci_ha0,HASWELL_HASYSDEFEATURE2 , ®); + pvt->is_chan_hash =GET_BITFIELD (reg,21 ,21 ); + }if (pvt->info.type ==HASWELL || pvt->info.type ==BROADWELL || pvt->info.type ==KNIGHTS_LANDING )pci_read_config_dword (pvt->pci_sad1,SAD_TARGET , ®);
@@ -2122,8 +2141,11 @@ static int get_memory_error_data(structif (ch_way ==3 ) idx = addr >>6 ; -else +else { idx = (addr >> (6 + sck_way + shiftup)) &0x3 ; +if (pvt->is_chan_hash) + idx =haswell_chan_hash (idx, addr); + } idx = idx % ch_way;/*
Patches currently in stable-queue which might be from [email protected] are
queue-4.5/x86-edac-sb_edac.c-repair-damage-introduced-when-fixing-channel-address.patch queue-4.5/x86-mce-avoid-using-object-after-free-in-genpool.patch queue-4.5/x86-edac-sb_edac.c-take-account-of-channel-hashing-when-needed.patch