diff options
| author | Matt Spinler <spinler@us.ibm.com> | 2017-02-17 12:34:40 -0600 |
|---|---|---|
| committer | Matt Spinler <spinler@us.ibm.com> | 2017-02-24 16:13:47 -0600 |
| commit | 3eb55d4f482004465169044b56a21be2ed1e368b (patch) | |
| tree | bbc80cec2ff0a01112b07a32b22e0b7219ecf7ab | |
| parent | 9ecda09f191d16fe26dc36eca41355ffea08f12b (diff) | |
| download | talos-openbmc-3eb55d4f482004465169044b56a21be2ed1e368b.tar.gz talos-openbmc-3eb55d4f482004465169044b56a21be2ed1e368b.zip | |
Add service to trigger OpenFSI driver to do a scan
After PGOOD comes up, the FSI driver needs to do a
scan to find the FSI devices.
Change-Id: I1b4eeec191408a36b37d9044279bdf067deb2b15
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
4 files changed, 31 insertions, 1 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb index ba8a95023..e4decd47c 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb @@ -32,6 +32,8 @@ RDEPENDS_${PN}-chassis = " \ obmc-pcie-detect \ obmc-watchdog \ " +#Pull in obmc-fsi-scan on all P9 OpenPOWER systems +RDEPENDS_${PN}-chassis += "${@mf_enabled(d, 'obmc-fsi-scan', 'obmc-fsi-scan')}" SUMMARY_${PN}-fans = "OpenPOWER Fans" RDEPENDS_${PN}-fans = " \ diff --git a/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc b/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc index 936576d43..6fa9b7bbe 100644 --- a/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc +++ b/meta-openbmc-machines/meta-openpower/conf/machine/include/p9.inc @@ -1,2 +1,2 @@ -OBMC_MACHINE_FEATURES += 'p9-vcs-workaround' +OBMC_MACHINE_FEATURES += 'p9-vcs-workaround obmc-fsi-scan' PREFERRED_PROVIDER_virtual/obmc-host-ctl = "p9-host-start" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi-scan.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi-scan.bb new file mode 100644 index 000000000..4a4fdd760 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi-scan.bb @@ -0,0 +1,15 @@ +SUMMARY = "Scan for FSI devices" +DESCRIPTION = "Tells the OpenFSI device driver to scan for FSI devices" +PR = "r1" + +inherit obmc-phosphor-dbus-service +inherit obmc-phosphor-license + +TMPL = "fsi-scan@.service" +INSTFMT = "fsi-scan@{0}.service" +TGTFMT = "obmc-power-chassis-on@{0}.target" +FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" + +SYSTEMD_SERVICE_${PN} += "${TMPL}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_SUBSTITUTIONS += "MACHINE:${MACHINE}:${TMPL}" diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi-scan/fsi-scan@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi-scan/fsi-scan@.service new file mode 100644 index 000000000..ac37004f3 --- /dev/null +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-fsi-scan/fsi-scan@.service @@ -0,0 +1,13 @@ +[Unit] +Description=Scan FSI devices +Wants=obmc-power-on@%i.target +After=obmc-power-on@%i.target +Conflicts=obmc-power-chassis-off@%i.target + +[Service] +ExecStart=/bin/sh -c "echo 1 > /sys/bus/platform/devices/fsi-master/scan" +Type=oneshot +RemainAfterExit=yes + +[Install] +RequiredBy=obmc-power-chassis-on@%i.target |
