From nobody Tue Feb 22 19:05:45 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 B546119D6679; Tue, 22 Feb 2022 19:05:49 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) (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 4K37t50lLCz4TRg; Tue, 22 Feb 2022 19:05:49 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-lj1-x22c.google.com with SMTP id p20so12749947ljo.0; Tue, 22 Feb 2022 11:05:49 -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=I2xBoLzDEi73Fp4xkENsD9Uz2PE3FPP9ZG93AjMXlJs=; b=lQfPXAJDvHG4ZvkqCVp9Q5wDs+vfopQMR0p+aBQX1gJfKeT1/9FNWgFCIfD/tbR31w WVul4kzoJZwUMsQdtgWgFsZESc9O8lcygXhsCC9t+FaViiOSSGPH+YIHs/PJLu97dDS6 +a5hgIT5LwMeml/3Am7VLNnib6bAMpC78hFY9gpTUFcGf3kqKwu0FdSt3zwW4O1TM9B7 yEN/hZoPolq7pXsDQbrgLlXSsR4U1l94oiSTvT1biKMJC1k1CVg8Cjr835mM5bs6H0IB 8UzSAUnfofKkz2V2jRCWEU9C9WRsCgebC4c1SXV/Dh6EYRA4Sp4oC4BNmWxZySqEBTg4 9nYw== 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=I2xBoLzDEi73Fp4xkENsD9Uz2PE3FPP9ZG93AjMXlJs=; b=WFFuccB/ZAHK8QBNahh2l57x2hfrGRDZv7okl+5wDQvhjZ2iRAWUarHO855dxMP+6D 47TSSb5k8HEwBcyr/lLMvo+Wv/4W0UvKBX5uQu/dq7kfbQmKCrLdQ5wnaSuJzirdlOu2 yJUtS/m4I/f2xuULBvmyx5/gzzIOAxhEi8oAsX2bNNm/aEsn/iGr3lHj5ZSv2D6hgJJE 80KX6hxIrB/SyO8DU6sbcfd+AkXEehMBjHUZlRvgw/StbbAi731g/O2RB6gHL8lQDDYC D3bRp0yMEBURjcea7IiImICldbS5KFQJxzE5kJ2aUJoJlP1XeeKaSrSAzSj/bgRZFGrh uA1Q== X-Gm-Message-State: AOAM532QXD+uN29wuWvFUpRhFtXD2ENKOOFDt8Ltlm+OnoBTd6lCiRsm LVzIgL+8o2/qABdDqbkA5jg46sNpb1MT+/Ox7DHWLAja X-Google-Smtp-Source: ABdhPJy9Izvx0SAGIJUXupNXRT5VKjjiI7zY7yvBL1Jy3nBpJ4Wd1wyREHxHOe6QTsBZkm4PBhqggoKlw6Y0INtfcNo= X-Received: by 2002:a2e:9654:0:b0:244:bb3f:6555 with SMTP id z20-20020a2e9654000000b00244bb3f6555mr18628288ljh.282.1645556746354; Tue, 22 Feb 2022 11:05:46 -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; Tue, 22 Feb 2022 11:05:45 -0800 (PST) In-Reply-To: <202202211629.21LGTm5q008381@gitrepo.freebsd.org> References: <202202211629.21LGTm5q008381@gitrepo.freebsd.org> From: Mateusz Guzik Date: Tue, 22 Feb 2022 20:05:45 +0100 Message-ID: Subject: Re: git: a813b0965d8e - main - sdhci: Make ext_resources non-optional To: Emmanuel Vadot Cc: 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: 4K37t50lLCz4TRg X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20210112 header.b=lQfPXAJD; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of mjguzik@gmail.com designates 2a00:1450:4864:20::22c as permitted sender) smtp.mailfrom=mjguzik@gmail.com X-Spamd-Result: default: False [-4.00 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20210112]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::22c:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MLMMJ_DEST(0.00)[dev-commits-src-all,dev-commits-src-main]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-ThisMailContainsUnwantedMimeParts: N 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 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