From patchwork Tue Apr 1 04:36:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 335664 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 518E31400AF for ; Tue, 1 Apr 2014 15:36:37 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751073AbaDAEg3 (ORCPT ); Tue, 1 Apr 2014 00:36:29 -0400 Received: from e28smtp05.in.ibm.com ([122.248.162.5]:40802 "EHLO e28smtp05.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750777AbaDAEg2 (ORCPT ); Tue, 1 Apr 2014 00:36:28 -0400 Received: from /spool/local by e28smtp05.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 1 Apr 2014 10:06:25 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp05.in.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 1 Apr 2014 10:06:23 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id 5253A394003E; Tue, 1 Apr 2014 10:06:22 +0530 (IST) Received: from d28av05.in.ibm.com (d28av05.in.ibm.com [9.184.220.67]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s314aJXL8389044; Tue, 1 Apr 2014 10:06:19 +0530 Received: from d28av05.in.ibm.com (localhost [127.0.0.1]) by d28av05.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s314aKKi012473; Tue, 1 Apr 2014 10:06:21 +0530 Received: from localhost (richard.cn.ibm.com [9.111.17.102]) by d28av05.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s314aJS5012387; Tue, 1 Apr 2014 10:06:20 +0530 From: Wei Yang To: netdev@vger.kernel.org, yevgenyp@mellanox.com, ogerlitz@mellanox.com, amirv@mellanox.com, bhelgaas@google.com, linux-pci@vger.kernel.org Cc: Wei Yang Subject: [PATCH] net/mlx4_core: match pci_device_id including dynids Date: Tue, 1 Apr 2014 12:36:01 +0800 Message-Id: <1396326961-20395-1-git-send-email-weiyang@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14040104-8256-0000-0000-00000C37C616 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Fix issue introduced by commit: 97a5221 "net/mlx4_core: pass pci_device_id.driver_data to __mlx4_init_one during reset". pci_match_id() just match the static pci_device_id, which may return NULL if someone binds the driver to a device manually using /sys/bus/pci/drivers/.../new_id. This patch match pci_device_id with pci_match_device() to cover both dynids and static id_table. Thanks to Bjorn finding this issue. CC: Bjorn Helgaas CC: Amir Vadai Signed-off-by: Wei Yang Acked-by: Amir Vadai --- drivers/net/ethernet/mellanox/mlx4/main.c | 4 +++- drivers/pci/pci-driver.c | 3 ++- include/linux/pci.h | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index aa54ef7..b0edb5c 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c @@ -2673,7 +2673,9 @@ static pci_ers_result_t mlx4_pci_slot_reset(struct pci_dev *pdev) const struct pci_device_id *id; int ret; - id = pci_match_id(mlx4_pci_table, pdev); + id = pci_match_device(pci_dev_driver(pdev), pdev); + BUG_ON(!id); + ret = __mlx4_init_one(pdev, id->driver_data); return ret ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED; diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 25f0bc6..1ee26a1 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -225,7 +225,7 @@ const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, * system is in its list of supported devices. Returns the matching * pci_device_id structure or %NULL if there is no match. */ -static const struct pci_device_id *pci_match_device(struct pci_driver *drv, +const struct pci_device_id *pci_match_device(struct pci_driver *drv, struct pci_dev *dev) { struct pci_dynid *dynid; @@ -1355,6 +1355,7 @@ postcore_initcall(pci_driver_init); EXPORT_SYMBOL_GPL(pci_add_dynid); EXPORT_SYMBOL(pci_match_id); +EXPORT_SYMBOL(pci_match_device); EXPORT_SYMBOL(__pci_register_driver); EXPORT_SYMBOL(pci_unregister_driver); EXPORT_SYMBOL(pci_dev_driver); diff --git a/include/linux/pci.h b/include/linux/pci.h index 44f6883..8ede1b5 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1134,6 +1134,8 @@ int pci_add_dynid(struct pci_driver *drv, unsigned long driver_data); const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, struct pci_dev *dev); +const struct pci_device_id *pci_match_device(struct pci_driver *drv, + struct pci_dev *dev); int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass);