From patchwork Thu Jun 24 14:22:09 2021 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: 12342315 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 426E2C49EA6 for ; Thu, 24 Jun 2021 14:28:51 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0898C613EA for ; Thu, 24 Jun 2021 14:28:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0898C613EA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwQLa-0003Vk-96 for qemu-devel@archiver.kernel.org; Thu, 24 Jun 2021 10:28:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwQG1-0007Cm-Pk; Thu, 24 Jun 2021 10:23:07 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:36508) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwQFz-0000Jo-Ru; Thu, 24 Jun 2021 10:23:05 -0400 Received: by mail-wm1-x32e.google.com with SMTP id m41-20020a05600c3b29b02901dcd3733f24so6377966wms.1; Thu, 24 Jun 2021 07:23:03 -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=odL4aPXo6G2NwNk7zPq0Akb4FqD4x5f/HsxoI2Fk9O4=; b=nwSHVBxvN19K6hEKysa0F/1wEeCA4nNxofX3HG8Hld4rxyJTjGzK0aLJGTmEcfjPqC Bu9lExkcH94jGRqoFuA63qhnUuuE4KfMxL3ypep6aaGIdWUFi8O2aX6rdqFdMXlBmvGo 5oK58JukEhlXvvObg3GrGw5QOPTkA8jcLHDKBpXOO9gDm80mMOd8OUYLE6Zo4pZ7oJnc JZGEETznUgUM8d22gxKSFdfj52iE1hl4TgcAFthqpeC0TLJVmOE+8p1wHYFGVP17eIXk IhNYH9wwttQfrL9XlhBvzJs9/5BnPlIV7q7Q69DpSaAHPaZmW3DDDMU4ErQg9xlZ8OTV 3pRQ== 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=odL4aPXo6G2NwNk7zPq0Akb4FqD4x5f/HsxoI2Fk9O4=; b=S3TSl9TQImZqQi7EaRxjvLWbI8RZiVzCoZm3d/eS3bZk+60dmsn0SprVtTFe3q+6fb ErZfg8dS60zg+tqDksVLHgCGcKxrKJ4n0oAU78d1cAah9zVpkusNWmIhly4dDmIEG5Pv tkbY3ETyotHH069XZXpG7qIxU3zJXGca4kz64Mb2DiEL9ivtIjO5XG51w7hXbhwQSkaw j/FjUxYs4bTHAJqQVx25K17n7q7wa2rtI+N6zmaNGLCQerum/zB86+eVMhM+pEH951v4 3sF0YEf8HGcWtsWywjfal76YvfDJwSVa4zmCcJKfFLJAA0k0DYuUbyFKbn6PN3RmaeFQ ZOvQ== X-Gm-Message-State: AOAM5332xAP+80PREI8N2xO8j5TYX6VT8COvk6oN0d8z/sWJO7cBHShZ ob6lIa79PwA4zRBnnu8Qz/ydlktRKkTkgA== X-Google-Smtp-Source: ABdhPJx5k0R3g7Bl5ZKKkl8eknVsO7NjOreXAuS9lJPJdQA6ayjudyNZbtfx6ajz4XVzxMUidrCF+Q== X-Received: by 2002:a05:600c:a07:: with SMTP id z7mr4509002wmp.83.1624544582166; Thu, 24 Jun 2021 07:23:02 -0700 (PDT) Received: from x1w.. (93.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.93]) by smtp.gmail.com with ESMTPSA id f19sm3287382wre.48.2021.06.24.07.23.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Jun 2021 07:23:01 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 10/10] hw/sd: Add sd_cmd_SEND_RELATIVE_ADDR() handler Date: Thu, 24 Jun 2021 16:22:09 +0200 Message-Id: <20210624142209.1193073-11-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 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, Andrew Jeffery , Bin Meng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?C?= =?utf-8?q?=C3=A9dric_Le_Goater?= , Joel Stanley Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Bin Meng --- hw/sd/sd.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 70dde5ae0b8..43a59b34ee8 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1010,6 +1010,20 @@ static sd_rsp_type_t sd_cmd_ALL_SEND_CID(SDState *sd, SDRequest req) return sd_r2_i; } +static sd_rsp_type_t sd_cmd_SEND_RELATIVE_ADDR(SDState *sd, SDRequest req) +{ + switch (sd->state) { + case sd_identification_state: + case sd_standby_state: + sd->state = sd_standby_state; + sd_set_rca(sd); + return sd_r6; + + default: + return sd_invalid_state_for_cmd(sd, req); + } +} + static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) { uint32_t rca = 0x0000; @@ -1049,19 +1063,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) switch (req.cmd) { /* Basic commands (Class 0 and Class 1) */ - case 3: /* CMD3: SEND_RELATIVE_ADDR */ - switch (sd->state) { - case sd_identification_state: - case sd_standby_state: - sd->state = sd_standby_state; - sd_set_rca(sd); - return sd_r6; - - default: - break; - } - break; - case 4: /* CMD4: SEND_DSR */ switch (sd->state) { case sd_standby_state: @@ -2106,6 +2107,7 @@ static const SDProto sd_proto_sd = { [0] = sd_cmd_GO_IDLE_STATE, [1] = sd_cmd_illegal, [2] = sd_cmd_ALL_SEND_CID, + [3] = sd_cmd_SEND_RELATIVE_ADDR, [5] = sd_cmd_illegal, [52 ... 54] = sd_cmd_illegal, [58] = sd_cmd_illegal,