diff options
| author | Matt Spinler <spinler@us.ibm.com> | 2017-01-09 09:28:50 -0600 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2017-01-10 19:40:56 +0000 |
| commit | 6f41005d5f135f71cde7c4b7ae483290355fe62f (patch) | |
| tree | 17531f49605b03398e6cccbc82440cd647e0b806 /meta-openbmc-machines/meta-openpower/common | |
| parent | 2a9a08a553bbd72db658cdef5c5f2136f524c4f4 (diff) | |
| download | talos-openbmc-6f41005d5f135f71cde7c4b7ae483290355fe62f.tar.gz talos-openbmc-6f41005d5f135f71cde7c4b7ae483290355fe62f.zip | |
Add multi-p9 support to the pdbg scripts
start_host.sh and vcs_workaround.sh need changes
to support multiple P9s. Also bumped the pdbg
version which is coreqed with the script changes.
Change-Id: I5536b548315b5f9bf4fd4cb742c686a6ce12b6d0
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Diffstat (limited to 'meta-openbmc-machines/meta-openpower/common')
3 files changed, 17 insertions, 7 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/pdbg/pdbg.bb b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/pdbg/pdbg.bb index 025aa4a31..494740458 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/pdbg/pdbg.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/pdbg/pdbg.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI += "git://github.com/open-power/pdbg.git" -SRCREV = "bc861c9883bd1c40c7a284d8e4f6676b758268e5" +SRCREV = "e4d626ed4edc3db0b850e71ca0410e343faca950" PV = "git${SRCREV}" S = "${WORKDIR}/git" diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/start_host.sh b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/start_host.sh index 909cde013..22766d81f 100755 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/start_host.sh +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/start_host.sh @@ -7,7 +7,7 @@ DEVICE_OPT=${1:+-d $1} putcfam() { - $PDBG -b fsi $DEVICE_OPT putcfam $1 $2 $3 + $PDBG -p0 -b fsi $DEVICE_OPT putcfam $1 $2 $3 } putcfam 0x283f 0x20000000 # Write scratch register 8 diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround.sh b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround.sh index 4b30bfc50..96408a7a0 100755 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround.sh +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround.sh @@ -7,18 +7,28 @@ DEVICE_OPT=${1:+-d $1} putcfam() { - $PDBG -b fsi $DEVICE_OPT putcfam $1 $2 $3 + $PDBG -b fsi $DEVICE_OPT $1 putcfam $2 $3 $4 } # P9 dd1 required workaround needed before powering VCS rails p9_dd1_vcs_workaround() { - putcfam 0x2810 0x00000000 0x00010000 && # Unfence PLL controls - putcfam 0x281A 0x40000000 0x40000000 && # Assert Perv chiplet endpoint reset, just in case - putcfam 0x281A 0x00000001 0x00000001 # Enable Nest PLL + putcfam -a 0x2810 0x00000000 0x00010000 && # Unfence PLL controls + putcfam -a 0x281A 0x40000000 0x40000000 && # Assert Perv chiplet endpoint reset, just in case + putcfam -a 0x281A 0x00000001 0x00000001 # Enable Nest PLL } # Put the CFAM/FSI slave into async mode -putcfam 0x900 1 +putcfam -p0 0x900 1 + +#Set hMFSI error recovery +putcfam -p0 0x34b8 0x0000c000 + +#Set hMFSI timings +putcfam -p0 0x3400 0xd0040110 +putcfam -p0 0x3401 0xffff0000 + +#Enable hMFST ports +putcfam -p0 0x3404 0xf0000000 p9_dd1_vcs_workaround |
