Upgrade to kernel 4.19.49
- added patch for usb from 4.20 which seems to fix the wifi hang issue that happened on 4.19 - changed power management to not turn off display on inactivity as sometimes the machine doesnt wakeup properly. Need to test patch from old 4.19 branch to see if that fixes this.
This commit is contained in:
Hal Emmerich
parent
a9627ed383
commit
769f481332
2
makefile
2
makefile
@ -13,7 +13,7 @@
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with PrawnOS. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
KVER=4.17.19
|
||||
KVER=4.19.49
|
||||
ifeq ($(PRAWNOS_SUITE),)
|
||||
PRAWNOS_SUITE=buster
|
||||
endif
|
||||
|
||||
@ -1 +1 @@
|
||||
console=tty1 init=/sbin/init root=PARTUUID=%U/PARTNROFF=1 rootfstype=ext4 rootwait ro net.ifnames=0
|
||||
console=tty1 init=/sbin/init root=PARTUUID=%U/PARTNROFF=1 rootfstype=ext4 rootwait ro net.ifnames=0 console=ttyS2,115200n8 earlyprintk=ttyS2,115200n8 loglevel=4
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,89 +0,0 @@
|
||||
From b79b87ffc54b143172880c6ce5dd66d30c772d76 Mon Sep 17 00:00:00 2001
|
||||
From: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||
Date: Wed, 2 May 2018 21:54:37 +0200
|
||||
Subject: [PATCH] ARM: DTSI: rk3288: Add the appropriate clock references
|
||||
|
||||
So, the commit f2e3a5f557ad27f6a6f447717090a39cea238d6a (Torvalds
|
||||
branch) is forcing the DTS files to provide appropriate clock
|
||||
references named "aclk" and "iface" for each MMU node.
|
||||
The references are then manipulated by the Rockchip IOMMU driver.
|
||||
If the references are not present, the IOMMU driver bails out with
|
||||
an error.
|
||||
|
||||
However, no changes has been pushed to add these clock references
|
||||
to the RK3288 DTSI file, making the Rockchip IOMMU driver fail all
|
||||
the Video hardware related MMU probes.
|
||||
That result in no display, which a major inconvenience.
|
||||
|
||||
The following patch, taken from the linux-rockchip Git repository
|
||||
maintained by @mmind, written by Jeffy Chen, actually adds these
|
||||
clock references to the rk3288.dtsi.
|
||||
Orignal patch link :
|
||||
https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git/commit/arch/arm/boot/dts/rk3288.dtsi?h=for-next&id=c78751f91c0b5461ba08b123f85c1ed146a32f97
|
||||
|
||||
Signed-off-by: Myy Miouyouyou <myy@miouyouyou.fr>
|
||||
---
|
||||
arch/arm/boot/dts/rk3288.dtsi | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
|
||||
index a258a3f7..e9ac64e2 100644
|
||||
--- a/arch/arm/boot/dts/rk3288.dtsi
|
||||
+++ b/arch/arm/boot/dts/rk3288.dtsi
|
||||
@@ -972,6 +972,8 @@
|
||||
reg = <0x0 0xff900800 0x0 0x40>;
|
||||
interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "iep_mmu";
|
||||
+ clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>;
|
||||
+ clock-names = "aclk", "iface";
|
||||
#iommu-cells = <0>;
|
||||
status = "disabled";
|
||||
};
|
||||
@@ -981,6 +983,8 @@
|
||||
reg = <0x0 0xff914000 0x0 0x100>, <0x0 0xff915000 0x0 0x100>;
|
||||
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "isp_mmu";
|
||||
+ clocks = <&cru ACLK_ISP>, <&cru HCLK_ISP>;
|
||||
+ clock-names = "aclk", "iface";
|
||||
#iommu-cells = <0>;
|
||||
rockchip,disable-mmu-reset;
|
||||
status = "disabled";
|
||||
@@ -1040,6 +1044,8 @@
|
||||
reg = <0x0 0xff930300 0x0 0x100>;
|
||||
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "vopb_mmu";
|
||||
+ clocks = <&cru ACLK_VOP0>, <&cru HCLK_VOP0>;
|
||||
+ clock-names = "aclk", "iface";
|
||||
power-domains = <&power RK3288_PD_VIO>;
|
||||
#iommu-cells = <0>;
|
||||
status = "disabled";
|
||||
@@ -1088,6 +1094,8 @@
|
||||
reg = <0x0 0xff940300 0x0 0x100>;
|
||||
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "vopl_mmu";
|
||||
+ clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>;
|
||||
+ clock-names = "aclk", "iface";
|
||||
power-domains = <&power RK3288_PD_VIO>;
|
||||
#iommu-cells = <0>;
|
||||
status = "disabled";
|
||||
@@ -1220,6 +1228,8 @@
|
||||
reg = <0x0 0xff9a0800 0x0 0x100>;
|
||||
interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "vpu_mmu";
|
||||
+ clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
|
||||
+ clock-names = "aclk", "iface";
|
||||
#iommu-cells = <0>;
|
||||
status = "disabled";
|
||||
};
|
||||
@@ -1250,6 +1260,8 @@
|
||||
reg = <0x0 0xff9c0440 0x0 0x40>, <0x0 0xff9c0480 0x0 0x40>;
|
||||
interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
|
||||
interrupt-names = "hevc_mmu";
|
||||
+ clocks = <&cru ACLK_HEVC>, <&cru HCLK_HEVC>;
|
||||
+ clock-names = "aclk", "iface";
|
||||
#iommu-cells = <0>;
|
||||
status = "disabled";
|
||||
};
|
||||
--
|
||||
2.17.0
|
||||
|
||||
@ -0,0 +1,47 @@
|
||||
From ed194d1367698a0872a2b75bbe06b3932ce9df3a Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Date: Mon, 10 Sep 2018 11:20:00 +0200
|
||||
Subject: [PATCH] usb: core: remove local_irq_save() around ->complete()
|
||||
handler
|
||||
|
||||
The core disabled interrupts before invocation the ->complete handler
|
||||
because the handler might have expected that interrupts are disabled.
|
||||
|
||||
All handlers were audited and use proper locking now. With it, the core
|
||||
code no longer needs to disable interrupts before invoking the
|
||||
->complete handler.
|
||||
Remove local_irq_save() statement before invoking the ->complete
|
||||
handler.
|
||||
|
||||
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||||
Acked-by: Alan Stern <stern@rowland.harvard.edu>
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
---
|
||||
drivers/usb/core/hcd.c | 13 -------------
|
||||
1 file changed, 13 deletions(-)
|
||||
|
||||
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
|
||||
index 1c21955fe7c00..f985d2303095c 100644
|
||||
--- a/drivers/usb/core/hcd.c
|
||||
+++ b/drivers/usb/core/hcd.c
|
||||
@@ -1755,20 +1755,7 @@ static void __usb_hcd_giveback_urb(struct urb *urb)
|
||||
|
||||
/* pass ownership to the completion handler */
|
||||
urb->status = status;
|
||||
-
|
||||
- /*
|
||||
- * We disable local IRQs here avoid possible deadlock because
|
||||
- * drivers may call spin_lock() to hold lock which might be
|
||||
- * acquired in one hard interrupt handler.
|
||||
- *
|
||||
- * The local_irq_save()/local_irq_restore() around complete()
|
||||
- * will be removed if current USB drivers have been cleaned up
|
||||
- * and no one may trigger the above deadlock situation when
|
||||
- * running complete() in tasklet.
|
||||
- */
|
||||
- local_irq_save(flags);
|
||||
urb->complete(urb);
|
||||
- local_irq_restore(flags);
|
||||
|
||||
usb_anchor_resume_wakeups(anchor);
|
||||
atomic_dec(&urb->use_count);
|
||||
@ -7,12 +7,12 @@
|
||||
<property name="brightness-switch" type="empty"/>
|
||||
<property name="brightness-on-battery" type="empty"/>
|
||||
<property name="brightness-level-on-battery" type="empty"/>
|
||||
<property name="dpms-on-battery-off" type="empty"/>
|
||||
<property name="dpms-on-battery-sleep" type="empty"/>
|
||||
<property name="blank-on-battery" type="empty"/>
|
||||
<property name="blank-on-ac" type="empty"/>
|
||||
<property name="dpms-on-ac-sleep" type="empty"/>
|
||||
<property name="dpms-on-ac-off" type="empty"/>
|
||||
<property name="dpms-on-battery-off" type="0"/>
|
||||
<property name="dpms-on-battery-sleep" type="0"/>
|
||||
<property name="blank-on-battery" type="0"/>
|
||||
<property name="blank-on-ac" type="0"/>
|
||||
<property name="dpms-on-ac-sleep" type="0"/>
|
||||
<property name="dpms-on-ac-off" type="0"/>
|
||||
<property name="inactivity-on-battery" type="empty"/>
|
||||
<property name="brightness-level-on-ac" type="empty"/>
|
||||
<property name="inactivity-sleep-mode-on-battery" type="uint" value="1"/>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user