From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985140; cv=none; d=zohomail.com; s=zohoarc; b=HfPGEuMDDZg8rfOxf2iayvPJFYhrL9XdinEwjEpxdZjCJM8HC6wct5P1L6Mf450hHqaOV8RkF6WzY6H9JTIwQ1kQlcEpUfgec17zoajk+0DEii7BWWiDedoMBQhV2MmqAQ8unb3ZNcuvoYj3Ospu9SGy/nVryo2LYwrurZAAOhg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985140; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YUILg6m9rwPONLf0mtn/8w2tqdGMLI7ZnZcN+Z+Sb6I=; b=QpCNi5abUFYvCaMJmgumfVf+zlR69t57N4M9p/ARXBDa/oKr608KyB/9LJ0fFnUBg0gjY352tJ5kHorxvoq+7q5mmACjgeymWGPOnk/8rvQiCc3MAtjN09qqfRKeURkTfdoodJ+SeAd2C4VqpBS6+NrFSsKAj8juQRNyzPdC6q0= 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 1681985140698266.3977892111752; Thu, 20 Apr 2023 03:05:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRA9-0000Z4-B8; Thu, 20 Apr 2023 06:05:13 -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 1ppRA1-0000X7-T1 for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:06 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppR9x-0003eD-HC for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:04 -0400 Received: by mail-wm1-x329.google.com with SMTP id m39-20020a05600c3b2700b003f170e75bd3so3207665wms.1 for ; Thu, 20 Apr 2023 03:05:01 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.04.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:04:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985100; x=1684577100; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=YUILg6m9rwPONLf0mtn/8w2tqdGMLI7ZnZcN+Z+Sb6I=; b=mxbetkncdh3JyOzzKyEBEq/dduxyMLOTqBOQ+WaX/982XPhGZFUD//3zSYwpAQOMSU FKUADRiaV3KpWUZhJTj8/EA7rlJrv82/slnad/0E1+ZWrtuvPQ65wRSsKB6RRQOwFnx9 4wOiJZw7CE8x7mkXW7jfdtEmrwFSHWuSIA0EmGYNC7On/ifUNArC8kS6M6cUKQGY9w9l Hdr3TWB2/n8B1inQv14p7t87BjVuw1kT0dUEDRasXAagjhlEc/WYiSAi0Gf7bX/d2hV4 9+Ub01iJCoz4Q8I1VilS+2QAwAWosVBBLeeGtEEDXnHbL/KproMolYCovS47NjMq5qrF GQUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985100; x=1684577100; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YUILg6m9rwPONLf0mtn/8w2tqdGMLI7ZnZcN+Z+Sb6I=; b=BHsh2Ean2lrucoM9rhYDpIFywXX322oK3x7JI/qpJsLcPcD7EEXkv+pXJOKLxLuvZ9 LFmVRPCFkSGN/BWclkw8zQflyOFadfz6POL4j7bzWK+z/zl+t2unhZY8RwbvuWOGInVn tJt8zqwOTBGzy942RrsQdkIiTAHp+Jy2wLwi3VknzKTFdvHzGVIFhCTwE2gxl4lxLGZ6 IPAhY17oS2YK0/SrxP88/Ctgi1bH1/cBzM7KmLieI6irKSVGC32nB9gxVjgsIvUlmsvH UdZdRGAIgil9Jg8ZURRm3pW2ssSz2jC+h/k2fvGMSmlj0XK/JP3fVyKDNfJxOSMelyoI tGjQ== X-Gm-Message-State: AAQBX9e8WyxN9lP3aJDKVur/jvZk4DZsL/E9ndQEZI4Jl+FeH8TXbfsk NAgzAPtE0b6jilb2Lym5OTkiEMoKuvVgnU39fok= X-Google-Smtp-Source: AKy350aSGQGcJ7c695DHmVCCZRSufux/5e2XYM1zFldcHkanCJfN7LrC8neP8cdz9zvjjhLGiRNrUw== X-Received: by 2002:a7b:c4c6:0:b0:3f1:7006:e782 with SMTP id g6-20020a7bc4c6000000b003f17006e782mr801928wmk.25.1681985099959; Thu, 20 Apr 2023 03:04:59 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 01/21] hw/arm: Fix some typos in comments (most found by codespell) Date: Thu, 20 Apr 2023 11:04:36 +0100 Message-Id: <20230420100456.944969-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985142107100003 From: Stefan Weil Signed-off-by: Stefan Weil Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20230409200526.1156456-1-sw@weilnetz.de Signed-off-by: Peter Maydell --- hw/arm/exynos4210.c | 4 ++-- hw/arm/musicpal.c | 2 +- hw/arm/omap1.c | 2 +- hw/arm/omap2.c | 2 +- hw/arm/virt-acpi-build.c | 2 +- hw/arm/virt.c | 2 +- hw/arm/xlnx-versal-virt.c | 2 +- hw/arm/Kconfig | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index 6f2dda13f63..de39fb0ece8 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -326,7 +326,7 @@ static int mapline_size(const int *mapline) =20 /* * Initialize board IRQs. - * These IRQs contain splitted Int/External Combiner and External Gic IRQs. + * These IRQs contain split Int/External Combiner and External Gic IRQs. */ static void exynos4210_init_board_irqs(Exynos4210State *s) { @@ -744,7 +744,7 @@ static void exynos4210_realize(DeviceState *socdev, Err= or **errp) * - SDMA * - ADMA2 * - * As this part of the Exynos4210 is not publically available, + * As this part of the Exynos4210 is not publicly available, * we used the "HS-MMC Controller S3C2416X RISC Microprocessor" * public datasheet which is very similar (implementing * MMC Specification Version 4.0 being the only difference noted) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index c9010b2ffbb..58f3d30c9b1 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -100,7 +100,7 @@ #define MP_LCD_SPI_CMD 0x00104011 #define MP_LCD_SPI_INVALID 0x00000000 =20 -/* Commmands */ +/* Commands */ #define MP_LCD_INST_SETPAGE0 0xB0 /* ... */ #define MP_LCD_INST_SETPAGE7 0xB7 diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c index 559c066ce90..d5438156ee9 100644 --- a/hw/arm/omap1.c +++ b/hw/arm/omap1.c @@ -4057,7 +4057,7 @@ struct omap_mpu_state_s *omap310_mpu_init(MemoryRegio= n *dram, s->led[1] =3D omap_lpg_init(system_memory, 0xfffbd800, omap_findclk(s, "clk32-kHz")); =20 - /* Register mappings not currenlty implemented: + /* Register mappings not currently implemented: * MCSI2 Comm fffb2000 - fffb27ff (not mapped on OMAP310) * MCSI1 Bluetooth fffb2800 - fffb2fff (not mapped on OMAP310) * USB W2FC fffb4000 - fffb47ff diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c index 366d6af1b66..d5a2ae7af6e 100644 --- a/hw/arm/omap2.c +++ b/hw/arm/omap2.c @@ -2523,7 +2523,7 @@ struct omap_mpu_state_s *omap2420_mpu_init(MemoryRegi= on *sdram, omap_findclk(s, "func_96m_clk"), omap_findclk(s, "core_l4_iclk")); =20 - /* All register mappings (includin those not currenlty implemented): + /* All register mappings (including those not currently implemented): * SystemControlMod 48000000 - 48000fff * SystemControlL4 48001000 - 48001fff * 32kHz Timer Mod 48004000 - 48004fff diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 4156111d49f..4af0de8b241 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -694,7 +694,7 @@ static void build_append_gicr(GArray *table_data, uint6= 4_t base, uint32_t size) build_append_int_noprefix(table_data, 0xE, 1); /* Type */ build_append_int_noprefix(table_data, 16, 1); /* Length */ build_append_int_noprefix(table_data, 0, 2); /* Reserved */ - /* Discovery Range Base Addres */ + /* Discovery Range Base Address */ build_append_int_noprefix(table_data, base, 8); build_append_int_noprefix(table_data, size, 4); /* Discovery Range Len= gth */ } diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ac626b3bef7..4983f5fc93a 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2052,7 +2052,7 @@ static void machvirt_init(MachineState *machine) int pa_bits; =20 /* - * Instanciate a temporary CPU object to find out about what + * Instantiate a temporary CPU object to find out about what * we are about to deal with. Once this is done, get rid of * the object. */ diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c index 37fc9b919c0..668a9d65a43 100644 --- a/hw/arm/xlnx-versal-virt.c +++ b/hw/arm/xlnx-versal-virt.c @@ -659,7 +659,7 @@ static void versal_virt_init(MachineState *machine) fdt_add_clk_node(s, "/clk25", 25000000, s->phandle.clk_25Mhz); =20 /* Make the APU cpu address space visible to virtio and other - * modules unaware of muliple address-spaces. */ + * modules unaware of multiple address-spaces. */ memory_region_add_subregion_overlap(get_system_memory(), 0, &s->soc.fpd.apu.mr, 0); =20 diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index b5aed4aff56..db1105c7175 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -126,7 +126,7 @@ config OLIMEX_STM32_H405 config NSERIES bool select OMAP - select TMP105 # tempature sensor + select TMP105 # temperature sensor select BLIZZARD # LCD/TV controller select ONENAND select TSC210X # touchscreen/sensors/audio --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985315; cv=none; d=zohomail.com; s=zohoarc; b=Xk9Biu9BZ/K+WCviud6NCmbIbGxm2w5GJ9uuVts3LDEOR3N7uajfBIfGtVQEfB8LtKeQuMgYAfD2zyQ5XbFXS5vv/OyfMtvOIjdcdOXO7aZUmAf6nqEMqJeiM6liwOAFsKe6n51s7yLudyMpINYwryc4unkRr5E+TrcF/Dw0iDY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985315; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oMEpsYca7tx1v9ldNloh95tUqbg4QvdTa03d2PGTKsg=; b=SMe4jUPZb8GFpK8DK65RKgWY4sAjwjz0FWLziXVJw+YlTGN82GDLIhxoGeUUuN3X+d1ZV23SnkvGDPP06XQueUMM1qmuNOwW7BONGNAu6/1ddCTHeJyMuz6fDcPg/uS91AEXDnd8fYr9+10ZieOaFTKiabJ3HSNOx2IQZF/7H4c= 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 1681985315834772.9717636422589; Thu, 20 Apr 2023 03:08:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAA-0000Zb-Dx; Thu, 20 Apr 2023 06:05:14 -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 1ppRA1-0000X8-TM for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:06 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppR9y-0003eI-PN for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:05 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3f0a0c4e505so3518715e9.0 for ; Thu, 20 Apr 2023 03:05:02 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985100; x=1684577100; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=oMEpsYca7tx1v9ldNloh95tUqbg4QvdTa03d2PGTKsg=; b=ZfhykoFeTVkJsSsQtP2tjDjBxir0g+n6ESeEPorIG8rXgFbG8Rd05Jup+wm+MMSFP5 jXWEekeB1/c08Tryq6Il0Y0oHhkC8omjpd345FUO6H/9UZBy+/MaDLDZ1EwVk4twfMFF lXmoSctVdFOokjtM3IS63ICpfzVKGG2e95cx3/UrJKa97sDbE0JWE1NBKnYgb8OHn/Wi NWzrvg/PuuG0FqfAU7eDfFGlk094Tu2Ccl07DzvV1nD+H42MgZRJYo3tnER5Bx9YuhfH k2IEF8QraW6XK3jllcNKCOxh2kol6Pg5FitF3ha5xCRMhz6rLhoxxphxgxD48N2u54JG cIBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985100; x=1684577100; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oMEpsYca7tx1v9ldNloh95tUqbg4QvdTa03d2PGTKsg=; b=HgR6qmhNkI1J5jGunhghsfSu2m8PRCqVNU4f8n7nniK/GKNfO2lzdD+2t5NGdmTqPH 2SyIIWvezfHevtt9dyLlIm7XXPNfUnby3yJPSLfTmAvI85J9dFUPZwRYEc/+/NxaAvEW ff93z7UxVVrmsh4h8KFRUzqP83jqjcch1wFZK8cIs0EFYSlZzso/fYv0blSq2XxbFIqC 08QfXRam8GD5rgbHksjJs53lYPVCW+jl42zHz23oTB/t+vkTL7Nen38d56JI+VnhWyPE g0ki/u47x4Ksrtj4l+PvskkDLudASXLHoy3i+V05Jb/5YYxKgsWCrZ/UYKIXxlqcwE0V NzUA== X-Gm-Message-State: AAQBX9c2RAJ+UW21oD/LPQAesAn8B+GgxS6X3YHbZkOoizpviGUnq/I5 5pYJ1uOJ0XUEYZXfIWNmFaUNADFWeA1vusydlcY= X-Google-Smtp-Source: AKy350aYeDZt0/rHYpIhTo+V77d9oWAaTfhGi0XPcsHQtdI4fpsE3Viu4woTWDWsk0uyIlsagZOh8w== X-Received: by 2002:a5d:5511:0:b0:2f9:fc06:9fcc with SMTP id b17-20020a5d5511000000b002f9fc069fccmr854448wrv.44.1681985100443; Thu, 20 Apr 2023 03:05:00 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 02/21] exynos: Fix out-of-bounds access in exynos4210_gcomp_find debug printf Date: Thu, 20 Apr 2023 11:04:37 +0100 Message-Id: <20230420100456.944969-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.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=2a00:1450:4864:20::332; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x332.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985316577100001 Content-Type: text/plain; charset="utf-8" From: Feng Jiang One of the debug printfs in exynos4210_gcomp_find() will access outside the 's->g_timer.reg.comp[]' array if there was no active comparator and 'res' is -1. Add a conditional to avoid this. This doesn't happen in normal use because the debug printfs are by default not compiled in. Signed-off-by: Feng Jiang Message-id: 20230404074506.112615-1-jiangfeng@kylinos.cn Reviewed-by: Peter Maydell [PMM: Adjusted commit message to clarify that the overrun only happens if you've enabled debug printfs] Signed-off-by: Peter Maydell --- hw/timer/exynos4210_mct.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/hw/timer/exynos4210_mct.c b/hw/timer/exynos4210_mct.c index c17b247da34..446bbd2b96c 100644 --- a/hw/timer/exynos4210_mct.c +++ b/hw/timer/exynos4210_mct.c @@ -480,11 +480,14 @@ static int32_t exynos4210_gcomp_find(Exynos4210MCTSta= te *s) res =3D min_comp_i; } =20 - DPRINTF("found comparator %d: comp 0x%llx distance 0x%llx, gfrc 0x%llx= \n", - res, - s->g_timer.reg.comp[res], - distance_min, - gfrc); + if (res >=3D 0) { + DPRINTF("found comparator %d: " + "comp 0x%llx distance 0x%llx, gfrc 0x%llx\n", + res, + s->g_timer.reg.comp[res], + distance_min, + gfrc); + } =20 return res; } --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985251; cv=none; d=zohomail.com; s=zohoarc; b=D2xpTvIfkDDON+uqrCiE7NitMVwvY5DynyEDPCaZD/L05xzCNinyw7ZJ4GzQIDJxsYunWUGJnUqSJ9EJq3fhbr3/lyV9L9KBJEhc+6JpSWVSyRQtGvfhGrM2gKM7kQgDomqkhD8Mdau3kJTKtEt1MG46+C5khtiVoCT/Nf/po0Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985251; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=L7nlUevNqyMVdqq24J8aX19ltWH+K+rS+TXuZnL1vZQ=; b=K04Iitnz+IR+k6/N6OS/DLzKxxoU4SrQpR5vh4Vn0cXTN0cVHNsHiVRE3jmaLfNdVrX5WXyQJIAnKJ5dAsYasYSXsnsMY0mHQNV1vmEBC2psnuxzgzx9qKVydjGJ/wV6yOxMTTxxWyEUhgP2r2dzm3R1YASG183/umP0NfD93Rk= 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 1681985251097797.3759674248175; Thu, 20 Apr 2023 03:07:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAC-0000at-GX; Thu, 20 Apr 2023 06:05:16 -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 1ppRA6-0000YB-Md for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:10 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppRA0-0003eQ-FB for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:09 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3f09b4a1584so3679515e9.2 for ; Thu, 20 Apr 2023 03:05:02 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985101; x=1684577101; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=L7nlUevNqyMVdqq24J8aX19ltWH+K+rS+TXuZnL1vZQ=; b=DS7OlppCCKh7qbeK0Ny6auM0z070IUJruOjljTQXREcNM2N+9vIVFvtBfUjMgugVlZ HSdiLgB/xTZQPMf8H6E7UIc1Hmdx1os6xxA1ATDOF2g+eNB2WiiaYd+WH6a85ep17//1 ctAJBLh6xVEFB6r95K0gWjFFphEBlRrHTNsUu36U4v2iJW6543Ega87x1rRfMq9Q0qsL 94qRPw/uU5ap3oZbDAL3snjrHk/k1ipIPNwQteBY0VcypwqdWk+450K6rm+CVaxEKA4m ms3heN0VltmbkKo5qg5pwahvoDFAripsRWaGnSXi7D1Fj3nfVDQB2DpV2Av/wyjy9fuj WUdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985101; x=1684577101; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L7nlUevNqyMVdqq24J8aX19ltWH+K+rS+TXuZnL1vZQ=; b=lmUEM94vzDB2esIFB1n8b9Np1rJu2vJJWvpdZzrzB+wcmGdgBUe+lYQe5C8WWGvNAw /7vTx74K8MQca6gB6FkQEQ/krn3vtyhw7aTlbiWggUXxD632/DUs72aOQpNjZrJeYh2S S2bd1DCwVPbWN8JIwg8tzArcJEkR6P3XK44YFgtQmG6K/IJ/aN3dos0k6qP8mNqCM53k IdNBC+dvsTlFIoIE9hPj65xiIX6lacZXsxfDVthE5gOF+Mse39Cm8TtTyQsGlCqMkQ8q iMTKGlz+ULCDqCGYgWO5IDR7GBJZbXT44ldLZKPlD8EzmXJ11+ZdcEiavIYs9oKEelnd /kwA== X-Gm-Message-State: AAQBX9cwR5SiHiGqQmYx+bfGJBTe4g9Mqs27i63cf59Vbr0OeBFx9h4G 29xGE0aQBJnZ09JO7jrpBEUuGn70uwU/UzhEF3k= X-Google-Smtp-Source: AKy350biF5BPexr+RPS8wUN7R1FOPwZyKCPfjip+iBhARX1llQoxUWoZLT68wQ2Sbcm4qW1b7HcnLg== X-Received: by 2002:adf:f209:0:b0:2f5:ace2:8737 with SMTP id p9-20020adff209000000b002f5ace28737mr900834wro.32.1681985100929; Thu, 20 Apr 2023 03:05:00 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 03/21] hw/watchdog: Allwinner WDT emulation for system reset Date: Thu, 20 Apr 2023 11:04:38 +0100 Message-Id: <20230420100456.944969-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.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=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985251701100001 Content-Type: text/plain; charset="utf-8" From: Strahinja Jankovic This patch adds basic support for Allwinner WDT. Both sun4i and sun6i variants are supported. However, interrupt generation is not supported, so WDT can be used only to = trigger system reset. Signed-off-by: Strahinja Jankovic Reviewed-by: Niek Linnenbank Tested-by: Niek Linnenbank Message-id: 20230326202256.22980-2-strahinja.p.jankovic@gmail.com Signed-off-by: Peter Maydell --- include/hw/watchdog/allwinner-wdt.h | 123 ++++++++ hw/watchdog/allwinner-wdt.c | 416 ++++++++++++++++++++++++++++ hw/watchdog/Kconfig | 4 + hw/watchdog/meson.build | 1 + hw/watchdog/trace-events | 7 + 5 files changed, 551 insertions(+) create mode 100644 include/hw/watchdog/allwinner-wdt.h create mode 100644 hw/watchdog/allwinner-wdt.c diff --git a/include/hw/watchdog/allwinner-wdt.h b/include/hw/watchdog/allw= inner-wdt.h new file mode 100644 index 00000000000..7fe41e20f2e --- /dev/null +++ b/include/hw/watchdog/allwinner-wdt.h @@ -0,0 +1,123 @@ +/* + * Allwinner Watchdog emulation + * + * Copyright (C) 2023 Strahinja Jankovic + * + * This file is derived from Allwinner RTC, + * by Niek Linnenbank. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef HW_WATCHDOG_ALLWINNER_WDT_H +#define HW_WATCHDOG_ALLWINNER_WDT_H + +#include "qom/object.h" +#include "hw/ptimer.h" +#include "hw/sysbus.h" + +/* + * This is a model of the Allwinner watchdog. + * Since watchdog registers belong to the timer module (and are shared wit= h the + * RTC module), the interrupt line from watchdog is not handled right now. + * In QEMU, we just wire up the watchdog reset to watchdog_perform_action(= ), + * at least for the moment. + */ + +#define TYPE_AW_WDT "allwinner-wdt" + +/** Allwinner WDT sun4i family (A10, A12), also sun7i (A20) */ +#define TYPE_AW_WDT_SUN4I TYPE_AW_WDT "-sun4i" + +/** Allwinner WDT sun6i family and newer (A31, H2+, H3, etc) */ +#define TYPE_AW_WDT_SUN6I TYPE_AW_WDT "-sun6i" + +/** Number of WDT registers */ +#define AW_WDT_REGS_NUM (5) + +OBJECT_DECLARE_TYPE(AwWdtState, AwWdtClass, AW_WDT) + +/** + * Allwinner WDT object instance state. + */ +struct AwWdtState { + /*< private >*/ + SysBusDevice parent_obj; + + /*< public >*/ + MemoryRegion iomem; + struct ptimer_state *timer; + + uint32_t regs[AW_WDT_REGS_NUM]; +}; + +/** + * Allwinner WDT class-level struct. + * + * This struct is filled by each sunxi device specific code + * such that the generic code can use this struct to support + * all devices. + */ +struct AwWdtClass { + /*< private >*/ + SysBusDeviceClass parent_class; + /*< public >*/ + + /** Defines device specific register map */ + const uint8_t *regmap; + + /** Size of the regmap in bytes */ + size_t regmap_size; + + /** + * Read device specific register + * + * @offset: register offset to read + * @return true if register read successful, false otherwise + */ + bool (*read)(AwWdtState *s, uint32_t offset); + + /** + * Write device specific register + * + * @offset: register offset to write + * @data: value to set in register + * @return true if register write successful, false otherwise + */ + bool (*write)(AwWdtState *s, uint32_t offset, uint32_t data); + + /** + * Check if watchdog can generate system reset + * + * @return true if watchdog can generate system reset + */ + bool (*can_reset_system)(AwWdtState *s); + + /** + * Check if provided key is valid + * + * @value: value written to register + * @return true if key is valid, false otherwise + */ + bool (*is_key_valid)(AwWdtState *s, uint32_t val); + + /** + * Get current INTV_VALUE setting + * + * @return current INTV_VALUE (0-15) + */ + uint8_t (*get_intv_value)(AwWdtState *s); +}; + +#endif /* HW_WATCHDOG_ALLWINNER_WDT_H */ diff --git a/hw/watchdog/allwinner-wdt.c b/hw/watchdog/allwinner-wdt.c new file mode 100644 index 00000000000..6205765efec --- /dev/null +++ b/hw/watchdog/allwinner-wdt.c @@ -0,0 +1,416 @@ +/* + * Allwinner Watchdog emulation + * + * Copyright (C) 2023 Strahinja Jankovic + * + * This file is derived from Allwinner RTC, + * by Niek Linnenbank. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/units.h" +#include "qemu/module.h" +#include "trace.h" +#include "hw/sysbus.h" +#include "hw/registerfields.h" +#include "hw/watchdog/allwinner-wdt.h" +#include "sysemu/watchdog.h" +#include "migration/vmstate.h" + +/* WDT registers */ +enum { + REG_IRQ_EN =3D 0, /* Watchdog interrupt enable */ + REG_IRQ_STA, /* Watchdog interrupt status */ + REG_CTRL, /* Watchdog control register */ + REG_CFG, /* Watchdog configuration register */ + REG_MODE, /* Watchdog mode register */ +}; + +/* Universal WDT register flags */ +#define WDT_RESTART_MASK (1 << 0) +#define WDT_EN_MASK (1 << 0) + +/* sun4i specific WDT register flags */ +#define RST_EN_SUN4I_MASK (1 << 1) +#define INTV_VALUE_SUN4I_SHIFT (3) +#define INTV_VALUE_SUN4I_MASK (0xfu << INTV_VALUE_SUN4I_SHIFT) + +/* sun6i specific WDT register flags */ +#define RST_EN_SUN6I_MASK (1 << 0) +#define KEY_FIELD_SUN6I_SHIFT (1) +#define KEY_FIELD_SUN6I_MASK (0xfffu << KEY_FIELD_SUN6I_SHIFT) +#define KEY_FIELD_SUN6I (0xA57u) +#define INTV_VALUE_SUN6I_SHIFT (4) +#define INTV_VALUE_SUN6I_MASK (0xfu << INTV_VALUE_SUN6I_SHIFT) + +/* Map of INTV_VALUE to 0.5s units. */ +static const uint8_t allwinner_wdt_count_map[] =3D { + 1, + 2, + 4, + 6, + 8, + 10, + 12, + 16, + 20, + 24, + 28, + 32 +}; + +/* WDT sun4i register map (offset to name) */ +const uint8_t allwinner_wdt_sun4i_regmap[] =3D { + [0x0000] =3D REG_CTRL, + [0x0004] =3D REG_MODE, +}; + +/* WDT sun6i register map (offset to name) */ +const uint8_t allwinner_wdt_sun6i_regmap[] =3D { + [0x0000] =3D REG_IRQ_EN, + [0x0004] =3D REG_IRQ_STA, + [0x0010] =3D REG_CTRL, + [0x0014] =3D REG_CFG, + [0x0018] =3D REG_MODE, +}; + +static bool allwinner_wdt_sun4i_read(AwWdtState *s, uint32_t offset) +{ + /* no sun4i specific registers currently implemented */ + return false; +} + +static bool allwinner_wdt_sun4i_write(AwWdtState *s, uint32_t offset, + uint32_t data) +{ + /* no sun4i specific registers currently implemented */ + return false; +} + +static bool allwinner_wdt_sun4i_can_reset_system(AwWdtState *s) +{ + if (s->regs[REG_MODE] & RST_EN_SUN4I_MASK) { + return true; + } else { + return false; + } +} + +static bool allwinner_wdt_sun4i_is_key_valid(AwWdtState *s, uint32_t val) +{ + /* sun4i has no key */ + return true; +} + +static uint8_t allwinner_wdt_sun4i_get_intv_value(AwWdtState *s) +{ + return ((s->regs[REG_MODE] & INTV_VALUE_SUN4I_MASK) >> + INTV_VALUE_SUN4I_SHIFT); +} + +static bool allwinner_wdt_sun6i_read(AwWdtState *s, uint32_t offset) +{ + const AwWdtClass *c =3D AW_WDT_GET_CLASS(s); + + switch (c->regmap[offset]) { + case REG_IRQ_EN: + case REG_IRQ_STA: + case REG_CFG: + return true; + default: + break; + } + return false; +} + +static bool allwinner_wdt_sun6i_write(AwWdtState *s, uint32_t offset, + uint32_t data) +{ + const AwWdtClass *c =3D AW_WDT_GET_CLASS(s); + + switch (c->regmap[offset]) { + case REG_IRQ_EN: + case REG_IRQ_STA: + case REG_CFG: + return true; + default: + break; + } + return false; +} + +static bool allwinner_wdt_sun6i_can_reset_system(AwWdtState *s) +{ + if (s->regs[REG_CFG] & RST_EN_SUN6I_MASK) { + return true; + } else { + return false; + } +} + +static bool allwinner_wdt_sun6i_is_key_valid(AwWdtState *s, uint32_t val) +{ + uint16_t key =3D (val & KEY_FIELD_SUN6I_MASK) >> KEY_FIELD_SUN6I_SHIFT; + return (key =3D=3D KEY_FIELD_SUN6I); +} + +static uint8_t allwinner_wdt_sun6i_get_intv_value(AwWdtState *s) +{ + return ((s->regs[REG_MODE] & INTV_VALUE_SUN6I_MASK) >> + INTV_VALUE_SUN6I_SHIFT); +} + +static void allwinner_wdt_update_timer(AwWdtState *s) +{ + const AwWdtClass *c =3D AW_WDT_GET_CLASS(s); + uint8_t count =3D c->get_intv_value(s); + + ptimer_transaction_begin(s->timer); + ptimer_stop(s->timer); + + /* Use map to convert. */ + if (count < sizeof(allwinner_wdt_count_map)) { + ptimer_set_count(s->timer, allwinner_wdt_count_map[count]); + } else { + qemu_log_mask(LOG_GUEST_ERROR, "%s: incorrect INTV_VALUE 0x%02x\n", + __func__, count); + } + + ptimer_run(s->timer, 1); + ptimer_transaction_commit(s->timer); + + trace_allwinner_wdt_update_timer(count); +} + +static uint64_t allwinner_wdt_read(void *opaque, hwaddr offset, + unsigned size) +{ + AwWdtState *s =3D AW_WDT(opaque); + const AwWdtClass *c =3D AW_WDT_GET_CLASS(s); + uint64_t r; + + if (offset >=3D c->regmap_size) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return 0; + } + + switch (c->regmap[offset]) { + case REG_CTRL: + case REG_MODE: + r =3D s->regs[c->regmap[offset]]; + break; + default: + if (!c->read(s, offset)) { + qemu_log_mask(LOG_UNIMP, "%s: unimplemented register 0x%04x\n", + __func__, (uint32_t)offset); + return 0; + } + r =3D s->regs[c->regmap[offset]]; + break; + } + + trace_allwinner_wdt_read(offset, r, size); + + return r; +} + +static void allwinner_wdt_write(void *opaque, hwaddr offset, + uint64_t val, unsigned size) +{ + AwWdtState *s =3D AW_WDT(opaque); + const AwWdtClass *c =3D AW_WDT_GET_CLASS(s); + uint32_t old_val; + + if (offset >=3D c->regmap_size) { + qemu_log_mask(LOG_GUEST_ERROR, "%s: out-of-bounds offset 0x%04x\n", + __func__, (uint32_t)offset); + return; + } + + trace_allwinner_wdt_write(offset, val, size); + + switch (c->regmap[offset]) { + case REG_CTRL: + if (c->is_key_valid(s, val)) { + if (val & WDT_RESTART_MASK) { + /* Kick timer */ + allwinner_wdt_update_timer(s); + } + } + break; + case REG_MODE: + old_val =3D s->regs[REG_MODE]; + s->regs[REG_MODE] =3D (uint32_t)val; + + /* Check for rising edge on WDOG_MODE_EN */ + if ((s->regs[REG_MODE] & ~old_val) & WDT_EN_MASK) { + allwinner_wdt_update_timer(s); + } + break; + default: + if (!c->write(s, offset, val)) { + qemu_log_mask(LOG_UNIMP, "%s: unimplemented register 0x%04x\n", + __func__, (uint32_t)offset); + } + s->regs[c->regmap[offset]] =3D (uint32_t)val; + break; + } +} + +static const MemoryRegionOps allwinner_wdt_ops =3D { + .read =3D allwinner_wdt_read, + .write =3D allwinner_wdt_write, + .endianness =3D DEVICE_NATIVE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, + .impl.min_access_size =3D 4, +}; + +static void allwinner_wdt_expired(void *opaque) +{ + AwWdtState *s =3D AW_WDT(opaque); + const AwWdtClass *c =3D AW_WDT_GET_CLASS(s); + + bool enabled =3D s->regs[REG_MODE] & WDT_EN_MASK; + bool reset_enabled =3D c->can_reset_system(s); + + trace_allwinner_wdt_expired(enabled, reset_enabled); + + /* Perform watchdog action if watchdog is enabled and can trigger rese= t */ + if (enabled && reset_enabled) { + watchdog_perform_action(); + } +} + +static void allwinner_wdt_reset_enter(Object *obj, ResetType type) +{ + AwWdtState *s =3D AW_WDT(obj); + + trace_allwinner_wdt_reset_enter(); + + /* Clear registers */ + memset(s->regs, 0, sizeof(s->regs)); +} + +static const VMStateDescription allwinner_wdt_vmstate =3D { + .name =3D "allwinner-wdt", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_PTIMER(timer, AwWdtState), + VMSTATE_UINT32_ARRAY(regs, AwWdtState, AW_WDT_REGS_NUM), + VMSTATE_END_OF_LIST() + } +}; + +static void allwinner_wdt_init(Object *obj) +{ + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + AwWdtState *s =3D AW_WDT(obj); + const AwWdtClass *c =3D AW_WDT_GET_CLASS(s); + + /* Memory mapping */ + memory_region_init_io(&s->iomem, OBJECT(s), &allwinner_wdt_ops, s, + TYPE_AW_WDT, c->regmap_size * 4); + sysbus_init_mmio(sbd, &s->iomem); +} + +static void allwinner_wdt_realize(DeviceState *dev, Error **errp) +{ + AwWdtState *s =3D AW_WDT(dev); + + s->timer =3D ptimer_init(allwinner_wdt_expired, s, + PTIMER_POLICY_NO_IMMEDIATE_TRIGGER | + PTIMER_POLICY_NO_IMMEDIATE_RELOAD | + PTIMER_POLICY_NO_COUNTER_ROUND_DOWN); + + ptimer_transaction_begin(s->timer); + /* Set to 2Hz (0.5s period); other periods are multiples of 0.5s. */ + ptimer_set_freq(s->timer, 2); + ptimer_set_limit(s->timer, 0xff, 1); + ptimer_transaction_commit(s->timer); +} + +static void allwinner_wdt_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + ResettableClass *rc =3D RESETTABLE_CLASS(klass); + + rc->phases.enter =3D allwinner_wdt_reset_enter; + dc->realize =3D allwinner_wdt_realize; + dc->vmsd =3D &allwinner_wdt_vmstate; +} + +static void allwinner_wdt_sun4i_class_init(ObjectClass *klass, void *data) +{ + AwWdtClass *awc =3D AW_WDT_CLASS(klass); + + awc->regmap =3D allwinner_wdt_sun4i_regmap; + awc->regmap_size =3D sizeof(allwinner_wdt_sun4i_regmap); + awc->read =3D allwinner_wdt_sun4i_read; + awc->write =3D allwinner_wdt_sun4i_write; + awc->can_reset_system =3D allwinner_wdt_sun4i_can_reset_system; + awc->is_key_valid =3D allwinner_wdt_sun4i_is_key_valid; + awc->get_intv_value =3D allwinner_wdt_sun4i_get_intv_value; +} + +static void allwinner_wdt_sun6i_class_init(ObjectClass *klass, void *data) +{ + AwWdtClass *awc =3D AW_WDT_CLASS(klass); + + awc->regmap =3D allwinner_wdt_sun6i_regmap; + awc->regmap_size =3D sizeof(allwinner_wdt_sun6i_regmap); + awc->read =3D allwinner_wdt_sun6i_read; + awc->write =3D allwinner_wdt_sun6i_write; + awc->can_reset_system =3D allwinner_wdt_sun6i_can_reset_system; + awc->is_key_valid =3D allwinner_wdt_sun6i_is_key_valid; + awc->get_intv_value =3D allwinner_wdt_sun6i_get_intv_value; +} + +static const TypeInfo allwinner_wdt_info =3D { + .name =3D TYPE_AW_WDT, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_init =3D allwinner_wdt_init, + .instance_size =3D sizeof(AwWdtState), + .class_init =3D allwinner_wdt_class_init, + .class_size =3D sizeof(AwWdtClass), + .abstract =3D true, +}; + +static const TypeInfo allwinner_wdt_sun4i_info =3D { + .name =3D TYPE_AW_WDT_SUN4I, + .parent =3D TYPE_AW_WDT, + .class_init =3D allwinner_wdt_sun4i_class_init, +}; + +static const TypeInfo allwinner_wdt_sun6i_info =3D { + .name =3D TYPE_AW_WDT_SUN6I, + .parent =3D TYPE_AW_WDT, + .class_init =3D allwinner_wdt_sun6i_class_init, +}; + +static void allwinner_wdt_register(void) +{ + type_register_static(&allwinner_wdt_info); + type_register_static(&allwinner_wdt_sun4i_info); + type_register_static(&allwinner_wdt_sun6i_info); +} + +type_init(allwinner_wdt_register) diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig index 66e1d029e32..861fd003341 100644 --- a/hw/watchdog/Kconfig +++ b/hw/watchdog/Kconfig @@ -20,3 +20,7 @@ config WDT_IMX2 =20 config WDT_SBSA bool + +config ALLWINNER_WDT + bool + select PTIMER diff --git a/hw/watchdog/meson.build b/hw/watchdog/meson.build index 8974b5cf4c8..5dcd4fbe2f1 100644 --- a/hw/watchdog/meson.build +++ b/hw/watchdog/meson.build @@ -1,4 +1,5 @@ softmmu_ss.add(files('watchdog.c')) +softmmu_ss.add(when: 'CONFIG_ALLWINNER_WDT', if_true: files('allwinner-wdt= .c')) softmmu_ss.add(when: 'CONFIG_CMSDK_APB_WATCHDOG', if_true: files('cmsdk-ap= b-watchdog.c')) softmmu_ss.add(when: 'CONFIG_WDT_IB6300ESB', if_true: files('wdt_i6300esb.= c')) softmmu_ss.add(when: 'CONFIG_WDT_IB700', if_true: files('wdt_ib700.c')) diff --git a/hw/watchdog/trace-events b/hw/watchdog/trace-events index 54371ae0755..2739570652b 100644 --- a/hw/watchdog/trace-events +++ b/hw/watchdog/trace-events @@ -1,5 +1,12 @@ # See docs/devel/tracing.rst for syntax documentation. =20 +# allwinner-wdt.c +allwinner_wdt_read(uint64_t offset, uint64_t data, unsigned size) "Allwinn= er watchdog read: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" +allwinner_wdt_write(uint64_t offset, uint64_t data, unsigned size) "Allwin= ner watchdog write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" +allwinner_wdt_reset_enter(void) "Allwinner watchdog: reset" +allwinner_wdt_update_timer(uint8_t count) "Allwinner watchdog: count %" PR= Iu8 +allwinner_wdt_expired(bool enabled, bool reset_enabled) "Allwinner watchdo= g: enabled %u reset_enabled %u" + # cmsdk-apb-watchdog.c cmsdk_apb_watchdog_read(uint64_t offset, uint64_t data, unsigned size) "CM= SDK APB watchdog read: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" cmsdk_apb_watchdog_write(uint64_t offset, uint64_t data, unsigned size) "C= MSDK APB watchdog write: offset 0x%" PRIx64 " data 0x%" PRIx64 " size %u" --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985121; cv=none; d=zohomail.com; s=zohoarc; b=MHTY5dY1rB7tQbkPJ+Xiv+4MKlOkCesZPzn/OSJUg+8T73CFeEow1FJs+HWwqKtCeRfMvYzlE2V8fTRBFTEfkMJTBxeHIT48kZTBO4Vri4Dlyv6WrESaqAFYbrDKEGwLWsV9c1fQK1LS8RN2RN1UqMVH1L1dV6JyIWVzwun8Qg4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985121; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Gpk2O9QYMWltB8kuw8C1EvNPkPN/lY6R3pJGRRQ85tA=; b=Qu+C2gDtw9ABNetJ9biFYwHTQCcLt3G6E3rQDKQgD7M2BqYWK6WhAugO1eloKjrzkIOIBsh0InNf1NxqvGiHU4rcV/FeOuzYwbmKB6aV3R63UsQ76lCdf6KC9QhgLVW8iNtb3RSP/0BFO9Zx1zXlUsoo6n9QY/T0t4FhF63mrdU= 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 1681985121852184.45603819890425; Thu, 20 Apr 2023 03:05:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAE-0000cg-5I; Thu, 20 Apr 2023 06:05:18 -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 1ppRA4-0000Xj-3k for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:08 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppR9z-0003et-Qb for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:06 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-2efbaad9d76so445721f8f.0 for ; Thu, 20 Apr 2023 03:05:02 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985101; x=1684577101; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Gpk2O9QYMWltB8kuw8C1EvNPkPN/lY6R3pJGRRQ85tA=; b=NzY9mES7ibVQWezGS/1/9Ya/Y75yfYJY01EOAQmpITdCvr+57HmxuTgcU3XeNZH5ao vDdakdeeTTKQaspjyfzM5W5Vwr8jfcxrbCfJhtO6SkpYCdL69UAWMh0UB1RaJYwpy8Uo OKOsLc+h4/lTaTuKxz/lLJEspG2T5iYE05oyp3nl/YqFo/2t/kTpktzsVmR+XnYp+l7W lwvBJYPE3pN5KiQTn4N6FQrEw537F6PiJNmlk8/zSrYHMPMs6EIxtl6/UGqvaXgqz/yD m9W5g7r9TUP/YUi+XEwF7+FHfUaPcNJjYZcvEgM6cmgChtgRk3dpHdmmQO3+b4bp2PBo w7+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985101; x=1684577101; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Gpk2O9QYMWltB8kuw8C1EvNPkPN/lY6R3pJGRRQ85tA=; b=RMVZXoyOhF5hY6596kJu35HaEvHvx92C1Pm99fmC+kXHri6gvvhsjFAsDFZ9cdBJYE 4xGcRG1HLqBoBBWGFF/Pbh3zVDC6zMuRkv7lqR9g8lvKhxCgbdw/mFptoo1c6Y4beRpA CgAex9k5hvE/cVzQcvx3p4jWqBIlXOGFOBuP3/IW5l0A1QqrJKn3/IEsYW2AR9PFhOTP MS+EsXAO7nH3fjViLnds8cFpxN6ucVNujLvfQow7G5lSIjnSZCeZls7B7g9bgIUL70y+ aAtV4y5zaJpa0U7tMd5sbeFcy4gajho+hsWvi9sOw61BQCkjS9r5VUTU+M1YV47GxAHs EOZg== X-Gm-Message-State: AAQBX9cGDTOkxMcn4RqUQO8t1US92jMPGA4CMt6sxmp9naiD7W2mMyG3 toVAkeg9Ccp/8eGdXMClrGMMnwBLD3r0j0cXKHI= X-Google-Smtp-Source: AKy350Z208x9WAr9xpGai+AManqTvX6QhZib5cndRVex0AYR73CCFlcIbZAuDuXJOVUsl9qUpqxBqQ== X-Received: by 2002:adf:ee8f:0:b0:2f8:ddce:f838 with SMTP id b15-20020adfee8f000000b002f8ddcef838mr784848wro.21.1681985101487; Thu, 20 Apr 2023 03:05:01 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 04/21] hw/arm: Add WDT to Allwinner-A10 and Cubieboard Date: Thu, 20 Apr 2023 11:04:39 +0100 Message-Id: <20230420100456.944969-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.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=2a00:1450:4864:20::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985123897100003 Content-Type: text/plain; charset="utf-8" From: Strahinja Jankovic This patch adds WDT to Allwinner-A10 and Cubieboard. WDT is added as an overlay to the Timer module memory map. Signed-off-by: Strahinja Jankovic Reviewed-by: Niek Linnenbank Message-id: 20230326202256.22980-3-strahinja.p.jankovic@gmail.com Signed-off-by: Peter Maydell --- docs/system/arm/cubieboard.rst | 1 + include/hw/arm/allwinner-a10.h | 2 ++ hw/arm/allwinner-a10.c | 7 +++++++ hw/arm/Kconfig | 1 + 4 files changed, 11 insertions(+) diff --git a/docs/system/arm/cubieboard.rst b/docs/system/arm/cubieboard.rst index 8d485f5435a..58c4a2d3ea6 100644 --- a/docs/system/arm/cubieboard.rst +++ b/docs/system/arm/cubieboard.rst @@ -15,3 +15,4 @@ Emulated devices: - USB controller - SATA controller - TWI (I2C) controller +- Watchdog timer diff --git a/include/hw/arm/allwinner-a10.h b/include/hw/arm/allwinner-a10.h index 095afb225d6..cd1465c6138 100644 --- a/include/hw/arm/allwinner-a10.h +++ b/include/hw/arm/allwinner-a10.h @@ -13,6 +13,7 @@ #include "hw/misc/allwinner-a10-ccm.h" #include "hw/misc/allwinner-a10-dramc.h" #include "hw/i2c/allwinner-i2c.h" +#include "hw/watchdog/allwinner-wdt.h" #include "sysemu/block-backend.h" =20 #include "target/arm/cpu.h" @@ -41,6 +42,7 @@ struct AwA10State { AwSdHostState mmc0; AWI2CState i2c0; AwRtcState rtc; + AwWdtState wdt; MemoryRegion sram_a; EHCISysBusState ehci[AW_A10_NUM_USB]; OHCISysBusState ohci[AW_A10_NUM_USB]; diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c index b7ca795c712..b0ea3f7f662 100644 --- a/hw/arm/allwinner-a10.c +++ b/hw/arm/allwinner-a10.c @@ -38,6 +38,7 @@ #define AW_A10_EHCI_BASE 0x01c14000 #define AW_A10_OHCI_BASE 0x01c14400 #define AW_A10_SATA_BASE 0x01c18000 +#define AW_A10_WDT_BASE 0x01c20c90 #define AW_A10_RTC_BASE 0x01c20d00 #define AW_A10_I2C0_BASE 0x01c2ac00 =20 @@ -92,6 +93,8 @@ static void aw_a10_init(Object *obj) object_initialize_child(obj, "mmc0", &s->mmc0, TYPE_AW_SDHOST_SUN4I); =20 object_initialize_child(obj, "rtc", &s->rtc, TYPE_AW_RTC_SUN4I); + + object_initialize_child(obj, "wdt", &s->wdt, TYPE_AW_WDT_SUN4I); } =20 static void aw_a10_realize(DeviceState *dev, Error **errp) @@ -203,6 +206,10 @@ static void aw_a10_realize(DeviceState *dev, Error **e= rrp) sysbus_realize(SYS_BUS_DEVICE(&s->i2c0), &error_fatal); sysbus_mmio_map(SYS_BUS_DEVICE(&s->i2c0), 0, AW_A10_I2C0_BASE); sysbus_connect_irq(SYS_BUS_DEVICE(&s->i2c0), 0, qdev_get_gpio_in(dev, = 7)); + + /* WDT */ + sysbus_realize(SYS_BUS_DEVICE(&s->wdt), &error_fatal); + sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->wdt), 0, AW_A10_WDT_BASE, 1= ); } =20 static void aw_a10_class_init(ObjectClass *oc, void *data) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index db1105c7175..338dabce427 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -325,6 +325,7 @@ config ALLWINNER_A10 select ALLWINNER_A10_PIC select ALLWINNER_A10_CCM select ALLWINNER_A10_DRAMC + select ALLWINNER_WDT select ALLWINNER_EMAC select ALLWINNER_I2C select AXP209_PMU --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985271; cv=none; d=zohomail.com; s=zohoarc; b=WXUhAElkmWh2yUvX0tocDWpMoqWrep/G1hMvDk5ZtVrNDw5FQ0twTYARYi9mjrZVKAGiqNBU6Foj+tiCdDfDCt6xD9d3ZGd/9D3ccV6+xFp1Hje8AO8BqKzyUAbG6Y8zF/FyM1/gh/T77vk37R0j2RTNqANKMXgJQEwsVLHPXso= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985271; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gHMd6Mccc9WWoHnZhKOQsV6TX3fZq4KK5xzXCVpXhHc=; b=QgiY0DM0u/QkIrBIxwaWgzDZWLJ0tT75C5/axY2X5rgxAiOpmeIqLLm0jmMbv94EwWvy+CrQb78mCg9D2+TycABgaLU1BDWcJdAIWgEJTHZJbLSWefTo7uedWmApy1s9FvkfNii7tinh1sxyOcD0ZWgQIfwUJ8B+SCcsJoTyceg= 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 1681985271292673.7334830493551; Thu, 20 Apr 2023 03:07:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAC-0000ba-PN; Thu, 20 Apr 2023 06:05:16 -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 1ppRA7-0000Yi-8O for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:11 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppRA1-0003f2-KN for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:10 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-2febac9cacdso282817f8f.1 for ; Thu, 20 Apr 2023 03:05:04 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985102; x=1684577102; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gHMd6Mccc9WWoHnZhKOQsV6TX3fZq4KK5xzXCVpXhHc=; b=jV43J+jPPgeZZ1rafSh+11Yui31ZGn0F+Gg8wWEyD4/N8wfisjlzfLmg629dax6O+j oovT03f6gnlsu5AX4cSC3Q3OQMJEcv47LhD8kVs2LU6RpSXH1UXk3oydrzlrag0VKW2G XFZuLMLWWidW5yFA/dxtszsyPu++eWDbzboS19KGx9BnfkgeFU1fR07HKkI4OOFgL7Jx wCzyyQ89mnI2Q/15Lvry9v/OLRrbUeXcDql6oz/A1y9LXMdK/fT/1I/zZnEpA7H1d4Pn iT6fIVce9hkjx+ztZqYNN5KkwszMeV/JvAguA4HDIPOvNNlJ8xTucuDSWbz6cVfbx9SZ B3Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985102; x=1684577102; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gHMd6Mccc9WWoHnZhKOQsV6TX3fZq4KK5xzXCVpXhHc=; b=M/XGLGIOSlkB98OiRGi4nE0V7ws0VNJYEAmAsc7eDD8K64SXceTwSgRHEEhh0tiAyo Kg7GrtaSb+jSZOOr5lIAK8eDEqvStGGL7+RMz2udOz+yhzhy/4ZKBsb3XyLX2cXuXXxX yzSETK2FP+0d+LCuCaB8wY5z/zIcT0r75CCg9u/+Bhy+SF6SDDLM6t6I8geA5h/PR0bb G2wO6sewLNWNNBCauu0wHe35Ynwm4o/4R3QHBXKDLoTOmibtRNyZ4kSJ+5ROnpi6LiNv e+JgHTLu4Jixiu54bUi4NohHZDsusOmk25+03H+UbPGg167StCQG7LnQqMxhRgjzKr4P qDeA== X-Gm-Message-State: AAQBX9eJ/8MSF8m654fD+KyFAs90UCuM3EcrpOR4diRMp0EzfkYgriBL l0qY5TrrYecO0JEIRU6tjubklJfGWlziciOTqQU= X-Google-Smtp-Source: AKy350Y0Sws7heQ26++tRlTCAn0kytd+YuV1YqF9kJE/R9Djvh9hGclqSbMezrPv6+b7vdwCmKOUrg== X-Received: by 2002:adf:ff83:0:b0:2f9:5841:a4d4 with SMTP id j3-20020adfff83000000b002f95841a4d4mr905392wrr.27.1681985102123; Thu, 20 Apr 2023 03:05:02 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 05/21] hw/arm: Add WDT to Allwinner-H3 and Orangepi-PC Date: Thu, 20 Apr 2023 11:04:40 +0100 Message-Id: <20230420100456.944969-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.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=2a00:1450:4864:20::42e; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42e.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, WEIRD_QUOTING=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 @linaro.org) X-ZM-MESSAGEID: 1681985272611100003 Content-Type: text/plain; charset="utf-8" From: Strahinja Jankovic This patch adds WDT to Allwinner-H3 and Orangepi-PC. WDT is added as an overlay to the Timer module memory area. Signed-off-by: Strahinja Jankovic Reviewed-by: Niek Linnenbank Message-id: 20230326202256.22980-4-strahinja.p.jankovic@gmail.com Signed-off-by: Peter Maydell --- docs/system/arm/orangepi.rst | 1 + include/hw/arm/allwinner-h3.h | 5 ++++- hw/arm/allwinner-h3.c | 8 ++++++++ hw/arm/Kconfig | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/system/arm/orangepi.rst b/docs/system/arm/orangepi.rst index e5973600a15..9afa54213b0 100644 --- a/docs/system/arm/orangepi.rst +++ b/docs/system/arm/orangepi.rst @@ -26,6 +26,7 @@ The Orange Pi PC machine supports the following devices: * System Control module * Security Identifier device * TWI (I2C) + * Watchdog timer =20 Limitations """"""""""" diff --git a/include/hw/arm/allwinner-h3.h b/include/hw/arm/allwinner-h3.h index 59e0f822d2d..f15d6d7cc7d 100644 --- a/include/hw/arm/allwinner-h3.h +++ b/include/hw/arm/allwinner-h3.h @@ -48,6 +48,7 @@ #include "hw/net/allwinner-sun8i-emac.h" #include "hw/rtc/allwinner-rtc.h" #include "hw/i2c/allwinner-i2c.h" +#include "hw/watchdog/allwinner-wdt.h" #include "target/arm/cpu.h" #include "sysemu/block-backend.h" =20 @@ -96,7 +97,8 @@ enum { AW_H3_DEV_RTC, AW_H3_DEV_CPUCFG, AW_H3_DEV_R_TWI, - AW_H3_DEV_SDRAM + AW_H3_DEV_SDRAM, + AW_H3_DEV_WDT }; =20 /** Total number of CPU cores in the H3 SoC */ @@ -141,6 +143,7 @@ struct AwH3State { AWI2CState r_twi; AwSun8iEmacState emac; AwRtcState rtc; + AwWdtState wdt; GICState gic; MemoryRegion sram_a1; MemoryRegion sram_a2; diff --git a/hw/arm/allwinner-h3.c b/hw/arm/allwinner-h3.c index 69d0ad6f50e..f05afddf7e0 100644 --- a/hw/arm/allwinner-h3.c +++ b/hw/arm/allwinner-h3.c @@ -49,6 +49,7 @@ const hwaddr allwinner_h3_memmap[] =3D { [AW_H3_DEV_OHCI3] =3D 0x01c1d400, [AW_H3_DEV_CCU] =3D 0x01c20000, [AW_H3_DEV_PIT] =3D 0x01c20c00, + [AW_H3_DEV_WDT] =3D 0x01c20ca0, [AW_H3_DEV_UART0] =3D 0x01c28000, [AW_H3_DEV_UART1] =3D 0x01c28400, [AW_H3_DEV_UART2] =3D 0x01c28800, @@ -234,6 +235,8 @@ static void allwinner_h3_init(Object *obj) object_initialize_child(obj, "twi1", &s->i2c1, TYPE_AW_I2C_SUN6I); object_initialize_child(obj, "twi2", &s->i2c2, TYPE_AW_I2C_SUN6I); object_initialize_child(obj, "r_twi", &s->r_twi, TYPE_AW_I2C_SUN6I); + + object_initialize_child(obj, "wdt", &s->wdt, TYPE_AW_WDT_SUN6I); } =20 static void allwinner_h3_realize(DeviceState *dev, Error **errp) @@ -453,6 +456,11 @@ static void allwinner_h3_realize(DeviceState *dev, Err= or **errp) sysbus_connect_irq(SYS_BUS_DEVICE(&s->r_twi), 0, qdev_get_gpio_in(DEVICE(&s->gic), AW_H3_GIC_SPI_R_T= WI)); =20 + /* WDT */ + sysbus_realize(SYS_BUS_DEVICE(&s->wdt), &error_fatal); + sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->wdt), 0, + s->memmap[AW_H3_DEV_WDT], 1); + /* Unimplemented devices */ for (i =3D 0; i < ARRAY_SIZE(unimplemented); i++) { create_unimplemented_device(unimplemented[i].device_name, diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 338dabce427..91636ab460c 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -337,6 +337,7 @@ config ALLWINNER_H3 select ALLWINNER_A10_PIT select ALLWINNER_SUN8I_EMAC select ALLWINNER_I2C + select ALLWINNER_WDT select SERIAL select ARM_TIMER select ARM_GIC --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985318; cv=none; d=zohomail.com; s=zohoarc; b=VLTCCrPOgGofMaZZ87+UhD0l0FgfuHtI/Qzhq0RCkWO1t0Ub1QUZxSDNfEb0y2Ylbe3IaeopT68t1Y780nHSE1t5bfzGLLIMu5J0BbNSHAIfbPp27GXiCuDTZD64m0lXgoR4SEEtGWVKs7DoG1b08SDCZd3VIBghwTqR5qFUMvk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985318; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9TPO1u+pAHb6aTiQd8rmqJXZ6ptbfMeE8o/R5XyQnOE=; b=Yh3t7uRq+4WYW8QX+xUHHFTgFVPRHt2NzDaCt1jeJzHH4PBDKuPbW3F5jrAPxf0jazZSOQ1kGaav0eTXuBRxy9MWMP3oU43KXf1f2rqUhDoXy+b6lvsbqBFvHS7f0Zjh3bg1XPTCl+icWbylcDEprmr77ahPKrYHsRtyu7Ykzks= 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 168198531763622.745817125043345; Thu, 20 Apr 2023 03:08:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAE-0000cJ-K6; Thu, 20 Apr 2023 06:05:18 -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 1ppRA5-0000Y7-0I for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:10 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppRA0-0003fp-Qn for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:08 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-3f180510299so3402295e9.2 for ; Thu, 20 Apr 2023 03:05:03 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985102; x=1684577102; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9TPO1u+pAHb6aTiQd8rmqJXZ6ptbfMeE8o/R5XyQnOE=; b=iyt3a18RAN7UwhPzMDKkF8pEvaCWAQhGITT8Ra1H1Wmr7W8wlsmNUfTP+q+mBO6Ng/ L5J4YlDtKNU0vAy8PB8U3xQaUsHDL+854vsuZL1OglUd1vkMuqbC7TtnDGi9rWIOfIiE n4mv4WPD/WJuhrVhSWqGGxc1IdHRA0tZd35x7FuaxvKAjSwLcpUxuhLu4Me5hb9FGtkE oAKpv3nmXt3WhEKZntQs9AEOQoUVUBerAhgX2sDZFiyrK4pQ3X6Zusu/rNmvQvL4tLBc vHDvMQX8axAWD/t81JiOHay49lN6B7ax/4uS4jwmVWL9G5vmGn+o5O32chxMn7hxq0ow 2tqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985102; x=1684577102; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9TPO1u+pAHb6aTiQd8rmqJXZ6ptbfMeE8o/R5XyQnOE=; b=GLmGobf8DDT9i+dUqDOQLhVQvSPtspDNDLIOGwelstqjhNl8w5DBY65y+Da69dOY/l UZj9DgJDe7Ic9OaCSCwxUoE5GQnJnXYrvKewiPXu3bQK1Iph5UbHA05cvg5wDSkqGK2/ CV4Ix3RxtHArBCDhTea5pZzw2Okhi+zvqeSvQxx5WknutIiw50cT8QVw+6BFP7hw+8hn 1atbiKa0JXz/S8eT53PCh+pDrCNLHhJ71qiap9ag2NvQ3Gq1FY/PMfMvwPISUKdZdyIa lYZ+DwZKkBEoPwkGPwqtKR0LYUk8mrnpWx1Q++0pKfvA/8EEikqgswd6PK73y1/PUv8g CnhA== X-Gm-Message-State: AAQBX9ciJTXK0xsXkm1UoqbBnzFlyrxsEibGHLRCyokm+BJ8PEe8Pl59 TVGJ39RnqTd4fIilX4oI42Cxi+Z6PqghJQHbW7E= X-Google-Smtp-Source: AKy350aLi/NpmnlG7lkUWGGFkK3w51krpl2W9ASkCzK1y0SEDoisqqa+1LogD35iC2tz5ASoZpaGkQ== X-Received: by 2002:adf:f203:0:b0:2f0:69c4:3900 with SMTP id p3-20020adff203000000b002f069c43900mr911024wro.54.1681985102593; Thu, 20 Apr 2023 03:05:02 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 06/21] tests/avocado: Add reboot tests to Cubieboard Date: Thu, 20 Apr 2023 11:04:41 +0100 Message-Id: <20230420100456.944969-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.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=2a00:1450:4864:20::336; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x336.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985319981100007 Content-Type: text/plain; charset="utf-8" From: Strahinja Jankovic Cubieboard tests end with comment "reboot not functioning; omit test". Fix this so reboot is done at the end of each test. Signed-off-by: Strahinja Jankovic Reviewed-by: Niek Linnenbank Tested-by: Niek Linnenbank Message-id: 20230326202256.22980-5-strahinja.p.jankovic@gmail.com Signed-off-by: Peter Maydell --- tests/avocado/boot_linux_console.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux= _console.py index 574609bf43b..c0675809e64 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -581,7 +581,10 @@ def test_arm_cubieboard_initrd(self): 'Allwinner sun4i/sun5i') exec_command_and_wait_for_pattern(self, 'cat /proc/iomem', 'system-control@1c00000') - # cubieboard's reboot is not functioning; omit reboot test. + exec_command_and_wait_for_pattern(self, 'reboot', + 'reboot: Restarting system= ') + # Wait for VM to shut down gracefully + self.vm.wait() =20 def test_arm_cubieboard_sata(self): """ @@ -625,7 +628,10 @@ def test_arm_cubieboard_sata(self): 'Allwinner sun4i/sun5i') exec_command_and_wait_for_pattern(self, 'cat /proc/partitions', 'sda') - # cubieboard's reboot is not functioning; omit reboot test. + exec_command_and_wait_for_pattern(self, 'reboot', + 'reboot: Restarting system= ') + # Wait for VM to shut down gracefully + self.vm.wait() =20 @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited= ') def test_arm_cubieboard_openwrt_22_03_2(self): @@ -672,7 +678,10 @@ def test_arm_cubieboard_openwrt_22_03_2(self): =20 exec_command_and_wait_for_pattern(self, 'cat /proc/cpuinfo', 'Allwinner sun4i/sun5i') - # cubieboard's reboot is not functioning; omit reboot test. + exec_command_and_wait_for_pattern(self, 'reboot', + 'reboot: Restarting system= ') + # Wait for VM to shut down gracefully + self.vm.wait() =20 @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout= ') def test_arm_quanta_gsj(self): --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985189; cv=none; d=zohomail.com; s=zohoarc; b=Nskc6A3Ufrg+v6hBp1y9UFuxK4q8yfPYZ9jrCZQCZwRXBdB7Y4Ot7RxoofTILW0/AycCwkCZpycqtKo01UX1NIJ00Pw1jeA3oVaGekar7nimI5QihkK3ULIFhU9J7+xU87wQV13wo8al/ZRvNC8xhbWIUgSFnmkJ0z6zXNDVt4A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985189; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4z8lBbo4cNMOCR3wyC7AQJyYBl4UvmsiUQL0/yuq4gI=; b=YaENqodiNQnc66Q+ceXwn8A1Vmc10TosD15/CMiPoLT4I7nHbCXFefdDFyFIfvqw2q9a5GnWwr/ux3t2LD1nsiOTw90Oz23Bc95x8C4TUN9LekndTQOwz5kBugS6LakwzaWSF1PnZ4oxpEUP1zX/JXYTsDAP8EbEWtdm/bWRCDw= 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 1681985189778382.3215118098411; Thu, 20 Apr 2023 03:06:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAF-0000dX-3u; Thu, 20 Apr 2023 06:05:19 -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 1ppRA6-0000YC-N7 for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:10 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppRA1-0003kh-Jk for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:10 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3f1728c2a57so5537315e9.0 for ; Thu, 20 Apr 2023 03:05:04 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985103; x=1684577103; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4z8lBbo4cNMOCR3wyC7AQJyYBl4UvmsiUQL0/yuq4gI=; b=HRhMK0k1xnHyD2cTj5JII1fdiiTahuSTktXL2f7erft2Qdj7MX+pxKgX/1N7jZSCl5 0oCw7QNwszaHAjY3gNBFj01c9uXpl/EE1bJWlyA6REHiGesF0FahPc8yf5tEvtBZ0GyY P0Ouo+MnzL4isxc6RL8twvWWytzW0aXi9hq9xezbX98HR3oOKS1xeYDERD8bis6AqpyC 0MzvXzdz93qez4rDVv0FuSeRs2Bj353+nG8/dxlvsVcdZz0PPv5c201IRghR9NG/oLn6 box8cgEypNmIOKLcOUCHv8jwcMihR7IkfNM6ALUcRyRSS92lPYwe12cs7/yfTN7bRmKN H93Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985103; x=1684577103; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4z8lBbo4cNMOCR3wyC7AQJyYBl4UvmsiUQL0/yuq4gI=; b=fHgu1Vd97CtpNYnv9TqJFhazwqmYb0m1AewY8luthiCYBZf9lkJh7WKdnVYmDy0g8P r5HlsVEVEEERBNvCvt6+bdearCUiucLdLQRDwx+LW3SExY6YuKrlLjAhWdwqxvkRTlBn 6HB6VFhKEycQ1wknwNUOZ0V4JQipSnFG2538ByOo5marxS/Ky1HJfc9pyVW6IwEzPPQ+ 7fEtyeoRzrnFFjSPpz+WTcY2gAim2sP2U1m4Z3rBjejqn3rtl/wPEH0Mh0/nnyXSQtHS DBAwcNFoOBT5l0OI4Xl+XXdj3/8ym08MPx5LIgdgxIFsVpRdQmDaKFErnSV1GSFYLBHB VEig== X-Gm-Message-State: AAQBX9dr5VzR9Bx33x8u0KhR0q9X7FTwdwe5WuUUgR5izIi0DsoKH0jz LOtBD5qkrx232BuxnikPoxbnGVLw7qvCeGnUCKI= X-Google-Smtp-Source: AKy350b0TigE1W9vFXqEnE1eQDpnOSz13sAaArfJcwm2k6Uh05kgpCV5+AgxzuFJT028K+NtPgYhYg== X-Received: by 2002:a5d:69d2:0:b0:2f9:2fb0:c46 with SMTP id s18-20020a5d69d2000000b002f92fb00c46mr683694wrw.68.1681985103038; Thu, 20 Apr 2023 03:05:03 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 07/21] hw/timer/imx_epit: don't shadow variable Date: Thu, 20 Apr 2023 11:04:42 +0100 Message-Id: <20230420100456.944969-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.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=2a00:1450:4864:20::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985190196100005 Content-Type: text/plain; charset="utf-8" From: Axel Heider Fix issue reported by Coverity. Signed-off-by: Axel Heider Message-id: 168070611775.20412.2883242077302841473-1@git.sr.ht Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/timer/imx_epit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c index 3a869782bcd..0821c62cd1c 100644 --- a/hw/timer/imx_epit.c +++ b/hw/timer/imx_epit.c @@ -179,7 +179,7 @@ static void imx_epit_update_compare_timer(IMXEPITState = *s) * the compare value. Otherwise it may fire at most once in the * current round. */ - bool is_oneshot =3D (limit >=3D s->cmp); + is_oneshot =3D (limit >=3D s->cmp); if (counter >=3D s->cmp) { /* The compare timer fires in the current round. */ counter -=3D s->cmp; --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985263; cv=none; d=zohomail.com; s=zohoarc; b=jqdDNzBk0Gh4xjY0q1XAgDX+qqCP6P14KN9vapEnSRxyEnTOMmvJ9H8dRVkm6Q6Z3UztVGHqU7fzP3ZeucxWypLCAwqbZvJE+o5E26llWc9EZ7FKTMfOGl8eQdvLn56PXejwaJZ0n2BO6cK985KYGlujw0RmREWSbi4JX1c44kA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985263; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EjMl5vexxEGO4PAe7d3muxw4Zdgc0H+6hNltDpoCeUI=; b=KtANomf0RrVgneHVNbTu9Pmih27L2gQDC66CJYYpauX9pJqRDxq7N+dcOA9yhguxrLBCelY+Q6P25u6WV3Z2X6BbGQYz9YKnKy/hTuzGSXH1L91ZPHmGJQ+i7dd+TKvnpAmZ7BzRmUIpQYELa4S93KfFPUw4oyMWv4E5b0DUcsQ= 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 1681985263148499.9975087521135; Thu, 20 Apr 2023 03:07:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAF-0000do-AE; Thu, 20 Apr 2023 06:05:19 -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 1ppRA7-0000Yj-B1 for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:11 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppRA1-0003qM-Lq for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:10 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-3f178da219bso5163925e9.1 for ; Thu, 20 Apr 2023 03:05:05 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985104; x=1684577104; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=EjMl5vexxEGO4PAe7d3muxw4Zdgc0H+6hNltDpoCeUI=; b=nZ8QkaA0KGbsoYwPS/sZMHgyZUNCcRCbzjik1qTAXyPxuGuU1LkGzns6KNvx0oddkp oIBkpsTuqx63C8QZVIP827tn6p049F9m5BQLlN9QvOzVAcdKaufitfXooVcMMS1iRks+ K/z/qvMQpCtNsGSoyw6zI7/lO3MYP4rQzsA8k9H/5/rpEmtwRMJtbUI25T2kGupkJ3NQ RK+4mPF9f4PpMXEgviQtbEaoDWGnYia5+oRLRkCIU+Ylo/HG3RCFz+5VxKMO0epNvBRI RRgXIJ7k1Vx2DLenGy57Rc3XfyBAdHvgteRutnAozDgKHsAVO/EWXmsX2D9SKJuVnpiF FUJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985104; x=1684577104; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EjMl5vexxEGO4PAe7d3muxw4Zdgc0H+6hNltDpoCeUI=; b=L64rcE2xXgKX0Wiy4jVwqr6iRyPobH0E5Zl1MaTBKK9LQLv45SGoAU3b1NQa7d6P8v SSaN+K3xvr6UDasq0q3zyTphLyHbBnkivQvhpMa0JFLcxBGuKMSwe3OyCPzNRIZABhOz Y0gGYZSSQqI0Rr5+fMdbudJb4WgyEMUbImR0aKc7mJ+wNQuR/yAFzKeKNuO6mEaBD2bu ieCiSt+LpEp0X5uxYszNZdMdNViTMotadvX5Q5LnbE+6Ck6eetqkGPyzsflNgX3M59h7 NEbehiLP3au29xxSfd8VF19j018f9BHVuxhgo7vkI1UV7Sb489lALomyfquxoSd5ttG2 ei3w== X-Gm-Message-State: AAQBX9d2UpdeYoOpCDiHdTcQRgmADSKeWoHXEGvnlkWq+SZaFgNVUPID Xov71GetqfQABe3bpZJo6M/I+3QI7g1GEJTSG6M= X-Google-Smtp-Source: AKy350YjMBApk/JOOiqi8ntkVyYOQ9viveMtEqY44Nsi6qBLuMSDOoj9v9zqVEj7lDjgtmR+5PpC+w== X-Received: by 2002:adf:e3ca:0:b0:2ef:ab51:15c2 with SMTP id k10-20020adfe3ca000000b002efab5115c2mr904602wrm.15.1681985103532; Thu, 20 Apr 2023 03:05:03 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 08/21] hw/timer/imx_epit: fix limit check Date: Thu, 20 Apr 2023 11:04:43 +0100 Message-Id: <20230420100456.944969-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.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=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985263666100001 Content-Type: text/plain; charset="utf-8" From: Axel Heider Fix the limit check. If the limit is less than the compare value, the timer can never reach this value, thus it will never fire. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1491 Signed-off-by: Axel Heider Message-id: 168070611775.20412.2883242077302841473-2@git.sr.ht Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/timer/imx_epit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c index 0821c62cd1c..640e4399c24 100644 --- a/hw/timer/imx_epit.c +++ b/hw/timer/imx_epit.c @@ -179,7 +179,7 @@ static void imx_epit_update_compare_timer(IMXEPITState = *s) * the compare value. Otherwise it may fire at most once in the * current round. */ - is_oneshot =3D (limit >=3D s->cmp); + is_oneshot =3D (limit < s->cmp); if (counter >=3D s->cmp) { /* The compare timer fires in the current round. */ counter -=3D s->cmp; --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985297; cv=none; d=zohomail.com; s=zohoarc; b=aQoiNjZdbMouGOD80kiCH8jQH44enS7DBvKk1oxBFIZxD6VNcI/+z3atyHzwseZT535rnAQlPIFtF0gGKZMJS22KJrq8X24DmKn3bfwS1oCKmXOY8UNlU+rQI4+r/U2pMr+cvIpQDt8/TJ3kBYhXJiZkMlsu5hqtf+5/WzaltLw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985297; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xejyZEcnXPcOcrIXCJsdEKcNfQCMmDuIs1Hj5HcWKBo=; b=Z2KsedUGCfraYt+xqPMWCZuRSGXF2Ndd/o4f3jxgEezw0Y8GGLIx7CzmuS2EUOdr00uQUTic2KDx0QMkIwDgdFzTTGcEgo5RpVM1i9XSNUAj8PxCzachzYtu4rh4tWCK8fWkf+KrA59BiQ/GBk9zn1lCvoa3e867mUbPY8hAZLU= 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 168198529719338.50106833769246; Thu, 20 Apr 2023 03:08:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAF-0000eb-U7; Thu, 20 Apr 2023 06:05:19 -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 1ppRA8-0000Yx-P5 for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:13 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppRA2-0003qr-Jv for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:12 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-3f177cb2c6cso3442635e9.2 for ; Thu, 20 Apr 2023 03:05:05 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985105; x=1684577105; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xejyZEcnXPcOcrIXCJsdEKcNfQCMmDuIs1Hj5HcWKBo=; b=ENAYuJWxPz0cR/5LkYDHvlhIRXugbjVNvEdlbUXVEWEbAxYJw4AmBzLHh7QFySrVtC N6jJCKupc2X9yjU4TuyZm38joGz0wU7PyzapqO5DnAaUMtWQ6zBl9EyQnezzarpNQlgH FLAch1vaHaYEDCXcziFNWNZD/BpKLbGzH1PFxexFljifcDtAfcGmz/HNG0FxipJ8YtXh mZhjWqU/G/hXNIirTNfo9mT5YONYXWxXXLEl+mytm1wnsZD8OZ2MZnr0Ut2GlgA1KHZg 9XwhLTawCAyZXZBwNdaLDJAEivdxWC+9yDdNWGpgVeB5G8G8MgRmii7ClgxZwLqQi4Rp RoTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985105; x=1684577105; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xejyZEcnXPcOcrIXCJsdEKcNfQCMmDuIs1Hj5HcWKBo=; b=fDHDH0JtcM7VnlwUXQPsbk1CmAz/wdRlZpqW1vE/xqZRPbSn7SbgHA8DJWuR1VwFp9 UX9zSpcrUHRqsOtL3BiFtY8vJoIr00Em/6vKrEGmSzH9xc3cAOlkIXA/gAHwb45NZKAi XxHOovKYxiWCxb8A1Zt/KXnH1wsUxewQTC9ihc9GmCpsVyxAXLf2e2zjiCh3ylOeq6oy Tzp8KvsQO/JGpzdHGRkRR289YnzFV0O9C6tu07/KNPXvx7pApYWJTOisbsghON/0fHFM 2qHZUHXY9OBsiyS9xOGoStOMVn9jWmYlzH5mdUo/PoHQIYGW4ohVvgISw30gro1K6UVt 5Zvg== X-Gm-Message-State: AAQBX9fE34WFRuW6gm5mZsv5tacDtm/y1why+n8n2UdpionVrqDHBpaW NXO9O0VVu0Qt8V50kcrnXZeeqxtiqk//jiWk/M8= X-Google-Smtp-Source: AKy350ZFjgvb6vhTmkNRhj5kd6czcrdPHpCQBw6cOAGs5vx+Oqn7n8V3rfO8Mket/x/a3e4dU8JZ5w== X-Received: by 2002:adf:d84d:0:b0:2d8:47c7:7b50 with SMTP id k13-20020adfd84d000000b002d847c77b50mr968474wrl.1.1681985104825; Thu, 20 Apr 2023 03:05:04 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 09/21] target/arm: Remove KVM AArch32 CPU definitions Date: Thu, 20 Apr 2023 11:04:44 +0100 Message-Id: <20230420100456.944969-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985298511100007 From: Philippe Mathieu-Daud=C3=A9 Missed in commit 80485d88f9 ("target/arm: Restrict v7A TCG cpus to TCG accel"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20230405100848.76145-2-philmd@linaro.org Signed-off-by: Peter Maydell --- target/arm/kvm-consts.h | 9 +++------ target/arm/cpu_tcg.c | 2 -- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/target/arm/kvm-consts.h b/target/arm/kvm-consts.h index 09967ec5e64..7c6adc14f6e 100644 --- a/target/arm/kvm-consts.h +++ b/target/arm/kvm-consts.h @@ -124,13 +124,10 @@ MISMATCH_CHECK(QEMU_PSCI_RET_INTERNAL_FAILURE, PSCI_R= ET_INTERNAL_FAILURE); MISMATCH_CHECK(QEMU_PSCI_RET_NOT_PRESENT, PSCI_RET_NOT_PRESENT); MISMATCH_CHECK(QEMU_PSCI_RET_DISABLED, PSCI_RET_DISABLED); =20 -/* Note that KVM uses overlapping values for AArch32 and AArch64 - * target CPU numbers. AArch32 targets: +/* + * Note that KVM uses overlapping values for AArch32 and AArch64 + * target CPU numbers. AArch64 targets: */ -#define QEMU_KVM_ARM_TARGET_CORTEX_A15 0 -#define QEMU_KVM_ARM_TARGET_CORTEX_A7 1 - -/* AArch64 targets: */ #define QEMU_KVM_ARM_TARGET_AEM_V8 0 #define QEMU_KVM_ARM_TARGET_FOUNDATION_V8 1 #define QEMU_KVM_ARM_TARGET_CORTEX_A57 2 diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c index df0c45e523b..1911d7ec47f 100644 --- a/target/arm/cpu_tcg.c +++ b/target/arm/cpu_tcg.c @@ -546,7 +546,6 @@ static void cortex_a7_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_EL2); set_feature(&cpu->env, ARM_FEATURE_EL3); set_feature(&cpu->env, ARM_FEATURE_PMU); - cpu->kvm_target =3D QEMU_KVM_ARM_TARGET_CORTEX_A7; cpu->midr =3D 0x410fc075; cpu->reset_fpsid =3D 0x41023075; cpu->isar.mvfr0 =3D 0x10110222; @@ -595,7 +594,6 @@ static void cortex_a15_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_EL2); set_feature(&cpu->env, ARM_FEATURE_EL3); set_feature(&cpu->env, ARM_FEATURE_PMU); - cpu->kvm_target =3D QEMU_KVM_ARM_TARGET_CORTEX_A15; /* r4p0 cpu, not requiring expensive tlb flush errata */ cpu->midr =3D 0x414fc0f0; cpu->revidr =3D 0x0; --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985355; cv=none; d=zohomail.com; s=zohoarc; b=fLdgE2eqUEgOKNz3p1OB6lgHmDTwjuZRS8ydNzpdjLgkDFIJcDj53b55giINz/q2RGkm5wgaL1YgeqsjGbo+Ux8YX5vEnYe2N4O3KO+kDh3+/zyfeh3MC4z3LySOPN7ZO4/ZHVtgs4URzc7xJYjcapn/D7jIS2q4kY03wpM8Q/c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985355; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gk+qtdkGjNiXdrXuOW9NlMvlVmOSEkalFiEAMg6KIvw=; b=SnWH5VMAA1ntivr/najgIbGU0OeX/6od0VEfq8DTcaFlACY1N+GPzYxeT4jPzY/cFMMaXg7ev+cnT+vkPVA0jdQ0YESzwMpc5Nc/dG3KAUyxIrYurirRrZ9wZdfQWTOp0B6iB4YFp0Sejjjz4pWBu26vZA6VOpdGyfj0G9lWC/0= 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 1681985355818744.3910362257241; Thu, 20 Apr 2023 03:09:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAL-0000kl-67; Thu, 20 Apr 2023 06:05:25 -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 1ppRA8-0000Yw-NG for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:13 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppRA3-0003r3-Cv for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:12 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3f178da21afso3699425e9.1 for ; Thu, 20 Apr 2023 03:05:06 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985105; x=1684577105; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gk+qtdkGjNiXdrXuOW9NlMvlVmOSEkalFiEAMg6KIvw=; b=kC3QU6Thgwo5+hIwmZtFxIQ4SFfW49ICeguvPbYSmbnpVtqV1ynIQXTDrAptejiWAs kQAGR4W74GIOyFXTE2Wuqq7uH6dE5ZH/Vji/I8fvywRn3evEMGDEUGUxyiXeGWIpkdZ8 5pjJfKXsxTNfJO/Zy7cTkrVAUzw3H7rMHojnd7hqh5nbi6lEMIsU2oqdOOHnO+kD9UYB XAsIljjrPXJ/Ma6xWoK8cPCcmgGCj9Sd1+I7BYc61gmURpiIHW8EQJo3fpCoxgy1pnmL vGY6YAVFGAGltn+B58LY8nHd8LsAjsqSsF0ls+I5EDvYKRTbk3DYEsQD35m2uuh1BUtC E05A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985105; x=1684577105; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gk+qtdkGjNiXdrXuOW9NlMvlVmOSEkalFiEAMg6KIvw=; b=TuU+XtOFa8ekUJ+MaxHF217KF1Ta6MtVhC5ejeYa6O83RReS5E9i6YFR/tx+bugaiu H8PaKJ6ZPeHiAxrEoLDBs59unojSXZmSCQIYvih7PpkEGXLDSxtxW1yfZA1Pt9YtoTqH aHfRR9bEyLsGp1YO9okMHP/39V/r+LUDksOH1T+8wIF5TxcWRCY/w0f/C7OtiGIgBZPq UYS8TFy0bVEk0BsUgmW3ZrKlmhA4FF0obSFX5GozTZBkMGM99I1pxdIzUHyavyc8KiRY uwmlNiOi+Of1f4XxoMeGdl4k+ThoLynZnRm0nu0ua6CW5UFGGYSTIoRFowr+Jkwwk4AJ ebVQ== X-Gm-Message-State: AAQBX9fNB/3NiLxH5L52fEgzIL1AHAIJe9PwOh4iIVNdls1guws+SuDK rcwROk7yUsI0NK4DR+DCc+s+rBcxIopf5kjgwNE= X-Google-Smtp-Source: AKy350ZyJ6kgu4G40s9kB/9yF+cZ0I3HeNFrbJR4x4FVTmLxhMS0K6ig7yAaS0IhkXCf4aGCED/elg== X-Received: by 2002:adf:ef51:0:b0:2f6:b273:a2fa with SMTP id c17-20020adfef51000000b002f6b273a2famr865486wrp.34.1681985105289; Thu, 20 Apr 2023 03:05:05 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 10/21] hw/arm/virt: Restrict Cortex-A7 check to TCG Date: Thu, 20 Apr 2023 11:04:45 +0100 Message-Id: <20230420100456.944969-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985356356100001 From: Philippe Mathieu-Daud=C3=A9 The Cortex-A7 core is only available when TCG is enabled (see commit 80485d88f9 "target/arm: Restrict v7A TCG cpus to TCG accel"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-id: 20230405100848.76145-3-philmd@linaro.org Signed-off-by: Peter Maydell --- hw/arm/virt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 4983f5fc93a..bdf3d76cc43 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -204,7 +204,9 @@ static const int a15irqmap[] =3D { }; =20 static const char *valid_cpus[] =3D { +#ifdef CONFIG_TCG ARM_CPU_TYPE_NAME("cortex-a7"), +#endif ARM_CPU_TYPE_NAME("cortex-a15"), ARM_CPU_TYPE_NAME("cortex-a35"), ARM_CPU_TYPE_NAME("cortex-a53"), --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985336; cv=none; d=zohomail.com; s=zohoarc; b=V8bi3Dv9D9lach42pw61LjiJcqqCNx8mHp6y4TNFriwGe/hYD6qiuSE4rYOIIkquPMJK27sQO4InQW6uQdTEmTZsX5sAOJHQ/0a2DT1kZebTHPMJEDgIa2QIY+VC9FlNoqDjGOI0pq6z9Pc2lqeeQcaHwv5Li4Q/iP+BdGiccZc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985336; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UBHmKP2QWvbgSGiIjbO0DHXHxUNpy1cA3E2msdtGyEU=; b=iyh5iIFAGSs1E8N+rKmISgNZImKKwOzIyGO93ZoopSjanYoLx3QYqR0BKuyQ66lWrpDMZoGGK6ntVkafb/+a3W0C1x3kENsfHsyV2lKDGSC4lyzCYNAjXFXA3dj2/aFu1n9wD2N4rnOnfoTz3Pg125p0OIfD+hhk2nSjlJjTnO0= 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 1681985336854572.9432146271714; Thu, 20 Apr 2023 03:08:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAD-0000cP-JN; Thu, 20 Apr 2023 06:05:17 -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 1ppRAA-0000Zi-Ed for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:15 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppRA4-0003rV-Dk for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:13 -0400 Received: by mail-wm1-x330.google.com with SMTP id he13so964577wmb.2 for ; Thu, 20 Apr 2023 03:05:06 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985105; x=1684577105; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=UBHmKP2QWvbgSGiIjbO0DHXHxUNpy1cA3E2msdtGyEU=; b=IMHdiBul6mXvafDGTwo+tkps089yVSk8ABzbTn/IIh7NZA4m/6AAH3LqubRZ3O+Uzi MHjf4w7AB3DjOpJH2McdbQwuZ4HrKMzXmmDfpgxnU5GbftHR1BkGTGZQE+01qqW4QDTA etPY6oLMDJbuOrWvB9vbh3WuYfEUZIRHg4MlXnFumLo4Y4rTHnUnPT5+c4qMbck677jh CRnUf9xztZdQQ7lsUu4aCJw2ToWhZvphj37xi6dnNkGmxAkxqtfS5Qt1uDMRv83zSh96 Gu0wyDeUtnVBF+QgNUg95pml6pFl1nXuzxQbSwuCY1tr7Fx24eW+kmHiuAzyIDUIxy7s fRpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985105; x=1684577105; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UBHmKP2QWvbgSGiIjbO0DHXHxUNpy1cA3E2msdtGyEU=; b=cJ5O4WbG+W7ey0QybC/hGpez/q6D39Pdw4sIzOfxpY5EYTK+lM4CUz3G2YtrjhQIjU YHVnEijTZjxkvTmgGTxEyqogVnyZEdODTxW4oHANs1Fc1UQwNPLeA3PUTvDGlW2A+wQM 2pAyeTyY37qUAxJXS4EM3yaydKA43LENwh+6RGjL5fz6ktN2PyS4FusLrA64G0qdtvel 3KPOy9qNwJ0vA1PNYZqzpqTpVHe5W7B7VRav/NuWiXcqVcR2mNiPdnXEghJFCPS+rTIS Ixp5AOGVDXzKuzBGtxJkCmQ0Jq4Og9wnkkvThIarwxOogg8RVxeKDWqKoGqPpqSY2ItP 8MNg== X-Gm-Message-State: AAQBX9fyF/8dY1U8E7XT14J+uq6PrTnVFmbE13SwEBXz9vznecBKEtL6 kIDEZOwxH2EYMQncoJ1ckA9pDua5rnwQSbi49vw= X-Google-Smtp-Source: AKy350bbbPVu7Y2MEyPCChzvRNCKLzigX6Tzf9Y8gYOulKq4BvnekfuHwWPirdPcTuKmCF7cgdIq1A== X-Received: by 2002:a1c:cc02:0:b0:3ef:df3:1693 with SMTP id h2-20020a1ccc02000000b003ef0df31693mr840105wmb.32.1681985105712; Thu, 20 Apr 2023 03:05:05 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 11/21] target/arm: Initialize debug capabilities only once Date: Thu, 20 Apr 2023 11:04:46 +0100 Message-Id: <20230420100456.944969-12-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985338922100003 From: Akihiko Odaki kvm_arm_init_debug() used to be called several times on a SMP system as kvm_arch_init_vcpu() calls it. Move the call to kvm_arch_init() to make sure it will be called only once; otherwise it will overwrite pointers to memory allocated with the previous call and leak it. Fixes: e4482ab7e3 ("target-arm: kvm - add support for HW assisted debug") Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Akihiko Odaki Message-id: 20230405153644.25300-1-akihiko.odaki@daynix.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/kvm_arm.h | 8 ++++++++ target/arm/kvm.c | 2 ++ target/arm/kvm64.c | 18 ++++-------------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 99017b635ce..330fbe5c722 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -18,6 +18,14 @@ #define KVM_ARM_VGIC_V2 (1 << 0) #define KVM_ARM_VGIC_V3 (1 << 1) =20 +/** + * kvm_arm_init_debug() - initialize guest debug capabilities + * @s: KVMState + * + * Should be called only once before using guest debug capabilities. + */ +void kvm_arm_init_debug(KVMState *s); + /** * kvm_arm_vcpu_init: * @cs: CPUState diff --git a/target/arm/kvm.c b/target/arm/kvm.c index f022c644d2f..84da49332c4 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -280,6 +280,8 @@ int kvm_arch_init(MachineState *ms, KVMState *s) } } =20 + kvm_arm_init_debug(s); + return ret; } =20 diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c index 1197253d12f..810db33ccbd 100644 --- a/target/arm/kvm64.c +++ b/target/arm/kvm64.c @@ -74,24 +74,16 @@ GArray *hw_breakpoints, *hw_watchpoints; #define get_hw_bp(i) (&g_array_index(hw_breakpoints, HWBreakpoint, i)) #define get_hw_wp(i) (&g_array_index(hw_watchpoints, HWWatchpoint, i)) =20 -/** - * kvm_arm_init_debug() - check for guest debug capabilities - * @cs: CPUState - * - * kvm_check_extension returns the number of debug registers we have - * or 0 if we have none. - * - */ -static void kvm_arm_init_debug(CPUState *cs) +void kvm_arm_init_debug(KVMState *s) { - have_guest_debug =3D kvm_check_extension(cs->kvm_state, + have_guest_debug =3D kvm_check_extension(s, KVM_CAP_SET_GUEST_DEBUG); =20 - max_hw_wps =3D kvm_check_extension(cs->kvm_state, KVM_CAP_GUEST_DEBUG_= HW_WPS); + max_hw_wps =3D kvm_check_extension(s, KVM_CAP_GUEST_DEBUG_HW_WPS); hw_watchpoints =3D g_array_sized_new(true, true, sizeof(HWWatchpoint), max_hw_wps); =20 - max_hw_bps =3D kvm_check_extension(cs->kvm_state, KVM_CAP_GUEST_DEBUG_= HW_BPS); + max_hw_bps =3D kvm_check_extension(s, KVM_CAP_GUEST_DEBUG_HW_BPS); hw_breakpoints =3D g_array_sized_new(true, true, sizeof(HWBreakpoint), max_hw_bps); return; @@ -920,8 +912,6 @@ int kvm_arch_init_vcpu(CPUState *cs) } cpu->mp_affinity =3D mpidr & ARM64_AFFINITY_MASK; =20 - kvm_arm_init_debug(cs); - /* Check whether user space can specify guest syndrome value */ kvm_arm_init_serror_injection(cs); =20 --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985368; cv=none; d=zohomail.com; s=zohoarc; b=SZZPIZOR5wWA3Igei1ZZtL3jLWUu06FPoD1h7Sr/q4jNwq3VF4bUFnsdX9TlqzpjqvfX/JcnU8Jxt/RYpBFa6843uEZca2xQP3UHhtUuRKF4NYhZ2zIUMfp9ff9FzT/kD8GnhhYTFFqNK+DCVnjyGrRY/XU/AZPww9CePUSI6Qw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985368; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=evM3bJgzg0o01IMtcO3BFkkA5dz04OO5SQWdXeDF5tY=; b=Av/xqhRo4c8CRGqgHPSp8+mzLSZOgoohtiJ2DQRt3jDjAmj9svaxmiFRPiHByl5diTvgy7NPyZ1HCILsdBKyvwDS+ZvB4gjjYFmyj+/U5+/LyxLtCP+5vStbR3Gg9gUdeNcyNeO6eB1I6I1rEQrFq0JM2U25/czNyMUDxY93qdc= 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 1681985368020720.1084819309367; Thu, 20 Apr 2023 03:09:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAL-0000lR-Sg; Thu, 20 Apr 2023 06:05:25 -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 1ppRAA-0000Zh-EK for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:15 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppRA4-0003rg-KW for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:13 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-2f46348728eso278135f8f.3 for ; Thu, 20 Apr 2023 03:05:07 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985106; x=1684577106; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=evM3bJgzg0o01IMtcO3BFkkA5dz04OO5SQWdXeDF5tY=; b=E5kMW4dEtaeK/e/xgL/bVah802K5YPT5Akd1mZZmZVH2CKXVkjU/iOg7AvlW4U42tf UDg1rxFBXQhWCEKHf9EX/i8uIpQK8vJUcn9+hwcb1Q4GXMH28EQI9oFH8Fzo3UnIskDg 6b92AmbN8b0iazlkFTbloGkrOdvZ3TzvU3pXRFTC3Woaxd9Nf8PNnB2gGnz4aSPee3u4 Oyp9cA06AIjY+9/STSz/Z18FU1+TogSLqEMZGMEQu4zvISIL0i4CiKeCPD6idCoGkkGz SOti1FzRn0dHpqCO7DxGieJdiOFcMhFwNgDtxdz/rkd1lOD225NKVSn/R8URNYMRFfbd fLcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985106; x=1684577106; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=evM3bJgzg0o01IMtcO3BFkkA5dz04OO5SQWdXeDF5tY=; b=AZvGAnGlU3P8P8HTvQVrCQXDQxB5fYLxa9NYJKzkfZiRN/j9efSv8Iy2RRG4kgziPt QZXiE6/iwFhG37xJU6xQD/YtKr3yVSJGfHUcA5XB6D0y9DNuvouOAIb69Jw8CqoQbFl+ 51Lbn2MgkKn+cFwoo8U58ZqXy/9SEa83SO8Ox03G/Ce16vXv6FqToPxJSUGFtT+7eOY4 lrrXJce/syS7QVZuR9OBifXyOw3unI0etQMEDy72KeyYkcxqr3R9wzmvMMQESJVsJ19L nXmNlvG13AFCQTqX4rS5NZeeTZDEnmWDmg36iZMD+vJvkXhKOuGM1NkIfIUx5jX1+6ni I6ig== X-Gm-Message-State: AAQBX9e6MLAuuxCIvxh7ItAaX5UIhmkF9pHd88HxiWca/zh9cLUt5QB5 QQIamYbci49f6jtzPLyi3rRM7Rmp/MdN348PH4s= X-Google-Smtp-Source: AKy350aPlvloBjgDzrkL6edLcs3W5QvtXRqB1KrD+eqWkWxRn9OGE/OFTu6vc7idje/9kccm2ApWrg== X-Received: by 2002:a5d:60c8:0:b0:2f4:9f46:6865 with SMTP id x8-20020a5d60c8000000b002f49f466865mr875329wrt.30.1681985106152; Thu, 20 Apr 2023 03:05:06 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 12/21] target/arm: Pass ARMMMUFaultInfo to merge_syn_data_abort() Date: Thu, 20 Apr 2023 11:04:47 +0100 Message-Id: <20230420100456.944969-13-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::42a; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42a.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985370327100007 We already pass merge_syn_data_abort() two fields from the ARMMMUFaultInfo struct, and we're about to want to use a third field. Refactor to just pass a pointer to the fault info. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20230331145045.2584941-2-peter.maydell@linaro.org --- target/arm/tcg/tlb_helper.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c index 31eb77f7df9..1a61adb8a68 100644 --- a/target/arm/tcg/tlb_helper.c +++ b/target/arm/tcg/tlb_helper.c @@ -24,9 +24,9 @@ bool arm_s1_regime_using_lpae_format(CPUARMState *env, AR= MMMUIdx mmu_idx) } =20 static inline uint32_t merge_syn_data_abort(uint32_t template_syn, + ARMMMUFaultInfo *fi, unsigned int target_el, - bool same_el, bool ea, - bool s1ptw, bool is_write, + bool same_el, bool is_write, int fsc) { uint32_t syn; @@ -43,9 +43,9 @@ static inline uint32_t merge_syn_data_abort(uint32_t temp= late_syn, * ISS encoding for an exception from a Data Abort, the * ISV field. */ - if (!(template_syn & ARM_EL_ISV) || target_el !=3D 2 || s1ptw) { + if (!(template_syn & ARM_EL_ISV) || target_el !=3D 2 || fi->s1ptw) { syn =3D syn_data_abort_no_iss(same_el, 0, - ea, 0, s1ptw, is_write, fsc); + fi->ea, 0, fi->s1ptw, is_write, fsc); } else { /* * Fields: IL, ISV, SAS, SSE, SRT, SF and AR come from the template @@ -54,7 +54,7 @@ static inline uint32_t merge_syn_data_abort(uint32_t temp= late_syn, */ syn =3D syn_data_abort_with_iss(same_el, 0, 0, 0, 0, 0, - ea, 0, s1ptw, is_write, fsc, + fi->ea, 0, fi->s1ptw, is_write, fsc, true); /* Merge the runtime syndrome with the template syndrome. */ syn |=3D template_syn; @@ -117,9 +117,8 @@ void arm_deliver_fault(ARMCPU *cpu, vaddr addr, syn =3D syn_insn_abort(same_el, fi->ea, fi->s1ptw, fsc); exc =3D EXCP_PREFETCH_ABORT; } else { - syn =3D merge_syn_data_abort(env->exception.syndrome, target_el, - same_el, fi->ea, fi->s1ptw, - access_type =3D=3D MMU_DATA_STORE, + syn =3D merge_syn_data_abort(env->exception.syndrome, fi, target_e= l, + same_el, access_type =3D=3D MMU_DATA_ST= ORE, fsc); if (access_type =3D=3D MMU_DATA_STORE && arm_feature(env, ARM_FEATURE_V6)) { --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985192; cv=none; d=zohomail.com; s=zohoarc; b=CW81KotfsMkVscg+zq72o0WHfG/ft7u0qWxFiaLT/eYfGDKejL3lJTDf/nDanlhMLcMCEQ5VmA+GbFlxlxc+lXOpRhBWycIZ4tAfDW+A7uOlq4gPKtNhC3enOIyE5YJ8TN848xowNSKSo2KEZb/KSLb2GHewLh6cH+qkQz7J0Ug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985192; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NO9cU/K25d1+EVnE2I5xYDNNqPgct0OWLItzEhlSFrQ=; b=BWb0eykJqgwDVupjhIymdIL25LKFpFe6SqfMvPFlWM8ZjRfGohMOBgYZHTx/B/cXF7QVptulDNeHOIzMmD8hwJDUEXtvsYbxiwiEGheIa8zxSfCVuJ/i4PwROKMbNi/2mWd/Je2XX+3JJR07FSyF/xnVYQNGaXwxhOUUJCMqWSk= 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 1681985192057615.6259712003036; Thu, 20 Apr 2023 03:06:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAK-0000kj-TW; Thu, 20 Apr 2023 06:05:24 -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 1ppRAA-0000Zy-QZ for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:15 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppRA4-0003rm-Ko for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:14 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-3f1763ee85bso5093915e9.2 for ; Thu, 20 Apr 2023 03:05:07 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985106; x=1684577106; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=NO9cU/K25d1+EVnE2I5xYDNNqPgct0OWLItzEhlSFrQ=; b=W4vKKjIwoBFS5ar6EsfoYykE2AMeWw3jWx1ZcTu8S3EcCuyLjE/7Wc5cAqGVorEBH8 MPuhYsmSUK6chzIL2QM5Ci06fXBw7p8o3MTAK+4Ee4qU7oKwUz0MpD2XT0Y/5amDzNEJ exgpL2DdctfwwOYOUWBHl1kmxmCVbudZ0Wz4kC+4eHQK10+3mirwaIbcGXq4ng8Ip99t sBisCHlbYiIjLOshkuKqUSvYtiy488Db+1Kl56YOsAk4mqoiLcrqCWWPST9uI9cawybd 1tkccLEyPZaO7RSd8B6JvQPniuBRYH5EatbyDBCfCJ4XFBLg/VHzqK3oKolAGGtp55mq rjTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985106; x=1684577106; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NO9cU/K25d1+EVnE2I5xYDNNqPgct0OWLItzEhlSFrQ=; b=hLwwTusncmYE+fiHVI/1qIdkHh8Kthfv6K3YhtPXF5c0JyUaU5dczSVCH8ppOLmh6i wCg+qjMLNUi+uDt1Pge4SAvL96FuCq6k9fngswgv5j/yNxQzJstDQsSWldGHTwvXadlC iwjlqWSTkzOsONf4G8R5VMgX2ucF/AVYsTl1oc4jpzthjBuanRus2zPqs5KS2ZLcmgL4 XP2IXlG18Yi0QJ/84K7EgHmLyuYkHsGrm5sJl2P86nZ2jkwM3Y/oSAKhHPpAHtm5ASKd rIrHqy8MJocII5OmkNj6cJr/vOil5LPj9nJLo/mvgF2EXKkOiJTwhUe1hDQ1zmmWegFR HAzQ== X-Gm-Message-State: AAQBX9d+fTn/eGBLIi2kTsMEnSmOivrgLNKxP3whRJJrCk+XY02+8s+k MvkaEJ2wszAI47UZV1vKrmXMngp0FupQeQA9DQ0= X-Google-Smtp-Source: AKy350bRtqAca6OBtPGBbwnCk6h4fU5b0KSEzT2tpum2sb7O+mkJ0BflETV6I+FJVgs7AsFPeVLyeA== X-Received: by 2002:a05:6000:90:b0:2fb:c75f:8f22 with SMTP id m16-20020a056000009000b002fbc75f8f22mr903525wrx.56.1681985106568; Thu, 20 Apr 2023 03:05:06 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 13/21] target/arm: Don't set ISV when reporting stage 1 faults in ESR_EL2 Date: Thu, 20 Apr 2023 11:04:48 +0100 Message-Id: <20230420100456.944969-14-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.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=2a00:1450:4864:20::332; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x332.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985194275100011 Content-Type: text/plain; charset="utf-8" The syndrome value reported to ESR_EL2 should only contain the detailed instruction syndrome information when the fault has been caused by a stage 2 abort, not when the fault was a stage 1 abort (i.e. caused by execution at EL2). We were getting this wrong and reporting the detailed ISV information all the time. Fix the bug by checking fi->stage2. Add a TODO comment noting the cases where we'll have to come back and revisit this when we implement FEAT_LS64 and friends. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20230331145045.2584941-3-peter.maydell@linaro.org --- target/arm/tcg/tlb_helper.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/target/arm/tcg/tlb_helper.c b/target/arm/tcg/tlb_helper.c index 1a61adb8a68..d5a89bc5141 100644 --- a/target/arm/tcg/tlb_helper.c +++ b/target/arm/tcg/tlb_helper.c @@ -32,8 +32,9 @@ static inline uint32_t merge_syn_data_abort(uint32_t temp= late_syn, uint32_t syn; =20 /* - * ISV is only set for data aborts routed to EL2 and - * never for stage-1 page table walks faulting on stage 2. + * ISV is only set for stage-2 data aborts routed to EL2 and + * never for stage-1 page table walks faulting on stage 2 + * or for stage-1 faults. * * Furthermore, ISV is only set for certain kinds of load/stores. * If the template syndrome does not have ISV set, we should leave @@ -42,8 +43,14 @@ static inline uint32_t merge_syn_data_abort(uint32_t tem= plate_syn, * See ARMv8 specs, D7-1974: * ISS encoding for an exception from a Data Abort, the * ISV field. + * + * TODO: FEAT_LS64/FEAT_LS64_V/FEAT_SL64_ACCDATA: Translation, + * Access Flag, and Permission faults caused by LD64B, ST64B, + * ST64BV, or ST64BV0 insns report syndrome info even for stage-1 + * faults and regardless of the target EL. */ - if (!(template_syn & ARM_EL_ISV) || target_el !=3D 2 || fi->s1ptw) { + if (!(template_syn & ARM_EL_ISV) || target_el !=3D 2 + || fi->s1ptw || !fi->stage2) { syn =3D syn_data_abort_no_iss(same_el, 0, fi->ea, 0, fi->s1ptw, is_write, fsc); } else { --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985215; cv=none; d=zohomail.com; s=zohoarc; b=TI14E643j2HKNTRVsyhSaNeVK5hA7xS8Oy4VoYmVm3TiKmaAhKBgntxydqgiiSgFF98pBKdKP1uTw4KoZraZv2UVWef9EkdVDgxR3YF8GPu8D0D3KaypJYC/vOCIIUMmW61RLICG6bR5h+RYPtLQ/VshBxiiQRAX/40mJtalyLw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985215; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=voz5szJvZiVSo8m5NzDOi1MHXMGYIWpvcJhNz8W52IE=; b=HexbQArWp3sojz5y+HlBqd3BjCjmyNN2Hc38nyr6XU7ZFTOHf4qa+20QXFVb6dTpV+QNzNalA8HNmbPBaSjZN8a3kC5KQ0sLyEJLEibC8R13wO/aNrzcCWfZGqlgNWdnOrINz9KGOOUN/LadtKThPU/u0jNL1lHDMOkEU2w50T8= 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 168198521543575.28226150187538; Thu, 20 Apr 2023 03:06:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAG-0000ej-Fy; Thu, 20 Apr 2023 06:05:20 -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 1ppRAC-0000bq-TR for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:16 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppRA6-0003s2-V8 for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:16 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-2f625d52275so443106f8f.3 for ; Thu, 20 Apr 2023 03:05:08 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985107; x=1684577107; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=voz5szJvZiVSo8m5NzDOi1MHXMGYIWpvcJhNz8W52IE=; b=VSojBVv43AvqQHm7tNBYgxHL0kyWMt2+f0Sd/1xYRoMbtK7wTZOHpVsMr5Klrts6Dv oD92ZlUkVmI9sM3OhWSMk97VFOxHi0Byl7UCiwnURdbSN1pHI6H9BqNnFA/zv180hkv7 inms4NI0JOySoQGh7AZ83aFp+7bLMnjDbqYyiXALwH4SQwlerDT1QIPFetg6SEQxHrI3 mCm/1YuS80IL9FnuQvKelAij6OC29aNbEujuOyuowYum4EzRjVeRWAj/kIWRQbKCxIII onSD/yMZm5TPq9NHcc04ni2qszUFYyCX1xI+bnqJsy3H6blKlEKHKlvhNZqhxXAtKgYZ Ws4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985107; x=1684577107; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=voz5szJvZiVSo8m5NzDOi1MHXMGYIWpvcJhNz8W52IE=; b=LxTVKvWXd3esFwfHtBNl+zB2KHEYtlQqSHhL0s5pzaTLCfxf4CKbDLe0iZqGHQ/9A8 3QgEaX7VPvR9vXeyavQHv/gNyqRgJJud/C91fM7jxjUYDi3u3vNA10JgBAtCHQBBuccs tEAuUT5tV+zRuIorFNm//DDBfZV5pJZ6ufGP6Yvw5Ybo1LkKRhXp/Sbdlxec6qa+oIzG o/5CCS8H5kxG6oepkN+Xy/mNZb2OFN1cLHYpGzWUXIw6Kej+07QW6BxROA1u56KHLhaQ 78zsJk78Z0r59G5RZCFETkqGoffj/fs0p5lFAoereVVigwqTMfKxeYvk/NWQkFdJjlGN 9dWA== X-Gm-Message-State: AAQBX9cnmcc/Zq0FJyJU1K6Wr0pk+WrQ8uQHA2NImS+mmD6A4AfLmVKj 8+HgNwbCk+2nlYeG/Cf/lus+X8xk1NCwJT2/w8Y= X-Google-Smtp-Source: AKy350ZOeapDdXq4/plhglRjiStdhnapziv4G9nyNM6ZEkeD6mX2102Cwa3BCy3Q72IQbqRo5/THnw== X-Received: by 2002:adf:de91:0:b0:2f6:a7a:1ded with SMTP id w17-20020adfde91000000b002f60a7a1dedmr938376wrl.30.1681985107124; Thu, 20 Apr 2023 03:05:07 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 14/21] target/arm: Implement FEAT_PAN3 Date: Thu, 20 Apr 2023 11:04:49 +0100 Message-Id: <20230420100456.944969-15-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.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=2a00:1450:4864:20::42d; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42d.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985216157100001 Content-Type: text/plain; charset="utf-8" FEAT_PAN3 adds an EPAN bit to SCTLR_EL1 and SCTLR_EL2, which allows the PAN bit to make memory non-privileged-read/write if it is user-executable as well as if it is user-read/write. Implement this feature and enable it in the AArch64 'max' CPU. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20230331145045.2584941-4-peter.maydell@linaro.org --- docs/system/arm/emulation.rst | 1 + target/arm/cpu.h | 5 +++++ target/arm/cpu64.c | 2 +- target/arm/ptw.c | 14 +++++++++++++- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/docs/system/arm/emulation.rst b/docs/system/arm/emulation.rst index 2062d712610..73389878755 100644 --- a/docs/system/arm/emulation.rst +++ b/docs/system/arm/emulation.rst @@ -56,6 +56,7 @@ the following architecture extensions: - FEAT_MTE3 (MTE Asymmetric Fault Handling) - FEAT_PAN (Privileged access never) - FEAT_PAN2 (AT S1E1R and AT S1E1W instruction variants affected by PSTATE= .PAN) +- FEAT_PAN3 (Support for SCTLR_ELx.EPAN) - FEAT_PAuth (Pointer authentication) - FEAT_PMULL (PMULL, PMULL2 instructions) - FEAT_PMUv3p1 (PMU Extensions v3.1) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index c097cae9882..d469a2637b3 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3823,6 +3823,11 @@ static inline bool isar_feature_aa64_ats1e1(const AR= MISARegisters *id) return FIELD_EX64(id->id_aa64mmfr1, ID_AA64MMFR1, PAN) >=3D 2; } =20 +static inline bool isar_feature_aa64_pan3(const ARMISARegisters *id) +{ + return FIELD_EX64(id->id_aa64mmfr1, ID_AA64MMFR1, PAN) >=3D 3; +} + static inline bool isar_feature_aa64_hcx(const ARMISARegisters *id) { return FIELD_EX64(id->id_aa64mmfr1, ID_AA64MMFR1, HCX) !=3D 0; diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 0fb07cc7b6d..735ca541634 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -1302,7 +1302,7 @@ static void aarch64_max_initfn(Object *obj) t =3D FIELD_DP64(t, ID_AA64MMFR1, VH, 1); /* FEAT_VHE */ t =3D FIELD_DP64(t, ID_AA64MMFR1, HPDS, 1); /* FEAT_HPDS */ t =3D FIELD_DP64(t, ID_AA64MMFR1, LO, 1); /* FEAT_LOR */ - t =3D FIELD_DP64(t, ID_AA64MMFR1, PAN, 2); /* FEAT_PAN2 */ + t =3D FIELD_DP64(t, ID_AA64MMFR1, PAN, 3); /* FEAT_PAN3 */ t =3D FIELD_DP64(t, ID_AA64MMFR1, XNX, 1); /* FEAT_XNX */ t =3D FIELD_DP64(t, ID_AA64MMFR1, ETS, 1); /* FEAT_ETS */ t =3D FIELD_DP64(t, ID_AA64MMFR1, HCX, 1); /* FEAT_HCX */ diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 6d72950a795..bd75da8dbcf 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -947,6 +947,7 @@ static int get_S2prot(CPUARMState *env, int s2ap, int x= n, bool s1_is_el0) static int get_S1prot(CPUARMState *env, ARMMMUIdx mmu_idx, bool is_aa64, int ap, int ns, int xn, int pxn) { + ARMCPU *cpu =3D env_archcpu(env); bool is_user =3D regime_is_user(env, mmu_idx); int prot_rw, user_rw; bool have_wxn; @@ -958,8 +959,19 @@ static int get_S1prot(CPUARMState *env, ARMMMUIdx mmu_= idx, bool is_aa64, if (is_user) { prot_rw =3D user_rw; } else { + /* + * PAN controls can forbid data accesses but don't affect insn fet= ch. + * Plain PAN forbids data accesses if EL0 has data permissions; + * PAN3 forbids data accesses if EL0 has either data or exec perms. + * Note that for AArch64 the 'user can exec' case is exactly !xn. + * We make the IMPDEF choices that SCR_EL3.SIF and Realm EL2&0 + * do not affect EPAN. + */ if (user_rw && regime_is_pan(env, mmu_idx)) { - /* PAN forbids data accesses but doesn't affect insn fetch */ + prot_rw =3D 0; + } else if (cpu_isar_feature(aa64_pan3, cpu) && is_aa64 && + regime_is_pan(env, mmu_idx) && + (regime_sctlr(env, mmu_idx) & SCTLR_EPAN) && !xn) { prot_rw =3D 0; } else { prot_rw =3D simple_ap_to_rw_prot_is_user(ap, false); --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985337; cv=none; d=zohomail.com; s=zohoarc; b=VmbovsaVsZWDedcnnoIgjt7bxyx1vPsaHYhPu63vMH0x0VQnQkejdA5kTTcWEbaIhmGdPPlPAo6QQABgHMdmj+TjSi1AwObwTzzUDku5BVga66HMAqPObv00axbOk91yAnSKoZv28cB/XAZvou5/WKa6U+HW+d9mmD0e02Rd+x4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985337; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=y4eHg+lCv4M3dXl8nzALTGNTpBxoOVjzDm9hvt3AFK8=; b=ImjwWUC+oLLjSNaQaWALqXT7uu5A1kRvLLG/JhAQT4iEAxruW7pBU0zkWlMlOirVsYLTwNRKimQRW1tWCDjAbW/aEiDN231bBd3LKi5vgrBOTVHtDaj+hoL8vu9brTkFFSiM1cp5aruqynOd2Zi8Jyx+pYXvlqUQWwDimo1gZgc= 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 1681985337279832.3531773831693; Thu, 20 Apr 2023 03:08:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAL-0000kp-AJ; Thu, 20 Apr 2023 06:05:25 -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 1ppRAB-0000a8-FD for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:15 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppRA6-0003sE-B0 for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:15 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-3f17b967bfbso14807145e9.1 for ; Thu, 20 Apr 2023 03:05:08 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985107; x=1684577107; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=y4eHg+lCv4M3dXl8nzALTGNTpBxoOVjzDm9hvt3AFK8=; b=YUo09dt36YzcluJ3C/maJU/HzhYBOLQzbW5iHJUF3VQTTpuyCtnx+6SrTRzXWdv8Um +z63Xh9sGKpJWS+LCdhIW0aI6mDL38bH4J/l5d7ttXuq4aJC9tx+g6H+6va1KTUyV1x5 4Y3qci2mQFD5zxZCA/qm6XPfyjFkm/BkjjHSuuwTuSvOYEjS7xOb+F6g8fFu61PLg+Vi rapgpVrwhHtRxsZn5TfwpqgaGhwFD3F/ywIV6ZmU26UmC/ANggnevGVd3VTLEhl9g1FX 7uW2e8iVMzDt5p0ARWSSy9WD5Nax0ccfaWAqf6B5HmCArV0ShOgtz2/rvIilVOWO/RAq klXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985107; x=1684577107; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y4eHg+lCv4M3dXl8nzALTGNTpBxoOVjzDm9hvt3AFK8=; b=fj0+rXdL5ffrJYF0K2fY+4Vwlv4p1nSyewtuQwIWAXmfDEm1iNiq85WK6gTq8EOYCX uBlER7ZNG+1I7122srrJ9DuECylpe8x01Ie0qs9Lmg4XGH2tcJrO6TpcOw2kRODBgV52 n/vvphlnotC8oRMhTWIsBSZC3vlxT7dY0I5gFVtssI/o2nWNdhZBizU4TDuZ3m1Ck6Dw v9IS98DFW2iVnJsnvX2VQEvksnsK3nA+Zfsk6sM7aFQ/h0hDloaoG2gPV37S3s1WvVao TbisOCpj7rf+0cl+/uhYIJ7V9AXlVEKp1G05R525vSDXtc/NVCLr+zQN2VdbHC+rWXja 6vuw== X-Gm-Message-State: AAQBX9fhTxRTNWOg1sVSAssNROefniuNnvsQzOTwL8Jc5sMTEGAxWKlK c3APGF6pbtgsaIeZ7I8oIynFj4w/UDYYgHkrlb0= X-Google-Smtp-Source: AKy350YOcElvTmS8X4Uux88VF1cCqXKPXRYpwtrIGtHhldX89oEAf63DcApDQTCedkBP2ANAIpQZ4g== X-Received: by 2002:adf:fc0b:0:b0:2f0:2d96:1c5a with SMTP id i11-20020adffc0b000000b002f02d961c5amr979806wrr.32.1681985107522; Thu, 20 Apr 2023 03:05:07 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 15/21] docs/devel/kconfig.rst: Fix incorrect markup Date: Thu, 20 Apr 2023 11:04:50 +0100 Message-Id: <20230420100456.944969-16-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985340077100005 In rST markup syntax, the inline markup (*italics*, **bold** and ``monospaced``) must be separated from the surrending text by non-word characters, otherwise it is not interpreted as markup. To force interpretation as markup in the middle of a word, you need to use a backslash-escaped space (which will not appear as a space in the output). Fix a missing backslash-space in this file, which meant that the `` after "select" was output literally and the monospacing was incorrectly extended all the way to the end of the next monospaced word. Signed-off-by: Peter Maydell Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20230411105424.3994585-1-peter.maydell@linaro.org --- docs/devel/kconfig.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/devel/kconfig.rst b/docs/devel/kconfig.rst index cc1a456edf0..ac9453eba90 100644 --- a/docs/devel/kconfig.rst +++ b/docs/devel/kconfig.rst @@ -274,7 +274,7 @@ or commenting out lines in the second group. =20 It is also possible to run QEMU's configure script with the ``--without-default-devices`` option. When this is done, everything defau= lts -to ``n`` unless it is ``select``ed or explicitly switched on in the +to ``n`` unless it is ``select``\ ed or explicitly switched on in the ``.mak`` files. In other words, ``default`` and ``imply`` directives are disabled. When QEMU is built with this option, the user will probably want to change some lines in the first group, for example like this:: --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985356; cv=none; d=zohomail.com; s=zohoarc; b=WhLXWIsgSOscl0IKDx9eUFumuSJCMMZzUf0Vdgl6IZgYIR8l9mbs+X1jhMKMVsFxXcmEh7hOljFV3/XnH4xRLGWKET3AZIPYt5ptd2OdG4dIRZYsS9S57GptuEWoVgkPifR6Oj/PXp48KxHstmgFRcfi5hCAN2Ue93j9apaAnpI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985356; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QXIl1fa++9Ow0aVWNLQPOb6RkM7apUVyviw4bR4/41c=; b=WsUMXfNSPJ7f3tJ4efaPJ41YcBrCSFIRwsSiysxLs0u3qMPBuSr7TedYbAPlAMNbsIbjmiOTYLPeA6O3ULFNveR45HcHeWRdEgsWExPQwfR83OJy/cTnsR3ppLVw6OVU7okKDnwvi3Cg4uzlQ9E5EmnewI+dOxj6fgru91ICAS4= 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 1681985356052227.2645997087884; Thu, 20 Apr 2023 03:09:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAL-0000l5-Hj; Thu, 20 Apr 2023 06:05:25 -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 1ppRAC-0000bC-En for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:16 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppRA6-0003sK-Cf for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:15 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-2f833bda191so284017f8f.1 for ; Thu, 20 Apr 2023 03:05:08 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985108; x=1684577108; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=QXIl1fa++9Ow0aVWNLQPOb6RkM7apUVyviw4bR4/41c=; b=cySqbOwsypi2Hry+secQVtW/l/aadWE0Zn1uuGHURn166gCllnUKyAJORBsN1SSFSe QCfo1nOWr67c/sEY25b+0Tm2xXffpRlgjzHi06gEjrFoHznHzktkdxWM/DLkqoLPQvG+ nffCLphGQnrE2wkMUE0b14M+ZG/LZXpCMu9bvYbkSHoMrhsvivJJOeCeOmR9CCqDOF1o 3oMc5GugQLLkOebNUvXUWhcdlWx3WHiOD0vJCt/84aJ3+Rfdh1/20IQAZa5Dmth1dZAQ P8YJakp/N3jmE+uXZqW+BamyZzC4MGno9qGgthvh1LaR6zj2GcGIzGUaAE+wRZJymWJO yihw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985108; x=1684577108; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QXIl1fa++9Ow0aVWNLQPOb6RkM7apUVyviw4bR4/41c=; b=SGYRhJopSs3SOo6XLvDoibzh0DZcJhMx87NR0zlzz9WorXOyDVaCfjFja6jCdXsqJ4 bLFmOpwQPiyH+XmnNPPMigLuZYSyXXlUCDbT3Ry3UxpjVrhPApS9B5T6wbhgHEsCS65y yzobUsLbqhQZeF5scZSlTJgZpB8fQBVXPwE9I2Q4+RDaVD2hXE05k90dv+QRQQ3bypV8 9hhAbDYSjhZjCf5yEVHYQ7mveOsPTbrNRZvDRfGMFUo4K9euRsDggmKRI4VsoxYvwNSb 936G5csiiJac2we6JQYkQOHGD73iVBaSMY44kn6kdzuKOBXBPaZWgMFShY+vupp575Lf fJ/w== X-Gm-Message-State: AAQBX9dTYEZtmygGW44pi1/9bt4amuhoAtd0CNfgD8M1QuXe9MJmPbsY 0CxGWykIZnL6mp6qSqlAYJ1lEEG0EjqpL2MpkPE= X-Google-Smtp-Source: AKy350ZcFDxiHpw6FaZS+Y65PbKz6a17iOUPrDjqqsNAOclFSGGfOLZ/EKmyHlqqMurXR/GR3k17ZQ== X-Received: by 2002:a05:6000:12:b0:2f8:5d92:aa12 with SMTP id h18-20020a056000001200b002f85d92aa12mr916730wrx.66.1681985107918; Thu, 20 Apr 2023 03:05:07 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 16/21] target/arm: Report pauth information to gdb as 'pauth_v2' Date: Thu, 20 Apr 2023 11:04:51 +0100 Message-Id: <20230420100456.944969-17-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.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=2a00:1450:4864:20::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985358979100007 Content-Type: text/plain; charset="utf-8" So that we can avoid the "older gdb crashes" problem described in commit 5787d17a42f7af4 and which caused us to disable reporting pauth information via the gdbstub, newer gdb is going to implement support for recognizing the pauth information via a new feature name: org.gnu.gdb.aarch64.pauth_v2 Older gdb won't recognize this feature name, so we can re-enable the pauth support under the new name without risking them crashing. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20230406150827.3322670-1-peter.maydell@linaro.org --- target/arm/gdbstub.c | 9 ++++----- gdb-xml/aarch64-pauth.xml | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c index 13fbe9b0d7e..03b17c814f6 100644 --- a/target/arm/gdbstub.c +++ b/target/arm/gdbstub.c @@ -521,18 +521,17 @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *c= pu) aarch64_gdb_set_fpu_reg, 34, "aarch64-fpu.xml", 0); } -#if 0 /* - * GDB versions 9 through 12 have a bug which means they will - * crash if they see this XML from QEMU; disable it for the 8.0 - * release, pending a better solution. + * Note that we report pauth information via the feature name + * org.gnu.gdb.aarch64.pauth_v2, not org.gnu.gdb.aarch64.pauth. + * GDB versions 9 through 12 have a bug where they will crash + * if they see the latter XML from QEMU. */ if (isar_feature_aa64_pauth(&cpu->isar)) { gdb_register_coprocessor(cs, aarch64_gdb_get_pauth_reg, aarch64_gdb_set_pauth_reg, 4, "aarch64-pauth.xml", 0); } -#endif #endif } else { if (arm_feature(env, ARM_FEATURE_NEON)) { diff --git a/gdb-xml/aarch64-pauth.xml b/gdb-xml/aarch64-pauth.xml index 24af5f903c1..0a5c566d668 100644 --- a/gdb-xml/aarch64-pauth.xml +++ b/gdb-xml/aarch64-pauth.xml @@ -6,7 +6,7 @@ notice and this notice are preserved. --> =20 - + --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985205; cv=none; d=zohomail.com; s=zohoarc; b=DWGMPw96Xklj3l8leN20Z1BlJW0eGa9aTkgHRAHx+mydKjpBuXY6UEkZeKywXxT46A1Xkt7gYuUtWn68dN+ocPJWqI4FToS5ipP5nXGNhR194IyA2GZEq23D9AOIJheeoGOmDhT4wNSfxaCKDffNtgvxSdWmFTw5rFZfkq8V9CQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985205; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=q8LtUQbrNbIcb7AmK/HYZ5o0bALmmnEK3mbIWEsTZ58=; b=a+OipFRoVff0Vk/aEw2j4MbGjPbgQZsS0JLSYuwV3Sm0oo/t1w6AHZifBve3SO6cWgQp7yzLpnUo8dQVVYFozgPu6Rx8/NDEA3wqjxntQyrD8odaQcnDnxCMXIPOQFZUFUOlU+Bex57Z2b+3hQTnAhnM2oisnjzpr0+N5jg/cEE= 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 1681985205463499.735526122437; Thu, 20 Apr 2023 03:06:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAH-0000f1-4p; Thu, 20 Apr 2023 06:05:21 -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 1ppRAD-0000c2-13 for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:17 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppRA6-0003ss-VJ for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:16 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-2eed43bfa4bso413779f8f.2 for ; Thu, 20 Apr 2023 03:05:09 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985108; x=1684577108; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=q8LtUQbrNbIcb7AmK/HYZ5o0bALmmnEK3mbIWEsTZ58=; b=yDCp9XmGgFs0/vv77YflBnI5uYEBYXaazrbCqQDaxJAgCvn1fQYiudiC/S2hGEXVgW abSlxhBUWGhLjo0cn0etGdIZX25SQwbI/S7bTESvXxNXX8Nwvg1kDY9n1npWwTwqteu5 P5FjdEg2AUbR4S5AnETxgG9HB/Hf5aoQVI56oRzFn6UW44bD5nGhZ/IiPZ4rSUVexZv5 qgiW/0QtM2RSPVhttb9Gu6qWn9Jq7rlfR4fWybwYiS9ST3+lYa+z/J3nUKQrNdHrBco3 lwAOdrY9Sg2+uMlzGptmAmo8ov0+Ct2xdQ8ZpLyO9AC9bwbj8lrYFsNWUsrzrfcN95b0 pCXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985108; x=1684577108; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=q8LtUQbrNbIcb7AmK/HYZ5o0bALmmnEK3mbIWEsTZ58=; b=bF6Ooi6H9wUfP+oXhpX0zgB1AQZJmn7Ndxw7OM60HCjp4t9/axwSrzEmegMnm+jVE6 RciM/JTfRa3vnLouJwBXRUsQsVuGwhHIkjEXYucYE9Sa6IivAAn3PKY2Yhiy76oHLwBe 88oEmWd7WnjAJBZvM5fRrhH852O1J+1E+tCUoYf6dGuyCaiYWxXT4lFKuL4rdVR3Rane jtVJ7SrpXPtud5gUa8xZNsjEMgQk8i+h+g0efRbTt63Qe5M0ShX5gA3tYlh9xGzaRofW Dg6fQw8KNpiXDGGRZavNPVNlv5h6eyDfFQm7saEphoy85mNDDdgor2etf14c/qmsssOg Zfgw== X-Gm-Message-State: AAQBX9ecXpdNc3CpUeVUxIU0AQHW47IpN8GpyKcJYlIDJoQctHNKAvB2 ePZJR+IT6E9rc64eRVhodr2iWP75WHQ+3yQqxiI= X-Google-Smtp-Source: AKy350YSF92wrRmJS+nQORAL+qUgJnCe/fmAPXPkCjdOPCnmo+/5pyAg+75sfJybrDnTdYzzQKeKbw== X-Received: by 2002:adf:f988:0:b0:2f4:eb13:4091 with SMTP id f8-20020adff988000000b002f4eb134091mr885751wrr.45.1681985108346; Thu, 20 Apr 2023 03:05:08 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 17/21] hw/net/imx_fec: Support two Ethernet interfaces connected to single MDIO bus Date: Thu, 20 Apr 2023 11:04:52 +0100 Message-Id: <20230420100456.944969-18-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.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=2a00:1450:4864:20::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985207443100003 Content-Type: text/plain; charset="utf-8" From: Guenter Roeck The SOC on i.MX6UL and i.MX7 has 2 Ethernet interfaces. The PHY on each may be connected to separate MDIO busses, or both may be connected on the same MDIO bus using different PHY addresses. Commit 461c51ad4275 ("Add a phy-num property to the i.MX FEC emulator") added support for specifying PHY addresses, but it did not provide support for linking the second PHY on a given MDIO bus to the other Ethernet interface. To be able to support two PHY instances on a single MDIO bus, two properties are needed: First, there needs to be a flag indicating if the MDIO bus on a given Ethernet interface is connected. If not, attempts to read from this bus must always return 0xffff. Implement this property as phy-connected. Second, if the MDIO bus on an interface is active, it needs a link to the consumer interface to be able to provide PHY access for it. Implement this property as phy-consumer. Signed-off-by: Guenter Roeck Message-id: 20230315145248.1639364-2-linux@roeck-us.net Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- include/hw/net/imx_fec.h | 2 ++ hw/net/imx_fec.c | 27 +++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/include/hw/net/imx_fec.h b/include/hw/net/imx_fec.h index e3a8755db92..2d13290c787 100644 --- a/include/hw/net/imx_fec.h +++ b/include/hw/net/imx_fec.h @@ -270,6 +270,8 @@ struct IMXFECState { uint32_t phy_int; uint32_t phy_int_mask; uint32_t phy_num; + bool phy_connected; + struct IMXFECState *phy_consumer; =20 bool is_fec; =20 diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index c862d965930..5d1f1f104cc 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -282,11 +282,19 @@ static uint32_t imx_phy_read(IMXFECState *s, int reg) uint32_t val; uint32_t phy =3D reg / 32; =20 - if (phy !=3D s->phy_num) { - trace_imx_phy_read_num(phy, s->phy_num); + if (!s->phy_connected) { return 0xffff; } =20 + if (phy !=3D s->phy_num) { + if (s->phy_consumer && phy =3D=3D s->phy_consumer->phy_num) { + s =3D s->phy_consumer; + } else { + trace_imx_phy_read_num(phy, s->phy_num); + return 0xffff; + } + } + reg %=3D 32; =20 switch (reg) { @@ -343,11 +351,19 @@ static void imx_phy_write(IMXFECState *s, int reg, ui= nt32_t val) { uint32_t phy =3D reg / 32; =20 - if (phy !=3D s->phy_num) { - trace_imx_phy_write_num(phy, s->phy_num); + if (!s->phy_connected) { return; } =20 + if (phy !=3D s->phy_num) { + if (s->phy_consumer && phy =3D=3D s->phy_consumer->phy_num) { + s =3D s->phy_consumer; + } else { + trace_imx_phy_write_num(phy, s->phy_num); + return; + } + } + reg %=3D 32; =20 trace_imx_phy_write(val, phy, reg); @@ -1327,6 +1343,9 @@ static Property imx_eth_properties[] =3D { DEFINE_NIC_PROPERTIES(IMXFECState, conf), DEFINE_PROP_UINT32("tx-ring-num", IMXFECState, tx_ring_num, 1), DEFINE_PROP_UINT32("phy-num", IMXFECState, phy_num, 0), + DEFINE_PROP_BOOL("phy-connected", IMXFECState, phy_connected, true), + DEFINE_PROP_LINK("phy-consumer", IMXFECState, phy_consumer, TYPE_IMX_F= EC, + IMXFECState *), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985324; cv=none; d=zohomail.com; s=zohoarc; b=auyPISXsA5z56N8r6sCutDaWNSugSiTsMZKb2P1DnyPpxGExdCeSfz//iu4Pj+fro1hlXJ7E+3FhJsMRvdKijq5MrljY1ZvYcomjCwbX2LsNGBiMXsXKoDJQfmykFKDUFyuK7TvwIhWnPL3CnO4R7TpJmNTIVwHe7uiyTpENT14= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985324; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Pzbn4cqrDD/rPP1zQmiL6uq/uryn5Rqdl4z0KRkcO9U=; b=CWY9Y4QsTwT/kfc9YU3k8WlYjq9g0aVi62vncq6WzOp4WWIYTXPDvNuroPzyhCr56U2kj2Up3huI3ue43IfjSqYuis1RySDwor18z7YjfhoZ/KmneCyEPRWe1HhYIte/BZ4EY7fpBSn58EPU7x0u61vbAMH6T+YleK7iZIVPqio= 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 1681985324769763.6441638992076; Thu, 20 Apr 2023 03:08:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAE-0000cz-KK; Thu, 20 Apr 2023 06:05:18 -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 1ppRAC-0000bX-NE for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:16 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppRA6-0003tD-F6 for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:16 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-3f176a16c03so3356575e9.2 for ; Thu, 20 Apr 2023 03:05:09 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985109; x=1684577109; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Pzbn4cqrDD/rPP1zQmiL6uq/uryn5Rqdl4z0KRkcO9U=; b=C0sRrYoJ5EC3NTt7mh+98jfcPWpoFUP+ZDHWuUbUUH2R14MmU+fwqPQVH15DmC3Ka2 m4hDGGa0gnzs6Xw4/CrkIbvtopQAhGDBC4IAoU4uExrwQmHx0yBD1boAZruJ3R37mVQT 5Dw0bhGcWu3WUhLEehP715RzrbzPOaYaEDBDnCzD5nzXzNw10Gz3ZtT9+SNSHjtIpC17 /0rVz+xy15tULVgsDT2S+pYa8TCbjX2lutjHAFJd3ptOpAXolwMwSPJ8S0QnN74MjZUs Ir/1ihP+r4hMkR4qeWd2HlXOy/R5/oYTQoGe2IUq8AlT9UyHHQ+IAEoXSfg8euDQtW+A uLFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985109; x=1684577109; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Pzbn4cqrDD/rPP1zQmiL6uq/uryn5Rqdl4z0KRkcO9U=; b=G5SNjWb76YCqdWVGniEHqs7nTqaSiV5t/0q2J7fXM/JKYSJMKfMhHg1K47yT6c8NPE KX6wQeSE+g94So6MLCDR2JBRhNEMDMvoKax5FXB2NINtuHY7ZvQOLPNv8+3FoyX6q37/ dijwUXqpsfe6xLbamLco75qhAvyOCMWjJnMg+/wu/lwX42o45tzfub7TqNVQLPziGvnk 4V6P+2Pr+VQeQGHnetc6HBE8se/+t30xWGPrNFxg/yUozQtMrbFUh2HpbxvSoMZoLW9g UuSdRQjAyxFKX2v0mugO4lc7mRF8XNLZLlFfGMXm7F6go9giir7rHpaFZSTavJHyWPba wWXA== X-Gm-Message-State: AAQBX9ekF8Da80mWa6Of3zZBOMOsG3jwCqFNtBuMxBwLZE9aCCdMxVcr joODjFqWLZPYdmvhbArWyZOwvX8iANR4F3m+RGI= X-Google-Smtp-Source: AKy350bkgUPTagcnxzsNucc/VWyNXcD0YmbhRvTat6hafDEbHlaCgM2Tk0qAI+X9PP3ZWgrqn3SVyg== X-Received: by 2002:adf:d4c6:0:b0:2f5:a598:33e5 with SMTP id w6-20020adfd4c6000000b002f5a59833e5mr821202wrk.58.1681985108762; Thu, 20 Apr 2023 03:05:08 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 18/21] fsl-imx6ul: Add fec[12]-phy-connected properties Date: Thu, 20 Apr 2023 11:04:53 +0100 Message-Id: <20230420100456.944969-19-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.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=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985326047100002 Content-Type: text/plain; charset="utf-8" From: Guenter Roeck Add fec[12]-phy-connected properties and use it to set phy-connected and phy-consumer properties for imx_fec. Signed-off-by: Guenter Roeck Message-id: 20230315145248.1639364-3-linux@roeck-us.net Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- include/hw/arm/fsl-imx6ul.h | 1 + hw/arm/fsl-imx6ul.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h index 1952cb984d6..9ee15ae38d6 100644 --- a/include/hw/arm/fsl-imx6ul.h +++ b/include/hw/arm/fsl-imx6ul.h @@ -89,6 +89,7 @@ struct FslIMX6ULState { MemoryRegion ocram_alias; =20 uint32_t phy_num[FSL_IMX6UL_NUM_ETHS]; + bool phy_connected[FSL_IMX6UL_NUM_ETHS]; }; =20 enum FslIMX6ULMemoryMap { diff --git a/hw/arm/fsl-imx6ul.c b/hw/arm/fsl-imx6ul.c index d88d6cc1c5f..2189dcbb72c 100644 --- a/hw/arm/fsl-imx6ul.c +++ b/hw/arm/fsl-imx6ul.c @@ -407,7 +407,23 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error= **errp) =20 /* * Ethernet + * + * We must use two loops since phy_connected affects the other interfa= ce + * and we have to set all properties before calling sysbus_realize(). */ + for (i =3D 0; i < FSL_IMX6UL_NUM_ETHS; i++) { + object_property_set_bool(OBJECT(&s->eth[i]), "phy-connected", + s->phy_connected[i], &error_abort); + /* + * If the MDIO bus on this controller is not connected, assume the + * other controller provides support for it. + */ + if (!s->phy_connected[i]) { + object_property_set_link(OBJECT(&s->eth[1 - i]), "phy-consumer= ", + OBJECT(&s->eth[i]), &error_abort); + } + } + for (i =3D 0; i < FSL_IMX6UL_NUM_ETHS; i++) { static const hwaddr FSL_IMX6UL_ENETn_ADDR[FSL_IMX6UL_NUM_ETHS] =3D= { FSL_IMX6UL_ENET1_ADDR, @@ -620,6 +636,10 @@ static void fsl_imx6ul_realize(DeviceState *dev, Error= **errp) static Property fsl_imx6ul_properties[] =3D { DEFINE_PROP_UINT32("fec1-phy-num", FslIMX6ULState, phy_num[0], 0), DEFINE_PROP_UINT32("fec2-phy-num", FslIMX6ULState, phy_num[1], 1), + DEFINE_PROP_BOOL("fec1-phy-connected", FslIMX6ULState, phy_connected[0= ], + true), + DEFINE_PROP_BOOL("fec2-phy-connected", FslIMX6ULState, phy_connected[1= ], + true), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985252; cv=none; d=zohomail.com; s=zohoarc; b=ke6M4j06sj9TU+FTlKOO3VKGhpTje8ADGRpRujNpJ4VfXoPV54mcZ8TvYtYAzDseoySaiXjgKRay4r/Cd9nFs9OJR+pQvw/SnNpvVb2Hlkou4ILpUJA3WvCgTsrjxrLdxOA7hJtZ9iIawpC8tgAwJi+PtZe1qMzg7+TiPrqZjWc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985252; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UUZfejXshrs3SIBhcXosBMyPn1kdvSAUIgMZvHXxREw=; b=bjX9wHMG9HUM6XB/vnYswXl9zJghN0Tq+LsPts3pGHA/Cx2VUoS06Y9snrr2m1+McPoRsO5OBBs7vGmYu67L9bqGsUV/0KNptL9qySt8CzPptHXRqYL/iUoe554sRitNB9toViAc5NVj1jYPs654ejuf6tWREJ7jb5oA0S8YutE= 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 1681985252911222.80582697585567; Thu, 20 Apr 2023 03:07:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAM-0000le-5e; Thu, 20 Apr 2023 06:05:26 -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 1ppRAD-0000cN-FA for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:17 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppRA8-0003tH-B2 for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:17 -0400 Received: by mail-wm1-x330.google.com with SMTP id l31-20020a05600c1d1f00b003f1718d89b2so2823993wms.0 for ; Thu, 20 Apr 2023 03:05:10 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985109; x=1684577109; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=UUZfejXshrs3SIBhcXosBMyPn1kdvSAUIgMZvHXxREw=; b=q3YQIeeIU44SzeAZAYbrDTC0JXeiD7OL4mYayrMRBs5TDgyEw8ld8Fzy7lKpEPtFm9 V1eEzVDsvQ4KYWalS57r9JS+aSrugFunHOv/A+lXIJeVdE/Ar21J92XU+Nd0l4N8y8ro kzHEWSzvGkhNSxGAW9+ZxL3ZvcfO+ZIYw4xr8ricAtfT69i/Lt+HaPfoOO59PGkN7f4P kCWDN3uc09KOoY8xDs4ACHOSwJWyd6gG27bVJaPL/6mX3kXnEPkZYlPvmRQjnAtxDQn2 uiECwe87HK2ysdRY2roGRRbZF03nkwjQE67FcgI8GpTtSJQYQwGoXfSJEr0Bd0J1Vb4x 53KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985109; x=1684577109; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UUZfejXshrs3SIBhcXosBMyPn1kdvSAUIgMZvHXxREw=; b=dUlJmixjsTFlzY64D9aSZlep5e2rpkn43Xaocr6TwrFLNF9ZxkF8oG3Aj+TCTGw36L ENM34y5hwlzHM/J7u3peQGRnm2cZc1W/+DPCPjY/jjWqRe6um6OB9zaoZTI8axTjBmis oxFxHWMtk/JgS1g8ywPpHYbFECR8HLfKGh6qZdn0DlE9ZewVRdjpxjhiU2sULWONCMfy sP8QyZnWoD5E1hAeEOIHt2b0NemgD8ugM29MRKpdTTjacBDSsNqdx3CeKhJoo9hZC4Eh CVLeljzpvCk+5P/76xp+ReY/hKZOd7a+7t3/JIB+yTmk6H0kn7Om5yt6WDUB2aMIMd/o T0TA== X-Gm-Message-State: AAQBX9fFO203+TcCH8qqrGTrq40uGOfnPxsxUui8hJAkEstLT9zLpEIs IAhcpJXmgr6Tdl0ThQtJpHoi6WIEXUPzfCK38Is= X-Google-Smtp-Source: AKy350ZOf2S8HFx8ctrHv/r/DzokMglJqR4bUD5yoyqMG/cjeM61ZNdT4IeL2ltbTEsBi+9YOwFzrg== X-Received: by 2002:a7b:cbd4:0:b0:3f1:7123:fd12 with SMTP id n20-20020a7bcbd4000000b003f17123fd12mr808031wmi.34.1681985109215; Thu, 20 Apr 2023 03:05:09 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 19/21] arm/mcimx6ul-evk: Set fec1-phy-connected property to false Date: Thu, 20 Apr 2023 11:04:54 +0100 Message-Id: <20230420100456.944969-20-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.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=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985254490100007 Content-Type: text/plain; charset="utf-8" From: Guenter Roeck On mcimx6ul-evk, the MDIO bus is connected to the second Ethernet interface. Set fec1-phy-connected to false to reflect this. Signed-off-by: Guenter Roeck Message-id: 20230315145248.1639364-4-linux@roeck-us.net Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/mcimx6ul-evk.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index d83c3c380e8..3ac1e2ea9b4 100644 --- a/hw/arm/mcimx6ul-evk.c +++ b/hw/arm/mcimx6ul-evk.c @@ -41,6 +41,8 @@ static void mcimx6ul_evk_init(MachineState *machine) object_property_add_child(OBJECT(machine), "soc", OBJECT(s)); object_property_set_uint(OBJECT(s), "fec1-phy-num", 2, &error_fatal); object_property_set_uint(OBJECT(s), "fec2-phy-num", 1, &error_fatal); + object_property_set_bool(OBJECT(s), "fec1-phy-connected", false, + &error_fatal); qdev_realize(DEVICE(s), NULL, &error_fatal); =20 memory_region_add_subregion(get_system_memory(), FSL_IMX6UL_MMDC_ADDR, --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985187; cv=none; d=zohomail.com; s=zohoarc; b=Lu74Q1w93tbIWqEs9geRK5J2B0VBGOU8rsc7gATeV7RsPSuKAjRCfUtheleAsqpXT/E5IkhIUkys7aK8rScUxS4F7Lxe4xOcZkwpek80pqoeO4t0DSM8q/VTS3Lkp3O6O4jUMF4FI3T0f0stGb38Q4NftQkfjlocmsm8Alf8Bz8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985187; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SsIzI92Bnfubvao4eevVsX6zp783WFWOJizGT2tAtrE=; b=VnyiqtNZZSAHc+XSsZhPxrKG4KvkkaPEDkpKuf9LomSOUXg5txUYki9vibAgYfayjzgdQldzyF03VDO2+cX0Mn9JvD2xvlidHvOc3C4umLw8Mpc4GMaxyGXmOpGimpr1H/SwvVDLJhJe1noxn8ZfkNUsbsz6JW5Mboa048xinsE= 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 1681985187504960.1048579804184; Thu, 20 Apr 2023 03:06:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAN-0000lm-0D; Thu, 20 Apr 2023 06:05:27 -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 1ppRAE-0000ch-4y for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:18 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppRA8-0003tR-Bd for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:17 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3f189819513so4515115e9.1 for ; Thu, 20 Apr 2023 03:05:10 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985110; x=1684577110; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=SsIzI92Bnfubvao4eevVsX6zp783WFWOJizGT2tAtrE=; b=TYsZtb4nKZA4ZhCXq0JdEfS5P29/b4zYT3Mi5uDVXGlR3YvfsqgQrXBMWvdkBz+9qv LD7GSUBEr4d5gliIIjlWycNJfoFtClbYEo4IlgaH5VjjAVFk8k+q4iACvrlYISR2MWCf btbAO4Jgt9jVBmdtxczLo8rXu/s/uvCVlZmk+CMCFZCjLR7zFW48KZ6OcVx787oy1ZN7 hqwpCfMgEKKCFRCztH9A8zigCgWp0K0exxC9Cnf1Ek7tkldyBiL7uy8qw8NJRbzOe1GR DzDaIZA4bO5KzFb7vTt6L7ohjlxSwm4xu0DqM2YLb5OUAhiDY/UxXamUyxYwWo5lbGot /uRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985110; x=1684577110; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SsIzI92Bnfubvao4eevVsX6zp783WFWOJizGT2tAtrE=; b=iaT7VeB4O8RssILmHTSNbNxbrzQHtVDBE3J+WDjp9x+6SEgfo8uB7OM1grkNRgmC7q SHNLPldpgPXnP3uhMbAg3ec81DMudPGG+Zn9S2glAcFiVkjH9T7k29UcGm13B2Lo5E3Q N66nrbClZ2tU1jEDphNVNjk1LEwbciV+ECo81cSgvGjzDLKF/O/8nv3srUhT0J6O93zl mR6ZetF4yh3GcPFP8gxClPq67F7CqyehW6umdPXbCMKv6obm5PMQOoQnpa5alI67OYSk eMGipwjlWM8TkoRW05EyD2OvPHRYnLde9Nnn3sX7rY37S0UcPq37e2539570zdCCsdbH qmjA== X-Gm-Message-State: AAQBX9cueDjqgHEITg+MctvaXFXVXJ/0YVDg7Z3563g955XA7fBJe2ak cTpnkaY5t+ZYEXT+L64jnXy05k6cYIP967oucVQ= X-Google-Smtp-Source: AKy350YUjnHYNV5yr5udnS3IzQhQ364Lyu4MHnHW8kMgxhChcTg1SxCVLxwMkyO3KrxCfoOOd6xMjg== X-Received: by 2002:adf:ee86:0:b0:2ff:2c39:d06b with SMTP id b6-20020adfee86000000b002ff2c39d06bmr1046172wro.46.1681985109678; Thu, 20 Apr 2023 03:05:09 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 20/21] fsl-imx7: Add fec[12]-phy-connected properties Date: Thu, 20 Apr 2023 11:04:55 +0100 Message-Id: <20230420100456.944969-21-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.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=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985188165100003 Content-Type: text/plain; charset="utf-8" From: Guenter Roeck Add fec[12]-phy-connected properties and use it to set phy-connected and phy-consumer properties for imx_fec. Signed-off-by: Guenter Roeck Message-id: 20230315145248.1639364-5-linux@roeck-us.net Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- include/hw/arm/fsl-imx7.h | 1 + hw/arm/fsl-imx7.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/include/hw/arm/fsl-imx7.h b/include/hw/arm/fsl-imx7.h index 355bd8ea838..54ea2f0890a 100644 --- a/include/hw/arm/fsl-imx7.h +++ b/include/hw/arm/fsl-imx7.h @@ -82,6 +82,7 @@ struct FslIMX7State { ChipideaState usb[FSL_IMX7_NUM_USBS]; DesignwarePCIEHost pcie; uint32_t phy_num[FSL_IMX7_NUM_ETHS]; + bool phy_connected[FSL_IMX7_NUM_ETHS]; }; =20 enum FslIMX7MemoryMap { diff --git a/hw/arm/fsl-imx7.c b/hw/arm/fsl-imx7.c index afc74807990..9e41d4b6772 100644 --- a/hw/arm/fsl-imx7.c +++ b/hw/arm/fsl-imx7.c @@ -395,7 +395,23 @@ static void fsl_imx7_realize(DeviceState *dev, Error *= *errp) =20 /* * Ethernet + * + * We must use two loops since phy_connected affects the other interfa= ce + * and we have to set all properties before calling sysbus_realize(). */ + for (i =3D 0; i < FSL_IMX7_NUM_ETHS; i++) { + object_property_set_bool(OBJECT(&s->eth[i]), "phy-connected", + s->phy_connected[i], &error_abort); + /* + * If the MDIO bus on this controller is not connected, assume the + * other controller provides support for it. + */ + if (!s->phy_connected[i]) { + object_property_set_link(OBJECT(&s->eth[1 - i]), "phy-consumer= ", + OBJECT(&s->eth[i]), &error_abort); + } + } + for (i =3D 0; i < FSL_IMX7_NUM_ETHS; i++) { static const hwaddr FSL_IMX7_ENETn_ADDR[FSL_IMX7_NUM_ETHS] =3D { FSL_IMX7_ENET1_ADDR, @@ -601,6 +617,10 @@ static void fsl_imx7_realize(DeviceState *dev, Error *= *errp) static Property fsl_imx7_properties[] =3D { DEFINE_PROP_UINT32("fec1-phy-num", FslIMX7State, phy_num[0], 0), DEFINE_PROP_UINT32("fec2-phy-num", FslIMX7State, phy_num[1], 1), + DEFINE_PROP_BOOL("fec1-phy-connected", FslIMX7State, phy_connected[0], + true), + DEFINE_PROP_BOOL("fec2-phy-connected", FslIMX7State, phy_connected[1], + true), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.34.1 From nobody Mon May 13 01:57:00 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1681985280; cv=none; d=zohomail.com; s=zohoarc; b=eMG9zW+StGiyxAxXaUUaDqcjs81qxdK9H8l22N+YmM85HCSMLZacvan7SjcBLVRmelud+nqeITS+hqgrz5L6Yi0/g256UBH0Vq1zljvX/2Btofj8KOqkLsbZc1ZdDKgHjdHS4Okx7af5DgRpk5kjaH2+lwvaBnHctVWxdOpbgEo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681985280; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IXETFNmGs9QvQq2m1ZAi/6SAVGC9Nw/XwN7n3Zh6D20=; b=KAKgtRsbPV8kg6Etp7vFiwrXvWaAaQCJtIJiq2nEZ+U172tLsllrRd6O3gR+ni63poj8nirRs9MXb0djxZ6ASxGPtJ71GjfGzAlZQI3H58i1nkuuN2lHuGKjFoISBifL4RmoaRkVIEHei1Kk9ifZjrgBckX9d1KbCKrVaD6+ycQ= 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 1681985280597578.8810960676672; Thu, 20 Apr 2023 03:08:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppRAF-0000eR-Ph; Thu, 20 Apr 2023 06:05:19 -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 1ppRAD-0000cO-F9 for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:17 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppRA8-0003tr-Bi for qemu-devel@nongnu.org; Thu, 20 Apr 2023 06:05:17 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3003b97fa12so281592f8f.2 for ; Thu, 20 Apr 2023 03:05:11 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o2-20020a5d58c2000000b002fe522117fdsm1556388wrf.36.2023.04.20.03.05.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 03:05:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681985110; x=1684577110; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=IXETFNmGs9QvQq2m1ZAi/6SAVGC9Nw/XwN7n3Zh6D20=; b=Hq5RX4Yd7BDCyCKZARmgO8XYfCTT9s9OnXtkE32Op0BVnVvYzHkcGwuZL+VRRgVKnY hQ4XHWFbuaL1PUNvNFQhsPVyZnS/i3IKnTzj0CKQU2L/JxB74o9g2EB+fpL3E40EJLWk 3Tt57h03TjOpD2OnV5XkNEhU8fWS8l/gmTiwU9damo/SUKnUcFKH40l7ZuccZF0XYHZO d1yHp8c01wjyskmrljPdB9oY5jFF+2KxIWRqzwRd11PXfLRZPyouyJKwhuhd12kDa7Qw 6D9uqPEbcp/SMHQarxoPfKSBKnCgXi44HjBRXCsIP+qEfJ6Mj7BxknjSJlzuapUvHou1 ifGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681985110; x=1684577110; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IXETFNmGs9QvQq2m1ZAi/6SAVGC9Nw/XwN7n3Zh6D20=; b=BZtZ2bp5A0QNAU6G80LF3AvOc9bvr1r2EqMJUO49ha+n/+pH2gN7mNl8rG6cI90vTj iD7ajC5C3rsU9SimGsSeJ61h2LVu7XtWHJ5L2D2Lt6T6Jws06Mi2fjOFiS2+oubJZpNF Xt5IVGuH0u5EkS+G7HF2yP4r60YW+ekKl/PKfWJCXcWtoyPeVNESS6C7ZEDJmsShTn+i 2T14vNC8E/o20f9HC7CW2BM9rzWululzxiPeW0TJKz6k3CFqhrRAlcZjsJ/TNhetOYQi l8BUQyFV1BMFFLnjYm5aSUqL1B/1FJzLkBGxjpRAsmZs0ElpZeyucaitJ5wXrt1yJPdT bcKg== X-Gm-Message-State: AAQBX9cjJtXypwD0toaiNbDI/J7T3/zJzhn6fg+QTtQkSK3R7vlmLRHF oqW4ukIN6Cs7Imu9f5RSgA9s6gIo08wjK+pVS0o= X-Google-Smtp-Source: AKy350Y4ba0jDnMcZtY2VCgQkYmt1Sg6KUEPNP3GWoLGLEMOgTl3/WiB20/1ZjFnjd380v0HAckbgw== X-Received: by 2002:adf:fd81:0:b0:2fa:ac8:a30c with SMTP id d1-20020adffd81000000b002fa0ac8a30cmr931025wrr.48.1681985110213; Thu, 20 Apr 2023 03:05:10 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 21/21] arm/mcimx7d-sabre: Set fec2-phy-connected property to false Date: Thu, 20 Apr 2023 11:04:56 +0100 Message-Id: <20230420100456.944969-22-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420100456.944969-1-peter.maydell@linaro.org> References: <20230420100456.944969-1-peter.maydell@linaro.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=2a00:1450:4864:20::42a; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42a.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 @linaro.org) X-ZM-MESSAGEID: 1681985281701100001 Content-Type: text/plain; charset="utf-8" From: Guenter Roeck On mcimx7d-sabre, the MDIO bus is connected to the first Ethernet interface. Set fec2-phy-connected to false to reflect this. Signed-off-by: Guenter Roeck Message-id: 20230315145248.1639364-6-linux@roeck-us.net Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/mcimx7d-sabre.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/arm/mcimx7d-sabre.c b/hw/arm/mcimx7d-sabre.c index 6182b15f190..d1778122b64 100644 --- a/hw/arm/mcimx7d-sabre.c +++ b/hw/arm/mcimx7d-sabre.c @@ -41,6 +41,8 @@ static void mcimx7d_sabre_init(MachineState *machine) =20 s =3D FSL_IMX7(object_new(TYPE_FSL_IMX7)); object_property_add_child(OBJECT(machine), "soc", OBJECT(s)); + object_property_set_bool(OBJECT(s), "fec2-phy-connected", false, + &error_fatal); qdev_realize(DEVICE(s), NULL, &error_fatal); =20 memory_region_add_subregion(get_system_memory(), FSL_IMX7_MMDC_ADDR, --=20 2.34.1