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 X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 10CEFC433FE for ; Fri, 11 Dec 2020 06:40:27 +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 8806323EB2 for ; Fri, 11 Dec 2020 06:40:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8806323EB2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43418 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knc6L-0007Kx-0m for qemu-devel@archiver.kernel.org; Fri, 11 Dec 2020 01:40:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knc3d-0006FU-L0; Fri, 11 Dec 2020 01:37:37 -0500 Received: from mail-io1-xd44.google.com ([2607:f8b0:4864:20::d44]:36152) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1knc3Z-0008Ig-NX; Fri, 11 Dec 2020 01:37:36 -0500 Received: by mail-io1-xd44.google.com with SMTP id z136so8379011iof.3; Thu, 10 Dec 2020 22:37:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XTFIv2WAE9rfla/uFVmPb7zUifAPllrvJphk9LyH7Dw=; b=o1/ycS/IPqypeVnZG3/oSOzWfjte6oUpj1AFxT22+VAK7pMH2FX/oedZgXHYsjQ3Lu PzV3/9Ec2oeilb3tEus4c6uGDyngQV9ZWY5uBiSUtTn/8ibEfEMspPJjknxg9ZoxOYTQ Vp/YKmSIppEitjd1ca0jXHYcygCwy2UQxvvqfQ7L7KtmlZNx3dbH6Pl0bHqKdrer1AUu nMcl0NUuACAj0WoE1jVkqMFLlyALC02Yy6RVGri+NeOrQvqX1xcTCJ1izVInzkjQP9vi rnMx3dgBuC6WnhV9Z0GTiSed5uDi8d7zpoIaSFZ8ULA/EwCy7JPa+jMavBbWb4k58S39 g4uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XTFIv2WAE9rfla/uFVmPb7zUifAPllrvJphk9LyH7Dw=; b=UdA9r4p3Hb0HnllX4cJ1SegFQmT9a+rOILUTU/HiOGzm8QDVZ7O8JscbDZimhoH+JT hNcOH38K3mrVp2xeNrODFKlIpVjFLYvN8wIvbvqTNt5YFxL5Iu4sYdSwnYxT0xoyYkAb AjXInYL2/NrSHL+VZo4aEcrp7NtpWXeL7Njp5zEmAZY5ro/maZuO38L1ZPJntpzv0jXu kJAIOXUUtjrgq/TpBjhwAEDE3DkwowGYtXLd2jKYZ5h9JP50mRdHuCJkGGDDejHa00pt 0uWPOwKWaobeYb2n6+qN8fyaDnodcvXCspTFllWSmoi/3haYBP2RrzFa4lhpntTTlQhT 4wgw== X-Gm-Message-State: AOAM531fP8FCwuQFe+BvxVL9pRLcP2zmdsDNihuTrnzPaXTuvqJEzm6o 3uCPWgD8nEJhlCXzJf7or9E= X-Google-Smtp-Source: ABdhPJzs1xRk2GrWBF01rV70L/k5a6TD9kjVejLuclkoLepMUvcTLA2JjTsrIWl3u8ctDwOMk4VR1Q== X-Received: by 2002:a5d:8793:: with SMTP id f19mr13443723ion.106.1607668650458; Thu, 10 Dec 2020 22:37:30 -0800 (PST) Received: from pek-vx-bsp2.wrs.com (unknown-124-94.windriver.com. [147.11.124.94]) by smtp.gmail.com with ESMTPSA id k18sm157620ils.73.2020.12.10.22.37.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Dec 2020 22:37:30 -0800 (PST) From: Bin Meng To: Alistair Francis , Francisco Iglesias , Kevin Wolf , Max Reitz , qemu-block@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v3 2/2] hw/block: m25p80: Implement AAI-WP command support for SST flashes Date: Fri, 11 Dec 2020 14:37:20 +0800 Message-Id: <1607668640-33970-2-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1607668640-33970-1-git-send-email-bmeng.cn@gmail.com> References: <1607668640-33970-1-git-send-email-bmeng.cn@gmail.com> Received-SPF: pass client-ip=2607:f8b0:4864:20::d44; envelope-from=bmeng.cn@gmail.com; helo=mail-io1-xd44.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.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 autolearn=ham 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: Xuzhou Cheng , Bin Meng Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Xuzhou Cheng Auto Address Increment (AAI) Word-Program is a special command of SST flashes. AAI-WP allows multiple bytes of data to be programmed without re-issuing the next sequential address location. Signed-off-by: Xuzhou Cheng Signed-off-by: Bin Meng --- Changes in v3: - initialize aai_enable to false in reset_memory() Changes in v2: - add aai_enable into the vmstate - validate AAI command before decoding a new command - log guest errors during AAI_WP command handling - report AAI status in the status register - abort AAI programming when address is wrapped - make sure AAI programming starts from the even address hw/block/m25p80.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 236e1b4..802a21d 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -359,6 +359,7 @@ typedef enum { QPP_4 = 0x34, RDID_90 = 0x90, RDID_AB = 0xab, + AAI_WP = 0xad, ERASE_4K = 0x20, ERASE4_4K = 0x21, @@ -449,6 +450,7 @@ struct Flash { bool four_bytes_address_mode; bool reset_enable; bool quad_enable; + bool aai_enable; uint8_t ear; int64_t dirty_page; @@ -664,6 +666,11 @@ static void complete_collecting_data(Flash *s) case PP4_4: s->state = STATE_PAGE_PROGRAM; break; + case AAI_WP: + /* AAI programming starts from the even address */ + s->cur_addr &= ~BIT(0); + s->state = STATE_PAGE_PROGRAM; + break; case READ: case READ4: case FAST_READ: @@ -762,6 +769,7 @@ static void reset_memory(Flash *s) s->write_enable = false; s->reset_enable = false; s->quad_enable = false; + s->aai_enable = false; switch (get_man(s)) { case MAN_NUMONYX: @@ -932,6 +940,15 @@ static void decode_qio_read_cmd(Flash *s) s->state = STATE_COLLECTING_DATA; } +static bool is_valid_aai_cmd(uint32_t value) +{ + if (value == AAI_WP || value == WRDI || value == RDSR) { + return true; + } else { + return false; + } +} + static void decode_new_cmd(Flash *s, uint32_t value) { int i; @@ -943,6 +960,11 @@ static void decode_new_cmd(Flash *s, uint32_t value) s->reset_enable = false; } + if (get_man(s) == MAN_SST && s->aai_enable && !is_valid_aai_cmd(value)) { + qemu_log_mask(LOG_GUEST_ERROR, + "M25P80: Invalid cmd within AAI programming sequence"); + } + switch (value) { case ERASE_4K: @@ -1008,6 +1030,9 @@ static void decode_new_cmd(Flash *s, uint32_t value) case WRDI: s->write_enable = false; + if (get_man(s) == MAN_SST) { + s->aai_enable = false; + } break; case WREN: s->write_enable = true; @@ -1018,6 +1043,10 @@ static void decode_new_cmd(Flash *s, uint32_t value) if (get_man(s) == MAN_MACRONIX) { s->data[0] |= (!!s->quad_enable) << 6; } + if (get_man(s) == MAN_SST) { + s->data[0] |= (!!s->aai_enable) << 6; + } + s->pos = 0; s->len = 1; s->data_read_loop = true; @@ -1160,6 +1189,24 @@ static void decode_new_cmd(Flash *s, uint32_t value) case RSTQIO: s->quad_enable = false; break; + case AAI_WP: + if (get_man(s) == MAN_SST) { + if (s->write_enable) { + if (s->aai_enable) { + s->state = STATE_PAGE_PROGRAM; + } else { + s->aai_enable = true; + s->needed_bytes = get_addr_length(s); + s->state = STATE_COLLECTING_DATA; + } + } else { + qemu_log_mask(LOG_GUEST_ERROR, + "M25P80: AAI_WP with write protect\n"); + } + } else { + qemu_log_mask(LOG_GUEST_ERROR, "M25P80: Unknown cmd %x\n", value); + } + break; default: s->pos = 0; s->len = 1; @@ -1205,6 +1252,19 @@ static uint32_t m25p80_transfer8(SSISlave *ss, uint32_t tx) trace_m25p80_page_program(s, s->cur_addr, (uint8_t)tx); flash_write8(s, s->cur_addr, (uint8_t)tx); s->cur_addr = (s->cur_addr + 1) & (s->size - 1); + + if (get_man(s) == MAN_SST && s->aai_enable && s->cur_addr == 0) { + /* + * There is no wrap mode during AAI programming once the highest + * unprotected memory address is reached. The Write-Enable-Latch + * bit is automatically reset, and AAI programming mode aborts. + */ + qemu_log_mask(LOG_GUEST_ERROR, + "M25P80: AAI highest memory address reached"); + s->write_enable = false; + s->aai_enable = false; + } + break; case STATE_READ: @@ -1372,6 +1432,7 @@ static const VMStateDescription vmstate_m25p80 = { VMSTATE_UINT32(volatile_cfg, Flash), VMSTATE_UINT32(enh_volatile_cfg, Flash), VMSTATE_BOOL(quad_enable, Flash), + VMSTATE_BOOL(aai_enable, Flash), VMSTATE_UINT8(spansion_cr1nv, Flash), VMSTATE_UINT8(spansion_cr2nv, Flash), VMSTATE_UINT8(spansion_cr3nv, Flash), -- 2.7.4