Linux 4.19.12
Greg KH
maintainerI'm announcing the release of the 4.19.12 kernel.
All users of the 4.19 kernel series must upgrade.
The updated 4.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.19.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arc/include/asm/io.h | 72 ++ arch/arm/mm/cache-v7.S | 8 arch/arm/mm/cache-v7m.S | 14 arch/arm/mm/dma-mapping.c | 2 arch/x86/include/asm/qspinlock.h | 21 arch/x86/platform/efi/early_printk.c | 2 drivers/acpi/nfit/core.c | 2 drivers/ata/libata-core.c | 1 drivers/clk/mmp/clk.c | 2 drivers/clk/mvebu/cp110-system-controller.c | 4 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 3 drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 2 drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 3 drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 2 drivers/gpu/drm/ast/ast_fb.c | 1 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 1 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 2 drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 4 drivers/gpu/drm/msm/hdmi/hdmi.c | 6 drivers/gpu/drm/msm/hdmi/hdmi.h | 1 drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 10 drivers/gpu/drm/msm/msm_atomic.c | 5 drivers/gpu/drm/msm/msm_debugfs.c | 15 drivers/gpu/drm/msm/msm_gpu.c | 9 drivers/gpu/drm/msm/msm_iommu.c | 2 drivers/gpu/drm/msm/msm_rd.c | 5 drivers/gpu/drm/ttm/ttm_bo_util.c | 4 drivers/hid/hid-hyperv.c | 2 drivers/i2c/busses/i2c-axxia.c | 40 - drivers/i2c/busses/i2c-rcar.c | 9 drivers/i2c/busses/i2c-scmi.c | 10 drivers/i2c/busses/i2c-uniphier-f.c | 19 drivers/i2c/busses/i2c-uniphier.c | 8 drivers/ide/pmac.c | 1 drivers/infiniband/hw/hfi1/user_sdma.c | 24 drivers/infiniband/hw/hfi1/user_sdma.h | 9 drivers/input/keyboard/omap4-keypad.c | 18 drivers/input/mouse/synaptics.c | 1 drivers/input/serio/hyperv-keyboard.c | 2 drivers/net/bonding/bond_3ad.c | 3 drivers/net/dsa/mv88e6060.c | 10 drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 2 drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 4 drivers/net/ethernet/freescale/fman/fman.c | 5 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 34 + drivers/net/ethernet/mellanox/mlx4/Kconfig | 2 drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 10 drivers/net/ethernet/socionext/sni_ave.c | 14 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 23 drivers/net/macvlan.c | 7 drivers/net/wireless/mac80211_hwsim.c | 12 drivers/nvme/host/core.c | 10 drivers/nvme/target/rdma.c | 3 drivers/sbus/char/display7seg.c | 1 drivers/sbus/char/envctrl.c | 2 drivers/scsi/libiscsi.c | 4 drivers/scsi/vmw_pvscsi.c | 4 drivers/thermal/armada_thermal.c | 2 drivers/tty/serial/suncore.c | 1 drivers/vhost/vsock.c | 22 fs/btrfs/disk-io.c | 51 - fs/cifs/Kconfig | 2 fs/nfs/direct.c | 9 kernel/bpf/verifier.c | 3 kernel/locking/qspinlock.c | 71 +- net/sunrpc/xprt.c | 11 tools/testing/nvdimm/test/nfit.c | 35 + tools/testing/selftests/bpf/test_btf.c | 375 +++++++++++- tools/testing/selftests/bpf/test_verifier.c | 2 71 files changed, 867 insertions(+), 221 deletions(-)
Abhinav Kumar (1):
drm/msm/dsi: configure VCO rate for 10nm PLL driver
Adamski, Krzysztof (Nokia - PL/Wroclaw) (1):
i2c: axxia: properly handle master timeout
Alexei Starovoitov (1):
bpf: check pending signals while verifying programs
Alexey Khoroshilov (1):
mac80211_hwsim: fix module init error paths for netlink
Anderson Luiz Alves (1):
mv88e6060: disable hardware level MAC learning
Baruch Siach (2):
net: mvpp2: fix detection of 10G SFP modules
net: mvpp2: fix phylink handling of invalid PHY modes
Cathy Avery (1):
scsi: vmw_pscsi: Rearrange code to avoid multiple calls to free_irq during unload
Chris Cole (1):
ARM: 8814/1: mm: improve/fix ARM v7_dma_inv_range() unaligned address handling
Christian König (2):
drm/ttm: fix LRU handling in ttm_buffer_object_transfer drm/amdgpu: wait for IB test on first device open
Dan Carpenter (3):
drm/msm/gpu: Fix a couple memory leaks in debugfs
clk: mvebu: Off by one bugs in cp110_of_clk_get()
clk: mmp: Off by one in mmp_clk_add()
Dan Williams (2):
tools/testing/nvdimm: Align test resources to 128M
acpi/nfit: Fix user-initiated ARS to be "ARS-long" rather than "ARS-short"
Dave Kleikamp (1):
nfs: don't dirty kernel pages read by direct-io
David Miller (1):
bpf: Fix verifier log string check for bad alignment.
Dmitry Bogdanov (1):
net: aquantia: fix rx checksum offload bits
Evan Quan (1):
drm/amd/powerplay: issue pre-display settings for display change event
Fred Herard (1):
scsi: libiscsi: Fix NULL pointer dereference in iscsi_eh_session_reset
Greg Kroah-Hartman (1):
Linux 4.19.12
Hans de Goede (1):
i2c: scmi: Fix probe error on devices with an empty SMB0001 ACPI device node
Ido Schimmel (1):
mlxsw: spectrum_switchdev: Fix VLAN device deletion via ioctl
Israel Rukshin (1):
nvmet-rdma: fix response use after free
James Smart (1):
nvme: validate controller state before rescheduling keep alive
James Zhu (1):
drm/amdgpu/vcn: Update vcn.cur_state during suspend
Jose Abreu (1):
ARC: io.h: Implement reads{x}()/writes{x}()Juha-Matti Tilli (1):
libata: whitelist all SAMSUNG MZ7KM* solid-state disks
Kunihiko Hayashi (1):
net: ethernet: ave: Replace NET_IP_ALIGN with AVE_FRAME_HEADROOM
Martin KaFai Lau (1):
tools/bpf: fix two test_btf unit test cases
Masahiro Yamada (2):
i2c: uniphier: fix violation of tLOW requirement for Fast-mode
i2c: uniphier-f: fix violation of tLOW requirement for Fast-mode
Matteo Croce (1):
macvlan: return correct error value
Michael J. Ruhl (1):
IB/hfi1: Remove race conditions in user_sdma send path
Nathan Jones (1):
ARM: 8816/1: dma-mapping: fix potential uninitialized return
Nicolas Saenz Julienne (1):
ethernet: fman: fix wrong of_node_put() in probe function
Omar Sandoval (1):
Btrfs: fix missing delayed iputs on unmount
Pan Bian (1):
liquidio: read sc->iq_no before release sc
Peter Zijlstra (2):
locking/qspinlock: Re-order code locking/qspinlock, x86: Provide liveness guarantee
Rob Clark (1):
drm/msm: fix handling of cmdstream offset
Roman Li (1):
drm/amd/display: Fix 6x4K displays light-up on Vega20 (v2)
Russell King (1):
thermal: armada: fix legacy validity test sense
Saeed Mahameed (1):
net/mlx4_en: Fix build break when CONFIG_INET is off
Sam Bobroff (1):
drm/ast: Fix connector leak during driver unload
Sean Paul (2):
drm/msm: Grab a vblank reference when waiting for commit_done drm/msm: dpu: Don't set legacy plane->crtc pointer
Sharat Masetty (1):
drm/msm: Fix task dump in gpu recovery
Stefan Hajnoczi (1):
vhost/vsock: fix reset orphans race with close timeout
Steve French (1):
cifs: In Kconfig CONFIG_CIFS_POSIX needs depends on legacy (insecure cifs)
Teika Kazura (1):
Input: synaptics - enable SMBus for HP 15-ay000
Thierry Reding (1):
net: stmmac: Move debugfs init/exit to ->probe()/->remove()
Todor Tomov (1):
drm/msm/hdmi: Enable HPD after HDMI IRQ is set up
Toni Peltonen (1):
bonding: fix 802.3ad state sent to partner when unbinding slave
Tony Lindgren (1):
Input: omap-keypad - fix keyboard debounce configuration
Trond Myklebust (1):
SUNRPC: Fix a potential race in xprt_connect()
Vitaly Kuznetsov (1):
Input: hyper-v - fix wakeup from suspend-to-idle
Vladimir Murzin (1):
ARM: 8815/1: V7M: align v7m_dma_inv_range() with v7 counterpart
Wen Yang (1):
drm/msm: Fix error return checking
Wolfram Sang (1):
i2c: rcar: check bus state before reinitializing
Yangtao Li (4):
sbus: char: add of_node_put()
drivers/sbus/char: add of_node_put()
drivers/tty: add missing of_node_put()
ide: pmac: add of_node_put()
YiFei Zhu (1):
x86/earlyprintk/efi: Fix infinite loop on some screen widths
Yonghong Song (1):
tools/bpf: add addition type tests to test_btf
YueHaibing (1):
drm/msm: dpu: Fix "WARNING: invalid free of devm_ allocated data"
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 19 -SUBLEVEL = 11 +SUBLEVEL = 12 EXTRAVERSION = NAME = "People's Front"
arch/arc/include/asm/io.h +72 -0
100 lines not on this page · raw message
arch/arm/mm/cache-v7.S +5 -3
@@ -360,14 +360,16 @@ v7_dma_inv_range: ALT_UP(W(nop)) #endif mcrne p15, 0, r0, c7, c14, 1 @ clean & invalidate D / U line + addne r0, r0, r2 tst r1, r3 bic r1, r1, r3 mcrne p15, 0, r1, c7, c14, 1 @ clean & invalidate D / U line -1: - mcr p15, 0, r0, c7, c6, 1 @ invalidate D / U line - add r0, r0, r2 cmp r0, r1 +1: + mcrlo p15, 0, r0, c7, c6, 1 @ invalidate D / U line + addlo r0, r0, r2 + cmplo r0, r1 blo 1b dsb st ret lr
arch/arm/mm/cache-v7m.S +9 -5
@@ -73,9 +73,11 @@ /* * dcimvac: Invalidate data cache line by MVA to PoC */ -.macro dcimvac, rt, tmp - v7m_cacheop \rt, \tmp, V7M_SCB_DCIMVAC +.irp c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo +.macro dcimvac\c, rt, tmp + v7m_cacheop \rt, \tmp, V7M_SCB_DCIMVAC, \c .endm +.endr /* * dccmvau: Clean data cache line by MVA to PoU
@@ -369,14 +371,16 @@ v7m_dma_inv_range: tst r0, r3 bic r0, r0, r3 dccimvacne r0, r3 + addne r0, r0, r2 subne r3, r2, #1 @ restore r3, corrupted by v7m's dccimvac tst r1, r3 bic r1, r1, r3 dccimvacne r1, r3 -1: - dcimvac r0, r3 - add r0, r0, r2 cmp r0, r1 +1: + dcimvaclo r0, r3 + addlo r0, r0, r2 + cmplo r0, r1 blo 1b dsb st ret lr
arch/arm/mm/dma-mapping.c +1 -1
@@ -830,7 +830,7 @@ static int __arm_dma_mmap(struct device *dev, struct vm_area_struct *vma, void *cpu_addr, dma_addr_t dma_addr, size_t size, unsigned long attrs) { - int ret; + int ret = -ENXIO;unsigned long nr_vma_pages =vma_pages (vma);unsigned long nr_pages =PAGE_ALIGN (size) >>PAGE_SHIFT ;unsigned long pfn =dma_to_pfn (dev, dma_addr);
arch/x86/include/asm/qspinlock.h +21 -0
@@ -6,9 +6,30 @@#include <asm/cpufeature.h> #include <asm-generic/qspinlock_types.h> #include <asm/paravirt.h> +#include <asm/rmwcc.h> #define _Q_PENDING_LOOPS (1 << 9) +#define queued_fetch_set_pending_acquire queued_fetch_set_pending_acquire + +static __always_inline bool __queued_RMW_btsl(struct qspinlock *lock) +{ +GEN_BINARY_RMWcc (LOCK_PREFIX "btsl" , lock->val.counter, +"I" , _Q_PENDING_OFFSET,"%0" , c); +} + +static __always_inline u32 queued_fetch_set_pending_acquire(struct qspinlock *lock) +{ +u32 val =0 ; + +if (__queued_RMW_btsl (lock)) + val |= _Q_PENDING_VAL; + + val |=atomic_read (&lock->val) & ~_Q_PENDING_MASK; + +return val; +} +#ifdef CONFIG_PARAVIRT_SPINLOCKS extern void native_queued_spin_lock_slowpath (struct qspinlock *lock,u32 val);extern void __pv_init_lock_hash (void );
arch/x86/platform/efi/early_printk.c +1 -1
@@ -179,7 +179,7 @@ early_efi_write(struct console *con, const char *str, unsigned int num) num--; } -if (efi_x >= si->lfb_width) { +if (efi_x + font->width > si->lfb_width) { efi_x =0 ; efi_y += font->height; }
drivers/acpi/nfit/core.c +1 -1
@@ -1303,7 +1303,7 @@ static ssize_t scrub_store(struct device *dev,if (nd_desc) {struct acpi_nfit_desc *acpi_desc =to_acpi_desc (nd_desc); - rc =acpi_nfit_ars_rescan (acpi_desc,0 ); + rc =acpi_nfit_ars_rescan (acpi_desc,ARS_REQ_LONG ); }device_unlock (dev);if (rc)
drivers/ata/libata-core.c +1 -0
@@ -4602,6 +4602,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "SSD*INTEL*", NULL, ATA_HORKAGE_ZERO_AFTER_TRIM, }, { "Samsung*SSD*", NULL, ATA_HORKAGE_ZERO_AFTER_TRIM, }, { "SAMSUNG*SSD*", NULL, ATA_HORKAGE_ZERO_AFTER_TRIM, }, + { "SAMSUNG*MZ7KM*", NULL, ATA_HORKAGE_ZERO_AFTER_TRIM, }, { "ST[1248][0248]0[FH]*", NULL, ATA_HORKAGE_ZERO_AFTER_TRIM, },/*
drivers/clk/mmp/clk.c +1 -1
@@ -183,7 +183,7 @@ void mmp_clk_add(struct mmp_clk_unit *unit, unsigned int id,pr_err ("CLK %d has invalid pointer %p\n" , id, clk);return ; } -if (id > unit->nr_clks) { +if (id >= unit->nr_clks) {pr_err ("CLK %d is invalid\n" , id);return ; }
drivers/clk/mvebu/cp110-system-controller.c +2 -2
@@ -202,11 +202,11 @@ static struct clk_hw *cp110_of_clk_get(struct of_phandle_args *clkspec,unsigned int idx = clkspec->args[1 ];if (type ==CP110_CLK_TYPE_CORE ) { -if (idx >CP110_MAX_CORE_CLOCKS ) +if (idx >=CP110_MAX_CORE_CLOCKS )return ERR_PTR (-EINVAL );return clk_data->hws[idx]; }else if (type ==CP110_CLK_TYPE_GATABLE ) { -if (idx >CP110_MAX_GATABLE_CLOCKS ) +if (idx >=CP110_MAX_GATABLE_CLOCKS )return ERR_PTR (-EINVAL );return clk_data->hws[CP110_MAX_CORE_CLOCKS + idx]; }
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +3 -3
@@ -292,9 +292,6 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_fileif (!info->return_size || !info->return_pointer)return -EINVAL ; -/* Ensure IB tests are run on ring */ -flush_delayed_work (&adev->late_init_work); -switch (info->query) {case AMDGPU_INFO_ACCEL_WORKING : ui32 = adev->accel_working;
@@ -861,6 +858,9 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)struct amdgpu_fpriv *fpriv;int r, pasid; +/* Ensure IB tests are run on ring */ +flush_delayed_work (&adev->late_init_work); + file_priv->driver_priv =NULL ; r =pm_runtime_get_sync (dev->dev);
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +2 -1
@@ -43,6 +43,7 @@ static void vcn_v1_0_set_enc_ring_funcs(struct amdgpu_device *adev);static void vcn_v1_0_set_jpeg_ring_funcs (struct amdgpu_device *adev);static void vcn_v1_0_set_irq_funcs (struct amdgpu_device *adev);static void vcn_v1_0_jpeg_ring_set_patch_ring (struct amdgpu_ring *ring,uint32_t ptr); +static int vcn_v1_0_set_powergating_state (void *handle,enum amd_powergating_state state);/** * vcn_v1_0_early_init - set function pointers
@@ -216,7 +217,7 @@ static int vcn_v1_0_hw_fini(void *handle)struct amdgpu_ring *ring = &adev->vcn.ring_dec;if (RREG32_SOC15 (VCN ,0 , mmUVD_STATUS)) -vcn_v1_0_stop (adev); +vcn_v1_0_set_powergating_state (adev,AMD_PG_STATE_GATE ); ring->ready = false;
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +2 -0
@@ -2530,6 +2530,8 @@ static void pplib_apply_display_requirements( dc, context->bw.dce.sclk_khz); + pp_display_cfg->min_dcfclock_khz = pp_display_cfg->min_engine_clock_khz; + pp_display_cfg->min_engine_clock_deep_sleep_khz = context->bw.dce.sclk_deep_sleep_khz;
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +3 -0
@@ -365,6 +365,9 @@ int hwmgr_handle_task(struct pp_hwmgr *hwmgr, enum amd_pp_task task_id,switch (task_id) {case AMD_PP_TASK_DISPLAY_CONFIG_CHANGE : + ret =phm_pre_display_configuration_changed (hwmgr); +if (ret) +return ret; ret =phm_set_cpu_power_state (hwmgr);if (ret)return ret;
drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c +0 -2
@@ -265,8 +265,6 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip,if (skip)return 0 ; -phm_pre_display_configuration_changed (hwmgr); -phm_display_configuration_changed (hwmgr);if (hwmgr->ps)
drivers/gpu/drm/ast/ast_fb.c +1 -0
@@ -263,6 +263,7 @@ static void ast_fbdev_destroy(struct drm_device *dev, {struct ast_framebuffer *afb = &afbdev->afb; +drm_crtc_force_disable_all (dev);drm_fb_helper_unregister_fbi (&afbdev->helper);if (afb->obj) {
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -1
@@ -2122,7 +2122,6 @@ struct drm_crtc *dpu_crtc_init(struct drm_device *dev, struct drm_plane *plane) NULL);drm_crtc_helper_add (crtc, &dpu_crtc_helper_funcs); - plane->crtc = crtc;/* save user friendly CRTC name for later */ snprintf (dpu_crtc->name,DPU_CRTC_NAME_SIZE ,"crtc%u" , crtc->base.id);
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +0 -2
@@ -503,8 +503,6 @@ static void dpu_encoder_destroy(struct drm_encoder *drm_enc)drm_encoder_cleanup (drm_enc);mutex_destroy (&dpu_enc->enc_lock); - -kfree (dpu_enc); } void dpu_encoder_helper_split_config(
drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c +3 -1
@@ -39,6 +39,8 @@#define DSI_PIXEL_PLL_CLK 1#define NUM_PROVIDED_CLKS 2 +#define VCO_REF_CLK_RATE 19200000 +struct dsi_pll_regs {u32 pll_prop_gain_rate;u32 pll_lockdet_rate;
@@ -316,7 +318,7 @@ static int dsi_pll_10nm_vco_set_rate(struct clk_hw *hw, unsigned long rate, parent_rate); pll_10nm->vco_current_rate = rate; - pll_10nm->vco_ref_clk_rate = parent_rate; + pll_10nm->vco_ref_clk_rate =VCO_REF_CLK_RATE ;dsi_pll_setup_config (pll_10nm);
drivers/gpu/drm/msm/hdmi/hdmi.c +6 -0
@@ -332,6 +332,12 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi, goto fail; } + ret =msm_hdmi_hpd_enable (hdmi->connector); +if (ret <0 ) { +DRM_DEV_ERROR (&hdmi->pdev->dev,"failed to enable HPD: %d\n" , ret); + goto fail; + } + encoder->bridge = hdmi->bridge; priv->bridges[priv->num_bridges++] = hdmi->bridge;
drivers/gpu/drm/msm/hdmi/hdmi.h +1 -0
@@ -245,6 +245,7 @@ void msm_hdmi_bridge_destroy(struct drm_bridge *bridge);void msm_hdmi_connector_irq (struct drm_connector *connector);struct drm_connector *msm_hdmi_connector_init (struct hdmi *hdmi); +int msm_hdmi_hpd_enable (struct drm_connector *connector);/* * i2c adapter for ddc:
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +2 -8
@@ -167,8 +167,9 @@ static void enable_hpd_clocks(struct hdmi *hdmi, bool enable) } } -static int hpd_enable (struct hdmi_connector *hdmi_connector) +int msm_hdmi_hpd_enable (struct drm_connector *connector) { +struct hdmi_connector *hdmi_connector =to_hdmi_connector (connector);struct hdmi *hdmi = hdmi_connector->hdmi;const struct hdmi_platform_config *config = hdmi->config;struct device *dev = &hdmi->pdev->dev;
@@ -450,7 +451,6 @@ struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi) {struct drm_connector *connector =NULL ;struct hdmi_connector *hdmi_connector; -int ret; hdmi_connector =kzalloc (sizeof (*hdmi_connector),GFP_KERNEL );if (!hdmi_connector)
@@ -471,12 +471,6 @@ struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi) connector->interlace_allowed =0 ; connector->doublescan_allowed =0 ; - ret =hpd_enable (hdmi_connector); -if (ret) { -dev_err (&hdmi->pdev->dev,"failed to enable HPD: %d\n" , ret); -return ERR_PTR (ret); - } -drm_connector_attach_encoder (connector, hdmi->encoder);return connector;
drivers/gpu/drm/msm/msm_atomic.c +5 -0
@@ -32,7 +32,12 @@ static void msm_atomic_wait_for_commit_done(struct drm_device *dev,if (!new_crtc_state->active)continue ; +if (drm_crtc_vblank_get (crtc)) +continue ; + kms->funcs->wait_for_crtc_commit_done (kms, crtc); + +drm_crtc_vblank_put (crtc); } }
drivers/gpu/drm/msm/msm_debugfs.c +11 -4
@@ -84,7 +84,7 @@ static int msm_gpu_open(struct inode *inode, struct file *file) ret =mutex_lock_interruptible (&dev->struct_mutex);if (ret) -return ret; + goto free_priv;pm_runtime_get_sync (&gpu->pdev->dev); show_priv->state = gpu->funcs->gpu_state_get (gpu);
@@ -94,13 +94,20 @@ static int msm_gpu_open(struct inode *inode, struct file *file)if (IS_ERR (show_priv->state)) { ret =PTR_ERR (show_priv->state); -kfree (show_priv); -return ret; + goto free_priv; } show_priv->dev = dev; -return single_open (file, msm_gpu_show, show_priv); + ret =single_open (file, msm_gpu_show, show_priv); +if (ret) + goto free_priv; + +return 0 ; + +free_priv: +kfree (show_priv); +return ret; }static const struct file_operations msm_gpu_fops = {
drivers/gpu/drm/msm/msm_gpu.c +4 -5
@@ -425,10 +425,9 @@ static void recover_worker(struct work_struct *work)if (submit) {struct task_struct *task; -rcu_read_lock (); - task =pid_task (submit->pid,PIDTYPE_PID ); + task =get_pid_task (submit->pid,PIDTYPE_PID );if (task) { - comm =kstrdup (task->comm,GFP_ATOMIC ); + comm =kstrdup (task->comm,GFP_KERNEL );/* * So slightly annoying, in other paths like
@@ -441,10 +440,10 @@ static void recover_worker(struct work_struct *work)* about the submit going away. */ mutex_unlock (&dev->struct_mutex); - cmd =kstrdup_quotable_cmdline (task,GFP_ATOMIC ); + cmd =kstrdup_quotable_cmdline (task,GFP_KERNEL ); +put_task_struct (task);mutex_lock (&dev->struct_mutex); } -rcu_read_unlock ();if (comm && cmd) { dev_err(dev->dev, "%s: offending task: %s (%s)\n",
drivers/gpu/drm/msm/msm_iommu.c +1 -1
@@ -66,7 +66,7 @@ static int msm_iommu_map(struct msm_mmu *mmu, uint64_t iova,// pm_runtime_get_sync(mmu->dev); ret =iommu_map_sg (iommu->domain, iova, sgt->sgl, sgt->nents, prot);// pm_runtime_put_sync(mmu->dev); -WARN_ON (ret <0 ); +WARN_ON (!ret);return (ret == len) ?0 : -EINVAL ; }
drivers/gpu/drm/msm/msm_rd.c +4 -1
@@ -316,10 +316,11 @@ static void snapshot_buf(struct msm_rd_state *rd, uint64_t iova, uint32_t size) {struct msm_gem_object *obj = submit->bos[idx].obj; +unsigned offset =0 ;const char *buf;if (iova) { - buf += iova - submit->bos[idx].iova; + offset = iova - submit->bos[idx].iova; }else { iova = submit->bos[idx].iova; size = obj->base.size;
@@ -340,6 +341,8 @@ static void snapshot_buf(struct msm_rd_state *rd,if (IS_ERR (buf))return ; + buf += offset; +rd_write_section (rd,RD_BUFFER_CONTENTS , buf, size);msm_gem_put_vaddr (&obj->base);
drivers/gpu/drm/ttm/ttm_bo_util.c +3 -1
@@ -492,8 +492,10 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo,if (!fbo)return -ENOMEM ; -ttm_bo_get (bo); fbo->base = *bo; + fbo->base.mem.placement |=TTM_PL_FLAG_NO_EVICT ; + +ttm_bo_get (bo); fbo->bo = bo;/**
drivers/hid/hid-hyperv.c +1 -1
@@ -309,7 +309,7 @@ static void mousevsc_on_receive(struct hv_device *device,hid_input_report (input_dev->hid_device,HID_INPUT_REPORT , input_dev->input_buf, len,1 ); -pm_wakeup_event (&input_dev->device->device,0 ); +pm_wakeup_hard_event (&input_dev->device->device);break ;default :
drivers/i2c/busses/i2c-axxia.c +29 -11
@@ -74,8 +74,7 @@ MST_STATUS_ND)#define MST_STATUS_ERR (MST_STATUS_NAK | \ MST_STATUS_AL | \ - MST_STATUS_IP | \ - MST_STATUS_TSS) + MST_STATUS_IP)#define MST_TX_BYTES_XFRD 0x50#define MST_RX_BYTES_XFRD 0x54#define SCL_HIGH_PERIOD 0x80
@@ -241,7 +240,7 @@ static int axxia_i2c_empty_rx_fifo(struct axxia_i2c_dev *idev)*/ if (c <=0 || c >I2C_SMBUS_BLOCK_MAX ) { idev->msg_err = -EPROTO ; -i2c_int_disable (idev, ~0 ); +i2c_int_disable (idev, ~MST_STATUS_TSS );complete (&idev->msg_complete);break ; }
@@ -299,14 +298,19 @@ static irqreturn_t axxia_i2c_isr(int irq, void *_dev)if (status &MST_STATUS_SCC ) {/* Stop completed */ -i2c_int_disable (idev, ~0 ); +i2c_int_disable (idev, ~MST_STATUS_TSS );complete (&idev->msg_complete); }else if (status &MST_STATUS_SNS ) {/* Transfer done */ -i2c_int_disable (idev, ~0 ); +i2c_int_disable (idev, ~MST_STATUS_TSS );if (i2c_m_rd (idev->msg) && idev->msg_xfrd < idev->msg->len)axxia_i2c_empty_rx_fifo (idev);complete (&idev->msg_complete); + }else if (status &MST_STATUS_TSS ) { +/* Transfer timeout */ + idev->msg_err = -ETIMEDOUT ; +i2c_int_disable (idev, ~MST_STATUS_TSS ); +complete (&idev->msg_complete); }else if (unlikely (status &MST_STATUS_ERR )) {/* Transfer error */ i2c_int_disable (idev, ~0 );
@@ -339,10 +343,10 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg)u32 rx_xfer, tx_xfer;u32 addr_1, addr_2;unsigned long time_left; +unsigned int wt_value; idev->msg = msg; idev->msg_xfrd =0 ; - idev->msg_err =0 ;reinit_completion (&idev->msg_complete);if (i2c_m_ten (msg)) {
@@ -383,9 +387,18 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg)else if (axxia_i2c_fill_tx_fifo (idev) !=0 ) int_mask |=MST_STATUS_TFL ; + wt_value =WT_VALUE (readl (idev->base +WAIT_TIMER_CONTROL )); +/* Disable wait timer temporarly */ +writel (wt_value, idev->base +WAIT_TIMER_CONTROL ); +/* Check if timeout error happened */ +if (idev->msg_err) + goto out; +/* Start manual mode */ writel (CMD_MANUAL , idev->base +MST_COMMAND ); +writel (WT_EN | wt_value, idev->base +WAIT_TIMER_CONTROL ); +i2c_int_enable (idev, int_mask); time_left = wait_for_completion_timeout(&idev->msg_complete,
@@ -396,13 +409,15 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg)if (readl (idev->base +MST_COMMAND ) &CMD_BUSY )dev_warn (idev->dev,"busy after xfer\n" ); -if (time_left ==0 ) +if (time_left ==0 ) { idev->msg_err = -ETIMEDOUT ; - -if (idev->msg_err == -ETIMEDOUT )i2c_recover_bus (&idev->adapter); +axxia_i2c_init (idev); + } -if (unlikely (idev->msg_err) && idev->msg_err != -ENXIO ) +out: +if (unlikely (idev->msg_err) && idev->msg_err != -ENXIO && + idev->msg_err != -ETIMEDOUT )axxia_i2c_init (idev);return idev->msg_err;
@@ -410,7 +425,7 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg)static int axxia_i2c_stop (struct axxia_i2c_dev *idev) { -u32 int_mask =MST_STATUS_ERR |MST_STATUS_SCC ; +u32 int_mask =MST_STATUS_ERR |MST_STATUS_SCC |MST_STATUS_TSS ;unsigned long time_left;reinit_completion (&idev->msg_complete);
@@ -437,6 +452,9 @@ axxia_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)int i;int ret =0 ; + idev->msg_err =0 ; +i2c_int_enable (idev,MST_STATUS_TSS ); +for (i =0 ; ret ==0 && i < num; ++i) ret =axxia_i2c_xfer_msg (idev, &msgs[i]);
drivers/i2c/busses/i2c-rcar.c +5 -4
@@ -779,6 +779,11 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,pm_runtime_get_sync (dev); +/* Check bus state before init otherwise bus busy info will be lost */ + ret =rcar_i2c_bus_barrier (priv); +if (ret <0 ) + goto out; +/* Gen3 needs a reset before allowing RXDMA once */ if (priv->devtype ==I2C_RCAR_GEN3 ) { priv->flags |=ID_P_NO_RXDMA ;
@@ -791,10 +796,6 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,rcar_i2c_init (priv); - ret =rcar_i2c_bus_barrier (priv); -if (ret <0 ) - goto out; -for (i =0 ; i < num; i++)rcar_i2c_request_dma (priv, msgs + i);
drivers/i2c/busses/i2c-scmi.c +7 -3
@@ -367,6 +367,7 @@ static int acpi_smbus_cmi_add(struct acpi_device *device) {struct acpi_smbus_cmi *smbus_cmi;const struct acpi_device_id *id; +int ret; smbus_cmi =kzalloc (sizeof (struct acpi_smbus_cmi ),GFP_KERNEL );if (!smbus_cmi)
@@ -388,8 +389,10 @@ static int acpi_smbus_cmi_add(struct acpi_device *device)acpi_walk_namespace (ACPI_TYPE_METHOD , smbus_cmi->handle,1 , acpi_smbus_cmi_query_methods,NULL , smbus_cmi,NULL ); -if (smbus_cmi->cap_info ==0 ) +if (smbus_cmi->cap_info ==0 ) { + ret = -ENODEV ; goto err; + } snprintf(smbus_cmi->adapter.name, sizeof(smbus_cmi->adapter.name), "SMBus CMI adapter %s",
@@ -400,7 +403,8 @@ static int acpi_smbus_cmi_add(struct acpi_device *device) smbus_cmi->adapter.class =I2C_CLASS_HWMON |I2C_CLASS_SPD ; smbus_cmi->adapter.dev.parent = &device->dev; -if (i2c_add_adapter (&smbus_cmi->adapter)) { + ret =i2c_add_adapter (&smbus_cmi->adapter); +if (ret) {dev_err (&device->dev,"Couldn't register adapter!\n" ); goto err; }
@@ -410,7 +414,7 @@ static int acpi_smbus_cmi_add(struct acpi_device *device) err:kfree (smbus_cmi); device->driver_data =NULL ; -return -EIO ; +return ret; }static int acpi_smbus_cmi_remove (struct acpi_device *device)
drivers/i2c/busses/i2c-uniphier-f.c +18 -1
@@ -470,9 +470,26 @@ static void uniphier_fi2c_hw_init(struct uniphier_fi2c_priv *priv)uniphier_fi2c_reset (priv); +/* +* Standard-mode: tLOW + tHIGH = 10 us +* Fast-mode: tLOW + tHIGH = 2.5 us +*/ writel (cyc, priv->membase +UNIPHIER_FI2C_CYC ); -writel (cyc /2 , priv->membase +UNIPHIER_FI2C_LCTL ); +/* +* Standard-mode: tLOW = 4.7 us, tHIGH = 4.0 us, tBUF = 4.7 us +* Fast-mode: tLOW = 1.3 us, tHIGH = 0.6 us, tBUF = 1.3 us +* "tLow/tHIGH = 5/4" meets both. +*/ +writel (cyc *5 /9 , priv->membase +UNIPHIER_FI2C_LCTL ); +/* +* Standard-mode: tHD;STA = 4.0 us, tSU;STA = 4.7 us, tSU;STO = 4.0 us +* Fast-mode: tHD;STA = 0.6 us, tSU;STA = 0.6 us, tSU;STO = 0.6 us +*/ writel (cyc /2 , priv->membase +UNIPHIER_FI2C_SSUT ); +/* +* Standard-mode: tSU;DAT = 250 ns +* Fast-mode: tSU;DAT = 100 ns +*/ writel (cyc /16 , priv->membase +UNIPHIER_FI2C_DSUT );uniphier_fi2c_prepare_operation (priv);
drivers/i2c/busses/i2c-uniphier.c +7 -1
@@ -320,7 +320,13 @@ static void uniphier_i2c_hw_init(struct uniphier_i2c_priv *priv)uniphier_i2c_reset (priv, true); -writel ((cyc /2 <<16 ) | cyc, priv->membase +UNIPHIER_I2C_CLK ); +/* +* Bit30-16: clock cycles of tLOW. +* Standard-mode: tLOW = 4.7 us, tHIGH = 4.0 us +* Fast-mode: tLOW = 1.3 us, tHIGH = 0.6 us +* "tLow/tHIGH = 5/4" meets both. +*/ +writel ((cyc *5 /9 <<16 ) | cyc, priv->membase +UNIPHIER_I2C_CLK );uniphier_i2c_reset (priv, false); }
drivers/ide/pmac.c +1 -0
@@ -920,6 +920,7 @@ static u8 pmac_ide_cable_detect(ide_hwif_t *hwif)struct device_node *root =of_find_node_by_path ("/" );const char *model =of_get_property (root,"model" ,NULL ); +of_node_put (root);/* Get cable type from device-tree. */ if (cable && !strncmp (cable,"80-" ,3 )) {/* Some drives fail to detect 80c cable in PowerBook */
drivers/infiniband/hw/hfi1/user_sdma.c +10 -14
@@ -187,7 +187,6 @@ int hfi1_user_sdma_alloc_queues(struct hfi1_ctxtdata *uctxt, pq->ctxt = uctxt->ctxt; pq->subctxt = fd->subctxt; pq->n_max_reqs = hfi1_sdma_comp_ring_size; - pq->state =SDMA_PKT_Q_INACTIVE ;atomic_set (&pq->n_reqs,0 );init_waitqueue_head (&pq->wait);atomic_set (&pq->n_locked,0 );
@@ -276,7 +275,7 @@ int hfi1_user_sdma_free_queues(struct hfi1_filedata *fd,/* Wait until all requests have been freed. */ wait_event_interruptible ( pq->wait, - (READ_ONCE (pq->state) ==SDMA_PKT_Q_INACTIVE )); + !atomic_read (&pq->n_reqs));kfree (pq->reqs);kfree (pq->req_in_use);kmem_cache_destroy (pq->txreq_cache);
@@ -312,6 +311,13 @@ static u8 dlid_to_selector(u16 dlid)return mapping[hash]; } +/** +* hfi1_user_sdma_process_request() - Process and start a user sdma request +* @fd: valid file descriptor +* @iovec: array of io vectors to process +* @dim: overall iovec array size +* @count: number of io vector array entries processed +*/ int hfi1_user_sdma_process_request (struct hfi1_filedata *fd,struct iovec *iovec,unsigned long dim,unsigned long *count)
@@ -560,20 +566,12 @@ int hfi1_user_sdma_process_request(struct hfi1_filedata *fd, req->ahg_idx =sdma_ahg_alloc (req->sde);set_comp_state (pq, cq, info.comp_idx,QUEUED ,0 ); + pq->state =SDMA_PKT_Q_ACTIVE ;/* Send the first N packets in the request to buy us some time */ ret =user_sdma_send_pkts (req, pcount);if (unlikely (ret <0 && ret != -EBUSY )) goto free_req; -/* -* It is possible that the SDMA engine would have processed all the -* submitted packets by the time we get here. Therefore, only set -* packet queue state to ACTIVE if there are still uncompleted -* requests. -*/ -if (atomic_read (&pq->n_reqs)) -xchg (&pq->state,SDMA_PKT_Q_ACTIVE ); -/* * This is a somewhat blocking send implementation. * The driver will block the caller until all packets of the
@@ -1409,10 +1407,8 @@ static void user_sdma_txreq_cb(struct sdma_txreq *txreq, int status)static inline void pq_update (struct hfi1_user_sdma_pkt_q *pq) { -if (atomic_dec_and_test (&pq->n_reqs)) { -xchg (&pq->state,SDMA_PKT_Q_INACTIVE ); +if (atomic_dec_and_test (&pq->n_reqs))wake_up (&pq->wait); - } }static void user_sdma_free_request (struct user_sdma_request *req,bool unpin)
drivers/infiniband/hw/hfi1/user_sdma.h +5 -4
@@ -105,9 +105,10 @@ static inline int ahg_header_set(u32 *arr, int idx, size_t array_size,#define TXREQ_FLAGS_REQ_ACK BIT(0)/* Set the ACK bit in the header */ #define TXREQ_FLAGS_REQ_DISABLE_SH BIT(1)/* Disable header suppression */ -#define SDMA_PKT_Q_INACTIVE BIT(0) -#define SDMA_PKT_Q_ACTIVE BIT(1) -#define SDMA_PKT_Q_DEFERRED BIT(2) +enum pkt_q_sdma_state { +SDMA_PKT_Q_ACTIVE , +SDMA_PKT_Q_DEFERRED , +};/* * Maximum retry attempts to submit a TX request
@@ -133,7 +134,7 @@ struct hfi1_user_sdma_pkt_q {struct user_sdma_request *reqs;unsigned long *req_in_use;struct iowait busy; -unsigned state; +enum pkt_q_sdma_state state;wait_queue_head_t wait;unsigned long unpinned;struct mmu_rb_handler *handler;
drivers/input/keyboard/omap4-keypad.c +14 -4
@@ -60,8 +60,18 @@/* OMAP4 values */ #define OMAP4_VAL_IRQDISABLE 0x0 -#define OMAP4_VAL_DEBOUNCINGTIME 0x7 -#define OMAP4_VAL_PVT 0x7 + +/* +* Errata i689: If a key is released for a time shorter than debounce time, +* the keyboard will idle and never detect the key release. The workaround +* is to use at least a 12ms debounce time. See omap5432 TRM chapter +* "26.4.6.2 Keyboard Controller Timer" for more information. +*/ +#define OMAP4_KEYPAD_PTV_DIV_128 0x6 +#define OMAP4_KEYPAD_DEBOUNCINGTIME_MS (dbms, ptv) \ + ((((dbms) * 1000) / ((1 << ((ptv) + 1)) * (1000000 / 32768))) - 1) +#define OMAP4_VAL_DEBOUNCINGTIME_16MS \ + OMAP4_KEYPAD_DEBOUNCINGTIME_MS(16, OMAP4_KEYPAD_PTV_DIV_128)enum {KBD_REVISION_OMAP4 =0 ,
@@ -181,9 +191,9 @@ static int omap4_keypad_open(struct input_dev *input)kbd_writel (keypad_data,OMAP4_KBD_CTRL ,OMAP4_DEF_CTRL_NOSOFTMODE | - (OMAP4_VAL_PVT <<OMAP4_DEF_CTRL_PTV_SHIFT )); + (OMAP4_KEYPAD_PTV_DIV_128 <<OMAP4_DEF_CTRL_PTV_SHIFT ));kbd_writel (keypad_data,OMAP4_KBD_DEBOUNCINGTIME , -OMAP4_VAL_DEBOUNCINGTIME ); +OMAP4_VAL_DEBOUNCINGTIME_16MS );/* clear pending interrupts */ kbd_write_irqreg (keypad_data,OMAP4_KBD_IRQSTATUS ,kbd_read_irqreg (keypad_data,OMAP4_KBD_IRQSTATUS ));
drivers/input/mouse/synaptics.c +1 -0
@@ -178,6 +178,7 @@ static const char * const smbus_pnp_ids[] = {"LEN0096" ,/* X280 */ "LEN0097" ,/* X280 -> ALPS trackpoint */ "LEN200f" ,/* T450s */ +"SYN3221" ,/* HP 15-ay000 */ NULL };
drivers/input/serio/hyperv-keyboard.c +1 -1
@@ -177,7 +177,7 @@ static void hv_kbd_on_receive(struct hv_device *hv_dev,* state because the Enter-UP can trigger a wakeup at once. */ if (!(info &IS_BREAK )) -pm_wakeup_event (&hv_dev->device,0 ); +pm_wakeup_hard_event (&hv_dev->device);break ;
drivers/net/bonding/bond_3ad.c +3 -0
@@ -2086,6 +2086,9 @@ void bond_3ad_unbind_slave(struct slave *slave) aggregator->aggregator_identifier);/* Tell the partner that this port is not suitable for aggregation */ + port->actor_oper_port_state &= ~AD_STATE_SYNCHRONIZATION ; + port->actor_oper_port_state &= ~AD_STATE_COLLECTING ; + port->actor_oper_port_state &= ~AD_STATE_DISTRIBUTING ; port->actor_oper_port_state &= ~AD_STATE_AGGREGATION ;__update_lacpdu_from_port (port);ad_lacpdu_send (port);
drivers/net/dsa/mv88e6060.c +3 -7
@@ -116,8 +116,7 @@ static int mv88e6060_switch_reset(struct dsa_switch *ds)/* Reset the switch. */ REG_WRITE (REG_GLOBAL ,GLOBAL_ATU_CONTROL ,GLOBAL_ATU_CONTROL_SWRESET | -GLOBAL_ATU_CONTROL_ATUSIZE_1024 | -GLOBAL_ATU_CONTROL_ATE_AGE_5MIN ); +GLOBAL_ATU_CONTROL_LEARNDIS );/* Wait up to one second for reset to complete. */ timeout = jiffies +1 *HZ ;
@@ -142,13 +141,10 @@ static int mv88e6060_setup_global(struct dsa_switch *ds)*/ REG_WRITE (REG_GLOBAL ,GLOBAL_CONTROL ,GLOBAL_CONTROL_MAX_FRAME_1536 ); -/* Enable automatic address learning, set the address -* database size to 1024 entries, and set the default aging -* time to 5 minutes. +/* Disable automatic address learning. */ REG_WRITE (REG_GLOBAL ,GLOBAL_ATU_CONTROL , -GLOBAL_ATU_CONTROL_ATUSIZE_1024 | -GLOBAL_ATU_CONTROL_ATE_AGE_5MIN ); +GLOBAL_ATU_CONTROL_LEARNDIS );return 0 ; }
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c +1 -1
@@ -667,7 +667,7 @@ static int hw_atl_b0_hw_ring_rx_receive(struct aq_hw_s *self, rx_stat = (0x0000003CU & rxd_wb->status) >>2 ; - is_rx_check_sum_enabled = (rxd_wb->type) & (0x3U <<19 ); + is_rx_check_sum_enabled = (rxd_wb->type >>19 ) &0x3U ; pkt_type =0xFFU & (rxd_wb->type >>4 );
drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c +3 -1
@@ -367,13 +367,15 @@ lio_vf_rep_packet_sent_callback(struct octeon_device *oct,struct octeon_soft_command *sc = (struct octeon_soft_command *)buf;struct sk_buff *skb = sc->ctxptr;struct net_device *ndev = skb->dev; +u32 iq_no;dma_unmap_single (&oct->pci_dev->dev, sc->dmadptr, sc->datasize,DMA_TO_DEVICE );dev_kfree_skb_any (skb); + iq_no = sc->iq_no;octeon_free_soft_command (oct, sc); -if (octnet_iq_is_full (oct, sc->iq_no)) +if (octnet_iq_is_full (oct, iq_no))return ;if (netif_queue_stopped (ndev))
drivers/net/ethernet/freescale/fman/fman.c +2 -3
@@ -2786,7 +2786,7 @@ static struct fman *read_dts_node(struct platform_device *of_dev)if (!muram_node) {dev_err (&of_dev->dev,"%s: could not find MURAM node\n" , __func__); - goto fman_node_put; + goto fman_free; } err = of_address_to_resource(muram_node, 0,
@@ -2795,11 +2795,10 @@ static struct fman *read_dts_node(struct platform_device *of_dev)of_node_put (muram_node);dev_err (&of_dev->dev,"%s: of_address_to_resource() = %d\n" , __func__, err); - goto fman_node_put; + goto fman_free; }of_node_put (muram_node); -of_node_put (fm_node); err =devm_request_irq (&of_dev->dev, irq, fman_irq,IRQF_SHARED ,"fman" , fman);
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +33 -1
@@ -4262,8 +4262,27 @@ static void mvpp2_phylink_validate(struct net_device *dev,unsigned long *supported, struct phylink_link_state *state) { + struct mvpp2_port *port = netdev_priv(dev);__ETHTOOL_DECLARE_LINK_MODE_MASK (mask) = {0 , }; +/* Invalid combinations */ +switch (state->interface) { +case PHY_INTERFACE_MODE_10GKR : +case PHY_INTERFACE_MODE_XAUI : +if (port->gop_id !=0 ) + goto empty_set; +break ; +case PHY_INTERFACE_MODE_RGMII : +case PHY_INTERFACE_MODE_RGMII_ID : +case PHY_INTERFACE_MODE_RGMII_RXID : +case PHY_INTERFACE_MODE_RGMII_TXID : +if (port->gop_id ==0 ) + goto empty_set; +break ; +default : +break ; + } +phylink_set (mask, Autoneg);phylink_set_port_modes (mask);phylink_set (mask, Pause);
@@ -4271,6 +4290,8 @@ static void mvpp2_phylink_validate(struct net_device *dev,switch (state->interface) {case PHY_INTERFACE_MODE_10GKR : +case PHY_INTERFACE_MODE_XAUI : +case PHY_INTERFACE_MODE_NA : phylink_set(mask, 10000baseCR_Full); phylink_set(mask, 10000baseSR_Full); phylink_set(mask, 10000baseLR_Full);
@@ -4278,7 +4299,11 @@ static void mvpp2_phylink_validate(struct net_device *dev, phylink_set(mask, 10000baseER_Full); phylink_set(mask, 10000baseKR_Full);/* Fall-through */ -default : +case PHY_INTERFACE_MODE_RGMII : +case PHY_INTERFACE_MODE_RGMII_ID : +case PHY_INTERFACE_MODE_RGMII_RXID : +case PHY_INTERFACE_MODE_RGMII_TXID : +case PHY_INTERFACE_MODE_SGMII : phylink_set(mask, 10baseT_Half); phylink_set(mask, 10baseT_Full); phylink_set(mask, 100baseT_Half);
@@ -4290,11 +4315,18 @@ static void mvpp2_phylink_validate(struct net_device *dev, phylink_set(mask, 1000baseT_Full); phylink_set(mask, 1000baseX_Full); phylink_set(mask, 2500baseX_Full); +break ; +default : + goto empty_set; }bitmap_and (supported, supported, mask, __ETHTOOL_LINK_MODE_MASK_NBITS);bitmap_and (state->advertising, state->advertising, mask, __ETHTOOL_LINK_MODE_MASK_NBITS); +return ; + +empty_set: +bitmap_zero (supported, __ETHTOOL_LINK_MODE_MASK_NBITS); } static void mvpp22_xlg_link_state(struct mvpp2_port *port,
drivers/net/ethernet/mellanox/mlx4/Kconfig +1 -1
@@ -5,7 +5,7 @@ config MLX4_EN tristate "Mellanox Technologies 1/10/40Gbit Ethernet support" depends on MAY_USE_DEVLINK - depends on PCI + depends on PCI && NETDEVICES && ETHERNET && INET select MLX4_CORE imply PTP_1588_CLOCK ---help---
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +8 -2
@@ -286,7 +286,13 @@ static boolmlxsw_sp_bridge_port_should_destroy (const struct mlxsw_sp_bridge_port * bridge_port) { -struct mlxsw_sp *mlxsw_sp =mlxsw_sp_lower_get (bridge_port->dev); +struct net_device *dev = bridge_port->dev; +struct mlxsw_sp *mlxsw_sp; + +if (is_vlan_dev (dev)) + mlxsw_sp =mlxsw_sp_lower_get (vlan_dev_real_dev (dev)); +else + mlxsw_sp =mlxsw_sp_lower_get (dev);/* In case ports were pulled from out of a bridged LAG, then * it's possible the reference count isn't zero, yet the bridge
@@ -2020,7 +2026,7 @@ mlxsw_sp_bridge_8021d_port_leave(struct mlxsw_sp_bridge_device *bridge_device, vid =is_vlan_dev (dev) ?vlan_dev_vlan_id (dev) :1 ; mlxsw_sp_port_vlan =mlxsw_sp_port_vlan_find_by_vid (mlxsw_sp_port, vid); -if (WARN_ON (!mlxsw_sp_port_vlan)) +if (!mlxsw_sp_port_vlan)return ;mlxsw_sp_port_vlan_bridge_leave (mlxsw_sp_port_vlan);
drivers/net/ethernet/socionext/sni_ave.c +8 -6
@@ -194,6 +194,7 @@/* Parameter for ethernet frame */ #define AVE_MAX_ETHFRAME 1518 +#define AVE_FRAME_HEADROOM 2/* Parameter for interrupt */ #define AVE_INTM_COUNT 20
@@ -585,12 +586,13 @@ static int ave_rxdesc_prepare(struct net_device *ndev, int entry) skb = priv->rx.desc[entry].skbs;if (!skb) { - skb =netdev_alloc_skb_ip_align (ndev, -AVE_MAX_ETHFRAME ); + skb =netdev_alloc_skb (ndev,AVE_MAX_ETHFRAME );if (!skb) {netdev_err (ndev,"can't allocate skb for Rx\n" );return -ENOMEM ; } + skb->data +=AVE_FRAME_HEADROOM ; + skb->tail +=AVE_FRAME_HEADROOM ; }/* set disable to cmdsts */
@@ -603,12 +605,12 @@ static int ave_rxdesc_prepare(struct net_device *ndev, int entry)* - Rx buffer begins with 2 byte headroom, and data will be put from * (buffer + 2). * To satisfy this, specify the address to put back the buffer -* pointer advanced by NET_IP_ALIGN by netdev_alloc_skb_ip_align(), -* and expand the map size by NET_IP_ALIGN. +* pointer advanced by AVE_FRAME_HEADROOM, and expand the map size +* by AVE_FRAME_HEADROOM. */ ret =ave_dma_map (ndev, &priv->rx.desc[entry], - skb->data -NET_IP_ALIGN , -AVE_MAX_ETHFRAME +NET_IP_ALIGN , + skb->data -AVE_FRAME_HEADROOM , +AVE_MAX_ETHFRAME +AVE_FRAME_HEADROOM ,DMA_FROM_DEVICE , &paddr);if (ret) {netdev_err (ndev,"can't map skb for Rx\n" );
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +13 -10
@@ -2547,12 +2547,6 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)netdev_warn (priv->dev,"PTP init failed\n" ); } -#ifdef CONFIG_DEBUG_FS - ret =stmmac_init_fs (dev); -if (ret <0 ) -netdev_warn (priv->dev,"%s: failed debugFS registration\n" , - __func__); -#endif priv->tx_lpi_timer =STMMAC_DEFAULT_TWT_LS ;if (priv->use_riwt) {
@@ -2753,10 +2747,6 @@ static int stmmac_release(struct net_device *dev)netif_carrier_off (dev); -#ifdef CONFIG_DEBUG_FS -stmmac_exit_fs (dev); -#endif -stmmac_release_ptp (priv);return 0 ;
@@ -3896,6 +3886,9 @@ static int stmmac_sysfs_ring_read(struct seq_file *seq, void *v)u32 tx_count = priv->plat->tx_queues_to_use;u32 queue; +if ((dev->flags &IFF_UP ) ==0 ) +return 0 ; +for (queue =0 ; queue < rx_count; queue++) {struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
@@ -4394,6 +4387,13 @@ int stmmac_dvr_probe(struct device *device, goto error_netdev_register; } +#ifdef CONFIG_DEBUG_FS + ret =stmmac_init_fs (ndev); +if (ret <0 ) +netdev_warn (priv->dev,"%s: failed debugFS registration\n" , + __func__); +#endif +return ret; error_netdev_register:
@@ -4429,6 +4429,9 @@ int stmmac_dvr_remove(struct device *dev)netdev_info (priv->dev,"%s: removing driver" , __func__); +#ifdef CONFIG_DEBUG_FS +stmmac_exit_fs (ndev); +#endif stmmac_stop_all_dma (priv);stmmac_mac_set (priv, priv->ioaddr, false);
drivers/net/macvlan.c +5 -2
@@ -608,7 +608,7 @@ static int macvlan_open(struct net_device *dev) goto hash_add; } - err = -EBUSY ; + err = -EADDRINUSE ;if (macvlan_addr_busy (vlan->port, dev->dev_addr)) goto out;
@@ -706,7 +706,7 @@ static int macvlan_sync_address(struct net_device *dev, unsigned char *addr) }else {/* Rehash and update the device filters */ if (macvlan_addr_busy (vlan->port, addr)) -return -EBUSY ; +return -EADDRINUSE ;if (!macvlan_passthru (port)) { err =dev_uc_add (lowerdev, addr);
@@ -747,6 +747,9 @@ static int macvlan_set_mac_address(struct net_device *dev, void *p)return dev_set_mac_address (vlan->lowerdev, addr); } +if (macvlan_addr_busy (vlan->port, addr->sa_data)) +return -EADDRINUSE ; +return macvlan_sync_address (dev, addr->sa_data); }
drivers/net/wireless/mac80211_hwsim.c +7 -5
@@ -3712,16 +3712,16 @@ static int __init init_mac80211_hwsim(void)if (err) goto out_unregister_pernet; + err =hwsim_init_netlink (); +if (err) + goto out_unregister_driver; + hwsim_class =class_create (THIS_MODULE ,"mac80211_hwsim" );if (IS_ERR (hwsim_class)) { err =PTR_ERR (hwsim_class); - goto out_unregister_driver; + goto out_exit_netlink; } - err =hwsim_init_netlink (); -if (err <0 ) - goto out_unregister_driver; -for (i =0 ; i < radios; i++) {struct hwsim_new_radio_params param = {0 };
@@ -3827,6 +3827,8 @@ static int __init init_mac80211_hwsim(void)free_netdev (hwsim_mon); out_free_radios:mac80211_hwsim_free (); +out_exit_netlink: +hwsim_exit_netlink (); out_unregister_driver:platform_driver_unregister (&mac80211_hwsim_driver); out_unregister_pernet:
drivers/nvme/host/core.c +9 -1
@@ -831,6 +831,8 @@ static int nvme_submit_user_cmd(struct request_queue *q,static void nvme_keep_alive_end_io (struct request *rq,blk_status_t status) {struct nvme_ctrl *ctrl = rq->end_io_data; +unsigned long flags; +bool startka = false;blk_mq_free_request (rq);
@@ -841,7 +843,13 @@ static void nvme_keep_alive_end_io(struct request *rq, blk_status_t status)return ; } -schedule_delayed_work (&ctrl->ka_work, ctrl->kato *HZ ); +spin_lock_irqsave (&ctrl->lock, flags); +if (ctrl->state ==NVME_CTRL_LIVE || + ctrl->state ==NVME_CTRL_CONNECTING ) + startka = true; +spin_unlock_irqrestore (&ctrl->lock, flags); +if (startka) +schedule_delayed_work (&ctrl->ka_work, ctrl->kato *HZ ); }static int nvme_keep_alive (struct nvme_ctrl *ctrl)
drivers/nvme/target/rdma.c +2 -1
@@ -529,6 +529,7 @@ static void nvmet_rdma_send_done(struct ib_cq *cq, struct ib_wc *wc) {struct nvmet_rdma_rsp *rsp = container_of(wc->wr_cqe, struct nvmet_rdma_rsp, send_cqe); +struct nvmet_rdma_queue *queue = cq->cq_context;nvmet_rdma_release_rsp (rsp);
@@ -536,7 +537,7 @@ static void nvmet_rdma_send_done(struct ib_cq *cq, struct ib_wc *wc) wc->status != IB_WC_WR_FLUSH_ERR)) {pr_err ("SEND for CQE 0x%p failed with status %s (%d).\n" , wc->wr_cqe,ib_wc_status_msg (wc->status), wc->status); -nvmet_rdma_error_comp (rsp->queue); +nvmet_rdma_error_comp (queue); } }
drivers/sbus/char/display7seg.c +1 -0
@@ -220,6 +220,7 @@ static int d7s_probe(struct platform_device *op)dev_set_drvdata (&op->dev, p); d7s_device = p; err =0 ; +of_node_put (opts); out:return err;
drivers/sbus/char/envctrl.c +2 -0
@@ -910,8 +910,10 @@ static void envctrl_init_i2c_child(struct device_node *dp,for (len =0 ; len <PCF8584_MAX_CHANNELS ; ++len) { pchild->mon_type[len] =ENVCTRL_NOMON ; } +of_node_put (root_node);return ; } +of_node_put (root_node); }/* Get the monitor channels. */
drivers/scsi/libiscsi.c +2 -2
@@ -2416,8 +2416,8 @@ int iscsi_eh_session_reset(struct scsi_cmnd *sc) failed:ISCSI_DBG_EH (session,"failing session reset: Could not log back into " -"%s, %s [age %d]\n" , session->targetname, - conn->persistent_address, session->age); +"%s [age %d]\n" , session->targetname, + session->age);spin_unlock_bh (&session->frwd_lock);mutex_unlock (&session->eh_mutex);return FAILED ;
drivers/scsi/vmw_pvscsi.c +2 -2
@@ -1202,8 +1202,6 @@ static void pvscsi_shutdown_intr(struct pvscsi_adapter *adapter)static void pvscsi_release_resources (struct pvscsi_adapter *adapter) { -pvscsi_shutdown_intr (adapter); -if (adapter->workqueue)destroy_workqueue (adapter->workqueue);
@@ -1535,6 +1533,7 @@ static int pvscsi_probe(struct pci_dev *pdev, const struct pci_device_id *id) out_reset_adapter:ll_adapter_reset (adapter); out_release_resources: +pvscsi_shutdown_intr (adapter);pvscsi_release_resources (adapter);scsi_host_put (host); out_disable_device:
@@ -1543,6 +1542,7 @@ static int pvscsi_probe(struct pci_dev *pdev, const struct pci_device_id *id)return error; out_release_resources_and_disable: +pvscsi_shutdown_intr (adapter);pvscsi_release_resources (adapter); goto out_disable_device; }
drivers/thermal/armada_thermal.c +1 -1
@@ -357,7 +357,7 @@ static int armada_get_temp_legacy(struct thermal_zone_device *thermal,int ret;/* Valid check */ -if (armada_is_valid (priv)) { +if (!armada_is_valid (priv)) {dev_err (priv->dev,"Temperature sensor reading not valid\n" );return -EIO ;
drivers/tty/serial/suncore.c +1 -0
@@ -112,6 +112,7 @@ void sunserial_console_termios(struct console *con, struct device_node *uart_dp) mode =of_get_property (dp, mode_prop,NULL );if (!mode) mode ="9600,8,n,1,-" ; +of_node_put (dp); } cflag =CREAD |HUPCL |CLOCAL ;
drivers/vhost/vsock.c +15 -7
@@ -563,13 +563,21 @@ static void vhost_vsock_reset_orphans(struct sock *sk)* executing. */ -if (!vhost_vsock_get (vsk->remote_addr.svm_cid)) { -sock_set_flag (sk,SOCK_DONE ); - vsk->peer_shutdown =SHUTDOWN_MASK ; - sk->sk_state =SS_UNCONNECTED ; - sk->sk_err =ECONNRESET ; - sk->sk_error_report (sk); - } +/* If the peer is still valid, no need to reset connection */ +if (vhost_vsock_get (vsk->remote_addr.svm_cid)) +return ; + +/* If the close timeout is pending, let it expire. This avoids races +* with the timeout callback. +*/ +if (vsk->close_work_scheduled) +return ; + +sock_set_flag (sk,SOCK_DONE ); + vsk->peer_shutdown =SHUTDOWN_MASK ; + sk->sk_state =SS_UNCONNECTED ; + sk->sk_err =ECONNRESET ; + sk->sk_error_report (sk); }static int vhost_vsock_dev_release (struct inode *inode,struct file *file)
fs/btrfs/disk-io.c +15 -36
81 lines not on this page · raw message
fs/cifs/Kconfig +1 -1
@@ -133,7 +133,7 @@ config CIFS_XATTR config CIFS_POSIX bool "CIFS POSIX Extensions" - depends on CIFS_XATTR + depends on CIFS && CIFS_ALLOW_INSECURE_LEGACY && CIFS_XATTR help Enabling this option will cause the cifs client to attempt to negotiate a newer dialect with servers, such as Samba 3.0.5
fs/nfs/direct.c +8 -1
@@ -98,8 +98,11 @@ struct nfs_direct_req {struct pnfs_ds_commit_info ds_cinfo;/* Storage for cinfo */ struct work_struct work;int flags; +/* for write */ #define NFS_ODIRECT_DO_COMMIT (1)/* an unstable reply was received */ #define NFS_ODIRECT_RESCHED_WRITES (2)/* write verification failed */ +/* for read */ +#define NFS_ODIRECT_SHOULD_DIRTY (3)/* dirty user-space page after read */ struct nfs_writeverf verf;/* unstable write verifier */ };
@@ -412,7 +415,8 @@ static void nfs_direct_read_completion(struct nfs_pgio_header *hdr)struct nfs_page *req =nfs_list_entry (hdr->pages.next);struct page *page = req->wb_page; -if (!PageCompound (page) && bytes < hdr->good_bytes) +if (!PageCompound (page) && bytes < hdr->good_bytes && + (dreq->flags ==NFS_ODIRECT_SHOULD_DIRTY ))set_page_dirty (page); bytes += req->wb_bytes;nfs_list_remove_request (req);
@@ -587,6 +591,9 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, struct iov_iter *iter)if (!is_sync_kiocb (iocb)) dreq->iocb = iocb; +if (iter_is_iovec (iter)) + dreq->flags =NFS_ODIRECT_SHOULD_DIRTY ; +nfs_start_io_direct (inode);NFS_I (inode)->read_io += count;
kernel/bpf/verifier.c +3 -0
@@ -4792,6 +4792,9 @@ static int do_check(struct bpf_verifier_env *env) goto process_bpf_exit; } +if (signal_pending (current)) +return -EAGAIN ; +if (need_resched ())cond_resched ();
kernel/locking/qspinlock.c +42 -29
88 lines not on this page · raw message
net/sunrpc/xprt.c +9 -2
@@ -781,8 +781,15 @@ void xprt_connect(struct rpc_task *task)return ;if (xprt_test_and_set_connecting (xprt))return ; - xprt->stat.connect_start = jiffies; - xprt->ops->connect (xprt, task); +/* Race breaker */ +if (!xprt_connected (xprt)) { + xprt->stat.connect_start = jiffies; + xprt->ops->connect (xprt, task); + }else { +xprt_clear_connecting (xprt); + task->tk_status =0 ; +rpc_wake_up_queued_task (&xprt->pending, task); + } }xprt_release_write (xprt, task); }
tools/testing/nvdimm/test/nfit.c +33 -2
@@ -15,6 +15,7 @@#include <linux/dma-mapping.h> #include <linux/workqueue.h> #include <linux/libnvdimm.h> +#include <linux/genalloc.h> #include <linux/vmalloc.h> #include <linux/device.h> #include <linux/module.h>
@@ -213,6 +214,8 @@ struct nfit_test {static struct workqueue_struct *nfit_wq; +static struct gen_pool *nfit_pool; +static struct nfit_test *to_nfit_test (struct device *dev) {struct platform_device *pdev =to_platform_device (dev);
@@ -1130,6 +1133,9 @@ static void release_nfit_res(void *data)list_del (&nfit_res->list);spin_unlock (&nfit_test_lock); +if (resource_size (&nfit_res->res) >=DIMM_SIZE ) +gen_pool_free (nfit_pool, nfit_res->res.start, +resource_size (&nfit_res->res));vfree (nfit_res->buf);kfree (nfit_res); }
@@ -1142,7 +1148,7 @@ static void *__test_alloc(struct nfit_test *t, size_t size, dma_addr_t *dma, GFP_KERNEL);int rc; -if (!buf || !nfit_res) +if (!buf || !nfit_res || !*dma) goto err; rc =devm_add_action (dev, release_nfit_res, nfit_res);if (rc)
@@ -1162,6 +1168,8 @@ static void *__test_alloc(struct nfit_test *t, size_t size, dma_addr_t *dma,return nfit_res->buf; err: +if (*dma && size >=DIMM_SIZE ) +gen_pool_free (nfit_pool, *dma, size);if (buf)vfree (buf);kfree (nfit_res);
@@ -1170,9 +1178,16 @@ static void *__test_alloc(struct nfit_test *t, size_t size, dma_addr_t *dma,static void *test_alloc (struct nfit_test *t,size_t size,dma_addr_t *dma) { +struct genpool_data_align data = { + .align =SZ_128M , + };void *buf =vmalloc (size); - *dma = (unsigned long ) buf; +if (size >=DIMM_SIZE ) + *dma =gen_pool_alloc_algo (nfit_pool, size, + gen_pool_first_fit_align, &data); +else + *dma = (unsigned long ) buf;return __test_alloc (t, size, dma, buf); }
@@ -2837,6 +2852,17 @@ static __init int nfit_test_init(void) goto err_register; } + nfit_pool =gen_pool_create (ilog2 (SZ_4M ),NUMA_NO_NODE ); +if (!nfit_pool) { + rc = -ENOMEM ; + goto err_register; + } + +if (gen_pool_add (nfit_pool,SZ_4G ,SZ_4G ,NUMA_NO_NODE )) { + rc = -ENOMEM ; + goto err_register; + } +for (i =0 ; i <NUM_NFITS ; i++) {struct nfit_test *nfit_test;struct platform_device *pdev;
@@ -2892,6 +2918,9 @@ static __init int nfit_test_init(void)return 0 ; err_register: +if (nfit_pool) +gen_pool_destroy (nfit_pool); +destroy_workqueue (nfit_wq);for (i =0 ; i <NUM_NFITS ; i++)if (instances[i])
@@ -2915,6 +2944,8 @@ static __exit void nfit_test_exit(void)platform_driver_unregister (&nfit_test_driver);nfit_test_teardown (); +gen_pool_destroy (nfit_pool); +for (i =0 ; i <NUM_NFITS ; i++)put_device (&instances[i]->pdev.dev);class_destroy (nfit_test_dimm);
tools/testing/selftests/bpf/test_btf.c +368 -7
395 lines not on this page · raw message
tools/testing/selftests/bpf/test_verifier.c +1 -1
@@ -12765,7 +12765,7 @@ static void do_test_single(struct bpf_test *test, bool unpriv, reject_from_alignment = fd_prog <0 && (test->flags &F_NEEDS_EFFICIENT_UNALIGNED_ACCESS ) && -strstr (bpf_vlog,"Unknown alignment." ); +strstr (bpf_vlog,"misaligned" );#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS if (reject_from_alignment) { printf("FAIL\nFailed due to alignment despite having efficient unaligned access: '%s'!\n",