Skip to content

dm: Print device name in dev_xxx like Linux

Sean Anderson u-boot 2 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest46 patches 0 repliesNew
  2. v10 of 4 patches 0 repliesSuperseded

Changes in v2 from the cover letter

- Support logging with struct device as well as struct udevice. A lot of drivers, especially USB gadgets, log with devices and not udevices. There is no major reason why they can't use udevice, but big changes like that are outside the scope of this series.
- Add some comments to __dev_printk and dev_printk_emit
- Handle struct device as well as struct udevice
- Match format strings for the NULL path to the regular path. This reduces the amount of duplicated strings.
- Print the device name before the driver name
- Many new patches added to fix build bugs

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/46dm: syscon: Fix calling dev_dbg with an uninitialized devicedrivers/core/syscon-uclass.c+1 -11 reply
1/46dm: syscon: Fix calling dev_dbg with an uninitialized device+0 -00 replies
2/46firmware: ti_sci: Fix not calling dev_err with a devicedrivers/firmware/ti_sci.c+16 -71 reply
3/46i2c: mxc: Fix dev_err being called on a nonexistant variabledrivers/i2c/mxc_i2c.c+5 -22 replies
4/46mtd: nand: pxa3xx: Fix not calling dev_xxx with a devicedrivers/mtd/nand/raw/pxa3xx_nand.c+15 -150 replies
5/46mtd: nand: sunxi: Fix not calling dev_err with a devicedrivers/mtd/nand/raw/sunxi_nand.c+23 -220 replies
6/46mtd: spi: Include dm.h in spi-nor-core.cdrivers/mtd/spi/spi-nor-core.c+1 -00 replies
7/46mtd: spi: Fix logging in spi-nor-tinydrivers/mtd/spi/spi-nor-tiny.c+16 -50 replies
8/46mtd: spi-nand: Fix not calling dev_err with a devicedrivers/mtd/nand/spi/core.c+4 -41 reply
9/46mmc: Add mmc_dev()include/mmc.h+2 -01 reply
10/46mmc: bcm2835-host: Fix not calling dev_dbg with a devicedrivers/mmc/bcm2835_sdhost.c+17 -170 replies
11/46mmc: mtk-sd: Fix not calling dev_err with a devicedrivers/mmc/mtk-sd.c+13 -111 reply
12/46mailbox: k3: Fix not calling dev_err with a devicedrivers/mailbox/k3-sec-proxy.c+4 -21 reply
13/46nand: atmel: Fix not calling dev_xxx with a devicedrivers/mtd/nand/raw/atmel_nand.c+39 -301 reply
14/46nand: brcmnand: Fix not calling dev_err() with a devicedrivers/mtd/nand/raw/brcmnand/brcmnand.c+6 -140 replies
15/46nand: vybrid: Re-introduce vf610_nfc.devdrivers/mtd/nand/raw/vf610_nfc.c+21 -170 replies
16/46net: bcm6368: Fix not calling dev_info with a devicedrivers/net/bcm6368-eth.c+1 -20 replies
17/46net: mdio: Fix not calling dev_dbg with a devicenet/mdio-uclass.c+2 -20 replies
18/46net: mvneta: Fix not always calling dev_err with a devicedrivers/net/mvneta.c+2 -21 reply
19/46net: mvneta: Convert netdev_xxx to dev_xxxdrivers/net/mvneta.c+28 -241 reply
20/46net: mvpp2: Fix not calling dev_xxx with a devicedrivers/net/mvpp2.c+12 -111 reply
21/46net: mvpp2: Convert netdev_xxx to dev_xxxdrivers/net/mvpp2.c+33 -311 reply
22/46linux/compat.h: Remove netdev_xxx functionsinclude/linux/compat.h+0 -191 reply
23/46net: sunxi: Fix not calling dev_xxx with a devicedrivers/net/sunxi_emac.c+3 -21 reply
24/46net: sun8i_emac: Fix not calling dev_xxx with a devicedrivers/net/sun8i_emac.c+5 -41 reply
25/46net: ti: cpsw: Fix not calling dev_dbg with a devicedrivers/net/ti/cpsw.c+6 -00 replies
26/46phy: marvell: Fix not calling dev_err with a devicedrivers/phy/marvell/comphy_core.c+3 -30 replies
27/46phy: rockchip: Fix not calling dev_err with a devicedrivers/phy/rockchip/phy-rockchip-pcie.c drivers/phy/rockchip/phy-rockchip-typec.c+10 -101 reply
28/46phy: sun4i-usb: Fix not calling dev_err with a devicedrivers/phy/allwinner/phy-sun4i-usb.c+8 -40 replies
29/46phy: ti: Fix not calling dev_err with a devicedrivers/phy/phy-ti-am654.c+2 -20 replies
30/46phy: usbphyc: Fix not calling dev_err with a devicedrivers/phy/phy-stm32-usbphyc.c+1 -12 replies
31/46remoteproc: Remove unused function rproc_elf_sanity_checkdrivers/remoteproc/rproc-elf-loader.c include/remoteproc.h+0 -290 replies
32/46remoteproc: k3-r5: Fix not calling dev_xxx with a devicedrivers/remoteproc/ti_k3_r5f_rproc.c+14 -100 replies
33/46remoteproc: k3: Fix not calling dev_xxx with a devicedrivers/remoteproc/k3_system_controller.c+5 -40 replies
34/46soc: qualcomm: Fix not calling dev_err with a devicedrivers/smem/msm_smem.c+1 -11 reply
35/46spi: sunxi: Fix not calling dev_err with a devicedrivers/spi/spi-sunxi.c+3 -30 replies
36/46spi: zynqmp_gqspi: Fix not calling dev_err with a devicedrivers/spi/zynqmp_gqspi.c+3 -31 reply
37/46sysreset: ti: Fix not calling dev_err with a devicedrivers/sysreset/sysreset-ti-sci.c+1 -20 replies
38/46usb: cdns3: Fix not calling dev_xxx with a devicedrivers/usb/cdns3/ep0.c drivers/usb/cdns3/gadget.c+4 -40 replies
39/46usb: dwc2: Fix not calling dev_xxx with a devicedrivers/usb/host/dwc2.c+23 -162 replies
39/46usb: dwc2: Fix not calling dev_xxx with a device+0 -00 replies
39/46usb: dwc2: Fix not calling dev_xxx with a device+0 -01 reply
40/46usb: dwc3: Fix not calling dev_xxx with a devicedrivers/usb/dwc3/core.c drivers/usb/dwc3/ep0.c drivers/usb/dwc3/gadget.c+21 -180 replies
41/46usb: dwc3: ti: Fix not calling dev_err with a devicedrivers/usb/dwc3/ti_usb_phy.c+2 -20 replies
42/46usb: dwc3: Don't include asm-generic/io.hdrivers/usb/dwc3/dwc3-generic.c+0 -10 replies
43/46usb: musb-new: sunxi: Fix not calling dev_err with a devicedrivers/usb/musb-new/sunxi.c+5 -40 replies
44/46video: stm32: Fix not calling dev_xxx with a devicedrivers/video/dw_mipi_dsi.c+14 -101 reply
45/46dm: Use symbolic constants for log levels in dev_xxxinclude/dm/device_compat.h+11 -101 reply
46/46dm: Print device name in dev_xxx like Linuxinclude/dm/device_compat.h+82 -280 replies

