From nobody Mon May 4 10:28:20 2026 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1751627957; cv=none; d=zohomail.com; s=zohoarc; b=KYq/N9MSB+lCPe3Fx0PorS2ZDGwGoLNTqOG24CrKPlwIDeUa7wachzL06HkeqxdZPey2SlC0I04tCsxJ4L3/8i87SbCKmyxiSh+1JfiZoMmeCu+BvFvGWksAK495NZqGuZbB9N13XiMd7oWqHN4SRgy+4Xt+LZ9Y+S/DPleo0rM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751627957; h=Content-Transfer-Encoding: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=co3a1xRLGQ7HekYeYvHj3VeR9v5FYdh85Xw624+7+Pg=; b=EZB18Q9J/0JboilESlPyo17DiQhAyqRP19hIQWDWzEB2YoAuWvqT+aQMqVypvhKfnvCCFUr0HZYu/3HjUZbD1GFRF4hoc5+GsXnRORixKD5T23lP7ED2DRxqQhqrxJLLbm6zSXg8yakG4rEBlzJrYetQxVCAb6FbYFoZx/+m2xU= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751627957643404.6320870083174; Fri, 4 Jul 2025 04:19:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXeNN-0005n3-Db; Fri, 04 Jul 2025 07:14:41 -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 1uXeMY-0002zo-7a for qemu-devel@nongnu.org; Fri, 04 Jul 2025 07:13:50 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uXeMV-00041o-Bs for qemu-devel@nongnu.org; Fri, 04 Jul 2025 07:13:49 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-234bfe37cccso9928725ad.0 for ; Fri, 04 Jul 2025 04:13:46 -0700 (PDT) Received: from toolbx.alistair23.me (2403-580b-97e8-0-82ce-f179-8a79-69f4.ip6.aussiebb.net. [2403:580b:97e8:0:82ce:f179:8a79:69f4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-23c8431a206sm18002655ad.28.2025.07.04.04.13.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Jul 2025 04:13:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751627625; x=1752232425; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=co3a1xRLGQ7HekYeYvHj3VeR9v5FYdh85Xw624+7+Pg=; b=iIdAvUm/N1HgAZf4RbyAnaykzZ0P7YVYxgNzdhoNiyYZAQEjRkwAT3jDND+jmJ7FVk OoVWgdOo2Ase+jIixPnJjrLN7PUGKxEzVE7VO8wdlJ+PmBcQX+q6MUBBQKEic3uqatf2 ddJAdzKpFVTwAfbItbQSnIfaqgpkLuOi/Qu87NTdFoQQpH3qztSKLCcZRayFsujJhmrT jF65YJ5eK2kPAyiFOePRGmghE6HWQZQlvvWWFahGNmlw4J/xdI1cJKC1kY8bA7YbQ2e4 LevzMvD//9bXNzmP70eGnxr0ataYcS8WzaHRzmhe6nZKVFjj3LmqDV9x17g9S8sMdgf3 M0lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751627625; x=1752232425; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=co3a1xRLGQ7HekYeYvHj3VeR9v5FYdh85Xw624+7+Pg=; b=u/zZLdXlouZCi3jg1pFgQTFLx0QpFgJiMZHKHU11rY+VSXK+Wv+igEk7ULTV5VfGio nfuUr2uPSQ9BwBQFs6hBQJWWZOP/xHmpEUCNpC5JkPGrHDAYySRb/9Jas7vtZ+DMV0Ar jNIWOgP00y2u/3tr9FgpuV470zKSZXGSrgNxbtruiuXGd2gYao6oznjYwuwBMiyrr5xK i8VmUCFNQQ0XAAP37SimsOVHuOLYxPHig5ElKdMlhIYqfbnKk/+rlF38vEVzpi+/+Abz hONW7a10rZ7MSFv7UvskR4/ulNyInZ7JfG0ww3WDa8pFUf4S6FoMU1LsHcV3ArXWFyZl dD7A== X-Gm-Message-State: AOJu0Yz4yRV52/Zx17slzOmsn1VAshhMitXbHrdGboHbDMXVTtvY7ti6 SPwydDmAWDt7sj5Aai+7V41jmXeqt8V4x+Lpg248cG4QgPb5HY7Dr8E+CRSyYQ== X-Gm-Gg: ASbGncuMn85sBlA01tb+7TbFwSltj+XaY/7PsORoKR99RQwimAFuKzBjGGcYAisFULk zYZJ+ihH0AdqAyIyvQaIsjE+OANeALq2R5VJuKeSURGz0xAI81fjna7Mkoc4OuzzI7XE56Kbdjq 58RAaHdqJj6YOJLCW+1hYzOqIG0TWWTAtstnqTZEAs03IOdOIVQzXWy/4vaYgDWHQZfxzOj4MEX RWX/BVHmp08yQUrvEhgt9pfMaHuzyjaeZkz3yUhS3pM8coTW4Mn5E53zhXVUwtvbm2KIv+rqfLx TkCcqagiIMeq732DQX595L1Nn11I3I/ahszixYGBU5RO9HhMImn5TgsWuIw0z90x9GIXaIB15z5 hWztSQdQYFz5zRw7y5Qc9JS5JjuW0V6cVMRJTnWkO+r0ebjk/r5Yn4rLwYrGpxTVOmdOrokQp+Y FrXA== X-Google-Smtp-Source: AGHT+IGtYM3X27SrgmcT+Cvmu6/3Q/XCKptPGqGjDSd3TTCOdIUg618BSWRQNe7uPlUMrRMM349jIw== X-Received: by 2002:a17:902:ccd0:b0:237:ec18:eab9 with SMTP id d9443c01a7336-23c8611e444mr32551995ad.32.1751627624881; Fri, 04 Jul 2025 04:13:44 -0700 (PDT) From: alistair23@gmail.com X-Google-Original-From: alistair.francis@wdc.com To: qemu-devel@nongnu.org Cc: alistair23@gmail.com, Joel Stanley , Daniel Henrique Barboza , Alistair Francis Subject: [PULL 25/40] hw/riscv/virt: Use setprop_sized_cells for aclint Date: Fri, 4 Jul 2025 21:11:52 +1000 Message-ID: <20250704111207.591994-26-alistair.francis@wdc.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250704111207.591994-1-alistair.francis@wdc.com> References: <20250704111207.591994-1-alistair.francis@wdc.com> 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::635; envelope-from=alistair23@gmail.com; helo=mail-pl1-x635.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, 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-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 @gmail.com) X-ZM-MESSAGEID: 1751627959452116600 Content-Type: text/plain; charset="utf-8" From: Joel Stanley The current device tree property uses two cells for the address (and for the size), but assumes the they are less than 32 bits by hard coding the high cell to zero. Use qemu_fdt_setprop_sized_cells to do the job of splitting the upper and lower 32 bits across cells. Reviewed-by: Daniel Henrique Barboza Reviewed-by: Alistair Francis Signed-off-by: Joel Stanley Message-ID: <20250604025450.85327-6-joel@jms.id.au> Signed-off-by: Alistair Francis --- hw/riscv/virt.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 205fa6e44f..4fd966a342 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -387,8 +387,8 @@ static void create_fdt_socket_aclint(RISCVVirtState *s, qemu_fdt_add_subnode(ms->fdt, name); qemu_fdt_setprop_string(ms->fdt, name, "compatible", "riscv,aclint-mswi"); - qemu_fdt_setprop_cells(ms->fdt, name, "reg", - 0x0, addr, 0x0, RISCV_ACLINT_SWI_SIZE); + qemu_fdt_setprop_sized_cells(ms->fdt, name, "reg", + 2, addr, 2, RISCV_ACLINT_SWI_SIZE); qemu_fdt_setprop(ms->fdt, name, "interrupts-extended", aclint_mswi_cells, aclint_cells_size); qemu_fdt_setprop(ms->fdt, name, "interrupt-controller", NULL, 0); @@ -410,11 +410,11 @@ static void create_fdt_socket_aclint(RISCVVirtState *= s, qemu_fdt_add_subnode(ms->fdt, name); qemu_fdt_setprop_string(ms->fdt, name, "compatible", "riscv,aclint-mtimer"); - qemu_fdt_setprop_cells(ms->fdt, name, "reg", - 0x0, addr + RISCV_ACLINT_DEFAULT_MTIME, - 0x0, size - RISCV_ACLINT_DEFAULT_MTIME, - 0x0, addr + RISCV_ACLINT_DEFAULT_MTIMECMP, - 0x0, RISCV_ACLINT_DEFAULT_MTIME); + qemu_fdt_setprop_sized_cells(ms->fdt, name, "reg", + 2, addr + RISCV_ACLINT_DEFAULT_MTIME, + 2, size - RISCV_ACLINT_DEFAULT_MTIME, + 2, addr + RISCV_ACLINT_DEFAULT_MTIMECMP, + 2, RISCV_ACLINT_DEFAULT_MTIME); qemu_fdt_setprop(ms->fdt, name, "interrupts-extended", aclint_mtimer_cells, aclint_cells_size); riscv_socket_fdt_write_id(ms, name, socket); @@ -428,8 +428,8 @@ static void create_fdt_socket_aclint(RISCVVirtState *s, qemu_fdt_add_subnode(ms->fdt, name); qemu_fdt_setprop_string(ms->fdt, name, "compatible", "riscv,aclint-sswi"); - qemu_fdt_setprop_cells(ms->fdt, name, "reg", - 0x0, addr, 0x0, s->memmap[VIRT_ACLINT_SSWI].size); + qemu_fdt_setprop_sized_cells(ms->fdt, name, "reg", + 2, addr, 2, s->memmap[VIRT_ACLINT_SSWI].size); qemu_fdt_setprop(ms->fdt, name, "interrupts-extended", aclint_sswi_cells, aclint_cells_size); qemu_fdt_setprop(ms->fdt, name, "interrupt-controller", NULL, 0); --=20 2.50.0