mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2026-09-09 00:06:08 +08:00
Daniel Golle
18cbd83a14
Import pending series introducing support for standalone PCS drivers. This has previously already been used by the airoha target, and is also the base for the closer-to-upstream patches for MediaTek MT7988 10G SerDes support. In order to not having to diverge from upstream also backport series for standardized handling for PHY and PCS SerDes pair polarity. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
From 572304faf8c1d30f142060c76a3e731438fc5975 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Jelonek <jelonek.jonas@gmail.com>
|
|
Date: Thu, 22 Jan 2026 10:59:20 +0000
|
|
Subject: [PATCH net-next v6 1/2] net: sfp: apply I2C adapter quirks to limit
|
|
block size
|
|
|
|
The SFP driver assumes all I2C adapters support reading and writing the
|
|
pre-defined block size SFP_EEPROM_BLOCK_SIZE of 16 bytes. This constant
|
|
was probably chosen based on good guesses and known limitations of a
|
|
range of I2C adapters and SFP modules.
|
|
|
|
However, I2C adapters may even support less and usually need to specify
|
|
this via I2C quirks. Theoretically, such an adapter may provide full
|
|
functionality but only support a read and write length of e.g. 8 bytes.
|
|
Currently, the SFP driver doesn't account for that.
|
|
|
|
Add handling for I2C quirks in SFP I2C configuration taking the fields
|
|
max_read_len and max_write_len in struct i2c_adapter_quirks into account
|
|
to further limit the maximum block size if needed.
|
|
|
|
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
|
|
---
|
|
drivers/net/phy/sfp.c | 12 ++++++++++--
|
|
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/phy/sfp.c
|
|
+++ b/drivers/net/phy/sfp.c
|
|
@@ -804,21 +804,29 @@ static int sfp_smbus_byte_write(struct s
|
|
|
|
static int sfp_i2c_configure(struct sfp *sfp, struct i2c_adapter *i2c)
|
|
{
|
|
+ size_t max_block_size;
|
|
+
|
|
sfp->i2c = i2c;
|
|
|
|
if (i2c_check_functionality(i2c, I2C_FUNC_I2C)) {
|
|
sfp->read = sfp_i2c_read;
|
|
sfp->write = sfp_i2c_write;
|
|
- sfp->i2c_max_block_size = SFP_EEPROM_BLOCK_SIZE;
|
|
+ max_block_size = SFP_EEPROM_BLOCK_SIZE;
|
|
} else if (i2c_check_functionality(i2c, I2C_FUNC_SMBUS_BYTE_DATA)) {
|
|
sfp->read = sfp_smbus_byte_read;
|
|
sfp->write = sfp_smbus_byte_write;
|
|
- sfp->i2c_max_block_size = 1;
|
|
+ max_block_size = 1;
|
|
} else {
|
|
sfp->i2c = NULL;
|
|
return -EINVAL;
|
|
}
|
|
|
|
+ if (i2c->quirks && i2c->quirks->max_read_len)
|
|
+ max_block_size = min(max_block_size, i2c->quirks->max_read_len);
|
|
+ if (i2c->quirks && i2c->quirks->max_write_len)
|
|
+ max_block_size = min(max_block_size, i2c->quirks->max_write_len);
|
|
+
|
|
+ sfp->i2c_max_block_size = max_block_size;
|
|
return 0;
|
|
}
|
|
|