From nobody Sun Sep 28 16:34:24 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=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1758638256; cv=none; d=zohomail.com; s=zohoarc; b=G6kgLNT7X6hIkbl1R2pIP3YnoAs4Lvrkhx7M6/Ijty1kgHzdR1tqF9QUUjewmJqt+i6XpqNAS3TjLrXvo/EZx0+NbQOXB68p0Egmvc3910Ho+EkqunrsKmlblrLY3oCWLm9xtJfbPAurrHFWOPBGvYwMwkHawBe4Z4+5bFY4X+I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758638256; 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=Bqnc6W/DpaQylOqC/KmZaaK7aTdnGCYidopG+v63cPU=; b=TdJbfG9D+2GBNkMVpBMKv07W/qjoXQM+DFAakKB986NMiyZJhpcusYoHdTO2b6RHRktlxVjXKCb51lj0GhERmCX/coB/rdqhXUQeKIkRlPYA8MVYahURCrVq4x7We1iwSNpoGwyvvCv3kJz5B8ehUxX/eBA3OyYGex12pJktR0w= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1758638256520254.90448878428958; Tue, 23 Sep 2025 07:37:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v148J-00038b-Al; Tue, 23 Sep 2025 10:36:43 -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 1v148F-00037Z-4W for qemu-devel@nongnu.org; Tue, 23 Sep 2025 10:36:39 -0400 Received: from sea.source.kernel.org ([172.234.252.31]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v148C-0002r1-Uq for qemu-devel@nongnu.org; Tue, 23 Sep 2025 10:36:38 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 3F007433AF; Tue, 23 Sep 2025 14:36:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28360C113D0; Tue, 23 Sep 2025 14:36:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758638194; bh=HjFoetad7pVh56arqUjyTqmHVD2kvUjNM6Qt9XVUY6o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q7MpH9CfdeeR9O4RaZXlMviBorSf2k6lIiar8rOr51qPzINu4JjwTvPWzdc/oH4U2 5FiFiS7lm8XW65Ur6p2iAJr3++a2BZAZh+l7Ji2QHg7i1vYtMGCaqUBZ4Kq4AMoY+f eR0qTsfNWV9XEvGtdsY6JpO/lJ7C1SxXNoLTWyySb3oOMBIUCxMo08NzHWyBSXl6DW tETJaBha3sRBEFpWZOeR79Gdd/fQEbSCE8c0LSm3eHrur92ElYoKyh62aaOoRQ85FP 3EybSXOPP0MRH/4yQiYEJs2sORbeIPrPnsMcn3Pf8sMzng2nJKuy0q3KQgyqdUK7GL Z2mM8eTqjEVZQ== From: Huacai Chen To: Bibo Mao , Song Gao Cc: Jiaxun Yang , WANG Xuerui , qemu-devel@nongnu.org, Huacai Chen , Nathan Chancellor , WANG Rui Subject: [PATCH 2/3] hw/loongarch/virt: Align VIRT_GED_CPUHP_ADDR to 4 bytes Date: Tue, 23 Sep 2025 22:35:41 +0800 Message-ID: <20250923143542.2391576-3-chenhuacai@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250923143542.2391576-1-chenhuacai@kernel.org> References: <20250923143542.2391576-1-chenhuacai@kernel.org> 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=172.234.252.31; envelope-from=chenhuacai@kernel.org; helo=sea.source.kernel.org X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.442, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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 @kernel.org) X-ZM-MESSAGEID: 1758638259037116600 Content-Type: text/plain; charset="utf-8" From: Huacai Chen Now VIRT_GED_CPUHP_ADDR is not aligned to 4 bytes, but if Linux kernel is built with ACPI_MISALIGNMENT_NOT_SUPPORTED, it assumes the alignment, otherwise we get ACPI errors at boot phase: ACPI Error: AE_AML_ALIGNMENT, Returned by Handler for [SystemMemory] (20250= 404/evregion-301) ACPI Error: Aborting method \_SB.CPUS.CSTA due to previous error (AE_AML_AL= IGNMENT) (20250404/psparse-529) ACPI Error: Aborting method \_SB.CPUS.C000._STA due to previous error (AE_A= ML_ALIGNMENT) (20250404/psparse-529) ACPI Error: Method execution failed \_SB.CPUS.C000._STA due to previous err= or (AE_AML_ALIGNMENT) (20250404/uteval-68) VIRT_GED_MEM_ADDR and VIRT_GED_REG_ADDR are already aligned now, but use QEMU_ALIGN_UP() to explicitly align them can make code more robust. Reported-by: Nathan Chancellor Suggested-by: WANG Rui Signed-off-by: Huacai Chen Reviewed-by: Bibo Mao --- include/hw/loongarch/virt.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/hw/loongarch/virt.h b/include/hw/loongarch/virt.h index 602feab0f0..be4f5d603f 100644 --- a/include/hw/loongarch/virt.h +++ b/include/hw/loongarch/virt.h @@ -28,9 +28,9 @@ #define VIRT_LOWMEM_SIZE 0x10000000 #define VIRT_HIGHMEM_BASE 0x80000000 #define VIRT_GED_EVT_ADDR 0x100e0000 -#define VIRT_GED_MEM_ADDR (VIRT_GED_EVT_ADDR + ACPI_GED_EVT_SEL_LEN) -#define VIRT_GED_REG_ADDR (VIRT_GED_MEM_ADDR + MEMORY_HOTPLUG_IO_LEN) -#define VIRT_GED_CPUHP_ADDR (VIRT_GED_REG_ADDR + ACPI_GED_REG_COUNT) +#define VIRT_GED_MEM_ADDR QEMU_ALIGN_UP(VIRT_GED_EVT_ADDR + ACPI_GED= _EVT_SEL_LEN, 4) +#define VIRT_GED_REG_ADDR QEMU_ALIGN_UP(VIRT_GED_MEM_ADDR + MEMORY_H= OTPLUG_IO_LEN, 4) +#define VIRT_GED_CPUHP_ADDR QEMU_ALIGN_UP(VIRT_GED_REG_ADDR + ACPI_GED= _REG_COUNT, 4) =20 #define COMMAND_LINE_SIZE 512 =20 --=20 2.47.3