@@ -7,7 +7,7 @@ CORE_OBJS += timebase.o opal-msg.o pci.o pci-opal.o fast-reboot.o
CORE_OBJS += device.o exceptions.o trace.o affinity.o vpd.o
CORE_OBJS += hostservices.o platform.o nvram.o flash-nvram.o hmi.o
CORE_OBJS += console-log.o ipmi.o time-utils.o pel.o pool.o errorlog.o
-CORE_OBJS += timer.o i2c.o rtc.o
+CORE_OBJS += timer.o i2c.o rtc.o sensor.o
CORE=core/built-in.o
CFLAGS_SKIP_core/relocate.o = -pg -fstack-protector-all
@@ -43,6 +43,7 @@
#include <libfdt/libfdt.h>
#include <hostservices.h>
#include <timer.h>
+#include <sensor.h>
/*
* Boot semaphore, incremented by each CPU calling in
@@ -619,6 +620,9 @@ void __noreturn main_cpu_entry(const void *fdt, u32 master_cpu)
if (platform.init)
platform.init();
+ /* Register routine to dispatch and read sensors */
+ sensor_init();
+
/* Setup dummy console nodes if it's enabled */
if (dummy_console_enabled())
dummy_console_add_nodes();
new file mode 100644
@@ -0,0 +1,36 @@
+/* Copyright 2013-2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#include <sensor.h>
+#include <skiboot.h>
+#include <opal.h>
+#include <fsp.h>
+
+static int64_t opal_sensor_read(uint32_t sensor_hndl, int token,
+ uint32_t *sensor_data)
+{
+ if (platform.sensor_read)
+ return platform.sensor_read(sensor_hndl, token, sensor_data);
+
+ return OPAL_PARAMETER;
+}
+
+void sensor_init(void)
+{
+ /* Register OPAL interface */
+ opal_register(OPAL_SENSOR_READ, opal_sensor_read, 3);
+}
@@ -489,7 +489,7 @@ static int64_t parse_sensor_id(uint32_t id, struct opal_sensor_data *attr)
}
-static int64_t fsp_opal_read_sensor(uint32_t sensor_hndl, int token,
+int64_t fsp_opal_read_sensor(uint32_t sensor_hndl, int token,
uint32_t *sensor_data)
{
struct opal_sensor_data *attr;
@@ -728,9 +728,6 @@ void fsp_init_sensor(void)
/* Map TCE */
fsp_tce_map(PSI_DMA_SENSOR_BUF, sensor_buffer, PSI_DMA_SENSOR_BUF_SZ);
- /* Register OPAL interface */
- opal_register(OPAL_SENSOR_READ, fsp_opal_read_sensor, 3);
-
msg.resp = &resp;
/* Traverse using all the modifiers to know all the sensors available
@@ -769,6 +769,8 @@ extern void fsp_memory_err_init(void);
/* Sensor */
extern void fsp_init_sensor(void);
+extern int64_t fsp_opal_read_sensor(uint32_t sensor_hndl, int token,
+ uint32_t *sensor_data);
/* Diagnostic */
extern void fsp_init_diag(void);
@@ -131,6 +131,12 @@ struct platform {
*/
bool (*load_resource)(enum resource_id id,
void *buf, size_t *len);
+
+ /*
+ * Read a sensor value
+ */
+ int64_t (*sensor_read)(uint32_t sensor_hndl, int token,
+ uint32_t *sensor_data);
};
extern struct platform __platforms_start;
new file mode 100644
@@ -0,0 +1,53 @@
+/* Copyright 2013-2014 IBM Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __SENSOR_H
+#define __SENSOR_H
+
+#include <stdint.h>
+
+/*
+ * A sensor handler is a four bytes value which identifies a sensor by
+ * its resource class (temperature, fans ...), a resource identifier
+ * and an attribute number (data, status, ...) :
+ *
+ * Res.
+ * | Attr. | Class | Resource Id |
+ * |--------|--------|----------------|
+ *
+ *
+ * Helper routines to build or use the sensor handler.
+ */
+#define sensor_make_handler(sensor_class, sensor_rid, sensor_attr) \
+ (((sensor_attr) << 24) | ((sensor_class) & 0xff) << 16 | \
+ ((sensor_rid) & 0xffff))
+
+#define sensor_get_frc(handler) (((handler) >> 16) & 0xff)
+#define sensor_get_rid(handler) ((handler) & 0xffff)
+#define sensor_get_attr(handler) ((handler) >> 24)
+
+/*
+ * Sensor families
+ *
+ * This identifier is used to dispatch calls to OPAL_SENSOR_READ to
+ * the appropriate component. FSP is the initial family.
+ */
+#define SENSOR_FSP 0x0
+
+
+extern void sensor_init(void);
+
+#endif /* __SENSOR_H */
@@ -391,4 +391,5 @@ DECLARE_PLATFORM(firenze) = {
.occ_timeout = ibm_fsp_occ_timeout,
.elog_commit = elog_fsp_commit,
.load_resource = fsp_load_resource,
+ .sensor_read = fsp_opal_read_sensor,
} ;
This patch introduces an initial framework to define a sensor_read operation per platform. It also proposes a few helper routines to work on the sensor 'handler' which identifies a sensor and attribute in the OPAL_SENSOR_READ call. This is only for the Tuletas for the moment. Support for BMC boards will be added later on. Signed-off-by: Cédric Le Goater <clg@fr.ibm.com> --- core/Makefile.inc | 2 +- core/init.c | 4 ++++ core/sensor.c | 36 +++++++++++++++++++++++++++++ hw/fsp/fsp-sensor.c | 5 +--- include/fsp.h | 2 ++ include/platform.h | 6 +++++ include/sensor.h | 53 +++++++++++++++++++++++++++++++++++++++++++ platforms/ibm-fsp/firenze.c | 1 + 8 files changed, 104 insertions(+), 5 deletions(-) create mode 100644 core/sensor.c create mode 100644 include/sensor.h