From nobody Fri Oct 21 20:13:28 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MvFzC2DMCz4gh94 for ; Fri, 21 Oct 2022 20:13:43 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MvFzB5BW0z3Sn3 for ; Fri, 21 Oct 2022 20:13:42 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-ed1-x52a.google.com with SMTP id a13so10075146edj.0 for ; Fri, 21 Oct 2022 13:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=h67Pjyq1wySQg92WbCtYp80OUAbxOEwgBoZWVLAe9bY=; b=S8q1Ohvr2kQklGHd9q1WBNVO6z0pHmhfpsC83SD/ykyvp6ooY5zd4jftlPS52+4VXW dIrO2iyi9fYcD6+qYMqQyUAnYRsg0HL9kK2HDVBrD3cDUbHUXQ0jhIF4rugUh7/UO8q2 oXz7T6jx/p3AdJA15ZeSow5iqCBcnwqWA26qQYkswDqOrA/wdJzkqrLebA/OBLCa0JRs bYfFr8nqsXMYvhmE+SG6Q0nnQyjUa0lxfeIyxKtRLo+2syZ7Nt5CBndBbTijrTNnl1Qz LHGrZwyF9uvq/HLGTHZaCpp1bziZDV1ZlSMRnkbFvR3nAygyB2TH3m5JpIyzWPOOJok1 VvKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=h67Pjyq1wySQg92WbCtYp80OUAbxOEwgBoZWVLAe9bY=; b=iIpMoihoL+QPgbSQcMXYjReAK1eIAf5DYzSllmqaMV3oy9agbRSlGtG5JqGwybWIgB DRKb4H8XhNmU0b3KCyCW1RWtr/oB0BMC7+NppWxRUVJsQazFGFChVQb4JG3tZThfBZk8 d1NJ4WUnrpD1UIZTntfeQ8TdE0+XrtejAN+Jdy9bS/loK920fR5QeKsPaqgmON4dVTSn ZUsLXGi4DbfJHJgu3U4WNMbSXjNn5sdHpD3jcWKNxil49CqNfE612YAnoh/KY/eYykMR P2fbTeeooiSrpkTe5NK49LyELKqsOM6A8vyvJbbTpxuSOXtjhK7rcY6sDE8WBUnuXW28 /F6w== X-Gm-Message-State: ACrzQf0kNC7PbHxEfccNWY0eFoiJwVjpt4O1a46LyLjhSDVyFQdpUJd9 JgYApj3Q7TcseL6eSOQMIWYRtvQYo1FLS62xdFaa5Q== X-Google-Smtp-Source: AMsMyM7zczG4K9r436AiYveCo0pmKf2T/p4fkO2c/ruSC75DzyUiAYPonMNzu+8cgte0JRogMf4LcfeEQthG8Cp0zwQ= X-Received: by 2002:a17:907:72d2:b0:79e:8082:1326 with SMTP id du18-20020a17090772d200b0079e80821326mr1983557ejc.252.1666383219426; Fri, 21 Oct 2022 13:13:39 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202210180540.29I5eNBZ068087@gitrepo.freebsd.org> <8sps479n-9961-rq8o-52op-po77rpo9p377@mnoonqbm.arg> <90B2F15A-3102-4771-BD46-C5304091569C@fubar.geek.nz> <1pr758pp-3640-43ss-451-nqnoqs248s5p@SerrOFQ.bet> In-Reply-To: <1pr758pp-3640-43ss-451-nqnoqs248s5p@SerrOFQ.bet> From: Warner Losh Date: Fri, 21 Oct 2022 14:13:28 -0600 Message-ID: Subject: Re: git: 2782ed8f6cd3 - main - dpaa2: fix standalone module build To: "Bjoern A. Zeeb" Cc: Andrew Turner , Gleb Smirnoff , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: multipart/alternative; boundary="000000000000daa8e505eb91137b" X-Rspamd-Queue-Id: 4MvFzB5BW0z3Sn3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20210112.gappssmtp.com header.s=20210112 header.b=S8q1Ohvr; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2a00:1450:4864:20::52a) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20210112.gappssmtp.com:s=20210112]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; R_SPF_NA(0.00)[no SPF record]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::52a:from]; RCVD_TLS_LAST(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20210112.gappssmtp.com:+]; TO_DN_SOME(0.00)[]; DMARC_NA(0.00)[bsdimp.com]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-main@freebsd.org]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N --000000000000daa8e505eb91137b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hey Bjoern, On Fri, Oct 21, 2022 at 2:08 PM Bjoern A. Zeeb wrote: > On Fri, 21 Oct 2022, Andrew Turner wrote: > > > > > > >> On 21 Oct 2022, at 16:17, Bjoern A. Zeeb wrote: > >> > >> On Tue, 18 Oct 2022, Gleb Smirnoff wrote: > >> > >>> The branch main has been updated by glebius: > >>> > >>> URL: > https://cgit.FreeBSD.org/src/commit/?id=3D2782ed8f6cd3d7f59219a783bc7fa7b= bfb1fe26f > >>> > >>> commit 2782ed8f6cd3d7f59219a783bc7fa7bbfb1fe26f > >>> Author: Gleb Smirnoff > >>> AuthorDate: 2022-10-18 05:38:24 +0000 > >>> Commit: Gleb Smirnoff > >>> CommitDate: 2022-10-18 05:38:24 +0000 > >>> > >>> dpaa2: fix standalone module build > >>> --- > >>> sys/modules/dpaa2/Makefile | 2 ++ > >>> 1 file changed, 2 insertions(+) > >>> > >>> diff --git a/sys/modules/dpaa2/Makefile b/sys/modules/dpaa2/Makefile > >>> index 556a1c531669..fa280452bcfa 100644 > >>> --- a/sys/modules/dpaa2/Makefile > >>> +++ b/sys/modules/dpaa2/Makefile > >>> @@ -19,6 +19,8 @@ SRCS+=3D memac_mdio_common.c memac_mdio_if.c > memac_mdio_if.h > >>> > >>> SRCS+=3D bus_if.h device_if.h miibus_if.h > >>> SRCS+=3D pcib_if.h pci_if.h > >>> +SRCS+=3D mdio_if.h > >> > >> What do you need this for? > >> > >>> +SRCS+=3D opt_acpi.h opt_platform.h > >> > >> opt_acpi gets inlcuded lines below and so does opt_platform under the > >> respective OPT_ checks. Now they are there twice. > > > > OPT_ACPI doesn=E2=80=99t exist as a make variable so the ".if !empty(OP= T_ACPI)=E2=80=9D > check won=E2=80=99t work as it is expected to work here so opt_acpi.h won= =E2=80=99t be > built. The second problem is the opt_*.h files need to be unconditionally > created so they can be included in the relevant code. > > Then they should probably have been removed from under the .ifdefs > in the same commit? > > > We do use OPT_ACPI elsewhere in the tree as well.. hwpmc? Can't > remember. How's it working there? > > What is currently then including these files then? Hmm I haven't used > the module in a while... > > Should we duplicate the FDT logic for ACPI in sys/conf/kern.opts.mk > so LINT-ACPI can be a better thing long-term as well? > Yes. We likely should clean this up... But the appetite to polish the currently way over polished and under powered config(8) program is low. However, having it create a .mk file that can be included that summarizes all the options in a kernel config would be the least amount of effort relative to the crazy greps we have going on now. Warner --000000000000daa8e505eb91137b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hey Bjoern,

