From owner-svn-src-stable-8@FreeBSD.ORG Wed Jul 24 22:26:59 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1849DF7B; Wed, 24 Jul 2013 22:26:59 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EA0392F66; Wed, 24 Jul 2013 22:26:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6OMQwNI045455; Wed, 24 Jul 2013 22:26:58 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6OMQwLY045454; Wed, 24 Jul 2013 22:26:58 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201307242226.r6OMQwLY045454@svn.freebsd.org> From: Jung-uk Kim Date: Wed, 24 Jul 2013 22:26:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r253623 - stable/8/usr.sbin/pciconf X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jul 2013 22:26:59 -0000 Author: jkim Date: Wed Jul 24 22:26:58 2013 New Revision: 253623 URL: http://svnweb.freebsd.org/changeset/base/253623 Log: MFC: r253455 Decode PCIe ASPM capability and status. Modified: stable/8/usr.sbin/pciconf/cap.c Directory Properties: stable/8/usr.sbin/pciconf/ (props changed) Modified: stable/8/usr.sbin/pciconf/cap.c ============================================================================== --- stable/8/usr.sbin/pciconf/cap.c Wed Jul 24 22:26:11 2013 (r253622) +++ stable/8/usr.sbin/pciconf/cap.c Wed Jul 24 22:26:58 2013 (r253623) @@ -391,11 +391,27 @@ link_speed_string(uint8_t speed) } } +static const char * +aspm_string(uint8_t aspm) +{ + + switch (aspm) { + case 1: + return ("L0s"); + case 2: + return ("L1"); + case 3: + return ("L0s/L1"); + default: + return ("disabled"); + } +} + static void cap_express(int fd, struct pci_conf *p, uint8_t ptr) { - uint32_t val; - uint16_t flags; + uint32_t cap; + uint16_t ctl, flags, sta; flags = read_config(fd, &p->pc_sel, ptr + PCIER_FLAGS, 2); printf("PCI-Express %d ", flags & PCIEM_FLAGS_VERSION); @@ -435,26 +451,28 @@ cap_express(int fd, struct pci_conf *p, printf(" slot"); if (flags & PCIEM_FLAGS_IRQ) printf(" IRQ %d", (flags & PCIEM_FLAGS_IRQ) >> 9); - val = read_config(fd, &p->pc_sel, ptr + PCIER_DEVICE_CAP, 4); - flags = read_config(fd, &p->pc_sel, ptr + PCIER_DEVICE_CTL, 2); + cap = read_config(fd, &p->pc_sel, ptr + PCIER_DEVICE_CAP, 4); + ctl = read_config(fd, &p->pc_sel, ptr + PCIER_DEVICE_CTL, 2); printf(" max data %d(%d)", - MAX_PAYLOAD((flags & PCIEM_CTL_MAX_PAYLOAD) >> 5), - MAX_PAYLOAD(val & PCIEM_CAP_MAX_PAYLOAD)); - if (val & PCIEM_CAP_FLR) + MAX_PAYLOAD((ctl & PCIEM_CTL_MAX_PAYLOAD) >> 5), + MAX_PAYLOAD(cap & PCIEM_CAP_MAX_PAYLOAD)); + if ((cap & PCIEM_CAP_FLR) != 0) printf(" FLR"); - val = read_config(fd, &p->pc_sel, ptr + PCIER_LINK_CAP, 4); - flags = read_config(fd, &p->pc_sel, ptr+ PCIER_LINK_STA, 2); - printf(" link x%d(x%d)", (flags & PCIEM_LINK_STA_WIDTH) >> 4, - (val & PCIEM_LINK_CAP_MAX_WIDTH) >> 4); - /* - * Only print link speed info if the link's max width is - * greater than 0. - */ - if ((val & PCIEM_LINK_CAP_MAX_WIDTH) != 0) { - printf("\n speed"); - printf(" %s(%s)", (flags & PCIEM_LINK_STA_WIDTH) == 0 ? - "0.0" : link_speed_string(flags & PCIEM_LINK_STA_SPEED), - link_speed_string(val & PCIEM_LINK_CAP_MAX_SPEED)); + cap = read_config(fd, &p->pc_sel, ptr + PCIER_LINK_CAP, 4); + sta = read_config(fd, &p->pc_sel, ptr + PCIER_LINK_STA, 2); + printf(" link x%d(x%d)", (sta & PCIEM_LINK_STA_WIDTH) >> 4, + (cap & PCIEM_LINK_CAP_MAX_WIDTH) >> 4); + if ((cap & (PCIEM_LINK_CAP_MAX_WIDTH | PCIEM_LINK_CAP_ASPM)) != 0) + printf("\n "); + if ((cap & PCIEM_LINK_CAP_MAX_WIDTH) != 0) { + printf(" speed %s(%s)", (sta & PCIEM_LINK_STA_WIDTH) == 0 ? + "0.0" : link_speed_string(sta & PCIEM_LINK_STA_SPEED), + link_speed_string(cap & PCIEM_LINK_CAP_MAX_SPEED)); + } + if ((cap & PCIEM_LINK_CAP_ASPM) != 0) { + ctl = read_config(fd, &p->pc_sel, ptr + PCIER_LINK_CTL, 2); + printf(" ASPM %s(%s)", aspm_string(ctl & PCIEM_LINK_CTL_ASPMC), + aspm_string((cap & PCIEM_LINK_CAP_ASPM) >> 10)); } }