Commit 4c7a0c95 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging driver updates from Greg KH:
 "Here is the big set of staging driver updates for 6.7-rc1. A bit
  bigger than 6.6 this time around, as it coincided with the Outreachy
  and mentorship application process, so we got a bunch of new
  developers sending in their first changes, which is nice to see.

  Also in here is a removal of the qlge ethernet driver, and the
  rtl8192u wireless driver. Both of these were very old and no one was
  maintaining them, the wireless driver removal was due to no one using
  it anymore, and no hardware to be found, and is part of a larger
  effort to remove unused and old wifi drivers from the system.

  The qlge ethernet driver did have one user pop up after it was
  dropped, and we are working with the network mainainers to figure out
  what tree it will come back in from and who will be responsible for
  it, and if it really is being used or not. Odds are it will show up in
  a network subsystem pull request after -rc1 is out, but we aren't sure
  yet.

  Other smaller changes in here are:

   - Lots of vc04_services work by Umang to clean up the mess created by
     the rpi developers long ago, bringing it almost into good enough
     shape to get out of staging, hopefully next major release, it's
     getting close.

   - rtl8192e variable cleanups and removal of unused code and
     structures

   - vme_user coding style cleanups

   - other small coding style cleanups to lots of the staging drivers

   - octeon typedef removals, and then last-minute revert when it was
     found to break the build in some configurations (it's a hard driver
     to build properly, none of the normal automated testing catches
     it.)

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'staging-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (256 commits)
  Revert "staging: octeon: remove typedef in enum cvmx_spi_mode_t"
  Revert "staging: octeon: remove typedef in enum cvmx_helper_interface_mode_t"
  Revert "staging: octeon: remove typedef in enum cvmx_pow_wait_t"
  Revert "staging: octeon: remove typedef in struct cvmx_pko_lock_t"
  Revert "staging: octeon: remove typedef in enum cvmx_pko_status_t"
  Revert "staging: octeon: remove typedef in structs cvmx_pip_port_status_t and cvmx_pko_port_status_t"
  staging: vt6655: Type encoding info dropped from variable name "byRxRate"
  staging: vt6655: Type encoding info dropped from function name "CARDbUpdateTSF"
  staging: vt6655: Type encoding info dropped from function name "CARDvSetRSPINF"
  staging: vt6655: Type encoding info dropped from function name "CARDbyGetPktType"
  staging: vt6655: Type encoding info dropped from variable name "byPacketType"
  staging: vt6655: Type encoding info dropped from function name "CARDbSetPhyParameter"
  staging: vt6655: Type encoding info dropped from variable name "pbyRsvTime"
  staging: vt6655: Type encoding info dropped from variable name "pbyTxRate"
  staging: vt6655: Type encoding info dropped from function name "s_vCalculateOFDMRParameter"
  staging: vt6655: Type encoding info dropped from array name "cwRXBCNTSFOff"
  staging: fbtft: Convert to platform remove callback returning void
  staging: olpc_dcon: Remove I2C_CLASS_DDC support
  staging: vc04_services: use snprintf instead of sprintf
  staging: rtl8192e: Fix line break issue at priv->rx_buf[priv->rx_idx]
  ...
parents b06f58ad a4000df5

Documentation/networking/device_drivers/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ Contents: 
   ethernet/index

   fddi/index

   hamradio/index

   qlogic/index

   wifi/index

   wwan/index

Documentation/networking/device_drivers/qlogic/index.rst

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)



QLogic QLGE Device Drivers

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



Contents:



.. toctree::

   :maxdepth: 2



   qlge



.. only::  subproject and html



   Indices

   =======



   * :ref:`genindex`

Documentation/networking/device_drivers/qlogic/qlge.rst

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



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

QLogic QLGE 10Gb Ethernet device driver

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



This driver use drgn and devlink for debugging.



Dump kernel data structures in drgn

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



To dump kernel data structures, the following Python script can be used

in drgn:



