Linux v4.16.9
This commit is contained in:
Jeremy Cline
parent
2bda331837
commit
68b5374d20
|
|
@ -1,107 +0,0 @@
|
|||
From b24b8a41fb5461d1f2105b18a3106cb0a2d5e058 Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Thu, 26 Apr 2018 20:52:06 +0200
|
||||
Subject: [PATCH 1/2] Bluetooth: btusb: Add Dell XPS 13 9360 to
|
||||
btusb_needs_reset_resume_table
|
||||
|
||||
The Dell XPS 13 9360 uses a QCA Rome chip which needs to be reset
|
||||
(and have its firmware reloaded) for bluetooth to work after
|
||||
suspend/resume.
|
||||
|
||||
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1514836
|
||||
Cc: stable@vger.kernel.org
|
||||
Cc: Garrett LeSage <glesage@redhat.com>
|
||||
Reported-and-tested-by: Garrett LeSage <glesage@redhat.com>
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Signed-off-by: Jeremy Cline <jeremy@jcline.org>
|
||||
---
|
||||
drivers/bluetooth/btusb.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
|
||||
index 366a49c7c08f..409d7eff08a4 100644
|
||||
--- a/drivers/bluetooth/btusb.c
|
||||
+++ b/drivers/bluetooth/btusb.c
|
||||
@@ -392,6 +392,13 @@ static const struct dmi_system_id btusb_needs_reset_resume_table[] = {
|
||||
DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 3060"),
|
||||
},
|
||||
},
|
||||
+ {
|
||||
+ /* Dell XPS 9360 (QCA ROME device 0cf3:e300) */
|
||||
+ .matches = {
|
||||
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
|
||||
+ DMI_MATCH(DMI_PRODUCT_NAME, "XPS 13 9360"),
|
||||
+ },
|
||||
+ },
|
||||
{}
|
||||
};
|
||||
|
||||
--
|
||||
2.17.0
|
||||
|
||||
From 50f2db2f8eccc7a31d899a0dee35f3a1f0c740fe Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Fri, 27 Apr 2018 11:26:43 +0200
|
||||
Subject: [PATCH 2/2] Bluetooth: btusb: Only check needs_reset_resume DMI table
|
||||
for QCA rome chipsets
|
||||
|
||||
Jeremy Cline correctly points out in rhbz#1514836 that a device where the
|
||||
QCA rome chipset needs the USB_QUIRK_RESET_RESUME quirk, may also ship
|
||||
with a different wifi/bt chipset in some configurations.
|
||||
|
||||
If that is the case then we are needlessly penalizing those other chipsets
|
||||
with a reset-resume quirk, typically causing 0.4W extra power use because
|
||||
this disables runtime-pm.
|
||||
|
||||
This commit moves the DMI table check to a btusb_check_needs_reset_resume()
|
||||
helper (so that we can easily also call it for other chipsets) and calls
|
||||
this new helper only for QCA_ROME chipsets for now.
|
||||
|
||||
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1514836
|
||||
Cc: stable@vger.kernel.org
|
||||
Cc: Jeremy Cline <jcline@redhat.com>
|
||||
Suggested-by: Jeremy Cline <jcline@redhat.com>
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Signed-off-by: Jeremy Cline <jeremy@jcline.org>
|
||||
---
|
||||
drivers/bluetooth/btusb.c | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
|
||||
index 409d7eff08a4..ebc9cb23a108 100644
|
||||
--- a/drivers/bluetooth/btusb.c
|
||||
+++ b/drivers/bluetooth/btusb.c
|
||||
@@ -2846,6 +2846,12 @@ static int btusb_config_oob_wake(struct hci_dev *hdev)
|
||||
}
|
||||
#endif
|
||||
|
||||
+static void btusb_check_needs_reset_resume(struct usb_interface *intf)
|
||||
+{
|
||||
+ if (dmi_check_system(btusb_needs_reset_resume_table))
|
||||
+ interface_to_usbdev(intf)->quirks |= USB_QUIRK_RESET_RESUME;
|
||||
+}
|
||||
+
|
||||
static int btusb_probe(struct usb_interface *intf,
|
||||
const struct usb_device_id *id)
|
||||
{
|
||||
@@ -2968,9 +2974,6 @@ static int btusb_probe(struct usb_interface *intf,
|
||||
hdev->send = btusb_send_frame;
|
||||
hdev->notify = btusb_notify;
|
||||
|
||||
- if (dmi_check_system(btusb_needs_reset_resume_table))
|
||||
- interface_to_usbdev(intf)->quirks |= USB_QUIRK_RESET_RESUME;
|
||||
-
|
||||
#ifdef CONFIG_PM
|
||||
err = btusb_config_oob_wake(hdev);
|
||||
if (err)
|
||||
@@ -3057,6 +3060,7 @@ static int btusb_probe(struct usb_interface *intf,
|
||||
if (id->driver_info & BTUSB_QCA_ROME) {
|
||||
data->setup_on_usb = btusb_setup_qca;
|
||||
hdev->set_bdaddr = btusb_set_bdaddr_ath3012;
|
||||
+ btusb_check_needs_reset_resume(intf);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_BT_HCIBTUSB_RTL
|
||||
--
|
||||
2.17.0
|
||||
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
From patchwork Tue Mar 27 17:47:04 2018
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: clk: ti: fix flag space conflict with clkctrl clocks
|
||||
From: Tero Kristo <t-kristo@ti.com>
|
||||
X-Patchwork-Id: 10311335
|
||||
Message-Id: <1522172824-14094-1-git-send-email-t-kristo@ti.com>
|
||||
To: <sboyd@kernel.org>, <mturquette@baylibre.com>,
|
||||
<linux-omap@vger.kernel.org>, <linux-clk@vger.kernel.org>,
|
||||
<tony@atomide.com>
|
||||
Cc: <arnd@arndb.de>, <linux-arm-kernel@lists.infradead.org>
|
||||
Date: Tue, 27 Mar 2018 20:47:04 +0300
|
||||
|
||||
The introduction of support for CLK_SET_RATE_PARENT flag for clkctrl
|
||||
clocks used a generic clock flag, which causes a conflict with the
|
||||
rest of the clkctrl flags, namely the NO_IDLEST flag. This can cause
|
||||
boot failures on certain platforms where this flag is introduced, by
|
||||
omitting the wait for the clockctrl module to be fully enabled before
|
||||
proceeding with rest of the code.
|
||||
|
||||
Fix this by moving all the clkctrl specific flags to their own bit-range.
|
||||
|
||||
Signed-off-by: Tero Kristo <t-kristo@ti.com>
|
||||
Fixes: 49159a9dc3da ("clk: ti: add support for CLK_SET_RATE_PARENT flag")
|
||||
Reported-by: Christophe Lyon <christophe.lyon@linaro.org>
|
||||
Tested-by: Tony Lindgren <tony@atomide.com>
|
||||
---
|
||||
drivers/clk/ti/clock.h | 9 +++++----
|
||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/drivers/clk/ti/clock.h b/drivers/clk/ti/clock.h
|
||||
index 90b86aa..b582780 100644
|
||||
--- a/drivers/clk/ti/clock.h
|
||||
+++ b/drivers/clk/ti/clock.h
|
||||
@@ -76,6 +76,11 @@ enum {
|
||||
#define CLKF_CORE (1 << 9)
|
||||
#define CLKF_J_TYPE (1 << 10)
|
||||
|
||||
+/* CLKCTRL flags */
|
||||
+#define CLKF_SW_SUP BIT(5)
|
||||
+#define CLKF_HW_SUP BIT(6)
|
||||
+#define CLKF_NO_IDLEST BIT(7)
|
||||
+
|
||||
#define CLK(dev, con, ck) \
|
||||
{ \
|
||||
.lk = { \
|
||||
@@ -185,10 +190,6 @@ struct omap_clkctrl_data {
|
||||
extern const struct omap_clkctrl_data dm814_clkctrl_data[];
|
||||
extern const struct omap_clkctrl_data dm816_clkctrl_data[];
|
||||
|
||||
-#define CLKF_SW_SUP BIT(0)
|
||||
-#define CLKF_HW_SUP BIT(1)
|
||||
-#define CLKF_NO_IDLEST BIT(2)
|
||||
-
|
||||
typedef void (*ti_of_clk_init_cb_t)(void *, struct device_node *);
|
||||
|
||||
struct clk *ti_clk_register(struct device *dev, struct clk_hw *hw,
|
||||
16
kernel.spec
16
kernel.spec
|
|
@ -42,7 +42,7 @@ Summary: The Linux kernel
|
|||
# For non-released -rc kernels, this will be appended after the rcX and
|
||||
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
|
||||
#
|
||||
%global baserelease 201
|
||||
%global baserelease 200
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
|
@ -54,7 +54,7 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 8
|
||||
%define stable_update 9
|
||||
# Set rpm version accordingly
|
||||
%if 0%{?stable_update}
|
||||
%define stablerev %{stable_update}
|
||||
|
|
@ -618,9 +618,6 @@ Patch317: arm-sunxi-nvmem-fixH3.patch
|
|||
# Upstream 4.17 back port
|
||||
Patch318: of-i2c-fix-module-aliases.patch
|
||||
|
||||
# https://patchwork.kernel.org/patch/10311335/
|
||||
Patch319: clk-ti-fix-flag-space-conflict-with-clkctrl-clocks.patch
|
||||
|
||||
Patch320: arm-dts-Add-am335x-pocketbeagle.patch
|
||||
|
||||
# https://patchwork.kernel.org/patch/10354521/
|
||||
|
|
@ -662,9 +659,6 @@ Patch503: v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch
|
|||
# rhbz 1549316
|
||||
Patch504: ipmi-fixes.patch
|
||||
|
||||
# rhbz 1514836
|
||||
Patch508: Bluetooth-btusb-autosuspend-XPS-13-9360-fixes.patch
|
||||
|
||||
# rhbz 1572944
|
||||
Patch509: Revert-the-random-series-for-4.16.4.patch
|
||||
|
||||
|
|
@ -677,9 +671,6 @@ Patch511: 0001-xfs-set-format-back-to-extents-if-xfs_bmap_extents_t.patch
|
|||
# rhbz 1566258
|
||||
Patch512: KVM-vmx-update-sec-exec-controls-for-UMIP-iff-emulating-UMIP.patch
|
||||
|
||||
# rhbz 1556797
|
||||
Patch513: swiotlb-silent-unwanted-warning-buffer-is-full.patch
|
||||
|
||||
# END OF PATCH DEFINITIONS
|
||||
|
||||
%endif
|
||||
|
|
@ -1933,7 +1924,8 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Tue May 15 2018 Jeremy Cline <jeremy@jcline.org>
|
||||
* Thu May 17 2018 Jeremy Cline <jcline@redhat.com> - 4.16.9-200
|
||||
- Linux v4.16.9
|
||||
- Silence unwanted "swiotlb buffer is full" warnings (rhbz 1556797)
|
||||
|
||||
* Wed May 09 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.8-201
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (linux-4.16.tar.xz) = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
|
||||
SHA512 (patch-4.16.8.xz) = 8bd521f5a14280c6893f6d85f46d12f97ba71abf3e149f1900aa5e1efa3a03a97df674c4b2b46553b8e9df55164894b6fcb510dbba8cab8ce47ee4b0186e27d0
|
||||
SHA512 (patch-4.16.9.xz) = d3a26957b13ba6e7e9488991cbdfe4ac20112efccbd3ed6a5c786e344731561323ec3d36e0b163debcbdcc33a8c7c545ee755b33e14c8d10e0ce3e27d90ac109
|
||||
|
|
|
|||
|
|
@ -1,43 +0,0 @@
|
|||
From 05e13bb57e6f181d7605f8608181c7e6fb7f591d Mon Sep 17 00:00:00 2001
|
||||
From: Jean Delvare <jdelvare@suse.de>
|
||||
Date: Sat, 12 May 2018 11:57:37 +0200
|
||||
Subject: [PATCH] swiotlb: silent unwanted warning "buffer is full"
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
If DMA_ATTR_NO_WARN is passed to swiotlb_alloc_buffer(), it should be
|
||||
passed further down to swiotlb_tbl_map_single(). Otherwise we escape
|
||||
half of the warnings but still log the other half.
|
||||
|
||||
This is one of the multiple causes of spurious warnings reported at:
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=104082
|
||||
|
||||
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
||||
Fixes: 0176adb00406 ("swiotlb: refactor coherent buffer allocation")
|
||||
Cc: Christoph Hellwig <hch@lst.de>
|
||||
Cc: Christian König <christian.koenig@amd.com>
|
||||
Cc: Michel Dänzer <michel@daenzer.net>
|
||||
Cc: Takashi Iwai <tiwai@suse.de>
|
||||
Cc: stable@vger.kernel.org # v4.16
|
||||
Signed-off-by: Jeremy Cline <jcline@redhat.com>
|
||||
---
|
||||
lib/swiotlb.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
|
||||
index 12fbaa445637..cc640588f145 100644
|
||||
--- a/lib/swiotlb.c
|
||||
+++ b/lib/swiotlb.c
|
||||
@@ -714,7 +714,7 @@ swiotlb_alloc_buffer(struct device *dev, size_t size, dma_addr_t *dma_handle,
|
||||
|
||||
phys_addr = swiotlb_tbl_map_single(dev,
|
||||
__phys_to_dma(dev, io_tlb_start),
|
||||
- 0, size, DMA_FROM_DEVICE, 0);
|
||||
+ 0, size, DMA_FROM_DEVICE, attrs);
|
||||
if (phys_addr == SWIOTLB_MAP_ERROR)
|
||||
goto out_warn;
|
||||
|
||||
--
|
||||
2.17.0
|
||||
|
||||
Loading…
Reference in New Issue