Message ID | b92bd58e016a14ae95e259ffbdcfc5e5da6a7aca.1726838531.git.pnewman@connecttech.com |
---|---|
State | Superseded |
Headers | show |
Series | serial: 8250_exar: Replace custom EEPROM code with eeprom_93cx6 | expand |
On Fri, Sep 20, 2024 at 10:03:21AM -0400, Parker Newman wrote: > From: Parker Newman <pnewman@connecttech.com> > > This patch adds a quirk similar to eeprom_93xx46 to add an extra clock > cycle before reading data from the EEPROM. > > The 93Cx6 family of EEPROMs output a "dummy 0 bit" between the writing > of the op-code/address from the host to the EEPROM and the reading of > the actual data from the EEPROM. > > More info can be found on page 6 of the AT93C46 datasheet (linked below). > Similar notes are found in other 93xx6 datasheets. > > In summary the read operation for a 93Cx6 EEPROM is: > Write to EEPROM: 110[A5-A0] (9 bits) > Read from EEPROM: 0[D15-D0] (17 bits) > > Where: > 110 is the start bit and READ OpCode > [A5-A0] is the address to read from > 0 is a "dummy bit" preceding the actual data > [D15-D0] is the actual data. > > Looking at the READ timing diagrams in the 93Cx6 datasheets the dummy > bit should be clocked out on the last address bit clock cycle meaning it > should be discarded naturally. > > However, depending on the hardware configuration sometimes this dummy > bit is not discarded. This is the case with Exar PCI UARTs which require > an extra clock cycle between sending the address and reading the data. > > Link: https://ww1.microchip.com/downloads/en/DeviceDoc/Atmel-5193-SEEPROM-AT93C46D-Datasheet.pdf JFYI: You may also convert this to Datasheet: tag (we have a history of it mostly in IIO subsystem), basically replacing word Link by Datasheet in the above line. > Signed-off-by: Parker Newman <pnewman@connecttech.com> Code wise LGTM now, Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> (Do not forget to embed this tag into a new version. With this the `b4` tool is quite helpful, so the workflow is to checkout a new branch in your local Git tree, like `git checkout -b exar-93xx46 v6.12-rc1` then taking a message ID from email of this thread — any should succeed, but cover letter's one for sure — run the following `b4 am $<message ID>`. It will print the hints what to do next, something like `git am $<patch_title>.mbx`. Then you can continue with `git rebase --interactive v6.12-rc1` if the code or other stuff in the commit message needs to be updated.)
On Fri, Sep 20, 2024 at 10:03:21AM -0400, Parker Newman wrote: > From: Parker Newman <pnewman@connecttech.com> > > This patch adds a quirk similar to eeprom_93xx46 to add an extra clock > cycle before reading data from the EEPROM. Ah, sorry, forgot to mention the Submitting Patches documentation. It suggests to use imperative mood in the commit messages, hence the above should be like Add a quirk similar to eeprom_93xx46 to add an extra clock cycle before reading data from the EEPROM. Also check other messages in this series.
diff --git a/drivers/misc/eeprom/eeprom_93cx6.c b/drivers/misc/eeprom/eeprom_93cx6.c index 9627294fe3e9..4c9827fe9217 100644 --- a/drivers/misc/eeprom/eeprom_93cx6.c +++ b/drivers/misc/eeprom/eeprom_93cx6.c @@ -186,6 +186,11 @@ void eeprom_93cx6_read(struct eeprom_93cx6 *eeprom, const u8 word, eeprom_93cx6_write_bits(eeprom, command, PCI_EEPROM_WIDTH_OPCODE + eeprom->width); + if (has_quirk_extra_read_cycle(eeprom)) { + eeprom_93cx6_pulse_high(eeprom); + eeprom_93cx6_pulse_low(eeprom); + } + /* * Read the requested 16 bits. */ @@ -252,6 +257,11 @@ void eeprom_93cx6_readb(struct eeprom_93cx6 *eeprom, const u8 byte, eeprom_93cx6_write_bits(eeprom, command, PCI_EEPROM_WIDTH_OPCODE + eeprom->width + 1); + if (has_quirk_extra_read_cycle(eeprom)) { + eeprom_93cx6_pulse_high(eeprom); + eeprom_93cx6_pulse_low(eeprom); + } + /* * Read the requested 8 bits. */ diff --git a/include/linux/eeprom_93cx6.h b/include/linux/eeprom_93cx6.h index c860c72a921d..4d141345f4d4 100644 --- a/include/linux/eeprom_93cx6.h +++ b/include/linux/eeprom_93cx6.h @@ -11,6 +11,8 @@ Supported chipsets: 93c46, 93c56 and 93c66. */ +#include <linux/bits.h> + /* * EEPROM operation defines. */ @@ -34,6 +36,7 @@ * @register_write(struct eeprom_93cx6 *eeprom): handler to * write to the eeprom register by using all reg_* fields. * @width: eeprom width, should be one of the PCI_EEPROM_WIDTH_* defines + * @quirks: eeprom or controller quirks * @drive_data: Set if we're driving the data line. * @reg_data_in: register field to indicate data input * @reg_data_out: register field to indicate data output @@ -50,6 +53,9 @@ struct eeprom_93cx6 { void (*register_write)(struct eeprom_93cx6 *eeprom); int width; + unsigned int quirks; +/* Some EEPROMs require an extra clock cycle before reading */ +#define PCI_EEPROM_QUIRK_EXTRA_READ_CYCLE BIT(0) char drive_data; char reg_data_in; @@ -71,3 +77,9 @@ extern void eeprom_93cx6_wren(struct eeprom_93cx6 *eeprom, bool enable); extern void eeprom_93cx6_write(struct eeprom_93cx6 *eeprom, u8 addr, u16 data); + +static inline bool has_quirk_extra_read_cycle(struct eeprom_93cx6 *eeprom) +{ + return eeprom->quirks & PCI_EEPROM_QUIRK_EXTRA_READ_CYCLE; +} +