From patchwork Thu Aug 14 21:45:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Lutomirski X-Patchwork-Id: 4725601 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 70FF0C0338 for ; Thu, 14 Aug 2014 21:46:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9B0C8201E4 for ; Thu, 14 Aug 2014 21:46:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF590201DD for ; Thu, 14 Aug 2014 21:46:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932117AbaHNVqF (ORCPT ); Thu, 14 Aug 2014 17:46:05 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:60793 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755061AbaHNVp4 (ORCPT ); Thu, 14 Aug 2014 17:45:56 -0400 Received: by mail-pa0-f41.google.com with SMTP id rd3so2366198pab.28 for ; Thu, 14 Aug 2014 14:45:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=JQ4ntFBk8ASS5iLr1KiCSRCh0tJYcmWvXHGBmUdXvlo=; b=X07DK6hXirouoMIZtdn0IiA2njeT6wrTzcVw5IApaN76nk23K2IyRXrqm4z1kFYQix 49IPiz05TI1qjdxQGEhfBT6v5nzdSxFk1rnnPkndrZIo2XKTAUjQ0Npqa3Y4FinI3XcP /E1M8b/0TSILT6U5OY5AB/Pb5C06THWhpuB2tghKzuXX+N+VhZI6c4VUFRYbwt8Rz3LG hbSPulcSz3Y91AdfoQiLwE0PMox8r2K8N6yIy1UlNGSFW7PJ78eLDXVVHjYKdb4OOmOg w/PnI4sPLCgxS54whWSTz6coRXu/jRfNILT5HPDnaHJhHgV+AKBjOXbYw4awyLg0vWeE +Y0w== X-Gm-Message-State: ALoCoQkF3O/38K4pSgWB2PcnLXT7llDW9P38eqegOhLI5x/+IEUQX01vTq7kVuzM3aCnbLKOQ5zF X-Received: by 10.70.38.134 with SMTP id g6mr12963580pdk.135.1408052755078; Thu, 14 Aug 2014 14:45:55 -0700 (PDT) Received: from localhost (50-76-60-73-ip-static.hfc.comcastbusiness.net. [50.76.60.73]) by mx.google.com with ESMTPSA id q7sm8880121pdo.6.2014.08.14.14.45.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Aug 2014 14:45:53 -0700 (PDT) From: Andy Lutomirski To: Mauro Carvalho Chehab , Doug Thompson , Greg Kroah-Hartman Cc: Borislav Petkov , Bjorn Helgaas , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Andy Lutomirski , Rui Wang Subject: [PATCH 2/2] sb_edac: Claim a different PCI device Date: Thu, 14 Aug 2014 14:45:41 -0700 Message-Id: <59f55d679cc596731589516a71075b6059fcaaa5.1408051536.git.luto@amacapital.net> X-Mailer: git-send-email 1.9.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Acked-by: Aristeu Rozanski --- 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. */ };