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 3918EC04A95 for ; Sun, 25 Sep 2022 15:06:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5577F84C66; Sun, 25 Sep 2022 17:03:58 +0200 (CEST) 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="dBP18kqh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4F82784B5D; Sun, 25 Sep 2022 17:03:36 +0200 (CEST) Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) (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 B38AB84AF7 for ; Sun, 25 Sep 2022 17:03:29 +0200 (CEST) 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-xd33.google.com with SMTP id v128so3405553ioe.12 for ; Sun, 25 Sep 2022 08:03:29 -0700 (PDT) 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; bh=ba4fwsZYmbZSBkqEK8bdRDVTvm28tx4HCrOvgUqZVuU=; b=dBP18kqh0SMCMjEqIZy/iW1H8NdFqzbtRn+mfCufQTawvORv9GTBV7X4fDb0D+gVkH 2DUxfKxZVw3aF4sYoalWsKyKQsN2QrNWd1dNDsgdPmIYKkZX/yE+m46VGGHpuccLaqmM e6lHnRlRYmonAlxTTCcqKJEhsmEV2wbstRcV0= 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; bh=ba4fwsZYmbZSBkqEK8bdRDVTvm28tx4HCrOvgUqZVuU=; b=mFdCDLeXCgTEMuhGQK1jThdUE9t92xG32X5bNWTt++nYir2uox5T5Ub4uPp0p+5F+C 84AM6zdTILGZ0ZkObkn/rmrx2ik9AT2NY0Cb8BOrJZmwEQZguHAevc5zjdqV/VzIZFVC mtxFFrtWfMuFPvk8+PFXNpmnNqAjcUM15JVhJcnCOJWNziZvqKnbCJXjbpwWLNhaSAy3 9mYi4ny/CPr3jgSH3jV8lYPBqobIfnga1iaMPbkwZDZJhupAy92pWy75LrJeZWk0KvoZ Dek0DkCkc79i4uMIU1HQs9IHdd0gma5R74IzzyJlWLj9sHXaF7JVx//+SymTB43Hk2GR 5blw== X-Gm-Message-State: ACrzQf1GAY1fDn3wRgbibB3JQtWVFsCbRtUzpgv5I26Oxs0DYLN4tNJq eAN9qE/xe+0DRNhwY3nhxXgnB0GUy4Te7w== X-Google-Smtp-Source: AMsMyM7uAxLVvxo/1iOEqje8796Rnnvwm8LFLEJRToDwYyxkeDlVCe4akV1/EdTcRV3rt7KlbW01Gw== X-Received: by 2002:a6b:6913:0:b0:6a0:eeaa:8d2d with SMTP id e19-20020a6b6913000000b006a0eeaa8d2dmr7582636ioc.92.1664118207813; Sun, 25 Sep 2022 08:03:27 -0700 (PDT) Received: from sjg1.roam.corp.google.com (c-67-190-102-125.hsd1.co.comcast.net. [67.190.102.125]) by smtp.gmail.com with ESMTPSA id u19-20020a926013000000b002f19d9838c6sm5360578ilb.25.2022.09.25.08.03.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Sep 2022 08:03:27 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Jaehoon Chung , Marek Vasut , Pavel Herrmann , Peng Fan Subject: [PATCH 17/45] dm: mmc: Allow sandbox emulator to build without writes Date: Sun, 25 Sep 2022 09:02:20 -0600 Message-Id: <20220925150248.2524421-18-sjg@chromium.org> X-Mailer: git-send-email 2.37.3.998.g577e59143f-goog In-Reply-To: <20220925150248.2524421-1-sjg@chromium.org> References: <20220925150248.2524421-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 When MMC_WRITE is disabled this driver produced a build error. Fix this. Also update a comment while we are here. Signed-off-by: Simon Glass --- drivers/mmc/sandbox_mmc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/sandbox_mmc.c b/drivers/mmc/sandbox_mmc.c index 451fe4a4e5a..ba79a5565c3 100644 --- a/drivers/mmc/sandbox_mmc.c +++ b/drivers/mmc/sandbox_mmc.c @@ -23,6 +23,8 @@ struct sandbox_mmc_plat { #define MMC_CMULT 8 /* 8 because the card is high-capacity */ #define MMC_BL_LEN_SHIFT 10 #define MMC_BL_LEN BIT(MMC_BL_LEN_SHIFT) + +/* Granularity of priv->csize - this is 1MB */ #define SIZE_MULTIPLE ((1 << (MMC_CMULT + 2)) * MMC_BL_LEN) struct sandbox_mmc_priv { @@ -41,7 +43,6 @@ static int sandbox_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, struct mmc_data *data) { struct sandbox_mmc_priv *priv = dev_get_priv(dev); - struct mmc *mmc = mmc_get_mmc_dev(dev); static ulong erase_start, erase_end; switch (cmd->cmdidx) { @@ -95,10 +96,15 @@ static int sandbox_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, case SD_CMD_ERASE_WR_BLK_END: erase_end = cmd->cmdarg; break; - case MMC_CMD_ERASE: +#if CONFIG_IS_ENABLED(MMC_WRITE) + case MMC_CMD_ERASE: { + struct mmc *mmc = mmc_get_mmc_dev(dev); + memset(&priv->buf[erase_start * mmc->write_bl_len], '\0', (erase_end - erase_start + 1) * mmc->write_bl_len); break; + } +#endif case SD_CMD_APP_SEND_OP_COND: cmd->response[0] = OCR_BUSY | OCR_HCS; cmd->response[1] = 0; -- 2.37.3.998.g577e59143f-goog