tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: sfp: add sfp_modify_u8() helper

Browse Source 
Add a helper to modify bits in a single byte in memory space, and use
it when updating the soft tx-disable flag in the module.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Russell King (Oracle)
2022-10-21 16:10:04 +01:00
committed by Jakub Kicinski
parent 3989004984
commit a3c536fc75
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/phy/sfp.c
+22 -9
View File
@@ -608,6 +608,22 @@ static int sfp_write(struct sfp *sfp, bool a2, u8 addr, void *buf, size_t len)
return sfp->write(sfp, a2, addr, buf, len);
}
static int sfp_modify_u8(struct sfp *sfp, bool a2, u8 addr, u8 mask, u8 val)
{
int ret;
u8 old, v;
ret = sfp_read(sfp, a2, addr, &old, sizeof(old));
if (ret != sizeof(old))
return ret;
v = (old & ~mask) | (val & mask);
if (v == old)
return sizeof(v);
return sfp_write(sfp, a2, addr, &v, sizeof(v));
}
static unsigned int sfp_soft_get_state(struct sfp *sfp)
{
unsigned int state = 0;
@@ -633,17 +649,14 @@ static unsigned int sfp_soft_get_state(struct sfp *sfp)
static void sfp_soft_set_state(struct sfp *sfp, unsigned int state)
{
u8 status;
u8 mask = SFP_STATUS_TX_DISABLE_FORCE;
u8 val = 0;
if (sfp_read(sfp, true, SFP_STATUS, &status, sizeof(status)) ==
sizeof(status)) {
if (state & SFP_F_TX_DISABLE)
status |= SFP_STATUS_TX_DISABLE_FORCE;
else
status &= ~SFP_STATUS_TX_DISABLE_FORCE;
if (state & SFP_F_TX_DISABLE)
val |= SFP_STATUS_TX_DISABLE_FORCE;
sfp_write(sfp, true, SFP_STATUS, &status, sizeof(status));
}
sfp_modify_u8(sfp, true, SFP_STATUS, mask, val);
}
static void sfp_soft_start_poll(struct sfp *sfp)