From 9b1ca9648dba8a9380a58362b343a34a878b6350 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 16 May 2022 13:34:56 +0200 Subject: [PATCH] drop serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch --- ...sure-to-select-the-right-feature_sel.patch | 44 ------------------- queue-5.10/series | 1 - ...sure-to-select-the-right-feature_sel.patch | 44 ------------------- queue-5.15/series | 1 - ...sure-to-select-the-right-feature_sel.patch | 44 ------------------- queue-5.17/series | 1 - ...sure-to-select-the-right-feature_sel.patch | 44 ------------------- queue-5.4/series | 1 - 8 files changed, 180 deletions(-) delete mode 100644 queue-5.10/serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch delete mode 100644 queue-5.15/serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch delete mode 100644 queue-5.17/serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch delete mode 100644 queue-5.4/serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch diff --git a/queue-5.10/serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch b/queue-5.10/serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch deleted file mode 100644 index 39f1eff0621..00000000000 --- a/queue-5.10/serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6f81fdded0d024c7d4084d434764f30bca1cd6b1 Mon Sep 17 00:00:00 2001 -From: AngeloGioacchino Del Regno -Date: Wed, 27 Apr 2022 15:23:27 +0200 -Subject: serial: 8250_mtk: Make sure to select the right FEATURE_SEL - -From: AngeloGioacchino Del Regno - -commit 6f81fdded0d024c7d4084d434764f30bca1cd6b1 upstream. - -Set the FEATURE_SEL at probe time to make sure that BIT(0) is enabled: -this guarantees that when the port is configured as AP UART, the -right register layout is interpreted by the UART IP. - -Signed-off-by: AngeloGioacchino Del Regno -Cc: stable -Link: https://lore.kernel.org/r/20220427132328.228297-3-angelogioacchino.delregno@collabora.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/serial/8250/8250_mtk.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/tty/serial/8250/8250_mtk.c -+++ b/drivers/tty/serial/8250/8250_mtk.c -@@ -57,6 +57,9 @@ - #define MTK_UART_XON1 40 /* I/O: Xon character 1 */ - #define MTK_UART_XOFF1 42 /* I/O: Xoff character 1 */ - -+#define MTK_UART_FEATURE_SEL 39 /* Feature Selection register */ -+#define MTK_UART_FEAT_NEWRMAP BIT(0) /* Use new register map */ -+ - #ifdef CONFIG_SERIAL_8250_DMA - enum dma_rx_status { - DMA_RX_START = 0, -@@ -572,6 +575,10 @@ static int mtk8250_probe(struct platform - uart.dma = data->dma; - #endif - -+ /* Set AP UART new register map */ -+ writel(MTK_UART_FEAT_NEWRMAP, uart.port.membase + -+ (MTK_UART_FEATURE_SEL << uart.port.regshift)); -+ - /* Disable Rate Fix function */ - writel(0x0, uart.port.membase + - (MTK_UART_RATE_FIX << uart.port.regshift)); diff --git a/queue-5.10/series b/queue-5.10/series index 1a104834c78..1c8bae4eb6f 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -49,7 +49,6 @@ usb-serial-option-add-fibocom-ma510-modem.patch slimbus-qcom-fix-irq-check-in-qcom_slim_probe.patch serial-8250_mtk-fix-uart_efr-register-address.patch serial-8250_mtk-fix-register-address-for-xon-xoff-character.patch -serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch ceph-fix-setting-of-xattrs-on-async-created-inodes.patch drm-nouveau-tegra-stop-using-iommu_present.patch i40e-i40e_main-fix-a-missing-check-on-list-iterator.patch diff --git a/queue-5.15/serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch b/queue-5.15/serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch deleted file mode 100644 index 39f1eff0621..00000000000 --- a/queue-5.15/serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6f81fdded0d024c7d4084d434764f30bca1cd6b1 Mon Sep 17 00:00:00 2001 -From: AngeloGioacchino Del Regno -Date: Wed, 27 Apr 2022 15:23:27 +0200 -Subject: serial: 8250_mtk: Make sure to select the right FEATURE_SEL - -From: AngeloGioacchino Del Regno - -commit 6f81fdded0d024c7d4084d434764f30bca1cd6b1 upstream. - -Set the FEATURE_SEL at probe time to make sure that BIT(0) is enabled: -this guarantees that when the port is configured as AP UART, the -right register layout is interpreted by the UART IP. - -Signed-off-by: AngeloGioacchino Del Regno -Cc: stable -Link: https://lore.kernel.org/r/20220427132328.228297-3-angelogioacchino.delregno@collabora.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/serial/8250/8250_mtk.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/tty/serial/8250/8250_mtk.c -+++ b/drivers/tty/serial/8250/8250_mtk.c -@@ -57,6 +57,9 @@ - #define MTK_UART_XON1 40 /* I/O: Xon character 1 */ - #define MTK_UART_XOFF1 42 /* I/O: Xoff character 1 */ - -+#define MTK_UART_FEATURE_SEL 39 /* Feature Selection register */ -+#define MTK_UART_FEAT_NEWRMAP BIT(0) /* Use new register map */ -+ - #ifdef CONFIG_SERIAL_8250_DMA - enum dma_rx_status { - DMA_RX_START = 0, -@@ -572,6 +575,10 @@ static int mtk8250_probe(struct platform - uart.dma = data->dma; - #endif - -+ /* Set AP UART new register map */ -+ writel(MTK_UART_FEAT_NEWRMAP, uart.port.membase + -+ (MTK_UART_FEATURE_SEL << uart.port.regshift)); -+ - /* Disable Rate Fix function */ - writel(0x0, uart.port.membase + - (MTK_UART_RATE_FIX << uart.port.regshift)); diff --git a/queue-5.15/series b/queue-5.15/series index be19a9b0260..ad26b9786c0 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -78,7 +78,6 @@ slimbus-qcom-fix-irq-check-in-qcom_slim_probe.patch fsl_lpuart-don-t-enable-interrupts-too-early.patch serial-8250_mtk-fix-uart_efr-register-address.patch serial-8250_mtk-fix-register-address-for-xon-xoff-character.patch -serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch ceph-fix-setting-of-xattrs-on-async-created-inodes.patch revert-mm-memory-failure.c-skip-huge_zero_page-in-memory_failure.patch mm-huge_memory-do-not-overkill-when-splitting-huge_zero_page.patch diff --git a/queue-5.17/serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch b/queue-5.17/serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch deleted file mode 100644 index 39f1eff0621..00000000000 --- a/queue-5.17/serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6f81fdded0d024c7d4084d434764f30bca1cd6b1 Mon Sep 17 00:00:00 2001 -From: AngeloGioacchino Del Regno -Date: Wed, 27 Apr 2022 15:23:27 +0200 -Subject: serial: 8250_mtk: Make sure to select the right FEATURE_SEL - -From: AngeloGioacchino Del Regno - -commit 6f81fdded0d024c7d4084d434764f30bca1cd6b1 upstream. - -Set the FEATURE_SEL at probe time to make sure that BIT(0) is enabled: -this guarantees that when the port is configured as AP UART, the -right register layout is interpreted by the UART IP. - -Signed-off-by: AngeloGioacchino Del Regno -Cc: stable -Link: https://lore.kernel.org/r/20220427132328.228297-3-angelogioacchino.delregno@collabora.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/serial/8250/8250_mtk.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/tty/serial/8250/8250_mtk.c -+++ b/drivers/tty/serial/8250/8250_mtk.c -@@ -57,6 +57,9 @@ - #define MTK_UART_XON1 40 /* I/O: Xon character 1 */ - #define MTK_UART_XOFF1 42 /* I/O: Xoff character 1 */ - -+#define MTK_UART_FEATURE_SEL 39 /* Feature Selection register */ -+#define MTK_UART_FEAT_NEWRMAP BIT(0) /* Use new register map */ -+ - #ifdef CONFIG_SERIAL_8250_DMA - enum dma_rx_status { - DMA_RX_START = 0, -@@ -572,6 +575,10 @@ static int mtk8250_probe(struct platform - uart.dma = data->dma; - #endif - -+ /* Set AP UART new register map */ -+ writel(MTK_UART_FEAT_NEWRMAP, uart.port.membase + -+ (MTK_UART_FEATURE_SEL << uart.port.regshift)); -+ - /* Disable Rate Fix function */ - writel(0x0, uart.port.membase + - (MTK_UART_RATE_FIX << uart.port.regshift)); diff --git a/queue-5.17/series b/queue-5.17/series index e3364cb64cb..512c22051a5 100644 --- a/queue-5.17/series +++ b/queue-5.17/series @@ -89,7 +89,6 @@ fsl_lpuart-don-t-enable-interrupts-too-early.patch genirq-remove-warn_on_once-in-generic_handle_domain_irq.patch serial-8250_mtk-fix-uart_efr-register-address.patch serial-8250_mtk-fix-register-address-for-xon-xoff-character.patch -serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch ceph-fix-setting-of-xattrs-on-async-created-inodes.patch revert-mm-memory-failure.c-skip-huge_zero_page-in-memory_failure.patch mm-huge_memory-do-not-overkill-when-splitting-huge_zero_page.patch diff --git a/queue-5.4/serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch b/queue-5.4/serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch deleted file mode 100644 index 5f6c7f817cd..00000000000 --- a/queue-5.4/serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6f81fdded0d024c7d4084d434764f30bca1cd6b1 Mon Sep 17 00:00:00 2001 -From: AngeloGioacchino Del Regno -Date: Wed, 27 Apr 2022 15:23:27 +0200 -Subject: serial: 8250_mtk: Make sure to select the right FEATURE_SEL - -From: AngeloGioacchino Del Regno - -commit 6f81fdded0d024c7d4084d434764f30bca1cd6b1 upstream. - -Set the FEATURE_SEL at probe time to make sure that BIT(0) is enabled: -this guarantees that when the port is configured as AP UART, the -right register layout is interpreted by the UART IP. - -Signed-off-by: AngeloGioacchino Del Regno -Cc: stable -Link: https://lore.kernel.org/r/20220427132328.228297-3-angelogioacchino.delregno@collabora.com -Signed-off-by: Greg Kroah-Hartman ---- - drivers/tty/serial/8250/8250_mtk.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/tty/serial/8250/8250_mtk.c -+++ b/drivers/tty/serial/8250/8250_mtk.c -@@ -56,6 +56,9 @@ - #define MTK_UART_XON1 40 /* I/O: Xon character 1 */ - #define MTK_UART_XOFF1 42 /* I/O: Xoff character 1 */ - -+#define MTK_UART_FEATURE_SEL 39 /* Feature Selection register */ -+#define MTK_UART_FEAT_NEWRMAP BIT(0) /* Use new register map */ -+ - #ifdef CONFIG_SERIAL_8250_DMA - enum dma_rx_status { - DMA_RX_START = 0, -@@ -554,6 +557,10 @@ static int mtk8250_probe(struct platform - uart.dma = data->dma; - #endif - -+ /* Set AP UART new register map */ -+ writel(MTK_UART_FEAT_NEWRMAP, uart.port.membase + -+ (MTK_UART_FEATURE_SEL << uart.port.regshift)); -+ - /* Disable Rate Fix function */ - writel(0x0, uart.port.membase + - (MTK_UART_RATE_FIX << uart.port.regshift)); diff --git a/queue-5.4/series b/queue-5.4/series index 4cb23aff575..591e7475b44 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -32,7 +32,6 @@ usb-serial-option-add-fibocom-ma510-modem.patch slimbus-qcom-fix-irq-check-in-qcom_slim_probe.patch serial-8250_mtk-fix-uart_efr-register-address.patch serial-8250_mtk-fix-register-address-for-xon-xoff-character.patch -serial-8250_mtk-make-sure-to-select-the-right-feature_sel.patch drm-nouveau-tegra-stop-using-iommu_present.patch i40e-i40e_main-fix-a-missing-check-on-list-iterator.patch cgroup-cpuset-remove-cpus_allowed-mems_allowed-setup-in-cpuset_init_smp.patch -- 2.47.3