.. code-block:: python



	def align(x, a):

	    """the alignment a should be a power of 2

	    """

	    mask = a - 1

	    return (x+ mask) & ~mask



	def struct_size(struct_type):

	    struct_str = "struct {}".format(struct_type)

	    return sizeof(Object(prog, struct_str, address=0x0))



	def netdev_priv(netdevice):

	    NETDEV_ALIGN = 32

	    return netdevice.value_() + align(struct_size("net_device"), NETDEV_ALIGN)



	name = 'xxx'

	qlge_device = None

	netdevices = prog['init_net'].dev_base_head.address_of_()

	for netdevice in list_for_each_entry("struct net_device", netdevices, "dev_list"):

	    if netdevice.name.string_().decode('ascii') == name:

	        print(netdevice.name)



	ql_adapter = Object(prog, "struct ql_adapter", address=netdev_priv(qlge_device))



The struct ql_adapter will be printed in drgn as follows,



    >>> ql_adapter

    (struct ql_adapter){

            .ricb = (struct ricb){

                    .base_cq = (u8)0,

                    .flags = (u8)120,

                    .mask = (__le16)26637,

                    .hash_cq_id = (u8 [1024]){ 172, 142, 255, 255 },

                    .ipv6_hash_key = (__le32 [10]){},

                    .ipv4_hash_key = (__le32 [4]){},

            },

            .flags = (unsigned long)0,

            .wol = (u32)0,

            .nic_stats = (struct nic_stats){

                    .tx_pkts = (u64)0,

                    .tx_bytes = (u64)0,

                    .tx_mcast_pkts = (u64)0,

                    .tx_bcast_pkts = (u64)0,

                    .tx_ucast_pkts = (u64)0,

                    .tx_ctl_pkts = (u64)0,

                    .tx_pause_pkts = (u64)0,

                    ...

            },

            .active_vlans = (unsigned long [64]){

                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52780853100545, 18446744073709551615,

                    18446619461681283072, 0, 42949673024, 2147483647,

            },

            .rx_ring = (struct rx_ring [17]){

                    {

                            .cqicb = (struct cqicb){

                                    .msix_vect = (u8)0,

                                    .reserved1 = (u8)0,

                                    .reserved2 = (u8)0,

                                    .flags = (u8)0,

                                    .len = (__le16)0,

                                    .rid = (__le16)0,

                                    ...

                            },

                            .cq_base = (void *)0x0,

                            .cq_base_dma = (dma_addr_t)0,

                    }

                    ...

            }

    }



coredump via devlink

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





And the coredump obtained via devlink in json format looks like,



.. code:: shell



	$ devlink health dump show DEVICE reporter coredump -p -j

	{

	    "Core Registers": {

	        "segment": 1,

	        "values": [ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ]

	    },

	    "Test Logic Regs": {

	        "segment": 2,

	        "values": [ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ]

	    },

	    "RMII Registers": {

	        "segment": 3,

	        "values": [ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 ]

	    },

	    ...

	    "Sem Registers": {

	        "segment": 50,

	        "values": [ 0,0,0,0 ]

	    }

	}



When the module parameter qlge_force_coredump is set to be true, the MPI

RISC reset before coredumping. So coredumping will much longer since

devlink tool has to wait for 5 secs for the resetting to be

finished.

MAINTAINERS

+0 −9
Original line number Diff line number Diff line
@@ -17673,15 +17673,6 @@ L: netdev@vger.kernel.org 
S:	Supported

F:	drivers/net/ethernet/qlogic/qlcnic/









QLOGIC QLGE 10Gb ETHERNET DRIVER









M:	Manish Chopra <manishc@marvell.com>









M:	GR-Linux-NIC-Dev@marvell.com









M:	Coiby Xu <coiby.xu@gmail.com>









L:	netdev@vger.kernel.org









S:	Supported









F:	Documentation/networking/device_drivers/qlogic/qlge.rst









F:	drivers/staging/qlge/

















QM1D1B0004 MEDIA DRIVER









M:	Akihiro Tsukada <tskd08@gmail.com>









L:	linux-media@vger.kernel.org

























arch/parisc/configs/generic-64bit_defconfig



+0
−1






























Original line number
Diff line number
Diff line







@@ -248,7 +248,6 @@ CONFIG_UIO_AEC=m







CONFIG_UIO_SERCOS3=m









CONFIG_UIO_PCI_GENERIC=m









CONFIG_STAGING=y









CONFIG_QLGE=m









CONFIG_EXT2_FS=y









CONFIG_EXT2_FS_XATTR=y









CONFIG_EXT2_FS_SECURITY=y