diff options
| -rw-r--r-- | arch/mips/bcm47xx/setup.c | 6 | ||||
| -rw-r--r-- | arch/mips/include/asm/mipsregs.h | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c index 6054d49e608e..8c9cbf13d32a 100644 --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c | |||
| @@ -212,6 +212,12 @@ static int __init bcm47xx_cpu_fixes(void) | |||
| 212 | */ | 212 | */ |
| 213 | if (bcm47xx_bus.bcma.bus.chipinfo.id == BCMA_CHIP_ID_BCM4706) | 213 | if (bcm47xx_bus.bcma.bus.chipinfo.id == BCMA_CHIP_ID_BCM4706) |
| 214 | cpu_wait = NULL; | 214 | cpu_wait = NULL; |
| 215 | |||
| 216 | /* | ||
| 217 | * BCM47XX Erratum "R10: PCIe Transactions Periodically Fail" | ||
| 218 | * Enable ExternalSync for sync instruction to take effect | ||
| 219 | */ | ||
| 220 | set_c0_config7(MIPS_CONF7_ES); | ||
| 215 | break; | 221 | break; |
| 216 | #endif | 222 | #endif |
| 217 | } | 223 | } |
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h index ae461d91cd1f..0bc270806ec5 100644 --- a/arch/mips/include/asm/mipsregs.h +++ b/arch/mips/include/asm/mipsregs.h | |||
| @@ -681,6 +681,8 @@ | |||
| 681 | #define MIPS_CONF7_WII (_ULCAST_(1) << 31) | 681 | #define MIPS_CONF7_WII (_ULCAST_(1) << 31) |
| 682 | 682 | ||
| 683 | #define MIPS_CONF7_RPS (_ULCAST_(1) << 2) | 683 | #define MIPS_CONF7_RPS (_ULCAST_(1) << 2) |
| 684 | /* ExternalSync */ | ||
| 685 | #define MIPS_CONF7_ES (_ULCAST_(1) << 8) | ||
| 684 | 686 | ||
| 685 | #define MIPS_CONF7_IAR (_ULCAST_(1) << 10) | 687 | #define MIPS_CONF7_IAR (_ULCAST_(1) << 10) |
| 686 | #define MIPS_CONF7_AR (_ULCAST_(1) << 16) | 688 | #define MIPS_CONF7_AR (_ULCAST_(1) << 16) |
| @@ -2765,6 +2767,7 @@ __BUILD_SET_C0(status) | |||
| 2765 | __BUILD_SET_C0(cause) | 2767 | __BUILD_SET_C0(cause) |
| 2766 | __BUILD_SET_C0(config) | 2768 | __BUILD_SET_C0(config) |
| 2767 | __BUILD_SET_C0(config5) | 2769 | __BUILD_SET_C0(config5) |
| 2770 | __BUILD_SET_C0(config7) | ||
| 2768 | __BUILD_SET_C0(intcontrol) | 2771 | __BUILD_SET_C0(intcontrol) |
| 2769 | __BUILD_SET_C0(intctl) | 2772 | __BUILD_SET_C0(intctl) |
| 2770 | __BUILD_SET_C0(srsmap) | 2773 | __BUILD_SET_C0(srsmap) |
