From nobody Tue Apr 30 15:38:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554775506505474.1131739629168; Mon, 8 Apr 2019 19:05:06 -0700 (PDT) Received: from localhost ([127.0.0.1]:33721 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDg8E-0003mA-8h for importer@patchew.org; Mon, 08 Apr 2019 22:05:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44861) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDg6H-0002bO-Td for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDg6F-0005yi-PB for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:01 -0400 Received: from mail-io1-xd2d.google.com ([2607:f8b0:4864:20::d2d]:40971) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDg6A-0005tw-1A for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:02:55 -0400 Received: by mail-io1-xd2d.google.com with SMTP id v10so12848377iom.8 for ; Mon, 08 Apr 2019 19:02:51 -0700 (PDT) Received: from worksec.oberlin.net (ip-210-181.oberlin.net. [208.66.210.181]) by smtp.gmail.com with ESMTPSA id y203sm5969838itb.22.2019.04.08.19.02.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Apr 2019 19:02:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oberlin-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7CTUvo3fKEINenVdrG1752SbfzgugkaAe+xZvTGCm38=; b=a/83QqyVIq5ml7LN5YyC+KZuTMXxgEBiNCV7iuhyKBetkdN8d0nJdFhuyhYbWmCsC4 JyjhkaBgamqeefhkTmlCOAysNyW7aQPIMZqjH6cVh2ZuLG11fNs60cP75JcQ/ohi6Sln uca4cJSQEnXurcTa1CxO2WhzWhwLg/9DmBecFGLmZlOv5B7jIwUAeN35AZ/PYE8Bwpo8 8uRMdTIEUA7PZL7ttZaXP0X++oJ2LCEDtCHAx5LoZXxgoR2uZoBU0EvyZBKcWpU9nSYl iKMJOKNgYbUYfZVz2oYWbwlLjN2WsMz6VuwsRZxhZbOQAq/4GbgzZ3gyUq8z31p6tIKL XKrw== 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:mime-version:content-transfer-encoding; bh=7CTUvo3fKEINenVdrG1752SbfzgugkaAe+xZvTGCm38=; b=LMeVMlN7OCRda8VKDd84nnGFupQgPLCuTXzszPJYl5TfQvpaEkf2Tf2VJAAI5pzb8x ucXLOkoIkXJK0uHwS5Lz1jmyi4fOXaLZh0BaMP8v4Dbsl3L9gEAt6t0SeFZkUb7ekpmM QqL7Vb8CZIJ5DggRsY6ittxV3je6HTlIme5mDIQwQ/MKQcQjbsZ4blUH+llqiNCfA7os 0z+YODTR4b4XTXmj4cI9d0RnCu/50/a2yKQcaM9H6hkWMkTKsmGY1ris3fVCIUTi1ju7 FRXHOcxdr7mdckAd9FIh+ElJANAa140dW7D+MY/Ll5cmHUQBBu6K++mrN/bz0U2alAHG bz3w== X-Gm-Message-State: APjAAAXp7NeTdrPwL92WzZR6iY7JR1D3NEATM2MOBBV08RXdPHCKQVVs Bc6CBWjVMm2hH/hI3aP6u+A5+sUocJLt2A== X-Google-Smtp-Source: APXvYqzJO6FGICW5RZygJvVqO1HswKLiQY7/ReIJi1AQerT+dHZo7a/3OxpPgLAU4/P5a5dTD2kMFg== X-Received: by 2002:a6b:4910:: with SMTP id u16mr21285287iob.150.1554775370445; Mon, 08 Apr 2019 19:02:50 -0700 (PDT) From: Stephen Checkoway To: qemu-devel@nongnu.org Date: Mon, 8 Apr 2019 22:01:23 -0400 Message-Id: <883963349ba8cfdaca1674141bc92100eb559ebc.1554774454.git.stephen.checkoway@oberlin.edu> X-Mailer: git-send-email 2.20.1 (Apple Git-117) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::d2d Subject: [Qemu-devel] [PATCH v2 01/10] block/pflash_cfi02: Add test for supported commands X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Laurent Vivier , Thomas Huth , Stephen Checkoway , qemu-block@nongnu.org, Max Reitz , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Test the AMD command set for parallel flash chips. This test uses an ARM musicpal board with a pflash drive to test the following list of currently-supported commands. - Autoselect - CFI - Sector erase - Chip erase - Program - Unlock bypass - Reset Signed-off-by: Stephen Checkoway --- tests/Makefile.include | 2 + tests/pflash-cfi02-test.c | 227 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 229 insertions(+) create mode 100644 tests/pflash-cfi02-test.c diff --git a/tests/Makefile.include b/tests/Makefile.include index 6b904d7430..0a26eacce0 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -263,6 +263,7 @@ check-qtest-arm-y +=3D tests/m25p80-test$(EXESUF) check-qtest-arm-y +=3D tests/test-arm-mptimer$(EXESUF) check-qtest-arm-y +=3D tests/boot-serial-test$(EXESUF) check-qtest-arm-y +=3D tests/hexloader-test$(EXESUF) +check-qtest-arm-$(CONFIG_PFLASH_CFI02) +=3D tests/pflash-cfi02-test$(EXESU= F) =20 check-qtest-aarch64-y =3D tests/numa-test$(EXESUF) check-qtest-aarch64-y +=3D tests/boot-serial-test$(EXESUF) @@ -773,6 +774,7 @@ tests/device-introspect-test$(EXESUF): tests/device-int= rospect-test.o tests/rtc-test$(EXESUF): tests/rtc-test.o tests/m48t59-test$(EXESUF): tests/m48t59-test.o tests/hexloader-test$(EXESUF): tests/hexloader-test.o +tests/pflash-cfi02$(EXESUF): tests/pflash-cfi02-test.o tests/endianness-test$(EXESUF): tests/endianness-test.o tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y) tests/rtas-test$(EXESUF): tests/rtas-test.o $(libqos-spapr-obj-y) diff --git a/tests/pflash-cfi02-test.c b/tests/pflash-cfi02-test.c new file mode 100644 index 0000000000..b113fca5af --- /dev/null +++ b/tests/pflash-cfi02-test.c @@ -0,0 +1,227 @@ +/* + * QTest testcase for parallel flash with AMD command set + * + * Copyright (c) 2018 Stephen Checkoway + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include +#include +#include "libqtest.h" + +/* + * To test the pflash_cfi02 device, we run QEMU with the musicpal machine = with + * a pflash drive. This enables us to test some flash configurations, but = not + * all. In particular, we're limited to a 16-bit wide flash device. + */ + +#define MP_FLASH_SIZE_MAX (32 * 1024 * 1024) +#define BASE_ADDR (0x100000000ULL - MP_FLASH_SIZE_MAX) + +#define FLASH_WIDTH 2 +#define CFI_ADDR (FLASH_WIDTH * 0x55) +#define UNLOCK0_ADDR (FLASH_WIDTH * 0x5555) +#define UNLOCK1_ADDR (FLASH_WIDTH * 0x2AAA) + +#define CFI_CMD 0x98 +#define UNLOCK0_CMD 0xAA +#define UNLOCK1_CMD 0x55 +#define AUTOSELECT_CMD 0x90 +#define RESET_CMD 0xF0 +#define PROGRAM_CMD 0xA0 +#define SECTOR_ERASE_CMD 0x30 +#define CHIP_ERASE_CMD 0x10 +#define UNLOCK_BYPASS_CMD 0x20 +#define UNLOCK_BYPASS_RESET_CMD 0x00 + +static char image_path[] =3D "/tmp/qtest.XXXXXX"; + +static inline void flash_write(uint64_t byte_addr, uint16_t data) +{ + qtest_writew(global_qtest, BASE_ADDR + byte_addr, data); +} + +static inline uint16_t flash_read(uint64_t byte_addr) +{ + return qtest_readw(global_qtest, BASE_ADDR + byte_addr); +} + +static void unlock(void) +{ + flash_write(UNLOCK0_ADDR, UNLOCK0_CMD); + flash_write(UNLOCK1_ADDR, UNLOCK1_CMD); +} + +static void reset(void) +{ + flash_write(0, RESET_CMD); +} + +static void sector_erase(uint64_t byte_addr) +{ + unlock(); + flash_write(UNLOCK0_ADDR, 0x80); + unlock(); + flash_write(byte_addr, SECTOR_ERASE_CMD); +} + +static void wait_for_completion(uint64_t byte_addr) +{ + /* If DQ6 is toggling, step the clock and ensure the toggle stops. */ + if ((flash_read(byte_addr) & 0x40) ^ (flash_read(byte_addr) & 0x40)) { + /* Wait for erase or program to finish. */ + clock_step_next(); + /* Ensure that DQ6 has stopped toggling. */ + g_assert_cmpint(flash_read(byte_addr), =3D=3D, flash_read(byte_add= r)); + } +} + +static void bypass_program(uint64_t byte_addr, uint16_t data) +{ + flash_write(UNLOCK0_ADDR, PROGRAM_CMD); + flash_write(byte_addr, data); + /* + * Data isn't valid until DQ6 stops toggling. We don't model this as + * writes are immediate, but if this changes in the future, we can wait + * until the program is complete. + */ + wait_for_completion(byte_addr); +} + +static void program(uint64_t byte_addr, uint16_t data) +{ + unlock(); + bypass_program(byte_addr, data); +} + +static void chip_erase(void) +{ + unlock(); + flash_write(UNLOCK0_ADDR, 0x80); + unlock(); + flash_write(UNLOCK0_ADDR, SECTOR_ERASE_CMD); +} + +static void test_flash(void) +{ + global_qtest =3D qtest_initf("-M musicpal,accel=3Dqtest " + "-drive if=3Dpflash,file=3D%s,format=3Draw,= copy-on-read", + image_path); + /* Check the IDs. */ + unlock(); + flash_write(UNLOCK0_ADDR, AUTOSELECT_CMD); + g_assert_cmpint(flash_read(FLASH_WIDTH * 0x0000), =3D=3D, 0x00BF); + g_assert_cmpint(flash_read(FLASH_WIDTH * 0x0001), =3D=3D, 0x236D); + reset(); + + /* Check the erase blocks. */ + flash_write(CFI_ADDR, CFI_CMD); + g_assert_cmpint(flash_read(FLASH_WIDTH * 0x10), =3D=3D, 'Q'); + g_assert_cmpint(flash_read(FLASH_WIDTH * 0x11), =3D=3D, 'R'); + g_assert_cmpint(flash_read(FLASH_WIDTH * 0x12), =3D=3D, 'Y'); + /* Num erase regions. */ + g_assert_cmpint(flash_read(FLASH_WIDTH * 0x2C), >=3D, 1); + uint32_t nb_sectors =3D flash_read(FLASH_WIDTH * 0x2D) + + (flash_read(FLASH_WIDTH * 0x2E) << 8) + 1; + uint32_t sector_len =3D (flash_read(FLASH_WIDTH * 0x2F) << 8) + + (flash_read(FLASH_WIDTH * 0x30) << 16); + reset(); + + /* Erase and program sector. */ + for (uint32_t i =3D 0; i < nb_sectors; ++i) { + uint64_t byte_addr =3D i * sector_len; + sector_erase(byte_addr); + /* Read toggle. */ + uint16_t status0 =3D flash_read(byte_addr); + /* DQ7 is 0 during an erase. */ + g_assert_cmpint(status0 & 0x80, =3D=3D, 0); + uint16_t status1 =3D flash_read(byte_addr); + /* DQ6 toggles during an erase. */ + g_assert_cmpint(status0 & 0x40, !=3D, status1 & 0x40); + /* Wait for erase to complete. */ + clock_step_next(); + /* Ensure DQ6 has stopped toggling. */ + g_assert_cmpint(flash_read(byte_addr), =3D=3D, flash_read(byte_add= r)); + /* Now the data should be valid. */ + g_assert_cmpint(flash_read(byte_addr), =3D=3D, 0xFFFF); + + /* Program a bit pattern. */ + program(byte_addr, 0x5555); + g_assert_cmpint(flash_read(byte_addr), =3D=3D, 0x5555); + program(byte_addr, 0xAA55); + g_assert_cmpint(flash_read(byte_addr), =3D=3D, 0x0055); + } + + /* Erase the chip. */ + chip_erase(); + /* Read toggle. */ + uint16_t status0 =3D flash_read(0); + /* DQ7 is 0 during an erase. */ + g_assert_cmpint(status0 & 0x80, =3D=3D, 0); + uint16_t status1 =3D flash_read(0); + /* DQ6 toggles during an erase. */ + g_assert_cmpint(status0 & 0x40, !=3D, status1 & 0x40); + /* Wait for erase to complete. */ + clock_step_next(); + /* Ensure DQ6 has stopped toggling. */ + g_assert_cmpint(flash_read(0), =3D=3D, flash_read(0)); + /* Now the data should be valid. */ + g_assert_cmpint(flash_read(0), =3D=3D, 0xFFFF); + + /* Unlock bypass */ + unlock(); + flash_write(UNLOCK0_ADDR, UNLOCK_BYPASS_CMD); + bypass_program(0, 0x0123); + bypass_program(2, 0x4567); + bypass_program(4, 0x89AB); + /* + * Test that bypass programming, unlike normal programming can use any + * address for the PROGRAM_CMD. + */ + flash_write(6, PROGRAM_CMD); + flash_write(6, 0xCDEF); + wait_for_completion(6); + flash_write(0, UNLOCK_BYPASS_RESET_CMD); + bypass_program(8, 0x55AA); /* Should fail. */ + g_assert_cmpint(flash_read(0), =3D=3D, 0x0123); + g_assert_cmpint(flash_read(2), =3D=3D, 0x4567); + g_assert_cmpint(flash_read(4), =3D=3D, 0x89AB); + g_assert_cmpint(flash_read(6), =3D=3D, 0xCDEF); + g_assert_cmpint(flash_read(8), =3D=3D, 0xFFFF); + + qtest_quit(global_qtest); +} + +static void cleanup(void *opaque) +{ + unlink(image_path); +} + +int main(int argc, char **argv) +{ + int fd =3D mkstemp(image_path); + if (fd =3D=3D -1) { + err(1, "Failed to create temporary file %s", image_path); + } + if (ftruncate(fd, 8 * 1024 * 1024) < 0) { + int error_code =3D errno; + close(fd); + unlink(image_path); + g_printerr("Failed to truncate file %s to 8 MB: %s\n", image_path, + strerror(error_code)); + exit(EXIT_FAILURE); + } + close(fd); + + qtest_add_abrt_handler(cleanup, NULL); + g_test_init(&argc, &argv, NULL); + qtest_add_func("pflash-cfi02", test_flash); + int result =3D g_test_run(); + cleanup(NULL); + return result; +} + +/* vim: set sw=3D4 sts=3D4 ts=3D8 et: */ --=20 2.20.1 (Apple Git-117) From nobody Tue Apr 30 15:38:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554775660587222.96923826462023; Mon, 8 Apr 2019 19:07:40 -0700 (PDT) Received: from localhost ([127.0.0.1]:33781 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDgAh-0006CB-Dz for importer@patchew.org; Mon, 08 Apr 2019 22:07:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDg6M-0002eT-8c for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDg6K-00064p-DB for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:06 -0400 Received: from mail-it1-x143.google.com ([2607:f8b0:4864:20::143]:54154) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDg6K-00062G-1r for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:04 -0400 Received: by mail-it1-x143.google.com with SMTP id y204so2414174itf.3 for ; Mon, 08 Apr 2019 19:03:02 -0700 (PDT) Received: from worksec.oberlin.net (ip-210-181.oberlin.net. [208.66.210.181]) by smtp.gmail.com with ESMTPSA id y203sm5969838itb.22.2019.04.08.19.03.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Apr 2019 19:03:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oberlin-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jv0E8JtBAEhamTwvz2jAbN/sxL4NNiW4E2UIqBfaHx8=; b=PLz7imhMWO43YkSNeB152fRVhExWJz1SlhztB/WYH9sLehfcTDiWDtdevDr9nCkm+E /4gKXAMX9h0OxAe2GWLeHKsRMUj5u87ixwuB6XgyceKa9LFrXzbl35bbzQ3MfFIl+UyQ JDw0b7dsoCrSd5ZOeznBdpM6sC2pryfhs0OOW4fg4HyYhuM/iQ0eWuy7/1NDMY2PMASv XM+zAPFgrNbc3uf9uRFBQoqZtN+UCbxG/rfVN8fdFYQLuRpeA7OaeZRReQkbdVSZVaLi mLw4vfV3RWcMm0FfpKqOmGvGa63R23Ti3V65k0sBd16EEFq90N9JWsoCLk+7KHfpNTCT 0DAQ== 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:mime-version:content-transfer-encoding; bh=Jv0E8JtBAEhamTwvz2jAbN/sxL4NNiW4E2UIqBfaHx8=; b=gKwDo9wlIZPfnvTZVQyaUsx69CWAyRjCjOl2MYMt0Ek13KUoBxrJm7/iXzuawsuoch dNCeT/sCI+SfG6e6fm0mUf0snXBxhf4V+08J5P3ym96pYSdwcwa/Pu208652P5ke10A3 PU+B5/moUDRG2NYA5CheCs8fWVIkoIaVYrzBklTQ+w92dgegLtxc3aDSSM06ZvOCtwkv z3S06xaukajATl/z8thpMcRR7D7ny1tOUA4V+zeg+gBPZWohVnllS1JNM1wJawWEul5P Vlb9cKNST1C5YH4x/pi0PrYyI97+BDnGqp2QyO5QAK3mQJCl7GlZ2xY+AQkiqr3nTBjX DiAA== X-Gm-Message-State: APjAAAVFFjoQiRPUXCMcag59wD0hN/ffFsFdctgozhqo8hiZsUtGPRqN a4r60d+oywn5hti1huZWo7wqAwbzHx3QXg== X-Google-Smtp-Source: APXvYqwsK+JwIFOuHEbPH/VrnVfuoJ9Z1ViqXCipHg5KZHLoESl7diSmAZpAqYKNkQft+o8T90e4dw== X-Received: by 2002:a24:13c7:: with SMTP id 190mr24680006itz.9.1554775381273; Mon, 08 Apr 2019 19:03:01 -0700 (PDT) From: Stephen Checkoway To: qemu-devel@nongnu.org Date: Mon, 8 Apr 2019 22:01:25 -0400 Message-Id: <78f69544e043ef8895319d24f73ac966af9451c3.1554774454.git.stephen.checkoway@oberlin.edu> X-Mailer: git-send-email 2.20.1 (Apple Git-117) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::143 Subject: [Qemu-devel] [PATCH v2 02/10] block/pflash_cfi02: Refactor, NFC intended X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Stephen Checkoway , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Simplify and refactor for upcoming commits. In particular, pull out all of the code to modify the status into simple helper functions. Status handling becomes more complex once multiple chips are interleaved to produce a single device. No change in functionality is intended with this commit. Signed-off-by: Stephen Checkoway --- hw/block/pflash_cfi02.c | 221 +++++++++++++++++----------------------- 1 file changed, 95 insertions(+), 126 deletions(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index f2c6201f81..4b7af71806 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -46,18 +46,19 @@ #include "hw/sysbus.h" #include "trace.h" =20 -//#define PFLASH_DEBUG -#ifdef PFLASH_DEBUG +#define PFLASH_DEBUG false #define DPRINTF(fmt, ...) \ do { \ - fprintf(stderr, "PFLASH: " fmt , ## __VA_ARGS__); \ + if (PFLASH_DEBUG) { \ + fprintf(stderr, "PFLASH: " fmt, ## __VA_ARGS__); \ + } \ } while (0) -#else -#define DPRINTF(fmt, ...) do { } while (0) -#endif =20 #define PFLASH_LAZY_ROMD_THRESHOLD 42 =20 +/* Special write cycle for CFI queries. */ +#define WCYCLE_CFI 7 + struct PFlashCFI02 { /*< private >*/ SysBusDevice parent_obj; @@ -97,6 +98,31 @@ struct PFlashCFI02 { void *storage; }; =20 +/* + * Toggle status bit DQ7. + */ +static inline void toggle_dq7(PFlashCFI02 *pfl) +{ + pfl->status ^=3D 0x80; +} + +/* + * Set status bit DQ7 to bit 7 of value. + */ +static inline void set_dq7(PFlashCFI02 *pfl, uint8_t value) +{ + pfl->status &=3D 0x7F; + pfl->status |=3D value & 0x80; +} + +/* + * Toggle status bit DQ6. + */ +static inline void toggle_dq6(PFlashCFI02 *pfl) +{ + pfl->status ^=3D 0x40; +} + /* * Set up replicated mappings of the same region. */ @@ -126,7 +152,7 @@ static void pflash_timer (void *opaque) =20 trace_pflash_timer_expired(pfl->cmd); /* Reset flash */ - pfl->status ^=3D 0x80; + toggle_dq7(pfl); if (pfl->bypass) { pfl->wcycle =3D 2; } else { @@ -136,12 +162,34 @@ static void pflash_timer (void *opaque) pfl->cmd =3D 0; } =20 -static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr offset, - int width, int be) +/* + * Read data from flash. + */ +static uint64_t pflash_data_read(PFlashCFI02 *pfl, hwaddr offset, + unsigned int width) { + uint8_t *p =3D (uint8_t *)pfl->storage + offset; + uint64_t ret =3D pfl->be ? ldn_be_p(p, width) : ldn_le_p(p, width); + /* XXX: Need a trace_pflash_data_read(offset, ret, width) */ + switch (width) { + case 1: + trace_pflash_data_read8(offset, ret); + break; + case 2: + trace_pflash_data_read16(offset, ret); + break; + case 4: + trace_pflash_data_read32(offset, ret); + break; + } + return ret; +} + +static uint64_t pflash_read(void *opaque, hwaddr offset, unsigned int widt= h) +{ + PFlashCFI02 *pfl =3D opaque; hwaddr boff; - uint32_t ret; - uint8_t *p; + uint64_t ret; =20 ret =3D -1; trace_pflash_read(offset, pfl->cmd, width, pfl->wcycle); @@ -166,39 +214,8 @@ static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr o= ffset, case 0x80: /* We accept reads during second unlock sequence... */ case 0x00: - flash_read: /* Flash area read */ - p =3D pfl->storage; - switch (width) { - case 1: - ret =3D p[offset]; - trace_pflash_data_read8(offset, ret); - break; - case 2: - if (be) { - ret =3D p[offset] << 8; - ret |=3D p[offset + 1]; - } else { - ret =3D p[offset]; - ret |=3D p[offset + 1] << 8; - } - trace_pflash_data_read16(offset, ret); - break; - case 4: - if (be) { - ret =3D p[offset] << 24; - ret |=3D p[offset + 1] << 16; - ret |=3D p[offset + 2] << 8; - ret |=3D p[offset + 3]; - } else { - ret =3D p[offset]; - ret |=3D p[offset + 1] << 8; - ret |=3D p[offset + 2] << 16; - ret |=3D p[offset + 3] << 24; - } - trace_pflash_data_read32(offset, ret); - break; - } + ret =3D pflash_data_read(pfl, offset, width); break; case 0x90: /* flash ID read */ @@ -213,23 +230,23 @@ static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr = offset, case 0x0E: case 0x0F: ret =3D boff & 0x01 ? pfl->ident3 : pfl->ident2; - if (ret =3D=3D (uint8_t)-1) { - goto flash_read; + if (ret !=3D (uint8_t)-1) { + break; } - break; + /* Fall through to data read. */ default: - goto flash_read; + ret =3D pflash_data_read(pfl, offset, width); } - DPRINTF("%s: ID " TARGET_FMT_plx " %x\n", __func__, boff, ret); + DPRINTF("%s: ID " TARGET_FMT_plx " %" PRIx64 "\n", __func__, boff,= ret); break; case 0xA0: case 0x10: case 0x30: /* Status register read */ ret =3D pfl->status; - DPRINTF("%s: status %x\n", __func__, ret); + DPRINTF("%s: status %" PRIx64 "\n", __func__, ret); /* Toggle bit 6 */ - pfl->status ^=3D 0x40; + toggle_dq6(pfl); break; case 0x98: /* CFI query mode */ @@ -245,8 +262,7 @@ static uint32_t pflash_read(PFlashCFI02 *pfl, hwaddr of= fset, } =20 /* update flash content on disk */ -static void pflash_update(PFlashCFI02 *pfl, int offset, - int size) +static void pflash_update(PFlashCFI02 *pfl, int offset, int size) { int offset_end; if (pfl->blk) { @@ -259,9 +275,10 @@ static void pflash_update(PFlashCFI02 *pfl, int offset, } } =20 -static void pflash_write(PFlashCFI02 *pfl, hwaddr offset, - uint32_t value, int width, int be) +static void pflash_write(void *opaque, hwaddr offset, uint64_t value, + unsigned int width) { + PFlashCFI02 *pfl =3D opaque; hwaddr boff; uint8_t *p; uint8_t cmd; @@ -277,7 +294,7 @@ static void pflash_write(PFlashCFI02 *pfl, hwaddr offse= t, trace_pflash_write(offset, value, width, pfl->wcycle); offset &=3D pfl->chip_len - 1; =20 - DPRINTF("%s: offset " TARGET_FMT_plx " %08x %d\n", __func__, + DPRINTF("%s: offset " TARGET_FMT_plx " %08" PRIx64 " %d\n", __func__, offset, value, width); boff =3D offset & (pfl->sector_len - 1); if (pfl->width =3D=3D 2) @@ -295,7 +312,7 @@ static void pflash_write(PFlashCFI02 *pfl, hwaddr offse= t, if (boff =3D=3D 0x55 && cmd =3D=3D 0x98) { enter_CFI_mode: /* Enter CFI query mode */ - pfl->wcycle =3D 7; + pfl->wcycle =3D WCYCLE_CFI; pfl->cmd =3D 0x98; return; } @@ -345,40 +362,22 @@ static void pflash_write(PFlashCFI02 *pfl, hwaddr off= set, goto check_unlock0; case 0xA0: trace_pflash_data_write(offset, value, width, 0); - p =3D pfl->storage; if (!pfl->ro) { - switch (width) { - case 1: - p[offset] &=3D value; - pflash_update(pfl, offset, 1); - break; - case 2: - if (be) { - p[offset] &=3D value >> 8; - p[offset + 1] &=3D value; - } else { - p[offset] &=3D value; - p[offset + 1] &=3D value >> 8; - } - pflash_update(pfl, offset, 2); - break; - case 4: - if (be) { - p[offset] &=3D value >> 24; - p[offset + 1] &=3D value >> 16; - p[offset + 2] &=3D value >> 8; - p[offset + 3] &=3D value; - } else { - p[offset] &=3D value; - p[offset + 1] &=3D value >> 8; - p[offset + 2] &=3D value >> 16; - p[offset + 3] &=3D value >> 24; - } - pflash_update(pfl, offset, 4); - break; + p =3D (uint8_t *)pfl->storage + offset; + if (pfl->be) { + uint64_t current =3D ldn_be_p(p, width); + stn_be_p(p, width, current & value); + } else { + uint64_t current =3D ldn_le_p(p, width); + stn_le_p(p, width, current & value); } + pflash_update(pfl, offset, width); } - pfl->status =3D 0x00 | ~(value & 0x80); + /* + * While programming, status bit DQ7 should hold the opposite + * value from how it was programmed. + */ + set_dq7(pfl, ~value); /* Let's pretend write is immediate */ if (pfl->bypass) goto do_bypass; @@ -426,7 +425,7 @@ static void pflash_write(PFlashCFI02 *pfl, hwaddr offse= t, memset(pfl->storage, 0xFF, pfl->chip_len); pflash_update(pfl, 0, pfl->chip_len); } - pfl->status =3D 0x00; + set_dq7(pfl, 0x00); /* Let's wait 5 seconds before chip erase is done */ timer_mod(&pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + (NANOSECONDS_PER_SECOND * 5)); @@ -441,7 +440,7 @@ static void pflash_write(PFlashCFI02 *pfl, hwaddr offse= t, memset(p + offset, 0xFF, pfl->sector_len); pflash_update(pfl, offset, pfl->sector_len); } - pfl->status =3D 0x00; + set_dq7(pfl, 0x00); /* Let's wait 1/2 second before sector erase is done */ timer_mod(&pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + (NANOSECONDS_PER_SECOND / 2)); @@ -467,7 +466,7 @@ static void pflash_write(PFlashCFI02 *pfl, hwaddr offse= t, goto reset_flash; } break; - case 7: /* Special value for CFI queries */ + case WCYCLE_CFI: /* Special value for CFI queries */ DPRINTF("%s: invalid write in CFI query mode\n", __func__); goto reset_flash; default: @@ -492,39 +491,9 @@ static void pflash_write(PFlashCFI02 *pfl, hwaddr offs= et, pfl->cmd =3D 0; } =20 -static uint64_t pflash_be_readfn(void *opaque, hwaddr addr, unsigned size) -{ - return pflash_read(opaque, addr, size, 1); -} - -static void pflash_be_writefn(void *opaque, hwaddr addr, - uint64_t value, unsigned size) -{ - pflash_write(opaque, addr, value, size, 1); -} - -static uint64_t pflash_le_readfn(void *opaque, hwaddr addr, unsigned size) -{ - return pflash_read(opaque, addr, size, 0); -} - -static void pflash_le_writefn(void *opaque, hwaddr addr, - uint64_t value, unsigned size) -{ - pflash_write(opaque, addr, value, size, 0); -} - -static const MemoryRegionOps pflash_cfi02_ops_be =3D { - .read =3D pflash_be_readfn, - .write =3D pflash_be_writefn, - .valid.min_access_size =3D 1, - .valid.max_access_size =3D 4, - .endianness =3D DEVICE_NATIVE_ENDIAN, -}; - -static const MemoryRegionOps pflash_cfi02_ops_le =3D { - .read =3D pflash_le_readfn, - .write =3D pflash_le_writefn, +static const MemoryRegionOps pflash_cfi02_ops =3D { + .read =3D pflash_read, + .write =3D pflash_write, .valid.min_access_size =3D 1, .valid.max_access_size =3D 4, .endianness =3D DEVICE_NATIVE_ENDIAN, @@ -552,9 +521,9 @@ static void pflash_cfi02_realize(DeviceState *dev, Erro= r **errp) =20 chip_len =3D pfl->sector_len * pfl->nb_blocs; =20 - memory_region_init_rom_device(&pfl->orig_mem, OBJECT(pfl), pfl->be ? - &pflash_cfi02_ops_be : &pflash_cfi02_ops= _le, - pfl, pfl->name, chip_len, &local_err); + memory_region_init_rom_device(&pfl->orig_mem, OBJECT(pfl), + &pflash_cfi02_ops, pfl, pfl->name, + chip_len, &local_err); if (local_err) { error_propagate(errp, local_err); return; --=20 2.20.1 (Apple Git-117) From nobody Tue Apr 30 15:38:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554775512277628.3796139810534; Mon, 8 Apr 2019 19:05:12 -0700 (PDT) Received: from localhost ([127.0.0.1]:33725 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDg8K-0003sS-8B for importer@patchew.org; Mon, 08 Apr 2019 22:05:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45183) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDg6T-0002i4-I4 for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDg6S-0006IX-EH for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:13 -0400 Received: from mail-io1-xd29.google.com ([2607:f8b0:4864:20::d29]:40346) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDg6S-0006HC-2P for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:12 -0400 Received: by mail-io1-xd29.google.com with SMTP id d201so12864414iof.7 for ; Mon, 08 Apr 2019 19:03:11 -0700 (PDT) Received: from worksec.oberlin.net (ip-210-181.oberlin.net. [208.66.210.181]) by smtp.gmail.com with ESMTPSA id y203sm5969838itb.22.2019.04.08.19.03.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Apr 2019 19:03:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oberlin-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JK1jenobNkp2h3wHQtfPIyfKfvzIb1aDxQY+2ztH4do=; b=SLbi2aJs55LqOopZ9zGQjuaRffnjKaoPoKUrEJbGi24dS/Ms+mibpBYx6sBB21wkN2 q5XWuBGGiSf4JQCuLLTtSqFNgC4jIaVeO9RufP5uJOYuYx+2rOe3nPT1ubNiBZPO+zHd g+6JdlTPfCOvRb3O60uO1EsmCjRVTOvTMPyxwQjh5lWAduFTVs2L3WCDSRoRLIFVuff7 izXHmV/bfZkxcbG5wKa3o9FklHe2jMBg+uq4uiEO/vvt5EhqT8gEOAno2Yr1+fn2ICOc hJd8l/A9ho3edzO7P/wwlQt/7B0URIKnITP1myIkdw77wK/ew0BUO/JAzAIFREO0KKbL xHVA== 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:mime-version:content-transfer-encoding; bh=JK1jenobNkp2h3wHQtfPIyfKfvzIb1aDxQY+2ztH4do=; b=RRgx9crz+sM0NXJJJal41thg1FVoBZUEGq633dUXbxctyf/0qUTSBbciexR/O6G7kh L+i1kzWbl8QhoH2JaPkjf6QPL34ifnnAb6Fb8memNJPKSimVX+/ZwOub7LXKyIq9MFMv aSClG0R6gFYbms+DWKWJcS/+vG4+PrKN8vzVKBxWeyNFNpmSemqqySqSOP6IOlTpNJ14 YjXgOZq1jeNQgRCn+MDj1UC/PHCO7rUSx8pWdkmVejwmJ2FUi1856IIoUvZ2gdrllARG moL3yG5iaSzfX80JJoSWPDrlAn65nXgFHzZ9mm4hoDnBHvTT+djVzFF5ofNBShiDrYhF uUHA== X-Gm-Message-State: APjAAAX2Uap9htawoU+lrFL/2zquPf2CMDb5zhoEOfvfKL5/QLwaUVq0 ZFXCgLyqHD5b69CVqOJ80FlXpFIN+gTzpg== X-Google-Smtp-Source: APXvYqx2Ydoh9ir2n8CGVeRhu/0UUijZ331XXUZ3+cQM9do/hmnTOO1p7ufjiyhOz9XwCS5+rsl4kg== X-Received: by 2002:a6b:440b:: with SMTP id r11mr12820833ioa.48.1554775391234; Mon, 08 Apr 2019 19:03:11 -0700 (PDT) From: Stephen Checkoway To: qemu-devel@nongnu.org Date: Mon, 8 Apr 2019 22:01:27 -0400 Message-Id: X-Mailer: git-send-email 2.20.1 (Apple Git-117) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::d29 Subject: [Qemu-devel] [PATCH v2 03/10] block/pflash_cfi02: Fix command address comparison X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Laurent Vivier , Thomas Huth , Stephen Checkoway , qemu-block@nongnu.org, Max Reitz , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Most AMD commands only examine 11 bits of the address. This masks the addresses used in the comparison to 11 bits. The exceptions are word or sector addresses which use offset directly rather than the shifted offset, boff. Signed-off-by: Stephen Checkoway --- hw/block/pflash_cfi02.c | 8 +++++++- tests/pflash-cfi02-test.c | 12 ++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 4b7af71806..e4bff0c8f8 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -296,11 +296,13 @@ static void pflash_write(void *opaque, hwaddr offset,= uint64_t value, =20 DPRINTF("%s: offset " TARGET_FMT_plx " %08" PRIx64 " %d\n", __func__, offset, value, width); - boff =3D offset & (pfl->sector_len - 1); + boff =3D offset; if (pfl->width =3D=3D 2) boff =3D boff >> 1; else if (pfl->width =3D=3D 4) boff =3D boff >> 2; + /* Only the least-significant 11 bits are used in most cases. */ + boff &=3D 0x7FF; switch (pfl->wcycle) { case 0: /* Set the device in I/O access mode if required */ @@ -519,6 +521,10 @@ static void pflash_cfi02_realize(DeviceState *dev, Err= or **errp) return; } =20 + /* Only 11 bits are used in the comparison. */ + pfl->unlock_addr0 &=3D 0x7FF; + pfl->unlock_addr1 &=3D 0x7FF; + chip_len =3D pfl->sector_len * pfl->nb_blocs; =20 memory_region_init_rom_device(&pfl->orig_mem, OBJECT(pfl), diff --git a/tests/pflash-cfi02-test.c b/tests/pflash-cfi02-test.c index b113fca5af..b91bb66a79 100644 --- a/tests/pflash-cfi02-test.c +++ b/tests/pflash-cfi02-test.c @@ -23,8 +23,8 @@ =20 #define FLASH_WIDTH 2 #define CFI_ADDR (FLASH_WIDTH * 0x55) -#define UNLOCK0_ADDR (FLASH_WIDTH * 0x5555) -#define UNLOCK1_ADDR (FLASH_WIDTH * 0x2AAA) +#define UNLOCK0_ADDR (FLASH_WIDTH * 0x555) +#define UNLOCK1_ADDR (FLASH_WIDTH * 0x2AA) =20 #define CFI_CMD 0x98 #define UNLOCK0_CMD 0xAA @@ -192,6 +192,14 @@ static void test_flash(void) g_assert_cmpint(flash_read(6), =3D=3D, 0xCDEF); g_assert_cmpint(flash_read(8), =3D=3D, 0xFFFF); =20 + /* Test ignored high order bits of address. */ + flash_write(FLASH_WIDTH * 0x5555, UNLOCK0_CMD); + flash_write(FLASH_WIDTH * 0x2AAA, UNLOCK1_CMD); + flash_write(FLASH_WIDTH * 0x5555, AUTOSELECT_CMD); + g_assert_cmpint(flash_read(FLASH_WIDTH * 0x0000), =3D=3D, 0x00BF); + g_assert_cmpint(flash_read(FLASH_WIDTH * 0x0001), =3D=3D, 0x236D); + reset(); + qtest_quit(global_qtest); } =20 --=20 2.20.1 (Apple Git-117) From nobody Tue Apr 30 15:38:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554775598421571.5362601207626; Mon, 8 Apr 2019 19:06:38 -0700 (PDT) Received: from localhost ([127.0.0.1]:33769 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDg9j-0005FR-5p for importer@patchew.org; Mon, 08 Apr 2019 22:06:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45391) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDg6k-0002yi-Mm for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDg6g-0006Yl-Cm for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:30 -0400 Received: from mail-io1-xd42.google.com ([2607:f8b0:4864:20::d42]:32989) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDg6f-0006X4-VE for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:26 -0400 Received: by mail-io1-xd42.google.com with SMTP id b6so12904683iog.0 for ; Mon, 08 Apr 2019 19:03:25 -0700 (PDT) Received: from worksec.oberlin.net (ip-210-181.oberlin.net. [208.66.210.181]) by smtp.gmail.com with ESMTPSA id y203sm5969838itb.22.2019.04.08.19.03.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Apr 2019 19:03:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oberlin-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HkZ50ResNFfwujKYsV+/wst98+iV1QyDSTcjzoQngd4=; b=ReO6M8iWtTeUo/UmAlyv9WUIocl4Pt0j21tbPvB+LXVdXvYoOK3svIBUWokRJhj9Ka ekdhSVYPYOT2VqBId3RHlv9Tzn8NSEDdYYGgeYXSdKJVvIhs71vHMHgB4RiB3jiToriA 8Sw78xFSarnu7DZ42mk2NbXBEKXRBNhXvLUplTvRkPnUfGjotgZ77gZEsGT3O2ji53vL rAARwamSjAQBB0IFImXCLREXWTca6W4U0EEyi6ZXoHATs5do3gsJoU0fQF8J+tBBSBwq jGTCMTo4oaBzuO2+68HOgIYsLJ1tY0NVIL0EKXi1HmFuGPQqHoRCN7ltOux5Zaj1wY1X TnFw== 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:mime-version:content-transfer-encoding; bh=HkZ50ResNFfwujKYsV+/wst98+iV1QyDSTcjzoQngd4=; b=DBd+LuJJmA+S2lCXV2Zp8J3OUnrqGOnLRc5m74L6tNqDRNQQ7Oowk4enfAh2Iru1oH nX0bhkBHo2fSeGm1szGarSk8vMNzt2upJOY0bdiWf2/V9g57FM2NVAEZFMPiCoUeFIFR OTwGoZQVi99MdqQX5zcdvCqgo7VQJHoMV9zo9BSZxAIY/DBpK2OGM+O/nw2w4Y0iAaaD ivXzwbJjDXeK4XbfZbwlnKQBuaC5gbCPAB/L29WLXO8WG2L/JRugn9emT2JolUA11Fhb wO1g+bEJWpl+RDfroaRX9t2nBdLn27AjoXiy8IXs1jqKtWVoKSizIpG9e8c/ELUQh2zS dT5w== X-Gm-Message-State: APjAAAVY0Zv3iHvTwPcPYD9HJlrSy9yGKVpCBG2xCwZj6rSU+kERKef8 frw+KuH20VtqOS+w+q4XlNRhImhz+2Duwg== X-Google-Smtp-Source: APXvYqxS6i6Z3388wtPUP+Q3ABfeXAQj6bZMdezKtAtHKMimlKE60EZMlWKm+K8zbxh930cIn3FSLg== X-Received: by 2002:a6b:7b03:: with SMTP id l3mr6495899iop.250.1554775403990; Mon, 08 Apr 2019 19:03:23 -0700 (PDT) From: Stephen Checkoway To: qemu-devel@nongnu.org Date: Mon, 8 Apr 2019 22:01:28 -0400 Message-Id: X-Mailer: git-send-email 2.20.1 (Apple Git-117) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::d42 Subject: [Qemu-devel] [PATCH v2 04/10] block/pflash_cfi02: Implement intereleaved flash devices X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Laurent Vivier , Thomas Huth , Stephen Checkoway , qemu-block@nongnu.org, Max Reitz , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" It's common for multiple narrow flash chips to be hooked up in parallel to support wider buses. For example, four 8-bit wide flash chips (x8) may be combined in parallel to produce a 32-bit wide device. Similarly, two 16-bit wide chips (x16) may be combined. This commit introduces `device-width` and `max-device-width` properties, similar to pflash_cfi01, with the following meanings: - `width`: The width of the logical, qemu device (same as before); - `device-width`: The width of an individual flash chip, defaulting to `width`; and - `max-device-width`: The maximum width of an individual flash chip, defaulting to `device-width`. Nothing needs to change to support reading such interleaved devices but commands (e.g., erase and programming) must be sent to all devices at the same time or else the various chips will be in different states. For example, a 4-byte wide logical device can be composed of four x8/x16 devices in x8 mode. That is, each device supports both x8 or x16 and they're being used in the byte, rather than word, mode. This configuration would have `width=3D4`, `device-width=3D1`, and `max-device-width=3D2`. In addition to commands being sent to all devices, guest firmware expects the status and CFI queries to be replicated for each device. (The one exception to the response replication is that each device gets to report its own status bit DQ7 while programming because its value depends on the value being programmed which will usually differ for each device.) Testing is limited to 16-bit wide devices due to the current inability to override the properties set by `pflash_cfi02_register`, but multiple configurations are tested. Signed-off-by: Stephen Checkoway --- hw/block/pflash_cfi02.c | 270 +++++++++++++++++------- tests/pflash-cfi02-test.c | 418 +++++++++++++++++++++++++++++--------- 2 files changed, 523 insertions(+), 165 deletions(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index e4bff0c8f8..101628b4ec 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -28,7 +28,6 @@ * - unlock bypass command * - CFI queries * - * It does not support flash interleaving. * It does not implement boot blocs with reduced size * It does not implement software data protection as found in many real ch= ips * It does not implement erase suspend/resume commands @@ -67,15 +66,19 @@ struct PFlashCFI02 { BlockBackend *blk; uint32_t sector_len; uint32_t nb_blocs; - uint32_t chip_len; + uint64_t total_len; + uint64_t interleave_multiplier; uint8_t mappings; - uint8_t width; + uint8_t bank_width; /* Width of the QEMU device in bytes. */ + uint8_t device_width; /* Width of individual pflash chip. */ + uint8_t max_device_width; /* Maximum width of individual pflash chip. = */ uint8_t be; + int device_shift; /* Amount to shift an offset to get a device address= . */ int wcycle; /* if 0, the flash is read normally */ int bypass; int ro; uint8_t cmd; - uint8_t status; + uint64_t status; /* FIXME: implement array device properties */ uint16_t ident0; uint16_t ident1; @@ -103,16 +106,17 @@ struct PFlashCFI02 { */ static inline void toggle_dq7(PFlashCFI02 *pfl) { - pfl->status ^=3D 0x80; + pfl->status ^=3D pfl->interleave_multiplier * 0x80; } =20 /* * Set status bit DQ7 to bit 7 of value. */ -static inline void set_dq7(PFlashCFI02 *pfl, uint8_t value) +static inline void set_dq7(PFlashCFI02 *pfl, uint64_t value) { - pfl->status &=3D 0x7F; - pfl->status |=3D value & 0x80; + uint64_t mask =3D pfl->interleave_multiplier * 0x80; + pfl->status &=3D ~mask; + pfl->status |=3D value & mask; } =20 /* @@ -120,7 +124,7 @@ static inline void set_dq7(PFlashCFI02 *pfl, uint8_t va= lue) */ static inline void toggle_dq6(PFlashCFI02 *pfl) { - pfl->status ^=3D 0x40; + pfl->status ^=3D pfl->interleave_multiplier * 0x40; } =20 /* @@ -188,7 +192,6 @@ static uint64_t pflash_data_read(PFlashCFI02 *pfl, hwad= dr offset, static uint64_t pflash_read(void *opaque, hwaddr offset, unsigned int widt= h) { PFlashCFI02 *pfl =3D opaque; - hwaddr boff; uint64_t ret; =20 ret =3D -1; @@ -198,12 +201,10 @@ static uint64_t pflash_read(void *opaque, hwaddr offs= et, unsigned int width) ++pfl->read_counter > PFLASH_LAZY_ROMD_THRESHOLD) { pflash_register_memory(pfl, 1); } - offset &=3D pfl->chip_len - 1; - boff =3D offset & 0xFF; - if (pfl->width =3D=3D 2) - boff =3D boff >> 1; - else if (pfl->width =3D=3D 4) - boff =3D boff >> 2; + /* Mask by the total length of the chip to account for alias mappings.= */ + offset &=3D pfl->total_len - 1; + hwaddr device_addr =3D offset >> pfl->device_shift; + switch (pfl->cmd) { default: /* This should never happen : reset state & treat it as a read*/ @@ -215,29 +216,32 @@ static uint64_t pflash_read(void *opaque, hwaddr offs= et, unsigned int width) /* We accept reads during second unlock sequence... */ case 0x00: /* Flash area read */ - ret =3D pflash_data_read(pfl, offset, width); - break; + return pflash_data_read(pfl, offset, width); case 0x90: /* flash ID read */ - switch (boff) { + switch (device_addr & 0xFF) { case 0x00: + ret =3D pfl->ident0; + break; case 0x01: - ret =3D boff & 0x01 ? pfl->ident1 : pfl->ident0; + ret =3D pfl->ident1; break; case 0x02: ret =3D 0x00; /* Pretend all sectors are unprotected */ break; case 0x0E: case 0x0F: - ret =3D boff & 0x01 ? pfl->ident3 : pfl->ident2; + ret =3D device_addr & 0x01 ? pfl->ident3 : pfl->ident2; if (ret !=3D (uint8_t)-1) { break; } /* Fall through to data read. */ default: - ret =3D pflash_data_read(pfl, offset, width); + return pflash_data_read(pfl, offset, width); } - DPRINTF("%s: ID " TARGET_FMT_plx " %" PRIx64 "\n", __func__, boff,= ret); + ret *=3D pfl->interleave_multiplier; + DPRINTF("%s: ID " TARGET_FMT_plx " %" PRIx64 "\n", + __func__, device_addr & 0xFF, ret); break; case 0xA0: case 0x10: @@ -250,8 +254,8 @@ static uint64_t pflash_read(void *opaque, hwaddr offset= , unsigned int width) break; case 0x98: /* CFI query mode */ - if (boff < sizeof(pfl->cfi_table)) { - ret =3D pfl->cfi_table[boff]; + if (device_addr < sizeof(pfl->cfi_table)) { + ret =3D pfl->interleave_multiplier * pfl->cfi_table[device_add= r]; } else { ret =3D 0; } @@ -279,30 +283,36 @@ static void pflash_write(void *opaque, hwaddr offset,= uint64_t value, unsigned int width) { PFlashCFI02 *pfl =3D opaque; - hwaddr boff; uint8_t *p; uint8_t cmd; =20 cmd =3D value; - if (pfl->cmd !=3D 0xA0 && cmd =3D=3D 0xF0) { -#if 0 - DPRINTF("%s: flash reset asked (%02x %02x)\n", - __func__, pfl->cmd, cmd); -#endif - goto reset_flash; + if (pfl->cmd !=3D 0xA0) { + if (value !=3D pfl->interleave_multiplier * cmd) { + DPRINTF("%s: cmd 0x%02x not sent to all devices: expected=3D" + "0x%0*" PRIx64 " actual=3D0x%0*" PRIx64 "\n", + __func__, cmd, + pfl->bank_width * 2, pfl->interleave_multiplier * cmd, + pfl->bank_width * 2, value); + } + + if (cmd =3D=3D 0xF0) { + goto reset_flash; + } } + trace_pflash_write(offset, value, width, pfl->wcycle); - offset &=3D pfl->chip_len - 1; - - DPRINTF("%s: offset " TARGET_FMT_plx " %08" PRIx64 " %d\n", __func__, - offset, value, width); - boff =3D offset; - if (pfl->width =3D=3D 2) - boff =3D boff >> 1; - else if (pfl->width =3D=3D 4) - boff =3D boff >> 2; - /* Only the least-significant 11 bits are used in most cases. */ - boff &=3D 0x7FF; + + /* Mask by the total length of the chip to account for alias mappings.= */ + offset &=3D pfl->total_len - 1; + + DPRINTF("%s: offset " TARGET_FMT_plx " 0x%0*" PRIx64 "\n", + __func__, offset, width * 2, value); + + hwaddr device_addr =3D (offset >> pfl->device_shift); + /* Address bits A11 and greater are don't cares for most commands. */ + unsigned int masked_addr =3D device_addr & 0x7FF; + switch (pfl->wcycle) { case 0: /* Set the device in I/O access mode if required */ @@ -311,16 +321,16 @@ static void pflash_write(void *opaque, hwaddr offset,= uint64_t value, pfl->read_counter =3D 0; /* We're in read mode */ check_unlock0: - if (boff =3D=3D 0x55 && cmd =3D=3D 0x98) { + if (masked_addr =3D=3D 0x55 && cmd =3D=3D 0x98) { enter_CFI_mode: /* Enter CFI query mode */ pfl->wcycle =3D WCYCLE_CFI; pfl->cmd =3D 0x98; return; } - if (boff !=3D pfl->unlock_addr0 || cmd !=3D 0xAA) { - DPRINTF("%s: unlock0 failed " TARGET_FMT_plx " %02x %04x\n", - __func__, boff, cmd, pfl->unlock_addr0); + if (masked_addr !=3D pfl->unlock_addr0 || cmd !=3D 0xAA) { + DPRINTF("%s: unlock0 failed %04x %02x %04x\n", + __func__, masked_addr, cmd, pfl->unlock_addr0); goto reset_flash; } DPRINTF("%s: unlock sequence started\n", __func__); @@ -328,18 +338,18 @@ static void pflash_write(void *opaque, hwaddr offset,= uint64_t value, case 1: /* We started an unlock sequence */ check_unlock1: - if (boff !=3D pfl->unlock_addr1 || cmd !=3D 0x55) { - DPRINTF("%s: unlock1 failed " TARGET_FMT_plx " %02x\n", __func= __, - boff, cmd); + if (masked_addr !=3D pfl->unlock_addr1 || cmd !=3D 0x55) { + DPRINTF("%s: unlock1 failed %03x %02x\n", __func__, + masked_addr, cmd); goto reset_flash; } DPRINTF("%s: unlock sequence done\n", __func__); break; case 2: /* We finished an unlock sequence */ - if (!pfl->bypass && boff !=3D pfl->unlock_addr0) { - DPRINTF("%s: command failed " TARGET_FMT_plx " %02x\n", __func= __, - boff, cmd); + if (!pfl->bypass && masked_addr !=3D pfl->unlock_addr0) { + DPRINTF("%s: command failed %03x %02x\n", __func__, + masked_addr, cmd); goto reset_flash; } switch (cmd) { @@ -390,8 +400,9 @@ static void pflash_write(void *opaque, hwaddr offset, u= int64_t value, goto reset_flash; } /* We can enter CFI query mode from autoselect mode */ - if (boff =3D=3D 0x55 && cmd =3D=3D 0x98) + if (masked_addr =3D=3D 0x55 && cmd =3D=3D 0x98) { goto enter_CFI_mode; + } /* No break here */ default: DPRINTF("%s: invalid write for command %02x\n", @@ -416,7 +427,7 @@ static void pflash_write(void *opaque, hwaddr offset, u= int64_t value, case 5: switch (cmd) { case 0x10: - if (boff !=3D pfl->unlock_addr0) { + if (masked_addr !=3D pfl->unlock_addr0) { DPRINTF("%s: chip erase: invalid address " TARGET_FMT_plx = "\n", __func__, offset); goto reset_flash; @@ -424,8 +435,8 @@ static void pflash_write(void *opaque, hwaddr offset, u= int64_t value, /* Chip erase */ DPRINTF("%s: start chip erase\n", __func__); if (!pfl->ro) { - memset(pfl->storage, 0xFF, pfl->chip_len); - pflash_update(pfl, 0, pfl->chip_len); + memset(pfl->storage, 0xFF, pfl->total_len); + pflash_update(pfl, 0, pfl->total_len); } set_dq7(pfl, 0x00); /* Let's wait 5 seconds before chip erase is done */ @@ -521,22 +532,132 @@ static void pflash_cfi02_realize(DeviceState *dev, E= rror **errp) return; } =20 + if (pfl->bank_width =3D=3D 0) { + error_setg(errp, "attribute \"width\" not specified or zero."); + return; + } + + /* + * device-width defaults to width and max-device-width defaults to + * device-width. Check that the device-width and max-device-width + * configurations are supported. + */ + if (pfl->device_width =3D=3D 0) { + pfl->device_width =3D pfl->bank_width; + } + if (pfl->max_device_width =3D=3D 0) { + pfl->max_device_width =3D pfl->device_width; + } + if (pfl->bank_width % pfl->device_width !=3D 0) { + error_setg(errp, + "attribute \"width\" (%u) not a multiple of attribute " + "\"device-width\" (%u).", + pfl->bank_width, pfl->device_width); + return; + } + + /* + * Writing commands to the flash device and reading CFI responses or + * status values requires transforming a QEMU device offset into a + * flash device address given in terms of the device's maximum width. = We + * can do this by shifting a QEMU device offset right a constant numbe= r of + * bits depending on the bank_width, device_width, and max_device_widt= h. + * + * num_devices =3D bank_width / device_width is the number of interlea= ved + * flash devices. To compute a device byte address, we need to divide + * offset by num_devices (equivalently shift right by log2(num_devices= )). + * To turn a device byte address into a device word address, we need to + * divide by max_device_width (equivalently shift right by + * log2(max_device_width)). + * + * In tabular form. + * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + * bank_width device_width max_device_width num_devices shift + * ------------------------------------------------------------------ + * 1 1 1 1 0 + * 1 1 2 1 1 + * 2 1 1 2 1 + * 2 1 2 2 2 + * 2 2 2 1 1 + * 4 1 1 4 2 + * 4 1 2 4 3 + * 4 1 4 4 4 + * 4 2 2 2 2 + * 4 2 4 2 3 + * 4 4 4 1 2 + * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + */ + pfl->device_shift =3D ctz32(pfl->bank_width) - ctz32(pfl->device_width= ) + + ctz32(pfl->max_device_width); + pfl->interleave_multiplier =3D 0; + for (unsigned int shift =3D 0; shift < pfl->bank_width; + shift +=3D pfl->device_width) { + pfl->interleave_multiplier |=3D 1 << (shift * 8); + } + + uint16_t device_interface_code; + if (pfl->max_device_width =3D=3D 1 && pfl->device_width =3D=3D 1) { + device_interface_code =3D 0; /* x8 only. */ + } else if (pfl->max_device_width =3D=3D 2 && + (pfl->device_width =3D=3D 1 || pfl->device_width =3D=3D 2))= { + /* XXX: Some devices only support x16, this code doesn't model the= m. */ + device_interface_code =3D 2; /* Supports x8 or x16. */ + } else if (pfl->max_device_width =3D=3D 4 && pfl->device_width =3D=3D = 1) { + /* + * XXX: this is x32-only. The standards I've seen don't specify a = value + * for x8/x32 but do mention them. + */ + device_interface_code =3D 3; /* x32 only. */ + } else if (pfl->max_device_width =3D=3D 4 && + (pfl->device_width =3D=3D 2 || pfl->device_width =3D=3D 4))= { + device_interface_code =3D 4; /* Supports x16 or x32. */ + } else { + error_setg(errp, + "unsupported configuration: \"device-width\"=3D%u " + "\"max-device-width\"=3D%u.", + pfl->device_width, pfl->max_device_width); + return; + } + + pfl->total_len =3D pfl->sector_len * pfl->nb_blocs; + + /* + * If the flash is not a power of 2, then the code for handling multip= le + * mappings will not work correctly. + */ + if (!is_power_of_2(pfl->total_len)) { + error_setg(errp, "total pflash length (%" PRIx64 ") not a power of= 2.", + pfl->total_len); + return; + } + + int num_devices =3D pfl->bank_width / pfl->device_width; + uint64_t sector_len_per_device =3D pfl->sector_len / num_devices; + uint64_t device_len =3D sector_len_per_device * pfl->nb_blocs; + + if (sector_len_per_device & 0xff || sector_len_per_device >=3D (1 << 2= 4)) { + error_setg(errp, + "unsupported configuration: sector length per device = =3D " + "%" PRIx64 ".", + sector_len_per_device); + return; + } + + memory_region_init_rom_device(&pfl->orig_mem, OBJECT(pfl), + &pflash_cfi02_ops, pfl, pfl->name, + pfl->total_len, &local_err); /* Only 11 bits are used in the comparison. */ pfl->unlock_addr0 &=3D 0x7FF; pfl->unlock_addr1 &=3D 0x7FF; =20 chip_len =3D pfl->sector_len * pfl->nb_blocs; =20 - memory_region_init_rom_device(&pfl->orig_mem, OBJECT(pfl), - &pflash_cfi02_ops, pfl, pfl->name, - chip_len, &local_err); if (local_err) { error_propagate(errp, local_err); return; } =20 pfl->storage =3D memory_region_get_ram_ptr(&pfl->orig_mem); - pfl->chip_len =3D chip_len; =20 if (pfl->blk) { uint64_t perm; @@ -566,6 +687,7 @@ static void pflash_cfi02_realize(DeviceState *dev, Erro= r **errp) pfl->wcycle =3D 0; pfl->cmd =3D 0; pfl->status =3D 0; + /* Hardcoded CFI table (mostly from SG29 Spansion flash) */ /* Standard "QRY" string */ pfl->cfi_table[0x10] =3D 'Q'; @@ -591,8 +713,8 @@ static void pflash_cfi02_realize(DeviceState *dev, Erro= r **errp) pfl->cfi_table[0x1D] =3D 0x00; /* Vpp max (no Vpp pin) */ pfl->cfi_table[0x1E] =3D 0x00; - /* Reserved */ - pfl->cfi_table[0x1F] =3D 0x07; + /* Timeout per single byte/word write (16 us) */ + pfl->cfi_table[0x1F] =3D 0x04; /* Timeout for min size buffer write (NA) */ pfl->cfi_table[0x20] =3D 0x00; /* Typical timeout for block erase (512 ms) */ @@ -608,13 +730,13 @@ static void pflash_cfi02_realize(DeviceState *dev, Er= ror **errp) /* Max timeout for chip erase */ pfl->cfi_table[0x26] =3D 0x0D; /* Device size */ - pfl->cfi_table[0x27] =3D ctz32(chip_len); - /* Flash device interface (8 & 16 bits) */ - pfl->cfi_table[0x28] =3D 0x02; - pfl->cfi_table[0x29] =3D 0x00; + pfl->cfi_table[0x27] =3D ctz32(device_len); + /* Flash device interface */ + pfl->cfi_table[0x28] =3D device_interface_code; + pfl->cfi_table[0x29] =3D device_interface_code >> 8; /* Max number of bytes in multi-bytes write */ /* XXX: disable buffered write as it's not supported */ - // pfl->cfi_table[0x2A] =3D 0x05; + /* pfl->cfi_table[0x2A] =3D 0x05; */ pfl->cfi_table[0x2A] =3D 0x00; pfl->cfi_table[0x2B] =3D 0x00; /* Number of erase block regions (uniform) */ @@ -622,8 +744,8 @@ static void pflash_cfi02_realize(DeviceState *dev, Erro= r **errp) /* Erase block region 1 */ pfl->cfi_table[0x2D] =3D pfl->nb_blocs - 1; pfl->cfi_table[0x2E] =3D (pfl->nb_blocs - 1) >> 8; - pfl->cfi_table[0x2F] =3D pfl->sector_len >> 8; - pfl->cfi_table[0x30] =3D pfl->sector_len >> 16; + pfl->cfi_table[0x2F] =3D sector_len_per_device >> 8; + pfl->cfi_table[0x30] =3D sector_len_per_device >> 16; =20 /* Extended */ pfl->cfi_table[0x31] =3D 'P'; @@ -648,7 +770,9 @@ static Property pflash_cfi02_properties[] =3D { DEFINE_PROP_DRIVE("drive", PFlashCFI02, blk), DEFINE_PROP_UINT32("num-blocks", PFlashCFI02, nb_blocs, 0), DEFINE_PROP_UINT32("sector-length", PFlashCFI02, sector_len, 0), - DEFINE_PROP_UINT8("width", PFlashCFI02, width, 0), + DEFINE_PROP_UINT8("width", PFlashCFI02, bank_width, 0), + DEFINE_PROP_UINT8("device-width", PFlashCFI02, device_width, 0), + DEFINE_PROP_UINT8("max-device-width", PFlashCFI02, max_device_width, 0= ), DEFINE_PROP_UINT8("mappings", PFlashCFI02, mappings, 0), DEFINE_PROP_UINT8("big-endian", PFlashCFI02, be, 0), DEFINE_PROP_UINT16("id0", PFlashCFI02, ident0, 0), @@ -696,7 +820,7 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base, hwaddr size, BlockBackend *blk, uint32_t sector_len, - int nb_mappings, int width, + int nb_mappings, int bank_width, uint16_t id0, uint16_t id1, uint16_t id2, uint16_t id3, uint16_t unlock_addr0, @@ -711,7 +835,7 @@ PFlashCFI02 *pflash_cfi02_register(hwaddr base, assert(size % sector_len =3D=3D 0); qdev_prop_set_uint32(dev, "num-blocks", size / sector_len); qdev_prop_set_uint32(dev, "sector-length", sector_len); - qdev_prop_set_uint8(dev, "width", width); + qdev_prop_set_uint8(dev, "width", bank_width); qdev_prop_set_uint8(dev, "mappings", nb_mappings); qdev_prop_set_uint8(dev, "big-endian", !!be); qdev_prop_set_uint16(dev, "id0", id0); diff --git a/tests/pflash-cfi02-test.c b/tests/pflash-cfi02-test.c index b91bb66a79..4d621e584d 100644 --- a/tests/pflash-cfi02-test.c +++ b/tests/pflash-cfi02-test.c @@ -21,10 +21,15 @@ #define MP_FLASH_SIZE_MAX (32 * 1024 * 1024) #define BASE_ADDR (0x100000000ULL - MP_FLASH_SIZE_MAX) =20 -#define FLASH_WIDTH 2 -#define CFI_ADDR (FLASH_WIDTH * 0x55) -#define UNLOCK0_ADDR (FLASH_WIDTH * 0x555) -#define UNLOCK1_ADDR (FLASH_WIDTH * 0x2AA) +/* Use a newtype to keep flash addresses separate from byte addresses. */ +typedef struct { + uint64_t addr; +} faddr; +#define FLASH_ADDR(x) ((faddr) { .addr =3D (x) }) + +#define CFI_ADDR FLASH_ADDR(0x55) +#define UNLOCK0_ADDR FLASH_ADDR(0x555) +#define UNLOCK1_ADDR FLASH_ADDR(0x2AA) =20 #define CFI_CMD 0x98 #define UNLOCK0_CMD 0xAA @@ -37,168 +42,332 @@ #define UNLOCK_BYPASS_CMD 0x20 #define UNLOCK_BYPASS_RESET_CMD 0x00 =20 +typedef struct { + int bank_width; + int device_width; + int max_device_width; +} FlashConfig; + static char image_path[] =3D "/tmp/qtest.XXXXXX"; =20 -static inline void flash_write(uint64_t byte_addr, uint16_t data) +/* + * The pflash implementation allows some parameters to be unspecified. We = want + * to test those configurations but we also need to know the real values in + * our testing code. So after we launch qemu, we'll need a new FlashConfig + * with the correct values filled in. + */ +static FlashConfig expand_config_defaults(const FlashConfig *c) { - qtest_writew(global_qtest, BASE_ADDR + byte_addr, data); + FlashConfig ret =3D *c; + + if (ret.device_width =3D=3D 0) { + ret.device_width =3D ret.bank_width; + } + if (ret.max_device_width =3D=3D 0) { + ret.max_device_width =3D ret.device_width; + } + return ret; +} + +/* + * Return a bit mask suitable for extracting the least significant + * status/query response from an interleaved response. + */ +static inline uint64_t device_mask(const FlashConfig *c) +{ + if (c->device_width =3D=3D 8) { + return (uint64_t)-1; + } + return (1ULL << (c->device_width * 8)) - 1ULL; +} + +/* + * Return a bit mask exactly as long as the bank_width. + */ +static inline uint64_t bank_mask(const FlashConfig *c) +{ + if (c->bank_width =3D=3D 8) { + return (uint64_t)-1; + } + return (1ULL << (c->bank_width * 8)) - 1ULL; +} + +static inline void flash_write(const FlashConfig *c, uint64_t byte_addr, + uint64_t data) +{ + /* Sanity check our tests. */ + assert((data & ~bank_mask(c)) =3D=3D 0); + uint64_t addr =3D BASE_ADDR + byte_addr; + switch (c->bank_width) { + case 1: + qtest_writeb(global_qtest, addr, data); + break; + case 2: + qtest_writew(global_qtest, addr, data); + break; + case 4: + qtest_writel(global_qtest, addr, data); + break; + case 8: + qtest_writeq(global_qtest, addr, data); + break; + default: + abort(); + } +} + +static inline uint64_t flash_read(const FlashConfig *c, uint64_t byte_addr) +{ + uint64_t addr =3D BASE_ADDR + byte_addr; + switch (c->bank_width) { + case 1: + return qtest_readb(global_qtest, addr); + case 2: + return qtest_readw(global_qtest, addr); + case 4: + return qtest_readl(global_qtest, addr); + case 8: + return qtest_readq(global_qtest, addr); + default: + abort(); + } +} + +/* + * Convert a flash address expressed in the maximum width of the device as= a + * byte address. + */ +static inline uint64_t as_byte_addr(const FlashConfig *c, faddr flash_addr) +{ + /* + * Command addresses are always given as addresses in the maximum + * supported bus size for the flash chip. So an x8/x16 chip in x8 mode + * uses addresses 0xAAA and 0x555 to unlock because the least signific= ant + * bit is ignored. (0x555 rather than 0x554 is traditional.) + * + * Interleaving flash chips use the least significant bits of a byte + * address to refer to data from the individual chips. Two interleaved= x8 + * devices would use command addresses 0xAAA and 0x554. Two interleaved + * x16 devices would use 0x1554 and 0xAA8. + * + * More exotic configurations are possible. Two interleaved x8/x16 dev= ices + * in x8 mode would also use 0x1554 and 0xAA8. + * + * In general we need to multiply an address by the number of devices, + * which is bank_width / device_width, and multiply that by the maximum + * device width. + */ + int num_devices =3D c->bank_width / c->device_width; + return flash_addr.addr * (num_devices * c->max_device_width); +} + +/* + * Return the command value or expected status replicated across all devic= es. + */ +static inline uint64_t replicate(const FlashConfig *c, uint64_t data) +{ + /* Sanity check our tests. */ + assert((data & ~device_mask(c)) =3D=3D 0); + for (int i =3D c->device_width; i < c->bank_width; i +=3D c->device_wi= dth) { + data |=3D data << (c->device_width * 8); + } + return data; +} + +static inline void flash_cmd(const FlashConfig *c, faddr cmd_addr, + uint8_t cmd) +{ + flash_write(c, as_byte_addr(c, cmd_addr), replicate(c, cmd)); +} + +static inline uint64_t flash_query(const FlashConfig *c, faddr query_addr) +{ + return flash_read(c, as_byte_addr(c, query_addr)); } =20 -static inline uint16_t flash_read(uint64_t byte_addr) +static inline uint64_t flash_query_1(const FlashConfig *c, faddr query_add= r) { - return qtest_readw(global_qtest, BASE_ADDR + byte_addr); + return flash_query(c, query_addr) & device_mask(c); } =20 -static void unlock(void) +static void unlock(const FlashConfig *c) { - flash_write(UNLOCK0_ADDR, UNLOCK0_CMD); - flash_write(UNLOCK1_ADDR, UNLOCK1_CMD); + flash_cmd(c, UNLOCK0_ADDR, UNLOCK0_CMD); + flash_cmd(c, UNLOCK1_ADDR, UNLOCK1_CMD); } =20 -static void reset(void) +static void reset(const FlashConfig *c) { - flash_write(0, RESET_CMD); + flash_cmd(c, FLASH_ADDR(0), RESET_CMD); } =20 -static void sector_erase(uint64_t byte_addr) +static void sector_erase(const FlashConfig *c, uint64_t byte_addr) { - unlock(); - flash_write(UNLOCK0_ADDR, 0x80); - unlock(); - flash_write(byte_addr, SECTOR_ERASE_CMD); + unlock(c); + flash_cmd(c, UNLOCK0_ADDR, 0x80); + unlock(c); + flash_write(c, byte_addr, replicate(c, SECTOR_ERASE_CMD)); } =20 -static void wait_for_completion(uint64_t byte_addr) +static void wait_for_completion(const FlashConfig *c, uint64_t byte_addr) { /* If DQ6 is toggling, step the clock and ensure the toggle stops. */ - if ((flash_read(byte_addr) & 0x40) ^ (flash_read(byte_addr) & 0x40)) { + const uint64_t dq6 =3D replicate(c, 0x40); + if ((flash_read(c, byte_addr) & dq6) ^ (flash_read(c, byte_addr) & dq6= )) { /* Wait for erase or program to finish. */ clock_step_next(); /* Ensure that DQ6 has stopped toggling. */ - g_assert_cmpint(flash_read(byte_addr), =3D=3D, flash_read(byte_add= r)); + g_assert_cmpint(flash_read(c, byte_addr), =3D=3D, flash_read(c, by= te_addr)); } } =20 -static void bypass_program(uint64_t byte_addr, uint16_t data) +static void bypass_program(const FlashConfig *c, uint64_t byte_addr, + uint16_t data) { - flash_write(UNLOCK0_ADDR, PROGRAM_CMD); - flash_write(byte_addr, data); + flash_cmd(c, UNLOCK0_ADDR, PROGRAM_CMD); + flash_write(c, byte_addr, data); /* * Data isn't valid until DQ6 stops toggling. We don't model this as * writes are immediate, but if this changes in the future, we can wait * until the program is complete. */ - wait_for_completion(byte_addr); + wait_for_completion(c, byte_addr); } =20 -static void program(uint64_t byte_addr, uint16_t data) +static void program(const FlashConfig *c, uint64_t byte_addr, uint16_t dat= a) { - unlock(); - bypass_program(byte_addr, data); + unlock(c); + bypass_program(c, byte_addr, data); } =20 -static void chip_erase(void) +static void chip_erase(const FlashConfig *c) { - unlock(); - flash_write(UNLOCK0_ADDR, 0x80); - unlock(); - flash_write(UNLOCK0_ADDR, SECTOR_ERASE_CMD); + unlock(c); + flash_cmd(c, UNLOCK0_ADDR, 0x80); + unlock(c); + flash_cmd(c, UNLOCK0_ADDR, CHIP_ERASE_CMD); } =20 -static void test_flash(void) +static void test_flash(const void *opaque) { - global_qtest =3D qtest_initf("-M musicpal,accel=3Dqtest " - "-drive if=3Dpflash,file=3D%s,format=3Draw,= copy-on-read", - image_path); + const FlashConfig *config =3D opaque; + global_qtest =3D qtest_initf("-M musicpal,accel=3Dqtest" + " -drive if=3Dpflash,file=3D%s,format=3Draw= ," + "copy-on-read" + " -global driver=3Dcfi.pflash02," + "property=3Ddevice-width,value=3D%d" + " -global driver=3Dcfi.pflash02," + "property=3Dmax-device-width,value=3D%d", + image_path, + config->device_width, + config->max_device_width); + + const FlashConfig explicit_config =3D expand_config_defaults(config); + const FlashConfig *c =3D &explicit_config; + /* Check the IDs. */ - unlock(); - flash_write(UNLOCK0_ADDR, AUTOSELECT_CMD); - g_assert_cmpint(flash_read(FLASH_WIDTH * 0x0000), =3D=3D, 0x00BF); - g_assert_cmpint(flash_read(FLASH_WIDTH * 0x0001), =3D=3D, 0x236D); - reset(); + unlock(c); + flash_cmd(c, UNLOCK0_ADDR, AUTOSELECT_CMD); + g_assert_cmpint(flash_query(c, FLASH_ADDR(0)), =3D=3D, replicate(c, 0x= BF)); + if (c->device_width >=3D 2) { + /* + * XXX: The ID returned by the musicpal flash chip is 16 bits which + * wouldn't happen with an 8-bit device. It would probably be best= to + * prohibit addresses larger than the device width in pflash_cfi02= .c, + * but then we couldn't test smaller device widths at all. + */ + g_assert_cmpint(flash_query(c, FLASH_ADDR(1)), =3D=3D, + replicate(c, 0x236D)); + } + reset(c); =20 /* Check the erase blocks. */ - flash_write(CFI_ADDR, CFI_CMD); - g_assert_cmpint(flash_read(FLASH_WIDTH * 0x10), =3D=3D, 'Q'); - g_assert_cmpint(flash_read(FLASH_WIDTH * 0x11), =3D=3D, 'R'); - g_assert_cmpint(flash_read(FLASH_WIDTH * 0x12), =3D=3D, 'Y'); + flash_cmd(c, CFI_ADDR, CFI_CMD); + g_assert_cmpint(flash_query(c, FLASH_ADDR(0x10)), =3D=3D, replicate(c,= 'Q')); + g_assert_cmpint(flash_query(c, FLASH_ADDR(0x11)), =3D=3D, replicate(c,= 'R')); + g_assert_cmpint(flash_query(c, FLASH_ADDR(0x12)), =3D=3D, replicate(c,= 'Y')); /* Num erase regions. */ - g_assert_cmpint(flash_read(FLASH_WIDTH * 0x2C), >=3D, 1); - uint32_t nb_sectors =3D flash_read(FLASH_WIDTH * 0x2D) + - (flash_read(FLASH_WIDTH * 0x2E) << 8) + 1; - uint32_t sector_len =3D (flash_read(FLASH_WIDTH * 0x2F) << 8) + - (flash_read(FLASH_WIDTH * 0x30) << 16); - reset(); + g_assert_cmpint(flash_query_1(c, FLASH_ADDR(0x2C)), >=3D, 1); + uint32_t nb_sectors =3D flash_query_1(c, FLASH_ADDR(0x2D)) + + (flash_query_1(c, FLASH_ADDR(0x2E)) << 8) + 1; + uint32_t sector_len =3D (flash_query_1(c, FLASH_ADDR(0x2F)) << 8) + + (flash_query_1(c, FLASH_ADDR(0x30)) << 16); + reset(c); =20 + const uint64_t dq7 =3D replicate(c, 0x80); + const uint64_t dq6 =3D replicate(c, 0x40); /* Erase and program sector. */ for (uint32_t i =3D 0; i < nb_sectors; ++i) { uint64_t byte_addr =3D i * sector_len; - sector_erase(byte_addr); + sector_erase(c, byte_addr); /* Read toggle. */ - uint16_t status0 =3D flash_read(byte_addr); + uint64_t status0 =3D flash_read(c, byte_addr); /* DQ7 is 0 during an erase. */ - g_assert_cmpint(status0 & 0x80, =3D=3D, 0); - uint16_t status1 =3D flash_read(byte_addr); + g_assert_cmpint(status0 & dq7, =3D=3D, 0); + uint64_t status1 =3D flash_read(c, byte_addr); /* DQ6 toggles during an erase. */ - g_assert_cmpint(status0 & 0x40, !=3D, status1 & 0x40); + g_assert_cmpint(status0 & dq6, =3D=3D, ~status1 & dq6); /* Wait for erase to complete. */ clock_step_next(); /* Ensure DQ6 has stopped toggling. */ - g_assert_cmpint(flash_read(byte_addr), =3D=3D, flash_read(byte_add= r)); + g_assert_cmpint(flash_read(c, byte_addr), =3D=3D, flash_read(c, by= te_addr)); /* Now the data should be valid. */ - g_assert_cmpint(flash_read(byte_addr), =3D=3D, 0xFFFF); + g_assert_cmpint(flash_read(c, byte_addr), =3D=3D, bank_mask(c)); =20 /* Program a bit pattern. */ - program(byte_addr, 0x5555); - g_assert_cmpint(flash_read(byte_addr), =3D=3D, 0x5555); - program(byte_addr, 0xAA55); - g_assert_cmpint(flash_read(byte_addr), =3D=3D, 0x0055); + program(c, byte_addr, 0x55); + g_assert_cmpint(flash_read(c, byte_addr) & 0xFF, =3D=3D, 0x55); + program(c, byte_addr, 0xA5); + g_assert_cmpint(flash_read(c, byte_addr) & 0xFF, =3D=3D, 0x05); } =20 /* Erase the chip. */ - chip_erase(); + chip_erase(c); /* Read toggle. */ - uint16_t status0 =3D flash_read(0); + uint64_t status0 =3D flash_read(c, 0); /* DQ7 is 0 during an erase. */ - g_assert_cmpint(status0 & 0x80, =3D=3D, 0); - uint16_t status1 =3D flash_read(0); + g_assert_cmpint(status0 & dq7, =3D=3D, 0); + uint64_t status1 =3D flash_read(c, 0); /* DQ6 toggles during an erase. */ - g_assert_cmpint(status0 & 0x40, !=3D, status1 & 0x40); + g_assert_cmpint(status0 & dq6, =3D=3D, ~status1 & dq6); /* Wait for erase to complete. */ clock_step_next(); /* Ensure DQ6 has stopped toggling. */ - g_assert_cmpint(flash_read(0), =3D=3D, flash_read(0)); + g_assert_cmpint(flash_read(c, 0), =3D=3D, flash_read(c, 0)); /* Now the data should be valid. */ - g_assert_cmpint(flash_read(0), =3D=3D, 0xFFFF); + + for (uint32_t i =3D 0; i < nb_sectors; ++i) { + uint64_t byte_addr =3D i * sector_len; + g_assert_cmpint(flash_read(c, byte_addr), =3D=3D, bank_mask(c)); + } =20 /* Unlock bypass */ - unlock(); - flash_write(UNLOCK0_ADDR, UNLOCK_BYPASS_CMD); - bypass_program(0, 0x0123); - bypass_program(2, 0x4567); - bypass_program(4, 0x89AB); + unlock(c); + flash_cmd(c, UNLOCK0_ADDR, UNLOCK_BYPASS_CMD); + bypass_program(c, 0 * c->bank_width, 0x01); + bypass_program(c, 1 * c->bank_width, 0x23); + bypass_program(c, 2 * c->bank_width, 0x45); /* * Test that bypass programming, unlike normal programming can use any * address for the PROGRAM_CMD. */ - flash_write(6, PROGRAM_CMD); - flash_write(6, 0xCDEF); - wait_for_completion(6); - flash_write(0, UNLOCK_BYPASS_RESET_CMD); - bypass_program(8, 0x55AA); /* Should fail. */ - g_assert_cmpint(flash_read(0), =3D=3D, 0x0123); - g_assert_cmpint(flash_read(2), =3D=3D, 0x4567); - g_assert_cmpint(flash_read(4), =3D=3D, 0x89AB); - g_assert_cmpint(flash_read(6), =3D=3D, 0xCDEF); - g_assert_cmpint(flash_read(8), =3D=3D, 0xFFFF); + flash_cmd(c, FLASH_ADDR(3 * c->bank_width), PROGRAM_CMD); + flash_write(c, 3 * c->bank_width, 0x67); + wait_for_completion(c, 3 * c->bank_width); + flash_cmd(c, FLASH_ADDR(0), UNLOCK_BYPASS_RESET_CMD); + bypass_program(c, 4 * c->bank_width, 0x89); /* Should fail. */ + g_assert_cmpint(flash_read(c, 0 * c->bank_width), =3D=3D, 0x01); + g_assert_cmpint(flash_read(c, 1 * c->bank_width), =3D=3D, 0x23); + g_assert_cmpint(flash_read(c, 2 * c->bank_width), =3D=3D, 0x45); + g_assert_cmpint(flash_read(c, 3 * c->bank_width), =3D=3D, 0x67); + g_assert_cmpint(flash_read(c, 4 * c->bank_width), =3D=3D, bank_mask(c)= ); =20 /* Test ignored high order bits of address. */ - flash_write(FLASH_WIDTH * 0x5555, UNLOCK0_CMD); - flash_write(FLASH_WIDTH * 0x2AAA, UNLOCK1_CMD); - flash_write(FLASH_WIDTH * 0x5555, AUTOSELECT_CMD); - g_assert_cmpint(flash_read(FLASH_WIDTH * 0x0000), =3D=3D, 0x00BF); - g_assert_cmpint(flash_read(FLASH_WIDTH * 0x0001), =3D=3D, 0x236D); - reset(); + flash_cmd(c, FLASH_ADDR(0x5555), UNLOCK0_CMD); + flash_cmd(c, FLASH_ADDR(0x2AAA), UNLOCK1_CMD); + flash_cmd(c, FLASH_ADDR(0x5555), AUTOSELECT_CMD); + g_assert_cmpint(flash_query(c, FLASH_ADDR(0)), =3D=3D, replicate(c, 0x= BF)); + reset(c); =20 qtest_quit(global_qtest); } @@ -208,6 +377,61 @@ static void cleanup(void *opaque) unlink(image_path); } =20 +/* + * XXX: Tests are limited to bank_width =3D 2 for now because that's what + * hw/arm/musicpal.c has. + */ +static const FlashConfig configuration[] =3D { + /* One x16 device. */ + { + .bank_width =3D 2, + .device_width =3D 2, + .max_device_width =3D 2, + }, + /* Implicitly one x16 device. */ + { + .bank_width =3D 2, + .device_width =3D 0, + .max_device_width =3D 0, + }, + /* Implicitly one x16 device. */ + { + .bank_width =3D 2, + .device_width =3D 2, + .max_device_width =3D 0, + }, + /* Interleave two x8 devices. */ + { + .bank_width =3D 2, + .device_width =3D 1, + .max_device_width =3D 1, + }, + /* Interleave two implicit x8 devices. */ + { + .bank_width =3D 2, + .device_width =3D 1, + .max_device_width =3D 0, + }, + /* Interleave two x8/x16 devices in x8 mode. */ + { + .bank_width =3D 2, + .device_width =3D 1, + .max_device_width =3D 2, + }, + /* One x16/x32 device in x16 mode. */ + { + .bank_width =3D 2, + .device_width =3D 2, + .max_device_width =3D 4, + }, + /* Two x8/x32 devices in x8 mode; I am not sure if such devices exist.= */ + { + .bank_width =3D 2, + .device_width =3D 1, + .max_device_width =3D 4, + }, +}; + int main(int argc, char **argv) { int fd =3D mkstemp(image_path); @@ -226,7 +450,17 @@ int main(int argc, char **argv) =20 qtest_add_abrt_handler(cleanup, NULL); g_test_init(&argc, &argv, NULL); - qtest_add_func("pflash-cfi02", test_flash); + + size_t nb_configurations =3D sizeof configuration / sizeof configurati= on[0]; + for (size_t i =3D 0; i < nb_configurations; ++i) { + const FlashConfig *config =3D &configuration[i]; + char *path =3D g_strdup_printf("pflash-cfi02/%d-%d-%d", + config->bank_width, + config->device_width, + config->max_device_width); + qtest_add_data_func(path, config, test_flash); + g_free(path); + } int result =3D g_test_run(); cleanup(NULL); return result; --=20 2.20.1 (Apple Git-117) From nobody Tue Apr 30 15:38:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554775808275200.07363144783244; Mon, 8 Apr 2019 19:10:08 -0700 (PDT) Received: from localhost ([127.0.0.1]:33811 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDgD5-0008Bw-36 for importer@patchew.org; Mon, 08 Apr 2019 22:10:03 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45449) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDg6n-00031a-SQ for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDg6k-0006c5-Vi for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:33 -0400 Received: from mail-io1-xd42.google.com ([2607:f8b0:4864:20::d42]:43065) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDg6k-0006aF-KX for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:30 -0400 Received: by mail-io1-xd42.google.com with SMTP id x3so12834127iol.10 for ; Mon, 08 Apr 2019 19:03:29 -0700 (PDT) Received: from worksec.oberlin.net (ip-210-181.oberlin.net. [208.66.210.181]) by smtp.gmail.com with ESMTPSA id y203sm5969838itb.22.2019.04.08.19.03.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Apr 2019 19:03:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oberlin-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+FJKZDZ/thc/HZMtzvi5GrqqIfTZ8U61JMcVdJoZFb8=; b=MXx0SDJL7zTFDtFPXrPklgzUY9DFrQU1D8fOYwuOjbmQEfan1eZQ2of9PLaJ2OmIWc RQlMyNdP+iDGLj+zEQnLdZUgIMqyJKIYIy9F5g3fsKKvGm2vx6GW4LWNBj19/1t0pnR0 3euQB85HaxOS5R+8bjwfg5GgTT13D+SDkUPKfbPTv4DwMYqvU5vw/aP7f5zP8g4C6/4x 5SGwRPXnFo4HeKM3a4TnBVOxY1NTKQ4i4cq3uBz+KDppMjg+EngbfGeyP46bo4f2hMMv 8Yhu+lq4AzgJ4P1OHSHLkCfu0U52R8/W7jT8L/g5RuodwrMeBGnpX9zL5OYaumBkQE9P vuKQ== 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:mime-version:content-transfer-encoding; bh=+FJKZDZ/thc/HZMtzvi5GrqqIfTZ8U61JMcVdJoZFb8=; b=O+ZAvvNMp7hdLvI0LMWUrqM+1yuHaeDbVKqhuvpugS/rcpOzkYsnf9w1qOOpmumROk 2+j7WAi/D9XajMVEkBXZ3+axXGyRCx7NqZ+efLo7g75zhrhcbDc6tCxtGgm1PiIYElhY n1MQsxkj8/vR3WSLqWSv281tb+x6aV7FGBeIAXCRb/Wysif3XxvitnYl3mXj2QUGTHFj HpaCanxck/0oeeLJzQcloXb7gOfdf0M5JW7gg8AbACKZk3G2UVDgwRzutvWLH5qXusr3 5zJ+OwlO+bCDLRQw6HwCH038OTKHoox/WL3pBAQpACU5HTsRqbwVmf0rqYqPj/uY3dtf m0hg== X-Gm-Message-State: APjAAAUu4qDjMTVC/qm0/LHexRiQ4JE0gKKelK+pakRutLQ9NQXdsZRk aLe0NBhv3iq9XcE41bl8VAjCEZCM+F2LbA== X-Google-Smtp-Source: APXvYqyOtzveXsOE44iBe+Gu5QLnBgW7E6hCDZ24Wuu1YbmheHV1gEzlak2yOXG96cvbzgO5faXABQ== X-Received: by 2002:a5d:9914:: with SMTP id x20mr21164185iol.257.1554775408270; Mon, 08 Apr 2019 19:03:28 -0700 (PDT) From: Stephen Checkoway To: qemu-devel@nongnu.org Date: Mon, 8 Apr 2019 22:01:29 -0400 Message-Id: X-Mailer: git-send-email 2.20.1 (Apple Git-117) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::d42 Subject: [Qemu-devel] [PATCH v2 05/10] block/pflash_cfi02: Implement nonuniform sector sizes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Laurent Vivier , Thomas Huth , Stephen Checkoway , qemu-block@nongnu.org, Max Reitz , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Some flash chips support sectors of different sizes. For example, the AMD AM29LV160DT has 31 64 kB sectors, one 32 kB sector, two 8 kB sectors, and a 16 kB sector, in that order. The AM29LV160DB has those in the reverse order. The `num-blocks` and `sector-length` properties work exactly as they did before: a flash device with uniform sector lengths. To get non-uniform sector lengths for up to four regions, the following properties may be set - region 0. `num-blocks0` and `sector-length0`; - region 1. `num-blocks1` and `sector-length1`; - region 2. `num-blocks2` and `sector-length2`; and - region 3. `num-blocks3` and `sector-length3`. If the uniform and nonuniform properties are set, then both must specify a flash device with the same total size. It would be better to disallow both being set, or make `num-blocks0` and `sector-length0` alias `num-blocks` and `sector-length`, but that would make testing currently impossible. Signed-off-by: Stephen Checkoway --- hw/block/pflash_cfi02.c | 177 ++++++++++++++++++++++++++----------- tests/pflash-cfi02-test.c | 179 +++++++++++++++++++++++++++++--------- 2 files changed, 265 insertions(+), 91 deletions(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 101628b4ec..c4efbe8cdf 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -28,7 +28,6 @@ * - unlock bypass command * - CFI queries * - * It does not implement boot blocs with reduced size * It does not implement software data protection as found in many real ch= ips * It does not implement erase suspend/resume commands * It does not implement multiple sectors erase @@ -55,6 +54,13 @@ do { = \ =20 #define PFLASH_LAZY_ROMD_THRESHOLD 42 =20 +/* + * The size of the cfi_table indirectly depends on this and the start of t= he + * PRI table directly depends on it. 4 is the maximum size (and also what + * seems common) without changing the PRT table address. + */ +#define PFLASH_MAX_ERASE_REGIONS 4 + /* Special write cycle for CFI queries. */ #define WCYCLE_CFI 7 =20 @@ -64,8 +70,10 @@ struct PFlashCFI02 { /*< public >*/ =20 BlockBackend *blk; - uint32_t sector_len; - uint32_t nb_blocs; + uint32_t uniform_nb_blocs; + uint32_t uniform_sector_len; + uint32_t nb_blocs[PFLASH_MAX_ERASE_REGIONS]; + uint32_t sector_len[PFLASH_MAX_ERASE_REGIONS]; uint64_t total_len; uint64_t interleave_multiplier; uint8_t mappings; @@ -86,7 +94,7 @@ struct PFlashCFI02 { uint16_t ident3; uint16_t unlock_addr0; uint16_t unlock_addr1; - uint8_t cfi_table[0x52]; + uint8_t cfi_table[0x4D]; QEMUTimer timer; /* The device replicates the flash memory across its memory space. Em= ulate * that by having a container (.mem) filled with an array of aliases @@ -189,6 +197,25 @@ static uint64_t pflash_data_read(PFlashCFI02 *pfl, hwa= ddr offset, return ret; } =20 +/* + * offset should be a byte offset of the QEMU device and _not_ a device + * offset. + */ +static uint32_t pflash_sector_len(PFlashCFI02 *pfl, hwaddr offset) +{ + assert(offset < pfl->total_len); + int nb_regions =3D pfl->cfi_table[0x2C]; + hwaddr addr =3D 0; + for (int i =3D 0; i < nb_regions; ++i) { + uint64_t region_size =3D (uint64_t)pfl->nb_blocs[i] * pfl->sector_= len[i]; + if (addr <=3D offset && offset < addr + region_size) { + return pfl->sector_len[i]; + } + addr +=3D region_size; + } + abort(); +} + static uint64_t pflash_read(void *opaque, hwaddr offset, unsigned int widt= h) { PFlashCFI02 *pfl =3D opaque; @@ -285,6 +312,7 @@ static void pflash_write(void *opaque, hwaddr offset, u= int64_t value, PFlashCFI02 *pfl =3D opaque; uint8_t *p; uint8_t cmd; + uint32_t sector_len; =20 cmd =3D value; if (pfl->cmd !=3D 0xA0) { @@ -446,12 +474,14 @@ static void pflash_write(void *opaque, hwaddr offset,= uint64_t value, case 0x30: /* Sector erase */ p =3D pfl->storage; - offset &=3D ~(pfl->sector_len - 1); - DPRINTF("%s: start sector erase at " TARGET_FMT_plx "\n", __fu= nc__, - offset); + sector_len =3D pflash_sector_len(pfl, offset); + offset &=3D ~(sector_len - 1); + DPRINTF("%s: start sector erase at %0*" PRIx64 "-%0*" PRIx64 "= \n", + __func__, pfl->bank_width * 2, offset, + pfl->bank_width * 2, offset + sector_len - 1); if (!pfl->ro) { - memset(p + offset, 0xFF, pfl->sector_len); - pflash_update(pfl, offset, pfl->sector_len); + memset(p + offset, 0xFF, sector_len); + pflash_update(pfl, offset, sector_len); } set_dq7(pfl, 0x00); /* Let's wait 1/2 second before sector erase is done */ @@ -515,15 +545,14 @@ static const MemoryRegionOps pflash_cfi02_ops =3D { static void pflash_cfi02_realize(DeviceState *dev, Error **errp) { PFlashCFI02 *pfl =3D PFLASH_CFI02(dev); - uint32_t chip_len; int ret; Error *local_err =3D NULL; =20 - if (pfl->sector_len =3D=3D 0) { + if (pfl->uniform_sector_len =3D=3D 0 && pfl->sector_len[0] =3D=3D 0) { error_setg(errp, "attribute \"sector-length\" not specified or zer= o."); return; } - if (pfl->nb_blocs =3D=3D 0) { + if (pfl->uniform_nb_blocs =3D=3D 0 && pfl->nb_blocs[0] =3D=3D 0) { error_setg(errp, "attribute \"num-blocks\" not specified or zero."= ); return; } @@ -619,7 +648,53 @@ static void pflash_cfi02_realize(DeviceState *dev, Err= or **errp) return; } =20 - pfl->total_len =3D pfl->sector_len * pfl->nb_blocs; + int num_devices =3D pfl->bank_width / pfl->device_width; + int nb_regions; + pfl->total_len =3D 0; + for (nb_regions =3D 0; nb_regions < PFLASH_MAX_ERASE_REGIONS; ++nb_reg= ions) { + if (pfl->nb_blocs[nb_regions] =3D=3D 0) { + break; + } + uint64_t sector_len_per_device =3D pfl->sector_len[nb_regions] / + num_devices; + + /* + * The size of each flash sector must be a power of 2 and it must = be + * aligned at the same power of 2. + */ + if (sector_len_per_device & 0xff || + sector_len_per_device >=3D (1 << 24) || + !is_power_of_2(sector_len_per_device)) + { + error_setg(errp, "unsupported configuration: " + "sector length[%d] per device =3D %" PRIx64 ".", + nb_regions, sector_len_per_device); + return; + } + if ((pfl->total_len / num_devices) & (sector_len_per_device - 1)) { + error_setg(errp, "unsupported configuration: " + "flash region %d not correctly aligned.", + nb_regions); + return; + } + + pfl->total_len +=3D (uint64_t)pfl->sector_len[nb_regions] * + pfl->nb_blocs[nb_regions]; + } + + uint64_t uniform_len =3D (uint64_t)pfl->uniform_nb_blocs * + pfl->uniform_sector_len; + if (nb_regions =3D=3D 0) { + nb_regions =3D 1; + pfl->nb_blocs[0] =3D pfl->uniform_nb_blocs; + pfl->sector_len[0] =3D pfl->uniform_sector_len; + pfl->total_len =3D uniform_len; + } else if (uniform_len !=3D 0 && uniform_len !=3D pfl->total_len) { + error_setg(errp, "\"num-blocks\"*\"sector-length\" " + "different from \"num-blocks0\"*\'sector-length0\" + ..= . + " + "\"num-blocks3\"*\"sector-length3\""); + return; + } =20 /* * If the flash is not a power of 2, then the code for handling multip= le @@ -631,18 +706,6 @@ static void pflash_cfi02_realize(DeviceState *dev, Err= or **errp) return; } =20 - int num_devices =3D pfl->bank_width / pfl->device_width; - uint64_t sector_len_per_device =3D pfl->sector_len / num_devices; - uint64_t device_len =3D sector_len_per_device * pfl->nb_blocs; - - if (sector_len_per_device & 0xff || sector_len_per_device >=3D (1 << 2= 4)) { - error_setg(errp, - "unsupported configuration: sector length per device = =3D " - "%" PRIx64 ".", - sector_len_per_device); - return; - } - memory_region_init_rom_device(&pfl->orig_mem, OBJECT(pfl), &pflash_cfi02_ops, pfl, pfl->name, pfl->total_len, &local_err); @@ -650,8 +713,6 @@ static void pflash_cfi02_realize(DeviceState *dev, Erro= r **errp) pfl->unlock_addr0 &=3D 0x7FF; pfl->unlock_addr1 &=3D 0x7FF; =20 - chip_len =3D pfl->sector_len * pfl->nb_blocs; - if (local_err) { error_propagate(errp, local_err); return; @@ -672,8 +733,8 @@ static void pflash_cfi02_realize(DeviceState *dev, Erro= r **errp) } =20 if (pfl->blk) { - if (!blk_check_size_and_read_all(pfl->blk, pfl->storage, chip_len, - errp)) { + if (!blk_check_size_and_read_all(pfl->blk, pfl->storage, + pfl->total_len, errp)) { vmstate_unregister_ram(&pfl->orig_mem, DEVICE(pfl)); return; } @@ -697,7 +758,7 @@ static void pflash_cfi02_realize(DeviceState *dev, Erro= r **errp) pfl->cfi_table[0x13] =3D 0x02; pfl->cfi_table[0x14] =3D 0x00; /* Primary extended table address */ - pfl->cfi_table[0x15] =3D 0x31; + pfl->cfi_table[0x15] =3D 0x40; pfl->cfi_table[0x16] =3D 0x00; /* Alternate command set (none) */ pfl->cfi_table[0x17] =3D 0x00; @@ -730,7 +791,7 @@ static void pflash_cfi02_realize(DeviceState *dev, Erro= r **errp) /* Max timeout for chip erase */ pfl->cfi_table[0x26] =3D 0x0D; /* Device size */ - pfl->cfi_table[0x27] =3D ctz32(device_len); + pfl->cfi_table[0x27] =3D ctz32(pfl->total_len / num_devices); /* Flash device interface */ pfl->cfi_table[0x28] =3D device_interface_code; pfl->cfi_table[0x29] =3D device_interface_code >> 8; @@ -739,37 +800,49 @@ static void pflash_cfi02_realize(DeviceState *dev, Er= ror **errp) /* pfl->cfi_table[0x2A] =3D 0x05; */ pfl->cfi_table[0x2A] =3D 0x00; pfl->cfi_table[0x2B] =3D 0x00; - /* Number of erase block regions (uniform) */ - pfl->cfi_table[0x2C] =3D 0x01; - /* Erase block region 1 */ - pfl->cfi_table[0x2D] =3D pfl->nb_blocs - 1; - pfl->cfi_table[0x2E] =3D (pfl->nb_blocs - 1) >> 8; - pfl->cfi_table[0x2F] =3D sector_len_per_device >> 8; - pfl->cfi_table[0x30] =3D sector_len_per_device >> 16; + /* Number of erase block regions */ + pfl->cfi_table[0x2C] =3D nb_regions; + /* Erase block regions */ + for (int i =3D 0; i < nb_regions; ++i) { + uint32_t sector_len_per_device =3D pfl->sector_len[i] / num_device= s; + pfl->cfi_table[0x2D + 4 * i] =3D pfl->nb_blocs[i] - 1; + pfl->cfi_table[0x2E + 4 * i] =3D (pfl->nb_blocs[i] - 1) >> 8; + pfl->cfi_table[0x2F + 4 * i] =3D sector_len_per_device >> 8; + pfl->cfi_table[0x30 + 4 * i] =3D sector_len_per_device >> 16; + } =20 /* Extended */ - pfl->cfi_table[0x31] =3D 'P'; - pfl->cfi_table[0x32] =3D 'R'; - pfl->cfi_table[0x33] =3D 'I'; + pfl->cfi_table[0x40] =3D 'P'; + pfl->cfi_table[0x41] =3D 'R'; + pfl->cfi_table[0x42] =3D 'I'; =20 - pfl->cfi_table[0x34] =3D '1'; - pfl->cfi_table[0x35] =3D '0'; + pfl->cfi_table[0x43] =3D '1'; /* version 1.0 */ + pfl->cfi_table[0x44] =3D '0'; =20 - pfl->cfi_table[0x36] =3D 0x00; - pfl->cfi_table[0x37] =3D 0x00; - pfl->cfi_table[0x38] =3D 0x00; - pfl->cfi_table[0x39] =3D 0x00; + pfl->cfi_table[0x45] =3D 0x00; /* Address sensitive unlock required. */ + pfl->cfi_table[0x46] =3D 0x00; /* Erase suspend not supported. */ + pfl->cfi_table[0x47] =3D 0x00; /* Sector protect not supported. */ + pfl->cfi_table[0x48] =3D 0x00; /* Temporary sector unprotect not suppo= rted. */ =20 - pfl->cfi_table[0x3a] =3D 0x00; + pfl->cfi_table[0x49] =3D 0x00; /* Sector protect/unprotect scheme. */ =20 - pfl->cfi_table[0x3b] =3D 0x00; - pfl->cfi_table[0x3c] =3D 0x00; + pfl->cfi_table[0x4a] =3D 0x00; /* Simultaneous operation not supported= . */ + pfl->cfi_table[0x4b] =3D 0x00; /* Burst mode not supported. */ + pfl->cfi_table[0x4c] =3D 0x00; /* Page mode not supported. */ } =20 static Property pflash_cfi02_properties[] =3D { DEFINE_PROP_DRIVE("drive", PFlashCFI02, blk), - DEFINE_PROP_UINT32("num-blocks", PFlashCFI02, nb_blocs, 0), - DEFINE_PROP_UINT32("sector-length", PFlashCFI02, sector_len, 0), + DEFINE_PROP_UINT32("num-blocks", PFlashCFI02, uniform_nb_blocs, 0), + DEFINE_PROP_UINT32("sector-length", PFlashCFI02, uniform_sector_len, 0= ), + DEFINE_PROP_UINT32("num-blocks0", PFlashCFI02, nb_blocs[0], 0), + DEFINE_PROP_UINT32("sector-length0", PFlashCFI02, sector_len[0], 0), + DEFINE_PROP_UINT32("num-blocks1", PFlashCFI02, nb_blocs[1], 0), + DEFINE_PROP_UINT32("sector-length1", PFlashCFI02, sector_len[1], 0), + DEFINE_PROP_UINT32("num-blocks2", PFlashCFI02, nb_blocs[2], 0), + DEFINE_PROP_UINT32("sector-length2", PFlashCFI02, sector_len[2], 0), + DEFINE_PROP_UINT32("num-blocks3", PFlashCFI02, nb_blocs[3], 0), + DEFINE_PROP_UINT32("sector-length3", PFlashCFI02, sector_len[3], 0), DEFINE_PROP_UINT8("width", PFlashCFI02, bank_width, 0), DEFINE_PROP_UINT8("device-width", PFlashCFI02, device_width, 0), DEFINE_PROP_UINT8("max-device-width", PFlashCFI02, max_device_width, 0= ), diff --git a/tests/pflash-cfi02-test.c b/tests/pflash-cfi02-test.c index 4d621e584d..dc85783a6a 100644 --- a/tests/pflash-cfi02-test.c +++ b/tests/pflash-cfi02-test.c @@ -21,6 +21,9 @@ #define MP_FLASH_SIZE_MAX (32 * 1024 * 1024) #define BASE_ADDR (0x100000000ULL - MP_FLASH_SIZE_MAX) =20 +#define UNIFORM_FLASH_SIZE (8 * 1024 * 1024) +#define UNIFORM_FLASH_SECTOR_SIZE (64 * 1024) + /* Use a newtype to keep flash addresses separate from byte addresses. */ typedef struct { uint64_t addr; @@ -43,9 +46,14 @@ typedef struct { #define UNLOCK_BYPASS_RESET_CMD 0x00 =20 typedef struct { + /* Interleave configuration. */ int bank_width; int device_width; int max_device_width; + + /* Nonuniform block size. */ + int nb_blocs[4]; + int sector_len[4]; } FlashConfig; =20 static char image_path[] =3D "/tmp/qtest.XXXXXX"; @@ -60,12 +68,22 @@ static FlashConfig expand_config_defaults(const FlashCo= nfig *c) { FlashConfig ret =3D *c; =20 + if (ret.bank_width =3D=3D 0) { + ret.bank_width =3D 2; + } if (ret.device_width =3D=3D 0) { ret.device_width =3D ret.bank_width; } if (ret.max_device_width =3D=3D 0) { ret.max_device_width =3D ret.device_width; } + if (ret.nb_blocs[0] =3D=3D 0 && ret.sector_len[0] =3D=3D 0) { + ret.sector_len[0] =3D UNIFORM_FLASH_SECTOR_SIZE; + ret.nb_blocs[0] =3D UNIFORM_FLASH_SIZE / UNIFORM_FLASH_SECTOR_SIZE; + } + + /* XXX: Limitations of test harness. */ + assert(ret.bank_width =3D=3D 2); return ret; } =20 @@ -157,8 +175,8 @@ static inline uint64_t as_byte_addr(const FlashConfig *= c, faddr flash_addr) * which is bank_width / device_width, and multiply that by the maximum * device width. */ - int num_devices =3D c->bank_width / c->device_width; - return flash_addr.addr * (num_devices * c->max_device_width); + int nb_devices =3D c->bank_width / c->device_width; + return flash_addr.addr * (nb_devices * c->max_device_width); } =20 /* @@ -248,22 +266,53 @@ static void chip_erase(const FlashConfig *c) flash_cmd(c, UNLOCK0_ADDR, CHIP_ERASE_CMD); } =20 -static void test_flash(const void *opaque) +/* + * Test flash commands with a variety of device geometry. + */ +static void test_geometry(const void *opaque) { const FlashConfig *config =3D opaque; + /* Set the properties that are under our control. */ global_qtest =3D qtest_initf("-M musicpal,accel=3Dqtest" " -drive if=3Dpflash,file=3D%s,format=3Draw= ," "copy-on-read" + /* Interleave properties. */ " -global driver=3Dcfi.pflash02," "property=3Ddevice-width,value=3D%d" " -global driver=3Dcfi.pflash02," - "property=3Dmax-device-width,value=3D%d", + "property=3Dmax-device-width,value=3D%d" + /* Device geometry properties. */ + " -global driver=3Dcfi.pflash02," + "property=3Dnum-blocks0,value=3D%d" + " -global driver=3Dcfi.pflash02," + "property=3Dsector-length0,value=3D%d" + " -global driver=3Dcfi.pflash02," + "property=3Dnum-blocks1,value=3D%d" + " -global driver=3Dcfi.pflash02," + "property=3Dsector-length1,value=3D%d" + " -global driver=3Dcfi.pflash02," + "property=3Dnum-blocks2,value=3D%d" + " -global driver=3Dcfi.pflash02," + "property=3Dsector-length2,value=3D%d" + " -global driver=3Dcfi.pflash02," + "property=3Dnum-blocks3,value=3D%d" + " -global driver=3Dcfi.pflash02," + "property=3Dsector-length3,value=3D%d", image_path, config->device_width, - config->max_device_width); + config->max_device_width, + config->nb_blocs[0], + config->sector_len[0], + config->nb_blocs[1], + config->sector_len[1], + config->nb_blocs[2], + config->sector_len[2], + config->nb_blocs[3], + config->sector_len[3]); =20 const FlashConfig explicit_config =3D expand_config_defaults(config); const FlashConfig *c =3D &explicit_config; + int nb_devices =3D c->bank_width / c->device_width; =20 /* Check the IDs. */ unlock(c); @@ -287,38 +336,52 @@ static void test_flash(const void *opaque) g_assert_cmpint(flash_query(c, FLASH_ADDR(0x11)), =3D=3D, replicate(c,= 'R')); g_assert_cmpint(flash_query(c, FLASH_ADDR(0x12)), =3D=3D, replicate(c,= 'Y')); /* Num erase regions. */ - g_assert_cmpint(flash_query_1(c, FLASH_ADDR(0x2C)), >=3D, 1); - uint32_t nb_sectors =3D flash_query_1(c, FLASH_ADDR(0x2D)) + - (flash_query_1(c, FLASH_ADDR(0x2E)) << 8) + 1; - uint32_t sector_len =3D (flash_query_1(c, FLASH_ADDR(0x2F)) << 8) + - (flash_query_1(c, FLASH_ADDR(0x30)) << 16); + int nb_erase_regions =3D flash_query_1(c, FLASH_ADDR(0x2C)); + g_assert_cmpint(nb_erase_regions, =3D=3D, + !!c->nb_blocs[0] + !!c->nb_blocs[1] + !!c->nb_blocs[2]= + + !!c->nb_blocs[3]); reset(c); - const uint64_t dq7 =3D replicate(c, 0x80); const uint64_t dq6 =3D replicate(c, 0x40); - /* Erase and program sector. */ - for (uint32_t i =3D 0; i < nb_sectors; ++i) { - uint64_t byte_addr =3D i * sector_len; - sector_erase(c, byte_addr); - /* Read toggle. */ - uint64_t status0 =3D flash_read(c, byte_addr); - /* DQ7 is 0 during an erase. */ - g_assert_cmpint(status0 & dq7, =3D=3D, 0); - uint64_t status1 =3D flash_read(c, byte_addr); - /* DQ6 toggles during an erase. */ - g_assert_cmpint(status0 & dq6, =3D=3D, ~status1 & dq6); - /* Wait for erase to complete. */ - clock_step_next(); - /* Ensure DQ6 has stopped toggling. */ - g_assert_cmpint(flash_read(c, byte_addr), =3D=3D, flash_read(c, by= te_addr)); - /* Now the data should be valid. */ - g_assert_cmpint(flash_read(c, byte_addr), =3D=3D, bank_mask(c)); =20 - /* Program a bit pattern. */ - program(c, byte_addr, 0x55); - g_assert_cmpint(flash_read(c, byte_addr) & 0xFF, =3D=3D, 0x55); - program(c, byte_addr, 0xA5); - g_assert_cmpint(flash_read(c, byte_addr) & 0xFF, =3D=3D, 0x05); + uint64_t byte_addr =3D 0; + for (int region =3D 0; region < nb_erase_regions; ++region) { + uint64_t base =3D 0x2D + 4 * region; + flash_cmd(c, CFI_ADDR, CFI_CMD); + uint32_t nb_sectors =3D flash_query_1(c, FLASH_ADDR(base + 0)) + + (flash_query_1(c, FLASH_ADDR(base + 1)) << 8= ) + 1; + uint32_t sector_len =3D (flash_query_1(c, FLASH_ADDR(base + 2)) <<= 8) + + (flash_query_1(c, FLASH_ADDR(base + 3)) << 1= 6); + sector_len *=3D nb_devices; + g_assert_cmpint(nb_sectors, =3D=3D, c->nb_blocs[region]); + g_assert_cmpint(sector_len, =3D=3D, c->sector_len[region]); + reset(c); + + /* Erase and program sector. */ + for (uint32_t i =3D 0; i < nb_sectors; ++i) { + sector_erase(c, byte_addr); + /* Read toggle. */ + uint64_t status0 =3D flash_read(c, byte_addr); + /* DQ7 is 0 during an erase. */ + g_assert_cmpint(status0 & dq7, =3D=3D, 0); + uint64_t status1 =3D flash_read(c, byte_addr); + /* DQ6 toggles during an erase. */ + g_assert_cmpint(status0 & dq6, =3D=3D, ~status1 & dq6); + /* Wait for erase to complete. */ + clock_step_next(); + /* Ensure DQ6 has stopped toggling. */ + g_assert_cmpint(flash_read(c, byte_addr), =3D=3D, + flash_read(c, byte_addr)); + /* Now the data should be valid. */ + g_assert_cmpint(flash_read(c, byte_addr), =3D=3D, bank_mask(c)= ); + + /* Program a bit pattern. */ + program(c, byte_addr, 0x55); + g_assert_cmpint(flash_read(c, byte_addr) & 0xFF, =3D=3D, 0x55); + program(c, byte_addr, 0xA5); + g_assert_cmpint(flash_read(c, byte_addr) & 0xFF, =3D=3D, 0x05); + byte_addr +=3D sector_len; + } } =20 /* Erase the chip. */ @@ -336,9 +399,11 @@ static void test_flash(const void *opaque) g_assert_cmpint(flash_read(c, 0), =3D=3D, flash_read(c, 0)); /* Now the data should be valid. */ =20 - for (uint32_t i =3D 0; i < nb_sectors; ++i) { - uint64_t byte_addr =3D i * sector_len; - g_assert_cmpint(flash_read(c, byte_addr), =3D=3D, bank_mask(c)); + for (int region =3D 0; region < nb_erase_regions; ++region) { + for (uint32_t i =3D 0; i < c->nb_blocs[region]; ++i) { + uint64_t byte_addr =3D i * c->sector_len[region]; + g_assert_cmpint(flash_read(c, byte_addr), =3D=3D, bank_mask(c)= ); + } } =20 /* Unlock bypass */ @@ -430,6 +495,32 @@ static const FlashConfig configuration[] =3D { .device_width =3D 1, .max_device_width =3D 4, }, + /* Nonuniform sectors (top boot). */ + { + .bank_width =3D 2, + .nb_blocs =3D { 127, 1, 2, 1 }, + .sector_len =3D { 0x10000, 0x08000, 0x02000, 0x04000 }, + }, + /* Nonuniform sectors (top boot) with two x8 devices. */ + { + .bank_width =3D 2, + .device_width =3D 1, + .nb_blocs =3D { 127, 1, 2, 1 }, + .sector_len =3D { 0x10000, 0x08000, 0x02000, 0x04000 }, + }, + /* Nonuniform sectors (bottom boot). */ + { + .bank_width =3D 2, + .nb_blocs =3D { 1, 2, 1, 127 }, + .sector_len =3D { 0x04000, 0x02000, 0x08000, 0x10000 }, + }, + /* Nonuniform sectors (bottom boot) with two x8 devices. */ + { + .bank_width =3D 2, + .device_width =3D 1, + .nb_blocs =3D { 1, 2, 1, 127 }, + .sector_len =3D { 0x04000, 0x02000, 0x08000, 0x10000 }, + }, }; =20 int main(int argc, char **argv) @@ -438,7 +529,7 @@ int main(int argc, char **argv) if (fd =3D=3D -1) { err(1, "Failed to create temporary file %s", image_path); } - if (ftruncate(fd, 8 * 1024 * 1024) < 0) { + if (ftruncate(fd, UNIFORM_FLASH_SIZE) < 0) { int error_code =3D errno; close(fd); unlink(image_path); @@ -454,11 +545,21 @@ int main(int argc, char **argv) size_t nb_configurations =3D sizeof configuration / sizeof configurati= on[0]; for (size_t i =3D 0; i < nb_configurations; ++i) { const FlashConfig *config =3D &configuration[i]; - char *path =3D g_strdup_printf("pflash-cfi02/%d-%d-%d", + char *path =3D g_strdup_printf("pflash-cfi02" + "/geometry/%dx%x-%dx%x-%dx%x-%dx%x" + "/%d-%d-%d", + config->nb_blocs[0], + config->sector_len[0], + config->nb_blocs[1], + config->sector_len[1], + config->nb_blocs[2], + config->sector_len[2], + config->nb_blocs[3], + config->sector_len[3], config->bank_width, config->device_width, config->max_device_width); - qtest_add_data_func(path, config, test_flash); + qtest_add_data_func(path, config, test_geometry); g_free(path); } int result =3D g_test_run(); --=20 2.20.1 (Apple Git-117) From nobody Tue Apr 30 15:38:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554775745756509.8281023673027; Mon, 8 Apr 2019 19:09:05 -0700 (PDT) Received: from localhost ([127.0.0.1]:33799 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDgC1-0007JK-Lj for importer@patchew.org; Mon, 08 Apr 2019 22:09:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDg6p-00033T-Uj for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDg6n-0006eM-IL for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:35 -0400 Received: from mail-io1-xd30.google.com ([2607:f8b0:4864:20::d30]:45786) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDg6n-0006dC-B8 for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:33 -0400 Received: by mail-io1-xd30.google.com with SMTP id s7so12839110iom.12 for ; Mon, 08 Apr 2019 19:03:33 -0700 (PDT) Received: from worksec.oberlin.net (ip-210-181.oberlin.net. [208.66.210.181]) by smtp.gmail.com with ESMTPSA id y203sm5969838itb.22.2019.04.08.19.03.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Apr 2019 19:03:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oberlin-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Fv5fB8GVOlQA6/nl/SV+rrrwTraGemNdwfTmaMiR9Mg=; b=1aAOfbh16dPsGkRMJiuTMMgggdg9ZKqPU4qqiu9Fxj/IjRb0L5UJ0vqIMg4ZtlxM0m SYxQZtMIo8tgkhxKgr8wzDxFeFaWFxnDl9BfFqIx+pQryItsfoLETiWH7WUIU88xFiOX 3+wIUFW49MbI8NXb55m3Z2fhjDu03+r3u+4508SDgSpaj/G4MTPjKdOvZX+snMKK2K2d +tSkVZNOkRY4NbEROf4JK//3KpuWqvyTu5VejRK0RywjQ8VL2H0ZjhxDzFvfPMeB/vWa fZ1WgB6Q7ZIbvp41DECZBKgIJW5ZvqCCdtRG+zlskctuG3FL5mR1qkRxG57Vcwlv1VX/ zPMw== 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:mime-version:content-transfer-encoding; bh=Fv5fB8GVOlQA6/nl/SV+rrrwTraGemNdwfTmaMiR9Mg=; b=rUPUJKCUjRiik9rG8+p915mVviAEdqVkcUdk3u9KexZ8GHFrt7J/9Z5iSrbV0uefAi iM4Y6fmpzZ1rbL9cn6d/HTmVIz0IOLZwAz8eVcQq4oU661r/uKXHYKc/RRzakuWqHeoT 7wFaf7hRS3uvYxnYElr/mlzQBb8J7NfHXo858OUWerbk167MZqqB6YULr9z5XOIHgpA+ EmuZN270xyjL0kdiYIzNUDC1N/tCmKTQX4uL34ZYeafDYfcgrnmSQPyaSdKXrB+ak6Ia rbgQZjVkmYHFv34qc6vC7aQyPrlEnB/ykq0zXEt34e2TovMCqvC7gNid2qBH8Jxp/Ojz WWHg== X-Gm-Message-State: APjAAAVdPEWM0aP4FwwdJoALtl8NgZiDNMAOOnRKigUvf093uGK+h87V LCf/Tb3ajVOPxn71+Z+sY9N/ITdm1e00CA== X-Google-Smtp-Source: APXvYqzc0kW7Yk3J6D1IjRlLkg4kv26r40WdjztL2Xw/NyquTzslM89tfnxc7zULj88KnantyDJ7xw== X-Received: by 2002:a5e:8f04:: with SMTP id c4mr23661236iok.131.1554775412474; Mon, 08 Apr 2019 19:03:32 -0700 (PDT) From: Stephen Checkoway To: qemu-devel@nongnu.org Date: Mon, 8 Apr 2019 22:01:30 -0400 Message-Id: <871e55199edc5c1ae1e5cb80e076a211d76c5a77.1554774454.git.stephen.checkoway@oberlin.edu> X-Mailer: git-send-email 2.20.1 (Apple Git-117) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::d30 Subject: [Qemu-devel] [PATCH v2 06/10] block/pflash_cfi02: Fix CFI in autoselect mode X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Laurent Vivier , Thomas Huth , Stephen Checkoway , qemu-block@nongnu.org, Max Reitz , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" After a flash device enters CFI mode from autoselect mode, the reset command returns the device to autoselect mode. An additional reset command is necessary to return to read array mode. Signed-off-by: Stephen Checkoway --- hw/block/pflash_cfi02.c | 21 +++++++++++++++++---- tests/pflash-cfi02-test.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index c4efbe8cdf..be10036886 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -61,8 +61,9 @@ do { = \ */ #define PFLASH_MAX_ERASE_REGIONS 4 =20 -/* Special write cycle for CFI queries. */ +/* Special write cycles for CFI queries. */ #define WCYCLE_CFI 7 +#define WCYCLE_AUTOSELECT_CFI 8 =20 struct PFlashCFI02 { /*< private >*/ @@ -325,6 +326,12 @@ static void pflash_write(void *opaque, hwaddr offset, = uint64_t value, } =20 if (cmd =3D=3D 0xF0) { + if (pfl->wcycle =3D=3D WCYCLE_AUTOSELECT_CFI) { + /* Return to autoselect mode. */ + pfl->wcycle =3D 3; + pfl->cmd =3D 0x90; + return; + } goto reset_flash; } } @@ -350,7 +357,6 @@ static void pflash_write(void *opaque, hwaddr offset, u= int64_t value, /* We're in read mode */ check_unlock0: if (masked_addr =3D=3D 0x55 && cmd =3D=3D 0x98) { - enter_CFI_mode: /* Enter CFI query mode */ pfl->wcycle =3D WCYCLE_CFI; pfl->cmd =3D 0x98; @@ -427,9 +433,15 @@ static void pflash_write(void *opaque, hwaddr offset, = uint64_t value, /* Unlock bypass reset */ goto reset_flash; } - /* We can enter CFI query mode from autoselect mode */ + /* + * We can enter CFI query mode from autoselect mode, but we mu= st + * return to autoselect mode after a reset. + */ if (masked_addr =3D=3D 0x55 && cmd =3D=3D 0x98) { - goto enter_CFI_mode; + /* Enter autoselect CFI query mode */ + pfl->wcycle =3D WCYCLE_AUTOSELECT_CFI; + pfl->cmd =3D 0x98; + return; } /* No break here */ default: @@ -510,6 +522,7 @@ static void pflash_write(void *opaque, hwaddr offset, u= int64_t value, } break; case WCYCLE_CFI: /* Special value for CFI queries */ + case WCYCLE_AUTOSELECT_CFI: DPRINTF("%s: invalid write in CFI query mode\n", __func__); goto reset_flash; default: diff --git a/tests/pflash-cfi02-test.c b/tests/pflash-cfi02-test.c index dc85783a6a..ae1cd4e54b 100644 --- a/tests/pflash-cfi02-test.c +++ b/tests/pflash-cfi02-test.c @@ -437,6 +437,39 @@ static void test_geometry(const void *opaque) qtest_quit(global_qtest); } =20 +/* + * Test that + * 1. enter autoselect mode; + * 2. enter CFI mode; and then + * 3. exit CFI mode + * leaves the flash device in autoselect mode. + */ +static void test_cfi_in_autoselect(const void *opaque) +{ + const FlashConfig *c =3D opaque; + global_qtest =3D qtest_initf("-M musicpal,accel=3Dqtest" + " -drive if=3Dpflash,file=3D%s,format=3Draw= ," + "copy-on-read", + image_path); + + /* 1. Enter autoselect. */ + unlock(c); + flash_cmd(c, UNLOCK0_ADDR, AUTOSELECT_CMD); + g_assert_cmpint(flash_query(c, FLASH_ADDR(0)), =3D=3D, replicate(c, 0x= BF)); + + /* 2. Enter CFI. */ + flash_cmd(c, CFI_ADDR, CFI_CMD); + g_assert_cmpint(flash_query(c, FLASH_ADDR(0x10)), =3D=3D, replicate(c,= 'Q')); + g_assert_cmpint(flash_query(c, FLASH_ADDR(0x11)), =3D=3D, replicate(c,= 'R')); + g_assert_cmpint(flash_query(c, FLASH_ADDR(0x12)), =3D=3D, replicate(c,= 'Y')); + + /* 3. Exit CFI. */ + reset(c); + g_assert_cmpint(flash_query(c, FLASH_ADDR(0)), =3D=3D, replicate(c, 0x= BF)); + + qtest_quit(global_qtest); +} + static void cleanup(void *opaque) { unlink(image_path); @@ -562,6 +595,9 @@ int main(int argc, char **argv) qtest_add_data_func(path, config, test_geometry); g_free(path); } + + qtest_add_data_func("pflash-cfi02/cfi-in-autoselect", &configuration[0= ], + test_cfi_in_autoselect); int result =3D g_test_run(); cleanup(NULL); return result; --=20 2.20.1 (Apple Git-117) From nobody Tue Apr 30 15:38:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554775549138221.91704630939125; Mon, 8 Apr 2019 19:05:49 -0700 (PDT) Received: from localhost ([127.0.0.1]:33746 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDg8t-0004K5-6r for importer@patchew.org; Mon, 08 Apr 2019 22:05:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45550) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDg6t-000377-0Y for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDg6r-0006iV-UZ for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:38 -0400 Received: from mail-it1-x142.google.com ([2607:f8b0:4864:20::142]:52446) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDg6r-0006hw-PF for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:37 -0400 Received: by mail-it1-x142.google.com with SMTP id x132so2423093itf.2 for ; Mon, 08 Apr 2019 19:03:37 -0700 (PDT) Received: from worksec.oberlin.net (ip-210-181.oberlin.net. [208.66.210.181]) by smtp.gmail.com with ESMTPSA id y203sm5969838itb.22.2019.04.08.19.03.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Apr 2019 19:03:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oberlin-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lnIQMa985gJdik6sa+sHszvNo6LvfSu/P2J8+RNmRRI=; b=fwF7saATcYG36I7mpxArvqvB+hz9CGdyS0djqMNEtZ3vrZI2MO8J19/WMqByl3w5aE ZKlyJ3m6Xl9JW3J305L2IRw60LJVRJsMYwr7bL3OJAu6umKAKqCtxY4uHbwPjDF3pr3Z nBLLNGzIcTVHis5KOC2Y57mB8pCHFXMToaesvXLhIauwBIzw1578A77eCRevgBXXgdMQ jwHasHeEmQDFRxu6dQsUw0+LNYYNEQcUD/ZE5y5DpRA36Nq3qgndllo737mKxouzdnsE M7tEKzJf4tEaoBiFJqcdIc+pEutMB/vYfpI1zkX9Jfze4Y2o/EzZ0Sdp53elQjnKLnqL dXYA== 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:mime-version:content-transfer-encoding; bh=lnIQMa985gJdik6sa+sHszvNo6LvfSu/P2J8+RNmRRI=; b=fEzh8NNF5uwkqn0HhSRfUJ43bSSIfCKWmwf25iure33r96hJOF42W7eyvQf6ZX/x/j Y/KhKjKZkb3OwmgQrXXTKm5mM3SoGAHbMCY29NYQ2YCBxoJmiKyhpEIZyxvJwU3kQeZ8 hOZbYGlYvYvujpj2vNQZXqw7PUyeZ13LKHT9Gry4lfAVA67+EY8AamIaYQUQpYxmnnkK 3T8qvCdAai1uE21zly8hXv3uVvlm4fV3+v+4yepZKTD+mSlM5uIUpufD3owfNhMH+bVg DtO73nCqrx7fx5Uvn10YF2ecafNt8b5Y6aR93JP2AYVXq+5FxyBnEHvcgCIUieINloZl j8ZA== X-Gm-Message-State: APjAAAXkxz0OJ/GH2rv7pAXMUjEOLkiXipv1Bg4kmRRKu4KqnK/fm7rz cp1wXcybbH9KbZyUWajK9Mj3kZqSlOyOCw== X-Google-Smtp-Source: APXvYqxJjjILjB/pw1rTWzwVy1PCeAkoqPBrrrKBtxCbPw7e4rUyJeKIaMgZgQaDwt9/2iL10ZutMQ== X-Received: by 2002:a24:9a86:: with SMTP id l128mr22112710ite.126.1554775417033; Mon, 08 Apr 2019 19:03:37 -0700 (PDT) From: Stephen Checkoway To: qemu-devel@nongnu.org Date: Mon, 8 Apr 2019 22:01:31 -0400 Message-Id: <635e67a22cbc89e73315dd1bb80f9ce65a303523.1554774454.git.stephen.checkoway@oberlin.edu> X-Mailer: git-send-email 2.20.1 (Apple Git-117) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::142 Subject: [Qemu-devel] [PATCH v2 07/10] block/pflash_cfi02: Fix reset command not ignored during erase X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Stephen Checkoway , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" When the flash device is performing a chip erase, all commands are ignored. When it is performing a sector erase, only the erase suspend command is valid, which is currently not supported. In particular, the reset command should not cause the device to reset to read array mode while programming is on going. Signed-off-by: Stephen Checkoway --- hw/block/pflash_cfi02.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index be10036886..cb1160eb35 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -325,7 +325,8 @@ static void pflash_write(void *opaque, hwaddr offset, u= int64_t value, pfl->bank_width * 2, value); } =20 - if (cmd =3D=3D 0xF0) { + /* Reset does nothing during chip erase and sector erase. */ + if (cmd =3D=3D 0xF0 && pfl->cmd !=3D 0x10 && pfl->cmd !=3D 0x30) { if (pfl->wcycle =3D=3D WCYCLE_AUTOSELECT_CFI) { /* Return to autoselect mode. */ pfl->wcycle =3D 3; --=20 2.20.1 (Apple Git-117) From nobody Tue Apr 30 15:38:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554775717323561.4604479667343; Mon, 8 Apr 2019 19:08:37 -0700 (PDT) Received: from localhost ([127.0.0.1]:33789 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDgBe-0006wz-KW for importer@patchew.org; Mon, 08 Apr 2019 22:08:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDg7C-0003MJ-HG for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:04:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDg78-0006nU-Ba for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:58 -0400 Received: from mail-it1-x143.google.com ([2607:f8b0:4864:20::143]:37204) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDg71-0006lZ-0H for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:50 -0400 Received: by mail-it1-x143.google.com with SMTP id u65so2453461itc.2 for ; Mon, 08 Apr 2019 19:03:46 -0700 (PDT) Received: from worksec.oberlin.net (ip-210-181.oberlin.net. [208.66.210.181]) by smtp.gmail.com with ESMTPSA id y203sm5969838itb.22.2019.04.08.19.03.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Apr 2019 19:03:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oberlin-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lIiXW4UXH6WJ+mTbFcqutdCLrvr7P5sHBkgFjvabVo8=; b=eMBnnSDyuHkbpMtJCzOJtgxmja+Qb08x8QshZ5WYRuhdRiHMntAOzSdYI14Cr7vDNZ yZ2A7l87jD6Mf7ITIHFNFgQBQ0F3EZRLI0LHCtujbMdqTG40vJklEHx+D1lruLadlq9U D50+yr22W70JrYaThuHRkF6/JFYOMWCWDldRGSxETX7cwtogVRxQrvWoEXmUtlvb7dow aQc64zATN5Tbdsuma4VcL0EVRFD0lYls+iXhideWnsIdxoSuuTQs+5SsP8laoyzJJvkL +NP8PJ1U6OTOFQYmSR/jEHcAOkPTKjJjZ7qZ3LALUhB1eTL+d79lTQVEWUDvMXGM9fvy F1mg== 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:mime-version:content-transfer-encoding; bh=lIiXW4UXH6WJ+mTbFcqutdCLrvr7P5sHBkgFjvabVo8=; b=jt/132tW8uP7gQnjFZGgEDg2Vq1uwx2cdKBgaK0TSYAYD1aDX0kN6rCnlZKd3eZgGH n+GQFtjRDOwo3G9jve+OzfajOd7jRr/emRSYkO0yuVU/my9DO2J9ieWCYQLts6PT19+x k7JxEKm3E258meEP+jLT0juwCNgXSfO8OKOHBAyfctPYwyQx8JAvxfz+LHPzhLz44ezo ZZEMgphDkSms23RHA5froQClYGRlUL39zH6aMmB57TDZu/ipD41Ukq+K+MkmhdkSLjG7 6rElb8Pea3PGm9/vsEj1XPFT65g4Du2/T4sIZ24iEtryDdXt20xteswQwthlNkxXM4mA pMJg== X-Gm-Message-State: APjAAAVkHbWVYCmO0+/k1GmGVYra3MgqfkprGT/hf77TC9t92ixTk80I kkEc4/30FX6kcMV1c2FXtuzkas3QZGoIuA== X-Google-Smtp-Source: APXvYqwApX96EXJqGgtDNCJfQanO96ZDLoI2Pkx0L0FaESek9loUVVBeTkKeFfXcBaY6lftQwGAESg== X-Received: by 2002:a24:6fc7:: with SMTP id x190mr20450257itb.46.1554775425641; Mon, 08 Apr 2019 19:03:45 -0700 (PDT) From: Stephen Checkoway To: qemu-devel@nongnu.org Date: Mon, 8 Apr 2019 22:01:32 -0400 Message-Id: <9e06ebcf01f74d93218880bf0d1fae9bf824716d.1554774454.git.stephen.checkoway@oberlin.edu> X-Mailer: git-send-email 2.20.1 (Apple Git-117) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::143 Subject: [Qemu-devel] [PATCH v2 08/10] block/pflash_cfi02: Implement multi-sector erase X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Laurent Vivier , Thomas Huth , Stephen Checkoway , qemu-block@nongnu.org, Max Reitz , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" After two unlock cycles and a sector erase command, the AMD flash chips start a 50 us erase time out. Any additional sector erase commands add a sector to be erased and restart the 50 us timeout. During the timeout, status bit DQ3 is cleared. After the time out, DQ3 is asserted during erasure. Signed-off-by: Stephen Checkoway --- hw/block/pflash_cfi02.c | 94 +++++++++++++++++++++++++++++++-------- tests/pflash-cfi02-test.c | 59 ++++++++++++++++++++++-- 2 files changed, 131 insertions(+), 22 deletions(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index cb1160eb35..21ceb0823b 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -30,7 +30,6 @@ * * It does not implement software data protection as found in many real ch= ips * It does not implement erase suspend/resume commands - * It does not implement multiple sectors erase */ =20 #include "qemu/osdep.h" @@ -106,6 +105,7 @@ struct PFlashCFI02 { MemoryRegion orig_mem; int rom_mode; int read_counter; /* used for lazy switch-back to rom mode */ + int sectors_to_erase; char *name; void *storage; }; @@ -136,6 +136,22 @@ static inline void toggle_dq6(PFlashCFI02 *pfl) pfl->status ^=3D pfl->interleave_multiplier * 0x40; } =20 +/* + * Turn on DQ3. + */ +static inline void assert_dq3(PFlashCFI02 *pfl) +{ + pfl->status |=3D pfl->interleave_multiplier * 0x08; +} + +/* + * Turn off DQ3. + */ +static inline void reset_dq3(PFlashCFI02 *pfl) +{ + pfl->status &=3D ~(pfl->interleave_multiplier * 0x08); +} + /* * Set up replicated mappings of the same region. */ @@ -159,11 +175,37 @@ static void pflash_register_memory(PFlashCFI02 *pfl, = int rom_mode) pfl->rom_mode =3D rom_mode; } =20 -static void pflash_timer (void *opaque) +static void pflash_timer(void *opaque) { PFlashCFI02 *pfl =3D opaque; =20 trace_pflash_timer_expired(pfl->cmd); + if (pfl->cmd =3D=3D 0x30) { + /* + * Sector erase. If DQ3 is 0 when the timer expires, then the 50 + * us erase timeout has expired so we need to start the timer for = the + * sector erase algorithm. Otherwise, the erase completed and we s= hould + * go back to read array mode. + */ + if ((pfl->status & 0x08) =3D=3D 0) { + assert_dq3(pfl); + /* + * CFI address 0x21 is "Typical timeout per individual block e= rase + * 2^N ms" + */ + uint64_t timeout =3D ((1ULL << pfl->cfi_table[0x21]) * + pfl->sectors_to_erase) * 1000000; + timer_mod(&pfl->timer, + qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + timeout); + DPRINTF("%s: erase timeout fired; erasing %d sectors\n", + __func__, pfl->sectors_to_erase); + return; + } + DPRINTF("%s: sector erase complete\n", __func__); + pfl->sectors_to_erase =3D 0; + reset_dq3(pfl); + } + /* Reset flash */ toggle_dq7(pfl); if (pfl->bypass) { @@ -307,13 +349,30 @@ static void pflash_update(PFlashCFI02 *pfl, int offse= t, int size) } } =20 +static void pflash_sector_erase(PFlashCFI02 *pfl, hwaddr offset) +{ + uint64_t sector_len =3D pflash_sector_len(pfl, offset); + offset &=3D ~(sector_len - 1); + DPRINTF("%s: start sector erase at %0*" PRIx64 "-%0*" PRIx64 "\n", + __func__, pfl->bank_width * 2, offset, + pfl->bank_width * 2, offset + sector_len - 1); + if (!pfl->ro) { + uint8_t *p =3D pfl->storage; + memset(p + offset, 0xFF, sector_len); + pflash_update(pfl, offset, sector_len); + } + set_dq7(pfl, 0x00); + ++pfl->sectors_to_erase; + /* Set (or reset) the 50 us timer for additional erase commands. */ + timer_mod(&pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 50000); +} + static void pflash_write(void *opaque, hwaddr offset, uint64_t value, unsigned int width) { PFlashCFI02 *pfl =3D opaque; uint8_t *p; uint8_t cmd; - uint32_t sector_len; =20 cmd =3D value; if (pfl->cmd !=3D 0xA0) { @@ -486,20 +545,7 @@ static void pflash_write(void *opaque, hwaddr offset, = uint64_t value, break; case 0x30: /* Sector erase */ - p =3D pfl->storage; - sector_len =3D pflash_sector_len(pfl, offset); - offset &=3D ~(sector_len - 1); - DPRINTF("%s: start sector erase at %0*" PRIx64 "-%0*" PRIx64 "= \n", - __func__, pfl->bank_width * 2, offset, - pfl->bank_width * 2, offset + sector_len - 1); - if (!pfl->ro) { - memset(p + offset, 0xFF, sector_len); - pflash_update(pfl, offset, sector_len); - } - set_dq7(pfl, 0x00); - /* Let's wait 1/2 second before sector erase is done */ - timer_mod(&pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + - (NANOSECONDS_PER_SECOND / 2)); + pflash_sector_erase(pfl, offset); break; default: DPRINTF("%s: invalid command %02x (wc 5)\n", __func__, cmd); @@ -513,7 +559,19 @@ static void pflash_write(void *opaque, hwaddr offset, = uint64_t value, /* Ignore writes during chip erase */ return; case 0x30: - /* Ignore writes during sector erase */ + /* + * If DQ3 is 0, additional sector erase commands can be + * written and anything else (other than an erase suspend) res= ets + * the device. + */ + if ((pfl->status & 0x08) =3D=3D 0) { + if (cmd =3D=3D 0x30) { + pflash_sector_erase(pfl, offset); + } else { + goto reset_flash; + } + } + /* Ignore writes during the actual erase. */ return; default: /* Should never happen */ diff --git a/tests/pflash-cfi02-test.c b/tests/pflash-cfi02-test.c index ae1cd4e54b..1cd9807c1b 100644 --- a/tests/pflash-cfi02-test.c +++ b/tests/pflash-cfi02-test.c @@ -37,6 +37,7 @@ typedef struct { #define CFI_CMD 0x98 #define UNLOCK0_CMD 0xAA #define UNLOCK1_CMD 0x55 +#define SECOND_UNLOCK_CMD 0x80 #define AUTOSELECT_CMD 0x90 #define RESET_CMD 0xF0 #define PROGRAM_CMD 0xA0 @@ -222,7 +223,7 @@ static void reset(const FlashConfig *c) static void sector_erase(const FlashConfig *c, uint64_t byte_addr) { unlock(c); - flash_cmd(c, UNLOCK0_ADDR, 0x80); + flash_cmd(c, UNLOCK0_ADDR, SECOND_UNLOCK_CMD); unlock(c); flash_write(c, byte_addr, replicate(c, SECTOR_ERASE_CMD)); } @@ -261,7 +262,7 @@ static void program(const FlashConfig *c, uint64_t byte= _addr, uint16_t data) static void chip_erase(const FlashConfig *c) { unlock(c); - flash_cmd(c, UNLOCK0_ADDR, 0x80); + flash_cmd(c, UNLOCK0_ADDR, SECOND_UNLOCK_CMD); unlock(c); flash_cmd(c, UNLOCK0_ADDR, CHIP_ERASE_CMD); } @@ -343,6 +344,7 @@ static void test_geometry(const void *opaque) reset(c); const uint64_t dq7 =3D replicate(c, 0x80); const uint64_t dq6 =3D replicate(c, 0x40); + const uint64_t dq3 =3D replicate(c, 0x08); =20 uint64_t byte_addr =3D 0; for (int region =3D 0; region < nb_erase_regions; ++region) { @@ -360,18 +362,29 @@ static void test_geometry(const void *opaque) /* Erase and program sector. */ for (uint32_t i =3D 0; i < nb_sectors; ++i) { sector_erase(c, byte_addr); - /* Read toggle. */ + + /* Check that DQ3 is 0. */ + g_assert_cmpint(flash_read(c, byte_addr) & dq3, =3D=3D, 0); + clock_step_next(); /* Step over the 50 us timeout. */ + + /* Check that DQ3 is 1. */ uint64_t status0 =3D flash_read(c, byte_addr); + g_assert_cmpint(status0 & dq3, =3D=3D, dq3); + /* DQ7 is 0 during an erase. */ g_assert_cmpint(status0 & dq7, =3D=3D, 0); uint64_t status1 =3D flash_read(c, byte_addr); + /* DQ6 toggles during an erase. */ g_assert_cmpint(status0 & dq6, =3D=3D, ~status1 & dq6); + /* Wait for erase to complete. */ - clock_step_next(); + wait_for_completion(c, byte_addr); + /* Ensure DQ6 has stopped toggling. */ g_assert_cmpint(flash_read(c, byte_addr), =3D=3D, flash_read(c, byte_addr)); + /* Now the data should be valid. */ g_assert_cmpint(flash_read(c, byte_addr), =3D=3D, bank_mask(c)= ); =20 @@ -434,6 +447,44 @@ static void test_geometry(const void *opaque) g_assert_cmpint(flash_query(c, FLASH_ADDR(0)), =3D=3D, replicate(c, 0x= BF)); reset(c); =20 + /* + * Program a word on each sector, erase one or two sectors per region,= and + * verify that all of those, and only those, are erased. + */ + byte_addr =3D 0; + for (int region =3D 0; region < nb_erase_regions; ++region) { + for (int i =3D 0; i < config->nb_blocs[region]; ++i) { + program(c, byte_addr, 0); + byte_addr +=3D config->sector_len[region]; + } + } + unlock(c); + flash_cmd(c, UNLOCK0_ADDR, SECOND_UNLOCK_CMD); + unlock(c); + byte_addr =3D 0; + const uint64_t erase_cmd =3D replicate(c, SECTOR_ERASE_CMD); + for (int region =3D 0; region < nb_erase_regions; ++region) { + flash_write(c, byte_addr, erase_cmd); + if (c->nb_blocs[region] > 1) { + flash_write(c, byte_addr + c->sector_len[region], erase_cmd); + } + byte_addr +=3D c->sector_len[region] * c->nb_blocs[region]; + } + + clock_step_next(); /* Step over the 50 us timeout. */ + wait_for_completion(c, 0); + byte_addr =3D 0; + for (int region =3D 0; region < nb_erase_regions; ++region) { + for (int i =3D 0; i < config->nb_blocs[region]; ++i) { + if (i < 2) { + g_assert_cmpint(flash_read(c, byte_addr), =3D=3D, bank_mas= k(c)); + } else { + g_assert_cmpint(flash_read(c, byte_addr), =3D=3D, 0); + } + byte_addr +=3D config->sector_len[region]; + } + } + qtest_quit(global_qtest); } =20 --=20 2.20.1 (Apple Git-117) From nobody Tue Apr 30 15:38:12 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554775854843391.8809234019702; Mon, 8 Apr 2019 19:10:54 -0700 (PDT) Received: from localhost ([127.0.0.1]:33843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDgDo-0000Nq-KO for importer@patchew.org; Mon, 08 Apr 2019 22:10:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45719) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDg7K-0003UU-9e for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:04:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDg7G-0006sB-IU for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:04:06 -0400 Received: from mail-it1-x141.google.com ([2607:f8b0:4864:20::141]:33633) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDg7E-0006mb-HA for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:04:02 -0400 Received: by mail-it1-x141.google.com with SMTP id v8so1504361itf.0 for ; Mon, 08 Apr 2019 19:03:50 -0700 (PDT) Received: from worksec.oberlin.net (ip-210-181.oberlin.net. [208.66.210.181]) by smtp.gmail.com with ESMTPSA id y203sm5969838itb.22.2019.04.08.19.03.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Apr 2019 19:03:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oberlin-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=osqEpSp8fJ8YSP1eM/WHuVjv288GwtsPaU+dloKjKZ8=; b=1FbGJ3tKZZT8rf4SFhbmPPAlrNFnBK1arPNA65OIWSy5yZfi9wgGuT5rpYOtJ9tQ6h PdQNKuRUERIE/edpYIOsdqQbpLoY5J7D92n90stiJpZGouoh3TnBsWYLXe9j+HbNmdab soCqfvys8eLRHaG34Hd7p5Km/jF9Z2BqBTFyWroAvwQRUmiAbn74h220A7Xj+qXnh4lq mOrDeyp0I/zylb4HgPHQTR1OjSpvRwfmRDdHqkgTrMS7pVz2bG+XnQ4CkodJ5vK31X1c c5if1rugI+6kc5cr7dUT2ELI7q61HT6/LIn0C499EMExD2Z31jpleS7Pa3Y62BRzflP5 OYuQ== 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:mime-version:content-transfer-encoding; bh=osqEpSp8fJ8YSP1eM/WHuVjv288GwtsPaU+dloKjKZ8=; b=becHj9RVrBN7Tp+xYnLmJFOQahd9zH59I2eE7nkZePvIFyR0j6DhY7K2SvTc+NAyRN L4IzzhP9EUnXavZDP+HlG1rJjfJBjdhQe3gzfgl+QwVEWJQV1g1G/VEVrOxLjmZUw5ov kiqCOWWX3eNF6Q05gsJhtOHg17yqUFE1nqZmvMoslZ9QR9vMO+cuQJ5cv5b3fISDPg67 D0k8mOfX84a4gDP92OAAH0XVOvXO/h6Y1cfrM0B/RUASpYbDJvkYesSCT2t6GoV7ULgp iB9n5z+OvfhadHIcCn7WcNiUPdIpX7ewjJG5If17stJ9VPTOJaWt8R1QnyFSTJ5M+yoW 06hA== X-Gm-Message-State: APjAAAWGdMUkp/djwTZGunFD+BET7TRRYjn6ZUs3Nd1oB0kE6H9Ft6+2 2MEn7CMt0rYJrMYIkOECh9veyI0IaI9fQw== X-Google-Smtp-Source: APXvYqzBExQtCVSyrS8tDRBT1u7HjdxyO2Fnfk6uyslXe8CAnaAwTmJp3RPBaY65JOq0gzI7W89rHQ== X-Received: by 2002:a24:1986:: with SMTP id b128mr22888014itb.41.1554775429504; Mon, 08 Apr 2019 19:03:49 -0700 (PDT) From: Stephen Checkoway To: qemu-devel@nongnu.org Date: Mon, 8 Apr 2019 22:01:33 -0400 Message-Id: <580ca196d92784ef708ff006eae2956c24c37e0c.1554774454.git.stephen.checkoway@oberlin.edu> X-Mailer: git-send-email 2.20.1 (Apple Git-117) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::141 Subject: [Qemu-devel] [PATCH v2 09/10] block/pflash_cfi02: Implement erase suspend/resume X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Laurent Vivier , Thomas Huth , Stephen Checkoway , qemu-block@nongnu.org, Max Reitz , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" During a sector erase (but not a chip erase), the embeded erase program can be suspended. Once suspended, the sectors not selected for erasure may be read and programmed. Autoselect mode is allowed during erase suspend mode. Presumably, CFI queries are similarly allowed so this commit allows them as well. Since guest firmware can use status bits DQ7, DQ6, DQ3, and DQ2 to determine the current state of sector erasure, these bits are properly implemented. Signed-off-by: Stephen Checkoway --- hw/block/pflash_cfi02.c | 153 ++++++++++++++++++++++++++++++++++---- tests/pflash-cfi02-test.c | 102 +++++++++++++++++++++++++ 2 files changed, 241 insertions(+), 14 deletions(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 21ceb0823b..d9087cafff 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -29,7 +29,6 @@ * - CFI queries * * It does not implement software data protection as found in many real ch= ips - * It does not implement erase suspend/resume commands */ =20 #include "qemu/osdep.h" @@ -37,6 +36,7 @@ #include "hw/block/block.h" #include "hw/block/flash.h" #include "qapi/error.h" +#include "qemu/bitmap.h" #include "qemu/timer.h" #include "sysemu/block-backend.h" #include "qemu/host-utils.h" @@ -72,6 +72,7 @@ struct PFlashCFI02 { BlockBackend *blk; uint32_t uniform_nb_blocs; uint32_t uniform_sector_len; + uint32_t total_sectors; uint32_t nb_blocs[PFLASH_MAX_ERASE_REGIONS]; uint32_t sector_len[PFLASH_MAX_ERASE_REGIONS]; uint64_t total_len; @@ -106,6 +107,8 @@ struct PFlashCFI02 { int rom_mode; int read_counter; /* used for lazy switch-back to rom mode */ int sectors_to_erase; + uint64_t erase_time_remaining; + unsigned long *sector_erase_map; char *name; void *storage; }; @@ -152,6 +155,14 @@ static inline void reset_dq3(PFlashCFI02 *pfl) pfl->status &=3D ~(pfl->interleave_multiplier * 0x08); } =20 +/* + * Toggle status bit DQ2. + */ +static inline void toggle_dq2(PFlashCFI02 *pfl) +{ + pfl->status ^=3D pfl->interleave_multiplier * 0x04; +} + /* * Set up replicated mappings of the same region. */ @@ -175,6 +186,29 @@ static void pflash_register_memory(PFlashCFI02 *pfl, i= nt rom_mode) pfl->rom_mode =3D rom_mode; } =20 +/* + * Returns the time it takes to erase the number of sectors scheduled for + * erasure based on CFI address 0x21 which is "Typical timeout per individ= ual + * block erase 2^N ms." + */ +static uint64_t pflash_erase_time(PFlashCFI02 *pfl) +{ + /* + * If there are no sectors to erase (which can happen if all of the se= ctors + * to be erased are protected), then erase takes 100 us. Protected sec= tors + * aren't supported so this should never happen. + */ + return ((1ULL << pfl->cfi_table[0x21]) * pfl->sectors_to_erase) * SCAL= E_US; +} + +/* + * Returns true if the device is currently in erase suspend mode. + */ +static inline bool pflash_erase_suspend_mode(PFlashCFI02 *pfl) +{ + return pfl->erase_time_remaining > 0; +} + static void pflash_timer(void *opaque) { PFlashCFI02 *pfl =3D opaque; @@ -189,12 +223,7 @@ static void pflash_timer(void *opaque) */ if ((pfl->status & 0x08) =3D=3D 0) { assert_dq3(pfl); - /* - * CFI address 0x21 is "Typical timeout per individual block e= rase - * 2^N ms" - */ - uint64_t timeout =3D ((1ULL << pfl->cfi_table[0x21]) * - pfl->sectors_to_erase) * 1000000; + uint64_t timeout =3D pflash_erase_time(pfl); timer_mod(&pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + timeout); DPRINTF("%s: erase timeout fired; erasing %d sectors\n", @@ -202,6 +231,7 @@ static void pflash_timer(void *opaque) return; } DPRINTF("%s: sector erase complete\n", __func__); + bitmap_zero(pfl->sector_erase_map, pfl->total_sectors); pfl->sectors_to_erase =3D 0; reset_dq3(pfl); } @@ -240,25 +270,45 @@ static uint64_t pflash_data_read(PFlashCFI02 *pfl, hw= addr offset, return ret; } =20 +typedef struct { + uint32_t len; + uint32_t num; +} SectorInfo; + /* * offset should be a byte offset of the QEMU device and _not_ a device * offset. */ -static uint32_t pflash_sector_len(PFlashCFI02 *pfl, hwaddr offset) +static SectorInfo pflash_sector_info(PFlashCFI02 *pfl, hwaddr offset) { assert(offset < pfl->total_len); int nb_regions =3D pfl->cfi_table[0x2C]; hwaddr addr =3D 0; + uint32_t sector_num =3D 0; for (int i =3D 0; i < nb_regions; ++i) { uint64_t region_size =3D (uint64_t)pfl->nb_blocs[i] * pfl->sector_= len[i]; if (addr <=3D offset && offset < addr + region_size) { - return pfl->sector_len[i]; + return (SectorInfo) { + .len =3D pfl->sector_len[i], + .num =3D sector_num + (offset - addr) / pfl->sector_len[i], + }; } + sector_num +=3D pfl->nb_blocs[i]; addr +=3D region_size; } abort(); } =20 +/* + * Returns true if the offset refers to a flash sector that is currently b= eing + * erased. + */ +static bool pflash_sector_is_erasing(PFlashCFI02 *pfl, hwaddr offset) +{ + long sector_num =3D pflash_sector_info(pfl, offset).num; + return test_bit(sector_num, pfl->sector_erase_map); +} + static uint64_t pflash_read(void *opaque, hwaddr offset, unsigned int widt= h) { PFlashCFI02 *pfl =3D opaque; @@ -285,6 +335,15 @@ static uint64_t pflash_read(void *opaque, hwaddr offse= t, unsigned int width) case 0x80: /* We accept reads during second unlock sequence... */ case 0x00: + if (pflash_erase_suspend_mode(pfl) && + pflash_sector_is_erasing(pfl, offset)) { + /* Toggle bit 2, but not 6. */ + toggle_dq2(pfl); + /* Status register read */ + ret =3D pfl->status; + DPRINTF("%s: status %" PRIx64 "\n", __func__, ret); + break; + } /* Flash area read */ return pflash_data_read(pfl, offset, width); case 0x90: @@ -313,14 +372,16 @@ static uint64_t pflash_read(void *opaque, hwaddr offs= et, unsigned int width) DPRINTF("%s: ID " TARGET_FMT_plx " %" PRIx64 "\n", __func__, device_addr & 0xFF, ret); break; - case 0xA0: case 0x10: case 0x30: + /* Toggle bit 2 during erase, but not program. */ + toggle_dq2(pfl); + case 0xA0: + /* Toggle bit 6 */ + toggle_dq6(pfl); /* Status register read */ ret =3D pfl->status; DPRINTF("%s: status %" PRIx64 "\n", __func__, ret); - /* Toggle bit 6 */ - toggle_dq6(pfl); break; case 0x98: /* CFI query mode */ @@ -351,7 +412,8 @@ static void pflash_update(PFlashCFI02 *pfl, int offset,= int size) =20 static void pflash_sector_erase(PFlashCFI02 *pfl, hwaddr offset) { - uint64_t sector_len =3D pflash_sector_len(pfl, offset); + SectorInfo sector_info =3D pflash_sector_info(pfl, offset); + uint64_t sector_len =3D sector_info.len; offset &=3D ~(sector_len - 1); DPRINTF("%s: start sector erase at %0*" PRIx64 "-%0*" PRIx64 "\n", __func__, pfl->bank_width * 2, offset, @@ -363,6 +425,7 @@ static void pflash_sector_erase(PFlashCFI02 *pfl, hwadd= r offset) } set_dq7(pfl, 0x00); ++pfl->sectors_to_erase; + set_bit(sector_info.num, pfl->sector_erase_map); /* Set (or reset) the 50 us timer for additional erase commands. */ timer_mod(&pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 50000); } @@ -422,6 +485,25 @@ static void pflash_write(void *opaque, hwaddr offset, = uint64_t value, pfl->cmd =3D 0x98; return; } + /* Handle erase resume in erase suspend mode, otherwise reset. */ + if (cmd =3D=3D 0x30) { + if (pflash_erase_suspend_mode(pfl)) { + /* Resume the erase. */ + timer_mod(&pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUA= L) + + pfl->erase_time_remaining); + pfl->erase_time_remaining =3D 0; + pfl->wcycle =3D 6; + pfl->cmd =3D 0x30; + set_dq7(pfl, 0x00); + assert_dq3(pfl); + return; + } + goto reset_flash; + } + /* Ignore erase suspend. */ + if (cmd =3D=3D 0xB0) { + return; + } if (masked_addr !=3D pfl->unlock_addr0 || cmd !=3D 0xAA) { DPRINTF("%s: unlock0 failed %04x %02x %04x\n", __func__, masked_addr, cmd, pfl->unlock_addr0); @@ -467,6 +549,14 @@ static void pflash_write(void *opaque, hwaddr offset, = uint64_t value, /* We need another unlock sequence */ goto check_unlock0; case 0xA0: + if (pflash_erase_suspend_mode(pfl) && + pflash_sector_is_erasing(pfl, offset)) { + /* Ignore writes to erasing sectors. */ + if (pfl->bypass) { + goto do_bypass; + } + goto reset_flash; + } trace_pflash_data_write(offset, value, width, 0); if (!pfl->ro) { p =3D (uint8_t *)pfl->storage + offset; @@ -525,6 +615,10 @@ static void pflash_write(void *opaque, hwaddr offset, = uint64_t value, } break; case 5: + if (pflash_erase_suspend_mode(pfl)) { + /* Erasing is not supported in erase suspend mode. */ + goto reset_flash; + } switch (cmd) { case 0x10: if (masked_addr !=3D pfl->unlock_addr0) { @@ -559,6 +653,30 @@ static void pflash_write(void *opaque, hwaddr offset, = uint64_t value, /* Ignore writes during chip erase */ return; case 0x30: + if (cmd =3D=3D 0xB0) { + /* + * If erase suspend happens during the erase timeout (so D= Q3 is + * 0), then the device suspends erasing immediately. Set t= he + * remaining time to be the total time to erase. Otherwise, + * there is a maximum amount of time it can take to enter + * suspend mode. Let's ignore that and suspend immediately= and + * set the remaining time to the actual time remaining on = the + * timer. + */ + if ((pfl->status & 0x08) =3D=3D 0) { + pfl->erase_time_remaining =3D pflash_erase_time(pfl); + } else { + int64_t delta =3D timer_expire_time_ns(&pfl->timer) - + qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + /* Make sure we have a positive time remaining. */ + pfl->erase_time_remaining =3D delta <=3D 0 ? 1 : delta; + } + reset_dq3(pfl); + timer_del(&pfl->timer); + pfl->wcycle =3D 0; + pfl->cmd =3D 0; + return; + } /* * If DQ3 is 0, additional sector erase commands can be * written and anything else (other than an erase suspend) res= ets @@ -723,10 +841,12 @@ static void pflash_cfi02_realize(DeviceState *dev, Er= ror **errp) int num_devices =3D pfl->bank_width / pfl->device_width; int nb_regions; pfl->total_len =3D 0; + pfl->total_sectors =3D 0; for (nb_regions =3D 0; nb_regions < PFLASH_MAX_ERASE_REGIONS; ++nb_reg= ions) { if (pfl->nb_blocs[nb_regions] =3D=3D 0) { break; } + pfl->total_sectors +=3D pfl->nb_blocs[nb_regions]; uint64_t sector_len_per_device =3D pfl->sector_len[nb_regions] / num_devices; =20 @@ -761,6 +881,7 @@ static void pflash_cfi02_realize(DeviceState *dev, Erro= r **errp) pfl->nb_blocs[0] =3D pfl->uniform_nb_blocs; pfl->sector_len[0] =3D pfl->uniform_sector_len; pfl->total_len =3D uniform_len; + pfl->total_sectors =3D pfl->uniform_nb_blocs; } else if (uniform_len !=3D 0 && uniform_len !=3D pfl->total_len) { error_setg(errp, "\"num-blocks\"*\"sector-length\" " "different from \"num-blocks0\"*\'sector-length0\" + ..= . + " @@ -785,6 +906,9 @@ static void pflash_cfi02_realize(DeviceState *dev, Erro= r **errp) pfl->unlock_addr0 &=3D 0x7FF; pfl->unlock_addr1 &=3D 0x7FF; =20 + /* Allocate memory for a bitmap for sectors being erased. */ + pfl->sector_erase_map =3D bitmap_new(pfl->total_sectors); + if (local_err) { error_propagate(errp, local_err); return; @@ -892,7 +1016,7 @@ static void pflash_cfi02_realize(DeviceState *dev, Err= or **errp) pfl->cfi_table[0x44] =3D '0'; =20 pfl->cfi_table[0x45] =3D 0x00; /* Address sensitive unlock required. */ - pfl->cfi_table[0x46] =3D 0x00; /* Erase suspend not supported. */ + pfl->cfi_table[0x46] =3D 0x02; /* Erase suspend to read/write. */ pfl->cfi_table[0x47] =3D 0x00; /* Sector protect not supported. */ pfl->cfi_table[0x48] =3D 0x00; /* Temporary sector unprotect not suppo= rted. */ =20 @@ -934,6 +1058,7 @@ static void pflash_cfi02_unrealize(DeviceState *dev, E= rror **errp) { PFlashCFI02 *pfl =3D PFLASH_CFI02(dev); timer_del(&pfl->timer); + g_free(pfl->sector_erase_map); } =20 static void pflash_cfi02_class_init(ObjectClass *klass, void *data) diff --git a/tests/pflash-cfi02-test.c b/tests/pflash-cfi02-test.c index 1cd9807c1b..38d6f6b809 100644 --- a/tests/pflash-cfi02-test.c +++ b/tests/pflash-cfi02-test.c @@ -45,6 +45,8 @@ typedef struct { #define CHIP_ERASE_CMD 0x10 #define UNLOCK_BYPASS_CMD 0x20 #define UNLOCK_BYPASS_RESET_CMD 0x00 +#define ERASE_SUSPEND_CMD 0xB0 +#define ERASE_RESUME_CMD SECTOR_ERASE_CMD =20 typedef struct { /* Interleave configuration. */ @@ -267,6 +269,16 @@ static void chip_erase(const FlashConfig *c) flash_cmd(c, UNLOCK0_ADDR, CHIP_ERASE_CMD); } =20 +static void erase_suspend(const FlashConfig *c) +{ + flash_cmd(c, FLASH_ADDR(0), ERASE_SUSPEND_CMD); +} + +static void erase_resume(const FlashConfig *c) +{ + flash_cmd(c, FLASH_ADDR(0), ERASE_RESUME_CMD); +} + /* * Test flash commands with a variety of device geometry. */ @@ -345,6 +357,7 @@ static void test_geometry(const void *opaque) const uint64_t dq7 =3D replicate(c, 0x80); const uint64_t dq6 =3D replicate(c, 0x40); const uint64_t dq3 =3D replicate(c, 0x08); + const uint64_t dq2 =3D replicate(c, 0x04); =20 uint64_t byte_addr =3D 0; for (int region =3D 0; region < nb_erase_regions; ++region) { @@ -485,6 +498,95 @@ static void test_geometry(const void *opaque) } } =20 + /* Test erase suspend/resume during erase timeout. */ + sector_erase(c, 0); + /* + * Check that DQ 3 is 0 and DQ6 and DQ2 are toggling in the sector bei= ng + * erased as well as in a sector not being erased. + */ + byte_addr =3D c->sector_len[0]; + status0 =3D flash_read(c, 0); + status1 =3D flash_read(c, 0); + g_assert_cmpint(status0 & dq3, =3D=3D, 0); + g_assert_cmpint(status0 & dq6, =3D=3D, ~status1 & dq6); + g_assert_cmpint(status0 & dq2, =3D=3D, ~status1 & dq2); + status0 =3D flash_read(c, byte_addr); + status1 =3D flash_read(c, byte_addr); + g_assert_cmpint(status0 & dq3, =3D=3D, 0); + g_assert_cmpint(status0 & dq6, =3D=3D, ~status1 & dq6); + g_assert_cmpint(status0 & dq2, =3D=3D, ~status1 & dq2); + + /* + * Check that after suspending, DQ6 does not toggle but DQ2 does toggl= e in + * an erase suspended sector but that neither toggle (we should be + * getting data) in a sector not being erased. + */ + erase_suspend(c); + status0 =3D flash_read(c, 0); + status1 =3D flash_read(c, 0); + g_assert_cmpint(status0 & dq6, =3D=3D, status1 & dq6); + g_assert_cmpint(status0 & dq2, =3D=3D, ~status1 & dq2); + g_assert_cmpint(flash_read(c, byte_addr), =3D=3D, flash_read(c, byte_a= ddr)); + + /* Check that after resuming, DQ3 is 1 and DQ6 and DQ2 toggle. */ + erase_resume(c); + status0 =3D flash_read(c, 0); + status1 =3D flash_read(c, 0); + g_assert_cmpint(status0 & dq3, =3D=3D, dq3); + g_assert_cmpint(status0 & dq6, =3D=3D, ~status1 & dq6); + g_assert_cmpint(status0 & dq2, =3D=3D, ~status1 & dq2); + status0 =3D flash_read(c, byte_addr); + status1 =3D flash_read(c, byte_addr); + g_assert_cmpint(status0 & dq3, =3D=3D, dq3); + g_assert_cmpint(status0 & dq6, =3D=3D, ~status1 & dq6); + g_assert_cmpint(status0 & dq2, =3D=3D, ~status1 & dq2); + wait_for_completion(c, 0); + + /* Repeat this process but this time suspend after the timeout. */ + sector_erase(c, 0); + clock_step_next(); + /* + * Check that DQ 3 is 1 and DQ6 and DQ2 are toggling in the sector bei= ng + * erased as well as in a sector not being erased. + */ + byte_addr =3D c->sector_len[0]; + status0 =3D flash_read(c, 0); + status1 =3D flash_read(c, 0); + g_assert_cmpint(status0 & dq3, =3D=3D, dq3); + g_assert_cmpint(status0 & dq6, =3D=3D, ~status1 & dq6); + g_assert_cmpint(status0 & dq2, =3D=3D, ~status1 & dq2); + status0 =3D flash_read(c, byte_addr); + status1 =3D flash_read(c, byte_addr); + g_assert_cmpint(status0 & dq3, =3D=3D, dq3); + g_assert_cmpint(status0 & dq6, =3D=3D, ~status1 & dq6); + g_assert_cmpint(status0 & dq2, =3D=3D, ~status1 & dq2); + + /* + * Check that after suspending, DQ6 does not toggle but DQ2 does toggl= e in + * an erase suspended sector but that neither toggle (we should be + * getting data) in a sector not being erased. + */ + erase_suspend(c); + status0 =3D flash_read(c, 0); + status1 =3D flash_read(c, 0); + g_assert_cmpint(status0 & dq6, =3D=3D, status1 & dq6); + g_assert_cmpint(status0 & dq2, =3D=3D, ~status1 & dq2); + g_assert_cmpint(flash_read(c, byte_addr), =3D=3D, flash_read(c, byte_a= ddr)); + + /* Check that after resuming, DQ3 is 1 and DQ6 and DQ2 toggle. */ + erase_resume(c); + status0 =3D flash_read(c, 0); + status1 =3D flash_read(c, 0); + g_assert_cmpint(status0 & dq3, =3D=3D, dq3); + g_assert_cmpint(status0 & dq6, =3D=3D, ~status1 & dq6); + g_assert_cmpint(status0 & dq2, =3D=3D, ~status1 & dq2); + status0 =3D flash_read(c, byte_addr); + status1 =3D flash_read(c, byte_addr); + g_assert_cmpint(status0 & dq3, =3D=3D, dq3); + g_assert_cmpint(status0 & dq6, =3D=3D, ~status1 & dq6); + g_assert_cmpint(status0 & dq2, =3D=3D, ~status1 & dq2); + wait_for_completion(c, 0); + qtest_quit(global_qtest); } =20 --=20 2.20.1 (Apple Git-117) From nobody Tue Apr 30 15:38:12 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1554775916761432.4968512414338; Mon, 8 Apr 2019 19:11:56 -0700 (PDT) Received: from localhost ([127.0.0.1]:33855 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDgEr-0001Fq-RC for importer@patchew.org; Mon, 08 Apr 2019 22:11:53 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45661) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDg7G-0003Qc-Ee for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:04:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDg7C-0006pJ-Er for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:04:00 -0400 Received: from mail-it1-x141.google.com ([2607:f8b0:4864:20::141]:38912) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hDg78-0006nA-FW for qemu-devel@nongnu.org; Mon, 08 Apr 2019 22:03:56 -0400 Received: by mail-it1-x141.google.com with SMTP id 139so2437678ita.4 for ; Mon, 08 Apr 2019 19:03:53 -0700 (PDT) Received: from worksec.oberlin.net (ip-210-181.oberlin.net. [208.66.210.181]) by smtp.gmail.com with ESMTPSA id y203sm5969838itb.22.2019.04.08.19.03.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Apr 2019 19:03:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oberlin-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/jtNWxB61SZw8gmWc4QLGq2l28K8nb8bWXBa9rEihZY=; b=jm48FmkwX+8OHmydGsK4/S4S/4R4b0DwL0g8XIYV3OJLRib5TKg7cwOIQUKie2t5E4 BQNweuL84ufQ8+02PCd6HpUhgYoX31q5qGOPevKqoQ214TbX0Lnpx4c7O7vjoB/0Dxs7 I5Hh2HSRztXUMECyk/iO1hkTjtGVUoMFhwCgI9edvhkZwCETvCfA5ILQRO/ZxV1a6cBe FYa1QB0Cac1oaWonBU5YQb+DyM85pXq/X29nJye/X1RHds5Zi17qfwl0KKOCdT5SYs1r Fmy9EbhLIx/T+rS/xAscqnarnlENk+iaO6kygdc07GwXUTI1xqOyPiuj9fyB4m11VGw2 FrWQ== 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:mime-version:content-transfer-encoding; bh=/jtNWxB61SZw8gmWc4QLGq2l28K8nb8bWXBa9rEihZY=; b=ePPMnpca7e95MRBdkNNQo4BoB0KrJ0FMbvKq5nCsWkuHcOw8xqyC6j4tYc0AumcXiy 6lzOOu5hBL5nT0l+ugSBmojQANGQPURCJDzeuIjzFgydjNpp5crFvlfTW40hbhfG/A1A ih3mVkCO+Vw8G5iGNJne1Nqyc+6tGceIDUrcsCnhzRKdw3YlRcGlLz6FFI+yWdtWiBjf Uetf0LOupRx7WZ3ZxPaqFsZiFfPP3QHb68w8OwuKY00k8bAchw4r6OdP1Yax6GRdNXSX MK+VMyBdOgjafXt1UAXY0nGdyrsYVdYRvhYRorQyvpLlFVFgfkcW5M8ftzOHyqpfbJsg C6yA== X-Gm-Message-State: APjAAAW8Dw01vvfJOhuCV++kSXuLpYK/3BtxIIPqCOs00OmULMUmAeTV ZKHKNI5/ZtQ+PypE/mmt7gBlD3/IukhJLw== X-Google-Smtp-Source: APXvYqwt1c6Ea6ZLC+wq8NFn0aDTYencM92nxTmhLtauLGM6v+b74OijT1hsW+1bdx/HWX/xSx5+mQ== X-Received: by 2002:a02:ab90:: with SMTP id t16mr24348111jan.119.1554775432722; Mon, 08 Apr 2019 19:03:52 -0700 (PDT) From: Stephen Checkoway To: qemu-devel@nongnu.org Date: Mon, 8 Apr 2019 22:01:34 -0400 Message-Id: <8f3c98364902035431d788f058b342b286cc924c.1554774454.git.stephen.checkoway@oberlin.edu> X-Mailer: git-send-email 2.20.1 (Apple Git-117) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::141 Subject: [Qemu-devel] [PATCH v2 10/10] block/pflash_cfi02: Use the chip erase time specified in the CFI table X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Stephen Checkoway , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" When erasing the chip, use the typical time specified in the CFI table rather than arbitrarily selecting 5 seconds. Since the currently unconfigurable value set in the table is 12, this means a chip erase takes 4096 ms so this isn't a big change in behavior. Signed-off-by: Stephen Checkoway --- hw/block/pflash_cfi02.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index d9087cafff..76c8af4365 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -633,9 +633,9 @@ static void pflash_write(void *opaque, hwaddr offset, u= int64_t value, pflash_update(pfl, 0, pfl->total_len); } set_dq7(pfl, 0x00); - /* Let's wait 5 seconds before chip erase is done */ + /* Wait the time specified at CFI address 0x22. */ timer_mod(&pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + - (NANOSECONDS_PER_SECOND * 5)); + (1ULL << pfl->cfi_table[0x22]) * SCALE_MS); break; case 0x30: /* Sector erase */ --=20 2.20.1 (Apple Git-117)