Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 9 Jan 2012 20:08:57 +0000 (UTC)
From:      Pyun YongHyeon <yongari@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r229878 - in stable/7/sys: dev/msk sparc64/pci
Message-ID:  <201201092008.q09K8vE3056584@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: yongari
Date: Mon Jan  9 20:08:57 2012
New Revision: 229878
URL: http://svn.freebsd.org/changeset/base/229878

Log:
  MFC r212378:
    Catch up to rename of the constant for the Master Data Parity Error bit in
    the PCI status register.

Modified:
  stable/7/sys/dev/msk/if_msk.c
  stable/7/sys/sparc64/pci/schizo.c
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/msk/if_msk.c
==============================================================================
--- stable/7/sys/dev/msk/if_msk.c	Mon Jan  9 20:07:38 2012	(r229877)
+++ stable/7/sys/dev/msk/if_msk.c	Mon Jan  9 20:08:57 2012	(r229878)
@@ -1392,7 +1392,7 @@ mskc_reset(struct msk_softc *sc)
 
 	pci_write_config(sc->msk_dev, PCIR_STATUS, status |
 	    PCIM_STATUS_PERR | PCIM_STATUS_SERR | PCIM_STATUS_RMABORT |
-	    PCIM_STATUS_RTABORT | PCIM_STATUS_PERRREPORT, 2);
+	    PCIM_STATUS_RTABORT | PCIM_STATUS_MDPERR, 2);
 	CSR_WRITE_2(sc, B0_CTST, CS_MRST_CLR);
 
 	switch (sc->msk_bustype) {
@@ -3518,7 +3518,7 @@ msk_intr_hwerr(struct msk_softc *sc)
 		CSR_WRITE_1(sc, B2_TST_CTRL1, TST_CFG_WRITE_ON);
 		pci_write_config(sc->msk_dev, PCIR_STATUS, v16 |
 		    PCIM_STATUS_PERR | PCIM_STATUS_SERR | PCIM_STATUS_RMABORT |
-		    PCIM_STATUS_RTABORT | PCIM_STATUS_PERRREPORT, 2);
+		    PCIM_STATUS_RTABORT | PCIM_STATUS_MDPERR, 2);
 		CSR_WRITE_1(sc, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
 	}
 

Modified: stable/7/sys/sparc64/pci/schizo.c
==============================================================================
--- stable/7/sys/sparc64/pci/schizo.c	Mon Jan  9 20:07:38 2012	(r229877)
+++ stable/7/sys/sparc64/pci/schizo.c	Mon Jan  9 20:08:57 2012	(r229878)
@@ -882,7 +882,7 @@ schizo_pci_bus(void *arg)
 		fatal = 1;
 	if ((status & (PCIM_STATUS_PERR | PCIM_STATUS_SERR |
 	    PCIM_STATUS_RMABORT | PCIM_STATUS_RTABORT |
-	    PCIM_STATUS_PERRREPORT)) != 0 ||
+	    PCIM_STATUS_MDPERR)) != 0 ||
 	    (csr & (SCZ_PCI_CTRL_BUS_UNUS | TOM_PCI_CTRL_DTO_ERR |
 	    STX_PCI_CTRL_TTO_ERR | STX_PCI_CTRL_RTRY_ERR |
 	    SCZ_PCI_CTRL_SBH_ERR | STX_PCI_CTRL_SERR)) != 0 ||

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201092008.q09K8vE3056584>