Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Delete "PCI_" from PCIX and PICE capability registers.
details: https://anonhg.NetBSD.org/src/rev/014704281ad0
branches: trunk
changeset: 786247:014704281ad0
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Sun Apr 21 19:59:39 2013 +0000
description:
Delete "PCI_" from PCIX and PICE capability registers.
diffstat:
sys/arch/arm/broadcom/bcm53xx_pax.c | 12 +-
sys/dev/pci/ahd_pci.c | 8 +-
sys/dev/pci/if_alc.c | 10 +-
sys/dev/pci/if_athn_pci.c | 10 +-
sys/dev/pci/if_bge.c | 26 +-
sys/dev/pci/if_bgereg.h | 6 +-
sys/dev/pci/if_iwn.c | 12 +-
sys/dev/pci/if_wm.c | 28 +-
sys/dev/pci/if_wmreg.h | 4 +-
sys/dev/pci/pci_subr.c | 210 ++++++++++----------
sys/dev/pci/pcireg.h | 368 ++++++++++++++++++------------------
sys/dev/pci/ppb.c | 52 ++--
12 files changed, 373 insertions(+), 373 deletions(-)
diffs (truncated from 1295 to 300 lines):
diff -r 04ca7d154f2b -r 014704281ad0 sys/arch/arm/broadcom/bcm53xx_pax.c
--- a/sys/arch/arm/broadcom/bcm53xx_pax.c Sun Apr 21 19:34:13 2013 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_pax.c Sun Apr 21 19:59:39 2013 +0000
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_pax.c,v 1.9 2013/02/19 02:15:18 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_pax.c,v 1.10 2013/04/21 19:59:39 msaitoh Exp $");
#include <sys/bus.h>
#include <sys/device.h>
@@ -299,21 +299,21 @@
* This will force the device to negotiate to a max of gen1.
*/
if (cf->cf_flags & 1) {
- bcmpax_conf_write(sc, 0, offset + PCI_PCIE_LCSR2, 1);
+ bcmpax_conf_write(sc, 0, offset + PCIE_LCSR2, 1);
}
/*
* Now we wait (.25 sec) for the link to come up.
*/
- offset += PCI_PCIE_LCSR;
+ offset += PCIE_LCSR;
for (size_t timo = 0;; timo++) {
const pcireg_t lcsr = bcmpax_conf_read(sc, 0, offset);
- sc->sc_linkup = __SHIFTOUT(lcsr, PCI_PCIE_LCSR_NLW) != 0
- && (1 || (lcsr & PCI_PCIE_LCSR_DLACTIVE) != 0);
+ sc->sc_linkup = __SHIFTOUT(lcsr, PCIE_LCSR_NLW) != 0
+ && (1 || (lcsr & PCIE_LCSR_DLACTIVE) != 0);
if (sc->sc_linkup || timo == 250) {
aprint_debug_dev(self,
"lcsr=%#x nlw=%jd linkup=%d, timo=%zu\n",
- lcsr, __SHIFTOUT(lcsr, PCI_PCIE_LCSR_NLW),
+ lcsr, __SHIFTOUT(lcsr, PCIE_LCSR_NLW),
sc->sc_linkup, timo);
break;
}
diff -r 04ca7d154f2b -r 014704281ad0 sys/dev/pci/ahd_pci.c
--- a/sys/dev/pci/ahd_pci.c Sun Apr 21 19:34:13 2013 +0000
+++ b/sys/dev/pci/ahd_pci.c Sun Apr 21 19:59:39 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ahd_pci.c,v 1.33 2011/12/30 18:20:46 christos Exp $ */
+/* $NetBSD: ahd_pci.c,v 1.34 2013/04/21 19:59:40 msaitoh Exp $ */
/*
* Product specific probe and attach routines for:
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahd_pci.c,v 1.33 2011/12/30 18:20:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahd_pci.c,v 1.34 2013/04/21 19:59:40 msaitoh Exp $");
#define AHD_PCI_IOADDR PCI_MAPREG_START /* I/O Address */
#define AHD_PCI_MEMADDR (PCI_MAPREG_START + 4) /* Mem I/O Address */
@@ -1033,7 +1033,7 @@
* additionally have SG engine splits to look at.
*/
pcix_status = pci_conf_read(bd->pc, bd->tag,
- bd->pcix_off + PCI_PCIX_STATUS);
+ bd->pcix_off + PCIX_STATUS);
printf("%s: PCI Split Interrupt - PCI-X status = 0x%x\n",
ahd_name(ahd), pcix_status);
@@ -1082,7 +1082,7 @@
/*
* Clear PCI-X status bits.
*/
- pci_conf_write(bd->pc, bd->tag, bd->pcix_off + PCI_PCIX_STATUS,
+ pci_conf_write(bd->pc, bd->tag, bd->pcix_off + PCIX_STATUS,
pcix_status);
ahd_outb(ahd, CLRINT, CLRSPLTINT);
ahd_restore_modes(ahd, saved_modes);
diff -r 04ca7d154f2b -r 014704281ad0 sys/dev/pci/if_alc.c
--- a/sys/dev/pci/if_alc.c Sun Apr 21 19:34:13 2013 +0000
+++ b/sys/dev/pci/if_alc.c Sun Apr 21 19:59:39 2013 +0000
@@ -567,7 +567,7 @@
if ((sc->alc_flags & (ALC_FLAG_APS | ALC_FLAG_PCIE)) ==
(ALC_FLAG_APS | ALC_FLAG_PCIE))
linkcfg = CSR_READ_2(sc, sc->alc_expcap +
- PCI_PCIE_LCSR);
+ PCIE_LCSR);
else
linkcfg = 0;
pmcfg &= ~PM_CFG_SERDES_PD_EX_L1;
@@ -582,7 +582,7 @@
if (sc->alc_ident->deviceid == PCI_PRODUCT_ATTANSIC_AR8152_B &&
sc->alc_rev == ATHEROS_AR8152_B_V10)
linkcfg |= 0x80;
- CSR_WRITE_2(sc, sc->alc_expcap + PCI_PCIE_LCSR,
+ CSR_WRITE_2(sc, sc->alc_expcap + PCIE_LCSR,
linkcfg);
pmcfg &= ~(PM_CFG_EN_BUFS_RX_L0S | PM_CFG_SA_DLY_ENB |
PM_CFG_HOTRST);
@@ -719,7 +719,7 @@
sc->alc_flags |= ALC_FLAG_PCIE;
sc->alc_expcap = base;
burst = pci_conf_read(sc->sc_pct, sc->sc_pcitag,
- base + PCI_PCIE_DCSR) >> 16;
+ base + PCIE_DCSR) >> 16;
sc->alc_dma_rd_burst = (burst & 0x7000) >> 12;
sc->alc_dma_wr_burst = (burst & 0x00e0) >> 5;
if (alcdebug) {
@@ -750,10 +750,10 @@
}
/* Disable ASPM L0S and L1. */
cap = pci_conf_read(sc->sc_pct, sc->sc_pcitag,
- base + PCI_PCIE_LCAP) >> 16;
+ base + PCIE_LCAP) >> 16;
if ((cap & 0x00000c00) != 0) {
ctl = pci_conf_read(sc->sc_pct, sc->sc_pcitag,
- base + PCI_PCIE_LCSR) >> 16;
+ base + PCIE_LCSR) >> 16;
if ((ctl & 0x08) != 0)
sc->alc_rcb = DMA_CFG_RCB_128;
if (alcdebug)
diff -r 04ca7d154f2b -r 014704281ad0 sys/dev/pci/if_athn_pci.c
--- a/sys/dev/pci/if_athn_pci.c Sun Apr 21 19:34:13 2013 +0000
+++ b/sys/dev/pci/if_athn_pci.c Sun Apr 21 19:59:39 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_athn_pci.c,v 1.7 2013/04/06 16:52:47 martin Exp $ */
+/* $NetBSD: if_athn_pci.c,v 1.8 2013/04/21 19:59:40 msaitoh Exp $ */
/* $OpenBSD: if_athn_pci.c,v 1.11 2011/01/08 10:02:32 damien Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_athn_pci.c,v 1.7 2013/04/06 16:52:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_pci.c,v 1.8 2013/04/21 19:59:40 msaitoh Exp $");
#include "opt_inet.h"
@@ -340,8 +340,8 @@
/* Disable PCIe Active State Power Management (ASPM). */
reg = pci_conf_read(psc->psc_pc, psc->psc_tag,
- psc->psc_cap_off + PCI_PCIE_LCSR);
- reg &= ~(PCI_PCIE_LCSR_ASPM_L0S | PCI_PCIE_LCSR_ASPM_L1);
+ psc->psc_cap_off + PCIE_LCSR);
+ reg &= ~(PCIE_LCSR_ASPM_L0S | PCIE_LCSR_ASPM_L1);
pci_conf_write(psc->psc_pc, psc->psc_tag,
- psc->psc_cap_off + PCI_PCIE_LCSR, reg);
+ psc->psc_cap_off + PCIE_LCSR, reg);
}
diff -r 04ca7d154f2b -r 014704281ad0 sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c Sun Apr 21 19:34:13 2013 +0000
+++ b/sys/dev/pci/if_bge.c Sun Apr 21 19:59:39 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.237 2013/04/12 03:33:17 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.238 2013/04/21 19:59:40 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.237 2013/04/12 03:33:17 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.238 2013/04/21 19:59:40 msaitoh Exp $");
#include "vlan.h"
@@ -826,8 +826,8 @@
pcireg_t val;
val = pci_conf_read(sc->sc_pc, sc->sc_pcitag, sc->bge_pciecap
- + PCI_PCIE_DCSR);
- val &= ~PCI_PCIE_DCSR_MAX_READ_REQ;
+ + PCIE_DCSR);
+ val &= ~PCIE_DCSR_MAX_READ_REQ;
switch (sc->bge_expmrq) {
case 2048:
val |= BGE_PCIE_DEVCTL_MAX_READRQ_2048;
@@ -840,7 +840,7 @@
break;
}
pci_conf_write(sc->sc_pc, sc->sc_pcitag, sc->bge_pciecap
- + PCI_PCIE_DCSR, val);
+ + PCIE_DCSR, val);
}
#ifdef notdef
@@ -4062,19 +4062,19 @@
reg | (1 << 15));
}
devctl = pci_conf_read(sc->sc_pc, sc->sc_pcitag,
- sc->bge_pciecap + PCI_PCIE_DCSR);
+ sc->bge_pciecap + PCIE_DCSR);
/* Clear enable no snoop and disable relaxed ordering. */
- devctl &= ~(PCI_PCIE_DCSR_ENA_RELAX_ORD |
- PCI_PCIE_DCSR_ENA_NO_SNOOP);
+ devctl &= ~(PCIE_DCSR_ENA_RELAX_ORD |
+ PCIE_DCSR_ENA_NO_SNOOP);
/* Set PCIE max payload size to 128 for older PCIe devices */
if ((sc->bge_flags & BGE_CPMU_PRESENT) == 0)
devctl &= ~(0x00e0);
/* Clear device status register. Write 1b to clear */
- devctl |= PCI_PCIE_DCSR_URD | PCI_PCIE_DCSR_FED
- | PCI_PCIE_DCSR_NFED | PCI_PCIE_DCSR_CED;
+ devctl |= PCIE_DCSR_URD | PCIE_DCSR_FED
+ | PCIE_DCSR_NFED | PCIE_DCSR_CED;
pci_conf_write(sc->sc_pc, sc->sc_pcitag,
- sc->bge_pciecap + PCI_PCIE_DCSR, devctl);
+ sc->bge_pciecap + PCIE_DCSR, devctl);
bge_set_max_readrq(sc);
}
@@ -4104,9 +4104,9 @@
/* Step 11: disable PCI-X Relaxed Ordering. */
if (sc->bge_flags & BGE_PCIX) {
reg = pci_conf_read(sc->sc_pc, sc->sc_pcitag, sc->bge_pcixcap
- + PCI_PCIX_CMD);
+ + PCIX_CMD);
pci_conf_write(sc->sc_pc, sc->sc_pcitag, sc->bge_pcixcap
- + PCI_PCIX_CMD, reg & ~PCI_PCIX_CMD_RELAXED_ORDER);
+ + PCIX_CMD, reg & ~PCIX_CMD_RELAXED_ORDER);
}
/* 5718 reset step 10, 57XX step 12 */
diff -r 04ca7d154f2b -r 014704281ad0 sys/dev/pci/if_bgereg.h
--- a/sys/dev/pci/if_bgereg.h Sun Apr 21 19:34:13 2013 +0000
+++ b/sys/dev/pci/if_bgereg.h Sun Apr 21 19:59:39 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bgereg.h,v 1.74 2013/04/11 10:12:48 msaitoh Exp $ */
+/* $NetBSD: if_bgereg.h,v 1.75 2013/04/21 19:59:40 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
* Copyright (c) 1997, 1998, 1999, 2001
@@ -175,8 +175,8 @@
#define BGE_PCI_MAXLAT 0x3F
#define BGE_PCI_PCIXCAP 0x40
#define BGE_PCI_NEXTPTR_PM 0x41
-#define BGE_PCI_PCIX_CMD 0x42
-#define BGE_PCI_PCIX_STS 0x44
+#define BGE_PCIX_CMD 0x42
+#define BGE_PCIX_STS 0x44
#define BGE_PCI_PWRMGMT_CAPID 0x48
#define BGE_PCI_NEXTPTR_VPD 0x49
#define BGE_PCI_PWRMGMT_CAPS 0x4A
diff -r 04ca7d154f2b -r 014704281ad0 sys/dev/pci/if_iwn.c
--- a/sys/dev/pci/if_iwn.c Sun Apr 21 19:34:13 2013 +0000
+++ b/sys/dev/pci/if_iwn.c Sun Apr 21 19:59:39 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwn.c,v 1.64 2013/03/30 03:21:43 christos Exp $ */
+/* $NetBSD: if_iwn.c,v 1.65 2013/04/21 19:59:40 msaitoh Exp $ */
/* $OpenBSD: if_iwn.c,v 1.96 2010/05/13 09:25:03 damien Exp $ */
/*-
@@ -22,7 +22,7 @@
* adapters.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.64 2013/03/30 03:21:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.65 2013/04/21 19:59:40 msaitoh Exp $");
#define IWN_USE_RBUF /* Use local storage for RX */
#undef IWN_HWCRYPTO /* XXX does not even compile yet */
@@ -4067,8 +4067,8 @@
cmd.flags |= htole16(IWN_PS_FAST_PD);
/* Retrieve PCIe Active State Power Management (ASPM). */
reg = pci_conf_read(sc->sc_pct, sc->sc_pcitag,
- sc->sc_cap_off + PCI_PCIE_LCSR);
- if (!(reg & PCI_PCIE_LCSR_ASPM_L0S)) /* L0s Entry disabled. */
+ sc->sc_cap_off + PCIE_LCSR);
+ if (!(reg & PCIE_LCSR_ASPM_L0S)) /* L0s Entry disabled. */
cmd.flags |= htole16(IWN_PS_PCI_PMGT);
cmd.rxtimeout = htole32(pmgt->rxtimeout * 1024);
cmd.txtimeout = htole32(pmgt->txtimeout * 1024);
@@ -5475,9 +5475,9 @@
/* Retrieve PCIe Active State Power Management (ASPM). */
reg = pci_conf_read(sc->sc_pct, sc->sc_pcitag,
- sc->sc_cap_off + PCI_PCIE_LCSR);
+ sc->sc_cap_off + PCIE_LCSR);
/* Workaround for HW instability in PCIe L0->L0s->L1 transition. */
- if (reg & PCI_PCIE_LCSR_ASPM_L1) /* L1 Entry enabled. */
+ if (reg & PCIE_LCSR_ASPM_L1) /* L1 Entry enabled. */
IWN_SETBITS(sc, IWN_GIO, IWN_GIO_L0S_ENA);
else
IWN_CLRBITS(sc, IWN_GIO, IWN_GIO_L0S_ENA);
diff -r 04ca7d154f2b -r 014704281ad0 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c Sun Apr 21 19:34:13 2013 +0000
+++ b/sys/dev/pci/if_wm.c Sun Apr 21 19:59:39 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.247 2013/04/18 12:42:03 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.248 2013/04/21 19:59:41 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.247 2013/04/18 12:42:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.248 2013/04/21 19:59:41 msaitoh Exp $");
Home |
Main Index |
Thread Index |
Old Index