[GIT,PULL,v2] for-next updates for soc/fsl drivers for v4.20 take 2

Message ID 20181005193040.28598-1-leoyang.li@nxp.com
State New
Headers show
Series
  • [GIT,PULL,v2] for-next updates for soc/fsl drivers for v4.20 take 2
Related show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git tags/soc-fsl-next-v4.20-2

Message

Li Yang Oct. 5, 2018, 7:30 p.m.
Hi arm-soc maintainers,

Please merge the following updates for next.

v2: updated tree to include dependency patches by merging soc-fsl-fix-v4.19-2

Regards,
Leo

The following changes since commit 56740a7167cbbbda99ebfd3e8b4e4d51ae39bd06:

  Merge tag 'soc-fsl-fix-v4.19-2' into HEAD (2018-10-05 13:58:35 -0500)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git tags/soc-fsl-next-v4.20-2

for you to fetch changes up to 6d06009cb216d071e955b3814086595851627910:

  soc: fsl: qbman: add interrupt coalesce changing APIs (2018-10-05 14:06:56 -0500)

----------------------------------------------------------------
NXP/FSL SoC drivers updates for v4.20 take 2

- Update qbman driver to better work with CPU hotplug
- Add Kconfig dependency of 64-bit DMA addressing for qbman driver
- Use last reponse to determine valid bit for qbman driver
- Defer bman_portals probe if bman is not probed
- Add interrupt coalescing APIs to qbman driver

----------------------------------------------------------------
Laurentiu Tudor (1):
      soc: fsl: bman_portals: defer probe after bman's probe

Madalin Bucur (2):
      soc: fsl: qbman: replace CPU 0 with any online CPU in hotplug handlers
      soc: fsl: qbman: add interrupt coalesce changing APIs

Roy Pledge (3):
      soc: fsl: qbman: Check if CPU is offline when initializing portals
      soc: fsl: qbman: Add 64 bit DMA addressing requirement to QBMan
      soc: fsl: qbman: Use last response to determine valid bit

 drivers/soc/fsl/qbman/Kconfig       |  2 +-
 drivers/soc/fsl/qbman/bman.c        |  6 ++---
 drivers/soc/fsl/qbman/bman_portal.c | 14 ++++++++--
 drivers/soc/fsl/qbman/dpaa_sys.h    | 20 ++++++++++++++
 drivers/soc/fsl/qbman/qman.c        | 53 ++++++++++++++++++++++++++++++++-----
 drivers/soc/fsl/qbman/qman_portal.c |  6 +++--
 include/soc/fsl/qman.h              | 28 ++++++++++++++++++++
 7 files changed, 114 insertions(+), 15 deletions(-)

Comments

Arnd Bergmann Oct. 8, 2018, 12:51 p.m. | #1
On Fri, Oct 5, 2018 at 9:30 PM Li Yang <leoyang.li@nxp.com> wrote:
>
> ----------------------------------------------------------------
> NXP/FSL SoC drivers updates for v4.20 take 2
>
> - Update qbman driver to better work with CPU hotplug
> - Add Kconfig dependency of 64-bit DMA addressing for qbman driver
> - Use last reponse to determine valid bit for qbman driver
> - Defer bman_portals probe if bman is not probed
> - Add interrupt coalescing APIs to qbman driver

Pulled into next/drivers.

I was a little surprised to see these commits in your branch:

      ARM: dts: BCM63xx: Fix incorrect interrupt specifiers
      MAINTAINERS: update the Annapurna Labs maintainer email
      ARM: dts: sun8i: drop A64 HDMI PHY fallback compatible from R40 DT
      ARM: dts: at91: sama5d2_ptc_ek: fix nand pinctrl

These are from our earlier 'fixes' branch and they were also part
of your fixes branch that I already pulled, which you had based on
top of the other fixes.

In the future, please don't do this again. Instead, base each branch
on top of a plain -rc unless you have a specific reason to require
something else (like in this case, where you require the fixes to
build on top of).

This time we were lucky because the 'fixes' branch you built on
was also done on top of -rc1, so at least it did not contain any
commits from upstream that were not already part of our
next/drivers.

       Arnd
Li Yang Oct. 8, 2018, 4:49 p.m. | #2
> -----Original Message-----
> From: Arnd Bergmann <arnd@arndb.de>
> Sent: Monday, October 8, 2018 7:51 AM
> To: Leo Li <leoyang.li@nxp.com>
> Cc: arm-soc <arm@kernel.org>; Linux ARM <linux-arm-
> kernel@lists.infradead.org>; Linux Kernel Mailing List <linux-
> kernel@vger.kernel.org>; Shawn Guo <shawnguo@kernel.org>
> Subject: Re: [GIT PULL v2] for-next updates for soc/fsl drivers for v4.20 take
> 2
> 
> On Fri, Oct 5, 2018 at 9:30 PM Li Yang <leoyang.li@nxp.com> wrote:
> >
> > ----------------------------------------------------------------
> > NXP/FSL SoC drivers updates for v4.20 take 2
> >
> > - Update qbman driver to better work with CPU hotplug
> > - Add Kconfig dependency of 64-bit DMA addressing for qbman driver
> > - Use last reponse to determine valid bit for qbman driver
> > - Defer bman_portals probe if bman is not probed
> > - Add interrupt coalescing APIs to qbman driver
> 
> Pulled into next/drivers.
> 
> I was a little surprised to see these commits in your branch:
> 
>       ARM: dts: BCM63xx: Fix incorrect interrupt specifiers
>       MAINTAINERS: update the Annapurna Labs maintainer email
>       ARM: dts: sun8i: drop A64 HDMI PHY fallback compatible from R40 DT
>       ARM: dts: at91: sama5d2_ptc_ek: fix nand pinctrl
> 
> These are from our earlier 'fixes' branch and they were also part of your
> fixes branch that I already pulled, which you had based on top of the other
> fixes.
> 
> In the future, please don't do this again. Instead, base each branch on top
> of a plain -rc unless you have a specific reason to require something else
> (like in this case, where you require the fixes to build on top of).

I rebased my second fix pull request to the arm-soc fix branch because some patches from my first fix pull request were cherry picked to the fix branch.  I did the rebase to avoid conflicts in merge.   But probably your for-next branch doesn't have all the fix patches yet, so these patches showed up.

> 
> This time we were lucky because the 'fixes' branch you built on was also
> done on top of -rc1, so at least it did not contain any commits from
> upstream that were not already part of our next/drivers.
> 
>        Arnd