Skip to content

powerpc/85xx: p2020: Create one unified machine description

Pali Rohár linuxppc-dev lkml 4 versions – Applied

Status from this message: Applied to powerpc/next.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest13 patches 1 replyApplied
  2. v38 patches 4 repliesSuperseded
  3. v28 patches 16 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v17 patches22 repliesSuperseded

Changes in v5 from the cover letter

* Split fsl_uli1575 patches to separate patch series as this one started to be too big.
* Fix commit messages
* Reduce includes
* Rebase on top of powerpc/next (b0bbe5a2915201e3231e788d716d39dc54493b03)
* Test all patches again on CZ.NIC Turris 1.1 board with P2020 processor

Patches in v5 Applied

#Subject and filesSizeRepliesApplied
1/13powerpc/85xx: Remove DBG() macroarch/powerpc/platforms/85xx/mpc85xx_ds.c arch/powerpc/platforms/85xx/mpc85xx_mds.c arch/powerpc/platforms/85xx/mpc85xx_rdb.c+1 -250 replies
2/13powerpc/85xx: mpc85xx_{ds/rdb} compact the call to mpic_alloc()arch/powerpc/platforms/85xx/mpc85xx_ds.c arch/powerpc/platforms/85xx/mpc85xx_rdb.c+11 -230 replies
3/13powerpc/85xx: mpc85xx_{ds/rdb} replace BUG_ON() by WARN_ON()arch/powerpc/platforms/85xx/mpc85xx_ds.c arch/powerpc/platforms/85xx/mpc85xx_rdb.c+6 -20 replies
4/13powerpc/85xx: mpc85xx_{ds/rdb} replace prink by pr_xxx macroarch/powerpc/platforms/85xx/mpc85xx_ds.c arch/powerpc/platforms/85xx/mpc85xx_rdb.c+4 -40 replies
5/13powerpc/85xx: Remove #ifdefs CONFIG_PPC_I8259 in mpc85xx_dsarch/powerpc/platforms/85xx/mpc85xx_ds.c+20 -170 replies
6/13powerpc/85xx: Remove #ifdef CONFIG_QUICC_ENGINE in mpc85xx_rdbarch/powerpc/platforms/85xx/mpc85xx_rdb.c+0 -20 replies
7/13powerpc/85xx: p2020: Move all P2020 DS machine descriptions to p2020.carch/powerpc/platforms/85xx/Makefile arch/powerpc/platforms/85xx/mpc85xx.h arch/powerpc/platforms/85xx/mpc85xx_ds.c +1 more+46 -160 replies
8/13powerpc/85xx: p2020: Move all P2020 RDB machine descriptions to p2020.carch/powerpc/platforms/85xx/Makefile arch/powerpc/platforms/85xx/mpc85xx.h arch/powerpc/platforms/85xx/mpc85xx_rdb.c +1 more+37 -300 replies
9/13powerpc/85xx: mpc85xx_ds: Move i8259 code into own filearch/powerpc/platforms/85xx/Makefile arch/powerpc/platforms/85xx/mpc85xx.h arch/powerpc/platforms/85xx/mpc85xx_8259.c +1 more+71 -470 replies
10/13powerpc/85xx: p2020: Unify .setup_arch and .init_IRQ callbacksarch/powerpc/platforms/85xx/mpc85xx.h arch/powerpc/platforms/85xx/mpc85xx_ds.c arch/powerpc/platforms/85xx/mpc85xx_rdb.c +1 more+36 -150 replies
11/13powerpc/85xx: p2020: Define just one machine descriptionarch/powerpc/platforms/85xx/p2020.c+19 -380 replies
12/13powerpc/85xx: p2020: Enable boards by new config option CONFIG_PPC_P2020arch/powerpc/platforms/85xx/Kconfig arch/powerpc/platforms/85xx/Makefile+21 -60 replies
13/13powerpc: dts: turris1x.dts: Remove "fsl,P2020RDB-PC" compatible stringarch/powerpc/boot/dts/turris1x.dts+1 -10 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v5 yet.

Read the v5 thread

