From nobody Fri Apr 19 15:07:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593524460; cv=none; d=zohomail.com; s=zohoarc; b=Ux1/bJVASYtI6MHwHB69Lzx3h4ByYtdeLGWzprVJ+vnw9BGPwP72uy9JWtB6rVKWqek/KbGYsTMbeB2RbBmVZNl6rZnK1q1mPVF5w4h4OqEPLaTwSen9l/GTvW9luAB2BCc+N0QLbK6Kd6eAGMLPKU33jtElPLVwQg8Q2YmKrck= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593524460; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZtgcwLm+oPvDM0rBUBUhyO6syjgVWMHkfRFyMuMRFYE=; b=jryvzBlYXeAQCOVu5lNaHXFDD655xAHtjLtoYg8YvnlVxl6wA2qD/95EsXdY2TuuBkO73DX/70ggRFDm631VBnMPNys/NoY/YAHsFZgaV4Rc5mESn+sL3VkteFcC714hQQ90WfkzuDJevG/TyaTRCvYLiZQPGC/EqUAm/W7qnGE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593524460284932.0664409608505; Tue, 30 Jun 2020 06:41:00 -0700 (PDT) Received: from localhost ([::1]:56938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqGVO-0003Bd-Hq for importer@patchew.org; Tue, 30 Jun 2020 09:40:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqGTm-0000x5-KT; Tue, 30 Jun 2020 09:39:18 -0400 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:33743) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqGTl-0006HS-06; Tue, 30 Jun 2020 09:39:18 -0400 Received: by mail-ed1-x544.google.com with SMTP id h28so16264095edz.0; Tue, 30 Jun 2020 06:39:16 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p18sm2099172ejm.55.2020.06.30.06.39.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 06:39:14 -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=ZtgcwLm+oPvDM0rBUBUhyO6syjgVWMHkfRFyMuMRFYE=; b=P/FwrK+1UVNGCeVICJu5/7SglWlkTyCCwmetJThr6hOtcxZyCGEaYK+CQ5Nhtt8bt2 JfOJiJGz/8EnoeDKomGX0OkKPUsIavwI1/78T5SSiudGusdps9FzMdqWvUdV/TA9uzlZ eWY0/bbQOBzQOXHM72O/uO3sp9QtOgiAcYxHbcaW+Q6SC+/YmZL8Giwu5k94gBXqSQ3w RCWxuSroMGAhq0M1QZomcKPdAFPenVszd7B255tArWRmnfph+It7A0GKUP7COABBhzgk s6Wb+aP7iZUDyIAe0tZHKdT2FSsRXSkFYZAraUj9e1GWuKGYMVFUbLfd3tV4F8mylgN2 PidQ== 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=ZtgcwLm+oPvDM0rBUBUhyO6syjgVWMHkfRFyMuMRFYE=; b=eEnhspZtM7O/57DuipXS0WO1V34PWFyGJKEPdLZ7IB/PpcaTBvAxE8FhAIAyXz92iS Ii/jTZWyeSt4UBXw3xnGbejSqx5zn6+gyYYn4QAATzAHfyfpxdyj49ttVUNWumPwijjL 50gHqfHJMQpnhUOXFUeGkoUOtONWLwrWJMcHpLRL7Vq/OxmBH5Bc1sn2PaNIY958sXWE KbUAB5wbVMYBUVhUKnpLsIBV9ACKDPbgj9L2oSSOC0mR8z+0e2glx4rmm6RJum48XK9Y zByuOgEckqX/c0UvennsgZXbWjKZnxzn0Kmd7+E0EbEZtRSOpR7WBWmJhXhQaYkCmFOy EaGQ== X-Gm-Message-State: AOAM533eAH6Iv4uKF+644M64fnPmdHnghPbET+NcYgI4NsOIboMkJyrW f0yR2dHfdVuYOb8hws7sNJ/nTXswFGg= X-Google-Smtp-Source: ABdhPJzf7nvWDJABAhKUKdUHA08GVdth66pupbwNLNgVz4Sn2MmDwna31zvsuGBXSjTOaprlKLHRNA== X-Received: by 2002:a50:d983:: with SMTP id w3mr22391545edj.110.1593524355004; Tue, 30 Jun 2020 06:39:15 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 01/17] MAINTAINERS: Cc qemu-block mailing list Date: Tue, 30 Jun 2020 15:38:55 +0200 Message-Id: <20200630133912.9428-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630133912.9428-1-f4bug@amsat.org> References: <20200630133912.9428-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::544; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x544.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 We forgot to include the qemu-block mailing list while adding this section in commit 076a0fc32a7. Fix this. Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index dec252f38b..9ad876c4a7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1628,6 +1628,7 @@ F: hw/ssi/xilinx_* =20 SD (Secure Card) M: Philippe Mathieu-Daud=C3=A9 +L: qemu-block@nongnu.org S: Odd Fixes F: include/hw/sd/sd* F: hw/sd/core.c --=20 2.21.3 From nobody Fri Apr 19 15:07:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593524453; cv=none; d=zohomail.com; s=zohoarc; b=V8xk+fwMyV9OKso/UdQ6Zov5qKok1eYJa+ontOY7kWLINLZIxmZbKCsijby85VKEdj1WkG6OBcbFjEMQa7rbp9AMA/SGfy+c9eLjISQJ/z9jMQkrDv8RD+3xo8NCIKcKevDWPcUgZK+qj8kiQbjNwR8GX9AbGpQFgxayA/cr5x8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593524453; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MjRNdoa0rZpF8KkV/ND0ssqMkJTZ9vSTBVaUds1+aIY=; b=fgD85Cy54IbnpcjIXsCV8u+Kku11ZJqSPGtNrPlvt/zpWYfJ/hBJJVSnqNk25kutgXS5YB3cOU/OIF8f/uXE8SuU+ZRCtrlZfPQTP07nUh1xPJvCA+F/1eGcSCAZRDZpsTfCD7mAjmmjpMyn9pJ6Yf3XwJs1X2Yty/SHVibf/8I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593524453936606.0741039924627; Tue, 30 Jun 2020 06:40:53 -0700 (PDT) Received: from localhost ([::1]:56522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqGVI-00031U-Il for importer@patchew.org; Tue, 30 Jun 2020 09:40:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqGTn-0000xF-CP; Tue, 30 Jun 2020 09:39:19 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:36171) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqGTl-0006Hg-TT; Tue, 30 Jun 2020 09:39:19 -0400 Received: by mail-ed1-x543.google.com with SMTP id dg28so16232499edb.3; Tue, 30 Jun 2020 06:39:17 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p18sm2099172ejm.55.2020.06.30.06.39.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 06:39:15 -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=MjRNdoa0rZpF8KkV/ND0ssqMkJTZ9vSTBVaUds1+aIY=; b=LRQ4E4B9mhCntLThCwvhzuRdnRTQT6wb556Yxds/8mtYujDx/epvCiTfHqW4Zrto+e k+/VMLot5f/ujVjCSPek348c3ufqgFqOah+fbScfmJzVGHKDtUQ74npCkptfL7/nSHrv OK/YQGv6R75/hIYdAqWoBFFsSjRfuX/ohzrXibmLF01D3bY2ESkMKhGujynYfK93E1Vw Uubzunr3w6Az5RQmpE3UpKSq8SNFKdZv34koVOtB/2Q2GY00SzsJgcNPrs0wjJja3Wzl lziI6KVZS8ifdRSmYA/kmcJQ3XbwOXtdUbe7JZLaBr88XmdgA/AD77H5CkE+tjE8yhW0 KrgA== 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=MjRNdoa0rZpF8KkV/ND0ssqMkJTZ9vSTBVaUds1+aIY=; b=hArqCgWRNyP1LOLVKrD4/u/sjqjyAVQ3PIShRcvXlePHdXk36z+EFfDrHwRwv7SQ6H vR6tNzIRlEuxx6krHgIUUXCaSJW208Gfu3R74HSuAQFaNDpaTdvw/4zHTOK2k/GEiZ8T Dlbjgg257+4M0ICep8ucpeeFbbdkqNqBZgVwRwXa7CiChFauxe1j18M3pEXH09L7d8x4 Oc8614ywXVJRn1Xd4UzZ/8Pr0k1DRdd4FMc3MDKsSGcRrfFuCyFKRAhWF9QFOjjgIPRn 2bT/OxeeYXsyoErzxcfpUQ1KP5rAZQbPKVXdNZqJ1UVL075mFD50sQ9bDGeeYbXxfcYn +udw== X-Gm-Message-State: AOAM533wFIsqDm/l+9AHxp7U1Ehf/ePfX/bKkta1KbF3E4QH6YI+mj4l r3o+z58NGZpjdcBQXiFGH+bXvkd5qIc= X-Google-Smtp-Source: ABdhPJxGtwbRjK9kmKgl1UtrZcORC5uF60RHxNz/zCaFQtqrwM7JCM2lzjyJjoiHO1AxnR7wlLVsZg== X-Received: by 2002:a05:6402:30b2:: with SMTP id df18mr23218583edb.229.1593524356073; Tue, 30 Jun 2020 06:39:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 02/17] hw/sd/sdcard: Update coding style to make checkpatch.pl happy Date: Tue, 30 Jun 2020 15:38:56 +0200 Message-Id: <20200630133912.9428-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630133912.9428-1-f4bug@amsat.org> References: <20200630133912.9428-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::543; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x543.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 To make the next commit easier to review, clean this code first. Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sd.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 97a9d32964..cac8d7d828 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1170,8 +1170,9 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) sd->data_start =3D addr; sd->data_offset =3D 0; =20 - if (sd->data_start + sd->blk_len > sd->size) + if (sd->data_start + sd->blk_len > sd->size) { sd->card_status |=3D ADDRESS_ERROR; + } return sd_r1; =20 default: @@ -1186,8 +1187,9 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) sd->data_start =3D addr; sd->data_offset =3D 0; =20 - if (sd->data_start + sd->blk_len > sd->size) + if (sd->data_start + sd->blk_len > sd->size) { sd->card_status |=3D ADDRESS_ERROR; + } return sd_r1; =20 default: @@ -1232,12 +1234,15 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,= SDRequest req) sd->data_offset =3D 0; sd->blk_written =3D 0; =20 - if (sd->data_start + sd->blk_len > sd->size) + if (sd->data_start + sd->blk_len > sd->size) { sd->card_status |=3D ADDRESS_ERROR; - if (sd_wp_addr(sd, sd->data_start)) + } + if (sd_wp_addr(sd, sd->data_start)) { sd->card_status |=3D WP_VIOLATION; - if (sd->csd[14] & 0x30) + } + if (sd->csd[14] & 0x30) { sd->card_status |=3D WP_VIOLATION; + } return sd_r1; =20 default: @@ -1256,12 +1261,15 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,= SDRequest req) sd->data_offset =3D 0; sd->blk_written =3D 0; =20 - if (sd->data_start + sd->blk_len > sd->size) + if (sd->data_start + sd->blk_len > sd->size) { sd->card_status |=3D ADDRESS_ERROR; - if (sd_wp_addr(sd, sd->data_start)) + } + if (sd_wp_addr(sd, sd->data_start)) { sd->card_status |=3D WP_VIOLATION; - if (sd->csd[14] & 0x30) + } + if (sd->csd[14] & 0x30) { sd->card_status |=3D WP_VIOLATION; + } return sd_r1; =20 default: --=20 2.21.3 From nobody Fri Apr 19 15:07:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1593524589; cv=none; d=zohomail.com; s=zohoarc; b=iX7PFxYcadOCox9mo5lsIZg/OmYhtVi6sK6zPw3HRHo1CkbQhn6ENxgx0jEqf1b0mBi4MfFJwBGKZHxWNX/eFZikMFhqzJtHhx4q2wN3uLqLHzNUQGG9aVFJReg++M5lkkbpDiby1Aa8lGbH4S4X7+X2POr5HRoeyYBYFmkehSM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593524589; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NATlEi/FrWfP9Y28UrUe6cx6ZnLH5i2MWU0fBA6ejkY=; b=aUrV+TzBj4mGJ4B6oB5pD6rxeUPRjs6JJApRkXcEU5VOQjA4nikaIVSRvcT8enUnRcnH3wkAo/daewbXtaOrHEwiR/QdS6cnuuiUq58YbhXqXsiqeObzjIWxO30IPk1lNLjR+XrvCk9T0Zx52YgYxEtj1PexW9vbyAA0hD9h41Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593524589231673.8845712135579; Tue, 30 Jun 2020 06:43:09 -0700 (PDT) Received: from localhost ([::1]:36506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqGXT-0006zM-Kt for importer@patchew.org; Tue, 30 Jun 2020 09:43:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqGTo-0000yb-H1; Tue, 30 Jun 2020 09:39:20 -0400 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:42580) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqGTm-0006Hy-Ud; Tue, 30 Jun 2020 09:39:20 -0400 Received: by mail-ed1-x544.google.com with SMTP id z17so16244500edr.9; Tue, 30 Jun 2020 06:39:18 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p18sm2099172ejm.55.2020.06.30.06.39.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 06:39:16 -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=NATlEi/FrWfP9Y28UrUe6cx6ZnLH5i2MWU0fBA6ejkY=; b=PeV/LkNILRZWOLaL4QBX3NRKvpFptIcRFjBN8rqlEdddDd6TRhJlX53Fo7Rl5oM8jp HXNAEaAorB6Rzhk+4IwBEktYT8wSbAhfScNKwyytav7dElHuuDlTReFHlJTCjLVN07// TH8G5IJGPWQ1/UVXdnzg2R+gckYYIBqChcb4orwBJavAsaqMiXcapOI73LY1J6hHTJWv m/DSntqkbEcdMyVBVH2rd/dGsj4fjet/cvVSfizDGfH6zL2a+4KFuk1B7bq4wI/1Xlgk in0R2fCv5j+7qneRLeCoTNgGClaAyQq/508fRtBqapWcMK7UuKrmtRSqG9bCSTFAgO23 NU/Q== 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=NATlEi/FrWfP9Y28UrUe6cx6ZnLH5i2MWU0fBA6ejkY=; b=GspLcRDNwgtT03ygPAbvQrGek8e+2IxhMg24qInWy8GTmusf0BGIUdy2r7v/Ivm2uV 2XKL19h5vC2xxbKnDm9UaqJZlWwPv/rCrv75aXnZnlXOymRwhV3lq/bCgLFIV5Okj1wz X8VMWFYA9rptCxez3BiiFIczsXJLGGTjHFgzzVkjIPasiaM3ErwtJacbjGUM03mrvUeH 3e3kpszwhwDAMszh7LMqP1c22WUwQqYf9eQPuG4gObWoHh4rgiepzCKfZjIVuLqaiPTN d0zqwm5AIr4ChLsxc+TWO873JGZ1GdhBJZSxsTTdZz8paBhCSbCkBkQLBG1w1EjAxW7M odTw== X-Gm-Message-State: AOAM5314YFCenZfoHKDX9TryUS7KcSuIHGdEL7XWMrnO55HdnxAMk+tL e7QrSl5jEV9i/FgNr2c9wOrfvDgS+DA= X-Google-Smtp-Source: ABdhPJwU0JmxyaSl6Sbeinz9s7vJal6Pz1PBdRZdvfmS9BJNuXVE02tY/6o07mH/B+IfXm5afaCf/w== X-Received: by 2002:a05:6402:b79:: with SMTP id cb25mr3622995edb.154.1593524357181; Tue, 30 Jun 2020 06:39:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 03/17] hw/sd/sdcard: Move some definitions to use them earlier Date: Tue, 30 Jun 2020 15:38:57 +0200 Message-Id: <20200630133912.9428-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630133912.9428-1-f4bug@amsat.org> References: <20200630133912.9428-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::544; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x544.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Move some definitions to use them earlier. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/sd/sd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index cac8d7d828..4816b4a462 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -80,6 +80,12 @@ enum SDCardStates { sd_disconnect_state, }; =20 +#define HWBLOCK_SHIFT 9 /* 512 bytes */ +#define SECTOR_SHIFT 5 /* 16 kilobytes */ +#define WPGROUP_SHIFT 7 /* 2 megs */ +#define CMULT_SHIFT 9 /* 512 times HWBLOCK_SIZE = */ +#define WPGROUP_SIZE (1 << (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIF= T)) + struct SDState { DeviceState parent_obj; =20 @@ -367,12 +373,6 @@ static void sd_set_cid(SDState *sd) sd->cid[15] =3D (sd_crc7(sd->cid, 15) << 1) | 1; } =20 -#define HWBLOCK_SHIFT 9 /* 512 bytes */ -#define SECTOR_SHIFT 5 /* 16 kilobytes */ -#define WPGROUP_SHIFT 7 /* 2 megs */ -#define CMULT_SHIFT 9 /* 512 times HWBLOCK_SIZE */ -#define WPGROUP_SIZE (1 << (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT)) - static const uint8_t sd_csd_rw_mask[16] =3D { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, --=20 2.21.3 From nobody Fri Apr 19 15:07:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593524596; cv=none; d=zohomail.com; s=zohoarc; b=k42lIkBMtjWxd0F/4+ofCWjbLOzcKp83q7fazoWjuGKinyOrYjJRCIIKZODjjX9Jdjtp0W9ja0eEybRNCIIEzToAxK+hA1N9ZI87BCmQDqgjoWyjZGg9XnFnwygjI5piEQmzdzfo3OYCF73blE9cizIKsdvOcLBEsMwnc2fBcXw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593524596; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=i3AX6k9zJcs7ntcPjDjs5EOqKiW+/SX/Gp5bwn7hkCA=; b=KXGmXGMU5OOscp8jvr+EELNSgfiVlvqCUM6nFzlyytePVSkH23QTXdEb2uxzP9soepiPdu7NloDMvPAfJNnNuffminmwbhQLFwwSkIqJ6npE+1fBCPJLPIOoUHcXKPkPhqrxlDUnBtnJ4EcqLlW+PBkqKviWEIXuUlD3+o1nhcc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593524596516248.3422769307266; Tue, 30 Jun 2020 06:43:16 -0700 (PDT) Received: from localhost ([::1]:37184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqGXb-0007HZ-1z for importer@patchew.org; Tue, 30 Jun 2020 09:43:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqGTp-00010m-IN; Tue, 30 Jun 2020 09:39:21 -0400 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]:45646) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqGTo-0006IM-2S; Tue, 30 Jun 2020 09:39:21 -0400 Received: by mail-ed1-x542.google.com with SMTP id d16so9594107edz.12; Tue, 30 Jun 2020 06:39:19 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p18sm2099172ejm.55.2020.06.30.06.39.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 06:39:17 -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=i3AX6k9zJcs7ntcPjDjs5EOqKiW+/SX/Gp5bwn7hkCA=; b=G5tK4TLjUXy/6OdiMLeBcI82VCrGi2aWIt4P7LB6EG6ihgTle21nQr58Q/nNBJ3Ehg X4z0Aq5mDo0d6VC5pMxCZLYFpZxfG4XCBPoNdhUxuOS2iCsbRb+jI3Pz4Mr+VKhlC3BD 69fvSKB7OR6hUANJ1pRQJxSJg3BlmV/JxRVMtPceeTWxSBDgRNvE/PXCdzLGERi/US/5 EuFVcOR/BazQvOWm+pUsUS+TX1eRhZuyTZpvp4Pv+wi2ABj6CizK1x+bsDwAO0N7JYY5 Fxl3DKKvsehrxyG7puZ2bNRqSu4SQQKIqZGAnWIXgBay8Y/k1xsuuyX5uZDf98t8NksW OuDg== 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=i3AX6k9zJcs7ntcPjDjs5EOqKiW+/SX/Gp5bwn7hkCA=; b=CdMtmWqTZDOfFXXXLusaszDsb1Jip8Ddn8Tpgz4J25BZJaBO3KD5WvIJ/u0hCKmEdK TBpX6s4Hezkuo3wAJGBDhjflyg0s7Xy1vj9QCDA967l+AmAOQ3kD9KfIZj734/XAGqtZ ktP0anK5YLPeNSm4pBbPyc9IAL+LJbz86S/01/GuxjkiKy+9Ptze6c9Gs3oDvkaOC9ni mf5JdunsEN3/V+iuyHusU1HHq4nRDfbhMrA9RDY27jc4ViR4ERngOtbiQT5RcPawofBF 4jDu4tYRk8qGkrolc+Q3rujQ4NKydZ7AIlD80WE9FaAtKlEaItgrMIpZbdQ1+3NvfIkY TV9w== X-Gm-Message-State: AOAM531Osg7ThY5Q2UZ7W+NSCnMdO+ObGkGRix6chDCTGyWoEQfdGKUx 2ebMOWOCz+5YoSTXsZM9IgOW0zY+ycs= X-Google-Smtp-Source: ABdhPJzXNdpvEdMno8aAobnvdP0TBwsu6gwsmsxv+lwBNlmn2aKa3AwrUTBmKBGh71YQvprD7PnHkQ== X-Received: by 2002:a50:cd1a:: with SMTP id z26mr23903371edi.120.1593524358353; Tue, 30 Jun 2020 06:39:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 04/17] hw/sd/sdcard: Use the HWBLOCK_SIZE definition Date: Tue, 30 Jun 2020 15:38:58 +0200 Message-Id: <20200630133912.9428-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630133912.9428-1-f4bug@amsat.org> References: <20200630133912.9428-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::542; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x542.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Replace the following different uses of the same value by the same HWBLOCK_SIZE definition: - 512 (magic value) - 0x200 (magic value) - 1 << HWBLOCK_SHIFT Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/sd/sd.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 4816b4a462..04451fdad2 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -81,6 +81,7 @@ enum SDCardStates { }; =20 #define HWBLOCK_SHIFT 9 /* 512 bytes */ +#define HWBLOCK_SIZE (1 << HWBLOCK_SHIFT) #define SECTOR_SHIFT 5 /* 16 kilobytes */ #define WPGROUP_SHIFT 7 /* 2 megs */ #define CMULT_SHIFT 9 /* 512 times HWBLOCK_SIZE = */ @@ -129,7 +130,7 @@ struct SDState { uint32_t blk_written; uint64_t data_start; uint32_t data_offset; - uint8_t data[512]; + uint8_t data[HWBLOCK_SIZE]; qemu_irq readonly_cb; qemu_irq inserted_cb; QEMUTimer *ocr_power_timer; @@ -410,7 +411,7 @@ static void sd_set_csd(SDState *sd, uint64_t size) ((HWBLOCK_SHIFT << 6) & 0xc0); sd->csd[14] =3D 0x00; /* File format group */ } else { /* SDHC */ - size /=3D 512 * KiB; + size /=3D HWBLOCK_SIZE * KiB; size -=3D 1; sd->csd[0] =3D 0x40; sd->csd[1] =3D 0x0e; @@ -574,7 +575,7 @@ static void sd_reset(DeviceState *dev) sd->erase_start =3D 0; sd->erase_end =3D 0; sd->size =3D size; - sd->blk_len =3D 0x200; + sd->blk_len =3D HWBLOCK_SIZE; sd->pwd_len =3D 0; sd->expecting_acmd =3D false; sd->dat_lines =3D 0xf; @@ -685,7 +686,7 @@ static const VMStateDescription sd_vmstate =3D { VMSTATE_UINT32(blk_written, SDState), VMSTATE_UINT64(data_start, SDState), VMSTATE_UINT32(data_offset, SDState), - VMSTATE_UINT8_ARRAY(data, SDState, 512), + VMSTATE_UINT8_ARRAY(data, SDState, HWBLOCK_SIZE), VMSTATE_UNUSED_V(1, 512), VMSTATE_BOOL(enable, SDState), VMSTATE_END_OF_LIST() @@ -754,8 +755,8 @@ static void sd_erase(SDState *sd) =20 if (FIELD_EX32(sd->ocr, OCR, CARD_CAPACITY)) { /* High capacity memory card: erase units are 512 byte blocks */ - erase_start *=3D 512; - erase_end *=3D 512; + erase_start *=3D HWBLOCK_SIZE; + erase_end *=3D HWBLOCK_SIZE; } =20 erase_start =3D sd_addr_to_wpnum(erase_start); @@ -1149,7 +1150,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) case 16: /* CMD16: SET_BLOCKLEN */ switch (sd->state) { case sd_transfer_state: - if (req.arg > (1 << HWBLOCK_SHIFT)) { + if (req.arg > HWBLOCK_SIZE) { sd->card_status |=3D BLOCK_LEN_ERROR; } else { trace_sdcard_set_blocklen(req.arg); @@ -1961,7 +1962,7 @@ uint8_t sd_read_data(SDState *sd) if (sd->card_status & (ADDRESS_ERROR | WP_VIOLATION)) return 0x00; =20 - io_len =3D (sd->ocr & (1 << 30)) ? 512 : sd->blk_len; + io_len =3D (sd->ocr & (1 << 30)) ? HWBLOCK_SIZE : sd->blk_len; =20 trace_sdcard_read_data(sd->proto_name, sd_acmd_name(sd->current_cmd), --=20 2.21.3 From nobody Fri Apr 19 15:07:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1593524647; cv=none; d=zohomail.com; s=zohoarc; b=Vny9MRSx6BMhM9n3qEVgcs3O4fMZgsgR+J2BRpaAct3DPR4240gFeoKJx6Y6fut8GrZnAKYJplN8z0LxVh4fGyDbt1yTPh/kSuY7hktO/csMQRqjpdF7oDmXv1bAQiH0kggij7rQeiZ+UbpCuaBfucxKFSfvg4mfqJaGhlPJKKs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593524647; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0q3fvINBMewfm4ouk0ChZ+kON+bgL7uzrdyA1Uly1X8=; b=AjArrQmW0CcRIE9n4//DxJ3qps1yC+hmo3jq5Rp9N0+11LMRqZvUhkGu/eUVAoeykuADKF1wWsfdV5agIaqALOFERB/9HJvDDghuuAVT/0s/Ci+jSszQIFnuTKGTxGpl1X6s3YwdsQ0WMP20f9jnlbA143uskgm8c9Sqsnfq63o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593524647383689.9261267509663; Tue, 30 Jun 2020 06:44:07 -0700 (PDT) Received: from localhost ([::1]:39926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqGYQ-0000J6-3g for importer@patchew.org; Tue, 30 Jun 2020 09:44:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqGTr-00015i-FM; Tue, 30 Jun 2020 09:39:23 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:35458) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqGTp-0006Ig-IG; Tue, 30 Jun 2020 09:39:23 -0400 Received: by mail-ed1-x541.google.com with SMTP id e15so16262012edr.2; Tue, 30 Jun 2020 06:39:20 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p18sm2099172ejm.55.2020.06.30.06.39.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 06:39:18 -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=0q3fvINBMewfm4ouk0ChZ+kON+bgL7uzrdyA1Uly1X8=; b=GIs8+CuD1T/pqGNj1zHsxRLmZI2rDcsOrC59ZM79eGONAOxKZXBVhT5hEX5MBEL78M zBTTdRhjkD8B45LUwtPGvXRWonQgabLIvA7MxBTBJ1Ej04Kto9AdePsXCNep4ku35mZT rIND5BKiTzQdY7im6HQhRJhgUNmRkvENrFpd7IXnB2VD0y7ssOvxdsnOwsmgedBYi+EV RVYpXwHE+QTS1h8RvmN+hacfnrf1adT2jKZ6X/IDUvInu8MAKBU4Qck3+HuqsO8SfDfk uItjfzh/Rzvh9NnEHAUokDK//pvEYfjSrl7glbDb5L4QnYLMFxIRTh/0CDegWTSO4e0c EdkA== 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=0q3fvINBMewfm4ouk0ChZ+kON+bgL7uzrdyA1Uly1X8=; b=rNgeiJG5orSB58IVR2Njk/E9NDGnuw+KF/MgceL3v2FY5jsAbZ52TEphxZcvXe/AJf Rt/wQSi+TGarK99EbwB8zIyy3Pz+PzXBwoUGcSnMN5bk9ck43XkVyFt6gfEi2KXVUPvF zqEG8PmeSJwN4kb+mTlcrvoXh9vB+4KeYuPXGVN+NThw02EaPC3UWiw3KprCKbeBxibb 1tLHxGN2h8GtZV96vtwdgeGbKAO0wG4F+7j0gW+1g900aoZwj1GOsSPDxb19yiH+Xt8W lArgkI5IZTOMkbuI2lOgdGcjzRkIRhLMV8iegJyGqq+Km2P3b59e2HLjCX1e+39yI8Uc 2RkQ== X-Gm-Message-State: AOAM531OoB8ecyYVc08BjgfJSvpvhAhi/Y9V9rDW8DEFQPFyzdJTdgAP kF7Cyb1MshwG9+27f104MCy7jiRlpCA= X-Google-Smtp-Source: ABdhPJw1SoT1uZcIHek+c6O/yVAXSslixwy/+Tb4nrodLzsaUKwo9PQvUX8wkGukQ/MKwVE6AQIDuQ== X-Received: by 2002:a05:6402:1d89:: with SMTP id dk9mr11430759edb.31.1593524359525; Tue, 30 Jun 2020 06:39:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 05/17] hw/sd/sdcard: Do not switch to ReceivingData if address is invalid Date: Tue, 30 Jun 2020 15:38:59 +0200 Message-Id: <20200630133912.9428-6-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630133912.9428-1-f4bug@amsat.org> References: <20200630133912.9428-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::541; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x541.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , Prasad J Pandit , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexander Bulekov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Only move the state machine to ReceivingData if there is no pending error. This avoids later OOB access while processing commands queued. "SD Specifications Part 1 Physical Layer Simplified Spec. v3.01" 4.3.3 Data Read Read command is rejected if BLOCK_LEN_ERROR or ADDRESS_ERROR occurred and no data transfer is performed. 4.3.4 Data Write Write command is rejected if BLOCK_LEN_ERROR or ADDRESS_ERROR occurred and no data transfer is performed. WP_VIOLATION errors are not modified: the error bit is set, we stay in receive-data state, wait for a stop command. All further data transfer is ignored. See the check on sd->card_status at the beginning of sd_read_data() and sd_write_data(). Fixes: CVE-2020-13253 Cc: Prasad J Pandit Reported-by: Alexander Bulekov Buglink: https://bugs.launchpad.net/qemu/+bug/1880822 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Reviewed-by: Peter Maydell --- v4: Only modify ADDRESS_ERROR, not WP_VIOLATION (pm215) --- hw/sd/sd.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 04451fdad2..7e0d684aca 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1167,13 +1167,15 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,= SDRequest req) case 17: /* CMD17: READ_SINGLE_BLOCK */ switch (sd->state) { case sd_transfer_state: - sd->state =3D sd_sendingdata_state; - sd->data_start =3D addr; - sd->data_offset =3D 0; =20 if (sd->data_start + sd->blk_len > sd->size) { sd->card_status |=3D ADDRESS_ERROR; + return sd_r1; } + + sd->state =3D sd_sendingdata_state; + sd->data_start =3D addr; + sd->data_offset =3D 0; return sd_r1; =20 default: @@ -1184,13 +1186,15 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,= SDRequest req) case 18: /* CMD18: READ_MULTIPLE_BLOCK */ switch (sd->state) { case sd_transfer_state: - sd->state =3D sd_sendingdata_state; - sd->data_start =3D addr; - sd->data_offset =3D 0; =20 if (sd->data_start + sd->blk_len > sd->size) { sd->card_status |=3D ADDRESS_ERROR; + return sd_r1; } + + sd->state =3D sd_sendingdata_state; + sd->data_start =3D addr; + sd->data_offset =3D 0; return sd_r1; =20 default: @@ -1230,14 +1234,17 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,= SDRequest req) /* Writing in SPI mode not implemented. */ if (sd->spi) break; + + if (sd->data_start + sd->blk_len > sd->size) { + sd->card_status |=3D ADDRESS_ERROR; + return sd_r1; + } + sd->state =3D sd_receivingdata_state; sd->data_start =3D addr; sd->data_offset =3D 0; sd->blk_written =3D 0; =20 - if (sd->data_start + sd->blk_len > sd->size) { - sd->card_status |=3D ADDRESS_ERROR; - } if (sd_wp_addr(sd, sd->data_start)) { sd->card_status |=3D WP_VIOLATION; } @@ -1257,14 +1264,17 @@ static sd_rsp_type_t sd_normal_command(SDState *sd,= SDRequest req) /* Writing in SPI mode not implemented. */ if (sd->spi) break; + + if (sd->data_start + sd->blk_len > sd->size) { + sd->card_status |=3D ADDRESS_ERROR; + return sd_r1; + } + sd->state =3D sd_receivingdata_state; sd->data_start =3D addr; sd->data_offset =3D 0; sd->blk_written =3D 0; =20 - if (sd->data_start + sd->blk_len > sd->size) { - sd->card_status |=3D ADDRESS_ERROR; - } if (sd_wp_addr(sd, sd->data_start)) { sd->card_status |=3D WP_VIOLATION; } --=20 2.21.3 From nobody Fri Apr 19 15:07:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1593524774; cv=none; d=zohomail.com; s=zohoarc; b=R3daj9s1tEd+NtL/+H6BH8t/cBYFDDenSkpdTW6whi41eo0QbLa4eUnK1pInQ/Mqf0gswYtUrgV2f18XOLuV3nA+sOXjzQu9k7s69Ej/1JOTt33snrAG21YSw+VaDweoEYAmS1dn18YnwHZrnYK8pfNQk3slk6wI1cQ6Nxf27uU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593524774; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2FehWZv489g7gLp1IpuJgAw0ELgG4HGTfqwfreEPxtg=; b=MfMyOFXJPoiw0Ap4FiIOjp8grhL+NL5xT3qG/eIurtsbje13RSZdjXBsnF8LtuVNFMKzjd6hIiXnXwe7gAt9N3UNcboaEcs3axIBBf7vHEoIejXsHANj2eEew5p+80ng0aaHQovB+fE9ng/z5IFyznNryYuF508Lg+p5BAObyWQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593524774470509.9215741012531; Tue, 30 Jun 2020 06:46:14 -0700 (PDT) Received: from localhost ([::1]:48470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqGaT-0004An-8c for importer@patchew.org; Tue, 30 Jun 2020 09:46:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34962) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqGTs-00018S-JK; Tue, 30 Jun 2020 09:39:24 -0400 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:44699) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqGTq-0006Ir-Qp; Tue, 30 Jun 2020 09:39:24 -0400 Received: by mail-ej1-x644.google.com with SMTP id ga4so20606770ejb.11; Tue, 30 Jun 2020 06:39:21 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p18sm2099172ejm.55.2020.06.30.06.39.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 06:39:20 -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=2FehWZv489g7gLp1IpuJgAw0ELgG4HGTfqwfreEPxtg=; b=e2oMdVdd4oZtoWmdovJN09AUNZ5aa63JRs0EZqZvzdKYoST29gR2cZmkeg7HbcQl7P jQnnQZcPQOhHyx/rs/fSETxPemyWqDIaXIuCvaRaM6Zu1mORngXLMtvefPcZuPNrVfUb UG8/ltcPATNi+lsyfvPgnuqZXwhJ4lG7A3s540ZxI6YTTdEyuZilTqFFW8QkOTllWQhe TIj+zI7h1PJe6JaVnyhkg29MS+F8jPLcE6dZgJpBA9TpvdBxgC39oKCOZ3hnwVHpzBxn 5DS6qJVqbcYJlKxdEQxrBwku7jo2TGAbsi9+rxb1YwVNahyBQweQTLeg/yPuuhqJxTfb 01Bg== 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=2FehWZv489g7gLp1IpuJgAw0ELgG4HGTfqwfreEPxtg=; b=eqB3ZJ3ANmQr2JjAheHObbZFHsB7AJBOb+udlo962ZvVquSAec4RJg4gvasePuqxGA lBL3w8i53fj5aXojpnD2YlOCDFnPbtcD6LZwMMZFXhTrF+pyPsM3KS4AdJBVxtUdlDzr QBc+WRNgjOXWQfPWM0MCZ1pzcvbhbE89e7K8vsBIPY/0ocslv1dqTsPT/x0VGopIasGF yeOiIodCuaFF2BIihQOsXmM2ue3aulcbopMum5/8Xv4G7RNJgcY+yZ73tMT+B1cX1RkA lXduW+wXK8g0GCpzfjBqrZ8UEN/AbkAWF+2wfCro4MNBy8VWdRD1GNfLT3y7+QDQxq31 cuJg== X-Gm-Message-State: AOAM531vgtoE2TRyY3MeNWAWwPtvwHp1f9nkfBcqgHFQfw8Zj6AzTtiu gSDYs6jYN/B6lfi7lJw6bbuBpBuj9Z0= X-Google-Smtp-Source: ABdhPJyTLMsXk33SElVRiJRGymWi9rdj8GAsvlkMvu/YXvr3OzOXZhYAK194W9m+ofYHx6kVyA0t7Q== X-Received: by 2002:a17:906:e25a:: with SMTP id gq26mr17827740ejb.152.1593524360648; Tue, 30 Jun 2020 06:39:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 06/17] hw/sd/sdcard: Restrict Class 6 commands to SCSD cards Date: Tue, 30 Jun 2020 15:39:00 +0200 Message-Id: <20200630133912.9428-7-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630133912.9428-1-f4bug@amsat.org> References: <20200630133912.9428-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::644; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x644.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Only SCSD cards support Class 6 (Block Oriented Write Protection) commands. "SD Specifications Part 1 Physical Layer Simplified Spec. v3.01" 4.3.14 Command Functional Difference in Card Capacity Types * Write Protected Group SDHC and SDXC do not support write-protected groups. Issuing CMD28, CMD29 and CMD30 generates the ILLEGAL_COMMAND error. Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sd.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 7e0d684aca..871c30a67f 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -922,6 +922,11 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SD= Request req) sd->multi_blk_cnt =3D 0; } =20 + if (sd_cmd_class[req.cmd] =3D=3D 6 && FIELD_EX32(sd->ocr, OCR, CARD_CA= PACITY)) { + /* Only Standard Capacity cards support class 6 commands */ + return sd_illegal; + } + switch (req.cmd) { /* Basic commands (Class 0 and Class 1) */ case 0: /* CMD0: GO_IDLE_STATE */ --=20 2.21.3 From nobody Fri Apr 19 15:07:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593524489; cv=none; d=zohomail.com; s=zohoarc; b=jMJC1ZPjHSjfoI+nk86eXiwGvg3ZO+IXFqjbc4PaCDJeRB3+FnUrBkBCmOfszAhavIzU5JpZ4wuxQ0HITH3IaM8r/josH/lVIQEUODAQY5bx+n1ZTAleB+O5H+fOd/IeVjAlooDKqiSUS890x1pUnzmMzQxMdtQN2wDZiIOPGwg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593524489; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+lTrHlDODPJpVtiU5OSZTdaw0jvk522ED9AiYmpwBdo=; b=UFhU24ljqCHC4iznCCyP2NovifPNK17YyT+zxSzpRxjjvrN3dwB6oaJ4crCK16g6TNE9bm2Ijd2tcLWgqGXJRqDAztttsy0trVLGwE1OGpC5bD1dopFYlnk0MWLxTYSI5fdRcBWtyX0D0npdi2GyjALzylVvzAPi9zhM/AAMHi4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15935244898081001.1312211202212; Tue, 30 Jun 2020 06:41:29 -0700 (PDT) Received: from localhost ([::1]:58628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqGVs-0003qX-HF for importer@patchew.org; Tue, 30 Jun 2020 09:41:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqGTt-00019o-9X; Tue, 30 Jun 2020 09:39:25 -0400 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:42881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqGTr-0006J3-Mx; Tue, 30 Jun 2020 09:39:24 -0400 Received: by mail-ej1-x643.google.com with SMTP id i14so20647699ejr.9; Tue, 30 Jun 2020 06:39:22 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p18sm2099172ejm.55.2020.06.30.06.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 06:39:21 -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=+lTrHlDODPJpVtiU5OSZTdaw0jvk522ED9AiYmpwBdo=; b=Amx+bG5IOb19PFGlatNgqyoTpsPxQdKJ9xNkHVrIWxuCXan9PQgwJcP7S/yzcIFUE7 VQ8x1gQzFn/de21TbiIUd26uNey+ybBOAr8dZ54UwZpJycyQal2C5XtD6Q4vDCjpuGTM pQxGg/kn6tzbKmZkFSEEAWGVvSfEcsB3S+BQ8+NOXJ114vSglrlGsFqHALxhQggh/mu5 E/aV58HghfMugC1bH5wSpX66SmgsNuUYayDPG2fCzE2lJcuhnvmJxtwjjNzTtCnh7SMR 9P2gK2M40rN8bUtumOXeOItLLkG4ycxDsnQkAY0pfGvayHpukI4yHDtrCIAcJ4fQA3C/ 8RFw== 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=+lTrHlDODPJpVtiU5OSZTdaw0jvk522ED9AiYmpwBdo=; b=hdwKk6HvknrPjLhSwwdJG3/7vlvHOdrM5WqUSSjwgc2K4BtqdeUdxIdwzenZo3uIqM c9DC3B9M9kLnCs5P2nOM9/Ic5cjTppI6E2uinD1eeDWqyb5wbpzvkSHTOii0woouSXfi cSb8LZUkYwGW7gJThxPFbqdoNZvSAgQgaJJbU1CLXPqVn6AJp2WBElLcYTBh73zHFtsx V7R8hju9LRjrT0+EOWOn666JOz8xKITyjiBPL4JdPfhoiP4tJsm7UFxkXrQmjX3R3B7L Ad+oBF/8pvPCmnOeQPGD+44+FehD4jpt+ZNbyaI4fK9MDLabawNVOppvggrp6EQmpKb3 5dQQ== X-Gm-Message-State: AOAM5333AhKNy+3kJlu3QQ0EeOLl70y4SmvAgCFWuY74Q1SyGFWPTLIw 1/0okNyXYauEQhtscI9nN3rEiOjDYOE= X-Google-Smtp-Source: ABdhPJxAF7cCd1uIHgOnnfaFMLvVJ/8HUZI2UXvzdwvUsq21TylrJsTovPjBPhA8f7CKv0ex0G9TBQ== X-Received: by 2002:a17:906:7ac9:: with SMTP id k9mr17639635ejo.489.1593524361714; Tue, 30 Jun 2020 06:39:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 07/17] hw/sd/sdcard: Move sd->size initialization Date: Tue, 30 Jun 2020 15:39:01 +0200 Message-Id: <20200630133912.9428-8-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630133912.9428-1-f4bug@amsat.org> References: <20200630133912.9428-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::643; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x643.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Move sd->size initialization earlier to make the following patches easier to review. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/sd/sd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 871c30a67f..078b0e81ee 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -558,12 +558,13 @@ static void sd_reset(DeviceState *dev) =20 sect =3D sd_addr_to_wpnum(size) + 1; =20 + sd->size =3D size; sd->state =3D sd_idle_state; sd->rca =3D 0x0000; sd_set_ocr(sd); sd_set_scr(sd); sd_set_cid(sd); - sd_set_csd(sd, size); + sd_set_csd(sd, sd->size); sd_set_cardstatus(sd); sd_set_sdstatus(sd); =20 @@ -574,7 +575,6 @@ static void sd_reset(DeviceState *dev) memset(sd->function_group, 0, sizeof(sd->function_group)); sd->erase_start =3D 0; sd->erase_end =3D 0; - sd->size =3D size; sd->blk_len =3D HWBLOCK_SIZE; sd->pwd_len =3D 0; sd->expecting_acmd =3D false; --=20 2.21.3 From nobody Fri Apr 19 15:07:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593524901; cv=none; d=zohomail.com; s=zohoarc; b=IlFtpXEF3NgAuNnGacV3T+vJylpdqaHt9r0xND4zhyLoMfa1V1KXeng4lBzqvYhMQyfc/T/N6fHjyCugN7x4gwVKaGMmR3GWKPv0cZguRVk6wbULZydzxSkNNinQnXMQpqqFrdRhuBa1zq7zLGUfqNCabBZNc02PXdzLulEroJA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593524901; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uCWGmD+bgn4Y2GrUizD+G8/TwFtuJI6lZxJDh/W1Rng=; b=Nj9J1HUHnwPBq132zpOJCjUs+cg9wV+chhdViAXopx7XmcTnepxtXxYWxllSYdf4lxTL0DR6wL0LrKilg/GiEUodVeEjIP2q1J/eBKGtwnVa1V2NmJ+vL8emMdNBjvAY3bgDoqET2xe8iOhuXxklkh3e+F2CjisSy3vDg9l0N+g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593524901058927.9901963586514; Tue, 30 Jun 2020 06:48:21 -0700 (PDT) Received: from localhost ([::1]:58244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqGcV-0008C1-Lu for importer@patchew.org; Tue, 30 Jun 2020 09:48:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqGTu-0001CJ-At; Tue, 30 Jun 2020 09:39:26 -0400 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:35461) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqGTs-0006JG-MC; Tue, 30 Jun 2020 09:39:25 -0400 Received: by mail-ed1-x544.google.com with SMTP id e15so16262211edr.2; Tue, 30 Jun 2020 06:39:23 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p18sm2099172ejm.55.2020.06.30.06.39.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 06:39:22 -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=uCWGmD+bgn4Y2GrUizD+G8/TwFtuJI6lZxJDh/W1Rng=; b=RSaNzF7CbF9k8PI5rtmpHuzt9wDkHj4Zs5XVMwjlDQisRmrjnFvTnObBAxtAlRCPQd Qf+N3xKg/2WfnVNlersmYkOKpioa3zQeEuMvqW2BMcyqbWKz3UIWEjTVScAur53YzBm1 XxniCU8Q+wI6wHnf08GIzgtOEaaY5FL4oPE0JVZuFshe5dVbx8drdl605m8KX5sfU7i1 YPwsmi9AMCZMcPmL9xMu7JVbm35UhPRotE+NRpNLSy2Z8wlP0GvVVqrQDcMdOU7N1xZz UiZQHvK+2AFF9b9c9HE9+1hhEY+0bRybgszgg+mDSzDpQ6mgoOmWfCAZXeuD8A5eESfv Ce9w== 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=uCWGmD+bgn4Y2GrUizD+G8/TwFtuJI6lZxJDh/W1Rng=; b=iQzU77zmi8g/BdA73ls7JCs90KcMfMfbiynSd+EzkI6kuomONEehRALNKaZY1tnkEK ZPwM9rfp19vr1yYsZtP54yqGgjMG9hJZmTe7lkFCSnr5L3UFIRd9lhFOSZGtMeVQIVRs lb+ZVl5IgBTfnDyJndEE8YslMMrBmO99brbvkwEqz8VBGNhcG5+3esS43kdiuxaiddia usG6gdcNUp1P7VWcCbLSxX4t3q3b54nwK+TWIFHJUiP1GJfoccMnNJ2msetKo1OLvShd YLVpPgJMfm75+6OKu7Z8UR6txC/bXQo4hViKmBom5iIskM3JNuAoWOEx4DtECwPJBUj3 FInA== X-Gm-Message-State: AOAM532cD3pMfwqaVcdPkwrXmJOZUmUiu7xuuopdbBuLQl6drT+NBlgc +PwfRVIoHQQjT+e4N2Dd1RcUlcqMJeQ= X-Google-Smtp-Source: ABdhPJxkHlEvFofkVpNPN8Z0SQg13iRYAQr5YwXd4sZOY5ljj4ROIz2pAVG7H5dfZgIENEQGWl0q6g== X-Received: by 2002:aa7:d3cd:: with SMTP id o13mr22568115edr.176.1593524362774; Tue, 30 Jun 2020 06:39:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 08/17] hw/sd/sdcard: Call sd_addr_to_wpnum where it is used, consider zero size Date: Tue, 30 Jun 2020 15:39:02 +0200 Message-Id: <20200630133912.9428-9-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630133912.9428-1-f4bug@amsat.org> References: <20200630133912.9428-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::544; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x544.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Avoid setting 'sect' variable just once (its name is confuse anyway). Directly set 'sd->wpgrps_size'. Special case when size is zero. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/sd/sd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 078b0e81ee..e5adcc8055 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -556,8 +556,6 @@ static void sd_reset(DeviceState *dev) } size =3D sect << 9; =20 - sect =3D sd_addr_to_wpnum(size) + 1; - sd->size =3D size; sd->state =3D sd_idle_state; sd->rca =3D 0x0000; @@ -570,7 +568,11 @@ static void sd_reset(DeviceState *dev) =20 g_free(sd->wp_groups); sd->wp_switch =3D sd->blk ? blk_is_read_only(sd->blk) : false; - sd->wpgrps_size =3D sect; + if (sd->size) { + sd->wpgrps_size =3D sd_addr_to_wpnum(sd, sd->size) + 1; + } else { + sd->wpgrps_size =3D 1; + } sd->wp_groups =3D bitmap_new(sd->wpgrps_size); memset(sd->function_group, 0, sizeof(sd->function_group)); sd->erase_start =3D 0; --=20 2.21.3 From nobody Fri Apr 19 15:07:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1593525019; cv=none; d=zohomail.com; s=zohoarc; b=myNQVlHKsktsEHfHtP3snGC9Klg9ous6XCuV+tmqFLdeI7v8bgLA1niBEmKNgGZ5ZaDD1tyoR6MFgadBASwjo+t3IyvvcNO9mzJwJRWFtFZ5YqwPajYBRPwCEDL3PAAA4LYuPH9kchRhEra22fw8CopaSH/DB+2w/xOZgg1rLws= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593525019; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VFFOiCizJ+mW5k6WnhghvzdFvmIVL76nU3yTXrPInm0=; b=Y7zw+6ufwO8iSUMybDiOf81GYXdb8nRIV0Nzy9B8ijITUM7M0hVCDemEbLIDaAt85RcTfpqh9dX4Pt0G4cYzUAKfIExFiDEAmQJFSRw4I9EKO+8igWsovlPJeQRc7K5OmDms1p1r6ryGQskuCi1yycr79e/m893DvEsWRLP/me8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593525019096285.9330529921916; Tue, 30 Jun 2020 06:50:19 -0700 (PDT) Received: from localhost ([::1]:38404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqGeP-0003Xe-P2 for importer@patchew.org; Tue, 30 Jun 2020 09:50:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqGTv-0001Ex-BC; Tue, 30 Jun 2020 09:39:27 -0400 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]:33969) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqGTt-0006Jd-Pd; Tue, 30 Jun 2020 09:39:27 -0400 Received: by mail-ed1-x542.google.com with SMTP id a8so15033747edy.1; Tue, 30 Jun 2020 06:39:24 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p18sm2099172ejm.55.2020.06.30.06.39.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 06:39:23 -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=VFFOiCizJ+mW5k6WnhghvzdFvmIVL76nU3yTXrPInm0=; b=BO7i1ymp9yBffSDllzficR4ZG69UtZZ5R74AqNSXRYh8yUuIGpV8FDDWcdVshR7lJO ud8RU7KqCzVcV5rMG4Nbmwt/FwZVPDlyxK+nBEwUg/8vXpMuwlr8PUzX+1hiboXF2NEJ nZ4Nu1oUzek7wlaIZjxu/o3ZHnNPjJaSzTDCc9apCxXDRgAxYL+MH/Ge43MbdLJFxmYm QRJSYlgHF15tzT/pnn95AScFJ8BDfNsu4GDmiQ565xM0Dbyx4AADHTgKi9jxF1APw+P/ UHWyrE0HlrQrtpCZ2/qGum2R1hCn0lB4P7/AaisN7MRRF+CaSJZpfP6J56pSL7n/sKPM OBWw== 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=VFFOiCizJ+mW5k6WnhghvzdFvmIVL76nU3yTXrPInm0=; b=J+s8UBqxs4Y34KQPuBB6A29eb72MldJth0cGtP8AEMsDfFYIEkK3WqU05HUDk560OA OJmpDWgDo99sti+fIIflugeiKXfgI02ER1wcMuYt6eupuXCNQFnqwvV2DCLEheZuyFKN syUWqNsBYYE7TDFemsb8hydGhjoJrv2FP8XV2O/UxbzSOCbOfL7CtBQD21J20H0hoGQ2 tOWZkhjGjCA4zXnftrd/uzYORIHIkh7/mPLD1KMd1kQLXibgy9XeIib1DJCfNzWlfBhI m40pqtj2N5uR/uvBTNT+gguNM06t/3ZvOb4n+XHZ8RGStLAVKRQS3x8BBSW4cMcpKcpS KDTA== X-Gm-Message-State: AOAM531wET6YQmdJcvsu0CC3VWxV2oimor2lWaZK16+PCXgt1XwtRTb7 sVKLqMbq6rR1vgzgjH7bq7NAeu7351E= X-Google-Smtp-Source: ABdhPJwRdFf/h+UGSi2IZWls9PKOqan0JBjUYiv+eqhH8xA4qmKnc1X36AvIDR+rlcXshLQVKX6Tvw== X-Received: by 2002:aa7:d049:: with SMTP id n9mr15933117edo.39.1593524363856; Tue, 30 Jun 2020 06:39:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 09/17] hw/sd/sdcard: Special case the -ENOMEDIUM error Date: Tue, 30 Jun 2020 15:39:03 +0200 Message-Id: <20200630133912.9428-10-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630133912.9428-1-f4bug@amsat.org> References: <20200630133912.9428-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::542; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x542.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) As we have no interest in the underlying block geometry, directly call blk_getlength(). We have to care about machines creating SD card with not drive attached (probably incorrect API use). Simply emit a warning when such Frankenstein cards of zero size are reset. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index e5adcc8055..548745614e 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -545,18 +545,30 @@ static inline uint64_t sd_addr_to_wpnum(uint64_t addr) static void sd_reset(DeviceState *dev) { SDState *sd =3D SD_CARD(dev); - uint64_t size; - uint64_t sect; =20 trace_sdcard_reset(); if (sd->blk) { - blk_get_geometry(sd->blk, §); - } else { - sect =3D 0; - } - size =3D sect << 9; + int64_t size =3D blk_getlength(sd->blk); + + if (size =3D=3D -ENOMEDIUM) { + /* + * FIXME blk should be set once per device in sd_realize(), + * and we shouldn't be checking it in sed_reset(). But this + * is how the reparent currently works. + */ + char *id =3D object_get_canonical_path_component(OBJECT(dev)); + + warn_report("sd-card '%s' created with no drive.", + id ? id : "unknown"); + g_free(id); + size =3D 0; + } + assert(size >=3D 0); + sd->size =3D size; + } else { + sd->size =3D 0; + } =20 - sd->size =3D size; sd->state =3D sd_idle_state; sd->rca =3D 0x0000; sd_set_ocr(sd); --=20 2.21.3 From nobody Fri Apr 19 15:07:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593524642; cv=none; d=zohomail.com; s=zohoarc; b=ccxLUsY7ywMQ5tg0VhnD+4RwT5q9kWiOmw1YUOW94oYoZce+aXM3vdOeASTg/OZYDtvS2L3NY/cRC75uZv1/HjaY5vWMVWgIWRAge4FAXUKV7sss328JJzkR7kzkKnoVxiEtRuHbaHn42vtJjDWIyQxUQaHfYPrJkO2Fa8sBMHc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593524642; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6i321mcNSRw2m36TDk2KcjbjHnC/Dq7f3je0r+sPTKo=; b=keNloiJyRw1AvNmeS2cJQHXHunCVDjXP3goiDw3HGuQBAnwRVJzSswkA2oy0PFN0LxT9f2/eadIYdBtga1ZaC2C4nUkwyzu+3w9Ye5/CZMcX1aoXYPNJYJBR1/57ueA86NgvXs16427cArEpAcVPeiiIqrQpDC/l82lm+51EN7c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593524642234340.6606034172389; Tue, 30 Jun 2020 06:44:02 -0700 (PDT) Received: from localhost ([::1]:39348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqGYK-0008Gg-TB for importer@patchew.org; Tue, 30 Jun 2020 09:44:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqGTw-0001Gg-JU; Tue, 30 Jun 2020 09:39:28 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:33969) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqGTv-0006K8-2U; Tue, 30 Jun 2020 09:39:28 -0400 Received: by mail-ed1-x541.google.com with SMTP id a8so15033840edy.1; Tue, 30 Jun 2020 06:39:26 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p18sm2099172ejm.55.2020.06.30.06.39.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 06:39:24 -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=6i321mcNSRw2m36TDk2KcjbjHnC/Dq7f3je0r+sPTKo=; b=WJZHVbPFMOUj0/HCodmNBPiOdNv0CqHRJBu18vHOef4cN6GdCxnWxbLRan+D8v9tRz QYxoCn79dslUca3ulY+yAPelyVpQsY+cGc8ve8GDTuSbzCsT3KzApqNaVlpfhk4uZTZR klRQdCgItjLcJU2vu+pywgrlt3YuXk6SavHh3Xj2kh5iyamhqDd8P86+ievV9Zugu2on +Ytxl3Fh4ps/d2fl0UWZHPtYxe51Y02CnjRTPW2CyhRvPB2iMF7zOH9w+PiKEHjP+PbK ydTLGgXjMvpQIAVeJIUuNlLcwAWo55IklL7zBDiyiqL7PLTAjbQOHCX2wVBgAUr2/e9B WnoA== 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=6i321mcNSRw2m36TDk2KcjbjHnC/Dq7f3je0r+sPTKo=; b=p3R8mxud1+SDKj4ajzpwwkArPCS04XvgJQDdYOMPtr8qKM0UaSQLBS6kbDsPq4KwRl MroRkXrPRXlG8cgm+8A2mGNym6tehBmRfQxvkzxRgoZsYktPLPIJRPDtFKtabfeiRAo9 fG++1rhDTEZWGUaMaFUSEpCdsy2byCP7dJop9A9hPnwBzbbwULpAKkt7cmAvrOu5zRDW rGXbHZuCm25Dd4Nr9DaEKQmJTWVS/diPwyVpTlsm2zwp+Th5F/qGDlQedYVd9NKwH0TW Yea333Uodvx20IWwq5ML7s5UAS1ZCLUrlA2PMZDJnPv5qd54A1wCc/M/jsVqgn8qfX7r sgGA== X-Gm-Message-State: AOAM532dmY9+jWmHhNwaWP8VzOq2DbN/T9pjHqNTTfrVsxkp79HIU9Do I6IyXEzMzJGHrjSR6JRJQzsJ/u/+xAo= X-Google-Smtp-Source: ABdhPJxGfVf7TQt/b2lQW+csA7wxj4HnHYZaaDrG0EMT03/PzMTsk0nDj8z/v6CCe0XLtoinGEa9eA== X-Received: by 2002:a50:e791:: with SMTP id b17mr24240501edn.366.1593524365176; Tue, 30 Jun 2020 06:39:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 10/17] hw/sd/sdcard: Check address is in range Date: Tue, 30 Jun 2020 15:39:04 +0200 Message-Id: <20200630133912.9428-11-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630133912.9428-1-f4bug@amsat.org> References: <20200630133912.9428-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::541; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x541.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) As a defense, assert if the requested address is out of the card area. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/sd/sd.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 548745614e..5d1b314a32 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -537,8 +537,10 @@ static void sd_response_r7_make(SDState *sd, uint8_t *= response) stl_be_p(response, sd->vhs); } =20 -static inline uint64_t sd_addr_to_wpnum(uint64_t addr) +static uint64_t sd_addr_to_wpnum(SDState *sd, uint64_t addr) { + assert(addr < sd->size); + return addr >> (HWBLOCK_SHIFT + SECTOR_SHIFT + WPGROUP_SHIFT); } =20 @@ -773,8 +775,8 @@ static void sd_erase(SDState *sd) erase_end *=3D HWBLOCK_SIZE; } =20 - erase_start =3D sd_addr_to_wpnum(erase_start); - erase_end =3D sd_addr_to_wpnum(erase_end); + erase_start =3D sd_addr_to_wpnum(sd, erase_start); + erase_end =3D sd_addr_to_wpnum(sd, erase_end); sd->erase_start =3D 0; sd->erase_end =3D 0; sd->csd[14] |=3D 0x40; @@ -791,7 +793,7 @@ static uint32_t sd_wpbits(SDState *sd, uint64_t addr) uint32_t i, wpnum; uint32_t ret =3D 0; =20 - wpnum =3D sd_addr_to_wpnum(addr); + wpnum =3D sd_addr_to_wpnum(sd, addr); =20 for (i =3D 0; i < 32; i++, wpnum++, addr +=3D WPGROUP_SIZE) { if (addr < sd->size && test_bit(wpnum, sd->wp_groups)) { @@ -833,7 +835,7 @@ static void sd_function_switch(SDState *sd, uint32_t ar= g) =20 static inline bool sd_wp_addr(SDState *sd, uint64_t addr) { - return test_bit(sd_addr_to_wpnum(addr), sd->wp_groups); + return test_bit(sd_addr_to_wpnum(sd, addr), sd->wp_groups); } =20 static void sd_lock_command(SDState *sd) @@ -1345,7 +1347,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) } =20 sd->state =3D sd_programming_state; - set_bit(sd_addr_to_wpnum(addr), sd->wp_groups); + set_bit(sd_addr_to_wpnum(sd, addr), sd->wp_groups); /* Bzzzzzzztt .... Operation complete. */ sd->state =3D sd_transfer_state; return sd_r1b; @@ -1364,7 +1366,7 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) } =20 sd->state =3D sd_programming_state; - clear_bit(sd_addr_to_wpnum(addr), sd->wp_groups); + clear_bit(sd_addr_to_wpnum(sd, addr), sd->wp_groups); /* Bzzzzzzztt .... Operation complete. */ sd->state =3D sd_transfer_state; return sd_r1b; --=20 2.21.3 From nobody Fri Apr 19 15:07:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1593524751; cv=none; d=zohomail.com; s=zohoarc; b=a/5NWKNG/qZfsOLEKnX1FmIQclWg7X+JV8aYtgfWOxI01wlFViuAozbw4Zmc4hPc4kCHh6PBcgukwNsV6bHHg8UUDpkvPqVWgSFs5Uil3PkuBLszxO85Eoc4gkk0GcuN0TDZuyR4YL617x8BfDzft5fkwMUAnC6IPZTUx/ow7ow= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593524751; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XqwjlBbJ3fvA8pvvTo8a4BEWNTwUPbni3z+WTf5U/ws=; b=lVlrSsFt711T4ylksfVeDEENSbN2WAEHsKD/1cer0I6g1LlotuT1mt+sgYwkplOV3RqhFLU3J5NAy2pru7KMOiXKG2mxqN6Xd9yM8NjV6BhhL17gF/nfEVu6o+ImefNxh6BkgurrteDU7pASn0HnvJbAD9MghLoTHEt8sZ+qfn0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593524751799265.34639257141623; Tue, 30 Jun 2020 06:45:51 -0700 (PDT) Received: from localhost ([::1]:47000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqGa6-0003DQ-0W for importer@patchew.org; Tue, 30 Jun 2020 09:45:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqGTx-0001Hk-F1; Tue, 30 Jun 2020 09:39:30 -0400 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:39520) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqGTw-0006KN-1s; Tue, 30 Jun 2020 09:39:29 -0400 Received: by mail-ej1-x644.google.com with SMTP id w6so20656581ejq.6; Tue, 30 Jun 2020 06:39:27 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p18sm2099172ejm.55.2020.06.30.06.39.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 06:39:25 -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=XqwjlBbJ3fvA8pvvTo8a4BEWNTwUPbni3z+WTf5U/ws=; b=aRM854uztcoPNwlS6NAx0ri7TbvqffQaO97GKQrnriimWCRkcTe3NH40HaXWUtMeCG mXf+XEz5g6pWFvJ4A1O9KhJetp8QF43qXxZkAcp2SVu5G1IS8HFVGwYxJOXxY2ufPv7w JlGQ/HieZ+0TDoLidm0LfyC6yRdr4+Rp/6r3ldFtXqbGXDaHXonLc3C7rRdE7zOhwng5 J/qPOKORSiyFsinrbxOOVVbcV+E2xGaUNOsTJ4cyErCGrROoCVRDjrBb7wobomKeRhix FFCdLpYNl/xgQ/9GXdkZsUaBEnZVYCsdgTgfAWA5stLkeeFtDpNfniATarWgKNftISvf Rkfw== 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=XqwjlBbJ3fvA8pvvTo8a4BEWNTwUPbni3z+WTf5U/ws=; b=AkLq9g0pkQcwv6LKqXpH4LafoMJrKjS8KJiCGtt0Awko36awsnuorVqcVKIKGJkTS3 TyMiFT9Umj/fm5kCaJnY1bCreKoTzFstlVeuPbNHqUJdQhYBkbSjxV+CjOBsj6l6jhW5 myZ7LEiQ6gYcKEc3m+H99bnlF2K8as58oJtT7pev5qCBvohzA0xNhIl+WR2cTDyPPvCq Zcb0yeRKedoPZIfIfdAky5mEFGNdhgbPEn/9eL6eL38oo8Bm4xWhgamoSkyZA/oymmfh 3Y4R/DKYU1z453b1v5pGG7yqV/li7nJfkLJ7jIaQp32pm1x5QKv77bm8ZH+SylZ8+O8f GwcQ== X-Gm-Message-State: AOAM530fk7/3jYLZtzH9gbBtIm2khOgj6xXNp95MhGr1t0FUn+u6rRpm tQoRaz4eipgtHdEPMUU4Z1nPqO4/uK0= X-Google-Smtp-Source: ABdhPJz/3CAAUu9olncDoAnQzS3yXRUTiL8abT5FHzPXHxbpIz1gsIC9UQ+qvTuzJN6Jiodg2TiC/A== X-Received: by 2002:a17:907:9c6:: with SMTP id bx6mr18313287ejc.43.1593524366235; Tue, 30 Jun 2020 06:39:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 11/17] hw/sd/sdcard: Update the SDState documentation Date: Tue, 30 Jun 2020 15:39:05 +0200 Message-Id: <20200630133912.9428-12-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630133912.9428-1-f4bug@amsat.org> References: <20200630133912.9428-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::644; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x644.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Add more descriptive comments to keep a clear separation between static property vs runtime changeable. Suggested-by: Peter Maydell Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 5d1b314a32..723e66bbf2 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -103,11 +103,14 @@ struct SDState { uint32_t card_status; uint8_t sd_status[64]; =20 - /* Configurable properties */ + /* Static properties */ + uint8_t spec_version; BlockBackend *blk; bool spi; =20 + /* Runtime changeables */ + uint32_t mode; /* current card mode, one of SDCardModes */ int32_t state; /* current card state, one of SDCardStates */ uint32_t vhs; --=20 2.21.3 From nobody Fri Apr 19 15:07:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593524776; cv=none; d=zohomail.com; s=zohoarc; b=C9aKboFfNC6FoTcRQs6xzyxlbvn7x8xZbOCZbO8+fyIu/fb4yMRZbC+idLeQGXTVa1bURrx+43XRjgdeofCfuOJYD77fq1ksng4SpArSV9lYA7LeyMDy3kpdTc4ZdDKDwLZsT0E2oJBrq08MIUHKdzDPIv3jgRQ3JrJXuxJdpCs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593524776; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7oWhhwBqOvLGS6HnYqHl1FI0efPvaFKdOE8O2MKYuLA=; b=A/mwqT/0pdWdLY4YpAAkfVIwehekkpOhtSB0slaKjSck/QFMWw0B2N5DLSJ8ennzmnrzNaXDHIhCgjIKFOFaNVdnNy8tKGWuag5YbwNmamp6Ro+zS5rPHOFsdib3duDIQx0ABh9/aVfRdRWSMOG6Kl8fcytZh+5jnE2gW0t6p+s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593524776482115.07082854418911; Tue, 30 Jun 2020 06:46:16 -0700 (PDT) Received: from localhost ([::1]:48594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqGaV-0004Do-5O for importer@patchew.org; Tue, 30 Jun 2020 09:46:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqGTy-0001Hv-HS; Tue, 30 Jun 2020 09:39:30 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:40715) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqGTx-0006Kb-2M; Tue, 30 Jun 2020 09:39:30 -0400 Received: by mail-ed1-x541.google.com with SMTP id b15so16234116edy.7; Tue, 30 Jun 2020 06:39:28 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p18sm2099172ejm.55.2020.06.30.06.39.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 06:39:26 -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=7oWhhwBqOvLGS6HnYqHl1FI0efPvaFKdOE8O2MKYuLA=; b=L0dm+ZqgiTie6OqdRv2fFH6DqA8j4GmsGBHeZe2v+H0MklGV+lbtTAimlVC3HMiq4w 5MfNxG7MMXXilmRB8FQJsiB7feNbmNrrR3a++y27YKSGNksbLGmNIhBt7eMS5N+BPk69 CtjVXTf1ZP+imlarsz1MrpP0bEaSg3jdA8MrmXOxx6EErgT4DIRZv1lkgT4CHJ7zXEnk VFgPj9eEECTarvHeUNonolmo6LV/ycslhrlU4q6bP3P0FdUWj62TC9FVcT+B/FX28gkR Fm0nVizy+P3HJHmSs3QoGzxcAiTagqwgk0+9gOr9fzs9tYaGos0cGC6TtksMuvFByS4L C7Lw== 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=7oWhhwBqOvLGS6HnYqHl1FI0efPvaFKdOE8O2MKYuLA=; b=qVTteFwfZSNVJ2eGA2PRSTAYqkelZwijDQbWlho8tI1ygvVL+0BR7fRzXcVunJDfPq +41ZJv2ZbVssHp8iMwT3yWpBa12jFiZ2Yur+Rebe5AVKWsIk69D9zum2VsKNjQxpBhvo RLoSp/O07PGeDNvTMeQMHfrQiBqazvg9RLOKBeZ9e6FevaPKk4v13Kxa7jkX5X5Px8RG ZEEvHIkejnqISdi6p6cqWmD1QFBahZZ/ZeYcVDp/Cke7mNITF7W8EhybGUsTyjGEPKoK uwJ+mGQCvbhs2N9l+19MiEDR36DCZWV/CCENEA/HDjgGNcE6DYyanpdfozalGJM+kQUS 4u3g== X-Gm-Message-State: AOAM5328+oIyaVauxXHrpo7kDWwW1y/YivxssIuGALKX/EU/DFkW3605 T3zlD/L0+aGVdeID27Z1Cc6pBDc3q1Y= X-Google-Smtp-Source: ABdhPJwZ7/Rz1K65mRo7TyScy1OmrO0JiOvkn+aoPtLYMsS18Y2iZNioQkqB8INEQ3oksb0VmaMPIw== X-Received: by 2002:a50:fd84:: with SMTP id o4mr4229758edt.117.1593524367335; Tue, 30 Jun 2020 06:39:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 12/17] hw/sd/sdcard: Simplify cmd_valid_while_locked() Date: Tue, 30 Jun 2020 15:39:06 +0200 Message-Id: <20200630133912.9428-13-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630133912.9428-1-f4bug@amsat.org> References: <20200630133912.9428-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::541; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x541.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) cmd_valid_while_locked() only needs to read SDRequest->cmd, pass it directly and make it const. Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sd.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 723e66bbf2..2946fe3040 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1678,7 +1678,7 @@ static sd_rsp_type_t sd_app_command(SDState *sd, return sd_illegal; } =20 -static int cmd_valid_while_locked(SDState *sd, SDRequest *req) +static int cmd_valid_while_locked(SDState *sd, const uint8_t cmd) { /* Valid commands in locked state: * basic class (0) @@ -1689,13 +1689,12 @@ static int cmd_valid_while_locked(SDState *sd, SDRe= quest *req) * Anything else provokes an "illegal command" response. */ if (sd->expecting_acmd) { - return req->cmd =3D=3D 41 || req->cmd =3D=3D 42; + return cmd =3D=3D 41 || cmd =3D=3D 42; } - if (req->cmd =3D=3D 16 || req->cmd =3D=3D 55) { + if (cmd =3D=3D 16 || cmd =3D=3D 55) { return 1; } - return sd_cmd_class[req->cmd] =3D=3D 0 - || sd_cmd_class[req->cmd] =3D=3D 7; + return sd_cmd_class[cmd] =3D=3D 0 || sd_cmd_class[cmd] =3D=3D 7; } =20 int sd_do_command(SDState *sd, SDRequest *req, @@ -1721,7 +1720,7 @@ int sd_do_command(SDState *sd, SDRequest *req, } =20 if (sd->card_status & CARD_IS_LOCKED) { - if (!cmd_valid_while_locked(sd, req)) { + if (!cmd_valid_while_locked(sd, req->cmd)) { sd->card_status |=3D ILLEGAL_COMMAND; sd->expecting_acmd =3D false; qemu_log_mask(LOG_GUEST_ERROR, "SD: Card is locked\n"); --=20 2.21.3 From nobody Fri Apr 19 15:07:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593525011; cv=none; d=zohomail.com; s=zohoarc; b=X1dFn0TlLi3FE1Fbswa3BrcadpHeSFNMleqmBZ+rE+dwF3xIBsfGQElyfHkiSWnwo/uH9X7RJZDRQ0Gcdy8mNoIg6obxTRgYx9h4Ki1BpgUUQWfuMJ8GLOlLc5Dy/3DBQ9DRp+6m/tp36WGoWAFJDc7VepjW61EyGI72Ul8rM4E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593525011; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/74ZOEVtWoI92Rhuv9NWA62JHOdD9/euQUb+Sj4+JZg=; b=aDa7vunGAzVcdyMy39lZQkDc3ZKC/CyY94VX3AoYEdY+cIn7dJ0Vs1m7dP6t+bvajEJzRK0Oe23OI5+P36V53Axt5vRylluViD8J6e1bhoeJtlnfKxSCxaFPXEaE1Uv90guSVEZB7fghb3dsmw/FTY77MsgQWdlk9tDwurA8ePg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593525011633914.0141764305778; Tue, 30 Jun 2020 06:50:11 -0700 (PDT) Received: from localhost ([::1]:37828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqGeI-0003G1-6E for importer@patchew.org; Tue, 30 Jun 2020 09:50:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqGTz-0001KO-SS; Tue, 30 Jun 2020 09:39:31 -0400 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:41732) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqGTy-0006Kw-7Q; Tue, 30 Jun 2020 09:39:31 -0400 Received: by mail-ed1-x544.google.com with SMTP id e22so16227400edq.8; Tue, 30 Jun 2020 06:39:29 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p18sm2099172ejm.55.2020.06.30.06.39.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 06:39:27 -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=/74ZOEVtWoI92Rhuv9NWA62JHOdD9/euQUb+Sj4+JZg=; b=cAIOek2+VUlEPq6VZObms5zcks/UNF8orPh7ODrxUf93whGbPppvaEOUNBNgIjVtwb RnJJj+a10P+abz3HB4QjiMILLCTSI24rjITO7ftpDHypTR8DOiiEcibRZZt63Ilqzcba EobA8YDO+yZG1yEm4piNn/Bbt9tvLnQxlkwuBMAE1gcDJB0zwm3+zh2Bf7IKS82auT89 4tNgB4vnS92LOGUAcEsCY+Idnu32vr336tODo/LknvGOGYBvtHLoTqH3HWaOcSL4/W+Y Q+Xrr+Ut4rtN0OEpHOQO01B/+3pGd+Ea9uwi90XJC4B8M1rLH8Y84C5XM6azBvUnbzbV NB5w== 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=/74ZOEVtWoI92Rhuv9NWA62JHOdD9/euQUb+Sj4+JZg=; b=MOhs38O//AeCM+oZzqMGvwtyEhg7+NrVeWoJoi3Do83A6Y4WtOCXmxySHLCcYjb+k3 TSGgPF0BM37AUPaVZBsHvRXjRRQwLZolHJCt6fBn2VVdDyLMGHXV2/XN77eHssU8k+X+ Tk2+rKmL7/jz85ieYo/SpwYx+V8/d+4L4Aus4yKTNPHieERTO+MjJr250+on3LeudPEx eqfxCBbzPAZyg46GHr0k2e2vcOMuT4vSVyrMaDSW/G6X2PtQg7pw2dJBed5x/D9mNP9m O9P3jkqFaSqPakEPZQLaSMcbsG35Dx9E0b30g6hLZvktDC8PT4+6vPgLELaUP5vG0Zc+ oIsg== X-Gm-Message-State: AOAM533ngooLykBgIBsC9sCcHx8lRu1YaM97Casva4Iq9W1BamjXwOY1 Oprh8y6Tm8u59LvEdX5jJ47si8jzmxk= X-Google-Smtp-Source: ABdhPJwmVWhsHgXMGS5UDv329YVKJlrZm5l0XYS5jrAFMnCZIJaBqp9mxejIJt6y33aYA1cAzbYKoQ== X-Received: by 2002:aa7:c442:: with SMTP id n2mr13672084edr.309.1593524368446; Tue, 30 Jun 2020 06:39:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 13/17] hw/sd/sdcard: Constify sd_crc*()'s message argument Date: Tue, 30 Jun 2020 15:39:07 +0200 Message-Id: <20200630133912.9428-14-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630133912.9428-1-f4bug@amsat.org> References: <20200630133912.9428-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::544; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x544.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) CRC functions don't modify the buffer argument, make it const. Reviewed-by: Alistair Francis Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- hw/sd/sd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 2946fe3040..364a6d1fcd 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -255,11 +255,11 @@ static const int sd_cmd_class[SDMMC_CMD_MAX] =3D { 7, 7, 10, 7, 9, 9, 9, 8, 8, 10, 8, 8, 8, 8, 8, 8, }; =20 -static uint8_t sd_crc7(void *message, size_t width) +static uint8_t sd_crc7(const void *message, size_t width) { int i, bit; uint8_t shift_reg =3D 0x00; - uint8_t *msg =3D (uint8_t *) message; + const uint8_t *msg =3D (const uint8_t *)message; =20 for (i =3D 0; i < width; i ++, msg ++) for (bit =3D 7; bit >=3D 0; bit --) { @@ -271,11 +271,11 @@ static uint8_t sd_crc7(void *message, size_t width) return shift_reg; } =20 -static uint16_t sd_crc16(void *message, size_t width) +static uint16_t sd_crc16(const void *message, size_t width) { int i, bit; uint16_t shift_reg =3D 0x0000; - uint16_t *msg =3D (uint16_t *) message; + const uint16_t *msg =3D (const uint16_t *)message; width <<=3D 1; =20 for (i =3D 0; i < width; i ++, msg ++) --=20 2.21.3 From nobody Fri Apr 19 15:07:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593525157; cv=none; d=zohomail.com; s=zohoarc; b=euhMrt+JQ4AOJt/lYISRtrBb8H4w+UtgmC9XOIvvtU7/4kObN+TqB2QstExMIANQAuWZ6SjBtFfKyd6dZJf42h0mB7drh2uUKuEbJdYxFtBG6Ae0IBtOKiAqnWYNa3E/i2hs6uimaewdyrb7Rhmujo8BMB/RcIU8JF/VUWslR4I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593525157; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8lBaOHF/GcJdlX2f+JY4g5jrg7UGtZKo4oX0j/i7PeY=; b=VGwT6jSKiYNOcadXRc5NcUhu68CtAba8U+Qzl1HUzLdEJowhq+quk2dWpTiozA1SIRcNp6BKZY5vurs5HQ1pAf3lR6gSY01+1ZtZFYGPTUo6vaPk1HkXNToOoIFWg9IG3I4GCDfNc+xElaMYvZfqpzKUdMiHOjd5Svu2psjStSE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593525157748129.53871361760343; Tue, 30 Jun 2020 06:52:37 -0700 (PDT) Received: from localhost ([::1]:46100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqGge-0006l5-EX for importer@patchew.org; Tue, 30 Jun 2020 09:52:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35108) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqGU0-0001L0-V1; Tue, 30 Jun 2020 09:39:33 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]:40666) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqGTz-0006LD-I0; Tue, 30 Jun 2020 09:39:32 -0400 Received: by mail-ed1-x52b.google.com with SMTP id b15so16234309edy.7; Tue, 30 Jun 2020 06:39:30 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p18sm2099172ejm.55.2020.06.30.06.39.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 06:39:29 -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=8lBaOHF/GcJdlX2f+JY4g5jrg7UGtZKo4oX0j/i7PeY=; b=b0iPdTLafCOIL2wYrpU8x/TiYe8AO2FfoQ0xZsbIN7arJ+enWM0QSBBYES+MGeDYMn 4jFiYrXWMH7XblPyxgw5xd+etUZOWpX70rPPLo6eyvigubgsrogySa5AWIfgPZlwYjYf VJJ+e7/gaLkHLAW+U4x4IsMTOfnKM4fJyRPMEgX+FrNWtUhiUUQG20gpW4QEmiGAXwJ/ UxLRkkav34edDP8ysM5HUV8MbM8k6zl4pmcXRYQUZ59QNQ/vbK2MkWsRpUlg1sFo16IG 3m9E8Y0Z/9F3nL9/3j+1rbeOX7rDOXAxbF5BpSD4bPREDpYHBTLoemR8wh3vkWGPbAuA Osug== 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=8lBaOHF/GcJdlX2f+JY4g5jrg7UGtZKo4oX0j/i7PeY=; b=PPRSq6lytkRzb2SBtJxshhBn0D0xm3dROOTUetA1Sq4jQPhouZQfejQ5/S1lca77VV PnapJcfyGYLl8NI5kjWHpXpi2fZYDS6qO3gUN+c6Vwql6QPIlXbeHiW2CMN8wR8xSffT 8PqffXeOEbyWdoRZUFo79beNws25E3AIxLsMxS3fWPJ9nJASE6bt74lf2D7X2OE9+GSI imh9Fxj9p2epQjRHwzhJ+RCATPH3CldQdBAorGz+8MUa0w3M/nP6VloO+LUJB328yiIq 8w3WfI/wJtuMT/KPq/I5TDa/MmVsdxxC3EaEy9ViFZbf3lUIkscQWsdWdC4eNx26OIEq TNkA== X-Gm-Message-State: AOAM532dQ6rREwRCCaBuSzirZolrq9HBcAY866rIVtr6GRVnQLNh8F8j i7GxfXSvSwQCG8Pa4rk3b45M9sXI/w0= X-Google-Smtp-Source: ABdhPJwCxYkNof7NMTt+GqTjBdGAwrEJ2kqlkkf2HuxMgPVhtIUfPtoiItGXWTS/lZZHy5E7skaJmA== X-Received: by 2002:a05:6402:b79:: with SMTP id cb25mr3624013edb.154.1593524369661; Tue, 30 Jun 2020 06:39:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 14/17] hw/sd/sdcard: Make iolen unsigned Date: Tue, 30 Jun 2020 15:39:08 +0200 Message-Id: <20200630133912.9428-15-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630133912.9428-1-f4bug@amsat.org> References: <20200630133912.9428-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x52b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 I/O request length can not be negative. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Reviewed-by: Peter Maydell --- v4: Use uint32_t (pm215) --- hw/sd/sd.c | 2 +- hw/sd/trace-events | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 364a6d1fcd..3e9faa8add 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1981,7 +1981,7 @@ uint8_t sd_read_data(SDState *sd) { /* TODO: Append CRCs */ uint8_t ret; - int io_len; + uint32_t io_len; =20 if (!sd->blk || !blk_is_inserted(sd->blk) || !sd->enable) return 0x00; diff --git a/hw/sd/trace-events b/hw/sd/trace-events index 5f09d32eb2..d0cd7c6ec4 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -52,7 +52,7 @@ sdcard_unlock(void) "" sdcard_read_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x= %x" sdcard_write_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0= x%x" sdcard_write_data(const char *proto, const char *cmd_desc, uint8_t cmd, ui= nt8_t value) "%s %20s/ CMD%02d value 0x%02x" -sdcard_read_data(const char *proto, const char *cmd_desc, uint8_t cmd, int= length) "%s %20s/ CMD%02d len %d" +sdcard_read_data(const char *proto, const char *cmd_desc, uint8_t cmd, uin= t32_t length) "%s %20s/ CMD%02d len %" PRIu32 sdcard_set_voltage(uint16_t millivolts) "%u mV" =20 # milkymist-memcard.c --=20 2.21.3 From nobody Fri Apr 19 15:07:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593525182; cv=none; d=zohomail.com; s=zohoarc; b=SdCad1KXJPBZMi3oGKWtRjORlq8T2N3kMUvTr6c3ysjKSKN0xImglKtkeuWtuPvEJqTdgfCYewNm7QHb15Z2eXbC8MD30ZN8+mn53QDpk8Aharwj5UMKXwC8TQ91t3iPk9Mq+hssPdxuoBHVLEl83x4PHef12X22J0l9vNql0/A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593525182; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Q/J0Q8HRfbG27Ye3g4wwIvBclHiw8k1nTV85awsZwW4=; b=JwZX9WzXbWSumuHfSXtymjEAoJlwUDjZK+8ZxGoicB2MZENDvyi6kg8c9dbsK9Z4Qbi0KhRlSZrhSTA00dIxwSd1HKOmH5g55thFxZF9UytQ9TiyAZFWLWY3oTswJhmAWle1byQ2+v7a+dGfRsD5f5BGYs9v0Z9tPJJWLFTVtDg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593525182326879.880454596033; Tue, 30 Jun 2020 06:53:02 -0700 (PDT) Received: from localhost ([::1]:48354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqGh2-0007eh-PF for importer@patchew.org; Tue, 30 Jun 2020 09:53:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqGU2-0001Ly-8d; Tue, 30 Jun 2020 09:39:34 -0400 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:40988) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqGU0-0006LX-GN; Tue, 30 Jun 2020 09:39:33 -0400 Received: by mail-ej1-x644.google.com with SMTP id dp18so20648044ejc.8; Tue, 30 Jun 2020 06:39:31 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p18sm2099172ejm.55.2020.06.30.06.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 06:39:30 -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=Q/J0Q8HRfbG27Ye3g4wwIvBclHiw8k1nTV85awsZwW4=; b=NG1lPzVcx1qi5mzWzP26qpnLVHTJsZ1UzMnobEnp9qoo4T5eVTrkBgjgm89CTeZ9WH r5WOdEJkNrgVQd0g5p/nr8bVisv5yC9L+tgWVTK/qBvy7OKfVTScwXSHbR37jRJwzxOn ojLT68pprbZ+RKBDZbfL84SToYX/deBIkKHOQAsBz/3HqUAvMOA7pj3/6vMhPXWOoVhm ++DYpPZ713sGSomFKoSS29BrJbDBao6vTGf1CS3sD1rvhc8Kc6+RxxQ0WSrXisCOkZO6 RsjdqBQoyfKkJ5YIavpi7aWz/CFGTzDZ/AlKqVXP1fiw18CDBz7CWIFJmOWRa4XYVfv1 97Qw== 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=Q/J0Q8HRfbG27Ye3g4wwIvBclHiw8k1nTV85awsZwW4=; b=WnrhrNz7xbbGAmbKAqJAliS26s65/AezlQBGuFDKRe+64Y8bj2Pjks64hPXDyUCYNU u7qCCNEHviJ+dJCXRa7f3yXxTk/nkdgaINYC8cgWT2bJvY9p9b7qFM16InQoQa1vc5RZ 5i3MoMoifmmZ8LOJskyykPB7vEf3RhqrDRrsvvxBUSfQboGE/3CE7kre60zCs2l2SmUV xwJBKJzE15ptq1Ee4MyH/iRj0lBLlIBmBDmzMRe7mGUgLYD2pivEl5ghB40vuMF6Rnd3 mYQYi7hKbvPuJBxSj+eUXTzfTD5Hw0Pico2UPe59vmhGG+Aiqp+qWXTqop6RK9lSqukb YBJA== X-Gm-Message-State: AOAM532ZMZJD+XkcB+y44nATzeJkOX44CvJveVND+azil17X5h7NbFMx A/oBWFQvDBOvHvHSHa7nxsHzYNTUDps= X-Google-Smtp-Source: ABdhPJz4CNgwE4fuM8AZTyW7lrVaRSUsZxJwoZYtmlSsEC2Zi8BmWqpQdYrI2Why77sI9Uu6JUUuDA== X-Received: by 2002:a17:906:c102:: with SMTP id do2mr17807190ejc.126.1593524370687; Tue, 30 Jun 2020 06:39:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 15/17] hw/sd/sdcard: Correctly display the command name in trace events Date: Tue, 30 Jun 2020 15:39:09 +0200 Message-Id: <20200630133912.9428-16-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630133912.9428-1-f4bug@amsat.org> References: <20200630133912.9428-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::644; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x644.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Some ACMD were incorrectly displayed. Fix by remembering if we are processing a ACMD (with current_cmd_is_acmd) and add the sd_current_cmd_name() helper, which display to correct name regardless it is a CMD or ACMD. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 3e9faa8add..eb549a52e1 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -125,6 +125,7 @@ struct SDState { uint8_t pwd[16]; uint32_t pwd_len; uint8_t function_group[6]; + bool current_cmd_is_acmd; uint8_t current_cmd; /* True if we will handle the next command as an ACMD. Note that this = does * *not* track the APP_CMD status bit! @@ -1718,6 +1719,8 @@ int sd_do_command(SDState *sd, SDRequest *req, req->cmd); req->cmd &=3D 0x3f; } + sd->current_cmd =3D req->cmd; + sd->current_cmd_is_acmd =3D sd->expecting_acmd; =20 if (sd->card_status & CARD_IS_LOCKED) { if (!cmd_valid_while_locked(sd, req->cmd)) { @@ -1745,7 +1748,6 @@ int sd_do_command(SDState *sd, SDRequest *req, /* Valid command, we can update the 'state before command' bits. * (Do this now so they appear in r1 responses.) */ - sd->current_cmd =3D req->cmd; sd->card_status &=3D ~CURRENT_STATE; sd->card_status |=3D (last_state << 9); } @@ -1806,6 +1808,15 @@ send_response: return rsplen; } =20 +static const char *sd_current_cmd_name(SDState *sd) +{ + if (sd->current_cmd_is_acmd) { + return sd_acmd_name(sd->current_cmd); + } else { + return sd_cmd_name(sd->current_cmd); + } +} + static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len) { trace_sdcard_read_block(addr, len); @@ -1844,7 +1855,7 @@ void sd_write_data(SDState *sd, uint8_t value) return; =20 trace_sdcard_write_data(sd->proto_name, - sd_acmd_name(sd->current_cmd), + sd_current_cmd_name(sd), sd->current_cmd, value); switch (sd->current_cmd) { case 24: /* CMD24: WRITE_SINGLE_BLOCK */ @@ -1998,7 +2009,7 @@ uint8_t sd_read_data(SDState *sd) io_len =3D (sd->ocr & (1 << 30)) ? HWBLOCK_SIZE : sd->blk_len; =20 trace_sdcard_read_data(sd->proto_name, - sd_acmd_name(sd->current_cmd), + sd_current_cmd_name(sd), sd->current_cmd, io_len); switch (sd->current_cmd) { case 6: /* CMD6: SWITCH_FUNCTION */ --=20 2.21.3 From nobody Fri Apr 19 15:07:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593524751; cv=none; d=zohomail.com; s=zohoarc; b=J7LJTdQ5NZ2gSXND2wyrOronhtrjSafoO2a/DfsVqMq4oO8cbM+30nRGmI/Zo2rRQbB9k+1RI5ZUK+edlWrF08u/R4VbOwCEKAT3uE3qIRnfVKoAXGU34y6yiJhEdOUYPYP9ZeYh+aym5IKNvY04LH4PEIQ+1yh7BOvunpLs67s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593524751; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Fnu31sUM9zvsS3/TiKLe1dt5ChbOeregKhQ/Q0EDdI0=; b=CPyA89OOCY1PSnDOfPGu7okc62knjKyGE/v7ghn2GV9s5v13DeUHq8b1qiVM6kYmOF7LY4aPovTMGY7JYgNOR6QXgI3rMGSEV4mJbrxlCBFeiAv3oGb1fhXxWxoAM2DdY1OtWuKC5hdO+PG4/Y8xeVpMi4pkVP03x+20gT9RECc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593524751508677.186187726465; Tue, 30 Jun 2020 06:45:51 -0700 (PDT) Received: from localhost ([::1]:46822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqGa4-00038m-Cz for importer@patchew.org; Tue, 30 Jun 2020 09:45:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35146) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqGU3-0001PN-Qj; Tue, 30 Jun 2020 09:39:35 -0400 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:33341) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqGU2-0006M4-Au; Tue, 30 Jun 2020 09:39:35 -0400 Received: by mail-ej1-x644.google.com with SMTP id n26so6701545ejx.0; Tue, 30 Jun 2020 06:39:33 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p18sm2099172ejm.55.2020.06.30.06.39.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 06:39: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=Fnu31sUM9zvsS3/TiKLe1dt5ChbOeregKhQ/Q0EDdI0=; b=cjZeWm3XxwXcdIgHHZvN1S3ciN6jvmmiHbXGpTxazXZTTzzOkIAvvXFmrNvKKdCPsD agAkjVqsjVrm60Mmex0AW9QexaHl2+k+R0rTN3GaYBOgXvw/gYhfG+XJFx3niXMNbs+8 o30kYoE4XUrBkp1GsgQp5+0HhxssrhfSDjjHgsTp8z6DrE0P7/SChoCYvoIai96ZbuyR jviJc3mzrblEppdq5G8o/Cvje+XjUS8iBPmr9IMbcwOyqZ+QS6TplwbZJsVAErsqmgGv a7LkZVoq/8Zs1Dl2Ye7j1kq1YHMZwK5FxaIY98mNZzsr5h7EIXsXx8jz/TXIeFDDyN+U +edg== 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=Fnu31sUM9zvsS3/TiKLe1dt5ChbOeregKhQ/Q0EDdI0=; b=Hk/1P1Ff4d1AB8LX5Rh9NIQsOWG3oJQufmw7qIudL+flPQafx4UR7SSeEWA+0rZhho SHgNEaSOd9TXq5yfDC9IQ9p2XUOM61/ZcFfg7Pepl8hlcMFvRF666ButaCv+emz7BHpa HWmVdf512E3icYtiiC+i5dYn5yQGZPcH5KLsgdPb9wgazr6Js2Je35nnyv0i/uBj3gwp NPQSSXUM0qASjxFkTdbW6bTy+M5VuuiAiKnqhM68Qq2IpAjWf+rka9E0QLcwD/dOYa8E gFUhXOWs4LG+Wca6onF8F6+oXDHwt/V5M8Hj83JawQgPduNzN7tmo8mYvZOIsbJh6H5R SPTQ== X-Gm-Message-State: AOAM530/4hYRiVWqEojNvSUNw1qur3FnFPvOr7TgQJb/nynu+o7W2bWj 1/k1qK6rCIhkuoLprlTSDSnjlR56jqY= X-Google-Smtp-Source: ABdhPJxydxn/pCahXiVYXGFb8g/rl44wVsJY/xzM1Q1QUAY3XF8vpvgIm5VWMqbDsYmsidvDAJDZ/g== X-Received: by 2002:a17:906:c40d:: with SMTP id u13mr17642770ejz.519.1593524371803; Tue, 30 Jun 2020 06:39:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 16/17] hw/sd/sdcard: Display offset in read/write_data() trace events Date: Tue, 30 Jun 2020 15:39:10 +0200 Message-Id: <20200630133912.9428-17-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630133912.9428-1-f4bug@amsat.org> References: <20200630133912.9428-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::644; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x644.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Having 'base address' and 'relative offset' displayed separately is more helpful than the absolute address. Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sd.c | 8 ++++---- hw/sd/trace-events | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index eb549a52e1..304fa4143a 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1855,8 +1855,8 @@ void sd_write_data(SDState *sd, uint8_t value) return; =20 trace_sdcard_write_data(sd->proto_name, - sd_current_cmd_name(sd), - sd->current_cmd, value); + sd_current_cmd_name(sd), sd->current_cmd, + sd->data_start, sd->data_offset, value); switch (sd->current_cmd) { case 24: /* CMD24: WRITE_SINGLE_BLOCK */ sd->data[sd->data_offset ++] =3D value; @@ -2009,8 +2009,8 @@ uint8_t sd_read_data(SDState *sd) io_len =3D (sd->ocr & (1 << 30)) ? HWBLOCK_SIZE : sd->blk_len; =20 trace_sdcard_read_data(sd->proto_name, - sd_current_cmd_name(sd), - sd->current_cmd, io_len); + sd_current_cmd_name(sd), sd->current_cmd, + sd->data_start, sd->data_offset, io_len); switch (sd->current_cmd) { case 6: /* CMD6: SWITCH_FUNCTION */ ret =3D sd->data[sd->data_offset ++]; diff --git a/hw/sd/trace-events b/hw/sd/trace-events index d0cd7c6ec4..946923223b 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -51,8 +51,8 @@ sdcard_lock(void) "" sdcard_unlock(void) "" sdcard_read_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x= %x" sdcard_write_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0= x%x" -sdcard_write_data(const char *proto, const char *cmd_desc, uint8_t cmd, ui= nt8_t value) "%s %20s/ CMD%02d value 0x%02x" -sdcard_read_data(const char *proto, const char *cmd_desc, uint8_t cmd, uin= t32_t length) "%s %20s/ CMD%02d len %" PRIu32 +sdcard_write_data(const char *proto, const char *cmd_desc, uint8_t cmd, ui= nt64_t address, uint32_t offset, uint8_t value) "%s %20s/ CMD%02d addr 0x%"= PRIx64 " ofs 0x%" PRIx32 " val 0x%02x" +sdcard_read_data(const char *proto, const char *cmd_desc, uint8_t cmd, uin= t64_t address, uint32_t offset, uint32_t length) "%s %20s/ CMD%02d addr 0x%= " PRIx64 " ofs 0x%" PRIx32 " len %" PRIu32 sdcard_set_voltage(uint16_t millivolts) "%u mV" =20 # milkymist-memcard.c --=20 2.21.3 From nobody Fri Apr 19 15:07:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593524866; cv=none; d=zohomail.com; s=zohoarc; b=OEmHf60Cl8F3px2AnwkeQdv8Hu87Jpp1mX30yvx3cUvBrCVxyyb4cGTL6ir6U0jhkbsi9SL53dUBZO5qmdhb/qejn2ODCg/SS09SQexek/slbO11cL8xVtPxrbc7rxWolk7lXzF5iOxCCYLKLK11UgL7C9jqJFnYAehvZvrAIqM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593524866; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tv3cmbEAPQXfnR101UMsB/BGFDSkA4UlLHtuhpdSRTY=; b=FfGAq8ldPutlA9dglKDNNZUWysoiVUiqKgv9uI3KQJ7Gv0LgbRKuR/zTAmCMEgPNAHErjv9+0i2KC9DU2F8mNp5BvdAUeEuaX31ReX/o9J1eTmAbLy4a+g4u+TtCS99mTR/4EysOS4gqJQJHWLCSCB4EcXMdZpsS50liN83bQcA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159352486697089.64103669578219; Tue, 30 Jun 2020 06:47:46 -0700 (PDT) Received: from localhost ([::1]:55402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqGbx-000740-Nr for importer@patchew.org; Tue, 30 Jun 2020 09:47:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqGU4-0001Qf-D1; Tue, 30 Jun 2020 09:39:36 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:33339) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqGU2-0006MC-Qs; Tue, 30 Jun 2020 09:39:36 -0400 Received: by mail-ej1-x641.google.com with SMTP id n26so6701580ejx.0; Tue, 30 Jun 2020 06:39:34 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id p18sm2099172ejm.55.2020.06.30.06.39.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 06:39:32 -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=tv3cmbEAPQXfnR101UMsB/BGFDSkA4UlLHtuhpdSRTY=; b=RZwld1LpTlMivvRFtSgkkewYWAozjm9c+mZhg+8hyFNdCAYhhViSqsMRKMh3IR+LBy 0+3/b6lnT070B980UAtoCmriTlp/UywBCkcKUyjBxnBa55iYV4MlXbKHy21MdHhwWrTF 1Byys60KyVshW292Ee9bCCg8KE+EqSNPWpvK19EH7CdGV4DnGmLck9M57nKTi3bPTwaF bNHb9g4LJZacdU6kEY4yJfJgRkViTRqEjyvDs5Teg5Y59kxM/uT8coMrcx/Q7bzmkDAq XJHs0uyyAnAnGKO8Ppx5K/ORHho/mVk9IxLlTpkrNoQFe5cF3OCfbiTnLJtEjrFT50v/ pCFg== 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=tv3cmbEAPQXfnR101UMsB/BGFDSkA4UlLHtuhpdSRTY=; b=WW9a7yVnzML1V0UppFJTjEt+U5dWbt3Ha9ox0vUwRRpZsOT4tmpkAAjixd29g8dZ0E zm+JEr79DRIj0oAqjZC89Fb42mldk/bks5VAQsTWtFLf43YYrEPiQv8v/iOClfexxPOn p2kAjbv7Hl4/+hlDKYWkrGniitFYNWSKwZMa7UpeaIVJWMVu8gRS21r4LFVy9JC1twMR rf22WX3coLslN5+V8Bl3LFqVlIatB4tPtgZ09YEO31VtPxbviQY9l3zdgSsHMeOFBL3L LcVZ1G4LvIagfcFCOHTBhV4Rv2JxVxu9o7RJEqozEBVv3CdPjvMxaTnqgjnQrLrzBkDT iKCw== X-Gm-Message-State: AOAM533Qy4HFBSqczw4UfRg9aqbguFcBpVuytmRD64kzcPnaUg0FfP2q sE2bqBQtxHTTJ1VprS6SvvUGFzzDIQo= X-Google-Smtp-Source: ABdhPJxprMXSEY422d+55cynJZbdJ2JJRydkzFCARpZUc4WY2Z2+H9HW8zezDTdqbSzrgBRGSsIChQ== X-Received: by 2002:a17:906:1f4f:: with SMTP id d15mr18121720ejk.206.1593524372900; Tue, 30 Jun 2020 06:39:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v7 17/17] hw/sd/sdcard: Simplify realize() a bit Date: Tue, 30 Jun 2020 15:39:11 +0200 Message-Id: <20200630133912.9428-18-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630133912.9428-1-f4bug@amsat.org> References: <20200630133912.9428-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::641; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-x641.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We don't need to check if sd->blk is set twice. Reviewed-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 304fa4143a..8ef6715665 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -2154,12 +2154,12 @@ static void sd_realize(DeviceState *dev, Error **er= rp) return; } =20 - if (sd->blk && blk_is_read_only(sd->blk)) { - error_setg(errp, "Cannot use read-only drive as SD card"); - return; - } - if (sd->blk) { + if (blk_is_read_only(sd->blk)) { + error_setg(errp, "Cannot use read-only drive as SD card"); + return; + } + ret =3D blk_set_perm(sd->blk, BLK_PERM_CONSISTENT_READ | BLK_PERM_= WRITE, BLK_PERM_ALL, errp); if (ret < 0) { --=20 2.21.3