[GIT,PULL] SOC FSL for 6.12

Pull-request

https://github.com/chleroy/linux.git tags/soc_fsl-6.12-1

Message

Christophe Leroy Aug. 28, 2024, 1:44 p.m. UTC

Hi Arnd,

Please pull the following Freescale Soc Drivers changes for 6.12:
- A series from Hervé Codina that bring support for the newer version of 
QMC (QUICC Multi-channel Controller) and TSA (Time Slots Assigner) found 
on MPC 83xx micro-controllers.
- Misc changes for qbman freescale drivers

There are no conflicts with latest linux-next tree.

Thanks
Christophe

The following changes since commit 5be63fc19fcaa4c236b307420483578a56986a37:

   Linux 6.11-rc5 (2024-08-25 19:07:11 +1200)

are available in the Git repository at:

   https://github.com/chleroy/linux.git tags/soc_fsl-6.12-1

for you to fetch changes up to 1fe683bf6113da3cb694bc18ae655b2ee10ba393:

   Merge branch 'support-for-quicc-engine-tsa-and-qmc' (2024-08-25 
20:48:47 +0200)

----------------------------------------------------------------
Christophe Leroy (1):
       Merge branch 'support-for-quicc-engine-tsa-and-qmc'

Herve Codina (36):
       soc: fsl: cpm1: qmc: Update TRNSYNC only in transparent mode
       soc: fsl: cpm1: qmc: Enable TRNSYNC only when needed
       soc: fsl: cpm1: tsa: Fix tsa_write8()
       soc: fsl: cpm1: tsa: Use BIT(), GENMASK() and FIELD_PREP() macros
       soc: fsl: cpm1: tsa: Fix blank line and spaces
       soc: fsl: cpm1: tsa: Add missing spinlock comment
       dt-bindings: soc: fsl: cpm_qe: Add QUICC Engine (QE) TSA controller
       soc: fsl: cpm1: tsa: Remove unused registers offset definition
       soc: fsl: cpm1: tsa: Use ARRAY_SIZE() instead of hardcoded 
integer values
       soc: fsl: cpm1: tsa: Make SIRAM entries specific to CPM1
       soc: fsl: cpm1: tsa: Introduce tsa_setup() and its CPM1 
compatible version
       soc: fsl: cpm1: tsa: Isolate specific CPM1 part from 
tsa_serial_{dis}connect()
       soc: fsl: cpm1: tsa: Introduce tsa_version
       soc: fsl: cpm1: tsa: Add support for QUICC Engine (QE) implementation
       MAINTAINERS: Add QE files related to the Freescale TSA controller
       soc: fsl: cpm1: tsa: Introduce tsa_serial_get_num()
       soc: fsl: cpm1: qmc: Rename QMC_TSA_MASK
       soc: fsl: cpm1: qmc: Use BIT(), GENMASK() and FIELD_PREP() macros
       soc: fsl: cpm1: qmc: Fix blank line and spaces
       soc: fsl: cpm1: qmc: Remove unneeded parenthesis
       soc: fsl: cpm1: qmc: Fix 'transmiter' typo
       soc: fsl: cpm1: qmc: Add missing spinlock comment
       dt-bindings: soc: fsl: cpm_qe: Add QUICC Engine (QE) QMC controller
       soc: fsl: cpm1: qmc: Introduce qmc_data structure
       soc: fsl: cpm1: qmc: Re-order probe() operations
       soc: fsl: cpm1: qmc: Introduce qmc_init_resource() and its CPM1 
version
       soc: fsl: cpm1: qmc: Introduce qmc_{init,exit}_xcc() and their 
CPM1 version
       soc: fsl: cpm1: qmc: Rename qmc_chan_command()
       soc: fsl: cpm1: qmc: Handle RPACK initialization
       soc: fsl: cpm1: qmc: Rename SCC_GSMRL_MODE_QMC
       soc: fsl: cpm1: qmc: Introduce qmc_version
       soc: fsl: qe: Add resource-managed muram allocators
       soc: fsl: qe: Add missing PUSHSCHED command
       soc: fsl: cpm1: qmc: Add support for QUICC Engine (QE) implementation
       soc: fsl: cpm1: qmc: Handle QUICC Engine (QE) soft-qmc firmware
       MAINTAINERS: Add QE files related to the Freescale QMC controller

