drop broken mips patch from 4.4 and 4.9 queues

diff --git a/queue-4.4/mips-vdso-drop-gic_get_usm_range-usage.patch b/queue-4.4/mips-vdso-drop-gic_get_usm_range-usage.patch
deleted file mode 100644 (file)
index fdde949..0000000
--- a/queue-4.4/mips-vdso-drop-gic_get_usm_range-usage.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 00578cd864d45ae4b8fa3f684f8d6f783dd8d15d Mon Sep 17 00:00:00 2001
-From: Paul Burton <paul.burton@imgtec.com>
-Date: Sat, 12 Aug 2017 21:36:30 -0700
-Subject: MIPS: VDSO: Drop gic_get_usm_range() usage
-
-From: Paul Burton <paul.burton@imgtec.com>
-
-commit 00578cd864d45ae4b8fa3f684f8d6f783dd8d15d upstream.
-
-We don't really need gic_get_usm_range() to abstract discovery of the
-address of the GIC user-visible section now that we have access to its
-base address globally.
-
-Switch to calculating it ourselves, which will allow us to stop
-requiring the irqchip driver to care about a counter exposed to userland
-for use via the VDSO.
-
-Signed-off-by: Paul Burton <paul.burton@imgtec.com>
-Cc: Jason Cooper <jason@lakedaemon.net>
-Cc: Marc Zyngier <marc.zyngier@arm.com>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: linux-mips@linux-mips.org
-Patchwork: https://patchwork.linux-mips.org/patch/17040/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-Signed-off-by: SZ Lin (林上智) <sz.lin@moxa.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/mips/kernel/vdso.c |   15 +++++----------
- 1 file changed, 5 insertions(+), 10 deletions(-)
-
---- a/arch/mips/kernel/vdso.c
-+++ b/arch/mips/kernel/vdso.c
-@@ -13,7 +13,6 @@
- #include <linux/err.h>
- #include <linux/init.h>
- #include <linux/ioport.h>
--#include <linux/irqchip/mips-gic.h>
- #include <linux/kernel.h>
- #include <linux/mm.h>
- #include <linux/sched.h>
-@@ -21,6 +20,7 @@
- #include <linux/timekeeper_internal.h>
- 
- #include <asm/abi.h>
-+#include <asm/mips-cps.h>
- #include <asm/page.h>
- #include <asm/vdso.h>
- 
-@@ -101,9 +101,8 @@ int arch_setup_additional_pages(struct l
- {
-       struct mips_vdso_image *image = current->thread.abi->vdso;
-       struct mm_struct *mm = current->mm;
--      unsigned long gic_size, vvar_size, size, base, data_addr, vdso_addr;
-+      unsigned long gic_size, vvar_size, size, base, data_addr, vdso_addr, gic_pfn;
-       struct vm_area_struct *vma;
--      struct resource gic_res;
-       int ret;
- 
-       down_write(&mm->mmap_sem);
-@@ -116,7 +115,7 @@ int arch_setup_additional_pages(struct l
-        * only map a page even though the total area is 64K, as we only need
-        * the counter registers at the start.
-        */
--      gic_size = gic_present ? PAGE_SIZE : 0;
-+      gic_size = mips_gic_present() ? PAGE_SIZE : 0;
-       vvar_size = gic_size + PAGE_SIZE;
-       size = vvar_size + image->size;
- 
-@@ -157,13 +156,9 @@ int arch_setup_additional_pages(struct l
- 
-       /* Map GIC user page. */
-       if (gic_size) {
--              ret = gic_get_usm_range(&gic_res);
--              if (ret)
--                      goto out;
-+              gic_pfn = virt_to_phys(mips_gic_base + MIPS_GIC_USER_OFS) >> PAGE_SHIFT;
- 
--              ret = io_remap_pfn_range(vma, base,
--                                       gic_res.start >> PAGE_SHIFT,
--                                       gic_size,
-+              ret = io_remap_pfn_range(vma, base, gic_pfn, gic_size,
-                                        pgprot_noncached(PAGE_READONLY));
-               if (ret)
-                       goto out;

diff --git a/queue-4.4/series b/queue-4.4/series
index 5ae54bf19415d123099efc260905e3b951b9af1b..312f1e28d33327bc116d1edaa4f85ed4557ffb6d 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -66,4 +66,3 @@ usb-serial-ti_usb_3410_5052-fix-array-underflow-in-completion-handler.patch
 mei-bus-type-promotion-bug-in-mei_nfc_if_version.patch
 drivers-net-cpsw-fix-segfault-in-case-of-bad-phy-handle.patch
 mips-vdso-match-data-page-cache-colouring-when-d-aliases.patch
-mips-vdso-drop-gic_get_usm_range-usage.patch

diff --git a/queue-4.9/mips-vdso-drop-gic_get_usm_range-usage.patch b/queue-4.9/mips-vdso-drop-gic_get_usm_range-usage.patch
deleted file mode 100644 (file)
index 9163c78..0000000
--- a/queue-4.9/mips-vdso-drop-gic_get_usm_range-usage.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 00578cd864d45ae4b8fa3f684f8d6f783dd8d15d Mon Sep 17 00:00:00 2001
-From: Paul Burton <paul.burton@imgtec.com>
-Date: Sat, 12 Aug 2017 21:36:30 -0700
-Subject: MIPS: VDSO: Drop gic_get_usm_range() usage
-
-From: Paul Burton <paul.burton@imgtec.com>
-
-commit 00578cd864d45ae4b8fa3f684f8d6f783dd8d15d upstream.
-
-We don't really need gic_get_usm_range() to abstract discovery of the
-address of the GIC user-visible section now that we have access to its
-base address globally.
-
-Switch to calculating it ourselves, which will allow us to stop
-requiring the irqchip driver to care about a counter exposed to userland
-for use via the VDSO.
-
-Signed-off-by: Paul Burton <paul.burton@imgtec.com>
-Cc: Jason Cooper <jason@lakedaemon.net>
-Cc: Marc Zyngier <marc.zyngier@arm.com>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: linux-mips@linux-mips.org
-Patchwork: https://patchwork.linux-mips.org/patch/17040/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-Signed-off-by: SZ Lin (林上智) <sz.lin@moxa.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/mips/kernel/vdso.c |   15 +++++----------
- 1 file changed, 5 insertions(+), 10 deletions(-)
-
---- a/arch/mips/kernel/vdso.c
-+++ b/arch/mips/kernel/vdso.c
-@@ -13,7 +13,6 @@
- #include <linux/err.h>
- #include <linux/init.h>
- #include <linux/ioport.h>
--#include <linux/irqchip/mips-gic.h>
- #include <linux/kernel.h>
- #include <linux/mm.h>
- #include <linux/sched.h>
-@@ -21,6 +20,7 @@
- #include <linux/timekeeper_internal.h>
- 
- #include <asm/abi.h>
-+#include <asm/mips-cps.h>
- #include <asm/page.h>
- #include <asm/vdso.h>
- 
-@@ -101,9 +101,8 @@ int arch_setup_additional_pages(struct l
- {
-       struct mips_vdso_image *image = current->thread.abi->vdso;
-       struct mm_struct *mm = current->mm;
--      unsigned long gic_size, vvar_size, size, base, data_addr, vdso_addr;
-+      unsigned long gic_size, vvar_size, size, base, data_addr, vdso_addr, gic_pfn;
-       struct vm_area_struct *vma;
--      struct resource gic_res;
-       int ret;
- 
-       if (down_write_killable(&mm->mmap_sem))
-@@ -127,7 +126,7 @@ int arch_setup_additional_pages(struct l
-        * only map a page even though the total area is 64K, as we only need
-        * the counter registers at the start.
-        */
--      gic_size = gic_present ? PAGE_SIZE : 0;
-+      gic_size = mips_gic_present() ? PAGE_SIZE : 0;
-       vvar_size = gic_size + PAGE_SIZE;
-       size = vvar_size + image->size;
- 
-@@ -168,13 +167,9 @@ int arch_setup_additional_pages(struct l
- 
-       /* Map GIC user page. */
-       if (gic_size) {
--              ret = gic_get_usm_range(&gic_res);
--              if (ret)
--                      goto out;
-+              gic_pfn = virt_to_phys(mips_gic_base + MIPS_GIC_USER_OFS) >> PAGE_SHIFT;
- 
--              ret = io_remap_pfn_range(vma, base,
--                                       gic_res.start >> PAGE_SHIFT,
--                                       gic_size,
-+              ret = io_remap_pfn_range(vma, base, gic_pfn, gic_size,
-                                        pgprot_noncached(PAGE_READONLY));
-               if (ret)
-                       goto out;

diff --git a/queue-4.9/series b/queue-4.9/series
index 08a3efefee9923302b3af4bbea10e99a80c18c08..bc3ea16abba2d8d0f0c70ac4e4c31e08a5a0fed5 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -106,4 +106,3 @@ e1000e-fix-queue-interrupt-re-raising-in-other-interrupt.patch
 e1000e-avoid-missed-interrupts-following-icr-read.patch
 revert-e1000e-separate-signaling-for-link-check-link-up.patch
 e1000e-fix-link-check-race-condition.patch
-mips-vdso-drop-gic_get_usm_range-usage.patch