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

[AS7712/PDDF] Add idle_state=-2 for pca954x deselect (#10079)

Browse Source 
Signed-off-by: Jostar Yang jostar_yang@accton.com.tw

Why I did it
Linux kernel 5.10, 'force_deselct_on_exit' parameter used for driver i2c_mux_pca954x is no longer valid. Instead an attribute 'idle_state' is added per MUX device. So set idle_state=-2 will let do deselect to pca954 when device channel exit . To avoid cause another device channel access i2c fail.

How I did it
Remove force_deselect_on_exit because not use this parameter.
Add "idle_state":"-2" to each "virt_bus"
How to verify it
Test all sysfs are fine.
This commit is contained in:
jostar-yang 2022-03-04 07:50:41 +08:00 committed by GitHub
parent 582ea7cfc6
commit 34a4817ad0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
device/accton/x86_64-accton_as4630_54pe-r0/pddf/pddf-device.json
View File

@ -33,7 +33,7 @@
"std_kos":
[
"i2c_dev",
"i2c_mux_pca954x force_deselect_on_exit=1",
"i2c_mux_pca954x",
"optoe"
],
"description":"kernel modules are loaded while moving to pdf mode, but they should not be unloaded while moving to nonpddf mode.",
@ -105,7 +105,7 @@
"i2c":
{
"topo_info": { "parent_bus":"0x1", "dev_addr":"0x77", "dev_type":"pca9548"},
"dev_attr": { "virt_bus":"0x2"},
"dev_attr": { "virt_bus":"0x2", "idle_state":"-2"},
"channel":
[
{ "chn":"0", "dev":"MUX2" },
@ -122,7 +122,7 @@
"i2c":
{
"topo_info": { "parent_bus":"0x2", "dev_addr":"0x71", "dev_type":"pca9548"},
"dev_attr": { "virt_bus":"0xa"},
"dev_attr": { "virt_bus":"0xa", "idle_state":"-2"},
"channel":
[
{ "chn":"0", "dev":"PSU1" },
@ -161,7 +161,7 @@
"i2c":
{
"topo_info": { "parent_bus":"0x3", "dev_addr":"0x70", "dev_type":"pca9548"},
"dev_attr": { "virt_bus":"0x12"},
"dev_attr": { "virt_bus":"0x12", "idle_state":"-2"},
"channel":
[
{ "chn":"0", "dev":"PORT49" },

1
device/accton/x86_64-accton_as7712_32x-r0/installer.conf
View File

@ -1,3 +1,4 @@
CONSOLE_PORT=0x2f8
CONSOLE_DEV=1
CONSOLE_SPEED=115200
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="modprobe.blacklist=i2c-ismt,i2c_ismt,i2c-i801,i2c_i801"

14
device/accton/x86_64-accton_as7712_32x-r0/pddf/pddf-device.json
View File

@ -34,7 +34,7 @@
"i2c-ismt",
"i2c-i801",
"i2c_dev",
"i2c_mux_pca954x force_deselect_on_exit=1",
"i2c_mux_pca954x",
"optoe"
],
"pddf_kos":
@ -116,7 +116,7 @@
"i2c":
{
"topo_info": { "parent_bus":"0x1", "dev_addr":"0x76", "dev_type":"pca9548"},
"dev_attr": { "virt_bus":"0x2"},
"dev_attr": { "virt_bus":"0x2", "idle_state":"-2"},
"channel":
[
{ "chn":"0", "dev":"FAN-CTRL" },
@ -137,7 +137,7 @@
"i2c":
{
"topo_info": { "parent_bus":"0x0", "dev_addr":"0x71", "dev_type":"pca9548"},
"dev_attr": { "virt_bus":"0xa"},
"dev_attr": { "virt_bus":"0xa", "idle_state":"-2"},
"channel":
[
{ "chn":"0", "dev":"PSU2" },
@ -402,7 +402,7 @@
"i2c":
{
"topo_info": { "parent_bus":"0x0", "dev_addr":"0x72", "dev_type":"pca9548"},
"dev_attr": { "virt_bus":"0x12"},
"dev_attr": { "virt_bus":"0x12", "idle_state":"-2"},
"channel":
[
{ "chn":"0", "dev":"PORT9" },
@ -423,7 +423,7 @@
"i2c":
{
"topo_info": { "parent_bus":"0x0", "dev_addr":"0x73", "dev_type":"pca9548"},
"dev_attr": { "virt_bus":"0x1a"},
"dev_attr": { "virt_bus":"0x1a", "idle_state":"-2"},
"channel":
[
{ "chn":"0", "dev":"PORT6" },
@ -444,7 +444,7 @@
"i2c":
{
"topo_info": { "parent_bus":"0x0", "dev_addr":"0x74", "dev_type":"pca9548"},
"dev_attr": { "virt_bus":"0x22"},
"dev_attr": { "virt_bus":"0x22", "idle_state":"-2"},
"channel":
[
{ "chn":"0", "dev":"PORT17" },
@ -465,7 +465,7 @@
"i2c":
{
"topo_info": { "parent_bus":"0x0", "dev_addr":"0x75", "dev_type":"pca9548"},
"dev_attr": { "virt_bus":"0x2a"},
"dev_attr": { "virt_bus":"0x2a", "idle_state":"-2"},
"channel":
[
{ "chn":"0", "dev":"PORT29" },