From patchwork Tue Jun 12 06:42:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pingfan Liu X-Patchwork-Id: 10459417 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B2DBE60532 for ; Tue, 12 Jun 2018 06:42:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A47AC28669 for ; Tue, 12 Jun 2018 06:42:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 982BF28672; Tue, 12 Jun 2018 06:42:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0E04028671 for ; Tue, 12 Jun 2018 06:42:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932663AbeFLGmZ (ORCPT ); Tue, 12 Jun 2018 02:42:25 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:42630 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932639AbeFLGmY (ORCPT ); Tue, 12 Jun 2018 02:42:24 -0400 Received: by mail-pg0-f67.google.com with SMTP id c10-v6so5351687pgu.9 for ; Mon, 11 Jun 2018 23:42:23 -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; bh=Okj70sjgnGHsIND35uFx9i5oO0z/MxiBAQEwh+RvjSM=; b=MQQ1C/lvPUFUIQ5xq1jc3a8oG5pxFL5N5CKZS4iKrbis16WhUvFRoJG2QjuXfjtBIH bwDgq387TwaK54mInoPpSQnYXnvPhl5jGV9OrrjUfWOputPSR8Tv5ugwS41bC6RKNYe0 +EIbWFKUp/VjJQeaSgMFBx8pmc0nepVL+0gYMk+8xgDKoxXnPDMf0mOgU79yQySNSSsG TIqMySnmLM8cRATcwczjIFTT8lrjZinI8J8Kx1KKnR9JsJFx7Nlz4wjN2D4uH+F6PDIu Y4OKKKoA9qmvJT8YXG9Wuhkk1dG2laI5GdYQWVOcXx2dvZebw+gHEEbuSnLQJCNZngKS pEsg== 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; bh=Okj70sjgnGHsIND35uFx9i5oO0z/MxiBAQEwh+RvjSM=; b=Q35OMZAh/sOdCLRYogoYhcYyTYBlh165Rg81JnZ2Slis9hWRHz8AcdMkY5uLqtgPw5 8z71bwN+DU8Y8oY7x/VKXx3WXgdfuyTUucSSJpzaE09xLqU6ZqwlSY43xBRQyx4+v9Lk 3ujyrWrU1Guxqyvt6WnxSPrcHX5oRlHKp8o9o30xeGT4l81oXJ9UF4HP0cQ1GY6SWtRP AzRb9NVG7XBaQP1AtxXiNsm6qKGrXqyeP3ajLikuu3RbChVsUAbE3T6NPqiFIpx5FR5s xKtmEuv9/9sV2lySZxPJrAFT6kStMWEqGCw4x1pZG5eQU0p2tEq6vU+er8Z3cN5OlknQ nfRQ== X-Gm-Message-State: APt69E11N578U0ktiK7t1pj2a+R4/SrBPIUSU4+4vqsz7GtsIY8l5qhr PwoaX/qDwuV7AHwZqoABv5Tk X-Google-Smtp-Source: ADUXVKKu85Oc8w8791FvCvrndnmaxtePyc7jT8qxr+XGqC8k1qcVNT9oaiknwmq1D4PwNYEXow3dVg== X-Received: by 2002:a63:a312:: with SMTP id s18-v6mr2015355pge.187.1528785743538; Mon, 11 Jun 2018 23:42:23 -0700 (PDT) Received: from mylaptop.nay.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id n70-v6sm656952pfh.140.2018.06.11.23.42.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Jun 2018 23:42:22 -0700 (PDT) From: Pingfan Liu To: linux-pci@vger.kernel.org Cc: Bjorn Helgaas , linuxppc-dev@lists.ozlabs.org Subject: [PATCH] pci/shpchp: no claim on pcie port device Date: Tue, 12 Jun 2018 14:42:13 +0800 Message-Id: <1528785733-19442-1-git-send-email-kernelfans@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. This causes a few problems, one is the wrong shutdown seq of devices, owing to the broken devices_kset. 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. Note 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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c index 1f0f969..2cd8e19 100644 --- a/drivers/pci/hotplug/shpchp_core.c +++ b/drivers/pci/hotplug/shpchp_core.c @@ -287,6 +287,13 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) int rc; struct controller *ctrl; + /* do not claim pcie port device */ + if (pci_is_pcie(dev) && + ((pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT) || + (pci_pcie_type(dev) == PCI_EXP_TYPE_UPSTREAM) || + (pci_pcie_type(dev) == PCI_EXP_TYPE_DOWNSTREAM))) + return -ENODEV; + if (!is_shpc_capable(pdev)) return -ENODEV;