From owner-svn-src-all@FreeBSD.ORG Mon Sep 17 12:51:49 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1883C1065687; Mon, 17 Sep 2012 12:51:49 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 044098FC0A; Mon, 17 Sep 2012 12:51:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8HCpmpO017783; Mon, 17 Sep 2012 12:51:48 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8HCpmwT017781; Mon, 17 Sep 2012 12:51:48 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201209171251.q8HCpmwT017781@svn.freebsd.org> From: Gavin Atkinson Date: Mon, 17 Sep 2012 12:51:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240602 - head/sys/dev/pci X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Sep 2012 12:51:49 -0000 Author: gavin Date: Mon Sep 17 12:51:48 2012 New Revision: 240602 URL: http://svn.freebsd.org/changeset/base/240602 Log: - Add #defines for the bits within the iPCI Express PCIR_EXPRESS_LINK_CTL register - Add missing register PCIR_EXPRESS_ROOT_CAP - Correct a spelling mistake (SLAT -> SLOT) [1] Reviewed by: jhb [1] Modified: head/sys/dev/pci/pcireg.h Modified: head/sys/dev/pci/pcireg.h ============================================================================== --- head/sys/dev/pci/pcireg.h Mon Sep 17 11:39:28 2012 (r240601) +++ head/sys/dev/pci/pcireg.h Mon Sep 17 12:51:48 2012 (r240602) @@ -687,6 +687,19 @@ #define PCIM_LINK_CAP_ASPM_COMPLIANCE 0x00400000 #define PCIM_LINK_CAP_PORT 0xff000000 #define PCIR_EXPRESS_LINK_CTL 0x10 +#define PCIM_EXP_LINK_CTL_ASPMC_DIS 0x0000 +#define PCIM_EXP_LINK_CTL_ASPMC_L0S 0x0001 +#define PCIM_EXP_LINK_CTL_ASPMC_L1 0x0002 +#define PCIM_EXP_LINK_CTL_ASPMC 0x0003 +#define PCIM_EXP_LINK_CTL_RCB 0x0008 +#define PCIM_EXP_LINK_CTL_LINK_DIS 0x0010 +#define PCIM_EXP_LINK_CTL_RETRAIN_LINK 0x0020 +#define PCIM_EXP_LINK_CTL_COMMON_CLOCK 0x0040 +#define PCIM_EXP_LINK_CTL_EXTENDED_SYNC 0x0080 +#define PCIM_EXP_LINK_CTL_ECPM 0x0100 +#define PCIM_EXP_LINK_CTL_HAWD 0x0200 +#define PCIM_EXP_LINK_CTL_LBMIE 0x0400 +#define PCIM_EXP_LINK_CTL_LABIE 0x0800 #define PCIR_EXPRESS_LINK_STA 0x12 #define PCIM_LINK_STA_SPEED 0x000f #define PCIM_LINK_STA_WIDTH 0x03f0 @@ -732,6 +745,7 @@ #define PCIM_EXP_SLOT_STA_EIS 0x0080 #define PCIM_EXP_SLOT_STA_DLLSC 0x0100 #define PCIR_EXPRESS_ROOT_CTL 0x1c +#define PCIR_EXPRESS_ROOT_CAP 0x1e #define PCIR_EXPRESS_ROOT_STA 0x20 #define PCIR_EXPRESS_DEVICE_CAP2 0x24 #define PCIR_EXPRESS_DEVICE_CTL2 0x28 @@ -753,7 +767,7 @@ #define PCIR_EXPRESS_LINK_CAP2 0x2c #define PCIR_EXPRESS_LINK_CTL2 0x30 #define PCIR_EXPRESS_LINK_STA2 0x32 -#define PCIR_EXPRESS_SLAT_CAP2 0x34 +#define PCIR_EXPRESS_SLOT_CAP2 0x34 #define PCIR_EXPRESS_SLOT_CTL2 0x38 #define PCIR_EXPRESS_SLOT_STA2 0x3a