1. 25 Jun, 2020 29 commits
  2. 24 Jun, 2020 11 commits
    • YueHaibing's avatar
      lan743x: Remove duplicated include from lan743x_main.c · 147373d9
      YueHaibing authored
      Remove duplicated include.
      Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      147373d9
    • David S. Miller's avatar
      Merge branch 'net-bridge-fdb-activity-tracking' · 593b03d4
      David S. Miller authored
      Nikolay Aleksandrov says:
      
      ====================
      net: bridge: fdb activity tracking
      
      This set adds extensions needed for EVPN multi-homing proper and
      efficient mac sync. User-space (e.g. FRR) needs to be able to track
      non-dynamic entry activity on per-fdb basis depending if a tracked fdb is
      currently peer active or locally active and needs to be able to add new
      peer active fdb (static + track + inactive) without refreshing it to get
      real activity tracking. Patch 02 adds a new NDA attribute - NDA_FDB_EXT_ATTRS
      to avoid future pollution of NDA attributes by bridge or vxlan. New
      bridge/vxlan specific fdb attributes are embedded in NDA_FDB_EXT_ATTRS,
      which is used in patch 03 to pass the new NFEA_ACTIVITY_NOTIFY attribute
      which controls if an fdb should be tracked and also reflects its current
      state when dumping. It is treated as a bitfield, current valid bits are:
       1 - mark an entry for activity tracking
       2 - mark an entry as inactive to avoid multiple notifications and
           reflect state properly
      
      Patch 04 adds the ability to avoid refreshing an entry when changing it
      via the NFEA_DONT_REFRESH flag. That allows user-space to mark a static
      entry for tracking and keep its real activity unchanged.
      The set has been extensively tested with FRR and those changes will
      be upstreamed if/after it gets accepted.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      593b03d4
    • Nikolay Aleksandrov's avatar
      net: bridge: add a flag to avoid refreshing fdb when changing/adding · b5f1d9ec
      Nikolay Aleksandrov authored
      When we modify or create a new fdb entry sometimes we want to avoid
      refreshing its activity in order to track it properly. One example is
      when a mac is received from EVPN multi-homing peer by FRR, which doesn't
      want to change local activity accounting. It makes it static and sets a
      flag to track its activity.
      Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b5f1d9ec
    • Nikolay Aleksandrov's avatar
      net: bridge: add option to allow activity notifications for any fdb entries · 31cbc39b
      Nikolay Aleksandrov authored
      This patch adds the ability to notify about activity of any entries
      (static, permanent or ext_learn). EVPN multihoming peers need it to
      properly and efficiently handle mac sync (peer active/locally active).
      We add a new NFEA_ACTIVITY_NOTIFY attribute which is used to dump the
      current activity state and to control if static entries should be monitored
      at all. We use 2 bits - one to activate fdb entry tracking (disabled by
      default) and the second to denote that an entry is inactive. We need
      the second bit in order to avoid multiple notifications of inactivity.
      Obviously this makes no difference for dynamic entries since at the time
      of inactivity they get deleted, while the tracked non-dynamic entries get
      the inactive bit set and get a notification.
      Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      31cbc39b
    • Nikolay Aleksandrov's avatar
      net: neighbor: add fdb extended attribute · 899426b3
      Nikolay Aleksandrov authored
      Add an attribute to NDA which will contain all future fdb-specific
      attributes in order to avoid polluting the NDA namespace with e.g.
      bridge or vxlan specific attributes. The attribute is called
      NDA_FDB_EXT_ATTRS and the structure would look like:
       [NDA_FDB_EXT_ATTRS] = {
          [NFEA_xxx]
       }
      Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      899426b3
    • Nikolay Aleksandrov's avatar
      net: bridge: fdb_add_entry takes ndm as argument · 0592ff88
      Nikolay Aleksandrov authored
      We can just pass ndm as an argument instead of its fields separately.
      Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0592ff88
    • David S. Miller's avatar
      Merge branch 'net-phy-mscc-PHC-and-timestamping-support' · b430081b
      David S. Miller authored
      Antoine Tenart says:
      
      ====================
      net: phy: mscc: PHC and timestamping support
      
      This series aims at adding support for PHC and timestamping operations
      in the MSCC PHY driver, for the VSC858x and VSC8575. Those PHYs are
      capable of timestamping in 1-step and 2-step for both L2 and L4 traffic.
      
      As of this series, only IPv4 support was implemented when using L4 mode.
      This is because of an hardware limitation which prevents us for
      supporting both IPv4 and IPv6 at the same time. Implementing support for
      IPv6 should be quite easy (I do have the modifications needed for the
      hardware configuration) but I did not see a way to retrieve this
      information in hwtstamp(). What would you suggest?
      
      Those PHYs are distributed in hardware packages containing multiple
      times the PHY. The VSC8584 for example is composed of 4 PHYs. With
      hardware packages, parts of the logic is usually common and one of the
      PHY has to be used for some parts of the initialization. Following this
      logic, the 1588 blocks of those PHYs are shared between two PHYs and
      accessing the registers has to be done using the "base" PHY of the
      group. This is handled thanks to helpers in the PTP code (and locks).
      We also need the MDIO bus lock while performing a single read or write
      to the 1588 registers as the read/write are composed of multiple MDIO
      transactions (and we don't want other threads updating the page).
      
      To get and set the PHC time, a GPIO has to be used and changes are only
      retrieved or committed when on a rising edge. The same GPIO is shared by
      all PHYs, so the granularity of the lock protecting it has to be
      different from the ones protecting the 1588 registers (the VSC8584 PHY
      has 2 1588 blocks, and a single load/save pin).
      
      Patch 1 extends the recently added helpers to share information between
      PHYs of the same hardware package; to allow having part of the probe to
      be shared (in addition to the already supported init part). This will be
      used when adding support for PHC/TS to initialize locks.
      
      Patches 2 and 3 are mostly cosmetic.
      
      Patch 4 takes into account the 1588 block in the MACsec initialization,
      to allow having both the MACsec and 1588 blocks initialized on a running
      system.
      
      Patches 5 and 6 add support for PHC and timestamping operations in the
      MSCC driver. An initialization of the 1588 block (plus all the registers
      definition; and helpers) is added first; and then comes a patch to
      implement the PHC and timestamping API.
      
      Patches 7 and 8 add the required hardware description for device trees,
      to be able to use the load/save GPIO pin on the PCB120 board.
      
      To use this on a PCB120 board, two other series are needed and have
      already been sent upstream (one is merged). There are no dependency
      between all those series.
      
      Since v3:
        - Fixed a SKB leak.
        - Removed ts_lock from the init, as TS and PHC operations aren't
          registered at this time.
        - Refectored the ts_base_addr/phy intialization.
        - Cleaned up the ingr/egr latencies definitons.
        - Fixed a comment about locking and the shared GPIO.
        - A few cosmetic fixes.
      
      Since v2:
        - Removed explicit inlines from .c files.
        - Fixed three warnings.
      
      Since v1:
        - Removed checks in rxtstamp/txtstamp as skb cannot be NULL here.
        - Reworked get_ptp_header_rx/get_ptp_header.
        - Reworked the locking logic between the PHC and timestamping
          operations.
        - Fixed a compilation issue on x86 reported by Jakub.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b430081b
    • Quentin Schulz's avatar
      MIPS: dts: ocelot: describe the load/save GPIO · 15324652
      Quentin Schulz authored
      This patch adds a description of the load/save GPIN pin, used in the
      VSC8584 PHY for timestamping operations. The related pinctrl description
      is also added.
      Signed-off-by: default avatarQuentin Schulz <quentin.schulz@bootlin.com>
      Signed-off-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      15324652
    • Antoine Tenart's avatar
      dt-bindings: net: phy: vsc8531: document the load/save GPIO · 3461522d
      Antoine Tenart authored
      A new optional property can be used to reference the load/save GPIO,
      used for PTP hardware clock (PHC) operations. This patch documents it in
      the binding documentation.
      Signed-off-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3461522d
    • Antoine Tenart's avatar
      net: phy: mscc: timestamping and PHC support · 7d272e63
      Antoine Tenart authored
      This patch adds support for PHC and timestamping operations for the MSCC
      PHY. PTP 1-step and 2-step modes are supported, over Ethernet and UDP.
      
      To get and set the PHC time, a GPIO has to be used and changes are only
      retrieved or committed when on a rising edge. The same GPIO is shared by
      all PHYs, so the granularity of the lock protecting it has to be
      different from the ones protecting the 1588 registers (the VSC8584 PHY
      has 2 1588 blocks, and a single load/save pin).
      Co-developed-by: default avatarQuentin Schulz <quentin.schulz@bootlin.com>
      Signed-off-by: default avatarQuentin Schulz <quentin.schulz@bootlin.com>
      Signed-off-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7d272e63
    • Quentin Schulz's avatar
      net: phy: mscc: 1588 block initialization · ab2bf933
      Quentin Schulz authored
      This patch adds the first parts of the 1588 support in the MSCC PHY,
      with registers definition and the 1588 block initialization.
      
      Those PHYs are distributed in hardware packages containing multiple
      times the PHY. The VSC8584 for example is composed of 4 PHYs. With
      hardware packages, parts of the logic is usually common and one of the
      PHY has to be used for some parts of the initialization. Following this
      logic, the 1588 blocks of those PHYs are shared between two PHYs and
      accessing the registers has to be done using the "base" PHY of the
      group. This is handled thanks to helpers in the PTP code (and locks).
      We also need the MDIO bus lock while performing a single read or write
      to the 1588 registers as the read/write are composed of multiple MDIO
      transactions (and we don't want other threads updating the page).
      Co-developed-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
      Signed-off-by: default avatarQuentin Schulz <quentin.schulz@bootlin.com>
      Signed-off-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      ab2bf933