dpaa2: add console support for FDT based systems
ClosedPublic
Actions

Authored by bz on Feb 14 2023, 3:58 PM.

Details

Reviewers

dsl
andrew

Commits

rG34ee2711941e: dpaa2: add console support for FDT based systems
rG72ef722b2a34: dpaa2: add console support for FDT based systems

Summary

Add DPAA2 console support for MC and AIOP (latter untested) for FDT
systems. ACPI systems are prepared but need some proper bus function
in order to get the address from MC. This will come at a later stage
once other ACPI/FDT bus parts are cleared up.
The work was originally done in July 2022 and finally switched to
bus_space[1].

Suggested by: andrew [1]

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 49781
Build 46671: arc lint + arc unit

Event Timeline

bz created this revision.Feb 14 2023, 3:58 PM

Herald added subscribers: emaste, andrew, imp. · View Herald TranscriptFeb 14 2023, 3:58 PM

bz requested review of this revision.Feb 14 2023, 3:58 PM

Harbormaster completed remote builds in B49781: Diff 117213.Feb 14 2023, 3:58 PM

I believe there is an issue due to last minute changes which no longer read the full message buffer (uiomove switched to uiomove_buffer, ... ) I'll have t track that down tonight. cat /dev/fsl_,,, does not report an error though but I only get the first round of 128 byte buffer back now.

bz added a subscriber: matt_traverse.com.au.Feb 14 2023, 4:07 PM

Switch back from uiomove_frombuf() to uiomove() as the former has
a silly check which will silently return 0 on repeated calls
(buflen <= uio->uio_offset) which after moving the first 128
bytes out will then fail on the 2nd round with new buffer contents.

Harbormaster completed remote builds in B49784: Diff 117223.Feb 14 2023, 5:49 PM

dsl added inline comments.Feb 14 2023, 8:12 PM

sys/dev/dpaa2/dpaa2_console.c
67	Shouldn't MC_REG_MCFBA be taken into account, i.e. `MC_REG_MCFBA + 0x00`? EDIT: This above was my first though when I saw the code for the first time. I didn't want to believe that memory region described in FDT consists an offset already, but here it is (from fsl-ls1088a.dtsi): console@8340020 { compatible = "fsl,dpaa2-console"; reg = <0x00000000 0x08340020 0 0x2>; }; ... fsl_mc: fsl-mc@80c000000 { compatible = "fsl,qoriq-mc"; reg = <0x00000008 0x0c000000 0 0x40>, /* MC portal base / <0x00000000 0x08340000 0 0x40000>; / MC control reg */ ...
69	Same about MC_REG_MCFBA here. EDIT: Please, ignore it due to the reason above.

dsl added inline comments.Feb 15 2023, 2:29 PM

sys/dev/dpaa2/dpaa2_console.c
73	@bz MC_BUFFER_OFFSET name is misleading because it can be confused with the offset to the log buffer, i.e. `hdr.start` which is 0x01400000 according to DPAA2UM. Where did you get this offset from? Same for the MC_BUFFER_SIZE.

Overall changes look good to me.

The only feature I'd add is to print log buffer's content during boot to debug issues as early as possible. I'm having troubles booting HoneyComb with FDT at the moment as it hangs at mounting NFS root and resets the board.

May we have it committed?

bz marked 2 inline comments as done.Apr 14 2023, 10:00 AM

bz added inline comments.

sys/dev/dpaa2/dpaa2_console.c
73	I wonder if they came from drivers/soc/fsl/dpaa2-console.c ; it's almost a year; I should probably add the NXP Copyrights to this file as well and add a note to the references above.

Add NXP copyright and license given some parts likely originated from the dual-licensed linux implementation
Cleanup some no longer needed includes and code given we switched to bus_space functions

Harbormaster completed remote builds in B50921: Diff 120350.Apr 15 2023, 12:23 PM

@imp is it okay to add the upstream SPDX license/copyright like this?