From nobody Thu May 2 01:08:07 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=1593189737; cv=none; d=zohomail.com; s=zohoarc; b=YTydtq8RL2jr3W3TaZQnOltXBb74MXxg7gaehIO+9hB2zUdXD3WWl9ZK7n2isp3CAIZZPYXRfh7bhONyeZ3CMbSoq74WY71yLURIljoRl9gN9sy8amQvUeoK+WctXtZwitQrzZDAa53eJzXkSnGw2eq8S4ESVQQ3sZDFEF0qUf8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593189737; 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=VaBeUAKeU/Fm4s8wzR3hU4H0t6OdWhihwFpjUJ3q1zc=; b=G0o3ECcFPhciuB0OFGCLJS9Dx4oT4+0cPjNql/c2qCwXO26CAIsYIgahFsZDdt+1tEYPTiDHoZ9XSWcPd1o4yMtFWiA4oUdpGF+JNfw03z9CVvYNY32n7m3TSSKBlcZHae6jJPpWj+sDdXbhzpy6De82xLlCiEYXna2JaURsasA= 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 1593189737592954.1846809969799; Fri, 26 Jun 2020 09:42:17 -0700 (PDT) Received: from localhost ([::1]:46568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jorQe-00022O-7V for importer@patchew.org; Fri, 26 Jun 2020 12:42:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57138) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jorOz-000095-Cs; Fri, 26 Jun 2020 12:40:34 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:40839) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jorOx-00060C-UR; Fri, 26 Jun 2020 12:40:33 -0400 Received: by mail-wm1-x341.google.com with SMTP id f139so9955636wmf.5; Fri, 26 Jun 2020 09:40:31 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id f12sm24623646wrw.53.2020.06.26.09.40.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 09:40: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=VaBeUAKeU/Fm4s8wzR3hU4H0t6OdWhihwFpjUJ3q1zc=; b=Ng6BJikdvB8LzBCPa9mn2RSe91/E/ECsqj6YtFgVSJwrzTDvBExtg/Et/ltGexKDPw CFjE4ZUQsmwI72nawN/h5CBvLQLvF7lJagP9uj7X1ekv/D81LDZPL23Ug3xpxOhQ+By2 aIF9yTjoP5cREs8OAsunsKES79Hihen1yg+x48jtQ3BM5X+dieliKDcNMMY9kPcRv1Uu rVkGTFIu0NwJk39Tip6fSFuKpt3csMxEwTjuWAD08ebXEolMoDT62ffEFZAdxD9UAtbr 7fYW4pL7a9JQShVba6V3/p9YPSSwNOj08X0JRueT1ZHdL52qP8pA+87gCVAVUK/2cImU 9FUg== 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=VaBeUAKeU/Fm4s8wzR3hU4H0t6OdWhihwFpjUJ3q1zc=; b=r4/+GXduHQJqrfwg/Q2b+Ka+pfxR9gjFt5zD8LcUtyrhpcjEIDGJg0Fwg4Qum8GnPN xOaVF+wwJs9h1baHPTLlbLsHj0beeT1ddvehby63ALoz2jtNarE/LjJVJjDr2muRAD4a HmW7yPBmPmZYyrX/agfqQczRuGnpy/pgEfqT1NxY9LmWqOJ/13IIowglR54PW1Ky9Mrx YIUsqjD2/cnp24pCu09i7lAxi6T6AcJrLm9H2vkWolRSdAPYSL1RYETKxXj0LdPFFg6K GozuHecMM9+KKKbKmNvn8EAOns/RA91s7eRFFd7tc3EJK227MqPE00ApgpRQw0Vgg1Uu IcYA== X-Gm-Message-State: AOAM531Jr0ARMjQrxsfB8wS8frAZI/LwJ5wnP/GhoHTep3hzmdhA87H2 ogudXBqR7EojfBNoO9O1dStam4sB X-Google-Smtp-Source: ABdhPJxO/UWo/gr1Bm+nEy+GofiC17JewdT32AAcMdA4ann0CEoqV9SmYQRD9Q34u2fOiJP9Q957Uw== X-Received: by 2002:a1c:4d05:: with SMTP id o5mr4323087wmh.130.1593189629946; Fri, 26 Jun 2020 09:40:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 01/15] MAINTAINERS: Cc qemu-block mailing list Date: Fri, 26 Jun 2020 18:40:12 +0200 Message-Id: <20200626164026.766-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200626164026.766-1-f4bug@amsat.org> References: <20200626164026.766-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::341; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x341.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 --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 1b40446c73..d9695a2cb3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1622,6 +1622,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 Thu May 2 01:08:07 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=1593189735; cv=none; d=zohomail.com; s=zohoarc; b=IxAofMAV98LKg3t5yceQVHVJuWr9kbq0uRgrO412adyTxLIp7DMb/WHUGQ6z6QBuOH4mo8uIGofK3bt+537npsVItByhdYvctdeSguw5SI4Z3z0T8L/dewCbaGaPHjhkv00ukJtqS3GBsW8T8iWNscWX4ufOQDsezHR0/MVdpA0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593189735; 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=lNUrJuu3l+f7AmS2E+4uDrQPCZm7OVe1ShMdl0rhzWSqGV6tNNdOv98C67bH9hNqF12dG9GiH+YudfTjgMScrfp1plzR5CgjfhRplfnM4YCwW12S79DK7UKWQWKzpf5JrESHCF/gTKHW/vTt8bBSubcbkppaITBbyM5vyS1/BBE= 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 1593189735621710.8674346072202; Fri, 26 Jun 2020 09:42:15 -0700 (PDT) Received: from localhost ([::1]:46396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jorQc-0001y1-Bn for importer@patchew.org; Fri, 26 Jun 2020 12:42:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jorP0-00009d-FY; Fri, 26 Jun 2020 12:40:34 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:54757) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jorOz-00060y-0S; Fri, 26 Jun 2020 12:40:34 -0400 Received: by mail-wm1-x342.google.com with SMTP id o8so9407571wmh.4; Fri, 26 Jun 2020 09:40:32 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id f12sm24623646wrw.53.2020.06.26.09.40.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 09:40: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=MjRNdoa0rZpF8KkV/ND0ssqMkJTZ9vSTBVaUds1+aIY=; b=uCb9xuHE8MQXOv+/Ei8FmzjMOikpF/m4fEqifA9IaHPVT3wjFiFBed2XZYcRI2x/+E To5p6df7TP0PBYNsl68si/ZZJySD/Uk0l1K4RTzyyjBSZWqaN01ujQT+9AK2w2cnTe2P rXiMNd4dw1qtAKyimhT8peXS15LJoKQon8EP9klrDimh2NARdYP7qYZCFBQ9gGRC8rth QKUt5II4RJ2uOiS2pvwAVuebrDHOhNj/8Y1S8ZZIKJYupWXnzPgtXfW8wCeMxeFPp2w0 vJmWfS0SPytUgyxXVSSB0IL1DteuQB9Y4tWM8W2OvhegyalGyvzvfA50ViYYDR1rlg++ +qpQ== 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=Z2nm9HrMH8P5PYoO6sxdW7p1VGjAtKcvZKZlqGRLruhUH0DsGMITX101VexBvmduBO VqcZVELta6TmbtsQe54PAAZEiKBWedM3oFhCG4lC6i598faBVKlmWDywqVefwFp/2SC9 rrLodqb/wKhgH8civ/GjRjYcR4gfCq4ctj1+GvfQ2YrWWOyn+fFwN5eOqKR1WVUVodRw NmrBPpeK4bMTuqAlcNOiM5ZEXGIqE5J0/A26NxO5aFVJXS7myQohMc/YS+DWAJBYSud1 YRtnj1NM3FBLFl0v2raeJKtCIEz3JzUjQFJO2PYWi7mzWc8picdRE4LOT1T/+Xu0Jq3B OgQQ== X-Gm-Message-State: AOAM530Jad6NNhIcbWLdXMU+8G4mFqwZ+yflxC7E8cpcXFTv1MEtUzYj GohmYqQnqoGUZJnLmhNDkSSI4ZcS X-Google-Smtp-Source: ABdhPJzGDnjXwPamD3tuFV8jgjnEpA3RXHctIpg58RG7e/2qrVEKT46DkUGOFy2FEguP26RWk+Rxpw== X-Received: by 2002:a7b:ce87:: with SMTP id q7mr4541569wmj.39.1593189631138; Fri, 26 Jun 2020 09:40:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 02/15] hw/sd/sdcard: Update coding style to make checkpatch.pl happy Date: Fri, 26 Jun 2020 18:40:13 +0200 Message-Id: <20200626164026.766-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200626164026.766-1-f4bug@amsat.org> References: <20200626164026.766-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::342; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x342.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 --- 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 Thu May 2 01:08:07 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=1593189923; cv=none; d=zohomail.com; s=zohoarc; b=cCFr+XgO+jtV0qwJb5nJvDxJGXO3nd2tk0wzY7bTnAVs5SPYESRHt78pGYvoibdy9s0fze1l+Kf6/jjCIxO157ZtpimVc2KjROVAD+UthYb4I1awlRHscAgra5gybVmIbFWKPyjvlP7q7snn6UmF5tEh+3Jx/LIt+M7fHH+00jo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593189923; 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=XDn9kp7qjrK37skyIk5AQiD2fyTD+VYGKFpI2Cwr+sC5orpMoHN6jjaKeeIMW3jmsFfGYrBHukPAo2bYPIxit14P3QOFfCV4z3YzxuId0JIwV6/EQdLnGo71mIlnkhx7fkDkUvUGZCaFSJLZ2MVmSoTHVHKrakd2tY4T2LKYWSo= 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 1593189923154982.5395115548415; Fri, 26 Jun 2020 09:45:23 -0700 (PDT) Received: from localhost ([::1]:35502 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jorTd-0000gu-Fn for importer@patchew.org; Fri, 26 Jun 2020 12:45:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jorP1-0000AN-UI; Fri, 26 Jun 2020 12:40:36 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:35869) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jorP0-000624-HO; Fri, 26 Jun 2020 12:40:35 -0400 Received: by mail-wm1-x342.google.com with SMTP id 17so9961194wmo.1; Fri, 26 Jun 2020 09:40:33 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id f12sm24623646wrw.53.2020.06.26.09.40.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 09:40: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=NATlEi/FrWfP9Y28UrUe6cx6ZnLH5i2MWU0fBA6ejkY=; b=lrPCUCdQZAKyBm80BbdG4hAp8m1tGZNNsDUIFMkMCHfb62uNLj1QH/xaJTtVVDoKCr hmObZII7yaHzPyKybahOU5vUH2DzWCYLnDu5Ns7H5MqB1p02/oYf2C4WBLCOfFIf7h3n sj1H6W5fmkbE8X/1Jfl8rke2uzfzn2A456VUHwYkkrEUvW6oF7E+pDYs3Ra4fum52ehM BcB77i9ZHgIjMdO6Uyo2Mt/+TKCI5WHtEZIFk34Eu5uW98cGF061KDin8Fr4UknkoM3v Pxd9gKehcMJw/NQXn+rdr2uz16dY0YrKFid/yg07c3rf0DFNUFMhtLXfOL3rsyce4paD nWTw== 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=gIXV3SGTWwga6hmiOuFThvDh1TD6OkIowjQXT1isza8fmEO0F7bP5VBY6cnq+1dlPy 5PgiUkko4oeSwQ2Q9mZWfp0/+9eiqnMmGoQK17a4t7CERzSo5xHkm1pIYSLg6IA5+fwe NIx9gadY6OYVx5BDqXB9Ae0yVKXxv/mmxWjlgad75mnlXnkCPFAtxwRnE4RGI9SJq2FP 7Jy4p5fl6adz+vPlj0Ebj0q5cxurqAD0+N9ITIujP3RcpWhl+JKxQPUQPRUmYFglbBKA TU8dhFFJDiQbgLpMRJjm+2mUNZMFB5vJVHtUg+qHNsx5hYaU4hZUB9oiqCqpo8AVMEBm 2OHA== X-Gm-Message-State: AOAM5334wE9pmB1KLRJEsHWhkL335tp/mKhJEelcN/vl9v6L3iciOfLy t9em6JGcEpOUTcd/ELAm9CnCDCur X-Google-Smtp-Source: ABdhPJyE8/oov+Yo7hoe2tmnzQQIp04aiKT1lLxD9CPQjgXBtPOSak3fTUOWvXUJ1EIwLaUjX6312A== X-Received: by 2002:a1c:bb89:: with SMTP id l131mr1497535wmf.125.1593189632280; Fri, 26 Jun 2020 09:40:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 03/15] hw/sd/sdcard: Move some definitions to use them earlier Date: Fri, 26 Jun 2020 18:40:14 +0200 Message-Id: <20200626164026.766-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200626164026.766-1-f4bug@amsat.org> References: <20200626164026.766-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::342; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x342.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 --- 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 Thu May 2 01:08:07 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=1593189876; cv=none; d=zohomail.com; s=zohoarc; b=N/cM56u11tIdm7IKRmAU1StizRCHGPXsW6tReBmTuyDIonMaia9kJtDtoy3b7wGvEzDrx3AKi7EJxfHzqLcvn2uh3FVjxgkzabFAVrykNPIOahWToakhFQZZ2iM0omEhMRY5MzrcgbQFEzeKIS9OT8MX/tFxoyjSCTTPFRInVJQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593189876; 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=ctTtjNAjiRsGI3jz8ImeTusKP3QeqUjIxtAs5WytXADnaEeEX4RncH6QMrOG+sQpJqcB2TuSzt8v0z8J6dbnTU3fesxQreGeUeZVXYBoDqzNbk0JegiUyGqZaro1AIu7Xi8JKXW8XFDtx44cSwcT2LHn16StC4KI0udkwb9j2Rg= 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 15931898763141002.133503195446; Fri, 26 Jun 2020 09:44:36 -0700 (PDT) Received: from localhost ([::1]:59120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jorSt-0007Bn-1R for importer@patchew.org; Fri, 26 Jun 2020 12:44:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jorP2-0000Bl-Uz; Fri, 26 Jun 2020 12:40:36 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:32824) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jorP1-00063e-EE; Fri, 26 Jun 2020 12:40:36 -0400 Received: by mail-wr1-x444.google.com with SMTP id f18so2051099wrs.0; Fri, 26 Jun 2020 09:40:34 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id f12sm24623646wrw.53.2020.06.26.09.40.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 09:40:33 -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=W3K2Q4y2qDU44ulfxHCRH0KyRak+lLK3bC38voxVslIUvmvNupChJmUHrLFVbjjCXY CyCP4ENRXOR7Lj+R0yzizDXSpreQpoeJsaO1IeNgRVa9R0tZA9Rxzxs0P6QyF0a4aIli Uq05UUswjyCRWXDWW7knMqHo+OjmtIqhIE6Jh4RCDiDPCW1emis16uwT3ArX3iEiU+d9 OzalJGIZZoW109vYdJf5Z5biOxaj8w5Zr6+V1mcEINg2raAAgORHGynzjeinsbSWNVLG AvgzACT6xsvJ+xSvBa6pPJFdBY+jJMsaGIk9kCcCK/nLDRfjAEzXXHcksQUGPkwsDB2R FvWQ== 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=kPlL9hTUe8L1A/x2dvZ8k4h4INCYKm6E8PGFDNTYV3nTJ4rhRRMaHAP7KMtfWcuVrL rM4PGDjQ0a5Fzn6B5OHnk0dgsEahrl1+kfRcObHCk/vjnZ5jRcuAxIRK7diIAwGFi1MM JenW3zUeQe6lzTa3jfzsdDSU11r+xj9xfXsuVbD4yvnv5UmzZAtpwSO9d3oRUgF567lH g52mUS3Edqf2p7Uq4y0GTa6e4XkEhOEVGdp5AB99K5i6bwIfTaIMN+Ya7TXrMWPOnGH6 SIWybwmsywpmIOGuiMv6SF/4oIy8Lebif4cKZQJWvyOqlHgzTG1sKkHyoafUwe8PoTo5 cToQ== X-Gm-Message-State: AOAM530f9niVmyY5q9dR+7WbEmxa89E/tyEw9PRPiqAYwa6bGJ/bRrTT wGEIDcbCnXUFkSZ51DGn+k6byIzI X-Google-Smtp-Source: ABdhPJzQetAz7tlH5J19bKZzCLEcB5GO2eV0SpayrGEeY4037Ye0Vx4fR+n/9WVMQWeekJBkenKfpA== X-Received: by 2002:adf:e60e:: with SMTP id p14mr4546743wrm.31.1593189633565; Fri, 26 Jun 2020 09:40:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 04/15] hw/sd/sdcard: Use the HWBLOCK_SIZE definition Date: Fri, 26 Jun 2020 18:40:15 +0200 Message-Id: <20200626164026.766-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200626164026.766-1-f4bug@amsat.org> References: <20200626164026.766-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::444; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x444.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 --- 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 Thu May 2 01:08:07 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=1593189983; cv=none; d=zohomail.com; s=zohoarc; b=n7KxE0A/f1rqBs1oZH483ifb9lS5j1yxDNFhesc2jw3FP7ng85ebZQQBuN5+3XQAVZk3ruM5KaQvEcMnt/Q00IwWGXatKGbpmU8z7IGEKDn0DhBP16PmPt67mLpM6kJiyYmg75k84MK9wVNDMEDJrhIERMISRcngWoAKJL+AB7M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593189983; 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=bluiv4CXu7VgSZd381lXwF4TtcBiMve+41KuCFYcxfL7PnDIspheRymxZgIdfEdatYDrc1GANJGcQ1BZDBa8eHcWj2uh6ACxGLQwymv6ZOlzeAbnT4lVp79wF8zCUmQB04xFL7T9ezEsjRXVjtTxrpH4WG0Np5diYjMvYoX0ALM= 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 1593189983843891.896315193857; Fri, 26 Jun 2020 09:46:23 -0700 (PDT) Received: from localhost ([::1]:39918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jorUc-0002jm-F4 for importer@patchew.org; Fri, 26 Jun 2020 12:46:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jorP5-0000EJ-5Z; Fri, 26 Jun 2020 12:40:39 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:32822) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jorP2-00064P-Sv; Fri, 26 Jun 2020 12:40:38 -0400 Received: by mail-wr1-x441.google.com with SMTP id f18so2051158wrs.0; Fri, 26 Jun 2020 09:40:36 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id f12sm24623646wrw.53.2020.06.26.09.40.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 09:40:34 -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=sFpqFS17yQY79QZJMC3kh2U9izuekgcjP82dQoSZ/wCDhEqUPF0ztyG4JEgyv/pKDy WLKTt/AUhN2GzIQuXJNtY1XWDpbblALFqJu7rN32OXinwFZE9gD6VxpCbuTszk9tFE/f NdZlNS/pwQBAD7ss+VTdu6dT38xXiBW1ysO4VPEqw46WNgl3dE4VqkJYQZWw7LWHAnjG D11CriLzCs05Xh0+gXIhZn3EnV0PiEi14wrTJLEnCYY5Ki8XmtPS3dnSI3y0Rq4sWUba +Oa52s3Jsv2OyARs66W8XCIRXLz3MNJkDYNpHhlkMzWMcG1MPvl3Ge7NUJ6c2B35c1VU j51g== 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=VZ/hrtGN01/+cp4N1goitstJR3GiaTCtPwh4ZBRKWjigbHmlg8fxKhi4dguT5T34dk l11sBEjtZH9tcG1/G63AngawF/AvvQMYynml8miBicMUtUdzRZi+abimLvJADAnbg8rN yb0VgCn17re6pQw5BTk/+cPuLNzF5EC/BCDgrLCKH+veFBMWha1v0Aco+lVxOjrfWvVj c+yBRIB7TbpQuVo5ZeuXPiNv27TYRb3D1Czn8m/HrdhFbxgrTyelWaFFIBsItTd+/7O4 k6K4/R1c6r2ShOz5qXEWHl4va5URhVo6uGCmLV1fx0V073T8J8gG+6+m+fDCfZ+GvwUV u80g== X-Gm-Message-State: AOAM531GGBmnZr3b++IZ/zZKBBBlJOs6RJpI/9afQWXIlGrskyTVPqkT p1mcY6n5JaalW3rtdlwUm/v4VG38 X-Google-Smtp-Source: ABdhPJx0C6QgEFKTkcI8cBFl7F6ZZ9L4w1OVnliVkgzuQ97DLvG/cn1Xn592mb0DKG/1fzf7y36dhQ== X-Received: by 2002:a5d:6b08:: with SMTP id v8mr4885683wrw.2.1593189634749; Fri, 26 Jun 2020 09:40:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 05/15] hw/sd/sdcard: Do not switch to ReceivingData if address is invalid Date: Fri, 26 Jun 2020 18:40:16 +0200 Message-Id: <20200626164026.766-6-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200626164026.766-1-f4bug@amsat.org> References: <20200626164026.766-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::441; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x441.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 --- 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 Thu May 2 01:08:07 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=1593189820; cv=none; d=zohomail.com; s=zohoarc; b=YH2hKHboLXK5FNeoTdF4m9oAz01ltUhMdeoNKnH9dc1e1doA4Yu/bbNTlw+xTN+tMdHzmJR1b576cYLwnGRsUqZLsmO+/g2W17suFtjtFj3wdHIPvwELKQ4vcx3Orv2+nW08INniSadM1h3DIlb3PMzKqry2aTy0a73MZVr31hw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593189820; 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=A0xhetzZ+NrlbRAjY7ASMbcjA4xqXrLGOSmzukegBIAPOHaQuKoQrm70vOk6u6cNYcdx+LEL2+FWh5R/B6KgpDxXyriClJHuuxFQPdELp+zS2p44NGdRs9Am3vE4rHJbxIwiIL0e2t7WxIfc8L3Y25FxOsK+LbVnsPEce/tjWP4= 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 1593189820809523.9856699624512; Fri, 26 Jun 2020 09:43:40 -0700 (PDT) Received: from localhost ([::1]:54884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jorRz-0005ND-Ca for importer@patchew.org; Fri, 26 Jun 2020 12:43:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jorP6-0000Ez-BH; Fri, 26 Jun 2020 12:40:41 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:41804) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jorP4-00064t-1M; Fri, 26 Jun 2020 12:40:39 -0400 Received: by mail-wr1-x443.google.com with SMTP id h15so10103321wrq.8; Fri, 26 Jun 2020 09:40:37 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id f12sm24623646wrw.53.2020.06.26.09.40.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 09:40:35 -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=txwXMu4XvTfD1f8pUQtQk9yXebkKYepKvggw1Vy3cu4GclrXThTd6ud0foK3bRYntS 6wtabgp+67wFTD0dMNy6CD6qkcRi8rCb+FC/ZBl4t207YvdHOCC5oiFpTQPVGh6+qnCm LlHOOw7WMqZaTBUpO9MBu5ykhC3jcIVt6SGzocvRnmbvRx4t7o/mGb/fsHyKG6XGMTnk YfG6SWbnMyRY6TO/I7uiXH9gK/mQbHFw51WeF2gxAzNrXz9cwFtSjiRpUjIhdAgnFzzs CNI8bTqvkvZ4WIcY2dx5HUALUdNBiBLq3V6OcYfMJwjt1wRNDc7dXi2fSl/pv89FIszO AxFQ== 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=OBZE9fTWxbdYDNO0wQf6VLvLzDz5T3VbiT4qSLCiJ6x9W9hdy+MVqJUAkURu9t06Re lJpiUvaCoh2T0V6ifMrk4npOYqfhFdPIfl6RIXjpelYJHtbsiAn9TLHj6JMrlVN1+A93 DhJE0bPMDffaiCikUmGrknEVUWNWtOGzfnmwtKUTF1CHxoIeFWz5pTSq3aBj6EyszQW2 vrXYz13ai7g8WFBP3Lnp6Uz9qLbXS2uKlFfc6vdIz1vfN0sci+15K5x2twnRRUCysW0t bp4JCa9DGn7NwtYfNfAmgrJoid6814diF7xxnhaeDvLK+xvjqdNd09cKFmA6/1zbDoJ4 BF4g== X-Gm-Message-State: AOAM532wc0MCT2ORI/3tWjgIIZQwCzCUAwYwMxc2oHLFJvXj2Jzmbvke 9GifoiVlROinnpU7+R645ydE4cjH X-Google-Smtp-Source: ABdhPJxhoIM0XKrZpYY5JRU12pZfUtcDMDVd8w90AzShwY73VCFzDA9QhdQW9mNLc343257Rvb8IOw== X-Received: by 2002:adf:de01:: with SMTP id b1mr4507277wrm.305.1593189636111; Fri, 26 Jun 2020 09:40:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 06/15] hw/sd/sdcard: Restrict Class 6 commands to SCSD cards Date: Fri, 26 Jun 2020 18:40:17 +0200 Message-Id: <20200626164026.766-7-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200626164026.766-1-f4bug@amsat.org> References: <20200626164026.766-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::443; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x443.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 --- 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 Thu May 2 01:08:07 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=1593189842; cv=none; d=zohomail.com; s=zohoarc; b=Tf40hHKrQtgOOBzLnnGJwpb7lJlTcwixrgMKK6MOQrGhp45AdVv260bwwbi3F2j7W0JOvRNyMZoHJZjNuF6VMvDAtQV7DZ+vdgZt/sFAFWwH3xYKKWtZeXRV9HYux66QxYy8oqeDiSoJsgTY9MM5UXz/n3jnS1EKHLPvGLTILnU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593189842; 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=/hBqILuvbq8GQVmvRRiNXAXWPYKiP9RUKThJFiSA5Mw=; b=IoicCpDjJXypxIFZi7BIM2qGunUUd/EiQxS4sF6WavOvu2gDSLkIOtimzBa13PlTdX9E/dgKjoUZHDIpMQyRquMY7SanNcWzTjnJ6qsDFBAxZAGIIGeyczSk3IHajoeqwUMml0kPj6IJHJW4mOBeTPAy7cDSL/JmKo7J0P+ibrA= 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 1593189842293359.328944241463; Fri, 26 Jun 2020 09:44:02 -0700 (PDT) Received: from localhost ([::1]:55726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jorSL-0005hy-2h for importer@patchew.org; Fri, 26 Jun 2020 12:44:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jorP6-0000F2-V8; Fri, 26 Jun 2020 12:40:41 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:50743) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jorP5-00066E-9P; Fri, 26 Jun 2020 12:40:40 -0400 Received: by mail-wm1-x343.google.com with SMTP id l17so9431563wmj.0; Fri, 26 Jun 2020 09:40:38 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id f12sm24623646wrw.53.2020.06.26.09.40.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 09:40:36 -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=/hBqILuvbq8GQVmvRRiNXAXWPYKiP9RUKThJFiSA5Mw=; b=C9aVK0Xd/bqTAE4Xy/s3T9iz40yTKaHPXlKka7sM76XHmnPHHWJhs2mcl6EpzFRMVm rIlDLpGanwheliSjSavLbtq1/zXqPG66sWkQ6CtANnVywtYjnsgfxpYCujL0FGi/ESVY /OTHu597oIgyWGUfJVDb/2QbJakzbeQHd5o0hYiGBrbE9e7uwCJ7//kmzmV66jWtwLC0 m3OXQPnYMhKr6cS1QxIhY9j/dGzmRZYrnQaTHkOyOC4sf6lC/Ug4p1xi5V3s7t8lB7xf GLZI3KBXdlf4IGf28nmf3Hm0vGRyWbU1zpCoFQhHAJE86m16EXqLHJX663kKcqMLK0ec nIIg== 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=/hBqILuvbq8GQVmvRRiNXAXWPYKiP9RUKThJFiSA5Mw=; b=KYyVuy4YQNBn0PpFIqhIk56MNAVUCyYa366lAgdfD9eBTYjuR2xDqwz5meV+7sETzH UV0DdhwJg2kJmGQS9KiDUNdhYnLfW6/B4LgSCW7V8D1KkihuNGQmYqmLDuoo+5BLSQB6 1YoKoTu5mDTDJTlb4Wo8l1jTKbrBuocViGRyBPmL6ec9JUrsTZRorhlq/TEnDpNdeuOp Ieu/dNVCj5NBc6dsaua3nGre/lgvDQR1fmF4NAW2Pfyb1JUOOm7lOTjFrEohgLrXQI7m nmGVmegnVD19ZfdZh1tawqs2Z210Lw8BNAfPcfzzvLquQNH2/ciqbEKg/qf/9dbLEnU+ W2uQ== X-Gm-Message-State: AOAM531tB6eE4Vc0z1BgNKgqVtc386w/GyywHroT5z/RxMskSjy04bqS FIEgroDHonMS2x8mR9PCRX1PQDpO X-Google-Smtp-Source: ABdhPJxkBeB1WtyYfV3YEqbjDHyMvw8jGV/v9JOy4Al6M4s19w+4kl0goaTLsN61LLRNn60M1DPf6g== X-Received: by 2002:a7b:c84d:: with SMTP id c13mr4339760wml.170.1593189637181; Fri, 26 Jun 2020 09:40:37 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 07/15] hw/sd/sdcard: Initialize constant values first Date: Fri, 26 Jun 2020 18:40:18 +0200 Message-Id: <20200626164026.766-8-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200626164026.766-1-f4bug@amsat.org> References: <20200626164026.766-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::343; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x343.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) Reorder initialization code, constant values first. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 871c30a67f..22392e5084 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -556,22 +556,6 @@ static void sd_reset(DeviceState *dev) } size =3D sect << 9; =20 - sect =3D sd_addr_to_wpnum(size) + 1; - - 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_cardstatus(sd); - sd_set_sdstatus(sd); - - g_free(sd->wp_groups); - sd->wp_switch =3D sd->blk ? blk_is_read_only(sd->blk) : false; - sd->wpgrps_size =3D sect; - sd->wp_groups =3D bitmap_new(sd->wpgrps_size); - memset(sd->function_group, 0, sizeof(sd->function_group)); sd->erase_start =3D 0; sd->erase_end =3D 0; sd->size =3D size; @@ -581,6 +565,22 @@ static void sd_reset(DeviceState *dev) sd->dat_lines =3D 0xf; sd->cmd_line =3D true; sd->multi_blk_cnt =3D 0; + 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_cardstatus(sd); + sd_set_sdstatus(sd); + + sect =3D sd_addr_to_wpnum(size) + 1; + g_free(sd->wp_groups); + sd->wp_switch =3D sd->blk ? blk_is_read_only(sd->blk) : false; + sd->wpgrps_size =3D sect; + sd->wp_groups =3D bitmap_new(sd->wpgrps_size); + memset(sd->function_group, 0, sizeof(sd->function_group)); } =20 static bool sd_get_inserted(SDState *sd) --=20 2.21.3 From nobody Thu May 2 01:08:07 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=1593190066; cv=none; d=zohomail.com; s=zohoarc; b=c9FRjiKpeBPQ/8yp7UUxEzxrhNgLqUtMzOGqz/i4aJIxUN9OEQUsq5Ct7bqrazDAC4H7l7K6udKcqOey0keVSamOAE1NfIkRt2LJOYix9veCkED3kl69NcP//iLWvizS6DlCdjVPz1HYcbYaoSx6wf/wfp8cXOpIuHUrdwjCNCk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593190066; 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=R2DX/QQvHKfKb103HIE/F7gpPXUpgK50o5/9QbI2yBE=; b=FgFCGxXOSyRUCUVXWqCDv+o1S0R/XgwU6NPpzfAjqWy49m/Gtjn6U+FoDcoCYfyZ3Uod2mmj3af7HbBoBEC44CycOxVMryCl/YwHIDbbmL9mu6ZE3ljVhzTu2PkPS2Esre1FGaqBbcwYNRhf8I9lwNHKCu0UNqsKxWgmRdHm5SE= 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 1593190066663774.4883994105995; Fri, 26 Jun 2020 09:47:46 -0700 (PDT) Received: from localhost ([::1]:44944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jorVx-0005EL-E8 for importer@patchew.org; Fri, 26 Jun 2020 12:47:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jorP8-0000GW-W7; Fri, 26 Jun 2020 12:40:43 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:50744) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jorP6-00066w-EC; Fri, 26 Jun 2020 12:40:41 -0400 Received: by mail-wm1-x343.google.com with SMTP id l17so9431634wmj.0; Fri, 26 Jun 2020 09:40:39 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id f12sm24623646wrw.53.2020.06.26.09.40.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 09:40:37 -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=R2DX/QQvHKfKb103HIE/F7gpPXUpgK50o5/9QbI2yBE=; b=KJza6d7/0XHGk9QScJHiogDEx4Kr/QcZg6XDP5GgSEv46bAujP6d5YNaRKpMycyeKD FVNJ9bVhdv/sSuEhabHCUJyzj+G+bfjBbBcNa4TrhobyzZEmNNuYgaKaEAoqy6sl3tz4 YD7snXvqW07HGDcbDYJwpzK8+LzzcpVjcuL8pPKxLp0OaMtyMzivdpp63mwsNTJBDqxa n+ZNbpycmtLeh6AP79jp2/g1tZyDTkE0BkzeIr+NMpZ1tmb8Go9Cn0bbDJkxazUvH1Nu ma/5Fv0rDhlcQV7yai/82gPMseNHjyzT4HR4eSvcAA+vHr64oPo2fZKY8AN/R620ejZs cbhQ== 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=R2DX/QQvHKfKb103HIE/F7gpPXUpgK50o5/9QbI2yBE=; b=VsEKk/9GjRY1hOilXO1yvUO7UTMp+0fgg6FAXqNOOfbnFkxFf+8iOz7On4GGBoDSvZ AWeclD41v+zP9v43ZV6NtWrqPfll1GxvEvuVg7svNA9D5njij7jHHF+aNTX4OHXp3KAy utqomVNyI00jLQxRxTiqtYPbCJSyzzwoDeSkQfW65ZuQOxGaprf2Bn0gP0Ygo/oM/7He 0FHKjSMqJTGP8Qo/M/Tf5oPDVwd6XVljqPo5t/mErNyS5YHxx2opSfYQtHIhbFeIcbAe smwleSYV5XkOcmChMoFcX3v6GX9QFFPkAwVGacOJYEKIDtFOMm27VVTnSu5KVfYG9HfH 1ghA== X-Gm-Message-State: AOAM531PBBuU7iOUliQ31UXub3G5ohZOQb06jOJPgpI+qDUAWYr1ZkKj QHMh8png1iivztqQ4fHaUpxLn/SV X-Google-Smtp-Source: ABdhPJxQ+ftUwDr3GnixSzlUlHFNC7KeT3dhTezAnQ2x5WTO94b5OefT29xSTFBQtDC90ojVI/sWcw== X-Received: by 2002:a7b:c4d6:: with SMTP id g22mr4469593wmk.170.1593189638354; Fri, 26 Jun 2020 09:40:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 08/15] hw/sd/sdcard: Check address is in range Date: Fri, 26 Jun 2020 18:40:19 +0200 Message-Id: <20200626164026.766-9-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200626164026.766-1-f4bug@amsat.org> References: <20200626164026.766-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::343; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x343.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 --- hw/sd/sd.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 22392e5084..2689a27b49 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 @@ -575,7 +577,7 @@ static void sd_reset(DeviceState *dev) sd_set_cardstatus(sd); sd_set_sdstatus(sd); =20 - sect =3D sd_addr_to_wpnum(size) + 1; + sect =3D sd_addr_to_wpnum(sd, size) + 1; g_free(sd->wp_groups); sd->wp_switch =3D sd->blk ? blk_is_read_only(sd->blk) : false; sd->wpgrps_size =3D sect; @@ -759,8 +761,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; @@ -777,7 +779,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)) { @@ -819,7 +821,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) @@ -1331,7 +1333,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; @@ -1350,7 +1352,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 Thu May 2 01:08:07 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=1593189950; cv=none; d=zohomail.com; s=zohoarc; b=asROBIwD7xrl3FZpw0YbW93xkQCAnxXIyX2etaUwO5GRn+zwlXKPEz9uAEiDRP/cgFRO5pgJsb1w3A+5QzKBO1H2lVCxRcDpMLznO+8hBJGPIQyI9c+ZPnJe+fbU3IrbyWw8DDMM7fB8EpnboJbR9v/XXnp3OeVM8ECN41UeR4w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593189950; 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=GvHez0pE6D3D72aVrb08Q8wyh4pB4x9TJg2DukSgMrU=; b=hbQHDusxUHjXtxSrwRHobCfPGdmoXWHmMtLnWt/GS2VLk4CqcbCW6QMzzrAfblgqVgZGrdXa66SflxqGiWKn1gS4fqXBlr3D3fcmBXIvHL8MEDskU4IiHfFWWCEvTacJx2KPd7Nyhk0h9aW3wYMMhnDxh5/S04EMW4pvZTCKZbU= 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 1593189950942521.087580046953; Fri, 26 Jun 2020 09:45:50 -0700 (PDT) Received: from localhost ([::1]:37068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jorU5-0001OJ-IY for importer@patchew.org; Fri, 26 Jun 2020 12:45:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jorP8-0000GY-WA; Fri, 26 Jun 2020 12:40:43 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:37756) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jorP7-00067m-Aj; Fri, 26 Jun 2020 12:40:42 -0400 Received: by mail-wm1-x343.google.com with SMTP id o2so9975894wmh.2; Fri, 26 Jun 2020 09:40:40 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id f12sm24623646wrw.53.2020.06.26.09.40.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 09:40:38 -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=GvHez0pE6D3D72aVrb08Q8wyh4pB4x9TJg2DukSgMrU=; b=UpsxxqL4tceQIFxKNT74gHGiNesv+WvURhNEvFvLDfW75f/xa2YMvUH9y8WaruPn2T Tpm8ZW1z4AFQct2CSRt7aD8R3AV0OF+zg0JaBozeqmzLDAHWu3iOmpHdDZ7LENVxX+jP vw393zxdqCtOw1RfiW0LroBXwQIgPdnyyZ4EE2s0HTqC1/SMot6gEtG6WbAeHhOmculz C4jK31V7XKccf998xuECro5fo7Y4iN3I1mdcvPoZU9/KSjoewkANNehBG8RI8iBxI+N9 QXP8mUdnNqu3rC3eoioymPHTdIU5lGurvku4WBxLiKRLzp6SY2izjs7OLEwFnwodHAc0 kaOA== 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=GvHez0pE6D3D72aVrb08Q8wyh4pB4x9TJg2DukSgMrU=; b=lU4P7imQT9745N/dc01tp2dKdnI+0zeTiUg3SyIIXgweXYw7i5fW1hf3mJTAxVV4Zk 17rMZNXUZ5IA0YDgSe+E+/yuDxTkj/J+6PAFSP+RGntaP7eTTtSB2wSOdAu82AT3whZo qChwZa5Q/HyI6hOKN4xyboSdhpqVWW9ALmtbtY70w/872F1ARneQLx6DD4FM0Vrm6mAA eMiDh1iLTJ1Vae4N30jy4BYtorIjL731wYKMO4DAsjsI6fZf9S9237XBRkIYIKfrJI29 yzPe3IgMo1ou/trK/7VeBiO6hpqEblVaEPkBaKHRmeTxJA+7L3NFbdCmGWjZez9R9RUT 417A== X-Gm-Message-State: AOAM533Gc6+bnnC1TEvMyQCHlrs+teEEWo4YPxa+rbM6DZnTezB6DQN9 tF1L9UUtOFnzYbiZaloFbPfXNq7L X-Google-Smtp-Source: ABdhPJxZMEZDsTRcqCKoBgc6AVGSJpjDhrOGbvXoTkJB4DDVpe5hl/060sUHSdmbycHagw32M5wzJA== X-Received: by 2002:a7b:c38c:: with SMTP id s12mr4327392wmj.136.1593189639596; Fri, 26 Jun 2020 09:40:39 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 09/15] hw/sd/sdcard: Update the SDState documentation Date: Fri, 26 Jun 2020 18:40:20 +0200 Message-Id: <20200626164026.766-10-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200626164026.766-1-f4bug@amsat.org> References: <20200626164026.766-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::343; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x343.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 --- 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 2689a27b49..d9ae4090fb 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 Thu May 2 01:08:07 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=1593190077; cv=none; d=zohomail.com; s=zohoarc; b=WI+1clSpuUYIOQRlCTaBNsUYNft99bLdendhKu6g7xpTdKeRjJw5X+tgRfkmtCLEm3+psVFsq/RVY/2AH+X7DpPfgF4sTtvTgorS+ojpa/FUcJtBa51lvfvyEjHUkeDqE8Zgph+KppY9NrK8XCPaJn9dx+1tmnAYErJaf0dadIc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593190077; 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=RfRAaK5bCiGl7xgm0xZdlWrkb6KuXKvncQm/zm7wVgY=; b=m8YSryhro6L+hN92tseK+ORgKHW0iLsFKXtwig/SlOBazkwSxXvrQPhNCoDceOMIq3Rj3goeKeUEXVx7GQzJtq5JzH0rxIL1ra/n1na7IsJGw/IL9glqgGszkV/Sa7whZFqOzqMPCUaXfcq21PBDRSRlFKf8AuFGegoFyyDCBe4= 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 1593190077296226.10768753688808; Fri, 26 Jun 2020 09:47:57 -0700 (PDT) Received: from localhost ([::1]:45956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jorW8-0005eM-1d for importer@patchew.org; Fri, 26 Jun 2020 12:47:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jorPA-0000J8-J2; Fri, 26 Jun 2020 12:40:44 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:35870) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jorP9-00068n-2U; Fri, 26 Jun 2020 12:40:44 -0400 Received: by mail-wm1-x342.google.com with SMTP id 17so9961633wmo.1; Fri, 26 Jun 2020 09:40:41 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id f12sm24623646wrw.53.2020.06.26.09.40.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 09:40:40 -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=RfRAaK5bCiGl7xgm0xZdlWrkb6KuXKvncQm/zm7wVgY=; b=XpW+Igd2vWW6H5nDo2Qe9hZVGZEH5nAhB8aiIT+hbxexQYDUUdY14pamcpgw1wIcO3 /LwbgDZHk2h3f93BMCfV33Tfr9YwrjzSwwhfFYm+6rCIfC/7ow2N/rARbq+0caLgr2WL WATMBY7fdT4rU6AryN0gcGiXqa7Uvvs/sbeVsRUcvX6npEpVsJpDQGPVcl+57aG+rhlc wpS6c89uTbWS7PMyEz3JAJftVqRVGUKFksV9G1dnKuDGhSXSKh4pXyE+jLckZs7R7C7u lebJHsG74tXJsXF9NZntkRkIvtP9R3EkUftPdzQ2ZyTw3uXq4wN7cfSfUAK6pXYbCrOV lrpw== 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=RfRAaK5bCiGl7xgm0xZdlWrkb6KuXKvncQm/zm7wVgY=; b=FDJcjlQpaXZBR1grLlqZMyXuKT5/eoKNhsEX/ThxjOHmlqVGb9pzHNL8BV80/9l0WD N8015pxvZQXxMZfnf6EOcz3mrsw3lqVkV31zi9oAGQnf4d2g5FVYK5csfSE2CMYBlbpy 7eqa8b8E9i5K5cuDyag1h99Y1+LP7WK89uZlOzG2n0RRD8vylfHBKyJrL0MP7shmrJuI +YgvSBoGMVPGG1RAMgH8jUsVNtADO+A+1YgmYMoGhA4qeVoIovTIno6IyuqPoeXYEg8C QhjOU1yDTKzsMILrTejDKRFtXLzBLVLqBm3+v+/5gcWL2Qr4lIs/P8saJ0IjwK4+BibM ZkCw== X-Gm-Message-State: AOAM533uiuXx2Y8a0M7WIHtXqxZkEiwsUBhjFmJ6WGHVgK8zuWQXgBQO DFdXrvNpyQHeGKP53oMS3dQMrrqk X-Google-Smtp-Source: ABdhPJwSumzLS2e7WjBPSmqNYN8dbvuyye4qO4ClYTegBK1v96UxnHgqu5mEfzMbrR8by52wKv2+cw== X-Received: by 2002:a1c:7d85:: with SMTP id y127mr4425645wmc.181.1593189640726; Fri, 26 Jun 2020 09:40:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 10/15] hw/sd/sdcard: Simplify cmd_valid_while_locked() Date: Fri, 26 Jun 2020 18:40:21 +0200 Message-Id: <20200626164026.766-11-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200626164026.766-1-f4bug@amsat.org> References: <20200626164026.766-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::342; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x342.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 --- 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 d9ae4090fb..115a5aa4c3 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1664,7 +1664,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) @@ -1675,13 +1675,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, @@ -1707,7 +1706,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 Thu May 2 01:08:07 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=1593190134; cv=none; d=zohomail.com; s=zohoarc; b=d2zjh7q/JwgW03k37VeFNY6UEj/a2wxdtXgDiLsQTlbSJwM4DHAqDgfu9WWHklA1gcRzmrDaD+9u4D2xUjpCuPD5pYkYDlB4o/OywLrhnWmNCEERXSKE4z4teRI2X589D1wtktNr7Wh5igE4sbhHYVnI56i/4U/hy+qCGIrY62w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593190134; 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=MLHuRhPJGMB88pWHM3hcWsOQI5A3QGzGpgPvgJRjRm0=; b=cNNej/NY5U9KGWLFkAkxzFtU65ub7hac+EIzchK36BSUbjiYbDQ1xkG+eS1K/y0OKSJzVYvJyjYiOTh98HRFomPOUUezsK3HjFWytxSey3M6Agp63ZT94XAIuq6vTw9s4Pppc/vSZfpQj3PH6tDRJCFJ7CJhbcensfVhI7URXIA= 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 1593190134335358.2493868430296; Fri, 26 Jun 2020 09:48:54 -0700 (PDT) Received: from localhost ([::1]:48740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jorX2-0006r0-VQ for importer@patchew.org; Fri, 26 Jun 2020 12:48:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57264) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jorPB-0000KG-Km; Fri, 26 Jun 2020 12:40:46 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:39704) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jorP9-0006AA-W7; Fri, 26 Jun 2020 12:40:45 -0400 Received: by mail-wr1-x442.google.com with SMTP id q5so10105174wru.6; Fri, 26 Jun 2020 09:40:43 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id f12sm24623646wrw.53.2020.06.26.09.40.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 09:40:41 -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=MLHuRhPJGMB88pWHM3hcWsOQI5A3QGzGpgPvgJRjRm0=; b=MQvo7wu4n32HNHV3DP4Y/rL9zFXpwifhHqwAgOfx+wSfl6rMR4ZCkVg5q1VqixBLcc xGmcT6oJ4IgYlsI+2sTz7rfkfl7SGSCZs4djTVTEP9Lm1Al2FU9qo2Y1HGlskmuqaqFh gp9/qzwsK1L6k5z5GHAH0uuuUIH0jZSHURvg856eDOA0WMGbMf3WoYb/edWXWdEg1KW8 vr2ol1S9ka+etHoHyYRYhGRRitE7xmZX63CTeNgoUfy76TcKpamU5fo0HjGbSEGQMGPh ZfcIbaTQusSogly6XCRwAPj1VhNPytaBoSAG1c+UTCWJ3AQYRHckj09nZyiS80adM5FZ rzPQ== 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=MLHuRhPJGMB88pWHM3hcWsOQI5A3QGzGpgPvgJRjRm0=; b=KUI52PanrQ6unP836hVfYss+zRMEwjBeXcoIi4CHE0CEdY4amT40Gu+anPnnMwied3 nA5L1nr9YhIx03AZKH6Nm6y4K1kENhGq/te7ZJlL1B7qdN71YGUZUTY3JqN9zomLNZuu kfQ1iq55HXiflkY23OLaklrkRkoKJUuWKlY/qp3oZjmWDqr7uJ303na8shp9LBI6gbL4 nGD/UYrMDhJGH8/FKcR83KqAT1PqobPByWiz5tgotsaPm/+5jBFUUsLROd/Y0qSakcF0 EuLR41Vr0r1Meu0OBMsZaJNjlkOcxNgCOtol5HvWLPP1NqYqFfcOdGrjBXKgMc+8t12/ 1ayg== X-Gm-Message-State: AOAM5304CwQrFc3p5HGg1giw6BhMwUEme7SYP6gv1g7k9faFyEF05OgO JUq/0wM9FghUDCCgZ7mC1QY2+jNj X-Google-Smtp-Source: ABdhPJytNXVy5y53v9+oK2/cfOLZTds8ZjhFV5tp6TosUl027ZxAS3y4gSJZRl1qF2NZlxtiU+tIzQ== X-Received: by 2002:a5d:6342:: with SMTP id b2mr4622722wrw.262.1593189641866; Fri, 26 Jun 2020 09:40:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 11/15] hw/sd/sdcard: Constify sd_crc*()'s message argument Date: Fri, 26 Jun 2020 18:40:22 +0200 Message-Id: <20200626164026.766-12-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200626164026.766-1-f4bug@amsat.org> References: <20200626164026.766-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::442; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x442.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 --- 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 115a5aa4c3..486538afc2 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 Thu May 2 01:08:07 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=1593190246; cv=none; d=zohomail.com; s=zohoarc; b=ZJczkq9Z0ck5bzCdnw2t2E9MSuo1Zmh6DqeKRGdBtP9rvw14go7k6lc+9yMyFDYyTEt5DSIjkJW2shdziHVa/r51SRjcNmMCo9Lq9eE86eU8+1sAuN8OHV+vJn1hYJ1LPsVYJtyAWHWPphtkSs+5QmSkuhOPfxV8PoTuDSUOLNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593190246; 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=SzJVtg/giHuTkd+J8k/OisBdWsb/IiYZi9QRfQu2hmE=; b=J562MJaS/PDDcMOncwMHSXFsn7NhA3rEzVtPbCsiYxokaJzMGmT5+P6cL+kKBo51ms1U3TLq9b+OIY99vEXJBuI4i2c/wB7Fl8QsLtIFSP7f1lfiqOw1Fv+ERM0HfKEThju2TLMbIB332G1+xBGyIIRoT10CRvsywXZYHV+era8= 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 1593190246314242.08325941099054; Fri, 26 Jun 2020 09:50:46 -0700 (PDT) Received: from localhost ([::1]:57004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jorYr-00020B-08 for importer@patchew.org; Fri, 26 Jun 2020 12:50:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jorPC-0000KS-EF; Fri, 26 Jun 2020 12:40:46 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:56252) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jorPA-0006B6-SJ; Fri, 26 Jun 2020 12:40:46 -0400 Received: by mail-wm1-x344.google.com with SMTP id g75so9395491wme.5; Fri, 26 Jun 2020 09:40:44 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id f12sm24623646wrw.53.2020.06.26.09.40.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 09:40:42 -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=SzJVtg/giHuTkd+J8k/OisBdWsb/IiYZi9QRfQu2hmE=; b=qUcy4cqtqne5kCrHujtYaDS0JqPF7akUIfY5NMEGhplfmgRPYn1EgH+t9eWyG36bUV +DYCjheTjcWXI2WqHifYE4oEwfcKcUc4PdUaXn/vFjgk/60D/GLMLVtgZlfBfnqdkd91 mkPGnJsJnvBMCBljdWZPWPX3lJobtxxEvosC3O+fefJWzadFr8TSy7BxotV9D4doQwLl IxlFFR7+7VN05o+9sN1WDrzJr8vHeruRWFFX0fAAnmLWqv/UzT56p3IQ1YiZQeK5QdaN buHqt+hMqw1zYCYv5WO94rfnmxQelv/OGMg5ifqUdV5haAbEg76pnCv6M6FPd+lqn0vM ECYQ== 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=SzJVtg/giHuTkd+J8k/OisBdWsb/IiYZi9QRfQu2hmE=; b=SAHPv4Kos4jd0gXeJL9DVM+ovsS9ySvQA13K6Q+9CX56iPOL+YsN6TTRmsTz/cywLU eIHQt6N2cIm3XEDT+3TQkI4q5AR1PerN0OtLUchjna7jZoJoIE4TZNrCA/qFCjiudVzt Ob5u+GntR4gcc9KnrEoQ1vouEpl/4sS1UVYnPbpN9YvKsTJv+j2VzkU0GeLGAPQYIET1 5mpacoTki/vjzqHfW03TiNVlsgm01Ebz79e87PzTEfdyR2PqZJ9bayOOmiHe8WBdSJjT ey0USBHiYMPA+j96cbqN7pjBO0Ox6scP8BNdz7F6IB08kWp5uKSnoHvCSr2dtn8Rp8sv IBuw== X-Gm-Message-State: AOAM532UQgoPhrG/VwiVkjglI4Qy8PLFQhbXI7wfRGmejLrKBd3Ocqzd BAg0hphDGllpeWn0EvSV92XFKyOA X-Google-Smtp-Source: ABdhPJxNg58hLNwddX/dLsUrGVg5NJS0FI+TBoJZjE+u+tHe1wZN19TTn1cHt0ecEMSN2XiEuqAm+g== X-Received: by 2002:a1c:b182:: with SMTP id a124mr4120204wmf.114.1593189642944; Fri, 26 Jun 2020 09:40:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 12/15] hw/sd/sdcard: Make iolen unsigned Date: Fri, 26 Jun 2020 18:40:23 +0200 Message-Id: <20200626164026.766-13-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200626164026.766-1-f4bug@amsat.org> References: <20200626164026.766-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::344; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x344.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 --- 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 486538afc2..dc005e4d91 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1967,7 +1967,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 Thu May 2 01:08:07 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=1593190208; cv=none; d=zohomail.com; s=zohoarc; b=EKFPYYa/l/HFi4b/GnRlw94XgQ1u8b7yRQT+V18AUfNN1LHhy7aXo4fT5HLpSh8n7vIZwQgLexB5Jo8w6CShysinqpbN32BWJt7MsFRkm5XXjAEAIbKJo5i46Mk/Bx7lfeSEYPXiW1bgu072CzFG2TKdAtRU9Wd8ADNU0blzkKg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593190208; 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=BVIXWAPWTBjsXpXZqdnb/q35sBOEWB0rSw+ANL4hq18=; b=Im+q4DhVXJrgaP/Wb4YRwXdkjc5aPZy0rDny+B0cuoePzGK90o1mRxAAfoZvo3TR/xCqQLtp1TAuRCfR0NWbB9C92dlag3OHDILxqfU6IiT1N7SXLNUnVX05tikZGxscUyHMsSa769NPAQHuyRZKkHiVIHTut0ebkGzV8MbgFdg= 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 1593190208214137.37548653719602; Fri, 26 Jun 2020 09:50:08 -0700 (PDT) Received: from localhost ([::1]:54408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jorYE-0000uN-RC for importer@patchew.org; Fri, 26 Jun 2020 12:50:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jorPE-0000Mh-3a; Fri, 26 Jun 2020 12:40:48 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:39706) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jorPC-0006Be-6o; Fri, 26 Jun 2020 12:40:47 -0400 Received: by mail-wr1-x444.google.com with SMTP id q5so10105285wru.6; Fri, 26 Jun 2020 09:40:45 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id f12sm24623646wrw.53.2020.06.26.09.40.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 09:40:43 -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=BVIXWAPWTBjsXpXZqdnb/q35sBOEWB0rSw+ANL4hq18=; b=iA4z3L90/iOr+CPoSL8eBA6c2GSoTysz8MQT/z2gDIz5jSi4ZWDJ78EAk/rn5nAbhr VwxNG7u9tLoUY+HT1PnHOoMEYE3Z3jkJbU1RBlEz3bLLWvsPyQ/tryTt3W0rz0ewvC0n gKV7hAQ7blxha/xNCudS84t5BSj2R5sNjMKhC0YW99wdLJawE3Q1tg1jV4D+PsdIugP/ YU1j7PvR5omlnpp/7mRKY6VbIo2ZkJuU0tzQlkfCmpaAX6rVy7241zJCpv8kyPfFXc4w WzLKVq7nztIsTzpJG8j8bHkFepumyJ0qGbP4qj3zRbBzvxpAw7A7tIclGpTKITyU19CK DBUQ== 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=BVIXWAPWTBjsXpXZqdnb/q35sBOEWB0rSw+ANL4hq18=; b=LBB9c2mATPO4osx+IeHjTp7Y+kTOgBaounrPPCm6YwQZqCCyKocbub5BG9McajMZLt 9OHlHAPI71ySFFxWCAcSkQdq2ja9jtLAXR4SF3j35xDTJmlEPqzyHpcBGWGg6M2Bzv9w Dmf1f2xlZfeAzgZXOXg4qVghm/N+xjdPoeT2Tncw7rzdl80J7Y0qmtmwkpRDtsSqbvah ec/MpdeKjOssNsmmDhLXaJ3P/dkEuxI/W2lKmjdXUy5JuKnk4cYBGWaDFiat3wLbASk3 nupCzmcWKJiVR9w/rZg6tsFomWYZn7tDWMd0htxskQXbyU4dmZLYC1zJf7oKNV/QzCzm 9i/w== X-Gm-Message-State: AOAM532ZbsMPAnYfoG4aRAEzQ4VcniX3B20h9JJmDGx8xzaivKk2kbtW y7kX091pZGRk4kg9iuYoIMKURqjg X-Google-Smtp-Source: ABdhPJxdBtOD+6VO1WfwHB+La1JXvzGI2PMAT47Sk8oAApTcdbEtJCDx46K+LRNyi4h/8uA+6XZvqA== X-Received: by 2002:adf:a49c:: with SMTP id g28mr4990965wrb.118.1593189644211; Fri, 26 Jun 2020 09:40:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 13/15] hw/sd/sdcard: Correctly display the command name in trace events Date: Fri, 26 Jun 2020 18:40:24 +0200 Message-Id: <20200626164026.766-14-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200626164026.766-1-f4bug@amsat.org> References: <20200626164026.766-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::444; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x444.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 dc005e4d91..e05af50cdb 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! @@ -1704,6 +1705,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)) { @@ -1731,7 +1734,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); } @@ -1792,6 +1794,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); @@ -1830,7 +1841,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 */ @@ -1984,7 +1995,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 Thu May 2 01:08:07 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=1593190213; cv=none; d=zohomail.com; s=zohoarc; b=j/n4sihg33VN+5QsHLvWiv0lnfPo4N3mbLrXmjTHObaLg/7DNgQGNN4ee5HZdwCnSBrT+Jb7W2fLKSCsPHxWqwMXyhaz71ZB9S2Jq+YcKlxaYtBWRS+hMx1PUGaFcBavsfzIAanzUhBYHO3ZoT/7uvDgKzwRPGCVNjH/fKKjMac= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593190213; 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=CxSm3RJicBxIxL9H3OtOu6SC+lfHczHb+nqiITfjkFo=; b=fQaI0Xqs/jm8bCJlbgaB/5ytnHIvIVYOPPE8z7H2VT0H5Or2/7zS9MlORiEJw8hWoRVXOI4wBQaNSwjhEbt8OxI5ZtV4cawb0Xz6kqeatX/UcjQEfDOEvRJld+HpWhSxcmvd4O/OWab1QIyVJ7J9ixhr9RHxunsvb3nFkV4ifxA= 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 1593190213117171.27127439240792; Fri, 26 Jun 2020 09:50:13 -0700 (PDT) Received: from localhost ([::1]:54734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jorYJ-00012I-Nq for importer@patchew.org; Fri, 26 Jun 2020 12:50:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jorPE-0000Ni-U5; Fri, 26 Jun 2020 12:40:49 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:37758) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jorPD-0006C7-8r; Fri, 26 Jun 2020 12:40:48 -0400 Received: by mail-wm1-x344.google.com with SMTP id o2so9976156wmh.2; Fri, 26 Jun 2020 09:40:46 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id f12sm24623646wrw.53.2020.06.26.09.40.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 09:40:44 -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=CxSm3RJicBxIxL9H3OtOu6SC+lfHczHb+nqiITfjkFo=; b=O38u1ySLdnGFNGDYs80fx+cer0q+9pMWx0E8C8eLrCXJxJ44JVNkA5tBoHZ/AFkFIX ts+gtYlFbFnMDVoEWNKV/mPqLElbqq3OxrzBhJ1RVZ5OgGuFjhc9NQOACdJEhMm8E5q6 zZKzOeYTCz3XdsLgl0iPI3CWotVAoNUxgmYkXA/XyFpjKo28AW2aAYlQQrWWj+w5barm 8MNZP+EV0SK741j9t/3dN4zK2r0rxf6BkJwkfyVsAcrka5KaJH99DzYSEvlJxhTJ0EPy 4u7mT9LSM46Gz0dar/Cpj3or43n6TbVHfY8FEDPhbTWIF4J/jWbb7bAhe5WcN2Fa6lWL KHOA== 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=CxSm3RJicBxIxL9H3OtOu6SC+lfHczHb+nqiITfjkFo=; b=UJT2/Ck8ZtLPBCgUuPr95opY26yDpFUW5grCnL7MailoSIb7qPy/wOQ/PQqejeRzCN NtxtWm6zYu0KJl3+eMAlfxVU6ScvM+ohkQdJpoi5tZcjBxv7KxB+9EkkOA7fLrPvMBK6 W1HAYb5d0MFemT6z3ShmwxYxJJKrJgQc32OtU+ZhR1uRoB1urR5TEDGNfNsAjGq9QeMN zyP6zDJrN//5JlGZQe86D2KeYGeHQJVNBhURwPamkoC1UctB1OgB0P1ToRIZgvd3AZYr 1ufYk2jo6nB98BDJf+ZaN6aRmbYfz7AsFrnvP/sV91B0KC07hvBvGiKCaR854B8K7Hbq G6tQ== X-Gm-Message-State: AOAM5334AWwCvkoRyLC+A+79ZcgFe6+b143jknXleya4Il7+cN9qLC5y xjS5Ky5IR+pOfszO5BCgHJUfV/Vy X-Google-Smtp-Source: ABdhPJyheW8g+c3jvsg/8xPrYOqNdcTNTejNQp9/dLB7JYLPRJ4zYgkU70fNexb1gl7gIpNA8+1M4A== X-Received: by 2002:a1c:9cd0:: with SMTP id f199mr4200564wme.94.1593189645288; Fri, 26 Jun 2020 09:40:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 14/15] hw/sd/sdcard: Display offset in read/write_data() trace events Date: Fri, 26 Jun 2020 18:40:25 +0200 Message-Id: <20200626164026.766-15-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200626164026.766-1-f4bug@amsat.org> References: <20200626164026.766-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::344; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x344.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 --- 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 e05af50cdb..f0b5527eaf 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1841,8 +1841,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; @@ -1995,8 +1995,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 Thu May 2 01:08:07 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=1593190348; cv=none; d=zohomail.com; s=zohoarc; b=Vh6392JY6yGsWTGuFF9tC/8Hcehc1XOnVNJzWc0MqZaB7vJ+GTmrMpzm88fYEU+B+CwK4A7nQx9kYC4MnuadKb+MaWnLinnAhcAnB49k4N5rB7vB+lUGaYASZJzkg3b29j07qKTY5k5UZVJCMNTiK1i9dPoYPvFwrel2hSHFqLk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593190348; 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=074iMePnrQX+lQLKspStcL4/Sdxmmp5D48oE2Br3C4s=; b=nfxQ7ZOTo0jIpgVQPW7eRGJLdDlkpJCaQp3M4W+n4v5GcVsOIiJ3h6jeS8XDwEEHISgc60b6QLdnGW7TicujeYDZDByfHclbbbQTuxUBs25Vr1GgEkP52I4kabGnGQBJqVKwP2k6Xih/4fjzcqgvegMSlq149bBIA4XUOhCliAI= 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 1593190348422611.6019531323774; Fri, 26 Jun 2020 09:52:28 -0700 (PDT) Received: from localhost ([::1]:35110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joraV-0004zt-31 for importer@patchew.org; Fri, 26 Jun 2020 12:52:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jorPF-0000Nu-IQ; Fri, 26 Jun 2020 12:40:49 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:38125) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jorPE-0006Ch-5L; Fri, 26 Jun 2020 12:40:49 -0400 Received: by mail-wr1-x442.google.com with SMTP id z13so10125102wrw.5; Fri, 26 Jun 2020 09:40:47 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id f12sm24623646wrw.53.2020.06.26.09.40.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2020 09:40:45 -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=074iMePnrQX+lQLKspStcL4/Sdxmmp5D48oE2Br3C4s=; b=LXvW9gSYa0SXpnKOq+5gPIPRM27/qard9nfNtEgjqVFqXXxOjt0BujRrp48k/qxncI hoUvufxqu0iVZCDVc9PGaA20csjXXFOEQctIamsfK95Melp3+gVbhnX/yJNocCJl18h+ 2ePe7fPhfxnlIsyDymkF1qzzRWj0VHkiWP8g8ZwJCUW8YGBsCV2LBU083CUQkSQZO6c9 +kiP3eu4ChiyZQT5tcfNsqspZpBGC7U9zOubPP9G/6iTKHJRMmKULHuaJQ713KFWL4cS doXKJ2U5/GjhReLqn6gsMppwVaJ8dAuPk5Jziot3OIPyxdFnRHYSLvDzRFQULpOBtLwW EBww== 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=074iMePnrQX+lQLKspStcL4/Sdxmmp5D48oE2Br3C4s=; b=mL21zghCb/cSoznny5anyVDmuJsk8A90/0xoA2hstPp/lfSEQVh+mU/jsKJ8/7PyMh jbR3LaDtsuR0D0R6rUI2HqB4oCkCkhAZ2zHsdVAJPfeBN2tFdczrezU+/rzn+wJ+294w TukXyJN9QPKxi5MTEFVorfV3h/behBx+v6lITfjGDGN0m0K6em0uPqPK3dC9zLaHKbJu DQ3ESfiXDmZaxV4iMmAP6aYzYOOh6BJaZf6qw3QIRN0zCVhqzW+pUr3Qu+wzfKgAOhww xLvdRv1V5yaZ9xDu5GHVQk8g+69wNUWeP4ROCP4Q1ngwDCwkPSzLeS1YvcXsYQ7GLMNx LThA== X-Gm-Message-State: AOAM531jdfPXD18zCGSS0dZgWCtyJ4UlFCX8t4Tx7l1B/y5w9Dxa75GD inEtFJIcfpOX+hrcxXFLoTU2hrLf X-Google-Smtp-Source: ABdhPJx3WyHMW1H3lktkBrGgzXb7DO9o79d+l3PLYrGf+y6TiFXz2tsXmyKS0Cp6+snHZjEkxqRmmQ== X-Received: by 2002:a5d:6786:: with SMTP id v6mr4614577wru.258.1593189646269; Fri, 26 Jun 2020 09:40:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 15/15] hw/sd/sdcard: Simplify realize() a bit Date: Fri, 26 Jun 2020 18:40:26 +0200 Message-Id: <20200626164026.766-16-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200626164026.766-1-f4bug@amsat.org> References: <20200626164026.766-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::442; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x442.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 --- 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 f0b5527eaf..27a7862c98 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -2140,12 +2140,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