From 54b275c8ed3ad20c447fd46deec83384822ac79d Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 21 Feb 2018 20:40:50 +0100 Subject: ipq40xx: add target Signed-off-by: Christian Lamparter Signed-off-by: Mathias Kresin Signed-off-by: John Crispin --- ...om-add-command-elements-in-BAM-transactio.patch | 89 ++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 target/linux/ipq40xx/patches-4.14/050-0002-mtd-nand-qcom-add-command-elements-in-BAM-transactio.patch (limited to 'target/linux/ipq40xx/patches-4.14/050-0002-mtd-nand-qcom-add-command-elements-in-BAM-transactio.patch') diff --git a/target/linux/ipq40xx/patches-4.14/050-0002-mtd-nand-qcom-add-command-elements-in-BAM-transactio.patch b/target/linux/ipq40xx/patches-4.14/050-0002-mtd-nand-qcom-add-command-elements-in-BAM-transactio.patch new file mode 100644 index 0000000000..1a32cc3767 --- /dev/null +++ b/target/linux/ipq40xx/patches-4.14/050-0002-mtd-nand-qcom-add-command-elements-in-BAM-transactio.patch @@ -0,0 +1,89 @@ +From 8c4cdce8b1ab044a2ee1d86d5a086f67e32b3c10 Mon Sep 17 00:00:00 2001 +From: Abhishek Sahu +Date: Mon, 25 Sep 2017 13:21:25 +0530 +Subject: [PATCH 2/7] mtd: nand: qcom: add command elements in BAM transaction + +All the QPIC register read/write through BAM DMA requires +command descriptor which contains the array of command elements. + +Reviewed-by: Archit Taneja +Signed-off-by: Abhishek Sahu +Signed-off-by: Boris Brezillon +--- + drivers/mtd/nand/qcom_nandc.c | 19 ++++++++++++++++++- + 1 file changed, 18 insertions(+), 1 deletion(-) + +--- a/drivers/mtd/nand/qcom_nandc.c ++++ b/drivers/mtd/nand/qcom_nandc.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + /* NANDc reg offsets */ + #define NAND_FLASH_CMD 0x00 +@@ -199,6 +200,7 @@ nandc_set_reg(nandc, NAND_READ_LOCATION_ + */ + #define dev_cmd_reg_addr(nandc, reg) ((nandc)->props->dev_cmd_reg_start + (reg)) + ++#define QPIC_PER_CW_CMD_ELEMENTS 32 + #define QPIC_PER_CW_CMD_SGL 32 + #define QPIC_PER_CW_DATA_SGL 8 + +@@ -221,8 +223,13 @@ nandc_set_reg(nandc, NAND_READ_LOCATION_ + /* + * This data type corresponds to the BAM transaction which will be used for all + * NAND transfers. ++ * @bam_ce - the array of BAM command elements + * @cmd_sgl - sgl for NAND BAM command pipe + * @data_sgl - sgl for NAND BAM consumer/producer pipe ++ * @bam_ce_pos - the index in bam_ce which is available for next sgl ++ * @bam_ce_start - the index in bam_ce which marks the start position ce ++ * for current sgl. It will be used for size calculation ++ * for current sgl + * @cmd_sgl_pos - current index in command sgl. + * @cmd_sgl_start - start index in command sgl. + * @tx_sgl_pos - current index in data sgl for tx. +@@ -231,8 +238,11 @@ nandc_set_reg(nandc, NAND_READ_LOCATION_ + * @rx_sgl_start - start index in data sgl for rx. + */ + struct bam_transaction { ++ struct bam_cmd_element *bam_ce; + struct scatterlist *cmd_sgl; + struct scatterlist *data_sgl; ++ u32 bam_ce_pos; ++ u32 bam_ce_start; + u32 cmd_sgl_pos; + u32 cmd_sgl_start; + u32 tx_sgl_pos; +@@ -462,7 +472,8 @@ alloc_bam_transaction(struct qcom_nand_c + + bam_txn_size = + sizeof(*bam_txn) + num_cw * +- ((sizeof(*bam_txn->cmd_sgl) * QPIC_PER_CW_CMD_SGL) + ++ ((sizeof(*bam_txn->bam_ce) * QPIC_PER_CW_CMD_ELEMENTS) + ++ (sizeof(*bam_txn->cmd_sgl) * QPIC_PER_CW_CMD_SGL) + + (sizeof(*bam_txn->data_sgl) * QPIC_PER_CW_DATA_SGL)); + + bam_txn_buf = devm_kzalloc(nandc->dev, bam_txn_size, GFP_KERNEL); +@@ -472,6 +483,10 @@ alloc_bam_transaction(struct qcom_nand_c + bam_txn = bam_txn_buf; + bam_txn_buf += sizeof(*bam_txn); + ++ bam_txn->bam_ce = bam_txn_buf; ++ bam_txn_buf += ++ sizeof(*bam_txn->bam_ce) * QPIC_PER_CW_CMD_ELEMENTS * num_cw; ++ + bam_txn->cmd_sgl = bam_txn_buf; + bam_txn_buf += + sizeof(*bam_txn->cmd_sgl) * QPIC_PER_CW_CMD_SGL * num_cw; +@@ -489,6 +504,8 @@ static void clear_bam_transaction(struct + if (!nandc->props->is_bam) + return; + ++ bam_txn->bam_ce_pos = 0; ++ bam_txn->bam_ce_start = 0; + bam_txn->cmd_sgl_pos = 0; + bam_txn->cmd_sgl_start = 0; + bam_txn->tx_sgl_pos = 0; -- cgit v1.2.3