Skip to content

W
White Rabbit Switch - Software
Commit 147e8ea5 authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

userspace: export temperature from sensors to HAL's shmem 

HAL at update of fan speed reads Switch's temperature sensors.
Sensors read:
-FPGA
-PLL (was read before to drive PWM for fan)
-Power supply left
-Power supply right

Additionally:
-add hal_temp_sensors structure to hal shmem, add current temperature and
 threshold values (to be implemented in later commits)
-increment HAL_SHMEM_VERSION
-update hal_shmem.h in ppsi
-update dump_shmem with new structure, add specific type for temperature
 sensors
-in hal_ports.c
 --rename struct wrs_shm_head *head to struct wrs_shm_head *hal_shmem_hdr
 --remove void *hal_port_shmem as not needed,
 --make struct hal_shmem_header *hal_shmem extern, defined in hal_main.c
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent 83bf4a86
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 24 deletions
userspace/libwr/fan.c
View file @ 147e8ea5
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <libwr/pio.h> #include <libwr/pio.h>
#include <libwr/fan.h> #include <libwr/fan.h>
#include <libwr/hal_shmem.h>
#include <at91_softpwm.h> #include <at91_softpwm.h>
...@@ -39,7 +40,10 @@ ...@@ -39,7 +40,10 @@
#include "spwm-regs.h" #include "spwm-regs.h"
#include <libwr/util.h> #include <libwr/util.h>
#define FAN_TEMP_SENSOR_ADDR 0x4c #define TEMP_SENSOR_ADDR_FPGA 0x4A /* (7bits addr) IC19 Below FPGA */
#define TEMP_SENSOR_ADDR_PLL 0x4C /* (7bits addr) IC18 PLLs */
#define TEMP_SENSOR_ADDR_PSL 0x49 /* (7bits addr) IC20 Power supply left */
#define TEMP_SENSOR_ADDR_PSR 0x4D /* (7bits addr) IC17 Power supply right */
#define DESIRED_TEMPERATURE 55.0 #define DESIRED_TEMPERATURE 55.0
...@@ -204,7 +208,7 @@ static int shw_init_i2c_sensors() ...@@ -204,7 +208,7 @@ static int shw_init_i2c_sensors()
return 0; return 0;
} }
int shw_init_fans() int shw_init_fans(void)
{ {
uint32_t val = 0; uint32_t val = 0;
...@@ -250,7 +254,11 @@ int shw_init_fans() ...@@ -250,7 +254,11 @@ int shw_init_fans()
shw_init_i2c_sensors(); shw_init_i2c_sensors();
tmp100_write_reg(FAN_TEMP_SENSOR_ADDR, 1, 0x60); // 12-bit resolution /* set all to 12-bit resolution */
tmp100_write_reg(TEMP_SENSOR_ADDR_FPGA, 1, 0x60);
tmp100_write_reg(TEMP_SENSOR_ADDR_PLL, 1, 0x60);
tmp100_write_reg(TEMP_SENSOR_ADDR_PSL, 1, 0x60);
tmp100_write_reg(TEMP_SENSOR_ADDR_PSR, 1, 0x60);
pi_init(&fan_pi); pi_init(&fan_pi);
...@@ -263,17 +271,24 @@ int shw_init_fans() ...@@ -263,17 +271,24 @@ int shw_init_fans()
* Reads out the temperature and drives the fan accordingly * Reads out the temperature and drives the fan accordingly
* note: This call is done by hal_main.c:hal_update() * note: This call is done by hal_main.c:hal_update()
*/ */
void shw_update_fans() void shw_update_fans(struct hal_temp_sensors *sensors)
{ {
static int64_t last_tics = -1; static int64_t last_tics = -1;
int64_t cur_tics = shw_get_tics(); int64_t cur_tics = shw_get_tics();
if (fan_update_timeout > 0 if (fan_update_timeout > 0
&& (last_tics < 0 || (cur_tics - last_tics) > fan_update_timeout)) { && (last_tics < 0 || (cur_tics - last_tics) > fan_update_timeout)) {
float t_cur = tmp100_read_temp(FAN_TEMP_SENSOR_ADDR); /* drive fan based on PLL temperature */
float t_cur = tmp100_read_temp(TEMP_SENSOR_ADDR_PLL);
float drive = pi_update(&fan_pi, t_cur - DESIRED_TEMPERATURE); float drive = pi_update(&fan_pi, t_cur - DESIRED_TEMPERATURE);
//pr_info("t=%f,pwm=%f\n",t_cur , drive); //pr_info("t=%f,pwm=%f\n",t_cur , drive);
shw_pwm_speed(0xFF, drive / 1000); //enable two and one shw_pwm_speed(0xFF, drive / 1000); //enable two and one
/* update sensor values */
sensors->fpga = tmp100_read_reg(TEMP_SENSOR_ADDR_FPGA, 0, 2);
sensors->pll = tmp100_read_reg(TEMP_SENSOR_ADDR_PLL, 0, 2);
sensors->psl = tmp100_read_reg(TEMP_SENSOR_ADDR_PSL, 0, 2);
sensors->psr = tmp100_read_reg(TEMP_SENSOR_ADDR_PSR, 0, 2);
last_tics = cur_tics; last_tics = cur_tics;
} }
} }
userspace/libwr/include/libwr/fan.h
View file @ 147e8ea5
#ifndef __LIBWR_FAN_H #ifndef __LIBWR_FAN_H
#define __LIBWR_FAN_H #define __LIBWR_FAN_H
#include <libwr/hal_shmem.h>
#define SHW_FAN_UPDATETO_DEFAULT 5 #define SHW_FAN_UPDATETO_DEFAULT 5
int shw_init_fans(); int shw_init_fans(void);
void shw_update_fans(); void shw_update_fans(struct hal_temp_sensors *sensors);
#endif /* __LIBWR_FAN_H */ #endif /* __LIBWR_FAN_H */
userspace/libwr/include/libwr/hal_shmem.h
View file @ 147e8ea5
...@@ -102,12 +102,24 @@ struct hal_port_state { ...@@ -102,12 +102,24 @@ struct hal_port_state {
uint32_t ep_base; uint32_t ep_base;
}; };
struct hal_temp_sensors {
int fpga; /* IC19 */
int pll; /* IC18 */
int psl; /* IC20 Power Supply Left (PSL) */
int psr; /* IC17 Power Supply Right (PSR) */
int fpga_thold; /* Threshold value for FPGA temperature */
int pll_thold; /* Threshold value for PLL temperature */
int psl_thold; /* Threshold value for PSL temperature */
int psr_thold; /* Threshold value for PSR temperature */
};
/* This is the overall structure stored in shared memory */ /* This is the overall structure stored in shared memory */
#define HAL_SHMEM_VERSION 5 /* Version 5 because of new field vendor_name in #define HAL_SHMEM_VERSION 6 /* Version 6 because of new structure
* struct shw_sfp_caldata */ * hal_temp_sensors in hal_shmem_header */
struct hal_shmem_header { struct hal_shmem_header {
int nports; int nports;
struct hal_port_state *ports; struct hal_port_state *ports;
struct hal_temp_sensors temp;
}; };
static inline int state_up(int state) static inline int state_up(int state)
......
ppsi @ d04c7c28
Subproject commit c22cd7cb69cacc5053f3306aa17d5ef30dc05330 Subproject commit d04c7c28cfcca35fd5d21f4f288ed1fd14318984
userspace/tools/wrs_dump_shmem.c
View file @ 147e8ea5
...@@ -67,6 +67,7 @@ enum dump_type { ...@@ -67,6 +67,7 @@ enum dump_type {
dump_type_ip_address, dump_type_ip_address,
dump_type_sfp_flags, dump_type_sfp_flags,
dump_type_port_mode, dump_type_port_mode,
dump_type_sensor_temp,
}; };
static int dump_all_rtu_entries = 0; /* rtu exports 4096 vlans and 2048 htab static int dump_all_rtu_entries = 0; /* rtu exports 4096 vlans and 2048 htab
...@@ -201,6 +202,9 @@ void dump_one_field(void *addr, struct dump_info *info) ...@@ -201,6 +202,9 @@ void dump_one_field(void *addr, struct dump_info *info)
break; break;
} }
break; break;
case dump_type_sensor_temp:
printf("%f\n", ((float)(*(int *)p >> 4)) / 16.0);
break;
} }
} }
void dump_many_fields(void *addr, struct dump_info *info, int ninfo) void dump_many_fields(void *addr, struct dump_info *info, int ninfo)
...@@ -228,6 +232,20 @@ void dump_many_fields(void *addr, struct dump_info *info, int ninfo) ...@@ -228,6 +232,20 @@ void dump_many_fields(void *addr, struct dump_info *info, int ninfo)
.size = _size, \ .size = _size, \
} }
#undef DUMP_STRUCT
#define DUMP_STRUCT struct hal_shmem_header
struct dump_info hal_shmem_info [] = {
DUMP_FIELD(int, nports),
DUMP_FIELD(sensor_temp, temp.fpga),
DUMP_FIELD(sensor_temp, temp.pll),
DUMP_FIELD(sensor_temp, temp.psl),
DUMP_FIELD(sensor_temp, temp.psr),
DUMP_FIELD(int, temp.fpga_thold),
DUMP_FIELD(int, temp.pll_thold),
DUMP_FIELD(int, temp.psl_thold),
DUMP_FIELD(int, temp.psr_thold),
};
/* map for fields of hal_port_state (hal_shmem.h) */ /* map for fields of hal_port_state (hal_shmem.h) */
#undef DUMP_STRUCT #undef DUMP_STRUCT
#define DUMP_STRUCT struct hal_port_state #define DUMP_STRUCT struct hal_port_state
...@@ -287,6 +305,10 @@ int dump_hal_mem(struct wrs_shm_head *head) ...@@ -287,6 +305,10 @@ int dump_hal_mem(struct wrs_shm_head *head)
return -1; return -1;
} }
h = (void *)head + head->data_off; h = (void *)head + head->data_off;
/* dump hal's shmem */
dump_many_fields(h, hal_shmem_info, ARRAY_SIZE(hal_shmem_info));
n = h->nports; n = h->nports;
p = wrs_shm_follow(head, h->ports); p = wrs_shm_follow(head, h->ports);
......
userspace/wrsw_hal/hal_main.c
View file @ 147e8ea5
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <libwr/shw_io.h> #include <libwr/shw_io.h>
#include <libwr/sfp_lib.h> #include <libwr/sfp_lib.h>
#include <libwr/config.h> #include <libwr/config.h>
#include <libwr/hal_shmem.h>
#include "wrsw_hal.h" #include "wrsw_hal.h"
#include <rt_ipc.h> #include <rt_ipc.h>
...@@ -26,6 +27,7 @@ ...@@ -26,6 +27,7 @@
static int daemon_mode = 0; static int daemon_mode = 0;
static hal_cleanup_callback_t cleanup_cb[MAX_CLEANUP_CALLBACKS]; static hal_cleanup_callback_t cleanup_cb[MAX_CLEANUP_CALLBACKS];
struct hal_shmem_header *hal_shmem;
/* Adds a function to be called during the HAL shutdown. */ /* Adds a function to be called during the HAL shutdown. */
int hal_add_cleanup_callback(hal_cleanup_callback_t cb) int hal_add_cleanup_callback(hal_cleanup_callback_t cb)
...@@ -235,7 +237,8 @@ int main(int argc, char *argv[]) ...@@ -235,7 +237,8 @@ int main(int argc, char *argv[])
} }
hal_port_update_all(); hal_port_update_all();
shw_update_fans(); /* update fans and temperatures in shmem */
shw_update_fans(&hal_shmem->temp);
t1 = t2; t1 = t2;
} }
......
userspace/wrsw_hal/hal_ports.c
View file @ 147e8ea5
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#define RTS_POLL_INTERVAL 200 /* ms */ #define RTS_POLL_INTERVAL 200 /* ms */
#define SFP_POLL_INTERVAL 1000 /* ms */ #define SFP_POLL_INTERVAL 1000 /* ms */
static void *hal_port_shmem; extern struct hal_shmem_header *hal_shmem;
/* Port table: the only item which is not "hal_port_*", as it's much used */ /* Port table: the only item which is not "hal_port_*", as it's much used */
static struct hal_port_state *ports; static struct hal_port_state *ports;
...@@ -184,8 +184,7 @@ static int hal_port_init(int index) ...@@ -184,8 +184,7 @@ static int hal_port_init(int index)
int hal_port_init_all() int hal_port_init_all()
{ {
int index; int index;
struct hal_shmem_header *hal_hdr; struct wrs_shm_head *hal_shmem_hdr;
struct wrs_shm_head *head;
pr_info("Initializing switch ports...\n"); pr_info("Initializing switch ports...\n");
...@@ -202,24 +201,23 @@ int hal_port_init_all() ...@@ -202,24 +201,23 @@ int hal_port_init_all()
} }
/* Allocate the ports in shared memory, so wr_mon etc can see them /* Allocate the ports in shared memory, so wr_mon etc can see them
Use lock since some (like rtud) wait for hal to be available */ Use lock since some (like rtud) wait for hal to be available */
hal_port_shmem = wrs_shm_get(wrs_shm_hal, "wrsw_hal", hal_shmem_hdr = wrs_shm_get(wrs_shm_hal, "wrsw_hal",
WRS_SHM_WRITE | WRS_SHM_LOCKED); WRS_SHM_WRITE | WRS_SHM_LOCKED);
if (!hal_port_shmem) { if (!hal_shmem_hdr) {
fprintf(stderr, "%s: Can't join shmem: %s\n", __func__, fprintf(stderr, "%s: Can't join shmem: %s\n", __func__,
strerror(errno)); strerror(errno));
return -1; return -1;
} }
head = hal_port_shmem; hal_shmem = wrs_shm_alloc(hal_shmem_hdr, sizeof(*hal_shmem));
hal_hdr = wrs_shm_alloc(hal_port_shmem, sizeof(*hal_hdr)); ports = wrs_shm_alloc(hal_shmem_hdr,
ports = wrs_shm_alloc(hal_port_shmem,
sizeof(struct hal_port_state) sizeof(struct hal_port_state)
* HAL_MAX_PORTS); * HAL_MAX_PORTS);
if (!hal_hdr || !ports) { if (!hal_shmem || !ports) {
fprintf(stderr, "%s: can't allocate in shmem\n", __func__); fprintf(stderr, "%s: can't allocate in shmem\n", __func__);
return -1; return -1;
} }
hal_hdr->ports = ports; hal_shmem->ports = ports;
for (index = 0; index < HAL_MAX_PORTS; index++) for (index = 0; index < HAL_MAX_PORTS; index++)
if (hal_port_init(index) < 0) if (hal_port_init(index) < 0)
...@@ -230,14 +228,14 @@ int hal_port_init_all() ...@@ -230,14 +228,14 @@ int hal_port_init_all()
hal_port_nports); hal_port_nports);
/* We are done, mark things as valid */ /* We are done, mark things as valid */
hal_hdr->nports = hal_port_nports; hal_shmem->nports = hal_port_nports;
head->version = HAL_SHMEM_VERSION; hal_shmem_hdr->version = HAL_SHMEM_VERSION;
/* Release processes waiting for HAL's to fill shm with correct data /* Release processes waiting for HAL's to fill shm with correct data
When shm is opened successfully data in shm is still not populated! When shm is opened successfully data in shm is still not populated!
Read data with wrs_shm_seqbegin and wrs_shm_seqend! Read data with wrs_shm_seqbegin and wrs_shm_seqend!
Especially for nports it is important */ Especially for nports it is important */
wrs_shm_write(head, WRS_SHM_WRITE_END); wrs_shm_write(hal_shmem_hdr, WRS_SHM_WRITE_END);
/* Create a WRIPC server for HAL public API */ /* Create a WRIPC server for HAL public API */
return hal_init_wripc(ports); return hal_init_wripc(ports);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment