Skip to content

Early flattened DT init consolidation

Rob Herring linux-arm-kernel linux-devicetree linux-metag linux-mips lkml 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest29 patches 11 repliesIn review
  2. v128 patches 31 repliesSuperseded

Changes in v2 from the cover letter

- Rebase to v3.12-rc3
- add arm64 sanity checks to default early_init_dt_add_memory_arch
- drop x86 and metag from common early_init_dt_add_memory_arch
- move metag early_init_dt_scan support to separate patch
- metag fixes from James Hogan
- Add NULL checks in early_init_dt_scan
- Document proper use of unflatten_and_copy_device_tree
- fix section mismatches with of_flat_dt_get_machine_name
- fix non-DT boot on ARM

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/29c6x: use boot_command_line instead of private c6x_command_linearch/c6x/include/asm/setup.h arch/c6x/kernel/devicetree.c arch/c6x/kernel/setup.c +1 more+2 -191 reply
2/29openrisc: use boot_command_line instead of private cmd_linearch/openrisc/kernel/prom.c arch/openrisc/kernel/setup.c+2 -90 replies
3/29of: create unflatten_and_copy_device_treedrivers/of/fdt.c include/linux/of_fdt.h+26 -00 replies
4/29arc: use unflatten_and_copy_device_treearch/arc/include/asm/mach_desc.h arch/arc/kernel/devtree.c arch/arc/kernel/setup.c+1 -180 replies
5/29openrisc: use unflatten_and_copy_device_treearch/openrisc/kernel/prom.c arch/openrisc/kernel/setup.c+1 -140 replies
6/29x86: use unflatten_and_copy_device_treearch/x86/kernel/devicetree.c+8 -150 replies
7/29xtensa: use unflatten_and_copy_device_treearch/xtensa/kernel/setup.c+1 -180 replies
8/29metag: use unflatten_and_copy_device_treearch/metag/kernel/devtree.c arch/metag/kernel/setup.c+1 -194 replies
9/29of: Introduce common early_init_dt_scandrivers/of/fdt.c include/linux/of_fdt.h+28 -00 replies
10/29arc: use early_init_dt_scanarch/arc/kernel/devtree.c+1 -130 replies
11/29arm: use early_init_dt_scanarch/arm/kernel/devtree.c+1 -150 replies
12/29arm64: use early_init_dt_scanarch/arm64/kernel/setup.c+3 -280 replies
13/29c6x: use early_init_dt_scanarch/c6x/kernel/devicetree.c arch/c6x/kernel/setup.c+1 -200 replies
14/29metag: use early_init_dt_scanarch/metag/kernel/devtree.c+1 -61 reply
15/29microblaze: use early_init_dt_scanarch/microblaze/kernel/prom.c arch/microblaze/kernel/setup.c+4 -150 replies
16/29mips: use early_init_dt_scanarch/mips/include/asm/prom.h arch/mips/kernel/prom.c+3 -390 replies
17/29openrisc: use early_init_dt_scanarch/openrisc/kernel/prom.c+1 -140 replies
18/29xtensa: use early_init_dt_scanarch/xtensa/kernel/setup.c+9 -120 replies
19/29of: create default early_init_dt_add_memory_archarch/arm64/kernel/setup.c arch/microblaze/kernel/prom.c arch/openrisc/kernel/prom.c +1 more+19 -291 reply
20/29arm: set initrd_start/initrd_end for fdt scanarch/arm/mm/init.c+8 -30 replies
21/29arm64: set initrd_start/initrd_end for fdt scanarch/arm64/mm/init.c+6 -180 replies
22/29of: remove early_init_dt_setup_initrd_archarch/arc/mm/init.c arch/arm/mm/init.c arch/c6x/kernel/devicetree.c +9 more+10 -1041 reply
23/29openrisc: remove unnecessary prom.c includesarch/openrisc/kernel/prom.c+0 -220 replies
24/29of: introduce common FDT machine related functionsdrivers/of/fdt.c include/linux/of_fdt.h+64 -00 replies
25/29arc: use common of_flat_dt_match_machinearch/arc/kernel/devtree.c+18 -473 replies
26/29arm: use common of_flat_dt_match_machinearch/arm/kernel/devtree.c+20 -220 replies
27/29arm64: use common of_flat_dt_get_machine_namearch/arm64/kernel/setup.c+1 -100 replies
28/29metag: use common of_flat_dt_match_machinearch/metag/include/asm/mach/arch.h arch/metag/include/asm/prom.h arch/metag/kernel/devtree.c +1 more+22 -440 replies
29/29mips: use common of_flat_dt_get_machine_namearch/mips/kernel/prom.c+1 -140 replies

Reviews trailers per patch

21 of 29 patches have a Reviewed-by or Acked-by.

