From patchwork Wed Mar 12 21:26:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 14013935 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B4A54C28B28 for ; Wed, 12 Mar 2025 21:27:21 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tsTaw-0003Jl-Eo; Wed, 12 Mar 2025 17:26:30 -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 1tsTau-0003Ig-DX; Wed, 12 Mar 2025 17:26:28 -0400 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tsTas-0002in-BX; Wed, 12 Mar 2025 17:26:28 -0400 Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-5e5491eb379so343760a12.3; Wed, 12 Mar 2025 14:26:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741814783; x=1742419583; 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=uOqb8zOa9Um9cZYXPSgdJyu+uX2T6VsrvFJJEhBaw1g=; b=FtQnlDpGOXahqRRHbLQDY1MtTy9BtTDWwsMP3M3S2p4U3fIOd1Gpt3ez+UbDE9PEyX nTTEtb41uC9+0EDs83eMzLwpj2Pt322QhrvPl+Wz0XcC3kRA4lAvY68iiHLdf+1m4w0r riIBG2oekHvAONoq+gKwTRrrQcwJsp2l4q8iXfHYh1O0oDTvxVc/Omf9rsO4lLu1S2k1 dh94RXxJHWr9BWatXd3VUeyUwZHubd6wv4hL99fYsmystEL5nw9EjM6FFcHEORVuyeum cFQCvXqq7B41APW+i6teD+1awL21BvzZTzv49zhUmU0OIYHUbj33QdiTc9ymSFJ4I7J0 QKgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741814783; x=1742419583; 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=uOqb8zOa9Um9cZYXPSgdJyu+uX2T6VsrvFJJEhBaw1g=; b=g0K3ow806lgBs3Vf33+n96orC+PHLZcoOgKR7IR1vmdBwdLd5tlfTF1Z5nYy7d5YP8 uODGFm9I1pFmYRGft8qD9Cag151Ke0+j2TJ7imBD2u3MNxy4DuWgYdtbzKkcB2DqAJzW P1ppd/Oldd25AsKT22d5E9X4OnIVeyPkwt+1cjR5Z+lQhy5IJfo90FU55RegulxB4BmH UjMtqtTr9AU5KAXKT8ggBfw2dOm9xLv/gW2RZSil0Se0yjYBE1rj386zLfxyWio8g2S4 bcfEI3jfSfzyrsuXTi3N9P/5Kk5TgKGfcxCFD0hMBLKxw2wfkyPZhv527sJGWKf7j4JH V1BA== X-Forwarded-Encrypted: i=1; AJvYcCWi0eqY2jN5ALgPhyT5F2y0XG/qoHvN8VpK2wLPycFr2V88YPaMr9hie+pPh/EIQMmNci7OZvdGzQ==@nongnu.org X-Gm-Message-State: AOJu0YxGr7jDq4Ut1bhNOjECboS8DP7TlNzQMvo9H83BBkzMTfQh73r1 ho1yw+s9xXLOt13pQPWSbD77HN9nm7K+dOEENzgF1YtnLqFeBxmMkIr7LQ== X-Gm-Gg: ASbGncu0+fQwGumtKum4aEc06BpTOmf5Uzn6c9Ov5X3MP3NEwnGUGv4IzgLNim9EBY7 r5av0jjnc2F1prGciuvFXqwLLiGGMJHPfNcteTQbkPrUpjlUCC9mRfhTUsF/hvB8MN53182z06a fTccb2Kjp8+P35XY/tTpAfLX7F+T6LIwfj2pHXOpzxt6obG84mAwu/wWtsg1OeWPLbA6j5oYqS9 4e7of9b1u/btJh7+AIDkMho/xF5rMoomvSSwfGd64G9PbIgZuUVLETgBFNVRP/3EaUcxLa08U+K buvdtGkLImyEU2a7HhZg8JOKDRHThQ8D3mGZBBfIJW18eecOeFd6P7DzsX0abEt+TKw7N+q8YbC 3IQe4XL9td2ivobNDpjsTscuNx1izZqCDe8Kke/P1652e4/UnDHHUuq3rN89KpnqsQAd8cujzeH c= X-Google-Smtp-Source: AGHT+IGs+lxFlAVifnegSIRF9JDlXJR1jgLpo0o3OqQKAtIuyhC1SMqNqDQ0ji2tJ8Qry6XqaDpWUg== X-Received: by 2002:a05:6402:2750:b0:5e4:d229:ad3d with SMTP id 4fb4d7f45d1cf-5e5e2319e1dmr33991556a12.16.1741814782890; Wed, 12 Mar 2025 14:26:22 -0700 (PDT) Received: from Provence.localdomain (dynamic-2a02-3100-2c4e-b100-0219-99ff-feb2-2458.310.pool.telefonica.de. [2a02:3100:2c4e:b100:219:99ff:feb2:2458]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e5c768d1d8sm10024540a12.67.2025.03.12.14.26.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Mar 2025 14:26:22 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Bernhard Beschow , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Peter Maydell , qemu-arm@nongnu.org, Thomas Huth Subject: [PATCH 1/2] hw/arm/fsl-imx8mp: Make SoC not user-creatable, derive from TYPE_SYS_BUS_DEVICE Date: Wed, 12 Mar 2025 22:26:09 +0100 Message-ID: <20250312212611.51667-2-shentey@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250312212611.51667-1-shentey@gmail.com> References: <20250312212611.51667-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52d; envelope-from=shentey@gmail.com; helo=mail-ed1-x52d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Fixes a crash when creating the SoC object on the command line: $ ./qemu-system-aarch64 -M virt -device fsl-imx8mp ** ERROR:../../devel/qemu/tcg/tcg.c:1006:tcg_register_thread: assertion failed: (n < tcg_max_ctxs) Bail out! ERROR:../../devel/qemu/tcg/tcg.c:1006:tcg_register_thread: assertion failed: (n < tcg_max_ctxs) Aborted (core dumped) Furthermore, the SoC object should be derived from TYPE_SYS_BUS_DEVICE such that it gets properly reset. Fixes: a4eefc69b237 "hw/arm: Add i.MX 8M Plus EVK board" Reported-by: Thomas Huth Suggested-by: Peter Maydell Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé --- include/hw/arm/fsl-imx8mp.h | 3 ++- hw/arm/fsl-imx8mp.c | 4 +++- hw/arm/imx8mp-evk.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/hw/arm/fsl-imx8mp.h b/include/hw/arm/fsl-imx8mp.h index bc97fc416e..22fdc0d67c 100644 --- a/include/hw/arm/fsl-imx8mp.h +++ b/include/hw/arm/fsl-imx8mp.h @@ -26,6 +26,7 @@ #include "hw/timer/imx_gpt.h" #include "hw/usb/hcd-dwc3.h" #include "hw/watchdog/wdt_imx2.h" +#include "hw/sysbus.h" #include "qom/object.h" #include "qemu/units.h" @@ -49,7 +50,7 @@ enum FslImx8mpConfiguration { }; struct FslImx8mpState { - DeviceState parent_obj; + SysBusDevice parent_obj; ARMCPU cpu[FSL_IMX8MP_NUM_CPUS]; GICv3State gic; diff --git a/hw/arm/fsl-imx8mp.c b/hw/arm/fsl-imx8mp.c index 1ea98e1463..9133d49383 100644 --- a/hw/arm/fsl-imx8mp.c +++ b/hw/arm/fsl-imx8mp.c @@ -698,13 +698,15 @@ static void fsl_imx8mp_class_init(ObjectClass *oc, void *data) device_class_set_props(dc, fsl_imx8mp_properties); dc->realize = fsl_imx8mp_realize; + /* Reason: SoC can only be instantiated from a board */ + dc->user_creatable = false; dc->desc = "i.MX 8M Plus SoC"; } static const TypeInfo fsl_imx8mp_types[] = { { .name = TYPE_FSL_IMX8MP, - .parent = TYPE_DEVICE, + .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(FslImx8mpState), .instance_init = fsl_imx8mp_init, .class_init = fsl_imx8mp_class_init, diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c index e1a7892fd7..f17d5db466 100644 --- a/hw/arm/imx8mp-evk.c +++ b/hw/arm/imx8mp-evk.c @@ -37,7 +37,7 @@ static void imx8mp_evk_init(MachineState *machine) s = FSL_IMX8MP(object_new(TYPE_FSL_IMX8MP)); object_property_add_child(OBJECT(machine), "soc", OBJECT(s)); object_property_set_uint(OBJECT(s), "fec1-phy-num", 1, &error_fatal); - qdev_realize(DEVICE(s), NULL, &error_fatal); + sysbus_realize_and_unref(SYS_BUS_DEVICE(s), &error_fatal); memory_region_add_subregion(get_system_memory(), FSL_IMX8MP_RAM_START, machine->ram); From patchwork Wed Mar 12 21:26:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 14013936 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 89D40C28B2E for ; Wed, 12 Mar 2025 21:27:37 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tsTaw-0003Jm-Ei; Wed, 12 Mar 2025 17:26:30 -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 1tsTau-0003Ik-G7; Wed, 12 Mar 2025 17:26:28 -0400 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tsTas-0002it-Sb; Wed, 12 Mar 2025 17:26:28 -0400 Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-5e5e8274a74so375765a12.1; Wed, 12 Mar 2025 14:26:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741814784; x=1742419584; 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=KNCTgDXk+dJWFTVjg9W6fCkEY6qDUx+0kEGi7VohCMY=; b=GolfgxS5gm/O2Oi5eDuJp1UVgrHjNg65wrJ/MZ/k1Mkl7iv+Imfe/+FAu+s4JLsraZ DvWJsKIhoxbRE1tUFctqba4XrbOQnKsX9XlH/VTF3qSD2w++HQsYCnJ/zu44EqPaGA4P +z1IwVjyQ6Pdq/LEP8VhvDeqPwT/KDnmH+7ovr75HOFt/2ZElm+Z7P1B/Pcn5RYmGuo+ pJ/Gb+JkZ1yT0SXXKoSuRhY+HBOJlBTRGMcPl6TMZJsFrbODgqfwJHEjWzo5CHtPEUX0 XbfzLyJgov3yw0CKryYMUohAVsdp8D9KYy/uAikpT951x9X2aREAdeG7tfJndKuvXSrN 8ksQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741814784; x=1742419584; 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=KNCTgDXk+dJWFTVjg9W6fCkEY6qDUx+0kEGi7VohCMY=; b=lIUBgGRSIkjvXA7oxM5wtUYf46cBVrcV7b7Vz51811rr/CzZ2OOmJ0kDY6Id0mcfiS FlsnVt5pKFXK/GIxiNF/KtAdCN0bhNccRg71hNcxdCVYz2D86meqeWAdu0i3ZGGaCRo6 SkJ86cbu9rZqBBcUhLQ+Z84droPFpb4vD9KW3AwMTOKIbAGYY+VSqEqkUHtHdwN2Dp97 +SyIF1SxrsqF4ja8b3dL1U6oHEqaZKYhVzsfoCQJFaCTxDVZfpTxjALqMltp6Zm0XPcK Wl+aLR8XxXCxHYLV408bGHGNoZkubgDOgHU3F8egOCXqI+hKpA7RKZXqZRqhn+vxJE1b oGZQ== X-Forwarded-Encrypted: i=1; AJvYcCXX3Cy7VtqMNdbBGtuT6bOAX4m4pqGDRmiF07sDX6bD+FrDEd5C026GXyLZQ8u2ncqPItBeYDBS5g==@nongnu.org X-Gm-Message-State: AOJu0YyAja6j0u/1rx7gzM+qKxn/Kk9z5FF9nbbS/nZ2Ayfx+UOphkSx CguvTWshoT/uNroa1LZVsuWu9qjqi+PINqHnYOS6CLE8sGYV9w+SbF7XIA== X-Gm-Gg: ASbGncu4oXvYQ6hxfttsjKW8mch9NrHcmDjZGYR3nnUjcwIC+3iHq+SBKjcYbBrJZG1 51mkvPgnZBKKF0/YBpMv0LoRSusYB7sGGRxh+Ew2fiaLv+LnJvwPpV5aPZrZwL9siZS5SOrFUy4 AAcfrmnr4XsoNA2CIAHZVE9hwR1JMQP7G31nw1fe+q/KlG/8xVi6I7FG7wLbAzHfk5YFHfMybeh gvyCH+2rr81mXtlqJSpRRKurwrvhREOnEB1HrPz/dB+6A0J3wll1bkB78cBd4dtEQvuY8tOAPxM eyYoyYwsJK5Kgt46ThS3xPbYznEjJDSx77Km5o9bp6YiNdgVSHYGxKRdF6lZmcNTDOs9RhN2KwP u5vAEBjmUI+81mN8wZ+2ErL30ZeYpVahKrl9aWCGWsaZLt2MZ3e/gYsfrAsnGQBfbILpCNCezCQ E= X-Google-Smtp-Source: AGHT+IELGoNLGtxSVUxKpEDErC+T2OnkCet784L2r2tceUDzxffQBg5m5jEBJCYbXUHJpTSWbnkhrQ== X-Received: by 2002:a05:6402:5201:b0:5df:6a:54ea with SMTP id 4fb4d7f45d1cf-5e5e22b92e8mr54442141a12.11.1741814783845; Wed, 12 Mar 2025 14:26:23 -0700 (PDT) Received: from Provence.localdomain (dynamic-2a02-3100-2c4e-b100-0219-99ff-feb2-2458.310.pool.telefonica.de. [2a02:3100:2c4e:b100:219:99ff:feb2:2458]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5e5c768d1d8sm10024540a12.67.2025.03.12.14.26.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Mar 2025 14:26:23 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Bernhard Beschow , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Peter Maydell , qemu-arm@nongnu.org, Thomas Huth Subject: [PATCH 2/2] hw/arm/fsl-imx8mp: Remove unused define Date: Wed, 12 Mar 2025 22:26:10 +0100 Message-ID: <20250312212611.51667-3-shentey@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250312212611.51667-1-shentey@gmail.com> References: <20250312212611.51667-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=shentey@gmail.com; helo=mail-ed1-x52f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The SoC has three SPI controllers, not four. Remove the extra define of an SPI IRQ. Fixes: 06908a84f036 "hw/arm/fsl-imx8mp: Add SPI controllers" Signed-off-by: Bernhard Beschow --- include/hw/arm/fsl-imx8mp.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/hw/arm/fsl-imx8mp.h b/include/hw/arm/fsl-imx8mp.h index 22fdc0d67c..d016f7d337 100644 --- a/include/hw/arm/fsl-imx8mp.h +++ b/include/hw/arm/fsl-imx8mp.h @@ -238,7 +238,6 @@ enum FslImx8mpIrqs { FSL_IMX8MP_ECSPI1_IRQ = 31, FSL_IMX8MP_ECSPI2_IRQ = 32, FSL_IMX8MP_ECSPI3_IRQ = 33, - FSL_IMX8MP_ECSPI4_IRQ = 34, FSL_IMX8MP_I2C1_IRQ = 35, FSL_IMX8MP_I2C2_IRQ = 36,