matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dell S6100- Fix PCA MUX attachment issue (#5401)

Browse Source 
* Dell S6100- Fix PCA MUX attachment t issue

* Update s6100_i2c_enumeration.sh

* Update s6100_i2c_enumeration.sh
This commit is contained in:
Aravind Mani 2020-09-21 08:35:53 +05:30 committed by GitHub
parent f041345e4e
commit bee516e370
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 89 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
platform/broadcom/sonic-platform-modules-dell/common/dell_pmc.c
View File

@ -155,6 +155,13 @@
/* Mailbox PowerOn Reason */
#define TRACK_POWERON_REASON 0x05FF
/* CPU Set IO Modules */
#define CPU_IOM1_CTRL_FLAG 0x04D9
#define CPU_IOM2_CTRL_FLAG 0x04DA
#define CPU_IOM3_CTRL_FLAG 0x04DB
#define CPU_IOM4_CTRL_FLAG 0x04DC
unsigned long *mmio;
static struct kobject *dell_kobj;
static unsigned short force_id;
@ -720,7 +727,24 @@ static ssize_t show_psu_fan(struct device *dev,
return sprintf(buf, "%d\n", ret);
}
static ssize_t show_cpu_iom_control(struct device *dev,
struct device_attribute *devattr, char *buf)
{
int index = to_sensor_dev_attr(devattr)->index;
struct smf_data *data = dev_get_drvdata(dev);
int cpu_iom_status;
if(index == 0)
cpu_iom_status = smf_read_reg(data, CPU_IOM1_CTRL_FLAG);
else if (index == 1)
cpu_iom_status = smf_read_reg(data, CPU_IOM2_CTRL_FLAG);
else if (index == 2)
cpu_iom_status = smf_read_reg(data, CPU_IOM3_CTRL_FLAG);
else if (index == 3)
cpu_iom_status = smf_read_reg(data, CPU_IOM4_CTRL_FLAG);
return sprintf(buf, "%x\n", cpu_iom_status);
}
static umode_t smf_fanin_is_visible(struct kobject *kobj,
struct attribute *a, int n)
@ -884,7 +908,6 @@ static ssize_t show_voltage(struct device *dev,
ret = smf_read_reg(data, IO_MODULE_STATUS);
else if ((data->kind == s6100smf) && (index < IOM_PRESENCE_MAX))
ret = smf_read_reg(data, IO_MODULE_PRESENCE);
if (ret < 0)
return ret;
@ -1850,6 +1873,11 @@ static SENSOR_DEVICE_ATTR(fan12_airflow, S_IRUGO, show_psu_fan, NULL, 3);
static SENSOR_DEVICE_ATTR(iom_status, S_IRUGO, show_voltage, NULL, 44);
static SENSOR_DEVICE_ATTR(iom_presence, S_IRUGO, show_voltage, NULL, 45);
static SENSOR_DEVICE_ATTR(cpu_iom1_control, S_IRUGO, show_cpu_iom_control, NULL, 0);
static SENSOR_DEVICE_ATTR(cpu_iom2_control, S_IRUGO, show_cpu_iom_control, NULL, 1);
static SENSOR_DEVICE_ATTR(cpu_iom3_control, S_IRUGO, show_cpu_iom_control, NULL, 2);
static SENSOR_DEVICE_ATTR(cpu_iom4_control, S_IRUGO, show_cpu_iom_control, NULL, 3);
static SENSOR_DEVICE_ATTR(psu1_presence, S_IRUGO, show_psu, NULL, 1);
static SENSOR_DEVICE_ATTR(psu2_presence, S_IRUGO, show_psu, NULL, 6);
static SENSOR_DEVICE_ATTR(current_total_power, S_IRUGO, show_psu, NULL, 10);
@ -1869,6 +1897,7 @@ static SENSOR_DEVICE_ATTR(smf_poweron_reason, S_IRUGO,
static SENSOR_DEVICE_ATTR(mb_poweron_reason, S_IRUGO|S_IWUSR,
show_mb_poweron_reason, set_mb_poweron_reason, 0);
static struct attribute *smf_dell_attrs[] = {
&sensor_dev_attr_smf_version.dev_attr.attr,
&sensor_dev_attr_smf_firmware_ver.dev_attr.attr,
@ -1888,6 +1917,10 @@ static struct attribute *smf_dell_attrs[] = {
&sensor_dev_attr_psu1_presence.dev_attr.attr,
&sensor_dev_attr_psu2_presence.dev_attr.attr,
&sensor_dev_attr_current_total_power.dev_attr.attr,
&sensor_dev_attr_cpu_iom1_control.dev_attr.attr,
&sensor_dev_attr_cpu_iom2_control.dev_attr.attr,
&sensor_dev_attr_cpu_iom3_control.dev_attr.attr,
&sensor_dev_attr_cpu_iom4_control.dev_attr.attr,
NULL
};

18
platform/broadcom/sonic-platform-modules-dell/s6100/scripts/iom_power_off.sh
View File

@ -2,15 +2,15 @@
#This script is used to power off IO modules
# IOM can be controlled via SMF using mailbox registers
# write 0x2 to 0x04D9 to power off IOM 1
./io_rd_wr.py --set --val 0x04 --offset 0x210
./io_rd_wr.py --set --val 0xd9 --offset 0x211
./io_rd_wr.py --set --val 0x2 --offset 0x213
io_rd_wr.py --set --val 0x04 --offset 0x210
io_rd_wr.py --set --val 0xd9 --offset 0x211
io_rd_wr.py --set --val 0x2 --offset 0x213
# write 0x2 to 0x04DA to power off IOM 2
./io_rd_wr.py --set --val 0xda --offset 0x211
./io_rd_wr.py --set --val 0x2 --offset 0x213
io_rd_wr.py --set --val 0xda --offset 0x211
io_rd_wr.py --set --val 0x2 --offset 0x213
# write 0x2 to 0x04DB to power off IOM 3
./io_rd_wr.py --set --val 0xdb --offset 0x211
./io_rd_wr.py --set --val 0x2 --offset 0x213
io_rd_wr.py --set --val 0xdb --offset 0x211
io_rd_wr.py --set --val 0x2 --offset 0x213
# write 0x2 to 0x04DC to power off IOM 4
./io_rd_wr.py --set --val 0xdc --offset 0x211
./io_rd_wr.py --set --val 0x2 --offset 0x213
io_rd_wr.py --set --val 0xdc --offset 0x211
io_rd_wr.py --set --val 0x2 --offset 0x213

3
platform/broadcom/sonic-platform-modules-dell/s6100/scripts/iom_power_on.sh
View File

@ -15,3 +15,6 @@
# write 0x1 to 0x04DC to power up IOM 4
/usr/local/bin/io_rd_wr.py --set --val 0xdc --offset 0x211
/usr/local/bin/io_rd_wr.py --set --val 0x1 --offset 0x213
#Delay for SMF to power on IOMs
sleep 3

44
platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_i2c_enumeration.sh
View File

@ -219,16 +219,58 @@ reset_muxes() {
init_devnum
check_iom_status()
{
SMF_DIR="/sys/devices/platform/SMF.512/hwmon/*"
count=0
iom_sta=0
MAX_IOM_STARTUP_DELAY=50
if [ -d $SMF_DIR ]; then
iom_status=$(cat $SMF_DIR/iom_status)
cpu_iom1_sta=$(cat $SMF_DIR/cpu_iom1_control)
cpu_iom2_sta=$(cat $SMF_DIR/cpu_iom2_control)
cpu_iom3_sta=$(cat $SMF_DIR/cpu_iom3_control)
cpu_iom4_sta=$(cat $SMF_DIR/cpu_iom4_control)
cpu_iom_sta=$(( cpu_iom1_sta|cpu_iom2_sta|cpu_iom3_sta|cpu_iom4_sta ))
echo "Started polling IOM status"
while [ "$iom_status" != "f0" -o "$cpu_iom_sta" != "0" ];
do
if [ "$count" -gt "$MAX_IOM_STARTUP_DELAY" ];then
echo "IOM is taking longer than expected to power up.Aborting.
iom_status- $iom_status cpu_iom_sta1- $cpu_iom1_sta cpu_iom_sta2- $cpu_iom2_sta
cpu_iom_sta3- $cpu_iom3_sta cpu_iom_sta4- $cpu_iom4_sta "
iom_sta=1
break
fi
cpu_iom1_sta=$(cat $SMF_DIR/cpu_iom1_control)
cpu_iom2_sta=$(cat $SMF_DIR/cpu_iom2_control)
cpu_iom3_sta=$(cat $SMF_DIR/cpu_iom3_control)
cpu_iom4_sta=$(cat $SMF_DIR/cpu_iom4_control)
cpu_iom_sta=$(( cpu_iom1_sta|cpu_iom2_sta|cpu_iom3_sta|cpu_iom4_sta ))
iom_status=$(cat $SMF_DIR/iom_status)
sleep .1
count=`expr $count + 1`
done
if [ "$iom_sta" != "0" ];then
echo "All IOM's are UP"
fi
fi
}
if [[ "$1" == "init" ]]; then
cpu_board_mux "new_device"
switch_board_mux "new_device"
sys_eeprom "new_device"
switch_board_cpld "new_device"
/usr/local/bin/s6100_bitbang_reset.sh
check_iom_status
switch_board_qsfp_mux "new_device"
switch_board_sfp "new_device"
switch_board_qsfp "new_device"
switch_board_qsfp_lpmode "disable"
/usr/local/bin/s6100_bitbang_reset.sh
xcvr_presence_interrupts "enable"
elif [[ "$1" == "deinit" ]]; then
xcvr_presence_interrupts "disable"