From: Greg Kroah-Hartman Date: Fri, 6 Apr 2018 07:54:48 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v3.18.103~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc0c978bc485dbfbc87e8820b1b4e87412d3d472;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: arm-dts-am57xx-beagle-x15-common-add-overide-powerhold-property.patch arm-dts-am57xx-idk-common-add-overide-powerhold-property.patch arm-dts-dra7-add-power-hold-and-power-controller-properties-to-palmas.patch documentation-pinctrl-palmas-add-ti-palmas-powerhold-override-property-definition.patch fix-slab-name-biovec-1-21-12.patch input-alps-fix-trackstick-detection-on-thinkpad-l570-and-latitude-7370.patch input-i8042-add-lenovo-thinkpad-l460-to-i8042-reset-list.patch input-i8042-enable-mux-on-sony-vaio-vgn-cs-series-to-fix-touchpad.patch md-raid10-reset-the-first-at-the-end-of-loop.patch net-hns-fix-ethtool-private-flags.patch staging-comedi-ni_mio_common-ack-ai-fifo-error-interrupts.patch vt-change-sgr-21-to-follow-the-standards.patch --- diff --git a/queue-4.9/arm-dts-am57xx-beagle-x15-common-add-overide-powerhold-property.patch b/queue-4.9/arm-dts-am57xx-beagle-x15-common-add-overide-powerhold-property.patch new file mode 100644 index 00000000000..49729dc2cab --- /dev/null +++ b/queue-4.9/arm-dts-am57xx-beagle-x15-common-add-overide-powerhold-property.patch @@ -0,0 +1,33 @@ +From 1f166499ce006b3770a3166122eda64e160736ab Mon Sep 17 00:00:00 2001 +From: Keerthy +Date: Thu, 10 Nov 2016 10:39:19 +0530 +Subject: ARM: dts: am57xx-beagle-x15-common: Add overide powerhold property + +From: Keerthy + +commit 1f166499ce006b3770a3166122eda64e160736ab upstream. + +The PMICs have POWERHOLD set by default which prevents PMIC shutdown +even on DEV_CTRL On bit set to 0 as the Powerhold has higher priority. +So to enable pmic power off this property lets one over ride the default +value and enable pmic power off. + +Signed-off-by: Keerthy +Signed-off-by: Tony Lindgren +Cc: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi ++++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi +@@ -204,6 +204,7 @@ + interrupt-controller; + + ti,system-power-controller; ++ ti,palmas-override-powerhold; + + tps659038_pmic { + compatible = "ti,tps659038-pmic"; diff --git a/queue-4.9/arm-dts-am57xx-idk-common-add-overide-powerhold-property.patch b/queue-4.9/arm-dts-am57xx-idk-common-add-overide-powerhold-property.patch new file mode 100644 index 00000000000..4936caf3c2b --- /dev/null +++ b/queue-4.9/arm-dts-am57xx-idk-common-add-overide-powerhold-property.patch @@ -0,0 +1,33 @@ +From 8804755bfb1f3cbc003e4ebe99eac491672f354c Mon Sep 17 00:00:00 2001 +From: Keerthy +Date: Thu, 10 Nov 2016 10:39:20 +0530 +Subject: ARM: dts: am57xx-idk-common: Add overide powerhold property + +From: Keerthy + +commit 8804755bfb1f3cbc003e4ebe99eac491672f354c upstream. + +The PMICs have POWERHOLD set by default which prevents PMIC shutdown +even on DEV_CTRL On bit set to 0 as the Powerhold has higher priority. +So to enable pmic power off this property lets one over ride the default +value and enable pmic power off. + +Signed-off-by: Keerthy +Signed-off-by: Tony Lindgren +Cc: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/boot/dts/am57xx-idk-common.dtsi | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm/boot/dts/am57xx-idk-common.dtsi ++++ b/arch/arm/boot/dts/am57xx-idk-common.dtsi +@@ -57,6 +57,7 @@ + #interrupt-cells = <2>; + interrupt-controller; + ti,system-power-controller; ++ ti,palmas-override-powerhold; + + tps659038_pmic { + compatible = "ti,tps659038-pmic"; diff --git a/queue-4.9/arm-dts-dra7-add-power-hold-and-power-controller-properties-to-palmas.patch b/queue-4.9/arm-dts-dra7-add-power-hold-and-power-controller-properties-to-palmas.patch new file mode 100644 index 00000000000..e2d10169722 --- /dev/null +++ b/queue-4.9/arm-dts-dra7-add-power-hold-and-power-controller-properties-to-palmas.patch @@ -0,0 +1,33 @@ +From 7c62de5f3fc92291decc0dac5f36949bdc3fb575 Mon Sep 17 00:00:00 2001 +From: Keerthy +Date: Thu, 13 Apr 2017 10:21:21 +0530 +Subject: ARM: dts: dra7: Add power hold and power controller properties to palmas + +From: Keerthy + +commit 7c62de5f3fc92291decc0dac5f36949bdc3fb575 upstream. + +Add power hold and power controller properties to palmas node. +This is needed to shutdown pmic correctly on boards with +powerhold set. + +Signed-off-by: Keerthy +Signed-off-by: Tony Lindgren +Cc: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/boot/dts/dra7-evm.dts | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/arch/arm/boot/dts/dra7-evm.dts ++++ b/arch/arm/boot/dts/dra7-evm.dts +@@ -398,6 +398,8 @@ + tps659038: tps659038@58 { + compatible = "ti,tps659038"; + reg = <0x58>; ++ ti,palmas-override-powerhold; ++ ti,system-power-controller; + + tps659038_pmic { + compatible = "ti,tps659038-pmic"; diff --git a/queue-4.9/documentation-pinctrl-palmas-add-ti-palmas-powerhold-override-property-definition.patch b/queue-4.9/documentation-pinctrl-palmas-add-ti-palmas-powerhold-override-property-definition.patch new file mode 100644 index 00000000000..80525db3e4b --- /dev/null +++ b/queue-4.9/documentation-pinctrl-palmas-add-ti-palmas-powerhold-override-property-definition.patch @@ -0,0 +1,43 @@ +From 0ea66f76ba17a4b229caaadd77de694111b21769 Mon Sep 17 00:00:00 2001 +From: Keerthy +Date: Mon, 28 Nov 2016 09:31:58 +0530 +Subject: Documentation: pinctrl: palmas: Add ti,palmas-powerhold-override property definition + +From: Keerthy + +commit 0ea66f76ba17a4b229caaadd77de694111b21769 upstream. + +GPIO7 is configured in POWERHOLD mode which has higher priority +over DEV_ON bit and keeps the PMIC supplies on even after the DEV_ON +bit is turned off. This property enables driver to over ride the +POWERHOLD value to GPIO7 so as to turn off the PMIC in power off +scenarios. + +Signed-off-by: Keerthy +Acked-by: Rob Herring +Signed-off-by: Linus Walleij +Cc: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman + +--- + Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt ++++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt +@@ -35,6 +35,15 @@ Optional properties: + - ti,palmas-enable-dvfs2: Enable DVFS2. Configure pins for DVFS2 mode. + Selection primary or secondary function associated to GPADC_START + and SYSEN2 pin/pad for DVFS2 interface ++- ti,palmas-override-powerhold: This is applicable for PMICs for which ++ GPIO7 is configured in POWERHOLD mode which has higher priority ++ over DEV_ON bit and keeps the PMIC supplies on even after the DEV_ON ++ bit is turned off. This property enables driver to over ride the ++ POWERHOLD value to GPIO7 so as to turn off the PMIC in power off ++ scenarios. So for GPIO7 if ti,palmas-override-powerhold is set ++ then the GPIO_7 field should never be muxed to anything else. ++ It should be set to POWERHOLD by default and only in case of ++ power off scenarios the driver will over ride the mux value. + + This binding uses the following generic properties as defined in + pinctrl-bindings.txt: diff --git a/queue-4.9/fix-slab-name-biovec-1-21-12.patch b/queue-4.9/fix-slab-name-biovec-1-21-12.patch new file mode 100644 index 00000000000..f6d85248747 --- /dev/null +++ b/queue-4.9/fix-slab-name-biovec-1-21-12.patch @@ -0,0 +1,35 @@ +From bd5c4facf59648581d2f1692dad7b107bf429954 Mon Sep 17 00:00:00 2001 +From: Mikulas Patocka +Date: Wed, 21 Mar 2018 12:49:29 -0400 +Subject: Fix slab name "biovec-(1<<(21-12))" + +From: Mikulas Patocka + +commit bd5c4facf59648581d2f1692dad7b107bf429954 upstream. + +I'm getting a slab named "biovec-(1<<(21-12))". It is caused by unintended +expansion of the macro BIO_MAX_PAGES. This patch renames it to biovec-max. + +Signed-off-by: Mikulas Patocka +Cc: stable@vger.kernel.org # v4.14+ +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman + +--- + block/bio.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/block/bio.c ++++ b/block/bio.c +@@ -42,9 +42,9 @@ + * break badly! cannot be bigger than what you can fit into an + * unsigned short + */ +-#define BV(x) { .nr_vecs = x, .name = "biovec-"__stringify(x) } ++#define BV(x, n) { .nr_vecs = x, .name = "biovec-"#n } + static struct biovec_slab bvec_slabs[BVEC_POOL_NR] __read_mostly = { +- BV(1), BV(4), BV(16), BV(64), BV(128), BV(BIO_MAX_PAGES), ++ BV(1, 1), BV(4, 4), BV(16, 16), BV(64, 64), BV(128, 128), BV(BIO_MAX_PAGES, max), + }; + #undef BV + diff --git a/queue-4.9/input-alps-fix-trackstick-detection-on-thinkpad-l570-and-latitude-7370.patch b/queue-4.9/input-alps-fix-trackstick-detection-on-thinkpad-l570-and-latitude-7370.patch new file mode 100644 index 00000000000..fe960a47488 --- /dev/null +++ b/queue-4.9/input-alps-fix-trackstick-detection-on-thinkpad-l570-and-latitude-7370.patch @@ -0,0 +1,80 @@ +From 567b9b549cfa1cbc202762ae97b5385c29ade1e3 Mon Sep 17 00:00:00 2001 +From: Masaki Ota +Date: Mon, 29 Jan 2018 14:36:54 -0800 +Subject: Input: ALPS - fix TrackStick detection on Thinkpad L570 and Latitude 7370 + +From: Masaki Ota + +commit 567b9b549cfa1cbc202762ae97b5385c29ade1e3 upstream. + +The primary interface for the touchpad device in Thinkpad L570 is SMBus, +so ALPS overlooked PS2 interface Firmware setting of TrackStick, and +shipped with TrackStick otp bit is disabled. + +The address 0xD7 contains device number information, so we can identify +the device by checking this value, but to access it we need to enable +Command mode, and then re-enable the device. Devices shipped in Thinkpad +L570 report either 0x0C or 0x1D as device numbers, if we see them we assume +that the devices are DualPoints. + +The same issue exists on Dell Latitude 7370. + +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=196929 +Fixes: 646580f793 ("Input: ALPS - fix multi-touch decoding on SS4 plus touchpads") +Signed-off-by: Masaki Ota +Tested-by: Aaron Ma +Tested-by: Jonathan Liu +Tested-by: Jaak Ristioja +Cc: stable@vger.kernel.org +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/input/mouse/alps.c | 24 +++++++++++++++++++++--- + 1 file changed, 21 insertions(+), 3 deletions(-) + +--- a/drivers/input/mouse/alps.c ++++ b/drivers/input/mouse/alps.c +@@ -2538,13 +2538,31 @@ static int alps_update_btn_info_ss4_v2(u + } + + static int alps_update_dual_info_ss4_v2(unsigned char otp[][4], +- struct alps_data *priv) ++ struct alps_data *priv, ++ struct psmouse *psmouse) + { + bool is_dual = false; ++ int reg_val = 0; ++ struct ps2dev *ps2dev = &psmouse->ps2dev; + +- if (IS_SS4PLUS_DEV(priv->dev_id)) ++ if (IS_SS4PLUS_DEV(priv->dev_id)) { + is_dual = (otp[0][0] >> 4) & 0x01; + ++ if (!is_dual) { ++ /* For support TrackStick of Thinkpad L/E series */ ++ if (alps_exit_command_mode(psmouse) == 0 && ++ alps_enter_command_mode(psmouse) == 0) { ++ reg_val = alps_command_mode_read_reg(psmouse, ++ 0xD7); ++ } ++ alps_exit_command_mode(psmouse); ++ ps2_command(ps2dev, NULL, PSMOUSE_CMD_ENABLE); ++ ++ if (reg_val == 0x0C || reg_val == 0x1D) ++ is_dual = true; ++ } ++ } ++ + if (is_dual) + priv->flags |= ALPS_DUALPOINT | + ALPS_DUALPOINT_WITH_PRESSURE; +@@ -2567,7 +2585,7 @@ static int alps_set_defaults_ss4_v2(stru + + alps_update_btn_info_ss4_v2(otp, priv); + +- alps_update_dual_info_ss4_v2(otp, priv); ++ alps_update_dual_info_ss4_v2(otp, priv, psmouse); + + return 0; + } diff --git a/queue-4.9/input-i8042-add-lenovo-thinkpad-l460-to-i8042-reset-list.patch b/queue-4.9/input-i8042-add-lenovo-thinkpad-l460-to-i8042-reset-list.patch new file mode 100644 index 00000000000..007f56a7a0d --- /dev/null +++ b/queue-4.9/input-i8042-add-lenovo-thinkpad-l460-to-i8042-reset-list.patch @@ -0,0 +1,39 @@ +From b56af54ac78c54a519d82813836f305d7f76ef27 Mon Sep 17 00:00:00 2001 +From: Dennis Wassenberg +Date: Thu, 8 Mar 2018 15:32:09 -0800 +Subject: Input: i8042 - add Lenovo ThinkPad L460 to i8042 reset list + +From: Dennis Wassenberg + +commit b56af54ac78c54a519d82813836f305d7f76ef27 upstream. + +Reset i8042 before probing because of insufficient BIOS initialisation of +the i8042 serial controller. This makes Synaptics touchpad detection +possible. Without resetting the Synaptics touchpad is not detected because +there are always NACK messages from AUX port. + +Signed-off-by: Dennis Wassenberg +Cc: stable@vger.kernel.org +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/input/serio/i8042-x86ia64io.h ++++ b/drivers/input/serio/i8042-x86ia64io.h +@@ -693,6 +693,13 @@ static const struct dmi_system_id __init + }, + }, + { ++ /* Lenovo ThinkPad L460 */ ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), ++ DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L460"), ++ }, ++ }, ++ { + /* Clevo P650RS, 650RP6, Sager NP8152-S, and others */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Notebook"), diff --git a/queue-4.9/input-i8042-enable-mux-on-sony-vaio-vgn-cs-series-to-fix-touchpad.patch b/queue-4.9/input-i8042-enable-mux-on-sony-vaio-vgn-cs-series-to-fix-touchpad.patch new file mode 100644 index 00000000000..6be25a1af43 --- /dev/null +++ b/queue-4.9/input-i8042-enable-mux-on-sony-vaio-vgn-cs-series-to-fix-touchpad.patch @@ -0,0 +1,71 @@ +From 04bb1719c4de94700056241d4c0fe3c1413f5aff Mon Sep 17 00:00:00 2001 +From: Ondrej Zary +Date: Tue, 3 Apr 2018 10:24:34 -0700 +Subject: Input: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad + +From: Ondrej Zary + +commit 04bb1719c4de94700056241d4c0fe3c1413f5aff upstream. + +The touch sensor buttons on Sony VAIO VGN-CS series laptops (e.g. +VGN-CS31S) are a separate PS/2 device. As the MUX is disabled for all +VAIO machines by the nomux blacklist, the data from touch sensor +buttons and touchpad are combined. The protocol used by the buttons is +probably similar to the touchpad protocol (both are Synaptics) so both +devices get enabled. The controller combines the data, creating a mess +which results in random button clicks, touchpad stopping working and +lost sync error messages: +psmouse serio1: TouchPad at isa0060/serio1/input0 lost sync at byte 4 +psmouse serio1: TouchPad at isa0060/serio1/input0 lost sync at byte 1 +psmouse serio1: TouchPad at isa0060/serio1/input0 lost sync at byte 1 +psmouse serio1: TouchPad at isa0060/serio1/input0 lost sync at byte 1 +psmouse serio1: TouchPad at isa0060/serio1/input0 lost sync at byte 1 +psmouse serio1: issuing reconnect request + +Add a new i8042_dmi_forcemux_table whitelist with VGN-CS. +With MUX enabled, touch sensor buttons are detected as separate device +(and left disabled as there's currently no driver), fixing all touchpad +problems. + +Signed-off-by: Ondrej Zary +Cc: stable@vger.kernel.org +Signed-off-by: Dmitry Torokhov +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/input/serio/i8042-x86ia64io.h | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +--- a/drivers/input/serio/i8042-x86ia64io.h ++++ b/drivers/input/serio/i8042-x86ia64io.h +@@ -530,6 +530,20 @@ static const struct dmi_system_id __init + { } + }; + ++static const struct dmi_system_id i8042_dmi_forcemux_table[] __initconst = { ++ { ++ /* ++ * Sony Vaio VGN-CS series require MUX or the touch sensor ++ * buttons will disturb touchpad operation ++ */ ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "VGN-CS"), ++ }, ++ }, ++ { } ++}; ++ + /* + * On some Asus laptops, just running self tests cause problems. + */ +@@ -1230,6 +1244,9 @@ static int __init i8042_platform_init(vo + if (dmi_check_system(i8042_dmi_nomux_table)) + i8042_nomux = true; + ++ if (dmi_check_system(i8042_dmi_forcemux_table)) ++ i8042_nomux = false; ++ + if (dmi_check_system(i8042_dmi_notimeout_table)) + i8042_notimeout = true; + diff --git a/queue-4.9/md-raid10-reset-the-first-at-the-end-of-loop.patch b/queue-4.9/md-raid10-reset-the-first-at-the-end-of-loop.patch new file mode 100644 index 00000000000..ea8f2795359 --- /dev/null +++ b/queue-4.9/md-raid10-reset-the-first-at-the-end-of-loop.patch @@ -0,0 +1,38 @@ +From 6f287ca6046edd34ed83aafb7f9033c9c2e809e2 Mon Sep 17 00:00:00 2001 +From: Guoqing Jiang +Date: Thu, 6 Apr 2017 09:12:18 +0800 +Subject: md/raid10: reset the 'first' at the end of loop + +From: Guoqing Jiang + +commit 6f287ca6046edd34ed83aafb7f9033c9c2e809e2 upstream. + +We need to set "first = 0' at the end of rdev_for_each +loop, so we can get the array's min_offset_diff correctly +otherwise min_offset_diff just means the last rdev's +offset diff. + +[only the first chunk, due to b506335e5d2b ("md/raid10: skip spare disk as +'first' disk") being already applied - gregkh] + +Suggested-by: NeilBrown +Signed-off-by: Guoqing Jiang +Reviewed-by: NeilBrown +Signed-off-by: Shaohua Li +Cc: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/md/raid10.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/md/raid10.c ++++ b/drivers/md/raid10.c +@@ -3681,6 +3681,7 @@ static int raid10_run(struct mddev *mdde + + if (blk_queue_discard(bdev_get_queue(rdev->bdev))) + discard_supported = true; ++ first = 0; + } + + if (mddev->queue) { diff --git a/queue-4.9/net-hns-fix-ethtool-private-flags.patch b/queue-4.9/net-hns-fix-ethtool-private-flags.patch new file mode 100644 index 00000000000..4e410ab9d8c --- /dev/null +++ b/queue-4.9/net-hns-fix-ethtool-private-flags.patch @@ -0,0 +1,74 @@ +From d61d263c8d82db7c4404a29ebc29674b1c0c05c9 Mon Sep 17 00:00:00 2001 +From: Matthias Brugger +Date: Thu, 15 Mar 2018 17:54:20 +0100 +Subject: net: hns: Fix ethtool private flags + +From: Matthias Brugger + +commit d61d263c8d82db7c4404a29ebc29674b1c0c05c9 upstream. + +The driver implementation returns support for private flags, while +no private flags are present. When asked for the number of private +flags it returns the number of statistic flag names. + +Fix this by returning EOPNOTSUPP for not implemented ethtool flags. + +Signed-off-by: Matthias Brugger +Signed-off-by: David S. Miller +Cc: Ben Hutchings +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 +++- + 4 files changed, 6 insertions(+), 4 deletions(-) + +--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c ++++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c +@@ -671,7 +671,7 @@ static void hns_gmac_get_strings(u32 str + + static int hns_gmac_get_sset_count(int stringset) + { +- if (stringset == ETH_SS_STATS || stringset == ETH_SS_PRIV_FLAGS) ++ if (stringset == ETH_SS_STATS) + return ARRAY_SIZE(g_gmac_stats_string); + + return 0; +--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c ++++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c +@@ -422,7 +422,7 @@ void hns_ppe_update_stats(struct hns_ppe + + int hns_ppe_get_sset_count(int stringset) + { +- if (stringset == ETH_SS_STATS || stringset == ETH_SS_PRIV_FLAGS) ++ if (stringset == ETH_SS_STATS) + return ETH_PPE_STATIC_NUM; + return 0; + } +--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c ++++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c +@@ -798,7 +798,7 @@ void hns_rcb_get_stats(struct hnae_queue + */ + int hns_rcb_get_ring_sset_count(int stringset) + { +- if (stringset == ETH_SS_STATS || stringset == ETH_SS_PRIV_FLAGS) ++ if (stringset == ETH_SS_STATS) + return HNS_RING_STATIC_REG_NUM; + + return 0; +--- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c ++++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c +@@ -1017,8 +1017,10 @@ int hns_get_sset_count(struct net_device + cnt--; + + return cnt; +- } else { ++ } else if (stringset == ETH_SS_STATS) { + return (HNS_NET_STATS_CNT + ops->get_sset_count(h, stringset)); ++ } else { ++ return -EOPNOTSUPP; + } + } + diff --git a/queue-4.9/series b/queue-4.9/series index 6bf1c834d9d..7d1dbcfafa2 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -82,3 +82,15 @@ media-usbtv-prevent-double-free-in-error-case.patch parport_pc-add-support-for-wch-ch382l-pci-e-single-parallel-port-card.patch crypto-ahash-fix-early-termination-in-hash-walk.patch crypto-x86-cast5-avx-fix-ecb-encryption-when-long-sg-follows-short-one.patch +staging-comedi-ni_mio_common-ack-ai-fifo-error-interrupts.patch +input-alps-fix-trackstick-detection-on-thinkpad-l570-and-latitude-7370.patch +input-i8042-add-lenovo-thinkpad-l460-to-i8042-reset-list.patch +input-i8042-enable-mux-on-sony-vaio-vgn-cs-series-to-fix-touchpad.patch +vt-change-sgr-21-to-follow-the-standards.patch +documentation-pinctrl-palmas-add-ti-palmas-powerhold-override-property-definition.patch +arm-dts-dra7-add-power-hold-and-power-controller-properties-to-palmas.patch +arm-dts-am57xx-beagle-x15-common-add-overide-powerhold-property.patch +arm-dts-am57xx-idk-common-add-overide-powerhold-property.patch +md-raid10-reset-the-first-at-the-end-of-loop.patch +net-hns-fix-ethtool-private-flags.patch +fix-slab-name-biovec-1-21-12.patch diff --git a/queue-4.9/staging-comedi-ni_mio_common-ack-ai-fifo-error-interrupts.patch b/queue-4.9/staging-comedi-ni_mio_common-ack-ai-fifo-error-interrupts.patch new file mode 100644 index 00000000000..fba245043e0 --- /dev/null +++ b/queue-4.9/staging-comedi-ni_mio_common-ack-ai-fifo-error-interrupts.patch @@ -0,0 +1,33 @@ +From e1d9fc04c41840a4688ef6ce90b6dcca157ea4d7 Mon Sep 17 00:00:00 2001 +From: Frank Mori Hess +Date: Thu, 15 Mar 2018 10:25:44 +0000 +Subject: staging: comedi: ni_mio_common: ack ai fifo error interrupts. + +From: Frank Mori Hess + +commit e1d9fc04c41840a4688ef6ce90b6dcca157ea4d7 upstream. + +Ack ai fifo error interrupts in interrupt handler to clear interrupt +after fifo overflow. It should prevent lock-ups after the ai fifo +overflows. + +Cc: # v4.2+ +Signed-off-by: Frank Mori Hess +Signed-off-by: Ian Abbott +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/staging/comedi/drivers/ni_mio_common.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/staging/comedi/drivers/ni_mio_common.c ++++ b/drivers/staging/comedi/drivers/ni_mio_common.c +@@ -1284,6 +1284,8 @@ static void ack_a_interrupt(struct comed + ack |= NISTC_INTA_ACK_AI_START; + if (a_status & NISTC_AI_STATUS1_STOP) + ack |= NISTC_INTA_ACK_AI_STOP; ++ if (a_status & NISTC_AI_STATUS1_OVER) ++ ack |= NISTC_INTA_ACK_AI_ERR; + if (ack) + ni_stc_writew(dev, ack, NISTC_INTA_ACK_REG); + } diff --git a/queue-4.9/vt-change-sgr-21-to-follow-the-standards.patch b/queue-4.9/vt-change-sgr-21-to-follow-the-standards.patch new file mode 100644 index 00000000000..21b5be91506 --- /dev/null +++ b/queue-4.9/vt-change-sgr-21-to-follow-the-standards.patch @@ -0,0 +1,65 @@ +From 65d9982d7e523a1a8e7c9af012da0d166f72fc56 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Mon, 29 Jan 2018 17:08:21 -0500 +Subject: vt: change SGR 21 to follow the standards + +From: Mike Frysinger + +commit 65d9982d7e523a1a8e7c9af012da0d166f72fc56 upstream. + +ECMA-48 [1] (aka ISO 6429) has defined SGR 21 as "doubly underlined" +since at least March 1984. The Linux kernel has treated it as SGR 22 +"normal intensity" since it was added in Linux-0.96b in June 1992. +Before that, it was simply ignored. Other terminal emulators have +either ignored it, or treat it as double underline now. xterm for +example added support in its 304 release (May 2014) [2] where it was +previously ignoring it. + +Changing this behavior shouldn't be an issue: +- It isn't a named capability in ncurses's terminfo database, so no + script is using libtinfo/libcurses to look this up, or using tput + to query & output the right sequence. +- Any script assuming SGR 21 will reset intensity in all terminals + already do not work correctly on non-Linux VTs (including running + under screen/tmux/etc...). +- If someone has written a script that only runs in the Linux VT, and + they're using SGR 21 (instead of SGR 22), the output should still + be readable. + +imo it's important to change this as the Linux VT's non-conformance +is sometimes used as an argument for other terminal emulators to not +implement SGR 21 at all, or do so incorrectly. + +[1]: https://www.ecma-international.org/publications/standards/Ecma-048.htm +[2]: https://github.com/ThomasDickey/xterm-snapshots/commit/2fd29cb98d214cb536bcafbee00bc73b3f1eeb9d + +Signed-off-by: Mike Frysinger +Cc: stable +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/tty/vt/vt.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/drivers/tty/vt/vt.c ++++ b/drivers/tty/vt/vt.c +@@ -1354,6 +1354,11 @@ static void csi_m(struct vc_data *vc) + case 3: + vc->vc_italic = 1; + break; ++ case 21: ++ /* ++ * No console drivers support double underline, so ++ * convert it to a single underline. ++ */ + case 4: + vc->vc_underline = 1; + break; +@@ -1389,7 +1394,6 @@ static void csi_m(struct vc_data *vc) + vc->vc_disp_ctrl = 1; + vc->vc_toggle_meta = 1; + break; +- case 21: + case 22: + vc->vc_intensity = 1; + break;