--- /dev/null
+From 70023de88c58a81a730ab4d13c51a30e537ec76e Mon Sep 17 00:00:00 2001
+From: Shaohua Li <shaohua.li@intel.com>
+Date: Thu, 29 Oct 2009 11:04:28 +0800
+Subject: ACPI: Add a generic API for _OSC -v2
+
+From: Shaohua Li <shaohua.li@intel.com>
+
+commit 70023de88c58a81a730ab4d13c51a30e537ec76e upstream.
+
+v2->v1:
+.improve debug info as suggedted by Bjorn,Kenji
+.API is using uuid string as suggested by Alexey
+
+Add an API to execute _OSC. A lot of devices can have this method, so add a
+generic API.
+
+Signed-off-by: Shaohua Li <shaohua.li@intel.com>
+Signed-off-by: Len Brown <len.brown@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/acpi/bus.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ include/linux/acpi.h | 9 +++
+ 2 files changed, 131 insertions(+)
+
+--- a/drivers/acpi/bus.c
++++ b/drivers/acpi/bus.c
+@@ -344,6 +344,128 @@ bool acpi_bus_can_wakeup(acpi_handle han
+
+ EXPORT_SYMBOL(acpi_bus_can_wakeup);
+
++static void acpi_print_osc_error(acpi_handle handle,
++ struct acpi_osc_context *context, char *error)
++{
++ struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER};
++ int i;
++
++ if (ACPI_FAILURE(acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer)))
++ printk(KERN_DEBUG "%s\n", error);
++ else {
++ printk(KERN_DEBUG "%s:%s\n", (char *)buffer.pointer, error);
++ kfree(buffer.pointer);
++ }
++ printk(KERN_DEBUG"_OSC request data:");
++ for (i = 0; i < context->cap.length; i += sizeof(u32))
++ printk("%x ", *((u32 *)(context->cap.pointer + i)));
++ printk("\n");
++}
++
++static u8 hex_val(unsigned char c)
++{
++ return isdigit(c) ? c - '0' : toupper(c) - 'A' + 10;
++}
++
++static acpi_status acpi_str_to_uuid(char *str, u8 *uuid)
++{
++ int i;
++ static int opc_map_to_uuid[16] = {6, 4, 2, 0, 11, 9, 16, 14, 19, 21,
++ 24, 26, 28, 30, 32, 34};
++
++ if (strlen(str) != 36)
++ return AE_BAD_PARAMETER;
++ for (i = 0; i < 36; i++) {
++ if (i == 8 || i == 13 || i == 18 || i == 23) {
++ if (str[i] != '-')
++ return AE_BAD_PARAMETER;
++ } else if (!isxdigit(str[i]))
++ return AE_BAD_PARAMETER;
++ }
++ for (i = 0; i < 16; i++) {
++ uuid[i] = hex_val(str[opc_map_to_uuid[i]]) << 4;
++ uuid[i] |= hex_val(str[opc_map_to_uuid[i] + 1]);
++ }
++ return AE_OK;
++}
++
++acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)
++{
++ acpi_status status;
++ struct acpi_object_list input;
++ union acpi_object in_params[4];
++ union acpi_object *out_obj;
++ u8 uuid[16];
++ u32 errors;
++
++ if (!context)
++ return AE_ERROR;
++ if (ACPI_FAILURE(acpi_str_to_uuid(context->uuid_str, uuid)))
++ return AE_ERROR;
++ context->ret.length = ACPI_ALLOCATE_BUFFER;
++ context->ret.pointer = NULL;
++
++ /* Setting up input parameters */
++ input.count = 4;
++ input.pointer = in_params;
++ in_params[0].type = ACPI_TYPE_BUFFER;
++ in_params[0].buffer.length = 16;
++ in_params[0].buffer.pointer = uuid;
++ in_params[1].type = ACPI_TYPE_INTEGER;
++ in_params[1].integer.value = context->rev;
++ in_params[2].type = ACPI_TYPE_INTEGER;
++ in_params[2].integer.value = context->cap.length/sizeof(u32);
++ in_params[3].type = ACPI_TYPE_BUFFER;
++ in_params[3].buffer.length = context->cap.length;
++ in_params[3].buffer.pointer = context->cap.pointer;
++
++ status = acpi_evaluate_object(handle, "_OSC", &input, &context->ret);
++ if (ACPI_FAILURE(status))
++ return status;
++
++ /* return buffer should have the same length as cap buffer */
++ if (context->ret.length != context->cap.length)
++ return AE_NULL_OBJECT;
++
++ out_obj = context->ret.pointer;
++ if (out_obj->type != ACPI_TYPE_BUFFER) {
++ acpi_print_osc_error(handle, context,
++ "_OSC evaluation returned wrong type");
++ status = AE_TYPE;
++ goto out_kfree;
++ }
++ /* Need to ignore the bit0 in result code */
++ errors = *((u32 *)out_obj->buffer.pointer) & ~(1 << 0);
++ if (errors) {
++ if (errors & OSC_REQUEST_ERROR)
++ acpi_print_osc_error(handle, context,
++ "_OSC request failed");
++ if (errors & OSC_INVALID_UUID_ERROR)
++ acpi_print_osc_error(handle, context,
++ "_OSC invalid UUID");
++ if (errors & OSC_INVALID_REVISION_ERROR)
++ acpi_print_osc_error(handle, context,
++ "_OSC invalid revision");
++ if (errors & OSC_CAPABILITIES_MASK_ERROR) {
++ if (((u32 *)context->cap.pointer)[OSC_QUERY_TYPE]
++ & OSC_QUERY_ENABLE)
++ goto out_success;
++ status = AE_SUPPORT;
++ goto out_kfree;
++ }
++ status = AE_ERROR;
++ goto out_kfree;
++ }
++out_success:
++ return AE_OK;
++
++out_kfree:
++ kfree(context->ret.pointer);
++ context->ret.pointer = NULL;
++ return status;
++}
++EXPORT_SYMBOL(acpi_run_osc);
++
+ /* --------------------------------------------------------------------------
+ Event Management
+ -------------------------------------------------------------------------- */
+--- a/include/linux/acpi.h
++++ b/include/linux/acpi.h
+@@ -253,6 +253,13 @@ void __init acpi_old_suspend_ordering(vo
+ void __init acpi_s4_no_nvs(void);
+ #endif /* CONFIG_PM_SLEEP */
+
++struct acpi_osc_context {
++ char *uuid_str; /* uuid string */
++ int rev;
++ struct acpi_buffer cap; /* arg2/arg3 */
++ struct acpi_buffer ret; /* free by caller if success */
++};
++
+ #define OSC_QUERY_TYPE 0
+ #define OSC_SUPPORT_TYPE 1
+ #define OSC_CONTROL_TYPE 2
+@@ -265,6 +272,8 @@ void __init acpi_s4_no_nvs(void);
+ #define OSC_INVALID_REVISION_ERROR 8
+ #define OSC_CAPABILITIES_MASK_ERROR 16
+
++acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);
++
+ /* _OSC DW1 Definition (OS Support Fields) */
+ #define OSC_EXT_PCI_CONFIG_SUPPORT 1
+ #define OSC_ACTIVE_STATE_PWR_SUPPORT 2
--- /dev/null
+From 3563ff964fdc36358cef0330936fdac28e65142a Mon Sep 17 00:00:00 2001
+From: Shaohua Li <shaohua.li@intel.com>
+Date: Thu, 29 Oct 2009 11:05:05 +0800
+Subject: ACPI: Add platform-wide _OSC support.
+
+From: Shaohua Li <shaohua.li@intel.com>
+
+commit 3563ff964fdc36358cef0330936fdac28e65142a upstream.
+
+Signed-off-by: Shaohua Li <shaohua.li@intel.com>
+Signed-off-by: Len Brown <len.brown@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/acpi/bus.c | 26 ++++++++++++++++++++++++++
+ include/linux/acpi.h | 7 +++++++
+ 2 files changed, 33 insertions(+)
+
+--- a/drivers/acpi/bus.c
++++ b/drivers/acpi/bus.c
+@@ -466,6 +466,30 @@ out_kfree:
+ }
+ EXPORT_SYMBOL(acpi_run_osc);
+
++static u8 sb_uuid_str[] = "0811B06E-4A27-44F9-8D60-3CBBC22E7B48";
++static void acpi_bus_osc_support(void)
++{
++ u32 capbuf[2];
++ struct acpi_osc_context context = {
++ .uuid_str = sb_uuid_str,
++ .rev = 1,
++ .cap.length = 8,
++ .cap.pointer = capbuf,
++ };
++ acpi_handle handle;
++
++ capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;
++ capbuf[OSC_SUPPORT_TYPE] = OSC_SB_PR3_SUPPORT; /* _PR3 is in use */
++#ifdef CONFIG_ACPI_PROCESSOR_AGGREGATOR
++ capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_PAD_SUPPORT;
++#endif
++ if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle)))
++ return;
++ if (ACPI_SUCCESS(acpi_run_osc(handle, &context)))
++ kfree(context.ret.pointer);
++ /* do we need to check the returned cap? Sounds no */
++}
++
+ /* --------------------------------------------------------------------------
+ Event Management
+ -------------------------------------------------------------------------- */
+@@ -856,6 +880,8 @@ static int __init acpi_bus_init(void)
+ status = acpi_ec_ecdt_probe();
+ /* Ignore result. Not having an ECDT is not fatal. */
+
++ acpi_bus_osc_support();
++
+ status = acpi_initialize_objects(ACPI_FULL_INITIALIZATION);
+ if (ACPI_FAILURE(status)) {
+ printk(KERN_ERR PREFIX "Unable to initialize ACPI objects\n");
+--- a/include/linux/acpi.h
++++ b/include/linux/acpi.h
+@@ -274,6 +274,13 @@ struct acpi_osc_context {
+
+ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);
+
++/* platform-wide _OSC bits */
++#define OSC_SB_PAD_SUPPORT 1
++#define OSC_SB_PPC_OST_SUPPORT 2
++#define OSC_SB_PR3_SUPPORT 4
++#define OSC_SB_CPUHP_OST_SUPPORT 8
++#define OSC_SB_APEI_SUPPORT 16
++
+ /* _OSC DW1 Definition (OS Support Fields) */
+ #define OSC_EXT_PCI_CONFIG_SUPPORT 1
+ #define OSC_ACTIVE_STATE_PWR_SUPPORT 2
--- /dev/null
+From 6a4e2b7503d1f630bface040cf0f5a7aac1fabdb Mon Sep 17 00:00:00 2001
+From: Zhao Yakui <yakui.zhao@intel.com>
+Date: Fri, 8 Jan 2010 21:29:58 +0800
+Subject: ACPI: Advertise to BIOS in _OSC: _OST on _PPC changes
+
+From: Zhao Yakui <yakui.zhao@intel.com>
+
+commit 6a4e2b7503d1f630bface040cf0f5a7aac1fabdb upstream.
+
+If the BIOS pokes the system-wide OSC bits to see if Linux
+supports evaluating _OST after a _PPC change notification,
+answer yes.
+
+Also, fix an oversight where we neglected to set the OSC
+bit advertising processor aggregator device support
+when acpi-pad is compiled as a module.
+
+Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
+Signed-off-by: Len Brown <len.brown@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/acpi/bus.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/drivers/acpi/bus.c
++++ b/drivers/acpi/bus.c
+@@ -490,9 +490,14 @@ static void acpi_bus_osc_support(void)
+
+ capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;
+ capbuf[OSC_SUPPORT_TYPE] = OSC_SB_PR3_SUPPORT; /* _PR3 is in use */
+-#ifdef CONFIG_ACPI_PROCESSOR_AGGREGATOR
++#if defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR) ||\
++ defined(CONFIG_ACPI_PROCESSOR_AGGREGATOR_MODULE)
+ capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_PAD_SUPPORT;
+ #endif
++
++#if defined(CONFIG_ACPI_PROCESSOR) || defined(CONFIG_ACPI_PROCESSOR_MODULE)
++ capbuf[OSC_SUPPORT_TYPE] |= OSC_SB_PPC_OST_SUPPORT;
++#endif
+ if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle)))
+ return;
+ if (ACPI_SUCCESS(acpi_run_osc(handle, &context)))
--- /dev/null
+From 9dc130fccb874f2959ef313d7922d306dc6d4f75 Mon Sep 17 00:00:00 2001
+From: Shaohua Li <shaohua.li@intel.com>
+Date: Wed, 23 Dec 2009 17:04:11 +0800
+Subject: ACPI: fix OSC regression that caused aer and pciehp not to load
+
+From: Shaohua Li <shaohua.li@intel.com>
+
+commit 9dc130fccb874f2959ef313d7922d306dc6d4f75 upstream.
+
+Executing _OSC returns a buffer, which has an acpi object in it.
+Don't directly returns the buffer, instead, we return the acpi object's
+buffer. This fixes a regression since caller of acpi_run_osc expects
+an acpi object's buffer returned.
+
+Tested-by: Yinghai Lu <yinghai@kernel.org>
+Signed-off-by: Shaohua Li <shaohua.li@intel.com>
+Signed-off-by: Len Brown <len.brown@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/acpi/bus.c | 26 ++++++++++++++++++--------
+ 1 file changed, 18 insertions(+), 8 deletions(-)
+
+--- a/drivers/acpi/bus.c
++++ b/drivers/acpi/bus.c
+@@ -397,6 +397,7 @@ acpi_status acpi_run_osc(acpi_handle han
+ union acpi_object *out_obj;
+ u8 uuid[16];
+ u32 errors;
++ struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
+
+ if (!context)
+ return AE_ERROR;
+@@ -419,16 +420,16 @@ acpi_status acpi_run_osc(acpi_handle han
+ in_params[3].buffer.length = context->cap.length;
+ in_params[3].buffer.pointer = context->cap.pointer;
+
+- status = acpi_evaluate_object(handle, "_OSC", &input, &context->ret);
++ status = acpi_evaluate_object(handle, "_OSC", &input, &output);
+ if (ACPI_FAILURE(status))
+ return status;
+
+- /* return buffer should have the same length as cap buffer */
+- if (context->ret.length != context->cap.length)
++ if (!output.length)
+ return AE_NULL_OBJECT;
+
+- out_obj = context->ret.pointer;
+- if (out_obj->type != ACPI_TYPE_BUFFER) {
++ out_obj = output.pointer;
++ if (out_obj->type != ACPI_TYPE_BUFFER
++ || out_obj->buffer.length != context->cap.length) {
+ acpi_print_osc_error(handle, context,
+ "_OSC evaluation returned wrong type");
+ status = AE_TYPE;
+@@ -457,11 +458,20 @@ acpi_status acpi_run_osc(acpi_handle han
+ goto out_kfree;
+ }
+ out_success:
+- return AE_OK;
++ context->ret.length = out_obj->buffer.length;
++ context->ret.pointer = kmalloc(context->ret.length, GFP_KERNEL);
++ if (!context->ret.pointer) {
++ status = AE_NO_MEMORY;
++ goto out_kfree;
++ }
++ memcpy(context->ret.pointer, out_obj->buffer.pointer,
++ context->ret.length);
++ status = AE_OK;
+
+ out_kfree:
+- kfree(context->ret.pointer);
+- context->ret.pointer = NULL;
++ kfree(output.pointer);
++ if (status != AE_OK)
++ context->ret.pointer = NULL;
+ return status;
+ }
+ EXPORT_SYMBOL(acpi_run_osc);
--- /dev/null
+From 294001a80c9810e2fe27aaaad7df8be12a103065 Mon Sep 17 00:00:00 2001
+From: Stefan Haberland <stefan.haberland@de.ibm.com>
+Date: Wed, 27 Jan 2010 10:12:35 +0100
+Subject: [S390] dasd: fix possible NULL pointer errors
+
+From: Stefan Haberland <stefan.haberland@de.ibm.com>
+
+commit 294001a80c9810e2fe27aaaad7df8be12a103065 upstream.
+
+Fix possible NULL pointer in DASD messages and correct discipline
+checking.
+
+Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com>
+Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/s390/block/dasd.c | 8 ++++----
+ drivers/s390/block/dasd_eckd.c | 2 +-
+ drivers/s390/block/dasd_ioctl.c | 7 ++-----
+ drivers/s390/block/dasd_proc.c | 7 ++-----
+ 4 files changed, 9 insertions(+), 15 deletions(-)
+
+--- a/drivers/s390/block/dasd.c
++++ b/drivers/s390/block/dasd.c
+@@ -1005,8 +1005,8 @@ static void dasd_handle_killed_request(s
+ if (device == NULL ||
+ device != dasd_device_from_cdev_locked(cdev) ||
+ strncmp(device->discipline->ebcname, (char *) &cqr->magic, 4)) {
+- DBF_DEV_EVENT(DBF_DEBUG, device, "invalid device in request: "
+- "bus_id %s", dev_name(&cdev->dev));
++ DBF_EVENT_DEVID(DBF_DEBUG, cdev, "%s",
++ "invalid device in request");
+ return;
+ }
+
+@@ -1078,8 +1078,8 @@ void dasd_int_handler(struct ccw_device
+ device = (struct dasd_device *) cqr->startdev;
+ if (!device ||
+ strncmp(device->discipline->ebcname, (char *) &cqr->magic, 4)) {
+- DBF_DEV_EVENT(DBF_DEBUG, device, "invalid device in request: "
+- "bus_id %s", dev_name(&cdev->dev));
++ DBF_EVENT_DEVID(DBF_DEBUG, cdev, "%s",
++ "invalid device in request");
+ return;
+ }
+
+--- a/drivers/s390/block/dasd_eckd.c
++++ b/drivers/s390/block/dasd_eckd.c
+@@ -2980,7 +2980,7 @@ static void dasd_eckd_dump_sense_ccw(str
+ len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+ " in req: %p CS: 0x%02X DS: 0x%02X CC: 0x%02X RC: %d\n",
+ req, scsw_cstat(&irb->scsw), scsw_dstat(&irb->scsw),
+- scsw_cc(&irb->scsw), req->intrc);
++ scsw_cc(&irb->scsw), req ? req->intrc : 0);
+ len += sprintf(page + len, KERN_ERR PRINTK_HEADER
+ " device %s: Failing CCW: %p\n",
+ dev_name(&device->cdev->dev),
+--- a/drivers/s390/block/dasd_ioctl.c
++++ b/drivers/s390/block/dasd_ioctl.c
+@@ -260,7 +260,7 @@ static int dasd_ioctl_information(struct
+ struct ccw_dev_id dev_id;
+
+ base = block->base;
+- if (!base->discipline->fill_info)
++ if (!base->discipline || !base->discipline->fill_info)
+ return -EINVAL;
+
+ dasd_info = kzalloc(sizeof(struct dasd_information2_t), GFP_KERNEL);
+@@ -303,10 +303,7 @@ static int dasd_ioctl_information(struct
+ dasd_info->features |=
+ ((base->features & DASD_FEATURE_READONLY) != 0);
+
+- if (base->discipline)
+- memcpy(dasd_info->type, base->discipline->name, 4);
+- else
+- memcpy(dasd_info->type, "none", 4);
++ memcpy(dasd_info->type, base->discipline->name, 4);
+
+ if (block->request_queue->request_fn) {
+ struct list_head *l;
+--- a/drivers/s390/block/dasd_proc.c
++++ b/drivers/s390/block/dasd_proc.c
+@@ -71,7 +71,7 @@ dasd_devices_show(struct seq_file *m, vo
+ /* Print device number. */
+ seq_printf(m, "%s", dev_name(&device->cdev->dev));
+ /* Print discipline string. */
+- if (device != NULL && device->discipline != NULL)
++ if (device->discipline != NULL)
+ seq_printf(m, "(%s)", device->discipline->name);
+ else
+ seq_printf(m, "(none)");
+@@ -91,10 +91,7 @@ dasd_devices_show(struct seq_file *m, vo
+ substr = (device->features & DASD_FEATURE_READONLY) ? "(ro)" : " ";
+ seq_printf(m, "%4s: ", substr);
+ /* Print device status information. */
+- switch ((device != NULL) ? device->state : -1) {
+- case -1:
+- seq_printf(m, "unknown");
+- break;
++ switch (device->state) {
+ case DASD_STATE_NEW:
+ seq_printf(m, "new");
+ break;
--- /dev/null
+From 534ead709235b967b659947c55d9130873a432c4 Mon Sep 17 00:00:00 2001
+From: Tejun Heo <tj@kernel.org>
+Date: Thu, 14 Jan 2010 16:18:09 +0900
+Subject: libata: retry FS IOs even if it has failed with AC_ERR_INVALID
+
+From: Tejun Heo <tj@kernel.org>
+
+commit 534ead709235b967b659947c55d9130873a432c4 upstream.
+
+libata currently doesn't retry if a command fails with AC_ERR_INVALID
+assuming that retrying won't get it any further even if retried.
+However, a failure may be classified as invalid through hardware
+glitch (incorrect reading of the error register or firmware bug) and
+there isn't whole lot to gain by not retrying as actually invalid
+commands will be failed immediately. Also, commands serving FS IOs
+are extremely unlikely to be invalid. Retry FS IOs even if it's
+marked invalid.
+
+Transient and incorrect invalid failure was seen while debugging
+firmware related issue on Samsung n130 on bko#14314.
+
+ http://bugzilla.kernel.org/show_bug.cgi?id=14314
+
+Signed-off-by: Tejun Heo <tj@kernel.org>
+Reported-by: Johannes Stezenbach <js@sig21.net>
+Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/ata/libata-eh.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/drivers/ata/libata-eh.c
++++ b/drivers/ata/libata-eh.c
+@@ -2019,8 +2019,9 @@ static void ata_eh_link_autopsy(struct a
+ qc->err_mask &= ~(AC_ERR_DEV | AC_ERR_OTHER);
+
+ /* determine whether the command is worth retrying */
+- if (!(qc->err_mask & AC_ERR_INVALID) &&
+- ((qc->flags & ATA_QCFLAG_IO) || qc->err_mask != AC_ERR_DEV))
++ if (qc->flags & ATA_QCFLAG_IO ||
++ (!(qc->err_mask & AC_ERR_INVALID) &&
++ qc->err_mask != AC_ERR_DEV))
+ qc->flags |= ATA_QCFLAG_RETRY;
+
+ /* accumulate error info */
s390-fix-single-stepped-svcs-with-trace_irqflags-y.patch
x86-set-hotpluggable-nodes-in-nodes_possible_map.patch
x86-remove-x86-cpu-features-in-debugfs-config_x86_cpu_debug.patch
+libata-retry-fs-ios-even-if-it-has-failed-with-ac_err_invalid.patch
+zcrypt-do-not-remove-coprocessor-for-error-8-72.patch
+dasd-fix-possible-null-pointer-errors.patch
+acpi-add-a-generic-api-for-_osc-v2.patch
+acpi-add-platform-wide-_osc-support.patch
+acpi-fix-osc-regression-that-caused-aer-and-pciehp-not-to-load.patch
+acpi-advertise-to-bios-in-_osc-_ost-on-_ppc-changes.patch
+ubi-fix-volume-creation-input-checking.patch
--- /dev/null
+From c5ce5b46af76f52dea21f467397d24c4ae6cb3ff Mon Sep 17 00:00:00 2001
+From: Mika Westerberg <ext-mika.1.westerberg@nokia.com>
+Date: Tue, 26 Jan 2010 17:47:05 +0200
+Subject: UBI: fix volume creation input checking
+
+From: Mika Westerberg <ext-mika.1.westerberg@nokia.com>
+
+commit c5ce5b46af76f52dea21f467397d24c4ae6cb3ff upstream.
+
+Do not use an unchecked variable UBI_IOCMKVOL ioctl.
+
+Signed-off-by: Mika Westerberg <ext-mika.1.westerberg@nokia.com>
+Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/mtd/ubi/cdev.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/mtd/ubi/cdev.c
++++ b/drivers/mtd/ubi/cdev.c
+@@ -853,7 +853,6 @@ static long ubi_cdev_ioctl(struct file *
+ break;
+ }
+
+- req.name[req.name_len] = '\0';
+ err = verify_mkvol_req(ubi, &req);
+ if (err)
+ break;
--- /dev/null
+From 19b123ebacacdce5e75045bfe82122b01c821a5b Mon Sep 17 00:00:00 2001
+From: Felix Beck <felix.beck@de.ibm.com>
+Date: Wed, 27 Jan 2010 10:12:39 +0100
+Subject: [S390] zcrypt: Do not remove coprocessor for error 8/72
+
+From: Felix Beck <felix.beck@de.ibm.com>
+
+commit 19b123ebacacdce5e75045bfe82122b01c821a5b upstream.
+
+In a case where the number of the input data is bigger than the
+modulus of the key, the coprocessor adapters will report an 8/72
+error. This case is not caught yet, thus the adapter will be taken
+offline. To prevent this, we return an -EINVAL instead.
+
+Signed-off-by: Felix Beck <felix.beck@de.ibm.com>
+Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/s390/crypto/zcrypt_pcicc.c | 2 ++
+ drivers/s390/crypto/zcrypt_pcixcc.c | 2 ++
+ 2 files changed, 4 insertions(+)
+
+--- a/drivers/s390/crypto/zcrypt_pcicc.c
++++ b/drivers/s390/crypto/zcrypt_pcicc.c
+@@ -373,6 +373,8 @@ static int convert_type86(struct zcrypt_
+ zdev->max_mod_size = PCICC_MAX_MOD_SIZE_OLD;
+ return -EAGAIN;
+ }
++ if (service_rc == 8 && service_rs == 72)
++ return -EINVAL;
+ zdev->online = 0;
+ return -EAGAIN; /* repeat the request on a different device. */
+ }
+--- a/drivers/s390/crypto/zcrypt_pcixcc.c
++++ b/drivers/s390/crypto/zcrypt_pcixcc.c
+@@ -462,6 +462,8 @@ static int convert_type86_ica(struct zcr
+ }
+ if (service_rc == 12 && service_rs == 769)
+ return -EINVAL;
++ if (service_rc == 8 && service_rs == 72)
++ return -EINVAL;
+ zdev->online = 0;
+ return -EAGAIN; /* repeat the request on a different device. */
+ }
projects / thirdparty / kernel / stable-queue.git / commitdiff
