From 2cd89cf0d7d00469aa79f626530869f6e3ee33d4 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 9 Sep 2019 12:42:26 +0200 Subject: [PATCH] kernel: bump 4.14 to 4.4.142 Refreshed all patches. Remove upstreamed: - 0032-usb-host-fotg2-restart-hcd-after-port-reset.patch Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte --- include/kernel-version.mk | 4 +-- ...b-host-fotg2-add-device-tree-probing.patch | 4 +-- ...ost-fotg2-add-silicon-clock-handling.patch | 6 ++--- ...t-fotg2-add-Gemini-specific-handling.patch | 4 +-- ...t-fotg2-restart-hcd-after-port-reset.patch | 26 ------------------- .../810-kvm-support-layerscape.patch | 2 +- 6 files changed, 10 insertions(+), 36 deletions(-) delete mode 100644 target/linux/gemini/patches-4.14/0032-usb-host-fotg2-restart-hcd-after-port-reset.patch diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 96ce88fbce..5a570955b4 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.14 = .141 +LINUX_VERSION-4.14 = .142 -LINUX_KERNEL_HASH-4.14.141 = 0bb9f0812326ec4554de1bea02628840e03b6664b5abfd9d8510049e43203a17 +LINUX_KERNEL_HASH-4.14.142 = e67ba535991170a8383be68203af7d9b4262474ceeff2f9afedeac6043b590f3 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/gemini/patches-4.14/0028-usb-host-fotg2-add-device-tree-probing.patch b/target/linux/gemini/patches-4.14/0028-usb-host-fotg2-add-device-tree-probing.patch index 862cb64909..01a704830f 100644 --- a/target/linux/gemini/patches-4.14/0028-usb-host-fotg2-add-device-tree-probing.patch +++ b/target/linux/gemini/patches-4.14/0028-usb-host-fotg2-add-device-tree-probing.patch @@ -24,7 +24,7 @@ ChangeLog v2->v3: #include #include #include -@@ -5600,6 +5601,15 @@ static int fotg210_hcd_probe(struct plat +@@ -5604,6 +5605,15 @@ static int fotg210_hcd_probe(struct plat if (usb_disabled()) return -ENODEV; @@ -40,7 +40,7 @@ ChangeLog v2->v3: pdev->dev.power.power_state = PMSG_ON; res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); -@@ -5676,9 +5686,18 @@ static int fotg210_hcd_remove(struct pla +@@ -5680,9 +5690,18 @@ static int fotg210_hcd_remove(struct pla return 0; } diff --git a/target/linux/gemini/patches-4.14/0029-usb-host-fotg2-add-silicon-clock-handling.patch b/target/linux/gemini/patches-4.14/0029-usb-host-fotg2-add-silicon-clock-handling.patch index 4a1faf938e..5ecd9297e5 100644 --- a/target/linux/gemini/patches-4.14/0029-usb-host-fotg2-add-silicon-clock-handling.patch +++ b/target/linux/gemini/patches-4.14/0029-usb-host-fotg2-add-silicon-clock-handling.patch @@ -26,7 +26,7 @@ Signed-off-by: Linus Walleij #include #include -@@ -5635,7 +5636,7 @@ static int fotg210_hcd_probe(struct plat +@@ -5639,7 +5640,7 @@ static int fotg210_hcd_probe(struct plat hcd->regs = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(hcd->regs)) { retval = PTR_ERR(hcd->regs); @@ -35,7 +35,7 @@ Signed-off-by: Linus Walleij } hcd->rsrc_start = res->start; -@@ -5645,22 +5646,35 @@ static int fotg210_hcd_probe(struct plat +@@ -5649,22 +5650,35 @@ static int fotg210_hcd_probe(struct plat fotg210->caps = hcd->regs; @@ -74,7 +74,7 @@ Signed-off-by: Linus Walleij usb_put_hcd(hcd); fail_create_hcd: dev_err(dev, "init %s fail, %d\n", dev_name(dev), retval); -@@ -5676,6 +5690,10 @@ static int fotg210_hcd_remove(struct pla +@@ -5680,6 +5694,10 @@ static int fotg210_hcd_remove(struct pla { struct device *dev = &pdev->dev; struct usb_hcd *hcd = dev_get_drvdata(dev); diff --git a/target/linux/gemini/patches-4.14/0030-usb-host-fotg2-add-Gemini-specific-handling.patch b/target/linux/gemini/patches-4.14/0030-usb-host-fotg2-add-Gemini-specific-handling.patch index 2e781e403d..0125e816d6 100644 --- a/target/linux/gemini/patches-4.14/0030-usb-host-fotg2-add-Gemini-specific-handling.patch +++ b/target/linux/gemini/patches-4.14/0030-usb-host-fotg2-add-Gemini-specific-handling.patch @@ -43,7 +43,7 @@ Signed-off-by: Linus Walleij #include #include -@@ -5583,6 +5587,72 @@ static void fotg210_init(struct fotg210_ +@@ -5587,6 +5591,72 @@ static void fotg210_init(struct fotg210_ iowrite32(value, &fotg210->regs->otgcsr); } @@ -116,7 +116,7 @@ Signed-off-by: Linus Walleij /** * fotg210_hcd_probe - initialize faraday FOTG210 HCDs * -@@ -5662,6 +5732,12 @@ static int fotg210_hcd_probe(struct plat +@@ -5666,6 +5736,12 @@ static int fotg210_hcd_probe(struct plat fotg210_init(fotg210); diff --git a/target/linux/gemini/patches-4.14/0032-usb-host-fotg2-restart-hcd-after-port-reset.patch b/target/linux/gemini/patches-4.14/0032-usb-host-fotg2-restart-hcd-after-port-reset.patch deleted file mode 100644 index 80b2fc4104..0000000000 --- a/target/linux/gemini/patches-4.14/0032-usb-host-fotg2-restart-hcd-after-port-reset.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 731a2896e11b4e6a8d252e6c14edb1b09dbfcd46 Mon Sep 17 00:00:00 2001 -From: Hans Ulli Kroll -Date: Sat, 14 Apr 2018 18:49:57 +0200 -Subject: [PATCH 1/2] usb: host: fotg2: restart hcd after port reset - -on Gemini SoC FOTG2 stalls after port reset -rerstart the hcd. - -Signed-off-by: Hans Ulli Kroll ---- - drivers/usb/host/fotg210-hcd.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/usb/host/fotg210-hcd.c -+++ b/drivers/usb/host/fotg210-hcd.c -@@ -1658,6 +1658,10 @@ static int fotg210_hub_control(struct us - /* see what we found out */ - temp = check_reset_complete(fotg210, wIndex, status_reg, - fotg210_readl(fotg210, status_reg)); -+ -+ /* restart schedule */ -+ fotg210->command |= CMD_RUN; -+ fotg210_writel(fotg210, fotg210->command, &fotg210->regs->command); - } - - if (!(temp & (PORT_RESUME|PORT_RESET))) { diff --git a/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch b/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch index 2d26637894..502a99fa87 100644 --- a/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch @@ -196,7 +196,7 @@ Signed-off-by: Signed-off-by: Biwen Li --- a/virt/kvm/arm/vgic/vgic-v2.c +++ b/virt/kvm/arm/vgic/vgic-v2.c -@@ -304,7 +304,8 @@ int vgic_v2_map_resources(struct kvm *kv +@@ -307,7 +307,8 @@ int vgic_v2_map_resources(struct kvm *kv if (!static_branch_unlikely(&vgic_v2_cpuif_trap)) { ret = kvm_phys_addr_ioremap(kvm, dist->vgic_cpu_base, kvm_vgic_global_state.vcpu_base, -- 2.30.2