add driver for Atmel QSPI controller
Subsystems (5)
v2 cover add driver for Atmel QSPI controller
ChangeLog
v2:
- remove the patches to set the "latency code" of Spansion QSPI memories (support of Spansion memories may be submitted in later series).
- rename "qspi" node into "spi" in the DT example to fit ePAPR standard.
- remove the useless "qspi0" label from the DT node example.
- remove the leading 0 from the size of the second memory region to make it consistent with the size of the first memory region.
- indent the DT bindings documentation to make it more readable.
- remove the useless ".bus = &platform_bus_type," line from the
platform driver definition.
v1:
This series of patches add support for the new Atmel QSPI controller embedded inside sama5d2x SoCs.
These patches were first developped for linux-3.18-at91 and tested on a sama5d27 Xplained ultra board, which embeds a Micron n25q128a13 QSPI NOR flash memory. Then the series was adapted for mainline.
Cyrille Pitchen (5):
mtd: spi-nor: notify (Q)SPI controller about protocol change
Documentation: mtd: add a DT property to set the number of dummy
cycles
mtd: spi-nor: allow to tune the number of dummy cycles
Documentation: atmel-quadspi: add binding file for Atmel QSPI driver
mtd: atmel-quadspi: add driver for Atmel QSPI controller
.../devicetree/bindings/mtd/atmel-quadspi.txt | 29 + .../devicetree/bindings/mtd/jedec,spi-nor.txt | 6 + drivers/mtd/spi-nor/Kconfig | 7 + drivers/mtd/spi-nor/Makefile | 1 + drivers/mtd/spi-nor/atmel-quadspi.c | 900 +++++++++++++++++++++ drivers/mtd/spi-nor/spi-nor.c | 114 ++- include/linux/mtd/spi-nor.h | 15 + 7 files changed, 1053 insertions(+), 19 deletions(-) create mode 100644 Documentation/devicetree/bindings/mtd/atmel-quadspi.txt create mode 100644 drivers/mtd/spi-nor/atmel-quadspi.c
Signature · 1 line
1.8.2.2
PATCH v2 1/5 mtd: spi-nor: notify (Q)SPI controller about protocol change
Once the Quad SPI mode has been enabled on a Micron flash memory, this device expects ALL the following commands to use the SPI 4-4-4 protocol. The (Q)SPI controller needs to be notified about the protocol change so it can adapt and keep on dialoging with the Micron memory.
--- drivers/mtd/spi-nor/spi-nor.c | 17 +++++++++++++++++ include/linux/mtd/spi-nor.h | 13 +++++++++++++ 2 files changed, 30 insertions(+)
drivers/mtd/spi-nor/spi-nor.c +17 -0
@@ -163,6 +163,18 @@ static inline int write_disable(struct spi_nor *nor)return nor->write_reg (nor,SPINOR_OP_WRDI ,NULL ,0 ,0 ); } +/* +* Notify the (Q)SPI controller about the new protocol to be used. +*/ +static inline int spi_nor_set_protocol (struct spi_nor *nor, +enum spi_protocol proto) +{ +if (nor->set_protocol) +return nor->set_protocol (nor, proto); + +return 0 ; +} +static inline struct spi_nor *mtd_to_spi_nor (struct mtd_info *mtd) {return mtd->priv;
@@ -943,6 +955,11 @@ static int micron_quad_enable(struct spi_nor *nor)return ret; } +/* switch protocol to Quad CMD 4-4-4 */ + ret =spi_nor_set_protocol (nor,SPI_PROTO_4_4_4 ); +if (ret) +return ret; + ret =spi_nor_wait_till_ready (nor);if (ret)return ret;
include/linux/mtd/spi-nor.h +13 -0
@@ -87,6 +87,16 @@ enum read_mode { SPI_NOR_QUAD, }; +enum spi_protocol { +SPI_PROTO_1_1_1 ,/* SPI */ +SPI_PROTO_1_1_2 ,/* Dual Output */ +SPI_PROTO_1_1_4 ,/* Quad Output */ +SPI_PROTO_1_2_2 ,/* Dual IO */ +SPI_PROTO_1_4_4 ,/* Quad IO */ +SPI_PROTO_2_2_2 ,/* Dual Command */ +SPI_PROTO_4_4_4 ,/* Quad Command */ +}; +/** * struct spi_nor_xfer_cfg - Structure for defining a Serial Flash transfer * @wren: command for "Write Enable", or 0x00 for not required
@@ -149,6 +159,7 @@ enum spi_nor_option_flags {* read/write/erase/lock/unlock operations * @read_xfer: [OPTIONAL] the read fundamental primitive * @write_xfer: [OPTIONAL] the writefundamental primitive +* @set_protocol: [OPTIONAL] notify about protocol change * @read_reg: [DRIVER-SPECIFIC] read out the register * @write_reg: [DRIVER-SPECIFIC] write data to the register * @read: [DRIVER-SPECIFIC] read data from the SPI NOR
@@ -185,6 +196,8 @@ struct spi_nor {int (*write_reg)(struct spi_nor *nor,u8 opcode,u8 *buf,int len,int write_enable); +int (*set_protocol)(struct spi_nor *nor,enum spi_protocol proto); +int (*read)(struct spi_nor *nor,loff_t from,size_t len,size_t *retlen,u_char *read_buf); void (*write)(struct spi_nor *nor, loff_t to,
Signature · 1 line
1.8.2.2
PATCH v2 2/5 Documentation: mtd: add a DT property to set the number of dummy cycles
In reply to Cyrille PitchenDepending on the SPI clock frequency, the Fast Read op code and the Single/Dual Data Rate mode, the number of dummy cycles can be tuned to improve transfer speed.
The actual number of dummy cycles is specific for each memory model and is provided by the manufacturer thanks to the memory datasheet.
--- Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt | 6 ++++++ 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt +6 -0
@@ -19,6 +19,11 @@ Optional properties: all chips and support for it can not be detected at runtime. Refer to your chips' datasheet to check if this is supported by your chip. +- m25p,num-dummy-cycles : Set the number of dummy cycles for Fast Read commands. + Depending on the manufacturer additional dedicated + commands are sent to the flash memory so the + controller and the memory can agree on the number of + dummy cycles to use. Example:
@@ -29,4 +34,5 @@ Example: reg = <0>; spi-max-frequency = <40000000>; m25p,fast-read; + m25p,num-dummy-cycles = <8>; };
Signature · 1 line
1.8.2.2
PATCH v2 3/5 mtd: spi-nor: allow to tune the number of dummy cycles
In reply to Cyrille PitchenThe number of dummy cycles used during Fast Read commands can be reduced to improve transfer performances. Each manufacturer has a dedicated set of registers to provide the memory with the exact number of dummy cycles it should expect. Both the memory and the (Q)SPI controller must agree on this number of dummy cycles.
The number of dummy cycles can be found into the memory datasheet and mostly depends on the SPI clock frequency, the Fast Read op code and the Single/Dual Data Rate mode.
Probing JEDEC Serial Flash Discoverable Parameters (SFDP) tables would only provide the driver with a high enough number of dummy cycles for each Fast Read command to be used for all clock frequencies: this solution would not be optimized.
--- drivers/mtd/spi-nor/spi-nor.c | 97 ++++++++++++++++++++++++++++++++++--------- include/linux/mtd/spi-nor.h | 2 + 2 files changed, 80 insertions(+), 19 deletions(-)
drivers/mtd/spi-nor/spi-nor.c +78 -19
@@ -119,24 +119,6 @@ static int read_cr(struct spi_nor *nor) }/* -* Dummy Cycle calculation for different type of read. -* It can be used to support more commands with -* different dummy cycle requirements. -*/ -static inline int spi_nor_read_dummy_cycles (struct spi_nor *nor) -{ -switch (nor->flash_read) { -case SPI_NOR_FAST : -case SPI_NOR_DUAL : -case SPI_NOR_QUAD : -return 8 ; -case SPI_NOR_NORMAL : -return 0 ; - } -return 0 ; -} - -/* * Write status register 1 byte * Returns negative if error occurred. */
@@ -1007,6 +989,81 @@ static int set_quad_mode(struct spi_nor *nor, struct flash_info *info) } } +static int micron_set_dummy_cycles (struct spi_nor *nor) +{ +int ret; +u8 val, mask; + +/* read the Volatile Configuration Register (VCR) */ + ret = nor->read_reg (nor,SPINOR_OP_RD_VCR , &val,1 ); +if (ret <0 ) { +dev_err (nor->dev,"error %d reading VCR\n" , ret); +return ret; + } + +write_enable (nor); + +/* update the number of dummy into the VCR */ + mask =GENMASK (7 ,4 ); + val &= ~mask; + val |= (nor->read_dummy <<4 ) & mask; + ret = nor->write_reg (nor,SPINOR_OP_WR_VCR , &val,1 ,0 ); +if (ret <0 ) { +dev_err (nor->dev,"error while writing VCR register\n" ); +return ret; + } + + ret =spi_nor_wait_till_ready (nor); +if (ret) +return ret; + +return 0 ; +} + +/* +* Dummy Cycle calculation for different type of read. +* It can be used to support more commands with +* different dummy cycle requirements. +*/ +static int spi_nor_read_dummy_cycles (struct spi_nor *nor, +const struct flash_info *info) +{ +struct device_node *np = nor->dev->of_node; +u32 num_dummy_cycles; + +if (np && !of_property_read_u32 (np,"m25p,num-dummy-cycles" , + &num_dummy_cycles)) { + nor->read_dummy = num_dummy_cycles; + +/* +* This switch block might be moved after the if...then...else +* statement but it was not tested with all Spansion or Micron +* memories. +* Now the "m25p,num-dummy-cycles" property needs to be +* explicitly set in the device tree so the switch statement is +* executed. This should avoid unwanted side effects and keep +* backward compatibility. +*/ +switch (JEDEC_MFR (info)) { +case CFI_MFR_ST : +return micron_set_dummy_cycles (nor); +default : +break ; + } + }else { +switch (nor->flash_read) { +case SPI_NOR_FAST : +case SPI_NOR_DUAL : +case SPI_NOR_QUAD : + nor->read_dummy =8 ; +case SPI_NOR_NORMAL : + nor->read_dummy =0 ; + } + } + +return 0 ; +} +static int spi_nor_check (struct spi_nor *nor) { if (!nor->dev || !nor->read || !nor->write ||
@@ -1211,7 +1268,9 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode) nor->addr_width =3 ; } - nor->read_dummy =spi_nor_read_dummy_cycles (nor); + ret =spi_nor_read_dummy_cycles (nor, info); +if (ret) +return ret;dev_info (dev,"%s (%lld Kbytes)\n" , id->name, (long long )mtd->size >>10 );
include/linux/mtd/spi-nor.h +2 -0
@@ -59,6 +59,8 @@/* Used for Micron flashes only. */ #define SPINOR_OP_RD_EVCR 0x65/* Read EVCR register */ #define SPINOR_OP_WD_EVCR 0x61/* Write EVCR register */ +#define SPINOR_OP_RD_VCR 0x85/* Read VCR register */ +#define SPINOR_OP_WR_VCR 0x81/* Write VCR register */ /* Status Register bits. */ #define SR_WIP 1/* Write in progress */
Signature · 1 line
1.8.2.2
PATCH v2 4/5 Documentation: atmel-quadspi: add binding file for Atmel QSPI driver
In reply to Cyrille PitchenThis patch documents the DT bindings for the driver of the Atmel QSPI controller embedded inside sama5d2x SoCs.
--- .../devicetree/bindings/mtd/atmel-quadspi.txt | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 Documentation/devicetree/bindings/mtd/atmel-quadspi.txt
Documentation/devicetree/bindings/mtd/atmel-quadspi.txt new file +29 -0
@@ -0,0 +1,29 @@ +* Atmel Quad Serial Peripheral Interface (QSPI) + +Required properties: +- compatible: should be "atmel,sama5d2-qspi" +- reg: the first contains the register location and length, + the second contains the memory mapping address and length +- interrupts: should contain the interrupt for the device +- clocks: the phandle of the clock needed by the QSPI controller +- #address-cells: should be <1> +- #size-cells: should be <0> + +Example: + +spi at f0020000 { + compatible = "atmel,sama5d2-qspi"; + reg = <0xf0020000 0x100>, + <0xd0000000 0x8000000>; + interrupts = <52 IRQ_TYPE_LEVEL_HIGH 7>; + clocks = <&spi0_clk>; + #address-cells = <1>; + #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi0_default>; + status = "okay"; + + m25p80 at 0 { + ... + }; +};
Signature · 1 line
1.8.2.2
PATCH v2 5/5 mtd: atmel-quadspi: add driver for Atmel QSPI controller
In reply to Cyrille PitchenThis driver add support to the new Atmel QSPI controller embedded into sama5d2x SoCs. It expects a NOR memory to be connected to the QSPI controller.
--- drivers/mtd/spi-nor/Kconfig | 7 + drivers/mtd/spi-nor/Makefile | 1 + drivers/mtd/spi-nor/atmel-quadspi.c | 900 ++++++++++++++++++++++++++++++++++++ 3 files changed, 908 insertions(+) create mode 100644 drivers/mtd/spi-nor/atmel-quadspi.c
drivers/mtd/spi-nor/Kconfig +7 -0
@@ -28,4 +28,11 @@ config SPI_FSL_QUADSPI This enables support for the Quad SPI controller in master mode. We only connect the NOR to this controller now. +config SPI_ATMEL_QUADSPI + tristate "Atmel Quad SPI Controller" + depends on (ARCH_AT91 || COMPILE_TEST) + help + This enables support for the Quad SPI controller in master mode. + We only connect the NOR to this controller now. + endif # MTD_SPI_NOR
drivers/mtd/spi-nor/Makefile +1 -0
@@ -1,2 +1,3 @@ obj-$(CONFIG_MTD_SPI_NOR) += spi-nor.o obj-$(CONFIG_SPI_FSL_QUADSPI) += fsl-quadspi.o +obj-$(CONFIG_SPI_ATMEL_QUADSPI) += atmel-quadspi.o
drivers/mtd/spi-nor/atmel-quadspi.c new file +900 -0
900 lines not on this page · raw message
Signature · 1 line
1.8.2.2
Re: [PATCH v2 1/5] mtd: spi-nor: notify (Q)SPI controller about protocol change
In reply to Cyrille PitchenQuoted 16 lines · Cyrille Pitchen
Once the Quad SPI mode has been enabled on a Micron flash memory, this device expects ALL the following commands to use the SPI 4-4-4 protocol. The (Q)SPI controller needs to be notified about the protocol change so it can adapt and keep on dialoging with the Micron memory.
Signed-off-by Cyrille Pitchen <[email protected]>--- drivers/mtd/spi-nor/spi-nor.c | 17 +++++++++++++++++ include/linux/mtd/spi-nor.h | 13 +++++++++++++ 2 files changed, 30 insertions(+)drivers/mtd/spi-nor/spi-nor.c +0
-0
drivers/mtd/spi-nor/spi-nor.c static inline int write_disable(struct spi_nor *nor) · line 167
Quoted 5 lines
drivers/mtd/spi-nor/spi-nor.c +2
-0@@ -163,6 +163,18 @@ static inline int write_disable(struct spi_nor *nor)return nor->write_reg (nor,SPINOR_OP_WRDI ,NULL ,0 ,0 ); } +/* +* Notify the (Q)SPI controller about the new protocol to be used.
Hi!
Can you please just reword this a little, so that it is absolutelly clear even to the less bright of us (like me) that this is a notification coming from the upper layers (ie. the spi-nor framework) toward the hardware ?
drivers/mtd/spi-nor/spi-nor.c static inline int write_disable(struct spi_nor *nor) · line 180
Quoted 13 lines
drivers/mtd/spi-nor/spi-nor.c +10
-0+*/ +static inline int spi_nor_set_protocol (struct spi_nor *nor, +enum spi_protocol proto) +{ +if (nor->set_protocol) +return nor->set_protocol (nor, proto); + +return 0 ; +} +static inline struct spi_nor *mtd_to_spi_nor (struct mtd_info *mtd) {return mtd->priv;
[...]
Best regards,
Marek Vasut
Re: [PATCH v2 2/5] Documentation: mtd: add a DT property to set the number of dummy cycles
In reply to Cyrille PitchenQuoted 20 lines · Cyrille Pitchen
Depending on the SPI clock frequency, the Fast Read op code and the Single/Dual Data Rate mode, the number of dummy cycles can be tuned to improve transfer speed.
The actual number of dummy cycles is specific for each memory model and is provided by the manufacturer thanks to the memory datasheet.Signed-off-by Cyrille Pitchen <[email protected]>--- Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt | 6 ++++++ 1 file changed, 6 insertions(+)(quoted diff) +0
-0
b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txtindex2bee68103b01..4387567d8024100644Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt +0
-0@@ -19,6 +19,11 @@ Optional properties: all chips and support for it can not be detected atruntime. Refer to your chips' datasheet to check if this is supported by your chip.
Quoted 5 lines
+- m25p,num-dummy-cycles : Set the number of dummy cycles for Fast Read commands. + Depending on the manufacturer additional dedicated + commands are sent to the flash memory so the + controller and the memory can agree on the number of + dummy cycles to use.
Can't you just try negotiating this value at probe time, starting with some high value and see how low you can get with the negotiations ? This way, you'd be able to effectively auto-detect this value at probe-time.
I might be wrong though :)
Best regards,
Marek Vasut
Re: [PATCH v2 5/5] mtd: atmel-quadspi: add driver for Atmel QSPI controller
In reply to Cyrille PitchenQuoted 6 lines · Cyrille Pitchen
This driver add support to the new Atmel QSPI controller embedded into sama5d2x SoCs. It expects a NOR memory to be connected to the QSPI controller.
Signed-off-by Cyrille Pitchen <[email protected]>---
[...]
Quoted 45 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +45
-0+/* QSPI register offsets */ +#define QSPI_CR 0x0000/* Control Register */ +#define QSPI_MR 0x0004/* Mode Register */ +#define QSPI_RD 0x0008/* Receive Data Register */ +#define QSPI_TD 0x000c/* Transmit Data Register */ +#define QSPI_SR 0x0010/* Status Register */ +#define QSPI_IER 0x0014/* Interrupt Enable Register */ +#define QSPI_IDR 0x0018/* Interrupt Disable Register */ +#define QSPI_IMR 0x001c/* Interrupt Mask Register */ +#define QSPI_SCR 0x0020/* Serial Clock Register */ + +#define QSPI_IAR 0x0030/* Instruction Address Register */ +#define QSPI_ICR 0x0034/* Instruction Code Register */ +#define QSPI_IFR 0x0038/* Instruction Frame Register */ + +#define QSPI_SMR 0x0040/* Scrambling Mode Register */ +#define QSPI_SKR 0x0044/* Scrambling Key Register */ + +#define QSPI_WPMR 0x00E4/* Write Protection Mode Register */ +#define QSPI_WPSR 0x00E8/* Write Protection Status Register */ + +#define QSPI_VERSION 0x00FC/* Version Register */ + +/* Bitfields in QSPI_CR (Control Register) */ +#define QSPI_CR_QSPIEN_OFFSET 0 +#define QSPI_CR_QSPIEN_SIZE 1 +#define QSPI_CR_QSPIDIS_OFFSET 1 +#define QSPI_CR_QSPIDIS_SIZE 1 +#define QSPI_CR_SWRST_OFFSET 7 +#define QSPI_CR_SWRST_SIZE 1 +#define QSPI_CR_LASTXFER_OFFSET 24 +#define QSPI_CR_LASTXFER_SIZE 1 + +/* Bitfields in QSPI_MR (Mode Register) */ +#define QSPI_MR_SSM_OFFSET 0 +#define QSPI_MR_SSM_SIZE 1 +#define QSPI_MR_LLB_OFFSET 1 +#define QSPI_MR_LLB_SIZE 1 +#define QSPI_MR_WDRBT_OFFSET 2 +#define QSPI_MR_WDRBT_SIZE 1 +#define QPSI_MR_SMRM_OFFSET 3 +#define QSPI_MR_SMRM_SIZE 1 +#define QSPI_MR_CSMODE_OFFSET 4 +#define QSPI_MR_CSMODE_SIZE 2 +#define QSPI_MR_NBBITS_OFFSET 8
drivers/mtd/spi-nor/atmel-quadspi.c line 97
Quoted 10 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +10
-0+#define QSPI_MR_NBBITS_SIZE 4 +#define QSPI_MR_NBBITS_8_BIT 0 +#define QSPI_MR_NBBITS_9_BIT 1 +#define QSPI_MR_NBBITS_10_BIT 2 +#define QSPI_MR_NBBITS_11_BIT 3 +#define QSPI_MR_NBBITS_12_BIT 4 +#define QSPI_MR_NBBITS_13_BIT 5 +#define QSPI_MR_NBBITS_14_BIT 6 +#define QSPI_MR_NBBITS_15_BIT 7 +#define QSPI_MR_NBBITS_16_BIT 8
You might want to turn this into something like:
#define QSPI_NR_NBBITS(n) ((n) - 8)
Quoted 4 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +4
-0+#define QSPI_MR_DLYBCT_OFFSET 16 +#define QSPI_MR_DLYBCT_SIZE 8 +#define QSPI_MR_DLYCS_OFFSET 24 +#define QSPI_MR_DLYCS_SIZE 8
[...]
drivers/mtd/spi-nor/atmel-quadspi.c line 146
Quoted 10 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +10
-0+/* Bitfields in QSPI_IFR (Instruction Frame Register) */ +#define QSPI_IFR_WIDTH_OFFSET 0 +#define QSPI_IFR_WIDTH_SIZE 3 +#define QSPI_IFR_WIDTH_SINGLE_BIT_SPI 0 +#define QSPI_IFR_WIDTH_DUAL_OUTPUT 1 +#define QSPI_IFR_WIDTH_QUAD_OUTPUT 2 +#define QSPI_IFR_WIDTH_DUAL_IO 3 +#define QSPI_IFR_WIDTH_QUAD_IO 4 +#define QSPI_IFR_WIDTH_DUAL_CMD 5 +#define QSPI_IFR_WIDTH_QUAD_CMD 6
Please use #define[SPACE] instead of inconsistent #define[TAB]
[...]
Quoted 16 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +16
-0+/* Bit manipulation macros */ +#define QSPI_BIT (name) \ + (1 << QSPI_##name##_OFFSET) +#define QSPI_BF (name, value) \ + (((value) & ((1 << QSPI_##name##_SIZE) - 1)) << QSPI_##name##_OFFSET) +#define QSPI_BFEXT (name, value) \ + (((value) >> QSPI_##name##_OFFSET) & ((1 << QSPI_##name##_SIZE) - 1)) +#define QSPI_BFINS (name, value, old) \ + (((old) & ~(((1 << QSPI_##name##_SIZE) - 1) << QSPI_##name##_OFFSET)) \ + | QSPI_BF(name, value)) + +/* Register access macros */ +#define qspi_readl (port, reg) \ + readl_relaxed((port)->regs + QSPI_##reg) +#define qspi_writel (port, reg, value) \ + writel_relaxed((value), (port)->regs + QSPI_##reg)
drivers/mtd/spi-nor/atmel-quadspi.c line 217
Quoted 10 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +10
-0+ +#define qspi_readw (port, reg) \ + readw_relaxed((port)->regs + QSPI_##reg) +#define qspi_writew (port, reg, value) \ + writew_relaxed((value), (port)->regs + QSPI_##reg) + +#define qspi_readb (port, reg) \ + readb_relaxed((port)->regs + QSPI_##reg) +#define qspi_writeb (port, reg, value) \ + writeb_relaxed((value), (port)->regs + QSPI_##reg)
I cannot say I'd be very fond of those preprocessor concatenations. Can't you do something about them? It's really hard to look for symbols which are in fact result of this horrible macro voodoo .
Quoted 19 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +19
-0+struct atmel_qspi { +void __iomem *regs; +void __iomem *mem; +dma_addr_t phys_addr; +struct dma_chan *chan; +struct clk *clk; +struct platform_device *pdev; +u32 ifr_width; +u32 pending; + +struct mtd_info mtd; +struct spi_nor nor; +u32 clk_rate; +struct completion completion; + +#ifdef DEBUG +u8 last_instruction; +#endif +};
[...]
Quoted 42 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +42
-0+#ifdef DEBUG +static void atmel_qspi_debug_command (struct atmel_qspi *aq, +const struct atmel_qspi_command *cmd) +{ +u8 cmd_buf[SPI_NOR_MAX_CMD_SIZE ]; +size_t len =0 ; +int i; + +if (cmd->enable.bits.instruction) { +if (aq->last_instruction == cmd->instruction) +return ; + aq->last_instruction = cmd->instruction; + } + +if (cmd->enable.bits.instruction) + cmd_buf[len++] = cmd->instruction; + +for (i = cmd->enable.bits.address-1 ; i >=0 ; --i) + cmd_buf[len++] = (cmd->address >> (i <<3 )) &0xff ; + +if (cmd->enable.bits.mode) + cmd_buf[len++] = cmd->mode; + +if (cmd->enable.bits.dummy) { +int num = cmd->num_dummy_cycles; + +switch (aq->ifr_width) { +case QSPI_IFR_WIDTH_SINGLE_BIT_SPI : +case QSPI_IFR_WIDTH_DUAL_OUTPUT : +case QSPI_IFR_WIDTH_QUAD_OUTPUT : + num >>=3 ; +break ; +case QSPI_IFR_WIDTH_DUAL_IO : +case QSPI_IFR_WIDTH_DUAL_CMD : + num >>=2 ; +break ; +case QSPI_IFR_WIDTH_QUAD_IO : +case QSPI_IFR_WIDTH_QUAD_CMD : + num >>=1 ; +break ; +default : +return ;
drivers/mtd/spi-nor/atmel-quadspi.c line 408
Quoted 10 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +10
-0+ } + +for (i =0 ; i < num; ++i) + cmd_buf[len++] =0 ; + } + +print_hex_dump (KERN_DEBUG ,"qspi cmd: " ,DUMP_PREFIX_NONE , +32 ,1 , cmd_buf, len, false); + +#ifdef VERBOSE_DEBUG
The print_hex_dump() is already KERN_DEBUG, so I don't think there's any need to introduce yet another preprocessor check here.
Quoted 8 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +8
-0+if (cmd->enable.bits.data && cmd->tx_buf) +print_hex_dump (KERN_DEBUG ,"qspi tx : " ,DUMP_PREFIX_NONE , +32 ,1 , cmd->tx_buf, cmd->buf_len, false); +#endif +} +#else +#define atmel_qspi_debug_command (aq, cmd) +#endif
[...]
Re: [PATCH v2 1/5] mtd: spi-nor: notify (Q)SPI controller about protocol change
In reply to Marek VasutHi Marek,
Le 22/07/2015 15:41, Marek Vasut a ?crit :
Quoted 20 lines · Cyrille Pitchen
Quoted 19 lines
Once the Quad SPI mode has been enabled on a Micron flash memory, this device expects ALL the following commands to use the SPI 4-4-4 protocol. The (Q)SPI controller needs to be notified about the protocol change so it can adapt and keep on dialoging with the Micron memory.
Signed-off-by Cyrille Pitchen <[email protected]>--- drivers/mtd/spi-nor/spi-nor.c | 17 +++++++++++++++++ include/linux/mtd/spi-nor.h | 13 +++++++++++++ 2 files changed, 30 insertions(+)drivers/mtd/spi-nor/spi-nor.c +0
-0@@ -163,6 +163,18 @@ static inline int write_disable(struct spi_nor *nor)return nor->write_reg (nor,SPINOR_OP_WRDI ,NULL ,0 ,0 ); }
Quoted 9 lines
drivers/mtd/spi-nor/spi-nor.c static inline int write_disable(struct spi_nor *nor) · line 167
Quoted 2 lines
drivers/mtd/spi-nor/spi-nor.c +2
-0+/* +* Notify the (Q)SPI controller about the new protocol to be used. Hi!
Can you please just reword this a little, so that it is absolutelly clear even to the less bright of us (like me) that this is a notification coming from the upper layers (ie. the spi-nor framework) toward the hardware ?
Sure, no problem! what about the following?
/*
* Let the spi-nor framework notify lower layers, especially the driver of the
* (Q)SPI controller, about the new protocol to be used. Indeed, once the
* spi-nor framework has sent manufacturer specific commands to a memory to
* enable its Quad SPI mode, it should immediately after tell the QSPI
* controller to use the very same Quad SPI protocol as expected by the memory. */
Quoted 16 lines
Quoted 13 lines
drivers/mtd/spi-nor/spi-nor.c +10
-0+*/ +static inline int spi_nor_set_protocol (struct spi_nor *nor, +enum spi_protocol proto) +{ +if (nor->set_protocol) +return nor->set_protocol (nor, proto); + +return 0 ; +} +static inline struct spi_nor *mtd_to_spi_nor (struct mtd_info *mtd) {return mtd->priv;[...]
Quoted 3 lines
Best regards,
Marek Vasut
Best regards,
Cyrille
Re: [PATCH v2 2/5] Documentation: mtd: add a DT property to set the number of dummy cycles
In reply to Marek VasutHi Marek,
Le 22/07/2015 15:43, Marek Vasut a ?crit :
Quoted 31 lines · Cyrille Pitchen
Quoted 20 lines
Depending on the SPI clock frequency, the Fast Read op code and the Single/Dual Data Rate mode, the number of dummy cycles can be tuned to improve transfer speed.
The actual number of dummy cycles is specific for each memory model and is provided by the manufacturer thanks to the memory datasheet.Signed-off-by Cyrille Pitchen <[email protected]>--- Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt | 6 ++++++ 1 file changed, 6 insertions(+)(quoted diff) +0
-0
b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txtindex2bee68103b01..4387567d8024100644Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt +0
-0@@ -19,6 +19,11 @@ Optional properties: all chips and support for it can not be detected atruntime. Refer to your chips' datasheet to check if this is supported by your chip.
Quoted 5 lines
+- m25p,num-dummy-cycles : Set the number of dummy cycles for Fast Read commands. + Depending on the manufacturer additional dedicated + commands are sent to the flash memory so the + controller and the memory can agree on the number of + dummy cycles to use.Can't you just try negotiating this value at probe time, starting with some high value and see how low you can get with the negotiations ? This way, you'd be able to effectively auto-detect this value at probe-time.
Quoted 2 lines
I might be wrong though :)
I don't know whether it would be reliable enough. It is the exact same idea as for the latency code used by Spansion QSPI memories. Micron memories allow to skip the step of converting the number of dummy cycles into a latency code, you directly program the right number of dummy cycles into a Micron specific register, the Volatile Configuration Register.
However for both manufacturers the number of dummy cycles to use during Fast Read commands is given though tables found into the memory datasheet. The number of dummy cycles depends on the Fast Read command, the SPI bus clock frequency and the Single/Dual Data Rate mode.
It should be confirmed by Quad SPI memory manufacturers but since the number of dummy cycles depends on the bus clock frequency, I guess the values provided by the datasheets are recommendations. I think a too low value should not be so easy to detect. For a given frequency one Fast Read command may succeed whereas the same command with the very same number of dummy cycles might fail on the next try. To be honest, I'm not sure about the memory behavior in limit conditions so maybe the command will always succeed or always fail.
Also we can't be sure the read data are valid if we don't write them first. So we would have to save the original data to restore them at the end of the probing. Writing data at each probe would also reduce the memory lifetime. We should also be aware of the bad blocks, which is more a job for upper layers.
It would be interesting to have some feedbacks from Micron, Spansion or other QSPI memory manufacturer :)
Quoted 3 lines
Best regards,
Marek Vasut
Best regards,
Cyrille
Re: [PATCH v2 1/5] mtd: spi-nor: notify (Q)SPI controller about protocol change
In reply to Cyrille PitchenQuoted 39 lines · Cyrille Pitchen
Hi Marek,
Le 22/07/2015 15:41, Marek Vasut a ?crit :
Quoted 29 lines · Cyrille Pitchen
Quoted 17 lines
Once the Quad SPI mode has been enabled on a Micron flash memory, this device expects ALL the following commands to use the SPI 4-4-4 protocol. The (Q)SPI controller needs to be notified about the protocol change so it can adapt and keep on dialoging with the Micron memory.
Signed-off-by Cyrille Pitchen <[email protected]>---
drivers/mtd/spi-nor/spi-nor.c | 17 +++++++++++++++++ include/linux/mtd/spi-nor.h | 13 +++++++++++++ 2 files changed, 30 insertions(+)(quoted diff) +0
-0
b/drivers/mtd/spi-nor/spi-nor.cindexd78831b4422b..93627d4e6be8100644drivers/mtd/spi-nor/spi-nor.c static inline int write_disable(struct spi_nor · line 170
Quoted 8 lines
drivers/mtd/spi-nor/spi-nor.c +2
-0@@ -163,6 +163,18 @@ static inline int write_disable(struct spi_nor *nor)return nor->write_reg (nor,SPINOR_OP_WRDI ,NULL ,0 ,0 ); } +/* +* Notify the (Q)SPI controller about the new protocol to be used. Hi!
Quoted 4 lines
Can you please just reword this a little, so that it is absolutelly clear even to the less bright of us (like me) that this is a notification coming from the upper layers (ie. the spi-nor framework) toward the hardware ?
Sure, no problem! what about the following?
Quoted 7 lines
/*
* Let the spi-nor framework notify lower layers, especially the driver of
the * (Q)SPI controller, about the new protocol to be used. Indeed, once the * spi-nor framework has sent manufacturer specific commands to a memory to * enable its Quad SPI mode, it should immediately after tell the QSPI * controller to use the very same Quad SPI protocol as expected by the memory. */
Sure, excellent, thanks ! :-)
Re: [PATCH v2 2/5] Documentation: mtd: add a DT property to set the number of dummy cycles
In reply to Cyrille PitchenQuoted 60 lines · Cyrille Pitchen
Hi Marek,
Le 22/07/2015 15:43, Marek Vasut a ?crit :
Quoted 35 lines · Cyrille Pitchen
Quoted 23 lines
Depending on the SPI clock frequency, the Fast Read op code and the Single/Dual Data Rate mode, the number of dummy cycles can be tuned to improve transfer speed.
The actual number of dummy cycles is specific for each memory model and is provided by the manufacturer thanks to the memory datasheet.Signed-off-by Cyrille Pitchen <[email protected]>---
Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt | 6 ++++++ 1 file changed, 6 insertions(+)(quoted diff) +0
-0
b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txtindex2bee68103b01..4387567d8024100644Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt +0
-0@@ -19,6 +19,11 @@ Optional properties: all chips and support for it can not be detected atruntime. Refer to your chips' datasheet to check if this is supported by your chip.
Quoted 6 lines
+- m25p,num-dummy-cycles : Set the number of dummy cycles for Fast Read commands. + Depending on the manufacturer additional dedicated + commands are sent to the flash memory so the + controller and the memory can agree on the number of + dummy cycles touse.
Can't you just try negotiating this value at probe time, starting with some high value and see how low you can get with the negotiations ? This way, you'd be able to effectively auto-detect this value at probe-time.
Quoted 1 line
I might be wrong though :)
I don't know whether it would be reliable enough. It is the exact same idea as for the latency code used by Spansion QSPI memories. Micron memories allow to skip the step of converting the number of dummy cycles into a latency code, you directly program the right number of dummy cycles into a Micron specific register, the Volatile Configuration Register.
However for both manufacturers the number of dummy cycles to use during Fast Read commands is given though tables found into the memory datasheet. The number of dummy cycles depends on the Fast Read command, the SPI bus clock frequency and the Single/Dual Data Rate mode.
It should be confirmed by Quad SPI memory manufacturers but since the number of dummy cycles depends on the bus clock frequency, I guess the values provided by the datasheets are recommendations. I think a too low value should not be so easy to detect. For a given frequency one Fast Read command may succeed whereas the same command with the very same number of dummy cycles might fail on the next try. To be honest, I'm not sure about the memory behavior in limit conditions so maybe the command will always succeed or always fail.
Quoted 5 lines
Also we can't be sure the read data are valid if we don't write them first. So we would have to save the original data to restore them at the end of the probing. Writing data at each probe would also reduce the memory lifetime. We should also be aware of the bad blocks, which is more a job for upper layers.
I see, understood, OK. I really like how you explain those things btw :)
Quoted 2 lines
It would be interesting to have some feedbacks from Micron, Spansion or other QSPI memory manufacturer :)
Definitelly!
Re: [PATCH v2 5/5] mtd: atmel-quadspi: add driver for Atmel QSPI controller
In reply to Marek VasutHi Marek,
Le 22/07/2015 15:50, Marek Vasut a ?crit :
Quoted 67 lines · Cyrille Pitchen
Quoted 6 lines
This driver add support to the new Atmel QSPI controller embedded into sama5d2x SoCs. It expects a NOR memory to be connected to the QSPI controller.
Signed-off-by Cyrille Pitchen <[email protected]>---
[...]
Quoted 45 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +45
-0+/* QSPI register offsets */ +#define QSPI_CR 0x0000/* Control Register */ +#define QSPI_MR 0x0004/* Mode Register */ +#define QSPI_RD 0x0008/* Receive Data Register */ +#define QSPI_TD 0x000c/* Transmit Data Register */ +#define QSPI_SR 0x0010/* Status Register */ +#define QSPI_IER 0x0014/* Interrupt Enable Register */ +#define QSPI_IDR 0x0018/* Interrupt Disable Register */ +#define QSPI_IMR 0x001c/* Interrupt Mask Register */ +#define QSPI_SCR 0x0020/* Serial Clock Register */ + +#define QSPI_IAR 0x0030/* Instruction Address Register */ +#define QSPI_ICR 0x0034/* Instruction Code Register */ +#define QSPI_IFR 0x0038/* Instruction Frame Register */ + +#define QSPI_SMR 0x0040/* Scrambling Mode Register */ +#define QSPI_SKR 0x0044/* Scrambling Key Register */ + +#define QSPI_WPMR 0x00E4/* Write Protection Mode Register */ +#define QSPI_WPSR 0x00E8/* Write Protection Status Register */ + +#define QSPI_VERSION 0x00FC/* Version Register */ + +/* Bitfields in QSPI_CR (Control Register) */ +#define QSPI_CR_QSPIEN_OFFSET 0 +#define QSPI_CR_QSPIEN_SIZE 1 +#define QSPI_CR_QSPIDIS_OFFSET 1 +#define QSPI_CR_QSPIDIS_SIZE 1 +#define QSPI_CR_SWRST_OFFSET 7 +#define QSPI_CR_SWRST_SIZE 1 +#define QSPI_CR_LASTXFER_OFFSET 24 +#define QSPI_CR_LASTXFER_SIZE 1 + +/* Bitfields in QSPI_MR (Mode Register) */ +#define QSPI_MR_SSM_OFFSET 0 +#define QSPI_MR_SSM_SIZE 1 +#define QSPI_MR_LLB_OFFSET 1 +#define QSPI_MR_LLB_SIZE 1 +#define QSPI_MR_WDRBT_OFFSET 2 +#define QSPI_MR_WDRBT_SIZE 1 +#define QPSI_MR_SMRM_OFFSET 3 +#define QSPI_MR_SMRM_SIZE 1 +#define QSPI_MR_CSMODE_OFFSET 4 +#define QSPI_MR_CSMODE_SIZE 2 +#define QSPI_MR_NBBITS_OFFSET 8drivers/mtd/spi-nor/atmel-quadspi.c line 97
Quoted 10 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +10
-0+#define QSPI_MR_NBBITS_SIZE 4 +#define QSPI_MR_NBBITS_8_BIT 0 +#define QSPI_MR_NBBITS_9_BIT 1 +#define QSPI_MR_NBBITS_10_BIT 2 +#define QSPI_MR_NBBITS_11_BIT 3 +#define QSPI_MR_NBBITS_12_BIT 4 +#define QSPI_MR_NBBITS_13_BIT 5 +#define QSPI_MR_NBBITS_14_BIT 6 +#define QSPI_MR_NBBITS_15_BIT 7 +#define QSPI_MR_NBBITS_16_BIT 8You might want to turn this into something like:
Quoted 1 line
#define
QSPI_NR_NBBITS(n)((n) - 8)
done in the next series
Quoted 8 lines
Quoted 5 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +4
-0+#define QSPI_MR_DLYBCT_OFFSET 16 +#define QSPI_MR_DLYBCT_SIZE 8 +#define QSPI_MR_DLYCS_OFFSET 24 +#define QSPI_MR_DLYCS_SIZE 8[...]
Quoted 13 lines
drivers/mtd/spi-nor/atmel-quadspi.c line 146
Quoted 10 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +10
-0+/* Bitfields in QSPI_IFR (Instruction Frame Register) */ +#define QSPI_IFR_WIDTH_OFFSET 0 +#define QSPI_IFR_WIDTH_SIZE 3 +#define QSPI_IFR_WIDTH_SINGLE_BIT_SPI 0 +#define QSPI_IFR_WIDTH_DUAL_OUTPUT 1 +#define QSPI_IFR_WIDTH_QUAD_OUTPUT 2 +#define QSPI_IFR_WIDTH_DUAL_IO 3 +#define QSPI_IFR_WIDTH_QUAD_IO 4 +#define QSPI_IFR_WIDTH_DUAL_CMD 5 +#define QSPI_IFR_WIDTH_QUAD_CMD 6Please use #define[SPACE] instead of inconsistent #define[TAB]
done in the next series. I also use BIT and GENMASK macros as much as possible to define the register bit fields.
Quoted 24 lines
[...]
Quoted 22 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +22
-0+/* Bit manipulation macros */ +#define QSPI_BIT (name) \ + (1 << QSPI_##name##_OFFSET) +#define QSPI_BF (name, value) \ + (((value) & ((1 << QSPI_##name##_SIZE) - 1)) << QSPI_##name##_OFFSET) +#define QSPI_BFEXT (name, value) \ + (((value) >> QSPI_##name##_OFFSET) & ((1 << QSPI_##name##_SIZE) - 1)) +#define QSPI_BFINS (name, value, old) \ + (((old) & ~(((1 << QSPI_##name##_SIZE) - 1) << QSPI_##name##_OFFSET)) \ + | QSPI_BF(name, value)) + +/* Register access macros */ +#define qspi_readl (port, reg) \ + readl_relaxed((port)->regs + QSPI_##reg) +#define qspi_writel (port, reg, value) \ + writel_relaxed((value), (port)->regs + QSPI_##reg) + +#define qspi_readw (port, reg) \ + readw_relaxed((port)->regs + QSPI_##reg) +#define qspi_writew (port, reg, value) \ + writew_relaxed((value), (port)->regs + QSPI_##reg) +
Quoted 9 lines
drivers/mtd/spi-nor/atmel-quadspi.c line 217
Quoted 4 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +4
-0+#define qspi_readb (port, reg) \ + readb_relaxed((port)->regs + QSPI_##reg) +#define qspi_writeb (port, reg, value) \ + writeb_relaxed((value), (port)->regs + QSPI_##reg)I cannot say I'd be very fond of those preprocessor concatenations. Can't you do something about them? It's really hard to look for symbols which are in fact result of this horrible macro voodoo .
I agree with you. I did it this way at first to make it consistent with other Atmel drivers which use such macros but we tend to remove them progressively as they prevent from using ctags for instance.
Quoted 69 lines
Quoted 19 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +19
-0+struct atmel_qspi { +void __iomem *regs; +void __iomem *mem; +dma_addr_t phys_addr; +struct dma_chan *chan; +struct clk *clk; +struct platform_device *pdev; +u32 ifr_width; +u32 pending; + +struct mtd_info mtd; +struct spi_nor nor; +u32 clk_rate; +struct completion completion; + +#ifdef DEBUG +u8 last_instruction; +#endif +};[...]
Quoted 47 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +47
-0+#ifdef DEBUG +static void atmel_qspi_debug_command (struct atmel_qspi *aq, +const struct atmel_qspi_command *cmd) +{ +u8 cmd_buf[SPI_NOR_MAX_CMD_SIZE ]; +size_t len =0 ; +int i; + +if (cmd->enable.bits.instruction) { +if (aq->last_instruction == cmd->instruction) +return ; + aq->last_instruction = cmd->instruction; + } + +if (cmd->enable.bits.instruction) + cmd_buf[len++] = cmd->instruction; + +for (i = cmd->enable.bits.address-1 ; i >=0 ; --i) + cmd_buf[len++] = (cmd->address >> (i <<3 )) &0xff ; + +if (cmd->enable.bits.mode) + cmd_buf[len++] = cmd->mode; + +if (cmd->enable.bits.dummy) { +int num = cmd->num_dummy_cycles; + +switch (aq->ifr_width) { +case QSPI_IFR_WIDTH_SINGLE_BIT_SPI : +case QSPI_IFR_WIDTH_DUAL_OUTPUT : +case QSPI_IFR_WIDTH_QUAD_OUTPUT : + num >>=3 ; +break ; +case QSPI_IFR_WIDTH_DUAL_IO : +case QSPI_IFR_WIDTH_DUAL_CMD : + num >>=2 ; +break ; +case QSPI_IFR_WIDTH_QUAD_IO : +case QSPI_IFR_WIDTH_QUAD_CMD : + num >>=1 ; +break ; +default : +return ; + } + +for (i =0 ; i < num; ++i) + cmd_buf[len++] =0 ; + }
Quoted 9 lines
drivers/mtd/spi-nor/atmel-quadspi.c line 408
Quoted 5 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +5
-0+ +print_hex_dump (KERN_DEBUG ,"qspi cmd: " ,DUMP_PREFIX_NONE , +32 ,1 , cmd_buf, len, false); + +#ifdef VERBOSE_DEBUG The
print_hex_dump()is alreadyKERN_DEBUG, so I don't think there's any need to introduce yet another preprocessor check here.
Indeed, there is only one debug level for printk() and print_hex_dump():KERN_DEBUG. However I've used the DEBUG and VERBOSE_DEBUG macros to have two levels of debug output. When the DEBUG macro is defined the driver prints the QSPI command. When both the DEBUG and VERBOSE_DEBUG macro are defined, the driver also prints the RX or TX data following the commands. Depending on the command to debug, data can be usefull, as for the READ ID command, or really annoying as for big Fast Read commands.
If it's fine with you, I'd rather keep these two debug levels.
Quoted 11 lines
Quoted 8 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +8
-0+if (cmd->enable.bits.data && cmd->tx_buf) +print_hex_dump (KERN_DEBUG ,"qspi tx : " ,DUMP_PREFIX_NONE , +32 ,1 , cmd->tx_buf, cmd->buf_len, false); +#endif +} +#else +#define atmel_qspi_debug_command (aq, cmd) +#endif [...]
Best Regards,
Cyrille
Re: [PATCH v2 5/5] mtd: atmel-quadspi: add driver for Atmel QSPI controller
Quoted 221 lines · Cyrille Pitchen
Hi Marek,
Le 22/07/2015 15:50, Marek Vasut a ?crit :
Quoted 68 lines · Cyrille Pitchen
Quoted 6 lines
This driver add support to the new Atmel QSPI controller embedded into sama5d2x SoCs. It expects a NOR memory to be connected to the QSPI controller.
Signed-off-by Cyrille Pitchen <[email protected]>---
[...]
Quoted 45 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +45
-0+/* QSPI register offsets */ +#define QSPI_CR 0x0000/* Control Register */ +#define QSPI_MR 0x0004/* Mode Register */ +#define QSPI_RD 0x0008/* Receive Data Register */ +#define QSPI_TD 0x000c/* Transmit Data Register */ +#define QSPI_SR 0x0010/* Status Register */ +#define QSPI_IER 0x0014/* Interrupt Enable Register */ +#define QSPI_IDR 0x0018/* Interrupt Disable Register */ +#define QSPI_IMR 0x001c/* Interrupt Mask Register */ +#define QSPI_SCR 0x0020/* Serial Clock Register */ + +#define QSPI_IAR 0x0030/* Instruction Address Register */ +#define QSPI_ICR 0x0034/* Instruction Code Register */ +#define QSPI_IFR 0x0038/* Instruction Frame Register */ + +#define QSPI_SMR 0x0040/* Scrambling Mode Register */ +#define QSPI_SKR 0x0044/* Scrambling Key Register */ + +#define QSPI_WPMR 0x00E4/* Write Protection Mode Register */ +#define QSPI_WPSR 0x00E8/* Write Protection Status Register */ + +#define QSPI_VERSION 0x00FC/* Version Register */ + +/* Bitfields in QSPI_CR (Control Register) */ +#define QSPI_CR_QSPIEN_OFFSET 0 +#define QSPI_CR_QSPIEN_SIZE 1 +#define QSPI_CR_QSPIDIS_OFFSET 1 +#define QSPI_CR_QSPIDIS_SIZE 1 +#define QSPI_CR_SWRST_OFFSET 7 +#define QSPI_CR_SWRST_SIZE 1 +#define QSPI_CR_LASTXFER_OFFSET 24 +#define QSPI_CR_LASTXFER_SIZE 1 + +/* Bitfields in QSPI_MR (Mode Register) */ +#define QSPI_MR_SSM_OFFSET 0 +#define QSPI_MR_SSM_SIZE 1 +#define QSPI_MR_LLB_OFFSET 1 +#define QSPI_MR_LLB_SIZE 1 +#define QSPI_MR_WDRBT_OFFSET 2 +#define QSPI_MR_WDRBT_SIZE 1 +#define QPSI_MR_SMRM_OFFSET 3 +#define QSPI_MR_SMRM_SIZE 1 +#define QSPI_MR_CSMODE_OFFSET 4 +#define QSPI_MR_CSMODE_SIZE 2 +#define QSPI_MR_NBBITS_OFFSET 8drivers/mtd/spi-nor/atmel-quadspi.c line 97
Quoted 10 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +10
-0+#define QSPI_MR_NBBITS_SIZE 4 +#define QSPI_MR_NBBITS_8_BIT 0 +#define QSPI_MR_NBBITS_9_BIT 1 +#define QSPI_MR_NBBITS_10_BIT 2 +#define QSPI_MR_NBBITS_11_BIT 3 +#define QSPI_MR_NBBITS_12_BIT 4 +#define QSPI_MR_NBBITS_13_BIT 5 +#define QSPI_MR_NBBITS_14_BIT 6 +#define QSPI_MR_NBBITS_15_BIT 7 +#define QSPI_MR_NBBITS_16_BIT 8You might want to turn this into something like:
Quoted 1 line
#define
QSPI_NR_NBBITS(n)((n) - 8)done in the next series
Quoted 7 lines
Quoted 4 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +4
-0+#define QSPI_MR_DLYBCT_OFFSET 16 +#define QSPI_MR_DLYBCT_SIZE 8 +#define QSPI_MR_DLYCS_OFFSET 24 +#define QSPI_MR_DLYCS_SIZE 8[...]
Quoted 12 lines
drivers/mtd/spi-nor/atmel-quadspi.c line 146
Quoted 10 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +10
-0+/* Bitfields in QSPI_IFR (Instruction Frame Register) */ +#define QSPI_IFR_WIDTH_OFFSET 0 +#define QSPI_IFR_WIDTH_SIZE 3 +#define QSPI_IFR_WIDTH_SINGLE_BIT_SPI 0 +#define QSPI_IFR_WIDTH_DUAL_OUTPUT 1 +#define QSPI_IFR_WIDTH_QUAD_OUTPUT 2 +#define QSPI_IFR_WIDTH_DUAL_IO 3 +#define QSPI_IFR_WIDTH_QUAD_IO 4 +#define QSPI_IFR_WIDTH_DUAL_CMD 5 +#define QSPI_IFR_WIDTH_QUAD_CMD 6Please use #define[SPACE] instead of inconsistent #define[TAB]
done in the next series. I also use BIT and GENMASK macros as much as possible to define the register bit fields.
Quoted 24 lines
[...]
Quoted 22 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +9
-0+/* Bit manipulation macros */ +#define QSPI_BIT (name) \ + (1 << QSPI_##name##_OFFSET) +#define QSPI_BF (name, value) \ + (((value) & ((1 << QSPI_##name##_SIZE) - 1)) << QSPI_##name##_OFFSET) +#define QSPI_BFEXT (name, value) \ + (((value) >> QSPI_##name##_OFFSET) & ((1 << QSPI_##name##_SIZE) - 1)) +#define QSPI_BFINS (name, value, old) \ + (((old) & ~(((1 << QSPI_##name##_SIZE) - 1) << QSPI_##name##_OFFSET))\ + |
QSPI_BF(name, value))drivers/mtd/spi-nor/atmel-quadspi.c new file +12
-0+ +/* Register access macros */ +#define qspi_readl (port, reg) \ + readl_relaxed((port)->regs + QSPI_##reg) +#define qspi_writel (port, reg, value) \ + writel_relaxed((value), (port)->regs + QSPI_##reg) + +#define qspi_readw (port, reg) \ + readw_relaxed((port)->regs + QSPI_##reg) +#define qspi_writew (port, reg, value) \ + writew_relaxed((value), (port)->regs + QSPI_##reg) +Quoted 8 lines
drivers/mtd/spi-nor/atmel-quadspi.c line 217
Quoted 4 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +4
-0+#define qspi_readb (port, reg) \ + readb_relaxed((port)->regs + QSPI_##reg) +#define qspi_writeb (port, reg, value) \ + writeb_relaxed((value), (port)->regs + QSPI_##reg)I cannot say I'd be very fond of those preprocessor concatenations. Can't you do something about them? It's really hard to look for symbols which are in fact result of this horrible macro voodoo .
I agree with you. I did it this way at first to make it consistent with other Atmel drivers which use such macros but we tend to remove them progressively as they prevent from using ctags for instance.
Quoted 69 lines
Quoted 19 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +19
-0+struct atmel_qspi { +void __iomem *regs; +void __iomem *mem; +dma_addr_t phys_addr; +struct dma_chan *chan; +struct clk *clk; +struct platform_device *pdev; +u32 ifr_width; +u32 pending; + +struct mtd_info mtd; +struct spi_nor nor; +u32 clk_rate; +struct completion completion; + +#ifdef DEBUG +u8 last_instruction; +#endif +};[...]
Quoted 47 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +47
-0+#ifdef DEBUG +static void atmel_qspi_debug_command (struct atmel_qspi *aq, +const struct atmel_qspi_command *cmd) +{ +u8 cmd_buf[SPI_NOR_MAX_CMD_SIZE ]; +size_t len =0 ; +int i; + +if (cmd->enable.bits.instruction) { +if (aq->last_instruction == cmd->instruction) +return ; + aq->last_instruction = cmd->instruction; + } + +if (cmd->enable.bits.instruction) + cmd_buf[len++] = cmd->instruction; + +for (i = cmd->enable.bits.address-1 ; i >=0 ; --i) + cmd_buf[len++] = (cmd->address >> (i <<3 )) &0xff ; + +if (cmd->enable.bits.mode) + cmd_buf[len++] = cmd->mode; + +if (cmd->enable.bits.dummy) { +int num = cmd->num_dummy_cycles; + +switch (aq->ifr_width) { +case QSPI_IFR_WIDTH_SINGLE_BIT_SPI : +case QSPI_IFR_WIDTH_DUAL_OUTPUT : +case QSPI_IFR_WIDTH_QUAD_OUTPUT : + num >>=3 ; +break ; +case QSPI_IFR_WIDTH_DUAL_IO : +case QSPI_IFR_WIDTH_DUAL_CMD : + num >>=2 ; +break ; +case QSPI_IFR_WIDTH_QUAD_IO : +case QSPI_IFR_WIDTH_QUAD_CMD : + num >>=1 ; +break ; +default : +return ; + } + +for (i =0 ; i < num; ++i) + cmd_buf[len++] =0 ; + }Quoted 8 lines
drivers/mtd/spi-nor/atmel-quadspi.c line 408
Quoted 5 lines
drivers/mtd/spi-nor/atmel-quadspi.c new file +5
-0+ +print_hex_dump (KERN_DEBUG ,"qspi cmd: " ,DUMP_PREFIX_NONE , +32 ,1 , cmd_buf, len, false); + +#ifdef VERBOSE_DEBUG The
print_hex_dump()is alreadyKERN_DEBUG, so I don't think there's any need to introduce yet another preprocessor check here.Indeed, there is only one debug level for
printk()andprint_hex_dump():KERN_DEBUG. However I've used the DEBUG andVERBOSE_DEBUGmacros to have two levels of debug output. When the DEBUG macro is defined the driver prints the QSPI command. When both the DEBUG andVERBOSE_DEBUGmacro are defined, the driver also prints the RX or TX data following the commands. Depending on the command to debug, data can be usefull, as for the READ ID command, or really annoying as for big Fast Read commands.
Quoted 1 line
If it's fine with you, I'd rather keep these two debug levels.
I'm not the one to decide, but it does indeed make sense.
Thanks a lot for doing the cleanups !