1. 04 4月, 2020 5 次提交
    • C
      net: dsa: mt7530: fix null pointer dereferencing in port5 setup · 0452800f
      Chuanhong Guo 提交于
      The 2nd gmac of mediatek soc ethernet may not be connected to a PHY
      and a phy-handle isn't always available.
      Unfortunately, mt7530 dsa driver assumes that the 2nd gmac is always
      connected to switch port 5 and setup mt7530 according to phy address
      of 2nd gmac node, causing null pointer dereferencing when phy-handle
      isn't defined in dts.
      This commit fix this setup code by checking return value of
      of_parse_phandle before using it.
      
      Fixes: 38f790a8 ("net: dsa: mt7530: Add support for port 5")
      Signed-off-by: NChuanhong Guo <gch981213@gmail.com>
      Reviewed-by: NVivien Didelot <vivien.didelot@gmail.com>
      Reviewed-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Tested-by: NRené van Dorst <opensource@vdorst.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0452800f
    • G
      mptcp: add some missing pr_fmt defines · c85adced
      Geliang Tang 提交于
      Some of the mptcp logs didn't print out the format string:
      
      [  185.651493] DSS
      [  185.651494] data_fin=0 dsn64=0 use_map=0 ack64=1 use_ack=1
      [  185.651494] data_ack=13792750332298763796
      [  185.651495] MPTCP: msk=00000000c4b81cfc ssk=000000009743af53 data_avail=0 skb=0000000063dc595d
      [  185.651495] MPTCP: msk=00000000c4b81cfc ssk=000000009743af53 status=0
      [  185.651495] MPTCP: msk ack_seq=9bbc894565aa2f9a subflow ack_seq=9bbc894565aa2f9a
      [  185.651496] MPTCP: msk=00000000c4b81cfc ssk=000000009743af53 data_avail=1 skb=0000000012e809e1
      
      So this patch added these missing pr_fmt defines. Then we can get the same
      format string "MPTCP" in all mptcp logs like this:
      
      [  142.795829] MPTCP: DSS
      [  142.795829] MPTCP: data_fin=0 dsn64=0 use_map=0 ack64=1 use_ack=1
      [  142.795829] MPTCP: data_ack=8089704603109242421
      [  142.795830] MPTCP: msk=00000000133a24e0 ssk=000000002e508c64 data_avail=0 skb=00000000d5f230df
      [  142.795830] MPTCP: msk=00000000133a24e0 ssk=000000002e508c64 status=0
      [  142.795831] MPTCP: msk ack_seq=66790290f1199d9b subflow ack_seq=66790290f1199d9b
      [  142.795831] MPTCP: msk=00000000133a24e0 ssk=000000002e508c64 data_avail=1 skb=00000000de5aca2e
      Signed-off-by: NGeliang Tang <geliangtang@gmail.com>
      Reviewed-by: NMatthieu Baerts <matthieu.baerts@tessares.net>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c85adced
    • O
      net: phy: micrel: kszphy_resume(): add delay after genphy_resume() before accessing PHY registers · 6110dff7
      Oleksij Rempel 提交于
      After the power-down bit is cleared, the chip internally triggers a
      global reset. According to the KSZ9031 documentation, we have to wait at
      least 1ms for the reset to finish.
      
      If the chip is accessed during reset, read will return 0xffff, while
      write will be ignored. Depending on the system performance and MDIO bus
      speed, we may or may not run in to this issue.
      
      This bug was discovered on an iMX6QP system with KSZ9031 PHY and
      attached PHY interrupt line. If IRQ was used, the link status update was
      lost. In polling mode, the link status update was always correct.
      
      The investigation showed, that during a read-modify-write access, the
      read returned 0xffff (while the chip was still in reset) and
      corresponding write hit the chip _after_ reset and triggered (due to the
      0xffff) another reset in an undocumented bit (register 0x1f, bit 1),
      resulting in the next write being lost due to the new reset cycle.
      
      This patch fixes the issue by adding a 1...2 ms sleep after the
      genphy_resume().
      
      Fixes: 836384d2 ("net: phy: micrel: Add specific suspend")
      Signed-off-by: NOleksij Rempel <o.rempel@pengutronix.de>
      Reviewed-by: NAndrew Lunn <andrew@lunn.ch>
      Reviewed-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6110dff7
    • C
      net_sched: fix a missing refcnt in tcindex_init() · a8eab6d3
      Cong Wang 提交于
      The initial refcnt of struct tcindex_data should be 1,
      it is clear that I forgot to set it to 1 in tcindex_init().
      This leads to a dec-after-zero warning.
      
      Reported-by: syzbot+8325e509a1bf83ec741d@syzkaller.appspotmail.com
      Fixes: 304e0242 ("net_sched: add a temporary refcnt for struct tcindex_data")
      Cc: Jamal Hadi Salim <jhs@mojatatu.com>
      Cc: Jiri Pirko <jiri@resnulli.us>
      Cc: Paul E. McKenney <paulmck@kernel.org>
      Signed-off-by: NCong Wang <xiyou.wangcong@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a8eab6d3
    • J
      net: stmmac: dwmac1000: fix out-of-bounds mac address reg setting · 3e1221ac
      Jisheng Zhang 提交于
      Commit 9463c445 ("net: stmmac: dwmac1000: Clear unused address
      entries") cleared the unused mac address entries, but introduced an
      out-of bounds mac address register programming bug -- After setting
      the secondary unicast mac addresses, the "reg" value has reached
      netdev_uc_count() + 1, thus we should only clear address entries
      if (addr < perfect_addr_number)
      
      Fixes: 9463c445 ("net: stmmac: dwmac1000: Clear unused address entries")
      Signed-off-by: NJisheng Zhang <Jisheng.Zhang@synaptics.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3e1221ac
  2. 03 4月, 2020 5 次提交
  3. 02 4月, 2020 22 次提交
  4. 01 4月, 2020 8 次提交
    • L
      x86: get rid of 'errret' argument to __get_user_xyz() macross · 1a323ea5
      Linus Torvalds 提交于
      Every remaining user just has the error case returning -EFAULT.
      
      In fact, the exception was __get_user_asm_nozero(), which was removed in
      commit 4b842e4e ("x86: get rid of small constant size cases in
      raw_copy_{to,from}_user()"), and the other __get_user_xyz() macros just
      followed suit for consistency.
      
      Fix up some macro whitespace while at it.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      1a323ea5
    • L
      x86: remove __put_user_asm() infrastructure · ab33eb49
      Linus Torvalds 提交于
      The last user was removed by commit 4b842e4e ("x86: get rid of small
      constant size cases in raw_copy_{to,from}_user()").  Get rid of the
      left-overs before somebody tries to use it again.
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      ab33eb49
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next · 29d9f30d
      Linus Torvalds 提交于
      Pull networking updates from David Miller:
       "Highlights:
      
         1) Fix the iwlwifi regression, from Johannes Berg.
      
         2) Support BSS coloring and 802.11 encapsulation offloading in
            hardware, from John Crispin.
      
         3) Fix some potential Spectre issues in qtnfmac, from Sergey
            Matyukevich.
      
         4) Add TTL decrement action to openvswitch, from Matteo Croce.
      
         5) Allow paralleization through flow_action setup by not taking the
            RTNL mutex, from Vlad Buslov.
      
         6) A lot of zero-length array to flexible-array conversions, from
            Gustavo A. R. Silva.
      
         7) Align XDP statistics names across several drivers for consistency,
            from Lorenzo Bianconi.
      
         8) Add various pieces of infrastructure for offloading conntrack, and
            make use of it in mlx5 driver, from Paul Blakey.
      
         9) Allow using listening sockets in BPF sockmap, from Jakub Sitnicki.
      
        10) Lots of parallelization improvements during configuration changes
            in mlxsw driver, from Ido Schimmel.
      
        11) Add support to devlink for generic packet traps, which report
            packets dropped during ACL processing. And use them in mlxsw
            driver. From Jiri Pirko.
      
        12) Support bcmgenet on ACPI, from Jeremy Linton.
      
        13) Make BPF compatible with RT, from Thomas Gleixnet, Alexei
            Starovoitov, and your's truly.
      
        14) Support XDP meta-data in virtio_net, from Yuya Kusakabe.
      
        15) Fix sysfs permissions when network devices change namespaces, from
            Christian Brauner.
      
        16) Add a flags element to ethtool_ops so that drivers can more simply
            indicate which coalescing parameters they actually support, and
            therefore the generic layer can validate the user's ethtool
            request. Use this in all drivers, from Jakub Kicinski.
      
        17) Offload FIFO qdisc in mlxsw, from Petr Machata.
      
        18) Support UDP sockets in sockmap, from Lorenz Bauer.
      
        19) Fix stretch ACK bugs in several TCP congestion control modules,
            from Pengcheng Yang.
      
        20) Support virtual functiosn in octeontx2 driver, from Tomasz
            Duszynski.
      
        21) Add region operations for devlink and use it in ice driver to dump
            NVM contents, from Jacob Keller.
      
        22) Add support for hw offload of MACSEC, from Antoine Tenart.
      
        23) Add support for BPF programs that can be attached to LSM hooks,
            from KP Singh.
      
        24) Support for multiple paths, path managers, and counters in MPTCP.
            From Peter Krystad, Paolo Abeni, Florian Westphal, Davide Caratti,
            and others.
      
        25) More progress on adding the netlink interface to ethtool, from
            Michal Kubecek"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (2121 commits)
        net: ipv6: rpl_iptunnel: Fix potential memory leak in rpl_do_srh_inline
        cxgb4/chcr: nic-tls stats in ethtool
        net: dsa: fix oops while probing Marvell DSA switches
        net/bpfilter: remove superfluous testing message
        net: macb: Fix handling of fixed-link node
        net: dsa: ksz: Select KSZ protocol tag
        netdevsim: dev: Fix memory leak in nsim_dev_take_snapshot_write
        net: stmmac: add EHL 2.5Gbps PCI info and PCI ID
        net: stmmac: add EHL PSE0 & PSE1 1Gbps PCI info and PCI ID
        net: stmmac: create dwmac-intel.c to contain all Intel platform
        net: dsa: bcm_sf2: Support specifying VLAN tag egress rule
        net: dsa: bcm_sf2: Add support for matching VLAN TCI
        net: dsa: bcm_sf2: Move writing of CFP_DATA(5) into slicing functions
        net: dsa: bcm_sf2: Check earlier for FLOW_EXT and FLOW_MAC_EXT
        net: dsa: bcm_sf2: Disable learning for ASP port
        net: dsa: b53: Deny enslaving port 7 for 7278 into a bridge
        net: dsa: b53: Prevent tagged VLAN on port 7 for 7278
        net: dsa: b53: Restore VLAN entries upon (re)configuration
        net: dsa: bcm_sf2: Fix overflow checks
        hv_netvsc: Remove unnecessary round_up for recv_completion_cnt
        ...
      29d9f30d
    • L
      Merge tag 'ntb-5.7' of git://github.com/jonmason/ntb · 56a451b7
      Linus Torvalds 提交于
      Pull NTB updates from Jon Mason:
       "Bug fixes for a few printing issues, link status detection bug on AMD
        hardware, and a DMA address issue with ntb_perf.
      
        Also, large series of AMD NTB patches"
      
      * tag 'ntb-5.7' of git://github.com/jonmason/ntb: (21 commits)
        NTB: add pci shutdown handler for AMD NTB
        NTB: send DB event when driver is loaded or un-loaded
        NTB: remove redundant setting of DB valid mask
        NTB: return link up status correctly for PRI and SEC
        NTB: add helper functions to set and clear sideinfo
        NTB: move ntb_ctrl handling to init and deinit
        NTB: handle link up, D0 and D3 events correctly
        NTB: handle link down event correctly
        NTB: remove handling of peer_sta from amd_link_is_up
        NTB: set peer_sta within event handler itself
        NTB: return the side info status from amd_poll_link
        NTB: define a new function to get link status
        NTB: Enable link up and down event notification
        NTB: clear interrupt status register
        NTB: Fix access to link status and control register
        MAINTAINERS: update maintainer list for AMD NTB driver
        NTB: ntb_transport: Use scnprintf() for avoiding potential buffer overflow
        ntb_hw_switchtec: Fix ntb_mw_clear_trans error if size == 0
        ntb_tool: Fix printk format
        NTB: ntb_perf: Fix address err in perf_copy_chunk
        ...
      56a451b7
    • L
      Merge tag 'platform-drivers-x86-v5.7-1' of git://git.infradead.org/linux-platform-drivers-x86 · dba43fc4
      Linus Torvalds 提交于
      Pull x86 platform driver updates from Andy Shevchenko:
      
       - Fix for improper handling of fan_boost_mode in sysfs for ASUS
         laptops.
      
       - On newer ASUS laptops the 1st battery is named differently, here is a
         fix.
      
       - Fix Lex 2I385SW to allow both network cards to be used.
      
       - The power integrated circuit driver for Surface 3 has been added.
      
       - Refactor and clean up of Intel PMC driver and enable it on Intel
         Jasper Lake.
      
       - Clean up of Dell RBU driver.
      
       - Big update for Intel Speed Select technology support tool and driver.
      
      * tag 'platform-drivers-x86-v5.7-1' of git://git.infradead.org/linux-platform-drivers-x86: (75 commits)
        platform/x86: surface3_power: Fix always true condition in mshw0011_space_handler()
        platform/x86: surface3_power: Fix Kconfig section ordering
        platform/x86: surface3_power: Add missed headers
        platform/x86: surface3_power: Reformat GUID assignment
        platform/x86: surface3_power: Drop useless macro ACPI_PTR()
        platform/x86: surface3_power: Prefix POLL_INTERVAL with SURFACE_3
        platform/x86: surface3_power: Simplify mshw0011_adp_psr() to one liner
        platform/x86: surface3_power: Use dev_err() instead of pr_err()
        platform/x86: surface3_power: Drop unused structure definition
        platform/x86: surface3_power: MSHW0011 rev-eng implementation
        platform/x86: intel_pmc_core: Make pmc_core_substate_res_show() generic
        platform/x86: intel_pmc_core: Make pmc_core_lpm_display() generic for platforms that support sub-states
        tools/power/x86/intel-speed-select: Fix a typo in error message
        tools/power/x86/intel-speed-select: Update version
        tools/power/x86/intel-speed-select: Avoid duplicate Package strings for json
        tools/power/x86/intel-speed-select: Add display for enabled cpus count
        tools/power/x86/intel-speed-select: Print friendly warning for bad command line
        tools/power/x86/intel-speed-select: Fix avx options for turbo-freq feature
        tools/power/x86/intel-speed-select: Improve CLX commands
        tools/power/x86/intel-speed-select: Show error for invalid CPUs in the options
        ...
      dba43fc4
    • L
      Merge tag 'tty-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 1f944f97
      Linus Torvalds 提交于
      Pull tty/serial updates from Greg KH:
       "Here is the big set of TTY / Serial patches for 5.7-rc1
      
        Lots of console fixups and reworking in here, serial core tweaks
        (doesn't that ever get old, why are we still creating new serial
        devices?), serial driver updates, line-protocol driver updates, and
        some vt cleanups and fixes included in here as well.
      
        All have been in linux-next with no reported issues"
      
      * tag 'tty-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (161 commits)
        serial: 8250: Optimize irq enable after console write
        serial: 8250: Fix rs485 delay after console write
        vt: vt_ioctl: fix use-after-free in vt_in_use()
        vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
        tty: serial: make SERIAL_SPRD depend on COMMON_CLK
        tty: serial: fsl_lpuart: fix return value checking
        tty: serial: fsl_lpuart: move dma_request_chan()
        ARM: dts: tango4: Make /serial compatible with ns16550a
        ARM: dts: mmp*: Make the serial ports compatible with xscale-uart
        ARM: dts: mmp*: Fix serial port names
        ARM: dts: mmp2-brownstone: Don't redeclare phandle references
        ARM: dts: pxa*: Make the serial ports compatible with xscale-uart
        ARM: dts: pxa*: Fix serial port names
        ARM: dts: pxa*: Don't redeclare phandle references
        serial: omap: drop unused dt-bindings header
        serial: 8250: 8250_omap: Add DMA support for UARTs on K3 SoCs
        serial: 8250: 8250_omap: Work around errata causing spurious IRQs with DMA
        serial: 8250: 8250_omap: Extend driver data to pass FIFO trigger info
        serial: 8250: 8250_omap: Move locking out from __dma_rx_do_complete()
        serial: 8250: 8250_omap: Account for data in flight during DMA teardown
        ...
      1f944f97
    • L
      Merge tag 'mmc-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc · dfabb077
      Linus Torvalds 提交于
      Pull MMC updates from Ulf Hansson:
       "MMC core:
         - Add support for host software queue for (e)MMC/SD
         - Throttle polling rate for CMD6
         - Update CMD13 busy condition check for CMD6 commands
         - Improve busy detect polling for erase/trim/discard/HPI
         - Fixup support for HW busy detection for HPI commands
         - Re-work and improve support for eMMC sanitize commands
      
        MMC host:
         - mmci:
             * Add support for sdmmc variant revision 2.0
         - mmci_sdmmc:
             * Improve support for busyend detection
             * Fixup support for signal voltage switch
             * Add support for tuning with delay block
         - mtk-sd:
             * Fix another SDIO irq issue
         - sdhci:
             * Disable native card detect when GPIO based type exist
         - sdhci:
             * Add option to defer request completion
         - sdhci_am654:
             * Add support to set a tap value per speed mode
         - sdhci-esdhc-imx:
             * Add support for i.MX8MM based variant
             * Fixup support for standard tuning on i.MX8 usdhc
             * Optimize for strobe/clock dll settings
             * Fixup support for system and runtime suspend/resume
         - sdhci-iproc:
             * Update regulator/bus-voltage management for bcm2711
         - sdhci-msm:
             * Prevent clock gating with PWRSAVE_DLL on broken variants
             * Fix management of CQE during SDHCI reset
         - sdhci-of-arasan:
             * Add support for auto tuning on ZynqMP based platforms
         - sdhci-omap:
             * Add support for system suspend/resume
         - sdhci-sprd:
             * Add support for HW busy detection
             * Enable support host software queue
         - sdhci-tegra:
             * Add support for HW busy detection
         - tmio/renesas_sdhi:
             * Enforce retune after runtime suspend
         - renesas_sdhi:
             * Use manual tap correction for HS400 on some variants
             * Add support for manual correction of tap values for tunings"
      
      * tag 'mmc-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (86 commits)
        mmc: cavium-octeon: remove nonsense variable coercion
        mmc: mediatek: fix SDIO irq issue
        mmc: mmci_sdmmc: Fix clear busyd0end irq flag
        dt-bindings: mmc: Fix node name in an example
        mmc: core: Re-work the code for eMMC sanitize
        mmc: sdhci: use FIELD_GET for preset value bit masks
        mmc: sdhci-of-at91: Display clock changes for debug purpose only
        mmc: sdhci: iproc: Add custom set_power() callback for bcm2711
        mmc: sdhci: am654: Use sdhci_set_power_and_voltage()
        mmc: sdhci: at91: Use sdhci_set_power_and_voltage()
        mmc: sdhci: milbeaut: Use sdhci_set_power_and_voltage()
        mmc: sdhci: arasan: Use sdhci_set_power_and_voltage()
        mmc: sdhci: Introduce sdhci_set_power_and_bus_voltage()
        mmc: vub300: Use scnprintf() for avoiding potential buffer overflow
        dt-bindings: mmc: synopsys-dw-mshc: fix clock-freq-min-max in example
        sdhci: tegra: Enable MMC_CAP_WAIT_WHILE_BUSY host capability
        sdhci: tegra: Implement Tegra specific set_timeout callback
        mmc: sdhci-omap: Add Support for Suspend/Resume
        mmc: renesas_sdhi: simplify execute_tuning
        mmc: renesas_sdhi: Use BITS_PER_LONG helper
        ...
      dfabb077
    • L
      Merge tag 'kbuild-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · 5b67fbfc
      Linus Torvalds 提交于
      Pull Kbuild updates from Masahiro Yamada:
       "Build system:
      
         - add CONFIG_UNUSED_KSYMS_WHITELIST, which will be useful to define a
           fixed set of export symbols for Generic Kernel Image (GKI)
      
         - allow to run 'make dt_binding_check' without .config
      
         - use full schema for checking DT examples in *.yaml files
      
         - make modpost fail for missing MODULE_IMPORT_NS(), which makes more
           sense because we know the produced modules are never loadable
      
         - Remove unused 'AS' variable
      
        Kconfig:
      
         - sanitize DEFCONFIG_LIST, and remove ARCH_DEFCONFIG from Kconfig
           files
      
         - relax the 'imply' behavior so that symbols implied by 'y' can
           become 'm'
      
         - make 'imply' obey 'depends on' in order to make 'imply' really weak
      
        Misc:
      
         - add documentation on building the kernel with Clang/LLVM
      
         - revive __HAVE_ARCH_STRLEN for 32bit sparc to use optimized strlen()
      
         - fix warning from deb-pkg builds when CONFIG_DEBUG_INFO=n
      
         - various script and Makefile cleanups"
      
      * tag 'kbuild-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (34 commits)
        Makefile: Update kselftest help information
        kbuild: deb-pkg: fix warning when CONFIG_DEBUG_INFO is unset
        kbuild: add outputmakefile to no-dot-config-targets
        kbuild: remove AS variable
        net: wan: wanxl: refactor the firmware rebuild rule
        net: wan: wanxl: use $(M68KCC) instead of $(M68KAS) for rebuilding firmware
        net: wan: wanxl: use allow to pass CROSS_COMPILE_M68k for rebuilding firmware
        kbuild: add comment about grouped target
        kbuild: add -Wall to KBUILD_HOSTCXXFLAGS
        kconfig: remove unused variable in qconf.cc
        sparc: revive __HAVE_ARCH_STRLEN for 32bit sparc
        kbuild: refactor Makefile.dtbinst more
        kbuild: compute the dtbs_install destination more simply
        Makefile: disallow data races on gcc-10 as well
        kconfig: make 'imply' obey the direct dependency
        kconfig: allow symbols implied by y to become m
        net: drop_monitor: use IS_REACHABLE() to guard net_dm_hw_report()
        modpost: return error if module is missing ns imports and MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=n
        modpost: rework and consolidate logging interface
        kbuild: allow to run dt_binding_check without kernel configuration
        ...
      5b67fbfc