Linux 4.18.15
Greg KH
maintainerI'm announcing the release of the 4.18.15 kernel.
All users of the 4.18 kernel series must upgrade.
The updated 4.18.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.18.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
------------
Documentation/devicetree/bindings/net/macb.txt | 1 Makefile | 16 - arch/arm/boot/dts/sama5d3_emac.dtsi | 2 arch/arm64/kernel/perf_event.c | 7 arch/mips/include/asm/processor.h | 10 arch/mips/kernel/process.c | 25 + arch/mips/kernel/setup.c | 48 +-- arch/mips/kernel/vdso.c | 18 + arch/powerpc/include/asm/book3s/64/pgtable.h | 4 arch/powerpc/kvm/book3s_64_mmu_radix.c | 101 ++---- arch/x86/include/asm/pgtable_types.h | 2 arch/x86/include/uapi/asm/kvm.h | 1 arch/x86/kvm/lapic.c | 22 + drivers/bluetooth/hci_ldisc.c | 2 drivers/clk/x86/clk-pmc-atom.c | 18 - drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 6 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 drivers/gpu/drm/amd/amdkfd/kfd_device.c | 3 drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 13 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 2 drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 21 + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 2 drivers/gpu/drm/nouveau/dispnv50/disp.c | 15 drivers/gpu/drm/pl111/pl111_vexpress.c | 3 drivers/hwmon/nct6775.c | 70 +++- drivers/i2c/busses/i2c-scmi.c | 1 drivers/input/joystick/xpad.c | 3 drivers/md/dm-cache-target.c | 5 drivers/md/dm-flakey.c | 2 drivers/md/dm-linear.c | 8 drivers/md/dm.c | 27 + drivers/mfd/omap-usb-host.c | 11 drivers/mmc/core/block.c | 10 drivers/net/bonding/bond_main.c | 65 ++-- drivers/net/dsa/b53/b53_common.c | 4 drivers/net/dsa/bcm_sf2.c | 14 drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 32 +- drivers/net/ethernet/broadcom/bcmsysport.c | 22 - drivers/net/ethernet/broadcom/bnxt/bnxt.c | 27 + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 6 drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 20 - drivers/net/ethernet/cadence/macb_main.c | 8 drivers/net/ethernet/hisilicon/hns/hnae.c | 2 drivers/net/ethernet/hisilicon/hns/hns_enet.c | 30 + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 19 - drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 3 drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 4 drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 2 drivers/net/ethernet/mscc/ocelot_board.c | 12 drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 17 - drivers/net/ethernet/qlogic/qed/qed_hsi.h | 1 drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 8 drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 3 drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 3 drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h | 3 drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 12 drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 7 drivers/net/ethernet/realtek/r8169.c | 24 - drivers/net/ethernet/stmicro/stmmac/common.h | 4 drivers/net/ethernet/stmicro/stmmac/stmmac.h | 14 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 238 ++++++++------- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 5 drivers/net/ethernet/ti/Kconfig | 1 drivers/net/phy/phylink.c | 48 +-- drivers/net/phy/sfp-bus.c | 4 drivers/net/team/team.c | 6 drivers/net/tun.c | 43 +- drivers/net/usb/qmi_wwan.c | 1 drivers/net/usb/smsc75xx.c | 1 drivers/net/vxlan.c | 3 drivers/pci/controller/pci-hyperv.c | 37 ++ drivers/perf/arm_pmu.c | 8 drivers/pinctrl/intel/pinctrl-cannonlake.c | 2 drivers/pinctrl/pinctrl-mcp23s08.c | 13 drivers/s390/cio/vfio_ccw_cp.c | 2 drivers/scsi/qla2xxx/qla_target.h | 4 drivers/target/iscsi/iscsi_target.c | 22 - drivers/video/fbdev/aty/atyfb.h | 3 drivers/video/fbdev/aty/atyfb_base.c | 7 drivers/video/fbdev/aty/mach64_ct.c | 10 fs/afs/rxrpc.c | 2 fs/dax.c | 13 include/linux/cgroup-defs.h | 1 include/linux/netdevice.h | 7 include/linux/perf/arm_pmu.h | 1 include/linux/stmmac.h | 1 include/linux/virtio_net.h | 18 + include/net/bonding.h | 7 include/net/inet_sock.h | 6 include/net/ip_fib.h | 1 include/sound/hdaudio.h | 1 include/sound/soc-dapm.h | 1 kernel/bpf/btf.c | 2 kernel/cgroup/cgroup.c | 25 + lib/vsprintf.c | 2 mm/huge_memory.c | 6 mm/mmap.c | 2 mm/percpu.c | 1 mm/vmscan.c | 11 mm/vmstat.c | 1 net/bluetooth/smp.c | 16 - net/core/dev.c | 28 + net/core/ethtool.c | 1 net/core/filter.c | 3 net/core/rtnetlink.c | 41 +- net/dccp/input.c | 4 net/dccp/ipv4.c | 4 net/ipv4/fib_frontend.c | 12 net/ipv4/fib_semantics.c | 50 +++ net/ipv4/inet_connection_sock.c | 5 net/ipv4/ip_sockglue.c | 3 net/ipv4/ip_tunnel.c | 9 net/ipv4/route.c | 7 net/ipv4/tcp_input.c | 4 net/ipv4/tcp_ipv4.c | 4 net/ipv4/udp.c | 2 net/ipv6/addrconf.c | 4 net/ipv6/ip6_fib.c | 2 net/ipv6/ip6_tunnel.c | 13 net/ipv6/raw.c | 29 + net/ipv6/route.c | 5 net/netlabel/netlabel_unlabeled.c | 3 net/packet/af_packet.c | 11 net/sched/cls_u32.c | 10 net/sched/sch_api.c | 24 + net/sctp/transport.c | 12 net/tipc/socket.c | 4 scripts/subarch.include | 13 sound/hda/hdac_controller.c | 15 sound/soc/amd/acp-pcm-dma.c | 21 + sound/soc/codecs/max98373.c | 3 sound/soc/codecs/rt5514.c | 8 sound/soc/codecs/sigmadsp.c | 3 sound/soc/codecs/wm8804-i2c.c | 15 sound/soc/intel/skylake/skl.c | 2 sound/soc/qcom/qdsp6/q6routing.c | 4 sound/soc/sh/rcar/adg.c | 5 sound/soc/sh/rcar/core.c | 10 sound/soc/sh/rcar/dma.c | 4 sound/soc/soc-core.c | 4 sound/soc/soc-dapm.c | 4 tools/perf/scripts/python/export-to-postgresql.py | 9 tools/perf/scripts/python/export-to-sqlite.py | 6 tools/testing/selftests/android/Makefile | 2 tools/testing/selftests/android/config | 5 tools/testing/selftests/android/ion/Makefile | 2 tools/testing/selftests/android/ion/config | 5 tools/testing/selftests/cgroup/cgroup_util.c | 17 - tools/testing/selftests/efivarfs/config | 1 tools/testing/selftests/futex/functional/Makefile | 1 tools/testing/selftests/gpio/Makefile | 7 tools/testing/selftests/kselftest.h | 1 tools/testing/selftests/kvm/Makefile | 7 tools/testing/selftests/lib.mk | 12 tools/testing/selftests/memory-hotplug/config | 1 tools/testing/selftests/net/Makefile | 1 tools/testing/selftests/networking/timestamping/Makefile | 1 tools/testing/selftests/vm/Makefile | 4 160 files changed, 1294 insertions(+), 626 deletions(-)
Adrian Hunter (2):
perf script python: Fix export-to-postgresql.py occasional failure perf script python: Fix export-to-sqlite.py sample columns
Akshu Agrawal (1):
ASoC: AMD: Ensure reset bit is cleared before configuring
Al Viro (1):
net: sched: cls_u32: fix hnode refcounting
Alaa Hleihel (1):
net/mlx5: Check for SQ and not RQ state when modifying hairpin SQ
Amber Lin (1):
drm/amdgpu: Fix SDMA HQD destroy error on gfx_v7
Anders Roxell (2):
selftests: android: move config up a level
selftests: add headers_install to lib.mk
Antoine Tenart (2):
net: mvpp2: fix a txq_done race condition
net: mscc: fix the frame extraction into the skb
Baruch Siach (1):
net: phy: phylink: fix SFP interface autodetection
Charles Keepax (1):
ASoC: dapm: Fix NULL pointer deference on CODEC to CODEC DAIs
Chris Boot (1):
mmc: block: avoid multiblock reads for the last sector in SPI mode
Corentin Labbe (1):
net: ethernet: ti: add missing GENERIC_ALLOCATOR dependency
Damien Le Moal (2):
dm: fix report zone remapping to account for partition offset dm linear: fix linear_end_io conditional definition
Dan Carpenter (1):
scsi: qla2xxx: Fix an endian bug in fcpcmd_is_corrupted()
Dan Williams (1):
filesystem-dax: Fix dax_layout_busy_page() livelock
Danny Smith (1):
ASoC: sigmadsp: safeload should not have lower byte limit
David Ahern (3):
net: sched: Add policy validation for tc attributes
rtnetlink: Fail dump if target netnsid is invalid net/ipv6: Remove extra call to ip6_convert_metrics for multipath case
David Howells (2):
afs: Fix afs_server struct leak
afs: Fix clearance of reply
Davide Caratti (1):
bnxt_en: don't try to offload VLAN 'modify' action
Edgar Cherkasov (1):
i2c: i2c-scmi: fix for i2c_smbus_write_block_data
Eran Ben Elisha (1):
net/mlx5: E-Switch, Fix out of bound access when setting vport rate
Eric Dumazet (7):
ipv4: fix use-after-free in ip_cmsg_recv_dstaddr()
rtnl: limit IFLA_NUM_TX_QUEUES and IFLA_NUM_RX_QUEUES to 4096
tun: remove unused parameters
tun: initialize napi_mutex unconditionally
tun: napi flags belong to tfile
tcp/dccp: fix lockdep issue when SYN is backlogged
inet: make sure to grab rcu_read_lock before using ireq->ireq_opt
Eric Farman (1):
s390/cio: Fix how vfio-ccw checks pinned pages
Florian Fainelli (4):
net: dsa: bcm_sf2: Call setup during switch resume
net: systemport: Fix wake-up interrupt race during resume
net: dsa: bcm_sf2: Fix unbind ordering
net: dsa: b53: Keep CPU port as tagged in all VLANs
Friedemann Gerold (1):
net: aquantia: memory corruption on jumbo frames
Giacinto Cifelli (1):
qmi_wwan: Added support for Gemalto's Cinterion ALASxx WWAN interface
Greg Kroah-Hartman (1):
Linux 4.18.15
Guenter Roeck (4):
hwmon: (nct6775) Fix access to fan pulse registers
hwmon: (nct6775) Fix virtual temperature sources for NCT6796D
hwmon: (nct6775) Fix RPM output for fan7 on NCT6796D
hwmon: (nct6775) Use different register to get fan RPM for fan7
Hangbin Liu (1):
vxlan: fill ttl inherit info
Hans de Goede (2):
clk: x86: add "ether_clk" alias for Bay Trail / Cherry Trail
clk: x86: Stop marking clocks as CLK_IS_CRITICAL
Heiner Kallweit (1):
r8169: fix network stalls due to missing bit TXCFG_AUTO_FIFO
Hermes Zhang (1):
Bluetooth: hci_ldisc: Free rw_semaphore on close
Ido Schimmel (1):
team: Forbid enslaving team device to itself
Jakub Kicinski (1):
nfp: avoid soft lockups under control message storm
Jan Kara (1):
mm: Preserve _PAGE_DEVMAP across mprotect() calls
Jann Horn (2):
mm/vmstat.c: fix outdated vmstat_text
mm/mmap.c: don't clobber partially overlapping VMA with MAP_FIXED_NOREPLACE
Jay Kamat (1):
Fix cg_read_strcmp()
Jeff Barnhill (1):
net/ipv6: Display all addresses in output of /proc/net/if_inet6
Jianbo Liu (1):
net/mlx5e: Set vlan masks for all offloaded TC rules
Jianfeng Tan (1):
net/packet: fix packet drop as of virtio gso
Jiri Kosina (1):
udp: Unbreak modules that rely on external __skb_recv_udp() availability
Johan Hedberg (1):
Bluetooth: SMP: Fix trying to use non-existent local OOB data
Jongsung Kim (1):
stmmac: fix valid numbers of unicast filter entries
Jose Abreu (2):
net: stmmac: Fixup the tail addr setting in xmit path
net: stmmac: Rework coalesce timer and fix multi-queue races
Jérôme Glisse (1):
mm/thp: fix call to mmu_notifier in set_pmd_migration_entry() v2
Kuninori Morimoto (2):
ASoC: rsnd: adg: care clock-frequency size
ASoC: rsnd: don't fallback to PIO mode when -EPROBE_DEFER
Laura Abbott (1):
scsi: iscsi: target: Don't use stack buffer for scatterlist
Lei Yang (2):
selftests/efivarfs: add required kernel configs
selftests: memory-hotplug: add required configs
Lyude Paul (1):
drm/nouveau/drm/nouveau: Grab runtime PM ref in nv50_mstc_detect()
Maciej S. Szmigiero (1):
r8169: set RX_MULTI_EN bit in RxConfig for 8168F-family chips
Maciej Żenczykowski (1):
net-ethtool: ETHTOOL_GUFO did not and should not require CAP_NET_ADMIN
Mahesh Bandewar (3):
bonding: avoid possible dead-lock
bonding: pass link-local packets to bonding master also.
bonding: fix warning message
Marco Felsch (1):
pinctrl: mcp23s08: fix irq and irqchip setup order
Martin KaFai Lau (1):
bpf: btf: Fix end boundary calculation for type section
Matias Karhumaa (1):
Bluetooth: Use correct tfm to generate OOB data
Mauricio Faria de Oliveira (1):
rtnetlink: fix rtnl_fdb_dump() for ndmsg header
Maxime Chevallier (1):
net: mvpp2: Extract the correct ethtype from the skb for tx csum offload
Michael Chan (2):
bnxt_en: Fix TX timeout during netpoll.
bnxt_en: Fix VNIC reservations on the PF.
Mike Rapoport (2):
net/ipv6: stop leaking percpu memory in fib6 info
percpu: stop leaking bitmap metadata blocks
Mike Snitzer (1):
dm linear: eliminate linear_end_io call if CONFIG_DM_ZONED disabled
Mikulas Patocka (1):
mach64: detect the dot clock divider correctly on sparc
Nicholas Piggin (1):
KVM: PPC: Book3S HV: Don't use compound_order to determine host mapping size
Nicolas Ferre (2):
net: macb: disable scatter-gather for macb on sama5d3
ARM: dts: at91: add new compatibility string for macb on sama5d3
Oder Chiou (1):
ASoC: rt5514: Fix the issue of the delay volume applied again
Paolo Abeni (2):
ip6_tunnel: be careful when accessing the inner header
ip_tunnel: be careful when accessing the inner header
Parthasarathy Bhuvaragan (1):
tipc: fix flow control accounting for implicit connect
Paul Burton (2):
MIPS: Fix CONFIG_CMDLINE handling
MIPS: VDSO: Always map near top of user memory
Paul Mackerras (1):
KVM: PPC: Book3S HV: Avoid crash from THP collapse during radix page fault
Pierre-Louis Bossart (1):
ASoC: wm8804: Add ACPI support
Ramses Ramírez (1):
Input: xpad - add support for Xbox1 PDP Camo series gamepad
Roman Gushchin (1):
mm: slowly shrink slabs with a relatively small number of objects
Russell King (1):
sfp: fix oops with ethtool -m
Ryan Lee (2):
ASoC: max98373: Added speaker FS gain cotnrol register to volatile.
ASoC: max98373: Added 10ms sleep after amp software reset
Sabrina Dubroca (2):
net: ipv4: update fnhe_pmtu when first hop's MTU changes
net: ipv4: don't let PMTU updates increase route MTU
Sean Tranchetti (2):
netlabel: check for IPV4MASK in addrinfo_get
net: qualcomm: rmnet: Skip processing loopback packets
Shahed Shaikh (1):
qlcnic: fix Tx descriptor corruption on 82xx devices
Shenghui Wang (1):
dm cache: destroy migration_cache if cache target registration failed
Simon Detheridge (1):
pinctrl: cannonlake: Fix gpio base for GPP-E
Srinivas Kandagatla (1):
ASoC: q6routing: initialize data correctly
Stephen Hemminger (1):
PCI: hv: support reporting serial number as slot information
Steven Rostedt (VMware) (1):
vsprintf: Fix off-by-one bug in bstr_printf() processing dereferenced pointers
Subash Abhinov Kasiviswanathan (2):
net: qualcomm: rmnet: Fix incorrect allocation flag in transmit
net: qualcomm: rmnet: Fix incorrect allocation flag in receive path
Sudarsana Reddy Kalluru (1):
qed: Fix shmem structure inconsistency between driver and the mfw.
Tejun Heo (1):
cgroup: Fix dom_cgrp propagation when enabling threaded mode
Thiago Jung Bauermann (1):
selftests: kselftest: Remove outdated comment
Tony Lindgren (1):
mfd: omap-usb-host: Fix dts probe of children
Tushar Dave (1):
bpf: use __GFP_COMP while allocating page
Vasundhara Volam (2):
bnxt_en: Fix enables field in HWRM_QUEUE_COS2BW_CFG request
bnxt_en: get the reduced max_irqs by the ones used by RDMA
Venkat Duvvuru (1):
bnxt_en: free hwrm resources, if driver probe fails.
Vitaly Kuznetsov (1):
x86/kvm/lapic: always disable MMIO interface in x2APIC mode
Wei Wang (1):
ipv6: take rcu lock in rawv6_send_hdrinc()
Will Deacon (1):
arm64: perf: Reject stand-alone CHAIN events for PMUv3
Xin Long (1):
sctp: update dst pmtu with the correct daddr
Yong Zhao (2):
drm/amdkfd: Change the control stack MTYPE from UC to NC on GFX9 drm/amdkfd: Fix ATS capablity was not reported correctly on some APUs
Yu Zhao (3):
net/usb: cancel pending work when unbinding smsc75xx
sound: enable interrupt after dma buffer initialization
sound: don't call skl_init_chip() to reset intel skl soc
Yunsheng Lin (1):
net: hns: fix for unmapping problem when SMMU is on
zhong jiang (1):
drm/pl111: Make sure of_device_id tables are NULL terminated
Greg KH
maintainerDocumentation/devicetree/bindings/net/macb.txt +1 -0
@@ -10,6 +10,7 @@ Required properties: Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on the Cadence GEM, or the generic form: "cdns,gem". Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs. + Use "atmel,sama5d3-macb" for the 10/100Mbit IP available on Atmel sama5d3 SoCs. Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs. Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs. Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.
Makefile +2 -14
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 18 -SUBLEVEL = 14 +SUBLEVEL = 15 EXTRAVERSION = NAME = Merciless Moray
@@ -298,19 +298,7 @@ KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION -# SUBARCH tells the usermode build what the underlying arch is. That is set -# first, and if a usermode build is happening, the "ARCH=um" on the command -# line overrides the setting of ARCH below. If a native build is happening, -# then ARCH is assigned, getting whatever value it gets normally, and -# SUBARCH is subsequently ignored. - -SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \ - -e s/sun4u/sparc64/ \ - -e s/arm.*/arm/ -e s/sa110/arm/ \ - -e s/s390x/s390/ -e s/parisc64/parisc/ \ - -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ - -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \ - -e s/riscv.*/riscv/) +include scripts/subarch.include # Cross compiling and selecting different set of gcc/bin-utils # ---------------------------------------------------------------------------
arch/arm/boot/dts/sama5d3_emac.dtsi +1 -1
@@ -41,7 +41,7 @@ }; macb1: ethernet@f802c000 { - compatible = "cdns,at91sam9260-macb", "cdns,macb"; + compatible = "atmel,sama5d3-macb", "cdns,at91sam9260-macb", "cdns,macb"; reg = <0xf802c000 0x100>; interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>; pinctrl-names = "default";
arch/arm64/kernel/perf_event.c +7 -0
@@ -823,6 +823,12 @@ static int armv8pmu_set_event_filter(struct hw_perf_event *event,return 0 ; } +static int armv8pmu_filter_match (struct perf_event *event) +{ +unsigned long evtype = event->hw.config_base &ARMV8_PMU_EVTYPE_EVENT ; +return evtype !=ARMV8_PMUV3_PERFCTR_CHAIN ; +} +static void armv8pmu_reset (void *info) {struct arm_pmu *cpu_pmu = (struct arm_pmu *)info;
@@ -968,6 +974,7 @@ static int armv8_pmu_init(struct arm_pmu *cpu_pmu) cpu_pmu->reset = armv8pmu_reset, cpu_pmu->max_period = (1LLU <<32 ) -1 , cpu_pmu->set_event_filter = armv8pmu_set_event_filter; + cpu_pmu->filter_match = armv8pmu_filter_match;return 0 ; }
arch/mips/include/asm/processor.h +5 -5
@@ -13,6 +13,7 @@#include <linux/atomic.h> #include <linux/cpumask.h> +#include <linux/sizes.h> #include <linux/threads.h> #include <asm/cachectl.h>
@@ -80,11 +81,10 @@ extern unsigned int vced_count, vcei_count;#endif -/* -* One page above the stack is used for branch delay slot "emulation". -* See dsemul.c for details. -*/ -#define STACK_TOP ((TASK_SIZE & PAGE_MASK) - PAGE_SIZE) +#define VDSO_RANDOMIZE_SIZE (TASK_IS_32BIT_ADDR ? SZ_1M : SZ_256M) + +extern unsigned long mips_stack_top (void ); +#define STACK_TOP mips_stack_top()/* * This decides where the kernel will search for a free chunk of vm
arch/mips/kernel/process.c +25 -0
@@ -31,6 +31,7 @@#include <linux/prctl.h> #include <linux/nmi.h> +#include <asm/abi.h> #include <asm/asm.h> #include <asm/bootinfo.h> #include <asm/cpu.h>
@@ -38,6 +39,7 @@#include <asm/dsp.h> #include <asm/fpu.h> #include <asm/irq.h> +#include <asm/mips-cps.h> #include <asm/msa.h> #include <asm/pgtable.h> #include <asm/mipsregs.h>
@@ -644,6 +646,29 @@ unsigned long get_wchan(struct task_struct *task)return pc; } +unsigned long mips_stack_top (void ) +{ +unsigned long top =TASK_SIZE &PAGE_MASK ; + +/* One page for branch delay slot "emulation" */ + top -=PAGE_SIZE ; + +/* Space for the VDSO, data page & GIC user page */ + top -=PAGE_ALIGN (current->thread.abi->vdso->size); + top -=PAGE_SIZE ; + top -=mips_gic_present () ?PAGE_SIZE :0 ; + +/* Space for cache colour alignment */ +if (cpu_has_dc_aliases) + top -= shm_align_mask +1 ; + +/* Space to randomize the VDSO base */ +if (current->flags &PF_RANDOMIZE ) + top -=VDSO_RANDOMIZE_SIZE ; + +return top; +} +/* * Don't forget that the stack pointer must be aligned on a 8 bytes * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
arch/mips/kernel/setup.c +28 -20
60 lines not on this page · raw message
arch/mips/kernel/vdso.c +17 -1
@@ -15,6 +15,7 @@#include <linux/ioport.h> #include <linux/kernel.h> #include <linux/mm.h> +#include <linux/random.h> #include <linux/sched.h> #include <linux/slab.h> #include <linux/timekeeper_internal.h>
@@ -97,6 +98,21 @@ void update_vsyscall_tz(void) } } +static unsigned long vdso_base (void ) +{ +unsigned long base; + +/* Skip the delay slot emulation page */ + base =STACK_TOP +PAGE_SIZE ; + +if (current->flags &PF_RANDOMIZE ) { + base +=get_random_int () & (VDSO_RANDOMIZE_SIZE -1 ); + base =PAGE_ALIGN (base); + } + +return base; +} +int arch_setup_additional_pages (struct linux_binprm *bprm,int uses_interp) {struct mips_vdso_image *image = current->thread.abi->vdso;
@@ -137,7 +153,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)if (cpu_has_dc_aliases) size += shm_align_mask +1 ; - base =get_unmapped_area (NULL ,0 , size,0 ,0 ); + base =get_unmapped_area (NULL ,vdso_base (), size,0 ,0 );if (IS_ERR_VALUE (base)) { ret = base; goto out;
arch/powerpc/include/asm/book3s/64/pgtable.h +2 -2
@@ -104,7 +104,7 @@*/ #define _HPAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY | \ _PAGE_ACCESSED | H_PAGE_THP_HUGE | _PAGE_PTE | \ - _PAGE_SOFT_DIRTY) + _PAGE_SOFT_DIRTY | _PAGE_DEVMAP)/* * user access blocked by key */
@@ -122,7 +122,7 @@*/ #define _PAGE_CHG_MASK (PTE_RPN_MASK | _PAGE_HPTEFLAGS | _PAGE_DIRTY | \ _PAGE_ACCESSED | _PAGE_SPECIAL | _PAGE_PTE | \ - _PAGE_SOFT_DIRTY) + _PAGE_SOFT_DIRTY | _PAGE_DEVMAP)#define H_PTE_PKEY (H_PTE_PKEY_BIT0 | H_PTE_PKEY_BIT1 | H_PTE_PKEY_BIT2 | \ H_PTE_PKEY_BIT3 | H_PTE_PKEY_BIT4)
arch/powerpc/kvm/book3s_64_mmu_radix.c +47 -54
127 lines not on this page · raw message
arch/x86/include/asm/pgtable_types.h +1 -1
@@ -123,7 +123,7 @@*/ #define _PAGE_CHG_MASK (PTE_PFN_MASK | _PAGE_PCD | _PAGE_PWT | \ _PAGE_SPECIAL | _PAGE_ACCESSED | _PAGE_DIRTY | \ - _PAGE_SOFT_DIRTY) + _PAGE_SOFT_DIRTY | _PAGE_DEVMAP)#define _HPAGE_CHG_MASK (_PAGE_CHG_MASK | _PAGE_PSE)/*
arch/x86/include/uapi/asm/kvm.h +1 -0
@@ -377,5 +377,6 @@ struct kvm_sync_regs {#define KVM_X86_QUIRK_LINT0_REENABLED (1 << 0)#define KVM_X86_QUIRK_CD_NW_CLEARED (1 << 1) +#define KVM_X86_QUIRK_LAPIC_MMIO_HOLE (1 << 2)#endif /* _ASM_X86_KVM_H */
arch/x86/kvm/lapic.c +19 -3
@@ -1291,9 +1291,8 @@ EXPORT_SYMBOL_GPL(kvm_lapic_reg_read);static int apic_mmio_in_range (struct kvm_lapic *apic,gpa_t addr) { -return kvm_apic_hw_enabled (apic) && - addr >= apic->base_address && - addr < apic->base_address +LAPIC_MMIO_LENGTH ; +return addr >= apic->base_address && + addr < apic->base_address +LAPIC_MMIO_LENGTH ; } static int apic_mmio_read(struct kvm_vcpu *vcpu, struct kvm_io_device *this,
@@ -1305,6 +1304,15 @@ static int apic_mmio_read(struct kvm_vcpu *vcpu, struct kvm_io_device *this,if (!apic_mmio_in_range (apic, address))return -EOPNOTSUPP ; +if (!kvm_apic_hw_enabled (apic) ||apic_x2apic_mode (apic)) { +if (!kvm_check_has_quirk (vcpu->kvm, +KVM_X86_QUIRK_LAPIC_MMIO_HOLE )) +return -EOPNOTSUPP ; + +memset (data,0xff , len); +return 0 ; + } +kvm_lapic_reg_read (apic, offset, len, data);return 0 ;
@@ -1864,6 +1872,14 @@ static int apic_mmio_write(struct kvm_vcpu *vcpu, struct kvm_io_device *this,if (!apic_mmio_in_range (apic, address))return -EOPNOTSUPP ; +if (!kvm_apic_hw_enabled (apic) ||apic_x2apic_mode (apic)) { +if (!kvm_check_has_quirk (vcpu->kvm, +KVM_X86_QUIRK_LAPIC_MMIO_HOLE )) +return -EOPNOTSUPP ; + +return 0 ; + } +/* * APIC register must be aligned on 128-bits boundary. * 32/64/128 bits registers must be accessed thru 32 bits.
drivers/bluetooth/hci_ldisc.c +2 -0
@@ -543,6 +543,8 @@ static void hci_uart_tty_close(struct tty_struct *tty) }clear_bit (HCI_UART_PROTO_SET , &hu->flags); +percpu_free_rwsem (&hu->proto_lock); +kfree (hu); }
drivers/clk/x86/clk-pmc-atom.c +11 -7
@@ -55,6 +55,7 @@ struct clk_plt_data {u8 nparents;struct clk_plt *clks[PMC_CLK_NUM ];struct clk_lookup *mclk_lookup; +struct clk_lookup *ether_clk_lookup; };/* Return an index in parent table */
@@ -186,13 +187,6 @@ static struct clk_plt *plt_clk_register(struct platform_device *pdev, int id, pclk->reg = base +PMC_CLK_CTL_OFFSET + id *PMC_CLK_CTL_SIZE ;spin_lock_init (&pclk->lock); -/* -* If the clock was already enabled by the firmware mark it as critical -* to avoid it being gated by the clock framework if no driver owns it. -*/ -if (plt_clk_is_enabled (&pclk->hw)) - init.flags |=CLK_IS_CRITICAL ; - ret =devm_clk_hw_register (&pdev->dev, &pclk->hw);if (ret) { pclk =ERR_PTR (ret);
@@ -351,11 +345,20 @@ static int plt_clk_probe(struct platform_device *pdev) goto err_unreg_clk_plt; } + data->ether_clk_lookup =clkdev_hw_create (&data->clks[4 ]->hw, +"ether_clk" ,NULL ); +if (!data->ether_clk_lookup) { + err = -ENOMEM ; + goto err_drop_mclk; + } +plt_clk_free_parent_names_loop (parent_names, data->nparents);platform_set_drvdata (pdev, data);return 0 ; +err_drop_mclk: +clkdev_drop (data->mclk_lookup); err_unreg_clk_plt:plt_clk_unregister_loop (data, i);plt_clk_unregister_parents (data);
@@ -369,6 +372,7 @@ static int plt_clk_remove(struct platform_device *pdev) data =platform_get_drvdata (pdev); +clkdev_drop (data->ether_clk_lookup);clkdev_drop (data->mclk_lookup);plt_clk_unregister_loop (data,PMC_CLK_NUM );plt_clk_unregister_parents (data);
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +5 -1
@@ -245,7 +245,7 @@ int amdgpu_amdkfd_resume(struct amdgpu_device *adev)int alloc_gtt_mem (struct kgd_dev *kgd,size_t size,void **mem_obj,uint64_t *gpu_addr, -void **cpu_ptr) +void **cpu_ptr,bool mqd_gfx9) {struct amdgpu_device *adev = (struct amdgpu_device *)kgd;struct amdgpu_bo *bo =NULL ;
@@ -261,6 +261,10 @@ int alloc_gtt_mem(struct kgd_dev *kgd, size_t size, bp.flags =AMDGPU_GEM_CREATE_CPU_GTT_USWC ; bp.type = ttm_bo_type_kernel; bp.resv =NULL ; + +if (mqd_gfx9) + bp.flags |=AMDGPU_GEM_CREATE_MQD_GFX9 ; + r =amdgpu_bo_create (adev, &bp, &bo);if (r) { dev_err(adev->dev,
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +1 -1
@@ -129,7 +129,7 @@ bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid);/* Shared API */ int alloc_gtt_mem (struct kgd_dev *kgd,size_t size,void **mem_obj,uint64_t *gpu_addr, -void **cpu_ptr); +void **cpu_ptr,bool mqd_gfx9);void free_gtt_mem (struct kgd_dev *kgd,void *mem_obj);void get_local_mem_info (struct kgd_dev *kgd,struct kfd_local_mem_info *mem_info);
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c +1 -1
@@ -677,7 +677,7 @@ static int kgd_hqd_sdma_destroy(struct kgd_dev *kgd, void *mqd,while (true) { temp =RREG32 (sdma_base_addr + mmSDMA0_RLC0_CONTEXT_STATUS); -if (temp &SDMA0_STATUS_REG__RB_CMD_IDLE__SHIFT ) +if (temp &SDMA0_RLC0_CONTEXT_STATUS__IDLE_MASK )break ;if (time_after (jiffies, end_jiffies))return -ETIME ;
drivers/gpu/drm/amd/amdkfd/kfd_device.c +2 -1
@@ -423,7 +423,8 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd,if (kfd->kfd2kgd->init_gtt_mem_allocation ( kfd->kgd, size, &kfd->gtt_mem, - &kfd->gtt_start_gpu_addr, &kfd->gtt_start_cpu_ptr)){ + &kfd->gtt_start_gpu_addr, &kfd->gtt_start_cpu_ptr, + false)) {dev_err (kfd_device,"Could not allocate %d bytes\n" , size); goto out; }
drivers/gpu/drm/amd/amdkfd/kfd_iommu.c +12 -1
@@ -62,9 +62,20 @@ int kfd_iommu_device_init(struct kfd_dev *kfd)struct amd_iommu_device_info iommu_info;unsigned int pasid_limit;int err; +struct kfd_topology_device *top_dev; -if (!kfd->device_info->needs_iommu_device) + top_dev =kfd_topology_device_by_id (kfd->id); + +/* +* Overwrite ATS capability according to needs_iommu_device to fix +* potential missing corresponding bit in CRAT of BIOS. +*/ +if (!kfd->device_info->needs_iommu_device) { + top_dev->node_props.capability &= ~HSA_CAP_ATS_PRESENT ;return 0 ; + } + + top_dev->node_props.capability |=HSA_CAP_ATS_PRESENT ; iommu_info.flags =0 ; err =amd_iommu_device_info (kfd->pdev, &iommu_info);
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +1 -1
@@ -63,7 +63,7 @@ static int init_mqd(struct mqd_manager *mm, void **mqd,ALIGN (sizeof (struct v9_mqd ),PAGE_SIZE ), &((*mqd_mem_obj)->gtt_mem), &((*mqd_mem_obj)->gpu_addr), - (void *)&((*mqd_mem_obj)->cpu_ptr)); + (void *)&((*mqd_mem_obj)->cpu_ptr), true); }else retval =kfd_gtt_sa_allocate (mm->dev,sizeof (struct v9_mqd ), mqd_mem_obj);
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +1 -0
@@ -796,6 +796,7 @@ int kfd_topology_add_device(struct kfd_dev *gpu);int kfd_topology_remove_device (struct kfd_dev *gpu);struct kfd_topology_device *kfd_topology_device_by_proximity_domain (uint32_t proximity_domain); +struct kfd_topology_device *kfd_topology_device_by_id (uint32_t gpu_id);struct kfd_dev *kfd_device_by_id (uint32_t gpu_id);struct kfd_dev *kfd_device_by_pci_dev (const struct pci_dev *pdev);int kfd_topology_enum_kfd_devices (uint8_t idx,struct kfd_dev **kdev);
drivers/gpu/drm/amd/amdkfd/kfd_topology.c +16 -5
@@ -63,22 +63,33 @@ struct kfd_topology_device *kfd_topology_device_by_proximity_domain(return device; } -struct kfd_dev *kfd_device_by_id (uint32_t gpu_id) +struct kfd_topology_device *kfd_topology_device_by_id (uint32_t gpu_id) { -struct kfd_topology_device *top_dev; -struct kfd_dev *device =NULL ; +struct kfd_topology_device *top_dev =NULL ; +struct kfd_topology_device *ret =NULL ;down_read (&topology_lock);list_for_each_entry (top_dev, &topology_device_list, list)if (top_dev->gpu_id == gpu_id) { - device = top_dev->gpu; + ret = top_dev;break ; }up_read (&topology_lock); -return device; +return ret; +} + +struct kfd_dev *kfd_device_by_id (uint32_t gpu_id) +{ +struct kfd_topology_device *top_dev; + + top_dev =kfd_topology_device_by_id (gpu_id); +if (!top_dev) +return NULL ; + +return top_dev->gpu; }struct kfd_dev *kfd_device_by_pci_dev (const struct pci_dev *pdev)
drivers/gpu/drm/amd/include/kgd_kfd_interface.h +1 -1
@@ -266,7 +266,7 @@ struct tile_config {struct kfd2kgd_calls {int (*init_gtt_mem_allocation)(struct kgd_dev *kgd,size_t size,void **mem_obj,uint64_t *gpu_addr, -void **cpu_ptr); +void **cpu_ptr,bool mqd_gfx9);void (*free_gtt_mem)(struct kgd_dev *kgd,void *mem_obj);
drivers/gpu/drm/nouveau/dispnv50/disp.c +14 -1
@@ -875,9 +875,22 @@ static enum drm_connector_status nv50_mstc_detect(struct drm_connector *connector, bool force) {struct nv50_mstc *mstc =nv50_mstc (connector); +enum drm_connector_status conn_status; +int ret; +if (!mstc->port)return connector_status_disconnected; -return drm_dp_mst_detect_port (connector, mstc->port->mgr, mstc->port); + + ret =pm_runtime_get_sync (connector->dev->dev); +if (ret <0 && ret != -EACCES ) +return connector_status_disconnected; + + conn_status =drm_dp_mst_detect_port (connector, mstc->port->mgr, + mstc->port); + +pm_runtime_mark_last_busy (connector->dev->dev); +pm_runtime_put_autosuspend (connector->dev->dev); +return conn_status; } static void
drivers/gpu/drm/pl111/pl111_vexpress.c +2 -1
@@ -111,7 +111,8 @@ static int vexpress_muxfpga_probe(struct platform_device *pdev) }static const struct of_device_id vexpress_muxfpga_match[] = { - { .compatible ="arm,vexpress-muxfpga" , } + { .compatible ="arm,vexpress-muxfpga" , }, + {} };static struct platform_driver vexpress_muxfpga_driver = {
drivers/hwmon/nct6775.c +48 -22
240 lines not on this page · raw message
drivers/i2c/busses/i2c-scmi.c +1 -0
@@ -152,6 +152,7 @@ acpi_smbus_cmi_access(struct i2c_adapter *adap, u16 addr, unsigned short flags, mt_params[3 ].type =ACPI_TYPE_INTEGER ; mt_params[3 ].integer.value = len; mt_params[4 ].type =ACPI_TYPE_BUFFER ; + mt_params[4 ].buffer.length = len; mt_params[4 ].buffer.pointer = data->block +1 ; }break ;
drivers/input/joystick/xpad.c +3 -0
@@ -231,6 +231,7 @@ static const struct xpad_device { { 0x0e6f, 0x0246, "Rock Candy Gamepad for Xbox One 2015", 0, XTYPE_XBOXONE }, { 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE }, { 0x0e6f, 0x02a4, "PDP Wired Controller for Xbox One - Stealth Series", 0, XTYPE_XBOXONE }, + { 0x0e6f, 0x02a6, "PDP Wired Controller for Xbox One - Camo Series", 0, XTYPE_XBOXONE }, { 0x0e6f, 0x0301, "Logic3 Controller", 0, XTYPE_XBOX360 }, { 0x0e6f, 0x0346, "Rock Candy Gamepad for Xbox One 2016", 0, XTYPE_XBOXONE }, { 0x0e6f, 0x0401, "Logic3 Controller", 0, XTYPE_XBOX360 },
@@ -530,6 +531,8 @@ static const struct xboxone_init_packet xboxone_init_packets[] = {XBOXONE_INIT_PKT (0x0e6f ,0x02ab , xboxone_pdp_init2),XBOXONE_INIT_PKT (0x0e6f ,0x02a4 , xboxone_pdp_init1),XBOXONE_INIT_PKT (0x0e6f ,0x02a4 , xboxone_pdp_init2), +XBOXONE_INIT_PKT (0x0e6f ,0x02a6 , xboxone_pdp_init1), +XBOXONE_INIT_PKT (0x0e6f ,0x02a6 , xboxone_pdp_init2),XBOXONE_INIT_PKT (0x24c6 ,0x541a , xboxone_rumblebegin_init),XBOXONE_INIT_PKT (0x24c6 ,0x542a , xboxone_rumblebegin_init), XBOXONE_INIT_PKT(0x24c6, 0x543a, xboxone_rumblebegin_init),
drivers/md/dm-cache-target.c +2 -3
@@ -3492,14 +3492,13 @@ static int __init dm_cache_init(void)int r; migration_cache =KMEM_CACHE (dm_cache_migration,0 ); -if (!migration_cache) { -dm_unregister_target (&cache_target); +if (!migration_cache)return -ENOMEM ; - } r =dm_register_target (&cache_target);if (r) {DMERR ("cache target registration failed: %d" , r); +kmem_cache_destroy (migration_cache);return r; }
drivers/md/dm-flakey.c +2 -0
@@ -467,7 +467,9 @@ static int flakey_iterate_devices(struct dm_target *ti, iterate_devices_callout_static struct target_type flakey_target = { .name ="flakey" , .version = {1 ,5 ,0 }, +#ifdef CONFIG_BLK_DEV_ZONED .features =DM_TARGET_ZONED_HM , +#endif .module =THIS_MODULE , .ctr = flakey_ctr, .dtr = flakey_dtr,
drivers/md/dm-linear.c +7 -1
@@ -102,6 +102,7 @@ static int linear_map(struct dm_target *ti, struct bio *bio)return DM_MAPIO_REMAPPED ; } +#ifdef CONFIG_BLK_DEV_ZONED static int linear_end_io (struct dm_target *ti,struct bio *bio,blk_status_t *error) {
@@ -112,6 +113,7 @@ static int linear_end_io(struct dm_target *ti, struct bio *bio, return DM_ENDIO_DONE; } +#endif static void linear_status (struct dm_target *ti,status_type_t type,unsigned status_flags,char *result,unsigned maxlen)
@@ -208,12 +210,16 @@ static size_t linear_dax_copy_to_iter(struct dm_target *ti, pgoff_t pgoff,static struct target_type linear_target = { .name ="linear" , .version = {1 ,4 ,0 }, +#ifdef CONFIG_BLK_DEV_ZONED + .end_io = linear_end_io, .features =DM_TARGET_PASSES_INTEGRITY |DM_TARGET_ZONED_HM , +#else + .features =DM_TARGET_PASSES_INTEGRITY , +#endif .module =THIS_MODULE , .ctr = linear_ctr, .dtr = linear_dtr, .map = linear_map, - .end_io = linear_end_io, .status = linear_status, .prepare_ioctl = linear_prepare_ioctl, .iterate_devices = linear_iterate_devices,
drivers/md/dm.c +20 -7
@@ -1153,12 +1153,14 @@ void dm_accept_partial_bio(struct bio *bio, unsigned n_sectors)EXPORT_SYMBOL_GPL (dm_accept_partial_bio);/* -* The zone descriptors obtained with a zone report indicate -* zone positions within the target device. The zone descriptors -* must be remapped to match their position within the dm device. -* A target may call dm_remap_zone_report after completion of a -* REQ_OP_ZONE_REPORT bio to remap the zone descriptors obtained -* from the target device mapping to the dm device. +* The zone descriptors obtained with a zone report indicate zone positions +* within the target backing device, regardless of that device is a partition +* and regardless of the target mapping start sector on the device or partition. +* The zone descriptors start sector and write pointer position must be adjusted +* to match their relative position within the dm device. +* A target may call dm_remap_zone_report() after completion of a +* REQ_OP_ZONE_REPORT bio to remap the zone descriptors obtained from the +* backing device. */ void dm_remap_zone_report (struct dm_target *ti,struct bio *bio,sector_t start) {
@@ -1169,6 +1171,7 @@ void dm_remap_zone_report(struct dm_target *ti, struct bio *bio, sector_t start)struct blk_zone *zone;unsigned int nr_rep =0 ;unsigned int ofst; +sector_t part_offset;struct bio_vec bvec;struct bvec_iter iter;void *addr;
@@ -1176,6 +1179,15 @@ void dm_remap_zone_report(struct dm_target *ti, struct bio *bio, sector_t start)if (bio->bi_status)return ; +/* +* bio sector was incremented by the request size on completion. Taking +* into account the original request sector, the target start offset on +* the backing device and the target mapping offset (ti->begin), the +* start sector of the backing device. The partition offset is always 0 +* if the target uses a whole device. +*/ + part_offset = bio->bi_iter.bi_sector + ti->begin - (start +bio_end_sector (report_bio)); +/* * Remap the start sector of the reported zones. For sequential zones, * also remap the write pointer position.
@@ -1193,6 +1205,7 @@ void dm_remap_zone_report(struct dm_target *ti, struct bio *bio, sector_t start)/* Set zones start sector */ while (hdr->nr_zones && ofst < bvec.bv_len) { zone = addr + ofst; + zone->start -= part_offset;if (zone->start >= start + ti->len) { hdr->nr_zones =0 ;break ;
@@ -1204,7 +1217,7 @@ void dm_remap_zone_report(struct dm_target *ti, struct bio *bio, sector_t start)else if (zone->cond ==BLK_ZONE_COND_EMPTY ) zone->wp = zone->start;else - zone->wp = zone->wp + ti->begin - start; + zone->wp = zone->wp + ti->begin - start - part_offset; } ofst +=sizeof (struct blk_zone ); hdr->nr_zones--;
drivers/mfd/omap-usb-host.c +6 -5
@@ -528,8 +528,8 @@ static int usbhs_omap_get_dt_pdata(struct device *dev, }static const struct of_device_id usbhs_child_match_table[] = { - { .compatible ="ti,omap-ehci" , }, - { .compatible ="ti,omap-ohci" , }, + { .compatible ="ti,ehci-omap" , }, + { .compatible ="ti,ohci-omap3" , }, { } };
@@ -855,6 +855,7 @@ static struct platform_driver usbhs_omap_driver = { .pm = &usbhsomap_dev_pm_ops, .of_match_table = usbhs_omap_dt_ids, }, + .probe = usbhs_omap_probe, .remove = usbhs_omap_remove, };
@@ -864,9 +865,9 @@ MODULE_ALIAS("platform:" USBHS_DRIVER_NAME);MODULE_LICENSE ("GPL v2" );MODULE_DESCRIPTION ("usb host common core driver for omap EHCI and OHCI" ); -static int __init omap_usbhs_drvinit (void ) +static int omap_usbhs_drvinit (void ) { -return platform_driver_probe (&usbhs_omap_driver, usbhs_omap_probe); +return platform_driver_register (&usbhs_omap_driver); }/*
@@ -878,7 +879,7 @@ static int __init omap_usbhs_drvinit(void)*/ fs_initcall_sync (omap_usbhs_drvinit); -static void __exit omap_usbhs_drvexit(void) +static void omap_usbhs_drvexit (void ) {platform_driver_unregister (&usbhs_omap_driver); }
drivers/mmc/core/block.c +10 -0
@@ -1370,6 +1370,16 @@ static void mmc_blk_data_prep(struct mmc_queue *mq, struct mmc_queue_req *mqrq, brq->data.blocks = card->host->max_blk_count;if (brq->data.blocks >1 ) { +/* +* Some SD cards in SPI mode return a CRC error or even lock up +* completely when trying to read the last block using a +* multiblock read command. +*/ +if (mmc_host_is_spi (card->host) && (rq_data_dir (req) ==READ ) && + (blk_rq_pos (req) +blk_rq_sectors (req) == +get_capacity (md->disk))) + brq->data.blocks--; +/* * After a read error, we redo the request one sector * at a time in order to accurately determine which
drivers/net/bonding/bond_main.c +37 -28
103 lines not on this page · raw message
drivers/net/dsa/b53/b53_common.c +2 -2
@@ -1107,7 +1107,7 @@ void b53_vlan_add(struct dsa_switch *ds, int port,b53_get_vlan_entry (dev, vid, vl); vl->members |=BIT (port); -if (untagged) +if (untagged && !dsa_is_cpu_port (ds, port)) vl->untag |=BIT (port);else vl->untag &= ~BIT (port);
@@ -1149,7 +1149,7 @@ int b53_vlan_del(struct dsa_switch *ds, int port, pvid =0 ; } -if (untagged) +if (untagged && !dsa_is_cpu_port (ds, port)) vl->untag &= ~(BIT (port));b53_set_vlan_entry (dev, vid, vl);
drivers/net/dsa/bcm_sf2.c +3 -11
@@ -698,7 +698,6 @@ static int bcm_sf2_sw_suspend(struct dsa_switch *ds)static int bcm_sf2_sw_resume (struct dsa_switch *ds) {struct bcm_sf2_priv *priv =bcm_sf2_to_priv (ds); -unsigned int port;int ret; ret =bcm_sf2_sw_rst (priv);
@@ -710,14 +709,7 @@ static int bcm_sf2_sw_resume(struct dsa_switch *ds)if (priv->hw_params.num_gphy ==1 )bcm_sf2_gphy_enable_set (ds, true); -for (port =0 ; port <DSA_MAX_PORTS ; port++) { -if (dsa_is_user_port (ds, port)) -bcm_sf2_port_setup (ds, port,NULL ); -else if (dsa_is_cpu_port (ds, port)) -bcm_sf2_imp_setup (ds, port); - } - -bcm_sf2_enable_acb (ds); + ds->ops->setup (ds);return 0 ; }
@@ -1168,10 +1160,10 @@ static int bcm_sf2_sw_remove(struct platform_device *pdev) {struct bcm_sf2_priv *priv =platform_get_drvdata (pdev); -/* Disable all ports and interrupts */ priv->wol_ports_mask =0 ; -bcm_sf2_sw_suspend (priv->dev->ds);dsa_unregister_switch (priv->dev->ds); +/* Disable all ports and interrupts */ +bcm_sf2_sw_suspend (priv->dev->ds);bcm_sf2_mdio_unregister (priv);return 0 ;
drivers/net/ethernet/aquantia/atlantic/aq_ring.c +18 -14
@@ -225,9 +225,10 @@ int aq_ring_rx_clean(struct aq_ring_s *self, }/* for single fragment packets use build_skb() */ -if (buff->is_eop) { +if (buff->is_eop && + buff->len <=AQ_CFG_RX_FRAME_MAX -AQ_SKB_ALIGN ) { skb =build_skb (page_address (buff->page), - buff->len +AQ_SKB_ALIGN ); +AQ_CFG_RX_FRAME_MAX );if (unlikely (!skb)) { err = -ENOMEM ; goto err_exit;
@@ -247,18 +248,21 @@ int aq_ring_rx_clean(struct aq_ring_s *self, buff->len -ETH_HLEN , SKB_TRUESIZE(buff->len - ETH_HLEN)); -for (i =1U , next_ = buff->next, - buff_ = &self->buff_ring[next_]; true; - next_ = buff_->next, - buff_ = &self->buff_ring[next_], ++i) { -skb_add_rx_frag (skb, i, buff_->page,0 , - buff_->len, -SKB_TRUESIZE (buff->len - -ETH_HLEN )); - buff_->is_cleaned =1 ; - -if (buff_->is_eop) -break ; +if (!buff->is_eop) { +for (i =1U , next_ = buff->next, + buff_ = &self->buff_ring[next_]; + true; next_ = buff_->next, + buff_ = &self->buff_ring[next_], ++i) { +skb_add_rx_frag (skb, i, + buff_->page,0 , + buff_->len, +SKB_TRUESIZE (buff->len - +ETH_HLEN )); + buff_->is_cleaned =1 ; + +if (buff_->is_eop) +break ; + } } }
drivers/net/ethernet/broadcom/bcmsysport.c +11 -11
@@ -1045,14 +1045,22 @@ static void bcm_sysport_resume_from_wol(struct bcm_sysport_priv *priv) {u32 reg; -/* Stop monitoring MPD interrupt */ -intrl2_0_mask_set (priv,INTRL2_0_MPD ); -/* Clear the MagicPacket detection logic */ reg =umac_readl (priv,UMAC_MPD_CTRL ); reg &= ~MPD_EN ;umac_writel (priv, reg,UMAC_MPD_CTRL ); + reg =intrl2_0_readl (priv,INTRL2_CPU_STATUS ); +if (reg &INTRL2_0_MPD ) +netdev_info (priv->netdev,"Wake-on-LAN (MPD) interrupt!\n" ); + +if (reg &INTRL2_0_BRCM_MATCH_TAG ) { + reg =rxchk_readl (priv,RXCHK_BRCM_TAG_MATCH_STATUS ) & +RXCHK_BRCM_TAG_MATCH_MASK ; +netdev_info (priv->netdev, +"Wake-on-LAN (filters 0x%02x) interrupt!\n" , reg); + } +netif_dbg (priv, wol, priv->netdev,"resumed from WOL\n" ); }
@@ -1102,11 +1110,6 @@ static irqreturn_t bcm_sysport_rx_isr(int irq, void *dev_id)if (priv->irq0_stat &INTRL2_0_TX_RING_FULL )bcm_sysport_tx_reclaim_all (priv); -if (priv->irq0_stat &INTRL2_0_MPD ) { -netdev_info (priv->netdev,"Wake-on-LAN interrupt!\n" ); -bcm_sysport_resume_from_wol (priv); - } -if (!priv->is_lite) goto out;
@@ -2459,9 +2462,6 @@ static int bcm_sysport_suspend_to_wol(struct bcm_sysport_priv *priv)/* UniMAC receive needs to be turned on */ umac_enable_set (priv,CMD_RX_EN ,1 ); -/* Enable the interrupt wake-up source */ -intrl2_0_mask_clear (priv,INTRL2_0_MPD ); -netif_dbg (priv, wol, ndev,"entered WOL mode\n" );return 0 ;
drivers/net/ethernet/broadcom/bnxt/bnxt.c +18 -9
@@ -1882,8 +1882,11 @@ static int bnxt_poll_work(struct bnxt *bp, struct bnxt_napi *bnapi, int budget)if (TX_CMP_TYPE (txcmp) ==CMP_TYPE_TX_L2_CMP ) { tx_pkts++;/* return full budget so NAPI will complete. */ -if (unlikely (tx_pkts > bp->tx_wake_thresh)) +if (unlikely (tx_pkts > bp->tx_wake_thresh)) { rx_pkts = budget; + raw_cons =NEXT_RAW_CMP (raw_cons); +break ; + } }else if ((TX_CMP_TYPE (txcmp) &0x30 ) ==0x10 ) {if (likely (budget)) rc =bnxt_rx_pkt (bp, bnapi, &raw_cons, &event);
@@ -1911,7 +1914,7 @@ static int bnxt_poll_work(struct bnxt *bp, struct bnxt_napi *bnapi, int budget) } raw_cons =NEXT_RAW_CMP (raw_cons); -if (rx_pkts == budget) +if (rx_pkts && rx_pkts == budget)break ; }
@@ -2025,8 +2028,12 @@ static int bnxt_poll(struct napi_struct *napi, int budget)while (1 ) { work_done +=bnxt_poll_work (bp, bnapi, budget - work_done); -if (work_done >= budget) +if (work_done >= budget) { +if (!budget) +BNXT_CP_DB_REARM (cpr->cp_doorbell, + cpr->cp_raw_cons);break ; + }if (!bnxt_has_work (bp, cpr)) {if (napi_complete_done (napi, work_done))
@@ -3008,10 +3015,11 @@ static void bnxt_free_hwrm_resources(struct bnxt *bp) {struct pci_dev *pdev = bp->pdev; -dma_free_coherent (&pdev->dev,PAGE_SIZE , bp->hwrm_cmd_resp_addr, - bp->hwrm_cmd_resp_dma_addr); - - bp->hwrm_cmd_resp_addr =NULL ; +if (bp->hwrm_cmd_resp_addr) { +dma_free_coherent (&pdev->dev,PAGE_SIZE , bp->hwrm_cmd_resp_addr, + bp->hwrm_cmd_resp_dma_addr); + bp->hwrm_cmd_resp_addr =NULL ; + }if (bp->hwrm_dbg_resp_addr) { dma_free_coherent(&pdev->dev, HWRM_DBG_REG_BUF_SIZE, bp->hwrm_dbg_resp_addr,
@@ -4643,7 +4651,7 @@ __bnxt_hwrm_reserve_pf_rings(struct bnxt *bp, struct hwrm_func_cfg_input *req, FUNC_CFG_REQ_ENABLES_NUM_STAT_CTXS :0 ; enables |= ring_grps ?FUNC_CFG_REQ_ENABLES_NUM_HW_RING_GRPS :0 ; - enables |= vnics ?FUNC_VF_CFG_REQ_ENABLES_NUM_VNICS :0 ; + enables |= vnics ?FUNC_CFG_REQ_ENABLES_NUM_VNICS :0 ; req->num_rx_rings =cpu_to_le16 (rx_rings); req->num_hw_ring_grps =cpu_to_le16 (ring_grps);
@@ -8493,7 +8501,7 @@ static void _bnxt_get_max_rings(struct bnxt *bp, int *max_rx, int *max_tx, *max_tx = hw_resc->max_tx_rings; *max_rx = hw_resc->max_rx_rings; *max_cp =min_t (int,bnxt_get_max_func_cp_rings_for_en (bp), - hw_resc->max_irqs); + hw_resc->max_irqs -bnxt_get_ulp_msix_num (bp)); *max_cp =min_t (int, *max_cp, hw_resc->max_stat_ctxs); max_ring_grps = hw_resc->max_hw_ring_grps;if (BNXT_CHIP_TYPE_NITRO_A0 (bp) &&BNXT_PF (bp)) {
@@ -8924,6 +8932,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)bnxt_clear_int_mode (bp); init_err_pci_clean: +bnxt_free_hwrm_resources (bp);bnxt_cleanup_pci (bp); init_err_free:
drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c +3 -3
@@ -98,13 +98,13 @@ static int bnxt_hwrm_queue_cos2bw_cfg(struct bnxt *bp, struct ieee_ets *ets,bnxt_hwrm_cmd_hdr_init (bp, &req,HWRM_QUEUE_COS2BW_CFG ,-1 ,-1 );for (i =0 ; i < max_tc; i++) { -u8 qidx; +u8 qidx = bp->tc_to_qidx[i]; req.enables |=cpu_to_le32 ( -QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID0_VALID << i); +QUEUE_COS2BW_CFG_REQ_ENABLES_COS_QUEUE_ID0_VALID << + qidx);memset (&cos2bw,0 ,sizeof (cos2bw)); - qidx = bp->tc_to_qidx[i]; cos2bw.queue_id = bp->q_info[qidx].queue_id;if (ets->tc_tsa[i] ==IEEE_8021QAZ_TSA_STRICT ) { cos2bw.tsa =
drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c +14 -6
@@ -75,17 +75,23 @@ static int bnxt_tc_parse_redir(struct bnxt *bp,return 0 ; } -static void bnxt_tc_parse_vlan (struct bnxt *bp, -struct bnxt_tc_actions *actions, -const struct tc_action *tc_act) +static int bnxt_tc_parse_vlan (struct bnxt *bp, +struct bnxt_tc_actions *actions, +const struct tc_action *tc_act) { -if (tcf_vlan_action (tc_act) ==TCA_VLAN_ACT_POP ) { +switch (tcf_vlan_action (tc_act)) { +case TCA_VLAN_ACT_POP : actions->flags |=BNXT_TC_ACTION_FLAG_POP_VLAN ; - }else if (tcf_vlan_action (tc_act) ==TCA_VLAN_ACT_PUSH ) { +break ; +case TCA_VLAN_ACT_PUSH : actions->flags |=BNXT_TC_ACTION_FLAG_PUSH_VLAN ; actions->push_vlan_tci =htons (tcf_vlan_push_vid (tc_act)); actions->push_vlan_tpid =tcf_vlan_push_proto (tc_act); +break ; +default : +return -EOPNOTSUPP ; } +return 0 ; } static int bnxt_tc_parse_tunnel_set(struct bnxt *bp,
@@ -136,7 +142,9 @@ static int bnxt_tc_parse_actions(struct bnxt *bp,/* Push/pop VLAN */ if (is_tcf_vlan (tc_act)) { -bnxt_tc_parse_vlan (bp, actions, tc_act); + rc =bnxt_tc_parse_vlan (bp, actions, tc_act); +if (rc) +return rc;continue ; }
drivers/net/ethernet/cadence/macb_main.c +8 -0
@@ -3765,6 +3765,13 @@ static const struct macb_config at91sam9260_config = { .init = macb_init, }; +static const struct macb_config sama5d3macb_config = { + .caps =MACB_CAPS_SG_DISABLED + |MACB_CAPS_USRIO_HAS_CLKEN |MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII , + .clk_init = macb_clk_init, + .init = macb_init, +}; +static const struct macb_config pc302gem_config = { .caps =MACB_CAPS_SG_DISABLED |MACB_CAPS_GIGABIT_MODE_AVAILABLE , .dma_burst_length =16 ,
@@ -3832,6 +3839,7 @@ static const struct of_device_id macb_dt_ids[] = { { .compatible = "cdns,gem", .data = &pc302gem_config }, { .compatible = "atmel,sama5d2-gem", .data = &sama5d2_config }, { .compatible = "atmel,sama5d3-gem", .data = &sama5d3_config }, + { .compatible = "atmel,sama5d3-macb", .data = &sama5d3macb_config }, { .compatible = "atmel,sama5d4-gem", .data = &sama5d4_config }, { .compatible = "cdns,at91rm9200-emac", .data = &emac_config }, { .compatible = "cdns,emac", .data = &emac_config },
drivers/net/ethernet/hisilicon/hns/hnae.c +1 -1
@@ -84,7 +84,7 @@ static void hnae_unmap_buffer(struct hnae_ring *ring, struct hnae_desc_cb *cb)if (cb->type ==DESC_TYPE_SKB )dma_unmap_single (ring_to_dev (ring), cb->dma, cb->length,ring_to_dma_dir (ring)); -else +else if (cb->length)dma_unmap_page (ring_to_dev (ring), cb->dma, cb->length,ring_to_dma_dir (ring)); }
drivers/net/ethernet/hisilicon/hns/hns_enet.c +19 -11
@@ -40,9 +40,9 @@#define SKB_TMP_LEN (SKB ) \ (((SKB)->transport_header - (SKB)->mac_header) + tcp_hdrlen(SKB)) -static void fill_v2_desc (struct hnae_ring *ring,void *priv, -int size,dma_addr_t dma,int frag_end, -int buf_num,enum hns_desc_type type,int mtu) +static void fill_v2_desc_hw (struct hnae_ring *ring,void *priv,int size, +int send_sz,dma_addr_t dma,int frag_end, +int buf_num,enum hns_desc_type type,int mtu) {struct hnae_desc *desc = &ring->desc[ring->next_to_use];struct hnae_desc_cb *desc_cb = &ring->desc_cb[ring->next_to_use];
@@ -64,7 +64,7 @@ static void fill_v2_desc(struct hnae_ring *ring, void *priv, desc_cb->type = type; desc->addr =cpu_to_le64 (dma); - desc->tx.send_size =cpu_to_le16 ((u16 )size); + desc->tx.send_size =cpu_to_le16 ((u16 )send_sz);/* config bd buffer end */ hnae_set_bit (rrcfv,HNSV2_TXD_VLD_B ,1 );
@@ -133,6 +133,14 @@ static void fill_v2_desc(struct hnae_ring *ring, void *priv,ring_ptr_move_fw (ring, next_to_use); } +static void fill_v2_desc (struct hnae_ring *ring,void *priv, +int size,dma_addr_t dma,int frag_end, +int buf_num,enum hns_desc_type type,int mtu) +{ +fill_v2_desc_hw (ring, priv, size, size, dma, frag_end, + buf_num, type, mtu); +} +static const struct acpi_device_id hns_enet_acpi_match[] = { {"HISI00C1" ,0 }, {"HISI00C2" ,0 },
@@ -289,15 +297,15 @@ static void fill_tso_desc(struct hnae_ring *ring, void *priv,/* when the frag size is bigger than hardware, split this frag */ for (k =0 ; k < frag_buf_num; k++) -fill_v2_desc (ring, priv, - (k == frag_buf_num -1 ) ? +fill_v2_desc_hw (ring, priv, k ==0 ? size :0 , + (k == frag_buf_num -1 ) ? sizeoflast :BD_MAX_SEND_SIZE , - dma +BD_MAX_SEND_SIZE * k, - frag_end && (k == frag_buf_num -1 ) ?1 :0 , - buf_num, - (type ==DESC_TYPE_SKB && !k) ? + dma +BD_MAX_SEND_SIZE * k, + frag_end && (k == frag_buf_num -1 ) ?1 :0 , + buf_num, + (type ==DESC_TYPE_SKB && !k) ?DESC_TYPE_SKB :DESC_TYPE_PAGE , - mtu); + mtu); } netdev_tx_t hns_nic_net_xmit_hw(struct net_device *ndev,
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +11 -8
@@ -1725,7 +1725,7 @@ static void mvpp2_txq_desc_put(struct mvpp2_tx_queue *txq) }/* Set Tx descriptors fields relevant for CSUM calculation */ -static u32 mvpp2_txq_desc_csum (int l3_offs,int l3_proto, +static u32 mvpp2_txq_desc_csum (int l3_offs,__be16 l3_proto,int ip_hdr_len,int l4_proto) {u32 command;
@@ -2600,14 +2600,15 @@ static u32 mvpp2_skb_tx_csum(struct mvpp2_port *port, struct sk_buff *skb)if (skb->ip_summed ==CHECKSUM_PARTIAL ) {int ip_hdr_len =0 ;u8 l4_proto; +__be16 l3_proto =vlan_get_protocol (skb); -if (skb->protocol ==htons (ETH_P_IP )) { +if (l3_proto ==htons (ETH_P_IP )) {struct iphdr *ip4h =ip_hdr (skb);/* Calculate IPv4 checksum and L4 checksum */ ip_hdr_len = ip4h->ihl; l4_proto = ip4h->protocol; - }else if (skb->protocol ==htons (ETH_P_IPV6 )) { + }else if (l3_proto ==htons (ETH_P_IPV6 )) {struct ipv6hdr *ip6h =ipv6_hdr (skb);/* Read l4_protocol from one of IPv6 extra headers */
@@ -2619,7 +2620,7 @@ static u32 mvpp2_skb_tx_csum(struct mvpp2_port *port, struct sk_buff *skb) }return mvpp2_txq_desc_csum (skb_network_offset (skb), - skb->protocol, ip_hdr_len, l4_proto); + l3_proto, ip_hdr_len, l4_proto); }return MVPP2_TXD_L4_CSUM_NOT |MVPP2_TXD_IP_CSUM_DISABLE ;
@@ -3055,10 +3056,12 @@ static int mvpp2_poll(struct napi_struct *napi, int budget) cause_rx_tx & ~MVPP2_CAUSE_MISC_SUM_MASK); } - cause_tx = cause_rx_tx &MVPP2_CAUSE_TXQ_OCCUP_DESC_ALL_MASK ; -if (cause_tx) { - cause_tx >>=MVPP2_CAUSE_TXQ_OCCUP_DESC_ALL_OFFSET ; -mvpp2_tx_done (port, cause_tx, qv->sw_thread_id); +if (port->has_tx_irqs) { + cause_tx = cause_rx_tx &MVPP2_CAUSE_TXQ_OCCUP_DESC_ALL_MASK ; +if (cause_tx) { + cause_tx >>=MVPP2_CAUSE_TXQ_OCCUP_DESC_ALL_OFFSET ; +mvpp2_tx_done (port, cause_tx, qv->sw_thread_id); + } }/* Process RX packets */
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +3 -0
@@ -1339,6 +1339,9 @@ static int __parse_cls_flower(struct mlx5e_priv *priv, *match_level =MLX5_MATCH_L2 ; } + }else { +MLX5_SET (fte_match_set_lyr_2_4, headers_c, svlan_tag,1 ); +MLX5_SET (fte_match_set_lyr_2_4, headers_c, cvlan_tag,1 ); }if (dissector_uses_key (f->dissector,FLOW_DISSECTOR_KEY_BASIC )) {
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +2 -2
@@ -2000,7 +2000,7 @@ static u32 calculate_vports_min_rate_divider(struct mlx5_eswitch *esw)u32 max_guarantee =0 ;int i; -for (i =0 ; i <= esw->total_vports; i++) { +for (i =0 ; i < esw->total_vports; i++) { evport = &esw->vports[i];if (!evport->enabled || evport->info.min_rate < max_guarantee)continue ;
@@ -2020,7 +2020,7 @@ static int normalize_vports_min_rate(struct mlx5_eswitch *esw, u32 divider)int err;int i; -for (i =0 ; i <= esw->total_vports; i++) { +for (i =0 ; i < esw->total_vports; i++) { evport = &esw->vports[i];if (!evport->enabled)continue ;
drivers/net/ethernet/mellanox/mlx5/core/transobj.c +1 -1
@@ -509,7 +509,7 @@ static int mlx5_hairpin_modify_sq(struct mlx5_core_dev *peer_mdev, u32 sqn, sqc =MLX5_ADDR_OF (modify_sq_in, in, ctx); -if (next_state ==MLX5_RQC_STATE_RDY ) { +if (next_state ==MLX5_SQC_STATE_RDY ) {MLX5_SET (sqc, sqc, hairpin_peer_rq, peer_rq);MLX5_SET (sqc, sqc, hairpin_peer_vhca, peer_vhca); }
drivers/net/ethernet/mscc/ocelot_board.c +9 -3
@@ -91,7 +91,7 @@ static irqreturn_t ocelot_xtr_irq_handler(int irq, void *arg)struct sk_buff *skb;struct net_device *dev;u32 *buf; -int sz, len; +int sz, len, buf_len;u32 ifh[4 ];u32 val;struct frame_info info;
@@ -116,14 +116,20 @@ static irqreturn_t ocelot_xtr_irq_handler(int irq, void *arg) err = -ENOMEM ;break ; } - buf = (u32 *)skb_put (skb, info.len); + buf_len = info.len -ETH_FCS_LEN ; + buf = (u32 *)skb_put (skb, buf_len); len =0 ;do { sz =ocelot_rx_frame_word (ocelot, grp, false, &val); *buf++ = val; len += sz; - }while ((sz ==4 ) && (len < info.len)); + }while (len < buf_len); + +/* Read the FCS and discard it */ + sz =ocelot_rx_frame_word (ocelot, grp, false, &val); +/* Update the statistics if part of the FCS was read before */ + len -=ETH_FCS_LEN - sz;if (sz <0 ) { err = sz;
drivers/net/ethernet/netronome/nfp/nfp_net_common.c +12 -5
@@ -2068,14 +2068,17 @@ nfp_ctrl_rx_one(struct nfp_net *nn, struct nfp_net_dp *dp,return true; } -static void nfp_ctrl_rx (struct nfp_net_r_vector *r_vec) +static bool nfp_ctrl_rx (struct nfp_net_r_vector *r_vec) {struct nfp_net_rx_ring *rx_ring = r_vec->rx_ring;struct nfp_net *nn = r_vec->nfp_net;struct nfp_net_dp *dp = &nn->dp; +unsigned int budget =512 ; -while (nfp_ctrl_rx_one (nn, dp, r_vec, rx_ring)) +while (nfp_ctrl_rx_one (nn, dp, r_vec, rx_ring) && budget--)continue ; + +return budget; }static void nfp_ctrl_poll (unsigned long arg)
@@ -2087,9 +2090,13 @@ static void nfp_ctrl_poll(unsigned long arg)__nfp_ctrl_tx_queued (r_vec);spin_unlock_bh (&r_vec->lock); -nfp_ctrl_rx (r_vec); - -nfp_net_irq_unmask (r_vec->nfp_net, r_vec->irq_entry); +if (nfp_ctrl_rx (r_vec)) { +nfp_net_irq_unmask (r_vec->nfp_net, r_vec->irq_entry); + }else { +tasklet_schedule (&r_vec->tasklet); +nn_dp_warn (&r_vec->nfp_net->dp, +"control message budget exceeded!\n" ); + } }/* Setup and Configuration
drivers/net/ethernet/qlogic/qed/qed_hsi.h +1 -0
@@ -11987,6 +11987,7 @@ struct public_global {u32 running_bundle_id;s32 external_temperature;u32 mdump_reason; +u64 reserved;u32 data_ptr;u32 data_size; };
drivers/net/ethernet/qlogic/qlcnic/qlcnic.h +5 -3
@@ -1800,7 +1800,8 @@ struct qlcnic_hardware_ops {int (*config_loopback) (struct qlcnic_adapter *,u8 );int (*clear_loopback) (struct qlcnic_adapter *,u8 );int (*config_promisc_mode) (struct qlcnic_adapter *,u32 ); -void (*change_l2_filter) (struct qlcnic_adapter *,u64 *,u16 ); +void (*change_l2_filter)(struct qlcnic_adapter *adapter,u64 *addr, +u16 vlan,struct qlcnic_host_tx_ring *tx_ring);int (*get_board_info) (struct qlcnic_adapter *);void (*set_mac_filter_count) (struct qlcnic_adapter *);void (*free_mac_list) (struct qlcnic_adapter *);
@@ -2064,9 +2065,10 @@ static inline int qlcnic_nic_set_promisc(struct qlcnic_adapter *adapter, }static inline void qlcnic_change_filter (struct qlcnic_adapter *adapter, -u64 *addr,u16 id) +u64 *addr,u16 vlan, +struct qlcnic_host_tx_ring *tx_ring) { - adapter->ahw->hw_ops->change_l2_filter (adapter, addr, id); + adapter->ahw->hw_ops->change_l2_filter (adapter, addr, vlan, tx_ring); }static inline int qlcnic_get_board_info (struct qlcnic_adapter *adapter)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +2 -1
@@ -2135,7 +2135,8 @@ int qlcnic_83xx_sre_macaddr_change(struct qlcnic_adapter *adapter, u8 *addr, }void qlcnic_83xx_change_l2_filter (struct qlcnic_adapter *adapter,u64 *addr, -u16 vlan_id) +u16 vlan_id, +struct qlcnic_host_tx_ring *tx_ring) {u8 mac[ETH_ALEN ];memcpy (&mac, addr,ETH_ALEN );
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h +2 -1
@@ -550,7 +550,8 @@ int qlcnic_83xx_wrt_reg_indirect(struct qlcnic_adapter *, ulong, u32);int qlcnic_83xx_nic_set_promisc (struct qlcnic_adapter *,u32 );int qlcnic_83xx_config_hw_lro (struct qlcnic_adapter *,int );int qlcnic_83xx_config_rss (struct qlcnic_adapter *,int ); -void qlcnic_83xx_change_l2_filter (struct qlcnic_adapter *,u64 *,u16 ); +void qlcnic_83xx_change_l2_filter (struct qlcnic_adapter *adapter,u64 *addr, +u16 vlan,struct qlcnic_host_tx_ring *ring);int qlcnic_83xx_get_pci_info (struct qlcnic_adapter *,struct qlcnic_pci_info *);int qlcnic_83xx_set_nic_info (struct qlcnic_adapter *,struct qlcnic_info *);void qlcnic_83xx_initialize_nic (struct qlcnic_adapter *,int );
drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h +2 -1
@@ -173,7 +173,8 @@ int qlcnic_82xx_napi_add(struct qlcnic_adapter *adapter, struct net_device *netdev);void qlcnic_82xx_get_beacon_state (struct qlcnic_adapter *);void qlcnic_82xx_change_filter (struct qlcnic_adapter *adapter, -u64 *uaddr,u16 vlan_id); +u64 *uaddr,u16 vlan_id, +struct qlcnic_host_tx_ring *tx_ring);int qlcnic_82xx_config_intr_coalesce (struct qlcnic_adapter *,struct ethtool_coalesce *);int qlcnic_82xx_set_rx_coalesce (struct qlcnic_adapter *);
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c +6 -6
@@ -268,13 +268,12 @@ static void qlcnic_add_lb_filter(struct qlcnic_adapter *adapter, }void qlcnic_82xx_change_filter (struct qlcnic_adapter *adapter,u64 *uaddr, -u16 vlan_id) +u16 vlan_id,struct qlcnic_host_tx_ring *tx_ring) {struct cmd_desc_type0 *hwdesc;struct qlcnic_nic_req *req;struct qlcnic_mac_req *mac_req;struct qlcnic_vlan_req *vlan_req; -struct qlcnic_host_tx_ring *tx_ring = adapter->tx_ring;u32 producer;u64 word;
@@ -301,7 +300,8 @@ void qlcnic_82xx_change_filter(struct qlcnic_adapter *adapter, u64 *uaddr,static void qlcnic_send_filter (struct qlcnic_adapter *adapter,struct cmd_desc_type0 *first_desc, -struct sk_buff *skb) +struct sk_buff *skb, +struct qlcnic_host_tx_ring *tx_ring) {struct vlan_ethhdr *vh = (struct vlan_ethhdr *)(skb->data);struct ethhdr *phdr = (struct ethhdr *)(skb->data);
@@ -335,7 +335,7 @@ static void qlcnic_send_filter(struct qlcnic_adapter *adapter, tmp_fil->vlan_id == vlan_id) {if (jiffies > (QLCNIC_READD_AGE *HZ + tmp_fil->ftime))qlcnic_change_filter (adapter, &src_addr, - vlan_id); + vlan_id, tx_ring); tmp_fil->ftime = jiffies;return ; }
@@ -350,7 +350,7 @@ static void qlcnic_send_filter(struct qlcnic_adapter *adapter,if (!fil)return ; -qlcnic_change_filter (adapter, &src_addr, vlan_id); +qlcnic_change_filter (adapter, &src_addr, vlan_id, tx_ring); fil->ftime = jiffies; fil->vlan_id = vlan_id;memcpy (fil->faddr, &src_addr,ETH_ALEN );
@@ -766,7 +766,7 @@ netdev_tx_t qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev) }if (adapter->drv_mac_learn) -qlcnic_send_filter (adapter, first_desc, skb); +qlcnic_send_filter (adapter, first_desc, skb, tx_ring); tx_ring->tx_stats.tx_bytes += skb->len; tx_ring->tx_stats.xmit_called++;
drivers/net/ethernet/qualcomm/rmnet/rmnet_handlers.c +5 -2
@@ -113,7 +113,7 @@ rmnet_map_ingress_handler(struct sk_buff *skb,struct sk_buff *skbn;if (skb->dev->type ==ARPHRD_ETHER ) { -if (pskb_expand_head (skb,ETH_HLEN ,0 ,GFP_KERNEL )) { +if (pskb_expand_head (skb,ETH_HLEN ,0 ,GFP_ATOMIC )) {kfree_skb (skb);return ; }
@@ -147,7 +147,7 @@ static int rmnet_map_egress_handler(struct sk_buff *skb, }if (skb_headroom (skb) < required_headroom) { -if (pskb_expand_head (skb, required_headroom,0 ,GFP_KERNEL )) +if (pskb_expand_head (skb, required_headroom,0 ,GFP_ATOMIC ))return -ENOMEM ; }
@@ -189,6 +189,9 @@ rx_handler_result_t rmnet_rx_handler(struct sk_buff **pskb)if (!skb) goto done; +if (skb->pkt_type ==PACKET_LOOPBACK ) +return RX_HANDLER_PASS ; + dev = skb->dev; port =rmnet_get_port (dev);
drivers/net/ethernet/realtek/r8169.c +10 -14
@@ -4788,8 +4788,8 @@ static void rtl_init_rxcfg(struct rtl8169_private *tp)RTL_W32 (tp, RxConfig,RX_FIFO_THRESH |RX_DMA_BURST );break ; case RTL_GIGA_MAC_VER_18 ... RTL_GIGA_MAC_VER_24: -case RTL_GIGA_MAC_VER_34 : -case RTL_GIGA_MAC_VER_35 : + case RTL_GIGA_MAC_VER_34 ... RTL_GIGA_MAC_VER_36: +case RTL_GIGA_MAC_VER_38 :RTL_W32 (tp, RxConfig,RX128_INT_EN |RX_MULTI_EN |RX_DMA_BURST );break ; case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_51:
@@ -5041,9 +5041,14 @@ static void rtl8169_hw_reset(struct rtl8169_private *tp)static void rtl_set_tx_config_registers (struct rtl8169_private *tp) { -/* Set DMA burst size and Interframe Gap Time */ -RTL_W32 (tp, TxConfig, (TX_DMA_BURST << TxDMAShift) | - (InterFrameGap << TxInterFrameGapShift)); +u32 val =TX_DMA_BURST << TxDMAShift | + InterFrameGap << TxInterFrameGapShift; + +if (tp->mac_version >=RTL_GIGA_MAC_VER_34 && + tp->mac_version !=RTL_GIGA_MAC_VER_39 ) + val |=TXCFG_AUTO_FIFO ; + +RTL_W32 (tp, TxConfig, val); }static void rtl_set_rx_max_size (struct rtl8169_private *tp)
@@ -5530,7 +5535,6 @@ static void rtl_hw_start_8168e_2(struct rtl8169_private *tp)rtl_disable_clock_request (tp); -RTL_W32 (tp, TxConfig,RTL_R32 (tp, TxConfig) |TXCFG_AUTO_FIFO );RTL_W8 (tp,MCU ,RTL_R8 (tp,MCU ) & ~NOW_IS_OOB );/* Adjust EEE LED frequency */
@@ -5562,7 +5566,6 @@ static void rtl_hw_start_8168f(struct rtl8169_private *tp)rtl_disable_clock_request (tp); -RTL_W32 (tp, TxConfig,RTL_R32 (tp, TxConfig) |TXCFG_AUTO_FIFO );RTL_W8 (tp,MCU ,RTL_R8 (tp,MCU ) & ~NOW_IS_OOB );RTL_W8 (tp,DLLPR ,RTL_R8 (tp,DLLPR ) |PFM_EN );RTL_W32 (tp,MISC ,RTL_R32 (tp,MISC ) |PWM_EN );
@@ -5607,8 +5610,6 @@ static void rtl_hw_start_8411(struct rtl8169_private *tp)static void rtl_hw_start_8168g (struct rtl8169_private *tp) { -RTL_W32 (tp, TxConfig,RTL_R32 (tp, TxConfig) |TXCFG_AUTO_FIFO ); -rtl_eri_write (tp,0xc8 ,ERIAR_MASK_0101 ,0x080002 ,ERIAR_EXGMAC );rtl_eri_write (tp,0xcc ,ERIAR_MASK_0001 ,0x38 ,ERIAR_EXGMAC );rtl_eri_write (tp,0xd0 ,ERIAR_MASK_0001 ,0x48 ,ERIAR_EXGMAC );
@@ -5707,8 +5708,6 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp)RTL_W8 (tp, Config5,RTL_R8 (tp, Config5) & ~ASPM_en);rtl_ephy_init (tp, e_info_8168h_1,ARRAY_SIZE (e_info_8168h_1)); -RTL_W32 (tp, TxConfig,RTL_R32 (tp, TxConfig) |TXCFG_AUTO_FIFO ); -rtl_eri_write (tp,0xc8 ,ERIAR_MASK_0101 ,0x00080002 ,ERIAR_EXGMAC );rtl_eri_write (tp,0xcc ,ERIAR_MASK_0001 ,0x38 ,ERIAR_EXGMAC );rtl_eri_write (tp,0xd0 ,ERIAR_MASK_0001 ,0x48 ,ERIAR_EXGMAC );
@@ -5789,8 +5788,6 @@ static void rtl_hw_start_8168ep(struct rtl8169_private *tp) {rtl8168ep_stop_cmac (tp); -RTL_W32 (tp, TxConfig,RTL_R32 (tp, TxConfig) |TXCFG_AUTO_FIFO ); -rtl_eri_write (tp,0xc8 ,ERIAR_MASK_0101 ,0x00080002 ,ERIAR_EXGMAC );rtl_eri_write (tp,0xcc ,ERIAR_MASK_0001 ,0x2f ,ERIAR_EXGMAC );rtl_eri_write (tp,0xd0 ,ERIAR_MASK_0001 ,0x5f ,ERIAR_EXGMAC );
@@ -6108,7 +6105,6 @@ static void rtl_hw_start_8402(struct rtl8169_private *tp)/* Force LAN exit from ASPM if Rx/Tx are not idle */ RTL_W32 (tp, FuncEvent,RTL_R32 (tp, FuncEvent) |0x002800 ); -RTL_W32 (tp, TxConfig,RTL_R32 (tp, TxConfig) |TXCFG_AUTO_FIFO );RTL_W8 (tp,MCU ,RTL_R8 (tp,MCU ) & ~NOW_IS_OOB );rtl_ephy_init (tp, e_info_8402,ARRAY_SIZE (e_info_8402));
drivers/net/ethernet/stmicro/stmmac/common.h +2 -2
@@ -256,10 +256,10 @@ struct stmmac_safety_stats {#define MAX_DMA_RIWT 0xff#define MIN_DMA_RIWT 0x20/* Tx coalesce parameters */ -#define STMMAC_COAL_TX_TIMER 40000 +#define STMMAC_COAL_TX_TIMER 1000#define STMMAC_MAX_COAL_TX_TICK 100000#define STMMAC_TX_MAX_FRAMES 256 -#define STMMAC_TX_FRAMES 64 +#define STMMAC_TX_FRAMES 25/* Packets types */ enum packets_types {
drivers/net/ethernet/stmicro/stmmac/stmmac.h +12 -2
@@ -48,6 +48,8 @@ struct stmmac_tx_info {/* Frequently used values are kept adjacent for cache effect */ struct stmmac_tx_queue { +u32 tx_count_frames; +struct timer_list txtimer;u32 queue_index;struct stmmac_priv *priv_data;struct dma_extended_desc *dma_etx____cacheline_aligned_in_smp ;
@@ -73,7 +75,14 @@ struct stmmac_rx_queue {u32 rx_zeroc_thresh;dma_addr_t dma_rx_phy;u32 rx_tail_addr; +}; + +struct stmmac_channel {struct napi_struct napi____cacheline_aligned_in_smp ; +struct stmmac_priv *priv_data; +u32 index; +int has_rx; +int has_tx; };struct stmmac_tc_entry {
@@ -109,14 +118,12 @@ struct stmmac_pps_cfg {struct stmmac_priv {/* Frequently used values are kept adjacent for cache effect */ -u32 tx_count_frames;u32 tx_coal_frames;u32 tx_coal_timer;int tx_coalesce;int hwts_tx_en;bool tx_path_in_lpi_mode; -struct timer_list txtimer;bool tso;unsigned int dma_buf_sz;
@@ -137,6 +144,9 @@ struct stmmac_priv {/* TX Queue */ struct stmmac_tx_queue tx_queue[MTL_MAX_TX_QUEUES ]; +/* Generic channel for NAPI */ +struct stmmac_channel channel[STMMAC_CH_MAX ]; +bool oldlink;int speed;int oldduplex;
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +134 -104
425 lines not on this page · raw message
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +2 -3
@@ -67,7 +67,7 @@ static int dwmac1000_validate_mcast_bins(int mcast_bins)* Description: * This function validates the number of Unicast address entries supported * by a particular Synopsys 10/100/1000 controller. The Synopsys controller -* supports 1, 32, 64, or 128 Unicast filter entries for it's Unicast filter +* supports 1..32, 64, or 128 Unicast filter entries for it's Unicast filter * logic. This function validates a valid, supported configuration is * selected, and defaults to 1 Unicast address if an unsupported * configuration is selected.
@@ -77,8 +77,7 @@ static int dwmac1000_validate_ucast_entries(int ucast_entries)int x = ucast_entries;switch (x) { -case 1 : -case 32 : + case 1 ... 32:case 64 :case 128 :break ;
drivers/net/ethernet/ti/Kconfig +1 -0
@@ -41,6 +41,7 @@ config TI_DAVINCI_MDIO config TI_DAVINCI_CPDMA tristate "TI DaVinci CPDMA Support" depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST + select GENERIC_ALLOCATOR ---help--- This driver supports TI's DaVinci CPDMA dma engine.
drivers/net/phy/phylink.c +28 -20
72 lines not on this page · raw message
drivers/net/phy/sfp-bus.c +2 -2
@@ -349,6 +349,7 @@ static int sfp_register_bus(struct sfp_bus *bus) }if (bus->started) bus->socket_ops->start (bus->sfp); + bus->netdev->sfp_bus = bus; bus->registered = true;return 0 ; }
@@ -357,6 +358,7 @@ static void sfp_unregister_bus(struct sfp_bus *bus) {const struct sfp_upstream_ops *ops = bus->upstream_ops; + bus->netdev->sfp_bus =NULL ;if (bus->registered) {if (bus->started) bus->socket_ops->stop (bus->sfp);
@@ -438,7 +440,6 @@ static void sfp_upstream_clear(struct sfp_bus *bus) { bus->upstream_ops =NULL ; bus->upstream =NULL ; - bus->netdev->sfp_bus =NULL ; bus->netdev =NULL ; }
@@ -467,7 +468,6 @@ struct sfp_bus *sfp_register_upstream(struct fwnode_handle *fwnode, bus->upstream_ops = ops; bus->upstream = upstream; bus->netdev = ndev; - ndev->sfp_bus = bus;if (bus->sfp) { ret =sfp_register_bus (bus);
drivers/net/team/team.c +6 -0
@@ -1172,6 +1172,12 @@ static int team_port_add(struct team *team, struct net_device *port_dev,return -EBUSY ; } +if (dev == port_dev) { +NL_SET_ERR_MSG (extack,"Cannot enslave team device to itself" ); +netdev_err (dev,"Cannot enslave team device to itself\n" ); +return -EINVAL ; + } +if (port_dev->features &NETIF_F_VLAN_CHALLENGED &&vlan_uses_dev (dev)) {NL_SET_ERR_MSG (extack,"Device is VLAN challenged and team device has VLAN set up" );
drivers/net/tun.c +23 -20
144 lines not on this page · raw message
drivers/net/usb/qmi_wwan.c +1 -0
@@ -1234,6 +1234,7 @@ static const struct usb_device_id products[] = { {QMI_FIXED_INTF(0x0b3c, 0xc00b, 4)}, /* Olivetti Olicard 500 */ {QMI_FIXED_INTF(0x1e2d, 0x0060, 4)}, /* Cinterion PLxx */ {QMI_FIXED_INTF(0x1e2d, 0x0053, 4)}, /* Cinterion PHxx,PXxx */ + {QMI_FIXED_INTF(0x1e2d, 0x0063, 10)}, /* Cinterion ALASxx (1 RmNet) */ {QMI_FIXED_INTF(0x1e2d, 0x0082, 4)}, /* Cinterion PHxx,PXxx (2 RmNet) */ {QMI_FIXED_INTF(0x1e2d, 0x0082, 5)}, /* Cinterion PHxx,PXxx (2 RmNet) */ {QMI_FIXED_INTF(0x1e2d, 0x0083, 4)}, /* Cinterion PHxx,PXxx (1 RmNet + USB Audio)*/
drivers/net/usb/smsc75xx.c +1 -0
@@ -1517,6 +1517,7 @@ static void smsc75xx_unbind(struct usbnet *dev, struct usb_interface *intf) {struct smsc75xx_priv *pdata = (struct smsc75xx_priv *)(dev->data[0 ]);if (pdata) { +cancel_work_sync (&pdata->set_multicast);netif_dbg (dev, ifdown, dev->net,"free pdata\n" );kfree (pdata); pdata =NULL ;
drivers/net/vxlan.c +3 -0
@@ -3537,6 +3537,7 @@ static size_t vxlan_get_size(const struct net_device *dev)nla_total_size (sizeof (__u32)) +/* IFLA_VXLAN_LINK */ nla_total_size (sizeof (struct in6_addr )) +/* IFLA_VXLAN_LOCAL{6} */ nla_total_size (sizeof (__u8)) +/* IFLA_VXLAN_TTL */ +nla_total_size (sizeof (__u8)) +/* IFLA_VXLAN_TTL_INHERIT */ nla_total_size (sizeof (__u8)) +/* IFLA_VXLAN_TOS */ nla_total_size (sizeof (__be32)) +/* IFLA_VXLAN_LABEL */ nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_LEARNING */
@@ -3601,6 +3602,8 @@ static int vxlan_fill_info(struct sk_buff *skb, const struct net_device *dev) }if (nla_put_u8 (skb,IFLA_VXLAN_TTL , vxlan->cfg.ttl) || +nla_put_u8 (skb,IFLA_VXLAN_TTL_INHERIT , + !!(vxlan->cfg.flags &VXLAN_F_TTL_INHERIT )) ||nla_put_u8 (skb,IFLA_VXLAN_TOS , vxlan->cfg.tos) ||nla_put_be32 (skb,IFLA_VXLAN_LABEL , vxlan->cfg.label) || nla_put_u8(skb, IFLA_VXLAN_LEARNING,
drivers/pci/controller/pci-hyperv.c +37 -0
@@ -89,6 +89,9 @@ static enum pci_protocol_version_t pci_protocol_version;#define STATUS_REVISION_MISMATCH 0xC0000059 +/* space for 32bit serial number as string */ +#define SLOT_NAME_SIZE 11 +/* * Message Types */
@@ -494,6 +497,7 @@ struct hv_pci_dev {struct list_head list_entry;refcount_t refs;enum hv_pcichild_state state; +struct pci_slot *pci_slot;struct pci_function_description desc;bool reported_missing;struct hv_pcibus_device *hbus;
@@ -1457,6 +1461,34 @@ static void prepopulate_bars(struct hv_pcibus_device *hbus)spin_unlock_irqrestore (&hbus->device_list_lock, flags); } +/* +* Assign entries in sysfs pci slot directory. +* +* Note that this function does not need to lock the children list +* because it is called from pci_devices_present_work which +* is serialized with hv_eject_device_work because they are on the +* same ordered workqueue. Therefore hbus->children list will not change +* even when pci_create_slot sleeps. +*/ +static void hv_pci_assign_slots (struct hv_pcibus_device *hbus) +{ +struct hv_pci_dev *hpdev; +char name[SLOT_NAME_SIZE ]; +int slot_nr; + +list_for_each_entry (hpdev, &hbus->children, list_entry) { +if (hpdev->pci_slot) +continue ; + + slot_nr =PCI_SLOT (wslot_to_devfn (hpdev->desc.win_slot.slot)); +snprintf (name,SLOT_NAME_SIZE ,"%u" , hpdev->desc.ser); + hpdev->pci_slot =pci_create_slot (hbus->pci_bus, slot_nr, + name,NULL ); +if (!hpdev->pci_slot) +pr_warn ("pci_create slot %s failed\n" , name); + } +} +/** * create_root_hv_pci_bus() - Expose a new root PCI bus * @hbus: Root PCI bus, as understood by this driver
@@ -1480,6 +1512,7 @@ static int create_root_hv_pci_bus(struct hv_pcibus_device *hbus)pci_lock_rescan_remove ();pci_scan_child_bus (hbus->pci_bus);pci_bus_assign_resources (hbus->pci_bus); +hv_pci_assign_slots (hbus);pci_bus_add_devices (hbus->pci_bus);pci_unlock_rescan_remove (); hbus->state = hv_pcibus_installed;
@@ -1742,6 +1775,7 @@ static void pci_devices_present_work(struct work_struct *work)*/ pci_lock_rescan_remove ();pci_scan_child_bus (hbus->pci_bus); +hv_pci_assign_slots (hbus);pci_unlock_rescan_remove ();break ;
@@ -1858,6 +1892,9 @@ static void hv_eject_device_work(struct work_struct *work)list_del (&hpdev->list_entry);spin_unlock_irqrestore (&hpdev->hbus->device_list_lock, flags); +if (hpdev->pci_slot) +pci_destroy_slot (hpdev->pci_slot); +memset (&ctxt,0 ,sizeof (ctxt)); ejct_pkt = (struct pci_eject_response *)&ctxt.pkt.message; ejct_pkt->message_type.type =PCI_EJECTION_COMPLETE ;
drivers/perf/arm_pmu.c +7 -1
@@ -474,7 +474,13 @@ static int armpmu_filter_match(struct perf_event *event) {struct arm_pmu *armpmu =to_arm_pmu (event->pmu);unsigned int cpu =smp_processor_id (); -return cpumask_test_cpu (cpu, &armpmu->supported_cpus); +int ret; + + ret =cpumask_test_cpu (cpu, &armpmu->supported_cpus); +if (ret && armpmu->filter_match) +return armpmu->filter_match (event); + +return ret; } static ssize_t armpmu_cpumask_show(struct device *dev,
drivers/pinctrl/intel/pinctrl-cannonlake.c +1 -1
@@ -382,7 +382,7 @@ static const struct intel_padgroup cnlh_community1_gpps[] = {static const struct intel_padgroup cnlh_community3_gpps[] = {CNL_GPP (0 ,155 ,178 ,192 ),/* GPP_K */ CNL_GPP (1 ,179 ,202 ,224 ),/* GPP_H */ -CNL_GPP (2 ,203 ,215 ,258 ),/* GPP_E */ +CNL_GPP (2 ,203 ,215 ,256 ),/* GPP_E */ CNL_GPP (3 ,216 ,239 ,288 ),/* GPP_F */ CNL_GPP (4 ,240 ,248 ,CNL_NO_GPIO ),/* SPI */ };
drivers/pinctrl/pinctrl-mcp23s08.c +12 -1
@@ -636,6 +636,14 @@ static int mcp23s08_irq_setup(struct mcp23s08 *mcp)return err; } +return 0 ; +} + +static int mcp23s08_irqchip_setup (struct mcp23s08 *mcp) +{ +struct gpio_chip *chip = &mcp->chip; +int err; + err = gpiochip_irqchip_add_nested(chip, &mcp23s08_irq_chip, 0,
@@ -912,7 +920,7 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev, }if (mcp->irq && mcp->irq_controller) { - ret =mcp23s08_irq_setup (mcp); + ret =mcp23s08_irqchip_setup (mcp);if (ret) goto fail; }
@@ -944,6 +952,9 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev, goto fail; } +if (mcp->irq) + ret =mcp23s08_irq_setup (mcp); + fail:if (ret <0 )dev_dbg (dev,"can't setup chip %d, --> %d\n" , addr, ret);
drivers/s390/cio/vfio_ccw_cp.c +1 -1
@@ -163,7 +163,7 @@ static bool pfn_array_table_iova_pinned(struct pfn_array_table *pat,for (i =0 ; i < pat->pat_nr; i++, pa++)for (j =0 ; j < pa->pa_nr; j++) -if (pa->pa_iova_pfn[i] == iova_pfn) +if (pa->pa_iova_pfn[j] == iova_pfn)return true;return false;
drivers/scsi/qla2xxx/qla_target.h +2 -2
@@ -374,8 +374,8 @@ struct atio_from_isp {static inline int fcpcmd_is_corrupted (struct atio *atio) {if (atio->entry_type ==ATIO_TYPE7 && - (le16_to_cpu (atio->attr_n_length &FCP_CMD_LENGTH_MASK ) < -FCP_CMD_LENGTH_MIN )) + ((le16_to_cpu (atio->attr_n_length) &FCP_CMD_LENGTH_MASK ) < +FCP_CMD_LENGTH_MIN ))return 1 ;else return 0 ;
drivers/target/iscsi/iscsi_target.c +14 -8
@@ -1419,7 +1419,8 @@ static void iscsit_do_crypto_hash_buf(struct ahash_request *hash,sg_init_table (sg,ARRAY_SIZE (sg));sg_set_buf (sg, buf, payload_length); -sg_set_buf (sg +1 , pad_bytes, padding); +if (padding) +sg_set_buf (sg +1 , pad_bytes, padding);ahash_request_set_crypt (hash, sg, data_crc, payload_length + padding);
@@ -3913,10 +3914,14 @@ static bool iscsi_target_check_conn_state(struct iscsi_conn *conn)static void iscsit_get_rx_pdu (struct iscsi_conn *conn) {int ret; -u8 buffer[ISCSI_HDR_LEN ], opcode; +u8 *buffer, opcode;u32 checksum =0 , digest =0 ;struct kvec iov; + buffer =kcalloc (ISCSI_HDR_LEN ,sizeof (*buffer),GFP_KERNEL ); +if (!buffer) +return ; +while (!kthread_should_stop ()) {/* * Ensure that both TX and RX per connection kthreads
@@ -3924,7 +3929,6 @@ static void iscsit_get_rx_pdu(struct iscsi_conn *conn)*/ iscsit_thread_check_cpumask (conn, current,0 ); -memset (buffer,0 ,ISCSI_HDR_LEN );memset (&iov,0 ,sizeof (struct kvec )); iov.iov_base = buffer;
@@ -3933,7 +3937,7 @@ static void iscsit_get_rx_pdu(struct iscsi_conn *conn) ret =rx_data (conn, &iov,1 ,ISCSI_HDR_LEN );if (ret !=ISCSI_HDR_LEN ) {iscsit_rx_thread_wait_for_tcp (conn); -return ; +break ; }if (conn->conn_ops->HeaderDigest) {
@@ -3943,7 +3947,7 @@ static void iscsit_get_rx_pdu(struct iscsi_conn *conn) ret =rx_data (conn, &iov,1 ,ISCSI_CRC_LEN );if (ret !=ISCSI_CRC_LEN ) {iscsit_rx_thread_wait_for_tcp (conn); -return ; +break ; } iscsit_do_crypto_hash_buf(conn->conn_rx_hash, buffer,
@@ -3967,7 +3971,7 @@ static void iscsit_get_rx_pdu(struct iscsi_conn *conn) }if (conn->conn_state ==TARG_CONN_STATE_IN_LOGOUT ) -return ; +break ; opcode = buffer[0 ] &ISCSI_OPCODE_MASK ;
@@ -3978,13 +3982,15 @@ static void iscsit_get_rx_pdu(struct iscsi_conn *conn) " while in Discovery Session, rejecting.\n", opcode);iscsit_add_reject (conn,ISCSI_REASON_PROTOCOL_ERROR , buffer); -return ; +break ; } ret =iscsi_target_rx_opcode (conn, buffer);if (ret <0 ) -return ; +break ; } + +kfree (buffer); }int iscsi_target_rx_thread (void *arg)
drivers/video/fbdev/aty/atyfb.h +2 -1
@@ -333,6 +333,8 @@ extern const struct aty_pll_ops aty_pll_ct; /* Integrated */extern void aty_set_pll_ct (const struct fb_info *info,const union aty_pll *pll);extern u8 aty_ld_pll_ct (int offset,const struct atyfb_par *par); +extern const u8 aty_postdividers[8 ]; +/* * Hardware cursor support
@@ -359,7 +361,6 @@ static inline void wait_for_idle(struct atyfb_par *par)extern void aty_reset_engine (const struct atyfb_par *par);extern void aty_init_engine (struct atyfb_par *par,struct fb_info *info); -extern u8 aty_ld_pll_ct (int offset,const struct atyfb_par *par);void atyfb_copyarea (struct fb_info *info,const struct fb_copyarea *area);void atyfb_fillrect (struct fb_info *info,const struct fb_fillrect *rect);
drivers/video/fbdev/aty/atyfb_base.c +4 -3
@@ -3087,17 +3087,18 @@ static int atyfb_setup_sparc(struct pci_dev *pdev, struct fb_info *info,/* * PLL Reference Divider M: */ -M = pll_regs[2 ]; +M = pll_regs[PLL_REF_DIV ];/* * PLL Feedback Divider N (Dependent on CLOCK_CNTL): */ -N = pll_regs[7 + (clock_cntl &3 )]; +N = pll_regs[VCLK0_FB_DIV + (clock_cntl &3 )];/* * PLL Post Divider P (Dependent on CLOCK_CNTL): */ -P =1 << (pll_regs[6 ] >> ((clock_cntl &3 ) <<1 )); +P = aty_postdividers[((pll_regs[VCLK_POST_DIV ] >> ((clock_cntl &3 ) <<1 )) &3 ) | + ((pll_regs[PLL_EXT_CNTL ] >> (2 + (clock_cntl &3 ))) &4 )];/* * PLL Divider Q:
drivers/video/fbdev/aty/mach64_ct.c +5 -5
@@ -115,7 +115,7 @@ static void aty_st_pll_ct(int offset, u8 val, const struct atyfb_par *par)*/ #define Maximum_DSP_PRECISION 7 -static u8 postdividers[] = {1 ,2 ,4 ,8 ,3 }; +const u8 aty_postdividers[8 ] = {1 ,2 ,4 ,8 ,3 ,5 ,6 ,12 };static int aty_dsp_gt (const struct fb_info *info,u32 bpp,struct pll_ct *pll) {
@@ -222,7 +222,7 @@ static int aty_valid_pll_ct(const struct fb_info *info, u32 vclk_per, struct pll pll->vclk_post_div += (q <64 *8 ); pll->vclk_post_div += (q <32 *8 ); } - pll->vclk_post_div_real = postdividers[pll->vclk_post_div]; + pll->vclk_post_div_real = aty_postdividers[pll->vclk_post_div];// pll->vclk_post_div <<= 6; pll->vclk_fb_div = q * pll->vclk_post_div_real /8 ; pllvclk = (1000000 * 2 * pll->vclk_fb_div) /
@@ -513,7 +513,7 @@ static int aty_init_pll_ct(const struct fb_info *info, union aty_pll *pll)u8 mclk_fb_div, pll_ext_cntl; pll->ct.pll_ref_div =aty_ld_pll_ct (PLL_REF_DIV , par); pll_ext_cntl =aty_ld_pll_ct (PLL_EXT_CNTL , par); - pll->ct.xclk_post_div_real = postdividers[pll_ext_cntl &0x07 ]; + pll->ct.xclk_post_div_real = aty_postdividers[pll_ext_cntl &0x07 ]; mclk_fb_div =aty_ld_pll_ct (MCLK_FB_DIV , par);if (pll_ext_cntl &PLL_MFB_TIMES_4_2B ) mclk_fb_div <<=1 ;
@@ -535,7 +535,7 @@ static int aty_init_pll_ct(const struct fb_info *info, union aty_pll *pll) xpost_div += (q <64 *8 ); xpost_div += (q <32 *8 ); } - pll->ct.xclk_post_div_real = postdividers[xpost_div]; + pll->ct.xclk_post_div_real = aty_postdividers[xpost_div]; pll->ct.mclk_fb_div = q * pll->ct.xclk_post_div_real /8 ;#ifdef CONFIG_PPC
@@ -584,7 +584,7 @@ static int aty_init_pll_ct(const struct fb_info *info, union aty_pll *pll) mpost_div += (q <64 *8 ); mpost_div += (q <32 *8 ); } - sclk_post_div_real = postdividers[mpost_div]; + sclk_post_div_real = aty_postdividers[mpost_div]; pll->ct.sclk_fb_div = q * sclk_post_div_real /8 ; pll->ct.spll_cntl2 = mpost_div <<4 ;#ifdef DEBUG
fs/afs/rxrpc.c +0 -2
@@ -690,8 +690,6 @@ static void afs_process_async_call(struct work_struct *work) }if (call->state ==AFS_CALL_COMPLETE ) { - call->reply[0 ] =NULL ; -/* We have two refs to release - one from the alloc and one * queued with the work item - and we can't just deallocate the * call because the work item may be queued again.
fs/dax.c +11 -2
@@ -558,6 +558,8 @@ struct page *dax_layout_busy_page(struct address_space *mapping)while (index < end &&pagevec_lookup_entries (&pvec, mapping, index,min (end - index, (pgoff_t )PAGEVEC_SIZE ), indices)) { +pgoff_t nr_pages =1 ; +for (i =0 ; i <pagevec_count (&pvec); i++) {struct page *pvec_ent = pvec.pages[i];void *entry;
@@ -571,8 +573,15 @@ struct page *dax_layout_busy_page(struct address_space *mapping)xa_lock_irq (&mapping->i_pages); entry =get_unlocked_mapping_entry (mapping, index,NULL ); -if (entry) +if (entry) { page =dax_busy_page (entry); +/* +* Account for multi-order entries at +* the end of the pagevec. +*/ +if (i +1 >=pagevec_count (&pvec)) + nr_pages =1UL <<dax_radix_order (entry); + }put_unlocked_mapping_entry (mapping, index, entry);xa_unlock_irq (&mapping->i_pages);if (page)
@@ -580,7 +589,7 @@ struct page *dax_layout_busy_page(struct address_space *mapping) }pagevec_remove_exceptionals (&pvec);pagevec_release (&pvec); - index++; + index += nr_pages;if (page)break ;
include/linux/cgroup-defs.h +1 -0
@@ -412,6 +412,7 @@ struct cgroup {* specific task are charged to the dom_cgrp. */ struct cgroup *dom_cgrp; +struct cgroup *old_dom_cgrp;/* used while enabling threaded */ /* per-cpu recursive resource statistics */ struct cgroup_rstat_cpu __percpu *rstat_cpu;
include/linux/netdevice.h +7 -0
@@ -2420,6 +2420,13 @@ struct netdev_notifier_info {struct netlink_ext_ack *extack; }; +struct netdev_notifier_info_ext { +struct netdev_notifier_info info;/* must be first */ +union { +u32 mtu; + } ext; +}; +struct netdev_notifier_change_info {struct netdev_notifier_info info;/* must be first */ unsigned int flags_changed;
net/core/rtnetlink.c +28 -13
41 lines not on this page · raw message
net/ipv4/fib_semantics.c +50 -0
50 lines not on this page · raw message
tools/perf/scripts/python/export-to-postgresql.py +9 -0
Lines of this file are not shown. View the raw message.
tools/perf/scripts/python/export-to-sqlite.py +5 -1
Lines of this file are not shown. View the raw message.
tools/testing/selftests/android/Makefile +1 -1
Lines of this file are not shown. View the raw message.
tools/testing/selftests/android/config new file +5 -0
Lines of this file are not shown. View the raw message.
tools/testing/selftests/android/ion/Makefile +2 -0
Lines of this file are not shown. View the raw message.
tools/testing/selftests/android/ion/config deleted +0 -5
Lines of this file are not shown. View the raw message.
tools/testing/selftests/cgroup/cgroup_util.c +14 -3
Lines of this file are not shown. View the raw message.
tools/testing/selftests/efivarfs/config new file +1 -0
Lines of this file are not shown. View the raw message.
tools/testing/selftests/futex/functional/Makefile +1 -0
Lines of this file are not shown. View the raw message.
tools/testing/selftests/memory-hotplug/config +1 -0
Lines of this file are not shown. View the raw message.
tools/testing/selftests/networking/timestamping/Makefile +1 -0
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.