1. 09 Feb, 2021 13 commits
  2. 08 Feb, 2021 8 commits
  3. 07 Feb, 2021 3 commits
  4. 06 Feb, 2021 14 commits
  5. 05 Feb, 2021 2 commits
    • Greg Kroah-Hartman's avatar
      Merge tag 'mhi-for-v5.12' of... · 37f1cda4
      Greg Kroah-Hartman authored
      Merge tag 'mhi-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi into char-misc-next
      
      Manivannan writes:
      
      MHI changes for v5.12
      
      Loic improved the MHI PCI generic controller by adding support for DIAG channel,
      PCI error handling, suspend/recovery/resume, and health check. Loic also added
      support for resetting the MHI device as per the MHI specification. This includes
      writing to a specific register for default cases and looking for controller
      specific callback when provided.
      
      Along with this Loic, also added a new API which gets the number for free TREs
      (Transfer Ring Elements) from the MHI core. The client drivers can make use of
      this API and the current consumer is the "mhi-net" driver. For taking both the
      "mhi-net" driver change and the API change, we created "mhi-net-immutable"
      branch for this patch and merged the same into net-next and mhi-next.
      
      Carl added a patch which lets the controller driver to pass the custom IRQ
      flags for BHI and MHI event interrupts to the MHI core. The current consumer of
      this feature is the ath11k MHI controller driver. For taking both the changes,
      we created "mhi-ath11k-immutable" branch for this patch and merged into
      ath11k-next and mhi-next.
      
      Finally, Loic cleaned up the MHI queue APIs and fixed the shared MSI vector
      support.
      
      * tag 'mhi-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi:
        bus: mhi: pci_generic: Increase num of elements in hw event ring
        mhi: pci_generic: Print warning in case of firmware crash
        bus: mhi: core: Add helper API to return number of free TREs
        mhi: core: Factorize mhi queuing
        mhi: use irq_flags if controller driver configures it
        mhi: pci_generic: Fix shared MSI vector support
        mhi: unconstify mhi_event_config
        bus: mhi: Ensure correct ring update ordering with memory barrier
        mhi: pci_generic: Set irq moderation value to 1ms for hw channels
        mhi: pci_generic: Add diag channels
        mhi: pci_generic: Increase controller timeout value
        mhi: pci_generic: Add health-check
        mhi: pci_generic: Add PCI error handlers
        mhi: pci_generic: Add suspend/resume/recovery procedure
        mhi: pci_generic: Add support for reset
        mhi: pci_generic: Enable burst mode for hardware channels
        mhi: pci-generic: Increase number of hardware events
        bus: mhi: core: Add device hardware reset support
      37f1cda4
    • Uwe Kleine-König's avatar
      coresight: etm4x: Fix merge resolution for amba rework · 1609faa9
      Uwe Kleine-König authored
      This was non-trivial to get right because commits
      c23bc382 ("coresight: etm4x: Refactor probing routine") and
      5214b563 ("coresight: etm4x: Add support for sysreg only devices")
      changed the code flow considerably. With this change the driver can be
      built again.
      
      Fixes: 0573d3fa ("Merge branch 'devel-stable' of git://git.armlinux.org.uk/~rmk/linux-arm into char-misc-next")
      Signed-off-by: default avatarUwe Kleine-König <uwe@kleine-koenig.org>
      Link: https://lore.kernel.org/r/20210205130848.20009-1-uwe@kleine-koenig.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      1609faa9