From patchwork Tue Feb 5 03:55:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 218144 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 8BC852C02C7 for ; Tue, 5 Feb 2013 14:56:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755162Ab3BED4R (ORCPT ); Mon, 4 Feb 2013 22:56:17 -0500 Received: from szxga01-in.huawei.com ([119.145.14.64]:43841 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754584Ab3BED4Q (ORCPT ); Mon, 4 Feb 2013 22:56:16 -0500 Received: from 172.24.2.119 (EHLO szxeml214-edg.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.4-GA FastPath queued) with ESMTP id AXF90518; Tue, 05 Feb 2013 11:56:14 +0800 (CST) Received: from SZXEML457-HUB.china.huawei.com (10.82.67.200) by szxeml214-edg.china.huawei.com (172.24.2.29) with Microsoft SMTP Server (TLS) id 14.1.323.7; Tue, 5 Feb 2013 11:56:07 +0800 Received: from localhost (10.135.76.69) by szxeml457-hub.china.huawei.com (10.82.67.200) with Microsoft SMTP Server id 14.1.323.7; Tue, 5 Feb 2013 11:56:00 +0800 From: Yijing Wang To: Bjorn Helgaas , Jon Mason CC: , , Yijing Wang , Hanjun Guo , , Joe Jin , Yijing Wang Subject: [PATCH] PCI: update device mps when doing pci hotplug Date: Tue, 5 Feb 2013 11:55:20 +0800 Message-ID: <1360036520-31032-1-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.11.msysgit.1 MIME-Version: 1.0 X-Originating-IP: [10.135.76.69] X-CFilter-Loop: Reflected Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Currently we dont't update device's mps vaule when doing pci device hot-add. The hot-added device's mps will be set to default value (128B). But the upstream port device's mps may be larger than 128B which was set by firmware during system bootup. In this case the new added device may not work normally. The reference discussion at http://marc.info/?l=linux-pci&m=135420434508910&w=2 and http://marc.info/?l=linux-pci&m=134815603407842&w=2 Reported-by: Joe Jin Reported-by: Yijing Wang Signed-off-by: Yijing Wang Cc: Jon Mason --- drivers/pci/probe.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index bbe4be7..57d9a5b 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1556,6 +1556,52 @@ static int pcie_bus_configure_set(struct pci_dev *dev, void *data) return 0; } +static int pcie_bus_update_set(struct pci_dev *dev, void *data) +{ + int mps, p_mps; + + if (!pci_is_pcie(dev) || !dev->bus->self) + return 0; + + mps = pcie_get_mps(dev); + p_mps = pcie_get_mps(dev->bus->self); + + if (pci_pcie_type(dev->bus->self) != PCI_EXP_TYPE_ROOT_PORT) { + /* update mps when current device mps is not equal to upstream mps */ + if (mps != p_mps) + goto update; + } else { + /* update mps when current device mps is smaller than upstream mps */ + if (mps < p_mps) + goto update; + } + + return 0; + +update: + /* If current mpss is lager than upstream, use upstream mps to update + * current mps, otherwise print warning info. + */ + if ((128 << dev->pcie_mpss) >= p_mps) + pcie_write_mps(dev, p_mps); + else + dev_warn(&dev->dev, "MPS %d MPSS %d both smaller than upstream MPS %d\n" + "If necessary, use \"pci=pcie_bus_peer2peer\" boot parameter to avoid this problem\n", + mps, 128 << dev->pcie_mpss, p_mps); + return 0; +} + +static void pcie_bus_update_setting(struct pci_bus *bus) +{ + + /* + * After hot added a pci device, the device's mps will set to default + * vaule(128 bytes). But the upstream port mps may be larger than 128B. + * In this case, we should update this device's mps for better performance. + */ + pci_walk_bus(bus, pcie_bus_update_set, NULL); +} + /* pcie_bus_configure_settings requires that pci_walk_bus work in a top-down, * parents then children fashion. If this changes, then this code will not * work as designed. @@ -1566,6 +1612,9 @@ void pcie_bus_configure_settings(struct pci_bus *bus, u8 mpss) if (!pci_is_pcie(bus->self)) return; + + /* update mps setting for newly hot added device */ + pcie_bus_update_setting(bus); if (pcie_bus_config == PCIE_BUS_TUNE_OFF) return;