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

[pddf] Enable deselect logic for CPLDMUX (#14631)

Browse Source 
This feature was meant to be enabled but was accidentally left disabled.

Also downgrades the select/deselect messages to KERN_INFO to reduce log
spam.

Fixes #14546.

Signed-off-by: Christian Svensson <blue@cmd.nu>
This commit is contained in:
Christian Svensson 2023-09-11 20:36:39 +02:00 committed by GitHub
parent 76b7cb8b64
commit 566fe1eb1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
platform/pddf/i2c/modules/cpldmux/driver/pddf_cpldmux_driver.c
View File

@ -28,11 +28,39 @@
extern PDDF_CPLDMUX_DATA pddf_cpldmux_data; extern PDDF_CPLDMUX_DATA pddf_cpldmux_data;
/* Users may overwrite these select and delsect functions as per their requirements /* Users may overwrite these select and delsect functions as per their requirements
* by overwriting them in custom driver * by overwriting them in custom driver.
*
* Example driver skeleton:
*
* #include <linux/module.h>
* #include <linux/i2c.h>
* ..
* ..
* #include "pddf_cpldmux_defs.h"
*
* extern PDDF_CPLDMUX_OPS pddf_cpldmux_ops;
*
* int cpldmux_byte_write(struct i2c_client *client, u8 regaddr, u8 val)
* {
* // Provide custom implementation here
* }
*
* int pddf_cpldmux_deselect(struct i2c_mux_core *muxc, uint32_t chan)
* {
* // Provide the custom implementation here
* }
*
* static int __init pddf_custom_cpldmux_init(void)
* {
* pddf_cpldmux_ops.deselect = pddf_cpldmux_deselect;
* pddf_cpldmux_ops.byte_write = cpldmux_byte_write;
* return 0;
* }
*/ */
PDDF_CPLDMUX_OPS pddf_cpldmux_ops = { PDDF_CPLDMUX_OPS pddf_cpldmux_ops = {
.select = pddf_cpldmux_select_default, .select = pddf_cpldmux_select_default,
.deselect = NULL, /* pddf_cpldmux_deselct_default */ .deselect = pddf_cpldmux_deselect_default,
}; };
EXPORT_SYMBOL(pddf_cpldmux_ops); EXPORT_SYMBOL(pddf_cpldmux_ops);
@ -69,7 +97,7 @@ int pddf_cpldmux_select_default(struct i2c_mux_core *muxc, uint32_t chan)
if ( (pdata->chan_cache!=1) || (private->last_chan!=chan) ) if ( (pdata->chan_cache!=1) || (private->last_chan!=chan) )
{ {
sdata = &pdata->chan_data[chan]; sdata = &pdata->chan_data[chan];
pddf_dbg(CPLDMUX, KERN_ERR "%s: Writing 0x%x at 0x%x offset of cpld 0x%x to enable chan %d\n", __FUNCTION__, sdata->cpld_sel, sdata->cpld_offset, sdata->cpld_devaddr, chan); pddf_dbg(CPLDMUX, KERN_INFO "%s: Writing 0x%x at 0x%x offset of cpld 0x%x to enable chan %d\n", __FUNCTION__, sdata->cpld_sel, sdata->cpld_offset, sdata->cpld_devaddr, chan);
ret = cpldmux_byte_write(pdata->cpld, sdata->cpld_offset, (uint8_t)(sdata->cpld_sel & 0xff)); ret = cpldmux_byte_write(pdata->cpld, sdata->cpld_offset, (uint8_t)(sdata->cpld_sel & 0xff));
private->last_chan = chan; private->last_chan = chan;
} }
@ -93,7 +121,7 @@ int pddf_cpldmux_deselect_default(struct i2c_mux_core *muxc, uint32_t chan)
} }
sdata = &pdata->chan_data[chan]; sdata = &pdata->chan_data[chan];
pddf_dbg(CPLDMUX, KERN_ERR "%s: Writing 0x%x at 0x%x offset of cpld 0x%x to disable chan %d", __FUNCTION__, sdata->cpld_desel, sdata->cpld_offset, sdata->cpld_devaddr, chan); pddf_dbg(CPLDMUX, KERN_INFO "%s: Writing 0x%x at 0x%x offset of cpld 0x%x to disable chan %d", __FUNCTION__, sdata->cpld_desel, sdata->cpld_offset, sdata->cpld_devaddr, chan);
ret = cpldmux_byte_write(pdata->cpld, sdata->cpld_offset, (uint8_t)(sdata->cpld_desel)); ret = cpldmux_byte_write(pdata->cpld, sdata->cpld_offset, (uint8_t)(sdata->cpld_desel));
return ret; return ret;
} }