Received: by 2002:a19:3859:0:0:0:0:0 with SMTP id d25csp5283287lfj; Wed, 11 May 2022 12:50:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynB3ObT8uDJvZrp3GfYOn+knAdt782eIo/SCy9U2bm3bcPsKkIgyQeLgYFN3Nxs0mBJtLT X-Received: by 2002:ac8:594b:0:b0:2f3:cb25:facf with SMTP id 11-20020ac8594b000000b002f3cb25facfmr23982526qtz.631.1652298653789; Wed, 11 May 2022 12:50:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652298653; cv=none; d=google.com; s=arc-20160816; b=zC0YQvDF6bYnpJW1v+FEVtPw7nDS0l2nzbeiUT4y3wve567gfcNYhhiRXKQpARuyaw 6QIUh9GExs81c4sH5y1Xap4PA49U2MO5cFK9Lz6qSDJRN/kcI1sF7FdNqsRKtoOHqjlA /oL9w0KTRLjqJvdZiSYInI0+P8Czian2M/97QZZdKE85LSdNUiFFbmOEA8b4vbHQdEKT KVgkm28ldhV2AOvi9cyCG+1dmfhtepF8m1oddujjOO8i8yK+a02uQtO3jkhzjF7dpb1S m0eD1Rz99Fy1tVfazU18zZ1cTvnLSUq/Pk4+i+H2WCpDt3hLq/8e2aJ+eRF4s80oNLDu tWhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=from:reply-to: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; bh=I1lbPGDDDcJ3j205wwK7ZYoGtRDBknLMwCXJQ+5U/Us=; b=KwShbF1phHQU17QZjqWcEy2ps8qW6+iEMNThWcSLjnhAF1mZRDkdkiKBSEwmIUbXyB ELtvewTHgaBKgF+GVwqrZCtG8l0SwHLnj+WruBQ84/ToLcSLKEOgBbL9TiugRO0Z24V3 kXhAMNimSVJ4M9RVr2Eo62xAZNWrC/410sFCbBoWTpvoVV+Q58sZiyE5yBIvZcfBZAaB sdLkqg2SLV8ssPyNfLQlqfICbuiv8glCubT6fzbVTyG64vsvGo9svmFPh2/FJbX/G8gG bBmoWRsMXB0GHQ2WQ/0ZsnfxPI/kI/cBlF4StUsLvF5neVpnSkOmXv3EQ0kWe9FZhJvJ IIWw== 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 f12-20020ac87f0c000000b002f3c61ead9bsi1985248qtk.39.2022.05.11.12.50.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 May 2022 12:50:53 -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]:38452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nosMH-0000f8-88 for alex.bennee@linaro.org; Wed, 11 May 2022 15:50:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1norBe-0000gc-KP for qemu-arm@nongnu.org; Wed, 11 May 2022 14:35:50 -0400 Received: from 66-220-155-178.mail-mxout.facebook.com ([66.220.155.178]:40691) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1norBd-0002HL-29 for qemu-arm@nongnu.org; Wed, 11 May 2022 14:35:50 -0400 Received: by devvm5719.atn0.facebook.com (Postfix, from userid 279525) id 55F1B13ABF94; Wed, 11 May 2022 11:10:26 -0700 (PDT) To: Cc: irischenlj@fb.com, pdel@fb.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, clg@kaod.org, patrick@stwcx.xyz Subject: [PATCH 1/1] hw: allow write_enable latch get/set Date: Wed, 11 May 2022 11:10:24 -0700 Message-Id: <20220511181024.969263-2-irischenlj@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220511181024.969263-1-irischenlj@fb.com> References: <20220511181024.969263-1-irischenlj@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: none client-ip=66.220.155.178; envelope-from=irischenlj@devvm5719.atn0.facebook.com; helo=66-220-155-178.mail-mxout.facebook.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NO_DNS_FOR_FROM=0.001, RDNS_DYNAMIC=0.982, SPF_HELO_PASS=-0.001, SPF_NONE=0.001, TVD_RCVD_IP=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 11 May 2022 15:50:04 -0400 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" Reply-to: Iris Chen From: Iris Chen via X-TUID: MzNw4heMiFrO --- hw/block/m25p80.c | 30 ++++++++++++++++++++++++++++++ tests/qtest/aspeed_smc-test.c | 20 ++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 430d1298a8..fb72704e5a 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -35,6 +35,7 @@ #include "qapi/error.h" #include "trace.h" #include "qom/object.h" +#include "qapi/visitor.h" =20 /* Fields for FlashPartInfo->flags */ =20 @@ -1646,6 +1647,31 @@ static const VMStateDescription vmstate_m25p80 =3D= { } }; =20 +static void m25p80_get_wel(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + Flash *s =3D M25P80(obj); + + assert(strcmp(name, "WEL") =3D=3D 0); + + visit_type_bool(v, name, &s->write_enable, errp); +} + +static void m25p80_set_wel(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + Flash *s =3D M25P80(obj); + bool value; + + assert(strcmp(name, "WEL") =3D=3D 0); + + if (!visit_type_bool(v, name, &value, errp)) { + return; + } + + s->write_enable =3D value; +} + static void m25p80_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -1660,6 +1686,10 @@ static void m25p80_class_init(ObjectClass *klass, = void *data) device_class_set_props(dc, m25p80_properties); dc->reset =3D m25p80_reset; mc->pi =3D data; + + object_class_property_add(klass, "WEL", "bool", + m25p80_get_wel, + m25p80_set_wel, NULL, NULL); } =20 static const TypeInfo m25p80_info =3D { diff --git a/tests/qtest/aspeed_smc-test.c b/tests/qtest/aspeed_smc-test.= c index 87b40a0ef1..af885a9c9d 100644 --- a/tests/qtest/aspeed_smc-test.c +++ b/tests/qtest/aspeed_smc-test.c @@ -49,6 +49,7 @@ */ enum { JEDEC_READ =3D 0x9f, + RDSR =3D 0x5, BULK_ERASE =3D 0xc7, READ =3D 0x03, PP =3D 0x02, @@ -348,6 +349,24 @@ static void test_write_page_mem(void) flash_reset(); } =20 +static void test_read_status_reg(void) +{ + uint8_t r; + + qmp("{ 'execute': 'qom-set', 'arguments': " + "{'path': '/machine/soc/fmc/ssi.0/child[0]', 'property': 'WEL', '= value': true}}"); + + spi_conf(CONF_ENABLE_W0); + spi_ctrl_start_user(); + writeb(ASPEED_FLASH_BASE, RDSR); + r =3D readb(ASPEED_FLASH_BASE); + spi_ctrl_stop_user(); + + g_assert_cmphex(r, =3D=3D, 0x2); + + flash_reset(); +} + static char tmp_path[] =3D "/tmp/qtest.m25p80.XXXXXX"; =20 int main(int argc, char **argv) @@ -373,6 +392,7 @@ int main(int argc, char **argv) qtest_add_func("/ast2400/smc/write_page", test_write_page); qtest_add_func("/ast2400/smc/read_page_mem", test_read_page_mem); qtest_add_func("/ast2400/smc/write_page_mem", test_write_page_mem); + qtest_add_func("/ast2400/smc/read_status_reg", test_read_status_reg)= ; =20 ret =3D g_test_run(); =20 --=20 2.30.2