From 8c84823f280564eff22c8bcfdf262e77c3d34974 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Wed, 11 Jan 2017 20:53:24 +0000 Subject: [PATCH] Update F2B RPM max based on empirical measurement. --- .../src/module/auto/powerpc_quanta_lb9.yml | 2 +- .../powerpc_quanta_lb9_config.h | 2 +- .../src/module/src/powerpc_quanta_lb9_int.h | 202 +++++++++--------- 3 files changed, 103 insertions(+), 103 deletions(-) diff --git a/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/onlp/builds/src/module/auto/powerpc_quanta_lb9.yml b/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/onlp/builds/src/module/auto/powerpc_quanta_lb9.yml index 66b7a600..b1e17af0 100644 --- a/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/onlp/builds/src/module/auto/powerpc_quanta_lb9.yml +++ b/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/onlp/builds/src/module/auto/powerpc_quanta_lb9.yml @@ -31,7 +31,7 @@ cdefs: &cdefs default: 100 - POWERPC_QUANTA_LB9_R0_CONFIG_SYSFAN_RPM_F2B_MAX: doc: "Maximum system fan speed in front-to-back mode." - default: 14500 + default: 16000 - POWERPC_QUANTA_LB9_R0_CONFIG_SYSFAN_RPM_B2F_MAX: doc: "Maximum system fan speed in back-to-front mode." default: 24000 diff --git a/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/onlp/builds/src/module/inc/powerpc_quanta_lb9/powerpc_quanta_lb9_config.h b/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/onlp/builds/src/module/inc/powerpc_quanta_lb9/powerpc_quanta_lb9_config.h index cfa89474..3ad26bf1 100644 --- a/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/onlp/builds/src/module/inc/powerpc_quanta_lb9/powerpc_quanta_lb9_config.h +++ b/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/onlp/builds/src/module/inc/powerpc_quanta_lb9/powerpc_quanta_lb9_config.h @@ -106,7 +106,7 @@ #ifndef POWERPC_QUANTA_LB9_R0_CONFIG_SYSFAN_RPM_F2B_MAX -#define POWERPC_QUANTA_LB9_R0_CONFIG_SYSFAN_RPM_F2B_MAX 14500 +#define POWERPC_QUANTA_LB9_R0_CONFIG_SYSFAN_RPM_F2B_MAX 16000 #endif /** diff --git a/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/onlp/builds/src/module/src/powerpc_quanta_lb9_int.h b/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/onlp/builds/src/module/src/powerpc_quanta_lb9_int.h index fbca0aa6..53961dcc 100644 --- a/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/onlp/builds/src/module/src/powerpc_quanta_lb9_int.h +++ b/packages/platforms/quanta/powerpc/powerpc-quanta-lb9/onlp/builds/src/module/src/powerpc_quanta_lb9_int.h @@ -11,41 +11,94 @@ /* */ -/** thermal_oid */ -typedef enum thermal_oid_e { - THERMAL_OID_THERMAL1 = ONLP_THERMAL_ID_CREATE(1), - THERMAL_OID_THERMAL2 = ONLP_THERMAL_ID_CREATE(2), - THERMAL_OID_THERMAL3 = ONLP_THERMAL_ID_CREATE(3), - THERMAL_OID_THERMAL4 = ONLP_THERMAL_ID_CREATE(4), - THERMAL_OID_THERMAL5 = ONLP_THERMAL_ID_CREATE(5), - THERMAL_OID_THERMAL6 = ONLP_THERMAL_ID_CREATE(6), - THERMAL_OID_THERMAL7 = ONLP_THERMAL_ID_CREATE(7), - THERMAL_OID_THERMAL8 = ONLP_THERMAL_ID_CREATE(8), - THERMAL_OID_THERMAL9 = ONLP_THERMAL_ID_CREATE(9), - THERMAL_OID_THERMAL10 = ONLP_THERMAL_ID_CREATE(10), - THERMAL_OID_THERMAL11 = ONLP_THERMAL_ID_CREATE(11), -} thermal_oid_t; +/** fan_id */ +typedef enum fan_id_e { + FAN_ID_FAN1 = 1, + FAN_ID_FAN2 = 2, + FAN_ID_FAN3 = 3, + FAN_ID_FAN4 = 4, + FAN_ID_FAN5 = 5, + FAN_ID_FAN6 = 6, +} fan_id_t; /** Enum names. */ -const char* thermal_oid_name(thermal_oid_t e); +const char* fan_id_name(fan_id_t e); /** Enum values. */ -int thermal_oid_value(const char* str, thermal_oid_t* e, int substr); +int fan_id_value(const char* str, fan_id_t* e, int substr); /** Enum descriptions. */ -const char* thermal_oid_desc(thermal_oid_t e); +const char* fan_id_desc(fan_id_t e); /** Enum validator. */ -int thermal_oid_valid(thermal_oid_t e); +int fan_id_valid(fan_id_t e); /** validator */ -#define THERMAL_OID_VALID(_e) \ - (thermal_oid_valid((_e))) +#define FAN_ID_VALID(_e) \ + (fan_id_valid((_e))) -/** thermal_oid_map table. */ -extern aim_map_si_t thermal_oid_map[]; -/** thermal_oid_desc_map table. */ -extern aim_map_si_t thermal_oid_desc_map[]; +/** fan_id_map table. */ +extern aim_map_si_t fan_id_map[]; +/** fan_id_desc_map table. */ +extern aim_map_si_t fan_id_desc_map[]; + +/** fan_oid */ +typedef enum fan_oid_e { + FAN_OID_FAN1 = ONLP_FAN_ID_CREATE(1), + FAN_OID_FAN2 = ONLP_FAN_ID_CREATE(2), + FAN_OID_FAN3 = ONLP_FAN_ID_CREATE(3), + FAN_OID_FAN4 = ONLP_FAN_ID_CREATE(4), + FAN_OID_FAN5 = ONLP_FAN_ID_CREATE(5), + FAN_OID_FAN6 = ONLP_FAN_ID_CREATE(6), +} fan_oid_t; + +/** Enum names. */ +const char* fan_oid_name(fan_oid_t e); + +/** Enum values. */ +int fan_oid_value(const char* str, fan_oid_t* e, int substr); + +/** Enum descriptions. */ +const char* fan_oid_desc(fan_oid_t e); + +/** Enum validator. */ +int fan_oid_valid(fan_oid_t e); + +/** validator */ +#define FAN_OID_VALID(_e) \ + (fan_oid_valid((_e))) + +/** fan_oid_map table. */ +extern aim_map_si_t fan_oid_map[]; +/** fan_oid_desc_map table. */ +extern aim_map_si_t fan_oid_desc_map[]; + +/** psu_id */ +typedef enum psu_id_e { + PSU_ID_PSU1 = 1, + PSU_ID_PSU2 = 2, +} psu_id_t; + +/** Enum names. */ +const char* psu_id_name(psu_id_t e); + +/** Enum values. */ +int psu_id_value(const char* str, psu_id_t* e, int substr); + +/** Enum descriptions. */ +const char* psu_id_desc(psu_id_t e); + +/** Enum validator. */ +int psu_id_valid(psu_id_t e); + +/** validator */ +#define PSU_ID_VALID(_e) \ + (psu_id_valid((_e))) + +/** psu_id_map table. */ +extern aim_map_si_t psu_id_map[]; +/** psu_id_desc_map table. */ +extern aim_map_si_t psu_id_desc_map[]; /** psu_oid */ typedef enum psu_oid_e { @@ -110,94 +163,41 @@ extern aim_map_si_t thermal_id_map[]; /** thermal_id_desc_map table. */ extern aim_map_si_t thermal_id_desc_map[]; -/** fan_id */ -typedef enum fan_id_e { - FAN_ID_FAN1 = 1, - FAN_ID_FAN2 = 2, - FAN_ID_FAN3 = 3, - FAN_ID_FAN4 = 4, - FAN_ID_FAN5 = 5, - FAN_ID_FAN6 = 6, -} fan_id_t; +/** thermal_oid */ +typedef enum thermal_oid_e { + THERMAL_OID_THERMAL1 = ONLP_THERMAL_ID_CREATE(1), + THERMAL_OID_THERMAL2 = ONLP_THERMAL_ID_CREATE(2), + THERMAL_OID_THERMAL3 = ONLP_THERMAL_ID_CREATE(3), + THERMAL_OID_THERMAL4 = ONLP_THERMAL_ID_CREATE(4), + THERMAL_OID_THERMAL5 = ONLP_THERMAL_ID_CREATE(5), + THERMAL_OID_THERMAL6 = ONLP_THERMAL_ID_CREATE(6), + THERMAL_OID_THERMAL7 = ONLP_THERMAL_ID_CREATE(7), + THERMAL_OID_THERMAL8 = ONLP_THERMAL_ID_CREATE(8), + THERMAL_OID_THERMAL9 = ONLP_THERMAL_ID_CREATE(9), + THERMAL_OID_THERMAL10 = ONLP_THERMAL_ID_CREATE(10), + THERMAL_OID_THERMAL11 = ONLP_THERMAL_ID_CREATE(11), +} thermal_oid_t; /** Enum names. */ -const char* fan_id_name(fan_id_t e); +const char* thermal_oid_name(thermal_oid_t e); /** Enum values. */ -int fan_id_value(const char* str, fan_id_t* e, int substr); +int thermal_oid_value(const char* str, thermal_oid_t* e, int substr); /** Enum descriptions. */ -const char* fan_id_desc(fan_id_t e); +const char* thermal_oid_desc(thermal_oid_t e); /** Enum validator. */ -int fan_id_valid(fan_id_t e); +int thermal_oid_valid(thermal_oid_t e); /** validator */ -#define FAN_ID_VALID(_e) \ - (fan_id_valid((_e))) +#define THERMAL_OID_VALID(_e) \ + (thermal_oid_valid((_e))) -/** fan_id_map table. */ -extern aim_map_si_t fan_id_map[]; -/** fan_id_desc_map table. */ -extern aim_map_si_t fan_id_desc_map[]; - -/** psu_id */ -typedef enum psu_id_e { - PSU_ID_PSU1 = 1, - PSU_ID_PSU2 = 2, -} psu_id_t; - -/** Enum names. */ -const char* psu_id_name(psu_id_t e); - -/** Enum values. */ -int psu_id_value(const char* str, psu_id_t* e, int substr); - -/** Enum descriptions. */ -const char* psu_id_desc(psu_id_t e); - -/** Enum validator. */ -int psu_id_valid(psu_id_t e); - -/** validator */ -#define PSU_ID_VALID(_e) \ - (psu_id_valid((_e))) - -/** psu_id_map table. */ -extern aim_map_si_t psu_id_map[]; -/** psu_id_desc_map table. */ -extern aim_map_si_t psu_id_desc_map[]; - -/** fan_oid */ -typedef enum fan_oid_e { - FAN_OID_FAN1 = ONLP_FAN_ID_CREATE(1), - FAN_OID_FAN2 = ONLP_FAN_ID_CREATE(2), - FAN_OID_FAN3 = ONLP_FAN_ID_CREATE(3), - FAN_OID_FAN4 = ONLP_FAN_ID_CREATE(4), - FAN_OID_FAN5 = ONLP_FAN_ID_CREATE(5), - FAN_OID_FAN6 = ONLP_FAN_ID_CREATE(6), -} fan_oid_t; - -/** Enum names. */ -const char* fan_oid_name(fan_oid_t e); - -/** Enum values. */ -int fan_oid_value(const char* str, fan_oid_t* e, int substr); - -/** Enum descriptions. */ -const char* fan_oid_desc(fan_oid_t e); - -/** Enum validator. */ -int fan_oid_valid(fan_oid_t e); - -/** validator */ -#define FAN_OID_VALID(_e) \ - (fan_oid_valid((_e))) - -/** fan_oid_map table. */ -extern aim_map_si_t fan_oid_map[]; -/** fan_oid_desc_map table. */ -extern aim_map_si_t fan_oid_desc_map[]; +/** thermal_oid_map table. */ +extern aim_map_si_t thermal_oid_map[]; +/** thermal_oid_desc_map table. */ +extern aim_map_si_t thermal_oid_desc_map[]; /* */