From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 214EAC6FA8E for ; Thu, 2 Mar 2023 20:42:56 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7E77B85CB2; Thu, 2 Mar 2023 21:42:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="VyegLRY9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B4FB185B1B; Thu, 2 Mar 2023 21:42:52 +0100 (CET) Received: from mail-qt1-x831.google.com (mail-qt1-x831.google.com [IPv6:2607:f8b0:4864:20::831]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E9F8B85A80 for ; Thu, 2 Mar 2023 21:42:49 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x831.google.com with SMTP id cf14so655857qtb.10 for ; Thu, 02 Mar 2023 12:42:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; t=1677789769; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=IBmcLh7TdqJdao56j5Z1RogM5n9ROeW3aLxoFWbQ4sU=; b=VyegLRY9qoBJx2tUx1nyH35lm+/RU7EUo73XKZ8Vk9h0pualn6wtn03PXwOhjQxTo+ 24jHyYjJU61B5aDbQuyZab02RaL5NRVDLqzf4wxcko6dAb5zPlBfjUe4mNtfGJvD4zf7 B7GZ3Ed+eeBvpwF37Ku3zDHIgGvuxUHtJE/Kw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677789769; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=IBmcLh7TdqJdao56j5Z1RogM5n9ROeW3aLxoFWbQ4sU=; b=yxnQf6i+UsbaJJS91UlLvMdYLBblnTkTSN7++whq/e0HsaiTUvyWYJyzgioDSG+Wdu Lx4kyXYRS1Dgimrk8PfUOLhSvnFIkU96xruMylNMhrVFa3hnrlqApDDBRpddhQYQK2Gz 5jnWbCFkrwgCDaN1tpNdDdM32ZDKrl7wFIQCvMvmTBhBMS5MfKv0W4dxm5t5JKnskJUR oReAIQDp9XRrE6VuhJ2PpEUqdiFSUJ0w3bQtFBqrLAhB4msfcLcVLyQI906eIv/lxj7W N4w6uA1PcOCykPuJbYseJNrUtome1B4pwOpe2jRzRilivGmP4olPfDrRnWMh6xBv5vje FVgQ== X-Gm-Message-State: AO0yUKWyioOqNwIbs47HSyqKGljeinGNGcWomBC5ZxUO9JckcOI1ur05 WLR5jFtzxLAvzWT0f2feZGgrvw== X-Google-Smtp-Source: AK7set8k2fxOC7U2oUyVt0gT8Gyxg2yZB4KANTgjuW8CCsWfVbqPL3bzxyhI5ezR8yocfXB30sBBwA== X-Received: by 2002:a05:622a:114:b0:3bf:ce3e:87db with SMTP id u20-20020a05622a011400b003bfce3e87dbmr18087895qtw.29.1677789768719; Thu, 02 Mar 2023 12:42:48 -0800 (PST) Received: from bill-the-cat (2603-6081-7b00-6400-0000-0000-0000-036b.res6.spectrum.com. [2603:6081:7b00:6400::36b]) by smtp.gmail.com with ESMTPSA id g14-20020ac8468e000000b003a527d29a41sm362367qto.75.2023.03.02.12.42.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Mar 2023 12:42:48 -0800 (PST) Date: Thu, 2 Mar 2023 15:42:46 -0500 From: Tom Rini To: Simon Glass Cc: U-Boot Mailing List , Jaehoon Chung , Peng Fan , Michael Walle Subject: Re: [PATCH v5 38/44] freescale: Fix odd use of ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE Message-ID: <20230302204246.GA4003985@bill-the-cat> References: <20230222163425.2043934-1-sjg@chromium.org> <20230222163425.2043934-39-sjg@chromium.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="tXcEht/k97Swhqel" Content-Disposition: inline In-Reply-To: <20230222163425.2043934-39-sjg@chromium.org> X-Clacks-Overhead: GNU Terry Pratchett X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean --tXcEht/k97Swhqel Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Feb 22, 2023 at 09:34:19AM -0700, Simon Glass wrote: > This is not a CONFIG option so we should not be using IS_ENABLED() on it, > particularly not when it is not defined to anything, so shows up as > calling IS_ENABLED() with no arguments. >=20 > Just check it normally. >=20 > For fsl_esdhc.c set it to 0 at the top of the file if it is not defined. > This sort-of matches the behaviour in fsl_esdhc_mmc.c which seem to have > a similar problem. >=20 > This fixes a build error with split config on T2080QDS. >=20 > Note: This should be handled in the devicetree. >=20 > Signed-off-by: Simon Glass > --- > No size changes on affected boards: >=20 > aarch64: w+ ls1088aqds ls1088aqds_qspi ls1088aqds_qspi_SECURE_BOOT = ls1088aqds_sdcard_ifc ls1088aqds_sdcard_qspi ls1088aqds_tfa ls1088ardb_qspi= ls1088ardb_qspi_SECURE_BOOT ls1088ardb_sdcard_qspi ls1088ardb_sdcard_qspi_= SECURE_BOOT ls1088ardb_tfa ls1088ardb_tfa_SECURE_BOOT ls2080aqds ls2080aqds= _nand ls2080aqds_qspi ls2080aqds_sdcard ls2080aqds_SECURE_BOOT ls2088aqds_t= fa > arm: w+ am57xx_hs_evm_usb > powerpc: w+ P2041RDB P2041RDB_NAND P2041RDB_SDCARD P2041RDB_SPIFLAS= H T1024RDB T1024RDB_NAND T1024RDB_SDCARD T1024RDB_SPIFLASH T1042D4RDB T1042= D4RDB_NAND T1042D4RDB_SDCARD T1042D4RDB_SPIFLASH T2080QDS T2080QDS_NAND T20= 80QDS_SDCARD T2080QDS_SECURE_BOOT T2080QDS_SPIFLASH T2080QDS_SRIO_PCIE_BOOT= T2080RDB T2080RDB_NAND T2080RDB_revD T2080RDB_revD_NAND T2080RDB_revD_SDCA= RD T2080RDB_revD_SPIFLASH T2080RDB_SDCARD T2080RDB_SPIFLASH kmcent2 >=20 > Changes in v5: > - Change approach and expand notes after more investigation >=20 > arch/powerpc/include/asm/config_mpc85xx.h | 6 +++--- > drivers/mmc/fsl_esdhc.c | 6 +++++- > drivers/mmc/fsl_esdhc_imx.c | 4 +++- > 3 files changed, 11 insertions(+), 5 deletions(-) >=20 > diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/inc= lude/asm/config_mpc85xx.h > index d990ecff96f..358ccef7f1d 100644 > --- a/arch/powerpc/include/asm/config_mpc85xx.h > +++ b/arch/powerpc/include/asm/config_mpc85xx.h > @@ -134,7 +134,7 @@ > #define CFG_FM_PLAT_CLK_DIV 1 > #define CFG_SYS_FM1_CLK CFG_FM_PLAT_CLK_DIV > #define CFG_SYS_FM_MURAM_SIZE 0x30000 > -#define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE > +#define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE 0 > #define QE_MURAM_SIZE 0x6000UL > #define MAX_QE_RISC 1 > #define QE_NUM_OF_SNUM 28 > @@ -147,7 +147,7 @@ > #define CFG_SYS_FM1_CLK 0 > #define CFG_QBMAN_CLK_DIV 1 > #define CFG_SYS_FM_MURAM_SIZE 0x30000 > -#define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE > +#define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE 0 > #define QE_MURAM_SIZE 0x6000UL > #define MAX_QE_RISC 1 > #define QE_NUM_OF_SNUM 28 > @@ -166,7 +166,7 @@ > #define CFG_SYS_PME_CLK CFG_PME_PLAT_CLK_DIV > #define CFG_SYS_FM1_CLK 0 > #define CFG_SYS_FM_MURAM_SIZE 0x28000 > -#define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE > +#define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE 0 > =20 > =20 > #elif defined(CONFIG_ARCH_C29X) > diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c > index d5066666698..ecb9c3b30c9 100644 > --- a/drivers/mmc/fsl_esdhc.c > +++ b/drivers/mmc/fsl_esdhc.c > @@ -34,6 +34,10 @@ > =20 > DECLARE_GLOBAL_DATA_PTR; > =20 > +#ifndef ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE > +#define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE 0 > +#endif > + > struct fsl_esdhc { > uint dsaddr; /* SDMA system address register */ > uint blkattr; /* Block attributes register */ > @@ -325,7 +329,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *pr= iv, struct mmc *mmc, > (timeout =3D=3D 4 || timeout =3D=3D 8 || timeout =3D=3D 12)) > timeout++; > =20 > - if (IS_ENABLED(ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE)) > + if (ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE) > timeout =3D 0xE; > =20 > esdhc_clrsetbits32(®s->sysctl, SYSCTL_TIMEOUT_MASK, timeout << 16); > diff --git a/drivers/mmc/fsl_esdhc_imx.c b/drivers/mmc/fsl_esdhc_imx.c > index 66caf683f74..9d9ffd0990a 100644 > --- a/drivers/mmc/fsl_esdhc_imx.c > +++ b/drivers/mmc/fsl_esdhc_imx.c > @@ -43,6 +43,8 @@ > #ifndef ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE > #ifdef CONFIG_FSL_USDHC > #define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE 1 > +#else > +#define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE 0 > #endif > #endif > =20 > @@ -375,7 +377,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *pr= iv, struct mmc *mmc, > (timeout =3D=3D 4 || timeout =3D=3D 8 || timeout =3D=3D 12)) > timeout++; > =20 > - if (IS_ENABLED(ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE)) > + if (ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE) > timeout =3D 0xE; > =20 > esdhc_clrsetbits32(®s->sysctl, SYSCTL_TIMEOUT_MASK, timeout << 16); Looking at commit 52faec31827e ("mmc: fsl_esdhc: replace most #ifdefs by IS_ENABLED()") this is going backwards. The original logic was to define ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE to set timeout to 0xE as "ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE" is a boolean, not a value-holder. --=20 Tom --tXcEht/k97Swhqel Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmQBCkYACgkQFHw5/5Y0 tyzBTQv9FhXGJzWw58XqZxzTjIgZKOcog/a8bdFUzLs0d8PazCUK6VxPMBUlN2aO vG6tU+py08HjoIjXURcfREpLdjWiMREKEfMkwiUISyvltli9IZc6KRZyoXPC9B0K FSekPO0esbfX6kwzfUExDW2q2/Eb2jrAmnVQ4IFqjD+pO5LYqdzcij51n5YlM9K1 g1Srp0vnu6C914egI6eX6kyw8a/Xa2Ya6eZR5FuejN0mmOSvoAFeC388lDVOHMAU ZRUELCejffQ07b1gGf5qxY5HHu5deFpBxjOZNyXqA8YaXbkOV853Oj9uTjZ58TVz ZqBONqdpgjQu9Af0ElnAWicG7NCZXsIVq3xIzgVKZXi05wB5Omec6GPVdrQ+cvn2 UHy79KR5rI09shM0Iy6jNdfhfKsOJl9HEPzMuuHodLPZ1pXzYbgkMYDq5ElB0syv uSHn1nzBOH+uUb7Dq0x/CtgXtgZJ13B/9Awwi39Nd9wRxpZpddbU8RigK0uuSxBa x0ECfb0W =M0CF -----END PGP SIGNATURE----- --tXcEht/k97Swhqel--