From nobody Tue Feb 10 04:16:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1641282860; cv=none; d=zohomail.com; s=zohoarc; b=PGyG2nCyoTn8Z/Eko9T8PqZ7PW1KTiss37/Bv6UzXIwj1OPcY0frUpLsTJWy4bi3MuOLxBhasMPzpY5syQFUk1s/xWZcBLIuYo+X3fZbbYodrs3Tk1qDjBAV3YECe0DkHladH8b2AABX/SA8MrvEymDzjg76/kYsAHIBx7GFWJI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641282860; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eBJgYpxMfElZCjSoM/LIb7+pEggDV+9LpvhxGVUtM6k=; b=CUb+W2LJznqtIsfQlUs9B1w0+QWrOIRgiiqoUuLBhe+KHO7E6+DhZmSPZPWAWW2OHHQY94FKsVfh+SmnfAD3n7KHT1SYOyl3MwkF/t0VsBIQcsiDI4ULnD4DW2HmarxtrEHvxyR+GgxnxV2JTPwoW/Bm5QkESBytfdlJdCS1KIw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1641282860954351.99572611494875; Mon, 3 Jan 2022 23:54:20 -0800 (PST) Received: by mail-wr1-f45.google.com with SMTP id e5so74383054wrc.5 for ; Mon, 03 Jan 2022 23:54:20 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id l2sm37545576wru.83.2022.01.03.23.54.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 23:54:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eBJgYpxMfElZCjSoM/LIb7+pEggDV+9LpvhxGVUtM6k=; b=Ruk3r5wFFU0Y7dO4gXZ7PA6NplKKwWSnJjmptGNd2EsRQ94gaHhHGm/qxZN8cv9ZN1 SydGjF2EpoH9LRfPpOj+vsG9qIqGpSKm1GNTsErhRFmU5r2pB99GuepwtEPU2GxVyOCP 6vix+Hxcuk4biikzGXjcIXkJNvTwanYnvazayM5v09OFaglaMlVPTSEOn4/4wN8FNiTg f7+PvzzPGd6oIvQF8mDhO/0+gfsd8RRekHS73aHaQhu8eSx08WFFW0d/oEhajo6snQGB cXq7OaRWVLLOHVrXWFVXCKTl/qOXYVlVp8U/5MmUYgxVtY7Gf+4VVi0klzhys1MLT6Km zR2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eBJgYpxMfElZCjSoM/LIb7+pEggDV+9LpvhxGVUtM6k=; b=QAVY6AnLRjKH8JV68ekDiq3G+Vrx1+o758Ig33zQVZLB3xb2MHcfNPeaG7GAbfJAoG n6lnGIG37KSRHPJYo9++L2TySwr1jwFtXiWiptElZkC5bOwPRpP4bQNR3tNCKFH7BJc9 b9Loa6hqdFDi51nl8gV/gSCArncjYazdv78/xXBvHhOdl7NAhrkoCxpmZw3IA72wQxWO pEmppyH+Gqi5kFqE1u7LaZuOW3P3fFj11LQbHaN3EDD3tNfnSNHtnsCwxLR06mMqOBmN Eg0bgc0+a+HuS5sHiEvYXj5QKsmiSccviRDnumZk22y5SujBx+HE9xLFNY8xJgYwraOG WbzA== X-Gm-Message-State: AOAM531FusrBJ8KoensK9aFoh6rLLolKB4GdjGq+twNljN54xAkqAeEn wWFcWiQUjA/lDi1oLuptkJ8= X-Google-Smtp-Source: ABdhPJzwUprtIiK4OhIfP9UbUHM3M2CnDbmYP+PT3RRFvgq9y6I2b5+64Le9Zi0Cbpnt2CGiCzWc4w== X-Received: by 2002:a5d:6c6a:: with SMTP id r10mr41154070wrz.60.1641282859150; Mon, 03 Jan 2022 23:54:19 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Bin Meng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alexander Bulekov Subject: [PULL 1/2] hw/sd/sdcard: Rename Write Protect Group variables Date: Tue, 4 Jan 2022 08:54:11 +0100 Message-Id: <20220104075412.2088859-2-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104075412.2088859-1-f4bug@amsat.org> References: <20220104075412.2088859-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1641282861926100003 'wp_groups' holds a bitmap, rename it as 'wp_group_bmap'. 'wpgrps_size' is the bitmap size (in bits), rename it as 'wp_group_bits'. Patch created mechanically using: $ sed -i -e s/wp_groups/wp_group_bmap/ \ -e s/wpgrps_size/wp_group_bits/ hw/sd/sd.c Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210728181728.2012952-4-f4bug@amsat.org> Reviewed-by: Alexander Bulekov --- hw/sd/sd.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index bb5dbff68c0..0bb99352cc1 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -116,8 +116,8 @@ struct SDState { int32_t state; /* current card state, one of SDCardStates */ uint32_t vhs; bool wp_switch; - unsigned long *wp_groups; - int32_t wpgrps_size; + unsigned long *wp_group_bmap; + int32_t wp_group_bits; uint64_t size; uint32_t blk_len; uint32_t multi_blk_cnt; @@ -567,10 +567,10 @@ static void sd_reset(DeviceState *dev) sd_set_cardstatus(sd); sd_set_sdstatus(sd); =20 - g_free(sd->wp_groups); + g_free(sd->wp_group_bmap); sd->wp_switch =3D sd->blk ? !blk_is_writable(sd->blk) : false; - sd->wpgrps_size =3D sect; - sd->wp_groups =3D bitmap_new(sd->wpgrps_size); + sd->wp_group_bits =3D sect; + sd->wp_group_bmap =3D bitmap_new(sd->wp_group_bits); memset(sd->function_group, 0, sizeof(sd->function_group)); sd->erase_start =3D INVALID_ADDRESS; sd->erase_end =3D INVALID_ADDRESS; @@ -673,7 +673,7 @@ static const VMStateDescription sd_vmstate =3D { VMSTATE_UINT32(card_status, SDState), VMSTATE_PARTIAL_BUFFER(sd_status, SDState, 1), VMSTATE_UINT32(vhs, SDState), - VMSTATE_BITMAP(wp_groups, SDState, 0, wpgrps_size), + VMSTATE_BITMAP(wp_group_bmap, SDState, 0, wp_group_bits), VMSTATE_UINT32(blk_len, SDState), VMSTATE_UINT32(multi_blk_cnt, SDState), VMSTATE_UINT32(erase_start, SDState), @@ -803,8 +803,8 @@ static void sd_erase(SDState *sd) if (sdsc) { /* Only SDSC cards support write protect groups */ wpnum =3D sd_addr_to_wpnum(erase_addr); - assert(wpnum < sd->wpgrps_size); - if (test_bit(wpnum, sd->wp_groups)) { + assert(wpnum < sd->wp_group_bits); + if (test_bit(wpnum, sd->wp_group_bmap)) { sd->card_status |=3D WP_ERASE_SKIP; continue; } @@ -869,7 +869,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(addr), sd->wp_group_bmap); } =20 static void sd_lock_command(SDState *sd) @@ -897,7 +897,7 @@ static void sd_lock_command(SDState *sd) sd->card_status |=3D LOCK_UNLOCK_FAILED; return; } - bitmap_zero(sd->wp_groups, sd->wpgrps_size); + bitmap_zero(sd->wp_group_bmap, sd->wp_group_bits); sd->csd[14] &=3D ~0x10; sd->card_status &=3D ~CARD_IS_LOCKED; sd->pwd_len =3D 0; @@ -1348,7 +1348,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(addr), sd->wp_group_bmap); /* Bzzzzzzztt .... Operation complete. */ sd->state =3D sd_transfer_state; return sd_r1b; @@ -1370,7 +1370,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(addr), sd->wp_group_bmap); /* Bzzzzzzztt .... Operation complete. */ sd->state =3D sd_transfer_state; return sd_r1b; --=20 2.33.1