1 From 3cb0bde365d913c484d20224367a54a0eac780a7 Mon Sep 17 00:00:00 2001
2 From: Antoine Tenart <antoine.tenart@bootlin.com>
3 Date: Fri, 21 Feb 2020 11:55:29 +0100
4 Subject: [PATCH 3/3] net: phy: sfp: add support for SMBus
6 Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
8 drivers/net/phy/sfp.c | 68 ++++++++++++++++++++++++++++++++++---------
9 1 file changed, 54 insertions(+), 14 deletions(-)
11 --- a/drivers/net/phy/sfp.c
12 +++ b/drivers/net/phy/sfp.c
13 @@ -419,32 +419,72 @@ static int sfp_i2c_write(struct sfp *sfp
14 return ret == ARRAY_SIZE(msgs) ? len : 0;
17 +static int sfp_smbus_read(struct sfp *sfp, bool a2, u8 dev_addr, void *buf,
20 + u8 bus_addr = a2 ? 0x51 : 0x50, *val = buf;
25 + *val = sfp->i2c_mii->read(sfp->i2c_mii, bus_addr, dev_addr);
32 + return val - (u8 *)buf;
35 +static int sfp_smbus_write(struct sfp *sfp, bool a2, u8 dev_addr, void *buf,
38 + u8 bus_addr = a2 ? 0x51 : 0x50;
41 + memcpy(&val, buf, len);
43 + return sfp->i2c_mii->write(sfp->i2c_mii, bus_addr, dev_addr, val);
46 static int sfp_i2c_configure(struct sfp *sfp, struct i2c_adapter *i2c)
48 - struct mii_bus *i2c_mii;
49 + struct mii_bus *mii;
52 - if (!i2c_check_functionality(i2c, I2C_FUNC_I2C))
56 - sfp->read = sfp_i2c_read;
57 - sfp->write = sfp_i2c_write;
59 - i2c_mii = mdio_i2c_alloc(sfp->dev, i2c);
60 - if (IS_ERR(i2c_mii))
61 - return PTR_ERR(i2c_mii);
62 + if (i2c_check_functionality(i2c, I2C_FUNC_I2C)) {
63 + sfp->read = sfp_i2c_read;
64 + sfp->write = sfp_i2c_write;
66 + mii = mdio_i2c_alloc(sfp->dev, i2c);
68 + return PTR_ERR(mii);
70 + mii->name = "SFP I2C Bus";
71 + } else if (i2c_check_functionality(i2c, I2C_FUNC_SMBUS_BYTE_DATA)) {
72 + sfp->read = sfp_smbus_read;
73 + sfp->write = sfp_smbus_write;
75 + mii = mdio_smbus_alloc(sfp->dev, i2c);
77 + return PTR_ERR(mii);
79 - i2c_mii->name = "SFP I2C Bus";
80 - i2c_mii->phy_mask = ~0;
81 + mii->name = "SFP SMBus";
86 - ret = mdiobus_register(i2c_mii);
88 + ret = mdiobus_register(mii);
90 - mdiobus_free(i2c_mii);
95 - sfp->i2c_mii = i2c_mii;