3.10-stable patches

added patches:
	e100-fix-disabling-already-disabled-device-warning.patch
	xhci-fix-resume-issues-on-renesas-chips-in-samsung-laptops.patch

diff --git a/queue-3.10/e100-fix-disabling-already-disabled-device-warning.patch b/queue-3.10/e100-fix-disabling-already-disabled-device-warning.patch
new file mode 100644 (file)
index 0000000..d0aa919
--- /dev/null
+++ b/queue-3.10/e100-fix-disabling-already-disabled-device-warning.patch
@@ -0,0 +1,64 @@
+From 2b6e0ca175fe4a20f21ba82b1e7ccc71029c4dd4 Mon Sep 17 00:00:00 2001
+From: Michele Baldessari <michele@acksyn.org>
+Date: Thu, 30 Jan 2014 10:51:04 +0000
+Subject: e100: Fix "disabling already-disabled device" warning
+
+From: Michele Baldessari <michele@acksyn.org>
+
+commit 2b6e0ca175fe4a20f21ba82b1e7ccc71029c4dd4 upstream.
+
+In https://bugzilla.redhat.com/show_bug.cgi?id=994438 and
+https://bugzilla.redhat.com/show_bug.cgi?id=970480  we
+received different reports of e100 throwing the following
+warning:
+
+ [<c06a0ba5>] ? pci_disable_device+0x85/0x90
+ [<c044a153>] warn_slowpath_fmt+0x33/0x40
+ [<c06a0ba5>] pci_disable_device+0x85/0x90
+ [<f7fdf7e0>] __e100_shutdown+0x80/0x120 [e100]
+ [<c0476ca5>] ? check_preempt_curr+0x65/0x90
+ [<f7fdf8d6>] e100_suspend+0x16/0x30 [e100]
+ [<c06a1ebb>] pci_legacy_suspend+0x2b/0xb0
+ [<c098fc0f>] ? wait_for_completion+0x1f/0xd0
+ [<c06a2d50>] ? pci_pm_poweroff+0xb0/0xb0
+ [<c06a2de4>] pci_pm_freeze+0x94/0xa0
+ [<c0767bb7>] dpm_run_callback+0x37/0x80
+ [<c076a204>] ? pm_wakeup_pending+0xc4/0x140
+ [<c0767f12>] __device_suspend+0xb2/0x1f0
+ [<c076806f>] async_suspend+0x1f/0x90
+ [<c04706e5>] async_run_entry_fn+0x35/0x140
+ [<c0478aef>] ? wake_up_process+0x1f/0x40
+ [<c0464495>] process_one_work+0x115/0x370
+ [<c0462645>] ? start_worker+0x25/0x30
+ [<c0464dc5>] ? manage_workers.isra.27+0x1a5/0x250
+ [<c0464f6e>] worker_thread+0xfe/0x330
+ [<c0464e70>] ? manage_workers.isra.27+0x250/0x250
+ [<c046a224>] kthread+0x94/0xa0
+ [<c0997f37>] ret_from_kernel_thread+0x1b/0x28
+ [<c046a190>] ? insert_kthread_work+0x30/0x30
+
+This patch removes pci_disable_device() from __e100_shutdown().
+pci_clear_master() is enough.
+
+Signed-off-by: Michele Baldessari <michele@acksyn.org>
+Tested-by: Mark Harig <idirectscm@aim.com>
+Signed-off-by: Aaron Brown <aaron.f.brown@intel.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Cc: Josh Boyer <jwboyer@fedoraproject.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/ethernet/intel/e100.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/intel/e100.c
++++ b/drivers/net/ethernet/intel/e100.c
+@@ -3039,7 +3039,7 @@ static void __e100_shutdown(struct pci_d
+               *enable_wake = false;
+       }
+ 
+-      pci_disable_device(pdev);
++      pci_clear_master(pdev);
+ }
+ 
+ static int __e100_power_off(struct pci_dev *pdev, bool wake)

diff --git a/queue-3.10/series b/queue-3.10/series
index 029dbc32ee1e94ea55604c74f0957c4bb35f1b54..00c21af151119c1164a340972e606e33f8943763 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -18,3 +18,5 @@ kvm-mmu-handle-invalid-root_hpa-at-__direct_map.patch
 kvm-x86-handle-invalid-root_hpa-everywhere.patch
 kvm-vmx-fix-use-after-free-of-vmx-loaded_vmcs.patch
 input-wacom-make-sure-touch_max-is-set-for-touch-devices.patch
+xhci-fix-resume-issues-on-renesas-chips-in-samsung-laptops.patch
+e100-fix-disabling-already-disabled-device-warning.patch

diff --git a/queue-3.10/xhci-fix-resume-issues-on-renesas-chips-in-samsung-laptops.patch b/queue-3.10/xhci-fix-resume-issues-on-renesas-chips-in-samsung-laptops.patch
new file mode 100644 (file)
index 0000000..81ba543
--- /dev/null
+++ b/queue-3.10/xhci-fix-resume-issues-on-renesas-chips-in-samsung-laptops.patch
@@ -0,0 +1,43 @@
+From 1aa9578c1a9450fb21501c4f549f5b1edb557e6d Mon Sep 17 00:00:00 2001
+From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
+Date: Fri, 17 Jan 2014 15:38:12 -0800
+Subject: xhci: Fix resume issues on Renesas chips in Samsung laptops
+
+From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
+
+commit 1aa9578c1a9450fb21501c4f549f5b1edb557e6d upstream.
+
+Don Zickus <dzickus@redhat.com> writes:
+
+Some co-workers of mine bought Samsung laptops that had mostly usb3 ports.
+Those ports did not resume correctly (the driver would timeout communicating
+and fail).  This led to frustration as suspend/resume is a common use for
+laptops.
+
+Poking around, I applied the reset on resume quirk to this chipset and the
+resume started working.  Reloading the xhci_hcd module had been the temporary
+workaround.
+
+Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
+Reported-by: Don Zickus <dzickus@redhat.com>
+Tested-by: Prarit Bhargava <prarit@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/host/xhci-pci.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/drivers/usb/host/xhci-pci.c
++++ b/drivers/usb/host/xhci-pci.c
+@@ -113,6 +113,11 @@ static void xhci_pci_quirks(struct devic
+               xhci_dbg(xhci, "QUIRK: Resetting on resume\n");
+               xhci->quirks |= XHCI_TRUST_TX_LENGTH;
+       }
++      if (pdev->vendor == PCI_VENDOR_ID_RENESAS &&
++                      pdev->device == 0x0015 &&
++                      pdev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG &&
++                      pdev->subsystem_device == 0xc0cd)
++              xhci->quirks |= XHCI_RESET_ON_RESUME;
+       if (pdev->vendor == PCI_VENDOR_ID_VIA)
+               xhci->quirks |= XHCI_RESET_ON_RESUME;
+ }