Hi Caleb,
On Tue, 19 Dec 2023 at 21:34, Caleb Connolly <caleb.conno...@linaro.org> wrote:
>
> Historically, Qualcomm boards in U-Boot have all had their own
> board/qualcomm/xyz directory, their own CONFIG_TARGET_XYZ option, their
> own hardcoded sysmap-xyz.c file, and their own U-Boot specific
> devicetree with little/no compatibility with upstream DT.
>
> This series makes a few final prepatory changes, and then replaces
> almost all of the board specific code with generic alternatives. The end
> result is that all Qualcomm boards both current and future (with the
> exception of the db410c and db820c) can be supported by a single U-Boot
> binary by just providing the correct DT. New boards can be added without
> introducing any addition mach/ or board/ code or config options.
>
> Due to the nature of this change, the patch ("mach-snapdragon:
> generalise board support") has become pretty big, I tried a few
> different ways to represent this in git history, but the other methods
> (e.g. adding a stub "generic" target and removing it again) were more
> confusing and made for much messier git history. The current patch is
> mostly atomic, but requires regenerating the config.
>
> The QCS404 EVB board had some code to enable the USB VBUS regulator,
> this is dropped in favour of a adding a new vbus-supply property to the
> dwc3-generic driver. This will also be used by the dragonboard845c in a
> future patch. This handles the common case of a board requiring some
> regulator be enabled for USB host mode.
>
> A more detailed description of the changes is below.
>
> == Memory map ==
>
> The memory map was historically hardcoded into U-Boot, this meant that
> U-Boot had to be built for a specific variant of a device. This is
> changed to instead read the memory map from the DT /memory node.
>
> Additionally, most boards mapped addresss 0x0 as valid, as a result if a
> null pointer access happens then it will cause a bus stall (and board
> hang). This is fixed so that null pointer accesses will now correctly
> throw an exception.
>
> == DT loading ==
>
> Previously, boards used the FDT blob embedded into U-Boot (via
> OF_SEPARATE). However, most Qualcomm boards run U-Boot as a secondary
> bootloader, so we can instead rely on the first-stage bootloader to
> populate some useful FDT properties for us (notably the /memory node and
> KASLR seed) and fetch the DTB that it provides. Combined with the memory
> map changes above, this let's us entirely avoid configuring the memory
> map explicitly.
>
> == defconfig ==
>
> Most of the board defconfigs and config headers were quite similar, to
> simplify maintenance going forward, all the fully generic boards (sdm845
> and qcs404-evb so far) are adapted to use the new qcom_defconfig. Going
> forward, all new Qualcomm boards should be supported by this defconfig.
> A notable exception is for specific usecases (like U-Boot as the primary
> bootloader).
>
> == The older dragonboards ==
>
> The db410c and db820c both have some custom board init code, as a result
> they aren't yet binary compatible. mach-snapdragon is adjusted so
> that all the necessary config options (e.g. CONFIG_SYS_BOARD) can be set
> from their defconfigs, this makes it possible to enable support for new
> boards without introducing additional config options.
>
> The db410c can run U-Boot either chainloaded like the other boards, or
> as a first-stage bootloader replacing aboot. However it was hardcoded to
> only build for the latter option. This series introduces a new
> "chainloaded" defconfig to enable easier testing via fastboot.
>
> == dynamic environment variables ==
>
> This series also introduces runtime-allocated load addresses via the lmb
> allocator. This allows for booting on boards with vastly different
> memory layouts without any pre-calculation or macro magic in the config
> header. This feature is based on similar code in mach-apple.
>
> The soc, board, and fdtfile environment variables are also generated
> automatically. Many Qualcomm boards follow a similar scheme for DTB
> naming such that the name can often be derived from the root compatible
> properties. This is intended to cover the most common cases and be a
> simple solution for booting generic distro images without having to
> explicitly choose the right DTB. The U-Boot DTS can be tweaked if
> necessary to produce the correct name, the variable can be overwritten,
> or a bootloader like GRUB can load the devicetree instead.
>
> == Upstream DT ==
>
> All Qualcomm boards have had their devicetree files replaced with the
> upstream versions. Previous patch series made the necessary driver
> adjustments to fully support the upstream DT format. All future
> Qualcomm boards should use upstream DTS by default.
>
> Once Sumit's work to import dt-rebasing has been merged, we will drop
> the imported DT and bindings again.
Since there is consensus building in the U-Boot community to use DT
rebasing subtree, I would suggest you rebase your work on top of [1].
You can take an amlogic SoC patch [2] as a reference and see
corresponding value-add. I don't see the point of unnecessary churn if
there is consensus we agree upon.
[1] https://lore.kernel.org/all/20231214135103.1606605-1-sumit.g...@linaro.org/
[2] https://lore.kernel.org/all/20231214135103.1606605-8-sumit.g...@linaro.org/
>
> ---
> I have tested this series on the Dragonboard410c, Dragonboard820c, and
> Dragonboard845c. I unfortunately don't have access to a QCS404 EVB board
> to test.
>
> This series is based on the qcom-next branch [1] and depends on my PMIC
> fixes series [2], an integration branch for testing can be found at [3].
> The non-qualcomm-specific changes (patches 1 and 2) don't have any
> dependencies.
>
> [1]: https://source.denx.de/u-boot/custodians/u-boot-snapdragon
> [2]:
> https://lore.kernel.org/u-boot/20231114-b4-qcom-dt-compat-v3-0-88a92f8f0...@linaro.org/
> [3]:
> https://source.denx.de/u-boot/custodians/u-boot-snapdragon/-/tree/b4/qcom-common-target
>
> ---
> Changes in v2:
> - Split DTS changes to reduce patch size.
> - Import full board DTS files from Linux too, and introduce -u-boot.dtsi
> files where necessary to make any U-Boot specific changes.
> - Add a pinctrl driver for qcom PMIC GPIOs
> - Always enable LINUX_KERNEL_IMAGE_HEADER
> - Link to v1:
> https://lore.kernel.org/r/20231121-b4-qcom-common-target-v1-0-9492198e0...@linaro.org
>
> To: Neil Armstrong <neil.armstr...@linaro.org>
> To: Sumit Garg <sumit.g...@linaro.org>
> To: Ramon Fried <rfried....@gmail.com>
> Cc: Marek Vasut <ma...@denx.de>
> To: Dzmitry Sankouski <dsankou...@gmail.com>
> To: Caleb Connolly <caleb.conno...@linaro.org>
> To: Peng Fan <peng....@nxp.com>
> To: Jaehoon Chung <jh80.ch...@samsung.com>
> To: Rayagonda Kokatanur <rayagonda.kokata...@broadcom.com>
> To: Lukasz Majewski <lu...@denx.de>
> To: Sean Anderson <sean...@gmail.com>
> To: Jorge Ramirez-Ortiz <jorge.ramirez.or...@gmail.com>
> To: Stephan Gerhold <step...@gerhold.net>
> Cc: <u-boot@lists.denx.de>
>
> ---
> Caleb Connolly (32):
> arm: init: export prev_bl_fdt_addr
> usb: dwc3-generic: support external vbus regulator
> mmc: msm_sdhci: use modern clock handling
> dt-bindings: drop msm_sdhci binding
> clk/qcom: use upstream compatible properties
> serial: msm: add debug UART
> serial: msm: fix clock handling
> gpio: qcom_pmic: 1-based GPIOs
> gpio: qcom_pmic: add a quirk to skip GPIO configuration
> gpio: qcom_pmic: add pinctrl driver
> board: dragonboard410c: add chainloaded config fragment
> board: dragonboard410c: upstream DT compat
> board: dragonboard410c: import board code from mach-snapdragon
> board: dragonboard820c: use LINUX_KERNEL_IMAGE_HEADER
> mach-snapdragon: generalise board support
> mach-snapdragon: dynamic load addresses
> mach-snapdragon: generate fdtfile automatically
> doc: board/qualcomm: document generic targets
...
> dt-bindings: import headers for SDM845
> dts: sdm845: import supporting dtsi files
> dts: sdm845: replace with upstream DTS
> dt-bindings: import headers for MSM8916
> dts: msm8916: import PMIC dtsi files
> dts: msm8916: replace with upstream DTS
> dt-bindings: import headers for MSM8996
> dts: msm8996: import PMIC dtsi files
> dts: dragonboard820c: use correct bindings for clocks
> dts: msm8996: replace with upstream DTS
> dt-bindings: import headers for qcs404
> dts: qcs404-evb: replace with upstream DT
The value being all these DT import patches won't be needed with DT rebasing.
-Sumit
> board: qcs404-evb: drop board code
> MAINTAINERS: Qualcomm: add some missing paths
>
> MAINTAINERS | 12 +-
> arch/arm/Kconfig | 4 +
> arch/arm/dts/Makefile | 9 +-
> arch/arm/dts/apq8016-sbc.dts | 729 +++
> arch/arm/dts/apq8096-db820c-u-boot.dtsi | 10 +
> arch/arm/dts/apq8096-db820c.dts | 1137 ++++
> arch/arm/dts/dragonboard410c-uboot.dtsi | 44 -
> arch/arm/dts/dragonboard410c.dts | 199 +-
> arch/arm/dts/dragonboard820c-uboot.dtsi | 32 -
> arch/arm/dts/dragonboard820c.dts | 151 -
> arch/arm/dts/dragonboard845c-uboot.dtsi | 26 -
> arch/arm/dts/dragonboard845c.dts | 48 -
> arch/arm/dts/msm8916-pm8916.dtsi | 157 +
> arch/arm/dts/msm8916.dtsi | 2702 +++++++++
> arch/arm/dts/msm8996.dtsi | 3884 +++++++++++++
> arch/arm/dts/pm8916.dtsi | 178 +
> arch/arm/dts/pm8994.dtsi | 152 +
> arch/arm/dts/pm8998.dtsi | 130 +
> arch/arm/dts/pmi8994.dtsi | 65 +
> arch/arm/dts/pmi8998.dtsi | 98 +
> arch/arm/dts/pms405.dtsi | 149 +
> arch/arm/dts/qcs404-evb-4000-u-boot.dtsi | 26 +
> arch/arm/dts/qcs404-evb-4000.dts | 96 +
> arch/arm/dts/qcs404-evb-uboot.dtsi | 30 -
> arch/arm/dts/qcs404-evb.dts | 390 --
> arch/arm/dts/qcs404-evb.dtsi | 389 ++
> arch/arm/dts/qcs404.dtsi | 1829 ++++++
> arch/arm/dts/sdm845-db845c.dts | 1190 ++++
> .../arm/dts/sdm845-samsung-starqltechn-u-boot.dtsi | 16 +
> arch/arm/dts/sdm845-samsung-starqltechn.dts | 624 +++
> arch/arm/dts/sdm845-wcd9340.dtsi | 86 +
> arch/arm/dts/sdm845.dtsi | 5801
> +++++++++++++++++++-
> arch/arm/dts/starqltechn-uboot.dtsi | 27 -
> arch/arm/dts/starqltechn.dts | 68 -
> arch/arm/lib/save_prev_bl_data.c | 5 +
> arch/arm/mach-snapdragon/Kconfig | 95 +-
> arch/arm/mach-snapdragon/Makefile | 8 +-
> arch/arm/mach-snapdragon/board.c | 304 +
> arch/arm/mach-snapdragon/include/mach/dram.h | 12 -
> arch/arm/mach-snapdragon/init_sdm845.c | 73 -
> arch/arm/mach-snapdragon/misc.c | 55 -
> arch/arm/mach-snapdragon/sysmap-apq8016.c | 31 -
> arch/arm/mach-snapdragon/sysmap-apq8096.c | 31 -
> arch/arm/mach-snapdragon/sysmap-qcs404.c | 43 -
> arch/arm/mach-snapdragon/sysmap-sdm845.c | 31 -
> board/qualcomm/dragonboard410c/Kconfig | 15 -
> board/qualcomm/dragonboard410c/Makefile | 3 +-
> .../dragonboard410c/configs/chainloaded.config | 7 +
> board/qualcomm/dragonboard410c/dragonboard410c.c | 109 +-
> .../qualcomm/dragonboard410c/misc.c | 51 +-
> .../mach => board/qualcomm/dragonboard410c}/misc.h | 1 +
> board/qualcomm/dragonboard820c/Kconfig | 15 -
> board/qualcomm/dragonboard820c/Makefile | 1 -
> board/qualcomm/dragonboard820c/dragonboard820c.c | 39 +-
> board/qualcomm/dragonboard820c/head.S | 33 -
> board/qualcomm/dragonboard820c/u-boot.lds | 111 -
> board/qualcomm/dragonboard845c/Kconfig | 12 -
> board/qualcomm/qcs404-evb/Kconfig | 15 -
> board/qualcomm/qcs404-evb/Makefile | 6 -
> board/qualcomm/qcs404-evb/qcs404-evb.c | 62 -
> configs/dragonboard410c_defconfig | 8 +-
> configs/dragonboard820c_defconfig | 8 +-
> configs/dragonboard845c_defconfig | 29 -
> configs/qcom_defconfig | 73 +
> configs/qcs404evb_defconfig | 55 -
> configs/starqltechn_defconfig | 41 -
> doc/board/qualcomm/board.rst | 119 +
> doc/board/qualcomm/debugging.rst | 61 +
> doc/board/qualcomm/index.rst | 4 +-
> doc/board/qualcomm/qcs404.rst | 79 -
> doc/board/qualcomm/sdm845.rst | 162 -
> doc/device-tree-bindings/mmc/msm_sdhci.txt | 25 -
> doc/device-tree-bindings/usb/ehci-msm.txt | 10 -
> drivers/clk/qcom/clock-apq8016.c | 9 +-
> drivers/clk/qcom/clock-apq8096.c | 7 +-
> drivers/gpio/qcom_pmic_gpio.c | 232 +-
> drivers/mmc/msm_sdhci.c | 69 +-
> drivers/phy/qcom/msm8916-usbh-phy.c | 4 +-
> drivers/pinctrl/qcom/pinctrl-apq8016.c | 2 +-
> drivers/serial/Kconfig | 8 +
> drivers/serial/serial_msm.c | 56 +-
> drivers/usb/dwc3/dwc3-generic.c | 12 +
> drivers/usb/host/ehci-msm.c | 24 +-
> include/configs/dragonboard845c.h | 20 -
> include/configs/qcom.h | 21 +
> include/configs/qcs404-evb.h | 20 -
> include/configs/sdm845.h | 26 -
> include/dt-bindings/arm/coresight-cti-dt.h | 37 +
> include/dt-bindings/clock/qcom,camcc-sdm845.h | 116 +
> include/dt-bindings/clock/qcom,dispcc-sdm845.h | 56 +
> include/dt-bindings/clock/qcom,gcc-msm8916.h | 179 +
> include/dt-bindings/clock/qcom,gcc-msm8996.h | 360 ++
> include/dt-bindings/clock/qcom,gpucc-sdm845.h | 24 +
> include/dt-bindings/clock/qcom,lpass-sdm845.h | 15 +
> include/dt-bindings/clock/qcom,mmcc-msm8996.h | 295 +
> include/dt-bindings/clock/qcom,rpmcc.h | 174 +
> include/dt-bindings/clock/qcom,rpmh.h | 37 +
> include/dt-bindings/clock/qcom,turingcc-qcs404.h | 15 +
> include/dt-bindings/clock/qcom,videocc-sdm845.h | 35 +
> include/dt-bindings/dma/qcom-gpi.h | 11 +
> include/dt-bindings/firmware/qcom,scm.h | 18 +
> include/dt-bindings/iio/qcom,spmi-vadc.h | 300 +
> include/dt-bindings/interconnect/qcom,msm8916.h | 100 +
> .../dt-bindings/interconnect/qcom,msm8996-cbf.h | 12 +
> include/dt-bindings/interconnect/qcom,msm8996.h | 163 +
> include/dt-bindings/interconnect/qcom,osm-l3.h | 15 +
> include/dt-bindings/interconnect/qcom,sdm845.h | 150 +
> include/dt-bindings/phy/phy-qcom-qmp.h | 20 +
> include/dt-bindings/phy/phy-qcom-qusb2.h | 37 +
> include/dt-bindings/pinctrl/qcom,pmic-gpio.h | 164 +
> include/dt-bindings/pinctrl/qcom,pmic-mpp.h | 106 +
> include/dt-bindings/power/qcom-rpmpd.h | 412 ++
> include/dt-bindings/qcom,q6asm.h | 26 +
> .../dt-bindings/regulator/qcom,rpmh-regulator.h | 36 +
> include/dt-bindings/reset/qcom,gcc-msm8916.h | 100 +
> include/dt-bindings/reset/qcom,sdm845-aoss.h | 17 +
> include/dt-bindings/reset/qcom,sdm845-pdc.h | 22 +
> include/dt-bindings/soc/qcom,apr.h | 28 +
> include/dt-bindings/soc/qcom,rpmh-rsc.h | 14 +
> include/dt-bindings/sound/apq8016-lpass.h | 9 +
> include/dt-bindings/sound/qcom,lpass.h | 46 +
> include/dt-bindings/sound/qcom,q6afe.h | 9 +
> include/dt-bindings/sound/qcom,q6asm.h | 26 +
> include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h | 234 +
> include/dt-bindings/sound/qcom,wcd9335.h | 15 +
> include/init.h | 11 +
> 126 files changed, 23909 insertions(+), 2375 deletions(-)
> ---
> base-commit: bcb4a9ddbd21a61b5b421ba374a785757bd28c80
>
> // Caleb (they/them)
>
