summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Spinler <spinler@us.ibm.com>2017-03-17 11:25:22 -0500
committerMatt Spinler <spinler@us.ibm.com>2017-03-17 11:49:31 -0500
commitfabe92e8ed1cbb65e4b054f41688935416765917 (patch)
treec8ccd4757c159fef5a7c6954031da4a7706f2c45
parentcc2403cbac41751b5bd81364c3f359f0226f6c93 (diff)
downloadopenpower-proc-control-fabe92e8ed1cbb65e4b054f41688935416765917.tar.gz
openpower-proc-control-fabe92e8ed1cbb65e4b054f41688935416765917.zip
Fix path for FSI slaves
The FSI path moved for the 2nd processor. Change-Id: Ic462dc7648a68abc7de178e2312bc2368fc06d40 Signed-off-by: Matt Spinler <spinler@us.ibm.com>
-rw-r--r--targeting.cpp4
-rw-r--r--targeting.hpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/targeting.cpp b/targeting.cpp
index e7d8b7a..635c8bb 100644
--- a/targeting.cpp
+++ b/targeting.cpp
@@ -47,7 +47,7 @@ Targeting::Targeting(const std::string& fsiMasterDev,
targets.push_back(std::make_unique<Target>(0, fsiMasterPath));
//Find the the remaining P9s dynamically based on which files show up
- std::regex exp{"slave@([0-9]{2}):00", std::regex::extended};
+ std::regex exp{"hub@00/slave@([0-9]{2}):00", std::regex::extended};
for (auto& file : fs::directory_iterator(fsiSlaveBasePath))
{
@@ -59,7 +59,7 @@ Targeting::Targeting(const std::string& fsiMasterDev,
if (pos == 0)
{
log<level::ERR>("Unexpected FSI slave device name found",
- entry("DEVICE_NAME=%d", path.c_str()));
+ entry("DEVICE_NAME=%s", path.c_str()));
continue;
}
diff --git a/targeting.hpp b/targeting.hpp
index 463ccc5..9719a65 100644
--- a/targeting.hpp
+++ b/targeting.hpp
@@ -12,7 +12,7 @@ namespace targeting
constexpr auto fsiMasterDevPath =
"/sys/devices/platform/fsi-master/slave@00:00/raw";
-constexpr auto fsiSlaveBaseDir = "/sys/devices/hub@00/";
+constexpr auto fsiSlaveBaseDir = "/sys/devices/platform/fsi-master/slave@00:00/hub@00/";
/**
* Represents a specific P9 processor in the system. Used by
OpenPOWER on IntegriCloud