Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753291AbbHESUj (ORCPT ); Wed, 5 Aug 2015 14:20:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40235 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752472AbbHESUi (ORCPT ); Wed, 5 Aug 2015 14:20:38 -0400 Date: Wed, 5 Aug 2015 14:20:36 -0400 From: Aristeu Rozanski To: Seth Jennings Cc: Mauro Carvalho Chehab , Tony Luck , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] sb_edac: fix TAD presence check for sbridge_mci_bind_devs() Message-ID: <20150805182036.GW23305@redhat.com> References: <1438798561-10180-1-git-send-email-sjenning@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1438798561-10180-1-git-send-email-sjenning@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2531 Lines: 76 On Wed, Aug 05, 2015 at 01:16:01PM -0500, Seth Jennings wrote: > In 7d375bff, NUM_CHANNELS was changed to 8 and the channel space was > renumerated to handle EN, EP, and EX configurations. > > The *_mci_bind_devs functions, except for sbridge_mci_bind_devs(), got a > new device presence check in the form of saw_chan_mask. However, > sbridge_mci_bind_devs() still uses the NUM_CHANNELS for loop. > > With the increase in NUM_CHANNELS, this loop fails at index 4 since > SB only has 4 TADs. This results in the following error on SB machines: > > EDAC sbridge: Some needed devices are missing > EDAC sbridge: Couldn't find mci handler > EDAC sbridge: Couldn't find mci handle > > This patch adapts the saw_chan_mask logic for sbridge_mci_bind_devs() as > well. > > After this patch: > > EDAC MC0: Giving out device to module sbridge_edac.c controller Sandy Bridge Socket#0: DEV 0000:3f:0e.0 (POLLED) > EDAC MC1: Giving out device to module sbridge_edac.c controller Sandy Bridge Socket#1: DEV 0000:7f:0e.0 (POLLED) Acked-by: Aristeu Rozanski > > Signed-off-by: Seth Jennings > --- > drivers/edac/sb_edac.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c > index ca78311..91cf710 100644 > --- a/drivers/edac/sb_edac.c > +++ b/drivers/edac/sb_edac.c > @@ -1648,6 +1648,7 @@ static int sbridge_mci_bind_devs(struct mem_ctl_info *mci, > { > struct sbridge_pvt *pvt = mci->pvt_info; > struct pci_dev *pdev; > + u8 saw_chan_mask = 0; > int i; > > for (i = 0; i < sbridge_dev->n_devs; i++) { > @@ -1681,6 +1682,7 @@ static int sbridge_mci_bind_devs(struct mem_ctl_info *mci, > { > int id = pdev->device - PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TAD0; > pvt->pci_tad[id] = pdev; > + saw_chan_mask |= 1 << id; > } > break; > case PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_DDRIO: > @@ -1701,10 +1703,8 @@ static int sbridge_mci_bind_devs(struct mem_ctl_info *mci, > !pvt-> pci_tad || !pvt->pci_ras || !pvt->pci_ta) > goto enodev; > > - for (i = 0; i < NUM_CHANNELS; i++) { > - if (!pvt->pci_tad[i]) > - goto enodev; > - } > + if (saw_chan_mask != 0x0f) > + goto enodev; > return 0; > > enodev: > -- > 2.4.3 > -- Aristeu -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/