diff options
author | Aristeu Rozanski <aris@redhat.com> | 2014-06-02 14:15:27 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-06-26 14:46:42 -0400 |
commit | 2ff3a308b5c776bdf4641311b87c843fe1bc3785 (patch) | |
tree | 2535e445ebbbde720ab93fdc228383fd3f86712c | |
parent | 66ca72749166163c4ec9e5ab5416548a40d902d3 (diff) |
sb_edac: fix socket detection on Ivy Bridge controllers
This patch fixes the obvious bug while handling the socket/HA bitmask used in
Ivy Bridge memory controllers.
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Aristeu Rozanski <aris@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r-- | drivers/edac/sb_edac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c index 3411f502a374..939b54c4a87c 100644 --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c | |||
@@ -616,7 +616,7 @@ static u8 get_node_id(struct sbridge_pvt *pvt) | |||
616 | static inline u8 sad_pkg_socket(u8 pkg) | 616 | static inline u8 sad_pkg_socket(u8 pkg) |
617 | { | 617 | { |
618 | /* on Ivy Bridge, nodeID is SASS, where A is HA and S is node id */ | 618 | /* on Ivy Bridge, nodeID is SASS, where A is HA and S is node id */ |
619 | return (pkg >> 3) | (pkg & 0x3); | 619 | return ((pkg >> 3) << 2) | (pkg & 0x3); |
620 | } | 620 | } |
621 | 621 | ||
622 | static inline u8 sad_pkg_ha(u8 pkg) | 622 | static inline u8 sad_pkg_ha(u8 pkg) |