diff --git a/packages/platforms/quanta/x86-64/modules/builds/quanta_hwmon.c b/packages/platforms/quanta/x86-64/modules/builds/quanta_hwmon_ly_series.c old mode 100644 new mode 100755 similarity index 78% rename from packages/platforms/quanta/x86-64/modules/builds/quanta_hwmon.c rename to packages/platforms/quanta/x86-64/modules/builds/quanta_hwmon_ly_series.c index 244d9a9e..1b807bcf --- a/packages/platforms/quanta/x86-64/modules/builds/quanta_hwmon.c +++ b/packages/platforms/quanta/x86-64/modules/builds/quanta_hwmon_ly_series.c @@ -11,7 +11,7 @@ * * * - * A hwmon driver for the Quanta LY6 + * A hwmon driver for the Quanta LY6/LY8/LY9 */ #include @@ -39,40 +39,40 @@ static const unsigned short normal_i2c[] = { 0x4E, I2C_CLIENT_END }; #define QUANTA_HWMON_NUM_FANS 6 -struct quanta_hwmon_data { +struct quanta_hwmon_ly_series_data { struct device *hwmon_dev; struct attribute_group attrs; struct mutex lock; }; -enum quanta_hwmon_s { +enum quanta_hwmon_ly_series_s { quanta_ly6_hwmon, quanta_ly6f_hwmon, quanta_ly8_hwmon, quanta_ly9_hwmon, }; -static int quanta_hwmon_probe(struct i2c_client *client, +static int quanta_hwmon_ly_series_probe(struct i2c_client *client, const struct i2c_device_id *id); -static int quanta_hwmon_remove(struct i2c_client *client); +static int quanta_hwmon_ly_series_remove(struct i2c_client *client); -static const struct i2c_device_id quanta_hwmon_id[] = { +static const struct i2c_device_id quanta_hwmon_ly_series_id[] = { { "quanta_ly6_hwmon", quanta_ly6_hwmon }, { "quanta_ly6f_hwmon", quanta_ly6f_hwmon }, { "quanta_ly8_hwmon", quanta_ly8_hwmon }, { "quanta_ly9_hwmon", quanta_ly9_hwmon }, { } }; -MODULE_DEVICE_TABLE(i2c, quanta_hwmon_id); +MODULE_DEVICE_TABLE(i2c, quanta_hwmon_ly_series_id); -static struct i2c_driver quanta_hwmon_driver = { +static struct i2c_driver quanta_hwmon_ly_series_driver = { .class = I2C_CLASS_HWMON, .driver = { - .name = "quanta_hwmon", + .name = "quanta_hwmon_ly_series", }, - .probe = quanta_hwmon_probe, - .remove = quanta_hwmon_remove, - .id_table = quanta_hwmon_id, + .probe = quanta_hwmon_ly_series_probe, + .remove = quanta_hwmon_ly_series_remove, + .id_table = quanta_hwmon_ly_series_id, .address_list = normal_i2c, }; @@ -81,7 +81,7 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *devattr, { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct i2c_client *client = to_i2c_client(dev); - struct quanta_hwmon_data *data = i2c_get_clientdata(client); + struct quanta_hwmon_ly_series_data *data = i2c_get_clientdata(client); int temp; mutex_lock(&data->lock); @@ -97,7 +97,7 @@ static ssize_t show_fan(struct device *dev, struct device_attribute *devattr, { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct i2c_client *client = to_i2c_client(dev); - struct quanta_hwmon_data *data = i2c_get_clientdata(client); + struct quanta_hwmon_ly_series_data *data = i2c_get_clientdata(client); int fan; mutex_lock(&data->lock); @@ -113,7 +113,7 @@ static ssize_t show_pwm(struct device *dev, struct device_attribute *devattr, { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct i2c_client *client = to_i2c_client(dev); - struct quanta_hwmon_data *data = i2c_get_clientdata(client); + struct quanta_hwmon_ly_series_data *data = i2c_get_clientdata(client); int pwm; mutex_lock(&data->lock); @@ -129,7 +129,7 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *devattr, { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct i2c_client *client = to_i2c_client(dev); - struct quanta_hwmon_data *data = i2c_get_clientdata(client); + struct quanta_hwmon_ly_series_data *data = i2c_get_clientdata(client); long val; int ret; @@ -158,7 +158,7 @@ static SENSOR_DEVICE_ATTR(fan6_input, S_IRUGO, show_fan, NULL, 5); static SENSOR_DEVICE_ATTR(fan7_input, S_IRUGO, show_fan, NULL, 6); static SENSOR_DEVICE_ATTR(pwm1, S_IWUSR | S_IRUGO, show_pwm, set_pwm, 0); -static struct attribute *quanta_hwmon_attr[] = { +static struct attribute *quanta_hwmon_ly_series_attr[] = { &sensor_dev_attr_temp1_input.dev_attr.attr, &sensor_dev_attr_temp2_input.dev_attr.attr, &sensor_dev_attr_temp3_input.dev_attr.attr, @@ -174,7 +174,7 @@ static struct attribute *quanta_hwmon_attr[] = { NULL }; -static struct attribute *quanta_hwmon_attr_6temps_3fans[] = { +static struct attribute *quanta_hwmon_ly_series_attr_6temps_3fans[] = { &sensor_dev_attr_temp1_input.dev_attr.attr, &sensor_dev_attr_temp2_input.dev_attr.attr, &sensor_dev_attr_temp3_input.dev_attr.attr, @@ -191,13 +191,13 @@ static struct attribute *quanta_hwmon_attr_6temps_3fans[] = { NULL }; -static int quanta_hwmon_probe(struct i2c_client *client, +static int quanta_hwmon_ly_series_probe(struct i2c_client *client, const struct i2c_device_id *id) { - struct quanta_hwmon_data *data; + struct quanta_hwmon_ly_series_data *data; int err; - data = devm_kzalloc(&client->dev, sizeof(struct quanta_hwmon_data), + data = devm_kzalloc(&client->dev, sizeof(struct quanta_hwmon_ly_series_data), GFP_KERNEL); if (!data) return -ENOMEM; @@ -208,10 +208,10 @@ static int quanta_hwmon_probe(struct i2c_client *client, dev_info(&client->dev, "%s chip found\n", client->name); if(!strcmp(client->name, "quanta_ly9_hwmon")){ - data->attrs.attrs = quanta_hwmon_attr_6temps_3fans; + data->attrs.attrs = quanta_hwmon_ly_series_attr_6temps_3fans; } else{ - data->attrs.attrs = quanta_hwmon_attr; + data->attrs.attrs = quanta_hwmon_ly_series_attr; } err = sysfs_create_group(&client->dev.kobj, &data->attrs); if (err) @@ -234,17 +234,18 @@ exit_remove: return err; } -static int quanta_hwmon_remove(struct i2c_client *client) +static int quanta_hwmon_ly_series_remove(struct i2c_client *client) { - struct quanta_hwmon_data *data = i2c_get_clientdata(client); + struct quanta_hwmon_ly_series_data *data = i2c_get_clientdata(client); hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&client->dev.kobj, &data->attrs); return 0; } -module_i2c_driver(quanta_hwmon_driver); +module_i2c_driver(quanta_hwmon_ly_series_driver); -MODULE_AUTHOR("QCT Technical "); -MODULE_DESCRIPTION("Quanta LY6 hardware monitor driver"); +MODULE_AUTHOR("Jonathan Tsai (jonathan.tsai@quantatw.com)"); +MODULE_VERSION("1.0"); +MODULE_DESCRIPTION("Quanta LY6/LY8/LY9 hardware monitor driver"); MODULE_LICENSE("GPL"); diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/inc/quanta_lib/gpio.h b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/inc/quanta_lib/gpio.h deleted file mode 100644 index b3096ec8..00000000 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/inc/quanta_lib/gpio.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef __QUANTA_LIB_GPIO_H__ -#define __QUANTA_LIB_GPIO_H__ - -#define GPIO_LOW 0 -#define GPIO_HIGH 1 - -#define GPIO_IN 0 -#define GPIO_OUT 1 - -#define GPIO_PATH "/sys/class/gpio" -#define GPIO_EXPORT GPIO_PATH "/export" -#define GPIO_UNEXPORT GPIO_PATH "/unexport" -#define GPIO_PREF GPIO_PATH "/gpio" - -int pca953x_gpio_value_get(int gpio, int *value); -int pca953x_gpio_direction_set(int gpio, int direction); -int pca953x_gpio_value_set(int gpio, int value); - -#endif /* __QUANTA_LIB_GPIO_H__ */ diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/inc/quanta_lib/i2c.h b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/inc/quanta_lib/i2c.h deleted file mode 100644 index 6bf8397a..00000000 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/inc/quanta_lib/i2c.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __QUANTA_LIB_I2C_H__ -#define __QUANTA_LIB_I2C_H__ - -int i2c_block_read(int bus, uint8_t addr, uint8_t offset, int size, - uint8_t* rdata, uint32_t flags); - -#endif /* __QUANTA_LIB_I2C_H__ */ diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/inc/x86_64_quanta_ly6_rangeley/x86_64_quanta_ly6_rangeley_gpio_table.h b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/inc/x86_64_quanta_ly6_rangeley/x86_64_quanta_ly6_rangeley_gpio_table.h old mode 100644 new mode 100755 index d64a2a6c..e6eefd4f --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/inc/x86_64_quanta_ly6_rangeley/x86_64_quanta_ly6_rangeley_gpio_table.h +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/inc/x86_64_quanta_ly6_rangeley/x86_64_quanta_ly6_rangeley_gpio_table.h @@ -1,53 +1,57 @@ -#ifndef __X86_64_QUANTA_LY6_RANGELEY_GPIO_TABLE_H__ -#define __X86_64_QUANTA_LY6_RANGELEY_GPIO_TABLE_H__ - -/* - * defined within platform/quanta_switch.c - * Quanta Switch Platform driver - */ -#define PCA953x_GPIO(P1, P2) (P1*8+P2) - -#define PCA9554_GPIO_SIZE 0x08 -#define PCA9555_GPIO_SIZE 0x10 -#define PCA9698_GPIO_SIZE 0x28 - -#define I2C_GPIO_BASE 0x80 - -#define LY6_CPLD_QSFP_GPIO_BASE (I2C_GPIO_BASE) -#define LY6_CPLD_QSFP_GPIO_SIZE 0x40 -#define LY6_CPLD_QSFP_PRSNT(port) (LY6_CPLD_QSFP_GPIO_BASE + ((port%2) ? (port) : (port-2)) * 4 + 1) - -/* 2 cpld for 32 ports */ -#define FAN_GPIO_BASE (LY6_CPLD_QSFP_GPIO_BASE + LY6_CPLD_QSFP_GPIO_SIZE * 2) -#define FAN_GPIO_SIZE PCA9555_GPIO_SIZE -#define FAN_PRSNT_N_1 (FAN_GPIO_BASE + PCA953x_GPIO(0,4)) -#define FAN_PRSNT_N_2 (FAN_GPIO_BASE + PCA953x_GPIO(0,5)) -#define FAN_PRSNT_N_3 (FAN_GPIO_BASE + PCA953x_GPIO(0,6)) -#define FAN_BF_DET1 (FAN_GPIO_BASE + PCA953x_GPIO(1,0)) -#define FAN_BF_DET2 (FAN_GPIO_BASE + PCA953x_GPIO(1,1)) -#define FAN_BF_DET3 (FAN_GPIO_BASE + PCA953x_GPIO(1,2)) -#define FAN_FAIL_LED_1 (FAN_GPIO_BASE + PCA953x_GPIO(1,4)) -#define FAN_FAIL_LED_2 (FAN_GPIO_BASE + PCA953x_GPIO(1,5)) -#define FAN_FAIL_LED_3 (FAN_GPIO_BASE + PCA953x_GPIO(1,6)) - -#define QSFP_EN_GPIO_BASE (FAN_GPIO_BASE + FAN_GPIO_SIZE) -#define QSFP_EN_GPIO_SIZE PCA9555_GPIO_SIZE -#define QSFP_EN_GPIO_P3V3_PW_GD (QSFP_EN_GPIO_BASE + PCA953x_GPIO(0,4)) -#define QSFP_EN_GPIO_P3V3_PW_EN (QSFP_EN_GPIO_BASE + PCA953x_GPIO(1,0)) - -#define PSU_GPIO_BASE (QSFP_EN_GPIO_BASE + QSFP_EN_GPIO_SIZE) -#define PSU_GPIO_SIZE PCA9555_GPIO_SIZE -#define PSU_GPIO_PSU1_PRSNT_N (PSU_GPIO_BASE + PCA953x_GPIO(0,0)) -#define PSU_GPIO_PSU1_PWRGD (PSU_GPIO_BASE + PCA953x_GPIO(0,1)) -#define PSU_GPIO_PSU2_PRSNT_N (PSU_GPIO_BASE + PCA953x_GPIO(0,3)) -#define PSU_GPIO_PSU2_PWRGD (PSU_GPIO_BASE + PCA953x_GPIO(0,4)) -#define PSU_GPIO_PSU1_AC_OK (PSU_GPIO_BASE + PCA953x_GPIO(0,6)) -#define PSU_GPIO_PSU2_AC_OK (PSU_GPIO_BASE + PCA953x_GPIO(0,7)) -#define PSU_GPIO_PSU1_GREEN_R (PSU_GPIO_BASE + PCA953x_GPIO(1,2)) -#define PSU_GPIO_PSU1_RED_R (PSU_GPIO_BASE + PCA953x_GPIO(1,3)) -#define PSU_GPIO_PSU2_GREEN_R (PSU_GPIO_BASE + PCA953x_GPIO(1,4)) -#define PSU_GPIO_PSU2_RED_R (PSU_GPIO_BASE + PCA953x_GPIO(1,5)) -#define PSU_GPIO_FAN_GREEN_R (PSU_GPIO_BASE + PCA953x_GPIO(1,6)) -#define PSU_GPIO_FAN_RED_R (PSU_GPIO_BASE + PCA953x_GPIO(1,7)) - -#endif /* __X86_64_QUANTA_LY6_RANGELEY_GPIO_TABLE_H__ */ +#ifndef __X86_64_QUANTA_LY6_RANGELEY_GPIO_TABLE_H__ +#define __X86_64_QUANTA_LY6_RANGELEY_GPIO_TABLE_H__ + +/* + * defined within platform/quanta_switch.c + * Quanta Switch Platform driver + */ +#define QUANTA_LY6_PCA953x_GPIO(P1, P2) (P1*8+P2) + +#define QUANTA_LY6_PCA9555_GPIO_SIZE 0x10 + +#define QUANTA_LY6_I2C_GPIO_CPU_BASE 0x40 + +#define QUANTA_LY6_CPU_BOARD_GPIO_BASE (QUANTA_LY6_I2C_GPIO_CPU_BASE) +#define QUANTA_LY6_CPU_BOARD_SYS_P1 (QUANTA_LY6_CPU_BOARD_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(1,2)) +#define QUANTA_LY6_CPU_BOARD_SYS_P2 (QUANTA_LY6_CPU_BOARD_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(1,3)) + +#define QUANTA_LY6_I2C_GPIO_BASE 0x80 + +#define QUANTA_LY6_CPLD_QSFP_GPIO_BASE (QUANTA_LY6_I2C_GPIO_BASE) +#define QUANTA_LY6_CPLD_QSFP_GPIO_SIZE 0x40 +#define QUANTA_LY6_CPLD_QSFP_PRSNT(port) (QUANTA_LY6_CPLD_QSFP_GPIO_BASE + ((port%2) ? (port) : (port-2)) * 4 + 1) + +/* 2 cpld for 32 ports */ +#define QUANTA_LY6_FAN_GPIO_BASE (QUANTA_LY6_CPLD_QSFP_GPIO_BASE + QUANTA_LY6_CPLD_QSFP_GPIO_SIZE * 2) +#define QUANTA_LY6_FAN_GPIO_SIZE QUANTA_LY6_PCA9555_GPIO_SIZE +#define QUANTA_LY6_FAN_PRSNT_N_1 (QUANTA_LY6_FAN_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(0,4)) +#define QUANTA_LY6_FAN_PRSNT_N_2 (QUANTA_LY6_FAN_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(0,5)) +#define QUANTA_LY6_FAN_PRSNT_N_3 (QUANTA_LY6_FAN_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(0,6)) +#define QUANTA_LY6_FAN_BF_DET1 (QUANTA_LY6_FAN_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(1,0)) +#define QUANTA_LY6_FAN_BF_DET2 (QUANTA_LY6_FAN_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(1,1)) +#define QUANTA_LY6_FAN_BF_DET3 (QUANTA_LY6_FAN_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(1,2)) +#define QUANTA_LY6_FAN_FAIL_LED_1 (QUANTA_LY6_FAN_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(1,4)) +#define QUANTA_LY6_FAN_FAIL_LED_2 (QUANTA_LY6_FAN_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(1,5)) +#define QUANTA_LY6_FAN_FAIL_LED_3 (QUANTA_LY6_FAN_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(1,6)) + +#define QUANTA_LY6_QSFP_EN_GPIO_BASE (QUANTA_LY6_FAN_GPIO_BASE + QUANTA_LY6_FAN_GPIO_SIZE) +#define QUANTA_LY6_QSFP_EN_GPIO_SIZE QUANTA_LY6_PCA9555_GPIO_SIZE +#define QUANTA_LY6_QSFP_EN_GPIO_P3V3_PW_GD (QUANTA_LY6_QSFP_EN_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(0,4)) +#define QUANTA_LY6_QSFP_EN_GPIO_P3V3_PW_EN (QUANTA_LY6_QSFP_EN_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(1,0)) + +#define QUANTA_LY6_PSU_GPIO_BASE (QUANTA_LY6_QSFP_EN_GPIO_BASE + QUANTA_LY6_QSFP_EN_GPIO_SIZE) +#define QUANTA_LY6_PSU_GPIO_SIZE QUANTA_LY6_PCA9555_GPIO_SIZE +#define QUANTA_LY6_PSU_GPIO_PSU1_PRSNT_N (QUANTA_LY6_PSU_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(0,0)) +#define QUANTA_LY6_PSU_GPIO_PSU1_PWRGD (QUANTA_LY6_PSU_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(0,1)) +#define QUANTA_LY6_PSU_GPIO_PSU2_PRSNT_N (QUANTA_LY6_PSU_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(0,3)) +#define QUANTA_LY6_PSU_GPIO_PSU2_PWRGD (QUANTA_LY6_PSU_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(0,4)) +#define QUANTA_LY6_PSU_GPIO_PSU1_AC_OK (QUANTA_LY6_PSU_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(0,6)) +#define QUANTA_LY6_PSU_GPIO_PSU2_AC_OK (QUANTA_LY6_PSU_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(0,7)) +#define QUANTA_LY6_PSU_GPIO_PSU1_GREEN_R (QUANTA_LY6_PSU_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(1,2)) +#define QUANTA_LY6_PSU_GPIO_PSU1_RED_R (QUANTA_LY6_PSU_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(1,3)) +#define QUANTA_LY6_PSU_GPIO_PSU2_GREEN_R (QUANTA_LY6_PSU_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(1,4)) +#define QUANTA_LY6_PSU_GPIO_PSU2_RED_R (QUANTA_LY6_PSU_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(1,5)) +#define QUANTA_LY6_PSU_GPIO_FAN_GREEN_R (QUANTA_LY6_PSU_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(1,6)) +#define QUANTA_LY6_PSU_GPIO_FAN_RED_R (QUANTA_LY6_PSU_GPIO_BASE + QUANTA_LY6_PCA953x_GPIO(1,7)) + +#endif /* __X86_64_QUANTA_LY6_RANGELEY_GPIO_TABLE_H__ */ diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/fani.c b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/fani.c old mode 100644 new mode 100755 index 5b1c286a..219602af --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/fani.c +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/fani.c @@ -30,7 +30,7 @@ #include "x86_64_quanta_ly6_rangeley_log.h" #include -#include +#include int onlp_fani_init(void) @@ -45,13 +45,13 @@ struct fan_gpio_s { static struct fan_gpio_s fan_gpio[] = { {}, /* Not used */ - { .present = FAN_PRSNT_N_1, .fan_dir_detect = FAN_BF_DET1 }, - { .present = FAN_PRSNT_N_2, .fan_dir_detect = FAN_BF_DET2 }, - { .present = FAN_PRSNT_N_3, .fan_dir_detect = FAN_BF_DET3 }, + { .present = QUANTA_LY6_FAN_PRSNT_N_1, .fan_dir_detect = QUANTA_LY6_FAN_BF_DET1 }, + { .present = QUANTA_LY6_FAN_PRSNT_N_2, .fan_dir_detect = QUANTA_LY6_FAN_BF_DET2 }, + { .present = QUANTA_LY6_FAN_PRSNT_N_3, .fan_dir_detect = QUANTA_LY6_FAN_BF_DET3 }, {}, /* Not used */ - { .present = FAN_PRSNT_N_1, .fan_dir_detect = FAN_BF_DET1 }, - { .present = FAN_PRSNT_N_2, .fan_dir_detect = FAN_BF_DET2 }, - { .present = FAN_PRSNT_N_3, .fan_dir_detect = FAN_BF_DET3 }, + { .present = QUANTA_LY6_FAN_PRSNT_N_1, .fan_dir_detect = QUANTA_LY6_FAN_BF_DET1 }, + { .present = QUANTA_LY6_FAN_PRSNT_N_2, .fan_dir_detect = QUANTA_LY6_FAN_BF_DET2 }, + { .present = QUANTA_LY6_FAN_PRSNT_N_3, .fan_dir_detect = QUANTA_LY6_FAN_BF_DET3 }, {}, /* Not used */ }; @@ -61,11 +61,11 @@ sys_fan_info_get__(onlp_fan_info_t* info, int id) int value = 0; int rv; - if(pca953x_gpio_value_get(fan_gpio[id].present, &value) == ONLP_STATUS_OK - && value == GPIO_LOW) { + if(onlp_gpio_get(fan_gpio[id].present, &value) == ONLP_STATUS_OK + && value == 0) { info->status = ONLP_FAN_STATUS_PRESENT; - if(pca953x_gpio_value_get(fan_gpio[id].fan_dir_detect, &value) == ONLP_STATUS_OK - && value == GPIO_LOW) { + if(onlp_gpio_get(fan_gpio[id].fan_dir_detect, &value) == ONLP_STATUS_OK + && value == 0) { info->status |= ONLP_FAN_STATUS_F2B; info->caps |= ONLP_FAN_CAPS_F2B; } diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/gpio.c b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/gpio.c deleted file mode 100644 index 4486989c..00000000 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/gpio.c +++ /dev/null @@ -1,82 +0,0 @@ -#include -#include -#include -#include -#include - -static int file_exists(char *filename) { - struct stat st; - return (stat(filename, &st) == 0); -} - -static int try_export_gpio(int gpio) { - char filename[PATH_MAX]; - - memset(filename, 0, sizeof(filename)); - sprintf(filename, "%s%d/value", GPIO_PREF, gpio); - - if(!file_exists(filename)) { - onlp_file_write_int(gpio, GPIO_EXPORT); - } - - return ONLP_STATUS_OK; -} - -static int try_unexport_gpio(int gpio) { - char filename[PATH_MAX]; - - memset(filename, 0, sizeof(filename)); - sprintf(filename, "%s%d/value", GPIO_PREF, gpio); - - if(file_exists(filename)) { - onlp_file_write_int(gpio, GPIO_UNEXPORT); - } - - return ONLP_STATUS_OK; -} - -int pca953x_gpio_value_get(int gpio, int *value) { - int ret; - - try_export_gpio(gpio); - ret = onlp_file_read_int(value, "%s%d/value", GPIO_PREF, gpio); - try_unexport_gpio(gpio); - - return ret; -} - -int pca953x_gpio_direction_set(int gpio, int direction) { - int ret; - - try_export_gpio(gpio); - - switch(direction) { - case GPIO_IN: - ret = onlp_file_write_str("in", "%s%d/direction", GPIO_PREF, gpio); - break; - - case GPIO_OUT: - ret = onlp_file_write_str("out", "%s%d/direction", GPIO_PREF, gpio); - break; - - default: - ret = ONLP_STATUS_E_UNSUPPORTED; - break; - } - - try_unexport_gpio(gpio); - - return ret; -} - -int pca953x_gpio_value_set(int gpio, int value) { - int ret; - - pca953x_gpio_direction_set(gpio, GPIO_OUT); - - try_export_gpio(gpio); - ret = onlp_file_write_int(value, "%s%d/value", GPIO_PREF, gpio); - try_unexport_gpio(gpio); - - return ret; -} diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/i2c.c b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/i2c.c deleted file mode 100644 index 169b2b02..00000000 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/i2c.c +++ /dev/null @@ -1,51 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* first byte of rdata is length of result */ -int -i2c_block_read(int bus, uint8_t addr, uint8_t offset, int size, - uint8_t* rdata, uint32_t flags) -{ - int fd; - - fd = onlp_i2c_open(bus, addr, flags); - - if(fd < 0) { - return fd; - } - - int count = size; - uint8_t* p = rdata; - while(count > 0) { - int rsize = (count >= ONLPLIB_CONFIG_I2C_BLOCK_SIZE) ? ONLPLIB_CONFIG_I2C_BLOCK_SIZE : count; - int rv = i2c_smbus_read_i2c_block_data(fd, - offset, - rsize, - p); - - if(rv != rsize) { - printf("i2c-%d: reading address 0x%x, offset %d, size=%d failed", - bus, addr, offset, rsize); - goto error; - } - - p += rsize; - count -= rsize; - } - - close(fd); - return 0; - - error: - close(fd); - return -1; -} - diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/ledi.c b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/ledi.c new file mode 100755 index 00000000..a15f1ea4 --- /dev/null +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/ledi.c @@ -0,0 +1,210 @@ +#include +#include +#include +#include +#include + +#include "x86_64_quanta_ly6_rangeley_int.h" +#include +#include + +/* + * Get the information for the given LED OID. + */ +static onlp_led_info_t led_info[] = +{ + { }, /* Not used */ + { + { LED_OID_SYSTEM, "System LED", 0 }, + ONLP_LED_STATUS_PRESENT, + ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_ORANGE | ONLP_LED_CAPS_GREEN, + }, + { + { LED_OID_FAN, "Front FAN LED", 0 }, + ONLP_LED_STATUS_PRESENT, + ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_RED | ONLP_LED_CAPS_GREEN, + }, + { + { LED_OID_PSU_1, "Front PSU(1) LED", 0 }, + ONLP_LED_STATUS_PRESENT, + ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_RED | ONLP_LED_CAPS_GREEN, + }, + { + { LED_OID_PSU_2, "Front PSU(2) LED", 0 }, + ONLP_LED_STATUS_PRESENT, + ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_RED | ONLP_LED_CAPS_GREEN, + }, + { + { LED_OID_FAN_FAIL_1, "FAN(1) fail LED", 0 }, + ONLP_LED_STATUS_PRESENT, + ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_RED, + }, + { + { LED_OID_FAN_FAIL_2, "FAN(2) fail LED", 0 }, + ONLP_LED_STATUS_PRESENT, + ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_RED, + }, + { + { LED_OID_FAN_FAIL_3, "FAN(3) fail LED", 0 }, + ONLP_LED_STATUS_PRESENT, + ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_RED, + } +}; + +int +onlp_ledi_init(void) +{ + return ONLP_STATUS_OK; +} + +int +onlp_ledi_info_get(onlp_oid_t id, onlp_led_info_t* info) +{ + + int led_id; + + led_id = ONLP_OID_ID_GET(id); + + *info = led_info[led_id]; + info->status |= ONLP_LED_STATUS_ON; + info->mode |= ONLP_LED_MODE_ON; + + return ONLP_STATUS_OK; +} + +void +Sysfs_Set_System_LED(onlp_led_mode_t mode) +{ + if(mode == ONLP_LED_MODE_GREEN){ + onlp_gpio_set(QUANTA_LY6_CPU_BOARD_SYS_P1, 0); + onlp_gpio_set(QUANTA_LY6_CPU_BOARD_SYS_P2, 1); + } + else if(mode == ONLP_LED_MODE_ORANGE){ + onlp_gpio_set(QUANTA_LY6_CPU_BOARD_SYS_P1, 1); + onlp_gpio_set(QUANTA_LY6_CPU_BOARD_SYS_P2, 0); + } + else{ + onlp_gpio_set(QUANTA_LY6_CPU_BOARD_SYS_P1, 1); + onlp_gpio_set(QUANTA_LY6_CPU_BOARD_SYS_P2, 1); + } +} + +void +Sysfs_Set_Fan_LED(onlp_led_mode_t mode) +{ + if(mode == ONLP_LED_MODE_GREEN){ + onlp_gpio_set(QUANTA_LY6_PSU_GPIO_FAN_GREEN_R, 1); + onlp_gpio_set(QUANTA_LY6_PSU_GPIO_FAN_RED_R, 0); + } + else if(mode == ONLP_LED_MODE_RED){ + onlp_gpio_set(QUANTA_LY6_PSU_GPIO_FAN_GREEN_R, 0); + onlp_gpio_set(QUANTA_LY6_PSU_GPIO_FAN_RED_R, 1); + } + else{ + onlp_gpio_set(QUANTA_LY6_PSU_GPIO_FAN_GREEN_R, 0); + onlp_gpio_set(QUANTA_LY6_PSU_GPIO_FAN_RED_R, 0); + } +} + +void +Sysfs_Set_Psu1_LED(onlp_led_mode_t mode) +{ + if(mode == ONLP_LED_MODE_GREEN){ + onlp_gpio_set(QUANTA_LY6_PSU_GPIO_PSU1_GREEN_R, 1); + onlp_gpio_set(QUANTA_LY6_PSU_GPIO_PSU1_RED_R, 0); + } + else if(mode == ONLP_LED_MODE_RED){ + onlp_gpio_set(QUANTA_LY6_PSU_GPIO_PSU1_GREEN_R, 0); + onlp_gpio_set(QUANTA_LY6_PSU_GPIO_PSU1_RED_R, 1); + } + else{ + onlp_gpio_set(QUANTA_LY6_PSU_GPIO_PSU1_GREEN_R, 0); + onlp_gpio_set(QUANTA_LY6_PSU_GPIO_PSU1_RED_R, 0); + } +} + +void +Sysfs_Set_Psu2_LED(onlp_led_mode_t mode) +{ + if(mode == ONLP_LED_MODE_GREEN){ + onlp_gpio_set(QUANTA_LY6_PSU_GPIO_PSU2_GREEN_R, 1); + onlp_gpio_set(QUANTA_LY6_PSU_GPIO_PSU2_RED_R, 0); + } + else if(mode == ONLP_LED_MODE_RED){ + onlp_gpio_set(QUANTA_LY6_PSU_GPIO_PSU2_GREEN_R, 0); + onlp_gpio_set(QUANTA_LY6_PSU_GPIO_PSU2_RED_R, 1); + } + else{ + onlp_gpio_set(QUANTA_LY6_PSU_GPIO_PSU2_GREEN_R, 0); + onlp_gpio_set(QUANTA_LY6_PSU_GPIO_PSU2_RED_R, 0); + } +} + +void +Sysfs_Set_Fan_Fail1_LED(onlp_led_mode_t mode) +{ + if(mode == ONLP_LED_MODE_RED){ + onlp_gpio_set(QUANTA_LY6_FAN_FAIL_LED_1, 1); + } + else{ + onlp_gpio_set(QUANTA_LY6_FAN_FAIL_LED_1, 0); + } +} + +void +Sysfs_Set_Fan_Fail2_LED(onlp_led_mode_t mode) +{ + if(mode == ONLP_LED_MODE_RED){ + onlp_gpio_set(QUANTA_LY6_FAN_FAIL_LED_2, 1); + } + else{ + onlp_gpio_set(QUANTA_LY6_FAN_FAIL_LED_2, 0); + } +} + +void +Sysfs_Set_Fan_Fail3_LED(onlp_led_mode_t mode) +{ + if(mode == ONLP_LED_MODE_RED){ + onlp_gpio_set(QUANTA_LY6_FAN_FAIL_LED_3, 1); + } + else{ + onlp_gpio_set(QUANTA_LY6_FAN_FAIL_LED_3, 0); + } +} + +int +onlp_ledi_mode_set(onlp_oid_t id, onlp_led_mode_t mode) +{ + int led_id; + + led_id = ONLP_OID_ID_GET(id); + switch (led_id) { + case LED_ID_SYSTEM: + Sysfs_Set_System_LED(mode); + break; + case LED_ID_FAN: + Sysfs_Set_Fan_LED(mode); + break; + case LED_ID_PSU_1: + Sysfs_Set_Psu1_LED(mode); + break; + case LED_ID_PSU_2: + Sysfs_Set_Psu2_LED(mode); + break; + case LED_ID_FAN_FAIL_1: + Sysfs_Set_Fan_Fail1_LED(mode); + break; + case LED_ID_FAN_FAIL_2: + Sysfs_Set_Fan_Fail2_LED(mode); + break; + case LED_ID_FAN_FAIL_3: + Sysfs_Set_Fan_Fail3_LED(mode); + break; + default: + return ONLP_STATUS_E_INTERNAL; + break; + } + + return ONLP_STATUS_OK; +} diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/psui.c b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/psui.c index 76272a57..c5683712 100755 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/psui.c +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/psui.c @@ -11,16 +11,15 @@ #include #include #include -#include -#include +#include #include "x86_64_quanta_ly6_rangeley_int.h" #include "x86_64_quanta_ly6_rangeley_log.h" #include struct psu_info_s psu_info[] = { {}, /* Not used */ - { .path = "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-24/24-0058", .present = PSU_GPIO_PSU1_PRSNT_N, .busno = 24, .addr = 0x58}, - { .path = "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-25/25-0059", .present = PSU_GPIO_PSU2_PRSNT_N, .busno = 25, .addr = 0x59}, + { .path = "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-24/24-0058", .present = QUANTA_LY6_PSU_GPIO_PSU1_PRSNT_N, .busno = 24, .addr = 0x58}, + { .path = "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-25/25-0059", .present = QUANTA_LY6_PSU_GPIO_PSU2_PRSNT_N, .busno = 25, .addr = 0x59}, }; int @@ -68,11 +67,11 @@ onlp_psui_info_get(onlp_oid_t id, onlp_psu_info_t* info) uint8_t buffer[ONLP_CONFIG_INFO_STR_MAX]; int value = -1; - rv = pca953x_gpio_value_get(psu_info[pid].present, &value); + rv = onlp_gpio_get(psu_info[pid].present, &value); if(rv < 0) { return rv; } - else if(value == GPIO_HIGH) { + else if(value == 1) { info->status &= ~1; return 0; } @@ -85,7 +84,7 @@ onlp_psui_info_get(onlp_oid_t id, onlp_psu_info_t* info) info->status |= 1; memset(buffer, 0, sizeof(buffer)); - rv = i2c_block_read(psu_info[pid].busno, psu_info[pid].addr, PMBUS_MFR_MODEL, PMBUS_MFR_MODEL_LEN, buffer, ONLP_I2C_F_FORCE); + rv = onlp_i2c_block_read(psu_info[pid].busno, psu_info[pid].addr, PMBUS_MFR_MODEL, PMBUS_MFR_MODEL_LEN, buffer, ONLP_I2C_F_FORCE); if(rv >= 0){ aim_strlcpy(info->model, (char *) (buffer+1), (buffer[0] + 1)); } @@ -94,7 +93,7 @@ onlp_psui_info_get(onlp_oid_t id, onlp_psu_info_t* info) } memset(buffer, 0, sizeof(buffer)); - rv = i2c_block_read(psu_info[pid].busno, psu_info[pid].addr, PMBUS_MFR_SERIAL, PMBUS_MFR_SERIAL_LEN, buffer, ONLP_I2C_F_FORCE); + rv = onlp_i2c_block_read(psu_info[pid].busno, psu_info[pid].addr, PMBUS_MFR_SERIAL, PMBUS_MFR_SERIAL_LEN, buffer, ONLP_I2C_F_FORCE); if(rv >= 0){ aim_strlcpy(info->serial, (char *) (buffer+1), (buffer[0] + 1)); } diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/sfpi.c b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/sfpi.c old mode 100644 new mode 100755 index 4ed89049..b2aa9dff --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/sfpi.c +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/sfpi.c @@ -26,13 +26,12 @@ #include #include #include +#include #include "x86_64_quanta_ly6_rangeley_log.h" #include #include -#include - /** * This table maps the presence gpio, reset gpio, and eeprom file * for each SFP port. @@ -48,47 +47,50 @@ typedef struct sfpmap_s { static sfpmap_t sfpmap__[] = { /* CPLD will not always be stable, use eeprom read instead */ - { 1, -1 /* LY6_CPLD_QSFP_PRSNT(1) */ /* 168 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-16/i2c-32/32-0050/eeprom", NULL }, - { 2, -1 /* LY6_CPLD_QSFP_PRSNT(2) */ /* 172 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-16/i2c-33/33-0050/eeprom", NULL }, - { 3, -1 /* LY6_CPLD_QSFP_PRSNT(3) */ /* 176 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-16/i2c-34/34-0050/eeprom", NULL }, - { 4, -1 /* LY6_CPLD_QSFP_PRSNT(4) */ /* 180 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-16/i2c-35/35-0050/eeprom", NULL }, - { 5, -1 /* LY6_CPLD_QSFP_PRSNT(5) */ /* 184 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-16/i2c-36/36-0050/eeprom", NULL }, - { 6, -1 /* LY6_CPLD_QSFP_PRSNT(6) */ /* 188 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-16/i2c-37/37-0050/eeprom", NULL }, - { 7, -1 /* LY6_CPLD_QSFP_PRSNT(7) */ /* 192 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-16/i2c-38/38-0050/eeprom", NULL }, - { 8, -1 /* LY6_CPLD_QSFP_PRSNT(8) */ /* 196 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-16/i2c-39/39-0050/eeprom", NULL }, - { 9, -1 /* LY6_CPLD_QSFP_PRSNT(9) */ /* 208 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-17/i2c-40/40-0050/eeprom", NULL }, - { 10, -1 /* LY6_CPLD_QSFP_PRSNT(10) */ /* 212 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-17/i2c-41/41-0050/eeprom", NULL }, - { 11, -1 /* LY6_CPLD_QSFP_PRSNT(11) */ /* 216 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-17/i2c-42/42-0050/eeprom", NULL }, - { 12, -1 /* LY6_CPLD_QSFP_PRSNT(12) */ /* 220 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-17/i2c-43/43-0050/eeprom", NULL }, - { 13, -1 /* LY6_CPLD_QSFP_PRSNT(13) */ /* 224 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-17/i2c-44/44-0050/eeprom", NULL }, - { 14, -1 /* LY6_CPLD_QSFP_PRSNT(14) */ /* 228 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-17/i2c-45/45-0050/eeprom", NULL }, - { 15, -1 /* LY6_CPLD_QSFP_PRSNT(15) */ /* 232 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-17/i2c-46/46-0050/eeprom", NULL }, - { 16, -1 /* LY6_CPLD_QSFP_PRSNT(16) */ /* 236 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-17/i2c-47/47-0050/eeprom", NULL }, - { 17, -1 /* LY6_CPLD_QSFP_PRSNT(17) */ /* 248 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-18/i2c-48/48-0050/eeprom", NULL }, - { 18, -1 /* LY6_CPLD_QSFP_PRSNT(18) */ /* 252 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-18/i2c-49/49-0050/eeprom", NULL }, - { 19, -1 /* LY6_CPLD_QSFP_PRSNT(19) */ /* 256 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-18/i2c-50/50-0050/eeprom", NULL }, - { 20, -1 /* LY6_CPLD_QSFP_PRSNT(20) */ /* 260 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-18/i2c-51/51-0050/eeprom", NULL }, - { 21, -1 /* LY6_CPLD_QSFP_PRSNT(21) */ /* 264 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-18/i2c-52/52-0050/eeprom", NULL }, - { 22, -1 /* LY6_CPLD_QSFP_PRSNT(22) */ /* 268 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-18/i2c-53/53-0050/eeprom", NULL }, - { 23, -1 /* LY6_CPLD_QSFP_PRSNT(23) */ /* 272 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-18/i2c-54/54-0050/eeprom", NULL }, - { 24, -1 /* LY6_CPLD_QSFP_PRSNT(24) */ /* 276 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-18/i2c-55/55-0050/eeprom", NULL }, - { 25, -1 /* LY6_CPLD_QSFP_PRSNT(25) */ /* 288 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-19/i2c-56/56-0050/eeprom", NULL }, - { 26, -1 /* LY6_CPLD_QSFP_PRSNT(26) */ /* 292 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-19/i2c-57/57-0050/eeprom", NULL }, - { 27, -1 /* LY6_CPLD_QSFP_PRSNT(27) */ /* 296 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-19/i2c-58/58-0050/eeprom", NULL }, - { 28, -1 /* LY6_CPLD_QSFP_PRSNT(28) */ /* 300 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-19/i2c-59/59-0050/eeprom", NULL }, - { 29, -1 /* LY6_CPLD_QSFP_PRSNT(29) */ /* 304 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-19/i2c-60/60-0050/eeprom", NULL }, - { 30, -1 /* LY6_CPLD_QSFP_PRSNT(30) */ /* 308 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-19/i2c-61/61-0050/eeprom", NULL }, - { 31, -1 /* LY6_CPLD_QSFP_PRSNT(31) */ /* 312 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-19/i2c-62/62-0050/eeprom", NULL }, - { 32, -1 /* LY6_CPLD_QSFP_PRSNT(32) */ /* 316 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-19/i2c-63/63-0050/eeprom", NULL }, + { 1, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(1) */ /* 168 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-16/i2c-32/32-0050/eeprom", NULL }, + { 2, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(2) */ /* 172 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-16/i2c-33/33-0050/eeprom", NULL }, + { 3, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(3) */ /* 176 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-16/i2c-34/34-0050/eeprom", NULL }, + { 4, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(4) */ /* 180 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-16/i2c-35/35-0050/eeprom", NULL }, + { 5, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(5) */ /* 184 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-16/i2c-36/36-0050/eeprom", NULL }, + { 6, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(6) */ /* 188 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-16/i2c-37/37-0050/eeprom", NULL }, + { 7, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(7) */ /* 192 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-16/i2c-38/38-0050/eeprom", NULL }, + { 8, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(8) */ /* 196 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-16/i2c-39/39-0050/eeprom", NULL }, + { 9, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(9) */ /* 208 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-17/i2c-40/40-0050/eeprom", NULL }, + { 10, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(10) */ /* 212 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-17/i2c-41/41-0050/eeprom", NULL }, + { 11, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(11) */ /* 216 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-17/i2c-42/42-0050/eeprom", NULL }, + { 12, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(12) */ /* 220 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-17/i2c-43/43-0050/eeprom", NULL }, + { 13, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(13) */ /* 224 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-17/i2c-44/44-0050/eeprom", NULL }, + { 14, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(14) */ /* 228 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-17/i2c-45/45-0050/eeprom", NULL }, + { 15, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(15) */ /* 232 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-17/i2c-46/46-0050/eeprom", NULL }, + { 16, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(16) */ /* 236 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-17/i2c-47/47-0050/eeprom", NULL }, + { 17, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(17) */ /* 248 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-18/i2c-48/48-0050/eeprom", NULL }, + { 18, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(18) */ /* 252 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-18/i2c-49/49-0050/eeprom", NULL }, + { 19, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(19) */ /* 256 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-18/i2c-50/50-0050/eeprom", NULL }, + { 20, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(20) */ /* 260 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-18/i2c-51/51-0050/eeprom", NULL }, + { 21, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(21) */ /* 264 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-18/i2c-52/52-0050/eeprom", NULL }, + { 22, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(22) */ /* 268 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-18/i2c-53/53-0050/eeprom", NULL }, + { 23, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(23) */ /* 272 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-18/i2c-54/54-0050/eeprom", NULL }, + { 24, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(24) */ /* 276 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-18/i2c-55/55-0050/eeprom", NULL }, + { 25, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(25) */ /* 288 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-19/i2c-56/56-0050/eeprom", NULL }, + { 26, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(26) */ /* 292 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-19/i2c-57/57-0050/eeprom", NULL }, + { 27, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(27) */ /* 296 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-19/i2c-58/58-0050/eeprom", NULL }, + { 28, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(28) */ /* 300 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-19/i2c-59/59-0050/eeprom", NULL }, + { 29, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(29) */ /* 304 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-19/i2c-60/60-0050/eeprom", NULL }, + { 30, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(30) */ /* 308 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-19/i2c-61/61-0050/eeprom", NULL }, + { 31, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(31) */ /* 312 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-19/i2c-62/62-0050/eeprom", NULL }, + { 32, -1 /* QUANTA_LY6_CPLD_QSFP_PRSNT(32) */ /* 316 */, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-19/i2c-63/63-0050/eeprom", NULL }, }; int onlp_sfpi_init(void) { int value = -1, ret; - ret = pca953x_gpio_value_get(QSFP_EN_GPIO_P3V3_PW_EN, &value); - if(ret == ONLP_STATUS_OK && value != GPIO_HIGH) { - ret = pca953x_gpio_value_set(QSFP_EN_GPIO_P3V3_PW_EN, GPIO_HIGH); + + onlp_gpio_export(QUANTA_LY6_QSFP_EN_GPIO_P3V3_PW_EN, ONLP_GPIO_DIRECTION_IN); + ret = onlp_gpio_get(QUANTA_LY6_QSFP_EN_GPIO_P3V3_PW_EN, &value); + if(ret == ONLP_STATUS_OK && value != 1) { + onlp_gpio_export(QUANTA_LY6_QSFP_EN_GPIO_P3V3_PW_EN, ONLP_GPIO_DIRECTION_OUT); + ret = onlp_gpio_set(QUANTA_LY6_QSFP_EN_GPIO_P3V3_PW_EN, 1); sleep(1); } @@ -115,8 +117,8 @@ onlp_sfpi_is_present(int port) int value = 0; sfpmap_t* sfp = SFP_GET(port); if(sfp->present_gpio > 0) { - if(pca953x_gpio_value_get(sfp->present_gpio, &value) == ONLP_STATUS_OK) - return (value == GPIO_LOW); + if(onlp_gpio_get(sfp->present_gpio, &value) == ONLP_STATUS_OK) + return (value == 0); else return ONLP_STATUS_E_MISSING; } diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/sysi.c b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/sysi.c old mode 100644 new mode 100755 index 6e94fa81..26b3c484 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/sysi.c +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/sysi.c @@ -10,6 +10,24 @@ #include "x86_64_quanta_ly6_rangeley_int.h" #include "x86_64_quanta_ly6_rangeley_log.h" #include +#include +#include +#include +#include + +struct led_control_s led_control; + +#define QUANTA_HWMON_REG_TEMP_ALERT_MASK 0x1E +#define QUANTA_HWMON_REG_TEMP_ALERT_CTRL 0x1D +#define QUANTA_HWMON_REG_FAN_ALERT_MASK 0x31 +#define QUANTA_HWMON_REG_FAN_ALERT_CTRL 0x30 + +#define QUANTA_FAN_1_1 0x01 +#define QUANTA_FAN_1_2 0x10 +#define QUANTA_FAN_2_1 0x02 +#define QUANTA_FAN_2_2 0x20 +#define QUANTA_FAN_3_1 0x04 +#define QUANTA_FAN_3_2 0x40 const char* onlp_sysi_platform_get(void) @@ -20,6 +38,49 @@ onlp_sysi_platform_get(void) int onlp_sysi_init(void) { + /* Initial value */ + led_control.PMCnt = 0; + led_control.fan_alert = 0xff; + led_control.psu1_present = 0; + led_control.psu2_present = 0; + led_control.psu1_power_good = 0; + led_control.psu2_power_good = 0; + + /* Set PSoc Fan-Alert Enable */ + onlp_i2c_writeb(0, 0x4e, QUANTA_HWMON_REG_TEMP_ALERT_MASK, 0x37, ONLP_I2C_F_FORCE); + onlp_i2c_writeb(0, 0x4e, QUANTA_HWMON_REG_TEMP_ALERT_CTRL, 0x3, ONLP_I2C_F_FORCE); + onlp_i2c_writeb(0, 0x4e, QUANTA_HWMON_REG_FAN_ALERT_MASK, 0x77, ONLP_I2C_F_FORCE); + onlp_i2c_writeb(0, 0x4e, QUANTA_HWMON_REG_FAN_ALERT_CTRL, 0x1, ONLP_I2C_F_FORCE); + + /* Config GPIO */ + /* LED Output */ + onlp_gpio_export(QUANTA_LY6_CPU_BOARD_SYS_P1, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY6_CPU_BOARD_SYS_P2, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY6_PSU_GPIO_PSU1_GREEN_R, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY6_PSU_GPIO_PSU1_RED_R, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY6_PSU_GPIO_PSU2_GREEN_R, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY6_PSU_GPIO_PSU2_RED_R, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY6_FAN_FAIL_LED_1, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY6_FAN_FAIL_LED_2, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY6_FAN_FAIL_LED_3, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY6_PSU_GPIO_FAN_GREEN_R, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY6_PSU_GPIO_FAN_RED_R, ONLP_GPIO_DIRECTION_OUT); + /* PSU Input */ + onlp_gpio_export(QUANTA_LY6_PSU_GPIO_PSU1_PRSNT_N, ONLP_GPIO_DIRECTION_IN); + onlp_gpio_export(QUANTA_LY6_PSU_GPIO_PSU1_PWRGD, ONLP_GPIO_DIRECTION_IN); + onlp_gpio_export(QUANTA_LY6_PSU_GPIO_PSU2_PRSNT_N, ONLP_GPIO_DIRECTION_IN); + onlp_gpio_export(QUANTA_LY6_PSU_GPIO_PSU2_PWRGD, ONLP_GPIO_DIRECTION_IN); + /* FAN Input */ + onlp_gpio_export(QUANTA_LY6_FAN_PRSNT_N_1, ONLP_GPIO_DIRECTION_IN); + onlp_gpio_export(QUANTA_LY6_FAN_PRSNT_N_2, ONLP_GPIO_DIRECTION_IN); + onlp_gpio_export(QUANTA_LY6_FAN_PRSNT_N_3, ONLP_GPIO_DIRECTION_IN); + + /* Set LED to green */ + onlp_ledi_mode_set(LED_OID_SYSTEM, ONLP_LED_MODE_GREEN); + led_control.psu_status_changed = 1; + led_control.fan_status_changed = 1; + onlp_sysi_platform_manage_leds(); + return ONLP_STATUS_OK; } @@ -72,7 +133,141 @@ onlp_sysi_oids_get(onlp_oid_t* table, int max) *e++ = PSU_OID_PSU2; /* - * Todo - LEDs + * 7 LEDs */ + *e++ = LED_OID_SYSTEM; + *e++ = LED_OID_FAN; + *e++ = LED_OID_PSU_1; + *e++ = LED_OID_PSU_2; + *e++ = LED_OID_FAN_FAIL_1; + *e++ = LED_OID_FAN_FAIL_2; + *e++ = LED_OID_FAN_FAIL_3; + return 0; } + +int +update_rpsu_fan_status(void){ + int last_status, rv, value = -1, tmp; + + last_status = led_control.psu1_present; + rv = onlp_gpio_get(QUANTA_LY6_PSU_GPIO_PSU1_PRSNT_N, &value); + if(rv < 0) { + printf("GPIO %d read Error!\n", QUANTA_LY6_PSU_GPIO_PSU1_PRSNT_N); + return rv; + } + led_control.psu1_present = (value ? 0 : 1); + if(last_status != led_control.psu1_present) + led_control.psu_status_changed = 1; + + last_status = led_control.psu1_power_good; + rv = onlp_gpio_get(QUANTA_LY6_PSU_GPIO_PSU1_PWRGD, &value); + if(rv < 0) { + printf("GPIO %d read Error!\n", QUANTA_LY6_PSU_GPIO_PSU1_PWRGD); + return rv; + } + led_control.psu1_power_good = (value ? 1 : 0); + if(last_status != led_control.psu1_power_good) + led_control.psu_status_changed = 1; + + last_status = led_control.psu2_present; + rv = onlp_gpio_get(QUANTA_LY6_PSU_GPIO_PSU2_PRSNT_N, &value); + if(rv < 0) { + printf("GPIO %d read Error!\n", QUANTA_LY6_PSU_GPIO_PSU2_PRSNT_N); + return rv; + } + led_control.psu2_present = (value ? 0 : 1); + if(last_status != led_control.psu2_present) + led_control.psu_status_changed = 1; + + last_status = led_control.psu2_power_good; + rv = onlp_gpio_get(QUANTA_LY6_PSU_GPIO_PSU2_PWRGD, &value); + if(rv < 0) { + printf("GPIO %d read Error!\n", QUANTA_LY6_PSU_GPIO_PSU2_PWRGD); + return rv; + } + led_control.psu2_power_good = (value ? 1 : 0); + if(last_status != led_control.psu2_power_good) + led_control.psu_status_changed = 1; + + tmp = led_control.fan_alert; + led_control.fan_alert = onlp_i2c_readb(0, 0x4e, 0x32, ONLP_I2C_F_FORCE); + if(tmp != led_control.fan_alert) + led_control.fan_status_changed = 1; + + return ONLP_STATUS_OK; +} + +int +onlp_sysi_platform_manage_leds(void) +{ + int rv; + + led_control.PMCnt++; + if(led_control.PMCnt>300) + led_control.PMCnt = 0; + if(led_control.PMCnt % 5 == 1){/* Each 10 seconds detect one time */ + + rv = update_rpsu_fan_status(); + if(rv < 0){ + printf("onlp_sysi_platform_manage_leds error\n"); + return ONLP_STATUS_E_INVALID; + } + + if(led_control.psu_status_changed){ + if(led_control.psu1_present && led_control.psu1_power_good) { + onlp_ledi_mode_set(LED_ID_PSU_1, ONLP_LED_MODE_GREEN); + } + else if(!led_control.psu1_present){ + onlp_ledi_mode_set(LED_ID_PSU_1, ONLP_LED_MODE_OFF); + } + else{ + onlp_ledi_mode_set(LED_ID_PSU_1, ONLP_LED_MODE_RED); + } + + if(led_control.psu2_present && led_control.psu2_power_good) { + onlp_ledi_mode_set(LED_ID_PSU_2, ONLP_LED_MODE_GREEN); + } + else if(!led_control.psu2_present){ + onlp_ledi_mode_set(LED_ID_PSU_2, ONLP_LED_MODE_OFF); + } + else{ + onlp_ledi_mode_set(LED_ID_PSU_2, ONLP_LED_MODE_RED); + } + led_control.psu_status_changed = 0; + } + + if(led_control.fan_status_changed){ + if(!(led_control.fan_alert & QUANTA_FAN_1_1) && !(led_control.fan_alert & QUANTA_FAN_1_2)) { + onlp_ledi_mode_set(LED_ID_FAN_FAIL_1, ONLP_LED_MODE_OFF); + } + else{ + onlp_ledi_mode_set(LED_ID_FAN_FAIL_1, ONLP_LED_MODE_RED); + } + + if(!(led_control.fan_alert & QUANTA_FAN_2_1) && !(led_control.fan_alert & QUANTA_FAN_2_2)) { + onlp_ledi_mode_set(LED_ID_FAN_FAIL_2, ONLP_LED_MODE_OFF); + } + else{ + onlp_ledi_mode_set(LED_ID_FAN_FAIL_2, ONLP_LED_MODE_RED); + } + + if(!(led_control.fan_alert & QUANTA_FAN_3_1) && !(led_control.fan_alert & QUANTA_FAN_3_2)) { + onlp_ledi_mode_set(LED_ID_FAN_FAIL_3, ONLP_LED_MODE_OFF); + } + else{ + onlp_ledi_mode_set(LED_ID_FAN_FAIL_3, ONLP_LED_MODE_RED); + } + + if(!led_control.fan_alert){ + onlp_ledi_mode_set(LED_ID_FAN, ONLP_LED_MODE_GREEN); + } + else{ + onlp_ledi_mode_set(LED_ID_FAN, ONLP_LED_MODE_RED); + } + led_control.fan_status_changed = 0; + } + } + + return ONLP_STATUS_OK; +} \ No newline at end of file diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/x86_64_quanta_ly6_rangeley_int.h b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/x86_64_quanta_ly6_rangeley_int.h old mode 100644 new mode 100755 index 20723531..8f1c4edc --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/x86_64_quanta_ly6_rangeley_int.h +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/onlp/builds/src/x86_64_quanta_ly6_rangeley/module/src/x86_64_quanta_ly6_rangeley_int.h @@ -217,9 +217,6 @@ extern aim_map_si_t fan_oid_map[]; extern aim_map_si_t fan_oid_desc_map[]; /* */ - -#define SYS_HWMON_PREFIX "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/0-004e" - /* psu info table */ struct psu_info_s { char path[PATH_MAX]; @@ -228,4 +225,82 @@ struct psu_info_s { int addr; }; +/** led_id */ +typedef enum led_id_e { + LED_ID_SYSTEM = 1, + LED_ID_FAN = 2, + LED_ID_PSU_1 = 3, + LED_ID_PSU_2 = 4, + LED_ID_FAN_FAIL_1 = 5, + LED_ID_FAN_FAIL_2 = 6, + LED_ID_FAN_FAIL_3 = 7, +} led_id_t; + +/** Enum names. */ +const char* led_id_name(led_id_t e); + +/** Enum values. */ +int led_id_value(const char* str, led_id_t* e, int substr); + +/** Enum descriptions. */ +const char* led_id_desc(led_id_t e); + +/** Enum validator. */ +int led_id_valid(led_id_t e); + +/** validator */ +#define LED_ID_VALID(_e) \ + (led_id_valid((_e))) + +/** led_id_map table. */ +extern aim_map_si_t led_id_map[]; +/** led_id_desc_map table. */ +extern aim_map_si_t led_id_desc_map[]; + +/** led_oid */ +typedef enum led_oid_e { + LED_OID_SYSTEM = ONLP_LED_ID_CREATE(LED_ID_SYSTEM), + LED_OID_FAN = ONLP_LED_ID_CREATE(LED_ID_FAN), + LED_OID_PSU_1 = ONLP_LED_ID_CREATE(LED_ID_PSU_1), + LED_OID_PSU_2 = ONLP_LED_ID_CREATE(LED_ID_PSU_2), + LED_OID_FAN_FAIL_1 = ONLP_LED_ID_CREATE(LED_ID_FAN_FAIL_1), + LED_OID_FAN_FAIL_2 = ONLP_LED_ID_CREATE(LED_ID_FAN_FAIL_2), + LED_OID_FAN_FAIL_3 = ONLP_LED_ID_CREATE(LED_ID_FAN_FAIL_3), +} led_oid_t; + +/** Enum names. */ +const char* led_oid_name(led_oid_t e); + +/** Enum values. */ +int led_oid_value(const char* str, led_oid_t* e, int substr); + +/** Enum descriptions. */ +const char* led_oid_desc(led_oid_t e); + +/** Enum validator. */ +int led_oid_valid(led_oid_t e); + +/** validator */ +#define LED_OID_VALID(_e) \ + (led_oid_valid((_e))) + +/** led_oid_map table. */ +extern aim_map_si_t led_oid_map[]; +/** led_oid_desc_map table. */ +extern aim_map_si_t led_oid_desc_map[]; +/* */ + +struct led_control_s{ + int PMCnt; + int psu_status_changed; + int fan_status_changed; + int fan_alert; + int psu1_present; + int psu2_present; + int psu1_power_good; + int psu2_power_good; +}; + +#define SYS_HWMON_PREFIX "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/0-004e" + #endif /* __X86_64_QUANTA_LY6_RANGELEY_INT_H__ */ diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/python/x86_64_quanta_ly6_rangeley_r0/__init__.py b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/python/x86_64_quanta_ly6_rangeley_r0/__init__.py index 48a87b41..a507afba 100755 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/python/x86_64_quanta_ly6_rangeley_r0/__init__.py +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly6-rangeley/platform-config/r0/src/python/x86_64_quanta_ly6_rangeley_r0/__init__.py @@ -8,7 +8,7 @@ class OnlPlatform_x86_64_quanta_ly6_rangeley_r0(OnlPlatformQuanta, SYS_OBJECT_ID='.6.1' def baseconfig(self): - self.insmod("quanta_hwmon") + self.insmod("quanta_hwmon_ly_series") self.insmod("quanta-ly6-i2c-mux") self.insmod("quanta_platform_ly6") diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/inc/quanta_lib/gpio.h b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/inc/quanta_lib/gpio.h deleted file mode 100644 index b3096ec8..00000000 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/inc/quanta_lib/gpio.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef __QUANTA_LIB_GPIO_H__ -#define __QUANTA_LIB_GPIO_H__ - -#define GPIO_LOW 0 -#define GPIO_HIGH 1 - -#define GPIO_IN 0 -#define GPIO_OUT 1 - -#define GPIO_PATH "/sys/class/gpio" -#define GPIO_EXPORT GPIO_PATH "/export" -#define GPIO_UNEXPORT GPIO_PATH "/unexport" -#define GPIO_PREF GPIO_PATH "/gpio" - -int pca953x_gpio_value_get(int gpio, int *value); -int pca953x_gpio_direction_set(int gpio, int direction); -int pca953x_gpio_value_set(int gpio, int value); - -#endif /* __QUANTA_LIB_GPIO_H__ */ diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/inc/quanta_lib/i2c.h b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/inc/quanta_lib/i2c.h deleted file mode 100644 index 6bf8397a..00000000 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/inc/quanta_lib/i2c.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __QUANTA_LIB_I2C_H__ -#define __QUANTA_LIB_I2C_H__ - -int i2c_block_read(int bus, uint8_t addr, uint8_t offset, int size, - uint8_t* rdata, uint32_t flags); - -#endif /* __QUANTA_LIB_I2C_H__ */ diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/src/gpio.c b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/src/gpio.c deleted file mode 100644 index cfbc1b83..00000000 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/src/gpio.c +++ /dev/null @@ -1,82 +0,0 @@ -#include -#include -#include -#include -#include - -static int file_exists(char *filename) { - struct stat st; - return (stat(filename, &st) == 0); -} - -static int try_export_gpio(int gpio) { - char filename[PATH_MAX]; - - memset(filename, 0, sizeof(filename)); - sprintf(filename, "%s%d/value", GPIO_PREF, gpio); - - if(!file_exists(filename)) { - onlp_file_write_int(gpio, GPIO_EXPORT); - } - - return ONLP_STATUS_OK; -} - -static int try_unexport_gpio(int gpio) { - char filename[PATH_MAX]; - - memset(filename, 0, sizeof(filename)); - sprintf(filename, "%s%d/value", GPIO_PREF, gpio); - - if(file_exists(filename)) { - onlp_file_write_int(gpio, GPIO_UNEXPORT); - } - - return ONLP_STATUS_OK; -} - -int pca953x_gpio_value_get(int gpio, int *value) { - int ret; - - try_export_gpio(gpio); - ret = onlp_file_read_int(value, "%s%d/value", GPIO_PREF, gpio); - try_unexport_gpio(gpio); - - return ret; - } - -int pca953x_gpio_direction_set(int gpio, int direction) { - int ret; - - try_export_gpio(gpio); - - switch(direction) { - case GPIO_IN: - ret = onlp_file_write_str("in", "%s%d/direction", GPIO_PREF, gpio); - break; - - case GPIO_OUT: - ret = onlp_file_write_str("out", "%s%d/direction", GPIO_PREF, gpio); - break; - - default: - ret = ONLP_STATUS_E_UNSUPPORTED; - break; - } - - try_unexport_gpio(gpio); - - return ret; -} - -int pca953x_gpio_value_set(int gpio, int value) { - int ret; - - pca953x_gpio_direction_set(gpio, GPIO_OUT); - - try_export_gpio(gpio); - ret = onlp_file_write_int(value, "%s%d/value", GPIO_PREF, gpio); - try_unexport_gpio(gpio); - - return ret; -} diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/src/i2c.c b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/src/i2c.c deleted file mode 100644 index 169b2b02..00000000 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/src/i2c.c +++ /dev/null @@ -1,51 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* first byte of rdata is length of result */ -int -i2c_block_read(int bus, uint8_t addr, uint8_t offset, int size, - uint8_t* rdata, uint32_t flags) -{ - int fd; - - fd = onlp_i2c_open(bus, addr, flags); - - if(fd < 0) { - return fd; - } - - int count = size; - uint8_t* p = rdata; - while(count > 0) { - int rsize = (count >= ONLPLIB_CONFIG_I2C_BLOCK_SIZE) ? ONLPLIB_CONFIG_I2C_BLOCK_SIZE : count; - int rv = i2c_smbus_read_i2c_block_data(fd, - offset, - rsize, - p); - - if(rv != rsize) { - printf("i2c-%d: reading address 0x%x, offset %d, size=%d failed", - bus, addr, offset, rsize); - goto error; - } - - p += rsize; - count -= rsize; - } - - close(fd); - return 0; - - error: - close(fd); - return -1; -} - diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/src/psui.c b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/src/psui.c index f773d5a0..aebdade5 100755 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/src/psui.c +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/src/psui.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include "x86_64_quanta_ly8_rangeley_int.h" #include "x86_64_quanta_ly8_rangeley_log.h" @@ -85,7 +84,7 @@ onlp_psui_info_get(onlp_oid_t id, onlp_psu_info_t* info) info->status |= 1; memset(buffer, 0, sizeof(buffer)); - rv = i2c_block_read(psu_info[pid].busno, psu_info[pid].addr, PMBUS_MFR_MODEL, PMBUS_MFR_MODEL_LEN, buffer, ONLP_I2C_F_FORCE); + rv = onlp_i2c_block_read(psu_info[pid].busno, psu_info[pid].addr, PMBUS_MFR_MODEL, PMBUS_MFR_MODEL_LEN, buffer, ONLP_I2C_F_FORCE); if(rv >= 0) { aim_strlcpy(info->model, (char *) (buffer+1), (buffer[0]+1)); } @@ -94,7 +93,7 @@ onlp_psui_info_get(onlp_oid_t id, onlp_psu_info_t* info) } memset(buffer, 0, sizeof(buffer)); - rv = i2c_block_read(psu_info[pid].busno, psu_info[pid].addr, PMBUS_MFR_SERIAL, PMBUS_MFR_SERIAL_LEN, buffer, ONLP_I2C_F_FORCE); + rv = onlp_i2c_block_read(psu_info[pid].busno, psu_info[pid].addr, PMBUS_MFR_SERIAL, PMBUS_MFR_SERIAL_LEN, buffer, ONLP_I2C_F_FORCE); if(rv >= 0) { aim_strlcpy(info->serial, (char *) (buffer+1), (buffer[0] + 1)); } else { diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/src/sfpi.c b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/src/sfpi.c index 3ec12672..236f1f82 100755 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/src/sfpi.c +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/src/sfpi.c @@ -26,13 +26,12 @@ #include #include #include +#include #include "x86_64_quanta_ly8_rangeley_log.h" #include #include -#include - /** * This table maps the presence gpio, reset gpio, and eeprom file * for each SFP port. @@ -103,22 +102,35 @@ static sfpmap_t sfpmap__[] = { 70, QUANTA_LY8_QSFP_QDB_GPIO_PRSNT_70_N /* 446 */, "/sys/class/gpio/gpio446/value", "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-23/i2c-89/89-0050/eeprom", "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-23/i2c-89/89-0051/eeprom" }, }; +#define SFP_GET(_port) (sfpmap__ + _port) + int onlp_sfpi_init(void) { - int value = -1, ret; - ret = pca953x_gpio_value_get(QUANTA_LY8_QSFP_EN_GPIO_P3V3_PW_EN, &value); - if(ret == ONLP_STATUS_OK && value != GPIO_HIGH) { - ret = pca953x_gpio_value_set(QUANTA_LY8_QSFP_EN_GPIO_P3V3_PW_EN, GPIO_HIGH); + int value = -1, ret, i; + sfpmap_t* sfp; + + onlp_gpio_export(QUANTA_LY8_QSFP_EN_GPIO_P3V3_PW_EN, ONLP_GPIO_DIRECTION_IN); + ret = onlp_gpio_get(QUANTA_LY8_QSFP_EN_GPIO_P3V3_PW_EN, &value); + if(ret == ONLP_STATUS_OK && value != 1) { + onlp_gpio_export(QUANTA_LY8_QSFP_EN_GPIO_P3V3_PW_EN, ONLP_GPIO_DIRECTION_OUT); + ret = onlp_gpio_set(QUANTA_LY8_QSFP_EN_GPIO_P3V3_PW_EN, 1); } if(ret == ONLP_STATUS_OK) { - ret = pca953x_gpio_value_get(QUANTA_LY8_QSFP_QDB_GPIO_MOD_EN_N, &value); - if(ret == ONLP_STATUS_OK && value != GPIO_LOW) { - ret = pca953x_gpio_value_set(QUANTA_LY8_QSFP_QDB_GPIO_MOD_EN_N, GPIO_LOW); + onlp_gpio_export(QUANTA_LY8_QSFP_QDB_GPIO_MOD_EN_N, ONLP_GPIO_DIRECTION_IN); + ret = onlp_gpio_get(QUANTA_LY8_QSFP_QDB_GPIO_MOD_EN_N, &value); + if(ret == ONLP_STATUS_OK && value != 0) { + onlp_gpio_export(QUANTA_LY8_QSFP_QDB_GPIO_MOD_EN_N, ONLP_GPIO_DIRECTION_OUT); + ret = onlp_gpio_set(QUANTA_LY8_QSFP_QDB_GPIO_MOD_EN_N, 0); } } + for(i = 0; i < 54; i++) { + sfp = SFP_GET(i); + onlp_gpio_export(sfp->present_gpio, ONLP_GPIO_DIRECTION_IN); + } + return ret; } @@ -134,16 +146,14 @@ onlp_sfpi_bitmap_get(onlp_sfp_bitmap_t* bmap) return ONLP_STATUS_OK; } -#define SFP_GET(_port) (sfpmap__ + _port) - int onlp_sfpi_is_present(int port) { int value = 0; sfpmap_t* sfp = SFP_GET(port); if(sfp->present_gpio > 0) { - if(pca953x_gpio_value_get(sfp->present_gpio, &value) == ONLP_STATUS_OK) - return (value == GPIO_LOW); + if(onlp_gpio_get(sfp->present_gpio, &value) == ONLP_STATUS_OK) + return (value == 0); else return ONLP_STATUS_E_MISSING; } diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/src/x86_64_quanta_ly8_rangeley_int.h b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/src/x86_64_quanta_ly8_rangeley_int.h index 541e8516..53dbbd7a 100755 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/src/x86_64_quanta_ly8_rangeley_int.h +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/onlp/builds/src/x86_64_quanta_ly8_rangeley/module/src/x86_64_quanta_ly8_rangeley_int.h @@ -225,7 +225,7 @@ struct psu_info_s { int addr; }; -/** fan_id */ +/** led_id */ typedef enum led_id_e { LED_ID_SYSTEM = 1, LED_ID_FAN = 2, diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/python/x86_64_quanta_ly8_rangeley_r0/__init__.py b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/python/x86_64_quanta_ly8_rangeley_r0/__init__.py index 1e0b715a..a8cdbdd2 100755 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/python/x86_64_quanta_ly8_rangeley_r0/__init__.py +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly8-rangeley/platform-config/r0/src/python/x86_64_quanta_ly8_rangeley_r0/__init__.py @@ -9,7 +9,7 @@ class OnlPlatform_x86_64_quanta_ly8_rangeley_r0(OnlPlatformQuanta, def baseconfig(self): self.insmod("emerson700") - self.insmod("quanta_hwmon") + self.insmod("quanta_hwmon_ly_series") self.insmod("quanta_platform_ly8") # make ds1339 as default rtc diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/inc/quanta_lib/gpio.h b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/inc/quanta_lib/gpio.h deleted file mode 100755 index f2882476..00000000 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/inc/quanta_lib/gpio.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef __QUANTA_LIB_GPIO_H__ -#define __QUANTA_LIB_GPIO_H__ - -#define GPIO_LOW 0 -#define GPIO_HIGH 1 - -#define GPIO_IN 0 -#define GPIO_OUT 1 - -#define GPIO_PATH "/sys/class/gpio" -#define GPIO_EXPORT GPIO_PATH "/export" -#define GPIO_UNEXPORT GPIO_PATH "/unexport" -#define GPIO_PREF GPIO_PATH "/gpio" - -int pca953x_gpio_value_get(int gpio, int *value); -int pca953x_gpio_direction_set(int gpio, int direction); -int pca953x_gpio_value_set(int gpio, int value); - -#endif /* __QUANTA_LIB_GPIO_H__ */ diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/inc/quanta_lib/i2c.h b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/inc/quanta_lib/i2c.h deleted file mode 100755 index d93595fa..00000000 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/inc/quanta_lib/i2c.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef __QUANTA_LIB_I2C_H__ -#define __QUANTA_LIB_I2C_H__ - -int i2c_block_read(int bus, uint8_t addr, uint8_t offset, int size, - unsigned char *rdata, uint32_t flags); - -#endif /* __QUANTA_LIB_I2C_H__ */ diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/inc/x86_64_quanta_ly9_rangeley/x86_64_quanta_ly9_rangeley_gpio_table.h b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/inc/x86_64_quanta_ly9_rangeley/x86_64_quanta_ly9_rangeley_gpio_table.h index 486e2682..73892da0 100755 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/inc/x86_64_quanta_ly9_rangeley/x86_64_quanta_ly9_rangeley_gpio_table.h +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/inc/x86_64_quanta_ly9_rangeley/x86_64_quanta_ly9_rangeley_gpio_table.h @@ -5,49 +5,55 @@ * defined within platform/quanta_switch.c * Quanta Switch Platform driver */ -#define PCA953x_GPIO(P1, P2) (P1*8+P2) +#define QUANTA_LY9_PCA953x_GPIO(P1, P2) (P1*8+P2) -#define PCA9555_GPIO_SIZE 0x10 +#define QUANTA_LY9_PCA9555_GPIO_SIZE 0x10 -#define I2C_GPIO_BASE 0x80 +#define QUANTA_LY9_I2C_GPIO_CPU_BASE 0x40 -#define FAN_GPIO_BASE (I2C_GPIO_BASE) -#define FAN_GPIO_SIZE PCA9555_GPIO_SIZE -#define FAN_PRSNT_N_1 (FAN_GPIO_BASE + PCA953x_GPIO(0,4)) -#define FAN_PRSNT_N_2 (FAN_GPIO_BASE + PCA953x_GPIO(0,5)) -#define FAN_PRSNT_N_3 (FAN_GPIO_BASE + PCA953x_GPIO(0,6)) -#define FAN_BF_DET1 (FAN_GPIO_BASE + PCA953x_GPIO(1,0)) -#define FAN_BF_DET2 (FAN_GPIO_BASE + PCA953x_GPIO(1,1)) -#define FAN_BF_DET3 (FAN_GPIO_BASE + PCA953x_GPIO(1,2)) -#define FAN_FAIL_LED_1 (FAN_GPIO_BASE + PCA953x_GPIO(1,4)) -#define FAN_FAIL_LED_2 (FAN_GPIO_BASE + PCA953x_GPIO(1,5)) -#define FAN_FAIL_LED_3 (FAN_GPIO_BASE + PCA953x_GPIO(1,6)) +#define QUANTA_LY9_CPU_BOARD_GPIO_BASE (QUANTA_LY9_I2C_GPIO_CPU_BASE) +#define QUANTA_LY9_CPU_BOARD_SYS_P1 (QUANTA_LY9_CPU_BOARD_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(1,2)) +#define QUANTA_LY9_CPU_BOARD_SYS_P2 (QUANTA_LY9_CPU_BOARD_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(1,3)) -#define QSFP_EN_GPIO_BASE (FAN_GPIO_BASE + FAN_GPIO_SIZE) -#define QSFP_EN_GPIO_SIZE PCA9555_GPIO_SIZE -#define QSFP_EN_GPIO_P3V3_PW_GD (QSFP_EN_GPIO_BASE + PCA953x_GPIO(0,4)) -#define QSFP_EN_GPIO_P3V3_PW_EN (QSFP_EN_GPIO_BASE + PCA953x_GPIO(0,5)) -#define QSFP_EN_GPIO_QDB_PRSNT (QSFP_EN_GPIO_BASE + PCA953x_GPIO(0,6)) +#define QUANTA_LY9_I2C_GPIO_BASE 0x80 -#define QSFP_QDB_GPIO_BASE (QSFP_EN_GPIO_BASE + QSFP_EN_GPIO_SIZE) -#define QSFP_QDB_GPIO_SIZE PCA9555_GPIO_SIZE -#define QSFP_QDB_GPIO_PRSNT_53_N (QSFP_QDB_GPIO_BASE + PCA953x_GPIO(0,2)) -#define QSFP_QDB_GPIO_PRSNT_54_N (QSFP_QDB_GPIO_BASE + PCA953x_GPIO(0,6)) -#define QSFP_QDB_GPIO_MOD_EN_N (QSFP_QDB_GPIO_BASE + PCA953x_GPIO(1,0)) +#define QUANTA_LY9_FAN_GPIO_BASE (QUANTA_LY9_I2C_GPIO_BASE) +#define QUANTA_LY9_FAN_GPIO_SIZE QUANTA_LY9_PCA9555_GPIO_SIZE +#define QUANTA_LY9_FAN_PRSNT_N_1 (QUANTA_LY9_FAN_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(0,4)) +#define QUANTA_LY9_FAN_PRSNT_N_2 (QUANTA_LY9_FAN_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(0,5)) +#define QUANTA_LY9_FAN_PRSNT_N_3 (QUANTA_LY9_FAN_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(0,6)) +#define QUANTA_LY9_FAN_BF_DET1 (QUANTA_LY9_FAN_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(1,0)) +#define QUANTA_LY9_FAN_BF_DET2 (QUANTA_LY9_FAN_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(1,1)) +#define QUANTA_LY9_FAN_BF_DET3 (QUANTA_LY9_FAN_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(1,2)) +#define QUANTA_LY9_FAN_FAIL_LED_1 (QUANTA_LY9_FAN_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(1,4)) +#define QUANTA_LY9_FAN_FAIL_LED_2 (QUANTA_LY9_FAN_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(1,5)) +#define QUANTA_LY9_FAN_FAIL_LED_3 (QUANTA_LY9_FAN_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(1,6)) -#define PSU_GPIO_BASE (QSFP_QDB_GPIO_BASE + QSFP_QDB_GPIO_SIZE) -#define PSU_GPIO_SIZE PCA9555_GPIO_SIZE -#define PSU_GPIO_PSU1_PRSNT_N (PSU_GPIO_BASE + PCA953x_GPIO(0,0)) -#define PSU_GPIO_PSU1_PWRGD (PSU_GPIO_BASE + PCA953x_GPIO(0,1)) -#define PSU_GPIO_PSU2_PRSNT_N (PSU_GPIO_BASE + PCA953x_GPIO(0,3)) -#define PSU_GPIO_PSU2_PWRGD (PSU_GPIO_BASE + PCA953x_GPIO(0,4)) -#define PSU_GPIO_PSU1_AC_OK (PSU_GPIO_BASE + PCA953x_GPIO(0,6)) -#define PSU_GPIO_PSU2_AC_OK (PSU_GPIO_BASE + PCA953x_GPIO(0,7)) -#define PSU_GPIO_PSU1_GREEN_R (PSU_GPIO_BASE + PCA953x_GPIO(1,2)) -#define PSU_GPIO_PSU1_RED_R (PSU_GPIO_BASE + PCA953x_GPIO(1,3)) -#define PSU_GPIO_PSU2_GREEN_R (PSU_GPIO_BASE + PCA953x_GPIO(1,4)) -#define PSU_GPIO_PSU2_RED_R (PSU_GPIO_BASE + PCA953x_GPIO(1,5)) -#define PSU_GPIO_FAN_GREEN_R (PSU_GPIO_BASE + PCA953x_GPIO(1,6)) -#define PSU_GPIO_FAN_RED_R (PSU_GPIO_BASE + PCA953x_GPIO(1,7)) +#define QUANTA_LY9_QSFP_EN_GPIO_BASE (QUANTA_LY9_FAN_GPIO_BASE + QUANTA_LY9_FAN_GPIO_SIZE) +#define QUANTA_LY9_QSFP_EN_GPIO_SIZE QUANTA_LY9_PCA9555_GPIO_SIZE +#define QUANTA_LY9_QSFP_EN_GPIO_P3V3_PW_GD (QUANTA_LY9_QSFP_EN_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(0,4)) +#define QUANTA_LY9_QSFP_EN_GPIO_P3V3_PW_EN (QUANTA_LY9_QSFP_EN_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(0,5)) +#define QUANTA_LY9_QSFP_EN_GPIO_QDB_PRSNT (QUANTA_LY9_QSFP_EN_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(0,6)) + +#define QUANTA_LY9_QSFP_QDB_GPIO_BASE (QUANTA_LY9_QSFP_EN_GPIO_BASE + QUANTA_LY9_QSFP_EN_GPIO_SIZE) +#define QUANTA_LY9_QSFP_QDB_GPIO_SIZE QUANTA_LY9_PCA9555_GPIO_SIZE +#define QUANTA_LY9_QSFP_QDB_GPIO_PRSNT_53_N (QUANTA_LY9_QSFP_QDB_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(0,2)) +#define QUANTA_LY9_QSFP_QDB_GPIO_PRSNT_54_N (QUANTA_LY9_QSFP_QDB_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(0,6)) +#define QUANTA_LY9_QSFP_QDB_GPIO_MOD_EN_N (QUANTA_LY9_QSFP_QDB_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(1,0)) + +#define QUANTA_LY9_PSU_GPIO_BASE (QUANTA_LY9_QSFP_QDB_GPIO_BASE + QUANTA_LY9_QSFP_QDB_GPIO_SIZE) +#define QUANTA_LY9_PSU_GPIO_SIZE QUANTA_LY9_PCA9555_GPIO_SIZE +#define QUANTA_LY9_PSU_GPIO_PSU1_PRSNT_N (QUANTA_LY9_PSU_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(0,0)) +#define QUANTA_LY9_PSU_GPIO_PSU1_PWRGD (QUANTA_LY9_PSU_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(0,1)) +#define QUANTA_LY9_PSU_GPIO_PSU2_PRSNT_N (QUANTA_LY9_PSU_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(0,3)) +#define QUANTA_LY9_PSU_GPIO_PSU2_PWRGD (QUANTA_LY9_PSU_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(0,4)) +#define QUANTA_LY9_PSU_GPIO_PSU1_AC_OK (QUANTA_LY9_PSU_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(0,6)) +#define QUANTA_LY9_PSU_GPIO_PSU2_AC_OK (QUANTA_LY9_PSU_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(0,7)) +#define QUANTA_LY9_PSU_GPIO_PSU1_GREEN_R (QUANTA_LY9_PSU_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(1,2)) +#define QUANTA_LY9_PSU_GPIO_PSU1_RED_R (QUANTA_LY9_PSU_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(1,3)) +#define QUANTA_LY9_PSU_GPIO_PSU2_GREEN_R (QUANTA_LY9_PSU_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(1,4)) +#define QUANTA_LY9_PSU_GPIO_PSU2_RED_R (QUANTA_LY9_PSU_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(1,5)) +#define QUANTA_LY9_PSU_GPIO_FAN_GREEN_R (QUANTA_LY9_PSU_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(1,6)) +#define QUANTA_LY9_PSU_GPIO_FAN_RED_R (QUANTA_LY9_PSU_GPIO_BASE + QUANTA_LY9_PCA953x_GPIO(1,7)) #endif /* __X86_64_QUANTA_LY9_RANGELEY_GPIO_TABLE_H__ */ diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/fani.c b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/fani.c index 474d5a6c..4975129e 100755 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/fani.c +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/fani.c @@ -30,7 +30,7 @@ #include "x86_64_quanta_ly9_rangeley_log.h" #include -#include +#include int onlp_fani_init(void) @@ -45,13 +45,13 @@ struct fan_gpio_s { static struct fan_gpio_s fan_gpio[] = { {}, /* Not used */ - { .present = FAN_PRSNT_N_1, .fan_dir_detect = FAN_BF_DET1 }, - { .present = FAN_PRSNT_N_2, .fan_dir_detect = FAN_BF_DET2 }, - { .present = FAN_PRSNT_N_3, .fan_dir_detect = FAN_BF_DET3 }, + { .present = QUANTA_LY9_FAN_PRSNT_N_1, .fan_dir_detect = QUANTA_LY9_FAN_BF_DET1 }, + { .present = QUANTA_LY9_FAN_PRSNT_N_2, .fan_dir_detect = QUANTA_LY9_FAN_BF_DET2 }, + { .present = QUANTA_LY9_FAN_PRSNT_N_3, .fan_dir_detect = QUANTA_LY9_FAN_BF_DET3 }, {}, /* Not used */ - { .present = FAN_PRSNT_N_1, .fan_dir_detect = FAN_BF_DET1 }, - { .present = FAN_PRSNT_N_2, .fan_dir_detect = FAN_BF_DET2 }, - { .present = FAN_PRSNT_N_3, .fan_dir_detect = FAN_BF_DET3 }, + { .present = QUANTA_LY9_FAN_PRSNT_N_1, .fan_dir_detect = QUANTA_LY9_FAN_BF_DET1 }, + { .present = QUANTA_LY9_FAN_PRSNT_N_2, .fan_dir_detect = QUANTA_LY9_FAN_BF_DET2 }, + { .present = QUANTA_LY9_FAN_PRSNT_N_3, .fan_dir_detect = QUANTA_LY9_FAN_BF_DET3 }, {}, /* Not used */ }; @@ -61,11 +61,11 @@ sys_fan_info_get__(onlp_fan_info_t* info, int id) int value = 0; int rv; - if(pca953x_gpio_value_get(fan_gpio[id].present, &value) == ONLP_STATUS_OK - && value == GPIO_LOW) { + if(onlp_gpio_get(fan_gpio[id].present, &value) == ONLP_STATUS_OK + && value == 0) { info->status = ONLP_FAN_STATUS_PRESENT; - if(pca953x_gpio_value_get(fan_gpio[id].fan_dir_detect, &value) == ONLP_STATUS_OK - && value == GPIO_LOW) { + if(onlp_gpio_get(fan_gpio[id].fan_dir_detect, &value) == ONLP_STATUS_OK + && value == 0) { info->status |= ONLP_FAN_STATUS_F2B; info->caps |= ONLP_FAN_CAPS_F2B; } diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/gpio.c b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/gpio.c deleted file mode 100755 index cfbc1b83..00000000 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/gpio.c +++ /dev/null @@ -1,82 +0,0 @@ -#include -#include -#include -#include -#include - -static int file_exists(char *filename) { - struct stat st; - return (stat(filename, &st) == 0); -} - -static int try_export_gpio(int gpio) { - char filename[PATH_MAX]; - - memset(filename, 0, sizeof(filename)); - sprintf(filename, "%s%d/value", GPIO_PREF, gpio); - - if(!file_exists(filename)) { - onlp_file_write_int(gpio, GPIO_EXPORT); - } - - return ONLP_STATUS_OK; -} - -static int try_unexport_gpio(int gpio) { - char filename[PATH_MAX]; - - memset(filename, 0, sizeof(filename)); - sprintf(filename, "%s%d/value", GPIO_PREF, gpio); - - if(file_exists(filename)) { - onlp_file_write_int(gpio, GPIO_UNEXPORT); - } - - return ONLP_STATUS_OK; -} - -int pca953x_gpio_value_get(int gpio, int *value) { - int ret; - - try_export_gpio(gpio); - ret = onlp_file_read_int(value, "%s%d/value", GPIO_PREF, gpio); - try_unexport_gpio(gpio); - - return ret; - } - -int pca953x_gpio_direction_set(int gpio, int direction) { - int ret; - - try_export_gpio(gpio); - - switch(direction) { - case GPIO_IN: - ret = onlp_file_write_str("in", "%s%d/direction", GPIO_PREF, gpio); - break; - - case GPIO_OUT: - ret = onlp_file_write_str("out", "%s%d/direction", GPIO_PREF, gpio); - break; - - default: - ret = ONLP_STATUS_E_UNSUPPORTED; - break; - } - - try_unexport_gpio(gpio); - - return ret; -} - -int pca953x_gpio_value_set(int gpio, int value) { - int ret; - - pca953x_gpio_direction_set(gpio, GPIO_OUT); - - try_export_gpio(gpio); - ret = onlp_file_write_int(value, "%s%d/value", GPIO_PREF, gpio); - try_unexport_gpio(gpio); - - return ret; -} diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/i2c.c b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/i2c.c deleted file mode 100755 index 8f72df0c..00000000 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/i2c.c +++ /dev/null @@ -1,97 +0,0 @@ -#include -#include -#include -#include -#include -#include -#if ONLPLIB_CONFIG_I2C_USE_CUSTOM_HEADER == 1 -#include -#else -#include -#endif -#include -#include -#include "x86_64_quanta_ly9_rangeley_log.h" -#include -#include - -int i2c_dev_smbus_access(int file, char read_write, __u8 command, - int size, union i2c_smbus_data *data) -{ - struct i2c_smbus_ioctl_data args; - - args.read_write = read_write; - args.command = command; - args.size = size; - args.data = data; - return ioctl(file, I2C_SMBUS, &args); -} - -int i2c_dev_read_block(int file, uint8_t command, unsigned char *buffer, int length) -{ - union i2c_smbus_data data; - int i; - - if (length > 32) - length = 32; - data.block[0] = length; - if (i2c_dev_smbus_access(file, I2C_SMBUS_READ, command, - length == 32 ? I2C_SMBUS_I2C_BLOCK_BROKEN : - I2C_SMBUS_I2C_BLOCK_DATA, &data)) - return -1; - else{ - for (i = 1; i <= data.block[0]; i++) - buffer[i - 1] = data.block[i]; - } - return 0; -} - -/* first byte of rdata is length of result */ -int -i2c_block_read(int bus, uint8_t addr, uint8_t offset, int size, - unsigned char *rdata, uint32_t flags) -{ - int fd; - int force = I2C_SLAVE, rv; - - fd = onlp_i2c_open(bus, addr, flags); - - if(fd < 0) { - return fd; - } - - fd = onlp_file_open(O_RDWR, 1, "/dev/i2c-%d", bus); - if(fd < 0) { - AIM_LOG_MSG("/dev/i2c-%d open Error!", bus); - return fd; - } - - /* Set SLAVE or SLAVE_FORCE address */ - rv = ioctl(fd, - force ? I2C_SLAVE_FORCE : I2C_SLAVE, - addr); - - if(rv == -1) { - AIM_LOG_ERROR("i2c-%d: %s slave address 0x%x failed: %{errno}", - bus, - (flags & ONLP_I2C_F_FORCE) ? "forcing" : "setting", - addr, - errno); - goto error; - } - - if ((i2c_dev_read_block(fd, offset, rdata, size)) < 0) - { - printf("/dev/i2c-%d read Error!\n", bus); - close (fd); - return -1; - } - - close(fd); - return 0; - - error: - close(fd); - return -1; -} - diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/ledi.c b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/ledi.c new file mode 100755 index 00000000..32e881ca --- /dev/null +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/ledi.c @@ -0,0 +1,210 @@ +#include +#include +#include +#include +#include + +#include "x86_64_quanta_ly9_rangeley_int.h" +#include +#include + +/* + * Get the information for the given LED OID. + */ +static onlp_led_info_t led_info[] = +{ + { }, /* Not used */ + { + { LED_OID_SYSTEM, "System LED", 0 }, + ONLP_LED_STATUS_PRESENT, + ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_ORANGE | ONLP_LED_CAPS_GREEN, + }, + { + { LED_OID_FAN, "Front FAN LED", 0 }, + ONLP_LED_STATUS_PRESENT, + ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_RED | ONLP_LED_CAPS_GREEN, + }, + { + { LED_OID_PSU_1, "Front PSU(1) LED", 0 }, + ONLP_LED_STATUS_PRESENT, + ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_RED | ONLP_LED_CAPS_GREEN, + }, + { + { LED_OID_PSU_2, "Front PSU(2) LED", 0 }, + ONLP_LED_STATUS_PRESENT, + ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_RED | ONLP_LED_CAPS_GREEN, + }, + { + { LED_OID_FAN_FAIL_1, "FAN(1) fail LED", 0 }, + ONLP_LED_STATUS_PRESENT, + ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_RED, + }, + { + { LED_OID_FAN_FAIL_2, "FAN(2) fail LED", 0 }, + ONLP_LED_STATUS_PRESENT, + ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_RED, + }, + { + { LED_OID_FAN_FAIL_3, "FAN(3) fail LED", 0 }, + ONLP_LED_STATUS_PRESENT, + ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_RED, + } +}; + +int +onlp_ledi_init(void) +{ + return ONLP_STATUS_OK; +} + +int +onlp_ledi_info_get(onlp_oid_t id, onlp_led_info_t* info) +{ + + int led_id; + + led_id = ONLP_OID_ID_GET(id); + + *info = led_info[led_id]; + info->status |= ONLP_LED_STATUS_ON; + info->mode |= ONLP_LED_MODE_ON; + + return ONLP_STATUS_OK; +} + +void +Sysfs_Set_System_LED(onlp_led_mode_t mode) +{ + if(mode == ONLP_LED_MODE_GREEN){ + onlp_gpio_set(QUANTA_LY9_CPU_BOARD_SYS_P1, 0); + onlp_gpio_set(QUANTA_LY9_CPU_BOARD_SYS_P2, 1); + } + else if(mode == ONLP_LED_MODE_ORANGE){ + onlp_gpio_set(QUANTA_LY9_CPU_BOARD_SYS_P1, 1); + onlp_gpio_set(QUANTA_LY9_CPU_BOARD_SYS_P2, 0); + } + else{ + onlp_gpio_set(QUANTA_LY9_CPU_BOARD_SYS_P1, 1); + onlp_gpio_set(QUANTA_LY9_CPU_BOARD_SYS_P2, 1); + } +} + +void +Sysfs_Set_Fan_LED(onlp_led_mode_t mode) +{ + if(mode == ONLP_LED_MODE_GREEN){ + onlp_gpio_set(QUANTA_LY9_PSU_GPIO_FAN_GREEN_R, 1); + onlp_gpio_set(QUANTA_LY9_PSU_GPIO_FAN_RED_R, 0); + } + else if(mode == ONLP_LED_MODE_RED){ + onlp_gpio_set(QUANTA_LY9_PSU_GPIO_FAN_GREEN_R, 0); + onlp_gpio_set(QUANTA_LY9_PSU_GPIO_FAN_RED_R, 1); + } + else{ + onlp_gpio_set(QUANTA_LY9_PSU_GPIO_FAN_GREEN_R, 0); + onlp_gpio_set(QUANTA_LY9_PSU_GPIO_FAN_RED_R, 0); + } +} + +void +Sysfs_Set_Psu1_LED(onlp_led_mode_t mode) +{ + if(mode == ONLP_LED_MODE_GREEN){ + onlp_gpio_set(QUANTA_LY9_PSU_GPIO_PSU1_GREEN_R, 1); + onlp_gpio_set(QUANTA_LY9_PSU_GPIO_PSU1_RED_R, 0); + } + else if(mode == ONLP_LED_MODE_RED){ + onlp_gpio_set(QUANTA_LY9_PSU_GPIO_PSU1_GREEN_R, 0); + onlp_gpio_set(QUANTA_LY9_PSU_GPIO_PSU1_RED_R, 1); + } + else{ + onlp_gpio_set(QUANTA_LY9_PSU_GPIO_PSU1_GREEN_R, 0); + onlp_gpio_set(QUANTA_LY9_PSU_GPIO_PSU1_RED_R, 0); + } +} + +void +Sysfs_Set_Psu2_LED(onlp_led_mode_t mode) +{ + if(mode == ONLP_LED_MODE_GREEN){ + onlp_gpio_set(QUANTA_LY9_PSU_GPIO_PSU2_GREEN_R, 1); + onlp_gpio_set(QUANTA_LY9_PSU_GPIO_PSU2_RED_R, 0); + } + else if(mode == ONLP_LED_MODE_RED){ + onlp_gpio_set(QUANTA_LY9_PSU_GPIO_PSU2_GREEN_R, 0); + onlp_gpio_set(QUANTA_LY9_PSU_GPIO_PSU2_RED_R, 1); + } + else{ + onlp_gpio_set(QUANTA_LY9_PSU_GPIO_PSU2_GREEN_R, 0); + onlp_gpio_set(QUANTA_LY9_PSU_GPIO_PSU2_RED_R, 0); + } +} + +void +Sysfs_Set_Fan_Fail1_LED(onlp_led_mode_t mode) +{ + if(mode == ONLP_LED_MODE_RED){ + onlp_gpio_set(QUANTA_LY9_FAN_FAIL_LED_1, 1); + } + else{ + onlp_gpio_set(QUANTA_LY9_FAN_FAIL_LED_1, 0); + } +} + +void +Sysfs_Set_Fan_Fail2_LED(onlp_led_mode_t mode) +{ + if(mode == ONLP_LED_MODE_RED){ + onlp_gpio_set(QUANTA_LY9_FAN_FAIL_LED_2, 1); + } + else{ + onlp_gpio_set(QUANTA_LY9_FAN_FAIL_LED_2, 0); + } +} + +void +Sysfs_Set_Fan_Fail3_LED(onlp_led_mode_t mode) +{ + if(mode == ONLP_LED_MODE_RED){ + onlp_gpio_set(QUANTA_LY9_FAN_FAIL_LED_3, 1); + } + else{ + onlp_gpio_set(QUANTA_LY9_FAN_FAIL_LED_3, 0); + } +} + +int +onlp_ledi_mode_set(onlp_oid_t id, onlp_led_mode_t mode) +{ + int led_id; + + led_id = ONLP_OID_ID_GET(id); + switch (led_id) { + case LED_ID_SYSTEM: + Sysfs_Set_System_LED(mode); + break; + case LED_ID_FAN: + Sysfs_Set_Fan_LED(mode); + break; + case LED_ID_PSU_1: + Sysfs_Set_Psu1_LED(mode); + break; + case LED_ID_PSU_2: + Sysfs_Set_Psu2_LED(mode); + break; + case LED_ID_FAN_FAIL_1: + Sysfs_Set_Fan_Fail1_LED(mode); + break; + case LED_ID_FAN_FAIL_2: + Sysfs_Set_Fan_Fail2_LED(mode); + break; + case LED_ID_FAN_FAIL_3: + Sysfs_Set_Fan_Fail3_LED(mode); + break; + default: + return ONLP_STATUS_E_INTERNAL; + break; + } + + return ONLP_STATUS_OK; +} diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/psui.c b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/psui.c index 1810fa46..3eab15b4 100755 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/psui.c +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/psui.c @@ -11,16 +11,15 @@ #include #include #include -#include -#include +#include #include "x86_64_quanta_ly9_rangeley_int.h" #include "x86_64_quanta_ly9_rangeley_log.h" #include struct psu_info_s psu_info[] = { {}, /* Not used */ - { .path = "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-24/24-006f", .present = PSU_GPIO_PSU1_PRSNT_N, .busno = 24, .addr = 0x6f}, - { .path = "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-25/25-0069", .present = PSU_GPIO_PSU2_PRSNT_N, .busno = 25, .addr = 0x69}, + { .path = "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-24/24-006f", .present = QUANTA_LY9_PSU_GPIO_PSU1_PRSNT_N, .busno = 24, .addr = 0x6f}, + { .path = "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-25/25-0069", .present = QUANTA_LY9_PSU_GPIO_PSU2_PRSNT_N, .busno = 25, .addr = 0x69}, }; int @@ -68,11 +67,11 @@ onlp_psui_info_get(onlp_oid_t id, onlp_psu_info_t* info) uint8_t buffer[ONLP_CONFIG_INFO_STR_MAX]; int value = -1; - rv = pca953x_gpio_value_get(psu_info[pid].present, &value); + rv = onlp_gpio_get(psu_info[pid].present, &value); if(rv < 0) { return rv; } - else if(value == GPIO_HIGH) { + else if(value == 1) { info->status &= ~1; return 0; } @@ -85,7 +84,7 @@ onlp_psui_info_get(onlp_oid_t id, onlp_psu_info_t* info) info->status |= 1; memset(buffer, 0, sizeof(buffer)); - rv = i2c_block_read(psu_info[pid].busno, psu_info[pid].addr, PMBUS_MFR_MODEL, PMBUS_MFR_MODEL_LEN, buffer, ONLP_I2C_F_FORCE); + rv = onlp_i2c_block_read(psu_info[pid].busno, psu_info[pid].addr, PMBUS_MFR_MODEL, PMBUS_MFR_MODEL_LEN, buffer, ONLP_I2C_F_FORCE); buffer[buffer[0] + 1] = 0x00; if(rv >= 0){ aim_strlcpy(info->model, (char *) (buffer+1), (buffer[0] + 1)); @@ -95,7 +94,7 @@ onlp_psui_info_get(onlp_oid_t id, onlp_psu_info_t* info) } memset(buffer, 0, sizeof(buffer)); - rv = i2c_block_read(psu_info[pid].busno, psu_info[pid].addr, PMBUS_MFR_SERIAL, PMBUS_MFR_SERIAL_LEN, buffer, ONLP_I2C_F_FORCE); + rv = onlp_i2c_block_read(psu_info[pid].busno, psu_info[pid].addr, PMBUS_MFR_SERIAL, PMBUS_MFR_SERIAL_LEN, buffer, ONLP_I2C_F_FORCE); buffer[buffer[0] + 1] = 0x00; if(rv >= 0){ aim_strlcpy(info->serial, (char *) (buffer+1), (buffer[0] + 1)); diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/sfpi.c b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/sfpi.c index 2e667c1d..c22748c1 100755 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/sfpi.c +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/sfpi.c @@ -26,13 +26,12 @@ #include #include #include +#include #include "x86_64_quanta_ly9_rangeley_log.h" #include #include -#include - /** * This table maps the presence gpio, reset gpio, and eeprom file * for each SFP port. @@ -63,25 +62,38 @@ typedef struct qsfpmap_s { static qsfpmap_t qsfpmap__[] = { - { 53, QSFP_QDB_GPIO_PRSNT_53_N, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-23/i2c-48/48-0050/eeprom", NULL }, - { 54, QSFP_QDB_GPIO_PRSNT_54_N, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-23/i2c-49/49-0050/eeprom", NULL }, + { 53, QUANTA_LY9_QSFP_QDB_GPIO_PRSNT_53_N, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-23/i2c-48/48-0050/eeprom", NULL }, + { 54, QUANTA_LY9_QSFP_QDB_GPIO_PRSNT_54_N, NULL, "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/i2c-23/i2c-49/49-0050/eeprom", NULL }, }; +#define SFP_GET(_port) (sfpmap__ + _port - 49) +#define QSFP_GET(_port) (qsfpmap__ + _port - 53) + int onlp_sfpi_init(void) { - int value = -1, ret; - ret = pca953x_gpio_value_get(QSFP_EN_GPIO_P3V3_PW_EN, &value); - if(ret == ONLP_STATUS_OK && value != GPIO_LOW) { - ret = pca953x_gpio_value_set(QSFP_EN_GPIO_P3V3_PW_EN, GPIO_LOW); + int value = -1, ret, i; + qsfpmap_t* qsfp; + + onlp_gpio_export(QUANTA_LY9_QSFP_EN_GPIO_P3V3_PW_EN, ONLP_GPIO_DIRECTION_IN); + ret = onlp_gpio_get(QUANTA_LY9_QSFP_EN_GPIO_P3V3_PW_EN, &value); + if(ret == ONLP_STATUS_OK && value != 0) { + onlp_gpio_export(QUANTA_LY9_QSFP_EN_GPIO_P3V3_PW_EN, ONLP_GPIO_DIRECTION_OUT); + ret = onlp_gpio_set(QUANTA_LY9_QSFP_EN_GPIO_P3V3_PW_EN, 0); } if(ret == ONLP_STATUS_OK) { - ret = pca953x_gpio_value_get(QSFP_QDB_GPIO_MOD_EN_N, &value); - if(ret == ONLP_STATUS_OK && value != GPIO_LOW) { - ret = pca953x_gpio_value_set(QSFP_QDB_GPIO_MOD_EN_N, GPIO_LOW); + onlp_gpio_export(QUANTA_LY9_QSFP_QDB_GPIO_MOD_EN_N, ONLP_GPIO_DIRECTION_IN); + ret = onlp_gpio_get(QUANTA_LY9_QSFP_QDB_GPIO_MOD_EN_N, &value); + if(ret == ONLP_STATUS_OK && value != 0) { + onlp_gpio_export(QUANTA_LY9_QSFP_QDB_GPIO_MOD_EN_N, ONLP_GPIO_DIRECTION_OUT); + ret = onlp_gpio_set(QUANTA_LY9_QSFP_QDB_GPIO_MOD_EN_N, 0); } } + for(i = 53; i < 55; i++) { + qsfp = QSFP_GET(i); + onlp_gpio_export(qsfp->present_gpio, ONLP_GPIO_DIRECTION_IN); + } return ret; } @@ -98,9 +110,6 @@ onlp_sfpi_bitmap_get(onlp_sfp_bitmap_t* bmap) return ONLP_STATUS_OK; } -#define SFP_GET(_port) (sfpmap__ + _port - 49) -#define QSFP_GET(_port) (qsfpmap__ + _port - 53) - int onlp_sfpi_is_present(int port) { @@ -110,8 +119,8 @@ onlp_sfpi_is_present(int port) qsfpmap_t* qsfp = QSFP_GET(port); if(qsfp->present_gpio > 0) { - if(pca953x_gpio_value_get(qsfp->present_gpio, &value) == ONLP_STATUS_OK) - return (value == GPIO_LOW); + if(onlp_gpio_get(qsfp->present_gpio, &value) == ONLP_STATUS_OK) + return (value == 0); else return ONLP_STATUS_E_MISSING; } diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/sysi.c b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/sysi.c index 2c648422..d91ef00b 100755 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/sysi.c +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/sysi.c @@ -10,6 +10,24 @@ #include "x86_64_quanta_ly9_rangeley_int.h" #include "x86_64_quanta_ly9_rangeley_log.h" #include +#include +#include +#include +#include + +struct led_control_s led_control; + +#define QUANTA_HWMON_REG_TEMP_ALERT_MASK 0x1E +#define QUANTA_HWMON_REG_TEMP_ALERT_CTRL 0x1D +#define QUANTA_HWMON_REG_FAN_ALERT_MASK 0x31 +#define QUANTA_HWMON_REG_FAN_ALERT_CTRL 0x30 + +#define QUANTA_FAN_1_1 0x01 +#define QUANTA_FAN_1_2 0x10 +#define QUANTA_FAN_2_1 0x02 +#define QUANTA_FAN_2_2 0x20 +#define QUANTA_FAN_3_1 0x04 +#define QUANTA_FAN_3_2 0x40 const char* onlp_sysi_platform_get(void) @@ -20,6 +38,49 @@ onlp_sysi_platform_get(void) int onlp_sysi_init(void) { + /* Initial value */ + led_control.PMCnt = 0; + led_control.fan_alert = 0xff; + led_control.psu1_present = 0; + led_control.psu2_present = 0; + led_control.psu1_power_good = 0; + led_control.psu2_power_good = 0; + + /* Set PSoc Fan-Alert Enable */ + onlp_i2c_writeb(0, 0x4e, QUANTA_HWMON_REG_TEMP_ALERT_MASK, 0x3f, ONLP_I2C_F_FORCE); + onlp_i2c_writeb(0, 0x4e, QUANTA_HWMON_REG_TEMP_ALERT_CTRL, 0x3, ONLP_I2C_F_FORCE); + onlp_i2c_writeb(0, 0x4e, QUANTA_HWMON_REG_FAN_ALERT_MASK, 0x77, ONLP_I2C_F_FORCE); + onlp_i2c_writeb(0, 0x4e, QUANTA_HWMON_REG_FAN_ALERT_CTRL, 0x1, ONLP_I2C_F_FORCE); + + /* Config GPIO */ + /* LED Output */ + onlp_gpio_export(QUANTA_LY9_CPU_BOARD_SYS_P1, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY9_CPU_BOARD_SYS_P2, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY9_PSU_GPIO_PSU1_GREEN_R, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY9_PSU_GPIO_PSU1_RED_R, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY9_PSU_GPIO_PSU2_GREEN_R, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY9_PSU_GPIO_PSU2_RED_R, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY9_FAN_FAIL_LED_1, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY9_FAN_FAIL_LED_2, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY9_FAN_FAIL_LED_3, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY9_PSU_GPIO_FAN_GREEN_R, ONLP_GPIO_DIRECTION_OUT); + onlp_gpio_export(QUANTA_LY9_PSU_GPIO_FAN_RED_R, ONLP_GPIO_DIRECTION_OUT); + /* PSU Input */ + onlp_gpio_export(QUANTA_LY9_PSU_GPIO_PSU1_PRSNT_N, ONLP_GPIO_DIRECTION_IN); + onlp_gpio_export(QUANTA_LY9_PSU_GPIO_PSU1_PWRGD, ONLP_GPIO_DIRECTION_IN); + onlp_gpio_export(QUANTA_LY9_PSU_GPIO_PSU2_PRSNT_N, ONLP_GPIO_DIRECTION_IN); + onlp_gpio_export(QUANTA_LY9_PSU_GPIO_PSU2_PWRGD, ONLP_GPIO_DIRECTION_IN); + /* FAN Input */ + onlp_gpio_export(QUANTA_LY9_FAN_PRSNT_N_1, ONLP_GPIO_DIRECTION_IN); + onlp_gpio_export(QUANTA_LY9_FAN_PRSNT_N_2, ONLP_GPIO_DIRECTION_IN); + onlp_gpio_export(QUANTA_LY9_FAN_PRSNT_N_3, ONLP_GPIO_DIRECTION_IN); + + /* Set LED to green */ + onlp_ledi_mode_set(LED_OID_SYSTEM, ONLP_LED_MODE_GREEN); + led_control.psu_status_changed = 1; + led_control.fan_status_changed = 1; + onlp_sysi_platform_manage_leds(); + return ONLP_STATUS_OK; } @@ -73,7 +134,141 @@ onlp_sysi_oids_get(onlp_oid_t* table, int max) *e++ = PSU_OID_PSU2; /* - * Todo - LEDs + * 7 LEDs */ + *e++ = LED_OID_SYSTEM; + *e++ = LED_OID_FAN; + *e++ = LED_OID_PSU_1; + *e++ = LED_OID_PSU_2; + *e++ = LED_OID_FAN_FAIL_1; + *e++ = LED_OID_FAN_FAIL_2; + *e++ = LED_OID_FAN_FAIL_3; + return 0; } + +int +update_rpsu_fan_status(void){ + int last_status, rv, value = -1, tmp; + + last_status = led_control.psu1_present; + rv = onlp_gpio_get(QUANTA_LY9_PSU_GPIO_PSU1_PRSNT_N, &value); + if(rv < 0) { + printf("GPIO %d read Error!\n", QUANTA_LY9_PSU_GPIO_PSU1_PRSNT_N); + return rv; + } + led_control.psu1_present = (value ? 0 : 1); + if(last_status != led_control.psu1_present) + led_control.psu_status_changed = 1; + + last_status = led_control.psu1_power_good; + rv = onlp_gpio_get(QUANTA_LY9_PSU_GPIO_PSU1_PWRGD, &value); + if(rv < 0) { + printf("GPIO %d read Error!\n", QUANTA_LY9_PSU_GPIO_PSU1_PWRGD); + return rv; + } + led_control.psu1_power_good = (value ? 1 : 0); + if(last_status != led_control.psu1_power_good) + led_control.psu_status_changed = 1; + + last_status = led_control.psu2_present; + rv = onlp_gpio_get(QUANTA_LY9_PSU_GPIO_PSU2_PRSNT_N, &value); + if(rv < 0) { + printf("GPIO %d read Error!\n", QUANTA_LY9_PSU_GPIO_PSU2_PRSNT_N); + return rv; + } + led_control.psu2_present = (value ? 0 : 1); + if(last_status != led_control.psu2_present) + led_control.psu_status_changed = 1; + + last_status = led_control.psu2_power_good; + rv = onlp_gpio_get(QUANTA_LY9_PSU_GPIO_PSU2_PWRGD, &value); + if(rv < 0) { + printf("GPIO %d read Error!\n", QUANTA_LY9_PSU_GPIO_PSU2_PWRGD); + return rv; + } + led_control.psu2_power_good = (value ? 1 : 0); + if(last_status != led_control.psu2_power_good) + led_control.psu_status_changed = 1; + + tmp = led_control.fan_alert; + led_control.fan_alert = onlp_i2c_readb(0, 0x4e, 0x32, ONLP_I2C_F_FORCE); + if(tmp != led_control.fan_alert) + led_control.fan_status_changed = 1; + + return ONLP_STATUS_OK; +} + +int +onlp_sysi_platform_manage_leds(void) +{ + int rv; + + led_control.PMCnt++; + if(led_control.PMCnt>300) + led_control.PMCnt = 0; + if(led_control.PMCnt % 5 == 1){/* Each 10 seconds detect one time */ + + rv = update_rpsu_fan_status(); + if(rv < 0){ + printf("onlp_sysi_platform_manage_leds error\n"); + return ONLP_STATUS_E_INVALID; + } + + if(led_control.psu_status_changed){ + if(led_control.psu1_present && led_control.psu1_power_good) { + onlp_ledi_mode_set(LED_ID_PSU_1, ONLP_LED_MODE_GREEN); + } + else if(!led_control.psu1_present){ + onlp_ledi_mode_set(LED_ID_PSU_1, ONLP_LED_MODE_OFF); + } + else{ + onlp_ledi_mode_set(LED_ID_PSU_1, ONLP_LED_MODE_RED); + } + + if(led_control.psu2_present && led_control.psu2_power_good) { + onlp_ledi_mode_set(LED_ID_PSU_2, ONLP_LED_MODE_GREEN); + } + else if(!led_control.psu2_present){ + onlp_ledi_mode_set(LED_ID_PSU_2, ONLP_LED_MODE_OFF); + } + else{ + onlp_ledi_mode_set(LED_ID_PSU_2, ONLP_LED_MODE_RED); + } + led_control.psu_status_changed = 0; + } + + if(led_control.fan_status_changed){ + if(!(led_control.fan_alert & QUANTA_FAN_1_1) && !(led_control.fan_alert & QUANTA_FAN_1_2)) { + onlp_ledi_mode_set(LED_ID_FAN_FAIL_1, ONLP_LED_MODE_OFF); + } + else{ + onlp_ledi_mode_set(LED_ID_FAN_FAIL_1, ONLP_LED_MODE_RED); + } + + if(!(led_control.fan_alert & QUANTA_FAN_2_1) && !(led_control.fan_alert & QUANTA_FAN_2_2)) { + onlp_ledi_mode_set(LED_ID_FAN_FAIL_2, ONLP_LED_MODE_OFF); + } + else{ + onlp_ledi_mode_set(LED_ID_FAN_FAIL_2, ONLP_LED_MODE_RED); + } + + if(!(led_control.fan_alert & QUANTA_FAN_3_1) && !(led_control.fan_alert & QUANTA_FAN_3_2)) { + onlp_ledi_mode_set(LED_ID_FAN_FAIL_3, ONLP_LED_MODE_OFF); + } + else{ + onlp_ledi_mode_set(LED_ID_FAN_FAIL_3, ONLP_LED_MODE_RED); + } + + if(!led_control.fan_alert){ + onlp_ledi_mode_set(LED_ID_FAN, ONLP_LED_MODE_GREEN); + } + else{ + onlp_ledi_mode_set(LED_ID_FAN, ONLP_LED_MODE_RED); + } + led_control.fan_status_changed = 0; + } + } + + return ONLP_STATUS_OK; +} \ No newline at end of file diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/x86_64_quanta_ly9_rangeley_int.h b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/x86_64_quanta_ly9_rangeley_int.h index 163367e8..b750aae2 100755 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/x86_64_quanta_ly9_rangeley_int.h +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/onlp/builds/src/x86_64_quanta_ly9_rangeley/module/src/x86_64_quanta_ly9_rangeley_int.h @@ -225,6 +225,81 @@ struct psu_info_s { int addr; }; +/** led_id */ +typedef enum led_id_e { + LED_ID_SYSTEM = 1, + LED_ID_FAN = 2, + LED_ID_PSU_1 = 3, + LED_ID_PSU_2 = 4, + LED_ID_FAN_FAIL_1 = 5, + LED_ID_FAN_FAIL_2 = 6, + LED_ID_FAN_FAIL_3 = 7, +} led_id_t; + +/** Enum names. */ +const char* led_id_name(led_id_t e); + +/** Enum values. */ +int led_id_value(const char* str, led_id_t* e, int substr); + +/** Enum descriptions. */ +const char* led_id_desc(led_id_t e); + +/** Enum validator. */ +int led_id_valid(led_id_t e); + +/** validator */ +#define LED_ID_VALID(_e) \ + (led_id_valid((_e))) + +/** led_id_map table. */ +extern aim_map_si_t led_id_map[]; +/** led_id_desc_map table. */ +extern aim_map_si_t led_id_desc_map[]; + +/** led_oid */ +typedef enum led_oid_e { + LED_OID_SYSTEM = ONLP_LED_ID_CREATE(LED_ID_SYSTEM), + LED_OID_FAN = ONLP_LED_ID_CREATE(LED_ID_FAN), + LED_OID_PSU_1 = ONLP_LED_ID_CREATE(LED_ID_PSU_1), + LED_OID_PSU_2 = ONLP_LED_ID_CREATE(LED_ID_PSU_2), + LED_OID_FAN_FAIL_1 = ONLP_LED_ID_CREATE(LED_ID_FAN_FAIL_1), + LED_OID_FAN_FAIL_2 = ONLP_LED_ID_CREATE(LED_ID_FAN_FAIL_2), + LED_OID_FAN_FAIL_3 = ONLP_LED_ID_CREATE(LED_ID_FAN_FAIL_3), +} led_oid_t; + +/** Enum names. */ +const char* led_oid_name(led_oid_t e); + +/** Enum values. */ +int led_oid_value(const char* str, led_oid_t* e, int substr); + +/** Enum descriptions. */ +const char* led_oid_desc(led_oid_t e); + +/** Enum validator. */ +int led_oid_valid(led_oid_t e); + +/** validator */ +#define LED_OID_VALID(_e) \ + (led_oid_valid((_e))) + +/** led_oid_map table. */ +extern aim_map_si_t led_oid_map[]; +/** led_oid_desc_map table. */ +extern aim_map_si_t led_oid_desc_map[]; +/* */ + +struct led_control_s{ + int PMCnt; + int psu_status_changed; + int fan_status_changed; + int fan_alert; + int psu1_present; + int psu2_present; + int psu1_power_good; + int psu2_power_good; +}; #define SYS_HWMON_PREFIX "/sys/devices/pci0000:00/0000:00:1f.3/i2c-0/0-004e" diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/platform-config/r0/src/python/x86_64_quanta_ly9_rangeley_r0/__init__.py b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/platform-config/r0/src/python/x86_64_quanta_ly9_rangeley_r0/__init__.py index 0aa785e9..6cff7f46 100755 --- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/platform-config/r0/src/python/x86_64_quanta_ly9_rangeley_r0/__init__.py +++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly9-rangeley/platform-config/r0/src/python/x86_64_quanta_ly9_rangeley_r0/__init__.py @@ -9,7 +9,7 @@ class OnlPlatform_x86_64_quanta_ly9_rangeley_r0(OnlPlatformQuanta, def baseconfig(self): self.insmod("emerson700") - self.insmod("quanta_hwmon") + self.insmod("quanta_hwmon_ly_series") self.insmod("qci_cpld") self.insmod("quanta_platform_ly9")