From patchwork Fri Sep 1 09:42:05 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: 719506 Delivered-To: patch@linaro.org Received: by 2002:adf:d08b:0:b0:31d:da82:a3b4 with SMTP id y11csp141902wrh; Fri, 1 Sep 2023 02:45:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHk/SFuGjHuZVANDTK1ruOdQ1LoDJ/XGmVsn6vuA0Dz9AYDLQ3gYRWtkDVTjravwqihtWtb X-Received: by 2002:ac8:7f0c:0:b0:3ff:c677:a033 with SMTP id f12-20020ac87f0c000000b003ffc677a033mr2042499qtk.29.1693561540231; Fri, 01 Sep 2023 02:45:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693561540; cv=none; d=google.com; s=arc-20160816; b=zYTsyRq35KxoTXSMdhZQ2BAv4cv/Yyvpt974rOUKpy7USdBFYWlfSYCfRh9QCu2kbt 6agSELGoobQL2cgHOJ6mDf4cO8v8BWD/HojtI0K8iQ+KnDAda8kGCgf9RtmR73HaTQ5s qJ/51apzqxHG3U8tUlvGjR2rZ6MFhYplQPxSSYpteobQH5nnEbhVp/+fzLfyg+hQI2nq M8URE5G109I6IDCsS3+h5vYYCQL9b8ceDwiT3Pg5uUs7vjtvci+XW198N7JIwXVMJDqZ Z6Tlq30XN7OEtQ7kvb5EgWTyLOHbZLWYNS4v5DjXMdAwERrdzZRTz+Vx/piZOK5coD7+ Ks5Q== 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=sAFxsovMRUpeK1m2ZrUTkWk2zuchzNgVidyR5jMbIm8=; b=m8wAP4tKq2/n3nPPDAkCHUIaLm0TZa0/iS2CMeIFGa1tLY05th0dva8MpzngQt/eOP fIja/7SX3SEIusnihRkwgBdywSQ7N0pCd/M61RupDyqIRQ+ftITBvYcL082JludLGjgm 2PRmPzmtU27IOyf9W81yGpnAWNEnnaGgEdZ13J4ASTrZJpgbndhXB+tadCLFU7iTerse zVJ1tkqJpkaQg0yUYCqDlLMh+iOxEGOhJfmLKTNMOerPPl/kagrYoUmT1fgVpE1BobBp fARCrRj22xCnbInFG+BSlph/r4KT4s7MYKuvzToZkmtUzYYuf3WsA6AoJhwVBPYaTg8w LcGg== 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 j8-20020ac85c48000000b0040f2b1cde26si1938388qtj.590.2023.09.01.02.45.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Sep 2023 02:45:40 -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 1qc0gG-0002K6-SZ; Fri, 01 Sep 2023 05:43:08 -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 1qc0gB-00025F-QG; Fri, 01 Sep 2023 05:43:04 -0400 Received: from mail.ozlabs.org ([2404:9400:2221:ea00::3] helo=gandalf.ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qc0g9-00032X-0J; Fri, 01 Sep 2023 05:43:03 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4RcY440NVqz4wy9; Fri, 1 Sep 2023 19:43:00 +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 4RcY4221q3z4x2D; Fri, 1 Sep 2023 19:42:58 +1000 (AEST) From: =?utf-8?q?C=C3=A9dric_Le_Goater?= To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Bin Meng , =?utf-8?q?C=C3=A9dric_Le_Goater?= Subject: [PULL 17/26] hw/sd: Introduce sd_cmd_handler type Date: Fri, 1 Sep 2023 11:42:05 +0200 Message-ID: <20230901094214.296918-18-clg@kaod.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230901094214.296918-1-clg@kaod.org> References: <20230901094214.296918-1-clg@kaod.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2404:9400:2221:ea00::3; envelope-from=SRS0=SnXb=ER=kaod.org=clg@ozlabs.org; helo=gandalf.ozlabs.org X-Spam_score_int: -39 X-Spam_score: -4.0 X-Spam_bar: ---- X-Spam_report: (-4.0 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-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 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) {