Skip to contentSkip to conversation

i7core_edac: fix misuse of logical operation in place of bitop

PATCH RESEND In review David Sterba 3 participants 4 messages Feb 21, 2011 – Feb 24, 2011

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 i7core_edac: fix misuse of logical operation in place of bitop

CC Mauro Carvalho Chehab <[email protected]>

---

Hi Mauro, this fix has not been applied yet, can you please pick it up?

Thanks,
dave

 drivers/edac/i7core_edac.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/edac/i7core_edac.c +2 -2
index 362861c..f41a34e 100644
@@ -731,7 +731,7 @@ static int get_dimm_config(const struct mem_ctl_info *mci)
 			debugf1("\t\t%#x\t%#x\t%#x\n",
 				(value[j] >> 27) & 0x1,
 				(value[j] >> 24) & 0x7,
-				(value[j] && ((1 << 24) - 1)));
+				(value[j] & ((1 << 24) - 1)));
 	}
 
 	return 0;
@@ -1670,7 +1670,7 @@ static void i7core_mce_output_error(struct mem_ctl_info *mci,
 	char *type, *optype, *err, *msg;
 	unsigned long error = m->status & 0x1ff0000l;
 	u32 optypenum = (m->status >> 4) & 0x07;
-	u32 core_err_cnt = (m->status >> 38) && 0x7fff;
+	u32 core_err_cnt = (m->status >> 38) & 0x7fff;
 	u32 dimm = (m->misc >> 16) & 0x3;
 	u32 channel = (m->misc >> 18) & 0x3;
 	u32 syndrome = m->misc >> 32;
Signature · 1 line
1.7.3.4.578.g6068a
#1 lore raw
Quoted 6 lines · David Sterba
CC Mauro Carvalho Chehab <[email protected]>

---

Hi Mauro, this fix has not been applied yet, can you please pick it up?

Yeah, this looks wrong. Is this tested? Is it something you hit when running the driver or you've caught it with some tool/by code staring?

If it is a real problem for you, I could make an exception and send it to Linus next week if Mauro doesn't do it before that.

Ok?

Signature · 8 lines
Regards/Gruss,
Boris.

Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
General Managers: Alberto Bozzo, Andrew Bowd
Registration: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
#2 lore raw

Em 24-02-2011 11:05, Borislav Petkov escreveu:

Quoted 6 lines · David Sterba
Quoted 5 lines
CC Mauro Carvalho Chehab <[email protected]>

---

Quoted 7 lines
Quoted 1 line

Hi Mauro, this fix has not been applied yet, can you please pick it up?

Yeah, this looks wrong. Is this tested? Is it something you hit when running the driver or you've caught it with some tool/by code staring?

If it is a real problem for you, I could make an exception and send it to Linus next week if Mauro doesn't do it before that.

I'm a little busy those days, but I'm expecting to have some time likely on Monday to test this patch.

Cheers,
Mauro

#3 lore raw
In reply to Borislav Petkov
Quoted 1 line · Borislav Petkov

Yeah, this looks wrong. Is this tested?

Compile tested, I don't have the hw at hand.

Quoted 2 lines

Is it something you hit when running the driver or you've caught it with some tool/by code staring?

It was found by clang compiler.

Quoted 2 lines

If it is a real problem for you, I could make an exception and send it to Linus next week if Mauro doesn't do it before that.

Not a problem for me, I just don't want let the patch fall on the floor.

Thanks,
dave