Date: Thu, 9 Sep 2010 13:10:55 -0700 From: mdf@FreeBSD.org To: John Baldwin <jhb@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r212368 - head/sys/dev/pci Message-ID: <AANLkTikx=cDTnxseNTpLYeq2urwsc393E-FSDzKHmHEe@mail.gmail.com> In-Reply-To: <201009091819.o89IJGLr015797@svn.freebsd.org> References: <201009091819.o89IJGLr015797@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Sep 9, 2010 at 11:19 AM, John Baldwin <jhb@freebsd.org> wrote: > Author: jhb > Date: Thu Sep =A09 18:19:15 2010 > New Revision: 212368 > URL: http://svn.freebsd.org/changeset/base/212368 > > Log: > =A0- Rename the constant for the Master Data Parity Error flag in the > =A0 =A0PCI status register to map its current name. > =A0- Use PCIM_* rather than PCIR_* for constants for fields in various AE= R > =A0 =A0registers. =A0I got about half of them right in the previous commi= t. > > =A0MFC after: =A0 =A01 week > > Modified: > =A0head/sys/dev/pci/pcireg.h This seems to break building CURRENT with this error: /data/sb/bsd.git/sys/dev/msk/if_msk.c: In function 'mskc_reset': /data/sb/bsd.git/sys/dev/msk/if_msk.c:1337: error: 'PCIM_STATUS_PERRREPORT' undeclared (first use in this function) /data/sb/bsd.git/sys/dev/msk/if_msk.c:1337: error: (Each undeclared identifier is reported only once /data/sb/bsd.git/sys/dev/msk/if_msk.c:1337: error: for each function it appears in.) /data/sb/bsd.git/sys/dev/msk/if_msk.c: In function 'msk_intr_hwerr': /data/sb/bsd.git/sys/dev/msk/if_msk.c:3408: error: 'PCIM_STATUS_PERRREPORT' undeclared (first use in this function) Thanks, matthew > > Modified: head/sys/dev/pci/pcireg.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/dev/pci/pcireg.h =A0 Thu Sep =A09 17:49:18 2010 =A0 =A0 =A0 = =A0(r212367) > +++ head/sys/dev/pci/pcireg.h =A0 Thu Sep =A09 18:19:15 2010 =A0 =A0 =A0 = =A0(r212368) > @@ -67,7 +67,7 @@ > =A0#define =A0 =A0 =A0 =A0PCIM_STATUS_CAPPRESENT =A00x0010 > =A0#define =A0 =A0 =A0 =A0PCIM_STATUS_66CAPABLE =A0 0x0020 > =A0#define =A0 =A0 =A0 =A0PCIM_STATUS_BACKTOBACK =A00x0080 > -#define =A0 =A0 =A0 =A0PCIM_STATUS_PERRREPORT =A00x0100 > +#define =A0 =A0 =A0 =A0PCIM_STATUS_MDPERR =A0 =A0 =A00x0100 > =A0#define =A0 =A0 =A0 =A0PCIM_STATUS_SEL_FAST =A0 =A00x0000 > =A0#define =A0 =A0 =A0 =A0PCIM_STATUS_SEL_MEDIMUM 0x0200 > =A0#define =A0 =A0 =A0 =A0PCIM_STATUS_SEL_SLOW =A0 =A00x0400 > @@ -689,18 +689,18 @@ > > =A0/* Advanced Error Reporting */ > =A0#define =A0 =A0 =A0 =A0PCIR_AER_UC_STATUS =A0 =A0 =A00x04 > -#define =A0 =A0 =A0 =A0PCIR_AER_UC_TRAINING_ERROR =A0 =A0 =A00x00000001 > -#define =A0 =A0 =A0 =A0PCIR_AER_UC_DL_PROTOCOL_ERROR =A0 0x00000010 > -#define =A0 =A0 =A0 =A0PCIR_AER_UC_POISONED_TLP =A0 =A0 =A0 =A00x0000100= 0 > -#define =A0 =A0 =A0 =A0PCIR_AER_UC_FC_PROTOCOL_ERROR =A0 0x00002000 > -#define =A0 =A0 =A0 =A0PCIR_AER_UC_COMPLETION_TIMEOUT =A00x00004000 > -#define =A0 =A0 =A0 =A0PCIR_AER_UC_COMPLETER_ABORT =A0 =A0 0x00008000 > -#define =A0 =A0 =A0 =A0PCIR_AER_UC_UNEXPECTED_COMPLETION 0x00010000 > -#define =A0 =A0 =A0 =A0PCIR_AER_UC_RECEIVER_OVERFLOW =A0 0x00020000 > -#define =A0 =A0 =A0 =A0PCIR_AER_UC_MALFORMED_TLP =A0 =A0 =A0 0x00040000 > -#define =A0 =A0 =A0 =A0PCIR_AER_UC_ECRC_ERROR =A0 =A0 =A0 =A0 =A00x00080= 000 > -#define =A0 =A0 =A0 =A0PCIR_AER_UC_UNSUPPORTED_REQUEST 0x00100000 > -#define =A0 =A0 =A0 =A0PCIR_AER_UC_ACS_VIOLATION =A0 =A0 =A0 0x00200000 > +#define =A0 =A0 =A0 =A0PCIM_AER_UC_TRAINING_ERROR =A0 =A0 =A00x00000001 > +#define =A0 =A0 =A0 =A0PCIM_AER_UC_DL_PROTOCOL_ERROR =A0 0x00000010 > +#define =A0 =A0 =A0 =A0PCIM_AER_UC_POISONED_TLP =A0 =A0 =A0 =A00x0000100= 0 > +#define =A0 =A0 =A0 =A0PCIM_AER_UC_FC_PROTOCOL_ERROR =A0 0x00002000 > +#define =A0 =A0 =A0 =A0PCIM_AER_UC_COMPLETION_TIMEOUT =A00x00004000 > +#define =A0 =A0 =A0 =A0PCIM_AER_UC_COMPLETER_ABORT =A0 =A0 0x00008000 > +#define =A0 =A0 =A0 =A0PCIM_AER_UC_UNEXPECTED_COMPLETION 0x00010000 > +#define =A0 =A0 =A0 =A0PCIM_AER_UC_RECEIVER_OVERFLOW =A0 0x00020000 > +#define =A0 =A0 =A0 =A0PCIM_AER_UC_MALFORMED_TLP =A0 =A0 =A0 0x00040000 > +#define =A0 =A0 =A0 =A0PCIM_AER_UC_ECRC_ERROR =A0 =A0 =A0 =A0 =A00x00080= 000 > +#define =A0 =A0 =A0 =A0PCIM_AER_UC_UNSUPPORTED_REQUEST 0x00100000 > +#define =A0 =A0 =A0 =A0PCIM_AER_UC_ACS_VIOLATION =A0 =A0 =A0 0x00200000 > =A0#define =A0 =A0 =A0 =A0PCIR_AER_UC_MASK =A0 =A0 =A0 =A00x08 =A0 =A0/* = Shares bits with UC_STATUS */ > =A0#define =A0 =A0 =A0 =A0PCIR_AER_UC_SEVERITY =A0 =A00x0c =A0 =A0/* Shar= es bits with UC_STATUS */ > =A0#define =A0 =A0 =A0 =A0PCIR_AER_COR_STATUS =A0 =A0 0x10 > @@ -718,18 +718,18 @@ > =A0#define =A0 =A0 =A0 =A0PCIM_AER_ECRC_CHECK_ENABLE =A0 =A0 =A00x0000010= 0 > =A0#define =A0 =A0 =A0 =A0PCIR_AER_HEADER_LOG =A0 =A0 0x1c > =A0#define =A0 =A0 =A0 =A0PCIR_AER_ROOTERR_CMD =A0 =A00x2c =A0 =A0/* Only= for root complex ports */ > -#define =A0 =A0 =A0 =A0PCIR_AER_ROOTERR_COR_ENABLE =A0 =A0 0x00000001 > -#define =A0 =A0 =A0 =A0PCIR_AER_ROOTERR_NF_ENABLE =A0 =A0 =A00x00000002 > -#define =A0 =A0 =A0 =A0PCIR_AER_ROOTERR_F_ENABLE =A0 =A0 =A0 0x00000004 > +#define =A0 =A0 =A0 =A0PCIM_AER_ROOTERR_COR_ENABLE =A0 =A0 0x00000001 > +#define =A0 =A0 =A0 =A0PCIM_AER_ROOTERR_NF_ENABLE =A0 =A0 =A00x00000002 > +#define =A0 =A0 =A0 =A0PCIM_AER_ROOTERR_F_ENABLE =A0 =A0 =A0 0x00000004 > =A0#define =A0 =A0 =A0 =A0PCIR_AER_ROOTERR_STATUS 0x30 =A0 =A0/* Only for= root complex ports */ > -#define =A0 =A0 =A0 =A0PCIR_AER_ROOTERR_COR_ERR =A0 =A0 =A0 =A00x0000000= 1 > -#define =A0 =A0 =A0 =A0PCIR_AER_ROOTERR_MULTI_COR_ERR =A00x00000002 > -#define =A0 =A0 =A0 =A0PCIR_AER_ROOTERR_UC_ERR =A0 =A0 =A0 =A0 0x0000000= 4 > -#define =A0 =A0 =A0 =A0PCIR_AER_ROOTERR_MULTI_UC_ERR =A0 0x00000008 > -#define =A0 =A0 =A0 =A0PCIR_AER_ROOTERR_FIRST_UC_FATAL 0x00000010 > -#define =A0 =A0 =A0 =A0PCIR_AER_ROOTERR_NF_ERR =A0 =A0 =A0 =A0 0x0000002= 0 > -#define =A0 =A0 =A0 =A0PCIR_AER_ROOTERR_F_ERR =A0 =A0 =A0 =A0 =A00x00000= 040 > -#define =A0 =A0 =A0 =A0PCIR_AER_ROOTERR_INT_MESSAGE =A0 =A00xf8000000 > +#define =A0 =A0 =A0 =A0PCIM_AER_ROOTERR_COR_ERR =A0 =A0 =A0 =A00x0000000= 1 > +#define =A0 =A0 =A0 =A0PCIM_AER_ROOTERR_MULTI_COR_ERR =A00x00000002 > +#define =A0 =A0 =A0 =A0PCIM_AER_ROOTERR_UC_ERR =A0 =A0 =A0 =A0 0x0000000= 4 > +#define =A0 =A0 =A0 =A0PCIM_AER_ROOTERR_MULTI_UC_ERR =A0 0x00000008 > +#define =A0 =A0 =A0 =A0PCIM_AER_ROOTERR_FIRST_UC_FATAL 0x00000010 > +#define =A0 =A0 =A0 =A0PCIM_AER_ROOTERR_NF_ERR =A0 =A0 =A0 =A0 0x0000002= 0 > +#define =A0 =A0 =A0 =A0PCIM_AER_ROOTERR_F_ERR =A0 =A0 =A0 =A0 =A00x00000= 040 > +#define =A0 =A0 =A0 =A0PCIM_AER_ROOTERR_INT_MESSAGE =A0 =A00xf8000000 > =A0#define =A0 =A0 =A0 =A0PCIR_AER_COR_SOURCE_ID =A00x34 =A0 =A0/* Only f= or root complex ports */ > =A0#define =A0 =A0 =A0 =A0PCIR_AER_ERR_SOURCE_ID =A00x36 =A0 =A0/* Only f= or root complex ports */ > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTikx=cDTnxseNTpLYeq2urwsc393E-FSDzKHmHEe>