From nobody Wed Feb 23 13:00:27 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 E03C119CC6FF; Wed, 23 Feb 2022 13:00:28 +0000 (UTC) (envelope-from meloun.michal@gmail.com) Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) (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 4K3bk45fYGz3Qkf; Wed, 23 Feb 2022 13:00:28 +0000 (UTC) (envelope-from meloun.michal@gmail.com) Received: by mail-ej1-x630.google.com with SMTP id qk11so52346859ejb.2; Wed, 23 Feb 2022 05:00:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:message-id:date:mime-version:user-agent:reply-to:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=Bexqpgfg8xZEL+U3Kqdhjg2gVKhCLlSfmaJtEAiz+10=; b=dcttuMhhv623127kYa2cqeWg8IEQYSa0O/a7obMxIqAMhITqF1WfHqt6EjxandJ1HZ ELvi/Wu17tWJlD4xGFfUWm6S9vij3GGWj2Q4D+pym7//YAkq48WFVUCIfRxF7sGTU2Xc 0yxZ/d2mHzguZjw4AF7xX1SsG20ZtvCKzrNPQj7zWhyN5c+PwA+6PlpNeI0LaUA12cB2 2EO54bYeLSDQbmzEV7F0JiEYY84ZQhTmk7dUPoZeIT7J1xUXBXqSM0jsQxcPdtABm/Xp bg/5MsytfjkAhMltY0b9ygDU3dNj2RYlGx3vBED9pG9kLu3njuTx1hmvRDGbNamUOj8X QvWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:message-id:date:mime-version:user-agent :reply-to:subject:content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=Bexqpgfg8xZEL+U3Kqdhjg2gVKhCLlSfmaJtEAiz+10=; b=ZyYbUSlC7J8pGvJsHbQR4i116hVkiLa97r48Yzr7vsKCyVpySrrQCJENbhPxQ7fsI1 /OeF0I/r0z9ensbLMEl3jQFxUKqCykpr/KFOslCiz57aIEXZI388skD2UGdpmzPrZLFb KO/+0kkqem5Y2TFpu1W6cF+UnIVteQ3f9VYxp89U6PotN9lI59Q+8QsNOEJ5hw5MyUqQ mqhkNMU4cckMBMm3Y2gIC+lNB7DrVOIJcIqMntDxye6BDke8zkP8L1NZorJHnAWBiu+K HYKFbje8Ghx7t7o7KWH6KErm7TJb2HYaD3r5GldQZ7AI9r/jhSNizMaxhVDkjP/XNm7b kSqw== X-Gm-Message-State: AOAM530UsNcTS1LekVMmfp5TmyB8tszZpvS0Qa/PMcweqZtVgCKOol/F IXxDH9vITIp792fXLdAHV6L7AxBcW6iD9g== X-Google-Smtp-Source: ABdhPJy41FdcbFRFLUkTUX9vlrNTuRtKLZeUu+9HhIuPyUQ0KMhcFNNyMA5mjcqj2+xdTTknwIxVvQ== X-Received: by 2002:a17:906:3042:b0:6cd:20ed:7c5c with SMTP id d2-20020a170906304200b006cd20ed7c5cmr22957708ejd.241.1645621227508; Wed, 23 Feb 2022 05:00:27 -0800 (PST) Received: from [88.208.79.100] (halouny.humusoft.cz. [88.208.79.100]) by smtp.gmail.com with ESMTPSA id i24sm7374763ejg.40.2022.02.23.05.00.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 23 Feb 2022 05:00:26 -0800 (PST) Message-ID: <78f5c62a-73f8-2753-888c-a4478cfa67f9@gmail.com> Date: Wed, 23 Feb 2022 14:00:27 +0100 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 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Reply-To: meloun.michal@gmail.com Subject: Re: git: a813b0965d8e - main - sdhci: Make ext_resources non-optional Content-Language: en-US To: Emmanuel Vadot , Mateusz Guzik Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202202211629.21LGTm5q008381@gitrepo.freebsd.org> <20220223084913.52c618c69fb1b9d52b780f6c@bidouilliste.com> <20220223133218.bcd42e470762fdf13bea06bb@bidouilliste.com> From: Michal Meloun In-Reply-To: <20220223133218.bcd42e470762fdf13bea06bb@bidouilliste.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4K3bk45fYGz3Qkf X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[] X-ThisMailContainsUnwantedMimeParts: N On 23.02.2022 13:32, Emmanuel Vadot wrote: > 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. > That's mine. Give me an hour. Michal >>> 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 > >