Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Belgite platform issues #14841

Closed
wants to merge 6 commits into from
Closed

Fix Belgite platform issues #14841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
00bd8c9
Fix Belgite platform issues
jemifdo Apr 17, 2023
163b20f
Merge branch 'sonic-net:master' into master
jemifdo Apr 17, 2023
ae23370
Use LED names expected by PDDF drivers
jemifdo Apr 25, 2023
0935dc4
Merge branch 'sonic-net:master' into master
jemifdo Apr 25, 2023
267d353
Remove unwanted file
jemifdo Apr 27, 2023
d5e3d95
Merge branch 'master' of https://github.com/jemifdo/sonic-buildimage
jemifdo Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file modified device/celestica/x86_64-cel_belgite-r0/custom_led.bin
View file
Open in desktop
Binary file not shown.
68 changes: 45 additions & 23 deletions device/celestica/x86_64-cel_belgite-r0/led-source-code/cmicx/custom_led.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,25 @@ Here is an exception, please keep in mind:
#include <shared/cmicfw/cmicx_led_public.h>

#define ACTIVITY_TICKS 2
#define READ_LED_ACCU_DATA(base, port) (*((uint16 *)(base + ((port - 1) * sizeof(uint32)))))
#define WRITE_LED_SEND_DATA(base, port, val) (*((uint16 *)(base + ((port - 1) * sizeof(uint32)))) = val)

/*! Macro to calculate LED RAM address. */
#define LED_HW_RAM_ADDR(base, port) \
(base + (port * sizeof(uint32)))

/*! Macro to read LED RAM. */
#define LED_HW_RAM_READ16(base, port) \
*((uint16 *) LED_HW_RAM_ADDR(base, port))

/*! Macro to write LED RAM. */
#define LED_HW_RAM_WRITE16(base, port, val) \
*((uint16 *) LED_HW_RAM_ADDR(base, port)) = (val)

#define PORT_NUM_TOTAL 56

#define LED_GREEN_BICOLOR 0x2 //bit : 10
#define LED_AMBER_BICOLOR 0x1 //bit : 01
#define LED_OFF_BICOLOR 0x3 //bit : 11
#define LED_SW_LINK_UP 0x1

