From patchwork Thu Oct 15 06:38:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 271244 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D764C433E7 for ; Thu, 15 Oct 2020 06:43:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6F6C321D7F for ; Thu, 15 Oct 2020 06:43:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="oX+uREvN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6F6C321D7F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kSwzS-0001Qr-9v for qemu-devel@archiver.kernel.org; Thu, 15 Oct 2020 02:43:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSwuJ-00056L-22; Thu, 15 Oct 2020 02:38:35 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:41861) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kSwuH-0006r6-H1; Thu, 15 Oct 2020 02:38:34 -0400 Received: by mail-wr1-x441.google.com with SMTP id s9so1908694wro.8; Wed, 14 Oct 2020 23:38:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mHMBZwFybrG3Wb5VMsP3egLDE4ZsHJicDRun+ytDKB4=; b=oX+uREvNOCcK1z0CsHc0geb9reSMcKogmylLUVsL7upxNVLy+7RBJIHd5RI1bDrA0c bN446L/3HRHiEEIIr3N+hbY7hdhhrRWvYuIS7384YIsjNhhkkrN3OqMv25LpS792yR0Z fR82oRe354j6dV4EGXFLJv7kMXQRikBkLHM/z8wv3MNug5+HujNqMR6PSAHmzkpu/8oX hkR1f06NiDeHJIecH6pA+5tS4dyv0nlUdO5MkN6uzZDyQlJAt9kY6F/D/R920Bq17ZKu sRG3/+7uk4o09rKRj8geLrRZwCt0qlu4ILTETkfihtKDBloojvVl++VPUKKShzMUTXPh zo6g== 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=mHMBZwFybrG3Wb5VMsP3egLDE4ZsHJicDRun+ytDKB4=; b=EhOE4Qb9Y5TVAzUDim+R5a1Tycn6S8UvVT4tX6BWDjo3xBpISvqpecnLQZGuOfiE+U pAB1+FiK1u7jtwi+GjVNI0h/lCtmWBYTDhwzmpo3w4Ok7DPkKjuRJA0cMEOGIYiAyaVI DWfDnt3b15afUWE7Zmi1xky2W/wTHkqlt8RVFroxpmLXQp5k2T7ZNKHudWX12Lm42BbR WcCtGRah/NG0Aq49lNb8mDS9MpBearBRM6Zn0r3pfLFexWOqb9zq/2tQnuMqwiM5igOq 4FhutwyO7iHaWmX/b4Pct2otYzQC2iOpCbachougTCNYD24BU2B+Qq8ZdfdqQ+moiKNN 4DXQ== X-Gm-Message-State: AOAM531iNuBtIdWyH2UlvY0cdO3WhLA5bppW8rsU95fDIbSURZWwHZKy XFWr7o/Vqfbby14Xk/DIm2h00GO9cO4= X-Google-Smtp-Source: ABdhPJzgi9yyNKmxqk0JPSexWeRyf4g7g8ZtzbND1J7AZ9fDdYUF6cEiaW1qj3ow2govJzQKCuOTBw== X-Received: by 2002:adf:fbc5:: with SMTP id d5mr2347037wrs.232.1602743911454; Wed, 14 Oct 2020 23:38:31 -0700 (PDT) Received: from localhost.localdomain (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id c18sm2796897wmk.36.2020.10.14.23.38.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2020 23:38:30 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 1/6] hw/sd/sdcard: Add trace event for ERASE command (CMD38) Date: Thu, 15 Oct 2020 08:38:19 +0200 Message-Id: <20201015063824.212980-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201015063824.212980-1-f4bug@amsat.org> References: <20201015063824.212980-1-f4bug@amsat.org> MIME-Version: 1.0 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: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander Bulekov , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Trace addresses provided to the ERASE command. Signed-off-by: Philippe Mathieu-Daudé --- 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 00128822224..2606b969e34 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -749,7 +749,7 @@ static void sd_erase(SDState *sd) uint64_t erase_start = sd->erase_start; uint64_t erase_end = sd->erase_end; - trace_sdcard_erase(); + trace_sdcard_erase(sd->erase_start, sd->erase_end); if (!sd->erase_start || !sd->erase_end) { sd->card_status |= ERASE_SEQ_ERROR; return; diff --git a/hw/sd/trace-events b/hw/sd/trace-events index a87d7355fb8..96c7ea5e52f 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -46,7 +46,7 @@ sdcard_reset(void) "" sdcard_set_blocklen(uint16_t length) "0x%03x" sdcard_inserted(bool readonly) "read_only: %u" sdcard_ejected(void) "" -sdcard_erase(void) "" +sdcard_erase(uint32_t first, uint32_t last) "addr first 0x%" PRIx32" last 0x%" PRIx32 sdcard_lock(void) "" sdcard_unlock(void) "" sdcard_read_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x%x" From patchwork Thu Oct 15 06:38:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 271243 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 721A7C433E7 for ; Thu, 15 Oct 2020 06:47:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B26D121D7F for ; Thu, 15 Oct 2020 06:47:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kCExnQLT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B26D121D7F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kSx3A-0003s6-Nv for qemu-devel@archiver.kernel.org; Thu, 15 Oct 2020 02:47:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55278) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSwuN-0005F4-Fs; Thu, 15 Oct 2020 02:38:39 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:45350) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kSwuL-0006sP-Nf; Thu, 15 Oct 2020 02:38:39 -0400 Received: by mail-wr1-x442.google.com with SMTP id e17so1888432wru.12; Wed, 14 Oct 2020 23:38: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=BM7THxJfGf+b7XY8piPM2aMZEPnFkfmBjlshGc2heOo=; b=kCExnQLTOdy0eTaIM3es43d2RzUSgOtGsYf5YMDtMa53Jk9qpmPaP9jNjcD4Xaq7ix 0wXiX+pkxCJFS6KhtKAR34R2SIKnBX+0Acf+da9onS6U4PIKuVTK7/jmoazZdzCl2GJM 7BJZnxm6yWcb/FRqCx0aFBShLh7wzimn74tAwnQSQ5jPW6sHXuHbhhHFzJBxpBzEgLFD pDj4VuafWjTUTL2ASs/N+XNCpvFpDrjsEJIUMNTq2+1OhyIzXNSamGyaLT80nzRYzH/M NOOC2j0LnV8jtNtHd5GiqX0hSrU8hJLunNbJdzQX5sFO1TKYU+uZmoYeEK+jYtz3fJSx zw9A== 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=BM7THxJfGf+b7XY8piPM2aMZEPnFkfmBjlshGc2heOo=; b=eRixk0WQ3ygZzjKru7aSzZApMMXQEa95d1HK3NEsdkfKehpdaxDv1h7eGC3svNGjR2 BKCruBQjs0fDY0KfiBkNLgmsXaPVDCiTrwpO3LxPXVRsJ8PWRIFXZ0Bs+lO+e3vBUYcw jUFfiYzjJwle9HAQit9E1oFbyNKUlsIYy7F2oQoporQo2Ry1zr/ixFH3uVQraVH0EAM1 HOT7KGwBZ3Y4jicKXAnW+MEIxnHatBfiPR0PUqTaoL7BXsj6mDYU17Uwn4gZc4eUSEKM YV+fxkFudVohhQC2s8VXUhqQ7ouppOkycdC9gv6SjTV4PpjgKz9oTt8ZBBNjYAqTseKq mkkA== X-Gm-Message-State: AOAM533vHIQytUi1EOVt6Tc4EmYYoreZoWBks7ns1CgXaWneLjFYt38D jwl5VQLAAZ/u4GXH/vXZNEVNpKz/Rfo= X-Google-Smtp-Source: ABdhPJxW35CEtaaKI0Vm0aC6ms9AcSUfON2lrko+9RFZWnaQt+mc1unGPGms/S316mMm0yx9daZHJQ== X-Received: by 2002:adf:b30c:: with SMTP id j12mr2424804wrd.82.1602743915849; Wed, 14 Oct 2020 23:38:35 -0700 (PDT) Received: from localhost.localdomain (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id 4sm2874292wrn.48.2020.10.14.23.38.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2020 23:38:35 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 2/6] hw/sd/sdcard: Introduce the INVALID_ADDRESS definition Date: Thu, 15 Oct 2020 08:38:20 +0200 Message-Id: <20201015063824.212980-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201015063824.212980-1-f4bug@amsat.org> References: <20201015063824.212980-1-f4bug@amsat.org> MIME-Version: 1.0 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: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander Bulekov , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" '0' is used as a value to indicate an invalid (or unset) address. Use a definition instead of a magic value. Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sd.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 2606b969e34..30ae435d669 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -53,6 +53,8 @@ #define SDSC_MAX_CAPACITY (2 * GiB) +#define INVALID_ADDRESS 0 + typedef enum { sd_r0 = 0, /* no response */ sd_r1, /* normal response command */ @@ -575,8 +577,8 @@ static void sd_reset(DeviceState *dev) sd->wpgrps_size = sect; sd->wp_groups = bitmap_new(sd->wpgrps_size); memset(sd->function_group, 0, sizeof(sd->function_group)); - sd->erase_start = 0; - sd->erase_end = 0; + sd->erase_start = INVALID_ADDRESS; + sd->erase_end = INVALID_ADDRESS; sd->size = size; sd->blk_len = 0x200; sd->pwd_len = 0; @@ -750,7 +752,8 @@ static void sd_erase(SDState *sd) uint64_t erase_end = sd->erase_end; trace_sdcard_erase(sd->erase_start, sd->erase_end); - if (!sd->erase_start || !sd->erase_end) { + if (sd->erase_start == INVALID_ADDRESS + || sd->erase_end == INVALID_ADDRESS) { sd->card_status |= ERASE_SEQ_ERROR; return; } @@ -763,8 +766,8 @@ static void sd_erase(SDState *sd) erase_start = sd_addr_to_wpnum(erase_start); erase_end = sd_addr_to_wpnum(erase_end); - sd->erase_start = 0; - sd->erase_end = 0; + sd->erase_start = INVALID_ADDRESS; + sd->erase_end = INVALID_ADDRESS; sd->csd[14] |= 0x40; for (i = erase_start; i <= erase_end; i++) { From patchwork Thu Oct 15 06:38:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 302840 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E96DEC433DF for ; Thu, 15 Oct 2020 06:41:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 60DD721D7F for ; Thu, 15 Oct 2020 06:41:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Xhvh5k3i" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 60DD721D7F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kSwws-00074F-Bc for qemu-devel@archiver.kernel.org; Thu, 15 Oct 2020 02:41:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSwuR-0005Np-OO; Thu, 15 Oct 2020 02:38:43 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:51118) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kSwuQ-0006vc-61; Thu, 15 Oct 2020 02:38:43 -0400 Received: by mail-wm1-x342.google.com with SMTP id 13so1922279wmf.0; Wed, 14 Oct 2020 23:38: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=q1pTPTH3LX9VUD1iKOS/b8uIDJxiGdXQ9x55yZUv5B0=; b=Xhvh5k3ibwtO3exbd6PuxeS1fog9Ju7CTOlpQWvjlKQG4N5yt5IQpyzRVoncRKIRr5 +eL96dsi0WaeKR5logMhgDylXtObk0jCleWXpnBwj9AzNZWADLw81gFUk0o0SgbCgcAU X+IHNmgxTIInaNzskyji5HrzXvQfYyXtPVxdAmH+jeINRlVIB6qD2WtOvlRzLJrFkaC8 pZcRSzfM0R3zUyEbLdgr7icTMoGOJ/7ZlZVlYlakzSttkE3v2sm4C5GS+06xcLMzB6zB KZuaft2c2XuQG2QZ08nqua6+1SrCPX23aV9sSzQrAu1T/sYsETnYJZcILrWtrkIquJ72 jt8A== 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=q1pTPTH3LX9VUD1iKOS/b8uIDJxiGdXQ9x55yZUv5B0=; b=bjT5kP6jKt0oGM7Qb6NxF0iCaB80g03J9cNuF4o30rR4ijMfEy0UjdM2djdILv/CSI QzbFkOkAc7TT+BPnDq4HJYMTgn6Jtytn3nEIxumb2mRZU3SMQKCjVhPkbxaHOnsTHsIS 8c+UgE/2jIZST+YDglTe3BRmMVfun2Esd715HGe+XPpVEIzJcmHg1KSjHc3IETvOQO8P 4TXzEuFwfvTXYC/SYID6Bu44jj7fnGhu/+8cqMKEN5+u0ezIiqV92Z35jGPS8ngfxFsF rXm7jYAYtbb3VHy/pI1AMi3P500BLiVr8QGSfKEnzgdjC0Hy7WuMV7PvvTuE6WRNha2k MVRA== X-Gm-Message-State: AOAM530Yf+zdP6s6ZB1wLQylG+qHfVRf5ZMOCsSA2OCY66z5ZZZjYVSe ge5i6QNBZIraS01cbxx2J9AYC6grAuc= X-Google-Smtp-Source: ABdhPJyjn/J4hPjlZNCH2FzNsfHMZYjXIyB9o4G8Cn0gfUKHPxkXcY1+C2m3W/LgA7Vg5bXhloW+8w== X-Received: by 2002:a1c:4056:: with SMTP id n83mr2309019wma.186.1602743920375; Wed, 14 Oct 2020 23:38:40 -0700 (PDT) Received: from localhost.localdomain (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id l5sm2797914wrq.14.2020.10.14.23.38.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2020 23:38:39 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 3/6] hw/sd/sdcard: Do not use legal address '0' for INVALID_ADDRESS Date: Thu, 15 Oct 2020 08:38:21 +0200 Message-Id: <20201015063824.212980-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201015063824.212980-1-f4bug@amsat.org> References: <20201015063824.212980-1-f4bug@amsat.org> MIME-Version: 1.0 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: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, "Dr . David Alan Gilbert" , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alexander Bulekov , Kevin O'Connor , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" As it is legal to WRITE/ERASE the address/block 0, change the value of this definition to an illegal address: UINT32_MAX. Unfortunately this break the migration stream, so bump the VMState version number. This affects some ARM boards and the SDHCI_PCI device (which is only used for testing). Signed-off-by: Philippe Mathieu-Daudé --- Cc: Paolo Bonzini Cc: Dr. David Alan Gilbert Cc: Kevin O'Connor --- hw/sd/sd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 30ae435d669..4c05152f189 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -53,7 +53,7 @@ #define SDSC_MAX_CAPACITY (2 * GiB) -#define INVALID_ADDRESS 0 +#define INVALID_ADDRESS UINT32_MAX typedef enum { sd_r0 = 0, /* no response */ @@ -666,8 +666,8 @@ static int sd_vmstate_pre_load(void *opaque) static const VMStateDescription sd_vmstate = { .name = "sd-card", - .version_id = 1, - .minimum_version_id = 1, + .version_id = 2, + .minimum_version_id = 2, .pre_load = sd_vmstate_pre_load, .fields = (VMStateField[]) { VMSTATE_UINT32(mode, SDState), From patchwork Thu Oct 15 06:38:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 302838 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70087C433E7 for ; Thu, 15 Oct 2020 06:44:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B36BE21D7F for ; Thu, 15 Oct 2020 06:44:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="O5UXa09N" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B36BE21D7F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kSx0R-0001uQ-Dg for qemu-devel@archiver.kernel.org; Thu, 15 Oct 2020 02:44:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSwue-0005RQ-J1; Thu, 15 Oct 2020 02:38:58 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:54050) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kSwuc-0006yM-S7; Thu, 15 Oct 2020 02:38:56 -0400 Received: by mail-wm1-x344.google.com with SMTP id f21so1905702wml.3; Wed, 14 Oct 2020 23:38:50 -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=UJjk8ZR/erxbnrLQ53sw18LTpiI4+fnfSdMDknbc4K0=; b=O5UXa09NEfYJfcImEuemyGqUnXpyOXPrGZvcGlJbRUsHzHDDuyZ54+7g+4TdMaFBVG kKjcT5xlrRvcXqb4v0a6jwmtcEknr1pVQypZ28Nh0rbHe/3N83yrO2SRgFfBrUjRiHHV xoKD0Jr0fAAv9+fMqiarjjhocm+F0jAaLWncNhUtwV63WgVTAM7bNuV9dy5I5FpMXBTf q8F3I4Xe3WUszN4Z8PXMb0jUNqTKt7xRuj5EG2+ddmq11+Oj7SSmL+FuN68yx6S0+EB9 mwkWleqb775wsF1ImwoiowrtSFKP8LYmc5qAUiikbfkPYBd9xtDuVRCvR4wY/LdbO4Cy dsAg== 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=UJjk8ZR/erxbnrLQ53sw18LTpiI4+fnfSdMDknbc4K0=; b=fVafJEtmQzqgvHEaN32krvGgvauIiekDgXt4CCNteAVSkKhzbh1/imcVZyFlsAMgbD JGvt15650q0SCV7Ur4TDrdaoGjmibgBTIt98mJgE2XJdQH2QfaRzQ80+MZWrUZ5Ah40b eKOXbJ64+cO+JuXIrYUKCWESh8Kp8zEHh4HOYZHMCYZv+dFXBSv/E5aln2po0hhOm9Jv cNtNTEjxKgIjxgg/ntEJImh8fJwQqK6XADc/D3PzkqVzztiPdWunSN4CjRpG5m+nkCMf gpsg3vyrebLvqBsWeu1GQ0b1VRn3B7FT6XOp+kZqXyNt/rwBfu6097eg2Ev4Jgj3RYPN kW1Q== X-Gm-Message-State: AOAM533lT0FiQnvs3xxch3xK8pz7uHBMEMuN6rxUC/CF7sJNEJPXJydk 5lxzqmkBmWQCCfjbhUT3AEuarcZnbKI= X-Google-Smtp-Source: ABdhPJzTLT6eSvDGf74DbI2sZzb3HcpC0qiGelwbiKnDK9Cg0dtKAfBpyuqXNGakY2meFEjW/IJWUQ== X-Received: by 2002:a1c:20d0:: with SMTP id g199mr2444658wmg.38.1602743929352; Wed, 14 Oct 2020 23:38:49 -0700 (PDT) Received: from localhost.localdomain (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id n9sm2923152wrq.72.2020.10.14.23.38.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2020 23:38:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 5/6] hw/sd/sdcard: Do not attempt to erase out of range addresses Date: Thu, 15 Oct 2020 08:38:23 +0200 Message-Id: <20201015063824.212980-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201015063824.212980-1-f4bug@amsat.org> References: <20201015063824.212980-1-f4bug@amsat.org> MIME-Version: 1.0 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: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander Bulekov , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" While the Spec v3 is not very clear, v6 states: If the host provides an out of range address as an argument to CMD32 or CMD33, the card shall indicate OUT_OF_RANGE error in R1 (ERX) for CMD38. If an address is out of range, do not attempt to erase it: return R1 with the error bit set. Buglink: https://bugs.launchpad.net/bugs/1895310 Reported-by: Alexander Bulekov Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index ee7b64023aa..4454d168e2f 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -766,6 +766,13 @@ static void sd_erase(SDState *sd) erase_end *= 512; } + if (sd->erase_start > sd->size || sd->erase_end > sd->size) { + sd->card_status |= OUT_OF_RANGE; + sd->erase_start = INVALID_ADDRESS; + sd->erase_end = INVALID_ADDRESS; + return; + } + erase_start = sd_addr_to_wpnum(erase_start); erase_end = sd_addr_to_wpnum(erase_end); sd->erase_start = INVALID_ADDRESS; From patchwork Thu Oct 15 06:38:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 302839 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22451C433DF for ; Thu, 15 Oct 2020 06:41:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 61E9121D7F for ; Thu, 15 Oct 2020 06:41:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="uOcBZ4mX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 61E9121D7F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kSwxK-0007YP-Bw for qemu-devel@archiver.kernel.org; Thu, 15 Oct 2020 02:41:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kSwug-0005RY-Gj; Thu, 15 Oct 2020 02:39:01 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:55313) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kSwue-0006zN-LH; Thu, 15 Oct 2020 02:38:57 -0400 Received: by mail-wm1-x342.google.com with SMTP id a72so1892654wme.5; Wed, 14 Oct 2020 23:38:55 -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=9kcH0QEir+isSyR2eHUJqmP++6hsLCDL3S99R+ttmDk=; b=uOcBZ4mXVTJ9XkvFcrq3r2Bnv15i4xKLWGrZtNTz55Ne6+skMlh+oqPF5ARR5mQEiN 4GQCnKYDtS8SFb5xPfPnuCRgDTOBlW/8jSgLXwKVNHPk9spePYlgA+NlZ/A2Q9UOuJOP gwkVuzyRBNUuxPoVpU+e6+mC40z4DZhRh0xXJPAalovJDjRFTXosnOfsyTFa7csKJqtz yTVh8TqvB5Hxs6O2p4Pp6Am+Q70j8/B5OJIWzJAsJUXUGzemRfdCxZhhY61qPduml9Hj PEjxmwvU4moRD0ItnIKfq0YwS4wKQYPeP5BZCQth5AAwsfK25tqVZebmI6hPAZTZRbXZ wOFQ== 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=9kcH0QEir+isSyR2eHUJqmP++6hsLCDL3S99R+ttmDk=; b=SmdTQMK+I5U7JvHB+oATuoDX26rAzrQYaLDZC39VGpeWRYPYpSlWqoWxAP91XVcSXL ITmg1Ftiq72DAfrTrGIoCcyOZV0N8+2xrJbs/qacNyACx0meICd6WdR3FTAtI+7Zm1kr ScIYE9jPedqrpIai8ZXLFm8Qi0LhpoKNhkT7DClNYaQL2VEO2JxgMdKPcA4qU1hsde/0 7QI3GJ5LBFyWOKP42AS2qu9eVa+UyTv2+FKmdVyi2gi8IgmdhXwL1qgqqdxNM1BdliPF UsPFpJCh0QE4aTNEAly6fRw220KoN3Y5l3t+8mlUhCjlcxw7j/QHiaJ2OL9OTyv4Qcka 1g3g== X-Gm-Message-State: AOAM532n/XtdSmPA9VTTRTCSnzx9UTWhIAZez5zQzceUMZoYHpP5SkEE ijDXyGHJxiTdij2yPKTbbb/ZHwP9bjc= X-Google-Smtp-Source: ABdhPJy5vBlWQffFEgxoiXD7GLKfpNW4ySbn6pKwnjyNBei3SG8fGfteivcXUWl3xY6glO2FHZWsHA== X-Received: by 2002:a1c:2d8f:: with SMTP id t137mr2279825wmt.26.1602743934280; Wed, 14 Oct 2020 23:38:54 -0700 (PDT) Received: from localhost.localdomain (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id c21sm2751483wme.36.2020.10.14.23.38.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2020 23:38:53 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 6/6] hw/sd/sdcard: Assert if accessing an illegal group Date: Thu, 15 Oct 2020 08:38:24 +0200 Message-Id: <20201015063824.212980-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201015063824.212980-1-f4bug@amsat.org> References: <20201015063824.212980-1-f4bug@amsat.org> MIME-Version: 1.0 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: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander Bulekov , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-block@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" We can not have more group than 'wpgrps_size'. Assert if we are accessing a group above this limit. Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 4454d168e2f..c3febed2434 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -780,6 +780,7 @@ static void sd_erase(SDState *sd) sd->csd[14] |= 0x40; for (i = erase_start; i <= erase_end; i++) { + assert(i < sd->wpgrps_size); if (test_bit(i, sd->wp_groups)) { sd->card_status |= WP_ERASE_SKIP; } @@ -794,6 +795,7 @@ static uint32_t sd_wpbits(SDState *sd, uint64_t addr) wpnum = sd_addr_to_wpnum(addr); for (i = 0; i < 32; i++, wpnum++, addr += WPGROUP_SIZE) { + assert(wpnum < sd->wpgrps_size); if (addr < sd->size && test_bit(wpnum, sd->wp_groups)) { ret |= (1 << i); }