Lu Baolu (1):
       soc: fsl: qbman: Use iommu_paging_domain_alloc()

Xiaolei Wang (1):
       soc: fsl: qbman: Remove redundant warnings

  .../bindings/soc/fsl/cpm_qe/fsl,qe-tsa.yaml        | 210 +++++++
  .../bindings/soc/fsl/cpm_qe/fsl,qe-ucc-qmc.yaml    | 197 ++++++
  MAINTAINERS                                        |   3 +
  drivers/soc/fsl/qbman/qman_ccsr.c                  |   2 -
  drivers/soc/fsl/qbman/qman_portal.c                |   5 +-
  drivers/soc/fsl/qe/Kconfig                         |  18 +-
  drivers/soc/fsl/qe/qe_common.c                     |  80 +++
  drivers/soc/fsl/qe/qmc.c                           | 667 
++++++++++++++++-----
  drivers/soc/fsl/qe/tsa.c                           | 659 
+++++++++++++++-----
  drivers/soc/fsl/qe/tsa.h                           |   3 +
  include/dt-bindings/soc/qe-fsl,tsa.h               |  13 +
  include/soc/fsl/qe/qe.h                            |  23 +-
  12 files changed, 1552 insertions(+), 328 deletions(-)
  create mode 100644 
Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,qe-tsa.yaml
  create mode 100644 
Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,qe-ucc-qmc.yaml
  create mode 100644 include/dt-bindings/soc/qe-fsl,tsa.h

Comments

Arnd Bergmann Sept. 2, 2024, 10:15 a.m. UTC | #1

On Wed, Aug 28, 2024, at 13:44, Christophe Leroy wrote:
> Hi Arnd,
>
> Please pull the following Freescale Soc Drivers changes for 6.12:
> - A series from Hervé Codina that bring support for the newer version of 
> QMC (QUICC Multi-channel Controller) and TSA (Time Slots Assigner) found 
> on MPC 83xx micro-controllers.
> - Misc changes for qbman freescale drivers
>
> There are no conflicts with latest linux-next tree.

Hi Christophe,

I've tried pulling this but ran into a few issues here, none of which
are related to the actual patches in your branch that look totally
fine to me:

> The following changes since commit 5be63fc19fcaa4c236b307420483578a56986a37:
>
>    Linux 6.11-rc5 (2024-08-25 19:07:11 +1200)
>
> are available in the Git repository at:
>
>    https://github.com/chleroy/linux.git tags/soc_fsl-6.12-1
>
> for you to fetch changes up to 1fe683bf6113da3cb694bc18ae655b2ee10ba393:
>
>    Merge branch 'support-for-quicc-engine-tsa-and-qmc' (2024-08-25 
> 20:48:47 +0200)

- There is no tag description in here, which would give me an empty
  changelog text for the merge commit, or force me to summarize your
  contents myself. Please describe the contents of your branch in a couple
  of short paragraphs, in a way that helps me and future readers of
  the changelog understand what kind of work is being done. Don't
  repeat the oneline commit messages of the individual patches though,
  as they show up right under your summary anyway.

- You have not signed the tag, so there is no way for me to verify that
  you are actually the person that uploaded the branch. Ideally this
  should be signed with a gpg key that is on the kernel keyring, but
  even a brand new key is better than nothing because that way I can
  at least check that your next pull requests are signed by the same
  account as this one. Since you use a github.com account, this is
  even more important, as I can't easily see if you are the only person
  that is able to push to the github user 'chleroy'.
  Using a git tree on either git.kernel.org or your own domain would
  be ideal here, but github works if that is all you can easily do.

- My branch is based on 6.11-rc4, while your tag is on top of 6.11-rc5,
  so pulling it into my tree would require a backmerge that I try to
  avoid (it shows up when Linus pulls from me). Please rebase on
  an earlier -rc, ideally 6.11-rc1 unless you have a reason to need
  something later.

- Please add the linux-arm-kernel and powerpc mailing lists to cc
  for the pull request, so the PR gets properly archived. I saw this
  was missing because I could not apply it using

    b4 pr [e-mail]

  This command failed as none of the mailing list archives have
  your message ID.

Please resend with all of the above changed.

       Arnd