From: Greg Kroah-Hartman Date: Tue, 28 Oct 2014 03:10:25 +0000 (+0800) Subject: delete powerpc-powernv-fix-endian-bug-in-lpc-bus-debugfs-accessors.patch X-Git-Tag: v3.10.59~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66107b779b7ae82410542fe25e0ad30a69898ed5;p=thirdparty%2Fkernel%2Fstable-queue.git delete powerpc-powernv-fix-endian-bug-in-lpc-bus-debugfs-accessors.patch --- diff --git a/queue-3.16/powerpc-powernv-fix-endian-bug-in-lpc-bus-debugfs-accessors.patch b/queue-3.16/powerpc-powernv-fix-endian-bug-in-lpc-bus-debugfs-accessors.patch deleted file mode 100644 index b2b3eebcdc0..00000000000 --- a/queue-3.16/powerpc-powernv-fix-endian-bug-in-lpc-bus-debugfs-accessors.patch +++ /dev/null @@ -1,43 +0,0 @@ -From bf7588a0859580a45c63cb082825d77c13eca357 Mon Sep 17 00:00:00 2001 -From: Benjamin Herrenschmidt -Date: Fri, 3 Oct 2014 17:12:25 +1000 -Subject: powerpc/powernv: Fix endian bug in LPC bus debugfs accessors - -From: Benjamin Herrenschmidt - -commit bf7588a0859580a45c63cb082825d77c13eca357 upstream. - -When reading from the LPC, the OPAL FW calls return the value via pointer -to a uint32_t which is always returned big endian. Our internal inb/outb -implementation byteswaps that fine but our debugfs code is still broken. - -Signed-off-by: Benjamin Herrenschmidt -Signed-off-by: Michael Ellerman -Signed-off-by: Greg Kroah-Hartman - ---- - arch/powerpc/platforms/powernv/opal-lpc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/arch/powerpc/platforms/powernv/opal-lpc.c -+++ b/arch/powerpc/platforms/powernv/opal-lpc.c -@@ -191,6 +191,7 @@ static ssize_t lpc_debug_read(struct fil - { - struct lpc_debugfs_entry *lpc = filp->private_data; - u32 data, pos, len, todo; -+ __be32 bedata; - int rc; - - if (!access_ok(VERIFY_WRITE, ubuf, count)) -@@ -213,9 +214,10 @@ static ssize_t lpc_debug_read(struct fil - len = 2; - } - rc = opal_lpc_read(opal_lpc_chip_id, lpc->lpc_type, pos, -- &data, len); -+ &bedata, len); - if (rc) - return -ENXIO; -+ data = be32_to_cpu(bedata); - switch(len) { - case 4: - rc = __put_user((u32)data, (u32 __user *)ubuf); diff --git a/queue-3.16/series b/queue-3.16/series index 7a453e46703..5d23cf682ec 100644 --- a/queue-3.16/series +++ b/queue-3.16/series @@ -71,7 +71,6 @@ fanotify-enable-close-on-exec-on-events-fd-when-requested-in-fanotify_init.patch kernel-add-support-for-gcc-5.patch rtc-cmos-fix-wakeup-from-s5-without-config_pm_sleep.patch futex-ensure-get_futex_key_refs-always-implies-a-barrier.patch -powerpc-powernv-fix-endian-bug-in-lpc-bus-debugfs-accessors.patch powerpc-iommu-ddw-fix-endianness.patch powerpc-eeh-clear-frozen-device-state-in-time.patch ima-fix-fallback-to-use-new_sync_read.patch diff --git a/queue-3.17/powerpc-powernv-fix-endian-bug-in-lpc-bus-debugfs-accessors.patch b/queue-3.17/powerpc-powernv-fix-endian-bug-in-lpc-bus-debugfs-accessors.patch deleted file mode 100644 index b2b3eebcdc0..00000000000 --- a/queue-3.17/powerpc-powernv-fix-endian-bug-in-lpc-bus-debugfs-accessors.patch +++ /dev/null @@ -1,43 +0,0 @@ -From bf7588a0859580a45c63cb082825d77c13eca357 Mon Sep 17 00:00:00 2001 -From: Benjamin Herrenschmidt -Date: Fri, 3 Oct 2014 17:12:25 +1000 -Subject: powerpc/powernv: Fix endian bug in LPC bus debugfs accessors - -From: Benjamin Herrenschmidt - -commit bf7588a0859580a45c63cb082825d77c13eca357 upstream. - -When reading from the LPC, the OPAL FW calls return the value via pointer -to a uint32_t which is always returned big endian. Our internal inb/outb -implementation byteswaps that fine but our debugfs code is still broken. - -Signed-off-by: Benjamin Herrenschmidt -Signed-off-by: Michael Ellerman -Signed-off-by: Greg Kroah-Hartman - ---- - arch/powerpc/platforms/powernv/opal-lpc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/arch/powerpc/platforms/powernv/opal-lpc.c -+++ b/arch/powerpc/platforms/powernv/opal-lpc.c -@@ -191,6 +191,7 @@ static ssize_t lpc_debug_read(struct fil - { - struct lpc_debugfs_entry *lpc = filp->private_data; - u32 data, pos, len, todo; -+ __be32 bedata; - int rc; - - if (!access_ok(VERIFY_WRITE, ubuf, count)) -@@ -213,9 +214,10 @@ static ssize_t lpc_debug_read(struct fil - len = 2; - } - rc = opal_lpc_read(opal_lpc_chip_id, lpc->lpc_type, pos, -- &data, len); -+ &bedata, len); - if (rc) - return -ENXIO; -+ data = be32_to_cpu(bedata); - switch(len) { - case 4: - rc = __put_user((u32)data, (u32 __user *)ubuf); diff --git a/queue-3.17/series b/queue-3.17/series index 1d46508da74..1dd86627024 100644 --- a/queue-3.17/series +++ b/queue-3.17/series @@ -112,7 +112,6 @@ mm-balloon_compaction-redesign-ballooned-pages-management.patch futex-ensure-get_futex_key_refs-always-implies-a-barrier.patch powerpc-fix-warning-reported-by-verify_cpu_node_mapping.patch powerpc-only-set-numa-node-information-for-present-cpus-at-boottime.patch -powerpc-powernv-fix-endian-bug-in-lpc-bus-debugfs-accessors.patch powerpc-iommu-ddw-fix-endianness.patch powerpc-eeh-clear-frozen-device-state-in-time.patch ima-fix-fallback-to-use-new_sync_read.patch