From nobody Fri Mar 14 18:46:54 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1735201784; cv=none; d=zohomail.com; s=zohoarc; b=PmEc4AlSfu0zrj3/xJmxiajfz1sBoU7WWEJCS0HBvVrM6+mh84NhCIq+4A5UidSD2GHNgNXNM8Ok58jzT81K+V8itDAB9tF/JuLq0IjwUupHyscduo1oQ/Fxqu6W7UOzbas4/MnxOlJvY/l99UyvNy3Sc4Xb+jMkLlM59jMkBFQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735201784; h=Content-Type:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dSh3O5WaaKwNo1iaUvTSpo+z9u0dQr4Ul55JCilzC1E=; b=ForUj9keYh4aY0Y6z6qbssAE6EMzYJyDQUZlfD9ykmlTPy1zcTUA3Zs7ZyWSdq2NDgANoDDzWFcf2y8b7GfLKpmwIvZmHZO884VZEc9B2qza1Xbsdc/PXFz5MzqlQpNVtvkifOsm8bei/hsSwKv7dZs7keu1DGnU+KNEAGNSYsI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1735201784837428.00468357435363; Thu, 26 Dec 2024 00:29:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tQjEe-0004pL-6C; Thu, 26 Dec 2024 03:28:48 -0500 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 <3uBNtZwgKCtUNL81FKJ87FF7C5.3FDH5DL-45M5CEFE7EL.FI7@flex--wuhaotsh.bounces.google.com>) id 1tQjEa-0004US-D6 for qemu-devel@nongnu.org; Thu, 26 Dec 2024 03:28:44 -0500 Received: from mail-pl1-x64a.google.com ([2607:f8b0:4864:20::64a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3uBNtZwgKCtUNL81FKJ87FF7C5.3FDH5DL-45M5CEFE7EL.FI7@flex--wuhaotsh.bounces.google.com>) id 1tQjEY-0001EA-Az for qemu-devel@nongnu.org; Thu, 26 Dec 2024 03:28:44 -0500 Received: by mail-pl1-x64a.google.com with SMTP id d9443c01a7336-216728b170cso76654655ad.2 for ; Thu, 26 Dec 2024 00:28:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1735201720; x=1735806520; darn=nongnu.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=dSh3O5WaaKwNo1iaUvTSpo+z9u0dQr4Ul55JCilzC1E=; b=RJ8p3k9ljx/jss4BYVaRohTDS1CjIRx6iOn4mKjcaDzVxNeGGp7zhq1Yjxrf3/4VST J30XnN11a/GsaBqZGjnnIkIq1fNbI5TTnD+wIP9Wpazqr8hWgM4AVddigxdDNYhfx81K EoUthbjyJEoiEIpwntbEsSXwok/tOvH+NnOpoGOpmQj2MfAVFMJeesoA8OIERtJZuEMX jZSfeOA18mbDoFqTDnNrwGRj3e7k+YEp2XqVMuH5s2h9eIG8s8+6fVGsk+/kIqOINan3 vvkD8PgXEgu7jkXeqyo6QhmWAF/bhXbmbOR3HoHHn0Vkv6OdYHbwSlXVSn/BQiwgApCd 6wLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735201720; x=1735806520; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=dSh3O5WaaKwNo1iaUvTSpo+z9u0dQr4Ul55JCilzC1E=; b=mm2ITUgF2bP7tbMZqB4HY6MRcO6ckZLgI6PTH76j5ZGjbKv7Xoo13+MkQXIwEOVZXc i8Q+Q7jV8jIWU/GRNNYXEbCd9+X2GmkhzWOCOIkq+FTxo8zvaZmN7eGVUgo6zSmGub0X NfXIfXFbI9TQybf5XAPV6eaPx9ydNZPCJ+aMn32d97pboP8ZkfWCm+kaCjiIaLl80YI8 asUNFA/HtZ6Xtu6mbzkVC7aqlz4i2lC6c3SGNAX7k3AFjFCnnHxyXa6KmQaQ6W7DhC9B WGy9vnqgLX2XIdFQrvYrg1zIyr2yDFzP3IUU2oSyR440BnErstLp5ASanjsGYf0nlPVL q+Qg== X-Forwarded-Encrypted: i=1; AJvYcCUcCBQWBBGFCT6ddTG1g34vWmvCh+LTYvjWLxN2IfujJz04+5rx6ltO+TSCW2kx/8E+m+I2l50oJMre@nongnu.org X-Gm-Message-State: AOJu0YzMZkFTyqprsOatii3jsOh1jyXFRuHU/DTbmoZTxPoQudyNCzyW RTlowD5iGiPheCUy3eXHkWFcDjoVA2+jJPhc+Az+PFoAYfcIEEPP86gSYpHDGeGPlBZZNDHj775 whyrFJ+QZwA== X-Google-Smtp-Source: AGHT+IGY6mIalT7T0WEgnWg5x1oPmyOhTr/N+z/j3ZrDV5dn/nuVsSxbd4L1QnagybxWz4seL8Q2YN88wnP03g== X-Received: from pgcs71.prod.google.com ([2002:a63:774a:0:b0:7ff:d6:4f07]) (user=wuhaotsh job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:4986:b0:1e1:b1bb:87a0 with SMTP id adf61e73a8af0-1e606dfe60fmr18479549637.34.1735201720267; Thu, 26 Dec 2024 00:28:40 -0800 (PST) Date: Thu, 26 Dec 2024 08:27:53 +0000 In-Reply-To: <20241226082800.2887689-1-wuhaotsh@google.com> Mime-Version: 1.0 References: <20241226082800.2887689-1-wuhaotsh@google.com> X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog Message-ID: <20241226082800.2887689-11-wuhaotsh@google.com> Subject: [PATCH v2 10/17] hw/misc: Support 8-bytes memop in NPCM GCR module From: Hao Wu To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, Avi.Fishman@nuvoton.com, kfting@nuvoton.com, titusr@google.com, mimik-dev@google.com, hskinnemoen@google.com, venture@google.com, pbonzini@redhat.com, jasowang@redhat.com, alistair@alistair23.me, Hao Wu Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=2607:f8b0:4864:20::64a; envelope-from=3uBNtZwgKCtUNL81FKJ87FF7C5.3FDH5DL-45M5CEFE7EL.FI7@flex--wuhaotsh.bounces.google.com; helo=mail-pl1-x64a.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@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-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @google.com) X-ZM-MESSAGEID: 1735201785836116600 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The NPCM8xx GCR device can be accessed with 64-bit memory operations. This patch supports that. Signed-off-by: Hao Wu Reviewed-by: Peter Maydell --- hw/misc/npcm_gcr.c | 94 +++++++++++++++++++++++++++++++++----------- hw/misc/trace-events | 4 +- 2 files changed, 74 insertions(+), 24 deletions(-) diff --git a/hw/misc/npcm_gcr.c b/hw/misc/npcm_gcr.c index a4c9643119..7dfdd3d74b 100644 --- a/hw/misc/npcm_gcr.c +++ b/hw/misc/npcm_gcr.c @@ -201,6 +201,7 @@ static uint64_t npcm_gcr_read(void *opaque, hwaddr offs= et, unsigned size) uint32_t reg =3D offset / sizeof(uint32_t); NPCMGCRState *s =3D opaque; NPCMGCRClass *c =3D NPCM_GCR_GET_CLASS(s); + uint64_t value; =20 if (reg >=3D c->nr_regs) { qemu_log_mask(LOG_GUEST_ERROR, @@ -209,9 +210,21 @@ static uint64_t npcm_gcr_read(void *opaque, hwaddr off= set, unsigned size) return 0; } =20 - trace_npcm_gcr_read(offset, s->regs[reg]); + switch (size) { + case 4: + value =3D s->regs[reg]; + break; + + case 8: + value =3D s->regs[reg] + (((uint64_t)s->regs[reg + 1]) << 32); + break; + + default: + g_assert_not_reached(); + } =20 - return s->regs[reg]; + trace_npcm_gcr_read(offset, value); + return value; } =20 static void npcm_gcr_write(void *opaque, hwaddr offset, @@ -231,29 +244,65 @@ static void npcm_gcr_write(void *opaque, hwaddr offse= t, return; } =20 - switch (reg) { - case NPCM7XX_GCR_PDID: - case NPCM7XX_GCR_PWRON: - case NPCM7XX_GCR_INTSR: - qemu_log_mask(LOG_GUEST_ERROR, - "%s: register @ 0x%04" HWADDR_PRIx " is read-only\n", - __func__, offset); - return; - - case NPCM7XX_GCR_RESSR: - case NPCM7XX_GCR_CP2BST: - /* Write 1 to clear */ - value =3D s->regs[reg] & ~value; + switch (size) { + case 4: + switch (reg) { + case NPCM7XX_GCR_PDID: + case NPCM7XX_GCR_PWRON: + case NPCM7XX_GCR_INTSR: + qemu_log_mask(LOG_GUEST_ERROR, + "%s: register @ 0x%04" HWADDR_PRIx " is read-onl= y\n", + __func__, offset); + return; + + case NPCM7XX_GCR_RESSR: + case NPCM7XX_GCR_CP2BST: + /* Write 1 to clear */ + value =3D s->regs[reg] & ~value; + break; + + case NPCM7XX_GCR_RLOCKR1: + case NPCM7XX_GCR_MDLR: + /* Write 1 to set */ + value |=3D s->regs[reg]; + break; + }; + s->regs[reg] =3D value; break; =20 - case NPCM7XX_GCR_RLOCKR1: - case NPCM7XX_GCR_MDLR: - /* Write 1 to set */ - value |=3D s->regs[reg]; + case 8: + s->regs[reg] =3D value; + s->regs[reg + 1] =3D v >> 32; break; - }; =20 - s->regs[reg] =3D value; + default: + g_assert_not_reached(); + } +} + +static bool npcm_gcr_check_mem_op(void *opaque, hwaddr offset, + unsigned size, bool is_write, + MemTxAttrs attrs) +{ + NPCMGCRClass *c =3D NPCM_GCR_GET_CLASS(opaque); + + if (offset >=3D c->nr_regs * sizeof(uint32_t)) { + return false; + } + + switch (size) { + case 4: + return true; + case 8: + if (offset >=3D NPCM8XX_GCR_SCRPAD_00 * sizeof(uint32_t) && + offset < (NPCM8XX_GCR_NR_REGS - 1) * sizeof(uint32_t)) { + return true; + } else { + return false; + } + default: + return false; + } } =20 static const struct MemoryRegionOps npcm_gcr_ops =3D { @@ -262,7 +311,8 @@ static const struct MemoryRegionOps npcm_gcr_ops =3D { .endianness =3D DEVICE_LITTLE_ENDIAN, .valid =3D { .min_access_size =3D 4, - .max_access_size =3D 4, + .max_access_size =3D 8, + .accepts =3D npcm_gcr_check_mem_op, .unaligned =3D false, }, }; diff --git a/hw/misc/trace-events b/hw/misc/trace-events index f2d498e862..59c2d4ecc0 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -135,8 +135,8 @@ npcm7xx_clk_read(uint64_t offset, uint32_t value) " off= set: 0x%04" PRIx64 " valu npcm7xx_clk_write(uint64_t offset, uint32_t value) "offset: 0x%04" PRIx64 = " value: 0x%08" PRIx32 =20 # npcm_gcr.c -npcm_gcr_read(uint64_t offset, uint32_t value) " offset: 0x%04" PRIx64 " v= alue: 0x%08" PRIx32 -npcm_gcr_write(uint64_t offset, uint32_t value) "offset: 0x%04" PRIx64 " v= alue: 0x%08" PRIx32 +npcm_gcr_read(uint64_t offset, uint64_t value) " offset: 0x%04" PRIx64 " v= alue: 0x%08" PRIx64 +npcm_gcr_write(uint64_t offset, uint64_t value) "offset: 0x%04" PRIx64 " v= alue: 0x%08" PRIx64 =20 # npcm7xx_mft.c npcm7xx_mft_read(const char *name, uint64_t offset, uint16_t value) "%s: o= ffset: 0x%04" PRIx64 " value: 0x%04" PRIx16 --=20 2.47.1.613.gc27f4b7a9f-goog