From patchwork Mon Jul 3 13:24:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 698674 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp1750335wrs; Mon, 3 Jul 2023 06:28:09 -0700 (PDT) X-Google-Smtp-Source: APBJJlHnUqI21OzGLOm3f72AynmCzzy2O04WjxXeBTE0OgZhwk4BCY3lNc0tMoA/pydS8O/z8oY+ X-Received: by 2002:a05:6214:29c5:b0:632:5fb:5642 with SMTP id gh5-20020a05621429c500b0063205fb5642mr12265511qvb.12.1688390889543; Mon, 03 Jul 2023 06:28:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688390889; cv=none; d=google.com; s=arc-20160816; b=gX6sAggJc5RId76r6bHzyVCHcx/uFv94UzqCZphIkTfFJ0l1XUZAH4T71txuUFdJWd SjHtPyEue6KY35ZmeCz6Y5l8ypmoqahHJsj7C2fUema5l1/WVtJnnoVhaLzLvsEq0qoq F63i838bn2q04tFRfyhU7Z932A1YLkow00Puv2/CTsYCgg6Gtft2ryX4HfsXmahpO2oa CcND98O3lnwTP8iR9vUDQxML3iUUG2SWzNf7ksQj6erlGAcRTlCX5dNuiQA+3NH1HHIQ 2H5fx6Zl07Fb488OqHnZj7Vl3t7g0lTzajcmQziV6a8M2BWH0Y8FnVZ2ZaqWZuJhwWHa cJtA== 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; bh=MeJFAgG4cWqAaKn+PJeZ1uhoAB5/zbA2L09zHFX4XaY=; fh=r4syDaV3G3LiWeo8FbYKgqn+w8cwBFTOjL41cVc53DU=; b=UhHmUz7VTsUGv6o4P0YvFql+FGLslpQ2DrsLaY+HKY6coZMi04jdAkjwhE9J3TnAu6 UHtq8Me205JgGoEZJSd6RX2ErBnloRzbALWkao2Eh2WpSQmz9hdSQGW9OS6hBhdzRiSa 5MuE94bRKrpqn1VoLsSjgKvUqaGulrsuYUMDTuDth+2vNpzmZsMEONytkGGmxdHAVMtd PHdvZDB5+QhKnotNGUc6r53y0Zi4xpLF5bEJoOtxhyKa1yffvBB45YvxbtudncOnz38F 7FXCzod9aAim5TGWqzcCQZr2zEg3Qsj6/Er8Bj4TpN0l4FQ/+6REffGFzzFgm8CYZRbD uZng== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id gh6-20020a05621429c600b0062dddf078cdsi2804373qvb.48.2023.07.03.06.28.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jul 2023 06:28:09 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qGJYd-0008Pt-Qm; Mon, 03 Jul 2023 09:25:35 -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 1qGJYb-0008Pj-3M for qemu-devel@nongnu.org; Mon, 03 Jul 2023 09:25:33 -0400 Received: from gandalf.ozlabs.org ([150.107.74.76]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qGJYZ-0000je-Dx for qemu-devel@nongnu.org; Mon, 03 Jul 2023 09:25:32 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4QvmrT31gzz4wxp; Mon, 3 Jul 2023 23:25:29 +1000 (AEST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4QvmrQ51bWz4wb1; Mon, 3 Jul 2023 23:25:26 +1000 (AEST) From: =?utf-8?q?C=C3=A9dric_Le_Goater?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Bin Meng , Peter Maydell , Lucien Murray-Pitts , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Bin Meng , =?utf-8?q?C=C3=A9dric_Le_Goater?= Subject: [PATCH 04/32] hw/sd: Introduce sd_cmd_handler type Date: Mon, 3 Jul 2023 15:24:41 +0200 Message-ID: <20230703132509.2474225-5-clg@kaod.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230703132509.2474225-1-clg@kaod.org> References: <20230703132509.2474225-1-clg@kaod.org> MIME-Version: 1.0 Received-SPF: pass client-ip=150.107.74.76; envelope-from=SRS0=mKPa=CV=kaod.org=clg@ozlabs.org; helo=gandalf.ozlabs.org X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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 From: Philippe Mathieu-Daudé 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é Reviewed-by: Bin Meng Message-Id: <20210624142209.1193073-5-f4bug@amsat.org> Signed-off-by: Cédric Le Goater --- hw/sd/sd.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index f6aa3b0a80bf..889c44a5c07c 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -87,8 +87,12 @@ enum SDCardStates { sd_disconnect_state, }; +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; struct SDState { @@ -1031,6 +1035,10 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) return sd_illegal; } + if (sd_proto(sd)->cmd[req.cmd]) { + return sd_proto(sd)->cmd[req.cmd](sd, req); + } + switch (req.cmd) { /* Basic commands (Class 0 and Class 1) */ case 0: /* CMD0: GO_IDLE_STATE */ @@ -1575,6 +1583,11 @@ static sd_rsp_type_t sd_app_command(SDState *sd, trace_sdcard_app_command(sd_proto(sd)->name, sd_acmd_name(req.cmd), req.cmd, req.arg, sd_state_name(sd->state)); sd->card_status |= APP_CMD; + + if (sd_proto(sd)->acmd[req.cmd]) { + return sd_proto(sd)->acmd[req.cmd](sd, req); + } + switch (req.cmd) { case 6: /* ACMD6: SET_BUS_WIDTH */ if (sd->spi) {