Cover letter [PATCH v5 00/13] powerpc/85xx: p2020: Create one unified machine description

This patch series unifies all P2020 boards and machine descriptions into one generic unified P2020 machine description. With this generic machine description, kernel can boot on any P2020-based board with correct DTS file.

Tested on CZ.NIC Turris 1.1 board which has Freescale P2020 processor. Kernel during booting correctly detects P2020 and prints:

[    0.000000] Hardware name: Turris 1.1 e500v2 0x80211051 Freescale P2020

This patch series depends on another patch series "powerpc/fsl_uli1575: Cleanups":
https://lore.kernel.org/linuxppc-dev/[email protected]/t/#u
(it was split from this one in v5)

Changes in v5:
* Split fsl_uli1575 patches to separate patch series as this one started to be too big.
* Fix commit messages
* Reduce includes
* Rebase on top of powerpc/next (b0bbe5a2915201e3231e788d716d39dc54493b03)
* Test all patches again on CZ.NIC Turris 1.1 board with P2020 processor

Changes in v4:
* Added several preparatory cleanup patchs
* Minimised churn by not duplicating helpers at the first place
* Split main patch in two
* Dropped patchs 1 and 2
* Untested beyond basic build test

Changes in v3:
* Use 'if (IS_ENABLED(CONFIG_PPC_I8259))' instead of '#ifdef CONFIG_PPC_I8259'
* Simplify p2020_probe()
* Patches generated by -M and -C git options

Link to v2: https://lore.kernel.org/linuxppc-dev/[email protected]/

Changes in v2:
* Added patch "p2020: Move i8259 code into own function" (separated from the next one)
* Renamed CONFIG_P2020 to CONFIG_PPC_P2020
* Fixed descriptions

Link to v1: https://lore.kernel.org/linuxppc-dev/[email protected]/

Christophe Leroy (6):
powerpc/85xx: Remove DBG() macro
powerpc/85xx: mpc85xx_{ds/rdb} compact the call to mpic_alloc() powerpc/85xx: mpc85xx_{ds/rdb} replace BUG_ON() by WARN_ON() powerpc/85xx: mpc85xx_{ds/rdb} replace prink by pr_xxx macro powerpc/85xx: Remove #ifdefs CONFIG_PPC_I8259 in mpc85xx_ds powerpc/85xx: Remove #ifdef CONFIG_QUICC_ENGINE in mpc85xx_rdb

Pali Rohár (7):
powerpc/85xx: p2020: Move all P2020 DS machine descriptions to p2020.c powerpc/85xx: p2020: Move all P2020 RDB machine descriptions to

    p2020.c
  powerpc/85xx: mpc85xx_ds: Move i8259 code into own file
  powerpc/85xx: p2020: Unify .setup_arch and .init_IRQ callbacks
  powerpc/85xx: p2020: Define just one machine description
  powerpc/85xx: p2020: Enable boards by new config option
    CONFIG_PPC_P2020

powerpc: dts: turris1x.dts: Remove "fsl,P2020RDB-PC" compatible string

 arch/powerpc/boot/dts/turris1x.dts         |  2 +-
 arch/powerpc/platforms/85xx/Kconfig        | 22 +++++-
 arch/powerpc/platforms/85xx/Makefile       |  4 +-
 arch/powerpc/platforms/85xx/mpc85xx.h      |  6 ++
 arch/powerpc/platforms/85xx/mpc85xx_8259.c | 63 ++++++++++++++++
 arch/powerpc/platforms/85xx/mpc85xx_ds.c   | 87 +++-------------------
 arch/powerpc/platforms/85xx/mpc85xx_mds.c  |  7 --
 arch/powerpc/platforms/85xx/mpc85xx_rdb.c  | 63 +++-------------
 arch/powerpc/platforms/85xx/p2020.c        | 81 ++++++++++++++++++++
 9 files changed, 191 insertions(+), 144 deletions(-)
 create mode 100644 arch/powerpc/platforms/85xx/mpc85xx_8259.c
 create mode 100644 arch/powerpc/platforms/85xx/p2020.c
Signature · 1 line
2.20.1