From 13f7f735d0476dc45cf52ac8e280eecd8ac58e7e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 12 Nov 2014 08:59:56 +0900 Subject: [PATCH] 3.10-stable patches added patches: acer-wmi-add-acpi_backlight-video-quirk-for-the-acer-kav80.patch drm-radeon-remove-invalid-pci-id.patch rbd-fix-error-recovery-in-rbd_obj_read_sync.patch --- ...light-video-quirk-for-the-acer-kav80.patch | 47 ++++++++++++++++ .../drm-radeon-remove-invalid-pci-id.patch | 30 +++++++++++ ...-error-recovery-in-rbd_obj_read_sync.patch | 36 +++++++++++++ queue-3.10/series | 4 +- ...t-f_fs-remove-redundant-ffs_data_get.patch | 53 ------------------- 5 files changed, 116 insertions(+), 54 deletions(-) create mode 100644 queue-3.10/acer-wmi-add-acpi_backlight-video-quirk-for-the-acer-kav80.patch create mode 100644 queue-3.10/drm-radeon-remove-invalid-pci-id.patch create mode 100644 queue-3.10/rbd-fix-error-recovery-in-rbd_obj_read_sync.patch delete mode 100644 queue-3.10/usb-gadget-f_fs-remove-redundant-ffs_data_get.patch diff --git a/queue-3.10/acer-wmi-add-acpi_backlight-video-quirk-for-the-acer-kav80.patch b/queue-3.10/acer-wmi-add-acpi_backlight-video-quirk-for-the-acer-kav80.patch new file mode 100644 index 00000000000..43e6d910c6c --- /dev/null +++ b/queue-3.10/acer-wmi-add-acpi_backlight-video-quirk-for-the-acer-kav80.patch @@ -0,0 +1,47 @@ +From 183fd8fcd7f8afb7ac5ec68f83194872f9fecc84 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Wed, 22 Oct 2014 16:06:38 +0200 +Subject: acer-wmi: Add acpi_backlight=video quirk for the Acer KAV80 + +From: Hans de Goede + +commit 183fd8fcd7f8afb7ac5ec68f83194872f9fecc84 upstream. + +The acpi-video backlight interface on the Acer KAV80 is broken, and worse +it causes the entire machine to slow down significantly after a suspend/resume. + +Blacklist it, and use the acer-wmi backlight interface instead. Note that +the KAV80 is somewhat unique in that it is the only Acer model where we +fall back to acer-wmi after blacklisting, rather then using the native +(e.g. intel) backlight driver. This is done because there is no native +backlight interface on this model. + +BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1128309 +Signed-off-by: Hans de Goede +Signed-off-by: Darren Hart +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/platform/x86/acer-wmi.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +--- a/drivers/platform/x86/acer-wmi.c ++++ b/drivers/platform/x86/acer-wmi.c +@@ -572,6 +572,17 @@ static const struct dmi_system_id video_ + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5750"), + }, + }, ++ { ++ /* ++ * Note no video_set_backlight_video_vendor, we must use the ++ * acer interface, as there is no native backlight interface. ++ */ ++ .ident = "Acer KAV80", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "Acer"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "KAV80"), ++ }, ++ }, + {} + }; + diff --git a/queue-3.10/drm-radeon-remove-invalid-pci-id.patch b/queue-3.10/drm-radeon-remove-invalid-pci-id.patch new file mode 100644 index 00000000000..2d1ae124147 --- /dev/null +++ b/queue-3.10/drm-radeon-remove-invalid-pci-id.patch @@ -0,0 +1,30 @@ +From 8c3e434769b1707fd2d24de5a2eb25fedc634c4a Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Sun, 26 Oct 2014 15:18:42 -0400 +Subject: drm/radeon: remove invalid pci id + +From: Alex Deucher + +commit 8c3e434769b1707fd2d24de5a2eb25fedc634c4a upstream. + +0x4c6e is a secondary device id so should not be used +by the driver. + +Noticed-by: Mark Kettenis +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman + +--- + include/drm/drm_pciids.h | 1 - + 1 file changed, 1 deletion(-) + +--- a/include/drm/drm_pciids.h ++++ b/include/drm/drm_pciids.h +@@ -52,7 +52,6 @@ + {0x1002, 0x4C64, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV250|RADEON_IS_MOBILITY}, \ + {0x1002, 0x4C66, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV250|RADEON_IS_MOBILITY}, \ + {0x1002, 0x4C67, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV250|RADEON_IS_MOBILITY}, \ +- {0x1002, 0x4C6E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV280|RADEON_IS_MOBILITY}, \ + {0x1002, 0x4E44, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ + {0x1002, 0x4E45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ + {0x1002, 0x4E46, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R300}, \ diff --git a/queue-3.10/rbd-fix-error-recovery-in-rbd_obj_read_sync.patch b/queue-3.10/rbd-fix-error-recovery-in-rbd_obj_read_sync.patch new file mode 100644 index 00000000000..3ab79e168f4 --- /dev/null +++ b/queue-3.10/rbd-fix-error-recovery-in-rbd_obj_read_sync.patch @@ -0,0 +1,36 @@ +From a8d4205623ae965e36c68629db306ca0695a2771 Mon Sep 17 00:00:00 2001 +From: Jan Kara +Date: Wed, 22 Oct 2014 09:17:24 +0200 +Subject: rbd: Fix error recovery in rbd_obj_read_sync() + +From: Jan Kara + +commit a8d4205623ae965e36c68629db306ca0695a2771 upstream. + +When we fail to allocate page vector in rbd_obj_read_sync() we just +basically ignore the problem and continue which will result in an oops +later. Fix the problem by returning proper error. + +CC: Yehuda Sadeh +CC: Sage Weil +CC: ceph-devel@vger.kernel.org +Coverity-id: 1226882 +Signed-off-by: Jan Kara +Signed-off-by: Ilya Dryomov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/block/rbd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/block/rbd.c ++++ b/drivers/block/rbd.c +@@ -3227,7 +3227,7 @@ static int rbd_obj_read_sync(struct rbd_ + page_count = (u32) calc_pages_for(offset, length); + pages = ceph_alloc_page_vector(page_count, GFP_KERNEL); + if (IS_ERR(pages)) +- ret = PTR_ERR(pages); ++ return PTR_ERR(pages); + + ret = -ENOMEM; + obj_request = rbd_obj_request_create(object_name, offset, length, diff --git a/queue-3.10/series b/queue-3.10/series index 5d9b26a059b..42c1b7b818b 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -113,4 +113,6 @@ crypto-algif-avoid-excessive-use-of-socket-buffer-in-skcipher.patch usb-dwc3-gadget-fix-set_halt-bug-with-pending-transfers.patch usb-gadget-function-acm-make-f_acm-pass-usb20cv-chapter9.patch usb-gadget-udc-core-fix-kernel-oops-with-soft-connect.patch -usb-gadget-f_fs-remove-redundant-ffs_data_get.patch +drm-radeon-remove-invalid-pci-id.patch +rbd-fix-error-recovery-in-rbd_obj_read_sync.patch +acer-wmi-add-acpi_backlight-video-quirk-for-the-acer-kav80.patch diff --git a/queue-3.10/usb-gadget-f_fs-remove-redundant-ffs_data_get.patch b/queue-3.10/usb-gadget-f_fs-remove-redundant-ffs_data_get.patch deleted file mode 100644 index cec2db90c03..00000000000 --- a/queue-3.10/usb-gadget-f_fs-remove-redundant-ffs_data_get.patch +++ /dev/null @@ -1,53 +0,0 @@ -From balbi@ti.com Wed Nov 12 08:47:28 2014 -From: Felipe Balbi -Date: Mon, 10 Nov 2014 09:19:57 -0600 -Subject: [PATCH backport v2] usb: gadget: f_fs: remove redundant ffs_data_get() -To: Greg KH -Cc: , Robert Baldyga , Felipe Balbi -Message-ID: <1415632797-28618-1-git-send-email-balbi@ti.com> - - -From: Robert Baldyga - -[ Upstream commit a3058a5d82e296daaca07411c3738a9ddd79f302 ] - -During FunctionFS bind, ffs_data_get() function was called twice -(in functionfs_bind() and in ffs_do_functionfs_bind()), while on unbind -ffs_data_put() was called once (in functionfs_unbind() function). -In result refcount never reached value 0, and ffs memory resources has -been never released. - -Since ffs_data_get() call in ffs_do_functionfs_bind() is redundant -and not neccessary, we remove it to have equal number of gets ans puts, -and free allocated memory after refcount reach 0. - -Fixes: 5920cda (usb: gadget: FunctionFS: convert to new function - interface with backward compatibility) -Signed-off-by: Robert Baldyga -Signed-off-by: Felipe Balbi -Signed-off-by: Greg Kroah-Hartman ---- - drivers/usb/gadget/f_fs.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c -index 5bcf7d0..afd0a15 100644 ---- a/drivers/usb/gadget/f_fs.c -+++ b/drivers/usb/gadget/f_fs.c -@@ -1995,8 +1995,6 @@ static inline struct f_fs_opts *ffs_do_functionfs_bind(struct usb_function *f, - func->conf = c; - func->gadget = c->cdev->gadget; - -- ffs_data_get(func->ffs); -- - /* - * in drivers/usb/gadget/configfs.c:configfs_composite_bind() - * configurations are bound in sequence with list_for_each_entry, --- -2.1.0.GIT - --- -To unsubscribe from this list: send the line "unsubscribe stable" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html - -- 2.47.3