From patchwork Mon Sep 9 23:14:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 273721 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 380662C0117 for ; Tue, 10 Sep 2013 09:14:12 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755602Ab3IIXOK (ORCPT ); Mon, 9 Sep 2013 19:14:10 -0400 Received: from mail-yh0-f48.google.com ([209.85.213.48]:46511 "EHLO mail-yh0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755528Ab3IIXOK (ORCPT ); Mon, 9 Sep 2013 19:14:10 -0400 Received: by mail-yh0-f48.google.com with SMTP id f10so2588003yha.35 for ; Mon, 09 Sep 2013 16:14:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=kBxlUMIq8ljURM8Xr6TfZkelAEUNJSoYmVOry/8h5F8=; b=SnfPU+aehjDxgpcv/2ikDkHLYsOOAGu872vJsFTm2zJ6fFasDcf3wtWOHkl96mTraI POVU4aGxJy3gh1CAGJwh/04N8o4FPi08oqSMl+X+FZOuBqJZq0/GihD/FyGnvJZ7hGkC egD/c7GzfcFjXHtY+wCvjmaVrE3E230w8LOFVQT4ycDhcn5GJ8N/PXiyqNQJc7t9UfNC tT7QBy0zhJzRCRq3nKYh+2YuKb01RE7mxquQtJZzRBn3f5g5tBYSmOoLWRSqEuiPMvJT DuHajqjeR+u1J+9TpgK1FABd4y5aI53HdZIMfDRwRWwNmHxvX/+Zr67RB/gW7ZWwJZa2 +oYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=kBxlUMIq8ljURM8Xr6TfZkelAEUNJSoYmVOry/8h5F8=; b=R0EHGqliIlEpuxvZ411PcgC39auLdMH25GcBxtMaAxR0bhlp1YPvUivpiW5y0xrDMp VBByIF8dqrhE6r6pdiDU1GapMe0RbfMrD3eh3RMZhHqd0rypGKXbPZw4PrWWSMnhFa99 6SAZeXb76HebFiM9cTZqRfVlU9s+48trswafLLzbr6n/RTako/IxD0Y3HAIVLG9ZIXTN 4VGYzZfrDltyFABjLMZP+prQP70XPb9r7fXfq2hvQGh4nx1Ha2wCSeQsMB+XQPN3FWCJ 1JSaqZW1kMQ0LmdPni86q4xex2tF0ELPlQQ1gYhsjyfgOFpnvcLq8qXBLb99J4IIv2PF nSlA== X-Gm-Message-State: ALoCoQmjMOOYbltbebjIeeOGfZbuQqBD4lNwOt3T0VV0LxD2HlXtb4P3qLRhFot+tt06s6eiINnyxjeTgnNPwKOgyX8A8zvUhWjXXRjkMDamxiCK52unrwKk7PqXnr6P4MKdgS69tRS1Q1rEVIPfu05DiB/chzqvREmUpl4U5km7AZWaNZj0E8HyNM3Rxhn5AWiSeMmOJenehf49JLFodS4qmQn7aoeOow== X-Received: by 10.236.117.106 with SMTP id i70mr7958382yhh.29.1378768449442; Mon, 09 Sep 2013 16:14:09 -0700 (PDT) Received: from localhost ([172.16.51.73]) by mx.google.com with ESMTPSA id z48sm20695726yha.19.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 09 Sep 2013 16:14:09 -0700 (PDT) Subject: [PATCH 4/7] lspci: Clarify "PCIe-to-PCI/PCI-X" desc and Bridge Retry Config Enable To: Martin Mares From: Bjorn Helgaas Cc: linux-pci@vger.kernel.org Date: Mon, 09 Sep 2013 17:14:07 -0600 Message-ID: <20130909231407.30095.68310.stgit@bhelgaas-glaptop> In-Reply-To: <20130909231345.30095.61638.stgit@bhelgaas-glaptop> References: <20130909231345.30095.61638.stgit@bhelgaas-glaptop> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The PCI_EXP_TYPE_PCI_BRIDGE type is a PCIe to PCI/PCI-X bridge, so be a bit more complete in the comment and printed device type. Also, per PCIe spec r3.0, Table 7-14, the PCIe Device Control "Bridge Configuration Retry Enable" bit only applies to PCIe-to-PCI/PCI-X bridges; it does not apply to PCI-to-PCIe bridges. Signed-off-by: Bjorn Helgaas --- lib/header.h | 4 ++-- ls-caps.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/lib/header.h b/lib/header.h index 6608003..cb63d40 100644 --- a/lib/header.h +++ b/lib/header.h @@ -728,8 +728,8 @@ #define PCI_EXP_TYPE_ROOT_PORT 0x4 /* Root Port */ #define PCI_EXP_TYPE_UPSTREAM 0x5 /* Upstream Port */ #define PCI_EXP_TYPE_DOWNSTREAM 0x6 /* Downstream Port */ -#define PCI_EXP_TYPE_PCI_BRIDGE 0x7 /* PCI/PCI-X Bridge */ -#define PCI_EXP_TYPE_PCIE_BRIDGE 0x8 /* PCI/PCI-X to PCIE Bridge */ +#define PCI_EXP_TYPE_PCI_BRIDGE 0x7 /* PCIe to PCI/PCI-X Bridge */ +#define PCI_EXP_TYPE_PCIE_BRIDGE 0x8 /* PCI/PCI-X to PCIe Bridge */ #define PCI_EXP_TYPE_ROOT_INT_EP 0x9 /* Root Complex Integrated Endpoint */ #define PCI_EXP_TYPE_ROOT_EC 0xa /* Root Complex Event Collector */ #define PCI_EXP_FLAGS_SLOT 0x0100 /* Slot implemented */ diff --git a/ls-caps.c b/ls-caps.c index 7621010..de0d79e 100644 --- a/ls-caps.c +++ b/ls-caps.c @@ -696,7 +696,7 @@ static void cap_express_dev(struct device *d, int where, int type) FLAG(w, PCI_EXP_DEVCTL_PHANTOM), FLAG(w, PCI_EXP_DEVCTL_AUX_PME), FLAG(w, PCI_EXP_DEVCTL_NOSNOOP)); - if (type == PCI_EXP_TYPE_PCI_BRIDGE || type == PCI_EXP_TYPE_PCIE_BRIDGE) + if (type == PCI_EXP_TYPE_PCI_BRIDGE) printf(" BrConfRtry%c", FLAG(w, PCI_EXP_DEVCTL_BCRE)); if (((type == PCI_EXP_TYPE_ENDPOINT) || (type == PCI_EXP_TYPE_LEG_END)) && (t & PCI_EXP_DEVCAP_FLRESET)) @@ -1105,7 +1105,7 @@ cap_express(struct device *d, int where, int cap) printf("Downstream Port (Slot%c)", FLAG(cap, PCI_EXP_FLAGS_SLOT)); break; case PCI_EXP_TYPE_PCI_BRIDGE: - printf("PCI/PCI-X Bridge"); + printf("PCI-Express to PCI/PCI-X Bridge"); break; case PCI_EXP_TYPE_PCIE_BRIDGE: printf("PCI/PCI-X to PCI-Express Bridge");