From patchwork Wed Jun 13 06:29:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pingfan Liu X-Patchwork-Id: 928683 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HxPys5Qa"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 415H1H2hp9z9ry1 for ; Wed, 13 Jun 2018 16:30:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754462AbeFMGaK (ORCPT ); Wed, 13 Jun 2018 02:30:10 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:42253 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754398AbeFMGaJ (ORCPT ); Wed, 13 Jun 2018 02:30:09 -0400 Received: by mail-pl0-f68.google.com with SMTP id w17-v6so916310pll.9 for ; Tue, 12 Jun 2018 23:30:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ceyoEb2iFnCMsov7WKpqnq3ZQWP48xDSryOo0rw80To=; b=HxPys5QamxPCrR5IF4tW7+PWQpl62Fg2oqe2Jz49De9/qX1g3PIdIEDcqnTMyge15E BK0IIeiQiuTbCRrGPvnPXmNu7DfdGUSgbCjEGvOyXtYojyIrxZno0ciR16qO9UsT7M/Y fOrjK/DS5NoXn/1eWZcQAfep2vUP8YZ9riC4P1VXvuG05OzZWdJMRKvU4z3BIjs0rjC3 KM2dmWy8467TxrYy5EcYj4Vu77wQeV3p5hLvlBrJHLV2S8krB3ZyPNnnGS3xhcxYvuVv so29THCqFcS4V0N0FXNhe8rOb0FhwlMPsNT89FzvpVhsJ+amPQnkANCdMj4LtOliMoa9 7Cng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ceyoEb2iFnCMsov7WKpqnq3ZQWP48xDSryOo0rw80To=; b=eCWuuXA2RsVnfxgG4OYmvT/GJnQ7UmKy3qbITU+5/80YCrJ6KnXQcpKtrLOyltDQqF BKrRRuaK8LcCl6g6N18d2WIdqWsd8E2MeJd6ivKl0/AVWFsrmtdmDLCDiqB+U95g4XKC 0yv2qgCC1cLX70BJuxmvQZwRQfW+TR/0GXMt8jdiVMCf/Wvdbd2Q77hHIvHxxesaGQQ1 E4F2RjrQNJUUENC2WhPQA+UwyBteHOqPBY21Y+ZTEhanvloK/b3tUNhg8RBHIfOGweNS DBcqrIiW/q8V/MQQdLk/l0z2DQ/wTPRXh6xIP3aNIbGTAbYkaHH1g7E97ZfChnJ36RE/ N4BA== X-Gm-Message-State: APt69E1lcRSQ18XRggongyMFb5UssvSx+NBzHLyyqVlHO/OxazQeyVzH HLSiwZLozbQ79Xv2MnKnMwWA X-Google-Smtp-Source: ADUXVKJJCiYSUUXdti88d0nuq+wYNNSsZFczX+/309cWx1ENZeHEkkrspXUydZcbJjBCF7GGwZFjAA== X-Received: by 2002:a17:902:b216:: with SMTP id t22-v6mr3755597plr.199.1528871409399; Tue, 12 Jun 2018 23:30:09 -0700 (PDT) Received: from mylaptop.nay.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id l23-v6sm2126602pgc.61.2018.06.12.23.30.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 23:30:08 -0700 (PDT) From: Pingfan Liu To: linux-pci@vger.kernel.org Cc: Bjorn Helgaas , Christoph Hellwig , linuxppc-dev@lists.ozlabs.org Subject: [patchV2 1/2] pci: introduce an extra method for matching in pci_driver Date: Wed, 13 Jun 2018 14:29:56 +0800 Message-Id: <1528871397-17917-2-git-send-email-kernelfans@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528871397-17917-1-git-send-email-kernelfans@gmail.com> References: <1528871397-17917-1-git-send-email-kernelfans@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org In __driver_attach(), if a driver matches a device, the device will be appended to the tail of devices_kset, no matter what the probing result of the device. Hence in order to prevent a driver to append a probed device to devices_kset, it requires a correct matching. As for pci, pci driver uses pci_device_id to match a device. But it may be not enough, since there is need for extra info such as pcie, which can not be provided in pci_device_id. Such info is driver specific, and this patch introduces a new method "extra_match" in pci_driver. This is used by next patch. Signed-off-by: Pingfan Liu --- drivers/pci/pci-driver.c | 4 ++++ include/linux/pci.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index b9a1311..151865f 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -273,6 +273,10 @@ static const struct pci_device_id *pci_match_device(struct pci_driver *drv, if (!found_id && dev->driver_override) found_id = &pci_device_id_any; + /* more strictly matching besides id_table */ + if (drv->extra_match && drv->extra_match(dev) < 0) + found_id = NULL; + return found_id; } diff --git a/include/linux/pci.h b/include/linux/pci.h index 73178a2..6ed960d 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -738,10 +738,12 @@ struct pci_error_handlers { struct module; +typedef int (*ematch)(struct pci_dev *pdev); struct pci_driver { struct list_head node; const char *name; const struct pci_device_id *id_table; /* Must be non-NULL for probe to be called */ + ematch extra_match; /* more strictly matching besides id_table */ int (*probe)(struct pci_dev *dev, const struct pci_device_id *id); /* New device inserted */ void (*remove)(struct pci_dev *dev); /* Device removed (NULL if not a hot-plug capable driver) */ int (*suspend)(struct pci_dev *dev, pm_message_t state); /* Device suspended */ From patchwork Wed Jun 13 06:29:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pingfan Liu X-Patchwork-Id: 928684 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mXBvasdM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 415H1L1PVhz9ry1 for ; Wed, 13 Jun 2018 16:30:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754398AbeFMGaN (ORCPT ); Wed, 13 Jun 2018 02:30:13 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:35787 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754466AbeFMGaM (ORCPT ); Wed, 13 Jun 2018 02:30:12 -0400 Received: by mail-pf0-f194.google.com with SMTP id c22-v6so848134pfi.2 for ; Tue, 12 Jun 2018 23:30:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bifgjtWLmJDtsv0btjkFlj4LGLvZdMci/XbBfATyrEw=; b=mXBvasdMAAFwRKerzZ1LJedrUFcFlSqKEbmK4EDtyk+keaktWy3PCmz7LfM4N5ysGz OyWkrSf5DBNoKw3Pg+5EWMndTPe/8GAMoiedt8X9MfriJdVBqqxA3dndj9L0Uxb0lgVJ 85pGNKEW7XaIBsRshdvg3zeviMq0ZHZlkFKoTmeiczYW13W0bpSzna+JtabJ4/tA8nmQ frEzKxA8wdy4s6aQZYQ8LmJxuUTlhhR8BeeIqcDW5Vd+IZXweBhZlEHotDANjWmAY0i9 9wsI3g8ahKzAyyaI9ha0TpoC2AFe/aP0fC1A4OQhfEHarC8GV8jQricBawFeko7j1Fwf +Y6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bifgjtWLmJDtsv0btjkFlj4LGLvZdMci/XbBfATyrEw=; b=uLxXYMbB2S6Ed3yRgK7WD/5vaGJwsWpljpyB+4RSwi/W/x3icBFlDSERt0GyPXZXs6 Z0X0cu8SKJj3r8gp++0i+hBDq/iS3bdfFT+Seq9KmOn6o/W9Zvg/I0suTXrjoI/Va9Y+ iPmVoz+qJmLYLZv/SjPBC9dM9TLh8nJWrKdsCghyZXprhWhEu2uF5yq/xjd8izzmJ7Q/ DOJk6OphS3FusBhroIWrmVJ0Nvwz8l3B1NLXVLTCLrd2qJ5Kg9rByHyLsbpfFBh9TNnz vQf6FAQaKJeaX4k1STQFtPXVGsCiOOngalPYjIh2tAhc5CkfBiXZUC5oSTY/ZSh4Xv5I 66+A== X-Gm-Message-State: APt69E0nMGUxS0Gmz1tf/NecyFCR6HKVp9nQF84JTj5uFU5MuMShQnfi n4wuuK4V939eGZRqO6KKtWMe X-Google-Smtp-Source: ADUXVKJtPzcCR0Ir+kbZ6Cwsd1c4XDHMIMC62Xu1ZvBOT0buS3+dpsdFYJNFONHZP5xKKzYOaFkLaw== X-Received: by 2002:a62:8995:: with SMTP id n21-v6mr3543474pfk.83.1528871411775; Tue, 12 Jun 2018 23:30:11 -0700 (PDT) Received: from mylaptop.nay.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id l23-v6sm2126602pgc.61.2018.06.12.23.30.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 23:30:11 -0700 (PDT) From: Pingfan Liu To: linux-pci@vger.kernel.org Cc: Bjorn Helgaas , Christoph Hellwig , linuxppc-dev@lists.ozlabs.org Subject: [patchV2 2/2] pci/shpchp: no claim on pcie port device Date: Wed, 13 Jun 2018 14:29:57 +0800 Message-Id: <1528871397-17917-3-git-send-email-kernelfans@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528871397-17917-1-git-send-email-kernelfans@gmail.com> References: <1528871397-17917-1-git-send-email-kernelfans@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The Linux Device Driver Model allows a physical device to be handled by only a single driver. But at present, both shpchp and portdrv_pci claim PCI_CLASS_BRIDGE_PCI, and touch devices_kset when the drivers are loaded. This causes a few problems, one is the wrong shutdown seq of devices, owing to the broken devices_kset. This patch keeps shpchp away from pcie port device, using the extra matching method. Note: I hit this bug on a Power9 machine, when "kexec -e", and see a ata-disk behind a bridge can not write back buffer in flight due to the former shutdown of the bridge which clears the BusMaster bit. the device involved: 0004:00:00.0 PCI bridge: IBM Device 04c1 (prog-if 00 [Normal decode]) Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR+ FastB2B- DisINTx- Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR- TAbort- Reset- FastB2B- PriDiscTmr- SecDiscTmr- DiscTmrStat- DiscTmrSERREn- Capabilities: [40] Power Management version 3 Flags: PMEClk- DSI- D1- D2- AuxCurrent=0mA PME(D0+,D1-,D2-,D3hot+,D3cold+) Status: D0 NoSoftRst- PME-Enable- DSel=0 DScale=0 PME- Capabilities: [48] Express (v2) Root Port (Slot-), MSI 00 DevCap: MaxPayload 512 bytes, PhantFunc 0 ExtTag- RBE+ DevCtl: Report errors: Correctable- Non-Fatal- Fatal- Unsupported- RlxdOrd- ExtTag- PhantFunc- AuxPwr- NoSnoop- MaxPayload 256 bytes, MaxReadReq 128 bytes DevSta: CorrErr- UncorrErr- FatalErr- UnsuppReq- AuxPwr- TransPend- LnkCap: Port #0, Speed 8GT/s, Width x8, ASPM not supported, Exit Latency L0s <64ns, L1 <1us ClockPM- Surprise- LLActRep+ BwNot+ ASPMOptComp- LnkCtl: ASPM Disabled; RCB 128 bytes Disabled- CommClk- ExtSynch- ClockPM- AutWidDis- BWInt- AutBWInt- LnkSta: Speed 8GT/s, Width x4, TrErr- Train- SlotClk- DLActive+ BWMgmt- ABWMgmt+ RootCtl: ErrCorrectable- ErrNon-Fatal- ErrFatal- PMEIntEna- CRSVisible- RootCap: CRSVisible- RootSta: PME ReqID 0000, PMEStatus- PMEPending- DevCap2: Completion Timeout: Range ABCD, TimeoutDis+, LTR-, OBFF Not Supported ARIFwd+ DevCtl2: Completion Timeout: 16ms to 55ms, TimeoutDis+, LTR-, OBFF Disabled ARIFwd+ LnkCtl2: Target Link Speed: 8GT/s, EnterCompliance- SpeedDis- Transmit Margin: Normal Operating Range, EnterModifiedCompliance- ComplianceSOS- Compliance De-emphasis: -6dB LnkSta2: Current De-emphasis Level: -3.5dB, EqualizationComplete+, EqualizationPhase1+ EqualizationPhase2+, EqualizationPhase3+, LinkEqualizationRequest- Capabilities: [100 v1] Advanced Error Reporting UESta: DLP- SDES- TLP- FCP- CmpltTO- CmpltAbrt- UnxCmplt- RxOF- MalfTLP- ECRC- UnsupReq- ACSViol- UEMsk: DLP- SDES- TLP+ FCP- CmpltTO+ CmpltAbrt+ UnxCmplt- RxOF- MalfTLP- ECRC+ UnsupReq- ACSViol- UESvrt: DLP- SDES- TLP- FCP- CmpltTO- CmpltAbrt- UnxCmplt- RxOF- MalfTLP- ECRC- UnsupReq- ACSViol- CESta: RxErr- BadTLP- BadDLLP- Rollover- Timeout- NonFatalErr- CEMsk: RxErr- BadTLP- BadDLLP- Rollover- Timeout- NonFatalErr- AERCap: First Error Pointer: 00, GenCap+ CGenEn+ ChkCap+ ChkEn+ Capabilities: [148 v1] #19 Signed-off-by: Pingfan Liu --- drivers/pci/hotplug/shpchp_core.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c index 1f0f969..85b4665 100644 --- a/drivers/pci/hotplug/shpchp_core.c +++ b/drivers/pci/hotplug/shpchp_core.c @@ -336,6 +336,18 @@ static void shpc_remove(struct pci_dev *dev) kfree(ctrl); } +static int shpc_extra_match(struct pci_dev *pdev) +{ + /* do not claim pcie port device */ + if (pci_is_pcie(pdev) && + (pci_pcie_type(pdev) == PCI_EXP_TYPE_ROOT_PORT || + pci_pcie_type(pdev) == PCI_EXP_TYPE_UPSTREAM || + pci_pcie_type(pdev) == PCI_EXP_TYPE_DOWNSTREAM)) + return -ENODEV; + + return 0; +} + static const struct pci_device_id shpcd_pci_tbl[] = { {PCI_DEVICE_CLASS(((PCI_CLASS_BRIDGE_PCI << 8) | 0x00), ~0)}, { /* end: all zeroes */ } @@ -345,6 +357,7 @@ MODULE_DEVICE_TABLE(pci, shpcd_pci_tbl); static struct pci_driver shpc_driver = { .name = SHPC_MODULE_NAME, .id_table = shpcd_pci_tbl, + .extra_match = shpc_extra_match, .probe = shpc_probe, .remove = shpc_remove, };