From nobody Wed Feb 23 12:32:18 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 2D38819EEAD1; Wed, 23 Feb 2022 12:32:21 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mail.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K3b5c5Rbdz3M5W; Wed, 23 Feb 2022 12:32:20 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1645619539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TTcetVyFipMBytTAua6Kx+Jam+Id3LG5Tr2sw7ndo28=; b=sYudB08mFJap/cROSjGuxGlmUHjbLUI1db/noo5Dd5k1MijiaPxQ53P/bsS7eJpul/+fv0 HKwJizQpZf55CM2Or1L1CWXm1jKuwOJHBkZO8Ien8ZKLBUlIwGUtavJHvXxHkedfuP0GR3 CkjTOlxYJL2NCP6eOpRN+MgKZNloSR4= Received: from skull.home.blih.net (lfbn-idf2-1-1209-14.w90-92.abo.wanadoo.fr [90.92.34.14]) by mx.blih.net (OpenSMTPD) with ESMTPSA id b980152e (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 23 Feb 2022 12:32:19 +0000 (UTC) Date: Wed, 23 Feb 2022 13:32:18 +0100 From: Emmanuel Vadot To: Mateusz Guzik Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: a813b0965d8e - main - sdhci: Make ext_resources non-optional Message-Id: <20220223133218.bcd42e470762fdf13bea06bb@bidouilliste.com> In-Reply-To: References: <202202211629.21LGTm5q008381@gitrepo.freebsd.org> <20220223084913.52c618c69fb1b9d52b780f6c@bidouilliste.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) 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 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4K3b5c5Rbdz3M5W 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 Wed, 23 Feb 2022 13:02:21 +0100 Mateusz Guzik wrote: > 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" > ^~~~~~~~~~~~~~~~~ I didn't touched anything related to this. > > 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 -- Emmanuel Vadot