PatchGrant LikelyVineet GuptaMax FilippovCatalin MarinasMark SalterMichal SimekJohn CrispinJames Hogan
1/29R-b A-b
2/29R-b
3/29A-b
4/29A-b A-b
5/29
6/29
7/29A-b A-b
8/29A-b
9/29A-b
10/29A-b
11/29
12/29A-b
13/29A-b
14/29A-b
15/29T-b
16/29A-b
17/29
18/29A-b
19/29A-b A-b
20/29A-b
21/29A-b
22/29A-b A-b A-b
23/29
24/29A-b
25/29A-b
26/29
27/29A-b
28/29
29/29A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 8 reviewers.

Read the v2 thread

Cover letter [PATCH v2 00/29] Early flattened DT init consolidation

From: Rob Herring <[email protected]>

This is the first of 2 series to do some consolidation of per architecture Device Tree code. We now have 12 architectures with DT support. As new architectures have been added, much of the DT related code for the early flattened DT scanning has been duplicated. Yet little of this code is architecture specific. This series has 4 main parts:

- Create a common function to copy built-in dtb's out of init section
- Create a single, common function to scan the FDT
- Removal of early_init_dt_setup_initrd_arch
- Create common functions for machine matching with DT

The entire series with prom.h clean-up series is available here:
git://sources.calxeda.com/kernel/linux.git dt-cleanup

Compiled on arm, arm64, microblaze, mips, openrisc, powerpc, sparc, xtensa.

Version 1 of this series is here:
http://www.spinics.net/lists/devicetree/msg04865.html

The prom.h clean-up series is here:
http://www.spinics.net/lists/devicetree/msg06175.html

Changes in v2:
- Rebase to v3.12-rc3
- add arm64 sanity checks to default early_init_dt_add_memory_arch
- drop x86 and metag from common early_init_dt_add_memory_arch
- move metag early_init_dt_scan support to separate patch
- metag fixes from James Hogan
- Add NULL checks in early_init_dt_scan
- Document proper use of unflatten_and_copy_device_tree
- fix section mismatches with of_flat_dt_get_machine_name
- fix non-DT boot on ARM

Rob

Rob Herring (29):
c6x: use boot_command_line instead of private c6x_command_line
openrisc: use boot_command_line instead of private cmd_line
of: create unflatten_and_copy_device_tree
arc: use unflatten_and_copy_device_tree
openrisc: use unflatten_and_copy_device_tree
x86: use unflatten_and_copy_device_tree
xtensa: use unflatten_and_copy_device_tree
metag: use unflatten_and_copy_device_tree
of: Introduce common early_init_dt_scan
arc: use early_init_dt_scan
arm: use early_init_dt_scan
arm64: use early_init_dt_scan
c6x: use early_init_dt_scan
metag: use early_init_dt_scan
microblaze: use early_init_dt_scan
mips: use early_init_dt_scan
openrisc: use early_init_dt_scan
xtensa: use early_init_dt_scan
of: create default early_init_dt_add_memory_arch
arm: set initrd_start/initrd_end for fdt scan
arm64: set initrd_start/initrd_end for fdt scan
of: remove early_init_dt_setup_initrd_arch
openrisc: remove unnecessary prom.c includes
of: introduce common FDT machine related functions
arc: use common of_flat_dt_match_machine
arm: use common of_flat_dt_match_machine
arm64: use common of_flat_dt_get_machine_name
metag: use common of_flat_dt_match_machine
mips: use common of_flat_dt_get_machine_name

 arch/arc/include/asm/mach_desc.h   |   1 -
 arch/arc/kernel/devtree.c          |  94 +++++--------------------
 arch/arc/kernel/setup.c            |   3 +-
 arch/arc/mm/init.c                 |   7 --
 arch/arm/kernel/devtree.c          |  58 ++++++----------
 arch/arm/mm/init.c                 |  13 ++--
 arch/arm64/kernel/setup.c          |  60 ++--------------
 arch/arm64/mm/init.c               |  24 ++-----
 arch/c6x/include/asm/setup.h       |   2 -
 arch/c6x/kernel/devicetree.c       |  29 --------
 arch/c6x/kernel/setup.c            |  13 +---
 arch/c6x/kernel/vmlinux.lds.S      |   6 --
 arch/metag/include/asm/mach/arch.h |   2 +-
 arch/metag/include/asm/prom.h      |   2 +-
 arch/metag/kernel/devtree.c        |  83 ++++++----------------
 arch/metag/kernel/setup.c          |   6 +-
 arch/metag/mm/init.c               |   9 ---
 arch/microblaze/kernel/prom.c      |  31 +--------
 arch/microblaze/kernel/setup.c     |   2 +-
 arch/mips/include/asm/prom.h       |   3 -
 arch/mips/kernel/prom.c            |  60 +---------------
 arch/openrisc/kernel/prom.c        |  70 +------------------
 arch/openrisc/kernel/setup.c       |   6 +-
 arch/powerpc/kernel/prom.c         |   9 ---
 arch/x86/kernel/devicetree.c       |  32 +++------
 arch/xtensa/kernel/setup.c         |  55 ++++-----------
 drivers/of/fdt.c                   | 138 ++++++++++++++++++++++++++++++++++++-
 include/linux/of_fdt.h             |  18 +++--
 28 files changed, 256 insertions(+), 580 deletions(-)
Signature · 1 line
1.8.1.2