uart: uart_cpu_arm64: fix the build without FDT
ClosedPublic
Actions

Authored by kevans on Sep 29 2022, 6:12 AM.

Details

Reviewers

manu
andrew

Group Reviewers

arm64

Commits

rG4a4ad02da3c8: uart: uart_cpu_arm64: fix the build without FDT

Summary

clang 14 doesn't properly determine that we're unconditionally returning
if we have ACPI but not FDT. Workaround it for now by just returning
earlier explicitly, but drop a comment noting that it's sketchy.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

kevans created this revision.Sep 29 2022, 6:12 AM

Herald added subscribers: emaste, andrew, imp. · View Herald TranscriptSep 29 2022, 6:12 AM

kevans requested review of this revision.Sep 29 2022, 6:12 AM

Harbormaster completed remote builds in B47600: Diff 111170.Sep 29 2022, 6:12 AM

kevans added a parent revision: D36787: extres: syscon: pull in sys/malloc.h (fix !FDT).Sep 29 2022, 6:12 AM

kevans added a child revision: D36789: arm64: coresight: fix the build without FDT.

manu accepted this revision.Sep 29 2022, 6:35 AM

This revision is now accepted and ready to land.Sep 29 2022, 6:35 AM

Maybe we should create a new function that calls uart_cpu_fdt_probe and sets up di similar to uart_cpu_acpi_spcr. This will mean the code is

#if DEV_ACPI
if (uart_cpu_acpi_spcr(...) == 0)
    return (0);
#endif
#if FDT
if (uart_new_fdt_func(...) == 0)
   return (0);
#endif
return (ENXIO);

Switch to Andy's idea; do fdt setup in a new function entirely, just return
ENXIO if neither setup succeeds.

This revision now requires review to proceed.Sep 29 2022, 4:11 PM

Harbormaster completed remote builds in B47610: Diff 111193.Sep 29 2022, 4:11 PM

andrew accepted this revision.Sep 29 2022, 4:32 PM

This revision is now accepted and ready to land.Sep 29 2022, 4:32 PM

Closed by commit rG4a4ad02da3c8: uart: uart_cpu_arm64: fix the build without FDT (authored by kevans). · Explain WhySep 29 2022, 7:34 PM

This revision was automatically updated to reflect the committed changes.

kevans added a commit: rG4a4ad02da3c8: uart: uart_cpu_arm64: fix the build without FDT.

Revision Contents
Changeset List

Path

Size

sys/

dev/

uart/

uart_cpu_arm64.c

52 lines

Diff 111207

View Options

sys/dev/uart/uart_cpu_arm64.c

uart: uart_cpu_arm64: fix the build without FDTClosedPublicActions