From patchwork Thu Oct 11 12:03:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 1581861 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 878A23FD9C for ; Thu, 11 Oct 2012 12:08:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751110Ab2JKMIt (ORCPT ); Thu, 11 Oct 2012 08:08:49 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:65272 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750924Ab2JKMIt (ORCPT ); Thu, 11 Oct 2012 08:08:49 -0400 Received: from 172.24.2.119 (EHLO szxeml206-edg.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.4-GA FastPath queued) with ESMTP id AQL27408; Thu, 11 Oct 2012 20:06:13 +0800 (CST) Received: from SZXEML407-HUB.china.huawei.com (10.82.67.94) by szxeml206-edg.china.huawei.com (172.24.2.59) with Microsoft SMTP Server (TLS) id 14.1.323.3; Thu, 11 Oct 2012 20:03:47 +0800 Received: from localhost (10.135.76.84) by szxeml407-hub.china.huawei.com (10.82.67.94) with Microsoft SMTP Server id 14.1.323.3; Thu, 11 Oct 2012 20:03:45 +0800 From: Yijing Wang To: Bjorn Helgaas , Jon Mason , Jon Mason CC: , Hanjun Guo , , Yijing Wang Subject: [PATCH V2] PCI: print pcie max_payload_size default setting info to help diagnosis Date: Thu, 11 Oct 2012 20:03:27 +0800 Message-ID: <1349957007-9920-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.84] X-CFilter-Loop: Reflected Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org PCIe device mps maybe not equal to its bridge mps after doing hotplug. This may result unexpected problem like http://marc.info/?l=linux-scsi&m=134788365823217&w=2. So add mps log for current mps setting to help diagnosis an issue like this. Signed-off-by: Yijing Wang --- drivers/pci/probe.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index ec909af..a31e615 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1533,6 +1533,33 @@ static void pcie_write_mrrs(struct pci_dev *dev) "with pci=pcie_bus_safe.\n"); } +static int pcie_mps_info(struct pci_dev *dev, void *data) +{ + int mps, mpss; + + if (!pci_is_pcie(dev)) + return -EINVAL; + + mps = pcie_get_mps(dev); + mpss = 128 << dev->pcie_mpss; + dev_printk(KERN_DEBUG, &dev->dev, "PCI-E Max_Payload_Size Supported %d, " + "Max_Payload_Size %d\n", mpss, mps); + + return 0; +} + +static void pcie_dump_mps_info(struct pci_bus *bus) +{ + int mps, mpss; + + mps = pcie_get_mps(bus->self); + mpss = 128 << bus->self->pcie_mpss; + dev_printk(KERN_DEBUG, &bus->self->dev, "PCI-E Max_Payload_Size Supported %d, " + "Max_Payload_Size %d\n", mpss, mps); + + pci_walk_bus(bus, pcie_mps_info, NULL); +} + static int pcie_bus_configure_set(struct pci_dev *dev, void *data) { int mps, orig_mps; @@ -1564,6 +1591,8 @@ void pcie_bus_configure_settings(struct pci_bus *bus, u8 mpss) if (!pci_is_pcie(bus->self)) return; + pcie_dump_mps_info(bus); + if (pcie_bus_config == PCIE_BUS_TUNE_OFF) return;