From nobody Wed Feb 11 06:36:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1624544554; cv=none; d=zohomail.com; s=zohoarc; b=gEjLhuEVfxF8SwLbAIn4hILTducF/R9FBz5jdJPliY6xMuVyDL8gVGbdXKenUIzyewsfKhpCvwPheW2fR4e8r0pSEx+Itd1UScqkw4HR/qtEC0CeF5icRoUdPZCMlSRNHM2rSb/GWjtlLloisoh+nhkoJQ8vrzWjvR2TSV++neE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1624544554; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XdJG7ZIE4+jGMuoiadGQKywOCCIK+dcTPMT2LT+HY3I=; b=ZJ6RQIXQZDu9dG/gvEHQlTr8TcJWzOAxVXIeiv9zOYD+yFF8f85BizTDXjYdJdIw2uoDCDN0vFt+CZNjpt35B4PbXmRiC1T47FoYzEEfAdkuvQr07A4ZgfuJjUt4xrfThcE4FaE3opijtRlcwkUrheGVUX4g1ijyk5I9bQe4tLs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1624544554862510.1243561472302; Thu, 24 Jun 2021 07:22:34 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id g7so2253724wri.7 for ; Thu, 24 Jun 2021 07:22:33 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id x1sm3202870wmc.31.2021.06.24.07.22.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Jun 2021 07:22:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XdJG7ZIE4+jGMuoiadGQKywOCCIK+dcTPMT2LT+HY3I=; b=PizqlPQ8uywdsFLvuXLK0lfJJ0AhVrrqPVbHHlSOtjmPLZ65gg1I/uCKCpquDEPNW3 oMY/LwXYW1+pyGZTssLvgX89mC71Jy2MtJWVCSlrxDnRnp5Dj3YUyfb+Q05fFSUrIIQW Twsyx62T7n43kFtxOtt27yuWNtvFEOcykN+ZL3aJBvK/sCEEE+r7I7DBG2mMR+enKt4E l1+O4mEfXUbLaYITlsGyqbeAxXKPK+PC8WqLrMPodPNdQG7W7U2DKWlNRzyhFsvvvzJR Tw7IxkNRYpF5/vmnZiu9QjZ4KqJsiKbtEFOznfIQQYestBoXHo4yhQzMMm2lztGOBrqR uRFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=XdJG7ZIE4+jGMuoiadGQKywOCCIK+dcTPMT2LT+HY3I=; b=H5B8TFt9706VfD5kq4dkQN+CUki5H2RA0OpQvbVWTVrNnp1RvQQ1okSnQPsEvbCQFu syIt0gSTceRdiI2r6kVJVYRI9OFKE9GS4UWVEmJa/e9gXpR2OxMNbA8bcELGAqJtbzLc E6CZSeFHUOCrV2FHlo9vSUzE+TxdT59XAV7nEb57ZdJSqqwQGpvpwlExyTeQ/b8NhU+c 85TmDXfSRSZCGRc8vodXx39RlEOmY5R/mZv8K6OOPYLaPPgIyuTgYi5EQKBiPkqb9USg bc5v7oVhMB7WLhm5Urp7M1UhoP95xI4GgYzCoTayK087FsUou5FMz3CF5sKntoQRPkVq vHpw== X-Gm-Message-State: AOAM53247ORPY/EGHr5gX/8dhpwe3yRupMgyRpTvj5oAmxN4K4UPczFO oC67VlbqYiNonhf8xyTDR0w= X-Google-Smtp-Source: ABdhPJyyMUx++MFu9Ddwr7bJVCNwpX8iHwKaCj/f4kznu1Yet9eeB2O4NyD8ZWcRk0djvvOUtLek9Q== X-Received: by 2002:a05:6000:1091:: with SMTP id y17mr4907241wrw.100.1624544552345; Thu, 24 Jun 2021 07:22:32 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Jeffery , Bin Meng , Joel Stanley , qemu-block@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [RFC PATCH 04/10] hw/sd: Introduce sd_cmd_handler type Date: Thu, 24 Jun 2021 16:22:03 +0200 Message-Id: <20210624142209.1193073-5-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210624142209.1193073-1-f4bug@amsat.org> References: <20210624142209.1193073-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Add 2 command handler arrays in SDProto, for CMD and ACMD. Have sd_normal_command() / sd_app_command() use these arrays: if an command handler is registered, call it, otherwise fall back to current code base. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Bin Meng --- hw/sd/sd.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index a1cc8ab0be8..ce1eec0374f 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -88,8 +88,12 @@ enum SDCardStates { sd_disconnect_state, }; =20 +typedef sd_rsp_type_t (*sd_cmd_handler)(SDState *sd, SDRequest req); + typedef struct SDProto { const char *name; + sd_cmd_handler cmd[SDMMC_CMD_MAX]; + sd_cmd_handler acmd[SDMMC_CMD_MAX]; } SDProto; =20 struct SDState { @@ -994,6 +998,10 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SD= Request req) return sd_illegal; } =20 + if (sd->proto->cmd[req.cmd]) { + return sd->proto->cmd[req.cmd](sd, req); + } + switch (req.cmd) { /* Basic commands (Class 0 and Class 1) */ case 0: /* CMD0: GO_IDLE_STATE */ @@ -1533,6 +1541,11 @@ static sd_rsp_type_t sd_app_command(SDState *sd, trace_sdcard_app_command(sd->proto->name, sd_acmd_name(req.cmd), req.cmd, req.arg, sd_state_name(sd->state)); sd->card_status |=3D APP_CMD; + + if (sd->proto->acmd[req.cmd]) { + return sd->proto->acmd[req.cmd](sd, req); + } + switch (req.cmd) { case 6: /* ACMD6: SET_BUS_WIDTH */ if (sd->spi) { --=20 2.31.1