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 23391C636D6 for ; Wed, 22 Feb 2023 16:49:50 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BC4F985B83; Wed, 22 Feb 2023 17:45:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="PlwyB8C0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 21B8685B2A; Wed, 22 Feb 2023 17:36:09 +0100 (CET) Received: from mail-io1-xd2e.google.com (mail-io1-xd2e.google.com [IPv6:2607:f8b0:4864:20::d2e]) (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 C412385B2C for ; Wed, 22 Feb 2023 17:35:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd2e.google.com with SMTP id 76so3753343iou.9 for ; Wed, 22 Feb 2023 08:35:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1dQ3hd1p4I2oQLhkEFfncjq5iX+D2EsoeetIJ/tF9G4=; b=PlwyB8C0EeB05bE09yJzJhVQp2h+AnNQELnz7fkOLTV7sDmrQSMWOSJd2ItUFixm4n hm6hGC0YIn4EiIFA/c0Ipyppm9V+IYXgvgDAJygmotH3pUqbX2TgAOZMdYP40zmr/6d4 cxoeuDAywXKPnLKqsNMBzCa/G6NImSYXMtwaU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1dQ3hd1p4I2oQLhkEFfncjq5iX+D2EsoeetIJ/tF9G4=; b=EFJm7sWza5306JBcDUP5fMQJjSYhAVzMRlzJsndJYbs4Lh/JSg9SzNQAPCf9tOZN1A dGSOT5wLjNbA8MB8VpEljKNnDr+G4TUVcqO3SlkSB2kXo5vzV8PGpmJGctH7PoCYH1/T xJ5RGGXZGAxoe7nK82u5HpAUbP7bRXqBLpG6TOSqJ0PTt83pwSmrfHXU7lO8k9uPatFD dnS1w7QWONKFvN2TJY2Qa9bml+oUkE3M4G9VVz98vb9y9NrSto2DpKknK0SQZM83IiOe V2tqw20G2/XhGhZxF3ofHGC9vCOXoWPs/sAzPC1mNYztEn6PM6LBvaYQhbE2p1gRai2w zfLQ== X-Gm-Message-State: AO0yUKWrGciUYdlLkNiBKNgi4mYLZnRQhhAa/ls39p5HKzxAXmQPMtPS 4kh81kRlRpARLd/I1XhGRXzWzaxB5OhSeoPN X-Google-Smtp-Source: AK7set8KY7dFaj77oBAS+PFEtqTF7fj29wvKX/vSyq36vyPL8cGtIshUdnukjXqsry15FjcweIB4zg== X-Received: by 2002:a5e:c24d:0:b0:74c:8dc7:aa1 with SMTP id w13-20020a5ec24d000000b0074c8dc70aa1mr2783303iop.17.1677083714181; Wed, 22 Feb 2023 08:35:14 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id z26-20020a056602005a00b00716eb44b97esm2164541ioz.27.2023.02.22.08.35.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 08:35:13 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jaehoon Chung , Peng Fan , Wolfgang Denk Subject: [PATCH v5 38/44] freescale: Fix odd use of ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE Date: Wed, 22 Feb 2023 09:34:19 -0700 Message-Id: <20230222163425.2043934-39-sjg@chromium.org> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog In-Reply-To: <20230222163425.2043934-1-sjg@chromium.org> References: <20230222163425.2043934-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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. Just check it normally. 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. This fixes a build error with split config on T2080QDS. Note: This should be handled in the devicetree. Signed-off-by: Simon Glass --- No size changes on affected boards: 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_tfa arm: w+ am57xx_hs_evm_usb powerpc: w+ P2041RDB P2041RDB_NAND P2041RDB_SDCARD P2041RDB_SPIFLASH T1024RDB T1024RDB_NAND T1024RDB_SDCARD T1024RDB_SPIFLASH T1042D4RDB T1042D4RDB_NAND T1042D4RDB_SDCARD T1042D4RDB_SPIFLASH T2080QDS T2080QDS_NAND T2080QDS_SDCARD T2080QDS_SECURE_BOOT T2080QDS_SPIFLASH T2080QDS_SRIO_PCIE_BOOT T2080RDB T2080RDB_NAND T2080RDB_revD T2080RDB_revD_NAND T2080RDB_revD_SDCARD T2080RDB_revD_SPIFLASH T2080RDB_SDCARD T2080RDB_SPIFLASH kmcent2 Changes in v5: - Change approach and expand notes after more investigation 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(-) diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/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 #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 @@ DECLARE_GLOBAL_DATA_PTR; +#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 *priv, struct mmc *mmc, (timeout == 4 || timeout == 8 || timeout == 12)) timeout++; - if (IS_ENABLED(ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE)) + if (ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE) timeout = 0xE; 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 @@ -375,7 +377,7 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc, (timeout == 4 || timeout == 8 || timeout == 12)) timeout++; - if (IS_ENABLED(ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE)) + if (ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE) timeout = 0xE; esdhc_clrsetbits32(®s->sysctl, SYSCTL_TIMEOUT_MASK, timeout << 16); -- 2.39.2.637.g21b0678d19-goog