him411/gl-infra-builder-FUjr
1
0
Fork 0
mirror of https://github.com/FUjr/gl-infra-builder.git synced 2025-12-16 09:10:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
main
gl-infra-builder-FUjr/patches-21.02.2/0019-revert-spi-qup-driver-to-v4.14.patch
Dongming Han a688f2b164 a1300: revert spi qup driver to v4.14
2022-08-16 14:28:10 +08:00

190 lines
6.3 KiB
Diff
Raw Permalink Blame History

From 1dd24abd933a0e6eea483372431c165120587028 Mon Sep 17 00:00:00 2001
From: Dongming Han <handongming@gl-inet.com>
Date: Tue, 16 Aug 2022 14:24:30 +0800
Subject: [PATCH] revert spi qup driver to v4.14
---
.../414-revert-spi-qup-driver-to-v4.14.patch | 170 ++++++++++++++++++
1 file changed, 170 insertions(+)
create mode 100644 target/linux/ipq40xx/patches-5.4/414-revert-spi-qup-driver-to-v4.14.patch
diff --git a/target/linux/ipq40xx/patches-5.4/414-revert-spi-qup-driver-to-v4.14.patch b/target/linux/ipq40xx/patches-5.4/414-revert-spi-qup-driver-to-v4.14.patch
new file mode 100644
index 0000000000..888562b03c
--- /dev/null
+++ b/target/linux/ipq40xx/patches-5.4/414-revert-spi-qup-driver-to-v4.14.patch
@@ -0,0 +1,170 @@
+From fc8af00bace36cae7bff16546a45be95c089b9f3 Mon Sep 17 00:00:00 2001
+From: Dongming Han <handongming@gl-inet.com>
+Date: Tue, 16 Aug 2022 12:10:14 +0800
+Subject: [PATCH] revert spi qup driver to v4.14
+
+---
+ drivers/spi/spi-qup.c | 75 ++++++++++++++-----------------------------
+ 1 file changed, 24 insertions(+), 51 deletions(-)
+
+diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
+index d1dfb5200..63172d0ed 100644
+--- a/drivers/spi/spi-qup.c
++++ b/drivers/spi/spi-qup.c
+@@ -1,6 +1,14 @@
+-// SPDX-License-Identifier: GPL-2.0-only
+ /*
+ * Copyright (c) 2008-2014, The Linux foundation. All rights reserved.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License rev 2 and
++ * only rev 2 as published by the free Software foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or fITNESS fOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
+ */
+
+ #include <linux/clk.h>
+@@ -273,9 +281,6 @@ static void spi_qup_read(struct spi_qup *controller, u32 *opflags)
+ writel_relaxed(QUP_OP_IN_SERVICE_FLAG,
+ controller->base + QUP_OPERATIONAL);
+
+- if (!remainder)
+- goto exit;
+-
+ if (is_block_mode) {
+ num_words = (remainder > words_per_block) ?
+ words_per_block : remainder;
+@@ -305,13 +310,11 @@ static void spi_qup_read(struct spi_qup *controller, u32 *opflags)
+ * to refresh opflags value because MAX_INPUT_DONE_FLAG may now be
+ * present and this is used to determine if transaction is complete
+ */
+-exit:
+- if (!remainder) {
+- *opflags = readl_relaxed(controller->base + QUP_OPERATIONAL);
+- if (is_block_mode && *opflags & QUP_OP_MAX_INPUT_DONE_FLAG)
+- writel_relaxed(QUP_OP_IN_SERVICE_FLAG,
+- controller->base + QUP_OPERATIONAL);
+- }
++ *opflags = readl_relaxed(controller->base + QUP_OPERATIONAL);
++ if (is_block_mode && *opflags & QUP_OP_MAX_INPUT_DONE_FLAG)
++ writel_relaxed(QUP_OP_IN_SERVICE_FLAG,
++ controller->base + QUP_OPERATIONAL);
++
+ }
+
+ static void spi_qup_write_to_fifo(struct spi_qup *controller, u32 num_words)
+@@ -359,10 +362,6 @@ static void spi_qup_write(struct spi_qup *controller)
+ writel_relaxed(QUP_OP_OUT_SERVICE_FLAG,
+ controller->base + QUP_OPERATIONAL);
+
+- /* make sure the interrupt is valid */
+- if (!remainder)
+- return;
+-
+ if (is_block_mode) {
+ num_words = (remainder > words_per_block) ?
+ words_per_block : remainder;
+@@ -576,24 +575,10 @@ static int spi_qup_do_pio(struct spi_device *spi, struct spi_transfer *xfer,
+ return 0;
+ }
+
+-static bool spi_qup_data_pending(struct spi_qup *controller)
+-{
+- unsigned int remainder_tx, remainder_rx;
+-
+- remainder_tx = DIV_ROUND_UP(spi_qup_len(controller) -
+- controller->tx_bytes, controller->w_size);
+-
+- remainder_rx = DIV_ROUND_UP(spi_qup_len(controller) -
+- controller->rx_bytes, controller->w_size);
+-
+- return remainder_tx || remainder_rx;
+-}
+-
+ static irqreturn_t spi_qup_qup_irq(int irq, void *dev_id)
+ {
+ struct spi_qup *controller = dev_id;
+ u32 opflags, qup_err, spi_err;
+- unsigned long flags;
+ int error = 0;
+
+ qup_err = readl_relaxed(controller->base + QUP_ERROR_FLAGS);
+@@ -605,13 +590,13 @@ static irqreturn_t spi_qup_qup_irq(int irq, void *dev_id)
+
+ if (qup_err) {
+ if (qup_err & QUP_ERROR_OUTPUT_OVER_RUN)
+- dev_warn(controller->dev, "OUTPUT_OVER_RUN\n");
++ dev_warn(controller->dev, "OUTPUT_OVER_RUN\n");
+ if (qup_err & QUP_ERROR_INPUT_UNDER_RUN)
+- dev_warn(controller->dev, "INPUT_UNDER_RUN\n");
++ dev_warn(controller->dev, "INPUT_UNDER_RUN\n");
+ if (qup_err & QUP_ERROR_OUTPUT_UNDER_RUN)
+- dev_warn(controller->dev, "OUTPUT_UNDER_RUN\n");
++ dev_warn(controller->dev, "OUTPUT_UNDER_RUN\n");
+ if (qup_err & QUP_ERROR_INPUT_OVER_RUN)
+- dev_warn(controller->dev, "INPUT_OVER_RUN\n");
++ dev_warn(controller->dev, "INPUT_OVER_RUN\n");
+
+ error = -EIO;
+ }
+@@ -625,11 +610,6 @@ static irqreturn_t spi_qup_qup_irq(int irq, void *dev_id)
+ error = -EIO;
+ }
+
+- spin_lock_irqsave(&controller->lock, flags);
+- if (!controller->error)
+- controller->error = error;
+- spin_unlock_irqrestore(&controller->lock, flags);
+-
+ if (spi_qup_is_dma_xfer(controller->mode)) {
+ writel_relaxed(opflags, controller->base + QUP_OPERATIONAL);
+ } else {
+@@ -638,21 +618,10 @@ static irqreturn_t spi_qup_qup_irq(int irq, void *dev_id)
+
+ if (opflags & QUP_OP_OUT_SERVICE_FLAG)
+ spi_qup_write(controller);
+-
+- if (!spi_qup_data_pending(controller))
+- complete(&controller->done);
+ }
+
+- if (error)
+- complete(&controller->done);
+-
+- if (opflags & QUP_OP_MAX_INPUT_DONE_FLAG) {
+- if (!spi_qup_is_dma_xfer(controller->mode)) {
+- if (spi_qup_data_pending(controller))
+- return IRQ_HANDLED;
+- }
++ if ((opflags & QUP_OP_MAX_INPUT_DONE_FLAG) || error)
+ complete(&controller->done);
+- }
+
+ return IRQ_HANDLED;
+ }
+@@ -873,6 +842,10 @@ static int spi_qup_transfer_one(struct spi_master *master,
+ else
+ ret = spi_qup_do_pio(spi, xfer, timeout);
+
++ if (ret)
++ goto exit;
++
++exit:
+ spi_qup_set_state(controller, QUP_STATE_RESET);
+ spin_lock_irqsave(&controller->lock, flags);
+ if (!ret)
+@@ -1263,7 +1236,7 @@ static int spi_qup_remove(struct platform_device *pdev)
+ struct spi_qup *controller = spi_master_get_devdata(master);
+ int ret;
+
+- ret = pm_runtime_resume_and_get(&pdev->dev);
++ ret = pm_runtime_get_sync(&pdev->dev);
+ if (ret < 0)
+ return ret;
+
+--
+2.25.1
+
--
2.25.1
Reference in New Issue View Git Blame Copy Permalink