From nobody Mon Oct 24 15:28:03 2022 X-Original-To: dev-commits-src-all@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 4MwzVT1gMxz4fyh4 for ; Mon, 24 Oct 2022 15:28:17 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) (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 4MwzVS4j6Dz3TH8 for ; Mon, 24 Oct 2022 15:28:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-ej1-x62b.google.com with SMTP id q9so6024414ejd.0 for ; Mon, 24 Oct 2022 08:28:16 -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=8LEVifi4RoXuaDohA1NrsTRVbke+LvefqhFGVzUncM0=; b=xIbYo/rtarsnZN3fjudZ06ryHC6vBx+YBEzLWGCXMUncW3d+z95lKdFN27YaA7qreO zfy0iK2xFdjNC406dcq4fj+a1pV1yvYP6OlPZUqPsdAxPpmFWZVxJN/HM5ReDH+qgFyG ea/pAABLXjqH91ANecOC6isZ4aFuGe1DqDTDrn947DZBYqaY/Bx+bGF3PxPGMhB38u3+ AwlRyUTANA7edbPhFInY5yjIFEm7Y0/SyiTlU5KLj96OGsgg5yzTGr1lTuOAa5JUKpzz 6djzFuR6ngOgGb1UDSRqa94wR2bzVDGo6ui9Aq/xBVX9MGTsOq5oQOfZ7KIu4qpm1HbX E6nw== 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=8LEVifi4RoXuaDohA1NrsTRVbke+LvefqhFGVzUncM0=; b=Qi+ukKnTivGy8mKt09x1ekgYo/2alZHsmgoGLICBzOtx32Omasu+IacH5tyYneOtwA T288zt/uoWudxCMOhHXEnhmpEo2mLEAHZDH5O0ePMKcNYm+AYKjoVZCI54gaAERxoD3o dka+hkit1viJ2HRCuv/1OiBjtNVsum6GUBed0O8pgvYUfbQOceNnHiiO16IycOqXO87g yM4ydQCU1LtfWbKxE5NXjAigA6w+3/6IArVeIUfEYKoftbMrgM5mcdsizA5hsSIz4Nxr mH5CB6fQCR/DmTvS8R5s+IOEGS1Gxbxz+BPFxnQTMKYA6rRyHSwI9G7UbTDo25BNnMbM 9WVw== X-Gm-Message-State: ACrzQf0DI1n+ncxEBhpuAF2pyyw6/WunCatDXz3riZHDzqdCEJgX6kT0 chkg/x+se1/72qB1e8iSBwuUW3j++1f9BTeXOMTD9Q== X-Google-Smtp-Source: AMsMyM5GFXRX5nDmocC6YVRYagAbAQN6NpPoORobBbGPuOPH0uPvDL5xeT8Jqq7PHETiuIgDv52dH2rES9jIGfoUwXM= X-Received: by 2002:a17:906:730f:b0:791:9b75:2ca1 with SMTP id di15-20020a170906730f00b007919b752ca1mr26855122ejc.140.1666625295212; Mon, 24 Oct 2022 08:28:15 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202210241439.29OEdKOI013861@gitrepo.freebsd.org> <170CEFAF-A78C-4DD7-A639-3B7090C5D347@freebsd.org> In-Reply-To: From: Warner Losh Date: Mon, 24 Oct 2022 09:28:03 -0600 Message-ID: Subject: Re: git: 9cf5db63698b - main - acpi_ged: fix build, as module and non INTRNG case. To: Kyle Evans Cc: Jessica Clarke , Takanori Watanabe , src-committers , "" , dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000b2039d05ebc97034" X-Rspamd-Queue-Id: 4MwzVS4j6Dz3TH8 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20210112.gappssmtp.com header.s=20210112 header.b="xIbYo/rt"; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2a00:1450:4864:20::62b) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.998]; 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]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::62b:from]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; R_SPF_NA(0.00)[no SPF record]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20210112.gappssmtp.com:+]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; RCPT_COUNT_FIVE(0.00)[6]; DMARC_NA(0.00)[bsdimp.com]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N --000000000000b2039d05ebc97034 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Oct 24, 2022, 9:22 AM Kyle Evans wrote: > On Mon, Oct 24, 2022 at 10:16 AM Jessica Clarke > wrote: > > > > On 24 Oct 2022, at 15:39, Takanori Watanabe > wrote: > > > > > > The branch main has been updated by takawata: > > > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D9cf5db63698b3c73edd632412bf6873= 5d3c20d37 > > > > > > commit 9cf5db63698b3c73edd632412bf68735d3c20d37 > > > Author: Takanori Watanabe > > > AuthorDate: 2022-10-24 14:19:12 +0000 > > > Commit: Takanori Watanabe > > > CommitDate: 2022-10-24 14:37:28 +0000 > > > > > > acpi_ged: fix build, as module and non INTRNG case. > > > > > > Reviewed-by: cy > > > > > > Differential Revision: https://reviews.freebsd.org/D37104 > > > --- > > > sys/dev/acpica/acpi_ged.c | 2 +- > > > sys/modules/acpi/acpi_ged/Makefile | 2 +- > > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/sys/dev/acpica/acpi_ged.c b/sys/dev/acpica/acpi_ged.c > > > index 9459ccc3525b..8ee56c8b0335 100644 > > > --- a/sys/dev/acpica/acpi_ged.c > > > +++ b/sys/dev/acpica/acpi_ged.c > > > @@ -198,7 +198,7 @@ acpi_ged_attach(device_t dev) > > > } > > > } > > > #else > > > - rawirq =3D rman_get_start(sc->evt[i].r); > > > + rawirq =3D rman_get_start(sc->evts[i].r); > > > trig =3D INTR_TRIGGER_LEVEL; > > > if (ACPI_SUCCESS(acpi_lookup_irq_resource > > > (dev, sc->evts[i].rid, > > > diff --git a/sys/modules/acpi/acpi_ged/Makefile > b/sys/modules/acpi/acpi_ged/Makefile > > > index a937249357f4..87dd53b88b2b 100644 > > > --- a/sys/modules/acpi/acpi_ged/Makefile > > > +++ b/sys/modules/acpi/acpi_ged/Makefile > > > @@ -1,7 +1,7 @@ > > > # $FreeBSD$ > > > > > > .PATH: ${SRCTOP}/sys/dev/acpica > > > -.if ${TARGET_ARCH} =3D=3D aarch64 > > > +.if ${MACHINE_CPUARCH} =3D=3D "aarch64" > > > CFLAGS +=3D -DINTRNG > > > .endif > > > KMOD=3D acpi_ged > > > > Why isn=E2=80=99t acpi_ged.c just #include=E2=80=99ing opt_global.h? > > > > I suspect this is trying to cope with untied builds, though I agree > it's using the wrong approach. We should push this into > sys/conf/config.mk instead (+ arm, riscv), which should do the right > thing and actually #define it in opt_global.h (which is included via > CFLAGS). > I was about to make similar comments. I'll take a look at fixing while I'm on the plane today... if some else doesn't take a stab I. The mean time. Warner > --000000000000b2039d05ebc97034 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Mon, Oct 24, 2022, 9:22 AM Kyle Evans <kevans@freebsd.org> wrote:
<= blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px= #ccc solid;padding-left:1ex">On Mon, Oct 24, 2022 at 10:16 AM Jessica Clar= ke <jrtc27@freebsd.org> wrote:
>
> On 24 Oct 2022, at 15:39, Takanori Watanabe <takawata@FreeBSD.org&g= t; wrote:
> >
> > The branch main has been updated by takawata:
> >
> > URL: https://cgit.FreeBSD.org/src/commit/?id=3D9cf5db63698b3c73edd632412= bf68735d3c20d37
> >
> > commit 9cf5db63698b3c73edd632412bf68735d3c20d37
> > Author:=C2=A0 =C2=A0 =C2=A0Takanori Watanabe <takawata@FreeBSD= .org>
> > AuthorDate: 2022-10-24 14:19:12 +0000
> > Commit:=C2=A0 =C2=A0 =C2=A0Takanori Watanabe <takawata@FreeBSD= .org>
> > CommitDate: 2022-10-24 14:37:28 +0000
> >
> >=C2=A0 =C2=A0 acpi_ged: fix build, as module and non INTRNG case.<= br> > >
> >=C2=A0 =C2=A0 Reviewed-by: cy
> >
> >=C2=A0 =C2=A0 Differential Revision: https://r= eviews.freebsd.org/D37104
> > ---
> > sys/dev/acpica/acpi_ged.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 2 += -
> > sys/modules/acpi/acpi_ged/Makefile | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/sys/dev/acpica/acpi_ged.c b/sys/dev/acpica/acpi_ged.= c
> > index 9459ccc3525b..8ee56c8b0335 100644
> > --- a/sys/dev/acpica/acpi_ged.c
> > +++ b/sys/dev/acpica/acpi_ged.c
> > @@ -198,7 +198,7 @@ acpi_ged_attach(device_t dev)
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0}
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
> > #else
> > -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rawirq =3D rman_= get_start(sc->evt[i].r);
> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0rawirq =3D rman_= get_start(sc->evts[i].r);
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0trig =3D IN= TR_TRIGGER_LEVEL;
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (ACPI_SU= CCESS(acpi_lookup_irq_resource
> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(dev, sc->evts[i].rid,
> > diff --git a/sys/modules/acpi/acpi_ged/Makefile b/sys/modules/acp= i/acpi_ged/Makefile
> > index a937249357f4..87dd53b88b2b 100644
> > --- a/sys/modules/acpi/acpi_ged/Makefile
> > +++ b/sys/modules/acpi/acpi_ged/Makefile
> > @@ -1,7 +1,7 @@
> > #=C2=A0 =C2=A0 =C2=A0$FreeBSD$
> >
> > .PATH:=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${SRCTOP}/sys/dev/acpica
> > -.if ${TARGET_ARCH} =3D=3D aarch64
> > +.if ${MACHINE_CPUARCH} =3D=3D "aarch64"
> > CFLAGS +=3D -DINTRNG
> > .endif
> > KMOD=3D acpi_ged
>
> Why isn=E2=80=99t acpi_ged.c just #include=E2=80=99ing opt_global.h? >

I suspect this is trying to cope with untied builds, though I agree
it's using the wrong approach. We should push this into
sys/conf/config.mk instead (+ arm, riscv), which should do the right=
thing and actually #define it in opt_global.h (which is included via
CFLAGS).

I was about to make similar comments.=C2=A0 I'll take a look = at fixing while I'm on the plane today... if some else doesn't take= a stab I. The mean time.

Warner=C2=A0
--000000000000b2039d05ebc97034--