Reviews trailers per patch

25 of 49 patches have a Reviewed-by or Acked-by.

PatchNishanth MenonMichal SimekPatrice ChotardPatrick DelaunaySimon GlassHeiko SchocherKever Yang
SeriesT-b
1/46R-b
1/46R-b
2/46R-b
3/46R-b R-b
4/46
5/46
6/46
7/46
8/46R-b
9/46R-b
10/46
11/46R-b
12/46R-b
13/46R-b
14/46
15/46
16/46
17/46
18/46R-b
19/46R-b
20/46R-b
21/46R-b
22/46R-b
23/46R-b
24/46R-b
25/46
26/46
27/46R-b
28/46
29/46
30/46R-b R-b
31/46
32/46
33/46
34/46R-b
35/46
36/46R-b
37/46
38/46
39/46R-b R-b
39/46R-b R-b
39/46R-b R-b
40/46
41/46
42/46
43/46
44/46R-b
45/46R-b
46/46

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

Read the v2 thread

Cover letter [PATCH v2 00/46] dm: Print device name in dev_xxx like Linux

This series adds some additional information to dev_xxx output. This requires the first argument to dev_xxx to be a struct udevice. The first argument has never been used in U-Boot, so many drivers have some invalid calls. To fix these drivers, the following strategies were generally followed

