From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 782DDC433EF for ; Thu, 7 Jul 2022 10:38:44 +0000 (UTC) Received: from localhost ([::1]:50306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9OuB-00035A-EU for qemu-devel@archiver.kernel.org; Thu, 07 Jul 2022 06:38:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9OsW-0001vw-Ti; Thu, 07 Jul 2022 06:37:00 -0400 Received: from mail-lf1-x12a.google.com ([2a00:1450:4864:20::12a]:46722) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o9OsT-0007Go-PL; Thu, 07 Jul 2022 06:36:59 -0400 Received: by mail-lf1-x12a.google.com with SMTP id bf9so7132111lfb.13; Thu, 07 Jul 2022 03:36:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=lmpmag8xjq6+y6Uzt0QEcndEpPuMGBP0P9TZpE2byLw=; b=a16rPhNp56qF2pcHBamhNjelgRUf7xM9VCakayUcooFgsesefwAPE0/z9228kjvsNN DzVlAhJwOg5YAgddiQksXUv9Mv68GckKFAiI3g0MXDosd4wnT3Y4kSS76pcJY9k8J/Pw zzOrv8qV06mBSmh4IgP97/JbVN1k9IHnmIjLx8DD4IJhSEb3YNG46rqhUQfhKwUwMQBi MkGzKIYbYrzRkUEBDbLq0XNOo+qPz5P11r7Jyd99q+T/QTtcqmd8zMIfXWPd7JwwRfPH CE8WL6TGg68z6iSSfddk35pliJJA4LTdnFlaXDBisyZBdaF0nkoUu5u9WR1vsfS2u/qe 6EWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=lmpmag8xjq6+y6Uzt0QEcndEpPuMGBP0P9TZpE2byLw=; b=GcYwNdMZ852F53JQmDo6YVAb6xgBIfikq/eq1/j6GLDZKsu3O7sHdf1o5zfPJYfDwM BJwCZtmmNiTz9Grp/Syw6S0XKO9ufl1MxW8w0w7qjM55RP2wdp/NyEig1tUREVhG0ynR DBTmkJGF7hM/+8HSAQ3+kiR7AYJHmO7UNPiUpdk4Y/uFHilL+Qq5KPb4/ixwh7LUDdwv 8Pf+2u0aNojbyEygYDouk4bWTRrstoNmSy8f2KV/6rNJO3IFZN5xAEH7Kt7NGPKNZXEG M3ulHfaJJPtKw5FZ0AQQa8d1XYSxmU5msZV5NhAYEX7W6yZGStdlAaUb+KiMk9Wb+YsL nPAw== X-Gm-Message-State: AJIora80SjWoE8wle8Tzy19Z+VMRt4GsRROs40KlEKryw3QYWPG1bVhC 1SaHMEt7QfbKJZ92bJEb/+Y= X-Google-Smtp-Source: AGRyM1tFX728pyzj9DnfSPeJ4u7/2+CXyK7uSIEEGvvelSrX+t7ePso9aXUcUBr3guM0k7cJ0z2eGQ== X-Received: by 2002:a05:6512:401c:b0:47f:7a20:cc70 with SMTP id br28-20020a056512401c00b0047f7a20cc70mr28245334lfb.629.1657190214772; Thu, 07 Jul 2022 03:36:54 -0700 (PDT) Received: from fralle-msi (31-208-27-151.cust.bredband2.com. [31.208.27.151]) by smtp.gmail.com with ESMTPSA id a11-20020ac25e6b000000b0047862287498sm6767187lfr.208.2022.07.07.03.36.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 03:36:53 -0700 (PDT) Date: Thu, 7 Jul 2022 12:36:52 +0200 From: Francisco Iglesias To: Iris Chen Cc: pdel@fb.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, clg@kaod.org, patrick@stwcx.xyz, alistair@alistair23.me, kwolf@redhat.com, hreitz@redhat.com, peter.maydell@linaro.org, andrew@aj.id.au, joel@jms.id.au, thuth@redhat.com, lvivier@redhat.com, pbonzini@redhat.com, qemu-block@nongnu.org, dz4list@gmail.com Subject: Re: [PATCH v2] hw: m25p80: Add Block Protect and Top Bottom bits for write protect Message-ID: <20220707103651.GG10629@fralle-msi> References: <20220627185234.1911337-1-irischenlj@fb.com> <20220707021626.2482219-1-irischenlj@fb.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220707021626.2482219-1-irischenlj@fb.com> User-Agent: Mutt/1.10.1 (2018-07-13) Received-SPF: pass client-ip=2a00:1450:4864:20::12a; envelope-from=frasse.iglesias@gmail.com; helo=mail-lf1-x12a.google.com X-Spam_score_int: -1020 X-Spam_score: -102.1 X-Spam_bar: --------------------------------------------------- X-Spam_report: (-102.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, USER_IN_WELCOMELIST=-0.01, USER_IN_WHITELIST=-100 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Iris On [2022 Jul 06] Wed 19:16:26, Iris Chen wrote: > Signed-off-by: Iris Chen A couple of suggestions below if you would like to go for a v3 but otherwise: Reviewed-by: Francisco Iglesias Thanks, Best regards, Francisco Iglesias > --- > Addressing all comments. > In reponse to this comment: > "Something wrong will occur if all block_protect[0123] are zeroes", > the code actually ignores num_protected_sectors when block_protect_value = 0 > which happens when block_protect[0123] are zeroes. > > You can refer to the bottom block in v1, where we only look at cases when > block_protect_value > 0 so it is actually handled. > Regardless, since we were setting num_protected_sectors > in either case, I have refactored the code to make it more clear. > > hw/block/m25p80.c | 103 ++++++++++++++++++++++++++++++++++++++++------ > 1 file changed, 91 insertions(+), 12 deletions(-) > > diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c > index 50b523e5b1..bddea9853b 100644 > --- a/hw/block/m25p80.c > +++ b/hw/block/m25p80.c > @@ -38,21 +38,19 @@ > #include "trace.h" > #include "qom/object.h" > > -/* Fields for FlashPartInfo->flags */ > - > -/* erase capabilities */ > -#define ER_4K 1 > -#define ER_32K 2 > -/* set to allow the page program command to write 0s back to 1. Useful for > - * modelling EEPROM with SPI flash command set > - */ > -#define EEPROM 0x100 > - > /* 16 MiB max in 3 byte address mode */ > #define MAX_3BYTES_SIZE 0x1000000 > - > #define SPI_NOR_MAX_ID_LEN 6 > > +/* Fields for FlashPartInfo->flags */ > +enum spi_option_flags { A suggestion is to rename to spi_flash_option_flags (for being more clear that it is flash option and not a SPI option). > + ER_4K = BIT(0), > + ER_32K = BIT(1), > + EEPROM = BIT(2), > + HAS_SR_TB = BIT(3), > + HAS_SR_BP3_BIT6 = BIT(4), > +}; > + > typedef struct FlashPartInfo { > const char *part_name; > /* > @@ -253,7 +251,8 @@ static const FlashPartInfo known_devices[] = { > { INFO("n25q512a11", 0x20bb20, 0, 64 << 10, 1024, ER_4K) }, > { INFO("n25q512a13", 0x20ba20, 0, 64 << 10, 1024, ER_4K) }, > { INFO("n25q128", 0x20ba18, 0, 64 << 10, 256, 0) }, > - { INFO("n25q256a", 0x20ba19, 0, 64 << 10, 512, ER_4K) }, > + { INFO("n25q256a", 0x20ba19, 0, 64 << 10, 512, > + ER_4K | HAS_SR_BP3_BIT6 | HAS_SR_TB) }, > { INFO("n25q512a", 0x20ba20, 0, 64 << 10, 1024, ER_4K) }, > { INFO("n25q512ax3", 0x20ba20, 0x1000, 64 << 10, 1024, ER_4K) }, > { INFO("mt25ql512ab", 0x20ba20, 0x1044, 64 << 10, 1024, ER_4K | ER_32K) }, > @@ -480,6 +479,11 @@ struct Flash { > bool reset_enable; > bool quad_enable; > bool aai_enable; > + bool block_protect0; > + bool block_protect1; > + bool block_protect2; > + bool block_protect3; > + bool top_bottom_bit; > bool status_register_write_disabled; > uint8_t ear; > > @@ -626,11 +630,36 @@ void flash_write8(Flash *s, uint32_t addr, uint8_t data) > uint32_t page = addr / s->pi->page_size; > uint8_t prev = s->storage[s->cur_addr]; > A cosmetic suggestion is to remove above blank line to keep the declarations together. > + uint32_t block_protect_value = (s->block_protect3 << 3) | > + (s->block_protect2 << 2) | > + (s->block_protect1 << 1) | > + (s->block_protect0 << 0); > + > if (!s->write_enable) { > qemu_log_mask(LOG_GUEST_ERROR, "M25P80: write with write protect!\n"); > return; > } > > + if (block_protect_value > 0) { > + uint32_t num_protected_sectors = 1 << (block_protect_value - 1); > + uint32_t sector = addr / s->pi->sector_size; > + > + /* top_bottom_bit == 0 means TOP */ > + if (!s->top_bottom_bit) { > + if (s->pi->n_sectors <= sector + num_protected_sectors) { > + qemu_log_mask(LOG_GUEST_ERROR, > + "M25P80: write with write protect!\n"); > + return; > + } > + } else { > + if (sector < num_protected_sectors) { > + qemu_log_mask(LOG_GUEST_ERROR, > + "M25P80: write with write protect!\n"); > + return; > + } > + } > + } > + > if ((prev ^ data) & data) { > trace_m25p80_programming_zero_to_one(s, addr, prev, data); > } > @@ -728,6 +757,15 @@ static void complete_collecting_data(Flash *s) > break; > case WRSR: > s->status_register_write_disabled = extract32(s->data[0], 7, 1); > + s->block_protect0 = extract32(s->data[0], 2, 1); > + s->block_protect1 = extract32(s->data[0], 3, 1); > + s->block_protect2 = extract32(s->data[0], 4, 1); > + if (s->pi->flags & HAS_SR_TB) { > + s->top_bottom_bit = extract32(s->data[0], 5, 1); > + } > + if (s->pi->flags & HAS_SR_BP3_BIT6) { > + s->block_protect3 = extract32(s->data[0], 6, 1); > + } > > switch (get_man(s)) { > case MAN_SPANSION: > @@ -1213,6 +1251,15 @@ 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; > + s->data[0] |= (!!s->block_protect0) << 2; > + s->data[0] |= (!!s->block_protect1) << 3; > + s->data[0] |= (!!s->block_protect2) << 4; > + if (s->pi->flags & HAS_SR_TB) { > + s->data[0] |= (!!s->top_bottom_bit) << 5; > + } > + if (s->pi->flags & HAS_SR_BP3_BIT6) { > + s->data[0] |= (!!s->block_protect3) << 6; > + } > > if (get_man(s) == MAN_MACRONIX || get_man(s) == MAN_ISSI) { > s->data[0] |= (!!s->quad_enable) << 6; > @@ -1553,6 +1600,11 @@ static void m25p80_reset(DeviceState *d) > > s->wp_level = true; > s->status_register_write_disabled = false; > + s->block_protect0 = false; > + s->block_protect1 = false; > + s->block_protect2 = false; > + s->block_protect3 = false; > + s->top_bottom_bit = false; > > reset_memory(s); > } > @@ -1639,6 +1691,32 @@ static const VMStateDescription vmstate_m25p80_write_protect = { > } > }; > > +static bool m25p80_block_protect_needed(void *opaque) > +{ > + Flash *s = (Flash *)opaque; > + > + return s->block_protect0 || > + s->block_protect1 || > + s->block_protect2 || > + s->block_protect3 || > + s->top_bottom_bit; > +} > + > +static const VMStateDescription vmstate_m25p80_block_protect = { > + .name = "m25p80/block_protect", > + .version_id = 1, > + .minimum_version_id = 1, > + .needed = m25p80_block_protect_needed, > + .fields = (VMStateField[]) { > + VMSTATE_BOOL(block_protect0, Flash), > + VMSTATE_BOOL(block_protect1, Flash), > + VMSTATE_BOOL(block_protect2, Flash), > + VMSTATE_BOOL(block_protect3, Flash), > + VMSTATE_BOOL(top_bottom_bit, Flash), > + VMSTATE_END_OF_LIST() > + } > +}; > + > static const VMStateDescription vmstate_m25p80 = { > .name = "m25p80", > .version_id = 0, > @@ -1671,6 +1749,7 @@ static const VMStateDescription vmstate_m25p80 = { > &vmstate_m25p80_data_read_loop, > &vmstate_m25p80_aai_enable, > &vmstate_m25p80_write_protect, > + &vmstate_m25p80_block_protect, > NULL > } > }; > -- > 2.30.2 > >