On Fri, Oct 21, 2022 at 2:= 08 PM Bjoern A. Zeeb <bz@freebsd.org> wrote:
On= Fri, 21 Oct 2022, Andrew Turner wrote:

>
>
>> On 21 Oct 2022, at 16:17, Bjoern A. Zeeb <bz@FreeBSD.org> wr= ote:
>>
>> On Tue, 18 Oct 2022, Gleb Smirnoff wrote:
>>
>>> The branch main has been updated by glebius:
>>>
>>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D2782ed8f6cd3d7f59219a783bc7fa7bbf= b1fe26f
>>>
>>> commit 2782ed8f6cd3d7f59219a783bc7fa7bbfb1fe26f
>>> Author:=C2=A0 =C2=A0 =C2=A0Gleb Smirnoff <glebius@FreeBSD.o= rg>
>>> AuthorDate: 2022-10-18 05:38:24 +0000
>>> Commit:=C2=A0 =C2=A0 =C2=A0Gleb Smirnoff <glebius@FreeBSD.o= rg>
>>> CommitDate: 2022-10-18 05:38:24 +0000
>>>
>>>=C2=A0 =C2=A0dpaa2: fix standalone module build
>>> ---
>>> sys/modules/dpaa2/Makefile | 2 ++
>>> 1 file changed, 2 insertions(+)
>>>
>>> diff --git a/sys/modules/dpaa2/Makefile b/sys/modules/dpaa2/Ma= kefile
>>> index 556a1c531669..fa280452bcfa 100644
>>> --- a/sys/modules/dpaa2/Makefile
>>> +++ b/sys/modules/dpaa2/Makefile
>>> @@ -19,6 +19,8 @@ SRCS+=3D=C2=A0 =C2=A0 memac_mdio_common.c me= mac_mdio_if.c memac_mdio_if.h
>>>
>>> SRCS+=3D=C2=A0 =C2=A0 =C2=A0 bus_if.h device_if.h miibus_if.h<= br> >>> SRCS+=3D=C2=A0 =C2=A0 =C2=A0 pcib_if.h pci_if.h
>>> +SRCS+=3D=C2=A0 =C2=A0 =C2=A0mdio_if.h
>>
>> What do you need this for?
>>
>>> +SRCS+=3D=C2=A0 =C2=A0 =C2=A0opt_acpi.h opt_platform.h
>>
>> opt_acpi gets inlcuded lines below and so does opt_platform under = the
>> respective OPT_ checks.=C2=A0 Now they are there twice.
>
> OPT_ACPI doesn=E2=80=99t exist as a make variable so the ".if !em= pty(OPT_ACPI)=E2=80=9D check won=E2=80=99t work as it is expected to work h= ere so opt_acpi.h won=E2=80=99t be built. The second problem is the opt_*.h= files need to be unconditionally created so they can be included in the re= levant code.

Then they should probably have been removed from under the .ifdefs
in the same commit?


We do use OPT_ACPI elsewhere in the tree as well.. hwpmc?=C2=A0 Can't remember.=C2=A0 How's it working there?

What is currently then including these files then?=C2=A0 Hmm I haven't = used
the module in a while...

Should we duplicate the FDT logic for ACPI in sys/conf/kern.opts.mk
so LINT-ACPI can be a better thing long-term as well?
=
Yes. We likely should clean this up... But the appetite to p= olish the currently
way over polished and under powered config(8)= program is low. However,
having it create a .mk file that can be= included that summarizes all the
options in a kernel config woul= d be the least amount of effort relative to the
crazy greps we ha= ve going on now.

Warner
--000000000000daa8e505eb91137b--