* [PATCH 00/12] mtd: rawnand: brcmnand: driver and doc updates
@ 2023-06-06 23:12 William Zhang
2023-06-06 23:12 ` [PATCH 01/12] mtd: rawnand: brcmnand: Fix ECC level field setting for v7.2 controller William Zhang
` (11 more replies)
0 siblings, 12 replies; 44+ messages in thread
From: William Zhang @ 2023-06-06 23:12 UTC (permalink / raw)
To: Broadcom Kernel List, Linux MTD List
Cc: f.fainelli, rafal, kursad.oney, joel.peshkin, computersforpeace,
anand.gore, dregan, kamal.dasu, tomer.yacoby, dan.beygelman,
William Zhang, devicetree, Rob Herring, linux-kernel,
Krzysztof Kozlowski, Vignesh Raghavendra, Miquel Raynal,
Richard Weinberger, linux-arm-kernel, Boris Brezillon, Kamal Dasu,
Rob Herring
[-- Attachment #1: Type: text/plain, Size: 3194 bytes --]
This patch series include the accumulative updates and fixes for the
brcmnand driver. The device tree document is also updated accordingly
with the new properties needed by the driver.
William Zhang (12):
mtd: rawnand: brcmnand: Fix ECC level field setting for v7.2 controller
mtd: rawnand: brcmnand: Fix potential false time out warning
mtd: rawnand: brcmnand: Fix crash during the panic_write
mtd: rawnand: brcmnand: Fix potential out-of-bounds access in oob write
dt-bindings: mtd: brcmnand: Updates for bcmbca SoCs
ARM: dts: broadcom: bcmbca: Add NAND controller node
arm64: dts: broadcom: bcmbca: Add NAND controller node
mtd: rawnand: brcmnand: Rename bcm63138 nand driver
mtd: rawnand: brcmnand: Add new compatible string
mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
mtd: rawnand: brcmnand: Add support for getting ecc setting from strap
mtd: rawnand: brcmnand: Support write protection setting from dts
.../bindings/mtd/brcm,brcmnand.yaml | 64 ++++---
arch/arm/boot/dts/bcm47622.dtsi | 17 ++
arch/arm/boot/dts/bcm63138.dtsi | 12 +-
arch/arm/boot/dts/bcm63148.dtsi | 17 ++
arch/arm/boot/dts/bcm63178.dtsi | 17 ++
arch/arm/boot/dts/bcm6756.dtsi | 17 ++
arch/arm/boot/dts/bcm6846.dtsi | 17 ++
arch/arm/boot/dts/bcm6855.dtsi | 17 ++
arch/arm/boot/dts/bcm6878.dtsi | 17 ++
arch/arm/boot/dts/bcm947622.dts | 4 +
arch/arm/boot/dts/bcm963138.dts | 4 +
arch/arm/boot/dts/bcm963138dvt.dts | 12 +-
arch/arm/boot/dts/bcm963148.dts | 4 +
arch/arm/boot/dts/bcm963178.dts | 4 +
arch/arm/boot/dts/bcm96756.dts | 4 +
arch/arm/boot/dts/bcm96846.dts | 4 +
arch/arm/boot/dts/bcm96855.dts | 4 +
arch/arm/boot/dts/bcm96878.dts | 4 +
.../boot/dts/broadcom/bcmbca/bcm4908.dtsi | 5 +-
.../boot/dts/broadcom/bcmbca/bcm4912.dtsi | 17 ++
.../boot/dts/broadcom/bcmbca/bcm63146.dtsi | 17 ++
.../boot/dts/broadcom/bcmbca/bcm63158.dtsi | 17 ++
.../boot/dts/broadcom/bcmbca/bcm6813.dtsi | 17 ++
.../boot/dts/broadcom/bcmbca/bcm6856.dtsi | 17 ++
.../boot/dts/broadcom/bcmbca/bcm6858.dtsi | 17 ++
.../boot/dts/broadcom/bcmbca/bcm94912.dts | 4 +
.../boot/dts/broadcom/bcmbca/bcm963146.dts | 4 +
.../boot/dts/broadcom/bcmbca/bcm963158.dts | 4 +
.../boot/dts/broadcom/bcmbca/bcm96813.dts | 4 +
.../boot/dts/broadcom/bcmbca/bcm96856.dts | 4 +
.../boot/dts/broadcom/bcmbca/bcm96858.dts | 4 +
drivers/mtd/nand/raw/brcmnand/Makefile | 2 +-
drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c | 101 -----------
drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c | 138 +++++++++++++++
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 166 ++++++++++++++----
drivers/mtd/nand/raw/brcmnand/brcmnand.h | 2 +
36 files changed, 615 insertions(+), 164 deletions(-)
delete mode 100644 drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c
create mode 100644 drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
--
2.37.3
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply [flat|nested] 44+ messages in thread
* [PATCH 01/12] mtd: rawnand: brcmnand: Fix ECC level field setting for v7.2 controller
2023-06-06 23:12 [PATCH 00/12] mtd: rawnand: brcmnand: driver and doc updates William Zhang
@ 2023-06-06 23:12 ` William Zhang
2023-06-07 8:06 ` Miquel Raynal
2023-06-06 23:12 ` [PATCH 02/12] mtd: rawnand: brcmnand: Fix potential false time out warning William Zhang
` (10 subsequent siblings)
11 siblings, 1 reply; 44+ messages in thread
From: William Zhang @ 2023-06-06 23:12 UTC (permalink / raw)
To: Broadcom Kernel List, Linux MTD List
Cc: f.fainelli, rafal, kursad.oney, joel.peshkin, computersforpeace,
anand.gore, dregan, kamal.dasu, tomer.yacoby, dan.beygelman,
William Zhang, Florian Fainelli, Rob Herring, linux-kernel,
Vignesh Raghavendra, Miquel Raynal, Richard Weinberger,
Boris Brezillon, Kamal Dasu
[-- Attachment #1: Type: text/plain, Size: 1862 bytes --]
v7.2 controller has different ECC level field size and shift in the acc
control register than its predecessor and successor controller. It needs
to be set specifically.
Fixes: decba6d47869 ("mtd: brcmnand: Add v7.2 controller support")
Signed-off-by: William Zhang <william.zhang@broadcom.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
---
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index 2e9c2e2d9c9f..b2cde1082b3b 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -977,12 +977,20 @@ static inline u32 brcmnand_ecc_level_mask(struct brcmnand_controller *ctrl)
mask <<= NAND_ACC_CONTROL_ECC_SHIFT;
/* v7.2 includes additional ECC levels */
- if (ctrl->nand_version >= 0x0702)
+ if (ctrl->nand_version == 0x0702)
mask |= 0x7 << NAND_ACC_CONTROL_ECC_EXT_SHIFT;
return mask;
}
+static inline int brcmnand_ecc_level_shift(struct brcmnand_controller *ctrl)
+{
+ if (ctrl->nand_version == 0x0702)
+ return NAND_ACC_CONTROL_ECC_EXT_SHIFT;
+ else
+ return NAND_ACC_CONTROL_ECC_SHIFT;
+}
+
static void brcmnand_set_ecc_enabled(struct brcmnand_host *host, int en)
{
struct brcmnand_controller *ctrl = host->ctrl;
@@ -992,8 +1000,8 @@ static void brcmnand_set_ecc_enabled(struct brcmnand_host *host, int en)
if (en) {
acc_control |= ecc_flags; /* enable RD/WR ECC */
- acc_control |= host->hwcfg.ecc_level
- << NAND_ACC_CONTROL_ECC_SHIFT;
+ acc_control &= ~brcmnand_ecc_level_mask(ctrl);
+ acc_control |= host->hwcfg.ecc_level << brcmnand_ecc_level_shift(ctrl);
} else {
acc_control &= ~ecc_flags; /* disable RD/WR ECC */
acc_control &= ~brcmnand_ecc_level_mask(ctrl);
--
2.37.3
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [PATCH 02/12] mtd: rawnand: brcmnand: Fix potential false time out warning
2023-06-06 23:12 [PATCH 00/12] mtd: rawnand: brcmnand: driver and doc updates William Zhang
2023-06-06 23:12 ` [PATCH 01/12] mtd: rawnand: brcmnand: Fix ECC level field setting for v7.2 controller William Zhang
@ 2023-06-06 23:12 ` William Zhang
2023-06-06 23:12 ` [PATCH 03/12] mtd: rawnand: brcmnand: Fix crash during the panic_write William Zhang
` (9 subsequent siblings)
11 siblings, 0 replies; 44+ messages in thread
From: William Zhang @ 2023-06-06 23:12 UTC (permalink / raw)
To: Broadcom Kernel List, Linux MTD List
Cc: f.fainelli, rafal, kursad.oney, joel.peshkin, computersforpeace,
anand.gore, dregan, kamal.dasu, tomer.yacoby, dan.beygelman,
William Zhang, Florian Fainelli, Miquel Raynal, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Boris Brezillon,
Kamal Dasu
[-- Attachment #1: Type: text/plain, Size: 1321 bytes --]
If system is busy during the command status polling function, the driver
may not get the chance to poll the status register till the end of time
out and return the premature status. Do a final check after time out
happens to ensure reading the correct status.
Fixes: 9d2ee0a60b8b ("mtd: nand: brcmnand: Check flash #WP pin status before nand erase/program")
Signed-off-by: William Zhang <william.zhang@broadcom.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
---
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index b2cde1082b3b..b6346a8b9833 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -1080,6 +1080,14 @@ static int bcmnand_ctrl_poll_status(struct brcmnand_controller *ctrl,
cpu_relax();
} while (time_after(limit, jiffies));
+ /*
+ * do a final check after time out in case CPU is busy and driver does
+ * not get the enough time to poll to avoid false alarm
+ */
+ val = brcmnand_read_reg(ctrl, BRCMNAND_INTFC_STATUS);
+ if ((val & mask) == expected_val)
+ return 0;
+
dev_warn(ctrl->dev, "timeout on status poll (expected %x got %x)\n",
expected_val, val & mask);
--
2.37.3
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [PATCH 03/12] mtd: rawnand: brcmnand: Fix crash during the panic_write
2023-06-06 23:12 [PATCH 00/12] mtd: rawnand: brcmnand: driver and doc updates William Zhang
2023-06-06 23:12 ` [PATCH 01/12] mtd: rawnand: brcmnand: Fix ECC level field setting for v7.2 controller William Zhang
2023-06-06 23:12 ` [PATCH 02/12] mtd: rawnand: brcmnand: Fix potential false time out warning William Zhang
@ 2023-06-06 23:12 ` William Zhang
2023-06-06 23:12 ` [PATCH 04/12] mtd: rawnand: brcmnand: Fix potential out-of-bounds access in oob write William Zhang
` (8 subsequent siblings)
11 siblings, 0 replies; 44+ messages in thread
From: William Zhang @ 2023-06-06 23:12 UTC (permalink / raw)
To: Broadcom Kernel List, Linux MTD List
Cc: f.fainelli, rafal, kursad.oney, joel.peshkin, computersforpeace,
anand.gore, dregan, kamal.dasu, tomer.yacoby, dan.beygelman,
William Zhang, Florian Fainelli, Miquel Raynal, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu
[-- Attachment #1: Type: text/plain, Size: 1546 bytes --]
During the panic write path to execute another nand command, if
there is a pending command, we should wait for the command instead of
calling BUG_ON so we don't crash while crashing.
Fixes: 27c5b17cd1b1 ("mtd: nand: add NAND driver "library" for Broadcom STB NAND controller")
Signed-off-by: William Zhang <william.zhang@broadcom.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: Kursad Oney <kursad.oney@broadcom.com>
Reviewed-by: Kamal Dasu <kamal.dasu@broadcom.com>
---
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index b6346a8b9833..20832857c4aa 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -1608,7 +1608,17 @@ static void brcmnand_send_cmd(struct brcmnand_host *host, int cmd)
dev_dbg(ctrl->dev, "send native cmd %d addr 0x%llx\n", cmd, cmd_addr);
- BUG_ON(ctrl->cmd_pending != 0);
+ /*
+ * If we came here through _panic_write and there is a pending
+ * command, try to wait for it. If it times out, rather than
+ * hitting BUG_ON, just return so we don't crash while crashing.
+ */
+ if (oops_in_progress) {
+ if (ctrl->cmd_pending &&
+ bcmnand_ctrl_poll_status(ctrl, NAND_CTRL_RDY, NAND_CTRL_RDY, 0))
+ return;
+ } else
+ BUG_ON(ctrl->cmd_pending != 0);
ctrl->cmd_pending = cmd;
ret = bcmnand_ctrl_poll_status(ctrl, NAND_CTRL_RDY, NAND_CTRL_RDY, 0);
--
2.37.3
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [PATCH 04/12] mtd: rawnand: brcmnand: Fix potential out-of-bounds access in oob write
2023-06-06 23:12 [PATCH 00/12] mtd: rawnand: brcmnand: driver and doc updates William Zhang
` (2 preceding siblings ...)
2023-06-06 23:12 ` [PATCH 03/12] mtd: rawnand: brcmnand: Fix crash during the panic_write William Zhang
@ 2023-06-06 23:12 ` William Zhang
2023-06-07 8:09 ` Miquel Raynal
2023-06-06 23:12 ` [PATCH 05/12] dt-bindings: mtd: brcmnand: Updates for bcmbca SoCs William Zhang
` (7 subsequent siblings)
11 siblings, 1 reply; 44+ messages in thread
From: William Zhang @ 2023-06-06 23:12 UTC (permalink / raw)
To: Broadcom Kernel List, Linux MTD List
Cc: f.fainelli, rafal, kursad.oney, joel.peshkin, computersforpeace,
anand.gore, dregan, kamal.dasu, tomer.yacoby, dan.beygelman,
William Zhang, Florian Fainelli, Miquel Raynal, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu
[-- Attachment #1: Type: text/plain, Size: 1341 bytes --]
When the oob buffer length is not in multiple of words, the oob write
function does out-of-bounds read on the oob source buffer at the last
iteration. Fix that by always checking length limit on the oob buffer
read and fill with 0xff when reaching the end of the buffer to the oob
registers.
Fixes: 27c5b17cd1b1 ("mtd: nand: add NAND driver "library" for Broadcom STB NAND controller")
Signed-off-by: William Zhang <william.zhang@broadcom.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
---
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index 20832857c4aa..d920e88c7f5b 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -1486,10 +1486,10 @@ static int write_oob_to_regs(struct brcmnand_controller *ctrl, int i,
for (j = 0; j < tbytes; j += 4)
oob_reg_write(ctrl, j,
- (oob[j + 0] << 24) |
- (oob[j + 1] << 16) |
- (oob[j + 2] << 8) |
- (oob[j + 3] << 0));
+ (((j < tbytes) ? oob[j] : 0xff) << 24) |
+ (((j + 1 < tbytes) ? oob[j + 1] : 0xff) << 16) |
+ (((j + 2 < tbytes) ? oob[j + 2] : 0xff) << 8) |
+ ((j + 3 < tbytes) ? oob[j + 3] : 0xff));
return tbytes;
}
--
2.37.3
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [PATCH 05/12] dt-bindings: mtd: brcmnand: Updates for bcmbca SoCs
2023-06-06 23:12 [PATCH 00/12] mtd: rawnand: brcmnand: driver and doc updates William Zhang
` (3 preceding siblings ...)
2023-06-06 23:12 ` [PATCH 04/12] mtd: rawnand: brcmnand: Fix potential out-of-bounds access in oob write William Zhang
@ 2023-06-06 23:12 ` William Zhang
2023-06-07 8:14 ` Miquel Raynal
2023-06-14 22:43 ` Rob Herring
2023-06-06 23:12 ` [PATCH 06/12] ARM: dts: broadcom: bcmbca: Add NAND controller node William Zhang
` (6 subsequent siblings)
11 siblings, 2 replies; 44+ messages in thread
From: William Zhang @ 2023-06-06 23:12 UTC (permalink / raw)
To: Broadcom Kernel List, Linux MTD List
Cc: f.fainelli, rafal, kursad.oney, joel.peshkin, computersforpeace,
anand.gore, dregan, kamal.dasu, tomer.yacoby, dan.beygelman,
William Zhang, devicetree, linux-kernel, Krzysztof Kozlowski,
Vignesh Raghavendra, Miquel Raynal, Richard Weinberger,
Kamal Dasu, Rob Herring
[-- Attachment #1: Type: text/plain, Size: 5898 bytes --]
Use new compatiable brcm,nand-bcmbca to support BCMBCA broadband
product. The old compatible string is still kept in the driver so old
dtb can still work.
Add brcm,nand-use-wp property to have an option for disabling this
feature on broadband board design that does not use write protection.
Add brcm,nand-ecc-use-strap to get ecc setting from board strap for
broadband board designs because they do not specify ecc setting in dts
but rather using the strap setting.
Remove the requirement of interrupts and interrupt-names properties to
reflect the driver code.
This patch also includes a few minor fixes to the BCM63xx compatibles
and add myself to the list of maintainers.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
.../bindings/mtd/brcm,brcmnand.yaml | 64 +++++++++++++------
1 file changed, 43 insertions(+), 21 deletions(-)
diff --git a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
index 1571024aa119..1fe1c166a9db 100644
--- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
+++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
@@ -9,6 +9,7 @@ title: Broadcom STB NAND Controller
maintainers:
- Brian Norris <computersforpeace@gmail.com>
- Kamal Dasu <kdasu.kdev@gmail.com>
+ - William Zhang <william.zhang@broadcom.com>
description: |
The Broadcom Set-Top Box NAND controller supports low-level access to raw NAND
@@ -18,9 +19,10 @@ description: |
supports basic PROGRAM and READ functions, among other features.
This controller was originally designed for STB SoCs (BCM7xxx) but is now
- available on a variety of Broadcom SoCs, including some BCM3xxx, BCM63xx, and
- iProc/Cygnus. Its history includes several similar (but not fully register
- compatible) versions.
+ available on a variety of Broadcom SoCs, including some BCM3xxx, MIPS based
+ Broadband SoC (BCM63xx), ARM based Broadband SoC (BCMBCA) and iProc/Cygnus.
+ Its history includes several similar (but not fully register compatible)
+ versions.
-- Additional SoC-specific NAND controller properties --
@@ -53,9 +55,9 @@ properties:
- brcm,brcmnand-v7.2
- brcm,brcmnand-v7.3
- const: brcm,brcmnand
- - description: BCM63138 SoC-specific NAND controller
+ - description: BCMBCA SoC-specific NAND controller
items:
- - const: brcm,nand-bcm63138
+ - const: brcm,nand-bcmbca
- enum:
- brcm,brcmnand-v7.0
- brcm,brcmnand-v7.1
@@ -65,11 +67,15 @@ properties:
- const: brcm,nand-iproc
- const: brcm,brcmnand-v6.1
- const: brcm,brcmnand
- - description: BCM63168 SoC-specific NAND controller
+ - description: BCM63xx SoC-specific NAND controller
items:
- - const: brcm,nand-bcm63168
- - const: brcm,nand-bcm6368
- - const: brcm,brcmnand-v4.0
+ - enum:
+ - brcm,nand-bcm63168
+ - brcm,nand-bcm6368
+ - enum:
+ - brcm,brcmnand-v2.1
+ - brcm,brcmnand-v2.2
+ - brcm,brcmnand-v4.0
- const: brcm,brcmnand
reg:
@@ -111,6 +117,19 @@ properties:
earlier versions of this core that include WP
type: boolean
+ brcm,nand-use-wp:
+ description:
+ Use this integer to indicate if board design uses
+ controller's write protection feature and connects its
+ NAND_WPb pin to nand chip's WP_L pin. Driver defaults to
+ use this feature when this property does not exist.
+ Set to 0 if WP pins are not connected and feature is not
+ used. Set to 1 if WP pins are connected and feature is used.
+ Set to 2 if WP pins are connected but disable this feature
+ through driver that sets controller to output high on NAND_WPb.
+ $ref: /schemas/types.yaml#/definitions/uint32
+ enum: [0, 1, 2]
+
patternProperties:
"^nand@[a-f0-9]$":
type: object
@@ -136,13 +155,23 @@ patternProperties:
layout.
$ref: /schemas/types.yaml#/definitions/uint32
+ brcm,nand-ecc-use-strap:
+ description:
+ This flag is used by the driver to get the ecc strength and
+ spare area size from the SoC NAND boot strap setting. This
+ is commonly used by the BCMBCA SoC board design. If ecc
+ strength and spare area size are set by nand-ecc-strength
+ and brcm,nand-oob-sector-size in the dts, these settings
+ have precedence and override this flag.
+ $ref: /schemas/types.yaml#/definitions/flag
+
allOf:
- $ref: nand-controller.yaml#
- if:
properties:
compatible:
contains:
- const: brcm,nand-bcm63138
+ const: brcm,nand-bcmbca
then:
properties:
reg-names:
@@ -153,7 +182,9 @@ allOf:
properties:
compatible:
contains:
- const: brcm,nand-bcm6368
+ enum:
+ - brcm,nand-bcm63168
+ - brcm,nand-bcm6368
then:
properties:
reg-names:
@@ -173,20 +204,12 @@ allOf:
- const: nand
- const: iproc-idm
- const: iproc-ext
- - if:
- properties:
- interrupts:
- minItems: 2
- then:
- required:
- - interrupt-names
unevaluatedProperties: false
required:
- reg
- reg-names
- - interrupts
examples:
- |
@@ -215,8 +238,7 @@ examples:
};
- |
nand-controller@10000200 {
- compatible = "brcm,nand-bcm63168", "brcm,nand-bcm6368",
- "brcm,brcmnand-v4.0", "brcm,brcmnand";
+ compatible = "brcm,nand-bcm6368", "brcm,brcmnand-v2.1", "brcm,brcmnand";
reg = <0x10000200 0x180>,
<0x100000b0 0x10>,
<0x10000600 0x200>;
--
2.37.3
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [PATCH 06/12] ARM: dts: broadcom: bcmbca: Add NAND controller node
2023-06-06 23:12 [PATCH 00/12] mtd: rawnand: brcmnand: driver and doc updates William Zhang
` (4 preceding siblings ...)
2023-06-06 23:12 ` [PATCH 05/12] dt-bindings: mtd: brcmnand: Updates for bcmbca SoCs William Zhang
@ 2023-06-06 23:12 ` William Zhang
2023-06-06 23:12 ` [PATCH 07/12] arm64: " William Zhang
` (5 subsequent siblings)
11 siblings, 0 replies; 44+ messages in thread
From: William Zhang @ 2023-06-06 23:12 UTC (permalink / raw)
To: Broadcom Kernel List, Linux MTD List
Cc: f.fainelli, rafal, kursad.oney, joel.peshkin, computersforpeace,
anand.gore, dregan, kamal.dasu, tomer.yacoby, dan.beygelman,
William Zhang, devicetree, linux-kernel, Krzysztof Kozlowski,
Rob Herring, linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 10455 bytes --]
Add support for Broadcom STB NAND controller in BCMBCA ARMv7 chip dts
files.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
arch/arm/boot/dts/bcm47622.dtsi | 17 +++++++++++++++++
arch/arm/boot/dts/bcm63138.dtsi | 12 ++++++++++--
arch/arm/boot/dts/bcm63148.dtsi | 17 +++++++++++++++++
arch/arm/boot/dts/bcm63178.dtsi | 17 +++++++++++++++++
arch/arm/boot/dts/bcm6756.dtsi | 17 +++++++++++++++++
arch/arm/boot/dts/bcm6846.dtsi | 17 +++++++++++++++++
arch/arm/boot/dts/bcm6855.dtsi | 17 +++++++++++++++++
arch/arm/boot/dts/bcm6878.dtsi | 17 +++++++++++++++++
arch/arm/boot/dts/bcm947622.dts | 4 ++++
arch/arm/boot/dts/bcm963138.dts | 4 ++++
arch/arm/boot/dts/bcm963138dvt.dts | 12 +++++-------
arch/arm/boot/dts/bcm963148.dts | 4 ++++
arch/arm/boot/dts/bcm963178.dts | 4 ++++
arch/arm/boot/dts/bcm96756.dts | 4 ++++
arch/arm/boot/dts/bcm96846.dts | 4 ++++
arch/arm/boot/dts/bcm96855.dts | 4 ++++
arch/arm/boot/dts/bcm96878.dts | 4 ++++
17 files changed, 166 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/bcm47622.dtsi b/arch/arm/boot/dts/bcm47622.dtsi
index cd25ed2757b7..401e1ce1da6d 100644
--- a/arch/arm/boot/dts/bcm47622.dtsi
+++ b/arch/arm/boot/dts/bcm47622.dtsi
@@ -137,6 +137,23 @@ hsspi: spi@1000 {
status = "disabled";
};
+ nand_controller: nand-controller@1800 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,nand-bcmbca", "brcm,brcmnand-v7.1", "brcm,brcmnand";
+ reg = <0x1800 0x600>, <0x2000 0x10>;
+ reg-names = "nand", "nand-int-base";
+ brcm,nand-use-wp = <0>;
+ status = "disabled";
+
+ nandcs: nand@0 {
+ compatible = "brcm,nandcs";
+ reg = <0>;
+ nand-on-flash-bbt;
+ brcm,nand-ecc-use-strap;
+ };
+ };
+
uart0: serial@12000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x12000 0x1000>;
diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi
index 93281c47c9ba..2c9939e775fb 100644
--- a/arch/arm/boot/dts/bcm63138.dtsi
+++ b/arch/arm/boot/dts/bcm63138.dtsi
@@ -224,12 +224,20 @@ hsspi: spi@1000 {
nand_controller: nand-controller@2000 {
#address-cells = <1>;
#size-cells = <0>;
- compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand";
+ compatible = "brcm,nand-bcmbca", "brcm,brcmnand-v7.0", "brcm,brcmnand";
reg = <0x2000 0x600>, <0xf0 0x10>;
reg-names = "nand", "nand-int-base";
status = "disabled";
interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
- interrupt-names = "nand";
+ interrupt-names = "nand_ctlrdy";
+ brcm,nand-use-wp = <0>;
+
+ nandcs: nand@0 {
+ compatible = "brcm,nandcs";
+ reg = <0>;
+ nand-on-flash-bbt;
+ brcm,nand-ecc-use-strap;
+ };
};
bootlut: bootlut@8000 {
diff --git a/arch/arm/boot/dts/bcm63148.dtsi b/arch/arm/boot/dts/bcm63148.dtsi
index ba7f265db121..de14d4564b14 100644
--- a/arch/arm/boot/dts/bcm63148.dtsi
+++ b/arch/arm/boot/dts/bcm63148.dtsi
@@ -118,5 +118,22 @@ hsspi: spi@1000 {
num-cs = <8>;
status = "disabled";
};
+
+ nand_controller: nand-controller@2000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,nand-bcmbca", "brcm,brcmnand-v7.1", "brcm,brcmnand";
+ reg = <0x2000 0x600>, <0xf0 0x10>;
+ reg-names = "nand", "nand-int-base";
+ brcm,nand-use-wp = <0>;
+ status = "disabled";
+
+ nandcs: nand@0 {
+ compatible = "brcm,nandcs";
+ reg = <0>;
+ nand-on-flash-bbt;
+ brcm,nand-ecc-use-strap;
+ };
+ };
};
};
diff --git a/arch/arm/boot/dts/bcm63178.dtsi b/arch/arm/boot/dts/bcm63178.dtsi
index d8268a1e889b..ae205408c5cd 100644
--- a/arch/arm/boot/dts/bcm63178.dtsi
+++ b/arch/arm/boot/dts/bcm63178.dtsi
@@ -128,6 +128,23 @@ hsspi: spi@1000 {
status = "disabled";
};
+ nand_controller: nand-controller@1800 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,nand-bcmbca", "brcm,brcmnand-v7.1", "brcm,brcmnand";
+ reg = <0x1800 0x600>, <0x2000 0x10>;
+ reg-names = "nand", "nand-int-base";
+ brcm,nand-use-wp = <0>;
+ status = "disabled";
+
+ nandcs: nand@0 {
+ compatible = "brcm,nandcs";
+ reg = <0>;
+ nand-on-flash-bbt;
+ brcm,nand-ecc-use-strap;
+ };
+ };
+
uart0: serial@12000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x12000 0x1000>;
diff --git a/arch/arm/boot/dts/bcm6756.dtsi b/arch/arm/boot/dts/bcm6756.dtsi
index 49ecc1f0c18c..bbff47172dc1 100644
--- a/arch/arm/boot/dts/bcm6756.dtsi
+++ b/arch/arm/boot/dts/bcm6756.dtsi
@@ -138,6 +138,23 @@ hsspi: spi@1000 {
status = "disabled";
};
+ nand_controller: nand-controller@1800 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,nand-bcmbca", "brcm,brcmnand-v7.1", "brcm,brcmnand";
+ reg = <0x1800 0x600>, <0x2000 0x10>;
+ reg-names = "nand", "nand-int-base";
+ brcm,nand-use-wp = <0>;
+ status = "disabled";
+
+ nandcs: nand@0 {
+ compatible = "brcm,nandcs";
+ reg = <0>;
+ nand-on-flash-bbt;
+ brcm,nand-ecc-use-strap;
+ };
+ };
+
uart0: serial@12000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x12000 0x1000>;
diff --git a/arch/arm/boot/dts/bcm6846.dtsi b/arch/arm/boot/dts/bcm6846.dtsi
index fbc7d3a5dc5f..26a36a577b44 100644
--- a/arch/arm/boot/dts/bcm6846.dtsi
+++ b/arch/arm/boot/dts/bcm6846.dtsi
@@ -118,5 +118,22 @@ hsspi: spi@1000 {
num-cs = <8>;
status = "disabled";
};
+
+ nand_controller: nand-controller@1800 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,nand-bcmbca", "brcm,brcmnand-v7.1", "brcm,brcmnand";
+ reg = <0x1800 0x600>, <0x2000 0x10>;
+ reg-names = "nand", "nand-int-base";
+ brcm,nand-use-wp = <0>;
+ status = "disabled";
+
+ nandcs: nand@0 {
+ compatible = "brcm,nandcs";
+ reg = <0>;
+ nand-on-flash-bbt;
+ brcm,nand-ecc-use-strap;
+ };
+ };
};
};
diff --git a/arch/arm/boot/dts/bcm6855.dtsi b/arch/arm/boot/dts/bcm6855.dtsi
index 5e0fe26530f1..0defcc10ca8a 100644
--- a/arch/arm/boot/dts/bcm6855.dtsi
+++ b/arch/arm/boot/dts/bcm6855.dtsi
@@ -128,6 +128,23 @@ hsspi: spi@1000 {
status = "disabled";
};
+ nand_controller: nand-controller@1800 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,nand-bcmbca", "brcm,brcmnand-v7.1", "brcm,brcmnand";
+ reg = <0x1800 0x600>, <0x2000 0x10>;
+ reg-names = "nand", "nand-int-base";
+ brcm,nand-use-wp = <0>;
+ status = "disabled";
+
+ nandcs: nand@0 {
+ compatible = "brcm,nandcs";
+ reg = <0>;
+ nand-on-flash-bbt;
+ brcm,nand-ecc-use-strap;
+ };
+ };
+
uart0: serial@12000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x12000 0x1000>;
diff --git a/arch/arm/boot/dts/bcm6878.dtsi b/arch/arm/boot/dts/bcm6878.dtsi
index 96529d3d4dc2..f6ae07fe1b44 100644
--- a/arch/arm/boot/dts/bcm6878.dtsi
+++ b/arch/arm/boot/dts/bcm6878.dtsi
@@ -119,6 +119,23 @@ hsspi: spi@1000 {
status = "disabled";
};
+ nand_controller: nand-controller@1800 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,nand-bcmbca", "brcm,brcmnand-v7.1", "brcm,brcmnand";
+ reg = <0x1800 0x600>, <0x2000 0x10>;
+ reg-names = "nand", "nand-int-base";
+ brcm,nand-use-wp = <0>;
+ status = "disabled";
+
+ nandcs: nand@0 {
+ compatible = "brcm,nandcs";
+ reg = <0>;
+ nand-on-flash-bbt;
+ brcm,nand-ecc-use-strap;
+ };
+ };
+
uart0: serial@12000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x12000 0x1000>;
diff --git a/arch/arm/boot/dts/bcm947622.dts b/arch/arm/boot/dts/bcm947622.dts
index 93b8ce22678d..22e3c4508e1a 100644
--- a/arch/arm/boot/dts/bcm947622.dts
+++ b/arch/arm/boot/dts/bcm947622.dts
@@ -32,3 +32,7 @@ &uart0 {
&hsspi {
status = "okay";
};
+
+&nand_controller {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/bcm963138.dts b/arch/arm/boot/dts/bcm963138.dts
index 1b405c249213..450289d47dc7 100644
--- a/arch/arm/boot/dts/bcm963138.dts
+++ b/arch/arm/boot/dts/bcm963138.dts
@@ -29,3 +29,7 @@ &serial0 {
&hsspi {
status = "okay";
};
+
+&nand_controller {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/bcm963138dvt.dts b/arch/arm/boot/dts/bcm963138dvt.dts
index b5af61853a07..f2140e512070 100644
--- a/arch/arm/boot/dts/bcm963138dvt.dts
+++ b/arch/arm/boot/dts/bcm963138dvt.dts
@@ -33,14 +33,12 @@ &serial1 {
&nand_controller {
status = "okay";
+};
- nand@0 {
- compatible = "brcm,nandcs";
- reg = <0>;
- nand-ecc-strength = <4>;
- nand-ecc-step-size = <512>;
- brcm,nand-oob-sectors-size = <16>;
- };
+&nandcs {
+ nand-ecc-strength = <4>;
+ nand-ecc-step-size = <512>;
+ brcm,nand-oob-sectors-size = <16>;
};
&ahci {
diff --git a/arch/arm/boot/dts/bcm963148.dts b/arch/arm/boot/dts/bcm963148.dts
index 1f5d6d783f09..aa08b473c7cd 100644
--- a/arch/arm/boot/dts/bcm963148.dts
+++ b/arch/arm/boot/dts/bcm963148.dts
@@ -32,3 +32,7 @@ &uart0 {
&hsspi {
status = "okay";
};
+
+&nand_controller {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/bcm963178.dts b/arch/arm/boot/dts/bcm963178.dts
index d036e99dd8d1..c0f504ac43a4 100644
--- a/arch/arm/boot/dts/bcm963178.dts
+++ b/arch/arm/boot/dts/bcm963178.dts
@@ -32,3 +32,7 @@ &uart0 {
&hsspi {
status = "okay";
};
+
+&nand_controller {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/bcm96756.dts b/arch/arm/boot/dts/bcm96756.dts
index 8b104f3fb14a..2ce998f2b84f 100644
--- a/arch/arm/boot/dts/bcm96756.dts
+++ b/arch/arm/boot/dts/bcm96756.dts
@@ -32,3 +32,7 @@ &uart0 {
&hsspi {
status = "okay";
};
+
+&nand_controller {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/bcm96846.dts b/arch/arm/boot/dts/bcm96846.dts
index 55852c229608..f4b9a07370ee 100644
--- a/arch/arm/boot/dts/bcm96846.dts
+++ b/arch/arm/boot/dts/bcm96846.dts
@@ -32,3 +32,7 @@ &uart0 {
&hsspi {
status = "okay";
};
+
+&nand_controller {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/bcm96855.dts b/arch/arm/boot/dts/bcm96855.dts
index 2ad880af2104..5c94063bceaf 100644
--- a/arch/arm/boot/dts/bcm96855.dts
+++ b/arch/arm/boot/dts/bcm96855.dts
@@ -32,3 +32,7 @@ &uart0 {
&hsspi {
status = "okay";
};
+
+&nand_controller {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/bcm96878.dts b/arch/arm/boot/dts/bcm96878.dts
index b7af8ade7a9d..910f7e125bad 100644
--- a/arch/arm/boot/dts/bcm96878.dts
+++ b/arch/arm/boot/dts/bcm96878.dts
@@ -32,3 +32,7 @@ &uart0 {
&hsspi {
status = "okay";
};
+
+&nand_controller {
+ status = "okay";
+};
--
2.37.3
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [PATCH 07/12] arm64: dts: broadcom: bcmbca: Add NAND controller node
2023-06-06 23:12 [PATCH 00/12] mtd: rawnand: brcmnand: driver and doc updates William Zhang
` (5 preceding siblings ...)
2023-06-06 23:12 ` [PATCH 06/12] ARM: dts: broadcom: bcmbca: Add NAND controller node William Zhang
@ 2023-06-06 23:12 ` William Zhang
2023-06-06 23:12 ` [PATCH 08/12] mtd: rawnand: brcmnand: Rename bcm63138 nand driver William Zhang
` (4 subsequent siblings)
11 siblings, 0 replies; 44+ messages in thread
From: William Zhang @ 2023-06-06 23:12 UTC (permalink / raw)
To: Broadcom Kernel List, Linux MTD List
Cc: f.fainelli, rafal, kursad.oney, joel.peshkin, computersforpeace,
anand.gore, dregan, kamal.dasu, tomer.yacoby, dan.beygelman,
William Zhang, devicetree, linux-kernel, Krzysztof Kozlowski,
Rob Herring, linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 9339 bytes --]
Add support for Broadcom STB NAND controller in BCMBCA ARMv8 chip dts
files.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
.../arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 5 ++++-
.../arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi | 17 +++++++++++++++++
.../boot/dts/broadcom/bcmbca/bcm63146.dtsi | 17 +++++++++++++++++
.../boot/dts/broadcom/bcmbca/bcm63158.dtsi | 17 +++++++++++++++++
.../arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi | 17 +++++++++++++++++
.../arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi | 17 +++++++++++++++++
.../arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi | 17 +++++++++++++++++
.../arm64/boot/dts/broadcom/bcmbca/bcm94912.dts | 4 ++++
.../boot/dts/broadcom/bcmbca/bcm963146.dts | 4 ++++
.../boot/dts/broadcom/bcmbca/bcm963158.dts | 4 ++++
.../arm64/boot/dts/broadcom/bcmbca/bcm96813.dts | 4 ++++
.../arm64/boot/dts/broadcom/bcmbca/bcm96856.dts | 4 ++++
.../arm64/boot/dts/broadcom/bcmbca/bcm96858.dts | 4 ++++
13 files changed, 130 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
index 457805efb385..acfedff89d19 100644
--- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
@@ -591,16 +591,19 @@ hsspi: spi@1000{
nand-controller@1800 {
#address-cells = <1>;
#size-cells = <0>;
- compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.1", "brcm,brcmnand";
+ compatible = "brcm,nand-bcmbca", "brcm,brcmnand-v7.1", "brcm,brcmnand";
reg = <0x1800 0x600>, <0x2000 0x10>;
reg-names = "nand", "nand-int-base";
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "nand_ctlrdy";
+ brcm,nand-use-wp = <0>;
status = "okay";
nandcs: nand@0 {
compatible = "brcm,nandcs";
reg = <0>;
+ nand-on-flash-bbt;
+ brcm,nand-ecc-use-strap;
};
};
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi
index 46aa8c0b7971..7c611c1978ac 100644
--- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi
@@ -137,6 +137,23 @@ hsspi: spi@1000 {
status = "disabled";
};
+ nand_controller: nand-controller@1800 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,nand-bcmbca", "brcm,brcmnand-v7.1", "brcm,brcmnand";
+ reg = <0x1800 0x600>, <0x2000 0x10>;
+ reg-names = "nand", "nand-int-base";
+ brcm,nand-use-wp = <0>;
+ status = "disabled";
+
+ nandcs: nand@0 {
+ compatible = "brcm,nandcs";
+ reg = <0>;
+ nand-on-flash-bbt;
+ brcm,nand-ecc-use-strap;
+ };
+ };
+
uart0: serial@12000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x12000 0x1000>;
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi
index 7020f2e995e2..faf8b1198d8e 100644
--- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi
@@ -118,6 +118,23 @@ hsspi: spi@1000 {
status = "disabled";
};
+ nand_controller: nand-controller@1800 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,nand-bcmbca", "brcm,brcmnand-v7.1", "brcm,brcmnand";
+ reg = <0x1800 0x600>, <0x2000 0x10>;
+ reg-names = "nand", "nand-int-base";
+ brcm,nand-use-wp = <0>;
+ status = "disabled";
+
+ nandcs: nand@0 {
+ compatible = "brcm,nandcs";
+ reg = <0>;
+ nand-on-flash-bbt;
+ brcm,nand-ecc-use-strap;
+ };
+ };
+
uart0: serial@12000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x12000 0x1000>;
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi
index 6a0242cbea57..24c344ed5dba 100644
--- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi
@@ -136,6 +136,23 @@ hsspi: spi@1000 {
status = "disabled";
};
+ nand_controller: nand-controller@1800 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,nand-bcmbca", "brcm,brcmnand-v7.1", "brcm,brcmnand";
+ reg = <0x1800 0x600>, <0x2000 0x10>;
+ reg-names = "nand", "nand-int-base";
+ brcm,nand-use-wp = <0>;
+ status = "disabled";
+
+ nandcs: nand@0 {
+ compatible = "brcm,nandcs";
+ reg = <0>;
+ nand-on-flash-bbt;
+ brcm,nand-ecc-use-strap;
+ };
+ };
+
uart0: serial@12000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x12000 0x1000>;
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi
index 1a12905266ef..c3416146c946 100644
--- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi
@@ -137,6 +137,23 @@ hsspi: spi@1000 {
status = "disabled";
};
+ nand_controller: nand-controller@1800 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,nand-bcmbca", "brcm,brcmnand-v7.1", "brcm,brcmnand";
+ reg = <0x1800 0x600>, <0x2000 0x10>;
+ reg-names = "nand", "nand-int-base";
+ brcm,nand-use-wp = <0>;
+ status = "disabled";
+
+ nandcs: nand@0 {
+ compatible = "brcm,nandcs";
+ reg = <0>;
+ nand-on-flash-bbt;
+ brcm,nand-ecc-use-strap;
+ };
+ };
+
uart0: serial@12000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x12000 0x1000>;
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi
index f41ebc30666f..ab6866ab6107 100644
--- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi
@@ -107,6 +107,23 @@ uart0: serial@640 {
status = "disabled";
};
+ nand_controller: nand-controller@1800 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,nand-bcmbca", "brcm,brcmnand-v7.1", "brcm,brcmnand";
+ reg = <0x1800 0x600>, <0x2000 0x10>;
+ reg-names = "nand", "nand-int-base";
+ brcm,nand-use-wp = <0>;
+ status = "disabled";
+
+ nandcs: nand@0 {
+ compatible = "brcm,nandcs";
+ reg = <0>;
+ nand-on-flash-bbt;
+ brcm,nand-ecc-use-strap;
+ };
+ };
+
hsspi: spi@1000 {
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi
index fa2688f41f06..390d5da67a3b 100644
--- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi
@@ -155,5 +155,22 @@ hsspi: spi@1000 {
num-cs = <8>;
status = "disabled";
};
+
+ nand_controller: nand-controller@1800 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "brcm,nand-bcmbca", "brcm,brcmnand-v7.1", "brcm,brcmnand";
+ reg = <0x1800 0x600>, <0x2000 0x10>;
+ reg-names = "nand", "nand-int-base";
+ brcm,nand-use-wp = <0>;
+ status = "disabled";
+
+ nandcs: nand@0 {
+ compatible = "brcm,nandcs";
+ reg = <0>;
+ nand-on-flash-bbt;
+ brcm,nand-ecc-use-strap;
+ };
+ };
};
};
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/bcm94912.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm94912.dts
index e69cd683211a..4d1ea501e384 100644
--- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm94912.dts
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm94912.dts
@@ -32,3 +32,7 @@ &uart0 {
&hsspi {
status = "okay";
};
+
+&nand_controller {
+ status = "okay";
+};
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/bcm963146.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm963146.dts
index db2c82d6dfd8..810b5a23da7b 100644
--- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm963146.dts
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm963146.dts
@@ -32,3 +32,7 @@ &uart0 {
&hsspi {
status = "okay";
};
+
+&nand_controller {
+ status = "okay";
+};
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/bcm963158.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm963158.dts
index 25c12bc63545..3aaae5dbb568 100644
--- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm963158.dts
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm963158.dts
@@ -32,3 +32,7 @@ &uart0 {
&hsspi {
status = "okay";
};
+
+&nand_controller {
+ status = "okay";
+};
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/bcm96813.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm96813.dts
index faba21f03120..6b167cc2af76 100644
--- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm96813.dts
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm96813.dts
@@ -32,3 +32,7 @@ &uart0 {
&hsspi {
status = "okay";
};
+
+&nand_controller {
+ status = "okay";
+};
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/bcm96856.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm96856.dts
index 9808331eede2..d598cd618b57 100644
--- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm96856.dts
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm96856.dts
@@ -32,3 +32,7 @@ &uart0 {
&hsspi {
status = "okay";
};
+
+&nand_controller {
+ status = "okay";
+};
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/bcm96858.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm96858.dts
index 1f561c8e13b0..e50ddbf6f58c 100644
--- a/arch/arm64/boot/dts/broadcom/bcmbca/bcm96858.dts
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm96858.dts
@@ -32,3 +32,7 @@ &uart0 {
&hsspi {
status = "okay";
};
+
+&nand_controller {
+ status = "okay";
+};
--
2.37.3
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [PATCH 08/12] mtd: rawnand: brcmnand: Rename bcm63138 nand driver
2023-06-06 23:12 [PATCH 00/12] mtd: rawnand: brcmnand: driver and doc updates William Zhang
` (6 preceding siblings ...)
2023-06-06 23:12 ` [PATCH 07/12] arm64: " William Zhang
@ 2023-06-06 23:12 ` William Zhang
2023-06-06 23:12 ` [PATCH 09/12] mtd: rawnand: brcmnand: Add new compatible string William Zhang
` (3 subsequent siblings)
11 siblings, 0 replies; 44+ messages in thread
From: William Zhang @ 2023-06-06 23:12 UTC (permalink / raw)
To: Broadcom Kernel List, Linux MTD List
Cc: f.fainelli, rafal, kursad.oney, joel.peshkin, computersforpeace,
anand.gore, dregan, kamal.dasu, tomer.yacoby, dan.beygelman,
William Zhang, Florian Fainelli, Miquel Raynal, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 6718 bytes --]
In preparing to support multiple BCMBCA SoCs, rename bcm63138 to bcmbca
in the driver code and driver file name.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
Acked-by: Florian Fainelli <florian.fainelli@broadcom.com>
---
drivers/mtd/nand/raw/brcmnand/Makefile | 2 +-
drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c | 101 ------------------
drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c | 101 ++++++++++++++++++
3 files changed, 102 insertions(+), 102 deletions(-)
delete mode 100644 drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c
create mode 100644 drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
diff --git a/drivers/mtd/nand/raw/brcmnand/Makefile b/drivers/mtd/nand/raw/brcmnand/Makefile
index 9907e3ec4bb2..0536568c6467 100644
--- a/drivers/mtd/nand/raw/brcmnand/Makefile
+++ b/drivers/mtd/nand/raw/brcmnand/Makefile
@@ -2,7 +2,7 @@
# link order matters; don't link the more generic brcmstb_nand.o before the
# more specific iproc_nand.o, for instance
obj-$(CONFIG_MTD_NAND_BRCMNAND_IPROC) += iproc_nand.o
-obj-$(CONFIG_MTD_NAND_BRCMNAND_BCMBCA) += bcm63138_nand.o
+obj-$(CONFIG_MTD_NAND_BRCMNAND_BCMBCA) += bcmbca_nand.o
obj-$(CONFIG_MTD_NAND_BRCMNAND_BCM63XX) += bcm6368_nand.o
obj-$(CONFIG_MTD_NAND_BRCMNAND_BRCMSTB) += brcmstb_nand.o
obj-$(CONFIG_MTD_NAND_BRCMNAND) += brcmnand.o
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c
deleted file mode 100644
index 71ddcc611f6e..000000000000
--- a/drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c
+++ /dev/null
@@ -1,101 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright © 2015 Broadcom Corporation
- */
-
-#include <linux/device.h>
-#include <linux/io.h>
-#include <linux/ioport.h>
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-
-#include "brcmnand.h"
-
-struct bcm63138_nand_soc {
- struct brcmnand_soc soc;
- void __iomem *base;
-};
-
-#define BCM63138_NAND_INT_STATUS 0x00
-#define BCM63138_NAND_INT_EN 0x04
-
-enum {
- BCM63138_CTLRDY = BIT(4),
-};
-
-static bool bcm63138_nand_intc_ack(struct brcmnand_soc *soc)
-{
- struct bcm63138_nand_soc *priv =
- container_of(soc, struct bcm63138_nand_soc, soc);
- void __iomem *mmio = priv->base + BCM63138_NAND_INT_STATUS;
- u32 val = brcmnand_readl(mmio);
-
- if (val & BCM63138_CTLRDY) {
- brcmnand_writel(val & ~BCM63138_CTLRDY, mmio);
- return true;
- }
-
- return false;
-}
-
-static void bcm63138_nand_intc_set(struct brcmnand_soc *soc, bool en)
-{
- struct bcm63138_nand_soc *priv =
- container_of(soc, struct bcm63138_nand_soc, soc);
- void __iomem *mmio = priv->base + BCM63138_NAND_INT_EN;
- u32 val = brcmnand_readl(mmio);
-
- if (en)
- val |= BCM63138_CTLRDY;
- else
- val &= ~BCM63138_CTLRDY;
-
- brcmnand_writel(val, mmio);
-}
-
-static int bcm63138_nand_probe(struct platform_device *pdev)
-{
- struct device *dev = &pdev->dev;
- struct bcm63138_nand_soc *priv;
- struct brcmnand_soc *soc;
- struct resource *res;
-
- priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
- if (!priv)
- return -ENOMEM;
- soc = &priv->soc;
-
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand-int-base");
- priv->base = devm_ioremap_resource(dev, res);
- if (IS_ERR(priv->base))
- return PTR_ERR(priv->base);
-
- soc->ctlrdy_ack = bcm63138_nand_intc_ack;
- soc->ctlrdy_set_enabled = bcm63138_nand_intc_set;
-
- return brcmnand_probe(pdev, soc);
-}
-
-static const struct of_device_id bcm63138_nand_of_match[] = {
- { .compatible = "brcm,nand-bcm63138" },
- {},
-};
-MODULE_DEVICE_TABLE(of, bcm63138_nand_of_match);
-
-static struct platform_driver bcm63138_nand_driver = {
- .probe = bcm63138_nand_probe,
- .remove = brcmnand_remove,
- .driver = {
- .name = "bcm63138_nand",
- .pm = &brcmnand_pm_ops,
- .of_match_table = bcm63138_nand_of_match,
- }
-};
-module_platform_driver(bcm63138_nand_driver);
-
-MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR("Brian Norris");
-MODULE_DESCRIPTION("NAND driver for BCM63138");
diff --git a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
new file mode 100644
index 000000000000..f51f857eeea6
--- /dev/null
+++ b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
@@ -0,0 +1,101 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright © 2015 Broadcom Corporation
+ */
+
+#include <linux/device.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+#include "brcmnand.h"
+
+struct bcmbca_nand_soc {
+ struct brcmnand_soc soc;
+ void __iomem *base;
+};
+
+#define BCMBCA_NAND_INT_STATUS 0x00
+#define BCMBCA_NAND_INT_EN 0x04
+
+enum {
+ BCMBCA_CTLRDY = BIT(4),
+};
+
+static bool bcmbca_nand_intc_ack(struct brcmnand_soc *soc)
+{
+ struct bcmbca_nand_soc *priv =
+ container_of(soc, struct bcmbca_nand_soc, soc);
+ void __iomem *mmio = priv->base + BCMBCA_NAND_INT_STATUS;
+ u32 val = brcmnand_readl(mmio);
+
+ if (val & BCMBCA_CTLRDY) {
+ brcmnand_writel(val & ~BCMBCA_CTLRDY, mmio);
+ return true;
+ }
+
+ return false;
+}
+
+static void bcmbca_nand_intc_set(struct brcmnand_soc *soc, bool en)
+{
+ struct bcmbca_nand_soc *priv =
+ container_of(soc, struct bcmbca_nand_soc, soc);
+ void __iomem *mmio = priv->base + BCMBCA_NAND_INT_EN;
+ u32 val = brcmnand_readl(mmio);
+
+ if (en)
+ val |= BCMBCA_CTLRDY;
+ else
+ val &= ~BCMBCA_CTLRDY;
+
+ brcmnand_writel(val, mmio);
+}
+
+static int bcmbca_nand_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct bcmbca_nand_soc *priv;
+ struct brcmnand_soc *soc;
+ struct resource *res;
+
+ priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+ if (!priv)
+ return -ENOMEM;
+ soc = &priv->soc;
+
+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand-int-base");
+ priv->base = devm_ioremap_resource(dev, res);
+ if (IS_ERR(priv->base))
+ return PTR_ERR(priv->base);
+
+ soc->ctlrdy_ack = bcmbca_nand_intc_ack;
+ soc->ctlrdy_set_enabled = bcmbca_nand_intc_set;
+
+ return brcmnand_probe(pdev, soc);
+}
+
+static const struct of_device_id bcmbca_nand_of_match[] = {
+ { .compatible = "brcm,nand-bcm63138" },
+ {},
+};
+MODULE_DEVICE_TABLE(of, bcmbca_nand_of_match);
+
+static struct platform_driver bcmbca_nand_driver = {
+ .probe = bcmbca_nand_probe,
+ .remove = brcmnand_remove,
+ .driver = {
+ .name = "bcmbca_nand",
+ .pm = &brcmnand_pm_ops,
+ .of_match_table = bcmbca_nand_of_match,
+ }
+};
+module_platform_driver(bcmbca_nand_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Brian Norris");
+MODULE_DESCRIPTION("NAND driver for BCMBCA");
--
2.37.3
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [PATCH 09/12] mtd: rawnand: brcmnand: Add new compatible string
2023-06-06 23:12 [PATCH 00/12] mtd: rawnand: brcmnand: driver and doc updates William Zhang
` (7 preceding siblings ...)
2023-06-06 23:12 ` [PATCH 08/12] mtd: rawnand: brcmnand: Rename bcm63138 nand driver William Zhang
@ 2023-06-06 23:12 ` William Zhang
2023-06-06 23:12 ` [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface William Zhang
` (2 subsequent siblings)
11 siblings, 0 replies; 44+ messages in thread
From: William Zhang @ 2023-06-06 23:12 UTC (permalink / raw)
To: Broadcom Kernel List, Linux MTD List
Cc: f.fainelli, rafal, kursad.oney, joel.peshkin, computersforpeace,
anand.gore, dregan, kamal.dasu, tomer.yacoby, dan.beygelman,
William Zhang, Miquel Raynal, linux-kernel, Vignesh Raghavendra,
Richard Weinberger, Kamal Dasu, linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 823 bytes --]
To support the new BCMBCA SoCs, add brcm,nand-bcmbca to the driver of
match table based on the updated binding document brcm,brcmnand.yaml.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
index f51f857eeea6..7e48b6a0bfa2 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
@@ -81,6 +81,7 @@ static int bcmbca_nand_probe(struct platform_device *pdev)
static const struct of_device_id bcmbca_nand_of_match[] = {
{ .compatible = "brcm,nand-bcm63138" },
+ { .compatible = "brcm,nand-bcmbca" },
{},
};
MODULE_DEVICE_TABLE(of, bcmbca_nand_of_match);
--
2.37.3
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-06 23:12 [PATCH 00/12] mtd: rawnand: brcmnand: driver and doc updates William Zhang
` (8 preceding siblings ...)
2023-06-06 23:12 ` [PATCH 09/12] mtd: rawnand: brcmnand: Add new compatible string William Zhang
@ 2023-06-06 23:12 ` William Zhang
2023-06-07 8:20 ` Miquel Raynal
` (2 more replies)
2023-06-06 23:12 ` [PATCH 11/12] mtd: rawnand: brcmnand: Add support for getting ecc setting from strap William Zhang
2023-06-06 23:12 ` [PATCH 12/12] mtd: rawnand: brcmnand: Support write protection setting from dts William Zhang
11 siblings, 3 replies; 44+ messages in thread
From: William Zhang @ 2023-06-06 23:12 UTC (permalink / raw)
To: Broadcom Kernel List, Linux MTD List
Cc: f.fainelli, rafal, kursad.oney, joel.peshkin, computersforpeace,
anand.gore, dregan, kamal.dasu, tomer.yacoby, dan.beygelman,
William Zhang, Miquel Raynal, linux-kernel, Vignesh Raghavendra,
Richard Weinberger, Kamal Dasu, linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 5677 bytes --]
The BCMBCA broadband SoC integrates the NAND controller differently than
STB, iProc and other SoCs. It has different endianness for NAND cache
data and ONFI parameter data.
Add a SoC read data bus shim for BCMBCA to meet the specific SoC need
and performance improvement using the optimized memcpy function on NAND
cache memory.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c | 36 +++++++++++++++++
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 44 ++++++++++++++-------
drivers/mtd/nand/raw/brcmnand/brcmnand.h | 2 +
3 files changed, 68 insertions(+), 14 deletions(-)
diff --git a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
index 7e48b6a0bfa2..899103a62c98 100644
--- a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
+++ b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
@@ -26,6 +26,18 @@ enum {
BCMBCA_CTLRDY = BIT(4),
};
+#if defined(CONFIG_ARM64)
+#define ALIGN_REQ 8
+#else
+#define ALIGN_REQ 4
+#endif
+
+static inline bool bcmbca_nand_is_buf_aligned(void *flash_cache, void *buffer)
+{
+ return IS_ALIGNED((uintptr_t)buffer, ALIGN_REQ) &&
+ IS_ALIGNED((uintptr_t)flash_cache, ALIGN_REQ);
+}
+
static bool bcmbca_nand_intc_ack(struct brcmnand_soc *soc)
{
struct bcmbca_nand_soc *priv =
@@ -56,6 +68,29 @@ static void bcmbca_nand_intc_set(struct brcmnand_soc *soc, bool en)
brcmnand_writel(val, mmio);
}
+static void bcmbca_read_data_bus(struct brcmnand_soc *soc,
+ void __iomem *flash_cache, u32 *buffer,
+ int fc_words, bool is_param)
+{
+ int i;
+
+ if (!is_param) {
+ /*
+ * memcpy can do unaligned aligned access depending on source
+ * and dest address, which is incompatible with nand cache. Fallback
+ * to the memcpy for io version
+ */
+ if (bcmbca_nand_is_buf_aligned(flash_cache, buffer))
+ memcpy((void *)buffer, (void *)flash_cache, fc_words * 4);
+ else
+ memcpy_fromio((void *)buffer, (void *)flash_cache, fc_words * 4);
+ } else {
+ /* Flash cache has same endian as the host for parameter pages */
+ for (i = 0; i < fc_words; i++, buffer++)
+ *buffer = __raw_readl(flash_cache + i * 4);
+ }
+}
+
static int bcmbca_nand_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -75,6 +110,7 @@ static int bcmbca_nand_probe(struct platform_device *pdev)
soc->ctlrdy_ack = bcmbca_nand_intc_ack;
soc->ctlrdy_set_enabled = bcmbca_nand_intc_set;
+ soc->read_data_bus = bcmbca_read_data_bus;
return brcmnand_probe(pdev, soc);
}
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index d920e88c7f5b..656be4d73016 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -814,6 +814,30 @@ static inline u32 edu_readl(struct brcmnand_controller *ctrl,
return brcmnand_readl(ctrl->edu_base + offs);
}
+static inline void brcmnand_read_data_bus(struct brcmnand_controller *ctrl,
+ void __iomem *flash_cache, u32 *buffer,
+ int fc_words, bool is_param)
+{
+ struct brcmnand_soc *soc = ctrl->soc;
+ int i;
+
+ if (soc->read_data_bus) {
+ soc->read_data_bus(soc, flash_cache, buffer, fc_words, is_param);
+ } else {
+ if (!is_param) {
+ for (i = 0; i < fc_words; i++, buffer++)
+ *buffer = brcmnand_read_fc(ctrl, i);
+ } else {
+ for (i = 0; i < fc_words; i++)
+ /*
+ * Flash cache is big endian for parameter pages, at
+ * least on STB SoCs
+ */
+ buffer[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
+ }
+ }
+}
+
static void brcmnand_clear_ecc_addr(struct brcmnand_controller *ctrl)
{
@@ -1811,20 +1835,11 @@ static void brcmnand_cmdfunc(struct nand_chip *chip, unsigned command,
native_cmd == CMD_PARAMETER_CHANGE_COL) {
/* Copy flash cache word-wise */
u32 *flash_cache = (u32 *)ctrl->flash_cache;
- int i;
brcmnand_soc_data_bus_prepare(ctrl->soc, true);
- /*
- * Must cache the FLASH_CACHE now, since changes in
- * SECTOR_SIZE_1K may invalidate it
- */
- for (i = 0; i < FC_WORDS; i++)
- /*
- * Flash cache is big endian for parameter pages, at
- * least on STB SoCs
- */
- flash_cache[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
+ brcmnand_read_data_bus(ctrl, ctrl->nand_fc, flash_cache,
+ FC_WORDS, true);
brcmnand_soc_data_bus_unprepare(ctrl->soc, true);
@@ -2137,7 +2152,7 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
{
struct brcmnand_host *host = nand_get_controller_data(chip);
struct brcmnand_controller *ctrl = host->ctrl;
- int i, j, ret = 0;
+ int i, ret = 0;
brcmnand_clear_ecc_addr(ctrl);
@@ -2150,8 +2165,9 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
if (likely(buf)) {
brcmnand_soc_data_bus_prepare(ctrl->soc, false);
- for (j = 0; j < FC_WORDS; j++, buf++)
- *buf = brcmnand_read_fc(ctrl, j);
+ brcmnand_read_data_bus(ctrl, ctrl->nand_fc, buf,
+ FC_WORDS, false);
+ buf += FC_WORDS;
brcmnand_soc_data_bus_unprepare(ctrl->soc, false);
}
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
index f1f93d85f50d..88819bc395f8 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.h
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
@@ -24,6 +24,8 @@ struct brcmnand_soc {
void (*ctlrdy_set_enabled)(struct brcmnand_soc *soc, bool en);
void (*prepare_data_bus)(struct brcmnand_soc *soc, bool prepare,
bool is_param);
+ void (*read_data_bus)(struct brcmnand_soc *soc, void __iomem *flash_cache,
+ u32 *buffer, int fc_words, bool is_param);
const struct brcmnand_io_ops *ops;
};
--
2.37.3
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [PATCH 11/12] mtd: rawnand: brcmnand: Add support for getting ecc setting from strap
2023-06-06 23:12 [PATCH 00/12] mtd: rawnand: brcmnand: driver and doc updates William Zhang
` (9 preceding siblings ...)
2023-06-06 23:12 ` [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface William Zhang
@ 2023-06-06 23:12 ` William Zhang
2023-06-07 8:25 ` Miquel Raynal
2023-06-06 23:12 ` [PATCH 12/12] mtd: rawnand: brcmnand: Support write protection setting from dts William Zhang
11 siblings, 1 reply; 44+ messages in thread
From: William Zhang @ 2023-06-06 23:12 UTC (permalink / raw)
To: Broadcom Kernel List, Linux MTD List
Cc: f.fainelli, rafal, kursad.oney, joel.peshkin, computersforpeace,
anand.gore, dregan, kamal.dasu, tomer.yacoby, dan.beygelman,
William Zhang, Miquel Raynal, linux-kernel, Vignesh Raghavendra,
Richard Weinberger, Kamal Dasu
[-- Attachment #1: Type: text/plain, Size: 3986 bytes --]
BCMBCA broadband SoC based board design does not specify ecc setting in
dts but rather use the SoC NAND strap info to obtain the ecc strength
and spare area size setting. Add brcm,nand-ecc-use-strap dts propety for
this purpose and update driver to support this option.
The generic nand ecc settings still take precedence over this flag. For
example, if nand-ecc-strength is set in the dts, the driver ignores the
strap setting and falls back to original behavior. This makes sure that
the existing BCMBCA board dts still works the old way even the strap
flag is set in the BCMBCA chip dtsi.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 72 +++++++++++++++++++++---
1 file changed, 64 insertions(+), 8 deletions(-)
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index 656be4d73016..8c7cea36ac71 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -1076,6 +1076,38 @@ static void brcmnand_set_sector_size_1k(struct brcmnand_host *host, int val)
nand_writereg(ctrl, acc_control_offs, tmp);
}
+static int brcmnand_get_spare_size(struct brcmnand_host *host)
+{
+ struct brcmnand_controller *ctrl = host->ctrl;
+ u16 acc_control_offs = brcmnand_cs_offset(ctrl, host->cs,
+ BRCMNAND_CS_ACC_CONTROL);
+ u32 acc = nand_readreg(ctrl, acc_control_offs);
+
+ return (acc&brcmnand_spare_area_mask(ctrl));
+}
+
+static int brcmnand_get_ecc_strength(struct brcmnand_host *host)
+{
+ struct brcmnand_controller *ctrl = host->ctrl;
+ u16 acc_control_offs = brcmnand_cs_offset(ctrl, host->cs,
+ BRCMNAND_CS_ACC_CONTROL);
+ int sector_size_1k = brcmnand_get_sector_size_1k(host);
+ int spare_area_size, ecc_level, ecc_strength;
+ u32 acc;
+
+ spare_area_size = brcmnand_get_spare_size(host);
+ acc = nand_readreg(ctrl, acc_control_offs);
+ ecc_level = (acc & brcmnand_ecc_level_mask(ctrl)) >> brcmnand_ecc_level_shift(ctrl);
+ if (sector_size_1k)
+ ecc_strength = ecc_level<<1;
+ else if (spare_area_size == 16 && ecc_level == 15)
+ ecc_strength = 1; /* hamming */
+ else
+ ecc_strength = ecc_level;
+
+ return ecc_strength;
+}
+
/***********************************************************************
* CS_NAND_SELECT
***********************************************************************/
@@ -2656,19 +2688,43 @@ static int brcmnand_setup_dev(struct brcmnand_host *host)
nanddev_get_ecc_requirements(&chip->base);
struct brcmnand_controller *ctrl = host->ctrl;
struct brcmnand_cfg *cfg = &host->hwcfg;
- char msg[128];
+ struct device_node *np = nand_get_flash_node(chip);
u32 offs, tmp, oob_sector;
- int ret;
+ int ret, sector_size_1k = 0;
+ bool use_strap = false;
+ char msg[128];
memset(cfg, 0, sizeof(*cfg));
+ use_strap = of_property_read_bool(np, "brcm,nand-ecc-use-strap");
+
+ /*
+ * Set ECC size and strength based on hw configuration from strap
+ * if device tree does not specify them and use strap property is set
+ * If ecc strength is set in dts, don't use strap setting.
+ */
+ if (chip->ecc.strength)
+ use_strap = 0;
+
+ if (use_strap) {
+ chip->ecc.strength = brcmnand_get_ecc_strength(host);
+ sector_size_1k = brcmnand_get_sector_size_1k(host);
+ if (chip->ecc.size == 0) {
+ if (sector_size_1k < 0)
+ chip->ecc.size = 512;
+ else
+ chip->ecc.size = 512<<sector_size_1k;
+ }
+ }
- ret = of_property_read_u32(nand_get_flash_node(chip),
- "brcm,nand-oob-sector-size",
- &oob_sector);
+ ret = of_property_read_u32(np, "brcm,nand-oob-sector-size",
+ &oob_sector);
if (ret) {
- /* Use detected size */
- cfg->spare_area_size = mtd->oobsize /
- (mtd->writesize >> FC_SHIFT);
+ if (use_strap)
+ cfg->spare_area_size = brcmnand_get_spare_size(host);
+ else
+ /* Use detected size */
+ cfg->spare_area_size = mtd->oobsize /
+ (mtd->writesize >> FC_SHIFT);
} else {
cfg->spare_area_size = oob_sector;
}
--
2.37.3
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 44+ messages in thread
* [PATCH 12/12] mtd: rawnand: brcmnand: Support write protection setting from dts
2023-06-06 23:12 [PATCH 00/12] mtd: rawnand: brcmnand: driver and doc updates William Zhang
` (10 preceding siblings ...)
2023-06-06 23:12 ` [PATCH 11/12] mtd: rawnand: brcmnand: Add support for getting ecc setting from strap William Zhang
@ 2023-06-06 23:12 ` William Zhang
11 siblings, 0 replies; 44+ messages in thread
From: William Zhang @ 2023-06-06 23:12 UTC (permalink / raw)
To: Broadcom Kernel List, Linux MTD List
Cc: f.fainelli, rafal, kursad.oney, joel.peshkin, computersforpeace,
anand.gore, dregan, kamal.dasu, tomer.yacoby, dan.beygelman,
William Zhang, Florian Fainelli, Miquel Raynal, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu
[-- Attachment #1: Type: text/plain, Size: 1673 bytes --]
The write protection feature is controlled by the module parameter wp_on
with default set to enabled. But not all the board use this feature
especially in BCMBCA broadband board. And module parameter is not
sufficient as different board can have different option. Add a device
tree property and allow this feature to be configured through the board
dts on per board basis.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: Kamal Dasu <kamal.dasu@broadcom.com>
---
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
index 8c7cea36ac71..4fc23077a5b5 100644
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
@@ -3106,7 +3106,7 @@ int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc)
struct brcmnand_controller *ctrl;
struct brcmnand_host *host;
struct resource *res;
- int ret;
+ int ret, wp_dt;
if (dn && !of_match_node(brcmnand_of_match, dn))
return -ENODEV;
@@ -3243,6 +3243,12 @@ int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc)
/* Disable XOR addressing */
brcmnand_rmw_reg(ctrl, BRCMNAND_CS_XOR, 0xff, 0, 0);
+ /* Not all boards support write protect (WP), check DT property */
+ if (of_property_read_u32(dn, "brcm,nand-use-wp", &wp_dt) == 0) {
+ if (wp_dt >= 0 && wp_dt <= 2)
+ wp_on = wp_dt;
+ }
+
if (ctrl->features & BRCMNAND_HAS_WP) {
/* Permanently disable write protection */
if (wp_on == 2)
--
2.37.3
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 44+ messages in thread
* Re: [PATCH 01/12] mtd: rawnand: brcmnand: Fix ECC level field setting for v7.2 controller
2023-06-06 23:12 ` [PATCH 01/12] mtd: rawnand: brcmnand: Fix ECC level field setting for v7.2 controller William Zhang
@ 2023-06-07 8:06 ` Miquel Raynal
0 siblings, 0 replies; 44+ messages in thread
From: Miquel Raynal @ 2023-06-07 8:06 UTC (permalink / raw)
To: William Zhang
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, Florian Fainelli,
Rob Herring, linux-kernel, Vignesh Raghavendra,
Richard Weinberger, Boris Brezillon, Kamal Dasu
Hi William,
william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:41 -0700:
> v7.2 controller has different ECC level field size and shift in the acc
> control register than its predecessor and successor controller. It needs
> to be set specifically.
>
> Fixes: decba6d47869 ("mtd: brcmnand: Add v7.2 controller support")
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
> ---
>
> drivers/mtd/nand/raw/brcmnand/brcmnand.c | 14 +++++++++++---
> 1 file changed, 11 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> index 2e9c2e2d9c9f..b2cde1082b3b 100644
> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> @@ -977,12 +977,20 @@ static inline u32 brcmnand_ecc_level_mask(struct brcmnand_controller *ctrl)
> mask <<= NAND_ACC_CONTROL_ECC_SHIFT;
>
> /* v7.2 includes additional ECC levels */
> - if (ctrl->nand_version >= 0x0702)
> + if (ctrl->nand_version == 0x0702)
> mask |= 0x7 << NAND_ACC_CONTROL_ECC_EXT_SHIFT;
>
> return mask;
> }
>
> +static inline int brcmnand_ecc_level_shift(struct brcmnand_controller *ctrl)
> +{
> + if (ctrl->nand_version == 0x0702)
> + return NAND_ACC_CONTROL_ECC_EXT_SHIFT;
> + else
> + return NAND_ACC_CONTROL_ECC_SHIFT;
> +}
> +
> static void brcmnand_set_ecc_enabled(struct brcmnand_host *host, int en)
> {
> struct brcmnand_controller *ctrl = host->ctrl;
> @@ -992,8 +1000,8 @@ static void brcmnand_set_ecc_enabled(struct brcmnand_host *host, int en)
>
> if (en) {
> acc_control |= ecc_flags; /* enable RD/WR ECC */
> - acc_control |= host->hwcfg.ecc_level
> - << NAND_ACC_CONTROL_ECC_SHIFT;
> + acc_control &= ~brcmnand_ecc_level_mask(ctrl);
Could we use static driver data instead? Let's avoid making
non-useful function calls when this can easily be avoided.
> + acc_control |= host->hwcfg.ecc_level << brcmnand_ecc_level_shift(ctrl);
> } else {
> acc_control &= ~ecc_flags; /* disable RD/WR ECC */
> acc_control &= ~brcmnand_ecc_level_mask(ctrl);
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 04/12] mtd: rawnand: brcmnand: Fix potential out-of-bounds access in oob write
2023-06-06 23:12 ` [PATCH 04/12] mtd: rawnand: brcmnand: Fix potential out-of-bounds access in oob write William Zhang
@ 2023-06-07 8:09 ` Miquel Raynal
0 siblings, 0 replies; 44+ messages in thread
From: Miquel Raynal @ 2023-06-07 8:09 UTC (permalink / raw)
To: William Zhang
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, Florian Fainelli,
linux-kernel, Vignesh Raghavendra, Richard Weinberger, Kamal Dasu
Hi William,
william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:44 -0700:
> When the oob buffer length is not in multiple of words, the oob write
> function does out-of-bounds read on the oob source buffer at the last
> iteration. Fix that by always checking length limit on the oob buffer
> read and fill with 0xff when reaching the end of the buffer to the oob
> registers.
>
> Fixes: 27c5b17cd1b1 ("mtd: nand: add NAND driver "library" for Broadcom STB NAND controller")
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
> ---
>
> drivers/mtd/nand/raw/brcmnand/brcmnand.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> index 20832857c4aa..d920e88c7f5b 100644
> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> @@ -1486,10 +1486,10 @@ static int write_oob_to_regs(struct brcmnand_controller *ctrl, int i,
>
> for (j = 0; j < tbytes; j += 4)
> oob_reg_write(ctrl, j,
> - (oob[j + 0] << 24) |
> - (oob[j + 1] << 16) |
> - (oob[j + 2] << 8) |
> - (oob[j + 3] << 0));
> + (((j < tbytes) ? oob[j] : 0xff) << 24) |
> + (((j + 1 < tbytes) ? oob[j + 1] : 0xff) << 16) |
> + (((j + 2 < tbytes) ? oob[j + 2] : 0xff) << 8) |
> + ((j + 3 < tbytes) ? oob[j + 3] : 0xff));
This is a lot of additional operations which most of the time are not
relevant. I would instead got for one less iteration in the for loop
when there is unaligned data, and then dedicated if/else to fill the
missing bytes.
> return tbytes;
> }
>
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 05/12] dt-bindings: mtd: brcmnand: Updates for bcmbca SoCs
2023-06-06 23:12 ` [PATCH 05/12] dt-bindings: mtd: brcmnand: Updates for bcmbca SoCs William Zhang
@ 2023-06-07 8:14 ` Miquel Raynal
2023-06-07 20:01 ` William Zhang
2023-06-14 22:46 ` Rob Herring
2023-06-14 22:43 ` Rob Herring
1 sibling, 2 replies; 44+ messages in thread
From: Miquel Raynal @ 2023-06-07 8:14 UTC (permalink / raw)
To: William Zhang
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, devicetree, linux-kernel,
Krzysztof Kozlowski, Vignesh Raghavendra, Richard Weinberger,
Kamal Dasu, Rob Herring
Hi William,
william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:45 -0700:
> Use new compatiable brcm,nand-bcmbca to support BCMBCA broadband
> product. The old compatible string is still kept in the driver so old
> dtb can still work.
>
> Add brcm,nand-use-wp property to have an option for disabling this
> feature on broadband board design that does not use write protection.
> Add brcm,nand-ecc-use-strap to get ecc setting from board strap for
> broadband board designs because they do not specify ecc setting in dts
> but rather using the strap setting.
>
> Remove the requirement of interrupts and interrupt-names properties to
> reflect the driver code.
>
> This patch also includes a few minor fixes to the BCM63xx compatibles
> and add myself to the list of maintainers.
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> ---
>
> .../bindings/mtd/brcm,brcmnand.yaml | 64 +++++++++++++------
> 1 file changed, 43 insertions(+), 21 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
> index 1571024aa119..1fe1c166a9db 100644
> --- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
> +++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
> @@ -9,6 +9,7 @@ title: Broadcom STB NAND Controller
> maintainers:
> - Brian Norris <computersforpeace@gmail.com>
> - Kamal Dasu <kdasu.kdev@gmail.com>
> + - William Zhang <william.zhang@broadcom.com>
>
> description: |
> The Broadcom Set-Top Box NAND controller supports low-level access to raw NAND
> @@ -18,9 +19,10 @@ description: |
> supports basic PROGRAM and READ functions, among other features.
>
> This controller was originally designed for STB SoCs (BCM7xxx) but is now
> - available on a variety of Broadcom SoCs, including some BCM3xxx, BCM63xx, and
> - iProc/Cygnus. Its history includes several similar (but not fully register
> - compatible) versions.
> + available on a variety of Broadcom SoCs, including some BCM3xxx, MIPS based
> + Broadband SoC (BCM63xx), ARM based Broadband SoC (BCMBCA) and iProc/Cygnus.
> + Its history includes several similar (but not fully register compatible)
> + versions.
>
> -- Additional SoC-specific NAND controller properties --
>
> @@ -53,9 +55,9 @@ properties:
> - brcm,brcmnand-v7.2
> - brcm,brcmnand-v7.3
> - const: brcm,brcmnand
> - - description: BCM63138 SoC-specific NAND controller
> + - description: BCMBCA SoC-specific NAND controller
> items:
> - - const: brcm,nand-bcm63138
> + - const: brcm,nand-bcmbca
> - enum:
> - brcm,brcmnand-v7.0
> - brcm,brcmnand-v7.1
> @@ -65,11 +67,15 @@ properties:
> - const: brcm,nand-iproc
> - const: brcm,brcmnand-v6.1
> - const: brcm,brcmnand
> - - description: BCM63168 SoC-specific NAND controller
> + - description: BCM63xx SoC-specific NAND controller
> items:
> - - const: brcm,nand-bcm63168
> - - const: brcm,nand-bcm6368
> - - const: brcm,brcmnand-v4.0
> + - enum:
> + - brcm,nand-bcm63168
> + - brcm,nand-bcm6368
> + - enum:
> + - brcm,brcmnand-v2.1
> + - brcm,brcmnand-v2.2
> + - brcm,brcmnand-v4.0
> - const: brcm,brcmnand
>
> reg:
> @@ -111,6 +117,19 @@ properties:
> earlier versions of this core that include WP
> type: boolean
>
> + brcm,nand-use-wp:
> + description:
> + Use this integer to indicate if board design uses
> + controller's write protection feature and connects its
> + NAND_WPb pin to nand chip's WP_L pin. Driver defaults to
> + use this feature when this property does not exist.
> + Set to 0 if WP pins are not connected and feature is not
> + used. Set to 1 if WP pins are connected and feature is used.
> + Set to 2 if WP pins are connected but disable this feature
> + through driver that sets controller to output high on NAND_WPb.
> + $ref: /schemas/types.yaml#/definitions/uint32
> + enum: [0, 1, 2]
Perhaps strings would be welcome. I'll let binding maintainers say what
they think of it.
> +
> patternProperties:
> "^nand@[a-f0-9]$":
> type: object
> @@ -136,13 +155,23 @@ patternProperties:
> layout.
> $ref: /schemas/types.yaml#/definitions/uint32
>
> + brcm,nand-ecc-use-strap:
> + description:
> + This flag is used by the driver to get the ecc strength and
> + spare area size from the SoC NAND boot strap setting. This
> + is commonly used by the BCMBCA SoC board design. If ecc
> + strength and spare area size are set by nand-ecc-strength
> + and brcm,nand-oob-sector-size in the dts, these settings
> + have precedence and override this flag.
> + $ref: /schemas/types.yaml#/definitions/flag
How in practice do you access the strap value? Don't you need a phandle
over a specific area in the SoC?
> +
> allOf:
> - $ref: nand-controller.yaml#
> - if:
> properties:
> compatible:
> contains:
> - const: brcm,nand-bcm63138
> + const: brcm,nand-bcmbca
> then:
> properties:
> reg-names:
> @@ -153,7 +182,9 @@ allOf:
> properties:
> compatible:
> contains:
> - const: brcm,nand-bcm6368
> + enum:
> + - brcm,nand-bcm63168
> + - brcm,nand-bcm6368
> then:
> properties:
> reg-names:
> @@ -173,20 +204,12 @@ allOf:
> - const: nand
> - const: iproc-idm
> - const: iproc-ext
> - - if:
> - properties:
> - interrupts:
> - minItems: 2
> - then:
> - required:
> - - interrupt-names
Why do you remove this? Removing "interrupts" from the required
properties is fine, but constraining the interrupts property when it is
relevant is still expected.
>
> unevaluatedProperties: false
>
> required:
> - reg
> - reg-names
> - - interrupts
This should be done in a separate patch.
>
> examples:
> - |
> @@ -215,8 +238,7 @@ examples:
> };
> - |
> nand-controller@10000200 {
> - compatible = "brcm,nand-bcm63168", "brcm,nand-bcm6368",
> - "brcm,brcmnand-v4.0", "brcm,brcmnand";
> + compatible = "brcm,nand-bcm6368", "brcm,brcmnand-v2.1", "brcm,brcmnand";
> reg = <0x10000200 0x180>,
> <0x100000b0 0x10>,
> <0x10000600 0x200>;
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-06 23:12 ` [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface William Zhang
@ 2023-06-07 8:20 ` Miquel Raynal
2023-06-07 20:12 ` William Zhang
2023-06-07 8:22 ` Miquel Raynal
2023-06-11 9:54 ` kernel test robot
2 siblings, 1 reply; 44+ messages in thread
From: Miquel Raynal @ 2023-06-07 8:20 UTC (permalink / raw)
To: William Zhang
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
Hi William,
william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:50 -0700:
> The BCMBCA broadband SoC integrates the NAND controller differently than
> STB, iProc and other SoCs. It has different endianness for NAND cache
> data and ONFI parameter data.
>
> Add a SoC read data bus shim for BCMBCA to meet the specific SoC need
> and performance improvement using the optimized memcpy function on NAND
> cache memory.
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> ---
>
> drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c | 36 +++++++++++++++++
> drivers/mtd/nand/raw/brcmnand/brcmnand.c | 44 ++++++++++++++-------
> drivers/mtd/nand/raw/brcmnand/brcmnand.h | 2 +
> 3 files changed, 68 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
> index 7e48b6a0bfa2..899103a62c98 100644
> --- a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
> +++ b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
> @@ -26,6 +26,18 @@ enum {
> BCMBCA_CTLRDY = BIT(4),
> };
>
> +#if defined(CONFIG_ARM64)
> +#define ALIGN_REQ 8
> +#else
> +#define ALIGN_REQ 4
> +#endif
> +
> +static inline bool bcmbca_nand_is_buf_aligned(void *flash_cache, void *buffer)
> +{
> + return IS_ALIGNED((uintptr_t)buffer, ALIGN_REQ) &&
> + IS_ALIGNED((uintptr_t)flash_cache, ALIGN_REQ);
> +}
> +
> static bool bcmbca_nand_intc_ack(struct brcmnand_soc *soc)
> {
> struct bcmbca_nand_soc *priv =
> @@ -56,6 +68,29 @@ static void bcmbca_nand_intc_set(struct brcmnand_soc *soc, bool en)
> brcmnand_writel(val, mmio);
> }
>
> +static void bcmbca_read_data_bus(struct brcmnand_soc *soc,
> + void __iomem *flash_cache, u32 *buffer,
> + int fc_words, bool is_param)
> +{
> + int i;
> +
> + if (!is_param) {
> + /*
> + * memcpy can do unaligned aligned access depending on source
> + * and dest address, which is incompatible with nand cache. Fallback
> + * to the memcpy for io version
> + */
> + if (bcmbca_nand_is_buf_aligned(flash_cache, buffer))
> + memcpy((void *)buffer, (void *)flash_cache, fc_words * 4);
> + else
> + memcpy_fromio((void *)buffer, (void *)flash_cache, fc_words * 4);
> + } else {
> + /* Flash cache has same endian as the host for parameter pages */
> + for (i = 0; i < fc_words; i++, buffer++)
> + *buffer = __raw_readl(flash_cache + i * 4);
> + }
> +}
> +
> static int bcmbca_nand_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> @@ -75,6 +110,7 @@ static int bcmbca_nand_probe(struct platform_device *pdev)
>
> soc->ctlrdy_ack = bcmbca_nand_intc_ack;
> soc->ctlrdy_set_enabled = bcmbca_nand_intc_set;
> + soc->read_data_bus = bcmbca_read_data_bus;
>
> return brcmnand_probe(pdev, soc);
> }
> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> index d920e88c7f5b..656be4d73016 100644
> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> @@ -814,6 +814,30 @@ static inline u32 edu_readl(struct brcmnand_controller *ctrl,
> return brcmnand_readl(ctrl->edu_base + offs);
> }
>
> +static inline void brcmnand_read_data_bus(struct brcmnand_controller *ctrl,
> + void __iomem *flash_cache, u32 *buffer,
> + int fc_words, bool is_param)
I strongly dislike this "is_param" boolean.
When is the data in host endianness? When is it not?
If we think about an exec_op() conversion and drop cmdfunc(), what
would be the discriminant?
> +{
> + struct brcmnand_soc *soc = ctrl->soc;
> + int i;
> +
> + if (soc->read_data_bus) {
> + soc->read_data_bus(soc, flash_cache, buffer, fc_words, is_param);
> + } else {
> + if (!is_param) {
> + for (i = 0; i < fc_words; i++, buffer++)
> + *buffer = brcmnand_read_fc(ctrl, i);
> + } else {
> + for (i = 0; i < fc_words; i++)
> + /*
> + * Flash cache is big endian for parameter pages, at
> + * least on STB SoCs
> + */
> + buffer[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
> + }
> + }
> +}
> +
> static void brcmnand_clear_ecc_addr(struct brcmnand_controller *ctrl)
> {
>
> @@ -1811,20 +1835,11 @@ static void brcmnand_cmdfunc(struct nand_chip *chip, unsigned command,
> native_cmd == CMD_PARAMETER_CHANGE_COL) {
> /* Copy flash cache word-wise */
> u32 *flash_cache = (u32 *)ctrl->flash_cache;
> - int i;
>
> brcmnand_soc_data_bus_prepare(ctrl->soc, true);
>
> - /*
> - * Must cache the FLASH_CACHE now, since changes in
> - * SECTOR_SIZE_1K may invalidate it
> - */
> - for (i = 0; i < FC_WORDS; i++)
> - /*
> - * Flash cache is big endian for parameter pages, at
> - * least on STB SoCs
> - */
> - flash_cache[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, flash_cache,
> + FC_WORDS, true);
>
> brcmnand_soc_data_bus_unprepare(ctrl->soc, true);
>
> @@ -2137,7 +2152,7 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
> {
> struct brcmnand_host *host = nand_get_controller_data(chip);
> struct brcmnand_controller *ctrl = host->ctrl;
> - int i, j, ret = 0;
> + int i, ret = 0;
>
> brcmnand_clear_ecc_addr(ctrl);
>
> @@ -2150,8 +2165,9 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
> if (likely(buf)) {
> brcmnand_soc_data_bus_prepare(ctrl->soc, false);
>
> - for (j = 0; j < FC_WORDS; j++, buf++)
> - *buf = brcmnand_read_fc(ctrl, j);
> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, buf,
> + FC_WORDS, false);
> + buf += FC_WORDS;
>
> brcmnand_soc_data_bus_unprepare(ctrl->soc, false);
> }
> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
> index f1f93d85f50d..88819bc395f8 100644
> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.h
> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
> @@ -24,6 +24,8 @@ struct brcmnand_soc {
> void (*ctlrdy_set_enabled)(struct brcmnand_soc *soc, bool en);
> void (*prepare_data_bus)(struct brcmnand_soc *soc, bool prepare,
> bool is_param);
> + void (*read_data_bus)(struct brcmnand_soc *soc, void __iomem *flash_cache,
> + u32 *buffer, int fc_words, bool is_param);
> const struct brcmnand_io_ops *ops;
> };
>
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-06 23:12 ` [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface William Zhang
2023-06-07 8:20 ` Miquel Raynal
@ 2023-06-07 8:22 ` Miquel Raynal
2023-06-07 20:24 ` William Zhang
2023-06-11 9:54 ` kernel test robot
2 siblings, 1 reply; 44+ messages in thread
From: Miquel Raynal @ 2023-06-07 8:22 UTC (permalink / raw)
To: William Zhang
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
Hi William,
william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:50 -0700:
> The BCMBCA broadband SoC integrates the NAND controller differently than
> STB, iProc and other SoCs. It has different endianness for NAND cache
> data and ONFI parameter data.
>
> Add a SoC read data bus shim for BCMBCA to meet the specific SoC need
> and performance improvement using the optimized memcpy function on NAND
> cache memory.
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> ---
>
> drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c | 36 +++++++++++++++++
> drivers/mtd/nand/raw/brcmnand/brcmnand.c | 44 ++++++++++++++-------
> drivers/mtd/nand/raw/brcmnand/brcmnand.h | 2 +
> 3 files changed, 68 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
> index 7e48b6a0bfa2..899103a62c98 100644
> --- a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
> +++ b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
> @@ -26,6 +26,18 @@ enum {
> BCMBCA_CTLRDY = BIT(4),
> };
>
> +#if defined(CONFIG_ARM64)
> +#define ALIGN_REQ 8
> +#else
> +#define ALIGN_REQ 4
> +#endif
> +
> +static inline bool bcmbca_nand_is_buf_aligned(void *flash_cache, void *buffer)
> +{
> + return IS_ALIGNED((uintptr_t)buffer, ALIGN_REQ) &&
> + IS_ALIGNED((uintptr_t)flash_cache, ALIGN_REQ);
> +}
> +
> static bool bcmbca_nand_intc_ack(struct brcmnand_soc *soc)
> {
> struct bcmbca_nand_soc *priv =
> @@ -56,6 +68,29 @@ static void bcmbca_nand_intc_set(struct brcmnand_soc *soc, bool en)
> brcmnand_writel(val, mmio);
> }
>
> +static void bcmbca_read_data_bus(struct brcmnand_soc *soc,
> + void __iomem *flash_cache, u32 *buffer,
> + int fc_words, bool is_param)
> +{
> + int i;
> +
> + if (!is_param) {
> + /*
> + * memcpy can do unaligned aligned access depending on source
> + * and dest address, which is incompatible with nand cache. Fallback
> + * to the memcpy for io version
> + */
> + if (bcmbca_nand_is_buf_aligned(flash_cache, buffer))
> + memcpy((void *)buffer, (void *)flash_cache, fc_words * 4);
> + else
> + memcpy_fromio((void *)buffer, (void *)flash_cache, fc_words * 4);
> + } else {
> + /* Flash cache has same endian as the host for parameter pages */
> + for (i = 0; i < fc_words; i++, buffer++)
> + *buffer = __raw_readl(flash_cache + i * 4);
> + }
> +}
> +
> static int bcmbca_nand_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> @@ -75,6 +110,7 @@ static int bcmbca_nand_probe(struct platform_device *pdev)
>
> soc->ctlrdy_ack = bcmbca_nand_intc_ack;
> soc->ctlrdy_set_enabled = bcmbca_nand_intc_set;
> + soc->read_data_bus = bcmbca_read_data_bus;
>
> return brcmnand_probe(pdev, soc);
> }
> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> index d920e88c7f5b..656be4d73016 100644
> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> @@ -814,6 +814,30 @@ static inline u32 edu_readl(struct brcmnand_controller *ctrl,
> return brcmnand_readl(ctrl->edu_base + offs);
> }
>
> +static inline void brcmnand_read_data_bus(struct brcmnand_controller *ctrl,
> + void __iomem *flash_cache, u32 *buffer,
> + int fc_words, bool is_param)
> +{
> + struct brcmnand_soc *soc = ctrl->soc;
> + int i;
> +
> + if (soc->read_data_bus) {
> + soc->read_data_bus(soc, flash_cache, buffer, fc_words, is_param);
> + } else {
> + if (!is_param) {
> + for (i = 0; i < fc_words; i++, buffer++)
> + *buffer = brcmnand_read_fc(ctrl, i);
> + } else {
> + for (i = 0; i < fc_words; i++)
> + /*
> + * Flash cache is big endian for parameter pages, at
> + * least on STB SoCs
> + */
> + buffer[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
> + }
> + }
Perhaps we could have a single function that is statically assigned at
probe time instead of a first helper with two conditions which calls in
one case another hook... This can be simplified I guess.
> +}
> +
> static void brcmnand_clear_ecc_addr(struct brcmnand_controller *ctrl)
> {
>
> @@ -1811,20 +1835,11 @@ static void brcmnand_cmdfunc(struct nand_chip *chip, unsigned command,
> native_cmd == CMD_PARAMETER_CHANGE_COL) {
> /* Copy flash cache word-wise */
> u32 *flash_cache = (u32 *)ctrl->flash_cache;
> - int i;
>
> brcmnand_soc_data_bus_prepare(ctrl->soc, true);
>
> - /*
> - * Must cache the FLASH_CACHE now, since changes in
> - * SECTOR_SIZE_1K may invalidate it
> - */
> - for (i = 0; i < FC_WORDS; i++)
> - /*
> - * Flash cache is big endian for parameter pages, at
> - * least on STB SoCs
> - */
> - flash_cache[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, flash_cache,
> + FC_WORDS, true);
>
> brcmnand_soc_data_bus_unprepare(ctrl->soc, true);
>
> @@ -2137,7 +2152,7 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
> {
> struct brcmnand_host *host = nand_get_controller_data(chip);
> struct brcmnand_controller *ctrl = host->ctrl;
> - int i, j, ret = 0;
> + int i, ret = 0;
>
> brcmnand_clear_ecc_addr(ctrl);
>
> @@ -2150,8 +2165,9 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
> if (likely(buf)) {
> brcmnand_soc_data_bus_prepare(ctrl->soc, false);
>
> - for (j = 0; j < FC_WORDS; j++, buf++)
> - *buf = brcmnand_read_fc(ctrl, j);
> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, buf,
> + FC_WORDS, false);
> + buf += FC_WORDS;
>
> brcmnand_soc_data_bus_unprepare(ctrl->soc, false);
> }
> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
> index f1f93d85f50d..88819bc395f8 100644
> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.h
> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
> @@ -24,6 +24,8 @@ struct brcmnand_soc {
> void (*ctlrdy_set_enabled)(struct brcmnand_soc *soc, bool en);
> void (*prepare_data_bus)(struct brcmnand_soc *soc, bool prepare,
> bool is_param);
> + void (*read_data_bus)(struct brcmnand_soc *soc, void __iomem *flash_cache,
> + u32 *buffer, int fc_words, bool is_param);
> const struct brcmnand_io_ops *ops;
> };
>
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 11/12] mtd: rawnand: brcmnand: Add support for getting ecc setting from strap
2023-06-06 23:12 ` [PATCH 11/12] mtd: rawnand: brcmnand: Add support for getting ecc setting from strap William Zhang
@ 2023-06-07 8:25 ` Miquel Raynal
0 siblings, 0 replies; 44+ messages in thread
From: Miquel Raynal @ 2023-06-07 8:25 UTC (permalink / raw)
To: William Zhang
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu
Hi William,
william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:51 -0700:
> BCMBCA broadband SoC based board design does not specify ecc setting in
> dts but rather use the SoC NAND strap info to obtain the ecc strength
> and spare area size setting. Add brcm,nand-ecc-use-strap dts propety for
> this purpose and update driver to support this option.
>
> The generic nand ecc settings still take precedence over this flag. For
> example, if nand-ecc-strength is set in the dts, the driver ignores the
> strap setting and falls back to original behavior. This makes sure that
> the existing BCMBCA board dts still works the old way even the strap
> flag is set in the BCMBCA chip dtsi.
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> ---
>
> drivers/mtd/nand/raw/brcmnand/brcmnand.c | 72 +++++++++++++++++++++---
> 1 file changed, 64 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> index 656be4d73016..8c7cea36ac71 100644
> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> @@ -1076,6 +1076,38 @@ static void brcmnand_set_sector_size_1k(struct brcmnand_host *host, int val)
> nand_writereg(ctrl, acc_control_offs, tmp);
> }
>
> +static int brcmnand_get_spare_size(struct brcmnand_host *host)
> +{
> + struct brcmnand_controller *ctrl = host->ctrl;
> + u16 acc_control_offs = brcmnand_cs_offset(ctrl, host->cs,
> + BRCMNAND_CS_ACC_CONTROL);
> + u32 acc = nand_readreg(ctrl, acc_control_offs);
> +
> + return (acc&brcmnand_spare_area_mask(ctrl));
> +}
> +
> +static int brcmnand_get_ecc_strength(struct brcmnand_host *host)
> +{
> + struct brcmnand_controller *ctrl = host->ctrl;
> + u16 acc_control_offs = brcmnand_cs_offset(ctrl, host->cs,
> + BRCMNAND_CS_ACC_CONTROL);
> + int sector_size_1k = brcmnand_get_sector_size_1k(host);
> + int spare_area_size, ecc_level, ecc_strength;
> + u32 acc;
> +
> + spare_area_size = brcmnand_get_spare_size(host);
> + acc = nand_readreg(ctrl, acc_control_offs);
> + ecc_level = (acc & brcmnand_ecc_level_mask(ctrl)) >> brcmnand_ecc_level_shift(ctrl);
> + if (sector_size_1k)
> + ecc_strength = ecc_level<<1;
?
If you mean "x2" then let the compiler do that.
> + else if (spare_area_size == 16 && ecc_level == 15)
> + ecc_strength = 1; /* hamming */
> + else
> + ecc_strength = ecc_level;
> +
> + return ecc_strength;
> +}
> +
> /***********************************************************************
> * CS_NAND_SELECT
> ***********************************************************************/
> @@ -2656,19 +2688,43 @@ static int brcmnand_setup_dev(struct brcmnand_host *host)
> nanddev_get_ecc_requirements(&chip->base);
> struct brcmnand_controller *ctrl = host->ctrl;
> struct brcmnand_cfg *cfg = &host->hwcfg;
> - char msg[128];
> + struct device_node *np = nand_get_flash_node(chip);
> u32 offs, tmp, oob_sector;
> - int ret;
> + int ret, sector_size_1k = 0;
> + bool use_strap = false;
> + char msg[128];
>
> memset(cfg, 0, sizeof(*cfg));
> + use_strap = of_property_read_bool(np, "brcm,nand-ecc-use-strap");
> +
> + /*
> + * Set ECC size and strength based on hw configuration from strap
> + * if device tree does not specify them and use strap property is set
> + * If ecc strength is set in dts, don't use strap setting.
> + */
> + if (chip->ecc.strength)
> + use_strap = 0;
> +
> + if (use_strap) {
> + chip->ecc.strength = brcmnand_get_ecc_strength(host);
> + sector_size_1k = brcmnand_get_sector_size_1k(host);
> + if (chip->ecc.size == 0) {
> + if (sector_size_1k < 0)
> + chip->ecc.size = 512;
> + else
> + chip->ecc.size = 512<<sector_size_1k;
Please run checkpatch.pl --strict
> + }
> + }
>
> - ret = of_property_read_u32(nand_get_flash_node(chip),
> - "brcm,nand-oob-sector-size",
> - &oob_sector);
> + ret = of_property_read_u32(np, "brcm,nand-oob-sector-size",
> + &oob_sector);
> if (ret) {
> - /* Use detected size */
> - cfg->spare_area_size = mtd->oobsize /
> - (mtd->writesize >> FC_SHIFT);
> + if (use_strap)
> + cfg->spare_area_size = brcmnand_get_spare_size(host);
> + else
> + /* Use detected size */
> + cfg->spare_area_size = mtd->oobsize /
> + (mtd->writesize >> FC_SHIFT);
> } else {
> cfg->spare_area_size = oob_sector;
> }
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 05/12] dt-bindings: mtd: brcmnand: Updates for bcmbca SoCs
2023-06-07 8:14 ` Miquel Raynal
@ 2023-06-07 20:01 ` William Zhang
2023-06-09 8:58 ` Miquel Raynal
2023-06-14 22:46 ` Rob Herring
1 sibling, 1 reply; 44+ messages in thread
From: William Zhang @ 2023-06-07 20:01 UTC (permalink / raw)
To: Miquel Raynal
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, devicetree, linux-kernel,
Krzysztof Kozlowski, Vignesh Raghavendra, Richard Weinberger,
Kamal Dasu, Rob Herring
[-- Attachment #1: Type: text/plain, Size: 7620 bytes --]
Hi Miquel,
On 06/07/2023 01:14 AM, Miquel Raynal wrote:
> Hi William,
>
> william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:45 -0700:
>
>> Use new compatiable brcm,nand-bcmbca to support BCMBCA broadband
>> product. The old compatible string is still kept in the driver so old
>> dtb can still work.
>>
>> Add brcm,nand-use-wp property to have an option for disabling this
>> feature on broadband board design that does not use write protection.
>> Add brcm,nand-ecc-use-strap to get ecc setting from board strap for
>> broadband board designs because they do not specify ecc setting in dts
>> but rather using the strap setting.
>>
>> Remove the requirement of interrupts and interrupt-names properties to
>> reflect the driver code.
>>
>> This patch also includes a few minor fixes to the BCM63xx compatibles
>> and add myself to the list of maintainers.
>>
>> Signed-off-by: William Zhang <william.zhang@broadcom.com>
>> ---
>>
>> .../bindings/mtd/brcm,brcmnand.yaml | 64 +++++++++++++------
>> 1 file changed, 43 insertions(+), 21 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
>> index 1571024aa119..1fe1c166a9db 100644
>> --- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
>> +++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
>> @@ -9,6 +9,7 @@ title: Broadcom STB NAND Controller
>> maintainers:
>> - Brian Norris <computersforpeace@gmail.com>
>> - Kamal Dasu <kdasu.kdev@gmail.com>
>> + - William Zhang <william.zhang@broadcom.com>
>>
>> description: |
>> The Broadcom Set-Top Box NAND controller supports low-level access to raw NAND
>> @@ -18,9 +19,10 @@ description: |
>> supports basic PROGRAM and READ functions, among other features.
>>
>> This controller was originally designed for STB SoCs (BCM7xxx) but is now
>> - available on a variety of Broadcom SoCs, including some BCM3xxx, BCM63xx, and
>> - iProc/Cygnus. Its history includes several similar (but not fully register
>> - compatible) versions.
>> + available on a variety of Broadcom SoCs, including some BCM3xxx, MIPS based
>> + Broadband SoC (BCM63xx), ARM based Broadband SoC (BCMBCA) and iProc/Cygnus.
>> + Its history includes several similar (but not fully register compatible)
>> + versions.
>>
>> -- Additional SoC-specific NAND controller properties --
>>
>> @@ -53,9 +55,9 @@ properties:
>> - brcm,brcmnand-v7.2
>> - brcm,brcmnand-v7.3
>> - const: brcm,brcmnand
>> - - description: BCM63138 SoC-specific NAND controller
>> + - description: BCMBCA SoC-specific NAND controller
>> items:
>> - - const: brcm,nand-bcm63138
>> + - const: brcm,nand-bcmbca
>> - enum:
>> - brcm,brcmnand-v7.0
>> - brcm,brcmnand-v7.1
>> @@ -65,11 +67,15 @@ properties:
>> - const: brcm,nand-iproc
>> - const: brcm,brcmnand-v6.1
>> - const: brcm,brcmnand
>> - - description: BCM63168 SoC-specific NAND controller
>> + - description: BCM63xx SoC-specific NAND controller
>> items:
>> - - const: brcm,nand-bcm63168
>> - - const: brcm,nand-bcm6368
>> - - const: brcm,brcmnand-v4.0
>> + - enum:
>> + - brcm,nand-bcm63168
>> + - brcm,nand-bcm6368
>> + - enum:
>> + - brcm,brcmnand-v2.1
>> + - brcm,brcmnand-v2.2
>> + - brcm,brcmnand-v4.0
>> - const: brcm,brcmnand
>>
>> reg:
>> @@ -111,6 +117,19 @@ properties:
>> earlier versions of this core that include WP
>> type: boolean
>>
>> + brcm,nand-use-wp:
>> + description:
>> + Use this integer to indicate if board design uses
>> + controller's write protection feature and connects its
>> + NAND_WPb pin to nand chip's WP_L pin. Driver defaults to
>> + use this feature when this property does not exist.
>> + Set to 0 if WP pins are not connected and feature is not
>> + used. Set to 1 if WP pins are connected and feature is used.
>> + Set to 2 if WP pins are connected but disable this feature
>> + through driver that sets controller to output high on NAND_WPb.
>> + $ref: /schemas/types.yaml#/definitions/uint32
>> + enum: [0, 1, 2]
>
> Perhaps strings would be welcome. I'll let binding maintainers say what
> they think of it.
>
Practically there is really just use cases of 0 and 1. I could use a
bool flag but to keep consistent with the driver code and in case there
is any existing usage of 2.
>> +
>> patternProperties:
>> "^nand@[a-f0-9]$":
>> type: object
>> @@ -136,13 +155,23 @@ patternProperties:
>> layout.
>> $ref: /schemas/types.yaml#/definitions/uint32
>>
>> + brcm,nand-ecc-use-strap:
>> + description:
>> + This flag is used by the driver to get the ecc strength and
>> + spare area size from the SoC NAND boot strap setting. This
>> + is commonly used by the BCMBCA SoC board design. If ecc
>> + strength and spare area size are set by nand-ecc-strength
>> + and brcm,nand-oob-sector-size in the dts, these settings
>> + have precedence and override this flag.
>> + $ref: /schemas/types.yaml#/definitions/flag
>
> How in practice do you access the strap value? Don't you need a phandle
> over a specific area in the SoC?
>
The strap value is latched and stored in the NAND controller register so
there is no extra phandle needed.
>> +
>> allOf:
>> - $ref: nand-controller.yaml#
>> - if:
>> properties:
>> compatible:
>> contains:
>> - const: brcm,nand-bcm63138
>> + const: brcm,nand-bcmbca
>> then:
>> properties:
>> reg-names:
>> @@ -153,7 +182,9 @@ allOf:
>> properties:
>> compatible:
>> contains:
>> - const: brcm,nand-bcm6368
>> + enum:
>> + - brcm,nand-bcm63168
>> + - brcm,nand-bcm6368
>> then:
>> properties:
>> reg-names:
>> @@ -173,20 +204,12 @@ allOf:
>> - const: nand
>> - const: iproc-idm
>> - const: iproc-ext
>> - - if:
>> - properties:
>> - interrupts:
>> - minItems: 2
>> - then:
>> - required:
>> - - interrupt-names
>
> Why do you remove this? Removing "interrupts" from the required
> properties is fine, but constraining the interrupts property when it is
> relevant is still expected.
>
There is no requirement for interrupt name even if it have two
interrupts. Driver code does not use interrupt name but the interrupt
index instead.
>>
>> unevaluatedProperties: false
>>
>> required:
>> - reg
>> - reg-names
>> - - interrupts
>
> This should be done in a separate patch.
>
I thought this is also related to my update for bcmbca chips because
they don't need to interrupt and interrupt name.
>>
>> examples:
>> - |
>> @@ -215,8 +238,7 @@ examples:
>> };
>> - |
>> nand-controller@10000200 {
>> - compatible = "brcm,nand-bcm63168", "brcm,nand-bcm6368",
>> - "brcm,brcmnand-v4.0", "brcm,brcmnand";
>> + compatible = "brcm,nand-bcm6368", "brcm,brcmnand-v2.1", "brcm,brcmnand";
>> reg = <0x10000200 0x180>,
>> <0x100000b0 0x10>,
>> <0x10000600 0x200>;
>
>
> Thanks,
> Miquèl
>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-07 8:20 ` Miquel Raynal
@ 2023-06-07 20:12 ` William Zhang
2023-06-08 6:15 ` Miquel Raynal
0 siblings, 1 reply; 44+ messages in thread
From: William Zhang @ 2023-06-07 20:12 UTC (permalink / raw)
To: Miquel Raynal
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 7268 bytes --]
Hi Miquel,
On 06/07/2023 01:20 AM, Miquel Raynal wrote:
> Hi William,
>
> william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:50 -0700:
>
>> The BCMBCA broadband SoC integrates the NAND controller differently than
>> STB, iProc and other SoCs. It has different endianness for NAND cache
>> data and ONFI parameter data.
>>
>> Add a SoC read data bus shim for BCMBCA to meet the specific SoC need
>> and performance improvement using the optimized memcpy function on NAND
>> cache memory.
>>
>> Signed-off-by: William Zhang <william.zhang@broadcom.com>
>> ---
>>
>> drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c | 36 +++++++++++++++++
>> drivers/mtd/nand/raw/brcmnand/brcmnand.c | 44 ++++++++++++++-------
>> drivers/mtd/nand/raw/brcmnand/brcmnand.h | 2 +
>> 3 files changed, 68 insertions(+), 14 deletions(-)
>>
>> diff --git a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
>> index 7e48b6a0bfa2..899103a62c98 100644
>> --- a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
>> +++ b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
>> @@ -26,6 +26,18 @@ enum {
>> BCMBCA_CTLRDY = BIT(4),
>> };
>>
>> +#if defined(CONFIG_ARM64)
>> +#define ALIGN_REQ 8
>> +#else
>> +#define ALIGN_REQ 4
>> +#endif
>> +
>> +static inline bool bcmbca_nand_is_buf_aligned(void *flash_cache, void *buffer)
>> +{
>> + return IS_ALIGNED((uintptr_t)buffer, ALIGN_REQ) &&
>> + IS_ALIGNED((uintptr_t)flash_cache, ALIGN_REQ);
>> +}
>> +
>> static bool bcmbca_nand_intc_ack(struct brcmnand_soc *soc)
>> {
>> struct bcmbca_nand_soc *priv =
>> @@ -56,6 +68,29 @@ static void bcmbca_nand_intc_set(struct brcmnand_soc *soc, bool en)
>> brcmnand_writel(val, mmio);
>> }
>>
>> +static void bcmbca_read_data_bus(struct brcmnand_soc *soc,
>> + void __iomem *flash_cache, u32 *buffer,
>> + int fc_words, bool is_param)
>> +{
>> + int i;
>> +
>> + if (!is_param) {
>> + /*
>> + * memcpy can do unaligned aligned access depending on source
>> + * and dest address, which is incompatible with nand cache. Fallback
>> + * to the memcpy for io version
>> + */
>> + if (bcmbca_nand_is_buf_aligned(flash_cache, buffer))
>> + memcpy((void *)buffer, (void *)flash_cache, fc_words * 4);
>> + else
>> + memcpy_fromio((void *)buffer, (void *)flash_cache, fc_words * 4);
>> + } else {
>> + /* Flash cache has same endian as the host for parameter pages */
>> + for (i = 0; i < fc_words; i++, buffer++)
>> + *buffer = __raw_readl(flash_cache + i * 4);
>> + }
>> +}
>> +
>> static int bcmbca_nand_probe(struct platform_device *pdev)
>> {
>> struct device *dev = &pdev->dev;
>> @@ -75,6 +110,7 @@ static int bcmbca_nand_probe(struct platform_device *pdev)
>>
>> soc->ctlrdy_ack = bcmbca_nand_intc_ack;
>> soc->ctlrdy_set_enabled = bcmbca_nand_intc_set;
>> + soc->read_data_bus = bcmbca_read_data_bus;
>>
>> return brcmnand_probe(pdev, soc);
>> }
>> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
>> index d920e88c7f5b..656be4d73016 100644
>> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
>> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
>> @@ -814,6 +814,30 @@ static inline u32 edu_readl(struct brcmnand_controller *ctrl,
>> return brcmnand_readl(ctrl->edu_base + offs);
>> }
>>
>> +static inline void brcmnand_read_data_bus(struct brcmnand_controller *ctrl,
>> + void __iomem *flash_cache, u32 *buffer,
>> + int fc_words, bool is_param)
>
> I strongly dislike this "is_param" boolean.
>
> When is the data in host endianness? When is it not?
This is little bit complicated. We have two type data read from nand
cache. One for page read and the other for parameter and onfi data read
from the controller side. But it depends on how SoC integrate the nand
cache to system. In broadband SoC, both page and parameter data are in
host endianess but other SoCs is not the same.
I am open to suggestion for is_param function argument but to factor out
this common code in more structured way, I don't see other way around.
>
> If we think about an exec_op() conversion and drop cmdfunc(), what
> would be the discriminant?
>
If we need to implement exec_op in the future, the data is not coming
from nand cache but some other low level data register which may not
subject to the endianess issue.
>> +{
>> + struct brcmnand_soc *soc = ctrl->soc;
>> + int i;
>> +
>> + if (soc->read_data_bus) {
>> + soc->read_data_bus(soc, flash_cache, buffer, fc_words, is_param);
>> + } else {
>> + if (!is_param) {
>> + for (i = 0; i < fc_words; i++, buffer++)
>> + *buffer = brcmnand_read_fc(ctrl, i);
>> + } else {
>> + for (i = 0; i < fc_words; i++)
>> + /*
>> + * Flash cache is big endian for parameter pages, at
>> + * least on STB SoCs
>> + */
>> + buffer[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
>> + }
>> + }
>> +}
>> +
>> static void brcmnand_clear_ecc_addr(struct brcmnand_controller *ctrl)
>> {
>>
>> @@ -1811,20 +1835,11 @@ static void brcmnand_cmdfunc(struct nand_chip *chip, unsigned command,
>> native_cmd == CMD_PARAMETER_CHANGE_COL) {
>> /* Copy flash cache word-wise */
>> u32 *flash_cache = (u32 *)ctrl->flash_cache;
>> - int i;
>>
>> brcmnand_soc_data_bus_prepare(ctrl->soc, true);
>>
>> - /*
>> - * Must cache the FLASH_CACHE now, since changes in
>> - * SECTOR_SIZE_1K may invalidate it
>> - */
>> - for (i = 0; i < FC_WORDS; i++)
>> - /*
>> - * Flash cache is big endian for parameter pages, at
>> - * least on STB SoCs
>> - */
>> - flash_cache[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
>> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, flash_cache,
>> + FC_WORDS, true);
>>
>> brcmnand_soc_data_bus_unprepare(ctrl->soc, true);
>>
>> @@ -2137,7 +2152,7 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
>> {
>> struct brcmnand_host *host = nand_get_controller_data(chip);
>> struct brcmnand_controller *ctrl = host->ctrl;
>> - int i, j, ret = 0;
>> + int i, ret = 0;
>>
>> brcmnand_clear_ecc_addr(ctrl);
>>
>> @@ -2150,8 +2165,9 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
>> if (likely(buf)) {
>> brcmnand_soc_data_bus_prepare(ctrl->soc, false);
>>
>> - for (j = 0; j < FC_WORDS; j++, buf++)
>> - *buf = brcmnand_read_fc(ctrl, j);
>> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, buf,
>> + FC_WORDS, false);
>> + buf += FC_WORDS;
>>
>> brcmnand_soc_data_bus_unprepare(ctrl->soc, false);
>> }
>> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
>> index f1f93d85f50d..88819bc395f8 100644
>> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.h
>> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
>> @@ -24,6 +24,8 @@ struct brcmnand_soc {
>> void (*ctlrdy_set_enabled)(struct brcmnand_soc *soc, bool en);
>> void (*prepare_data_bus)(struct brcmnand_soc *soc, bool prepare,
>> bool is_param);
>> + void (*read_data_bus)(struct brcmnand_soc *soc, void __iomem *flash_cache,
>> + u32 *buffer, int fc_words, bool is_param);
>> const struct brcmnand_io_ops *ops;
>> };
>>
>
>
> Thanks,
> Miquèl
>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-07 8:22 ` Miquel Raynal
@ 2023-06-07 20:24 ` William Zhang
2023-06-08 6:18 ` Miquel Raynal
0 siblings, 1 reply; 44+ messages in thread
From: William Zhang @ 2023-06-07 20:24 UTC (permalink / raw)
To: Miquel Raynal
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 7132 bytes --]
Hi Miquel,
On 06/07/2023 01:22 AM, Miquel Raynal wrote:
> Hi William,
>
> william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:50 -0700:
>
>> The BCMBCA broadband SoC integrates the NAND controller differently than
>> STB, iProc and other SoCs. It has different endianness for NAND cache
>> data and ONFI parameter data.
>>
>> Add a SoC read data bus shim for BCMBCA to meet the specific SoC need
>> and performance improvement using the optimized memcpy function on NAND
>> cache memory.
>>
>> Signed-off-by: William Zhang <william.zhang@broadcom.com>
>> ---
>>
>> drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c | 36 +++++++++++++++++
>> drivers/mtd/nand/raw/brcmnand/brcmnand.c | 44 ++++++++++++++-------
>> drivers/mtd/nand/raw/brcmnand/brcmnand.h | 2 +
>> 3 files changed, 68 insertions(+), 14 deletions(-)
>>
>> diff --git a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
>> index 7e48b6a0bfa2..899103a62c98 100644
>> --- a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
>> +++ b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
>> @@ -26,6 +26,18 @@ enum {
>> BCMBCA_CTLRDY = BIT(4),
>> };
>>
>> +#if defined(CONFIG_ARM64)
>> +#define ALIGN_REQ 8
>> +#else
>> +#define ALIGN_REQ 4
>> +#endif
>> +
>> +static inline bool bcmbca_nand_is_buf_aligned(void *flash_cache, void *buffer)
>> +{
>> + return IS_ALIGNED((uintptr_t)buffer, ALIGN_REQ) &&
>> + IS_ALIGNED((uintptr_t)flash_cache, ALIGN_REQ);
>> +}
>> +
>> static bool bcmbca_nand_intc_ack(struct brcmnand_soc *soc)
>> {
>> struct bcmbca_nand_soc *priv =
>> @@ -56,6 +68,29 @@ static void bcmbca_nand_intc_set(struct brcmnand_soc *soc, bool en)
>> brcmnand_writel(val, mmio);
>> }
>>
>> +static void bcmbca_read_data_bus(struct brcmnand_soc *soc,
>> + void __iomem *flash_cache, u32 *buffer,
>> + int fc_words, bool is_param)
>> +{
>> + int i;
>> +
>> + if (!is_param) {
>> + /*
>> + * memcpy can do unaligned aligned access depending on source
>> + * and dest address, which is incompatible with nand cache. Fallback
>> + * to the memcpy for io version
>> + */
>> + if (bcmbca_nand_is_buf_aligned(flash_cache, buffer))
>> + memcpy((void *)buffer, (void *)flash_cache, fc_words * 4);
>> + else
>> + memcpy_fromio((void *)buffer, (void *)flash_cache, fc_words * 4);
>> + } else {
>> + /* Flash cache has same endian as the host for parameter pages */
>> + for (i = 0; i < fc_words; i++, buffer++)
>> + *buffer = __raw_readl(flash_cache + i * 4);
>> + }
>> +}
>> +
>> static int bcmbca_nand_probe(struct platform_device *pdev)
>> {
>> struct device *dev = &pdev->dev;
>> @@ -75,6 +110,7 @@ static int bcmbca_nand_probe(struct platform_device *pdev)
>>
>> soc->ctlrdy_ack = bcmbca_nand_intc_ack;
>> soc->ctlrdy_set_enabled = bcmbca_nand_intc_set;
>> + soc->read_data_bus = bcmbca_read_data_bus;
>>
>> return brcmnand_probe(pdev, soc);
>> }
>> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
>> index d920e88c7f5b..656be4d73016 100644
>> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
>> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
>> @@ -814,6 +814,30 @@ static inline u32 edu_readl(struct brcmnand_controller *ctrl,
>> return brcmnand_readl(ctrl->edu_base + offs);
>> }
>>
>> +static inline void brcmnand_read_data_bus(struct brcmnand_controller *ctrl,
>> + void __iomem *flash_cache, u32 *buffer,
>> + int fc_words, bool is_param)
>> +{
>> + struct brcmnand_soc *soc = ctrl->soc;
>> + int i;
>> +
>> + if (soc->read_data_bus) {
>> + soc->read_data_bus(soc, flash_cache, buffer, fc_words, is_param);
>> + } else {
>> + if (!is_param) {
>> + for (i = 0; i < fc_words; i++, buffer++)
>> + *buffer = brcmnand_read_fc(ctrl, i);
>> + } else {
>> + for (i = 0; i < fc_words; i++)
>> + /*
>> + * Flash cache is big endian for parameter pages, at
>> + * least on STB SoCs
>> + */
>> + buffer[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
>> + }
>> + }
>
> Perhaps we could have a single function that is statically assigned at
> probe time instead of a first helper with two conditions which calls in
> one case another hook... This can be simplified I guess.
>
Well this will need to be done at the SoC specific implementation level
(bcm<xxx>_nand.c) and each SoC will need to have either general data bus
read func with is_param option or data_bus_read_page,
data_bus_read_param. Not sure how much this can be simplified... Or we
have default implementation in brcmnand.c but then there is one
condition check too. Page read is done at 512 bytes burst. One or two
conditions check outside of the per 512 bytes read loop does not sounds
too bad if performance is concern.
>> +}
>> +
>> static void brcmnand_clear_ecc_addr(struct brcmnand_controller *ctrl)
>> {
>>
>> @@ -1811,20 +1835,11 @@ static void brcmnand_cmdfunc(struct nand_chip *chip, unsigned command,
>> native_cmd == CMD_PARAMETER_CHANGE_COL) {
>> /* Copy flash cache word-wise */
>> u32 *flash_cache = (u32 *)ctrl->flash_cache;
>> - int i;
>>
>> brcmnand_soc_data_bus_prepare(ctrl->soc, true);
>>
>> - /*
>> - * Must cache the FLASH_CACHE now, since changes in
>> - * SECTOR_SIZE_1K may invalidate it
>> - */
>> - for (i = 0; i < FC_WORDS; i++)
>> - /*
>> - * Flash cache is big endian for parameter pages, at
>> - * least on STB SoCs
>> - */
>> - flash_cache[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
>> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, flash_cache,
>> + FC_WORDS, true);
>>
>> brcmnand_soc_data_bus_unprepare(ctrl->soc, true);
>>
>> @@ -2137,7 +2152,7 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
>> {
>> struct brcmnand_host *host = nand_get_controller_data(chip);
>> struct brcmnand_controller *ctrl = host->ctrl;
>> - int i, j, ret = 0;
>> + int i, ret = 0;
>>
>> brcmnand_clear_ecc_addr(ctrl);
>>
>> @@ -2150,8 +2165,9 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
>> if (likely(buf)) {
>> brcmnand_soc_data_bus_prepare(ctrl->soc, false);
>>
>> - for (j = 0; j < FC_WORDS; j++, buf++)
>> - *buf = brcmnand_read_fc(ctrl, j);
>> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, buf,
>> + FC_WORDS, false);
>> + buf += FC_WORDS;
>>
>> brcmnand_soc_data_bus_unprepare(ctrl->soc, false);
>> }
>> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
>> index f1f93d85f50d..88819bc395f8 100644
>> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.h
>> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
>> @@ -24,6 +24,8 @@ struct brcmnand_soc {
>> void (*ctlrdy_set_enabled)(struct brcmnand_soc *soc, bool en);
>> void (*prepare_data_bus)(struct brcmnand_soc *soc, bool prepare,
>> bool is_param);
>> + void (*read_data_bus)(struct brcmnand_soc *soc, void __iomem *flash_cache,
>> + u32 *buffer, int fc_words, bool is_param);
>> const struct brcmnand_io_ops *ops;
>> };
>>
>
>
> Thanks,
> Miquèl
>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-07 20:12 ` William Zhang
@ 2023-06-08 6:15 ` Miquel Raynal
2023-06-08 19:04 ` William Zhang
0 siblings, 1 reply; 44+ messages in thread
From: Miquel Raynal @ 2023-06-08 6:15 UTC (permalink / raw)
To: William Zhang
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
Hi William,
william.zhang@broadcom.com wrote on Wed, 7 Jun 2023 13:12:02 -0700:
> Hi Miquel,
>
> On 06/07/2023 01:20 AM, Miquel Raynal wrote:
> > Hi William,
> >
> > william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:50 -0700:
> >
> >> The BCMBCA broadband SoC integrates the NAND controller differently than
> >> STB, iProc and other SoCs. It has different endianness for NAND cache
> >> data and ONFI parameter data.
> >>
> >> Add a SoC read data bus shim for BCMBCA to meet the specific SoC need
> >> and performance improvement using the optimized memcpy function on NAND
> >> cache memory.
> >>
> >> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> >> ---
> >>
> >> drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c | 36 +++++++++++++++++
> >> drivers/mtd/nand/raw/brcmnand/brcmnand.c | 44 ++++++++++++++-------
> >> drivers/mtd/nand/raw/brcmnand/brcmnand.h | 2 +
> >> 3 files changed, 68 insertions(+), 14 deletions(-)
> >>
> >> diff --git a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
> >> index 7e48b6a0bfa2..899103a62c98 100644
> >> --- a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
> >> +++ b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
> >> @@ -26,6 +26,18 @@ enum {
> >> BCMBCA_CTLRDY = BIT(4),
> >> };
> >> >> +#if defined(CONFIG_ARM64)
> >> +#define ALIGN_REQ 8
> >> +#else
> >> +#define ALIGN_REQ 4
> >> +#endif
> >> +
> >> +static inline bool bcmbca_nand_is_buf_aligned(void *flash_cache, void *buffer)
> >> +{
> >> + return IS_ALIGNED((uintptr_t)buffer, ALIGN_REQ) &&
> >> + IS_ALIGNED((uintptr_t)flash_cache, ALIGN_REQ);
> >> +}
> >> +
> >> static bool bcmbca_nand_intc_ack(struct brcmnand_soc *soc)
> >> {
> >> struct bcmbca_nand_soc *priv =
> >> @@ -56,6 +68,29 @@ static void bcmbca_nand_intc_set(struct brcmnand_soc *soc, bool en)
> >> brcmnand_writel(val, mmio);
> >> }
> >> >> +static void bcmbca_read_data_bus(struct brcmnand_soc *soc,
> >> + void __iomem *flash_cache, u32 *buffer,
> >> + int fc_words, bool is_param)
> >> +{
> >> + int i;
> >> +
> >> + if (!is_param) {
> >> + /*
> >> + * memcpy can do unaligned aligned access depending on source
> >> + * and dest address, which is incompatible with nand cache. Fallback
> >> + * to the memcpy for io version
> >> + */
> >> + if (bcmbca_nand_is_buf_aligned(flash_cache, buffer))
> >> + memcpy((void *)buffer, (void *)flash_cache, fc_words * 4);
> >> + else
> >> + memcpy_fromio((void *)buffer, (void *)flash_cache, fc_words * 4);
> >> + } else {
> >> + /* Flash cache has same endian as the host for parameter pages */
> >> + for (i = 0; i < fc_words; i++, buffer++)
> >> + *buffer = __raw_readl(flash_cache + i * 4);
> >> + }
> >> +}
> >> +
> >> static int bcmbca_nand_probe(struct platform_device *pdev)
> >> {
> >> struct device *dev = &pdev->dev;
> >> @@ -75,6 +110,7 @@ static int bcmbca_nand_probe(struct platform_device *pdev)
> >> >> soc->ctlrdy_ack = bcmbca_nand_intc_ack;
> >> soc->ctlrdy_set_enabled = bcmbca_nand_intc_set;
> >> + soc->read_data_bus = bcmbca_read_data_bus;
> >> >> return brcmnand_probe(pdev, soc);
> >> }
> >> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> >> index d920e88c7f5b..656be4d73016 100644
> >> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> >> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> >> @@ -814,6 +814,30 @@ static inline u32 edu_readl(struct brcmnand_controller *ctrl,
> >> return brcmnand_readl(ctrl->edu_base + offs);
> >> }
> >> >> +static inline void brcmnand_read_data_bus(struct brcmnand_controller *ctrl,
> >> + void __iomem *flash_cache, u32 *buffer,
> >> + int fc_words, bool is_param)
> >
> > I strongly dislike this "is_param" boolean.
> >
> > When is the data in host endianness? When is it not?
> This is little bit complicated. We have two type data read from nand cache. One for page read and the other for parameter and onfi data read from the controller side. But it depends on how SoC integrate the nand cache to system. In broadband SoC, both page and parameter data are in host endianess but other SoCs is not the same.
>
> I am open to suggestion for is_param function argument but to factor out this common code in more structured way, I don't see other way around.
Alright, so this is SoC dependent, very well -> a (sub)compatible per
SoC + platform data associated to it with the right function.
> > If we think about an exec_op() conversion and drop cmdfunc(), what
> > would be the discriminant?
> >
> If we need to implement exec_op in the future, the data is not coming from nand cache but some other low level data register which may not subject to the endianess issue.
Can't you use the same cache all the time here as well then? And avoid
the need for this overly complex logic?
>
> >> +{
> >> + struct brcmnand_soc *soc = ctrl->soc;
> >> + int i;
> >> +
> >> + if (soc->read_data_bus) {
> >> + soc->read_data_bus(soc, flash_cache, buffer, fc_words, is_param);
> >> + } else {
> >> + if (!is_param) {
> >> + for (i = 0; i < fc_words; i++, buffer++)
> >> + *buffer = brcmnand_read_fc(ctrl, i);
> >> + } else {
> >> + for (i = 0; i < fc_words; i++)
> >> + /*
> >> + * Flash cache is big endian for parameter pages, at
> >> + * least on STB SoCs
> >> + */
> >> + buffer[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
> >> + }
> >> + }
> >> +}
> >> +
> >> static void brcmnand_clear_ecc_addr(struct brcmnand_controller *ctrl)
> >> {
> >> >> @@ -1811,20 +1835,11 @@ static void brcmnand_cmdfunc(struct nand_chip *chip, unsigned command,
> >> native_cmd == CMD_PARAMETER_CHANGE_COL) {
> >> /* Copy flash cache word-wise */
> >> u32 *flash_cache = (u32 *)ctrl->flash_cache;
> >> - int i;
> >> >> brcmnand_soc_data_bus_prepare(ctrl->soc, true);
> >> >> - /*
> >> - * Must cache the FLASH_CACHE now, since changes in
> >> - * SECTOR_SIZE_1K may invalidate it
> >> - */
> >> - for (i = 0; i < FC_WORDS; i++)
> >> - /*
> >> - * Flash cache is big endian for parameter pages, at
> >> - * least on STB SoCs
> >> - */
> >> - flash_cache[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
> >> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, flash_cache,
> >> + FC_WORDS, true);
> >> >> brcmnand_soc_data_bus_unprepare(ctrl->soc, true);
> >> >> @@ -2137,7 +2152,7 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
> >> {
> >> struct brcmnand_host *host = nand_get_controller_data(chip);
> >> struct brcmnand_controller *ctrl = host->ctrl;
> >> - int i, j, ret = 0;
> >> + int i, ret = 0;
> >> >> brcmnand_clear_ecc_addr(ctrl);
> >> >> @@ -2150,8 +2165,9 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
> >> if (likely(buf)) {
> >> brcmnand_soc_data_bus_prepare(ctrl->soc, false);
> >> >> - for (j = 0; j < FC_WORDS; j++, buf++)
> >> - *buf = brcmnand_read_fc(ctrl, j);
> >> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, buf,
> >> + FC_WORDS, false);
> >> + buf += FC_WORDS;
> >> >> brcmnand_soc_data_bus_unprepare(ctrl->soc, false);
> >> }
> >> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
> >> index f1f93d85f50d..88819bc395f8 100644
> >> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.h
> >> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
> >> @@ -24,6 +24,8 @@ struct brcmnand_soc {
> >> void (*ctlrdy_set_enabled)(struct brcmnand_soc *soc, bool en);
> >> void (*prepare_data_bus)(struct brcmnand_soc *soc, bool prepare,
> >> bool is_param);
> >> + void (*read_data_bus)(struct brcmnand_soc *soc, void __iomem *flash_cache,
> >> + u32 *buffer, int fc_words, bool is_param);
> >> const struct brcmnand_io_ops *ops;
> >> };
> >> > >
> > Thanks,
> > Miquèl
> >
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-07 20:24 ` William Zhang
@ 2023-06-08 6:18 ` Miquel Raynal
2023-06-08 19:10 ` William Zhang
0 siblings, 1 reply; 44+ messages in thread
From: Miquel Raynal @ 2023-06-08 6:18 UTC (permalink / raw)
To: William Zhang
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
Hi William,
william.zhang@broadcom.com wrote on Wed, 7 Jun 2023 13:24:23 -0700:
> Hi Miquel,
>
> On 06/07/2023 01:22 AM, Miquel Raynal wrote:
> > Hi William,
> >
> > william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:50 -0700:
> >
> >> The BCMBCA broadband SoC integrates the NAND controller differently than
> >> STB, iProc and other SoCs. It has different endianness for NAND cache
> >> data and ONFI parameter data.
> >>
> >> Add a SoC read data bus shim for BCMBCA to meet the specific SoC need
> >> and performance improvement using the optimized memcpy function on NAND
> >> cache memory.
> >>
> >> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> >> ---
> >>
> >> drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c | 36 +++++++++++++++++
> >> drivers/mtd/nand/raw/brcmnand/brcmnand.c | 44 ++++++++++++++-------
> >> drivers/mtd/nand/raw/brcmnand/brcmnand.h | 2 +
> >> 3 files changed, 68 insertions(+), 14 deletions(-)
> >>
> >> diff --git a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
> >> index 7e48b6a0bfa2..899103a62c98 100644
> >> --- a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
> >> +++ b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
> >> @@ -26,6 +26,18 @@ enum {
> >> BCMBCA_CTLRDY = BIT(4),
> >> };
> >> >> +#if defined(CONFIG_ARM64)
> >> +#define ALIGN_REQ 8
> >> +#else
> >> +#define ALIGN_REQ 4
> >> +#endif
> >> +
> >> +static inline bool bcmbca_nand_is_buf_aligned(void *flash_cache, void *buffer)
> >> +{
> >> + return IS_ALIGNED((uintptr_t)buffer, ALIGN_REQ) &&
> >> + IS_ALIGNED((uintptr_t)flash_cache, ALIGN_REQ);
> >> +}
> >> +
> >> static bool bcmbca_nand_intc_ack(struct brcmnand_soc *soc)
> >> {
> >> struct bcmbca_nand_soc *priv =
> >> @@ -56,6 +68,29 @@ static void bcmbca_nand_intc_set(struct brcmnand_soc *soc, bool en)
> >> brcmnand_writel(val, mmio);
> >> }
> >> >> +static void bcmbca_read_data_bus(struct brcmnand_soc *soc,
> >> + void __iomem *flash_cache, u32 *buffer,
> >> + int fc_words, bool is_param)
> >> +{
> >> + int i;
> >> +
> >> + if (!is_param) {
> >> + /*
> >> + * memcpy can do unaligned aligned access depending on source
> >> + * and dest address, which is incompatible with nand cache. Fallback
> >> + * to the memcpy for io version
> >> + */
> >> + if (bcmbca_nand_is_buf_aligned(flash_cache, buffer))
> >> + memcpy((void *)buffer, (void *)flash_cache, fc_words * 4);
> >> + else
> >> + memcpy_fromio((void *)buffer, (void *)flash_cache, fc_words * 4);
> >> + } else {
> >> + /* Flash cache has same endian as the host for parameter pages */
> >> + for (i = 0; i < fc_words; i++, buffer++)
> >> + *buffer = __raw_readl(flash_cache + i * 4);
> >> + }
> >> +}
> >> +
> >> static int bcmbca_nand_probe(struct platform_device *pdev)
> >> {
> >> struct device *dev = &pdev->dev;
> >> @@ -75,6 +110,7 @@ static int bcmbca_nand_probe(struct platform_device *pdev)
> >> >> soc->ctlrdy_ack = bcmbca_nand_intc_ack;
> >> soc->ctlrdy_set_enabled = bcmbca_nand_intc_set;
> >> + soc->read_data_bus = bcmbca_read_data_bus;
> >> >> return brcmnand_probe(pdev, soc);
> >> }
> >> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> >> index d920e88c7f5b..656be4d73016 100644
> >> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> >> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> >> @@ -814,6 +814,30 @@ static inline u32 edu_readl(struct brcmnand_controller *ctrl,
> >> return brcmnand_readl(ctrl->edu_base + offs);
> >> }
> >> >> +static inline void brcmnand_read_data_bus(struct brcmnand_controller *ctrl,
> >> + void __iomem *flash_cache, u32 *buffer,
> >> + int fc_words, bool is_param)
> >> +{
> >> + struct brcmnand_soc *soc = ctrl->soc;
> >> + int i;
> >> +
> >> + if (soc->read_data_bus) {
> >> + soc->read_data_bus(soc, flash_cache, buffer, fc_words, is_param);
> >> + } else {
> >> + if (!is_param) {
> >> + for (i = 0; i < fc_words; i++, buffer++)
> >> + *buffer = brcmnand_read_fc(ctrl, i);
> >> + } else {
> >> + for (i = 0; i < fc_words; i++)
> >> + /*
> >> + * Flash cache is big endian for parameter pages, at
> >> + * least on STB SoCs
> >> + */
> >> + buffer[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
> >> + }
> >> + }
> >
> > Perhaps we could have a single function that is statically assigned at
> > probe time instead of a first helper with two conditions which calls in
> > one case another hook... This can be simplified I guess.
> >
> Well this will need to be done at the SoC specific implementation level (bcm<xxx>_nand.c) and each SoC will need to have either general data bus read func with is_param option or data_bus_read_page, data_bus_read_param.
You told me in case we would use exec_op we could avoid the param
cache. If that's true then the whole support can be simplified.
> Not sure how much this can be simplified... Or we have default
> implementation in brcmnand.c but then there is one condition check
> too. Page read is done at 512 bytes burst. One or two conditions
> check outside of the per 512 bytes read loop does not sounds too bad
> if performance is concern.
It is unreadable. That is my main concern.
>
> >> +}
> >> +
> >> static void brcmnand_clear_ecc_addr(struct brcmnand_controller *ctrl)
> >> {
> >> >> @@ -1811,20 +1835,11 @@ static void brcmnand_cmdfunc(struct nand_chip *chip, unsigned command,
> >> native_cmd == CMD_PARAMETER_CHANGE_COL) {
> >> /* Copy flash cache word-wise */
> >> u32 *flash_cache = (u32 *)ctrl->flash_cache;
> >> - int i;
> >> >> brcmnand_soc_data_bus_prepare(ctrl->soc, true);
> >> >> - /*
> >> - * Must cache the FLASH_CACHE now, since changes in
> >> - * SECTOR_SIZE_1K may invalidate it
> >> - */
> >> - for (i = 0; i < FC_WORDS; i++)
> >> - /*
> >> - * Flash cache is big endian for parameter pages, at
> >> - * least on STB SoCs
> >> - */
> >> - flash_cache[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
> >> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, flash_cache,
> >> + FC_WORDS, true);
> >> >> brcmnand_soc_data_bus_unprepare(ctrl->soc, true);
> >> >> @@ -2137,7 +2152,7 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
> >> {
> >> struct brcmnand_host *host = nand_get_controller_data(chip);
> >> struct brcmnand_controller *ctrl = host->ctrl;
> >> - int i, j, ret = 0;
> >> + int i, ret = 0;
> >> >> brcmnand_clear_ecc_addr(ctrl);
> >> >> @@ -2150,8 +2165,9 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
> >> if (likely(buf)) {
> >> brcmnand_soc_data_bus_prepare(ctrl->soc, false);
> >> >> - for (j = 0; j < FC_WORDS; j++, buf++)
> >> - *buf = brcmnand_read_fc(ctrl, j);
> >> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, buf,
> >> + FC_WORDS, false);
> >> + buf += FC_WORDS;
> >> >> brcmnand_soc_data_bus_unprepare(ctrl->soc, false);
> >> }
> >> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
> >> index f1f93d85f50d..88819bc395f8 100644
> >> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.h
> >> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
> >> @@ -24,6 +24,8 @@ struct brcmnand_soc {
> >> void (*ctlrdy_set_enabled)(struct brcmnand_soc *soc, bool en);
> >> void (*prepare_data_bus)(struct brcmnand_soc *soc, bool prepare,
> >> bool is_param);
> >> + void (*read_data_bus)(struct brcmnand_soc *soc, void __iomem *flash_cache,
> >> + u32 *buffer, int fc_words, bool is_param);
> >> const struct brcmnand_io_ops *ops;
> >> };
> >> > >
> > Thanks,
> > Miquèl
> >
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-08 6:15 ` Miquel Raynal
@ 2023-06-08 19:04 ` William Zhang
0 siblings, 0 replies; 44+ messages in thread
From: William Zhang @ 2023-06-08 19:04 UTC (permalink / raw)
To: Miquel Raynal
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 8741 bytes --]
On 06/07/2023 11:15 PM, Miquel Raynal wrote:
> Hi William,
>
> william.zhang@broadcom.com wrote on Wed, 7 Jun 2023 13:12:02 -0700:
>
>> Hi Miquel,
>>
>> On 06/07/2023 01:20 AM, Miquel Raynal wrote:
>>> Hi William,
>>>
>>> william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:50 -0700:
>>>
>>>> The BCMBCA broadband SoC integrates the NAND controller differently than
>>>> STB, iProc and other SoCs. It has different endianness for NAND cache
>>>> data and ONFI parameter data.
>>>>
>>>> Add a SoC read data bus shim for BCMBCA to meet the specific SoC need
>>>> and performance improvement using the optimized memcpy function on NAND
>>>> cache memory.
>>>>
>>>> Signed-off-by: William Zhang <william.zhang@broadcom.com>
>>>> ---
>>>>
>>>> drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c | 36 +++++++++++++++++
>>>> drivers/mtd/nand/raw/brcmnand/brcmnand.c | 44 ++++++++++++++-------
>>>> drivers/mtd/nand/raw/brcmnand/brcmnand.h | 2 +
>>>> 3 files changed, 68 insertions(+), 14 deletions(-)
>>>>
>>>> diff --git a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
>>>> index 7e48b6a0bfa2..899103a62c98 100644
>>>> --- a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
>>>> +++ b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
>>>> @@ -26,6 +26,18 @@ enum {
>>>> BCMBCA_CTLRDY = BIT(4),
>>>> };
>>>> >> +#if defined(CONFIG_ARM64)
>>>> +#define ALIGN_REQ 8
>>>> +#else
>>>> +#define ALIGN_REQ 4
>>>> +#endif
>>>> +
>>>> +static inline bool bcmbca_nand_is_buf_aligned(void *flash_cache, void *buffer)
>>>> +{
>>>> + return IS_ALIGNED((uintptr_t)buffer, ALIGN_REQ) &&
>>>> + IS_ALIGNED((uintptr_t)flash_cache, ALIGN_REQ);
>>>> +}
>>>> +
>>>> static bool bcmbca_nand_intc_ack(struct brcmnand_soc *soc)
>>>> {
>>>> struct bcmbca_nand_soc *priv =
>>>> @@ -56,6 +68,29 @@ static void bcmbca_nand_intc_set(struct brcmnand_soc *soc, bool en)
>>>> brcmnand_writel(val, mmio);
>>>> }
>>>> >> +static void bcmbca_read_data_bus(struct brcmnand_soc *soc,
>>>> + void __iomem *flash_cache, u32 *buffer,
>>>> + int fc_words, bool is_param)
>>>> +{
>>>> + int i;
>>>> +
>>>> + if (!is_param) {
>>>> + /*
>>>> + * memcpy can do unaligned aligned access depending on source
>>>> + * and dest address, which is incompatible with nand cache. Fallback
>>>> + * to the memcpy for io version
>>>> + */
>>>> + if (bcmbca_nand_is_buf_aligned(flash_cache, buffer))
>>>> + memcpy((void *)buffer, (void *)flash_cache, fc_words * 4);
>>>> + else
>>>> + memcpy_fromio((void *)buffer, (void *)flash_cache, fc_words * 4);
>>>> + } else {
>>>> + /* Flash cache has same endian as the host for parameter pages */
>>>> + for (i = 0; i < fc_words; i++, buffer++)
>>>> + *buffer = __raw_readl(flash_cache + i * 4);
>>>> + }
>>>> +}
>>>> +
>>>> static int bcmbca_nand_probe(struct platform_device *pdev)
>>>> {
>>>> struct device *dev = &pdev->dev;
>>>> @@ -75,6 +110,7 @@ static int bcmbca_nand_probe(struct platform_device *pdev)
>>>> >> soc->ctlrdy_ack = bcmbca_nand_intc_ack;
>>>> soc->ctlrdy_set_enabled = bcmbca_nand_intc_set;
>>>> + soc->read_data_bus = bcmbca_read_data_bus;
>>>> >> return brcmnand_probe(pdev, soc);
>>>> }
>>>> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
>>>> index d920e88c7f5b..656be4d73016 100644
>>>> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
>>>> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
>>>> @@ -814,6 +814,30 @@ static inline u32 edu_readl(struct brcmnand_controller *ctrl,
>>>> return brcmnand_readl(ctrl->edu_base + offs);
>>>> }
>>>> >> +static inline void brcmnand_read_data_bus(struct brcmnand_controller *ctrl,
>>>> + void __iomem *flash_cache, u32 *buffer,
>>>> + int fc_words, bool is_param)
>>>
>>> I strongly dislike this "is_param" boolean.
>>>
>>> When is the data in host endianness? When is it not?
>> This is little bit complicated. We have two type data read from nand cache. One for page read and the other for parameter and onfi data read from the controller side. But it depends on how SoC integrate the nand cache to system. In broadband SoC, both page and parameter data are in host endianess but other SoCs is not the same.
>>
>> I am open to suggestion for is_param function argument but to factor out this common code in more structured way, I don't see other way around.
>
> Alright, so this is SoC dependent, very well -> a (sub)compatible per
> SoC + platform data associated to it with the right function.
>
Right we have per SoC compatible and can have per SoC implementation but
I prefer to have a default implementation in the brcmnand.c because
right now only bcmcba SoC need some different handling. The other four
implementations are the same.
To make the code a little more readable and less complicated, I am
thinking to separate the brcmnand_read_data_bus into
brcmnand_read_page_data and brcmnand_read_param_data as default in
brcmnand.c. But bcmbca will override them. Would that be okay with you?
>>> If we think about an exec_op() conversion and drop cmdfunc(), what
>>> would be the discriminant?
>>>
>> If we need to implement exec_op in the future, the data is not coming from nand cache but some other low level data register which may not subject to the endianess issue.
>
> Can't you use the same cache all the time here as well then? And avoid
> the need for this overly complex logic?
>
Unfortunately exec_op will not use nand cache for parameter data read
but some other low level data register. This is dictated by the controller.
>>
>>>> +{
>>>> + struct brcmnand_soc *soc = ctrl->soc;
>>>> + int i;
>>>> +
>>>> + if (soc->read_data_bus) {
>>>> + soc->read_data_bus(soc, flash_cache, buffer, fc_words, is_param);
>>>> + } else {
>>>> + if (!is_param) {
>>>> + for (i = 0; i < fc_words; i++, buffer++)
>>>> + *buffer = brcmnand_read_fc(ctrl, i);
>>>> + } else {
>>>> + for (i = 0; i < fc_words; i++)
>>>> + /*
>>>> + * Flash cache is big endian for parameter pages, at
>>>> + * least on STB SoCs
>>>> + */
>>>> + buffer[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
>>>> + }
>>>> + }
>>>> +}
>>>> +
>>>> static void brcmnand_clear_ecc_addr(struct brcmnand_controller *ctrl)
>>>> {
>>>> >> @@ -1811,20 +1835,11 @@ static void brcmnand_cmdfunc(struct nand_chip *chip, unsigned command,
>>>> native_cmd == CMD_PARAMETER_CHANGE_COL) {
>>>> /* Copy flash cache word-wise */
>>>> u32 *flash_cache = (u32 *)ctrl->flash_cache;
>>>> - int i;
>>>> >> brcmnand_soc_data_bus_prepare(ctrl->soc, true);
>>>> >> - /*
>>>> - * Must cache the FLASH_CACHE now, since changes in
>>>> - * SECTOR_SIZE_1K may invalidate it
>>>> - */
>>>> - for (i = 0; i < FC_WORDS; i++)
>>>> - /*
>>>> - * Flash cache is big endian for parameter pages, at
>>>> - * least on STB SoCs
>>>> - */
>>>> - flash_cache[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
>>>> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, flash_cache,
>>>> + FC_WORDS, true);
>>>> >> brcmnand_soc_data_bus_unprepare(ctrl->soc, true);
>>>> >> @@ -2137,7 +2152,7 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
>>>> {
>>>> struct brcmnand_host *host = nand_get_controller_data(chip);
>>>> struct brcmnand_controller *ctrl = host->ctrl;
>>>> - int i, j, ret = 0;
>>>> + int i, ret = 0;
>>>> >> brcmnand_clear_ecc_addr(ctrl);
>>>> >> @@ -2150,8 +2165,9 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
>>>> if (likely(buf)) {
>>>> brcmnand_soc_data_bus_prepare(ctrl->soc, false);
>>>> >> - for (j = 0; j < FC_WORDS; j++, buf++)
>>>> - *buf = brcmnand_read_fc(ctrl, j);
>>>> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, buf,
>>>> + FC_WORDS, false);
>>>> + buf += FC_WORDS;
>>>> >> brcmnand_soc_data_bus_unprepare(ctrl->soc, false);
>>>> }
>>>> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
>>>> index f1f93d85f50d..88819bc395f8 100644
>>>> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.h
>>>> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
>>>> @@ -24,6 +24,8 @@ struct brcmnand_soc {
>>>> void (*ctlrdy_set_enabled)(struct brcmnand_soc *soc, bool en);
>>>> void (*prepare_data_bus)(struct brcmnand_soc *soc, bool prepare,
>>>> bool is_param);
>>>> + void (*read_data_bus)(struct brcmnand_soc *soc, void __iomem *flash_cache,
>>>> + u32 *buffer, int fc_words, bool is_param);
>>>> const struct brcmnand_io_ops *ops;
>>>> };
>>>> > >
>>> Thanks,
>>> Miquèl
>>>
>
>
> Thanks,
> Miquèl
>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-08 6:18 ` Miquel Raynal
@ 2023-06-08 19:10 ` William Zhang
2023-06-09 8:35 ` Miquel Raynal
0 siblings, 1 reply; 44+ messages in thread
From: William Zhang @ 2023-06-08 19:10 UTC (permalink / raw)
To: Miquel Raynal
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 8294 bytes --]
On 06/07/2023 11:18 PM, Miquel Raynal wrote:
> Hi William,
>
> william.zhang@broadcom.com wrote on Wed, 7 Jun 2023 13:24:23 -0700:
>
>> Hi Miquel,
>>
>> On 06/07/2023 01:22 AM, Miquel Raynal wrote:
>>> Hi William,
>>>
>>> william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:50 -0700:
>>>
>>>> The BCMBCA broadband SoC integrates the NAND controller differently than
>>>> STB, iProc and other SoCs. It has different endianness for NAND cache
>>>> data and ONFI parameter data.
>>>>
>>>> Add a SoC read data bus shim for BCMBCA to meet the specific SoC need
>>>> and performance improvement using the optimized memcpy function on NAND
>>>> cache memory.
>>>>
>>>> Signed-off-by: William Zhang <william.zhang@broadcom.com>
>>>> ---
>>>>
>>>> drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c | 36 +++++++++++++++++
>>>> drivers/mtd/nand/raw/brcmnand/brcmnand.c | 44 ++++++++++++++-------
>>>> drivers/mtd/nand/raw/brcmnand/brcmnand.h | 2 +
>>>> 3 files changed, 68 insertions(+), 14 deletions(-)
>>>>
>>>> diff --git a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
>>>> index 7e48b6a0bfa2..899103a62c98 100644
>>>> --- a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
>>>> +++ b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
>>>> @@ -26,6 +26,18 @@ enum {
>>>> BCMBCA_CTLRDY = BIT(4),
>>>> };
>>>> >> +#if defined(CONFIG_ARM64)
>>>> +#define ALIGN_REQ 8
>>>> +#else
>>>> +#define ALIGN_REQ 4
>>>> +#endif
>>>> +
>>>> +static inline bool bcmbca_nand_is_buf_aligned(void *flash_cache, void *buffer)
>>>> +{
>>>> + return IS_ALIGNED((uintptr_t)buffer, ALIGN_REQ) &&
>>>> + IS_ALIGNED((uintptr_t)flash_cache, ALIGN_REQ);
>>>> +}
>>>> +
>>>> static bool bcmbca_nand_intc_ack(struct brcmnand_soc *soc)
>>>> {
>>>> struct bcmbca_nand_soc *priv =
>>>> @@ -56,6 +68,29 @@ static void bcmbca_nand_intc_set(struct brcmnand_soc *soc, bool en)
>>>> brcmnand_writel(val, mmio);
>>>> }
>>>> >> +static void bcmbca_read_data_bus(struct brcmnand_soc *soc,
>>>> + void __iomem *flash_cache, u32 *buffer,
>>>> + int fc_words, bool is_param)
>>>> +{
>>>> + int i;
>>>> +
>>>> + if (!is_param) {
>>>> + /*
>>>> + * memcpy can do unaligned aligned access depending on source
>>>> + * and dest address, which is incompatible with nand cache. Fallback
>>>> + * to the memcpy for io version
>>>> + */
>>>> + if (bcmbca_nand_is_buf_aligned(flash_cache, buffer))
>>>> + memcpy((void *)buffer, (void *)flash_cache, fc_words * 4);
>>>> + else
>>>> + memcpy_fromio((void *)buffer, (void *)flash_cache, fc_words * 4);
>>>> + } else {
>>>> + /* Flash cache has same endian as the host for parameter pages */
>>>> + for (i = 0; i < fc_words; i++, buffer++)
>>>> + *buffer = __raw_readl(flash_cache + i * 4);
>>>> + }
>>>> +}
>>>> +
>>>> static int bcmbca_nand_probe(struct platform_device *pdev)
>>>> {
>>>> struct device *dev = &pdev->dev;
>>>> @@ -75,6 +110,7 @@ static int bcmbca_nand_probe(struct platform_device *pdev)
>>>> >> soc->ctlrdy_ack = bcmbca_nand_intc_ack;
>>>> soc->ctlrdy_set_enabled = bcmbca_nand_intc_set;
>>>> + soc->read_data_bus = bcmbca_read_data_bus;
>>>> >> return brcmnand_probe(pdev, soc);
>>>> }
>>>> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
>>>> index d920e88c7f5b..656be4d73016 100644
>>>> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
>>>> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
>>>> @@ -814,6 +814,30 @@ static inline u32 edu_readl(struct brcmnand_controller *ctrl,
>>>> return brcmnand_readl(ctrl->edu_base + offs);
>>>> }
>>>> >> +static inline void brcmnand_read_data_bus(struct brcmnand_controller *ctrl,
>>>> + void __iomem *flash_cache, u32 *buffer,
>>>> + int fc_words, bool is_param)
>>>> +{
>>>> + struct brcmnand_soc *soc = ctrl->soc;
>>>> + int i;
>>>> +
>>>> + if (soc->read_data_bus) {
>>>> + soc->read_data_bus(soc, flash_cache, buffer, fc_words, is_param);
>>>> + } else {
>>>> + if (!is_param) {
>>>> + for (i = 0; i < fc_words; i++, buffer++)
>>>> + *buffer = brcmnand_read_fc(ctrl, i);
>>>> + } else {
>>>> + for (i = 0; i < fc_words; i++)
>>>> + /*
>>>> + * Flash cache is big endian for parameter pages, at
>>>> + * least on STB SoCs
>>>> + */
>>>> + buffer[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
>>>> + }
>>>> + }
>>>
>>> Perhaps we could have a single function that is statically assigned at
>>> probe time instead of a first helper with two conditions which calls in
>>> one case another hook... This can be simplified I guess.
>>>
>> Well this will need to be done at the SoC specific implementation level (bcm<xxx>_nand.c) and each SoC will need to have either general data bus read func with is_param option or data_bus_read_page, data_bus_read_param.
>
> You told me in case we would use exec_op we could avoid the param
> cache. If that's true then the whole support can be simplified.
>
Correct we may possibly unified the parameter data read but exec_op is
long shot and we are not fully ready for that yet. It also depends on if
the low level data register has endianess difference for the parameter
data between difference SoCs.
So I would like to push the current implementation and we can explore
the exec_op option late which will be a much big and complete different
implementation.
>> Not sure how much this can be simplified... Or we have default
>> implementation in brcmnand.c but then there is one condition check
>> too. Page read is done at 512 bytes burst. One or two conditions
>> check outside of the per 512 bytes read loop does not sounds too bad
>> if performance is concern.
>
> It is unreadable. That is my main concern.
>
>>
>>>> +}
>>>> +
>>>> static void brcmnand_clear_ecc_addr(struct brcmnand_controller *ctrl)
>>>> {
>>>> >> @@ -1811,20 +1835,11 @@ static void brcmnand_cmdfunc(struct nand_chip *chip, unsigned command,
>>>> native_cmd == CMD_PARAMETER_CHANGE_COL) {
>>>> /* Copy flash cache word-wise */
>>>> u32 *flash_cache = (u32 *)ctrl->flash_cache;
>>>> - int i;
>>>> >> brcmnand_soc_data_bus_prepare(ctrl->soc, true);
>>>> >> - /*
>>>> - * Must cache the FLASH_CACHE now, since changes in
>>>> - * SECTOR_SIZE_1K may invalidate it
>>>> - */
>>>> - for (i = 0; i < FC_WORDS; i++)
>>>> - /*
>>>> - * Flash cache is big endian for parameter pages, at
>>>> - * least on STB SoCs
>>>> - */
>>>> - flash_cache[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
>>>> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, flash_cache,
>>>> + FC_WORDS, true);
>>>> >> brcmnand_soc_data_bus_unprepare(ctrl->soc, true);
>>>> >> @@ -2137,7 +2152,7 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
>>>> {
>>>> struct brcmnand_host *host = nand_get_controller_data(chip);
>>>> struct brcmnand_controller *ctrl = host->ctrl;
>>>> - int i, j, ret = 0;
>>>> + int i, ret = 0;
>>>> >> brcmnand_clear_ecc_addr(ctrl);
>>>> >> @@ -2150,8 +2165,9 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
>>>> if (likely(buf)) {
>>>> brcmnand_soc_data_bus_prepare(ctrl->soc, false);
>>>> >> - for (j = 0; j < FC_WORDS; j++, buf++)
>>>> - *buf = brcmnand_read_fc(ctrl, j);
>>>> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, buf,
>>>> + FC_WORDS, false);
>>>> + buf += FC_WORDS;
>>>> >> brcmnand_soc_data_bus_unprepare(ctrl->soc, false);
>>>> }
>>>> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
>>>> index f1f93d85f50d..88819bc395f8 100644
>>>> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.h
>>>> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
>>>> @@ -24,6 +24,8 @@ struct brcmnand_soc {
>>>> void (*ctlrdy_set_enabled)(struct brcmnand_soc *soc, bool en);
>>>> void (*prepare_data_bus)(struct brcmnand_soc *soc, bool prepare,
>>>> bool is_param);
>>>> + void (*read_data_bus)(struct brcmnand_soc *soc, void __iomem *flash_cache,
>>>> + u32 *buffer, int fc_words, bool is_param);
>>>> const struct brcmnand_io_ops *ops;
>>>> };
>>>> > >
>>> Thanks,
>>> Miquèl
>>>
>
>
> Thanks,
> Miquèl
>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-08 19:10 ` William Zhang
@ 2023-06-09 8:35 ` Miquel Raynal
2023-06-09 19:16 ` William Zhang
0 siblings, 1 reply; 44+ messages in thread
From: Miquel Raynal @ 2023-06-09 8:35 UTC (permalink / raw)
To: William Zhang
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
Hi William,
william.zhang@broadcom.com wrote on Thu, 8 Jun 2023 12:10:06 -0700:
> On 06/07/2023 11:18 PM, Miquel Raynal wrote:
> > Hi William,
> >
> > william.zhang@broadcom.com wrote on Wed, 7 Jun 2023 13:24:23 -0700:
> >
> >> Hi Miquel,
> >>
> >> On 06/07/2023 01:22 AM, Miquel Raynal wrote:
> >>> Hi William,
> >>>
> >>> william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:50 -0700:
> >>> >>>> The BCMBCA broadband SoC integrates the NAND controller differently than
> >>>> STB, iProc and other SoCs. It has different endianness for NAND cache
> >>>> data and ONFI parameter data.
> >>>>
> >>>> Add a SoC read data bus shim for BCMBCA to meet the specific SoC need
> >>>> and performance improvement using the optimized memcpy function on NAND
> >>>> cache memory.
> >>>>
> >>>> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> >>>> ---
> >>>>
> >>>> drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c | 36 +++++++++++++++++
> >>>> drivers/mtd/nand/raw/brcmnand/brcmnand.c | 44 ++++++++++++++-------
> >>>> drivers/mtd/nand/raw/brcmnand/brcmnand.h | 2 +
> >>>> 3 files changed, 68 insertions(+), 14 deletions(-)
> >>>>
> >>>> diff --git a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
> >>>> index 7e48b6a0bfa2..899103a62c98 100644
> >>>> --- a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
> >>>> +++ b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
> >>>> @@ -26,6 +26,18 @@ enum {
> >>>> BCMBCA_CTLRDY = BIT(4),
> >>>> };
> >>>> >> +#if defined(CONFIG_ARM64)
> >>>> +#define ALIGN_REQ 8
> >>>> +#else
> >>>> +#define ALIGN_REQ 4
> >>>> +#endif
> >>>> +
> >>>> +static inline bool bcmbca_nand_is_buf_aligned(void *flash_cache, void *buffer)
> >>>> +{
> >>>> + return IS_ALIGNED((uintptr_t)buffer, ALIGN_REQ) &&
> >>>> + IS_ALIGNED((uintptr_t)flash_cache, ALIGN_REQ);
> >>>> +}
> >>>> +
> >>>> static bool bcmbca_nand_intc_ack(struct brcmnand_soc *soc)
> >>>> {
> >>>> struct bcmbca_nand_soc *priv =
> >>>> @@ -56,6 +68,29 @@ static void bcmbca_nand_intc_set(struct brcmnand_soc *soc, bool en)
> >>>> brcmnand_writel(val, mmio);
> >>>> }
> >>>> >> +static void bcmbca_read_data_bus(struct brcmnand_soc *soc,
> >>>> + void __iomem *flash_cache, u32 *buffer,
> >>>> + int fc_words, bool is_param)
> >>>> +{
> >>>> + int i;
> >>>> +
> >>>> + if (!is_param) {
> >>>> + /*
> >>>> + * memcpy can do unaligned aligned access depending on source
> >>>> + * and dest address, which is incompatible with nand cache. Fallback
> >>>> + * to the memcpy for io version
> >>>> + */
> >>>> + if (bcmbca_nand_is_buf_aligned(flash_cache, buffer))
> >>>> + memcpy((void *)buffer, (void *)flash_cache, fc_words * 4);
> >>>> + else
> >>>> + memcpy_fromio((void *)buffer, (void *)flash_cache, fc_words * 4);
> >>>> + } else {
> >>>> + /* Flash cache has same endian as the host for parameter pages */
> >>>> + for (i = 0; i < fc_words; i++, buffer++)
> >>>> + *buffer = __raw_readl(flash_cache + i * 4);
> >>>> + }
> >>>> +}
> >>>> +
> >>>> static int bcmbca_nand_probe(struct platform_device *pdev)
> >>>> {
> >>>> struct device *dev = &pdev->dev;
> >>>> @@ -75,6 +110,7 @@ static int bcmbca_nand_probe(struct platform_device *pdev)
> >>>> >> soc->ctlrdy_ack = bcmbca_nand_intc_ack;
> >>>> soc->ctlrdy_set_enabled = bcmbca_nand_intc_set;
> >>>> + soc->read_data_bus = bcmbca_read_data_bus;
> >>>> >> return brcmnand_probe(pdev, soc);
> >>>> }
> >>>> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> >>>> index d920e88c7f5b..656be4d73016 100644
> >>>> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> >>>> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> >>>> @@ -814,6 +814,30 @@ static inline u32 edu_readl(struct brcmnand_controller *ctrl,
> >>>> return brcmnand_readl(ctrl->edu_base + offs);
> >>>> }
> >>>> >> +static inline void brcmnand_read_data_bus(struct brcmnand_controller *ctrl,
> >>>> + void __iomem *flash_cache, u32 *buffer,
> >>>> + int fc_words, bool is_param)
> >>>> +{
> >>>> + struct brcmnand_soc *soc = ctrl->soc;
> >>>> + int i;
> >>>> +
> >>>> + if (soc->read_data_bus) {
> >>>> + soc->read_data_bus(soc, flash_cache, buffer, fc_words, is_param);
> >>>> + } else {
> >>>> + if (!is_param) {
> >>>> + for (i = 0; i < fc_words; i++, buffer++)
> >>>> + *buffer = brcmnand_read_fc(ctrl, i);
> >>>> + } else {
> >>>> + for (i = 0; i < fc_words; i++)
> >>>> + /*
> >>>> + * Flash cache is big endian for parameter pages, at
> >>>> + * least on STB SoCs
> >>>> + */
> >>>> + buffer[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
> >>>> + }
> >>>> + }
> >>>
> >>> Perhaps we could have a single function that is statically assigned at
> >>> probe time instead of a first helper with two conditions which calls in
> >>> one case another hook... This can be simplified I guess.
> >>> >> Well this will need to be done at the SoC specific implementation level (bcm<xxx>_nand.c) and each SoC will need to have either general data bus read func with is_param option or data_bus_read_page, data_bus_read_param.
> >
> > You told me in case we would use exec_op we could avoid the param
> > cache. If that's true then the whole support can be simplified.
> >
> Correct we may possibly unified the parameter data read but exec_op is long shot and we are not fully ready for that yet. It also depends on if the low level data register has endianess difference for the parameter data between difference SoCs.
>
> So I would like to push the current implementation and we can explore the exec_op option late which will be a much big and complete different implementation.
I am sorry but this series is totally backwards, you're trying to guess
what comes next with the 'is_param' thing, it's exactly what we are
fighting against since 2017. There are plenty of ->exec_op()
conversions out there, I don't believe this one will be harder. You
need to convert the driver to this new API and get rid of this whole
endianness non-sense to simplify a lot the driver.
>
> >> Not sure how much this can be simplified... Or we have default
> >> implementation in brcmnand.c but then there is one condition check
> >> too. Page read is done at 512 bytes burst. One or two conditions
> >> check outside of the per 512 bytes read loop does not sounds too bad
> >> if performance is concern.
> >
> > It is unreadable. That is my main concern.
> >
> >>
> >>>> +}
> >>>> +
> >>>> static void brcmnand_clear_ecc_addr(struct brcmnand_controller *ctrl)
> >>>> {
> >>>> >> @@ -1811,20 +1835,11 @@ static void brcmnand_cmdfunc(struct nand_chip *chip, unsigned command,
> >>>> native_cmd == CMD_PARAMETER_CHANGE_COL) {
> >>>> /* Copy flash cache word-wise */
> >>>> u32 *flash_cache = (u32 *)ctrl->flash_cache;
> >>>> - int i;
> >>>> >> brcmnand_soc_data_bus_prepare(ctrl->soc, true);
> >>>> >> - /*
> >>>> - * Must cache the FLASH_CACHE now, since changes in
> >>>> - * SECTOR_SIZE_1K may invalidate it
> >>>> - */
> >>>> - for (i = 0; i < FC_WORDS; i++)
> >>>> - /*
> >>>> - * Flash cache is big endian for parameter pages, at
> >>>> - * least on STB SoCs
> >>>> - */
> >>>> - flash_cache[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
> >>>> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, flash_cache,
> >>>> + FC_WORDS, true);
> >>>> >> brcmnand_soc_data_bus_unprepare(ctrl->soc, true);
> >>>> >> @@ -2137,7 +2152,7 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
> >>>> {
> >>>> struct brcmnand_host *host = nand_get_controller_data(chip);
> >>>> struct brcmnand_controller *ctrl = host->ctrl;
> >>>> - int i, j, ret = 0;
> >>>> + int i, ret = 0;
> >>>> >> brcmnand_clear_ecc_addr(ctrl);
> >>>> >> @@ -2150,8 +2165,9 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
> >>>> if (likely(buf)) {
> >>>> brcmnand_soc_data_bus_prepare(ctrl->soc, false);
> >>>> >> - for (j = 0; j < FC_WORDS; j++, buf++)
> >>>> - *buf = brcmnand_read_fc(ctrl, j);
> >>>> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, buf,
> >>>> + FC_WORDS, false);
> >>>> + buf += FC_WORDS;
> >>>> >> brcmnand_soc_data_bus_unprepare(ctrl->soc, false);
> >>>> }
> >>>> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
> >>>> index f1f93d85f50d..88819bc395f8 100644
> >>>> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.h
> >>>> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
> >>>> @@ -24,6 +24,8 @@ struct brcmnand_soc {
> >>>> void (*ctlrdy_set_enabled)(struct brcmnand_soc *soc, bool en);
> >>>> void (*prepare_data_bus)(struct brcmnand_soc *soc, bool prepare,
> >>>> bool is_param);
> >>>> + void (*read_data_bus)(struct brcmnand_soc *soc, void __iomem *flash_cache,
> >>>> + u32 *buffer, int fc_words, bool is_param);
> >>>> const struct brcmnand_io_ops *ops;
> >>>> };
> >>>> > >
> >>> Thanks,
> >>> Miquèl
> >>> > >
> > Thanks,
> > Miquèl
> >
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 05/12] dt-bindings: mtd: brcmnand: Updates for bcmbca SoCs
2023-06-07 20:01 ` William Zhang
@ 2023-06-09 8:58 ` Miquel Raynal
2023-06-09 19:05 ` William Zhang
0 siblings, 1 reply; 44+ messages in thread
From: Miquel Raynal @ 2023-06-09 8:58 UTC (permalink / raw)
To: William Zhang
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, devicetree, linux-kernel,
Krzysztof Kozlowski, Vignesh Raghavendra, Richard Weinberger,
Kamal Dasu, Rob Herring
Hi William,
william.zhang@broadcom.com wrote on Wed, 7 Jun 2023 13:01:56 -0700:
> Hi Miquel,
>
> On 06/07/2023 01:14 AM, Miquel Raynal wrote:
> > Hi William,
> >
> > william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:45 -0700:
> >
> >> Use new compatiable brcm,nand-bcmbca to support BCMBCA broadband
> >> product. The old compatible string is still kept in the driver so old
> >> dtb can still work.
> >>
> >> Add brcm,nand-use-wp property to have an option for disabling this
> >> feature on broadband board design that does not use write protection.
> >> Add brcm,nand-ecc-use-strap to get ecc setting from board strap for
> >> broadband board designs because they do not specify ecc setting in dts
> >> but rather using the strap setting.
> >>
> >> Remove the requirement of interrupts and interrupt-names properties to
> >> reflect the driver code.
> >>
> >> This patch also includes a few minor fixes to the BCM63xx compatibles
> >> and add myself to the list of maintainers.
> >>
> >> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> >> ---
> >>
> >> .../bindings/mtd/brcm,brcmnand.yaml | 64 +++++++++++++------
> >> 1 file changed, 43 insertions(+), 21 deletions(-)
> >>
> >> diff --git a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
> >> index 1571024aa119..1fe1c166a9db 100644
> >> --- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
> >> +++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
> >> @@ -9,6 +9,7 @@ title: Broadcom STB NAND Controller
> >> maintainers:
> >> - Brian Norris <computersforpeace@gmail.com>
> >> - Kamal Dasu <kdasu.kdev@gmail.com>
> >> + - William Zhang <william.zhang@broadcom.com>
> >> >> description: |
> >> The Broadcom Set-Top Box NAND controller supports low-level access to raw NAND
> >> @@ -18,9 +19,10 @@ description: |
> >> supports basic PROGRAM and READ functions, among other features.
> >> >> This controller was originally designed for STB SoCs (BCM7xxx) but is now
> >> - available on a variety of Broadcom SoCs, including some BCM3xxx, BCM63xx, and
> >> - iProc/Cygnus. Its history includes several similar (but not fully register
> >> - compatible) versions.
> >> + available on a variety of Broadcom SoCs, including some BCM3xxx, MIPS based
> >> + Broadband SoC (BCM63xx), ARM based Broadband SoC (BCMBCA) and iProc/Cygnus.
> >> + Its history includes several similar (but not fully register compatible)
> >> + versions.
> >> >> -- Additional SoC-specific NAND controller properties --
> >> >> @@ -53,9 +55,9 @@ properties:
> >> - brcm,brcmnand-v7.2
> >> - brcm,brcmnand-v7.3
> >> - const: brcm,brcmnand
> >> - - description: BCM63138 SoC-specific NAND controller
> >> + - description: BCMBCA SoC-specific NAND controller
> >> items:
> >> - - const: brcm,nand-bcm63138
> >> + - const: brcm,nand-bcmbca
> >> - enum:
> >> - brcm,brcmnand-v7.0
> >> - brcm,brcmnand-v7.1
> >> @@ -65,11 +67,15 @@ properties:
> >> - const: brcm,nand-iproc
> >> - const: brcm,brcmnand-v6.1
> >> - const: brcm,brcmnand
> >> - - description: BCM63168 SoC-specific NAND controller
> >> + - description: BCM63xx SoC-specific NAND controller
> >> items:
> >> - - const: brcm,nand-bcm63168
> >> - - const: brcm,nand-bcm6368
> >> - - const: brcm,brcmnand-v4.0
> >> + - enum:
> >> + - brcm,nand-bcm63168
> >> + - brcm,nand-bcm6368
> >> + - enum:
> >> + - brcm,brcmnand-v2.1
> >> + - brcm,brcmnand-v2.2
> >> + - brcm,brcmnand-v4.0
> >> - const: brcm,brcmnand
> >> >> reg:
> >> @@ -111,6 +117,19 @@ properties:
> >> earlier versions of this core that include WP
> >> type: boolean
> >> >> + brcm,nand-use-wp:
> >> + description:
> >> + Use this integer to indicate if board design uses
> >> + controller's write protection feature and connects its
> >> + NAND_WPb pin to nand chip's WP_L pin. Driver defaults to
> >> + use this feature when this property does not exist.
> >> + Set to 0 if WP pins are not connected and feature is not
> >> + used. Set to 1 if WP pins are connected and feature is used.
> >> + Set to 2 if WP pins are connected but disable this feature
> >> + through driver that sets controller to output high on NAND_WPb.
> >> + $ref: /schemas/types.yaml#/definitions/uint32
> >> + enum: [0, 1, 2]
> >
> > Perhaps strings would be welcome. I'll let binding maintainers say what
> > they think of it.
> >
> Practically there is really just use cases of 0 and 1. I could use a bool flag but to keep consistent with the driver code and in case there is any existing usage of 2.
>
> >> +
> >> patternProperties:
> >> "^nand@[a-f0-9]$":
> >> type: object
> >> @@ -136,13 +155,23 @@ patternProperties:
> >> layout.
> >> $ref: /schemas/types.yaml#/definitions/uint32
> >> >> + brcm,nand-ecc-use-strap:
> >> + description:
> >> + This flag is used by the driver to get the ecc strength and
> >> + spare area size from the SoC NAND boot strap setting. This
> >> + is commonly used by the BCMBCA SoC board design. If ecc
> >> + strength and spare area size are set by nand-ecc-strength
> >> + and brcm,nand-oob-sector-size in the dts, these settings
> >> + have precedence and override this flag.
> >> + $ref: /schemas/types.yaml#/definitions/flag
> >
> > How in practice do you access the strap value? Don't you need a phandle
> > over a specific area in the SoC?
> >
> The strap value is latched and stored in the NAND controller register so there is no extra phandle needed.
Ok.
>
> >> +
> >> allOf:
> >> - $ref: nand-controller.yaml#
> >> - if:
> >> properties:
> >> compatible:
> >> contains:
> >> - const: brcm,nand-bcm63138
> >> + const: brcm,nand-bcmbca
> >> then:
> >> properties:
> >> reg-names:
> >> @@ -153,7 +182,9 @@ allOf:
> >> properties:
> >> compatible:
> >> contains:
> >> - const: brcm,nand-bcm6368
> >> + enum:
> >> + - brcm,nand-bcm63168
> >> + - brcm,nand-bcm6368
> >> then:
> >> properties:
> >> reg-names:
> >> @@ -173,20 +204,12 @@ allOf:
> >> - const: nand
> >> - const: iproc-idm
> >> - const: iproc-ext
> >> - - if:
> >> - properties:
> >> - interrupts:
> >> - minItems: 2
> >> - then:
> >> - required:
> >> - - interrupt-names
> >
> > Why do you remove this? Removing "interrupts" from the required
> > properties is fine, but constraining the interrupts property when it is
> > relevant is still expected.
> >
> There is no requirement for interrupt name even if it have two interrupts. Driver code does not use interrupt name but the interrupt index instead.
It does not matter in this case how the driver uses the interrupts. If
names have been provided once in the bindings, you could expect another
project using the same bindings to use the interrupt names instead of
the order. So you must keep the names. Just don't mark them required it
they are.
>
> >> >> unevaluatedProperties: false
> >> >> required:
> >> - reg
> >> - reg-names
> >> - - interrupts
> >
> > This should be done in a separate patch.
> >
> I thought this is also related to my update for bcmbca chips because they don't need to interrupt and interrupt name.
The fact that the driver does not use the interrupts does not mean they
should not be described.
>
> >> >> examples:
> >> - |
> >> @@ -215,8 +238,7 @@ examples:
> >> };
> >> - |
> >> nand-controller@10000200 {
> >> - compatible = "brcm,nand-bcm63168", "brcm,nand-bcm6368",
> >> - "brcm,brcmnand-v4.0", "brcm,brcmnand";
> >> + compatible = "brcm,nand-bcm6368", "brcm,brcmnand-v2.1", "brcm,brcmnand";
> >> reg = <0x10000200 0x180>,
> >> <0x100000b0 0x10>,
> >> <0x10000600 0x200>;
> >
> >
> > Thanks,
> > Miquèl
> >
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 05/12] dt-bindings: mtd: brcmnand: Updates for bcmbca SoCs
2023-06-09 8:58 ` Miquel Raynal
@ 2023-06-09 19:05 ` William Zhang
2023-06-12 17:43 ` Miquel Raynal
0 siblings, 1 reply; 44+ messages in thread
From: William Zhang @ 2023-06-09 19:05 UTC (permalink / raw)
To: Miquel Raynal
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, devicetree, linux-kernel,
Krzysztof Kozlowski, Vignesh Raghavendra, Richard Weinberger,
Kamal Dasu, Rob Herring
[-- Attachment #1: Type: text/plain, Size: 8905 bytes --]
Hi Miquel,
On 06/09/2023 01:58 AM, Miquel Raynal wrote:
> Hi William,
>
> william.zhang@broadcom.com wrote on Wed, 7 Jun 2023 13:01:56 -0700:
>
>> Hi Miquel,
>>
>> On 06/07/2023 01:14 AM, Miquel Raynal wrote:
>>> Hi William,
>>>
>>> william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:45 -0700:
>>>
>>>> Use new compatiable brcm,nand-bcmbca to support BCMBCA broadband
>>>> product. The old compatible string is still kept in the driver so old
>>>> dtb can still work.
>>>>
>>>> Add brcm,nand-use-wp property to have an option for disabling this
>>>> feature on broadband board design that does not use write protection.
>>>> Add brcm,nand-ecc-use-strap to get ecc setting from board strap for
>>>> broadband board designs because they do not specify ecc setting in dts
>>>> but rather using the strap setting.
>>>>
>>>> Remove the requirement of interrupts and interrupt-names properties to
>>>> reflect the driver code.
>>>>
>>>> This patch also includes a few minor fixes to the BCM63xx compatibles
>>>> and add myself to the list of maintainers.
>>>>
>>>> Signed-off-by: William Zhang <william.zhang@broadcom.com>
>>>> ---
>>>>
>>>> .../bindings/mtd/brcm,brcmnand.yaml | 64 +++++++++++++------
>>>> 1 file changed, 43 insertions(+), 21 deletions(-)
>>>>
>>>> diff --git a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
>>>> index 1571024aa119..1fe1c166a9db 100644
>>>> --- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
>>>> +++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
>>>> @@ -9,6 +9,7 @@ title: Broadcom STB NAND Controller
>>>> maintainers:
>>>> - Brian Norris <computersforpeace@gmail.com>
>>>> - Kamal Dasu <kdasu.kdev@gmail.com>
>>>> + - William Zhang <william.zhang@broadcom.com>
>>>> >> description: |
>>>> The Broadcom Set-Top Box NAND controller supports low-level access to raw NAND
>>>> @@ -18,9 +19,10 @@ description: |
>>>> supports basic PROGRAM and READ functions, among other features.
>>>> >> This controller was originally designed for STB SoCs (BCM7xxx) but is now
>>>> - available on a variety of Broadcom SoCs, including some BCM3xxx, BCM63xx, and
>>>> - iProc/Cygnus. Its history includes several similar (but not fully register
>>>> - compatible) versions.
>>>> + available on a variety of Broadcom SoCs, including some BCM3xxx, MIPS based
>>>> + Broadband SoC (BCM63xx), ARM based Broadband SoC (BCMBCA) and iProc/Cygnus.
>>>> + Its history includes several similar (but not fully register compatible)
>>>> + versions.
>>>> >> -- Additional SoC-specific NAND controller properties --
>>>> >> @@ -53,9 +55,9 @@ properties:
>>>> - brcm,brcmnand-v7.2
>>>> - brcm,brcmnand-v7.3
>>>> - const: brcm,brcmnand
>>>> - - description: BCM63138 SoC-specific NAND controller
>>>> + - description: BCMBCA SoC-specific NAND controller
>>>> items:
>>>> - - const: brcm,nand-bcm63138
>>>> + - const: brcm,nand-bcmbca
>>>> - enum:
>>>> - brcm,brcmnand-v7.0
>>>> - brcm,brcmnand-v7.1
>>>> @@ -65,11 +67,15 @@ properties:
>>>> - const: brcm,nand-iproc
>>>> - const: brcm,brcmnand-v6.1
>>>> - const: brcm,brcmnand
>>>> - - description: BCM63168 SoC-specific NAND controller
>>>> + - description: BCM63xx SoC-specific NAND controller
>>>> items:
>>>> - - const: brcm,nand-bcm63168
>>>> - - const: brcm,nand-bcm6368
>>>> - - const: brcm,brcmnand-v4.0
>>>> + - enum:
>>>> + - brcm,nand-bcm63168
>>>> + - brcm,nand-bcm6368
>>>> + - enum:
>>>> + - brcm,brcmnand-v2.1
>>>> + - brcm,brcmnand-v2.2
>>>> + - brcm,brcmnand-v4.0
>>>> - const: brcm,brcmnand
>>>> >> reg:
>>>> @@ -111,6 +117,19 @@ properties:
>>>> earlier versions of this core that include WP
>>>> type: boolean
>>>> >> + brcm,nand-use-wp:
>>>> + description:
>>>> + Use this integer to indicate if board design uses
>>>> + controller's write protection feature and connects its
>>>> + NAND_WPb pin to nand chip's WP_L pin. Driver defaults to
>>>> + use this feature when this property does not exist.
>>>> + Set to 0 if WP pins are not connected and feature is not
>>>> + used. Set to 1 if WP pins are connected and feature is used.
>>>> + Set to 2 if WP pins are connected but disable this feature
>>>> + through driver that sets controller to output high on NAND_WPb.
>>>> + $ref: /schemas/types.yaml#/definitions/uint32
>>>> + enum: [0, 1, 2]
>>>
>>> Perhaps strings would be welcome. I'll let binding maintainers say what
>>> they think of it.
>>>
>> Practically there is really just use cases of 0 and 1. I could use a bool flag but to keep consistent with the driver code and in case there is any existing usage of 2.
>>
>>>> +
>>>> patternProperties:
>>>> "^nand@[a-f0-9]$":
>>>> type: object
>>>> @@ -136,13 +155,23 @@ patternProperties:
>>>> layout.
>>>> $ref: /schemas/types.yaml#/definitions/uint32
>>>> >> + brcm,nand-ecc-use-strap:
>>>> + description:
>>>> + This flag is used by the driver to get the ecc strength and
>>>> + spare area size from the SoC NAND boot strap setting. This
>>>> + is commonly used by the BCMBCA SoC board design. If ecc
>>>> + strength and spare area size are set by nand-ecc-strength
>>>> + and brcm,nand-oob-sector-size in the dts, these settings
>>>> + have precedence and override this flag.
>>>> + $ref: /schemas/types.yaml#/definitions/flag
>>>
>>> How in practice do you access the strap value? Don't you need a phandle
>>> over a specific area in the SoC?
>>>
>> The strap value is latched and stored in the NAND controller register so there is no extra phandle needed.
>
> Ok.
>
>>
>>>> +
>>>> allOf:
>>>> - $ref: nand-controller.yaml#
>>>> - if:
>>>> properties:
>>>> compatible:
>>>> contains:
>>>> - const: brcm,nand-bcm63138
>>>> + const: brcm,nand-bcmbca
>>>> then:
>>>> properties:
>>>> reg-names:
>>>> @@ -153,7 +182,9 @@ allOf:
>>>> properties:
>>>> compatible:
>>>> contains:
>>>> - const: brcm,nand-bcm6368
>>>> + enum:
>>>> + - brcm,nand-bcm63168
>>>> + - brcm,nand-bcm6368
>>>> then:
>>>> properties:
>>>> reg-names:
>>>> @@ -173,20 +204,12 @@ allOf:
>>>> - const: nand
>>>> - const: iproc-idm
>>>> - const: iproc-ext
>>>> - - if:
>>>> - properties:
>>>> - interrupts:
>>>> - minItems: 2
>>>> - then:
>>>> - required:
>>>> - - interrupt-names
>>>
>>> Why do you remove this? Removing "interrupts" from the required
>>> properties is fine, but constraining the interrupts property when it is
>>> relevant is still expected.
>>>
>> There is no requirement for interrupt name even if it have two interrupts. Driver code does not use interrupt name but the interrupt index instead.
>
> It does not matter in this case how the driver uses the interrupts. If
> names have been provided once in the bindings, you could expect another
> project using the same bindings to use the interrupt names instead of
> the order. So you must keep the names. Just don't mark them required it
> they are.
>
Certainly any dts file can still have interrupts names with one or two
interrupts but to my understand it is not required to have the name when
there are two interrupts. Anyway I will add this back so this constrain
remains.
>>
>>>> >> unevaluatedProperties: false
>>>> >> required:
>>>> - reg
>>>> - reg-names
>>>> - - interrupts
>>>
>>> This should be done in a separate patch.
>>>
>> I thought this is also related to my update for bcmbca chips because they don't need to interrupt and interrupt name.
>
> The fact that the driver does not use the interrupts does not mean they
> should not be described.
>
>>
>>>> >> examples:
>>>> - |
>>>> @@ -215,8 +238,7 @@ examples:
>>>> };
>>>> - |
>>>> nand-controller@10000200 {
>>>> - compatible = "brcm,nand-bcm63168", "brcm,nand-bcm6368",
>>>> - "brcm,brcmnand-v4.0", "brcm,brcmnand";
>>>> + compatible = "brcm,nand-bcm6368", "brcm,brcmnand-v2.1", "brcm,brcmnand";
>>>> reg = <0x10000200 0x180>,
>>>> <0x100000b0 0x10>,
>>>> <0x10000600 0x200>;
>>>
>>>
>>> Thanks,
>>> Miquèl
>>>
>
>
> Thanks,
> Miquèl
>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-09 8:35 ` Miquel Raynal
@ 2023-06-09 19:16 ` William Zhang
2023-06-12 17:49 ` Miquel Raynal
0 siblings, 1 reply; 44+ messages in thread
From: William Zhang @ 2023-06-09 19:16 UTC (permalink / raw)
To: Miquel Raynal
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 9957 bytes --]
Hi Miquel,
On 06/09/2023 01:35 AM, Miquel Raynal wrote:
> Hi William,
>
> william.zhang@broadcom.com wrote on Thu, 8 Jun 2023 12:10:06 -0700:
>
>> On 06/07/2023 11:18 PM, Miquel Raynal wrote:
>>> Hi William,
>>>
>>> william.zhang@broadcom.com wrote on Wed, 7 Jun 2023 13:24:23 -0700:
>>>
>>>> Hi Miquel,
>>>>
>>>> On 06/07/2023 01:22 AM, Miquel Raynal wrote:
>>>>> Hi William,
>>>>>
>>>>> william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:50 -0700:
>>>>> >>>> The BCMBCA broadband SoC integrates the NAND controller differently than
>>>>>> STB, iProc and other SoCs. It has different endianness for NAND cache
>>>>>> data and ONFI parameter data.
>>>>>>
>>>>>> Add a SoC read data bus shim for BCMBCA to meet the specific SoC need
>>>>>> and performance improvement using the optimized memcpy function on NAND
>>>>>> cache memory.
>>>>>>
>>>>>> Signed-off-by: William Zhang <william.zhang@broadcom.com>
>>>>>> ---
>>>>>>
>>>>>> drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c | 36 +++++++++++++++++
>>>>>> drivers/mtd/nand/raw/brcmnand/brcmnand.c | 44 ++++++++++++++-------
>>>>>> drivers/mtd/nand/raw/brcmnand/brcmnand.h | 2 +
>>>>>> 3 files changed, 68 insertions(+), 14 deletions(-)
>>>>>>
>>>>>> diff --git a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
>>>>>> index 7e48b6a0bfa2..899103a62c98 100644
>>>>>> --- a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
>>>>>> +++ b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
>>>>>> @@ -26,6 +26,18 @@ enum {
>>>>>> BCMBCA_CTLRDY = BIT(4),
>>>>>> };
>>>>>> >> +#if defined(CONFIG_ARM64)
>>>>>> +#define ALIGN_REQ 8
>>>>>> +#else
>>>>>> +#define ALIGN_REQ 4
>>>>>> +#endif
>>>>>> +
>>>>>> +static inline bool bcmbca_nand_is_buf_aligned(void *flash_cache, void *buffer)
>>>>>> +{
>>>>>> + return IS_ALIGNED((uintptr_t)buffer, ALIGN_REQ) &&
>>>>>> + IS_ALIGNED((uintptr_t)flash_cache, ALIGN_REQ);
>>>>>> +}
>>>>>> +
>>>>>> static bool bcmbca_nand_intc_ack(struct brcmnand_soc *soc)
>>>>>> {
>>>>>> struct bcmbca_nand_soc *priv =
>>>>>> @@ -56,6 +68,29 @@ static void bcmbca_nand_intc_set(struct brcmnand_soc *soc, bool en)
>>>>>> brcmnand_writel(val, mmio);
>>>>>> }
>>>>>> >> +static void bcmbca_read_data_bus(struct brcmnand_soc *soc,
>>>>>> + void __iomem *flash_cache, u32 *buffer,
>>>>>> + int fc_words, bool is_param)
>>>>>> +{
>>>>>> + int i;
>>>>>> +
>>>>>> + if (!is_param) {
>>>>>> + /*
>>>>>> + * memcpy can do unaligned aligned access depending on source
>>>>>> + * and dest address, which is incompatible with nand cache. Fallback
>>>>>> + * to the memcpy for io version
>>>>>> + */
>>>>>> + if (bcmbca_nand_is_buf_aligned(flash_cache, buffer))
>>>>>> + memcpy((void *)buffer, (void *)flash_cache, fc_words * 4);
>>>>>> + else
>>>>>> + memcpy_fromio((void *)buffer, (void *)flash_cache, fc_words * 4);
>>>>>> + } else {
>>>>>> + /* Flash cache has same endian as the host for parameter pages */
>>>>>> + for (i = 0; i < fc_words; i++, buffer++)
>>>>>> + *buffer = __raw_readl(flash_cache + i * 4);
>>>>>> + }
>>>>>> +}
>>>>>> +
>>>>>> static int bcmbca_nand_probe(struct platform_device *pdev)
>>>>>> {
>>>>>> struct device *dev = &pdev->dev;
>>>>>> @@ -75,6 +110,7 @@ static int bcmbca_nand_probe(struct platform_device *pdev)
>>>>>> >> soc->ctlrdy_ack = bcmbca_nand_intc_ack;
>>>>>> soc->ctlrdy_set_enabled = bcmbca_nand_intc_set;
>>>>>> + soc->read_data_bus = bcmbca_read_data_bus;
>>>>>> >> return brcmnand_probe(pdev, soc);
>>>>>> }
>>>>>> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
>>>>>> index d920e88c7f5b..656be4d73016 100644
>>>>>> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
>>>>>> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
>>>>>> @@ -814,6 +814,30 @@ static inline u32 edu_readl(struct brcmnand_controller *ctrl,
>>>>>> return brcmnand_readl(ctrl->edu_base + offs);
>>>>>> }
>>>>>> >> +static inline void brcmnand_read_data_bus(struct brcmnand_controller *ctrl,
>>>>>> + void __iomem *flash_cache, u32 *buffer,
>>>>>> + int fc_words, bool is_param)
>>>>>> +{
>>>>>> + struct brcmnand_soc *soc = ctrl->soc;
>>>>>> + int i;
>>>>>> +
>>>>>> + if (soc->read_data_bus) {
>>>>>> + soc->read_data_bus(soc, flash_cache, buffer, fc_words, is_param);
>>>>>> + } else {
>>>>>> + if (!is_param) {
>>>>>> + for (i = 0; i < fc_words; i++, buffer++)
>>>>>> + *buffer = brcmnand_read_fc(ctrl, i);
>>>>>> + } else {
>>>>>> + for (i = 0; i < fc_words; i++)
>>>>>> + /*
>>>>>> + * Flash cache is big endian for parameter pages, at
>>>>>> + * least on STB SoCs
>>>>>> + */
>>>>>> + buffer[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
>>>>>> + }
>>>>>> + }
>>>>>
>>>>> Perhaps we could have a single function that is statically assigned at
>>>>> probe time instead of a first helper with two conditions which calls in
>>>>> one case another hook... This can be simplified I guess.
>>>>> >> Well this will need to be done at the SoC specific implementation level (bcm<xxx>_nand.c) and each SoC will need to have either general data bus read func with is_param option or data_bus_read_page, data_bus_read_param.
>>>
>>> You told me in case we would use exec_op we could avoid the param
>>> cache. If that's true then the whole support can be simplified.
>>>
>> Correct we may possibly unified the parameter data read but exec_op is long shot and we are not fully ready for that yet. It also depends on if the low level data register has endianess difference for the parameter data between difference SoCs.
>>
>> So I would like to push the current implementation and we can explore the exec_op option late which will be a much big and complete different implementation.
>
> I am sorry but this series is totally backwards, you're trying to guess
> what comes next with the 'is_param' thing, it's exactly what we are
> fighting against since 2017. There are plenty of ->exec_op()
> conversions out there, I don't believe this one will be harder. You
> need to convert the driver to this new API and get rid of this whole
> endianness non-sense to simplify a lot the driver.
>
I am not guessing anything but just factor out the existing common nand
cache read logic into the single default function(or one for page read
and another for parameter read as I mentioned in another thread) and
allow SoC to overrides the implementation when needed.
I agree ->exec_op can possibly get rid of the parameter page read
function and is the way to go. But it won't help on the page read for
endianess. It's not that I am against exec_op but I want to take one
step a time and I'd like to get these fixes and support for bcmbca soc
first and then work on the exec_op API to minimize the change and reduce
the risk.
>>
>>>> Not sure how much this can be simplified... Or we have default
>>>> implementation in brcmnand.c but then there is one condition check
>>>> too. Page read is done at 512 bytes burst. One or two conditions
>>>> check outside of the per 512 bytes read loop does not sounds too bad
>>>> if performance is concern.
>>>
>>> It is unreadable. That is my main concern.
>>>
>>>>
>>>>>> +}
>>>>>> +
>>>>>> static void brcmnand_clear_ecc_addr(struct brcmnand_controller *ctrl)
>>>>>> {
>>>>>> >> @@ -1811,20 +1835,11 @@ static void brcmnand_cmdfunc(struct nand_chip *chip, unsigned command,
>>>>>> native_cmd == CMD_PARAMETER_CHANGE_COL) {
>>>>>> /* Copy flash cache word-wise */
>>>>>> u32 *flash_cache = (u32 *)ctrl->flash_cache;
>>>>>> - int i;
>>>>>> >> brcmnand_soc_data_bus_prepare(ctrl->soc, true);
>>>>>> >> - /*
>>>>>> - * Must cache the FLASH_CACHE now, since changes in
>>>>>> - * SECTOR_SIZE_1K may invalidate it
>>>>>> - */
>>>>>> - for (i = 0; i < FC_WORDS; i++)
>>>>>> - /*
>>>>>> - * Flash cache is big endian for parameter pages, at
>>>>>> - * least on STB SoCs
>>>>>> - */
>>>>>> - flash_cache[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
>>>>>> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, flash_cache,
>>>>>> + FC_WORDS, true);
>>>>>> >> brcmnand_soc_data_bus_unprepare(ctrl->soc, true);
>>>>>> >> @@ -2137,7 +2152,7 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
>>>>>> {
>>>>>> struct brcmnand_host *host = nand_get_controller_data(chip);
>>>>>> struct brcmnand_controller *ctrl = host->ctrl;
>>>>>> - int i, j, ret = 0;
>>>>>> + int i, ret = 0;
>>>>>> >> brcmnand_clear_ecc_addr(ctrl);
>>>>>> >> @@ -2150,8 +2165,9 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
>>>>>> if (likely(buf)) {
>>>>>> brcmnand_soc_data_bus_prepare(ctrl->soc, false);
>>>>>> >> - for (j = 0; j < FC_WORDS; j++, buf++)
>>>>>> - *buf = brcmnand_read_fc(ctrl, j);
>>>>>> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, buf,
>>>>>> + FC_WORDS, false);
>>>>>> + buf += FC_WORDS;
>>>>>> >> brcmnand_soc_data_bus_unprepare(ctrl->soc, false);
>>>>>> }
>>>>>> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
>>>>>> index f1f93d85f50d..88819bc395f8 100644
>>>>>> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.h
>>>>>> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
>>>>>> @@ -24,6 +24,8 @@ struct brcmnand_soc {
>>>>>> void (*ctlrdy_set_enabled)(struct brcmnand_soc *soc, bool en);
>>>>>> void (*prepare_data_bus)(struct brcmnand_soc *soc, bool prepare,
>>>>>> bool is_param);
>>>>>> + void (*read_data_bus)(struct brcmnand_soc *soc, void __iomem *flash_cache,
>>>>>> + u32 *buffer, int fc_words, bool is_param);
>>>>>> const struct brcmnand_io_ops *ops;
>>>>>> };
>>>>>> > >
>>>>> Thanks,
>>>>> Miquèl
>>>>> > >
>>> Thanks,
>>> Miquèl
>>>
>
>
> Thanks,
> Miquèl
>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-06 23:12 ` [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface William Zhang
2023-06-07 8:20 ` Miquel Raynal
2023-06-07 8:22 ` Miquel Raynal
@ 2023-06-11 9:54 ` kernel test robot
2 siblings, 0 replies; 44+ messages in thread
From: kernel test robot @ 2023-06-11 9:54 UTC (permalink / raw)
To: William Zhang, Broadcom Kernel List, Linux MTD List
Cc: oe-kbuild-all, f.fainelli, rafal, kursad.oney, joel.peshkin,
computersforpeace, anand.gore, dregan, kamal.dasu, tomer.yacoby,
dan.beygelman, William Zhang, Miquel Raynal, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
Hi William,
kernel test robot noticed the following build warnings:
[auto build test WARNING on mtd/nand/next]
[also build test WARNING on mtd/mtd/next mtd/mtd/fixes linus/master v6.4-rc5 next-20230609]
[cannot apply to robh/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/William-Zhang/mtd-rawnand-brcmnand-Fix-ECC-level-field-setting-for-v7-2-controller/20230607-071834
base: https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next
patch link: https://lore.kernel.org/r/20230606231252.94838-11-william.zhang%40broadcom.com
patch subject: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
config: arm-randconfig-s052-20230611 (https://download.01.org/0day-ci/archive/20230611/202306111741.1Hs0TVE4-lkp@intel.com/config)
compiler: arm-linux-gnueabi-gcc (GCC) 12.3.0
reproduce:
mkdir -p ~/bin
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# apt-get install sparse
# sparse version: v0.6.4-39-gce1a6720-dirty
# https://github.com/intel-lab-lkp/linux/commit/2fce7300f3e21ad0cb55442e1acfeaf60f41bf7d
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review William-Zhang/mtd-rawnand-brcmnand-Fix-ECC-level-field-setting-for-v7-2-controller/20230607-071834
git checkout 2fce7300f3e21ad0cb55442e1acfeaf60f41bf7d
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.3.0 ~/bin/make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=arm olddefconfig
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.3.0 ~/bin/make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=arm SHELL=/bin/bash drivers/mtd/nand/raw/brcmnand/
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202306111741.1Hs0TVE4-lkp@intel.com/
sparse warnings: (new ones prefixed by >>)
drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c:83:48: sparse: sparse: incorrect type in argument 1 (different address spaces) @@ expected void *flash_cache @@ got void [noderef] __iomem *flash_cache @@
drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c:83:48: sparse: expected void *flash_cache
drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c:83:48: sparse: got void [noderef] __iomem *flash_cache
drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c:84:25: sparse: sparse: cast removes address space '__iomem' of expression
drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c:84:25: sparse: sparse: cast removes address space '__iomem' of expression
drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c:84:25: sparse: sparse: cast removes address space '__iomem' of expression
drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c:86:25: sparse: sparse: cast removes address space '__iomem' of expression
>> drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c:86:25: sparse: sparse: incorrect type in argument 2 (different address spaces) @@ expected void const volatile [noderef] __iomem *from @@ got void * @@
drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c:86:25: sparse: expected void const volatile [noderef] __iomem *from
drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c:86:25: sparse: got void *
vim +86 drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
70
71 static void bcmbca_read_data_bus(struct brcmnand_soc *soc,
72 void __iomem *flash_cache, u32 *buffer,
73 int fc_words, bool is_param)
74 {
75 int i;
76
77 if (!is_param) {
78 /*
79 * memcpy can do unaligned aligned access depending on source
80 * and dest address, which is incompatible with nand cache. Fallback
81 * to the memcpy for io version
82 */
> 83 if (bcmbca_nand_is_buf_aligned(flash_cache, buffer))
84 memcpy((void *)buffer, (void *)flash_cache, fc_words * 4);
85 else
> 86 memcpy_fromio((void *)buffer, (void *)flash_cache, fc_words * 4);
87 } else {
88 /* Flash cache has same endian as the host for parameter pages */
89 for (i = 0; i < fc_words; i++, buffer++)
90 *buffer = __raw_readl(flash_cache + i * 4);
91 }
92 }
93
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 05/12] dt-bindings: mtd: brcmnand: Updates for bcmbca SoCs
2023-06-09 19:05 ` William Zhang
@ 2023-06-12 17:43 ` Miquel Raynal
0 siblings, 0 replies; 44+ messages in thread
From: Miquel Raynal @ 2023-06-12 17:43 UTC (permalink / raw)
To: William Zhang
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, devicetree, linux-kernel,
Krzysztof Kozlowski, Vignesh Raghavendra, Richard Weinberger,
Kamal Dasu, Rob Herring
Hi William,
william.zhang@broadcom.com wrote on Fri, 9 Jun 2023 12:05:19 -0700:
> Hi Miquel,
>
> On 06/09/2023 01:58 AM, Miquel Raynal wrote:
> > Hi William,
> >
> > william.zhang@broadcom.com wrote on Wed, 7 Jun 2023 13:01:56 -0700:
> >
> >> Hi Miquel,
> >>
> >> On 06/07/2023 01:14 AM, Miquel Raynal wrote:
> >>> Hi William,
> >>>
> >>> william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:45 -0700:
> >>> >>>> Use new compatiable brcm,nand-bcmbca to support BCMBCA broadband
> >>>> product. The old compatible string is still kept in the driver so old
> >>>> dtb can still work.
> >>>>
> >>>> Add brcm,nand-use-wp property to have an option for disabling this
> >>>> feature on broadband board design that does not use write protection.
> >>>> Add brcm,nand-ecc-use-strap to get ecc setting from board strap for
> >>>> broadband board designs because they do not specify ecc setting in dts
> >>>> but rather using the strap setting.
> >>>>
> >>>> Remove the requirement of interrupts and interrupt-names properties to
> >>>> reflect the driver code.
> >>>>
> >>>> This patch also includes a few minor fixes to the BCM63xx compatibles
> >>>> and add myself to the list of maintainers.
> >>>>
> >>>> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> >>>> ---
> >>>>
> >>>> .../bindings/mtd/brcm,brcmnand.yaml | 64 +++++++++++++------
> >>>> 1 file changed, 43 insertions(+), 21 deletions(-)
> >>>>
> >>>> diff --git a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
> >>>> index 1571024aa119..1fe1c166a9db 100644
> >>>> --- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
> >>>> +++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
> >>>> @@ -9,6 +9,7 @@ title: Broadcom STB NAND Controller
> >>>> maintainers:
> >>>> - Brian Norris <computersforpeace@gmail.com>
> >>>> - Kamal Dasu <kdasu.kdev@gmail.com>
> >>>> + - William Zhang <william.zhang@broadcom.com>
> >>>> >> description: |
> >>>> The Broadcom Set-Top Box NAND controller supports low-level access to raw NAND
> >>>> @@ -18,9 +19,10 @@ description: |
> >>>> supports basic PROGRAM and READ functions, among other features.
> >>>> >> This controller was originally designed for STB SoCs (BCM7xxx) but is now
> >>>> - available on a variety of Broadcom SoCs, including some BCM3xxx, BCM63xx, and
> >>>> - iProc/Cygnus. Its history includes several similar (but not fully register
> >>>> - compatible) versions.
> >>>> + available on a variety of Broadcom SoCs, including some BCM3xxx, MIPS based
> >>>> + Broadband SoC (BCM63xx), ARM based Broadband SoC (BCMBCA) and iProc/Cygnus.
> >>>> + Its history includes several similar (but not fully register compatible)
> >>>> + versions.
> >>>> >> -- Additional SoC-specific NAND controller properties --
> >>>> >> @@ -53,9 +55,9 @@ properties:
> >>>> - brcm,brcmnand-v7.2
> >>>> - brcm,brcmnand-v7.3
> >>>> - const: brcm,brcmnand
> >>>> - - description: BCM63138 SoC-specific NAND controller
> >>>> + - description: BCMBCA SoC-specific NAND controller
> >>>> items:
> >>>> - - const: brcm,nand-bcm63138
> >>>> + - const: brcm,nand-bcmbca
> >>>> - enum:
> >>>> - brcm,brcmnand-v7.0
> >>>> - brcm,brcmnand-v7.1
> >>>> @@ -65,11 +67,15 @@ properties:
> >>>> - const: brcm,nand-iproc
> >>>> - const: brcm,brcmnand-v6.1
> >>>> - const: brcm,brcmnand
> >>>> - - description: BCM63168 SoC-specific NAND controller
> >>>> + - description: BCM63xx SoC-specific NAND controller
> >>>> items:
> >>>> - - const: brcm,nand-bcm63168
> >>>> - - const: brcm,nand-bcm6368
> >>>> - - const: brcm,brcmnand-v4.0
> >>>> + - enum:
> >>>> + - brcm,nand-bcm63168
> >>>> + - brcm,nand-bcm6368
> >>>> + - enum:
> >>>> + - brcm,brcmnand-v2.1
> >>>> + - brcm,brcmnand-v2.2
> >>>> + - brcm,brcmnand-v4.0
> >>>> - const: brcm,brcmnand
> >>>> >> reg:
> >>>> @@ -111,6 +117,19 @@ properties:
> >>>> earlier versions of this core that include WP
> >>>> type: boolean
> >>>> >> + brcm,nand-use-wp:
> >>>> + description:
> >>>> + Use this integer to indicate if board design uses
> >>>> + controller's write protection feature and connects its
> >>>> + NAND_WPb pin to nand chip's WP_L pin. Driver defaults to
> >>>> + use this feature when this property does not exist.
> >>>> + Set to 0 if WP pins are not connected and feature is not
> >>>> + used. Set to 1 if WP pins are connected and feature is used.
> >>>> + Set to 2 if WP pins are connected but disable this feature
> >>>> + through driver that sets controller to output high on NAND_WPb.
> >>>> + $ref: /schemas/types.yaml#/definitions/uint32
> >>>> + enum: [0, 1, 2]
> >>>
> >>> Perhaps strings would be welcome. I'll let binding maintainers say what
> >>> they think of it.
> >>> >> Practically there is really just use cases of 0 and 1. I could use a bool flag but to keep consistent with the driver code and in case there is any existing usage of 2.
> >>
> >>>> +
> >>>> patternProperties:
> >>>> "^nand@[a-f0-9]$":
> >>>> type: object
> >>>> @@ -136,13 +155,23 @@ patternProperties:
> >>>> layout.
> >>>> $ref: /schemas/types.yaml#/definitions/uint32
> >>>> >> + brcm,nand-ecc-use-strap:
> >>>> + description:
> >>>> + This flag is used by the driver to get the ecc strength and
> >>>> + spare area size from the SoC NAND boot strap setting. This
> >>>> + is commonly used by the BCMBCA SoC board design. If ecc
> >>>> + strength and spare area size are set by nand-ecc-strength
> >>>> + and brcm,nand-oob-sector-size in the dts, these settings
> >>>> + have precedence and override this flag.
> >>>> + $ref: /schemas/types.yaml#/definitions/flag
> >>>
> >>> How in practice do you access the strap value? Don't you need a phandle
> >>> over a specific area in the SoC?
> >>> >> The strap value is latched and stored in the NAND controller register so there is no extra phandle needed.
> >
> > Ok.
> >
> >>
> >>>> +
> >>>> allOf:
> >>>> - $ref: nand-controller.yaml#
> >>>> - if:
> >>>> properties:
> >>>> compatible:
> >>>> contains:
> >>>> - const: brcm,nand-bcm63138
> >>>> + const: brcm,nand-bcmbca
> >>>> then:
> >>>> properties:
> >>>> reg-names:
> >>>> @@ -153,7 +182,9 @@ allOf:
> >>>> properties:
> >>>> compatible:
> >>>> contains:
> >>>> - const: brcm,nand-bcm6368
> >>>> + enum:
> >>>> + - brcm,nand-bcm63168
> >>>> + - brcm,nand-bcm6368
> >>>> then:
> >>>> properties:
> >>>> reg-names:
> >>>> @@ -173,20 +204,12 @@ allOf:
> >>>> - const: nand
> >>>> - const: iproc-idm
> >>>> - const: iproc-ext
> >>>> - - if:
> >>>> - properties:
> >>>> - interrupts:
> >>>> - minItems: 2
> >>>> - then:
> >>>> - required:
> >>>> - - interrupt-names
> >>>
> >>> Why do you remove this? Removing "interrupts" from the required
> >>> properties is fine, but constraining the interrupts property when it is
> >>> relevant is still expected.
> >>> >> There is no requirement for interrupt name even if it have two interrupts. Driver code does not use interrupt name but the interrupt index instead.
> >
> > It does not matter in this case how the driver uses the interrupts. If
> > names have been provided once in the bindings, you could expect another
> > project using the same bindings to use the interrupt names instead of
> > the order. So you must keep the names. Just don't mark them required it
> > they are.
> >
> Certainly any dts file can still have interrupts names with one or two interrupts but to my understand it is not required to have the name when there are two interrupts. Anyway I will add this back so this constrain remains.
That is true, until you enforce specific names. Then you are tied to
these names, otherwise you may break the bindings. It it is not
_really_ useful, then don't do it.
>
> >>
> >>>> >> unevaluatedProperties: false
> >>>> >> required:
> >>>> - reg
> >>>> - reg-names
> >>>> - - interrupts
> >>>
> >>> This should be done in a separate patch.
> >>> >> I thought this is also related to my update for bcmbca chips because they don't need to interrupt and interrupt name.
> >
> > The fact that the driver does not use the interrupts does not mean they
> > should not be described.
> >
> >>
> >>>> >> examples:
> >>>> - |
> >>>> @@ -215,8 +238,7 @@ examples:
> >>>> };
> >>>> - |
> >>>> nand-controller@10000200 {
> >>>> - compatible = "brcm,nand-bcm63168", "brcm,nand-bcm6368",
> >>>> - "brcm,brcmnand-v4.0", "brcm,brcmnand";
> >>>> + compatible = "brcm,nand-bcm6368", "brcm,brcmnand-v2.1", "brcm,brcmnand";
> >>>> reg = <0x10000200 0x180>,
> >>>> <0x100000b0 0x10>,
> >>>> <0x10000600 0x200>;
> >>>
> >>>
> >>> Thanks,
> >>> Miquèl
> >>> > >
> > Thanks,
> > Miquèl
> >
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-09 19:16 ` William Zhang
@ 2023-06-12 17:49 ` Miquel Raynal
2023-06-12 17:53 ` Miquel Raynal
2023-06-12 19:03 ` William Zhang
0 siblings, 2 replies; 44+ messages in thread
From: Miquel Raynal @ 2023-06-12 17:49 UTC (permalink / raw)
To: William Zhang
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
Hi William,
william.zhang@broadcom.com wrote on Fri, 9 Jun 2023 12:16:27 -0700:
> Hi Miquel,
>
> On 06/09/2023 01:35 AM, Miquel Raynal wrote:
> > Hi William,
> >
> > william.zhang@broadcom.com wrote on Thu, 8 Jun 2023 12:10:06 -0700:
> >
> >> On 06/07/2023 11:18 PM, Miquel Raynal wrote:
> >>> Hi William,
> >>>
> >>> william.zhang@broadcom.com wrote on Wed, 7 Jun 2023 13:24:23 -0700:
> >>> >>>> Hi Miquel,
> >>>>
> >>>> On 06/07/2023 01:22 AM, Miquel Raynal wrote:
> >>>>> Hi William,
> >>>>>
> >>>>> william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:50 -0700:
> >>>>> >>>> The BCMBCA broadband SoC integrates the NAND controller differently than
> >>>>>> STB, iProc and other SoCs. It has different endianness for NAND cache
> >>>>>> data and ONFI parameter data.
> >>>>>>
> >>>>>> Add a SoC read data bus shim for BCMBCA to meet the specific SoC need
> >>>>>> and performance improvement using the optimized memcpy function on NAND
> >>>>>> cache memory.
> >>>>>>
> >>>>>> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> >>>>>> ---
> >>>>>>
> >>>>>> drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c | 36 +++++++++++++++++
> >>>>>> drivers/mtd/nand/raw/brcmnand/brcmnand.c | 44 ++++++++++++++-------
> >>>>>> drivers/mtd/nand/raw/brcmnand/brcmnand.h | 2 +
> >>>>>> 3 files changed, 68 insertions(+), 14 deletions(-)
> >>>>>>
> >>>>>> diff --git a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
> >>>>>> index 7e48b6a0bfa2..899103a62c98 100644
> >>>>>> --- a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
> >>>>>> +++ b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
> >>>>>> @@ -26,6 +26,18 @@ enum {
> >>>>>> BCMBCA_CTLRDY = BIT(4),
> >>>>>> };
> >>>>>> >> +#if defined(CONFIG_ARM64)
> >>>>>> +#define ALIGN_REQ 8
> >>>>>> +#else
> >>>>>> +#define ALIGN_REQ 4
> >>>>>> +#endif
> >>>>>> +
> >>>>>> +static inline bool bcmbca_nand_is_buf_aligned(void *flash_cache, void *buffer)
> >>>>>> +{
> >>>>>> + return IS_ALIGNED((uintptr_t)buffer, ALIGN_REQ) &&
> >>>>>> + IS_ALIGNED((uintptr_t)flash_cache, ALIGN_REQ);
> >>>>>> +}
> >>>>>> +
> >>>>>> static bool bcmbca_nand_intc_ack(struct brcmnand_soc *soc)
> >>>>>> {
> >>>>>> struct bcmbca_nand_soc *priv =
> >>>>>> @@ -56,6 +68,29 @@ static void bcmbca_nand_intc_set(struct brcmnand_soc *soc, bool en)
> >>>>>> brcmnand_writel(val, mmio);
> >>>>>> }
> >>>>>> >> +static void bcmbca_read_data_bus(struct brcmnand_soc *soc,
> >>>>>> + void __iomem *flash_cache, u32 *buffer,
> >>>>>> + int fc_words, bool is_param)
> >>>>>> +{
> >>>>>> + int i;
> >>>>>> +
> >>>>>> + if (!is_param) {
> >>>>>> + /*
> >>>>>> + * memcpy can do unaligned aligned access depending on source
> >>>>>> + * and dest address, which is incompatible with nand cache. Fallback
> >>>>>> + * to the memcpy for io version
> >>>>>> + */
> >>>>>> + if (bcmbca_nand_is_buf_aligned(flash_cache, buffer))
> >>>>>> + memcpy((void *)buffer, (void *)flash_cache, fc_words * 4);
> >>>>>> + else
> >>>>>> + memcpy_fromio((void *)buffer, (void *)flash_cache, fc_words * 4);
> >>>>>> + } else {
> >>>>>> + /* Flash cache has same endian as the host for parameter pages */
> >>>>>> + for (i = 0; i < fc_words; i++, buffer++)
> >>>>>> + *buffer = __raw_readl(flash_cache + i * 4);
> >>>>>> + }
> >>>>>> +}
> >>>>>> +
> >>>>>> static int bcmbca_nand_probe(struct platform_device *pdev)
> >>>>>> {
> >>>>>> struct device *dev = &pdev->dev;
> >>>>>> @@ -75,6 +110,7 @@ static int bcmbca_nand_probe(struct platform_device *pdev)
> >>>>>> >> soc->ctlrdy_ack = bcmbca_nand_intc_ack;
> >>>>>> soc->ctlrdy_set_enabled = bcmbca_nand_intc_set;
> >>>>>> + soc->read_data_bus = bcmbca_read_data_bus;
> >>>>>> >> return brcmnand_probe(pdev, soc);
> >>>>>> }
> >>>>>> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> >>>>>> index d920e88c7f5b..656be4d73016 100644
> >>>>>> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> >>>>>> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
> >>>>>> @@ -814,6 +814,30 @@ static inline u32 edu_readl(struct brcmnand_controller *ctrl,
> >>>>>> return brcmnand_readl(ctrl->edu_base + offs);
> >>>>>> }
> >>>>>> >> +static inline void brcmnand_read_data_bus(struct brcmnand_controller *ctrl,
> >>>>>> + void __iomem *flash_cache, u32 *buffer,
> >>>>>> + int fc_words, bool is_param)
> >>>>>> +{
> >>>>>> + struct brcmnand_soc *soc = ctrl->soc;
> >>>>>> + int i;
> >>>>>> +
> >>>>>> + if (soc->read_data_bus) {
> >>>>>> + soc->read_data_bus(soc, flash_cache, buffer, fc_words, is_param);
> >>>>>> + } else {
> >>>>>> + if (!is_param) {
> >>>>>> + for (i = 0; i < fc_words; i++, buffer++)
> >>>>>> + *buffer = brcmnand_read_fc(ctrl, i);
> >>>>>> + } else {
> >>>>>> + for (i = 0; i < fc_words; i++)
> >>>>>> + /*
> >>>>>> + * Flash cache is big endian for parameter pages, at
> >>>>>> + * least on STB SoCs
> >>>>>> + */
> >>>>>> + buffer[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
> >>>>>> + }
> >>>>>> + }
> >>>>>
> >>>>> Perhaps we could have a single function that is statically assigned at
> >>>>> probe time instead of a first helper with two conditions which calls in
> >>>>> one case another hook... This can be simplified I guess.
> >>>>> >> Well this will need to be done at the SoC specific implementation level (bcm<xxx>_nand.c) and each SoC will need to have either general data bus read func with is_param option or data_bus_read_page, data_bus_read_param.
> >>>
> >>> You told me in case we would use exec_op we could avoid the param
> >>> cache. If that's true then the whole support can be simplified.
> >>> >> Correct we may possibly unified the parameter data read but exec_op is long shot and we are not fully ready for that yet. It also depends on if the low level data register has endianess difference for the parameter data between difference SoCs.
> >>
> >> So I would like to push the current implementation and we can explore the exec_op option late which will be a much big and complete different implementation.
> >
> > I am sorry but this series is totally backwards, you're trying to guess
> > what comes next with the 'is_param' thing, it's exactly what we are
> > fighting against since 2017. There are plenty of ->exec_op()
> > conversions out there, I don't believe this one will be harder. You
> > need to convert the driver to this new API and get rid of this whole
> > endianness non-sense to simplify a lot the driver.
> >
> I am not guessing anything but just factor out the existing common nand cache read logic into the single default function(or one for page read and another for parameter read as I mentioned in another thread) and allow SoC to overrides the implementation when needed.
No, you are trying to guess what type of read the core is performing,
either a regular data page read or a parameter page read.
> I agree ->exec_op can possibly get rid of the parameter page read function and is the way to go. But it won't help on the page read for endianess.
You told me there is no endianess issue with the data pages, so why it
won't help on the page read?
> It's not that I am against exec_op but I want to take one step a time
> and I'd like to get these fixes
I don't see any fix here? Let me know if I am missing something but
right now I see a new version of the controller being supported with
its own constraints. If you are fixing existing code for already
supported platform, then make it clear and we can discuss this. But if
you just want to support the bcmbca flavor, then there is no risk
mitigation involved here, and a conversion is the right step :)
> and support for bcmbca soc first and
> then work on the exec_op API to minimize the change and reduce the
> risk.
>
> >>
> >>>> Not sure how much this can be simplified... Or we have default
> >>>> implementation in brcmnand.c but then there is one condition check
> >>>> too. Page read is done at 512 bytes burst. One or two conditions
> >>>> check outside of the per 512 bytes read loop does not sounds too bad
> >>>> if performance is concern.
> >>>
> >>> It is unreadable. That is my main concern.
> >>> >>>> >>>>>> +}
> >>>>>> +
> >>>>>> static void brcmnand_clear_ecc_addr(struct brcmnand_controller *ctrl)
> >>>>>> {
> >>>>>> >> @@ -1811,20 +1835,11 @@ static void brcmnand_cmdfunc(struct nand_chip *chip, unsigned command,
> >>>>>> native_cmd == CMD_PARAMETER_CHANGE_COL) {
> >>>>>> /* Copy flash cache word-wise */
> >>>>>> u32 *flash_cache = (u32 *)ctrl->flash_cache;
> >>>>>> - int i;
> >>>>>> >> brcmnand_soc_data_bus_prepare(ctrl->soc, true);
> >>>>>> >> - /*
> >>>>>> - * Must cache the FLASH_CACHE now, since changes in
> >>>>>> - * SECTOR_SIZE_1K may invalidate it
> >>>>>> - */
> >>>>>> - for (i = 0; i < FC_WORDS; i++)
> >>>>>> - /*
> >>>>>> - * Flash cache is big endian for parameter pages, at
> >>>>>> - * least on STB SoCs
> >>>>>> - */
> >>>>>> - flash_cache[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
> >>>>>> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, flash_cache,
> >>>>>> + FC_WORDS, true);
> >>>>>> >> brcmnand_soc_data_bus_unprepare(ctrl->soc, true);
> >>>>>> >> @@ -2137,7 +2152,7 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
> >>>>>> {
> >>>>>> struct brcmnand_host *host = nand_get_controller_data(chip);
> >>>>>> struct brcmnand_controller *ctrl = host->ctrl;
> >>>>>> - int i, j, ret = 0;
> >>>>>> + int i, ret = 0;
> >>>>>> >> brcmnand_clear_ecc_addr(ctrl);
> >>>>>> >> @@ -2150,8 +2165,9 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
> >>>>>> if (likely(buf)) {
> >>>>>> brcmnand_soc_data_bus_prepare(ctrl->soc, false);
> >>>>>> >> - for (j = 0; j < FC_WORDS; j++, buf++)
> >>>>>> - *buf = brcmnand_read_fc(ctrl, j);
> >>>>>> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, buf,
> >>>>>> + FC_WORDS, false);
> >>>>>> + buf += FC_WORDS;
> >>>>>> >> brcmnand_soc_data_bus_unprepare(ctrl->soc, false);
> >>>>>> }
> >>>>>> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
> >>>>>> index f1f93d85f50d..88819bc395f8 100644
> >>>>>> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.h
> >>>>>> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
> >>>>>> @@ -24,6 +24,8 @@ struct brcmnand_soc {
> >>>>>> void (*ctlrdy_set_enabled)(struct brcmnand_soc *soc, bool en);
> >>>>>> void (*prepare_data_bus)(struct brcmnand_soc *soc, bool prepare,
> >>>>>> bool is_param);
> >>>>>> + void (*read_data_bus)(struct brcmnand_soc *soc, void __iomem *flash_cache,
> >>>>>> + u32 *buffer, int fc_words, bool is_param);
> >>>>>> const struct brcmnand_io_ops *ops;
> >>>>>> };
> >>>>>> > >
> >>>>> Thanks,
> >>>>> Miquèl
> >>>>> > >
> >>> Thanks,
> >>> Miquèl
> >>> > >
> > Thanks,
> > Miquèl
> >
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-12 17:49 ` Miquel Raynal
@ 2023-06-12 17:53 ` Miquel Raynal
2023-06-12 19:18 ` William Zhang
2023-06-12 19:03 ` William Zhang
1 sibling, 1 reply; 44+ messages in thread
From: Miquel Raynal @ 2023-06-12 17:53 UTC (permalink / raw)
To: William Zhang
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
Hello again,
> > >>>>> Perhaps we could have a single function that is statically assigned at
> > >>>>> probe time instead of a first helper with two conditions which calls in
> > >>>>> one case another hook... This can be simplified I guess.
> > >>>>> >> Well this will need to be done at the SoC specific implementation level (bcm<xxx>_nand.c) and each SoC will need to have either general data bus read func with is_param option or data_bus_read_page, data_bus_read_param.
> > >>>
> > >>> You told me in case we would use exec_op we could avoid the param
> > >>> cache. If that's true then the whole support can be simplified.
> > >>> >> Correct we may possibly unified the parameter data read but exec_op is long shot and we are not fully ready for that yet. It also depends on if the low level data register has endianess difference for the parameter data between difference SoCs.
> > >>
> > >> So I would like to push the current implementation and we can explore the exec_op option late which will be a much big and complete different implementation.
> > >
> > > I am sorry but this series is totally backwards, you're trying to guess
> > > what comes next with the 'is_param' thing, it's exactly what we are
> > > fighting against since 2017. There are plenty of ->exec_op()
> > > conversions out there, I don't believe this one will be harder. You
> > > need to convert the driver to this new API and get rid of this whole
> > > endianness non-sense to simplify a lot the driver.
> > >
> > I am not guessing anything but just factor out the existing common nand cache read logic into the single default function(or one for page read and another for parameter read as I mentioned in another thread) and allow SoC to overrides the implementation when needed.
>
> No, you are trying to guess what type of read the core is performing,
> either a regular data page read or a parameter page read.
>
> > I agree ->exec_op can possibly get rid of the parameter page read function and is the way to go. But it won't help on the page read for endianess.
>
> You told me there is no endianess issue with the data pages, so why it
> won't help on the page read?
>
> > It's not that I am against exec_op but I want to take one step a time
> > and I'd like to get these fixes
>
> I don't see any fix here? Let me know if I am missing something but
> right now I see a new version of the controller being supported with
> its own constraints. If you are fixing existing code for already
> supported platform, then make it clear and we can discuss this. But if
> you just want to support the bcmbca flavor, then there is no risk
> mitigation involved here, and a conversion is the right step :)
>
I forgot to mention: the exec_op conversion is almost ready, Boris
worked on it but he lacked the hardware so maybe you'll just need to
revive the few patches which target your platform and do a little bit of
debugging?
https://github.com/bbrezillon/linux/commits/nand/exec-op-conversion?after=8a3cf6fd25d5e15c6667f9e95c1fc86e4cb735e6+34&branch=nand%2Fexec-op-conversion&qualified_name=refs%2Fheads%2Fnand%2Fexec-op-conversion
Cheers,
Miquèl
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-12 17:49 ` Miquel Raynal
2023-06-12 17:53 ` Miquel Raynal
@ 2023-06-12 19:03 ` William Zhang
1 sibling, 0 replies; 44+ messages in thread
From: William Zhang @ 2023-06-12 19:03 UTC (permalink / raw)
To: Miquel Raynal
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 12051 bytes --]
On 06/12/2023 10:49 AM, Miquel Raynal wrote:
> Hi William,
>
> william.zhang@broadcom.com wrote on Fri, 9 Jun 2023 12:16:27 -0700:
>
>> Hi Miquel,
>>
>> On 06/09/2023 01:35 AM, Miquel Raynal wrote:
>>> Hi William,
>>>
>>> william.zhang@broadcom.com wrote on Thu, 8 Jun 2023 12:10:06 -0700:
>>>
>>>> On 06/07/2023 11:18 PM, Miquel Raynal wrote:
>>>>> Hi William,
>>>>>
>>>>> william.zhang@broadcom.com wrote on Wed, 7 Jun 2023 13:24:23 -0700:
>>>>> >>>> Hi Miquel,
>>>>>>
>>>>>> On 06/07/2023 01:22 AM, Miquel Raynal wrote:
>>>>>>> Hi William,
>>>>>>>
>>>>>>> william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:50 -0700:
>>>>>>> >>>> The BCMBCA broadband SoC integrates the NAND controller differently than
>>>>>>>> STB, iProc and other SoCs. It has different endianness for NAND cache
>>>>>>>> data and ONFI parameter data.
>>>>>>>>
>>>>>>>> Add a SoC read data bus shim for BCMBCA to meet the specific SoC need
>>>>>>>> and performance improvement using the optimized memcpy function on NAND
>>>>>>>> cache memory.
>>>>>>>>
>>>>>>>> Signed-off-by: William Zhang <william.zhang@broadcom.com>
>>>>>>>> ---
>>>>>>>>
>>>>>>>> drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c | 36 +++++++++++++++++
>>>>>>>> drivers/mtd/nand/raw/brcmnand/brcmnand.c | 44 ++++++++++++++-------
>>>>>>>> drivers/mtd/nand/raw/brcmnand/brcmnand.h | 2 +
>>>>>>>> 3 files changed, 68 insertions(+), 14 deletions(-)
>>>>>>>>
>>>>>>>> diff --git a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
>>>>>>>> index 7e48b6a0bfa2..899103a62c98 100644
>>>>>>>> --- a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
>>>>>>>> +++ b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
>>>>>>>> @@ -26,6 +26,18 @@ enum {
>>>>>>>> BCMBCA_CTLRDY = BIT(4),
>>>>>>>> };
>>>>>>>> >> +#if defined(CONFIG_ARM64)
>>>>>>>> +#define ALIGN_REQ 8
>>>>>>>> +#else
>>>>>>>> +#define ALIGN_REQ 4
>>>>>>>> +#endif
>>>>>>>> +
>>>>>>>> +static inline bool bcmbca_nand_is_buf_aligned(void *flash_cache, void *buffer)
>>>>>>>> +{
>>>>>>>> + return IS_ALIGNED((uintptr_t)buffer, ALIGN_REQ) &&
>>>>>>>> + IS_ALIGNED((uintptr_t)flash_cache, ALIGN_REQ);
>>>>>>>> +}
>>>>>>>> +
>>>>>>>> static bool bcmbca_nand_intc_ack(struct brcmnand_soc *soc)
>>>>>>>> {
>>>>>>>> struct bcmbca_nand_soc *priv =
>>>>>>>> @@ -56,6 +68,29 @@ static void bcmbca_nand_intc_set(struct brcmnand_soc *soc, bool en)
>>>>>>>> brcmnand_writel(val, mmio);
>>>>>>>> }
>>>>>>>> >> +static void bcmbca_read_data_bus(struct brcmnand_soc *soc,
>>>>>>>> + void __iomem *flash_cache, u32 *buffer,
>>>>>>>> + int fc_words, bool is_param)
>>>>>>>> +{
>>>>>>>> + int i;
>>>>>>>> +
>>>>>>>> + if (!is_param) {
>>>>>>>> + /*
>>>>>>>> + * memcpy can do unaligned aligned access depending on source
>>>>>>>> + * and dest address, which is incompatible with nand cache. Fallback
>>>>>>>> + * to the memcpy for io version
>>>>>>>> + */
>>>>>>>> + if (bcmbca_nand_is_buf_aligned(flash_cache, buffer))
>>>>>>>> + memcpy((void *)buffer, (void *)flash_cache, fc_words * 4);
>>>>>>>> + else
>>>>>>>> + memcpy_fromio((void *)buffer, (void *)flash_cache, fc_words * 4);
>>>>>>>> + } else {
>>>>>>>> + /* Flash cache has same endian as the host for parameter pages */
>>>>>>>> + for (i = 0; i < fc_words; i++, buffer++)
>>>>>>>> + *buffer = __raw_readl(flash_cache + i * 4);
>>>>>>>> + }
>>>>>>>> +}
>>>>>>>> +
>>>>>>>> static int bcmbca_nand_probe(struct platform_device *pdev)
>>>>>>>> {
>>>>>>>> struct device *dev = &pdev->dev;
>>>>>>>> @@ -75,6 +110,7 @@ static int bcmbca_nand_probe(struct platform_device *pdev)
>>>>>>>> >> soc->ctlrdy_ack = bcmbca_nand_intc_ack;
>>>>>>>> soc->ctlrdy_set_enabled = bcmbca_nand_intc_set;
>>>>>>>> + soc->read_data_bus = bcmbca_read_data_bus;
>>>>>>>> >> return brcmnand_probe(pdev, soc);
>>>>>>>> }
>>>>>>>> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
>>>>>>>> index d920e88c7f5b..656be4d73016 100644
>>>>>>>> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
>>>>>>>> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
>>>>>>>> @@ -814,6 +814,30 @@ static inline u32 edu_readl(struct brcmnand_controller *ctrl,
>>>>>>>> return brcmnand_readl(ctrl->edu_base + offs);
>>>>>>>> }
>>>>>>>> >> +static inline void brcmnand_read_data_bus(struct brcmnand_controller *ctrl,
>>>>>>>> + void __iomem *flash_cache, u32 *buffer,
>>>>>>>> + int fc_words, bool is_param)
>>>>>>>> +{
>>>>>>>> + struct brcmnand_soc *soc = ctrl->soc;
>>>>>>>> + int i;
>>>>>>>> +
>>>>>>>> + if (soc->read_data_bus) {
>>>>>>>> + soc->read_data_bus(soc, flash_cache, buffer, fc_words, is_param);
>>>>>>>> + } else {
>>>>>>>> + if (!is_param) {
>>>>>>>> + for (i = 0; i < fc_words; i++, buffer++)
>>>>>>>> + *buffer = brcmnand_read_fc(ctrl, i);
>>>>>>>> + } else {
>>>>>>>> + for (i = 0; i < fc_words; i++)
>>>>>>>> + /*
>>>>>>>> + * Flash cache is big endian for parameter pages, at
>>>>>>>> + * least on STB SoCs
>>>>>>>> + */
>>>>>>>> + buffer[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
>>>>>>>> + }
>>>>>>>> + }
>>>>>>>
>>>>>>> Perhaps we could have a single function that is statically assigned at
>>>>>>> probe time instead of a first helper with two conditions which calls in
>>>>>>> one case another hook... This can be simplified I guess.
>>>>>>> >> Well this will need to be done at the SoC specific implementation level (bcm<xxx>_nand.c) and each SoC will need to have either general data bus read func with is_param option or data_bus_read_page, data_bus_read_param.
>>>>>
>>>>> You told me in case we would use exec_op we could avoid the param
>>>>> cache. If that's true then the whole support can be simplified.
>>>>> >> Correct we may possibly unified the parameter data read but exec_op is long shot and we are not fully ready for that yet. It also depends on if the low level data register has endianess difference for the parameter data between difference SoCs.
>>>>
>>>> So I would like to push the current implementation and we can explore the exec_op option late which will be a much big and complete different implementation.
>>>
>>> I am sorry but this series is totally backwards, you're trying to guess
>>> what comes next with the 'is_param' thing, it's exactly what we are
>>> fighting against since 2017. There are plenty of ->exec_op()
>>> conversions out there, I don't believe this one will be harder. You
>>> need to convert the driver to this new API and get rid of this whole
>>> endianness non-sense to simplify a lot the driver.
>>>
>> I am not guessing anything but just factor out the existing common nand cache read logic into the single default function(or one for page read and another for parameter read as I mentioned in another thread) and allow SoC to overrides the implementation when needed.
>
> No, you are trying to guess what type of read the core is performing,
> either a regular data page read or a parameter page read.
>
Okay this is what you mean by guessing. I didn't realize that ;)
>> I agree ->exec_op can possibly get rid of the parameter page read function and is the way to go. But it won't help on the page read for endianess.
>
> You told me there is no endianess issue with the data pages, so why it
> won't help on the page read?
>
Even with exec_op, the page read path for brcmand(chip->ecc.read_page)
will still need brcmnand_read_page function which eventually I need per
SoC implementation at least for bcmbca for now besides different
endianess between SoC. For bcmbca, I also use the memcpy in the patch as
the nand cache in bcmbca chip can handled the optimized copy code as
long as the buffer is aligned for better performance.
>> It's not that I am against exec_op but I want to take one step a time
>> and I'd like to get these fixes
>
> I don't see any fix here? Let me know if I am missing something but
> right now I see a new version of the controller being supported with
> its own constraints. If you are fixing existing code for already
> supported platform, then make it clear and we can discuss this. But if
> you just want to support the bcmbca flavor, then there is no risk
> mitigation involved here, and a conversion is the right step :)
>
I mean the patch 1 to 4 in this series.
The exec_op will apply to all the five SoCs under brcmnand folder, not
just bcmbca. It will take lot of time even just find people to
test/debug all of them as I don't have access to other SoC and boards,
on top of the nature of this big change.
>> and support for bcmbca soc first and
>> then work on the exec_op API to minimize the change and reduce the
>> risk.
>>
>>>>
>>>>>> Not sure how much this can be simplified... Or we have default
>>>>>> implementation in brcmnand.c but then there is one condition check
>>>>>> too. Page read is done at 512 bytes burst. One or two conditions
>>>>>> check outside of the per 512 bytes read loop does not sounds too bad
>>>>>> if performance is concern.
>>>>>
>>>>> It is unreadable. That is my main concern.
>>>>> >>>> >>>>>> +}
>>>>>>>> +
>>>>>>>> static void brcmnand_clear_ecc_addr(struct brcmnand_controller *ctrl)
>>>>>>>> {
>>>>>>>> >> @@ -1811,20 +1835,11 @@ static void brcmnand_cmdfunc(struct nand_chip *chip, unsigned command,
>>>>>>>> native_cmd == CMD_PARAMETER_CHANGE_COL) {
>>>>>>>> /* Copy flash cache word-wise */
>>>>>>>> u32 *flash_cache = (u32 *)ctrl->flash_cache;
>>>>>>>> - int i;
>>>>>>>> >> brcmnand_soc_data_bus_prepare(ctrl->soc, true);
>>>>>>>> >> - /*
>>>>>>>> - * Must cache the FLASH_CACHE now, since changes in
>>>>>>>> - * SECTOR_SIZE_1K may invalidate it
>>>>>>>> - */
>>>>>>>> - for (i = 0; i < FC_WORDS; i++)
>>>>>>>> - /*
>>>>>>>> - * Flash cache is big endian for parameter pages, at
>>>>>>>> - * least on STB SoCs
>>>>>>>> - */
>>>>>>>> - flash_cache[i] = be32_to_cpu(brcmnand_read_fc(ctrl, i));
>>>>>>>> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, flash_cache,
>>>>>>>> + FC_WORDS, true);
>>>>>>>> >> brcmnand_soc_data_bus_unprepare(ctrl->soc, true);
>>>>>>>> >> @@ -2137,7 +2152,7 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
>>>>>>>> {
>>>>>>>> struct brcmnand_host *host = nand_get_controller_data(chip);
>>>>>>>> struct brcmnand_controller *ctrl = host->ctrl;
>>>>>>>> - int i, j, ret = 0;
>>>>>>>> + int i, ret = 0;
>>>>>>>> >> brcmnand_clear_ecc_addr(ctrl);
>>>>>>>> >> @@ -2150,8 +2165,9 @@ static int brcmnand_read_by_pio(struct mtd_info *mtd, struct nand_chip *chip,
>>>>>>>> if (likely(buf)) {
>>>>>>>> brcmnand_soc_data_bus_prepare(ctrl->soc, false);
>>>>>>>> >> - for (j = 0; j < FC_WORDS; j++, buf++)
>>>>>>>> - *buf = brcmnand_read_fc(ctrl, j);
>>>>>>>> + brcmnand_read_data_bus(ctrl, ctrl->nand_fc, buf,
>>>>>>>> + FC_WORDS, false);
>>>>>>>> + buf += FC_WORDS;
>>>>>>>> >> brcmnand_soc_data_bus_unprepare(ctrl->soc, false);
>>>>>>>> }
>>>>>>>> diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.h b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
>>>>>>>> index f1f93d85f50d..88819bc395f8 100644
>>>>>>>> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.h
>>>>>>>> +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.h
>>>>>>>> @@ -24,6 +24,8 @@ struct brcmnand_soc {
>>>>>>>> void (*ctlrdy_set_enabled)(struct brcmnand_soc *soc, bool en);
>>>>>>>> void (*prepare_data_bus)(struct brcmnand_soc *soc, bool prepare,
>>>>>>>> bool is_param);
>>>>>>>> + void (*read_data_bus)(struct brcmnand_soc *soc, void __iomem *flash_cache,
>>>>>>>> + u32 *buffer, int fc_words, bool is_param);
>>>>>>>> const struct brcmnand_io_ops *ops;
>>>>>>>> };
>>>>>>>> > >
>>>>>>> Thanks,
>>>>>>> Miquèl
>>>>>>> > >
>>>>> Thanks,
>>>>> Miquèl
>>>>> > >
>>> Thanks,
>>> Miquèl
>>>
>
>
> Thanks,
> Miquèl
>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-12 17:53 ` Miquel Raynal
@ 2023-06-12 19:18 ` William Zhang
2023-06-13 6:42 ` Miquel Raynal
0 siblings, 1 reply; 44+ messages in thread
From: William Zhang @ 2023-06-12 19:18 UTC (permalink / raw)
To: Miquel Raynal
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 4133 bytes --]
On 06/12/2023 10:53 AM, Miquel Raynal wrote:
> Hello again,
>
>>>>>>>> Perhaps we could have a single function that is statically assigned at
>>>>>>>> probe time instead of a first helper with two conditions which calls in
>>>>>>>> one case another hook... This can be simplified I guess.
>>>>>>>> >> Well this will need to be done at the SoC specific implementation level (bcm<xxx>_nand.c) and each SoC will need to have either general data bus read func with is_param option or data_bus_read_page, data_bus_read_param.
>>>>>>
>>>>>> You told me in case we would use exec_op we could avoid the param
>>>>>> cache. If that's true then the whole support can be simplified.
>>>>>> >> Correct we may possibly unified the parameter data read but exec_op is long shot and we are not fully ready for that yet. It also depends on if the low level data register has endianess difference for the parameter data between difference SoCs.
>>>>>
>>>>> So I would like to push the current implementation and we can explore the exec_op option late which will be a much big and complete different implementation.
>>>>
>>>> I am sorry but this series is totally backwards, you're trying to guess
>>>> what comes next with the 'is_param' thing, it's exactly what we are
>>>> fighting against since 2017. There are plenty of ->exec_op()
>>>> conversions out there, I don't believe this one will be harder. You
>>>> need to convert the driver to this new API and get rid of this whole
>>>> endianness non-sense to simplify a lot the driver.
>>>>
>>> I am not guessing anything but just factor out the existing common nand cache read logic into the single default function(or one for page read and another for parameter read as I mentioned in another thread) and allow SoC to overrides the implementation when needed.
>>
>> No, you are trying to guess what type of read the core is performing,
>> either a regular data page read or a parameter page read.
>>
>>> I agree ->exec_op can possibly get rid of the parameter page read function and is the way to go. But it won't help on the page read for endianess.
>>
>> You told me there is no endianess issue with the data pages, so why it
>> won't help on the page read?
>>
>>> It's not that I am against exec_op but I want to take one step a time
>>> and I'd like to get these fixes
>>
>> I don't see any fix here? Let me know if I am missing something but
>> right now I see a new version of the controller being supported with
>> its own constraints. If you are fixing existing code for already
>> supported platform, then make it clear and we can discuss this. But if
>> you just want to support the bcmbca flavor, then there is no risk
>> mitigation involved here, and a conversion is the right step :)
>>
>
> I forgot to mention: the exec_op conversion is almost ready, Boris
> worked on it but he lacked the hardware so maybe you'll just need to
> revive the few patches which target your platform and do a little bit of
> debugging?
>
> https://github.com/bbrezillon/linux/commits/nand/exec-op-conversion?after=8a3cf6fd25d5e15c6667f9e95c1fc86e4cb735e6+34&branch=nand%2Fexec-op-conversion&qualified_name=refs%2Fheads%2Fnand%2Fexec-op-conversion
>
Yes this is the patch what our exec_op work is based on. Thanks Boris!
The issue with patch is that performance is very slow for anything that
rely on nand_read_page_op as the patch implementing it using the low
level cmd and data register to transfer the data byte by byte. I
actually sent out email regarding this to Boris and he cc'ed you in sept
last year. We have to use the nand parser to match the page read from
exec_op so we can actually match and use the brcmnand_page_read fast
path. But there are many situations that we need to match so the project
to migrate exce_op are still work in progress just on our bcmbca chip as
of now. Just forward that email again to you and I appreciate it if you
have any inputs there. So IMHO it is just too risky and too big of
scope to have the exec_op added to this patch series and definitively
better to do it afterwards with a dedicated patch.
> Cheers,
> Miquèl
>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-12 19:18 ` William Zhang
@ 2023-06-13 6:42 ` Miquel Raynal
2023-06-14 0:00 ` William Zhang
0 siblings, 1 reply; 44+ messages in thread
From: Miquel Raynal @ 2023-06-13 6:42 UTC (permalink / raw)
To: William Zhang
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
Hi William,
william.zhang@broadcom.com wrote on Mon, 12 Jun 2023 12:18:58 -0700:
> On 06/12/2023 10:53 AM, Miquel Raynal wrote:
> > Hello again,
> >
> >>>>>>>> Perhaps we could have a single function that is statically assigned at
> >>>>>>>> probe time instead of a first helper with two conditions which calls in
> >>>>>>>> one case another hook... This can be simplified I guess.
> >>>>>>>> >> Well this will need to be done at the SoC specific implementation level (bcm<xxx>_nand.c) and each SoC will need to have either general data bus read func with is_param option or data_bus_read_page, data_bus_read_param.
> >>>>>>
> >>>>>> You told me in case we would use exec_op we could avoid the param
> >>>>>> cache. If that's true then the whole support can be simplified.
> >>>>>> >> Correct we may possibly unified the parameter data read but exec_op is long shot and we are not fully ready for that yet. It also depends on if the low level data register has endianess difference for the parameter data between difference SoCs.
> >>>>>
> >>>>> So I would like to push the current implementation and we can explore the exec_op option late which will be a much big and complete different implementation.
> >>>>
> >>>> I am sorry but this series is totally backwards, you're trying to guess
> >>>> what comes next with the 'is_param' thing, it's exactly what we are
> >>>> fighting against since 2017. There are plenty of ->exec_op()
> >>>> conversions out there, I don't believe this one will be harder. You
> >>>> need to convert the driver to this new API and get rid of this whole
> >>>> endianness non-sense to simplify a lot the driver.
> >>>> >>> I am not guessing anything but just factor out the existing common nand cache read logic into the single default function(or one for page read and another for parameter read as I mentioned in another thread) and allow SoC to overrides the implementation when needed.
> >>
> >> No, you are trying to guess what type of read the core is performing,
> >> either a regular data page read or a parameter page read.
> >>
> >>> I agree ->exec_op can possibly get rid of the parameter page read function and is the way to go. But it won't help on the page read for endianess.
> >>
> >> You told me there is no endianess issue with the data pages, so why it
> >> won't help on the page read?
> >>
> >>> It's not that I am against exec_op but I want to take one step a time
> >>> and I'd like to get these fixes
> >>
> >> I don't see any fix here? Let me know if I am missing something but
> >> right now I see a new version of the controller being supported with
> >> its own constraints. If you are fixing existing code for already
> >> supported platform, then make it clear and we can discuss this. But if
> >> you just want to support the bcmbca flavor, then there is no risk
> >> mitigation involved here, and a conversion is the right step :)
> >>
> >
> > I forgot to mention: the exec_op conversion is almost ready, Boris
> > worked on it but he lacked the hardware so maybe you'll just need to
> > revive the few patches which target your platform and do a little bit of
> > debugging?
> >
> > https://github.com/bbrezillon/linux/commits/nand/exec-op-conversion?after=8a3cf6fd25d5e15c6667f9e95c1fc86e4cb735e6+34&branch=nand%2Fexec-op-conversion&qualified_name=refs%2Fheads%2Fnand%2Fexec-op-conversion
> >
> Yes this is the patch what our exec_op work is based on. Thanks Boris! The issue with patch is that performance is very slow for anything that rely on nand_read_page_op as the patch implementing it using the low level cmd and data register to transfer the data byte by byte.
You don't need to use exec_op for your read_page/write_page hooks,
quite the opposite actually. exec_op is not meant for high throughput.
exec_op is meant to be simple. You can have fast I/Os with a different
mechanism in your read/write_page hooks.
> I actually sent out email regarding this to Boris and he cc'ed you in
> sept last year. We have to use the nand parser to match the page read
> from exec_op so we can actually match and use the brcmnand_page_read
> fast path. But there are many situations that we need to match so the
> project to migrate exce_op are still work in progress just on our
> bcmbca chip as of now. Just forward that email again to you and I
> appreciate it if you have any inputs there. So IMHO it is just too
> risky and too big of scope to have the exec_op added to this patch
> series and definitively better to do it afterwards with a dedicated
> patch.
As long as you add small and orthogonal changes to cmd_ctrl/cmd_func
I don't mind, but what you want now is to force me to pull dirty
changes "first", the type of change we are refusing since 2018, making
me expect you'll perform the conversion after. It would have been
terribly less dirty and you would have all your code already upstreamed
if you had performed the exec_op conversion since September.
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-13 6:42 ` Miquel Raynal
@ 2023-06-14 0:00 ` William Zhang
2023-06-14 6:22 ` Miquel Raynal
0 siblings, 1 reply; 44+ messages in thread
From: William Zhang @ 2023-06-14 0:00 UTC (permalink / raw)
To: Miquel Raynal
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 6414 bytes --]
Hi Miquel,
On 06/12/2023 11:42 PM, Miquel Raynal wrote:
> Hi William,
>
> william.zhang@broadcom.com wrote on Mon, 12 Jun 2023 12:18:58 -0700:
>
>> On 06/12/2023 10:53 AM, Miquel Raynal wrote:
>>> Hello again,
>>>
>>>>>>>>>> Perhaps we could have a single function that is statically assigned at
>>>>>>>>>> probe time instead of a first helper with two conditions which calls in
>>>>>>>>>> one case another hook... This can be simplified I guess.
>>>>>>>>>> >> Well this will need to be done at the SoC specific implementation level (bcm<xxx>_nand.c) and each SoC will need to have either general data bus read func with is_param option or data_bus_read_page, data_bus_read_param.
>>>>>>>>
>>>>>>>> You told me in case we would use exec_op we could avoid the param
>>>>>>>> cache. If that's true then the whole support can be simplified.
>>>>>>>> >> Correct we may possibly unified the parameter data read but exec_op is long shot and we are not fully ready for that yet. It also depends on if the low level data register has endianess difference for the parameter data between difference SoCs.
>>>>>>>
>>>>>>> So I would like to push the current implementation and we can explore the exec_op option late which will be a much big and complete different implementation.
>>>>>>
>>>>>> I am sorry but this series is totally backwards, you're trying to guess
>>>>>> what comes next with the 'is_param' thing, it's exactly what we are
>>>>>> fighting against since 2017. There are plenty of ->exec_op()
>>>>>> conversions out there, I don't believe this one will be harder. You
>>>>>> need to convert the driver to this new API and get rid of this whole
>>>>>> endianness non-sense to simplify a lot the driver.
>>>>>> >>> I am not guessing anything but just factor out the existing common nand cache read logic into the single default function(or one for page read and another for parameter read as I mentioned in another thread) and allow SoC to overrides the implementation when needed.
>>>>
>>>> No, you are trying to guess what type of read the core is performing,
>>>> either a regular data page read or a parameter page read.
>>>>
>>>>> I agree ->exec_op can possibly get rid of the parameter page read function and is the way to go. But it won't help on the page read for endianess.
>>>>
>>>> You told me there is no endianess issue with the data pages, so why it
>>>> won't help on the page read?
>>>>
>>>>> It's not that I am against exec_op but I want to take one step a time
>>>>> and I'd like to get these fixes
>>>>
>>>> I don't see any fix here? Let me know if I am missing something but
>>>> right now I see a new version of the controller being supported with
>>>> its own constraints. If you are fixing existing code for already
>>>> supported platform, then make it clear and we can discuss this. But if
>>>> you just want to support the bcmbca flavor, then there is no risk
>>>> mitigation involved here, and a conversion is the right step :)
>>>>
>>>
>>> I forgot to mention: the exec_op conversion is almost ready, Boris
>>> worked on it but he lacked the hardware so maybe you'll just need to
>>> revive the few patches which target your platform and do a little bit of
>>> debugging?
>>>
>>> https://github.com/bbrezillon/linux/commits/nand/exec-op-conversion?after=8a3cf6fd25d5e15c6667f9e95c1fc86e4cb735e6+34&branch=nand%2Fexec-op-conversion&qualified_name=refs%2Fheads%2Fnand%2Fexec-op-conversion
>>>
>> Yes this is the patch what our exec_op work is based on. Thanks Boris! The issue with patch is that performance is very slow for anything that rely on nand_read_page_op as the patch implementing it using the low level cmd and data register to transfer the data byte by byte.
>
> You don't need to use exec_op for your read_page/write_page hooks,
> quite the opposite actually. exec_op is not meant for high throughput.
> exec_op is meant to be simple. You can have fast I/Os with a different
> mechanism in your read/write_page hooks.
>
Right it does not impact our fast path: controller based ecc read/write.
But things like on-chip ecc nand driver that uses exec_op API get
impacted badly. We need to add nand op parser, several matching rules
and other logics to use fast path page read/write instead of the low
level data register read/write.
>> I actually sent out email regarding this to Boris and he cc'ed you in
>> sept last year. We have to use the nand parser to match the page read
>> from exec_op so we can actually match and use the brcmnand_page_read
>> fast path. But there are many situations that we need to match so the
>> project to migrate exce_op are still work in progress just on our
>> bcmbca chip as of now. Just forward that email again to you and I
>> appreciate it if you have any inputs there. So IMHO it is just too
>> risky and too big of scope to have the exec_op added to this patch
>> series and definitively better to do it afterwards with a dedicated
>> patch.
>
> As long as you add small and orthogonal changes to cmd_ctrl/cmd_func
> I don't mind, but what you want now is to force me to pull dirty
> changes "first", the type of change we are refusing since 2018, making
> me expect you'll perform the conversion after. It would have been
> terribly less dirty and you would have all your code already upstreamed
> if you had performed the exec_op conversion since September.
>
I didn't work on open source 5 years ago. I am sorry that I missed the
background of the rejected changes since then but I do not agree that
this change is dirty change just because I factor out the code with
is_param argument(and I offered an alternative to remove is_param with
two data read functions).
I see your point with exec_op and agree that is the way to go. We had
an initial look of the Borris exec_op patch last Sept and noticed the
performance issue but we haven't got the chance to actively work on
improving the performance and prepare for up-streaming until recently.
What if we bring in the original exec_op patch in this series so we
don't need to add the parameter data read function(if we verify it works
on difference SoCs without endianess)? Or better to have exec_op as
separate patch first and then this series? Then we provide another
patch to improve the performance for exec_op as this work is still in
progress and require more testing.
> Thanks,
> Miquèl
>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-14 0:00 ` William Zhang
@ 2023-06-14 6:22 ` Miquel Raynal
2023-06-14 23:52 ` William Zhang
0 siblings, 1 reply; 44+ messages in thread
From: Miquel Raynal @ 2023-06-14 6:22 UTC (permalink / raw)
To: William Zhang
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
Hi William,
william.zhang@broadcom.com wrote on Tue, 13 Jun 2023 17:00:19 -0700:
> Hi Miquel,
>
> On 06/12/2023 11:42 PM, Miquel Raynal wrote:
> > Hi William,
> >
> > william.zhang@broadcom.com wrote on Mon, 12 Jun 2023 12:18:58 -0700:
> >
> >> On 06/12/2023 10:53 AM, Miquel Raynal wrote:
> >>> Hello again,
> >>> >>>>>>>>>> Perhaps we could have a single function that is statically assigned at
> >>>>>>>>>> probe time instead of a first helper with two conditions which calls in
> >>>>>>>>>> one case another hook... This can be simplified I guess.
> >>>>>>>>>> >> Well this will need to be done at the SoC specific implementation level (bcm<xxx>_nand.c) and each SoC will need to have either general data bus read func with is_param option or data_bus_read_page, data_bus_read_param.
> >>>>>>>>
> >>>>>>>> You told me in case we would use exec_op we could avoid the param
> >>>>>>>> cache. If that's true then the whole support can be simplified.
> >>>>>>>> >> Correct we may possibly unified the parameter data read but exec_op is long shot and we are not fully ready for that yet. It also depends on if the low level data register has endianess difference for the parameter data between difference SoCs.
> >>>>>>>
> >>>>>>> So I would like to push the current implementation and we can explore the exec_op option late which will be a much big and complete different implementation.
> >>>>>>
> >>>>>> I am sorry but this series is totally backwards, you're trying to guess
> >>>>>> what comes next with the 'is_param' thing, it's exactly what we are
> >>>>>> fighting against since 2017. There are plenty of ->exec_op()
> >>>>>> conversions out there, I don't believe this one will be harder. You
> >>>>>> need to convert the driver to this new API and get rid of this whole
> >>>>>> endianness non-sense to simplify a lot the driver.
> >>>>>> >>> I am not guessing anything but just factor out the existing common nand cache read logic into the single default function(or one for page read and another for parameter read as I mentioned in another thread) and allow SoC to overrides the implementation when needed.
> >>>>
> >>>> No, you are trying to guess what type of read the core is performing,
> >>>> either a regular data page read or a parameter page read.
> >>>> >>>>> I agree ->exec_op can possibly get rid of the parameter page read function and is the way to go. But it won't help on the page read for endianess.
> >>>>
> >>>> You told me there is no endianess issue with the data pages, so why it
> >>>> won't help on the page read?
> >>>> >>>>> It's not that I am against exec_op but I want to take one step a time
> >>>>> and I'd like to get these fixes
> >>>>
> >>>> I don't see any fix here? Let me know if I am missing something but
> >>>> right now I see a new version of the controller being supported with
> >>>> its own constraints. If you are fixing existing code for already
> >>>> supported platform, then make it clear and we can discuss this. But if
> >>>> you just want to support the bcmbca flavor, then there is no risk
> >>>> mitigation involved here, and a conversion is the right step :)
> >>>> >>>
> >>> I forgot to mention: the exec_op conversion is almost ready, Boris
> >>> worked on it but he lacked the hardware so maybe you'll just need to
> >>> revive the few patches which target your platform and do a little bit of
> >>> debugging?
> >>>
> >>> https://github.com/bbrezillon/linux/commits/nand/exec-op-conversion?after=8a3cf6fd25d5e15c6667f9e95c1fc86e4cb735e6+34&branch=nand%2Fexec-op-conversion&qualified_name=refs%2Fheads%2Fnand%2Fexec-op-conversion
> >>> >> Yes this is the patch what our exec_op work is based on. Thanks Boris! The issue with patch is that performance is very slow for anything that rely on nand_read_page_op as the patch implementing it using the low level cmd and data register to transfer the data byte by byte.
> >
> > You don't need to use exec_op for your read_page/write_page hooks,
> > quite the opposite actually. exec_op is not meant for high throughput.
> > exec_op is meant to be simple. You can have fast I/Os with a different
> > mechanism in your read/write_page hooks.
> >
> Right it does not impact our fast path: controller based ecc read/write. But things like on-chip ecc nand driver that uses exec_op API get impacted badly. We need to add nand op parser, several matching rules and other logics to use fast path page read/write instead of the low level data register read/write.
>
> >> I actually sent out email regarding this to Boris and he cc'ed you in
> >> sept last year. We have to use the nand parser to match the page read
> >> from exec_op so we can actually match and use the brcmnand_page_read
> >> fast path. But there are many situations that we need to match so the
> >> project to migrate exce_op are still work in progress just on our
> >> bcmbca chip as of now. Just forward that email again to you and I
> >> appreciate it if you have any inputs there. So IMHO it is just too
> >> risky and too big of scope to have the exec_op added to this patch
> >> series and definitively better to do it afterwards with a dedicated
> >> patch.
> >
> > As long as you add small and orthogonal changes to cmd_ctrl/cmd_func
> > I don't mind, but what you want now is to force me to pull dirty
> > changes "first", the type of change we are refusing since 2018, making
> > me expect you'll perform the conversion after. It would have been
> > terribly less dirty and you would have all your code already upstreamed
> > if you had performed the exec_op conversion since September.
> >
> I didn't work on open source 5 years ago. I am sorry that I missed the background of the rejected changes since then but I do not agree that this change is dirty change just because I factor out the code with is_param argument(and I offered an alternative to remove is_param with two data read functions).
This _is_ dirty because you cannot know with the cmd_ctrl/cmdfunc
API whether we read a parameter page or a page of data. So your are
_guessing_. There are plenty ways of reading one of the others, the
heuristics on the controller side will _always_ be wrong. That is why
exec_op() was introduced.
> I see your point with exec_op and agree that is the way to go. We had an initial look of the Borris exec_op patch last Sept and noticed the performance issue but we haven't got the chance to actively work on improving the performance and prepare for up-streaming until recently. What if we bring in the original exec_op patch in this series so we don't need to add the parameter data read function(if we verify it works on difference SoCs without endianess)? Or better to have exec_op as separate patch first and then this series?
This one is my favorite:
1/ Add exec_op support
2/ Remove legacy hooks
3/ Add support for the bcmbca SoC
Then you can improve the performance for on-die ECC situations, but to
be honest this improvement looks little a very little addition. You can
take example from the existing hooks, how they match specific
operations in the parser and then hook them to specific helpers.
Nothing terribly complex, there are dozens of conversions available
now.
Good luck :)
Miquèl
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 05/12] dt-bindings: mtd: brcmnand: Updates for bcmbca SoCs
2023-06-06 23:12 ` [PATCH 05/12] dt-bindings: mtd: brcmnand: Updates for bcmbca SoCs William Zhang
2023-06-07 8:14 ` Miquel Raynal
@ 2023-06-14 22:43 ` Rob Herring
2023-06-15 0:28 ` William Zhang
1 sibling, 1 reply; 44+ messages in thread
From: Rob Herring @ 2023-06-14 22:43 UTC (permalink / raw)
To: William Zhang
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, devicetree, linux-kernel,
Krzysztof Kozlowski, Vignesh Raghavendra, Miquel Raynal,
Richard Weinberger, Kamal Dasu
On Tue, Jun 06, 2023 at 04:12:45PM -0700, William Zhang wrote:
> Use new compatiable brcm,nand-bcmbca to support BCMBCA broadband
> product. The old compatible string is still kept in the driver so old
> dtb can still work.
I don't understand why you need to change this.
> Add brcm,nand-use-wp property to have an option for disabling this
> feature on broadband board design that does not use write protection.
> Add brcm,nand-ecc-use-strap to get ecc setting from board strap for
> broadband board designs because they do not specify ecc setting in dts
> but rather using the strap setting.
>
> Remove the requirement of interrupts and interrupt-names properties to
> reflect the driver code.
>
> This patch also includes a few minor fixes to the BCM63xx compatibles
> and add myself to the list of maintainers.
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> ---
>
> .../bindings/mtd/brcm,brcmnand.yaml | 64 +++++++++++++------
> 1 file changed, 43 insertions(+), 21 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
> index 1571024aa119..1fe1c166a9db 100644
> --- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
> +++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
> @@ -9,6 +9,7 @@ title: Broadcom STB NAND Controller
> maintainers:
> - Brian Norris <computersforpeace@gmail.com>
> - Kamal Dasu <kdasu.kdev@gmail.com>
> + - William Zhang <william.zhang@broadcom.com>
>
> description: |
> The Broadcom Set-Top Box NAND controller supports low-level access to raw NAND
> @@ -18,9 +19,10 @@ description: |
> supports basic PROGRAM and READ functions, among other features.
>
> This controller was originally designed for STB SoCs (BCM7xxx) but is now
> - available on a variety of Broadcom SoCs, including some BCM3xxx, BCM63xx, and
> - iProc/Cygnus. Its history includes several similar (but not fully register
> - compatible) versions.
> + available on a variety of Broadcom SoCs, including some BCM3xxx, MIPS based
> + Broadband SoC (BCM63xx), ARM based Broadband SoC (BCMBCA) and iProc/Cygnus.
> + Its history includes several similar (but not fully register compatible)
> + versions.
>
> -- Additional SoC-specific NAND controller properties --
>
> @@ -53,9 +55,9 @@ properties:
> - brcm,brcmnand-v7.2
> - brcm,brcmnand-v7.3
> - const: brcm,brcmnand
> - - description: BCM63138 SoC-specific NAND controller
> + - description: BCMBCA SoC-specific NAND controller
> items:
> - - const: brcm,nand-bcm63138
> + - const: brcm,nand-bcmbca
> - enum:
> - brcm,brcmnand-v7.0
> - brcm,brcmnand-v7.1
> @@ -65,11 +67,15 @@ properties:
> - const: brcm,nand-iproc
> - const: brcm,brcmnand-v6.1
> - const: brcm,brcmnand
> - - description: BCM63168 SoC-specific NAND controller
> + - description: BCM63xx SoC-specific NAND controller
> items:
> - - const: brcm,nand-bcm63168
> - - const: brcm,nand-bcm6368
> - - const: brcm,brcmnand-v4.0
> + - enum:
> + - brcm,nand-bcm63168
> + - brcm,nand-bcm6368
> + - enum:
> + - brcm,brcmnand-v2.1
> + - brcm,brcmnand-v2.2
> + - brcm,brcmnand-v4.0
> - const: brcm,brcmnand
Completely changing what's valid here too. You're breaking the ABI.
Rob
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 05/12] dt-bindings: mtd: brcmnand: Updates for bcmbca SoCs
2023-06-07 8:14 ` Miquel Raynal
2023-06-07 20:01 ` William Zhang
@ 2023-06-14 22:46 ` Rob Herring
2023-06-15 0:40 ` William Zhang
1 sibling, 1 reply; 44+ messages in thread
From: Rob Herring @ 2023-06-14 22:46 UTC (permalink / raw)
To: Miquel Raynal
Cc: William Zhang, Broadcom Kernel List, Linux MTD List, f.fainelli,
rafal, kursad.oney, joel.peshkin, computersforpeace, anand.gore,
dregan, kamal.dasu, tomer.yacoby, dan.beygelman, devicetree,
linux-kernel, Krzysztof Kozlowski, Vignesh Raghavendra,
Richard Weinberger, Kamal Dasu
On Wed, Jun 07, 2023 at 10:14:52AM +0200, Miquel Raynal wrote:
> Hi William,
>
> william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:45 -0700:
>
> > Use new compatiable brcm,nand-bcmbca to support BCMBCA broadband
> > product. The old compatible string is still kept in the driver so old
> > dtb can still work.
> >
> > Add brcm,nand-use-wp property to have an option for disabling this
> > feature on broadband board design that does not use write protection.
> > Add brcm,nand-ecc-use-strap to get ecc setting from board strap for
> > broadband board designs because they do not specify ecc setting in dts
> > but rather using the strap setting.
> >
> > Remove the requirement of interrupts and interrupt-names properties to
> > reflect the driver code.
> >
> > This patch also includes a few minor fixes to the BCM63xx compatibles
> > and add myself to the list of maintainers.
> >
> > Signed-off-by: William Zhang <william.zhang@broadcom.com>
> > ---
> >
> > .../bindings/mtd/brcm,brcmnand.yaml | 64 +++++++++++++------
> > 1 file changed, 43 insertions(+), 21 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
> > index 1571024aa119..1fe1c166a9db 100644
> > --- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
> > +++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
> > @@ -9,6 +9,7 @@ title: Broadcom STB NAND Controller
> > maintainers:
> > - Brian Norris <computersforpeace@gmail.com>
> > - Kamal Dasu <kdasu.kdev@gmail.com>
> > + - William Zhang <william.zhang@broadcom.com>
> >
> > description: |
> > The Broadcom Set-Top Box NAND controller supports low-level access to raw NAND
> > @@ -18,9 +19,10 @@ description: |
> > supports basic PROGRAM and READ functions, among other features.
> >
> > This controller was originally designed for STB SoCs (BCM7xxx) but is now
> > - available on a variety of Broadcom SoCs, including some BCM3xxx, BCM63xx, and
> > - iProc/Cygnus. Its history includes several similar (but not fully register
> > - compatible) versions.
> > + available on a variety of Broadcom SoCs, including some BCM3xxx, MIPS based
> > + Broadband SoC (BCM63xx), ARM based Broadband SoC (BCMBCA) and iProc/Cygnus.
> > + Its history includes several similar (but not fully register compatible)
> > + versions.
> >
> > -- Additional SoC-specific NAND controller properties --
> >
> > @@ -53,9 +55,9 @@ properties:
> > - brcm,brcmnand-v7.2
> > - brcm,brcmnand-v7.3
> > - const: brcm,brcmnand
> > - - description: BCM63138 SoC-specific NAND controller
> > + - description: BCMBCA SoC-specific NAND controller
> > items:
> > - - const: brcm,nand-bcm63138
> > + - const: brcm,nand-bcmbca
> > - enum:
> > - brcm,brcmnand-v7.0
> > - brcm,brcmnand-v7.1
> > @@ -65,11 +67,15 @@ properties:
> > - const: brcm,nand-iproc
> > - const: brcm,brcmnand-v6.1
> > - const: brcm,brcmnand
> > - - description: BCM63168 SoC-specific NAND controller
> > + - description: BCM63xx SoC-specific NAND controller
> > items:
> > - - const: brcm,nand-bcm63168
> > - - const: brcm,nand-bcm6368
> > - - const: brcm,brcmnand-v4.0
> > + - enum:
> > + - brcm,nand-bcm63168
> > + - brcm,nand-bcm6368
> > + - enum:
> > + - brcm,brcmnand-v2.1
> > + - brcm,brcmnand-v2.2
> > + - brcm,brcmnand-v4.0
> > - const: brcm,brcmnand
> >
> > reg:
> > @@ -111,6 +117,19 @@ properties:
> > earlier versions of this core that include WP
> > type: boolean
> >
> > + brcm,nand-use-wp:
> > + description:
> > + Use this integer to indicate if board design uses
> > + controller's write protection feature and connects its
> > + NAND_WPb pin to nand chip's WP_L pin. Driver defaults to
> > + use this feature when this property does not exist.
> > + Set to 0 if WP pins are not connected and feature is not
> > + used. Set to 1 if WP pins are connected and feature is used.
> > + Set to 2 if WP pins are connected but disable this feature
> > + through driver that sets controller to output high on NAND_WPb.
> > + $ref: /schemas/types.yaml#/definitions/uint32
> > + enum: [0, 1, 2]
>
> Perhaps strings would be welcome. I'll let binding maintainers say what
> they think of it.
1 is redundant as it is the same as not present. Seems like a
'brcm,disable-wp' boolean would suffice here.
Rob
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface
2023-06-14 6:22 ` Miquel Raynal
@ 2023-06-14 23:52 ` William Zhang
0 siblings, 0 replies; 44+ messages in thread
From: William Zhang @ 2023-06-14 23:52 UTC (permalink / raw)
To: Miquel Raynal
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, linux-kernel,
Vignesh Raghavendra, Richard Weinberger, Kamal Dasu,
linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 7785 bytes --]
On 06/13/2023 11:22 PM, Miquel Raynal wrote:
> Hi William,
>
> william.zhang@broadcom.com wrote on Tue, 13 Jun 2023 17:00:19 -0700:
>
>> Hi Miquel,
>>
>> On 06/12/2023 11:42 PM, Miquel Raynal wrote:
>>> Hi William,
>>>
>>> william.zhang@broadcom.com wrote on Mon, 12 Jun 2023 12:18:58 -0700:
>>>
>>>> On 06/12/2023 10:53 AM, Miquel Raynal wrote:
>>>>> Hello again,
>>>>> >>>>>>>>>> Perhaps we could have a single function that is statically assigned at
>>>>>>>>>>>> probe time instead of a first helper with two conditions which calls in
>>>>>>>>>>>> one case another hook... This can be simplified I guess.
>>>>>>>>>>>> >> Well this will need to be done at the SoC specific implementation level (bcm<xxx>_nand.c) and each SoC will need to have either general data bus read func with is_param option or data_bus_read_page, data_bus_read_param.
>>>>>>>>>>
>>>>>>>>>> You told me in case we would use exec_op we could avoid the param
>>>>>>>>>> cache. If that's true then the whole support can be simplified.
>>>>>>>>>> >> Correct we may possibly unified the parameter data read but exec_op is long shot and we are not fully ready for that yet. It also depends on if the low level data register has endianess difference for the parameter data between difference SoCs.
>>>>>>>>>
>>>>>>>>> So I would like to push the current implementation and we can explore the exec_op option late which will be a much big and complete different implementation.
>>>>>>>>
>>>>>>>> I am sorry but this series is totally backwards, you're trying to guess
>>>>>>>> what comes next with the 'is_param' thing, it's exactly what we are
>>>>>>>> fighting against since 2017. There are plenty of ->exec_op()
>>>>>>>> conversions out there, I don't believe this one will be harder. You
>>>>>>>> need to convert the driver to this new API and get rid of this whole
>>>>>>>> endianness non-sense to simplify a lot the driver.
>>>>>>>> >>> I am not guessing anything but just factor out the existing common nand cache read logic into the single default function(or one for page read and another for parameter read as I mentioned in another thread) and allow SoC to overrides the implementation when needed.
>>>>>>
>>>>>> No, you are trying to guess what type of read the core is performing,
>>>>>> either a regular data page read or a parameter page read.
>>>>>> >>>>> I agree ->exec_op can possibly get rid of the parameter page read function and is the way to go. But it won't help on the page read for endianess.
>>>>>>
>>>>>> You told me there is no endianess issue with the data pages, so why it
>>>>>> won't help on the page read?
>>>>>> >>>>> It's not that I am against exec_op but I want to take one step a time
>>>>>>> and I'd like to get these fixes
>>>>>>
>>>>>> I don't see any fix here? Let me know if I am missing something but
>>>>>> right now I see a new version of the controller being supported with
>>>>>> its own constraints. If you are fixing existing code for already
>>>>>> supported platform, then make it clear and we can discuss this. But if
>>>>>> you just want to support the bcmbca flavor, then there is no risk
>>>>>> mitigation involved here, and a conversion is the right step :)
>>>>>> >>>
>>>>> I forgot to mention: the exec_op conversion is almost ready, Boris
>>>>> worked on it but he lacked the hardware so maybe you'll just need to
>>>>> revive the few patches which target your platform and do a little bit of
>>>>> debugging?
>>>>>
>>>>> https://github.com/bbrezillon/linux/commits/nand/exec-op-conversion?after=8a3cf6fd25d5e15c6667f9e95c1fc86e4cb735e6+34&branch=nand%2Fexec-op-conversion&qualified_name=refs%2Fheads%2Fnand%2Fexec-op-conversion
>>>>> >> Yes this is the patch what our exec_op work is based on. Thanks Boris! The issue with patch is that performance is very slow for anything that rely on nand_read_page_op as the patch implementing it using the low level cmd and data register to transfer the data byte by byte.
>>>
>>> You don't need to use exec_op for your read_page/write_page hooks,
>>> quite the opposite actually. exec_op is not meant for high throughput.
>>> exec_op is meant to be simple. You can have fast I/Os with a different
>>> mechanism in your read/write_page hooks.
>>>
>> Right it does not impact our fast path: controller based ecc read/write. But things like on-chip ecc nand driver that uses exec_op API get impacted badly. We need to add nand op parser, several matching rules and other logics to use fast path page read/write instead of the low level data register read/write.
>>
>>>> I actually sent out email regarding this to Boris and he cc'ed you in
>>>> sept last year. We have to use the nand parser to match the page read
>>>> from exec_op so we can actually match and use the brcmnand_page_read
>>>> fast path. But there are many situations that we need to match so the
>>>> project to migrate exce_op are still work in progress just on our
>>>> bcmbca chip as of now. Just forward that email again to you and I
>>>> appreciate it if you have any inputs there. So IMHO it is just too
>>>> risky and too big of scope to have the exec_op added to this patch
>>>> series and definitively better to do it afterwards with a dedicated
>>>> patch.
>>>
>>> As long as you add small and orthogonal changes to cmd_ctrl/cmd_func
>>> I don't mind, but what you want now is to force me to pull dirty
>>> changes "first", the type of change we are refusing since 2018, making
>>> me expect you'll perform the conversion after. It would have been
>>> terribly less dirty and you would have all your code already upstreamed
>>> if you had performed the exec_op conversion since September.
>>>
>> I didn't work on open source 5 years ago. I am sorry that I missed the background of the rejected changes since then but I do not agree that this change is dirty change just because I factor out the code with is_param argument(and I offered an alternative to remove is_param with two data read functions).
>
> This _is_ dirty because you cannot know with the cmd_ctrl/cmdfunc
> API whether we read a parameter page or a page of data. So your are
> _guessing_. There are plenty ways of reading one of the others, the
> heuristics on the controller side will _always_ be wrong. That is why
> exec_op() was introduced.
>
alright we have different definition of dirty ;) Understand it is not a
preferred way to update the code in controller cmdfunc path especially
for large change that can be done in exec_op.
>> I see your point with exec_op and agree that is the way to go. We had an initial look of the Borris exec_op patch last Sept and noticed the performance issue but we haven't got the chance to actively work on improving the performance and prepare for up-streaming until recently. What if we bring in the original exec_op patch in this series so we don't need to add the parameter data read function(if we verify it works on difference SoCs without endianess)? Or better to have exec_op as separate patch first and then this series?
>
> This one is my favorite:
> 1/ Add exec_op support
> 2/ Remove legacy hooks
> 3/ Add support for the bcmbca SoC
>
Sounds good. We will send exec_op series for 1 and 2 then another
series for 3. And I will send v2 of this series to just include the
fixes (patch 1 to patch 4) with updates based on the comments received.
> Then you can improve the performance for on-die ECC situations, but to
> be honest this improvement looks little a very little addition. You can
> take example from the existing hooks, how they match specific
> operations in the parser and then hook them to specific helpers.
> Nothing terribly complex, there are dozens of conversions available
> now.
>
> Good luck :)
> Miquèl
>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 05/12] dt-bindings: mtd: brcmnand: Updates for bcmbca SoCs
2023-06-14 22:43 ` Rob Herring
@ 2023-06-15 0:28 ` William Zhang
0 siblings, 0 replies; 44+ messages in thread
From: William Zhang @ 2023-06-15 0:28 UTC (permalink / raw)
To: Rob Herring
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, devicetree, linux-kernel,
Krzysztof Kozlowski, Vignesh Raghavendra, Miquel Raynal,
Richard Weinberger, Kamal Dasu
[-- Attachment #1: Type: text/plain, Size: 4896 bytes --]
Hi Rob,
On 06/14/2023 03:43 PM, Rob Herring wrote:
> On Tue, Jun 06, 2023 at 04:12:45PM -0700, William Zhang wrote:
>> Use new compatiable brcm,nand-bcmbca to support BCMBCA broadband
>> product. The old compatible string is still kept in the driver so old
>> dtb can still work.
>
> I don't understand why you need to change this.
>
>
Same as the iProc SoC NAND controller flavor for our BCMBCA SoC
controller. And the existing binding is wrong. It shows
brcm,nand-bcm63138 can be backward compatible to either v7.0 and v7.1
controller. But in fact 63138 only use v7.0.
I understand we had discussion before and chip specific name is the
preferred method but the nand controller here is different and it has
well defined and documented version control and our bcmbca SoCs
integrate the controller exactly the same way so no chip specific
compatible is needed. In the unlikely event that a future bcmbca SoC
has a different implementation, we can always add new chip specific
compatible.
If you are concerned about ABI breakage on the 63138 compatible, I can
add it back, although I find only a few 63138 and 4908 boards use it
and I did keep it in the driver so they can still bind.
>> Add brcm,nand-use-wp property to have an option for disabling this
>> feature on broadband board design that does not use write protection.
>> Add brcm,nand-ecc-use-strap to get ecc setting from board strap for
>> broadband board designs because they do not specify ecc setting in dts
>> but rather using the strap setting.
>>
>> Remove the requirement of interrupts and interrupt-names properties to
>> reflect the driver code.
>>
>> This patch also includes a few minor fixes to the BCM63xx compatibles
>> and add myself to the list of maintainers.
>>
>> Signed-off-by: William Zhang <william.zhang@broadcom.com>
>> ---
>>
>> .../bindings/mtd/brcm,brcmnand.yaml | 64 +++++++++++++------
>> 1 file changed, 43 insertions(+), 21 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
>> index 1571024aa119..1fe1c166a9db 100644
>> --- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
>> +++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
>> @@ -9,6 +9,7 @@ title: Broadcom STB NAND Controller
>> maintainers:
>> - Brian Norris <computersforpeace@gmail.com>
>> - Kamal Dasu <kdasu.kdev@gmail.com>
>> + - William Zhang <william.zhang@broadcom.com>
>>
>> description: |
>> The Broadcom Set-Top Box NAND controller supports low-level access to raw NAND
>> @@ -18,9 +19,10 @@ description: |
>> supports basic PROGRAM and READ functions, among other features.
>>
>> This controller was originally designed for STB SoCs (BCM7xxx) but is now
>> - available on a variety of Broadcom SoCs, including some BCM3xxx, BCM63xx, and
>> - iProc/Cygnus. Its history includes several similar (but not fully register
>> - compatible) versions.
>> + available on a variety of Broadcom SoCs, including some BCM3xxx, MIPS based
>> + Broadband SoC (BCM63xx), ARM based Broadband SoC (BCMBCA) and iProc/Cygnus.
>> + Its history includes several similar (but not fully register compatible)
>> + versions.
>>
>> -- Additional SoC-specific NAND controller properties --
>>
>> @@ -53,9 +55,9 @@ properties:
>> - brcm,brcmnand-v7.2
>> - brcm,brcmnand-v7.3
>> - const: brcm,brcmnand
>> - - description: BCM63138 SoC-specific NAND controller
>> + - description: BCMBCA SoC-specific NAND controller
>> items:
>> - - const: brcm,nand-bcm63138
>> + - const: brcm,nand-bcmbca
>> - enum:
>> - brcm,brcmnand-v7.0
>> - brcm,brcmnand-v7.1
>> @@ -65,11 +67,15 @@ properties:
>> - const: brcm,nand-iproc
>> - const: brcm,brcmnand-v6.1
>> - const: brcm,brcmnand
>> - - description: BCM63168 SoC-specific NAND controller
>> + - description: BCM63xx SoC-specific NAND controller
>> items:
>> - - const: brcm,nand-bcm63168
>> - - const: brcm,nand-bcm6368
>> - - const: brcm,brcmnand-v4.0
>> + - enum:
>> + - brcm,nand-bcm63168
>> + - brcm,nand-bcm6368
>> + - enum:
>> + - brcm,brcmnand-v2.1
>> + - brcm,brcmnand-v2.2
>> + - brcm,brcmnand-v4.0
>> - const: brcm,brcmnand
>
> Completely changing what's valid here too. You're breaking the ABI.
>
This binding is wrong, 63168 is not backward compatible to 6368. They
should backward compatible to their specific controller version. If you
looks arch/mips/boot/dts/brcm/bcm6328.dtsi, bcm6368.dtsi, bcm63268.dtsi
and bcm6362.dtsi, their compatible list is correct but the yaml was not
updated.
> Rob
>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply [flat|nested] 44+ messages in thread
* Re: [PATCH 05/12] dt-bindings: mtd: brcmnand: Updates for bcmbca SoCs
2023-06-14 22:46 ` Rob Herring
@ 2023-06-15 0:40 ` William Zhang
0 siblings, 0 replies; 44+ messages in thread
From: William Zhang @ 2023-06-15 0:40 UTC (permalink / raw)
To: Rob Herring, Miquel Raynal
Cc: Broadcom Kernel List, Linux MTD List, f.fainelli, rafal,
kursad.oney, joel.peshkin, computersforpeace, anand.gore, dregan,
kamal.dasu, tomer.yacoby, dan.beygelman, devicetree, linux-kernel,
Krzysztof Kozlowski, Vignesh Raghavendra, Richard Weinberger,
Kamal Dasu
[-- Attachment #1: Type: text/plain, Size: 5279 bytes --]
Hi Rob,
On 06/14/2023 03:46 PM, Rob Herring wrote:
> On Wed, Jun 07, 2023 at 10:14:52AM +0200, Miquel Raynal wrote:
>> Hi William,
>>
>> william.zhang@broadcom.com wrote on Tue, 6 Jun 2023 16:12:45 -0700:
>>
>>> Use new compatiable brcm,nand-bcmbca to support BCMBCA broadband
>>> product. The old compatible string is still kept in the driver so old
>>> dtb can still work.
>>>
>>> Add brcm,nand-use-wp property to have an option for disabling this
>>> feature on broadband board design that does not use write protection.
>>> Add brcm,nand-ecc-use-strap to get ecc setting from board strap for
>>> broadband board designs because they do not specify ecc setting in dts
>>> but rather using the strap setting.
>>>
>>> Remove the requirement of interrupts and interrupt-names properties to
>>> reflect the driver code.
>>>
>>> This patch also includes a few minor fixes to the BCM63xx compatibles
>>> and add myself to the list of maintainers.
>>>
>>> Signed-off-by: William Zhang <william.zhang@broadcom.com>
>>> ---
>>>
>>> .../bindings/mtd/brcm,brcmnand.yaml | 64 +++++++++++++------
>>> 1 file changed, 43 insertions(+), 21 deletions(-)
>>>
>>> diff --git a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
>>> index 1571024aa119..1fe1c166a9db 100644
>>> --- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
>>> +++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.yaml
>>> @@ -9,6 +9,7 @@ title: Broadcom STB NAND Controller
>>> maintainers:
>>> - Brian Norris <computersforpeace@gmail.com>
>>> - Kamal Dasu <kdasu.kdev@gmail.com>
>>> + - William Zhang <william.zhang@broadcom.com>
>>>
>>> description: |
>>> The Broadcom Set-Top Box NAND controller supports low-level access to raw NAND
>>> @@ -18,9 +19,10 @@ description: |
>>> supports basic PROGRAM and READ functions, among other features.
>>>
>>> This controller was originally designed for STB SoCs (BCM7xxx) but is now
>>> - available on a variety of Broadcom SoCs, including some BCM3xxx, BCM63xx, and
>>> - iProc/Cygnus. Its history includes several similar (but not fully register
>>> - compatible) versions.
>>> + available on a variety of Broadcom SoCs, including some BCM3xxx, MIPS based
>>> + Broadband SoC (BCM63xx), ARM based Broadband SoC (BCMBCA) and iProc/Cygnus.
>>> + Its history includes several similar (but not fully register compatible)
>>> + versions.
>>>
>>> -- Additional SoC-specific NAND controller properties --
>>>
>>> @@ -53,9 +55,9 @@ properties:
>>> - brcm,brcmnand-v7.2
>>> - brcm,brcmnand-v7.3
>>> - const: brcm,brcmnand
>>> - - description: BCM63138 SoC-specific NAND controller
>>> + - description: BCMBCA SoC-specific NAND controller
>>> items:
>>> - - const: brcm,nand-bcm63138
>>> + - const: brcm,nand-bcmbca
>>> - enum:
>>> - brcm,brcmnand-v7.0
>>> - brcm,brcmnand-v7.1
>>> @@ -65,11 +67,15 @@ properties:
>>> - const: brcm,nand-iproc
>>> - const: brcm,brcmnand-v6.1
>>> - const: brcm,brcmnand
>>> - - description: BCM63168 SoC-specific NAND controller
>>> + - description: BCM63xx SoC-specific NAND controller
>>> items:
>>> - - const: brcm,nand-bcm63168
>>> - - const: brcm,nand-bcm6368
>>> - - const: brcm,brcmnand-v4.0
>>> + - enum:
>>> + - brcm,nand-bcm63168
>>> + - brcm,nand-bcm6368
>>> + - enum:
>>> + - brcm,brcmnand-v2.1
>>> + - brcm,brcmnand-v2.2
>>> + - brcm,brcmnand-v4.0
>>> - const: brcm,brcmnand
>>>
>>> reg:
>>> @@ -111,6 +117,19 @@ properties:
>>> earlier versions of this core that include WP
>>> type: boolean
>>>
>>> + brcm,nand-use-wp:
>>> + description:
>>> + Use this integer to indicate if board design uses
>>> + controller's write protection feature and connects its
>>> + NAND_WPb pin to nand chip's WP_L pin. Driver defaults to
>>> + use this feature when this property does not exist.
>>> + Set to 0 if WP pins are not connected and feature is not
>>> + used. Set to 1 if WP pins are connected and feature is used.
>>> + Set to 2 if WP pins are connected but disable this feature
>>> + through driver that sets controller to output high on NAND_WPb.
>>> + $ref: /schemas/types.yaml#/definitions/uint32
>>> + enum: [0, 1, 2]
>>
>> Perhaps strings would be welcome. I'll let binding maintainers say what
>> they think of it.
>
> 1 is redundant as it is the same as not present. Seems like a
> 'brcm,disable-wp' boolean would suffice here.
> WP feature present is indicated by the existing flag brcm,nand-has-wp.
1 is the opposite of 0 (use this feature vs not use this feature while
chip has this feature). 2 is kind of strange (for feature disabled
intentionally at run time while feature is used), maybe for testing
purpose or for certainly nand chip that has issue with WP but the board
design already connect the WP pin. I keep it here to match the driver
code that have these three states of the wp usage.
> Rob
>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply [flat|nested] 44+ messages in thread
end of thread, other threads:[~2023-06-15 0:41 UTC | newest]
Thread overview: 44+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-06 23:12 [PATCH 00/12] mtd: rawnand: brcmnand: driver and doc updates William Zhang
2023-06-06 23:12 ` [PATCH 01/12] mtd: rawnand: brcmnand: Fix ECC level field setting for v7.2 controller William Zhang
2023-06-07 8:06 ` Miquel Raynal
2023-06-06 23:12 ` [PATCH 02/12] mtd: rawnand: brcmnand: Fix potential false time out warning William Zhang
2023-06-06 23:12 ` [PATCH 03/12] mtd: rawnand: brcmnand: Fix crash during the panic_write William Zhang
2023-06-06 23:12 ` [PATCH 04/12] mtd: rawnand: brcmnand: Fix potential out-of-bounds access in oob write William Zhang
2023-06-07 8:09 ` Miquel Raynal
2023-06-06 23:12 ` [PATCH 05/12] dt-bindings: mtd: brcmnand: Updates for bcmbca SoCs William Zhang
2023-06-07 8:14 ` Miquel Raynal
2023-06-07 20:01 ` William Zhang
2023-06-09 8:58 ` Miquel Raynal
2023-06-09 19:05 ` William Zhang
2023-06-12 17:43 ` Miquel Raynal
2023-06-14 22:46 ` Rob Herring
2023-06-15 0:40 ` William Zhang
2023-06-14 22:43 ` Rob Herring
2023-06-15 0:28 ` William Zhang
2023-06-06 23:12 ` [PATCH 06/12] ARM: dts: broadcom: bcmbca: Add NAND controller node William Zhang
2023-06-06 23:12 ` [PATCH 07/12] arm64: " William Zhang
2023-06-06 23:12 ` [PATCH 08/12] mtd: rawnand: brcmnand: Rename bcm63138 nand driver William Zhang
2023-06-06 23:12 ` [PATCH 09/12] mtd: rawnand: brcmnand: Add new compatible string William Zhang
2023-06-06 23:12 ` [PATCH 10/12] mtd: rawnand: brcmnand: Add BCMBCA read data bus interface William Zhang
2023-06-07 8:20 ` Miquel Raynal
2023-06-07 20:12 ` William Zhang
2023-06-08 6:15 ` Miquel Raynal
2023-06-08 19:04 ` William Zhang
2023-06-07 8:22 ` Miquel Raynal
2023-06-07 20:24 ` William Zhang
2023-06-08 6:18 ` Miquel Raynal
2023-06-08 19:10 ` William Zhang
2023-06-09 8:35 ` Miquel Raynal
2023-06-09 19:16 ` William Zhang
2023-06-12 17:49 ` Miquel Raynal
2023-06-12 17:53 ` Miquel Raynal
2023-06-12 19:18 ` William Zhang
2023-06-13 6:42 ` Miquel Raynal
2023-06-14 0:00 ` William Zhang
2023-06-14 6:22 ` Miquel Raynal
2023-06-14 23:52 ` William Zhang
2023-06-12 19:03 ` William Zhang
2023-06-11 9:54 ` kernel test robot
2023-06-06 23:12 ` [PATCH 11/12] mtd: rawnand: brcmnand: Add support for getting ecc setting from strap William Zhang
2023-06-07 8:25 ` Miquel Raynal
2023-06-06 23:12 ` [PATCH 12/12] mtd: rawnand: brcmnand: Support write protection setting from dts William Zhang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).