Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f58d0dee authored by Dan Carpenter's avatar Dan Carpenter Committed by Mauro Carvalho Chehab
Browse files

edac i5000, i5400: fix pointer math in i5000_get_mc_regs() 



"pvt->ambase" is a u64 datatype.  The intent here is to fill the first
half in the first call to pci_read_config_dword() and the other half in
the second.  Unfortunately the pointer math is wrong so we set the wrong
data.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 38ced28b

drivers/edac/i5000_edac.c

+9 −3
Original line number Diff line number Diff line
@@ -328,7 +328,13 @@ struct i5000_pvt { 
	struct pci_dev *branch_1;	/* 22.0 */



	u16 tolm;		/* top of low memory */

	union {

		u64 ambase;		/* AMB BAR */

		struct {

			u32 ambase_bottom;

			u32 ambase_top;

		} u __packed;

	};



	u16 mir0, mir1, mir2;
@@ -1131,9 +1137,9 @@ static void i5000_get_mc_regs(struct mem_ctl_info *mci) 
	pvt = mci->pvt_info;



	pci_read_config_dword(pvt->system_address, AMBASE,

			(u32 *) & pvt->ambase);

			&pvt->u.ambase_bottom);

	pci_read_config_dword(pvt->system_address, AMBASE + sizeof(u32),

			((u32 *) & pvt->ambase) + sizeof(u32));

			&pvt->u.ambase_top);



	maxdimmperch = pvt->maxdimmperch;

	maxch = pvt->maxch;

drivers/edac/i5400_edac.c

+9 −3
Original line number Diff line number Diff line
@@ -327,7 +327,13 @@ struct i5400_pvt { 
	struct pci_dev *branch_1;		/* 22.0 */



	u16 tolm;				/* top of low memory */

	union {

		u64 ambase;				/* AMB BAR */

		struct {

			u32 ambase_bottom;

			u32 ambase_top;

		} u __packed;

	};



	u16 mir0, mir1;
@@ -1055,9 +1061,9 @@ static void i5400_get_mc_regs(struct mem_ctl_info *mci) 
	pvt = mci->pvt_info;



	pci_read_config_dword(pvt->system_address, AMBASE,

			(u32 *) &pvt->ambase);

			&pvt->u.ambase_bottom);

	pci_read_config_dword(pvt->system_address, AMBASE + sizeof(u32),

			((u32 *) &pvt->ambase) + sizeof(u32));

			&pvt->u.ambase_top);



	maxdimmperch = pvt->maxdimmperch;

	maxch = pvt->maxch;