From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:ee12:0:0:0:0:0 with SMTP id g18csp422432lfb; Fri, 17 Jun 2022 15:03:50 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tagJjRas6BBqX4VQ2MOk+3SP1QkWmiiMfTQAfMT0fi6jGbA6F/DwAO4C/u2ILq21l6P7YQ X-Received: by 2002:ad4:5be6:0:b0:464:4f31:870 with SMTP id k6-20020ad45be6000000b004644f310870mr10269575qvc.109.1655503430688; Fri, 17 Jun 2022 15:03:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655503430; cv=none; d=google.com; s=arc-20160816; b=xNue+DoZwiwBxGnLnLdZkOoUaOcjFxMQ0cNMBXmVIMdu4+EJnoxgFuK8j5lJg+chR+ lowuSILNDQL6FBuOnsQUx4J8LWRK0PXa55dLuf2o9NLZhZnj2Cc93VRzEmODsQ1zd/vn Jok03DijDXl+GhZe8m3FeIX2pj+vjTiOd01Y7889kt/ccDCBldp8T/3VUDGsXQ2UfpKD G5zeTDIXrzjkQsK295uMBPg5y3MCcNsPPWKWR2r2b6foQwrYgp8zWbxiRnaIC4F3FvvO Bm2r2bjRz6Y1bhjKHodqobazV029HsFjWZQGr+WeNtORN3RdIMKfGOUWf4SG7IMcprrV CWKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=YOjMe23O8Tc5vIhwtl0bdN87rTwqzw2TEUrM4lcjOjA=; b=tYgLP0NLZFWmvHsZIC6lfxS1RLbeEbZVDVMm+LPWWbJSoogoUWd+XCQZROBba3DpFo 4RoOhWbN4ebZia4MmonguSUE81cylVqoGHaaVo2FpQr6dEzuFbyowg2i7pO6gqYWS46I XKu2S/ERXhTPhhfJqGLOAGo843HlsLLoh78tSIahOL1f2fXhma1iqI+MlX3Ps4IYB1RC yJewmlK9ayguFN2GbTM0lo1F178q+fTaj1uapLtw7fHWSxWS3ILc+bjqyTRH+shceIN9 xNm0PiYslhgIMpcLLHkMWp8mBEZyUOffNkHZgLEQZ4ASjEf9CbOrAjhG+KxOY7+AkZ8M mPTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=dExJ5L1d; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fb.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h7-20020a05620a244700b006a6b3f6ca4asi4554268qkn.376.2022.06.17.15.03.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Jun 2022 15:03:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=dExJ5L1d; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fb.com Received: from localhost ([::1]:48186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o2K4E-0008Ev-2E for alex.bennee@linaro.org; Fri, 17 Jun 2022 18:03:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o2K3b-0007yU-UJ; Fri, 17 Jun 2022 18:03:11 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:38198) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o2K3Z-0007Nz-OS; Fri, 17 Jun 2022 18:03:11 -0400 Received: from pps.filterd (m0109333.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25HLhlsL012849; Fri, 17 Jun 2022 15:02:52 -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=YOjMe23O8Tc5vIhwtl0bdN87rTwqzw2TEUrM4lcjOjA=; b=dExJ5L1dikUPcz0CG0tjRrJrl1k0p6q31tbp87DcXkCBL1r7Ap9SEB9DTaqihwZ1Vqs9 PEVpW0zvbbdV5IkrC/GPG35iNRLbxaF7CQfLuxSZSnIBos1haWco2OedeAERspEkUPwY Sw0Wc9XpDMjMDh/Q9D/TzML/1R6cJM5LSAU= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3gqt6fwda6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 17 Jun 2022 15:02:52 -0700 Received: from localhost (2620:10d:c085:108::8) by mail.thefacebook.com (2620:10d:c085:21d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Fri, 17 Jun 2022 15:02:51 -0700 From: Iris Chen To: CC: , , , , , , , , , , , , , , , , Subject: [PATCH v3 1/2] hw: m25p80: add WP# pin and SRWD bit for write protection Date: Fri, 17 Jun 2022 15:02:45 -0700 Message-ID: <20220617220245.2285150-1-irischenlj@fb.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [2620:10d:c085:108::8] X-Proofpoint-GUID: EuC-7Tyf9RBhjC-aC8Ot6psG3vwBRAKU X-Proofpoint-ORIG-GUID: EuC-7Tyf9RBhjC-aC8Ot6psG3vwBRAKU 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-17_14,2022-06-17_01,2022-02-23_01 Received-SPF: pass client-ip=67.231.145.42; envelope-from=prvs=71671d6567=irischenlj@fb.com; helo=mx0a-00082601.pphosted.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 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_LOW=-0.7, 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-arm@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-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: hf8ZCQd4WjG7 Signed-off-by: Iris Chen --- Thanks everyone for your comments. This is a v3 patch that addresses all suggestions (moving write_enable to decode_new_cmd). I am waiting on some feedback from Dan's (dz4list@gmail.com) patch regarding adding a STATE_STANDBY state. Currently, all tests are passing. hw/block/m25p80.c | 77 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 62 insertions(+), 15 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 81ba3da4df..12a59ca57c 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -27,12 +27,14 @@ #include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "hw/ssi/ssi.h" +#include "hw/irq.h" #include "migration/vmstate.h" #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h" #include "qemu/error-report.h" #include "qapi/error.h" +#include "qapi/visitor.h" #include "trace.h" #include "qom/object.h" @@ -472,11 +474,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; int64_t dirty_page; @@ -723,6 +727,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 = extract32(s->data[0], 7, 1); + switch (get_man(s)) { case MAN_SPANSION: s->quad_enable = !!(s->data[1] & 0x02); @@ -1165,22 +1171,34 @@ static void decode_new_cmd(Flash *s, uint32_t value) break; case WRSR: - if (s->write_enable) { - switch (get_man(s)) { - case MAN_SPANSION: - s->needed_bytes = 2; - s->state = STATE_COLLECTING_DATA; - break; - case MAN_MACRONIX: - s->needed_bytes = 2; - s->state = STATE_COLLECTING_VAR_LEN_DATA; - break; - default: - s->needed_bytes = 1; - s->state = STATE_COLLECTING_DATA; - } - s->pos = 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 mode" + * (SPM), and status register writes are permitted. + */ + if ((s->wp_level == 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 = 2; + s->state = STATE_COLLECTING_DATA; + break; + case MAN_MACRONIX: + s->needed_bytes = 2; + s->state = STATE_COLLECTING_VAR_LEN_DATA; + break; + default: + s->needed_bytes = 1; + s->state = STATE_COLLECTING_DATA; + } + s->pos = 0; break; case WRDI: @@ -1195,6 +1213,8 @@ static void decode_new_cmd(Flash *s, uint32_t value) case RDSR: s->data[0] = (!!s->write_enable) << 1; + s->data[0] |= (!!s->status_register_write_disabled) << 7; + if (get_man(s) == MAN_MACRONIX || get_man(s) == MAN_ISSI) { s->data[0] |= (!!s->quad_enable) << 6; } @@ -1484,6 +1504,14 @@ static uint32_t m25p80_transfer8(SSIPeripheral *ss, uint32_t tx) return r; } +static void m25p80_write_protect_pin_irq_handler(void *opaque, int n, int level) +{ + Flash *s = M25P80(opaque); + /* WP# is just a single pin. */ + assert(n == 0); + s->wp_level = !!level; +} + static void m25p80_realize(SSIPeripheral *ss, Error **errp) { Flash *s = M25P80(ss); @@ -1515,12 +1543,18 @@ static void m25p80_realize(SSIPeripheral *ss, Error **errp) s->storage = 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); } static void m25p80_reset(DeviceState *d) { Flash *s = M25P80(d); + s->wp_level = true; + s->status_register_write_disabled = false; + reset_memory(s); } @@ -1587,6 +1621,18 @@ static const VMStateDescription vmstate_m25p80_aai_enable = { } }; +static const VMStateDescription vmstate_m25p80_write_protect = { + .name = "m25p80/write_protect", + .version_id = 1, + .minimum_version_id = 1, + .needed = false, + .fields = (VMStateField[]) { + VMSTATE_BOOL(wp_level, Flash), + VMSTATE_BOOL(status_register_write_disabled, Flash), + VMSTATE_END_OF_LIST() + } +}; + static const VMStateDescription vmstate_m25p80 = { .name = "m25p80", .version_id = 0, @@ -1618,6 +1664,7 @@ static const VMStateDescription vmstate_m25p80 = { .subsections = (const VMStateDescription * []) { &vmstate_m25p80_data_read_loop, &vmstate_m25p80_aai_enable, + &vmstate_m25p80_write_protect, NULL } }; -- 2.30.2