spi: add NPCM FIU controller driver
Subsystems (3)
Tomer Maimon
maintainerv2 cover spi: add NPCM FIU controller driver
This patch set adds Flash Interface Unit(FIU) SPI master support for the Nuvoton NPCM Baseboard Management Controller (BMC).
The FIU supports single, dual or quad communication interface.
the FIU controller can operate in following modes:
- User Mode Access(UMA): provides flash access by using an indirect address/data mechanism.
- direct rd/wr mode: maps the flash memory into the core address space.
- SPI-X mode: used for an expansion bus to an ASIC or CPLD.
The NPCM750/730/715/710 supports up to three FIU devices:
- FIU0 supports two chip select.
- FIU3 supports four chip select.
- FIUX supports two chip select.
The NPCM FIU driver tested on NPCM750 evaluation board.
The FIU controller driver using direct map API SPI-MEM interface and tested with the latest m25p80 driver patch
https://www.spinics.net/lists/linux-mtd/msg07358.html
According a conversion about direct SPI-MEM API
https://www.spinics.net/lists/linux-mtd/msg08225.html
The m25p80 driver will merge to the spi-nor driver we need to make sure the m25p80 direct SPI-MEM will merge as well.
The FIU controller driver tested with the latest spi-nor driver patch
https://www.spinics.net/lists/linux-mtd/msg08472.html
Changes since version 1:
- Support spi-mem no data transferred option (SPI_MEM_NO_DATA)
Tomer Maimon (2):
dt-binding: spi: add NPCM FIU controller
spi: npcm-fiu: add NPCM FIU controller driver
.../bindings/spi/nuvoton,npcm-fiu.txt | 47 ++ drivers/spi/Kconfig | 10 + drivers/spi/Makefile | 1 + drivers/spi/spi-npcm-fiu.c | 761 ++++++++++++++++++ 4 files changed, 819 insertions(+) create mode 100644 Documentation/devicetree/bindings/spi/nuvoton,npcm-fiu.txt create mode 100644 drivers/spi/spi-npcm-fiu.c
Signature · 1 line
2.18.0
Tomer Maimon
maintainerPATCH v2 1/2 dt-binding: spi: add NPCM FIU controller
Added device tree binding documentation for Nuvoton BMC NPCM Flash Interface Unit(FIU) SPI master controller using SPI-MEM interface.
--- .../bindings/spi/nuvoton,npcm-fiu.txt | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 Documentation/devicetree/bindings/spi/nuvoton,npcm-fiu.txt
Documentation/devicetree/bindings/spi/nuvoton,npcm-fiu.txt new file +47 -0
@@ -0,0 +1,47 @@ +* Nuvoton FLASH Interface Unit (FIU) SPI Controller + +NPCM FIU supports single, dual and quad communication interface. + +The NPCM7XX supports three FIU modules, +FIU0 and FIUx supports two chip selects, +FIU3 support four chip select. + +Required properties: + - compatible : "nuvoton,npcm750-fiu" for the NPCM7XX BMC + - #address-cells : should be 1. + - #size-cells : should be 0. + - reg : the first contains the register location and length, + the second contains the memory mapping address and length + - reg-names: Should contain the reg names "control" and "memory" + - clocks : phandle of FIU reference clock. + +Required properties in case the pins can be muxed: + - pinctrl-names : a pinctrl state named "default" must be defined. + - pinctrl-0 : phandle referencing pin configuration of the device. + +Optional property: + - spix-mode: enable spix-mode for an expansion bus to an ASIC or CPLD. + +Aliases: +- All the FIU controller nodes should be represented in the aliases node using + the following format 'fiu{n}' where n is a unique number for the alias. + In the NPCM7XX BMC: + fiu0 represent fiu 0 controller + fiu1 represent fiu 3 controller + fiu2 represent fiu x controller + +Example: +fiu3: fiu@c00000000 { + compatible = "nuvoton,npcm750-fiu"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xfb000000 0x1000>, <0x80000000 0x10000000>; + reg-names = "control", "memory"; + clocks = <&clk NPCM7XX_CLK_AHB>; + pinctrl-names = "default"; + pinctrl-0 = <&spi3_pins>; + spi-nor@0 { + ... + }; +}; +
Signature · 1 line
2.18.0
Rob Herring
maintainerRe: [PATCH v2 1/2] dt-binding: spi: add NPCM FIU controller
Quoted 29 lines · Tomer Maimon
Added device tree binding documentation for Nuvoton BMC NPCM Flash Interface Unit(FIU) SPI master controller using SPI-MEM interface.
Signed-off-by Tomer Maimon <[email protected]>--- .../bindings/spi/nuvoton,npcm-fiu.txt | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 Documentation/devicetree/bindings/spi/nuvoton,npcm-fiu.txtDocumentation/devicetree/bindings/spi/nuvoton,npcm-fiu.txt new file +13
-0@@ -0,0 +1,47 @@ +* Nuvoton FLASH Interface Unit (FIU) SPI Controller + +NPCM FIU supports single, dual and quad communication interface. + +The NPCM7XX supports three FIU modules, +FIU0 and FIUx supports two chip selects, +FIU3 support four chip select. + +Required properties: + - compatible : "nuvoton,npcm750-fiu" for the NPCM7XX BMC + - #address-cells : should be 1. + - #size-cells : should be 0. + - reg : the first contains the register location and length,
Documentation/devicetree/bindings/spi/nuvoton,npcm-fiu.txt line 23
Quoted 10 lines
Documentation/devicetree/bindings/spi/nuvoton,npcm-fiu.txt new file +10
-0+ the second contains the memory mapping address and length + - reg-names: Should contain the reg names "control" and "memory" + - clocks : phandle of FIU reference clock. + +Required properties in case the pins can be muxed: + - pinctrl-names : a pinctrl state named "default" must be defined. + - pinctrl-0 : phandle referencing pin configuration of the device. + +Optional property: + - spix-mode: enable spix-mode for an expansion bus to an ASIC or CPLD.
Is this something standard? If not, add a vendor prefix.
Documentation/devicetree/bindings/spi/nuvoton,npcm-fiu.txt line 34
Quoted 11 lines
Documentation/devicetree/bindings/spi/nuvoton,npcm-fiu.txt new file +11
-0+ +Aliases: +- All the FIU controller nodes should be represented in the aliases node using + the following format 'fiu{n}' where n is a unique number for the alias. + In the NPCM7XX BMC: + fiu0 represent fiu 0 controller + fiu1 represent fiu 3 controller + fiu2 represent fiu x controller + +Example: +fiu3: fiu@c00000000 {
spi@...
Quoted 16 lines
Documentation/devicetree/bindings/spi/nuvoton,npcm-fiu.txt new file +13
-0+ compatible = "nuvoton,npcm750-fiu"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xfb000000 0x1000>, <0x80000000 0x10000000>; + reg-names = "control", "memory"; + clocks = <&clk NPCM7XX_CLK_AHB>; + pinctrl-names = "default"; + pinctrl-0 = <&spi3_pins>; + spi-nor@0 { + ... + }; +}; +Signature · 1 line
2.18.0
Tomer Maimon
maintainerPATCH v2 2/2 spi: npcm-fiu: add NPCM FIU controller driver
In reply to Tomer MaimonAdd Nuvoton NPCM BMC Flash Interface Unit(FIU) SPI master controller driver using SPI-MEM interface.
The FIU supports single, dual or quad communication interface.
the FIU controller can operate in following modes:
- User Mode Access(UMA): provides flash access by using an indirect address/data mechanism.
- direct rd/wr mode: maps the flash memory into the core address space.
- SPI-X mode: used for an expansion bus to an ASIC or CPLD.
--- drivers/spi/Kconfig | 10 + drivers/spi/Makefile | 1 + drivers/spi/spi-npcm-fiu.c | 761 +++++++++++++++++++++++++++++++++++++ 3 files changed, 772 insertions(+) create mode 100644 drivers/spi/spi-npcm-fiu.c
drivers/spi/Kconfig +10 -0
@@ -433,6 +433,16 @@ config SPI_MT7621 help This selects a driver for the MediaTek MT7621 SPI Controller. +config SPI_NPCM_FIU + tristate "Nuvoton NPCM FLASH Interface Unit" + depends on ARCH_NPCM || COMPILE_TEST + depends on OF && HAS_IOMEM + help + This enables support for the Flash Interface Unit SPI controller + in master mode. + This driver does not support generic SPI. The implementation only + supports spi-mem interface. + config SPI_NPCM_PSPI tristate "Nuvoton NPCM PSPI Controller" depends on ARCH_NPCM || COMPILE_TEST
drivers/spi/Makefile +1 -0
@@ -63,6 +63,7 @@ obj-$(CONFIG_SPI_MT65XX) += spi-mt65xx.o obj-$(CONFIG_SPI_MT7621) += spi-mt7621.o obj-$(CONFIG_SPI_MXIC) += spi-mxic.o obj-$(CONFIG_SPI_MXS) += spi-mxs.o +obj-$(CONFIG_SPI_NPCM_FIU) += spi-npcm-fiu.o obj-$(CONFIG_SPI_NPCM_PSPI) += spi-npcm-pspi.o obj-$(CONFIG_SPI_NUC900) += spi-nuc900.o obj-$(CONFIG_SPI_NXP_FLEXSPI) += spi-nxp-fspi.o
drivers/spi/spi-npcm-fiu.c new file +761 -0
761 lines not on this page · raw message
Signature · 1 line
2.18.0
Mark Brown
maintainerRe: [PATCH v2 2/2] spi: npcm-fiu: add NPCM FIU controller driver
drivers/spi/spi-npcm-fiu.c line 723
Quoted 3 lines · Tomer Maimon
drivers/spi/spi-npcm-fiu.c new file +3
-0+ ctrl->mode_bits =SPI_RX_DUAL |SPI_RX_QUAD + |SPI_TX_DUAL |SPI_TX_QUAD ; + ctrl->setup = npcm_fiu_setup;
I'm not seeing where we implement dual or quad modes in the driver? There's some
drivers/spi/spi-npcm-fiu.c line 733
Quoted 1 line
drivers/spi/spi-npcm-fiu.c new file +1
-0+dev_info (dev,"NPCM %s probe succeed\n" , fiu->info->name);
Just remove this, it makes the log more verbose but doesn't really add any information.
Tomer Maimon
maintainerRe: [PATCH v2 2/2] spi: npcm-fiu: add NPCM FIU controller driver
Hi Mark,
Thanks for the prompt reply.
Quoted 10 lines · Mark Brown
drivers/spi/spi-npcm-fiu.c line 723
Quoted 3 lines · Tomer Maimon
drivers/spi/spi-npcm-fiu.c new file +3
-0+ ctrl->mode_bits =SPI_RX_DUAL |SPI_RX_QUAD + |SPI_TX_DUAL |SPI_TX_QUAD ; + ctrl->setup = npcm_fiu_setup;I'm not seeing where we implement dual or quad modes in the driver? There's some
Do you mean you do not see where it is implemented in the NPCM FIU driver?
for example in our driver we modify the access type (singe, dual or quad) according the op->addr.buswidth
for example in the npcm_fiu_set_drd function.
regmap_update_bits(fiu->regmap, NPCM_FIU_DRD_CFG,
NPCM_FIU_DRD_CFG_ACCTYPE,
ilog2(op->addr.buswidth) <<
NPCM_FIU_DRD_ACCTYPE_SHIFT);we also modify it in the UMA R/W functions.
Quoted 5 lines
+
dev_info(dev, "NPCM %s probe succeed\n", fiu->info->name);Just remove this, it makes the log more verbose but doesn't really add any information.
I will remove it.
Thanks,
Tomer
Mark Brown
maintainerRe: [PATCH v2 2/2] spi: npcm-fiu: add NPCM FIU controller driver
Quoted 10 lines · Tomer Maimon
for example in our driver we modify the access type (singe, dual or quad) according the
op->addr.buswidth
for example in thenpcm_fiu_set_drdfunction.regmap_update_bits(fiu->regmap, NPCM_FIU_DRD_CFG, NPCM_FIU_DRD_CFG_ACCTYPE, ilog2(op->addr.buswidth) << NPCM_FIU_DRD_ACCTYPE_SHIFT);we also modify it in the UMA R/W functions.
Ah, it's only for the flash functions - that's fine.
Tomer Maimon
maintainerRe: [PATCH v2 2/2] spi: npcm-fiu: add NPCM FIU controller driver
Hi Mark,
Thanks for your prompt reply.
I will like to send another patch with support for the spi_mem_op->addr field.
I am going to vacation until 25/08 I will send the new patch (V3) as soon I will be back.
Thanks for your support,
Tomer
Quoted 15 lines · Mark Brown
Quoted 10 lines · Tomer Maimon
for example in our driver we modify the access type (singe, dual or quad) according the
op->addr.buswidth
for example in thenpcm_fiu_set_drdfunction.regmap_update_bits(fiu->regmap, NPCM_FIU_DRD_CFG, NPCM_FIU_DRD_CFG_ACCTYPE, ilog2(op->addr.buswidth) << NPCM_FIU_DRD_ACCTYPE_SHIFT);we also modify it in the UMA R/W functions.
Ah, it's only for the flash functions - that's fine.
Re: [PATCH v2 2/2] spi: npcm-fiu: add NPCM FIU controller driver
In reply to Tomer Maimondrivers/spi/spi-npcm-fiu.c line 651
Quoted 3 lines · On Thu, 8 Aug 2019 16:14:48 +0300 Tomer Maimon <[email protected]> wrote:
drivers/spi/spi-npcm-fiu.c new file +3
-0+ +static const struct spi_controller_mem_ops npcm_fiu_mem_ops = { + .exec_op = npcm_fiu_exec_op,
No npcm_supports_op()? That's suspicious, especially after looking at the npcm_fiu_exec_op() (and the functions called from there) where the requested ->buswidth seems to be completely ignored...
Quoted 5 lines
drivers/spi/spi-npcm-fiu.c new file +5
-0+ .dirmap_create = npcm_fiu_dirmap_create, + .dirmap_read = npcm_fiu_direct_read, + .dirmap_write = npcm_fiu_direct_write, +}; +
Tomer Maimon
maintainerRe: [PATCH v2 2/2] spi: npcm-fiu: add NPCM FIU controller driver
Hi Boris,
Thanks a lot for your comment.
Quoted 12 lines · Boris Brezillon
drivers/spi/spi-npcm-fiu.c line 651
Quoted 3 lines · On Thu, 8 Aug 2019 16:14:48 +0300 Tomer Maimon <[email protected]> wrote:
drivers/spi/spi-npcm-fiu.c new file +3
-0+ +static const struct spi_controller_mem_ops npcm_fiu_mem_ops = { + .exec_op = npcm_fiu_exec_op,No
npcm_supports_op()? That's suspicious, especially after looking at thenpcm_fiu_exec_op()(and the functions called from there) where the requested ->buswidth seems to be completely ignored...
Quoted 1 line
Sorry but I do not fully understand it, do you mean a support for the
buswidth?
If yes it been done in the UMA functions as follow:
uma_cfg |= ilog2(op->cmd.buswidth);
uma_cfg |= ilog2(op->addr.buswidth) <<
NPCM_FIU_UMA_CFG_ADBPCK_SHIFT;
uma_cfg |= ilog2(op->data.buswidth) <<
NPCM_FIU_UMA_CFG_WDBPCK_SHIFT;
uma_cfg |= op->addr.nbytes << NPCM_FIU_UMA_CFG_ADDSIZ_SHIFT;
regmap_write(fiu->regmap, NPCM_FIU_UMA_ADDR, op->addr.val);Quoted 6 lines
+ .dirmap_create =
npcm_fiu_dirmap_create,drivers/spi/spi-npcm-fiu.c line 656
Quoted 4 lines
drivers/spi/spi-npcm-fiu.c new file +4
-0+ .dirmap_read = npcm_fiu_direct_read, + .dirmap_write = npcm_fiu_direct_write, +}; +
Thanks,
Tomer
Re: [PATCH v2 2/2] spi: npcm-fiu: add NPCM FIU controller driver
Quoted 23 lines · On Fri, 9 Aug 2019 18:26:23 +0300 Tomer Maimon <[email protected]> wrote:
Hi Boris,
Thanks a lot for your comment.
Quoted 12 lines · Boris Brezillon
drivers/spi/spi-npcm-fiu.c line 651
Quoted 3 lines · On Thu, 8 Aug 2019 16:14:48 +0300 Tomer Maimon <[email protected]> wrote:
drivers/spi/spi-npcm-fiu.c new file +3
-0+ +static const struct spi_controller_mem_ops npcm_fiu_mem_ops = { + .exec_op = npcm_fiu_exec_op,No
npcm_supports_op()? That's suspicious, especially after looking at thenpcm_fiu_exec_op()(and the functions called from there) where the requested ->buswidth seems to be completely ignored...Quoted 1 line
Sorry but I do not fully understand it, do you mean a support for the
buswidth?
If yes it been done in the UMA functions as follow:
Quoted 8 lines
uma_cfg |= ilog2(op->cmd.buswidth);
uma_cfg |= ilog2(op->addr.buswidth) <<
NPCM_FIU_UMA_CFG_ADBPCK_SHIFT;
uma_cfg |= ilog2(op->data.buswidth) <<
NPCM_FIU_UMA_CFG_WDBPCK_SHIFT;
uma_cfg |= op->addr.nbytes << NPCM_FIU_UMA_CFG_ADDSIZ_SHIFT;
regmap_write(fiu->regmap, NPCM_FIU_UMA_ADDR, op->addr.val);Hm, the default supports_op() implementation might be just fine for your use case. But there's one thing you still need to check: the number of addr cycles (or address size as you call it in this driver). Looks like your IP is limited to 4 address cycles, if I'm right, you should reject any operation that have op->addr.nbytes > 4. I also wonder if there's a limitation on the data size you can have on a single transfer. If there's one you should implement ->adjust_op() too.
Tomer Maimon
maintainerRe: [PATCH v2 2/2] spi: npcm-fiu: add NPCM FIU controller driver
Quoted 35 lines · Boris Brezillon
Quoted 5 lines · On Fri, 9 Aug 2019 18:26:23 +0300 Tomer Maimon <[email protected]> wrote:
Hi Boris,
Thanks a lot for your comment.
On Thu, 8 Aug 2019 at 18:32, Boris Brezillon <
Quoted 18 lines
Quoted 12 lines · wrote:
drivers/spi/spi-npcm-fiu.c line 651
Quoted 3 lines · On Thu, 8 Aug 2019 16:14:48 +0300 Tomer Maimon <[email protected]> wrote:
drivers/spi/spi-npcm-fiu.c new file +3
-0+ +static const struct spi_controller_mem_ops npcm_fiu_mem_ops = { + .exec_op = npcm_fiu_exec_op,No
npcm_supports_op()? That's suspicious, especially after looking at thenpcm_fiu_exec_op()(and the functions called from there) where the requested ->buswidth seems to be completely ignored...Quoted 1 line
Sorry but I do not fully understand it, do you mean a support for the
buswidth?
If yes it been done in the UMA functions as follow:Quoted 6 lines
uma_cfg |= ilog2(op->cmd.buswidth); uma_cfg |= ilog2(op->addr.buswidth) << NPCM_FIU_UMA_CFG_ADBPCK_SHIFT; uma_cfg |= ilog2(op->data.buswidth) << NPCM_FIU_UMA_CFG_WDBPCK_SHIFT; uma_cfg |= op->addr.nbytes <<
NPCM_FIU_UMA_CFG_ADDSIZ_SHIFT;Quoted 1 line
regmap_write(fiu->regmap, NPCM_FIU_UMA_ADDR,
Quoted 9 lines
op->addr.val);Quoted 1 line
Hm, the default
supports_op()implementation might be just fine for your use case. But there's one thing you still need to check: the number of addr cycles (or address size as you call it in this driver). Looks like your IP is limited to 4 address cycles, if I'm right, you should reject any operation that haveop->addr.nbytes> 4. I also
Indeed our IP limited to 4 address cycle (bytes) do we have NOR Flash with more than 32bit address?
I will add this limitation thanks!
Quoted 3 lines
wonder if there's a limitation on the data size you can have on a single transfer. If there's one you should implement ->adjust_op() too.
there is a limitation in a single transfer but I handle it in the npcm_fiu_manualwrite
function.
Do you suggest to use ->adjust_op() instead?
Re: [PATCH v2 2/2] spi: npcm-fiu: add NPCM FIU controller driver
Quoted 41 lines · On Fri, 9 Aug 2019 18:47:08 +0300 Tomer Maimon <[email protected]> wrote:
Quoted 38 lines · Boris Brezillon
Quoted 5 lines · On Fri, 9 Aug 2019 18:26:23 +0300 Tomer Maimon <[email protected]> wrote:
Hi Boris,
Thanks a lot for your comment.
On Thu, 8 Aug 2019 at 18:32, Boris Brezillon <
Quoted 18 lines
Quoted 12 lines · wrote:
drivers/spi/spi-npcm-fiu.c line 651
Quoted 3 lines · On Thu, 8 Aug 2019 16:14:48 +0300 Tomer Maimon <[email protected]> wrote:
drivers/spi/spi-npcm-fiu.c new file +3
-0+ +static const struct spi_controller_mem_ops npcm_fiu_mem_ops = { + .exec_op = npcm_fiu_exec_op,No
npcm_supports_op()? That's suspicious, especially after looking at thenpcm_fiu_exec_op()(and the functions called from there) where the requested ->buswidth seems to be completely ignored...Quoted 1 line
Sorry but I do not fully understand it, do you mean a support for the
buswidth?
If yes it been done in the UMA functions as follow:Quoted 6 lines
uma_cfg |= ilog2(op->cmd.buswidth); uma_cfg |= ilog2(op->addr.buswidth) << NPCM_FIU_UMA_CFG_ADBPCK_SHIFT; uma_cfg |= ilog2(op->data.buswidth) << NPCM_FIU_UMA_CFG_WDBPCK_SHIFT; uma_cfg |= op->addr.nbytes <<
NPCM_FIU_UMA_CFG_ADDSIZ_SHIFT;Quoted 1 line
regmap_write(fiu->regmap, NPCM_FIU_UMA_ADDR,
op->addr.val);Quoted 1 line
Quoted 8 lines
Quoted 6 lines
Hm, the default
supports_op()implementation might be just fine for your use case. But there's one thing you still need to check: the number of addr cycles (or address size as you call it in this driver). Looks like your IP is limited to 4 address cycles, if I'm right, you should reject any operation that haveop->addr.nbytes> 4. I alsoIndeed our IP limited to 4 address cycle (bytes) do we have NOR Flash with more than 32bit address?
spi-mem is not only about spi-nor, it can be used for any kind of memory (NOR, NAND, SRAM, ...) or even to communicate with an FGPA, so yes, you have to take care of that.
Quoted 9 lines
I will add this limitation thanks!
Quoted 3 lines
wonder if there's a limitation on the data size you can have on a single transfer. If there's one you should implement ->adjust_op() too.
there is a limitation in a single transfer but I handle it in the
npcm_fiu_manualwrite
function.
Do you suggest to use ->adjust_op() instead?
Yes, should be exposed through ->adjust_op() => the caller needs to know when a new operation (one containing an opcode+address) is issued, because sometimes such splits are not supported by the memory.
Tomer Maimon
maintainerRe: [PATCH v2 2/2] spi: npcm-fiu: add NPCM FIU controller driver
O.K.
Thanks a lot for the clarifications
I will add it in the next patch.
Quoted 77 lines · Boris Brezillon
Quoted 1 line · On Fri, 9 Aug 2019 18:47:08 +0300 Tomer Maimon <[email protected]> wrote:
On Fri, 9 Aug 2019 at 18:26, Boris Brezillon <
Quoted 17 lines
Quoted 15 lines · wrote:
Quoted 5 lines · On Fri, 9 Aug 2019 18:26:23 +0300 Tomer Maimon <[email protected]> wrote:
Hi Boris,
Thanks a lot for your comment.
On Thu, 8 Aug 2019 at 18:32, Boris Brezillon <
Quoted 6 lines
Quoted 4 lines · wrote:
On Thu, 8 Aug 2019 16:14:48 +0300
Tomer Maimon <[email protected]> wrote:Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/spi/spi-npcm-fiu.c line 651
Quoted 3 lines
drivers/spi/spi-npcm-fiu.c new file +3
-0+ +static const struct spi_controller_mem_ops npcm_fiu_mem_ops = { + .exec_op = npcm_fiu_exec_op,No
npcm_supports_op()? That's suspicious, especially after lookingat
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
the
npcm_fiu_exec_op()(and the functions called from there) wherethe
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
requested ->buswidth seems to be completely ignored...
Sorry but I do not fully understand it, do you mean a support for
the
Quoted 14 lines
Quoted 14 lines
Quoted 9 lines
buswidth?
If yes it been done in the UMA functions as follow:uma_cfg |= ilog2(op->cmd.buswidth); uma_cfg |= ilog2(op->addr.buswidth) << NPCM_FIU_UMA_CFG_ADBPCK_SHIFT; uma_cfg |= ilog2(op->data.buswidth) << NPCM_FIU_UMA_CFG_WDBPCK_SHIFT; uma_cfg |= op->addr.nbytes <<
NPCM_FIU_UMA_CFG_ADDSIZ_SHIFT;Quoted 1 line
regmap_write(fiu->regmap, NPCM_FIU_UMA_ADDR,
op->addr.val);Quoted 1 line
Quoted 7 lines
Quoted 6 lines
Hm, the default
supports_op()implementation might be just fine for your use case. But there's one thing you still need to check: the number of addr cycles (or address size as you call it in this driver). Looks like your IP is limited to 4 address cycles, if I'm right, you should reject any operation that haveop->addr.nbytes> 4. I alsoIndeed our IP limited to 4 address cycle (bytes) do we have NOR Flash
with
Quoted 1 line
more than 32bit address?
spi-mem is not only about spi-nor, it can be used for any kind of memory (NOR, NAND, SRAM, ...) or even to communicate with an FGPA, so yes, you have to take care of that.
Quoted 9 lines
I will add this limitation thanks!
Quoted 3 lines
wonder if there's a limitation on the data size you can have on a single transfer. If there's one you should implement ->adjust_op() too.
there is a limitation in a single transfer but I handle it in the
npcm_fiu_manualwrite
function.
Do you suggest to use ->adjust_op() instead?Yes, should be exposed through ->adjust_op() => the caller needs to know when a new operation (one containing an opcode+address) is issued, because sometimes such splits are not supported by the memory.
Benjamin Fair
reviewerRe: [PATCH v2 2/2] spi: npcm-fiu: add NPCM FIU controller driver
In reply to Tomer MaimonQuoted 338 lines · Tomer Maimon
Add Nuvoton NPCM BMC Flash Interface Unit(FIU) SPI master controller driver using SPI-MEM interface.
The FIU supports single, dual or quad communication interface.
the FIU controller can operate in following modes:
- User Mode Access(UMA): provides flash access by using an indirect address/data mechanism.
- direct rd/wr mode: maps the flash memory into the core address space.
- SPI-X mode: used for an expansion bus to an ASIC or CPLD.Signed-off-by Tomer Maimon <[email protected]>--- drivers/spi/Kconfig | 10 + drivers/spi/Makefile | 1 + drivers/spi/spi-npcm-fiu.c | 761 +++++++++++++++++++++++++++++++++++++ 3 files changed, 772 insertions(+) create mode 100644 drivers/spi/spi-npcm-fiu.cdrivers/spi/Kconfig +10
-0@@ -433,6 +433,16 @@ config SPI_MT7621 help This selects a driver for the MediaTek MT7621 SPI Controller. +config SPI_NPCM_FIU + tristate "Nuvoton NPCM FLASH Interface Unit" + depends on ARCH_NPCM || COMPILE_TEST + depends on OF && HAS_IOMEM + help + This enables support for the Flash Interface Unit SPI controller + in master mode. + This driver does not support generic SPI. The implementation only + supports spi-mem interface. + config SPI_NPCM_PSPI tristate "Nuvoton NPCM PSPI Controller" depends on ARCH_NPCM || COMPILE_TESTdrivers/spi/Makefile +1
-0@@ -63,6 +63,7 @@ obj-$(CONFIG_SPI_MT65XX) += spi-mt65xx.o obj-$(CONFIG_SPI_MT7621) += spi-mt7621.o obj-$(CONFIG_SPI_MXIC) += spi-mxic.o obj-$(CONFIG_SPI_MXS) += spi-mxs.o +obj-$(CONFIG_SPI_NPCM_FIU) += spi-npcm-fiu.o obj-$(CONFIG_SPI_NPCM_PSPI) += spi-npcm-pspi.o obj-$(CONFIG_SPI_NUC900) += spi-nuc900.o obj-$(CONFIG_SPI_NXP_FLEXSPI) += spi-nxp-fspi.odrivers/spi/spi-npcm-fiu.c new file +278
-0@@ -0,0 +1,761 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (c) 2019 Nuvoton Technology corporation. + +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/device.h> +#include <linux/module.h> +#include <linux/ioport.h> +#include <linux/clk.h> +#include <linux/platform_device.h> +#include <linux/io.h> +#include <linux/vmalloc.h> +#include <linux/regmap.h> +#include <linux/of_device.h> +#include <linux/spi/spi-mem.h> +#include <linux/mfd/syscon.h> + +/* NPCM7xx GCR module */ +#define NPCM7XX_INTCR3_OFFSET 0x9C +#define NPCM7XX_INTCR3_FIU_FIX BIT(6) + +/* Flash Interface Unit (FIU) Registers */ +#define NPCM_FIU_DRD_CFG 0x00 +#define NPCM_FIU_DWR_CFG 0x04 +#define NPCM_FIU_UMA_CFG 0x08 +#define NPCM_FIU_UMA_CTS 0x0C +#define NPCM_FIU_UMA_CMD 0x10 +#define NPCM_FIU_UMA_ADDR 0x14 +#define NPCM_FIU_PRT_CFG 0x18 +#define NPCM_FIU_UMA_DW0 0x20 +#define NPCM_FIU_UMA_DW1 0x24 +#define NPCM_FIU_UMA_DW2 0x28 +#define NPCM_FIU_UMA_DW3 0x2C +#define NPCM_FIU_UMA_DR0 0x30 +#define NPCM_FIU_UMA_DR1 0x34 +#define NPCM_FIU_UMA_DR2 0x38 +#define NPCM_FIU_UMA_DR3 0x3C +#define NPCM_FIU_MAX_REG_LIMIT 0x80 + +/* FIU Direct Read Configuration Register */ +#define NPCM_FIU_DRD_CFG_LCK BIT(31) +#define NPCM_FIU_DRD_CFG_R_BURST GENMASK(25, 24) +#define NPCM_FIU_DRD_CFG_ADDSIZ GENMASK(17, 16) +#define NPCM_FIU_DRD_CFG_DBW GENMASK(13, 12) +#define NPCM_FIU_DRD_CFG_ACCTYPE GENMASK(9, 8) +#define NPCM_FIU_DRD_CFG_RDCMD GENMASK(7, 0) +#define NPCM_FIU_DRD_ADDSIZ_SHIFT 16 +#define NPCM_FIU_DRD_DBW_SHIFT 12 +#define NPCM_FIU_DRD_ACCTYPE_SHIFT 8 + +/* FIU Direct Write Configuration Register */ +#define NPCM_FIU_DWR_CFG_LCK BIT(31) +#define NPCM_FIU_DWR_CFG_W_BURST GENMASK(25, 24) +#define NPCM_FIU_DWR_CFG_ADDSIZ GENMASK(17, 16) +#define NPCM_FIU_DWR_CFG_ABPCK GENMASK(11, 10) +#define NPCM_FIU_DWR_CFG_DBPCK GENMASK(9, 8) +#define NPCM_FIU_DWR_CFG_WRCMD GENMASK(7, 0) +#define NPCM_FIU_DWR_ADDSIZ_SHIFT 16 +#define NPCM_FIU_DWR_ABPCK_SHIFT 10 +#define NPCM_FIU_DWR_DBPCK_SHIFT 8 + +/* FIU UMA Configuration Register */ +#define NPCM_FIU_UMA_CFG_LCK BIT(31) +#define NPCM_FIU_UMA_CFG_CMMLCK BIT(30) +#define NPCM_FIU_UMA_CFG_RDATSIZ GENMASK(28, 24) +#define NPCM_FIU_UMA_CFG_DBSIZ GENMASK(23, 21) +#define NPCM_FIU_UMA_CFG_WDATSIZ GENMASK(20, 16) +#define NPCM_FIU_UMA_CFG_ADDSIZ GENMASK(13, 11) +#define NPCM_FIU_UMA_CFG_CMDSIZ BIT(10) +#define NPCM_FIU_UMA_CFG_RDBPCK GENMASK(9, 8) +#define NPCM_FIU_UMA_CFG_DBPCK GENMASK(7, 6) +#define NPCM_FIU_UMA_CFG_WDBPCK GENMASK(5, 4) +#define NPCM_FIU_UMA_CFG_ADBPCK GENMASK(3, 2) +#define NPCM_FIU_UMA_CFG_CMBPCK GENMASK(1, 0) +#define NPCM_FIU_UMA_CFG_ADBPCK_SHIFT 2 +#define NPCM_FIU_UMA_CFG_WDBPCK_SHIFT 4 +#define NPCM_FIU_UMA_CFG_DBPCK_SHIFT 6 +#define NPCM_FIU_UMA_CFG_RDBPCK_SHIFT 8 +#define NPCM_FIU_UMA_CFG_ADDSIZ_SHIFT 11 +#define NPCM_FIU_UMA_CFG_WDATSIZ_SHIFT 16 +#define NPCM_FIU_UMA_CFG_DBSIZ_SHIFT 21 +#define NPCM_FIU_UMA_CFG_RDATSIZ_SHIFT 24 + +/* FIU UMA Control and Status Register */ +#define NPCM_FIU_UMA_CTS_RDYIE BIT(25) +#define NPCM_FIU_UMA_CTS_RDYST BIT(24) +#define NPCM_FIU_UMA_CTS_SW_CS BIT(16) +#define NPCM_FIU_UMA_CTS_DEV_NUM GENMASK(9, 8) +#define NPCM_FIU_UMA_CTS_EXEC_DONE BIT(0) +#define NPCM_FIU_UMA_CTS_DEV_NUM_SHIFT 8 + +/* FIU UMA Command Register */ +#define NPCM_FIU_UMA_CMD_DUM3 GENMASK(31, 24) +#define NPCM_FIU_UMA_CMD_DUM2 GENMASK(23, 16) +#define NPCM_FIU_UMA_CMD_DUM1 GENMASK(15, 8) +#define NPCM_FIU_UMA_CMD_CMD GENMASK(7, 0) + +/* FIU UMA Address Register */ +#define NPCM_FIU_UMA_ADDR_UMA_ADDR GENMASK(31, 0) +#define NPCM_FIU_UMA_ADDR_AB3 GENMASK(31, 24) +#define NPCM_FIU_UMA_ADDR_AB2 GENMASK(23, 16) +#define NPCM_FIU_UMA_ADDR_AB1 GENMASK(15, 8) +#define NPCM_FIU_UMA_ADDR_AB0 GENMASK(7, 0) + +/* FIU UMA Write Data Bytes 0-3 Register */ +#define NPCM_FIU_UMA_DW0_WB3 GENMASK(31, 24) +#define NPCM_FIU_UMA_DW0_WB2 GENMASK(23, 16) +#define NPCM_FIU_UMA_DW0_WB1 GENMASK(15, 8) +#define NPCM_FIU_UMA_DW0_WB0 GENMASK(7, 0) + +/* FIU UMA Write Data Bytes 4-7 Register */ +#define NPCM_FIU_UMA_DW1_WB7 GENMASK(31, 24) +#define NPCM_FIU_UMA_DW1_WB6 GENMASK(23, 16) +#define NPCM_FIU_UMA_DW1_WB5 GENMASK(15, 8) +#define NPCM_FIU_UMA_DW1_WB4 GENMASK(7, 0) + +/* FIU UMA Write Data Bytes 8-11 Register */ +#define NPCM_FIU_UMA_DW2_WB11 GENMASK(31, 24) +#define NPCM_FIU_UMA_DW2_WB10 GENMASK(23, 16) +#define NPCM_FIU_UMA_DW2_WB9 GENMASK(15, 8) +#define NPCM_FIU_UMA_DW2_WB8 GENMASK(7, 0) + +/* FIU UMA Write Data Bytes 12-15 Register */ +#define NPCM_FIU_UMA_DW3_WB15 GENMASK(31, 24) +#define NPCM_FIU_UMA_DW3_WB14 GENMASK(23, 16) +#define NPCM_FIU_UMA_DW3_WB13 GENMASK(15, 8) +#define NPCM_FIU_UMA_DW3_WB12 GENMASK(7, 0) + +/* FIU UMA Read Data Bytes 0-3 Register */ +#define NPCM_FIU_UMA_DR0_RB3 GENMASK(31, 24) +#define NPCM_FIU_UMA_DR0_RB2 GENMASK(23, 16) +#define NPCM_FIU_UMA_DR0_RB1 GENMASK(15, 8) +#define NPCM_FIU_UMA_DR0_RB0 GENMASK(7, 0) + +/* FIU UMA Read Data Bytes 4-7 Register */ +#define NPCM_FIU_UMA_DR1_RB15 GENMASK(31, 24) +#define NPCM_FIU_UMA_DR1_RB14 GENMASK(23, 16) +#define NPCM_FIU_UMA_DR1_RB13 GENMASK(15, 8) +#define NPCM_FIU_UMA_DR1_RB12 GENMASK(7, 0) + +/* FIU UMA Read Data Bytes 8-11 Register */ +#define NPCM_FIU_UMA_DR2_RB15 GENMASK(31, 24) +#define NPCM_FIU_UMA_DR2_RB14 GENMASK(23, 16) +#define NPCM_FIU_UMA_DR2_RB13 GENMASK(15, 8) +#define NPCM_FIU_UMA_DR2_RB12 GENMASK(7, 0) + +/* FIU UMA Read Data Bytes 12-15 Register */ +#define NPCM_FIU_UMA_DR3_RB15 GENMASK(31, 24) +#define NPCM_FIU_UMA_DR3_RB14 GENMASK(23, 16) +#define NPCM_FIU_UMA_DR3_RB13 GENMASK(15, 8) +#define NPCM_FIU_UMA_DR3_RB12 GENMASK(7, 0) + +/* FIU Read Mode */ +enum { +DRD_SINGLE_WIRE_MODE =0 , +DRD_DUAL_IO_MODE =1 , +DRD_QUAD_IO_MODE =2 , +DRD_SPI_X_MODE =3 , +}; + +enum { +DWR_ABPCK_BIT_PER_CLK =0 , +DWR_ABPCK_2_BIT_PER_CLK =1 , +DWR_ABPCK_4_BIT_PER_CLK =2 , +}; + +enum { +DWR_DBPCK_BIT_PER_CLK =0 , +DWR_DBPCK_2_BIT_PER_CLK =1 , +DWR_DBPCK_4_BIT_PER_CLK =2 , +}; + +#define NPCM_FIU_DRD_16_BYTE_BURST 0x3000000 +#define NPCM_FIU_DWR_16_BYTE_BURST 0x3000000 + +#define MAP_SIZE_128MB 0x8000000 +#define MAP_SIZE_16MB 0x1000000 +#define MAP_SIZE_8MB 0x800000 + +#define NUM_BITS_IN_BYTE 8 +#define FIU_DRD_MAX_DUMMY_NUMBER 3 +#define NPCM_MAX_CHIP_NUM 4 +#define CHUNK_SIZE 16 +#define UMA_MICRO_SEC_TIMEOUT 150 + +enum { +FIU0 =0 , +FIU3 , +FIUX , +}; + +struct npcm_fiu_info { +char *name; +u32 fiu_id; +u32 max_map_size; +u32 max_cs; +}; + +struct fiu_data { +const struct npcm_fiu_info *npcm_fiu_data_info; +int fiu_max; +}; + +static const struct npcm_fiu_info npxm7xx_fiu_info[] = { + {.name ="FIU0" , .fiu_id =FIU0 , + .max_map_size =MAP_SIZE_128MB , .max_cs =2 }, + {.name ="FIU3" , .fiu_id =FIU3 , + .max_map_size =MAP_SIZE_128MB , .max_cs =4 }, + {.name ="FIUX" , .fiu_id =FIUX , + .max_map_size =MAP_SIZE_16MB , .max_cs =2 } }; + +static const struct fiu_data npxm7xx_fiu_data = { + .npcm_fiu_data_info = npxm7xx_fiu_info, + .fiu_max =3 , +}; + +struct npcm_fiu_spi ; + +struct npcm_fiu_chip { +void __iomem *flash_region_mapped_ptr; +struct npcm_fiu_spi *fiu; +unsigned long clkrate; +u32 chipselect; +}; + +struct npcm_fiu_spi { +struct npcm_fiu_chip chip[NPCM_MAX_CHIP_NUM ]; +const struct npcm_fiu_info *info; +struct spi_mem_op drd_op; +struct resource *res_mem; +struct regmap *regmap; +unsigned long clkrate; +struct device *dev; +struct clk *clk; +bool spix_mode; +}; + +static const struct regmap_config npcm_mtd_regmap_config = { + .reg_bits =32 , + .val_bits =32 , + .reg_stride =4 , + .max_register =NPCM_FIU_MAX_REG_LIMIT , +}; + +static void npcm_fiu_set_drd (struct npcm_fiu_spi *fiu, +const struct spi_mem_op *op) +{ +regmap_update_bits (fiu->regmap,NPCM_FIU_DRD_CFG , +NPCM_FIU_DRD_CFG_ACCTYPE , +ilog2 (op->addr.buswidth) << +NPCM_FIU_DRD_ACCTYPE_SHIFT ); + fiu->drd_op.addr.buswidth = op->addr.buswidth; +regmap_update_bits (fiu->regmap,NPCM_FIU_DRD_CFG , +NPCM_FIU_DRD_CFG_DBW , + ((op->dummy.nbytes *ilog2 (op->addr.buswidth)) + /NUM_BITS_IN_BYTE ) <<NPCM_FIU_DRD_DBW_SHIFT ); + fiu->drd_op.dummy.nbytes = op->dummy.nbytes; +regmap_update_bits (fiu->regmap,NPCM_FIU_DRD_CFG , +NPCM_FIU_DRD_CFG_RDCMD , op->cmd.opcode); + fiu->drd_op.cmd.opcode = op->cmd.opcode; +regmap_update_bits (fiu->regmap,NPCM_FIU_DRD_CFG , +NPCM_FIU_DRD_CFG_ADDSIZ , + (op->addr.nbytes -3 ) <<NPCM_FIU_DRD_ADDSIZ_SHIFT ); + fiu->drd_op.addr.nbytes = op->addr.nbytes; +} + +static ssize_t npcm_fiu_direct_read (struct spi_mem_dirmap_desc *desc, +u64 offs,size_t len,void *buf) +{ +struct npcm_fiu_spi *fiu = +spi_controller_get_devdata (desc->mem->spi->master); +struct npcm_fiu_chip *chip = &fiu->chip[desc->mem->spi->chip_select]; +void __iomem *src = (void __iomem *)(chip->flash_region_mapped_ptr + + offs); +u8 *buf_rx = buf; +u32 i; + +if (fiu->spix_mode) {
drivers/spi/spi-npcm-fiu.c line 288
Quoted 10 lines
drivers/spi/spi-npcm-fiu.c new file +10
-0+for (i =0 ; i < len ; i++) + *(buf_rx + i) =ioread8 (src + i); + }else { +if (desc->info.op_tmpl.addr.buswidth != fiu->drd_op.addr.buswidth || + desc->info.op_tmpl.dummy.nbytes != fiu->drd_op.dummy.nbytes || + desc->info.op_tmpl.cmd.opcode != fiu->drd_op.cmd.opcode || + desc->info.op_tmpl.addr.nbytes != fiu->drd_op.addr.nbytes) +npcm_fiu_set_drd (fiu, &desc->info.op_tmpl); + +memcpy_fromio (buf_rx, src, len);
Does this need to make sure the memcpy is aligned, or is that handled at a higher layer?
Quoted 476 lines
drivers/spi/spi-npcm-fiu.c new file +473
-1+ } + +return len; +} + +static ssize_t npcm_fiu_direct_write (struct spi_mem_dirmap_desc *desc, +u64 offs,size_t len,const void *buf) +{ +struct npcm_fiu_spi *fiu = +spi_controller_get_devdata (desc->mem->spi->master); +struct npcm_fiu_chip *chip = &fiu->chip[desc->mem->spi->chip_select]; +void __iomem *dst = (void __iomem *)(chip->flash_region_mapped_ptr + + offs); +const u8 *buf_tx = buf; +u32 i; + +if (fiu->spix_mode) +for (i =0 ; i < len ; i++) +iowrite8 (*(buf_tx + i), dst + i); +else +memcpy_toio (dst, buf_tx, len); + +return len; +} + +static int npcm_fiu_uma_read (struct spi_mem *mem, +const struct spi_mem_op *op,u32 addr, +bool is_address_size,u8 *data,u32 data_size) +{ +struct npcm_fiu_spi *fiu = +spi_controller_get_devdata (mem->spi->master); +u32 uma_cfg =BIT (10 ); +u32 data_reg[4 ]; +int ret; +u32 val; +u32 i; + +regmap_update_bits (fiu->regmap,NPCM_FIU_UMA_CTS , +NPCM_FIU_UMA_CTS_DEV_NUM , + (mem->spi->chip_select << +NPCM_FIU_UMA_CTS_DEV_NUM_SHIFT )); +regmap_update_bits (fiu->regmap,NPCM_FIU_UMA_CMD , +NPCM_FIU_UMA_CMD_CMD , op->cmd.opcode); + +if (is_address_size) { + uma_cfg |=ilog2 (op->cmd.buswidth); + uma_cfg |=ilog2 (op->addr.buswidth) + <<NPCM_FIU_UMA_CFG_ADBPCK_SHIFT ; + uma_cfg |=ilog2 (op->dummy.buswidth) + <<NPCM_FIU_UMA_CFG_DBPCK_SHIFT ; + uma_cfg |=ilog2 (op->data.buswidth) + <<NPCM_FIU_UMA_CFG_RDBPCK_SHIFT ; + uma_cfg |= op->dummy.nbytes <<NPCM_FIU_UMA_CFG_DBSIZ_SHIFT ; + uma_cfg |= op->addr.nbytes <<NPCM_FIU_UMA_CFG_ADDSIZ_SHIFT ; +regmap_write (fiu->regmap,NPCM_FIU_UMA_ADDR , addr); + }else { +regmap_write (fiu->regmap,NPCM_FIU_UMA_ADDR ,0x0 ); + } + + uma_cfg |= data_size <<NPCM_FIU_UMA_CFG_RDATSIZ_SHIFT ; +regmap_write (fiu->regmap,NPCM_FIU_UMA_CFG , uma_cfg); +regmap_write_bits (fiu->regmap,NPCM_FIU_UMA_CTS , +NPCM_FIU_UMA_CTS_EXEC_DONE , +NPCM_FIU_UMA_CTS_EXEC_DONE ); + ret =regmap_read_poll_timeout (fiu->regmap,NPCM_FIU_UMA_CTS , val, + (!(val &NPCM_FIU_UMA_CTS_EXEC_DONE )),0 , +UMA_MICRO_SEC_TIMEOUT ); +if (ret) +return ret; + +if (data_size) { +for (i =0 ; i <DIV_ROUND_UP (data_size,4 ); i++) +regmap_read (fiu->regmap,NPCM_FIU_UMA_DR0 + (i *4 ), + &data_reg[i]); +memcpy (data, data_reg, data_size); + } + +return 0 ; +} + +static int npcm_fiu_uma_write (struct spi_mem *mem, +const struct spi_mem_op *op,u8 cmd, +bool is_address_size,u8 *data,u32 data_size) +{ +struct npcm_fiu_spi *fiu = +spi_controller_get_devdata (mem->spi->master); +u32 uma_cfg =BIT (10 ); +u32 data_reg[4 ] = {0 }; +u32 val; +u32 i; + +regmap_update_bits (fiu->regmap,NPCM_FIU_UMA_CTS , +NPCM_FIU_UMA_CTS_DEV_NUM , + (mem->spi->chip_select << +NPCM_FIU_UMA_CTS_DEV_NUM_SHIFT )); + +regmap_update_bits (fiu->regmap,NPCM_FIU_UMA_CMD , +NPCM_FIU_UMA_CMD_CMD , cmd); + +if (data_size) { +memcpy (data_reg, data, data_size); +for (i =0 ; i <DIV_ROUND_UP (data_size,4 ); i++) +regmap_write (fiu->regmap,NPCM_FIU_UMA_DW0 + (i *4 ), + data_reg[i]); + } + +if (is_address_size) { + uma_cfg |=ilog2 (op->cmd.buswidth); + uma_cfg |=ilog2 (op->addr.buswidth) << +NPCM_FIU_UMA_CFG_ADBPCK_SHIFT ; + uma_cfg |=ilog2 (op->data.buswidth) << +NPCM_FIU_UMA_CFG_WDBPCK_SHIFT ; + uma_cfg |= op->addr.nbytes <<NPCM_FIU_UMA_CFG_ADDSIZ_SHIFT ; +regmap_write (fiu->regmap,NPCM_FIU_UMA_ADDR , op->addr.val); + }else { +regmap_write (fiu->regmap,NPCM_FIU_UMA_ADDR ,0x0 ); + } + + uma_cfg |= (data_size <<NPCM_FIU_UMA_CFG_WDATSIZ_SHIFT ); +regmap_write (fiu->regmap,NPCM_FIU_UMA_CFG , uma_cfg); + +regmap_write_bits (fiu->regmap,NPCM_FIU_UMA_CTS , +NPCM_FIU_UMA_CTS_EXEC_DONE , +NPCM_FIU_UMA_CTS_EXEC_DONE ); + +return regmap_read_poll_timeout (fiu->regmap,NPCM_FIU_UMA_CTS , val, + (!(val &NPCM_FIU_UMA_CTS_EXEC_DONE )),0 , +UMA_MICRO_SEC_TIMEOUT ); +} + +static int npcm_fiu_manualwrite (struct spi_mem *mem, +const struct spi_mem_op *op) +{ +struct npcm_fiu_spi *fiu = +spi_controller_get_devdata (mem->spi->master); +u8 *data = (u8 *)op->data.buf.out; +u32 num_data_chunks; +u32 remain_data; +u32 idx =0 ; +int ret; + + num_data_chunks = op->data.nbytes /CHUNK_SIZE ; + remain_data = op->data.nbytes %CHUNK_SIZE ; + +regmap_update_bits (fiu->regmap,NPCM_FIU_UMA_CTS , +NPCM_FIU_UMA_CTS_DEV_NUM , + (mem->spi->chip_select << +NPCM_FIU_UMA_CTS_DEV_NUM_SHIFT )); +regmap_update_bits (fiu->regmap,NPCM_FIU_UMA_CTS , +NPCM_FIU_UMA_CTS_SW_CS ,0 ); + + ret =npcm_fiu_uma_write (mem, op, op->cmd.opcode, true,NULL ,0 ); +if (ret) +return ret; + +/* Starting the data writing loop in multiples of 8 */ +for (idx =0 ; idx < num_data_chunks; ++idx) { + ret =npcm_fiu_uma_write (mem, op, data[0 ], false, + &data[1 ],CHUNK_SIZE -1 ); +if (ret) +return ret; + + data +=CHUNK_SIZE ; + } + +/* Handling chunk remains */ +if (remain_data >0 ) { + ret =npcm_fiu_uma_write (mem, op, data[0 ], false, + &data[1 ], remain_data -1 ); +if (ret) +return ret; + } + +regmap_update_bits (fiu->regmap,NPCM_FIU_UMA_CTS , +NPCM_FIU_UMA_CTS_SW_CS ,NPCM_FIU_UMA_CTS_SW_CS ); + +return 0 ; +} + +static int npcm_fiu_read (struct spi_mem *mem,const struct spi_mem_op *op) +{ +u8 *data = op->data.buf.in; +int i, readlen, currlen; +size_t retlen =0 ; +u8 *buf_ptr; +u32 addr; +int ret; + + i =0 ; + currlen = op->data.nbytes; + +do { + addr = ((u32 )op->addr.val + i); +if (currlen <16 ) + readlen = currlen; +else + readlen =16 ; + + buf_ptr = data + i; + ret =npcm_fiu_uma_read (mem, op, addr, true, buf_ptr, + readlen); +if (ret) +return ret; + + i += readlen; + currlen -=16 ; + }while (currlen >0 ); + + retlen = i; + +return 0 ; +} + +static void npcm_fiux_set_direct_wr (struct npcm_fiu_spi *fiu) +{ +regmap_write (fiu->regmap,NPCM_FIU_DWR_CFG , +NPCM_FIU_DWR_16_BYTE_BURST ); +regmap_update_bits (fiu->regmap,NPCM_FIU_DWR_CFG , +NPCM_FIU_DWR_CFG_ABPCK , +DWR_ABPCK_4_BIT_PER_CLK <<NPCM_FIU_DWR_ABPCK_SHIFT ); +regmap_update_bits (fiu->regmap,NPCM_FIU_DWR_CFG , +NPCM_FIU_DWR_CFG_DBPCK , +DWR_DBPCK_4_BIT_PER_CLK <<NPCM_FIU_DWR_DBPCK_SHIFT ); +} + +static void npcm_fiux_set_direct_rd (struct npcm_fiu_spi *fiu) +{ +u32 rx_dummy =0 ; + +regmap_write (fiu->regmap,NPCM_FIU_DRD_CFG , +NPCM_FIU_DRD_16_BYTE_BURST ); +regmap_update_bits (fiu->regmap,NPCM_FIU_DRD_CFG , +NPCM_FIU_DRD_CFG_ACCTYPE , +DRD_SPI_X_MODE <<NPCM_FIU_DRD_ACCTYPE_SHIFT ); +regmap_update_bits (fiu->regmap,NPCM_FIU_DRD_CFG , +NPCM_FIU_DRD_CFG_DBW , + rx_dummy <<NPCM_FIU_DRD_DBW_SHIFT ); +} + +static int npcm_fiu_exec_op (struct spi_mem *mem,const struct spi_mem_op *op) +{ +struct npcm_fiu_spi *fiu = +spi_controller_get_devdata (mem->spi->master); +struct npcm_fiu_chip *chip = &fiu->chip[mem->spi->chip_select]; +int ret =0 ; +u8 *buf; + +dev_dbg (fiu->dev,"cmd:%#x mode:%d.%d.%d.%d addr:%#llx len:%#x\n" , + op->cmd.opcode, op->cmd.buswidth, op->addr.buswidth, + op->dummy.buswidth, op->data.buswidth, op->addr.val, + op->data.nbytes); + +if (fiu->spix_mode) +return -ENOTSUPP ; + +if (fiu->clkrate != chip->clkrate) { + ret =clk_set_rate (fiu->clk, chip->clkrate); +if (ret <0 ) +dev_warn (fiu->dev,"Failed setting %lu frequancy, stay at %lu frequancy\n" , chip->clkrate, fiu->clkrate); +else + fiu->clkrate = chip->clkrate; + } + +if (op->data.dir ==SPI_MEM_DATA_IN ) { +if (!op->addr.nbytes) { + buf = op->data.buf.in; + ret =npcm_fiu_uma_read (mem, op, op->addr.val, false, + buf, op->data.nbytes); + }else { + ret =npcm_fiu_read (mem, op); + } + }else { +if (!op->addr.nbytes || !op->data.nbytes) { +if (op->data.nbytes) + buf = (u8 *)op->data.buf.out; +else + buf =NULL ; + ret =npcm_fiu_uma_write (mem, op, op->cmd.opcode, false, + buf, op->data.nbytes); + }else { + ret =npcm_fiu_manualwrite (mem, op); + } + } + +return ret; +} + +static int npcm_fiu_dirmap_create (struct spi_mem_dirmap_desc *desc) +{ +struct npcm_fiu_spi *fiu = +spi_controller_get_devdata (desc->mem->spi->master); +struct npcm_fiu_chip *chip = &fiu->chip[desc->mem->spi->chip_select]; +struct regmap *gcr_regmap; + +if (!fiu->res_mem) { +dev_warn (fiu->dev,"Reserved memory not defined, direct read disabled\n" ); + desc->nodirmap = true; +return 0 ; + } + +if (!fiu->spix_mode && + desc->info.op_tmpl.data.dir ==SPI_MEM_DATA_OUT ) { + desc->nodirmap = true; +return 0 ; + } + +if (!chip->flash_region_mapped_ptr) { + chip->flash_region_mapped_ptr = +devm_ioremap_nocache (fiu->dev, (fiu->res_mem->start + + (fiu->info->max_map_size * + desc->mem->spi->chip_select)), + (u32 )desc->info.length); +if (!chip->flash_region_mapped_ptr) { +dev_warn (fiu->dev,"Error mapping memory region, direct read disabled\n" ); + desc->nodirmap = true; +return 0 ; + } + } + +if (of_device_is_compatible (fiu->dev->of_node,"nuvoton,npcm750-fiu" )) { + gcr_regmap = +syscon_regmap_lookup_by_compatible ("nuvoton,npcm750-gcr" ); +if (IS_ERR (gcr_regmap)) { +dev_warn (fiu->dev,"Didn't find nuvoton,npcm750-gcr, direct read disabled\n" ); + desc->nodirmap = true; +return 0 ; + } +regmap_update_bits (gcr_regmap,NPCM7XX_INTCR3_OFFSET , +NPCM7XX_INTCR3_FIU_FIX , +NPCM7XX_INTCR3_FIU_FIX ); + } + +if (desc->info.op_tmpl.data.dir ==SPI_MEM_DATA_IN ) { +if (!fiu->spix_mode) +npcm_fiu_set_drd (fiu, &desc->info.op_tmpl); +else +npcm_fiux_set_direct_rd (fiu); + + }else { +npcm_fiux_set_direct_wr (fiu); + } + +return 0 ; +} + +static int npcm_fiu_setup (struct spi_device *spi) +{ +struct spi_controller *ctrl = spi->master; +struct npcm_fiu_spi *fiu =spi_controller_get_devdata (ctrl); +struct npcm_fiu_chip *chip; + + chip = &fiu->chip[spi->chip_select]; + chip->fiu = fiu; + chip->chipselect = spi->chip_select; + chip->clkrate = spi->max_speed_hz; + + fiu->clkrate =clk_get_rate (fiu->clk); + +return 0 ; +} + +static const struct spi_controller_mem_ops npcm_fiu_mem_ops = { + .exec_op = npcm_fiu_exec_op, + .dirmap_create = npcm_fiu_dirmap_create, + .dirmap_read = npcm_fiu_direct_read, + .dirmap_write = npcm_fiu_direct_write, +}; + +static const struct of_device_id npcm_fiu_dt_ids[] = { + { .compatible ="nuvoton,npcm750-fiu" , .data = &npxm7xx_fiu_data }, + {/* sentinel */ } +}; + +static int npcm_fiu_probe (struct platform_device *pdev) +{ +const struct fiu_data *fiu_data_match; +const struct of_device_id *match; +struct device *dev = &pdev->dev; +struct spi_controller *ctrl; +struct npcm_fiu_spi *fiu; +void __iomem *regbase; +struct resource *res; +int ret; +int id; + + ctrl =spi_alloc_master (dev,sizeof (*fiu)); +if (!ctrl) +return -ENOMEM ; + + fiu =spi_controller_get_devdata (ctrl); + + match =of_match_device (npcm_fiu_dt_ids, dev); +if (!match || !match->data) { +dev_err (dev,"No compatible OF match\n" ); +return -ENODEV ; + } + + fiu_data_match = match->data; + id =of_alias_get_id (dev->of_node,"fiu" ); +if (id <0 || id >= fiu_data_match->fiu_max) { +dev_err (dev,"Invalid platform device id: %d\n" , id); +return -EINVAL ; + } + + fiu->info = &fiu_data_match->npcm_fiu_data_info[id]; + +platform_set_drvdata (pdev, fiu); + fiu->dev = dev; + + res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"control" ); + regbase =devm_ioremap_resource (dev, res); +if (IS_ERR (regbase)) +return PTR_ERR (regbase); + + fiu->regmap =devm_regmap_init_mmio (dev, regbase, + &npcm_mtd_regmap_config); +if (IS_ERR (fiu->regmap)) { +dev_err (dev,"Failed to create regmap\n" ); +return PTR_ERR (fiu->regmap); + } + + fiu->res_mem =platform_get_resource_byname (pdev,IORESOURCE_MEM , +"memory" ); + fiu->clk =devm_clk_get (dev,NULL ); +if (IS_ERR (fiu->clk)) +return PTR_ERR (fiu->clk); + + fiu->spix_mode =of_property_read_bool (dev->of_node,"spix-mode" ); + +platform_set_drvdata (pdev, fiu); +clk_prepare_enable (fiu->clk); + + ctrl->mode_bits =SPI_RX_DUAL |SPI_RX_QUAD + |SPI_TX_DUAL |SPI_TX_QUAD ; + ctrl->setup = npcm_fiu_setup; + ctrl->bus_num =-1 ; + ctrl->mem_ops = &npcm_fiu_mem_ops; + ctrl->num_chipselect = fiu->info->max_cs; + ctrl->dev.of_node = dev->of_node; + + ret =devm_spi_register_master (dev, ctrl); +if (ret) +return ret; + +dev_info (dev,"NPCM %s probe succeed\n" , fiu->info->name); + +return 0 ; +} + +static int npcm_fiu_remove (struct platform_device *pdev) +{ +struct npcm_fiu_spi *fiu =platform_get_drvdata (pdev); + +clk_disable_unprepare (fiu->clk); +return 0 ; +} + +MODULE_DEVICE_TABLE (of, npcm_fiu_dt_ids); + +static struct platform_driver npcm_fiu_driver = { + .driver = { + .name ="NPCM-FIU" , + .bus = &platform_bus_type, + .of_match_table = npcm_fiu_dt_ids, + }, + .probe = npcm_fiu_probe, + .remove = npcm_fiu_remove, +}; +module_platform_driver (npcm_fiu_driver); + +MODULE_DESCRIPTION ("Nuvoton FLASH Interface Unit SPI Controller Driver" ); +MODULE_AUTHOR ("Tomer Maimon <[email protected]>" ); +MODULE_LICENSE ("GPL v2" ); --2.18.0
Tomer Maimon
maintainerRe: [PATCH v2 2/2] spi: npcm-fiu: add NPCM FIU controller driver
Quoted 354 lines · Benjamin Fair
Quoted 26 lines · Tomer Maimon
Add Nuvoton NPCM BMC Flash Interface Unit(FIU) SPI master controller driver using SPI-MEM interface.
The FIU supports single, dual or quad communication interface.
the FIU controller can operate in following modes:
- User Mode Access(UMA): provides flash access by using an indirect address/data mechanism.
- direct rd/wr mode: maps the flash memory into the core address space.
- SPI-X mode: used for an expansion bus to an ASIC or CPLD.Signed-off-by Tomer Maimon <[email protected]>--- drivers/spi/Kconfig | 10 + drivers/spi/Makefile | 1 + drivers/spi/spi-npcm-fiu.c | 761 +++++++++++++++++++++++++++++++++++++ 3 files changed, 772 insertions(+) create mode 100644 drivers/spi/spi-npcm-fiu.cdrivers/spi/Kconfig +0
-0drivers/spi/Kconfig config SPI_MT7621 · line 441
Quoted 9 lines
drivers/spi/Kconfig +6
-0@@ -433,6 +433,16 @@ config SPI_MT7621 help This selects a driver for the MediaTek MT7621 SPI Controller. +config SPI_NPCM_FIU + tristate "Nuvoton NPCM FLASH Interface Unit" + depends on ARCH_NPCM || COMPILE_TEST + depends on OF && HAS_IOMEM + help + This enables support for the Flash Interface Unit SPIcontroller
drivers/spi/Kconfig config SPI_MT7621 · line 443
Quoted 2 lines
drivers/spi/Kconfig +2
-0+ in master mode. + This driver does not support generic SPI. The implementationonly
Quoted 269 lines
drivers/spi/Kconfig +2
-0+ supports spi-mem interface. + config SPI_NPCM_PSPI tristate "Nuvoton NPCM PSPI Controller" depends on ARCH_NPCM || COMPILE_TESTdrivers/spi/Makefile +1
-0@@ -63,6 +63,7 @@ obj-$(CONFIG_SPI_MT65XX) += spi-mt65xx.o obj-$(CONFIG_SPI_MT7621) += spi-mt7621.o obj-$(CONFIG_SPI_MXIC) += spi-mxic.o obj-$(CONFIG_SPI_MXS) += spi-mxs.o +obj-$(CONFIG_SPI_NPCM_FIU) += spi-npcm-fiu.o obj-$(CONFIG_SPI_NPCM_PSPI) += spi-npcm-pspi.o obj-$(CONFIG_SPI_NUC900) += spi-nuc900.o obj-$(CONFIG_SPI_NXP_FLEXSPI) += spi-nxp-fspi.odrivers/spi/spi-npcm-fiu.c new file +246
-0@@ -0,0 +1,761 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (c) 2019 Nuvoton Technology corporation. + +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/device.h> +#include <linux/module.h> +#include <linux/ioport.h> +#include <linux/clk.h> +#include <linux/platform_device.h> +#include <linux/io.h> +#include <linux/vmalloc.h> +#include <linux/regmap.h> +#include <linux/of_device.h> +#include <linux/spi/spi-mem.h> +#include <linux/mfd/syscon.h> + +/* NPCM7xx GCR module */ +#define NPCM7XX_INTCR3_OFFSET 0x9C +#define NPCM7XX_INTCR3_FIU_FIX BIT(6) + +/* Flash Interface Unit (FIU) Registers */ +#define NPCM_FIU_DRD_CFG 0x00 +#define NPCM_FIU_DWR_CFG 0x04 +#define NPCM_FIU_UMA_CFG 0x08 +#define NPCM_FIU_UMA_CTS 0x0C +#define NPCM_FIU_UMA_CMD 0x10 +#define NPCM_FIU_UMA_ADDR 0x14 +#define NPCM_FIU_PRT_CFG 0x18 +#define NPCM_FIU_UMA_DW0 0x20 +#define NPCM_FIU_UMA_DW1 0x24 +#define NPCM_FIU_UMA_DW2 0x28 +#define NPCM_FIU_UMA_DW3 0x2C +#define NPCM_FIU_UMA_DR0 0x30 +#define NPCM_FIU_UMA_DR1 0x34 +#define NPCM_FIU_UMA_DR2 0x38 +#define NPCM_FIU_UMA_DR3 0x3C +#define NPCM_FIU_MAX_REG_LIMIT 0x80 + +/* FIU Direct Read Configuration Register */ +#define NPCM_FIU_DRD_CFG_LCK BIT(31) +#define NPCM_FIU_DRD_CFG_R_BURST GENMASK(25, 24) +#define NPCM_FIU_DRD_CFG_ADDSIZ GENMASK(17, 16) +#define NPCM_FIU_DRD_CFG_DBW GENMASK(13, 12) +#define NPCM_FIU_DRD_CFG_ACCTYPE GENMASK(9, 8) +#define NPCM_FIU_DRD_CFG_RDCMD GENMASK(7, 0) +#define NPCM_FIU_DRD_ADDSIZ_SHIFT 16 +#define NPCM_FIU_DRD_DBW_SHIFT 12 +#define NPCM_FIU_DRD_ACCTYPE_SHIFT 8 + +/* FIU Direct Write Configuration Register */ +#define NPCM_FIU_DWR_CFG_LCK BIT(31) +#define NPCM_FIU_DWR_CFG_W_BURST GENMASK(25, 24) +#define NPCM_FIU_DWR_CFG_ADDSIZ GENMASK(17, 16) +#define NPCM_FIU_DWR_CFG_ABPCK GENMASK(11, 10) +#define NPCM_FIU_DWR_CFG_DBPCK GENMASK(9, 8) +#define NPCM_FIU_DWR_CFG_WRCMD GENMASK(7, 0) +#define NPCM_FIU_DWR_ADDSIZ_SHIFT 16 +#define NPCM_FIU_DWR_ABPCK_SHIFT 10 +#define NPCM_FIU_DWR_DBPCK_SHIFT 8 + +/* FIU UMA Configuration Register */ +#define NPCM_FIU_UMA_CFG_LCK BIT(31) +#define NPCM_FIU_UMA_CFG_CMMLCK BIT(30) +#define NPCM_FIU_UMA_CFG_RDATSIZ GENMASK(28, 24) +#define NPCM_FIU_UMA_CFG_DBSIZ GENMASK(23, 21) +#define NPCM_FIU_UMA_CFG_WDATSIZ GENMASK(20, 16) +#define NPCM_FIU_UMA_CFG_ADDSIZ GENMASK(13, 11) +#define NPCM_FIU_UMA_CFG_CMDSIZ BIT(10) +#define NPCM_FIU_UMA_CFG_RDBPCK GENMASK(9, 8) +#define NPCM_FIU_UMA_CFG_DBPCK GENMASK(7, 6) +#define NPCM_FIU_UMA_CFG_WDBPCK GENMASK(5, 4) +#define NPCM_FIU_UMA_CFG_ADBPCK GENMASK(3, 2) +#define NPCM_FIU_UMA_CFG_CMBPCK GENMASK(1, 0) +#define NPCM_FIU_UMA_CFG_ADBPCK_SHIFT 2 +#define NPCM_FIU_UMA_CFG_WDBPCK_SHIFT 4 +#define NPCM_FIU_UMA_CFG_DBPCK_SHIFT 6 +#define NPCM_FIU_UMA_CFG_RDBPCK_SHIFT 8 +#define NPCM_FIU_UMA_CFG_ADDSIZ_SHIFT 11 +#define NPCM_FIU_UMA_CFG_WDATSIZ_SHIFT 16 +#define NPCM_FIU_UMA_CFG_DBSIZ_SHIFT 21 +#define NPCM_FIU_UMA_CFG_RDATSIZ_SHIFT 24 + +/* FIU UMA Control and Status Register */ +#define NPCM_FIU_UMA_CTS_RDYIE BIT(25) +#define NPCM_FIU_UMA_CTS_RDYST BIT(24) +#define NPCM_FIU_UMA_CTS_SW_CS BIT(16) +#define NPCM_FIU_UMA_CTS_DEV_NUM GENMASK(9, 8) +#define NPCM_FIU_UMA_CTS_EXEC_DONE BIT(0) +#define NPCM_FIU_UMA_CTS_DEV_NUM_SHIFT 8 + +/* FIU UMA Command Register */ +#define NPCM_FIU_UMA_CMD_DUM3 GENMASK(31, 24) +#define NPCM_FIU_UMA_CMD_DUM2 GENMASK(23, 16) +#define NPCM_FIU_UMA_CMD_DUM1 GENMASK(15, 8) +#define NPCM_FIU_UMA_CMD_CMD GENMASK(7, 0) + +/* FIU UMA Address Register */ +#define NPCM_FIU_UMA_ADDR_UMA_ADDR GENMASK(31, 0) +#define NPCM_FIU_UMA_ADDR_AB3 GENMASK(31, 24) +#define NPCM_FIU_UMA_ADDR_AB2 GENMASK(23, 16) +#define NPCM_FIU_UMA_ADDR_AB1 GENMASK(15, 8) +#define NPCM_FIU_UMA_ADDR_AB0 GENMASK(7, 0) + +/* FIU UMA Write Data Bytes 0-3 Register */ +#define NPCM_FIU_UMA_DW0_WB3 GENMASK(31, 24) +#define NPCM_FIU_UMA_DW0_WB2 GENMASK(23, 16) +#define NPCM_FIU_UMA_DW0_WB1 GENMASK(15, 8) +#define NPCM_FIU_UMA_DW0_WB0 GENMASK(7, 0) + +/* FIU UMA Write Data Bytes 4-7 Register */ +#define NPCM_FIU_UMA_DW1_WB7 GENMASK(31, 24) +#define NPCM_FIU_UMA_DW1_WB6 GENMASK(23, 16) +#define NPCM_FIU_UMA_DW1_WB5 GENMASK(15, 8) +#define NPCM_FIU_UMA_DW1_WB4 GENMASK(7, 0) + +/* FIU UMA Write Data Bytes 8-11 Register */ +#define NPCM_FIU_UMA_DW2_WB11 GENMASK(31, 24) +#define NPCM_FIU_UMA_DW2_WB10 GENMASK(23, 16) +#define NPCM_FIU_UMA_DW2_WB9 GENMASK(15, 8) +#define NPCM_FIU_UMA_DW2_WB8 GENMASK(7, 0) + +/* FIU UMA Write Data Bytes 12-15 Register */ +#define NPCM_FIU_UMA_DW3_WB15 GENMASK(31, 24) +#define NPCM_FIU_UMA_DW3_WB14 GENMASK(23, 16) +#define NPCM_FIU_UMA_DW3_WB13 GENMASK(15, 8) +#define NPCM_FIU_UMA_DW3_WB12 GENMASK(7, 0) + +/* FIU UMA Read Data Bytes 0-3 Register */ +#define NPCM_FIU_UMA_DR0_RB3 GENMASK(31, 24) +#define NPCM_FIU_UMA_DR0_RB2 GENMASK(23, 16) +#define NPCM_FIU_UMA_DR0_RB1 GENMASK(15, 8) +#define NPCM_FIU_UMA_DR0_RB0 GENMASK(7, 0) + +/* FIU UMA Read Data Bytes 4-7 Register */ +#define NPCM_FIU_UMA_DR1_RB15 GENMASK(31, 24) +#define NPCM_FIU_UMA_DR1_RB14 GENMASK(23, 16) +#define NPCM_FIU_UMA_DR1_RB13 GENMASK(15, 8) +#define NPCM_FIU_UMA_DR1_RB12 GENMASK(7, 0) + +/* FIU UMA Read Data Bytes 8-11 Register */ +#define NPCM_FIU_UMA_DR2_RB15 GENMASK(31, 24) +#define NPCM_FIU_UMA_DR2_RB14 GENMASK(23, 16) +#define NPCM_FIU_UMA_DR2_RB13 GENMASK(15, 8) +#define NPCM_FIU_UMA_DR2_RB12 GENMASK(7, 0) + +/* FIU UMA Read Data Bytes 12-15 Register */ +#define NPCM_FIU_UMA_DR3_RB15 GENMASK(31, 24) +#define NPCM_FIU_UMA_DR3_RB14 GENMASK(23, 16) +#define NPCM_FIU_UMA_DR3_RB13 GENMASK(15, 8) +#define NPCM_FIU_UMA_DR3_RB12 GENMASK(7, 0) + +/* FIU Read Mode */ +enum { +DRD_SINGLE_WIRE_MODE =0 , +DRD_DUAL_IO_MODE =1 , +DRD_QUAD_IO_MODE =2 , +DRD_SPI_X_MODE =3 , +}; + +enum { +DWR_ABPCK_BIT_PER_CLK =0 , +DWR_ABPCK_2_BIT_PER_CLK =1 , +DWR_ABPCK_4_BIT_PER_CLK =2 , +}; + +enum { +DWR_DBPCK_BIT_PER_CLK =0 , +DWR_DBPCK_2_BIT_PER_CLK =1 , +DWR_DBPCK_4_BIT_PER_CLK =2 , +}; + +#define NPCM_FIU_DRD_16_BYTE_BURST 0x3000000 +#define NPCM_FIU_DWR_16_BYTE_BURST 0x3000000 + +#define MAP_SIZE_128MB 0x8000000 +#define MAP_SIZE_16MB 0x1000000 +#define MAP_SIZE_8MB 0x800000 + +#define NUM_BITS_IN_BYTE 8 +#define FIU_DRD_MAX_DUMMY_NUMBER 3 +#define NPCM_MAX_CHIP_NUM 4 +#define CHUNK_SIZE 16 +#define UMA_MICRO_SEC_TIMEOUT 150 + +enum { +FIU0 =0 , +FIU3 , +FIUX , +}; + +struct npcm_fiu_info { +char *name; +u32 fiu_id; +u32 max_map_size; +u32 max_cs; +}; + +struct fiu_data { +const struct npcm_fiu_info *npcm_fiu_data_info; +int fiu_max; +}; + +static const struct npcm_fiu_info npxm7xx_fiu_info[] = { + {.name ="FIU0" , .fiu_id =FIU0 , + .max_map_size =MAP_SIZE_128MB , .max_cs =2 }, + {.name ="FIU3" , .fiu_id =FIU3 , + .max_map_size =MAP_SIZE_128MB , .max_cs =4 }, + {.name ="FIUX" , .fiu_id =FIUX , + .max_map_size =MAP_SIZE_16MB , .max_cs =2 } }; + +static const struct fiu_data npxm7xx_fiu_data = { + .npcm_fiu_data_info = npxm7xx_fiu_info, + .fiu_max =3 , +}; + +struct npcm_fiu_spi ; + +struct npcm_fiu_chip { +void __iomem *flash_region_mapped_ptr; +struct npcm_fiu_spi *fiu; +unsigned long clkrate; +u32 chipselect; +}; + +struct npcm_fiu_spi { +struct npcm_fiu_chip chip[NPCM_MAX_CHIP_NUM ]; +const struct npcm_fiu_info *info; +struct spi_mem_op drd_op; +struct resource *res_mem; +struct regmap *regmap; +unsigned long clkrate; +struct device *dev; +struct clk *clk; +bool spix_mode; +}; + +static const struct regmap_config npcm_mtd_regmap_config = { + .reg_bits =32 , + .val_bits =32 , + .reg_stride =4 , + .max_register =NPCM_FIU_MAX_REG_LIMIT , +}; + +static void npcm_fiu_set_drd (struct npcm_fiu_spi *fiu, +const struct spi_mem_op *op)drivers/spi/spi-npcm-fiu.c line 256
Quoted 10 lines
drivers/spi/spi-npcm-fiu.c new file +10
-0+{ +regmap_update_bits (fiu->regmap,NPCM_FIU_DRD_CFG , +NPCM_FIU_DRD_CFG_ACCTYPE , +ilog2 (op->addr.buswidth) << +NPCM_FIU_DRD_ACCTYPE_SHIFT ); + fiu->drd_op.addr.buswidth = op->addr.buswidth; + regmap_update_bits(fiu->regmap, NPCM_FIU_DRD_CFG, + NPCM_FIU_DRD_CFG_DBW, + ((op->dummy.nbytes * ilog2(op->addr.buswidth)) + / NUM_BITS_IN_BYTE) <<
NPCM_FIU_DRD_DBW_SHIFT);drivers/spi/spi-npcm-fiu.c
Quoted 7 lines
drivers/spi/spi-npcm-fiu.c new file +7
-0+ fiu->drd_op.dummy.nbytes = op->dummy.nbytes; +regmap_update_bits (fiu->regmap,NPCM_FIU_DRD_CFG , +NPCM_FIU_DRD_CFG_RDCMD , op->cmd.opcode); + fiu->drd_op.cmd.opcode = op->cmd.opcode; + regmap_update_bits(fiu->regmap, NPCM_FIU_DRD_CFG, + NPCM_FIU_DRD_CFG_ADDSIZ, + (op->addr.nbytes - 3) <<
NPCM_FIU_DRD_ADDSIZ_SHIFT);drivers/spi/spi-npcm-fiu.c
Quoted 9 lines
drivers/spi/spi-npcm-fiu.c new file +9
-0+ fiu->drd_op.addr.nbytes = op->addr.nbytes; +} + +static ssize_t npcm_fiu_direct_read (struct spi_mem_dirmap_desc *desc, +u64 offs,size_t len,void *buf) +{ +struct npcm_fiu_spi *fiu = +spi_controller_get_devdata (desc->mem->spi->master); + struct npcm_fiu_chip *chip =&fiu->chip[desc->mem->spi->chip_select];
drivers/spi/spi-npcm-fiu.c line 273
Quoted 1 line
drivers/spi/spi-npcm-fiu.c new file +1
-0+ void __iomem *src = (void __iomem*)(chip->flash_region_mapped_ptr +
drivers/spi/spi-npcm-fiu.c
Quoted 9 lines
drivers/spi/spi-npcm-fiu.c new file +9
-0+ offs); +u8 *buf_rx = buf; +u32 i; + +if (fiu->spix_mode) { +for (i =0 ; i < len ; i++) + *(buf_rx + i) =ioread8 (src + i); + }else { + if (desc->info.op_tmpl.addr.buswidth !=
fiu->drd_op.addr.buswidth||drivers/spi/spi-npcm-fiu.c line 283
Quoted 1 line
drivers/spi/spi-npcm-fiu.c new file +1
-0+ desc->info.op_tmpl.dummy.nbytes !=
fiu->drd_op.dummy.nbytes||drivers/spi/spi-npcm-fiu.c line 284
Quoted 1 line
drivers/spi/spi-npcm-fiu.c new file +1
-0+ desc->info.op_tmpl.cmd.opcode !=
fiu->drd_op.cmd.opcode||
Quoted 9 lines
drivers/spi/spi-npcm-fiu.c line 285
Quoted 1 line
drivers/spi/spi-npcm-fiu.c new file +1
-0+ desc->info.op_tmpl.addr.nbytes !=
fiu->drd_op.addr.nbytes)drivers/spi/spi-npcm-fiu.c line 288
Quoted 3 lines
drivers/spi/spi-npcm-fiu.c new file +3
-0+npcm_fiu_set_drd (fiu, &desc->info.op_tmpl); + +memcpy_fromio (buf_rx, src, len);Does this need to make sure the memcpy is aligned, or is that handled at a higher layer?
The memcpy_fromio use in the direct functions can deal with unaligned address, we have stress test it for some time
and it working well, I have sent Kun the test stress scripts.
Quoted 514 lines
drivers/spi/spi-npcm-fiu.c
Quoted 7 lines
drivers/spi/spi-npcm-fiu.c new file +7
-0+ } + +return len; +} + +static ssize_t npcm_fiu_direct_write (struct spi_mem_dirmap_desc *desc, + u64 offs, size_t len, const void*buf)
drivers/spi/spi-npcm-fiu.c
Quoted 4 lines
drivers/spi/spi-npcm-fiu.c new file +4
-0+{ +struct npcm_fiu_spi *fiu = +spi_controller_get_devdata (desc->mem->spi->master); + struct npcm_fiu_chip *chip =&fiu->chip[desc->mem->spi->chip_select];
drivers/spi/spi-npcm-fiu.c line 300
Quoted 1 line
drivers/spi/spi-npcm-fiu.c new file +1
-0+ void __iomem *dst = (void __iomem*)(chip->flash_region_mapped_ptr +
Quoted 6 lines
drivers/spi/spi-npcm-fiu.c new file +6
-0+ offs); +const u8 *buf_tx = buf; +u32 i; + +if (fiu->spix_mode) +for (i =0 ; i < len ; i++)drivers/spi/spi-npcm-fiu.c
Quoted 10 lines
drivers/spi/spi-npcm-fiu.c new file +10
-0+iowrite8 (*(buf_tx + i), dst + i); + else +memcpy_toio (dst ,buf_tx ,len ); + +return len; +} + +static int npcm_fiu_uma_read (struct spi_mem *mem, +const struct spi_mem_op *op,u32 addr, + bool is_address_size, u8 *data, u32
data_size)Quoted 15 lines
drivers/spi/spi-npcm-fiu.c new file +15
-0+{ +struct npcm_fiu_spi *fiu = +spi_controller_get_devdata (mem->spi->master); +u32 uma_cfg =BIT (10 ); +u32 data_reg[4 ]; +int ret; +u32 val; +u32 i; + +regmap_update_bits (fiu->regmap,NPCM_FIU_UMA_CTS , +NPCM_FIU_UMA_CTS_DEV_NUM , + (mem->spi->chip_select << +NPCM_FIU_UMA_CTS_DEV_NUM_SHIFT )); +regmap_update_bits (fiu->regmap,NPCM_FIU_UMA_CMD , +NPCM_FIU_UMA_CMD_CMD , op->cmd.opcode);drivers/spi/spi-npcm-fiu.c
Quoted 10 lines
drivers/spi/spi-npcm-fiu.c new file +10
-0+ +if (is_address_size) { + uma_cfg |=ilog2 (op->cmd.buswidth); + uma_cfg |=ilog2 (op->addr.buswidth) + <<NPCM_FIU_UMA_CFG_ADBPCK_SHIFT ; + uma_cfg |=ilog2 (op->dummy.buswidth) + <<NPCM_FIU_UMA_CFG_DBPCK_SHIFT ; + uma_cfg |=ilog2 (op->data.buswidth) + <<NPCM_FIU_UMA_CFG_RDBPCK_SHIFT ; + uma_cfg |= op->dummy.nbytes <<
NPCM_FIU_UMA_CFG_DBSIZ_SHIFT;drivers/spi/spi-npcm-fiu.c line 342
Quoted 1 line
drivers/spi/spi-npcm-fiu.c new file +1
-0+ uma_cfg |= op->addr.nbytes <<
NPCM_FIU_UMA_CFG_ADDSIZ_SHIFT;drivers/spi/spi-npcm-fiu.c
Quoted 11 lines
drivers/spi/spi-npcm-fiu.c new file +11
-0+regmap_write (fiu->regmap,NPCM_FIU_UMA_ADDR , addr); + }else { +regmap_write (fiu->regmap,NPCM_FIU_UMA_ADDR ,0x0 ); + } + + uma_cfg |= data_size <<NPCM_FIU_UMA_CFG_RDATSIZ_SHIFT ; +regmap_write (fiu->regmap,NPCM_FIU_UMA_CFG , uma_cfg); +regmap_write_bits (fiu->regmap,NPCM_FIU_UMA_CTS , +NPCM_FIU_UMA_CTS_EXEC_DONE , +NPCM_FIU_UMA_CTS_EXEC_DONE ); + ret = regmap_read_poll_timeout(fiu->regmap, NPCM_FIU_UMA_CTS,val,
drivers/spi/spi-npcm-fiu.c line 354
Quoted 1 line
drivers/spi/spi-npcm-fiu.c new file +1
-0+ (!(val &
NPCM_FIU_UMA_CTS_EXEC_DONE)), 0,drivers/spi/spi-npcm-fiu.c
Quoted 7 lines
drivers/spi/spi-npcm-fiu.c new file +7
-0+ UMA_MICRO_SEC_TIMEOUT); +if (ret) +return ret; + +if (data_size) { +for (i =0 ; i <DIV_ROUND_UP (data_size,4 ); i++) + regmap_read(fiu->regmap, NPCM_FIU_UMA_DR0 + (i *4),
drivers/spi/spi-npcm-fiu.c
Quoted 10 lines
drivers/spi/spi-npcm-fiu.c new file +10
-0+ &data_reg[i]); +memcpy (data, data_reg, data_size); + } + +return 0 ; +} + +static int npcm_fiu_uma_write (struct spi_mem *mem, +const struct spi_mem_op *op,u8 cmd, + bool is_address_size, u8 *data, u32
data_size)Quoted 10 lines
drivers/spi/spi-npcm-fiu.c new file +10
-0+{ +struct npcm_fiu_spi *fiu = +spi_controller_get_devdata (mem->spi->master); +u32 uma_cfg =BIT (10 ); +u32 data_reg[4 ] = {0 }; +u32 val; +u32 i; + + regmap_update_bits(fiu->regmap, NPCM_FIU_UMA_CTS, + NPCM_FIU_UMA_CTS_DEV_NUM,drivers/spi/spi-npcm-fiu.c
Quoted 10 lines
drivers/spi/spi-npcm-fiu.c new file +10
-0+ (mem->spi->chip_select << + NPCM_FIU_UMA_CTS_DEV_NUM_SHIFT)); + +regmap_update_bits (fiu->regmap,NPCM_FIU_UMA_CMD , +NPCM_FIU_UMA_CMD_CMD , cmd); + +if (data_size) { +memcpy (data_reg, data, data_size); +for (i =0 ; i <DIV_ROUND_UP (data_size,4 ); i++) + regmap_write(fiu->regmap, NPCM_FIU_UMA_DW0 + (i* 4),
drivers/spi/spi-npcm-fiu.c
Quoted 10 lines
drivers/spi/spi-npcm-fiu.c new file +10
-0+ data_reg[i]); + } + +if (is_address_size) { + uma_cfg |=ilog2 (op->cmd.buswidth); + uma_cfg |=ilog2 (op->addr.buswidth) << +NPCM_FIU_UMA_CFG_ADBPCK_SHIFT ; + uma_cfg |=ilog2 (op->data.buswidth) << +NPCM_FIU_UMA_CFG_WDBPCK_SHIFT ; + uma_cfg |= op->addr.nbytes <<
NPCM_FIU_UMA_CFG_ADDSIZ_SHIFT;drivers/spi/spi-npcm-fiu.c line 402
Quoted 1 line
drivers/spi/spi-npcm-fiu.c new file +1
-0+ regmap_write(fiu->regmap, NPCM_FIU_UMA_ADDR,
op->addr.val);drivers/spi/spi-npcm-fiu.c
Quoted 12 lines
drivers/spi/spi-npcm-fiu.c new file +12
-0+ }else { +regmap_write (fiu->regmap,NPCM_FIU_UMA_ADDR ,0x0 ); + } + + uma_cfg |= (data_size <<NPCM_FIU_UMA_CFG_WDATSIZ_SHIFT ); +regmap_write (fiu->regmap,NPCM_FIU_UMA_CFG , uma_cfg); + +regmap_write_bits (fiu->regmap,NPCM_FIU_UMA_CTS , +NPCM_FIU_UMA_CTS_EXEC_DONE , +NPCM_FIU_UMA_CTS_EXEC_DONE ); + + return regmap_read_poll_timeout(fiu->regmap, NPCM_FIU_UMA_CTS,val,
drivers/spi/spi-npcm-fiu.c line 415
Quoted 1 line
drivers/spi/spi-npcm-fiu.c new file +1
-0+ (!(val &
NPCM_FIU_UMA_CTS_EXEC_DONE)), 0,Quoted 38 lines
drivers/spi/spi-npcm-fiu.c new file +38
-0+ UMA_MICRO_SEC_TIMEOUT); +} + +static int npcm_fiu_manualwrite (struct spi_mem *mem, +const struct spi_mem_op *op) +{ +struct npcm_fiu_spi *fiu = +spi_controller_get_devdata (mem->spi->master); +u8 *data = (u8 *)op->data.buf.out; +u32 num_data_chunks; +u32 remain_data; +u32 idx =0 ; +int ret; + + num_data_chunks = op->data.nbytes /CHUNK_SIZE ; + remain_data = op->data.nbytes %CHUNK_SIZE ; + +regmap_update_bits (fiu->regmap,NPCM_FIU_UMA_CTS , +NPCM_FIU_UMA_CTS_DEV_NUM , + (mem->spi->chip_select << +NPCM_FIU_UMA_CTS_DEV_NUM_SHIFT )); +regmap_update_bits (fiu->regmap,NPCM_FIU_UMA_CTS , +NPCM_FIU_UMA_CTS_SW_CS ,0 ); + + ret =npcm_fiu_uma_write (mem, op, op->cmd.opcode, true,NULL ,0 ); +if (ret) +return ret; + +/* Starting the data writing loop in multiples of 8 */ +for (idx =0 ; idx < num_data_chunks; ++idx) { + ret =npcm_fiu_uma_write (mem, op, data[0 ], false, + &data[1 ],CHUNK_SIZE -1 ); +if (ret) +return ret; + + data +=CHUNK_SIZE ; + } +drivers/spi/spi-npcm-fiu.c
Quoted 10 lines
drivers/spi/spi-npcm-fiu.c new file +10
-0+/* Handling chunk remains */ +if (remain_data >0 ) { + ret =npcm_fiu_uma_write (mem, op, data[0 ], false, + &data[1 ], remain_data -1 ); +if (ret) +return ret; + } + + regmap_update_bits(fiu->regmap, NPCM_FIU_UMA_CTS, + NPCM_FIU_UMA_CTS_SW_CS,
NPCM_FIU_UMA_CTS_SW_CS);drivers/spi/spi-npcm-fiu.c
Quoted 5 lines
drivers/spi/spi-npcm-fiu.c new file +5
-0+ +return 0 ; +} + +static int npcm_fiu_read(struct spi_mem *mem, const struct spi_mem_op*op)
Quoted 30 lines
drivers/spi/spi-npcm-fiu.c new file +30
-0+{ +u8 *data = op->data.buf.in; +int i, readlen, currlen; +size_t retlen =0 ; +u8 *buf_ptr; +u32 addr; +int ret; + + i =0 ; + currlen = op->data.nbytes; + +do { + addr = ((u32 )op->addr.val + i); +if (currlen <16 ) + readlen = currlen; +else + readlen =16 ; + + buf_ptr = data + i; + ret =npcm_fiu_uma_read (mem, op, addr, true, buf_ptr, + readlen); +if (ret) +return ret; + + i += readlen; + currlen -=16 ; + }while (currlen >0 ); + + retlen = i; +drivers/spi/spi-npcm-fiu.c
Quoted 10 lines
drivers/spi/spi-npcm-fiu.c new file +10
-0+return 0 ; +} + +static void npcm_fiux_set_direct_wr (struct npcm_fiu_spi *fiu) +{ +regmap_write (fiu->regmap,NPCM_FIU_DWR_CFG , +NPCM_FIU_DWR_16_BYTE_BURST ); + regmap_update_bits(fiu->regmap, NPCM_FIU_DWR_CFG, + NPCM_FIU_DWR_CFG_ABPCK, + DWR_ABPCK_4_BIT_PER_CLK <<
NPCM_FIU_DWR_ABPCK_SHIFT);drivers/spi/spi-npcm-fiu.c
Quoted 3 lines
drivers/spi/spi-npcm-fiu.c new file +3
-0+ regmap_update_bits(fiu->regmap, NPCM_FIU_DWR_CFG, + NPCM_FIU_DWR_CFG_DBPCK, + DWR_DBPCK_4_BIT_PER_CLK <<
NPCM_FIU_DWR_DBPCK_SHIFT);Quoted 7 lines
drivers/spi/spi-npcm-fiu.c new file +7
-0+} + +static void npcm_fiux_set_direct_rd (struct npcm_fiu_spi *fiu) +{ +u32 rx_dummy =0 ; + + regmap_write(fiu->regmap, NPCM_FIU_DRD_CFG,drivers/spi/spi-npcm-fiu.c
Quoted 10 lines
drivers/spi/spi-npcm-fiu.c new file +10
-0+ NPCM_FIU_DRD_16_BYTE_BURST); +regmap_update_bits (fiu->regmap,NPCM_FIU_DRD_CFG , +NPCM_FIU_DRD_CFG_ACCTYPE , +DRD_SPI_X_MODE <<NPCM_FIU_DRD_ACCTYPE_SHIFT ); +regmap_update_bits (fiu->regmap,NPCM_FIU_DRD_CFG , +NPCM_FIU_DRD_CFG_DBW , + rx_dummy <<NPCM_FIU_DRD_DBW_SHIFT ); +} + +static int npcm_fiu_exec_op(struct spi_mem *mem, const struct
spi_mem_op*op)drivers/spi/spi-npcm-fiu.c
Quoted 8 lines
drivers/spi/spi-npcm-fiu.c new file +8
-0+{ +struct npcm_fiu_spi *fiu = +spi_controller_get_devdata (mem->spi->master); +struct npcm_fiu_chip *chip = &fiu->chip[mem->spi->chip_select]; +int ret =0 ; +u8 *buf; + + dev_dbg(fiu->dev, "cmd:%#x mode:%d.%d.%d.%d addr:%#llxlen:%#x\n",
drivers/spi/spi-npcm-fiu.c
Quoted 11 lines
drivers/spi/spi-npcm-fiu.c new file +11
-0+ op->cmd.opcode, op->cmd.buswidth, op->addr.buswidth, + op->dummy.buswidth, op->data.buswidth, op->addr.val, + op->data.nbytes); + +if (fiu->spix_mode) +return -ENOTSUPP ; + +if (fiu->clkrate != chip->clkrate) { + ret =clk_set_rate (fiu->clk, chip->clkrate); +if (ret <0 ) + dev_warn(fiu->dev, "Failed setting %lufrequancy, stay at %lu frequancy\n",
chip->clkrate,fiu->clkrate);drivers/spi/spi-npcm-fiu.c
Quoted 8 lines
drivers/spi/spi-npcm-fiu.c new file +8
-0+else + fiu->clkrate = chip->clkrate; + } + +if (op->data.dir ==SPI_MEM_DATA_IN ) { +if (!op->addr.nbytes) { + buf = op->data.buf.in; + ret = npcm_fiu_uma_read(mem, op, op->addr.val,false,
drivers/spi/spi-npcm-fiu.c
Quoted 11 lines
drivers/spi/spi-npcm-fiu.c new file +11
-0+ buf, op->data.nbytes); + }else { + ret =npcm_fiu_read (mem, op); + } + }else { +if (!op->addr.nbytes || !op->data.nbytes) { +if (op->data.nbytes) + buf = (u8 *)op->data.buf.out; +else + buf =NULL ; + ret = npcm_fiu_uma_write(mem, op,
op->cmd.opcode, false,Quoted 4 lines
drivers/spi/spi-npcm-fiu.c new file +4
-0+ buf, op->data.nbytes); + }else { + ret =npcm_fiu_manualwrite (mem, op); + }drivers/spi/spi-npcm-fiu.c
Quoted 10 lines
drivers/spi/spi-npcm-fiu.c new file +10
-0+ } + +return ret; +} + +static int npcm_fiu_dirmap_create (struct spi_mem_dirmap_desc *desc) +{ +struct npcm_fiu_spi *fiu = +spi_controller_get_devdata (desc->mem->spi->master); + struct npcm_fiu_chip *chip =&fiu->chip[desc->mem->spi->chip_select];
drivers/spi/spi-npcm-fiu.c
Quoted 4 lines
drivers/spi/spi-npcm-fiu.c new file +4
-0+struct regmap *gcr_regmap; + +if (!fiu->res_mem) { + dev_warn(fiu->dev, "Reserved memory not defined, directread disabled\n");
drivers/spi/spi-npcm-fiu.c
Quoted 13 lines
drivers/spi/spi-npcm-fiu.c new file +13
-0+ desc->nodirmap = true; +return 0 ; + } + +if (!fiu->spix_mode && + desc->info.op_tmpl.data.dir ==SPI_MEM_DATA_OUT ) { + desc->nodirmap = true; +return 0 ; + } + +if (!chip->flash_region_mapped_ptr) { + chip->flash_region_mapped_ptr = + devm_ioremap_nocache(fiu->dev,(
fiu->res_mem->start+drivers/spi/spi-npcm-fiu.c line 598
Quoted 1 line
drivers/spi/spi-npcm-fiu.c new file +1
-0+(
fiu->info->max_map_size*drivers/spi/spi-npcm-fiu.c line 599
Quoted 1 line
drivers/spi/spi-npcm-fiu.c new file +1
-0+
desc->mem->spi->chip_select)),drivers/spi/spi-npcm-fiu.c
Quoted 3 lines
drivers/spi/spi-npcm-fiu.c new file +3
-0+ (u32)desc->info.length); +if (!chip->flash_region_mapped_ptr) { + dev_warn(fiu->dev, "Error mapping memory region,direct read disabled\n");
drivers/spi/spi-npcm-fiu.c
Quoted 6 lines
drivers/spi/spi-npcm-fiu.c new file +6
-0+ desc->nodirmap = true; +return 0 ; + } + } + + if (of_device_is_compatible(fiu->dev->of_node,"nuvoton,npcm750-fiu")) {
drivers/spi/spi-npcm-fiu.c line 620
Quoted 2 lines
drivers/spi/spi-npcm-fiu.c new file +2
-0+ gcr_regmap = +
syscon_regmap_lookup_by_compatible("nuvoton,npcm750-gcr");drivers/spi/spi-npcm-fiu.c line 612
Quoted 2 lines
drivers/spi/spi-npcm-fiu.c new file +2
-0+if (IS_ERR (gcr_regmap)) { + dev_warn(fiu->dev, "Didn't findnuvoton,npcm750-gcr, direct read disabled\n");
Quoted 36 lines
drivers/spi/spi-npcm-fiu.c new file +36
-0+ desc->nodirmap = true; +return 0 ; + } +regmap_update_bits (gcr_regmap,NPCM7XX_INTCR3_OFFSET , +NPCM7XX_INTCR3_FIU_FIX , +NPCM7XX_INTCR3_FIU_FIX ); + } + +if (desc->info.op_tmpl.data.dir ==SPI_MEM_DATA_IN ) { +if (!fiu->spix_mode) +npcm_fiu_set_drd (fiu, &desc->info.op_tmpl); +else +npcm_fiux_set_direct_rd (fiu); + + }else { +npcm_fiux_set_direct_wr (fiu); + } + +return 0 ; +} + +static int npcm_fiu_setup (struct spi_device *spi) +{ +struct spi_controller *ctrl = spi->master; +struct npcm_fiu_spi *fiu =spi_controller_get_devdata (ctrl); +struct npcm_fiu_chip *chip; + + chip = &fiu->chip[spi->chip_select]; + chip->fiu = fiu; + chip->chipselect = spi->chip_select; + chip->clkrate = spi->max_speed_hz; + + fiu->clkrate =clk_get_rate (fiu->clk); + +return 0 ; +}drivers/spi/spi-npcm-fiu.c
Quoted 10 lines
drivers/spi/spi-npcm-fiu.c new file +10
-0+ +static const struct spi_controller_mem_ops npcm_fiu_mem_ops = { + .exec_op = npcm_fiu_exec_op, + .dirmap_create = npcm_fiu_dirmap_create, + .dirmap_read = npcm_fiu_direct_read, + .dirmap_write = npcm_fiu_direct_write, +}; + +static const struct of_device_id npcm_fiu_dt_ids[] = { + { .compatible = "nuvoton,npcm750-fiu", .data =
&npxm7xx_fiu_data},Quoted 30 lines
drivers/spi/spi-npcm-fiu.c new file +30
-0+ {/* sentinel */ } +}; + +static int npcm_fiu_probe (struct platform_device *pdev) +{ +const struct fiu_data *fiu_data_match; +const struct of_device_id *match; +struct device *dev = &pdev->dev; +struct spi_controller *ctrl; +struct npcm_fiu_spi *fiu; +void __iomem *regbase; +struct resource *res; +int ret; +int id; + + ctrl =spi_alloc_master (dev,sizeof (*fiu)); +if (!ctrl) +return -ENOMEM ; + + fiu =spi_controller_get_devdata (ctrl); + + match =of_match_device (npcm_fiu_dt_ids, dev); +if (!match || !match->data) { +dev_err (dev,"No compatible OF match\n" ); +return -ENODEV ; + } + + fiu_data_match = match->data; + id =of_alias_get_id (dev->of_node,"fiu" ); +if (id <0 || id >= fiu_data_match->fiu_max) {drivers/spi/spi-npcm-fiu.c
Quoted 10 lines
drivers/spi/spi-npcm-fiu.c new file +10
-0+dev_err (dev,"Invalid platform device id: %d\n" , id); +return -EINVAL ; + } + + fiu->info = &fiu_data_match->npcm_fiu_data_info[id]; + +platform_set_drvdata (pdev, fiu); + fiu->dev = dev; + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM,"control");
Quoted 8 lines
drivers/spi/spi-npcm-fiu.c new file +8
-0+ regbase =devm_ioremap_resource (dev, res); +if (IS_ERR (regbase)) +return PTR_ERR (regbase); + + fiu->regmap =devm_regmap_init_mmio (dev, regbase, + &npcm_mtd_regmap_config); +if (IS_ERR (fiu->regmap)) { +dev_err (dev,"Failed to create regmap\n" );drivers/spi/spi-npcm-fiu.c
Quoted 10 lines
drivers/spi/spi-npcm-fiu.c new file +10
-0+return PTR_ERR (fiu->regmap); + } + + fiu->res_mem =platform_get_resource_byname (pdev,IORESOURCE_MEM , +"memory" ); + fiu->clk =devm_clk_get (dev,NULL ); +if (IS_ERR (fiu->clk)) +return PTR_ERR (fiu->clk); + + fiu->spix_mode = of_property_read_bool(dev->of_node,"spix-mode");
Quoted 33 lines
drivers/spi/spi-npcm-fiu.c new file +33
-0+ +platform_set_drvdata (pdev, fiu); +clk_prepare_enable (fiu->clk); + + ctrl->mode_bits =SPI_RX_DUAL |SPI_RX_QUAD + |SPI_TX_DUAL |SPI_TX_QUAD ; + ctrl->setup = npcm_fiu_setup; + ctrl->bus_num =-1 ; + ctrl->mem_ops = &npcm_fiu_mem_ops; + ctrl->num_chipselect = fiu->info->max_cs; + ctrl->dev.of_node = dev->of_node; + + ret =devm_spi_register_master (dev, ctrl); +if (ret) +return ret; + +dev_info (dev,"NPCM %s probe succeed\n" , fiu->info->name); + +return 0 ; +} + +static int npcm_fiu_remove (struct platform_device *pdev) +{ +struct npcm_fiu_spi *fiu =platform_get_drvdata (pdev); + +clk_disable_unprepare (fiu->clk); +return 0 ; +} + +MODULE_DEVICE_TABLE (of, npcm_fiu_dt_ids); + +static struct platform_driver npcm_fiu_driver = { + .driver = {drivers/spi/spi-npcm-fiu.c
Quoted 10 lines
drivers/spi/spi-npcm-fiu.c new file +10
-0+ .name = "NPCM-FIU", + .bus = &platform_bus_type, + .of_match_table = npcm_fiu_dt_ids, + }, + .probe = npcm_fiu_probe, + .remove = npcm_fiu_remove, +}; +module_platform_driver (npcm_fiu_driver); + +MODULE_DESCRIPTION("Nuvoton FLASH Interface Unit SPI ControllerDriver");
Quoted 5 lines
drivers/spi/spi-npcm-fiu.c new file +2
-1+MODULE_AUTHOR ("Tomer Maimon <[email protected]>" ); +MODULE_LICENSE ("GPL v2" ); --2.18.0