unsigned short portmap[] = {
25, 26, 27, 28, 29, 30, 31, 32,
Expand All @@ -123,47 +134,58 @@ unsigned short portmap[] = {
void custom_led_handler(soc_led_custom_handler_ctrl_t *ctrl,
uint32 activity_count)
{
unsigned short accu_val = 0, send_val = 0;
unsigned short port, physical_port;
uint8 idx = 0;
uint16 accu_val = 0, send_val = 0;
uint16 uc_port = 0, physical_port = 0;

/* Physical port numbers to be used */
for(port = 1; port <= PORT_NUM_TOTAL; port++) {
for(uc_port = 0; uc_port < PORT_NUM_TOTAL; uc_port++) {

physical_port = portmap[port-1];
// change to zero-based
physical_port = portmap[uc_port] - 1;

/* Read value from led_ram bank0 */
accu_val = READ_LED_ACCU_DATA(ctrl->accu_ram_base, physical_port);
accu_val = LED_HW_RAM_READ16(ctrl->accu_ram_base, physical_port);

send_val = 0xff;
send_val = LED_OFF_BICOLOR;

if (((accu_val & LED_OUTPUT_RX) || (accu_val & LED_OUTPUT_TX)) && (activity_count & ACTIVITY_TICKS))
if (((accu_val & LED_HW_RX) || (accu_val & LED_HW_TX)) && (activity_count & ACTIVITY_TICKS))
{
send_val = LED_OFF_BICOLOR;
}
else if ( accu_val & LED_OUTPUT_LINK_UP)
else if (ctrl->led_control_data[physical_port] & LED_SW_LINK_UP)
{
send_val = LED_GREEN_BICOLOR;
}
else
{
send_val = LED_OFF_BICOLOR;
}
}

/* Write value to led_ram bank1 */
WRITE_LED_SEND_DATA(ctrl->pat_ram_base, port, send_val);
LED_HW_RAM_WRITE16(ctrl->pat_ram_base, uc_port, send_val);
} /* for */

/* Send the pattern over LED interface 1 for ports 1 - 56*/
ctrl->intf_ctrl[1].valid = 1;
ctrl->intf_ctrl[1].start_row = 0;
ctrl->intf_ctrl[1].end_row = 55;
ctrl->intf_ctrl[1].pat_width = 2;

/* Invalidate rest of the interfaces */
ctrl->intf_ctrl[0].valid = 0;
ctrl->intf_ctrl[2].valid = 0;
ctrl->intf_ctrl[3].valid = 0;
ctrl->intf_ctrl[4].valid = 0;
/* Configure LED HW interfaces based on board configuration */
for (idx = 0; idx < LED_HW_INTF_MAX_NUM; idx++) {
soc_led_intf_ctrl_t *lic = &ctrl->intf_ctrl[idx];
switch (idx) {
case 0:
lic->valid = 0;
break;
case 1:
lic->valid = 1;
lic->start_row = 0;
lic->end_row = 55;
lic->pat_width = 2;
break;
default:

/* Invalidate rest of the interfaces */
lic->valid = 0;
break;
}
}

return;

Expand Down
73 changes: 35 additions & 38 deletions device/celestica/x86_64-cel_belgite-r0/pddf/pddf-device.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"i2c_dev",
"i2c_mux_pca954x force_deselect_on_exit=1",
"gpio_pca953x",
"mc24lc64t",
"mc24lc64t",
"optoe"
],
"pddf_kos":
Expand All @@ -55,8 +55,8 @@
"pddf_fan_driver_module",
"pddf_fan_module",
"pddf_led_module"
],
"custom_kos":
],
"custom_kos":
[
"pddf_custom_psu",
"pddf_custom_wdt"
Expand Down Expand Up @@ -93,7 +93,7 @@
{
"topo_info": {"parent_bus": "0x0", "dev_addr": "0x52", "dev_type": "24lc64t"},
"dev_attr": {"access_mode": "BLOCK"},
"attr_list":
"attr_list":
[
{"attr_name": "eeprom"}
]
Expand All @@ -110,13 +110,13 @@
[
{"chn":"0", "dev":"CPLD1" },
{"chn":"0", "dev":"FAN-CTRL" },
{"chn":"2", "dev":"PSU1" },
{"chn":"2", "dev":"PSU1" },
{"chn":"2", "dev":"PSU2" },
{"chn":"3", "dev":"TEMP1"},
{"chn":"3", "dev":"TEMP2"},
{"chn":"4", "dev":"TEMP3"},
{"chn":"4", "dev":"TEMP4"},
{"chn":"7", "dev":"MUX2"}
{"chn":"4", "dev":"TEMP4"},
{"chn":"7", "dev":"MUX2"}
]
}
},
Expand All @@ -130,13 +130,13 @@
"channel":
[
{"chn":"0", "dev":"PORT49"},
{"chn":"1", "dev":"PORT50"},
{"chn":"1", "dev":"PORT50"},
{"chn":"2", "dev":"PORT51"},
{"chn":"3", "dev":"PORT52"},
{"chn":"4", "dev":"PORT53"},
{"chn":"5", "dev":"PORT54"},
{"chn":"6", "dev":"PORT55"},
{"chn":"7", "dev":"PORT56"}
{"chn":"7", "dev":"PORT56"}
]
}
},
Expand Down Expand Up @@ -168,7 +168,7 @@
{
"topo_info":{ "parent_bus":"0x4", "dev_addr":"0x58", "dev_type":"psu_pmbus"},
"attr_list":
[
[
{ "attr_name":"psu_present", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x41", "attr_mask":"0x10", "attr_cmpval":"0x0", "attr_len":"1"},
{ "attr_name":"psu_power_good", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x41", "attr_mask":"0x4", "attr_cmpval":"0x0", "attr_len":"1"},
{ "attr_name":"psu_model_name", "attr_devaddr":"0x58", "attr_devtype":"pmbus", "attr_offset":"0x9a", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"13" },
Expand Down Expand Up @@ -204,7 +204,7 @@
{
"topo_info": { "parent_bus":"0x4", "dev_addr":"0x59", "dev_type":"psu_pmbus"},
"attr_list":
[
[
{ "attr_name":"psu_present", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x41", "attr_mask":"0x20", "attr_cmpval":"0x0", "attr_len":"1"},
{ "attr_name":"psu_power_good", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x41", "attr_mask":"0x8", "attr_cmpval":"0x0", "attr_len":"1"},
{ "attr_name":"psu_model_name", "attr_devaddr":"0x59", "attr_devtype":"pmbus", "attr_offset":"0x9a", "attr_mask":"0x0", "attr_cmpval":"0xff", "attr_len":"13" },
Expand All @@ -221,16 +221,16 @@
]
}
},
"TEMP1":
"TEMP1":
{
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP1", "device_parent":"MUX1"},
"dev_attr": { "display_name":"LM75_U10"},
"dev_attr": { "display_name":"Inlet U10 temp (EXHAUST)"},
"i2c":
{
"topo_info": { "parent_bus":"0x5", "dev_addr":"0x48", "dev_type":"lm75"},
"attr_list":
[
{ "attr_name": "temp1_high_threshold", "drv_attr_name":"temp1_max"},
{ "attr_name": "temp1_max"},
{ "attr_name": "temp1_max_hyst"},
{ "attr_name": "temp1_input"}
]
Expand All @@ -239,13 +239,13 @@
"TEMP2":
{
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP2", "device_parent":"MUX1"},
"dev_attr": { "display_name":"LM75_U4"},
"dev_attr": { "display_name":"Inlet U4 temp (EXHAUST)"},
"i2c":
{
"topo_info": { "parent_bus":"0x5", "dev_addr":"0x49", "dev_type":"lm75"},
"attr_list":
[
{ "attr_name": "temp1_high_threshold", "drv_attr_name":"temp1_max"},
{ "attr_name": "temp1_max"},
{ "attr_name": "temp1_max_hyst"},
{ "attr_name": "temp1_input"}
]
Expand All @@ -254,33 +254,33 @@
"TEMP3":
{
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP3", "device_parent":"MUX1"},
"dev_attr": { "display_name":"LM75_U7"},
"dev_attr": { "display_name":"Inlet U7 temp (INTAKE)"},
"i2c":
{
"topo_info": { "parent_bus":"0x6", "dev_addr":"0x4a", "dev_type":"lm75"},
"attr_list":
[
{ "attr_name": "temp1_high_threshold", "drv_attr_name":"temp1_max"},
{ "attr_name": "temp1_max"},
{ "attr_name": "temp1_max_hyst"},
{ "attr_name": "temp1_input"}
]
}
},
},
"TEMP4":
{
"dev_info": { "device_type":"TEMP_SENSOR", "device_name":"TEMP4", "device_parent":"MUX1"},
"dev_attr": { "display_name":"LM75_U60"},
"dev_attr": { "display_name":"BCM inlet U60 temp"},
"i2c":
{
"topo_info": { "parent_bus":"0x6", "dev_addr":"0x49", "dev_type":"lm75"},
"attr_list":
[
{ "attr_name": "temp1_high_threshold", "drv_attr_name":"temp1_max"},
{ "attr_name": "temp1_max"},
{ "attr_name": "temp1_max_hyst"},
{ "attr_name": "temp1_input"}
]
}
},
},
"PORT49":
{
"dev_info": { "device_type":"SFP+", "device_name":"PORT49", "device_parent":"MUX2"},
Expand Down Expand Up @@ -360,7 +360,6 @@
{ "attr_name":"xcvr_lpmode", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x4a", "attr_mask":"0x1", "attr_cmpval":"0x2", "attr_len":"1"},
{ "attr_name":"xcvr_present", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x49", "attr_mask":"0x1", "attr_cmpval":"0x2", "attr_len":"1"},
{ "attr_name":"xcvr_rxlos", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x48", "attr_mask":"0x1", "attr_cmpval":"0x2", "attr_len":"1"}

]
}
},
Expand Down Expand Up @@ -443,7 +442,6 @@
{ "attr_name":"xcvr_lpmode", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x4a", "attr_mask":"0x3", "attr_cmpval":"0x8", "attr_len":"1"},
{ "attr_name":"xcvr_present", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x49", "attr_mask":"0x3", "attr_cmpval":"0x8", "attr_len":"1"},
{ "attr_name":"xcvr_rxlos", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x48", "attr_mask":"0x3", "attr_cmpval":"0x8", "attr_len":"1"}

]
}
},
Expand Down Expand Up @@ -485,7 +483,6 @@
{ "attr_name":"xcvr_lpmode", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x4a", "attr_mask":"0x4", "attr_cmpval":"0x10", "attr_len":"1"},
{ "attr_name":"xcvr_present", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x49", "attr_mask":"0x4", "attr_cmpval":"0x10", "attr_len":"1"},
{ "attr_name":"xcvr_rxlos", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x48", "attr_mask":"0x4", "attr_cmpval":"0x10", "attr_len":"1"}

]
}
},
Expand Down Expand Up @@ -562,7 +559,7 @@
{
"topo_info": { "parent_bus":"0x10", "dev_addr":"0x66", "dev_type":"pddf_xcvr"},
"attr_list":
[
[
{ "attr_name":"xcvr_txfault", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x47", "attr_mask":"0x6", "attr_cmpval":"0x40", "attr_len":"1"},
{ "attr_name":"xcvr_txdisable", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x4a", "attr_mask":"0x6", "attr_cmpval":"0x40", "attr_len":"1"},
{ "attr_name":"xcvr_lpmode", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x4a", "attr_mask":"0x6", "attr_cmpval":"0x40", "attr_len":"1"},
Expand Down Expand Up @@ -622,9 +619,9 @@
"attr_list":
[
{ "attr_name":"fan1_pwm", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x32", "attr_mask":"0xff", "attr_cmpval":"0x0", "attr_len":"1"},
{ "attr_name":"fan2_pwm", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x36", "attr_mask":"0xff", "attr_cmpval":"0x0", "attr_len":"1"},
{ "attr_name":"fan3_pwm", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x3a", "attr_mask":"0xff", "attr_cmpval":"0x0", "attr_len":"1"},
{ "attr_name":"fan1_direction", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x88", "attr_mask":"0x4", "attr_cmpval":"0x0", "attr_len":"1"},
{ "attr_name":"fan2_pwm", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x36", "attr_mask":"0xff", "attr_cmpval":"0x0", "attr_len":"1"},
{ "attr_name":"fan3_pwm", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x3a", "attr_mask":"0xff", "attr_cmpval":"0x0", "attr_len":"1"},
{ "attr_name":"fan1_direction", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x88", "attr_mask":"0x4", "attr_cmpval":"0x0", "attr_len":"1"},
{ "attr_name":"fan2_direction", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x88", "attr_mask":"0x2", "attr_cmpval":"0x0", "attr_len":"1"},
{ "attr_name":"fan3_direction", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x88", "attr_mask":"0x1", "attr_cmpval":"0x0", "attr_len":"1"},
{ "attr_name":"fan1_input", "attr_devaddr":"0x32", "attr_devtype":"cpld", "attr_devname":"CPLD1", "attr_offset":"0x31", "attr_mask":"0xff", "attr_len":"1", "attr_mult":"150", "attr_is_divisor":0},
Expand All @@ -640,9 +637,9 @@
"i2c" : {
"attr_list":
[
{"attr_name":"STATUS_LED_COLOR_AMBER","swpld_addr":"0x32","attr_devtype":"cpld","attr_devname":"CPLD1", "bits":"5:4","descr":"","value":"0x1","swpld_addr_offset":"0x43"},
{"attr_name":"STATUS_LED_COLOR_GREEN","swpld_addr":"0x32","attr_devtype":"cpld","attr_devname":"CPLD1", "bits":"5:4","descr":"","value":"0x2","swpld_addr_offset":"0x43"},
{"attr_name":"STATUS_LED_COLOR_OFF","swpld_addr":"0x32","attr_devtype":"cpld","attr_devname":"CPLD1", "bits":"5:4","descr":"","value":"0x3","swpld_addr_offset":"0x43"}
{"attr_name":"amber","swpld_addr":"0x32","attr_devtype":"cpld","attr_devname":"CPLD1", "bits":"5:4","descr":"","value":"0x1","swpld_addr_offset":"0x43"},
{"attr_name":"green","swpld_addr":"0x32","attr_devtype":"cpld","attr_devname":"CPLD1", "bits":"5:4","descr":"","value":"0x2","swpld_addr_offset":"0x43"},
{"attr_name":"off","swpld_addr":"0x32","attr_devtype":"cpld","attr_devname":"CPLD1", "bits":"5:4","descr":"","value":"0x3","swpld_addr_offset":"0x43"}
]
}
},
Expand All @@ -653,8 +650,8 @@
"i2c" : {
"attr_list":
[
{"attr_name":"STATUS_LED_COLOR_GREEN","attr_devtype":"cpld","attr_devname":"CPLD1","bits":"1:0","descr":"","value":"0x1","swpld_addr":"0x32","swpld_addr_offset":"0x33"},
{"attr_name":"STATUS_LED_COLOR_AMBER","attr_devtype":"cpld","attr_devname":"CPLD1","bits":"1:0","descr":"","value":"0x2","swpld_addr":"0x32","swpld_addr_offset":"0x33"}
{"attr_name":"green","attr_devtype":"cpld","attr_devname":"CPLD1","bits":"1:0","descr":"","value":"0x1","swpld_addr":"0x32","swpld_addr_offset":"0x33"},
{"attr_name":"amber","attr_devtype":"cpld","attr_devname":"CPLD1","bits":"1:0","descr":"","value":"0x2","swpld_addr":"0x32","swpld_addr_offset":"0x33"}
]
}
},
Expand All @@ -665,8 +662,8 @@
"i2c" : {
"attr_list":
[
{"attr_name":"STATUS_LED_COLOR_GREEN","attr_devtype":"cpld","attr_devname":"CPLD1","bits":"1:0","descr":"","value":"0x1","swpld_addr":"0x32","swpld_addr_offset":"0x37"},
{"attr_name":"STATUS_LED_COLOR_AMBER","attr_devtype":"cpld","attr_devname":"CPLD1","bits":"1:0","descr":"","value":"0x2","swpld_addr":"0x32","swpld_addr_offset":"0x37"}
{"attr_name":"green","attr_devtype":"cpld","attr_devname":"CPLD1","bits":"1:0","descr":"","value":"0x1","swpld_addr":"0x32","swpld_addr_offset":"0x37"},
{"attr_name":"amber","attr_devtype":"cpld","attr_devname":"CPLD1","bits":"1:0","descr":"","value":"0x2","swpld_addr":"0x32","swpld_addr_offset":"0x37"}
]
}
},
Expand All @@ -677,8 +674,8 @@
"i2c" : {
"attr_list":
[
{"attr_name":"STATUS_LED_COLOR_GREEN","attr_devtype":"cpld","attr_devname":"CPLD1","bits":"1:0","descr":"","value":"0x1","swpld_addr":"0x32","swpld_addr_offset":"0x3b"},
{"attr_name":"STATUS_LED_COLOR_AMBER","attr_devtype":"cpld","attr_devname":"CPLD1","bits":"1:0","descr":"","value":"0x2","swpld_addr":"0x32","swpld_addr_offset":"0x3b"}
{"attr_name":"green","attr_devtype":"cpld","attr_devname":"CPLD1","bits":"1:0","descr":"","value":"0x1","swpld_addr":"0x32","swpld_addr_offset":"0x3b"},
{"attr_name":"amber","attr_devtype":"cpld","attr_devname":"CPLD1","bits":"1:0","descr":"","value":"0x2","swpld_addr":"0x32","swpld_addr_offset":"0x3b"}
]
}
}
Expand Down