From owner-svn-src-stable@FreeBSD.ORG  Thu Mar 18 18:45:45 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ECFEC106566C;
	Thu, 18 Mar 2010 18:45:45 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DAF988FC1F;
	Thu, 18 Mar 2010 18:45:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2IIjjq6005970;
	Thu, 18 Mar 2010 18:45:45 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2IIjjFt005968;
	Thu, 18 Mar 2010 18:45:45 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201003181845.o2IIjjFt005968@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Thu, 18 Mar 2010 18:45:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205287 - stable/7/sys/dev/pci
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Mar 2010 18:45:46 -0000

Author: yongari
Date: Thu Mar 18 18:45:45 2010
New Revision: 205287
URL: http://svn.freebsd.org/changeset/base/205287

Log:
  MFC r203355:
    Add more bit definitions to PCI express device control and device
    status register.

Modified:
  stable/7/sys/dev/pci/pcireg.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/pci/pcireg.h
==============================================================================
--- stable/7/sys/dev/pci/pcireg.h	Thu Mar 18 18:44:08 2010	(r205286)
+++ stable/7/sys/dev/pci/pcireg.h	Thu Mar 18 18:45:45 2010	(r205287)
@@ -605,9 +605,17 @@
 #define	PCIR_EXPRESS_DEVICE_CAP	0x4
 #define	PCIM_EXP_CAP_MAX_PAYLOAD	0x0007
 #define	PCIR_EXPRESS_DEVICE_CTL	0x8
+#define	PCIM_EXP_CTL_RELAXED_ORD_ENABLE	0x0010
 #define	PCIM_EXP_CTL_MAX_PAYLOAD	0x00e0
+#define	PCIM_EXP_CTL_NOSNOOP_ENABLE	0x0800
 #define	PCIM_EXP_CTL_MAX_READ_REQUEST	0x7000
 #define	PCIR_EXPRESS_DEVICE_STA	0xa
+#define	PCIM_EXP_STA_CORRECTABLE_ERROR	0x0001
+#define	PCIM_EXP_STA_NON_FATAL_ERROR	0x0002
+#define	PCIM_EXP_STA_FATAL_ERROR	0x0004
+#define	PCIM_EXP_STA_UNSUPPORTED_REQ	0x0008
+#define	PCIM_EXP_STA_AUX_POWER		0x0010
+#define	PCIM_EXP_STA_TRANSACTION_PND	0x0020
 #define	PCIR_EXPRESS_LINK_CAP	0xc
 #define	PCIM_LINK_CAP_MAX_SPEED		0x0000000f
 #define	PCIM_LINK_CAP_MAX_WIDTH		0x000003f0