From: Greg Kroah-Hartman Date: Tue, 16 Oct 2018 10:22:13 +0000 (+0200) Subject: 3.18-stable patches X-Git-Tag: v4.9.134~23 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd61748971074cddc6d9a125f3e357f52ccbbdd8;p=thirdparty%2Fkernel%2Fstable-queue.git 3.18-stable patches added patches: mfd-omap-usb-host-fix-dts-probe-of-children.patch selftests-efivarfs-add-required-kernel-configs.patch stmmac-fix-valid-numbers-of-unicast-filter-entries.patch --- diff --git a/queue-3.18/mfd-omap-usb-host-fix-dts-probe-of-children.patch b/queue-3.18/mfd-omap-usb-host-fix-dts-probe-of-children.patch new file mode 100644 index 00000000000..409f2e4e9f7 --- /dev/null +++ b/queue-3.18/mfd-omap-usb-host-fix-dts-probe-of-children.patch @@ -0,0 +1,68 @@ +From foo@baz Tue Oct 16 12:22:04 CEST 2018 +From: Tony Lindgren +Date: Wed, 25 Apr 2018 07:29:22 -0700 +Subject: mfd: omap-usb-host: Fix dts probe of children + +From: Tony Lindgren + +[ Upstream commit 10492ee8ed9188d6d420e1f79b2b9bdbc0624e65 ] + +It currently only works if the parent bus uses "simple-bus". We +currently try to probe children with non-existing compatible values. +And we're missing .probe. + +I noticed this while testing devices configured to probe using ti-sysc +interconnect target module driver. For that we also may want to rebind +the driver, so let's remove __init and __exit. + +Signed-off-by: Tony Lindgren +Acked-by: Roger Quadros +Signed-off-by: Lee Jones +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mfd/omap-usb-host.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +--- a/drivers/mfd/omap-usb-host.c ++++ b/drivers/mfd/omap-usb-host.c +@@ -558,8 +558,8 @@ static int usbhs_omap_get_dt_pdata(struc + } + + static const struct of_device_id usbhs_child_match_table[] = { +- { .compatible = "ti,omap-ehci", }, +- { .compatible = "ti,omap-ohci", }, ++ { .compatible = "ti,ehci-omap", }, ++ { .compatible = "ti,ohci-omap3", }, + { } + }; + +@@ -886,6 +886,7 @@ static struct platform_driver usbhs_omap + .pm = &usbhsomap_dev_pm_ops, + .of_match_table = usbhs_omap_dt_ids, + }, ++ .probe = usbhs_omap_probe, + .remove = usbhs_omap_remove, + }; + +@@ -895,9 +896,9 @@ MODULE_ALIAS("platform:" USBHS_DRIVER_NA + MODULE_LICENSE("GPL v2"); + MODULE_DESCRIPTION("usb host common core driver for omap EHCI and OHCI"); + +-static int __init omap_usbhs_drvinit(void) ++static int omap_usbhs_drvinit(void) + { +- return platform_driver_probe(&usbhs_omap_driver, usbhs_omap_probe); ++ return platform_driver_register(&usbhs_omap_driver); + } + + /* +@@ -909,7 +910,7 @@ static int __init omap_usbhs_drvinit(voi + */ + fs_initcall_sync(omap_usbhs_drvinit); + +-static void __exit omap_usbhs_drvexit(void) ++static void omap_usbhs_drvexit(void) + { + platform_driver_unregister(&usbhs_omap_driver); + } diff --git a/queue-3.18/selftests-efivarfs-add-required-kernel-configs.patch b/queue-3.18/selftests-efivarfs-add-required-kernel-configs.patch new file mode 100644 index 00000000000..b159766a98e --- /dev/null +++ b/queue-3.18/selftests-efivarfs-add-required-kernel-configs.patch @@ -0,0 +1,24 @@ +From foo@baz Tue Oct 16 12:22:04 CEST 2018 +From: Lei Yang +Date: Wed, 5 Sep 2018 11:14:49 +0800 +Subject: selftests/efivarfs: add required kernel configs + +From: Lei Yang + +[ Upstream commit 53cf59d6c0ad3edc4f4449098706a8f8986258b6 ] + +add config file + +Signed-off-by: Lei Yang +Signed-off-by: Shuah Khan (Samsung OSG) +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/efivarfs/config | 1 + + 1 file changed, 1 insertion(+) + create mode 100644 tools/testing/selftests/efivarfs/config + +--- /dev/null ++++ b/tools/testing/selftests/efivarfs/config +@@ -0,0 +1 @@ ++CONFIG_EFIVAR_FS=y diff --git a/queue-3.18/series b/queue-3.18/series new file mode 100644 index 00000000000..a6d45315d40 --- /dev/null +++ b/queue-3.18/series @@ -0,0 +1,3 @@ +selftests-efivarfs-add-required-kernel-configs.patch +mfd-omap-usb-host-fix-dts-probe-of-children.patch +stmmac-fix-valid-numbers-of-unicast-filter-entries.patch diff --git a/queue-3.18/stmmac-fix-valid-numbers-of-unicast-filter-entries.patch b/queue-3.18/stmmac-fix-valid-numbers-of-unicast-filter-entries.patch new file mode 100644 index 00000000000..4cfdfea3fb4 --- /dev/null +++ b/queue-3.18/stmmac-fix-valid-numbers-of-unicast-filter-entries.patch @@ -0,0 +1,43 @@ +From foo@baz Tue Oct 16 12:22:04 CEST 2018 +From: Jongsung Kim +Date: Thu, 13 Sep 2018 18:32:21 +0900 +Subject: stmmac: fix valid numbers of unicast filter entries + +From: Jongsung Kim + +[ Upstream commit edf2ef7242805e53ec2e0841db26e06d8bc7da70 ] + +Synopsys DWC Ethernet MAC can be configured to have 1..32, 64, or +128 unicast filter entries. (Table 7-8 MAC Address Registers from +databook) Fix dwmac1000_validate_ucast_entries() to accept values +between 1 and 32 in addition. + +Signed-off-by: Jongsung Kim +Signed-off-by: David S. Miller +Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c ++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +@@ -85,7 +85,7 @@ static int dwmac1000_validate_mcast_bins + + /* This function validates the number of Unicast address entries supported + * by a particular Synopsys 10/100/1000 controller. The Synopsys controller +- * supports 1, 32, 64, or 128 Unicast filter entries for it's Unicast filter ++ * supports 1..32, 64, or 128 Unicast filter entries for it's Unicast filter + * logic. This function validates a valid, supported configuration is + * selected, and defaults to 1 Unicast address if an unsupported + * configuration is selected. +@@ -95,8 +95,7 @@ static int dwmac1000_validate_ucast_entr + int x = ucast_entries; + + switch (x) { +- case 1: +- case 32: ++ case 1 ... 32: + case 64: + case 128: + break;