diff options
| author | marius <marius@FreeBSD.org> | 2012-03-30 15:08:09 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2012-03-30 15:08:09 +0000 |
| commit | 07d4fd218fa5d503420c9ab5bade13ee89480e8e (patch) | |
| tree | 6e1ee72f7bc8369f0db6f377159dc5ab3113062f /sys/sparc64/pci | |
| parent | 0bd3403eb7f928418fbb325f2861302a2ca29dbb (diff) | |
| download | FreeBSD-src-07d4fd218fa5d503420c9ab5bade13ee89480e8e.zip FreeBSD-src-07d4fd218fa5d503420c9ab5bade13ee89480e8e.tar.gz | |
- Remove erroneous trailing semicolon. [1]
- Correctly determine the maximum payload size for setting the TX link
frequent NACK latency and replay timer thresholds.
Submitted by: stefanf [1]
MFC after: 3 days
Diffstat (limited to 'sys/sparc64/pci')
| -rw-r--r-- | sys/sparc64/pci/fire.c | 5 | ||||
| -rw-r--r-- | sys/sparc64/pci/firereg.h | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sys/sparc64/pci/fire.c b/sys/sparc64/pci/fire.c index c5a90c1..ff33114 100644 --- a/sys/sparc64/pci/fire.c +++ b/sys/sparc64/pci/fire.c @@ -443,10 +443,11 @@ fire_attach(device_t dev) lw = 0; } mps = (FIRE_PCI_READ_8(sc, FO_PCI_TLU_CTRL) & - FO_PCI_TLU_CTRL_CFG_MASK) >> FO_PCI_TLU_CTRL_CFG_SHFT; + FO_PCI_TLU_CTRL_CFG_MPS_MASK) >> + FO_PCI_TLU_CTRL_CFG_MPS_SHFT; i = sizeof(fire_freq_nak_tmr_thrs) / sizeof(*fire_freq_nak_tmr_thrs); - if (mps >= i); + if (mps >= i) mps = i - 1; FIRE_PCI_SET(sc, FO_PCI_LPU_TXLNK_FREQ_LAT_TMR_THRS, (fire_freq_nak_tmr_thrs[mps][lw] << diff --git a/sys/sparc64/pci/firereg.h b/sys/sparc64/pci/firereg.h index 1471b09..650eb8c 100644 --- a/sys/sparc64/pci/firereg.h +++ b/sys/sparc64/pci/firereg.h @@ -345,6 +345,13 @@ #define FO_PCI_TLU_CTRL_CFG_MASK 0x000000000000ffffULL #define FO_PCI_TLU_CTRL_CFG_SHFT 0 #define FO_PCI_TLU_CTRL_CFG_REMAIN_DETECT_QUIET 0x0000000000000100ULL +#define FO_PCI_TLU_CTRL_CFG_PAD_LOOPBACK_EN 0x0000000000000080ULL +#define FO_PCI_TLU_CTRL_CFG_EWRAP_LOOPBACK_EN 0x0000000000000040ULL +#define FO_PCI_TLU_CTRL_CFG_DIGITAL_LOOPBACK_EN 0x0000000000000020ULL +#define FO_PCI_TLU_CTRL_CFG_MPS_MASK 0x000000000000001cULL +#define FO_PCI_TLU_CTRL_CFG_MPS_SHFT 2 +#define FO_PCI_TLU_CTRL_CFG_COMMON_CLK_CFG 0x0000000000000002ULL +#define FO_PCI_TLU_CTRL_CFG_PORT 0x0000000000000001ULL /* * PCI TLU other event interrupt enable, interrupt status and status clear |