* If there is a udevice already passed to the function, use it.
* If there is a udevice contained in a struct passed to the function, use it. When there are multiple possible devices, I have tried to use whatever "makes sense" given the content of the message.
* If there is no udevice passed to the function either directly or indirectly, but all the callers of said function can access a udevice, modify the function signature to pass in a udevice and use that.
* If the driver does not use DM, convert the log statements to log_xxx.
* If the driver uses DM only some of the time, use ifdefs to select an appropriate log function.

I have done a little bit of cleanup beyond these strategies, but for the most part I have tried to *only* to the minimum necessary. Many drivers could use a follow-up patch to convert their printf()s and debug()s to an appropriate log function.

I have tried to CC relevant maintainers/reviewers only for patches they maintain/review. If I have left someone out, please let me know and I will add them.

CI is passing at [1]. This does not necessarily mean that this series is free of bugs, so I would appreciate testing on hardware. During my refactoring, I noticed a few bugs like

	struct udevice *dev;

	if (some_condition)
		dev_err(dev, "Something went wrong\n");

	dev = some_function();

I have fixed such errors when I have encountered them, but they will not always warn or error on build.

Removal of the duplicate definitions in <linux/compat.h> will be done in a follow-up patch due to the already-large size of this series.

To test this series on sandbox, apply the following options in addition to sandbox_defconfig

CONFIG_LOGLEVEL=8
CONFIG_LOG=n
CONFIG_CMD_LOG=n
CONFIG_CMD_TPM=n

Note that there is a soft dependency on [2] if you would like to test this patch with CONFIG_LOG and a higher LOG_LEVEL than LOGL_INFO.

[1] https://dev.azure.com/seanga2/u-boot/_build/results?buildId=34&view=results
[2] https://patchwork.ozlabs.org/project/uboot/list/?series=201343

Changes in v2:
- Support logging with struct device as well as struct udevice. A lot of drivers, especially USB gadgets, log with devices and not udevices. There is no major reason why they can't use udevice, but big changes like that are outside the scope of this series.
- Add some comments to __dev_printk and dev_printk_emit
- Handle struct device as well as struct udevice
- Match format strings for the NULL path to the regular path. This reduces the amount of duplicated strings.
- Print the device name before the driver name
- Many new patches added to fix build bugs

