conf.listen_interval can sometimes be zero causing wake_up_count
to wrap around up to many beacons too late causing
CTRL-EVENT-BEACON-LOSS as in.
wpa_supplicant[795]: message repeated 45 times: [..CTRL-EVENT-BEACON-LOSS ]
Fixes: 43c93d9bf5e2 ("staging: vt6656: implement power saving code.")
Cc: stable <stable(a)vger.kernel.org>
Signed-off-by: Malcolm Priestley <tvboxspy(a)gmail.com>
---
drivers/staging/vt6656/usbpipe.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
index eae211e5860f..91b62c3dff7b 100644
--- a/drivers/staging/vt6656/usbpipe.c
+++ b/drivers/staging/vt6656/usbpipe.c
@@ -207,7 +207,8 @@ static void vnt_int_process_data(struct vnt_private *priv)
priv->wake_up_count =
priv->hw->conf.listen_interval;
- --priv->wake_up_count;
+ if (priv->wake_up_count)
+ --priv->wake_up_count;
/* Turn on wake up to listen next beacon */
if (priv->wake_up_count == 1)
--
2.25.1
From: Chris Wilson <ickle(a)x201s.alporthouse.com>
After changing the timing between GTT updates and execution on the GPU,
we started seeing sporadic failures on Ironlake. These were narrowed
down to being an insufficiently strong enough barrier/delay after
updating the GTT and scheduling execution on the GPU. By forcing the
uncached read, and adding the missing barrier for the singular
insert_page (relocation paths), the sporadic failures go away.
Fixes: 983d308cb8f6 ("agp/intel: Serialise after GTT updates")
Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk>
Cc: stable(a)vger.kernel.org # v4.0+
---
drivers/char/agp/intel-gtt.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 66a62d17a3f5..3d42fc4290bc 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -846,6 +846,7 @@ void intel_gtt_insert_page(dma_addr_t addr,
unsigned int flags)
{
intel_private.driver->write_entry(addr, pg, flags);
+ readl(intel_private.gtt + pg);
if (intel_private.driver->chipset_flush)
intel_private.driver->chipset_flush();
}
@@ -871,7 +872,7 @@ void intel_gtt_insert_sg_entries(struct sg_table *st,
j++;
}
}
- wmb();
+ readl(intel_private.gtt + j - 1);
if (intel_private.driver->chipset_flush)
intel_private.driver->chipset_flush();
}
@@ -1105,6 +1106,7 @@ static void i9xx_cleanup(void)
static void i9xx_chipset_flush(void)
{
+ wmb();
if (intel_private.i9xx_flush_page)
writel(1, intel_private.i9xx_flush_page);
}
--
2.20.1
From: Arnd Bergmann <arnd(a)arndb.de>
commit 94a5d8790e79ab78f499d2d9f1ff2cab63849d9f upstream.
Without including psci.h and arm-smccc.h, we now get a build failure in
some configurations:
arch/arm64/kernel/cpu_errata.c: In function 'arm64_update_smccc_conduit':
arch/arm64/kernel/cpu_errata.c:278:10: error: 'psci_ops' undeclared (first use in this function); did you mean 'sysfs_ops'?
arch/arm64/kernel/cpu_errata.c: In function 'arm64_set_ssbd_mitigation':
arch/arm64/kernel/cpu_errata.c:311:3: error: implicit declaration of function 'arm_smccc_1_1_hvc' [-Werror=implicit-function-declaration]
arm_smccc_1_1_hvc(ARM_SMCCC_ARCH_WORKAROUND_2, state, NULL);
Signed-off-by: Arnd Bergmann <arnd(a)arndb.de>
Signed-off-by: Catalin Marinas <catalin.marinas(a)arm.com>
Signed-off-by: Nathan Chancellor <natechancellor(a)gmail.com>
---
Greg and Sasha,
Please apply this to 4.9. The error in the commit message can be
reproduced on 4.9.219 when CONFIG_ARM64_SSBD is enabled and
CONFIG_HARDEN_BRANCH_PREDICTOR is disabled. It was reported to me by a
user of one of my Android stable trees, where one of the configs in
Qualcomm's 4.9 tree reproduced this issue.
This commit is in 4.14 already so this should be the only tree where it
is needed.
arch/arm64/kernel/cpu_errata.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
index 930e74d9fcbd..3b680a32886b 100644
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@ -16,6 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <linux/arm-smccc.h>
+#include <linux/psci.h>
#include <linux/types.h>
#include <asm/cachetype.h>
#include <asm/cpu.h>
base-commit: 5188957a315f664d46ff58fedecbc0f7503f1b22
--
2.26.2
This is the start of the stable review cycle for the 5.6.6 release.
There are 71 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Wed, 22 Apr 2020 12:10:36 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.6.6-rc1.…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.6.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 5.6.6-rc1
Maurizio Lombardi <mlombard(a)redhat.com>
scsi: target: iscsi: calling iscsit_stop_session() inside iscsit_close_session() has no effect
John Allen <john.allen(a)amd.com>
x86/microcode/AMD: Increase microcode PATCH_MAX_SIZE
Reinette Chatre <reinette.chatre(a)intel.com>
x86/resctrl: Fix invalid attempt at removing the default resource group
James Morse <james.morse(a)arm.com>
x86/resctrl: Preserve CDP enable over CPU hotplug
Andrei Vagin <avagin(a)gmail.com>
proc, time/namespace: Show clock symbolic names in /proc/pid/timens_offsets
Grygorii Strashko <grygorii.strashko(a)ti.com>
irqchip/ti-sci-inta: Fix processing of masked irqs
Jan Kara <jack(a)suse.cz>
ext4: do not zeroout extents beyond i_disksize
Paul E. McKenney <paulmck(a)kernel.org>
rcu: Don't acquire lock in NMI handler in rcu_nmi_enter_common()
Ashutosh Dixit <ashutosh.dixit(a)intel.com>
drm/i915/perf: Do not clear pollin for small user read buffers
Ben Skeggs <bskeggs(a)redhat.com>
drm/nouveau/sec2/gv100-: add missing MODULE_FIRMWARE()
Hans de Goede <hdegoede(a)redhat.com>
i2c: designware: platdrv: Remove DPM_FLAG_SMART_SUSPEND flag on BYT and CHT
Prike Liang <Prike.Liang(a)amd.com>
drm/amdgpu: fix the hw hang during perform system reboot and reset
Alex Deucher <alexander.deucher(a)amd.com>
drm/amdgpu/gfx9: add gfxoff quirk
Sergei Lopatin <magist3r(a)gmail.com>
drm/amd/powerplay: force the trim of the mclk dpm_levels if OD is enabled
Maxim Mikityanskiy <maximmi(a)mellanox.com>
net/mlx5e: Use preactivate hook to set the indirection table
Maxim Mikityanskiy <maximmi(a)mellanox.com>
net/mlx5e: Rename hw_modify to preactivate
Maxim Mikityanskiy <maximmi(a)mellanox.com>
net/mlx5e: Encapsulate updating netdev queues into a function
Tuomas Tynkkynen <tuomas.tynkkynen(a)iki.fi>
mac80211_hwsim: Use kstrndup() in place of kasprintf()
Sumit Garg <sumit.garg(a)linaro.org>
mac80211: fix race in ieee80211_register_hw()
Johannes Berg <johannes.berg(a)intel.com>
nl80211: fix NL80211_ATTR_FTM_RESPONDER policy
Josef Bacik <josef(a)toxicpanda.com>
btrfs: check commit root generation in should_ignore_root
Xiao Yang <yangx.jy(a)cn.fujitsu.com>
tracing: Fix the race between registering 'snapshot' event trigger and triggering 'snapshot' operation
Vasily Averin <vvs(a)virtuozzo.com>
keys: Fix proc_keys_next to increase position index
Mark Rutland <mark.rutland(a)arm.com>
arm64: vdso: don't free unallocated pages
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Check mapping at creating connector controls, too
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Don't create jack controls for PCM terminals
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Don't override ignore_ctl_error value from the map
Takashi Iwai <tiwai(a)suse.de>
ALSA: usb-audio: Filter error from connector kctl ops, too
Adam Barber <barberadam995(a)gmail.com>
ALSA: hda/realtek - Enable the headset mic on Asus FX505DT
Takashi Iwai <tiwai(a)suse.de>
ALSA: hda: Allow setting preallocation again for x86
Colin Ian King <colin.king(a)canonical.com>
ASoC: Intel: mrfld: return error codes when an error occurs
Colin Ian King <colin.king(a)canonical.com>
ASoC: Intel: mrfld: fix incorrect check on p->sink
Thinh Nguyen <Thinh.Nguyen(a)synopsys.com>
usb: dwc3: gadget: Don't clear flags before transfer ended
Angus Ainslie (Purism) <angus(a)akkea.ca>
arm64: dts: librem5-devkit: add a vbus supply to usb0
Oleksandr Suvorov <oleksandr.suvorov(a)toradex.com>
ARM: dts: imx7-colibri: fix muxing of usbc_det pin
Claudiu Beznea <claudiu.beznea(a)microchip.com>
clk: at91: usb: use proper usbs_mask
Claudiu Beznea <claudiu.beznea(a)microchip.com>
clk: at91: sam9x60: fix usb clock parents
Hans de Goede <hdegoede(a)redhat.com>
HID: lg-g15: Do not fail the probe when we fail to disable F# emulation
Josh Triplett <josh(a)joshtriplett.org>
ext4: fix incorrect inodes per group in error message
Josh Triplett <josh(a)joshtriplett.org>
ext4: fix incorrect group count in ext4_fill_super error message
Bruno Meneguele <bmeneg(a)redhat.com>
net/bpfilter: remove superfluous testing message
Jose Abreu <Jose.Abreu(a)synopsys.com>
net: stmmac: xgmac: Fix VLAN register handling
Sven Van Asbroeck <TheSven73(a)gmail.com>
pwm: pca9685: Fix PWM/GPIO inter-operation
Jin Yao <yao.jin(a)linux.intel.com>
perf report: Fix no branch type statistics report issue
Dan Carpenter <dan.carpenter(a)oracle.com>
acpi/nfit: improve bounds checking for 'func'
zhangyi (F) <yi.zhang(a)huawei.com>
jbd2: improve comments about freeing data buffers whose page mapping is NULL
Pi-Hsun Shih <pihsun(a)chromium.org>
platform/chrome: cros_ec_rpmsg: Fix race with host event
Can Guo <cang(a)codeaurora.org>
scsi: ufs: Fix ufshcd_hold() caused scheduling while atomic
Amir Goldstein <amir73il(a)gmail.com>
ovl: fix value of i_ino for lower hardlink corner case
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Revert "ACPI: EC: Do not clear boot_ec_is_ecdt in acpi_ec_add()"
Clemens Gruber <clemens.gruber(a)pqgruber.com>
net: phy: marvell: Fix pause frame negotiation
Florian Fainelli <f.fainelli(a)gmail.com>
net: stmmac: dwmac-sunxi: Provide TX and RX fifo sizes
Vladimir Oltean <vladimir.oltean(a)nxp.com>
net: mscc: ocelot: fix untagged packet drops when enslaving to vlan aware bridge
Tim Stallard <code(a)timstallard.me.uk>
net: icmp6: do not select saddr from iif when route has prefsrc set
Parav Pandit <parav(a)mellanox.com>
net/mlx5e: Fix pfnum in devlink port attribute
Dmytro Linkin <dmitrolin(a)mellanox.com>
net/mlx5e: Fix nest_level for vlan pop action
Eran Ben Elisha <eranbe(a)mellanox.com>
net/mlx5e: Add missing release firmware call
Moshe Shemesh <moshe(a)mellanox.com>
net/mlx5: Fix frequent ioread PCI access during recovery
René van Dorst <opensource(a)vdorst.com>
net: ethernet: mediatek: move mt7623 settings out off the mt7530
René van Dorst <opensource(a)vdorst.com>
net: dsa: mt7530: move mt7623 settings out off the mt7530
Gilberto Bertin <me(a)jibi.io>
net: tun: record RX queue in skb before do_xdp_generic()
Konstantin Khlebnikov <khlebnikov(a)yandex-team.ru>
net: revert default NAPI poll timeout to 2 jiffies
Wang Wenhu <wenhu.wang(a)vivo.com>
net: qrtr: send msgs from local of same id as broadcast
Atsushi Nemoto <atsushi.nemoto(a)sord.co.jp>
net: phy: micrel: use genphy_read_status for KSZ9131
Taehee Yoo <ap420073(a)gmail.com>
net: macsec: fix using wrong structure in macsec_changelink()
Tim Stallard <code(a)timstallard.me.uk>
net: ipv6: do not consider routes via gateways for anycast address check
Taras Chornyi <taras.chornyi(a)plvision.eu>
net: ipv4: devinet: Fix crash when add/del multicast IP with autojoin
DENG Qingfang <dqfext(a)gmail.com>
net: dsa: mt7530: fix tagged frames pass-through in VLAN-unaware mode
Michael Weiß <michael.weiss(a)aisec.fraunhofer.de>
l2tp: Allow management of tunnels and session in user namespace
Taehee Yoo <ap420073(a)gmail.com>
hsr: check protocol version in hsr_newlink()
Sebastian Andrzej Siewior <bigeasy(a)linutronix.de>
amd-xgbe: Use __napi_schedule() in BH context
-------------
Diffstat:
Makefile | 4 +-
arch/arm/boot/dts/imx7-colibri.dtsi | 9 +-
.../boot/dts/freescale/imx8mq-librem5-devkit.dts | 1 +
arch/arm64/kernel/vdso.c | 13 +--
arch/x86/include/asm/microcode_amd.h | 2 +-
arch/x86/kernel/cpu/resctrl/core.c | 2 +
arch/x86/kernel/cpu/resctrl/internal.h | 1 +
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 16 +++-
drivers/acpi/ec.c | 6 +-
drivers/acpi/nfit/core.c | 10 +-
drivers/acpi/nfit/nfit.h | 1 +
drivers/clk/at91/clk-usb.c | 2 +-
drivers/clk/at91/sam9x60.c | 5 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 5 +-
drivers/gpu/drm/i915/i915_perf.c | 65 +++----------
drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp108.c | 3 +
drivers/gpu/drm/nouveau/nvkm/engine/sec2/tu102.c | 16 ++++
drivers/hid/hid-lg-g15.c | 6 +-
drivers/i2c/busses/i2c-designware-platdrv.c | 14 ++-
drivers/irqchip/irq-ti-sci-inta.c | 3 +-
drivers/net/dsa/mt7530.c | 103 +++------------------
drivers/net/dsa/mt7530.h | 17 ++--
drivers/net/dsa/ocelot/felix.c | 5 +-
drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 +-
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 24 ++++-
drivers/net/ethernet/mediatek/mtk_eth_soc.h | 8 ++
drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 5 +-
drivers/net/ethernet/mellanox/mlx5/core/en.h | 7 +-
.../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 10 +-
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 49 +++++++---
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 9 +-
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 5 +-
drivers/net/ethernet/mellanox/mlx5/core/health.c | 2 +-
drivers/net/ethernet/mscc/ocelot.c | 84 +++++++++--------
drivers/net/ethernet/mscc/ocelot.h | 2 -
drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 2 +
.../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 11 +++
drivers/net/macsec.c | 2 +-
drivers/net/phy/marvell.c | 46 ++++-----
drivers/net/phy/micrel.c | 2 +-
drivers/net/tun.c | 3 +-
drivers/net/wireless/mac80211_hwsim.c | 12 +--
drivers/platform/chrome/cros_ec_rpmsg.c | 16 +++-
drivers/pwm/pwm-pca9685.c | 85 +++++++++--------
drivers/scsi/ufs/ufshcd.c | 5 +
drivers/target/iscsi/iscsi_target.c | 3 +-
drivers/usb/dwc3/gadget.c | 4 +-
fs/btrfs/relocation.c | 4 +-
fs/ext4/extents.c | 8 +-
fs/ext4/super.c | 6 +-
fs/jbd2/commit.c | 7 +-
fs/overlayfs/inode.c | 4 +-
fs/proc/base.c | 14 ++-
include/net/ip6_route.h | 1 +
include/soc/mscc/ocelot.h | 4 +-
kernel/rcu/tree.c | 2 +-
kernel/time/namespace.c | 15 ++-
kernel/trace/trace_events_trigger.c | 10 +-
net/bpfilter/main.c | 1 -
net/core/dev.c | 3 +-
net/hsr/hsr_netlink.c | 10 +-
net/ipv4/devinet.c | 13 ++-
net/ipv6/icmp.c | 21 ++++-
net/l2tp/l2tp_netlink.c | 16 ++--
net/mac80211/main.c | 24 ++---
net/qrtr/qrtr.c | 7 +-
net/wireless/nl80211.c | 6 +-
security/keys/proc.c | 2 +
sound/hda/Kconfig | 7 +-
sound/pci/hda/patch_realtek.c | 1 +
sound/soc/intel/atom/sst-atom-controls.c | 2 +-
sound/soc/intel/atom/sst/sst_pci.c | 2 +-
sound/usb/mixer.c | 31 ++++---
sound/usb/mixer_maps.c | 4 +-
tools/perf/builtin-report.c | 9 +-
77 files changed, 513 insertions(+), 432 deletions(-)