From nobody Thu May 16 06:59:10 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1672866861; cv=none; d=zohomail.com; s=zohoarc; b=D+8Glg0sutXjweZseRIA2Ihy25iHGc2MaU5bThK4yvf7fvK4Qfjfl/1HLnKktCb/AS09FEm2Rv/Js3FOW2JJ90M5R7Wd2N1ldDEWuMyt2tmXs5Kk95KZA7+nptz0adpExD56YkGBD1okgh4Z0BbIZ9201zrEd4N7Ke1KCZjhghY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672866861; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=jFCiBqiFRd74CyBLDrcmTBlgbMkmwC6NDoQgRZga20k=; b=llUrCrZXhvu1+gm/GEFGaCGzpo+Y/OeSp9sT/fiBP7aSg5jVP0J2SapXNACmfMd2DigURNAFqzrRjN8mIMaVvDbZelQfU4Zvt2817acZ1pMptPcBSga85CD0pE1wCV2pQ1jXLMH7E0uEMFsCnD/5FS++MooqI4kG77BPsXvVktA= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1672866861404966.3145696934466; Wed, 4 Jan 2023 13:14:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pDB53-00038n-Hl; Wed, 04 Jan 2023 16:13:49 -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 ) id 1pD8lf-0002a2-Di for qemu-devel@nongnu.org; Wed, 04 Jan 2023 13:45:43 -0500 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pD8ld-0006k5-Dk for qemu-devel@nongnu.org; Wed, 04 Jan 2023 13:45:39 -0500 Received: by mail-pf1-x429.google.com with SMTP id a184so12717833pfa.9 for ; Wed, 04 Jan 2023 10:45:36 -0800 (PST) Received: from azoghby-Laptop.hq.rivosinc.com ([50.221.140.188]) by smtp.gmail.com with ESMTPSA id h4-20020aa79f44000000b00572c12a1e91sm1550956pfr.48.2023.01.04.10.45.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jan 2023 10:45:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=jFCiBqiFRd74CyBLDrcmTBlgbMkmwC6NDoQgRZga20k=; b=o7QyLBOwsiqkNdU6eBGEsPLRVAUIOVt7GtqYbkjQgmXg1OrumCOPNSSDtn0hTD9+/n TqjSJ6pi4xYG8iVSXC+HVOxqCtokuW5DupUWXIVg3TSkOa2tNru9X5dLEvyEDYNJ1EPI uRKttf7ptoIufqUtf9grdGuPXgaW2KYCyTT9GEPPoGo3/UfmU44R8TNn+Kk5hJot9Y/Z Y79DdHzur0cnjj6ZMQnId/QrVVAQh6wGuZXOMzsiISG0zZYmx41YkL/Knc+H1zySNVwP 4vWw6rcYG6JiZW+GkMT2CSi6OSAo1COYiyDXwmsgtyCdR2TQVELbr25hoaYNt3TZdKdZ e/oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jFCiBqiFRd74CyBLDrcmTBlgbMkmwC6NDoQgRZga20k=; b=vho6HgxdmWLdgpJveNFTZXGikrmpDug71cG3PS8XW3+am4ZIOOidaOwAmHE5spuLv2 xfrXjhXRTDJjgy3QGWWwthH8LbGL0qmqMTo9cSBqaGamRrntSUnw94ugDntoXBSA2Z0w EgSW1tA/GTYAezGE1RwVsUsk/iUK/GYH1Qtbr4st4G0v5pfzT7Rev4WhWcRPDx9s0BuY pWM+eqiy7M2mcbndCl+Z+7AGqkWckRghl8GipD4oUt7BCH5rgz/VPQeeInOMWj/BkWY3 d0HN2B0HGHKKIBAaU3JAJ/7vo4O/8G5xsG+tjpXi4YWZDoLyOMhC8OqqLD8uERnu5jsV xWLg== X-Gm-Message-State: AFqh2krSDzlXgj6lVkDxTgwHMIsbkpf8QmxRgMwHUMH0jykRFwdDahqG mHU0ZCBqES3WytCw4SeuYwcYh6p1KzJXUdo= X-Google-Smtp-Source: AMrXdXsahJ0xQzyK86yCCbVyZT5ilRku1v5Q48Orld6b7vidOFEM66Q78km0Z1yHp79yf2xILeitog== X-Received: by 2002:a05:6a00:a1d:b0:581:73c4:f0bb with SMTP id p29-20020a056a000a1d00b0058173c4f0bbmr37826719pfh.2.1672857934348; Wed, 04 Jan 2023 10:45:34 -0800 (PST) From: Andrew Zoghby To: qemu-devel@nongnu.org Cc: Andrew Zoghby Subject: [PATCH] hw/timer/ibex: fix register addresses Date: Wed, 4 Jan 2023 10:45:15 -0800 Message-Id: <20230104184515.96895-1-azoghby@rivosinc.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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::429; envelope-from=azoghby@rivosinc.com; helo=mail-pf1-x429.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 04 Jan 2023 16:13:47 -0500 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 @rivosinc-com.20210112.gappssmtp.com) X-ZM-MESSAGEID: 1672866863757100001 Content-Type: text/plain; charset="utf-8" Change the register addresses to match https://docs.opentitan.org/hw/ip/rv_timer/doc/#register-table. Signed-off-by: Andrew Zoghby --- hw/timer/ibex_timer.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/hw/timer/ibex_timer.c b/hw/timer/ibex_timer.c index d8b8e4e1f6..a8a23b22d7 100644 --- a/hw/timer/ibex_timer.c +++ b/hw/timer/ibex_timer.c @@ -38,20 +38,19 @@ REG32(ALERT_TEST, 0x00) FIELD(ALERT_TEST, FATAL_FAULT, 0, 1) REG32(CTRL, 0x04) FIELD(CTRL, ACTIVE, 0, 1) -REG32(CFG0, 0x100) - FIELD(CFG0, PRESCALE, 0, 12) - FIELD(CFG0, STEP, 16, 8) -REG32(LOWER0, 0x104) -REG32(UPPER0, 0x108) -REG32(COMPARE_LOWER0, 0x10C) -REG32(COMPARE_UPPER0, 0x110) -REG32(INTR_ENABLE, 0x114) +REG32(INTR_ENABLE, 0x100) FIELD(INTR_ENABLE, IE_0, 0, 1) -REG32(INTR_STATE, 0x118) +REG32(INTR_STATE, 0x104) FIELD(INTR_STATE, IS_0, 0, 1) -REG32(INTR_TEST, 0x11C) +REG32(INTR_TEST, 0x108) FIELD(INTR_TEST, T_0, 0, 1) - +REG32(CFG0, 0x10c) + FIELD(CFG0, PRESCALE, 0, 12) + FIELD(CFG0, STEP, 16, 8) +REG32(LOWER0, 0x110) +REG32(UPPER0, 0x114) +REG32(COMPARE_LOWER0, 0x118) +REG32(COMPARE_UPPER0, 0x11c) static uint64_t cpu_riscv_read_rtc(uint32_t timebase_freq) { return muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL), --=20 2.34.1