From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756612Ab2CEJpo (ORCPT ); Mon, 5 Mar 2012 04:45:44 -0500 Received: from mx01.sz.bfs.de ([194.94.69.103]:13178 "EHLO mx01.sz.bfs.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756373Ab2CEJpm (ORCPT ); Mon, 5 Mar 2012 04:45:42 -0500 Message-ID: <4F548B43.6010802@bfs.de> Date: Mon, 05 Mar 2012 10:45:39 +0100 From: walter harms Reply-To: wharms@bfs.de User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; de; rv:1.9.1.16) Gecko/20101125 SUSE/3.0.11 Thunderbird/3.0.11 MIME-Version: 1.0 To: Dan Carpenter CC: Eric Wollesen , Doug Thompson , list-edac@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [patch v2] edac i5000, i5400: fix pointer math in i5000_get_mc_regs() References: <20120302065441.GB24508@elgon.mountain> <4F508C16.30900@bfs.de> <20120305090109.GM22598@mwanda> In-Reply-To: <20120305090109.GM22598@mwanda> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am 05.03.2012 10:01, schrieb Dan Carpenter: > "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: Dan Carpenter > --- > v2: Redid it as with a union as Walter Harms suggested. > Fixed the same bug in i5400_edac.c as well. > > I don't have this hardware, so please review carefully. > > diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c > index 74d6ec34..083e80a 100644 > --- a/drivers/edac/i5400_edac.c > +++ b/drivers/edac/i5400_edac.c > @@ -343,7 +343,13 @@ struct i5400_pvt { > struct pci_dev *branch_1; /* 22.0 */ > > u16 tolm; /* top of low memory */ > - u64 ambase; /* AMB BAR */ > + union { > + u64 ambase; /* AMB BAR */ > + struct { > + u32 ambase_bottom; > + u32 ambase_top; > + } u; > + }; > would this work with alignment=8 ? re, wh > u16 mir0, mir1; > > @@ -1024,9 +1030,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; > diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c > index 4dc3ac2..ecc2401 100644 > --- a/drivers/edac/i5000_edac.c > +++ b/drivers/edac/i5000_edac.c > @@ -343,7 +343,13 @@ struct i5000_pvt { > struct pci_dev *branch_1; /* 22.0 */ > > u16 tolm; /* top of low memory */ > - u64 ambase; /* AMB BAR */ > + union { > + u64 ambase; /* AMB BAR */ > + struct { > + u32 ambase_bottom; > + u32 ambase_top; > + } u; > + }; > > u16 mir0, mir1, mir2; > > @@ -1128,9 +1134,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;