From nobody Wed Feb 23 12:02:21 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 6469219E9847; Wed, 23 Feb 2022 12:02:30 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) (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 4K3ZRB22JCz3HvM; Wed, 23 Feb 2022 12:02:30 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-lf1-x12e.google.com with SMTP id bu29so30731908lfb.0; Wed, 23 Feb 2022 04:02:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=zmDN9x3Pxktwg2X2AqyB3oTyqnD919HsxlOK/FU37jM=; b=PCO9FmvWdXeObIF8l/fnBjvTCbIJJU9t65aX+lWPCNipVkoOWyrsmNKvadIjaFj+ET BPfHeen0oc3X+5xwoiKCvJhfTSKADyiFbS3RKRdzzOlFaQOo6ZAL60mX08lAAxw9vo9c E3zPzId2y1E2Q1qkJiZ5boKBPtsDYxL7NxUJKdNhm+pvr7M4R8a55gNN5VJ8Mc5Pt2yS fj89CDTxdsy+ocffb7gTjFXaBj+NJxWKWioItLH4GTalwQLA3MZIebmTY5jK3GhF3tut WmPV2uIC3yMUxvRVFuptGvmDuel4F4GzEclqTJ+bZclxK8+++G6OUWAaUdHvvmNDYwT8 gPIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=zmDN9x3Pxktwg2X2AqyB3oTyqnD919HsxlOK/FU37jM=; b=Q/XTzdPExf+V3uwyvygC1+9iLwNQ5O3lrM0LumWOAJttHhpI7piSprJLbIofySTGax EgSEJ+50hLucUYGiMEXOyPMFPZlCIzG07MLwI5k3IlCFuf2D/h7m8zEA8FFMo662v3L2 pauoWzm0VdWLqO4GgMeTYLqpqDoBwRzvEHXW2qs84iKJBH3qU2STp1Y4WNd/MdawDCa3 OiwPVgWcFqnQGSkMPaJUT2PJd4vJsJ8bdUgLiS8X7dHVuR5LYpkLLi+n+PfxxpoOYBkP P2tuyBkSZD6bnHVFlD47sxjkNIh4lCHNqvAAuEAes6Yq3kKZNSbH+Ljncp/nxAfgBnL4 w9pg== X-Gm-Message-State: AOAM533iQ0+Brxas2ZZQDNgLi0PgeQ9310cblsZ3jWiOLhKtW7G2eEdi UEvEa1TrMLCLVjKtO2EYKd7EhWGeTNw7e0FUSSKwPS90 X-Google-Smtp-Source: ABdhPJz0yIrkflMyFWC5jSNDBzTkwRVaq/shb+FGeGVuwtPxg70M5YMFWPX+d5pHciryQWEdzLpNcgeQHyUEKa6hDm8= X-Received: by 2002:a05:6512:3b6:b0:443:a793:13ef with SMTP id v22-20020a05651203b600b00443a79313efmr20224188lfp.682.1645617742794; Wed, 23 Feb 2022 04:02:22 -0800 (PST) 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 Received: by 2002:a9a:118a:0:b0:19f:a551:2b1a with HTTP; Wed, 23 Feb 2022 04:02:21 -0800 (PST) In-Reply-To: <20220223084913.52c618c69fb1b9d52b780f6c@bidouilliste.com> References: <202202211629.21LGTm5q008381@gitrepo.freebsd.org> <20220223084913.52c618c69fb1b9d52b780f6c@bidouilliste.com> From: Mateusz Guzik Date: Wed, 23 Feb 2022 13:02:21 +0100 Message-ID: Subject: Re: git: a813b0965d8e - main - sdhci: Make ext_resources non-optional To: Emmanuel Vadot Cc: Emmanuel Vadot , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4K3ZRB22JCz3HvM X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N On 2/23/22, Emmanuel Vadot wrote: > On Tue, 22 Feb 2022 20:05:45 +0100 > Mateusz Guzik wrote: > >> This broke numerous kernels in tinderbox: >> arm EFIKA_MX kernel failed, check _.arm.EFIKA_MX for details >> arm ALPINE kernel failed, check _.arm.ALPINE for details >> arm ZEDBOARD kernel failed, check _.arm.ZEDBOARD for details >> arm VYBRID kernel failed, check _.arm.VYBRID for details >> arm IMX53 kernel failed, check _.arm.IMX53 for details >> arm ARMADA38X kernel failed, check _.arm.ARMADA38X for details >> powerpc MPC85XX kernel failed, check _.powerpc.MPC85XX for details >> powerpc QORIQ64 kernel failed, check _.powerpc.QORIQ64 for details > > I've fixed the arm kernels and QORIQ64. > MPC85XX still fails on some atomic function and that doesn't seems to > be because of me. > Everything builds fine for me now (including MPC85XX), but ZEDBOARD still fails: /usr/src/sys/dev/iicbus/ofw_iicbus.c:45:10: fatal error: 'ofw_iicbus_if.h' file not found #include "ofw_iicbus_if.h" ^~~~~~~~~~~~~~~~~ > Cheers, > >> >> On 2/21/22, Emmanuel Vadot wrote: >> > The branch main has been updated by manu: >> > >> > URL: >> > https://cgit.FreeBSD.org/src/commit/?id=a813b0965d8e9765135ad92a78ce62c8b762b99f >> > >> > commit a813b0965d8e9765135ad92a78ce62c8b762b99f >> > Author: Emmanuel Vadot >> > AuthorDate: 2022-01-11 09:41:23 +0000 >> > Commit: Emmanuel Vadot >> > CommitDate: 2022-02-21 16:28:46 +0000 >> > >> > sdhci: Make ext_resources non-optional >> > >> > EXT_RESOURCES have been introduced in 12-CURRENT and all supported >> > releases have it enabled in their kernel config. >> > >> > MFC after: 1 month >> > Differential Revision: https://reviews.freebsd.org/D33824 >> > --- >> > sys/dev/sdhci/sdhci_fdt.c | 12 ------------ >> > sys/dev/sdhci/sdhci_xenon_acpi.c | 2 -- >> > 2 files changed, 14 deletions(-) >> > >> > diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c >> > index 24a1d054849f..51b009a411c8 100644 >> > --- a/sys/dev/sdhci/sdhci_fdt.c >> > +++ b/sys/dev/sdhci/sdhci_fdt.c >> > @@ -52,13 +52,11 @@ __FBSDID("$FreeBSD$"); >> > #include >> > #include >> > >> > -#ifdef EXT_RESOURCES >> > #include >> > #include >> > #include >> > #include >> > #include >> > -#endif >> > >> > #include >> > >> > @@ -69,10 +67,8 @@ __FBSDID("$FreeBSD$"); >> > >> > #include "opt_mmccam.h" >> > >> > -#ifdef EXT_RESOURCES >> > #include "clkdev_if.h" >> > #include "syscon_if.h" >> > -#endif >> > >> > #define MAX_SLOTS 6 >> > #define SDHCI_FDT_ARMADA38X 1 >> > @@ -81,7 +77,6 @@ __FBSDID("$FreeBSD$"); >> > #define SDHCI_FDT_QUALCOMM 4 >> > #define SDHCI_FDT_RK3399 5 >> > >> > -#ifdef EXT_RESOURCES >> > #define RK3399_GRF_EMMCCORE_CON0 0xf000 >> > #define RK3399_CORECFG_BASECLKFREQ 0xff00 >> > #define RK3399_CORECFG_TIMEOUTCLKUNIT (1 << 7) >> > @@ -93,7 +88,6 @@ __FBSDID("$FreeBSD$"); >> > #define SHIFTIN(x, mask) ((x) * LOWEST_SET_BIT(mask)) >> > >> > #define EMMCCARDCLK_ID 1000 >> > -#endif >> > >> > static struct ofw_compat_data compat_data[] = { >> > { "marvell,armada-380-sdhci", SDHCI_FDT_ARMADA38X }, >> > @@ -120,14 +114,11 @@ struct sdhci_fdt_softc { >> > bool wp_inverted; /* WP pin is inverted */ >> > bool no_18v; /* No 1.8V support */ >> > >> > -#ifdef EXT_RESOURCES >> > clk_t clk_xin; /* xin24m fixed clock */ >> > clk_t clk_ahb; /* ahb clock */ >> > phy_t phy; /* phy to be used */ >> > -#endif >> > }; >> > >> > -#ifdef EXT_RESOURCES >> > struct rk3399_emmccardclk_sc { >> > device_t clkdev; >> > bus_addr_t reg; >> > @@ -320,7 +311,6 @@ sdhci_init_rk3399(device_t dev) >> > >> > return (0); >> > } >> > -#endif >> > >> > static uint8_t >> > sdhci_fdt_read_1(device_t dev, struct sdhci_slot *slot, bus_size_t >> > off) >> > @@ -488,7 +478,6 @@ sdhci_fdt_attach(device_t dev) >> > return (ENOMEM); >> > } >> > >> > -#ifdef EXT_RESOURCES >> > if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == >> > SDHCI_FDT_RK3399) { >> > /* Initialize SDHCI */ >> > @@ -498,7 +487,6 @@ sdhci_fdt_attach(device_t dev) >> > return (err); >> > } >> > } >> > -#endif >> > >> > /* Scan all slots. */ >> > slots = sc->num_slots; /* number of slots determined in probe(). */ >> > diff --git a/sys/dev/sdhci/sdhci_xenon_acpi.c >> > b/sys/dev/sdhci/sdhci_xenon_acpi.c >> > index 1bd4c03c67e4..9bb781ff75a6 100644 >> > --- a/sys/dev/sdhci/sdhci_xenon_acpi.c >> > +++ b/sys/dev/sdhci/sdhci_xenon_acpi.c >> > @@ -44,9 +44,7 @@ __FBSDID("$FreeBSD$"); >> > #include >> > #include >> > >> > -#ifdef EXT_RESOURCES >> > #include >> > -#endif >> > >> > #include >> > #include >> > >> >> >> -- >> Mateusz Guzik > > > -- > Emmanuel Vadot > -- Mateusz Guzik