From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932327AbaIIJZ1 (ORCPT ); Tue, 9 Sep 2014 05:25:27 -0400 Received: from mailout4.w2.samsung.com ([211.189.100.14]:24613 "EHLO usmailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932276AbaIIJZY (ORCPT ); Tue, 9 Sep 2014 05:25:24 -0400 X-AuditID: cbfec372-b7f2f6d0000052b3-9f-540ec7832d8a Date: Tue, 09 Sep 2014 06:25:16 -0300 From: Mauro Carvalho Chehab To: Andy Lutomirski Cc: Greg Kroah-Hartman , Aristeu Rozanski , Doug Thompson , Borislav Petkov , Bjorn Helgaas , linux-edac@vger.kernel.org, "linux-kernel@vger.kernel.org" , "linux-pci@vger.kernel.org" , Rui Wang Subject: Re: [PATCH 2/2] sb_edac: Claim a different PCI device Message-id: <20140909062516.17abf622.m.chehab@samsung.com> In-reply-to: <20140908234131.GA14042@kroah.com> References: <59f55d679cc596731589516a71075b6059fcaaa5.1408051536.git.luto@amacapital.net> <20140908141035.GK22290@redhat.com> <20140908234131.GA14042@kroah.com> X-Mailer: Claws Mail 3.10.1 (GTK+ 2.24.22; x86_64-redhat-linux-gnu) MIME-version: 1.0 Content-type: text/plain; charset=US-ASCII Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrDLMWRmVeSWpSXmKPExsVy+t/hEN3m43whBifPc1ncfdvLYrGkKcPi 84Z/bBZXl51lsmhevJ7N4sKpBiaLy7vmsFmcnXeczWL12gZWi4mHnrA5cHl8b+1j8bj/5i+L x85Zd9k9Fmwq9dg/dw27x/t9V9k8Pm+S85hyqJ0lgCOKyyYlNSezLLVI3y6BK6O74RV7QZNo xcQvOxkbGA8KdDFyckgImEh82NLEAmGLSVy4t56ti5GLQ0hgCaPEhJ3r2SGcZiaJnYsnsoNU sQioSvz6MYsRxGYTMJJ41djCCmKLCGhKvJwynwWkgVmgnVli5YReJpCEsICdRG/fSrAVvAJW ErMO3AeLcwroS3yZ9JcZYsMMJoknK6YzQdzhLPFz5iRGiAZBiR+T74E1MwtoSWze1sQKYctL bF7zlnkCo8AsJGWzkJTNQlK2gJF5FaNoaXFyQXFSeq6hXnFibnFpXrpecn7uJkZIjBTtYHy2 weoQowAHoxIPb0EUX4gQa2JZcWXuIUYJDmYlEd7dB4FCvCmJlVWpRfnxRaU5qcWHGJk4OKUa GOf8TV3C7nlnH++Ur/o6851Ob/iRk+cZfILzrb3DjcevEvcs0Iu34iyRXpV5YQ7zwh23olz6 JcXtVM36Dhbo/2RsLOOZGcqzYO7XlRVl1mGN/VpNkocYbUz/8b44cu3YMsUp+suKU3QyBOvF ugumJWcVxGVHRj40kk7Odtoez+rxdMUyo/POSizFGYmGWsxFxYkAb/Yvd28CAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Mon, 08 Sep 2014 16:41:31 -0700 Greg Kroah-Hartman escreveu: > On Mon, Sep 08, 2014 at 02:49:59PM -0700, Andy Lutomirski wrote: > > On Mon, Sep 8, 2014 at 7:10 AM, Aristeu Rozanski wrote: > > > On Thu, Aug 14, 2014 at 02:45:41PM -0700, Andy Lutomirski wrote: > > >> sb_edac controls a large number of different PCI functions. Rather > > >> than registering as a normal PCI driver for all of them, it > > >> registers for just one so that it gets probed and, at probe time, it > > >> looks for all the others. > > >> > > >> Coincidentally, the device it registers for also contains the SMBUS > > >> registers, so the PCI core will refuse to probe both sb_edac and a > > >> future iMC SMBUS driver. The drivers don't actually conflict, so > > >> just change sb_edac's device table to probe a different device. > > >> > > >> An alternative fix would be to merge the two drivers, but sb_edac > > >> will also refuse to load on non-ECC systems, whereas i2c_imc would > > >> still be useful without ECC. > > >> > > >> The only user-visible change should be that sb_edac appears to bind > > >> a different device. > > >> > > >> Cc: Mauro Carvalho Chehab > > >> Cc: Rui Wang > > >> Signed-off-by: Andy Lutomirski > > >> --- > > >> drivers/edac/sb_edac.c | 2 +- > > >> 1 file changed, 1 insertion(+), 1 deletion(-) > > >> > > >> diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c > > >> index a2597e9313c6..e3bc2cced580 100644 > > >> --- a/drivers/edac/sb_edac.c > > >> +++ b/drivers/edac/sb_edac.c > > >> @@ -432,7 +432,7 @@ static const struct pci_id_table pci_dev_descr_ibridge_table[] = { > > >> * pci_device_id table for which devices we are looking for > > >> */ > > >> static const struct pci_device_id sbridge_pci_tbl[] = { > > >> - {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA)}, > > >> + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_HA0)}, > > >> {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IBRIDGE_IMC_HA0_TA)}, > > >> {0,} /* 0 terminated list. */ > > >> }; > > > > > > Acked-by: Aristeu Rozanski > > > > > > > Whose tree will this go through? > > Mauro should have a tree for this as he's the subsystem maintainer. Yes, I'll handle it. > > FWIW, this git am can't apply this to 3.17-rc4, but git am --3way can, > > and it's a one-liner in any case. Should I send a trivially rebased > > version? No need. I'll fix any merge conflicts that might arise. Regards. Mauro