From patchwork Tue Jul 2 09:20:17 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: 809083 Delivered-To: patch@linaro.org Received: by 2002:adf:a199:0:b0:367:895a:4699 with SMTP id u25csp117964wru; Tue, 2 Jul 2024 02:28:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX3CIwF6CXwshJSLSkInQXDb8BNxbylq71bGEjadJhdC2AFjRftRF7e4sP+2hB9787T/QALE7o1zbaycJCz+jdq X-Google-Smtp-Source: AGHT+IEGZANKzvxh0PcRYiyuY3f++CnddfVUcGbmLPLt7fS9gn4Y2aO74v75mkB53zQo9/mKIIt0 X-Received: by 2002:a05:6214:1c42:b0:6b4:4585:8e43 with SMTP id 6a1803df08f44-6b5b70cab6dmr128957976d6.31.1719912481936; Tue, 02 Jul 2024 02:28:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719912481; cv=none; d=google.com; s=arc-20160816; b=R3GQ/Hlldz/xtaP0GRn45IH9/i700e+/b7ZlabVrZqmHzQYUr5bepB5x054Klby+dS zen0KCtMkXxAU1aewYCkoqJhyKBI2lYr0GIcTPzrXLKUA616/301amK9canYNcwf5BnX 8w9TcaTyAdignI70n4geVNQbKu2M912VVpp5LNMKhScsXz9vvW/WRpADMZckCoAa+BAT i0qst4rx53I4smH/eoOUMpDVNj8QyZoHVKbhBA7fhhydYoJTu/QGF0uS3jR2sMuF8bpy RfLAGoDyZvaodVka463p57y/IMQTbL1QR3s15zc1yCHfnuwQbqFThJukQ+oz6neuR8ss 9jSw== 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=jPA9R4YCYQBkQZ2o9Ln39vUoRWjzfB1ZKjrmxeGewtg=; fh=/TyiCVzPJVYkT4NtrOYZRXAcrkaiLXA/rwqp4QqIc5M=; b=L4AXhQAA9FLdlvj27IQi1QMULvEEoKL6kQAcaLZOteLxlIDPDl8sxS8291XBJkKFoA DupvO6aoyoEN3Ng9Rd38FuF+B6MqTpSHsZofYv0HNCqmGk9b1ilPAlj18X71bv+rs/Tb vf3ULYnoHP3Gb+40/TbQUc3pBs4WzFZVZKb8+cQC86+EkB28b39l17HS5DazXdObL25E eLD8T4rYelqrQ08sUc7LwSToZ2TTaqaHBq1KH3mrk8Y2oUc60AL6rCdFitTwvYI9a+cn KY1dNtsormTTj1Ae2OcRF8klB2AG4lIwwLLrwT/Fsv3w5TZn+2qm45q1Tn8EXQYJlJzK qwqA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lDGu8B3Y; 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 6a1803df08f44-6b59e62541fsi102521746d6.602.2024.07.02.02.28.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Jul 2024 02:28:01 -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=lDGu8B3Y; 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 1sOZkY-0003eT-D3; Tue, 02 Jul 2024 05:24:34 -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 1sOZkS-0003Nk-8v for qemu-devel@nongnu.org; Tue, 02 Jul 2024 05:24:28 -0400 Received: from mail-lj1-x22e.google.com ([2a00:1450:4864:20::22e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sOZkI-00005H-W4 for qemu-devel@nongnu.org; Tue, 02 Jul 2024 05:24:28 -0400 Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2ee7885aa5fso3014801fa.1 for ; Tue, 02 Jul 2024 02:24:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1719912256; x=1720517056; 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=jPA9R4YCYQBkQZ2o9Ln39vUoRWjzfB1ZKjrmxeGewtg=; b=lDGu8B3YsG28PtcnU2QFl9n3tiCjVfKzwAkQqw18cUZjpagppqC4CqigLXRKG85R8o FuAa2ZlNndE7mzSkj5YgykezlQ7+cUI9xQb9bsiymmZFWg7usIiAttvt9P9XWDJfURl3 81XNVgF2hdUg66RBW8mPPfLm9Z/OnGT/BcjlPQUzOw+zD0gavq/0vI/VRKIsCbZooehK tjFapT48ldXWSjFliIryQ5K5YA4IsmkAk0u8Ia5PDrKLCx6+scMQxHr20AOj50Ma8efn nBOUJ3n+3AasMX4n5P5j1sMq8y2NmoSuOmHX1+mS63T2FhY7vQWXJdywSyywFks05rXA w+kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719912256; x=1720517056; 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=jPA9R4YCYQBkQZ2o9Ln39vUoRWjzfB1ZKjrmxeGewtg=; b=P3DUPDXUSuV7vCwsxcxjPBvy6AtguQ8TglTm3FL5IROEtoTVqkE/cpqg5jW7MhFXBw 7heJ95qTOAgfPY5RTWqjI17e1AKPns/Zdcx0JbjILQBY05ikg+nJH0bMkOKcrq3/Lf03 potG6jjeq+n2n95NPewh/u+uvyRNbWSNbkPpEa/b3xxTKMtfdfL8hYt9snfHvfqS6tVD NE409n2LGoqrB4sAX0YpbFWYQW7pLFemOBq4UNcZ/hXhMJA8VUAnMniTMw4acpyYx/Ev Qo93qPw4cEXfsNRuCMay7Orjduuyg9n3fCNDqoL7+DzKRlJuZD9l+54pWYIZ7JLQyAyK peLA== X-Gm-Message-State: AOJu0YyEys06OcOj47f06G8Nz+3W6NMJ3BcgAhlPlDvygDYGo7zoMek7 Jl+UXaU3FtWCjoVNOkPaoPaCoTya71/PjN8iEjVDdjXKEf8D5+ucZPlgXvUgXSNVMHQGJFvs3Cm Y X-Received: by 2002:a2e:2407:0:b0:2ec:839c:938e with SMTP id 38308e7fff4ca-2ee5e6d746bmr49607001fa.45.1719912255749; Tue, 02 Jul 2024 02:24:15 -0700 (PDT) Received: from m1x-phil.lan ([176.187.209.58]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4256af389b3sm192408485e9.1.2024.07.02.02.24.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Jul 2024 02:24:15 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?C?= =?utf-8?q?=C3=A9dric_Le_Goater?= Subject: [PULL 34/67] hw/sd/sdcard: Store command type in SDProto Date: Tue, 2 Jul 2024 11:20:17 +0200 Message-ID: <20240702092051.45754-35-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240702092051.45754-1-philmd@linaro.org> References: <20240702092051.45754-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22e; envelope-from=philmd@linaro.org; helo=mail-lj1-x22e.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 Store the command type altogether with the command handler and name. Signed-off-by: Philippe Mathieu-Daudé Tested-by: Cédric Le Goater Reviewed-by: Cédric Le Goater Message-Id: <20240628070216.92609-41-philmd@linaro.org> --- include/hw/sd/sd.h | 5 +++-- hw/sd/sd.c | 44 ++++++++++++++++++++------------------------ 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h index 2c8748fb9b..29c76935a0 100644 --- a/include/hw/sd/sd.h +++ b/include/hw/sd/sd.h @@ -76,8 +76,9 @@ typedef enum { } sd_uhs_mode_t; typedef enum { - sd_none = -1, - sd_bc = 0, /* broadcast -- no response */ + sd_none = 0, + sd_spi, + sd_bc, /* broadcast -- no response */ sd_bcr, /* broadcast with response */ sd_ac, /* addressed -- no data transfer */ sd_adtc, /* addressed with data transfer */ diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 2cfba6ff60..9f257906b5 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -94,6 +94,7 @@ typedef sd_rsp_type_t (*sd_cmd_handler)(SDState *sd, SDRequest req); typedef struct SDProto { const char *name; struct { + const sd_cmd_type_t type; const char *name; sd_cmd_handler handler; } cmd[SDMMC_CMD_MAX], acmd[SDMMC_CMD_MAX]; @@ -348,20 +349,6 @@ static void sd_set_mode(SDState *sd) } } -static const sd_cmd_type_t sd_cmd_type[SDMMC_CMD_MAX] = { - sd_bc, sd_none, sd_bcr, sd_bcr, sd_none, sd_none, sd_none, sd_ac, - sd_bcr, sd_ac, sd_ac, sd_adtc, sd_ac, sd_ac, sd_none, sd_ac, - /* 16 */ - sd_ac, sd_adtc, sd_adtc, sd_none, sd_none, sd_none, sd_none, sd_none, - sd_adtc, sd_adtc, sd_adtc, sd_adtc, sd_ac, sd_ac, sd_adtc, sd_none, - /* 32 */ - sd_ac, sd_ac, sd_none, sd_none, sd_none, sd_none, sd_ac, sd_none, - sd_none, sd_none, sd_bc, sd_none, sd_none, sd_none, sd_none, sd_none, - /* 48 */ - sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_ac, - sd_adtc, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, sd_none, -}; - static const int sd_cmd_class[SDMMC_CMD_MAX] = { 0, 0, 0, 0, 0, 9, 10, 0, 0, 0, 0, 1, 0, 0, 0, 0, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 6, 6, 6, 6, @@ -567,10 +554,19 @@ static void sd_set_rca(SDState *sd) static uint16_t sd_req_get_rca(SDState *s, SDRequest req) { - if (sd_cmd_type[req.cmd] == sd_ac || sd_cmd_type[req.cmd] == sd_adtc) { + switch (s->proto->cmd[req.cmd].type) { + case sd_none: + /* Called from legacy code not ported to SDProto array */ + assert(!s->proto->cmd[req.cmd].handler); + /* fall-through */ + case sd_ac: + case sd_adtc: return req.arg >> 16; + case sd_spi: + g_assert_not_reached(); + default: + return 0; } - return 0; } /* Card Status register */ @@ -2279,22 +2275,22 @@ void sd_enable(SDState *sd, bool enable) static const SDProto sd_proto_spi = { .name = "SPI", .cmd = { - [0] = { "GO_IDLE_STATE", sd_cmd_GO_IDLE_STATE}, - [1] = { "SEND_OP_COND", spi_cmd_SEND_OP_COND}, + [0] = { sd_spi, "GO_IDLE_STATE", sd_cmd_GO_IDLE_STATE}, + [1] = { sd_spi, "SEND_OP_COND", spi_cmd_SEND_OP_COND}, }, .acmd = { - [41] = { "SEND_OP_COND", spi_cmd_SEND_OP_COND}, + [41] = { sd_spi, "SEND_OP_COND", spi_cmd_SEND_OP_COND}, }, }; static const SDProto sd_proto_sd = { .name = "SD", .cmd = { - [0] = { "GO_IDLE_STATE", sd_cmd_GO_IDLE_STATE}, - [2] = { "ALL_SEND_CID", sd_cmd_ALL_SEND_CID}, - [3] = { "SEND_RELATIVE_ADDR", sd_cmd_SEND_RELATIVE_ADDR}, - [19] = { "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK}, - [23] = { "SET_BLOCK_COUNT", sd_cmd_SET_BLOCK_COUNT}, + [0] = { sd_bc, "GO_IDLE_STATE", sd_cmd_GO_IDLE_STATE}, + [2] = { sd_bcr, "ALL_SEND_CID", sd_cmd_ALL_SEND_CID}, + [3] = { sd_bcr, "SEND_RELATIVE_ADDR", sd_cmd_SEND_RELATIVE_ADDR}, + [19] = { sd_adtc, "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK}, + [23] = { sd_ac, "SET_BLOCK_COUNT", sd_cmd_SET_BLOCK_COUNT}, }, };