Bug 271932 - ASUS_AC1300 fails to compile qcom_cpu_kpassv2.c
Summary: ASUS_AC1300 fails to compile qcom_cpu_kpassv2.c
Status: Closed FIXED
Alias: None
Product: Base System
Classification: Unclassified
Component: arm (show other bugs)
Version: CURRENT
Hardware: arm Any
: --- Affects Only Me
Assignee: Warner Losh
URL: https://github.com/freebsd/freebsd-sr...
Keywords:
Depends on:
Blocks:
 
Reported: 2023-06-10 06:22 UTC by Mina Galić
Modified: 2024-02-19 03:59 UTC (History)
1 user (show)

See Also:
imp: mfc-stable13-

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Mina Galić freebsd_triage 2023-06-10 06:22:04 UTC 
--- qcom_cpu_kpssv2.o ---                                                    /poudriere/jails/14-current-armv7/usr/src/sys/arm/qualcomm/qcom_cpu_kpssv2.c:76:1: error: conflicting types for 'qcom_cpu_kpssv2_regulator_start'         qcom_cpu_kpssv2_regulator_start(u_int id, phandle_t node)                    ^                                                                            /poudriere/jails/14-current-armv7/usr/src/sys/arm/qualcomm/qcom_cpu_kpssv2.h:33:13: note: previous declaration is here                                    extern  bool qcom_cpu_kpssv2_regulator_start(u_int id, phandle_t node);                   ^                                                               1 error generated.                                                           Building /usr/obj/poudriere/jails/14-current-armv7/usr/src/arm.armv7/sys/ASUS_AC1300/ar40xx_phy.o                                                         *** [qcom_cpu_kpssv2.o] Error code 1
Comment 1 Mark Millard 2023-06-10 18:55:57 UTC 
A little context not shown by the error messages:

sys/arm/qualcomm/qcom_cpu_kpssv2.c still has (from back in
2021-Oct):

boolean_t
qcom_cpu_kpssv2_regulator_start(u_int id, phandle_t node)
{
. . .


sys/arm/qualcomm/qcom_cpu_kpssv2.h recently got an update
to ( afdb42987ca8 ):

extern	bool qcom_cpu_kpssv2_regulator_start(u_int id, phandle_t node);


bool vs. boolean_t need not be compatible. boolean_t needs
to be replaced.
Comment 2 Mina Galić freebsd_triage 2023-06-10 19:23:31 UTC 
thanks for the analysis.
I'll be able to submit a patch one I'm at the computer tonight
Comment 3 commit-hook freebsd_committer freebsd_triage 2023-06-12 14:34:21 UTC 
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=3ed646d89aa4a312ceb1bdcb948f91903860f8f0

commit 3ed646d89aa4a312ceb1bdcb948f91903860f8f0
Author:     Mina Galić <freebsd@igalic.co>
AuthorDate: 2023-06-11 21:12:59 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-06-12 14:30:15 +0000

    fix qcom_cpu_kpssv2 compile on ASUS_AC1300

    Complete afdb42987ca8 by changing the return type from boolean_t to bool
    for the definition for qcom_cpu_kpssv2_regulator_start.

    PR: 271932
    Fixes: afdb42987ca82869eeaecf6dc25c2b6fb7b8370e
    Pull Request: https://github.com/freebsd/freebsd-src/pull/776

 sys/arm/qualcomm/qcom_cpu_kpssv2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 4 Mark Linimon freebsd_committer freebsd_triage 2024-01-10 05:53:21 UTC 
^Triage: assign to committer that resolved.
Comment 5 Warner Losh freebsd_committer freebsd_triage 2024-02-19 03:59:59 UTC 
Not relevant to 13.