Sean Anderson (46):
dm: syscon: Fix calling dev_dbg with an uninitialized device
firmware: ti_sci: Fix not calling dev_err with a device
i2c: mxc: Fix dev_err being called on a nonexistant variable
mtd: nand: pxa3xx: Fix not calling dev_xxx with a device
mtd: nand: sunxi: Fix not calling dev_err with a device
mtd: spi: Include dm.h in spi-nor-core.c
mtd: spi: Fix logging in spi-nor-tiny
mtd: spi-nand: Fix not calling dev_err with a device
mmc: Add mmc_dev()
mmc: bcm2835-host: Fix not calling dev_dbg with a device
mmc: mtk-sd: Fix not calling dev_err with a device
mailbox: k3: Fix not calling dev_err with a device
nand: atmel: Fix not calling dev_xxx with a device
nand: brcmnand: Fix not calling dev_err() with a device
nand: vybrid: Re-introduce vf610_nfc.dev
net: bcm6368: Fix not calling dev_info with a device
net: mdio: Fix not calling dev_dbg with a device
net: mvneta: Fix not always calling dev_err with a device
net: mvneta: Convert netdev_xxx to dev_xxx
net: mvpp2: Fix not calling dev_xxx with a device
net: mvpp2: Convert netdev_xxx to dev_xxx linux/compat.h: Remove netdev_xxx functions
net: sunxi: Fix not calling dev_xxx with a device
net: sun8i_emac: Fix not calling dev_xxx with a device
net: ti: cpsw: Fix not calling dev_dbg with a device
phy: marvell: Fix not calling dev_err with a device
phy: rockchip: Fix not calling dev_err with a device
phy: sun4i-usb: Fix not calling dev_err with a device
phy: ti: Fix not calling dev_err with a device
phy: usbphyc: Fix not calling dev_err with a device
remoteproc: Remove unused function rproc_elf_sanity_check
remoteproc: k3-r5: Fix not calling dev_xxx with a device
remoteproc: k3: Fix not calling dev_xxx with a device
soc: qualcomm: Fix not calling dev_err with a device
spi: sunxi: Fix not calling dev_err with a device
spi: zynqmp_gqspi: Fix not calling dev_err with a device
sysreset: ti: Fix not calling dev_err with a device
usb: cdns3: Fix not calling dev_xxx with a device
usb: dwc2: Fix not calling dev_xxx with a device
usb: dwc3: Fix not calling dev_xxx with a device
usb: dwc3: ti: Fix not calling dev_err with a device
usb: dwc3: Don't include asm-generic/io.h
usb: musb-new: sunxi: Fix not calling dev_err with a device
video: stm32: Fix not calling dev_xxx with a device
dm: Use symbolic constants for log levels in dev_xxx
dm: Print device name in dev_xxx like Linux

 drivers/core/syscon-uclass.c              |   2 +-
 drivers/firmware/ti_sci.c                 |  23 ++--
 drivers/i2c/mxc_i2c.c                     |   7 +-
 drivers/mailbox/k3-sec-proxy.c            |   6 +-
 drivers/mmc/bcm2835_sdhost.c              |  34 +++---
 drivers/mmc/mtk-sd.c                      |  24 ++--
 drivers/mtd/nand/raw/atmel_nand.c         |  69 +++++++-----
 drivers/mtd/nand/raw/brcmnand/brcmnand.c  |  20 +---
 drivers/mtd/nand/raw/pxa3xx_nand.c        |  30 ++---
 drivers/mtd/nand/raw/sunxi_nand.c         |  45 ++++----
 drivers/mtd/nand/raw/vf610_nfc.c          |  38 ++++---
 drivers/mtd/nand/spi/core.c               |   8 +-
 drivers/mtd/spi/spi-nor-core.c            |   1 +
 drivers/mtd/spi/spi-nor-tiny.c            |  21 +++-
 drivers/net/bcm6368-eth.c                 |   3 +-
 drivers/net/mvneta.c                      |  56 +++++-----
 drivers/net/mvpp2.c                       |  87 ++++++++-------
 drivers/net/sun8i_emac.c                  |   9 +-
 drivers/net/sunxi_emac.c                  |   5 +-
 drivers/net/ti/cpsw.c                     |   6 +
 drivers/phy/allwinner/phy-sun4i-usb.c     |  12 +-
 drivers/phy/marvell/comphy_core.c         |   6 +-
 drivers/phy/phy-stm32-usbphyc.c           |   2 +-
 drivers/phy/phy-ti-am654.c                |   4 +-
 drivers/phy/rockchip/phy-rockchip-pcie.c  |  14 +--
 drivers/phy/rockchip/phy-rockchip-typec.c |   6 +-
 drivers/remoteproc/k3_system_controller.c |   9 +-
 drivers/remoteproc/rproc-elf-loader.c     |  16 ---
 drivers/remoteproc/ti_k3_r5f_rproc.c      |  24 ++--
 drivers/smem/msm_smem.c                   |   2 +-
 drivers/spi/spi-sunxi.c                   |   6 +-
 drivers/spi/zynqmp_gqspi.c                |   6 +-
 drivers/sysreset/sysreset-ti-sci.c        |   3 +-
 drivers/usb/cdns3/ep0.c                   |   5 +-
 drivers/usb/cdns3/gadget.c                |   3 +-
 drivers/usb/dwc3/core.c                   |  15 +--
 drivers/usb/dwc3/dwc3-generic.c           |   1 -
 drivers/usb/dwc3/ep0.c                    |   1 +
 drivers/usb/dwc3/gadget.c                 |  23 ++--
 drivers/usb/dwc3/ti_usb_phy.c             |   4 +-
 drivers/usb/host/dwc2.c                   |  39 ++++---
 drivers/usb/musb-new/sunxi.c              |   9 +-
 drivers/video/dw_mipi_dsi.c               |  24 ++--
 include/dm/device_compat.h                | 127 ++++++++++++++++------
 include/linux/compat.h                    |  19 ----
 include/mmc.h                             |   2 +
 include/remoteproc.h                      |  13 ---
 net/mdio-uclass.c                         |   4 +-
 48 files changed, 486 insertions(+), 407 deletions(-)
Signature · 1 line
2.28.0