summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Spinler <spinler@us.ibm.com>2017-02-17 12:45:09 -0600
committerPatrick Williams <patrick@stwcx.xyz>2017-02-24 22:45:04 +0000
commit2f30409ffffbab93a3f156f03bb01549fefe88fc (patch)
tree74656c51de0e0cc830b75ec523a7309afe974780
parent3eb55d4f482004465169044b56a21be2ed1e368b (diff)
downloadtalos-openbmc-2f30409ffffbab93a3f156f03bb01549fefe88fc.tar.gz
talos-openbmc-2f30409ffffbab93a3f156f03bb01549fefe88fc.zip
Use OpenFSI backend for all FSI operations
We perform two changes that must be done in sync: - Tell pdbg to use OpenFSI backend in boot scripts. - Bump the kernel to enable the FSI kernel driver. Following this change the host CPUs are IPL'd through the kernel driver. Change-Id: Ia28d2c854c8856c12c21e2230501ab7a9bc2a3b7 Signed-off-by: Matt Spinler <spinler@us.ibm.com> Signed-off-by: Joel Stanley <joel@jms.id.au>
-rwxr-xr-xmeta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/start_host.sh4
-rwxr-xr-xmeta-openbmc-machines/meta-openpower/common/recipes-phosphor/host/op-pdbg-host-control/vcs_workaround.sh4
-rw-r--r--meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb2
3 files changed, 3 insertions, 7 deletions
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 a34c03b8c..43b433fc8 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
@@ -2,12 +2,10 @@
# Starts POWER9 IPL (boot)
PDBG=${PDBG:-pdbg}
-# Argument [device]: if provided, pass to pdbg as "-d [device]"
-DEVICE_OPT=${1:+-d $1}
putcfam()
{
- $PDBG $1 -b fsi $DEVICE_OPT putcfam $2 $3 $4
+ $PDBG $1 putcfam $2 $3 $4
}
#Clock mux select override
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 96408a7a0..9ebf60136 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
@@ -2,12 +2,10 @@
# Apply fixes over FSI to POWER9 hosts. Required before VCS rail on.
PDBG=${PDBG:-pdbg}
-# Argument [device]: if provided, pass to pdbg as "-d [device]"
-DEVICE_OPT=${1:+-d $1}
putcfam()
{
- $PDBG -b fsi $DEVICE_OPT $1 putcfam $2 $3 $4
+ $PDBG $1 putcfam $2 $3 $4
}
# P9 dd1 required workaround needed before powering VCS rails
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb
index c1530cddc..d5614c128 100644
--- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb
+++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc_4.7.bb
@@ -1,6 +1,6 @@
KBRANCH ?= "dev-4.7"
LINUX_VERSION ?= "4.7"
-SRCREV="cd72aa35e473996f548d8a1612d2e8cf7006f44e"
+SRCREV="39eb5a44bfd49fe530f6b68c4d99ab2d8d391be0"
require linux-obmc.inc
OpenPOWER on IntegriCloud