From nobody Tue May 21 16:18:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=reject dis=none) header.from=fb.com ARC-Seal: i=1; a=rsa-sha256; t=1655843213; cv=none; d=zohomail.com; s=zohoarc; b=bSCEFPTaOS1RDd06W8iKBHmeEu3vFhjxWVBB6lr9XN1gCisLqBAFOLuCoYlJYegYjhGHXiQYvSPuZCi5oh2Yjb+wM/TJGeWcLx8aO0jeqGvW4AMcIf+T9/9dhi50yeCV1g8iLw6YcrpQw4R/lPbZospVSemvyciE/YqoZ1B8vFk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655843213; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject; bh=IgXc0k+4f0L+/XD3WHCLdKypOU6paufXJWT/J1Pqojc=; b=QnEyOA0CoNdCa6iUaqEwPntpoPqavLh1EED8/dkrw7CbcyV6iqwxa40MFmsVfgoMfl978KX6nF9h7hk5CD76zQzKcU70DRIgWw36MZDTIXS+q1gYiRYxlA/icIAyv4J1xtt1eFaNeNnPxCUv0LWIzum8J8h4gOaa0ylglgjWBjA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1655843213630128.03693171254088; Tue, 21 Jun 2022 13:26:53 -0700 (PDT) Received: from localhost ([::1]:39384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o3kSa-0008CG-KJ for importer@patchew.org; Tue, 21 Jun 2022 16:26:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3kQg-0005yd-U0; Tue, 21 Jun 2022 16:24:54 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:40504) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3kQd-00065o-Qc; Tue, 21 Jun 2022 16:24:54 -0400 Received: from pps.filterd (m0109332.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25LIbKbZ031674; Tue, 21 Jun 2022 13:24:35 -0700 Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3gukdwrq6d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 21 Jun 2022 13:24:35 -0700 Received: from localhost (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Tue, 21 Jun 2022 13:24:34 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=facebook; bh=IgXc0k+4f0L+/XD3WHCLdKypOU6paufXJWT/J1Pqojc=; b=VsOd+9RUxicZ/9BaZNcJUZjeUBkiHRU5XGzyZDL9HgJ0uHfvpJC2db91GPJl7hkSClDN jYdZR22qL6jjniQrzQrgNwez6I8H93dtBWiAQwfVHOap6GR8TnjOl4hQkN5Mja8OROTi DR3RT6+rQZ0io745ocGqVJkVhnUWzQ31JGw= From: Iris Chen To: CC: , , , , , , , , , , , , , , , , , Iris Chen Subject: [PATCH v4] hw: m25p80: add WP# pin and SRWD bit for write protection Date: Tue, 21 Jun 2022 13:24:27 -0700 Message-ID: <20220621202427.2680413-1-irischenlj@fb.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [2620:10d:c0a8:1b::d] X-Proofpoint-GUID: 3kPgsaAF_VLiiBqptI0oC3sJPR2T_QVB X-Proofpoint-ORIG-GUID: 3kPgsaAF_VLiiBqptI0oC3sJPR2T_QVB X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.64.514 definitions=2022-06-21_09,2022-06-21_01,2022-02-23_01 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=67.231.153.30; envelope-from=prvs=7171ca9011=irischenlj@fb.com; helo=mx0b-00082601.pphosted.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @fb.com) X-ZM-MESSAGEID: 1655843216059100001 Content-Type: text/plain; charset="utf-8" From: Iris Chen Signed-off-by: Iris Chen Reviewed-by: Francisco Iglesias --- Fixed .needed for subsection and suggestions from Francisco=20 hw/block/m25p80.c | 82 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 67 insertions(+), 15 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 81ba3da4df..3045dda53b 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -472,11 +472,13 @@ struct Flash { uint8_t spansion_cr2v; uint8_t spansion_cr3v; uint8_t spansion_cr4v; + bool wp_level; bool write_enable; bool four_bytes_address_mode; bool reset_enable; bool quad_enable; bool aai_enable; + bool status_register_write_disabled; uint8_t ear; =20 int64_t dirty_page; @@ -723,6 +725,8 @@ static void complete_collecting_data(Flash *s) flash_erase(s, s->cur_addr, s->cmd_in_progress); break; case WRSR: + s->status_register_write_disabled =3D extract32(s->data[0], 7, 1); + switch (get_man(s)) { case MAN_SPANSION: s->quad_enable =3D !!(s->data[1] & 0x02); @@ -1165,22 +1169,34 @@ static void decode_new_cmd(Flash *s, uint32_t value) break; =20 case WRSR: - if (s->write_enable) { - switch (get_man(s)) { - case MAN_SPANSION: - s->needed_bytes =3D 2; - s->state =3D STATE_COLLECTING_DATA; - break; - case MAN_MACRONIX: - s->needed_bytes =3D 2; - s->state =3D STATE_COLLECTING_VAR_LEN_DATA; - break; - default: - s->needed_bytes =3D 1; - s->state =3D STATE_COLLECTING_DATA; - } - s->pos =3D 0; + /* + * If WP# is low and status_register_write_disabled is high, + * status register writes are disabled. + * This is also called "hardware protected mode" (HPM). All other + * combinations of the two states are called "software protected m= ode" + * (SPM), and status register writes are permitted. + */ + if ((s->wp_level =3D=3D 0 && s->status_register_write_disabled) + || !s->write_enable) { + qemu_log_mask(LOG_GUEST_ERROR, + "M25P80: Status register write is disabled!\n"); + break; + } + + switch (get_man(s)) { + case MAN_SPANSION: + s->needed_bytes =3D 2; + s->state =3D STATE_COLLECTING_DATA; + break; + case MAN_MACRONIX: + s->needed_bytes =3D 2; + s->state =3D STATE_COLLECTING_VAR_LEN_DATA; + break; + default: + s->needed_bytes =3D 1; + s->state =3D STATE_COLLECTING_DATA; } + s->pos =3D 0; break; =20 case WRDI: @@ -1195,6 +1211,8 @@ static void decode_new_cmd(Flash *s, uint32_t value) =20 case RDSR: s->data[0] =3D (!!s->write_enable) << 1; + s->data[0] |=3D (!!s->status_register_write_disabled) << 7; + if (get_man(s) =3D=3D MAN_MACRONIX || get_man(s) =3D=3D MAN_ISSI) { s->data[0] |=3D (!!s->quad_enable) << 6; } @@ -1484,6 +1502,14 @@ static uint32_t m25p80_transfer8(SSIPeripheral *ss, = uint32_t tx) return r; } =20 +static void m25p80_write_protect_pin_irq_handler(void *opaque, int n, int = level) +{ + Flash *s =3D M25P80(opaque); + /* WP# is just a single pin. */ + assert(n =3D=3D 0); + s->wp_level =3D !!level; +} + static void m25p80_realize(SSIPeripheral *ss, Error **errp) { Flash *s =3D M25P80(ss); @@ -1515,12 +1541,18 @@ static void m25p80_realize(SSIPeripheral *ss, Error= **errp) s->storage =3D blk_blockalign(NULL, s->size); memset(s->storage, 0xFF, s->size); } + + qdev_init_gpio_in_named(DEVICE(s), + m25p80_write_protect_pin_irq_handler, "WP#", 1= ); } =20 static void m25p80_reset(DeviceState *d) { Flash *s =3D M25P80(d); =20 + s->wp_level =3D true; + s->status_register_write_disabled =3D false; + reset_memory(s); } =20 @@ -1587,6 +1619,25 @@ static const VMStateDescription vmstate_m25p80_aai_e= nable =3D { } }; =20 +static bool m25p80_wp_level_srwd_needed(void *opaque) +{ + Flash *s =3D (Flash *)opaque; + + return !s->wp_level || s->status_register_write_disabled; +} + +static const VMStateDescription vmstate_m25p80_write_protect =3D { + .name =3D "m25p80/write_protect", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D m25p80_wp_level_srwd_needed, + .fields =3D (VMStateField[]) { + VMSTATE_BOOL(wp_level, Flash), + VMSTATE_BOOL(status_register_write_disabled, Flash), + VMSTATE_END_OF_LIST() + } +}; + static const VMStateDescription vmstate_m25p80 =3D { .name =3D "m25p80", .version_id =3D 0, @@ -1618,6 +1669,7 @@ static const VMStateDescription vmstate_m25p80 =3D { .subsections =3D (const VMStateDescription * []) { &vmstate_m25p80_data_read_loop, &vmstate_m25p80_aai_enable, + &vmstate_m25p80_write_protect, NULL } }; --=20 2.30.2