| Message ID | 20240731154152.4020668-1-kyle.swenson@est.tech (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,v2] net: pse-pd: tps23881: Fix the device ID check | expand |
On Wed, 31 Jul 2024 15:42:14 +0000 Kyle Swenson <kyle.swenson@est.tech> wrote: > The DEVID register contains two pieces of information: the device ID in > the upper nibble, and the silicon revision number in the lower nibble. > The driver should work fine with any silicon revision, so let's mask > that out in the device ID check. > > Fixes: 20e6d190ffe1 ("net: pse-pd: Add TI TPS23881 PSE controller driver") > Signed-off-by: Kyle Swenson <kyle.swenson@est.tech> Thanks for the change! Reviewed-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
On Wed, Jul 31, 2024 at 03:42:14PM +0000, Kyle Swenson wrote: > The DEVID register contains two pieces of information: the device ID in > the upper nibble, and the silicon revision number in the lower nibble. > The driver should work fine with any silicon revision, so let's mask > that out in the device ID check. > > Fixes: 20e6d190ffe1 ("net: pse-pd: Add TI TPS23881 PSE controller driver") > Signed-off-by: Kyle Swenson <kyle.swenson@est.tech> Acked-by: Oleksij Rempel <o.rempel@pengutronix.de> Thank you!
On Wed, 31 Jul 2024 15:42:14 +0000 Kyle Swenson <kyle.swenson@est.tech> wrote: > The DEVID register contains two pieces of information: the device ID in > the upper nibble, and the silicon revision number in the lower nibble. > The driver should work fine with any silicon revision, so let's mask > that out in the device ID check. > > Fixes: 20e6d190ffe1 ("net: pse-pd: Add TI TPS23881 PSE controller driver") > Signed-off-by: Kyle Swenson <kyle.swenson@est.tech> Hello Kyle, In net subsystem when you send a fix you should use net prefix instead of net-next. Jakub, does Kyle have to send a new patch or can you deal with it? Thanks for your fix! Reviewed-by: Kory Maincent <kory.maincent@bootlin.com> Regards,
On Sat, 10 Aug 2024 23:45:56 +0200 Kory Maincent wrote: > > The DEVID register contains two pieces of information: the device ID in > > the upper nibble, and the silicon revision number in the lower nibble. > > The driver should work fine with any silicon revision, so let's mask > > that out in the device ID check. > > > > Fixes: 20e6d190ffe1 ("net: pse-pd: Add TI TPS23881 PSE controller driver") > > Signed-off-by: Kyle Swenson <kyle.swenson@est.tech> > > Hello Kyle, > > In net subsystem when you send a fix you should use net prefix instead > of net-next. Jakub, does Kyle have to send a new patch or can you deal with > it? > > Thanks for your fix! > > Reviewed-by: Kory Maincent <kory.maincent@bootlin.com> Ah, I'm pretty sure I already applied this. kernel.org infra has been quite unreliable lately. Commit 89108cb5c285 ("net: pse-pd: tps23881: Fix the device ID check"), indeed in net.
On Mon, 12 Aug 2024 08:41:59 -0700 Jakub Kicinski <kuba@kernel.org> wrote: > On Sat, 10 Aug 2024 23:45:56 +0200 Kory Maincent wrote: > > > The DEVID register contains two pieces of information: the device ID in > > > the upper nibble, and the silicon revision number in the lower nibble. > > > The driver should work fine with any silicon revision, so let's mask > > > that out in the device ID check. > > > > > > Fixes: 20e6d190ffe1 ("net: pse-pd: Add TI TPS23881 PSE controller driver") > > > Signed-off-by: Kyle Swenson <kyle.swenson@est.tech> > > > > Hello Kyle, > > > > In net subsystem when you send a fix you should use net prefix instead > > of net-next. Jakub, does Kyle have to send a new patch or can you deal with > > it? > > > > Thanks for your fix! > > > > Reviewed-by: Kory Maincent <kory.maincent@bootlin.com> > > Ah, I'm pretty sure I already applied this. kernel.org infra has been > quite unreliable lately. Commit 89108cb5c285 ("net: pse-pd: tps23881: > Fix the device ID check"), indeed in net. Ah right, thanks! I didn't received the merged notification email. Sorry for the useless noise! Regards,
diff --git a/drivers/net/pse-pd/tps23881.c b/drivers/net/pse-pd/tps23881.c index 61f6ad9c1934..f90db758554b 100644 --- a/drivers/net/pse-pd/tps23881.c +++ b/drivers/net/pse-pd/tps23881.c @@ -27,10 +27,12 @@ #define TPS23881_REG_PORT_POWER 0x29 #define TPS23881_REG_POEPLUS 0x40 #define TPS23881_REG_TPON BIT(0) #define TPS23881_REG_FWREV 0x41 #define TPS23881_REG_DEVID 0x43 +#define TPS23881_REG_DEVID_MASK 0xF0 +#define TPS23881_DEVICE_ID 0x02 #define TPS23881_REG_SRAM_CTRL 0x60 #define TPS23881_REG_SRAM_DATA 0x61 struct tps23881_port_desc { u8 chan[2]; @@ -748,11 +750,11 @@ static int tps23881_i2c_probe(struct i2c_client *client) ret = i2c_smbus_read_byte_data(client, TPS23881_REG_DEVID); if (ret < 0) return ret; - if (ret != 0x22) { + if (FIELD_GET(TPS23881_REG_DEVID_MASK, ret) != TPS23881_DEVICE_ID) { dev_err(dev, "Wrong device ID\n"); return -ENXIO; } ret = tps23881_flash_sram_fw(client);
The DEVID register contains two pieces of information: the device ID in the upper nibble, and the silicon revision number in the lower nibble. The driver should work fine with any silicon revision, so let's mask that out in the device ID check. Fixes: 20e6d190ffe1 ("net: pse-pd: Add TI TPS23881 PSE controller driver") Signed-off-by: Kyle Swenson <kyle.swenson@est.tech> --- v2: - Use FIELD_GET and defines instead of raw numbers v1: https://lore.kernel.org/netdev/20240730161032.3616000-1-kyle.swenson@est.tech/ drivers/net/pse-pd/tps23881.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)