Commit adbea1a5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
100GbE Intel Wired LAN Driver Updates 2020-03-21

Implement basic support for the devlink interface in the ice driver.
Additionally pave some necessary changes for adding a devlink region that
exposes the NVM contents.

This series first contains 5 patches for enabling and implementing full NVM
read access via the ETHTOOL_GEEPROM interface. This includes some cleanup of
endian-types, a new function for reading from the NVM and Shadow RAM as a flat
addressable space, a function to calculate the available flash size during
load, and a change to how some of the NVM version fields are stored in the
ice_nvm_info structure.

Following this is 3 patches for implementing devlink support. First, one patch
which implements the basic framework and introduces the ice_devlink.c file.
Second, a patch to implement basic .info_get support. Finally, a patch which
reads the device PBA identifier and reports it as the `board.id` value in the
.info_get response.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 08e8b91c e961b679

Documentation/networking/devlink/devlink-info.rst

+5 −0
Original line number Diff line number Diff line
@@ -98,3 +98,8 @@ fw.roce 


RoCE firmware version which is responsible for handling roce

management.



fw.bundle_id

------------



Unique identifier of the entire firmware bundle.

Documentation/networking/devlink/ice.rst

0 → 100644
+71 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



===================

ice devlink support

===================



This document describes the devlink features implemented by the ``ice``

device driver.



Info versions

=============



The ``ice`` driver reports the following versions



.. list-table:: devlink info versions implemented

    :widths: 5 5 5 90



    * - Name

      - Type

      - Example

      - Description

    * - ``board.id``

      - fixed

      - K65390-000

      - The Product Board Assembly (PBA) identifier of the board.

    * - ``fw.mgmt``

      - running

      - 2.1.7

      - 3-digit version number of the management firmware that controls the

        PHY, link, etc.

    * - ``fw.mgmt.api``

      - running

      - 1.5

      - 2-digit version number of the API exported over the AdminQ by the

        management firmware. Used by the driver to identify what commands

        are supported.

    * - ``fw.mgmt.build``

      - running

      - 0x305d955f

      - Unique identifier of the source for the management firmware.

    * - ``fw.undi``

      - running

      - 1.2581.0

      - Version of the Option ROM containing the UEFI driver. The version is

        reported in ``major.minor.patch`` format. The major version is

        incremented whenever a major breaking change occurs, or when the

        minor version would overflow. The minor version is incremented for

        non-breaking changes and reset to 1 when the major version is

        incremented. The patch version is normally 0 but is incremented when

        a fix is delivered as a patch against an older base Option ROM.

    * - ``fw.psid.api``

      - running

      - 0.80

      - Version defining the format of the flash contents.

    * - ``fw.bundle_id``

      - running

      - 0x80002ec0

      - Unique identifier of the firmware image file that was loaded onto

        the device. Also referred to as the EETRACK identifier of the NVM.

    * - ``fw.app.name``

      - running

      - ICE OS Default Package

      - The name of the DDP package that is active in the device. The DDP

        package is loaded by the driver during initialization. Each varation

        of DDP package shall have a unique name.

    * - ``fw.app``

      - running

      - 1.3.1.0

      - The version of the DDP package that is active in the device. Note

        that both the name (as reported by ``fw.app.name``) and version are

        required to uniquely identify the package.

Documentation/networking/devlink/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ parameters, info versions, and other features it supports. 


   bnxt

   ionic

   ice

   mlx4

   mlx5

   mlxsw

drivers/net/ethernet/intel/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ config ICE 
	tristate "Intel(R) Ethernet Connection E800 Series Support"

	default n

	depends on PCI_MSI

	select NET_DEVLINK

	---help---

	  This driver supports Intel(R) Ethernet Connection E800 Series of

	  devices.  For more information on how to identify your adapter, go

drivers/net/ethernet/intel/ice/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ ice-y := ice_main.o \ 
	 ice_txrx.o	\

	 ice_flex_pipe.o \

	 ice_flow.o	\

	 ice_devlink.o	\

	 ice_ethtool.o

ice-$(CONFIG_PCI_IOV) += ice_virtchnl_pf.o ice_sriov.o

ice-$(CONFIG_DCB) += ice_dcb.o ice_dcb_nl.o ice_dcb_lib.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE