1. 13 Oct, 2017 2 commits
  2. 10 Oct, 2017 12 commits
    • Tony Lindgren's avatar
      ARM: OMAP2+: Drop legacy struct omap_hwmod_addr_space · 9cffb1a0
      Tony Lindgren authored
      With all of mach-omap2 booting now in device tree only mode,
      we can get the module IO range from device tree and just drop
      the legacy hwmod struct omap_hwmod_addr_space.
      
      Cc: Lokesh Vutla <lokeshvutla@ti.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      9cffb1a0
    • Tony Lindgren's avatar
      ARM: OMAP2+: Drop omap_hwmod_dma_info · c2b84a9b
      Tony Lindgren authored
      We have all of mach-omap2 booting in device tree only
      mode now, and this data is populated from device tree.
      
      Note that once we have removed support for the omap legacy
      DMA, we can also drop struct omap_dma_dev_attr.
      
      Cc: Lokesh Vutla <lokeshvutla@ti.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      c2b84a9b
    • Tony Lindgren's avatar
      ARM: OMAP2+: Drop omap_hwmod_irq_info · fe97874a
      Tony Lindgren authored
      With the previous patches removing the need for legacy IRQs
      now that all of mach-omap2 is booting in device tree only mode,
      we can drop struct omap_hwmod_irq_info.
      
      Note that we can now also finally drop omap4_xlate_irq.
      
      Cc: Lokesh Vutla <lokeshvutla@ti.com>
      Cc: Marc Zyngier <marc.zyngier@arm.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      fe97874a
    • Tony Lindgren's avatar
      ARM: OMAP4: Remove legacy IRQ for PRM · 3da52167
      Tony Lindgren authored
      We have the PRM IRQ mapped in device tree and this legacy code
      is no longer needed.
      
      Cc: Lokesh Vutla <lokeshvutla@ti.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      3da52167
    • Tony Lindgren's avatar
      ARM: OMAP3: Remove legacy IRQ for PRM · 82e5051b
      Tony Lindgren authored
      We have this coming from device tree and legacy booting is
      no longer needed.
      
      Cc: Lokesh Vutla <lokeshvutla@ti.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      82e5051b
    • Tony Lindgren's avatar
      bus: ti-sysc: Add minimal TI sysc interconnect target driver · 0eecc636
      Tony Lindgren authored
      We can handle the sysc interconnect target module in a generic way
      for many TI SoCs. Initially let's just enable runtime PM with
      autosuspend, and probe the children. This can already be used for
      idling interconnect target modules that don't have any device driver
      available for the child devices.
      
      For now, the "ti,hwmods" custom binding is still required. That will
      be eventually deprecated in later patches. And more features will be
      added, such as parsing for sysc capabilities so we can continue
      removing the legacy platform data.
      
      Cc: Benoît Cousson <bcousson@baylibre.com>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
      Cc: Nishanth Menon <nm@ti.com>
      Cc: Matthijs van Duin <matthijsvanduin@gmail.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
      Cc: Sakari Ailus <sakari.ailus@iki.fi>
      Cc: Tero Kristo <t-kristo@ti.com>
      Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
      Cc: linux-kernel@vger.kernel.org
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      0eecc636
    • Tony Lindgren's avatar
      ARM: OMAP2+: Populate legacy resources for dma and smartreflex · d85a2d61
      Tony Lindgren authored
      We can populate the legacy resources needed by dma and smartreflex
      from device tree in omap_device_build().
      
      There should be no need to do this for other devices, and eventually
      these two remaining users will be gone too. The legacy dma will be
      dropped when the remaining users have been converted to use the
      dmaengine driver, and smartreflex can now become just a regular
      device driver with a few pdata callbacks.
      
      This is needed in order to remove remaining device dma, irq and io
      resources from the interconnect code.
      
      And while at it, let's simplify things by removing otherwise
      unused omap_device_build_ss() as we will never call it for more
      than one hwmod.
      
      Cc: "Benoît Cousson" <bcousson@baylibre.com>
      Cc: Lokesh Vutla <lokeshvutla@ti.com>
      Cc: Nishanth Menon <nm@ti.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      d85a2d61
    • Tony Lindgren's avatar
      ARM: OMAP2+: Parse module IO range from dts for legacy "ti,hwmods" support · 6c72b355
      Tony Lindgren authored
      When removing legacy platform data for IO ranges for the hwmod
      interconnect code, we still need to support the "ti,hwmods"
      property.
      
      And as we're going to use a generic sysc device driver to handle the
      interconnect target instances, we can parse the information needed
      for legacy "ti,hwmods" IO range from the dts. It's always the first
      range the interconnect target module provides.
      
      Note that we want to parse the range instead of the first child
      device IO regs as the child device may not always be defined.
      
      The child IP device node may not exist in cases where there is no
      driver binding for the device, or when the child IP block may not
      even be functional for some SoC revisions. But the IO range of the
      interconnect target module is always known.
      
      Cc: "Benoît Cousson" <bcousson@baylibre.com>
      Cc: Lokesh Vutla <lokeshvutla@ti.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      6c72b355
    • Tony Lindgren's avatar
    • Tony Lindgren's avatar
      ARM: dts: Configure SmartReflex only to idle the interconnect target module · 160ec89a
      Tony Lindgren authored
      The TRM has marked dra7 SmartReflex as reserved and we should not
      touch those registers as pointed out by Nishanth Menon <nm@ti.com>.
      We do still want to idle the related interconnect target modules on
      init though.
      
      Let's do this by only configuring the generic interconnect target modules
      and not add the child SmartReflex devices.
      
      Cc: Lokesh Vutla <lokeshvutla@ti.com>
      Cc: Nishanth Menon <nm@ti.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Rob Herring <robh+dt@kernel.org>
      Cc: Tero Kristo <t-kristo@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      160ec89a
    • Tony Lindgren's avatar
      ARM: dts: Add nodes for missing omap4 interconnect target modules · d23a163e
      Tony Lindgren authored
      On omap4 we are missing dts nodes for several interconnect target
      modules that we are idling on init. This currently works with the
      legacy platform data still around.
      
      To fix this, let's add the interconnect target modules so we can
      idle the unused interconnect target module on init.
      
      Also note that adding the interconnect target module node does not
      necessarily mean that there is a driver available for the child IP
      block, or that the child IP block is even functional.
      
      In the SGX case, the PowerVR driver is closed source. And McASP on
      omap4 has at least the TX path disabled and is not supported by the
      davinci-mcasp driver. For AESS there is old Android 3.4 kernel
      driver available.
      
      For smarflex, we are still probing with platform data and the
      driver needs more work before we can add the device ip child nodes.
      
      And finally, we're not yet using the interconnet ranges. I will
      be posting separate patches for those later on.
      
      Cc: Benoît Cousson <bcousson@baylibre.com>
      Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
      Cc: Liam Girdwood <lgirdwood@gmail.com>
      Cc: Mark Brown <broonie@kernel.org>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
      Cc: Nishanth Menon <nm@ti.com>
      Cc: Matthijs van Duin <matthijsvanduin@gmail.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
      Cc: Rob Herring <robh+dt@kernel.org>
      Cc: Sakari Ailus <sakari.ailus@iki.fi>
      Cc: Tero Kristo <t-kristo@ti.com>
      Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      d23a163e
    • Tony Lindgren's avatar
      dt-bindings: bus: Minimal TI sysc interconnect target module binding · b6891523
      Tony Lindgren authored
      With the recently introduced omap clkctrl module binding, we can start
      moving omap hwmod data to device tree and drivers from arch/arm/mach-omap2.
      
      To start doing this, let's introduce a device tree binding for TI
      sysc interconnect target module hardware. The sysc manages module clocks,
      idlemodes and interconnect level resets. Each interconnect target module
      can have one or more child devices connected to it.
      
      TI sysc interconnect target module hardware is independent of the
      interconnect. It is used at least with TI L3 interconnect (Arteris NoC)
      and TI L4 interconnect (Sonics s3220). The sysc is mostly used for
      interaction between module and PRCM. It participates in the OCP Disconnect
      Protocol but other than that is mostly indepenent of the interconnect.
      
      As all the features may not be supported for a given sysc module, we
      need to use device tree configuration for the revision of the interconnect
      target module.
      
      Note that the interconnect target module control registers are always
      sprinked at varying locations in the unused address space of the first
      child device IP block. To avoid device tree reg conflicts, the sysc device
      provides ranges for it's children.
      
      For a non-intrusive transition from static hwmod data to using device
      tree defined TI interconnect target module binding, we can keep things
      working with static hwmod data if device tree property "ti,hwmods" is
      specified for the the interconnect target module.
      
      Note that additional properties for sysc capabilities will be added
      later on. For now, we can already use this binding for interconnect
      target modules that do not have any child device drivers available.
      This allows us to idle the unused interconnect target modules during
      init without the need for legacy hwmod platform data for doing it.
      
      Cc: Benoît Cousson <bcousson@baylibre.com>
      Cc: Dave Gerlach <d-gerlach@ti.com>
      Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
      Cc: Liam Girdwood <lgirdwood@gmail.com>
      Cc: Mark Brown <broonie@kernel.org>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
      Cc: Nishanth Menon <nm@ti.com>
      Cc: Matthijs van Duin <matthijsvanduin@gmail.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
      Cc: Sakari Ailus <sakari.ailus@iki.fi>
      Cc: Suman Anna <s-anna@ti.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
      Reviewed-by: default avatarRob Herring <robh@kernel.org>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      b6891523
  3. 02 Oct, 2017 3 commits
  4. 19 Sep, 2017 15 commits
    • Tony Lindgren's avatar
      ARM: OMAP2+: Drop unused omap_hwmod_mux_info · dd33074a
      Tony Lindgren authored
      This is no longer used as we boot in device tree
      only mode.
      
      Cc: Lokesh Vutla <lokeshvutla@ti.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      dd33074a
    • Tony Lindgren's avatar
      ARM: OMAP2+: Drop unused omap_init_hdq · 680dc624
      Tony Lindgren authored
      We now boot all of mach-omap2 in device tree only mode and
      this is now dead code.
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      680dc624
    • Tony Lindgren's avatar
      ARM: OMAP2+: Fix overwriting of clkctrl and modulemode values · 8823ddf2
      Tony Lindgren authored
      We are currently overwiting the hwmod clkctrl registers if we
      configure a clock ctrl clock from device tree.
      
      While this does not expose any bugs except for kernel coders
      when debugging things, it should be fixed for correctness.
      It is now impossible to use the hwmod data for checking the
      clkctrl register values after booting for debugging or
      generating dts data from hwmod data.
      
      Let's fix the issue by adding a helper to detect if clkctrl
      clock is configured.
      
      Cc: Lokesh Vutla <lokeshvutla@ti.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      8823ddf2
    • Tony Lindgren's avatar
      ARM: OMAP2+: Fix MMC address space mismatch for am33xx and am43xx · 6963c584
      Tony Lindgren authored
      The address space currently set up for the interconnect data
      is different compared to the dts data. We have hwmod data with
      offset 0x100 to account for the revision, sysc and syss
      register offsets. Let's fix the issue by correcting the MMC
      register offsets in hwmod data and removing the unnecessary
      duplicate IO range data that we get from device tree anyways.
      
      Cc: Lokesh Vutla <lokeshvutla@ti.com>
      Cc: Paul Walmsley <paul@pwsan.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      6963c584
    • Tony Lindgren's avatar
      ARM: dts: Add missing hwmod related properties for dra7 · 288cdbbf
      Tony Lindgren authored
      On dra7 we're missing two "ti,hwmods" properties that the SoC
      interconnect code needs. For hdq 1-wire, we need to add the
      node for that.
      
      Note that this will only show up as a bug with "doesn't have
      mpu register target base" boot errors when the legacy platform
      data is removed.
      
      Cc: Nishanth Menon <nm@ti.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      288cdbbf
    • Tony Lindgren's avatar
      ARM: dts: Add missing hwmod related nodes for am33xx · cd57dc5a
      Tony Lindgren authored
      On am33xx we're missing the pmu and emif nodes with their related
      "ti,hwmods" properties that the SoC interconnect code needs.
      
      Note that this will only show up as a bug with "doesn't have
      mpu register target base" boot errors when the legacy platform
      data is removed.
      
      Let's also update the related binding documentation while at it.
      
      Cc: Mark Rutland <mark.rutland@arm.com>
      Acked-by: default avatarRob Herring <robh+dt@kernel.org>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      cd57dc5a
    • Tony Lindgren's avatar
      ARM: dts: Add missing dma hwmod property for omap5 · ef90bfb8
      Tony Lindgren authored
      On omap5 we're missing the dma "ti,hwmods" property that the
      SoC interconnect code needs.
      
      Note that this will only show up as a bug with "doesn't have
      mpu register target base" boot errors when the legacy platform
      data is removed.
      
      Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      ef90bfb8
    • Tony Lindgren's avatar
      ARM: dts: Add missing wdt3 node for omap4 · 5750d671
      Tony Lindgren authored
      On omap4 we're missing the wdt3 node with it's related "ti,hwmods"
      property that the SoC interconnect code needs.
      
      Note that this will only show up as a bug with "doesn't have
      mpu register target base" boot errors when the legacy platform
      data is removed.
      
      Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      5750d671
    • Tony Lindgren's avatar
      ARM: dts: Add missing hsi node for omap4 · 8be8576f
      Tony Lindgren authored
      On omap4 we're missing the hsi node with it's related "ti,hwmods"
      property that the SoC interconnect code needs.
      
      Note that this will only show up as a bug with "doesn't have
      mpu register target base" boot errors when the legacy platform
      data is removed.
      
      Let's also update the binding accrodingly while at it.
      
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Rob Herring <robh+dt@kernel.org>
      Reviewed-by: default avatarSebastian Reichel <sre@kernel.org>
      Acked-by: default avatarRob Herring <robh@kernel.org>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      8be8576f
    • Tony Lindgren's avatar
      ARM: dts: Add missing onewire node for omap4 · d6e1a238
      Tony Lindgren authored
      On omap4 we're missing the onewire node with it's related "ti,hwmods"
      property that the SoC interconnect code needs.
      
      Note that this will only show up as a bug with "doesn't have
      mpu register target base" boot errors when the legacy platform
      data is removed.
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      d6e1a238
    • Tony Lindgren's avatar
      ARM: dts: Add missing smartreflex node and binding for omap4 · 514b2da4
      Tony Lindgren authored
      We are missing smartreflex device tree nodes for omap4 with
      their related "ti,hwmods" properties that the SoC interconnect
      code needs.
      
      Note that this will only show up as a bug with "doesn't have
      mpu register target base" boot errors when the legacy platform
      data is removed.
      
      And since we're missing the device tree binding for smartreflex,
      let's also add it and document the existing omap3 use too.
      
      Note that the related driver also needs to be updated to probe
      using device tree and get the platform data passed to it using
      auxdata with arch/arm/mach-omap2/pdata-quirks.c.
      
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Nishanth Menon <nm@ti.com>
      Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
      Cc: Tero Kristo <t-kristo@ti.com>
      Acked-by: default avatarRob Herring <robh+dt@kernel.org>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      514b2da4
    • Tony Lindgren's avatar
      ARM: dts: Add missing hwmods property for omap4 dma · 370ad6b4
      Tony Lindgren authored
      On omap4, we are missing a ti,hwmods property for dma that the
      that the SoC interconnect code needs.
      
      Note that this will only show up as a bug with "doesn't have
      mpu register target base" boot errors when the legacy platform
      data is removed.
      
      Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      370ad6b4
    • Tony Lindgren's avatar
      ARM: dts: Add missing properties for omap4 control modules · 1d6a332a
      Tony Lindgren authored
      On omap4, we are missing several ti,hwmods properties and IO
      ranges for system control modules. These are needed by the SoC
      interconnect code.
      
      Note that this will only show up as a bug with "doesn't have
      mpu register target base" boot errors when the legacy platform
      data is removed.
      
      In order to add these, we need to move omap4_pmx_wkup to be a
      child of omap4_padconf_wkup.
      
      On omap4 there are separate modules for control module and
      control module pads. For control module core, we have this
      already configured except for the missing ti,hwmods and reg
      entries.
      
      Cc: Mark Rutland <mark.rutland@arm.com>
      Acked-by: default avatarRob Herring <robh+dt@kernel.org>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      1d6a332a
    • Tony Lindgren's avatar
      ARM: dts: Configure pmu without interrupt for omap4430 · b0142a10
      Tony Lindgren authored
      On omap4430, the PMU is not configure unlike on omap4460 because
      of the missing handling.
      
      The missing pmu node with the missing ti,hwmods entry will cause
      boot time errors when the legacy platform data is removed as
      the SoC interconnect code needs it.
      
      Note that this will only show up as a bug with "doesn't have
      mpu register target base" boot errors when the legacy platform
      data is removed.
      
      Let's fix the issue by configuring PMU but without the interrupts.
      Then when cross trigger interface (CTI) is supported, we can add
      interrupts also for omap4430.
      
      Cc: Jon Hunter <jonathanh@nvidia.com>
      Cc: Will Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      b0142a10
    • Tony Lindgren's avatar
      ARM: dts: Add missing dma hwmods property for omap3 · f0f838fd
      Tony Lindgren authored
      On omap3, we are missing a ti,hwmods property for dma that
      the SoC interconnect code needs.
      
      Note that this will only show up as a bug with "doesn't have
      mpu register target base" boot errors when the legacy platform
      data is removed.
      
      Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      f0f838fd
  5. 16 Sep, 2017 8 commits
    • Linus Torvalds's avatar
      Linux 4.14-rc1 · 2bd6bf03
      Linus Torvalds authored
      2bd6bf03
    • Linus Torvalds's avatar
      Merge tag 'upstream-4.14-rc1' of git://git.infradead.org/linux-ubifs · 194a4ef9
      Linus Torvalds authored
      Pull UBI updates from Richard Weinberger:
       "Minor improvements"
      
      * tag 'upstream-4.14-rc1' of git://git.infradead.org/linux-ubifs:
        UBI: Fix two typos in comments
        ubi: fastmap: fix spelling mistake: "invalidiate" -> "invalidate"
        ubi: pr_err() strings should end with newlines
        ubi: pr_err() strings should end with newlines
        ubi: pr_err() strings should end with newlines
      194a4ef9
    • Linus Torvalds's avatar
      Merge branch 'for-linus-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · 2896b80e
      Linus Torvalds authored
      Pull UML updates from Richard Weinberger:
      
       - minor improvements
      
       - fixes for Debian's new gcc defaults (pie enabled by default)
      
       - fixes for XSTATE/XSAVE to make UML work again on modern systems
      
      * 'for-linus-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
        um: return negative in tuntap_open_tramp()
        um: remove a stray tab
        um: Use relative modversions with LD_SCRIPT_DYN
        um: link vmlinux with -no-pie
        um: Fix CONFIG_GCOV for modules.
        Fix minor typos and grammar in UML start_up help
        um: defconfig: Cleanup from old Kconfig options
        um: Fix FP register size for XSTATE/XSAVE
      2896b80e
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 48bddb14
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Fix hotplug deadlock in hv_netvsc, from Stephen Hemminger.
      
       2) Fix double-free in rmnet driver, from Dan Carpenter.
      
       3) INET connection socket layer can double put request sockets, fix
          from Eric Dumazet.
      
       4) Don't match collect metadata-mode tunnels if the device is down,
          from Haishuang Yan.
      
       5) Do not perform TSO6/GSO on ipv6 packets with extensions headers in
          be2net driver, from Suresh Reddy.
      
       6) Fix scaling error in gen_estimator, from Eric Dumazet.
      
       7) Fix 64-bit statistics deadlock in systemport driver, from Florian
          Fainelli.
      
       8) Fix use-after-free in sctp_sock_dump, from Xin Long.
      
       9) Reject invalid BPF_END instructions in verifier, from Edward Cree.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (43 commits)
        mlxsw: spectrum_router: Only handle IPv4 and IPv6 events
        Documentation: link in networking docs
        tcp: fix data delivery rate
        bpf/verifier: reject BPF_ALU64|BPF_END
        sctp: do not mark sk dumped when inet_sctp_diag_fill returns err
        sctp: fix an use-after-free issue in sctp_sock_dump
        netvsc: increase default receive buffer size
        tcp: update skb->skb_mstamp more carefully
        net: ipv4: fix l3slave check for index returned in IP_PKTINFO
        net: smsc911x: Quieten netif during suspend
        net: systemport: Fix 64-bit stats deadlock
        net: vrf: avoid gcc-4.6 warning
        qed: remove unnecessary call to memset
        tg3: clean up redundant initialization of tnapi
        tls: make tls_sw_free_resources static
        sctp: potential read out of bounds in sctp_ulpevent_type_enabled()
        MAINTAINERS: review Renesas DT bindings as well
        net_sched: gen_estimator: fix scaling error in bytes/packets samples
        nfp: wait for the NSP resource to appear on boot
        nfp: wait for board state before talking to the NSP
        ...
      48bddb14
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · c8503720
      Linus Torvalds authored
      Pull more input updates from Dmitry Torokhov:
       "A second round of updates for the input subsystem:
      
         - a new driver for PWM-controlled vibrators
      
         - ucb1400 touchscreen driver had completely busted suspend/resume
           handling
      
         - we now handle "home" button found on some devices with Goodix
           touchscreens
      
         - assorted other fixups"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: i8042 - add Gigabyte P57 to the keyboard reset table
        Input: xpad - validate USB endpoint type during probe
        Input: ucb1400_ts - fix suspend and resume handling
        Input: edt-ft5x06 - fix access to non-existing register
        Input: elantech - make arrays debounce_packet static, reduces object code size
        Input: surface3_spi - make const array header static, reduces object code size
        Input: goodix - add support for capacitive home button
        Input: add a driver for PWM controllable vibrators
        Input: adi - make array seq static, reduces object code size
      c8503720
    • Markus Trippelsdorf's avatar
      firmware: Restore support for built-in firmware · df85b2d7
      Markus Trippelsdorf authored
      Commit 5620a0d1 ("firmware: delete in-kernel firmware") removed the
      entire firmware directory.  Unfortunately it thereby also removed the
      support for built-in firmware.
      
      This restores the ability to build firmware directly into the kernel by
      pruning the original Makefile to the necessary minimum.  The default for
      EXTRA_FIRMWARE_DIR is now the standard directory /lib/firmware/.
      
      Fixes: 5620a0d1 ("firmware: delete in-kernel firmware")
      Signed-off-by: default avatarMarkus Trippelsdorf <markus@trippelsdorf.de>
      Acked-by: default avatarGreg K-H <gregkh@linuxfoundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      df85b2d7
    • Ido Schimmel's avatar
      mlxsw: spectrum_router: Only handle IPv4 and IPv6 events · 8e29f979
      Ido Schimmel authored
      The driver doesn't support events from address families other than IPv4
      and IPv6, so ignore them. Otherwise, we risk queueing a work item before
      it's initialized.
      
      This can happen in case a VRF is configured when MROUTE_MULTIPLE_TABLES
      is enabled, as the VRF driver will try to add an l3mdev rule for the
      IPMR family.
      
      Fixes: 65e65ec1 ("mlxsw: spectrum_router: Don't ignore IPv6 notifications")
      Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
      Reported-by: default avatarAndreas Rammhold <andreas@rammhold.de>
      Reported-by: default avatarFlorian Klink <flokli@flokli.de>
      Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8e29f979
    • Pavel Machek's avatar
      Documentation: link in networking docs · 2130c028
      Pavel Machek authored
      Fix link in filter.txt.
      Acked-by: default avatarPavel Machek <pavel@ucw.cz>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2130c028