diff options
| author | attilio <attilio@FreeBSD.org> | 2011-05-29 00:59:38 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2011-05-29 00:59:38 +0000 |
| commit | 55a3bf38a5f8f3d517542f92fc9e34a1cebcce52 (patch) | |
| tree | 19a91bf94ba6b6dca19c88849791de347e024692 /sys/powerpc/mpc85xx | |
| parent | eefddaeed6c0577102de6360a326fa15c36afd07 (diff) | |
| parent | 16f4172df58aff2531075ad9428e980aba6a25bd (diff) | |
| download | FreeBSD-src-55a3bf38a5f8f3d517542f92fc9e34a1cebcce52.zip FreeBSD-src-55a3bf38a5f8f3d517542f92fc9e34a1cebcce52.tar.gz | |
MFC
Diffstat (limited to 'sys/powerpc/mpc85xx')
| -rw-r--r-- | sys/powerpc/mpc85xx/mpc85xx.c | 21 | ||||
| -rw-r--r-- | sys/powerpc/mpc85xx/mpc85xx.h | 5 |
2 files changed, 14 insertions, 12 deletions
diff --git a/sys/powerpc/mpc85xx/mpc85xx.c b/sys/powerpc/mpc85xx/mpc85xx.c index 564bf84..f383a1b 100644 --- a/sys/powerpc/mpc85xx/mpc85xx.c +++ b/sys/powerpc/mpc85xx/mpc85xx.c @@ -69,12 +69,13 @@ law_getmax(void) uint32_t ver; ver = SVR_VER(mfspr(SPR_SVR)); - if (ver == SVR_MPC8572E || ver == SVR_MPC8572) - return (12); - else if (ver == SVR_MPC8548E || ver == SVR_MPC8548) - return (10); - else + if (ver == SVR_MPC8555E || ver == SVR_MPC8555) return (8); + if (ver == SVR_MPC8548E || ver == SVR_MPC8548 || + ver == SVR_MPC8533E || ver == SVR_MPC8533) + return (10); + + return (12); } #define _LAW_SR(trgt,size) (0x80000000 | (trgt << 20) | (ffsl(size) - 2)) @@ -152,10 +153,16 @@ law_pci_target(struct resource *res, int *trgt_mem, int *trgt_io) trgt = 1; break; case 0xa000: - if (ver == SVR_MPC8572E || ver == SVR_MPC8572) - trgt = 2; + if (ver == SVR_MPC8548E || ver == SVR_MPC8548) + trgt = 3; else + trgt = 2; + break; + case 0xb000: + if (ver == SVR_MPC8548E || ver == SVR_MPC8548) rv = EINVAL; + else + trgt = 3; break; default: rv = ENXIO; diff --git a/sys/powerpc/mpc85xx/mpc85xx.h b/sys/powerpc/mpc85xx/mpc85xx.h index 7621f2c..fa3bde3 100644 --- a/sys/powerpc/mpc85xx/mpc85xx.h +++ b/sys/powerpc/mpc85xx/mpc85xx.h @@ -67,11 +67,6 @@ #define OCP85XX_PORDEVSR2 (CCSRBAR_VA + 0xe0014) -#define OCP85XX_DEVDISR (CCSRBAR_VA + 0xe0070) -#define OCP85XX_DEVDISR_PCIE0 0x20000000 -#define OCP85XX_DEVDISR_PCIE1 0x04000000 -#define OCP85XX_DEVDISR_PCIE2 0x02000000 - /* * Status Registers. */ |
