From patchwork Thu Jun 27 16:33:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 807837 Delivered-To: patch@linaro.org Received: by 2002:adf:e842:0:b0:362:4979:7f74 with SMTP id d2csp894354wrn; Thu, 27 Jun 2024 09:34:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUXbUi6yh5/TJman//boDVpteccgmzzAsU4A169CXB3rKKltpBiw4C0t9c945E1XEJ/io2xLK5Qnbmgr3pQSQRt X-Google-Smtp-Source: AGHT+IG3wLA9iCNGjj82vr3OOb3FskMl5fUREQY4hNQMYLttrk0p/ZGoj0ziCtRteSfT4rfN+ntV X-Received: by 2002:a05:6122:2524:b0:4ef:4fc8:ab6d with SMTP id 71dfb90a1353d-4ef6d80a590mr13331076e0c.6.1719506094478; Thu, 27 Jun 2024 09:34:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719506094; cv=none; d=google.com; s=arc-20160816; b=cl0hUOV9BVqakDgT/tYM2F23NYytELbukJkAJnzB2JbI//O2uEw3iIhBVtgF+2TCp0 6kFNr1aFRIFA3wBDTN63MggRo9JREDQC2Y4OpZc+AhILnTe1g6SNAmdxtHnDCA/dvPbH MhYaC+jcPlPh+ggwOQ/VuhgBEiL7ecFjcsbgokM6DONsI8MhDv42EUOvdoCszb6FAn+i JdM7c7/yRSnTOE+tA371shiBh0EgtJB9yaNHV1PJyon3jd9dtKRjlNNJQ0e6phXr3Pxi L80C90h7fMtEqthDfgH5IvxDSWzzdZdGqMSKVuiJl6KDF/5ot41mK2MohBd8KJm6e1RW udXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=dnn8g/1r/IDbgXO0nM+fG6kuhQufIGWzDGBB4WRk/v4=; fh=Nuz+xfBuPB+jr462hD/XUDJnYvP1a+fdu4WocHfEOYk=; b=eoj+5ukZZlFds0i9bOfOFUc+YPngGnUGB0kKNkMWYnGdOphx2W50A3z4SYXgMI9SOZ IzsUukuh9nvnYjWNybZaOwvhUC+mtcaKdWAoc68xDFRBRLaXw+nX4lzQm4kgQJBEyHH0 Wvyyp/DjRHah623zvrxu6Upws9rrrKdebh0wqSQdZqXN6aEsDo/HJbdTnCKEzI/048V2 cV/kobrNDahBQJl9aWB9tn/1pyPr7iyf4QSxhDdGcOClhERHm6CUIXOz2biDR1B4aGF1 wzNEamuGcr5j6iBHPhtxV359y+j+v6durm+VEaUbNqnYf+brBhC2K+0DD2tqb/z+3frT EtqQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DP65HpRM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 71dfb90a1353d-4f29224e5cbsi4558e0c.157.2024.06.27.09.34.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Jun 2024 09:34:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DP65HpRM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMs4o-0001UR-7Y; Thu, 27 Jun 2024 12:34:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMs4m-0001Tb-Af for qemu-devel@nongnu.org; Thu, 27 Jun 2024 12:34:24 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sMs4k-0004Uz-KV for qemu-devel@nongnu.org; Thu, 27 Jun 2024 12:34:24 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3672aec418cso1316020f8f.0 for ; Thu, 27 Jun 2024 09:34:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719506061; x=1720110861; darn=nongnu.org; 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=dnn8g/1r/IDbgXO0nM+fG6kuhQufIGWzDGBB4WRk/v4=; b=DP65HpRMXK9/XazTsYgxsxuuenuEcuZ3a9rYP03uVLZeH8DYhRT0mdHKMOCVOe7Cq5 t5r7H5RCiMlMXRjLsoXiDx7bmdGkBwQFN/nKwU/a8Jr6hDippZpDejunb3B952Asytl4 AbLJxgcm4sUdGUG8NWNvv1rGb5IqG7pxmxZ2gHvtekyXrYPiZgom1McWNRszU9heOrTO lQegG4fVAbvWd4/NyZJ2KpzCPk0IDbuFHk0jMO2jtzgfapC02Ir1NOtkdWuc8Bnt0iZQ k7NV2elyfX1ZCcpArh8jXVYtZuqIV8VQLMmMQKIuBABj2SkAqGi0dnO18s7lExNmHNvf TtEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719506061; x=1720110861; 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=dnn8g/1r/IDbgXO0nM+fG6kuhQufIGWzDGBB4WRk/v4=; b=YCmkGEF+h+8jFoVF/gkV+69sGJewBrGe+07DAT9zHAg5xO9w9u0V/i6RmJG4+gs/9I 2hxhHlyFAzg2NnqHplM848DRfNOahgozATyfKutZoZXvDrqUek4HYMlUero0B9WebCFV 3dwh5unKwJgUoPE7hOBJFzpocG+w6JCcxpigmz0ir2ZvK1xSptxbsmdBKt/LheH2XP+v R0lNVCOID7VCQJ7YuEvHY+NyUaWraVcGbcgNsgUoXQSCwNIzaBYIQ8xejNF5g2bcArYQ wsV2VMsM9zieC84f5+esPg28/kWzcI5QZg4psZTpjl7IzgxJLx4ImMyVeD6sfP3uUgyr NtGQ== X-Gm-Message-State: AOJu0YxsO+1EOeeD2GD+hizZ3y3cjkZGkHZabX0tWs0dLNYEo70Mz7iL ugJ9AeJdiGHktLNaJTky3MEDXZW/Ieu2O+ngWryTwPJda1taHtYQLZT3hdQdRzQ0r+P2fFsgWQp BxdU= X-Received: by 2002:adf:e390:0:b0:367:33b1:e82b with SMTP id ffacd0b85a97d-36733b1e8b7mr2566041f8f.68.1719506060714; Thu, 27 Jun 2024 09:34:20 -0700 (PDT) Received: from localhost.localdomain (33.red-95-127-46.staticip.rima-tde.net. [95.127.46.33]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-367435852fesm2368830f8f.56.2024.06.27.09.34.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 27 Jun 2024 09:34:20 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Sai Pavan Boddu , Luc Michel , Francisco Iglesias , Bin Meng , qemu-block@nongnu.org, =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= , =?utf-8?q?C=C3=A9dric_Le_?= =?utf-8?q?Goater?= , Joel Stanley Subject: [PATCH v2 1/7] hw/sd/sdcard: Introduce sd_cmd_to_receivingdata / sd_generic_write_byte Date: Thu, 27 Jun 2024 18:33:57 +0200 Message-ID: <20240627163403.81220-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240627163403.81220-1-philmd@linaro.org> References: <20240627163403.81220-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org All commands switching from TRANSFER state to (receiving)DATA do the same: receive stream of data from the DAT lines. Instead of duplicating the same code many times, introduce 2 helpers: - sd_cmd_to_receivingdata() on the I/O line setup the data to be received on the data[] buffer, - sd_generic_write_byte() on the DAT lines to push the data. Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sd.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index cd308e9a89..690a3f275e 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1100,6 +1100,22 @@ static sd_rsp_type_t sd_cmd_unimplemented(SDState *sd, SDRequest req) return sd_illegal; } +/* Configure fields for following sd_generic_write_byte() calls */ +__attribute__((unused)) +static sd_rsp_type_t sd_cmd_to_receivingdata(SDState *sd, SDRequest req, + uint64_t start, size_t size) +{ + if (sd->state != sd_transfer_state) { + return sd_invalid_state_for_cmd(sd, req); + } + sd->state = sd_receivingdata_state; + sd->data_start = start; + sd->data_offset = 0; + /* sd->data[] used as receive buffer */ + sd->data_size = size ?: sizeof(sd->data); + return sd_r1; +} + /* Configure fields for following sd_generic_read_byte() calls */ static sd_rsp_type_t sd_cmd_to_sendingdata(SDState *sd, SDRequest req, uint64_t start, @@ -1953,6 +1969,19 @@ send_response: return rsplen; } +/* Return true if buffer is consumed. Configured by sd_cmd_to_receivingdata() */ +__attribute__((unused)) +static bool sd_generic_write_byte(SDState *sd, uint8_t value) +{ + sd->data[sd->data_offset] = value; + + if (++sd->data_offset >= sd->data_size) { + sd->state = sd_transfer_state; + return true; + } + return false; +} + /* Return true when buffer is consumed. Configured by sd_cmd_to_sendingdata() */ static bool sd_generic_read_byte(SDState *sd, uint8_t *value) {