Re: [PATCH v2 1/3] net: sfp: add workaround for Realtek RTL8672 and RTL9601C chips

Andrew Lunn
2021-01-07T17:20:10Z

> + if (sfp->i2c_block_size < 2) {
> + dev_info(sfp->dev, "skipping hwmon device registration "
> + "due to broken EEPROM\n");
> + dev_info(sfp->dev, "diagnostic EEPROM area cannot be read "
> + "atomically to guarantee data coherency\n");

Strings like this are the exception to the 80 character rule. People
grep for them, and when they are split, they are harder to find.

> -static int sfp_quirk_i2c_block_size(const struct sfp_eeprom_base *base)
> +static bool sfp_id_needs_byte_io(struct sfp *sfp, void *buf, size_t len)
> {
> - if (!memcmp(base->vendor_name, "VSOL ", 16))
> - return 1;
> - if (!memcmp(base->vendor_name, "OEM ", 16) &&
> - !memcmp(base->vendor_pn, "V2801F ", 16))
> - return 1;
> + size_t i, block_size = sfp->i2c_block_size;
>
> - /* Some modules can't cope with long reads */
> - return 16;
> -}
> + /* Already using byte IO */
> + if (block_size == 1)
> + return false;

This seems counter intuitive. We don't need byte IO because we are
doing btye IO? Can we return True here?

>
> -static void sfp_quirks_base(struct sfp *sfp, const struct sfp_eeprom_base *base)
> -{
> - sfp->i2c_block_size = sfp_quirk_i2c_block_size(base);
> + for (i = 1; i < len; i += block_size) {
> + if (memchr_inv(buf + i, '\0', block_size - 1))
> + return false;
> + }

Is the loop needed?

I also wonder if on the last iteration of the loop you go passed the
end of buf? Don't you need a min(block_size -1, len - i) or
similar?

> - /* Some modules (CarlitoxxPro CPGOS03-0490) do not support multibyte
> - * reads from the EEPROM, so start by reading the base identifying
> - * information one byte at a time.
> - */
> - sfp->i2c_block_size = 1;
> + sfp->i2c_block_size = 16;

Did we loose the comment:

/* Some modules (Nokia 3FE46541AA) lock up if byte 0x51 is read as a
* single read. Switch back to reading 16 byte blocks ...

That explains why 16 is used. Given how broken stuff is and the number
of workaround we need, we should try to document as much as we cam, so
we don't break stuff when adding more workarounds.

Andrew