From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:505:564d:b0:1be9:327d:8ee3 with SMTP id jl13csp3234028njb; Tue, 9 Jul 2024 04:54:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXGGa5I4lRdVIuz65yfDc9txN89Q9RDhZswtz+gEmvIwgN4yIfOX1xDY0lICQtD2+V27XabIL8C282BCn5WDRjApcNkEPgB X-Google-Smtp-Source: AGHT+IHVSJWWKmWKidhNo8eHok7yZrMQDxe7XdiHJ4BKPbGldvLrawMHKvLjdeoOzO0vCljpRWjN X-Received: by 2002:a05:620a:b1b:b0:797:84f9:cb38 with SMTP id af79cd13be357-79f1b5365eamr294897285a.11.1720526041841; Tue, 09 Jul 2024 04:54:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720526041; cv=none; d=google.com; s=arc-20160816; b=YH+OsiFROyRstqpEUG7unxfk6rN3e5uYerdTk1V4AsXVTLRKoYVqVw2sz/b+G+a94v VZYG+qBXSgkwywZtna1ra23t1ZB9P1eE4TYU6BsqXTlbus4f+6OALgn1ohVbnIyfeJ8N Uw67OZvbSEoF+OXKMJ1oWw/On9r27b4WzT5l7au3nPq9X79BKioerdTH1du8fFaNP7Iq 9f7/SgpClfB6qc2Ih754lvp+2T6++IE/xLlBG/S55A2c/o2k/Rt20nAkDdaUEZSk1vqq YXPe9MlWo5s6k4AMizFD1i27MpDoKwYSSik6hAXx2JqW4+WzMvAYGlYyHL9y/uTtlYn5 KNog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=tdPFQXQSQZMNxFPBm94K3NbKgNhWOYAIwcO0ydpIx28=; fh=OB4nhQX1bFwm+MLKNUzc1UcgBcUdSYXblZnVHN1xxIM=; b=Vp7LMR5ntmTH61C8wBuBjA9j8Yab56KHfrC6i4zlawNw/M6/SPjucNpiWTQwhKqFKi GIRGHiXi2bc7xDbKwrF/SXlt7yz25RrJJbi1QkTmPcVBuYjhtzDhWnDCv+hR31LyJE98 ad2PpLEzXV8tX8qO4ZabPmWBdZfofEv0z4oNACtNH6hPpJ5xII03ZBk/HrhvtZGaE8Dg eL8ek6d0FhC/v4E7Wb6zeiaCwM5AJ/0UoevoooXWw38Lqjds+8A1tfuiK+KwS4chhpUe O2g0wqbXEACteDDHO/rTnLrdX6mIbdrKBVDwLSTvxZIPkMJRuiSFjywu+y2mu/uIvmNj fYAw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="UwZ/gXyO"; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-79f190e7464si190030085a.712.2024.07.09.04.54.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Jul 2024 04:54:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="UwZ/gXyO"; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sR9P3-0001mX-Ck; Tue, 09 Jul 2024 07:53:01 -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 1sR9P1-0001f3-LV for qemu-arm@nongnu.org; Tue, 09 Jul 2024 07:52:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sR9Ot-0006bD-4m for qemu-arm@nongnu.org; Tue, 09 Jul 2024 07:52:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720525968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tdPFQXQSQZMNxFPBm94K3NbKgNhWOYAIwcO0ydpIx28=; b=UwZ/gXyO78Ft0G/cuZf8aaDjnilzWcCOqUSiymFrPO2GngCubpVYQNmfpTY58eoBTw0yTY TB3mEsl8VKuGk2Zgn8B78kRtFQqXwp7rm7s1ohmLr/kNmfFraXsyj9FBuaRT4OauAfu4Qi 3LMNm+XVBVUdjgDFnesZ9c/4FJ6/Cak= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-636-T8zMhkbAPKG9bA1BafX6AQ-1; Tue, 09 Jul 2024 07:52:46 -0400 X-MC-Unique: T8zMhkbAPKG9bA1BafX6AQ-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C2BA51955F42; Tue, 9 Jul 2024 11:52:45 +0000 (UTC) Received: from corto.redhat.com (unknown [10.39.193.243]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 13CA13000181; Tue, 9 Jul 2024 11:52:43 +0000 (UTC) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Jamin Lin , Troy Lee , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PULL 6/8] hw/block: m25p80: support quad mode for w25q01jvq Date: Tue, 9 Jul 2024 13:52:26 +0200 Message-ID: <20240709115228.798904-7-clg@redhat.com> In-Reply-To: <20240709115228.798904-1-clg@redhat.com> References: <20240709115228.798904-1-clg@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass client-ip=170.10.133.124; envelope-from=clg@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.144, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=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: , Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: Wip6+CDkg9yx From: Jamin Lin 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 Reviewed-by: Cédric Le Goater --- hw/block/m25p80.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 8dec134832a1..9e99107b42e2 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.45.2