Received: by 2002:a17:504:7599:b0:1be7:c013:c773 with SMTP id j25csp2440515njm; Wed, 3 Jul 2024 01:17:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXF78stDZUovq1BYq2WhdBHsJESVJSca9TByi/d9Crk3DfKIwD9q4VbpE6ZBB0FddaCsBD7oQnPduR/0GQk33d3C2uZn5Li X-Google-Smtp-Source: AGHT+IGM2SLZxV+JPJVaAFP3pBeoptgoXpareFe724UQeb8OxKiZ6jbJnHRE+QhUcSX3UcSaLGYr X-Received: by 2002:a05:6214:4015:b0:6b4:7910:2b60 with SMTP id 6a1803df08f44-6b5b704f2d7mr115890686d6.6.1719994660005; Wed, 03 Jul 2024 01:17:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719994659; cv=none; d=google.com; s=arc-20160816; b=znmiPcySjS/BEio4ief1Z1OdjPKOJ1tFEIBMrfYlO8JOs/IL0SpFQCNb1uUiZ8L4hE mUF0X5JFJ18bptwW/MYzgB1A4X9iD1o+fQb6lnUIw/Tba/2lgiGecDN90u0VX7Aq81E+ f2JPjpel+4e2F6B2Izb/cERbhG1VXkbUm7DYadhuF5vIAGZGD2/FGaNBLXnIMt/Dkss2 gMXLuRK/ob/CvZirUaUFE/ikuAr8C9LuDS4XjOBknjBCnh5XXiXO0D7B0+LoztSfJkH7 550LsEat0ZnY9zoSTtbv6OvF6U0awREXSdIrekF0BWN8a+EayZJQWtLkjmD98pT+mOBH DeAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:from:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to; bh=qKGYwsTaROH09PBP02IJEcw6k1/sl2IEJ1elPo6SqA8=; fh=Vva0SnTfFpZ62XWQNW5X4TL2jFj5cBikmg9Gp1PrOrY=; b=M6C0+3HgTQmk7nVRhyhxBHoAiogJGYbCr6nHezmAlPPLu0LJoHSEZ4ldXMS/rvNGaw lCDQi70bzbtbWVB+Lv1Tfnh05Q8DxC5F7jErBJ935WPN+UGPGHaI/q4DS9RHNWeGILn4 1slnP91ssdj0m32cozpLYaLBaSiJOBJbmzo/cS0TUDMaKTUWO4Hgk7xplWqaOYo96PB6 OZkJFm0zCnPy1+SDVxPZegOFwecimcCPgmogLly7HwStlniFhigQOjaHz6WtNYjEXNOx W3t7TGgPP6pykGYNnuTz8sl6oVE4paqnAkSB+FoxGrdJxgfWguvJBv4UG4SpxoUbNEIB wAdg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6b59e6190ebsi122096576d6.589.2024.07.03.01.17.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Jul 2024 01:17:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nongnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOvAl-0003JK-Ik; Wed, 03 Jul 2024 04:17:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sOvAk-0003Iy-Mr; Wed, 03 Jul 2024 04:17:02 -0400 Received: from mail.aspeedtech.com ([211.20.114.72] helo=TWMBX01.aspeed.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sOvAi-00014r-5c; Wed, 03 Jul 2024 04:17:01 -0400 Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Wed, 3 Jul 2024 16:16:26 +0800 Received: from localhost.localdomain (192.168.10.10) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1258.12 via Frontend Transport; Wed, 3 Jul 2024 16:16:26 +0800 To: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Peter Maydell , Steven Lee , Troy Lee , Andrew Jeffery , "Joel Stanley" , Alistair Francis , "Kevin Wolf" , Hanna Reitz , Jason Wang , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Wainer dos Santos Moschetta" , Beraldo Leal , "open list:ASPEED BMCs" , "open list:All patches CC here" , "open list:Block layer core" CC: , , Subject: [PATCH v2 4/5] hw/block: m25p80: support quad mode for w25q01jvq Date: Wed, 3 Jul 2024 16:16:22 +0800 Message-ID: <20240703081623.2740862-5-jamin_lin@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240703081623.2740862-1-jamin_lin@aspeedtech.com> References: <20240703081623.2740862-1-jamin_lin@aspeedtech.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Received-SPF: pass client-ip=211.20.114.72; envelope-from=jamin_lin@aspeedtech.com; helo=TWMBX01.aspeed.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_FAIL=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jamin Lin From: Jamin Lin via Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: 1VbFkFY23/TP According to the w25q01jv datasheet at page 16, it is required to set QE bit in "Status Register 2". Besides, users are able to utilize "Write Status Register 1(0x01)" command to set QE bit in "Status Register 2" and utilize "Read Status Register 2(0x35)" command to get the QE bit status. To support quad mode for w25q01jvq, update collecting data needed 2 bytes for WRSR command in decode_new_cmd function and verify QE bit at the second byte of collecting data bit 2 in complete_collecting_data. Update RDCR_EQIO command to set bit 2 of return data if quad mode enable in decode_new_cmd. Signed-off-by: Troy Lee Signed-off-by: Jamin Lin --- hw/block/m25p80.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 8dec134832..9e99107b42 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -416,6 +416,7 @@ typedef enum { /* * Micron: 0x35 - enable QPI * Spansion: 0x35 - read control register + * Winbond: 0x35 - quad enable */ RDCR_EQIO = 0x35, RSTQIO = 0xf5, @@ -798,6 +799,11 @@ static void complete_collecting_data(Flash *s) s->four_bytes_address_mode = extract32(s->data[1], 5, 1); } break; + case MAN_WINBOND: + if (s->len > 1) { + s->quad_enable = !!(s->data[1] & 0x02); + } + break; default: break; } @@ -1254,6 +1260,10 @@ static void decode_new_cmd(Flash *s, uint32_t value) s->needed_bytes = 2; s->state = STATE_COLLECTING_VAR_LEN_DATA; break; + case MAN_WINBOND: + s->needed_bytes = 2; + s->state = STATE_COLLECTING_VAR_LEN_DATA; + break; default: s->needed_bytes = 1; s->state = STATE_COLLECTING_DATA; @@ -1431,6 +1441,12 @@ static void decode_new_cmd(Flash *s, uint32_t value) case MAN_MACRONIX: s->quad_enable = true; break; + case MAN_WINBOND: + s->data[0] = (!!s->quad_enable) << 1; + s->pos = 0; + s->len = 1; + s->state = STATE_READING_DATA; + break; default: break; } -- 2.34.1