From patchwork Tue Apr 8 18:55:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 879045 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp5636196wrs; Tue, 8 Apr 2025 11:57:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXj4j4uSaZ+8fzrOBThxFP9tz8Fk16V7hoWmDKjLw6O/13HKN2bVbOkeGxzd8ZBImckoTGWcA==@linaro.org X-Google-Smtp-Source: AGHT+IHvdqhxPhTp+ck5apC58ZO1q1diJsZcxwi12kHk01UMja8udroObZthHaQD9lWGaRfD32Jj X-Received: by 2002:ad4:5bca:0:b0:6ed:1095:e9d3 with SMTP id 6a1803df08f44-6f0d254f9c3mr55168766d6.14.1744138637124; Tue, 08 Apr 2025 11:57:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744138637; cv=none; d=google.com; s=arc-20240605; b=Q2LP4XR3Ke4C5060PN7UOT3aFJ+5M6LXsoI7107AzQrHRav2mloqAEiaTnGOW9dfza E4jhjTHK11M8EENp/gBE6BtFqA4SGXKdSSJBTVaiboUYeXVse1c8Rak1GjORVBBDRs6b rZQ4572wkrqLfMfgwjyOPtOkR/LHbthW2k+xP7kv7aJVA+o+ESgfihCmPMl2PXMlNGZe VImZxAv9HGtP45cD1uAZ+QU5VLi9cZb6g2LANF3SQbWDBsdC93SV5f0XzaTJYBuxMD/l BIx3ED7TCUBQZ80r2J87T9dXWqnSxs0QNo6QKKAEd1lg7jvmjdLSJNMPKwtUXmmyZ/yA 17Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8jJkudB3uEF57VonwdP4mQn1d0+k2UD0Vk/ydRhbRYA=; fh=ts9Woq1GVgM5blBp7PjHVEHrE6VqulrUBCswKDtwIas=; b=cwS3xySgV1iqr5EjQ7ZzMtTdnVWPFeJYBwVLRa6M3n0tfjblkGPfcWPoJ0/un2ruCu utwGBj+pwXGRbl/2gzkcIBuxG73L20pns2VgE8+ZbSMAuhUr022/u+E9H8xj2Pd5B9QD XZAqOZyRphd8RlMe1yxhlbfD4TdnVmpRUtSo7g1onyAnnu3to7Rho7sddkmFu+2fdJUO 66GBcnqxIKnunpihR3i9NGac/r2N6ftgY2u4z/Q77CFZGWpMxMnzlTlaDJpBEst6n+nx hP/RQEABCMcF3a+woA7uPAQAkEk3mosaF0LR4X4y/oi3VvTSq2cJ4yFlOKEgdFQ3/4VG KfWg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FYUzL5+B; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6ef0f13b38bsi107609646d6.373.2025.04.08.11.57.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Apr 2025 11:57:17 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FYUzL5+B; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2E71-0004Xv-UU; Tue, 08 Apr 2025 14:55:56 -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 1u2E6z-0004Xc-KK for qemu-devel@nongnu.org; Tue, 08 Apr 2025 14:55:53 -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 1u2E6t-0004Ci-GK for qemu-devel@nongnu.org; Tue, 08 Apr 2025 14:55:53 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-39c0dfad22aso3657140f8f.2 for ; Tue, 08 Apr 2025 11:55:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744138545; x=1744743345; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8jJkudB3uEF57VonwdP4mQn1d0+k2UD0Vk/ydRhbRYA=; b=FYUzL5+Bypn03HIsSzO5PgZ/0yw9ht/uSzw5fM+i/FulhGLydKcWht5/eEDUELarWh 73kNmbbJSRJwIf0SGu34cWmZC7oGaPHqZS/n8/UNuQcMY0142JgIIFe/uUVZ2cROoyZR t6N5lWteirmITheqYOFf4SgI2QFEgi2n8DYJuiRW0AgBaaom9Ff0mXd3B+w3KZ6uwgDb duQYLjCz+AgWbJOJ1fe6XWE9D48HZczjLn+ninEBZAd8gRT2AEjQm6u3FElRQU2eXFsA Z1g543Jtcbw7naTwOyp6UgLMnKT2/okcqmWAEqXLRwsd/JxGnTYVrbe5dGvC0DQte2nK ueoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744138545; x=1744743345; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8jJkudB3uEF57VonwdP4mQn1d0+k2UD0Vk/ydRhbRYA=; b=cqWzcgrbeM2zdbHJj4rW4Eh4ZKnEvykWbiHuom2jZZGjatXdzLq9XwDt9fUAp8LQS4 pAD4F+I1M1qVbuChmrgOPUGtWDvY5e41sW9e+a+AV1StxQC1vdNnGXMRxXrz+UyUiUjK C8SJXK7S8Mo793cZHea5hG2/bUZ91I67ylZvqFXeiurx63/nAH3voy+UOQQL9il0IfDV pprZwXPX/RG9Vtot8/N1HuJpiHH1S5rFs5esRtM1R5BGD1L/o78CQh2vJRI/ezvMZgmu vh2MdN7fRD3SOZyau0DnuLuoSPf5hava5fEkf3YdYTTczE+lPn2jz5hTzoR+F4luc10y L7Jg== X-Gm-Message-State: AOJu0YyNAu3ablBArjIGAiN8mXjb9tFIN5yMSaZ+OriVQxDixxhW/awc A88Cu2iuv9gW6VNnmVap2wJky/wEiGVOQe6Kyna3zeXc1knrvEs9MQK50Nv5Ox2MS5gPxE4jLWE 0Ap0= X-Gm-Gg: ASbGncvYXm9iDJp5RGQrojFYek/yFh1b6tt4Kz7r8warnslq0r/J/MInjsK4B3BDLC1 Zs6qZLVLpi6Pgh4YVrUeih1STMUZxRuD9Xz23ZEMEoBrGVshBgOlCjSY8rVwcIAK617JiOPfdw+ e0yVrfiFWoqpfneQCEFZqpYNK0IqX1w6vYs9fGo6UzsRY25ESa7H5Q1wmeelZltdCKx8MRqyC4U /LEumMqoekCtXstRzMcR5dCGiCB97GBk18nWHam4tDjPYWK8nFzSSYVjimEC0n+PZhQ+RUdINTJ 9xQdLC8VJA1faFtYKXgvUd0IjJTTsQvJYgnPwlyk78YMuExvC+bIa1y1hd/Pc0RiDBg6qV21EZ+ yklInrY/Nw7j22yujxEBXhvwHSoEvrA== X-Received: by 2002:a05:6000:381:b0:397:3900:ef8c with SMTP id ffacd0b85a97d-39d87adcb11mr255946f8f.35.1744138544792; Tue, 08 Apr 2025 11:55:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec1794efesm173791295e9.28.2025.04.08.11.55.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 08 Apr 2025 11:55:44 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Daan De Meyer , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Valentin David , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= Subject: [PULL 1/8] smbios: Fix buffer overrun when using path= option Date: Tue, 8 Apr 2025 20:55:31 +0200 Message-ID: <20250408185538.85538-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250408185538.85538-1-philmd@linaro.org> References: <20250408185538.85538-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Daan De Meyer We have to make sure the array of bytes read from the path= file is null-terminated, otherwise we run into a buffer overrun later on. Fixes: bb99f4772f54017490e3356ecbb3df25c5d4537f ("hw/smbios: support loading OEM strings values from a file") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2879 Signed-off-by: Daan De Meyer Reviewed-by: Daniel P. Berrangé Tested-by: Valentin David Message-ID: <20250323213622.2581013-1-daan.j.demeyer@gmail.com> Signed-off-by: Philippe Mathieu-Daudé --- hw/smbios/smbios.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 02a09eb9cd0..ad4cd6721e6 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -1285,6 +1285,9 @@ static int save_opt_one(void *opaque, g_byte_array_append(data, (guint8 *)buf, ret); } + buf[0] = '\0'; + g_byte_array_append(data, (guint8 *)buf, 1); + qemu_close(fd); *opt->dest = g_renew(char *, *opt->dest, (*opt->ndest) + 1); From patchwork Tue Apr 8 18:55:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 879044 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp5636109wrs; Tue, 8 Apr 2025 11:57:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV2x2Sb+EVX99k6amFVyK2LtwzQQE9xliBvz3Ms95uNwv1qli6gTV6Q+l5RNZ2nOBUtz6nlhg==@linaro.org X-Google-Smtp-Source: AGHT+IF+D/e6IyOFca9J7yrarkQ5OozMdsJCdZ2jJxsAcD20kneZA63ZbYoESTnN4ZhroLaUpF/P X-Received: by 2002:ac8:7dcd:0:b0:476:639e:edf1 with SMTP id d75a77b69052e-4795f2dda2bmr979981cf.23.1744138622441; Tue, 08 Apr 2025 11:57:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744138622; cv=none; d=google.com; s=arc-20240605; b=hbksZgjBSAfZG5jr4haDR4kDj7Dup8nFJwQpziHKsM+V2L+cCEOf4mYGm2LgkohGsP fMjCuyLnFZWZPG7M/P/mCqD8qobtm0uJn5+TCevFXxBkhMZb8ou3riJpZM//tXDdMRnI E4UFjN6npDK6jq71b160baAoBxg2Y+TkulPPv8KUUQHQ5qy1drLF8nLnxWE1MU6sgTM8 Sox5hJ6JZ77Ax728nOQiiIVz6EL4MHT4U2AhWyZuPyVMlxJh0vPOqpV25fG4FpdjzGZb ngyY+sqK/4GKb+X48HTt9/qr4YGaCR6XD4PBPJG2Tj90NNjDZpL9CWAE7HWHSr58oaIf VNxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=gHTmarhdzx/+kGuibyF5scVpYUQxoz4xhKrDhSMfcxQ=; fh=pRKhRQ5C8okbjnnEhRSvEkj5whlgEuxk3RJlYTtO6/w=; b=kQ5ZGYR+dv7So7sgTwMgT+j05xmVRVK7gIPXro7ybTypK4kXSYsj7egD03Ndy7IpQG v1ocdH+WPZeeCDCNT7d9s144hLC1Wd9XZFpax4n23aexiJReP23oV4tXrcTV3NH5REWW tMY+BYIJovBd6PBFZJoDOyTivsKL8Jh4n55dbndpr+TrrQYsqs2WiHggJeSPXwxS9wyE auX3fnGZybxmG7BO+9iqXGXf07d6lhpKGFhfx0N5iuCODw+Lmg0PCwho/cadGqFNE4rd C1v4sxAMOW7u0V4yeeVGjcNbmBBLt1nClXispwKDC1PgGlnbwUY1KF/zrtJbzCAT47wg 9g5w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tdE9NBVU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4791b1c3a51si107151741cf.523.2025.04.08.11.57.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Apr 2025 11:57:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tdE9NBVU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2E78-0004Yp-6L; Tue, 08 Apr 2025 14:56:02 -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 1u2E71-0004Xx-V8 for qemu-devel@nongnu.org; Tue, 08 Apr 2025 14:55:57 -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 1u2E6x-0004Cx-Od for qemu-devel@nongnu.org; Tue, 08 Apr 2025 14:55:55 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43cebe06e9eso40398255e9.3 for ; Tue, 08 Apr 2025 11:55:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744138549; x=1744743349; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gHTmarhdzx/+kGuibyF5scVpYUQxoz4xhKrDhSMfcxQ=; b=tdE9NBVU7MaQwfuVml2H3+LQ9l/leoMiTqL7eegQLjFKHVwHlha5f0qesDdJ6/fJxn FtqqKNFpphYJILbX5YhMIVDTI+n37rqmZBmz/yxU+xmlFjBkylDMJNYv3fcTKk+HQfAg btKHgeQPhIb/g/f8lmMGvUiYkjZ/CfmbsP10Xee/U3ZRKqghspAvnMTHqeL2vsJR1qHk 4AG0J/5u8yyeCpy2EOIDVhbheU0himqsagt2F0CUN0UTjduJqafDqiM4c4nlRVdMJnG4 Bl7qxRwdcZxVBpxUZ4pdYpFztCdeNoWg82/5cW5+SSKNVsw3P2DnN0s0fHJOQh0jt7cK FETQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744138549; x=1744743349; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gHTmarhdzx/+kGuibyF5scVpYUQxoz4xhKrDhSMfcxQ=; b=SVWmGGlPV/efxXpR2uOe6+vpE/LtCpETYhemyc3dj8O4LXRJZZRwSuTxt5Qc5g/SYb 3UNpOs9k/vu1FidV6nLnxhoLQwxgTEsF9ZQqTAH8Tj6iadGBnOalh9w4hLEVuuQ8b5Js MesKIp1CiR+XOuH/OSny0hR41Zzj/22o+tKzSJBXg5OkUJB6GV9uIPMPgIWPENDbnpzP lKqfaIZDBw0yzeTmu+Xfbdh8WTB1ct5XHtsOQJlyfkRncLGGxGSzjG/2HIHDOrbIZ4Uo QRS5ytA4fmqv5PbiC6Ujd1MF3GpNxRJdSGRUO+BPbcK8Ew/cuAVlgRu/m8SgXRTT6opV VbHA== X-Gm-Message-State: AOJu0YzTCv3ejxHzUi7iD2pEllV+jfC1oeCytalU4kZCFjlp/yWw7QJs 7xOVw4jVYP5aGHc2JyjfIVH2ftc5C+z5+xAqkSicU4ar9PaQxLLaOl0i98gcAJw4J3Q34Vdp/28 0vno= X-Gm-Gg: ASbGnctVw58Hr3WrXneHtcSWdv6rPertrVQXSX08Ok7cmbvaNWT2Z5C5vEGlMxfhlQM iaDMxR1DNE/jGsfAwJp28J+Dxzy9E+0QFoWYlDCsI4yW+QNPRgHmraavJ6kLp1TDcElPhCvyLyu 2AslDKSL10WkW4L+1UU2vUJdSHbOVH2IzHo/LyfHEz09JoTcE1mZXPRy0imBiAxyC37+ZUfDi1I SPVSlg0jUhNkwOWA/lXp3SONIgTN7ahkD29BRUOjExyV+sEea3y572lcXS1ZwbkaUebHTsjS6YN pUySlAM4chN0ESre1YYhVNww56ci+0By03QvUGIzo/ZVS2E+iuYSQ0xfnqIU/1f3wu5uHWCRfad dUaZrTW7+sR7Vivma3i4= X-Received: by 2002:a05:600c:1c02:b0:43b:ca39:6c7d with SMTP id 5b1f17b1804b1-43f1ec7cd2dmr2584905e9.3.1744138549410; Tue, 08 Apr 2025 11:55:49 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec1663046sm175470495e9.13.2025.04.08.11.55.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 08 Apr 2025 11:55:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Joel Stanley , Alistair Francis , =?utf-8?q?Philippe_Mathieu-Dau?= =?utf-8?q?d=C3=A9?= Subject: [PULL 2/8] hw/core/machine: Fix -machine dumpdtb=file.dtb Date: Tue, 8 Apr 2025 20:55:32 +0200 Message-ID: <20250408185538.85538-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250408185538.85538-1-philmd@linaro.org> References: <20250408185538.85538-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Joel Stanley In commit 8fd2518ef2f8 ("hw: Centralize handling of -machine dumpdtb option") the call to dump was moved with respect to the init of the machine. This resulted in the device tree missing parts of the machine description, depending on how they construct their device tree. The arm virt machine is missing some PSCI nodes, while the riscv one is missing most of its content. Move the dump to after the notifiers have been run, allowing virt_machine_done to be called and the device tree to be fully populated. Fixes: 8fd2518ef2f8 ("hw: Centralize handling of -machine dumpdtb option") Signed-off-by: Joel Stanley Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20250401041509.719153-1-joel@jms.id.au> Signed-off-by: Philippe Mathieu-Daudé --- hw/core/machine.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index f52a4f2273b..63c6ef93d29 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -1731,12 +1731,6 @@ void qdev_machine_creation_done(void) phase_advance(PHASE_MACHINE_READY); qdev_assert_realized_properly(); - /* - * If the user used -machine dumpdtb=file.dtb to request that we - * dump the DTB to a file, do it now, and exit. - */ - handle_machine_dumpdtb(current_machine); - /* TODO: once all bus devices are qdevified, this should be done * when bus is created by qdev.c */ /* @@ -1750,6 +1744,12 @@ void qdev_machine_creation_done(void) notifier_list_notify(&machine_init_done_notifiers, NULL); + /* + * If the user used -machine dumpdtb=file.dtb to request that we + * dump the DTB to a file, do it now, and exit. + */ + handle_machine_dumpdtb(current_machine); + if (rom_check_and_register_reset() != 0) { exit(1); } From patchwork Tue Apr 8 18:55:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 879042 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp5636093wrs; Tue, 8 Apr 2025 11:56:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU9sPh2bN/BCz35g7kKj7RRvYhCKHbONjh5Z9yUB+UC2AWv+oXeKORypWanPJb03P2jtBQvzQ==@linaro.org X-Google-Smtp-Source: AGHT+IGnktCyN7CENn+PsPO9ja4X8i2ibuZdTv7onc2HzFKLInRnDsY8IPOqjVXgwOJIdyQloXEO X-Received: by 2002:a05:6214:f24:b0:6e4:4676:85c3 with SMTP id 6a1803df08f44-6f0d250e927mr54554506d6.11.1744138616702; Tue, 08 Apr 2025 11:56:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744138616; cv=none; d=google.com; s=arc-20240605; b=OmPN3Hr+aOm6vkfYvlHkefgrLLADNJNdZIBHbvLYwUWE7YSL5Rh8mnUqsh6DJcIY5M 8qs1NH0DAdaU1bpreJgled9dEKr7a1TO7wKfP1nbQG8Szly4N7BsMbbjeGTDOspS4BN+ E0rhsIN8BlDNBTtueG2mjs8B4aX06FzOjYugftPNT18BuIETS8tMdXZC78LDckvCSWU4 BsJNPZ+HlSYcQ3IEPZ3xwkM1o/zqHUKGfci711EfegYb+QbktahZNDo2N3PPJN6YJVbg A1pATVAJNVBYrgS+dIjSxw/yU3POld6w2SsYdUXWBwhqpRKPPfhbPkjrKPsUPasc3sKP 4MKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GGo0+5f/HLAe67bUnyFSuZNNk2QAFIW9Hf13M3Fh2as=; fh=iHfO6z0CjEmj8McO3BrVTxIM5Li8qLwE8miFR9icIos=; b=Vtma3dyPIZrFRZgOk2lzSHwNSX/ZijWY2LRsmCNX1JFfgU0Bxg4pRAtsxhnwxias0u ECt6V2/5Zhip3BP7N67beb7r5M5QSpITNTmymGxDW38BB+MDg4wnWvqfcHpVB7GPwbxf Px+/s0te0rzzNr550mJZOd4TjxnhOgB3v3/3UWJ/CwsMgEz24809j1VjwPIOiO3c53Dj q7jkl3QtQj+Ii6rcTNFFdF6LY3RDf3ahilCMsAGbDoXpQlxEft3M7aBfJ5vsI95EZxk3 1lsUmxYZaO1Jm1AGDWsXO7pzuWjpHEJzqHUpXbZdmLleRarKY08fZRRpPYi1jSILnMef bX9g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CQ41GpPe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6ef0f12a4c3si113798306d6.360.2025.04.08.11.56.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Apr 2025 11:56:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CQ41GpPe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2E7B-0004ZI-2i; Tue, 08 Apr 2025 14:56:05 -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 1u2E74-0004Yn-MS for qemu-devel@nongnu.org; Tue, 08 Apr 2025 14:55:58 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u2E72-0004DE-7k for qemu-devel@nongnu.org; Tue, 08 Apr 2025 14:55:58 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3965c995151so3000197f8f.1 for ; Tue, 08 Apr 2025 11:55:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744138554; x=1744743354; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GGo0+5f/HLAe67bUnyFSuZNNk2QAFIW9Hf13M3Fh2as=; b=CQ41GpPe57C4/TVDZA/mBMuzT8JxjzIEoTlG/fvFPVSeXVkT6pQO4KItMo3i5q9Ccj LjKo/+1VtFAHU5rlhlRStkiIl+0DZ6TgayPeOQD90C8sGbQaLVuWkB6AS2MPXQSvcIqO utmsvOL+wUwLkpVWVEZC8Qk+6+yiKKfXEI9n6GcNU2l0oH7vXH/LYYHar6HJdrdsiWKW bBlIaYVBBq+zlIeHZL65TaFL3UGjJ3Y+kwTtKb4IpiSuzdSJlvrppa07jNUN9mGNBotd hnmZDK0B1HkVKS5uJpdg7YVQHhPKjXsoKf8G24c00hICk7OxQ/OPJuUZVrkMe32M1fHq uU6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744138554; x=1744743354; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GGo0+5f/HLAe67bUnyFSuZNNk2QAFIW9Hf13M3Fh2as=; b=Y+pN3ciFTxDk1E4UUjE8MnJED8253csgr1Zk9w4qverwTZAf7yqej65rVOYrpRlo2w 2HwfHqp0BeSksUelmpDTgiS4LwIpplPNklthhTK6MI71KBCqGQYPHyCNwUFg7+hrto1z Aq7r/+L/KN6BeFY77I5UMqhamouQCVfAHXUQzUj5R8Tjmeee8OAX6l8KsLEbxkAH1WaC 1OWmumQPwXQ+h5jN1VrTKDqpFyNTww9d7KvTLhJEs006+emliFYjZdPe5PpNzNqmlnN2 EM6RPj7VsKsuzEsNY003lj/fisAcqt0ZcKIQwbTNnp/7266R16JW/+7jbOHpXlrXsQh6 iMGA== X-Gm-Message-State: AOJu0Yzk++RhquF4It8gN8vFImUgbl8a1guakQ1rdANLKNZd9zUK2vsF B8o85TywD0df+O9nSmkSuI13EfoKcORWgwLlsrbNr09LrxgkTQLMBhsSLMEbAqXjQLp76B/OtGj JTdI= X-Gm-Gg: ASbGnctyXAwNtL/Dnw9ciSX9gtOpb1/cDdaSf3pfT2OzKTEKni83axKQkZTr7m2QD2c y2sHFPQxVdQ7nCMUM3GCF9qIRbr4F4eK9cXXxWwedb5FETzrn/Oj++pdAgc/qhJ20WG41NLyAxr pgxyHrxoxdpFR2zn1p6GLpgD4ukZyt/SlevpNu09gOaWPVU/RkVv436hqH/HqmIxJIwRaqwW8CC w9/0q4GZb2AqxKZjPaWeSCOw0RUy8RsDPvG4DLdW4LLigxYQ7dtPf5+6nnWC05yRpDDlHIOsjck wWTcxYa3I0zRzFMMLjdQX1/Jen+ryDOA/HvdJ4redBbEDkzdR01CBU2erg/n+BDxLeceEPRn1d6 ZnMbXpWPhYcoyMpR0spffel5YD5X1XQ== X-Received: by 2002:a05:6000:1863:b0:39c:12ce:67d with SMTP id ffacd0b85a97d-39d87aa1cc0mr292951f8f.9.1744138553973; Tue, 08 Apr 2025 11:55:53 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec1f27a55sm173079115e9.2.2025.04.08.11.55.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 08 Apr 2025 11:55:53 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhang Chen , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [PULL 3/8] docs/arm: Add apple HVF host for supported guest CPU type Date: Tue, 8 Apr 2025 20:55:33 +0200 Message-ID: <20250408185538.85538-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250408185538.85538-1-philmd@linaro.org> References: <20250408185538.85538-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Zhang Chen In my test, latest QEMU already support Apple HVF for -cpu host and max. >From guest VM lscpu: Architecture: aarch64 CPU op-mode(s): 64-bit Byte Order: Little Endian CPU(s): 11 On-line CPU(s) list: 0-10 Vendor ID: Apple Model name: - Model: 0 Thread(s) per core: 1 Core(s) per socket: 11 Socket(s): 1 Stepping: 0x0 BogoMIPS: 48.00 Flags: fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp asimdhp cpuid asimdrdm jscvt fcma lrcpc dcpop sha3 asimddp sha512 asim dfhm dit uscat ilrcpc flagm ssbs sb paca pacg dcpodp flagm2 frint Signed-off-by: Zhang Chen Reviewed-by: Alex Bennée Message-ID: <20250401083102.72845-1-zhangckid@gmail.com> Signed-off-by: Philippe Mathieu-Daudé --- docs/system/arm/virt.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/system/arm/virt.rst b/docs/system/arm/virt.rst index adf446c0a29..6a719b95863 100644 --- a/docs/system/arm/virt.rst +++ b/docs/system/arm/virt.rst @@ -70,11 +70,11 @@ Supported guest CPU types: - ``cortex-a76`` (64-bit) - ``cortex-a710`` (64-bit) - ``a64fx`` (64-bit) -- ``host`` (with KVM only) +- ``host`` (with KVM and HVF only) - ``neoverse-n1`` (64-bit) - ``neoverse-v1`` (64-bit) - ``neoverse-n2`` (64-bit) -- ``max`` (same as ``host`` for KVM; best possible emulation with TCG) +- ``max`` (same as ``host`` for KVM and HVF; best possible emulation with TCG) Note that the default is ``cortex-a15``, so for an AArch64 guest you must specify a CPU type. From patchwork Tue Apr 8 18:55:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 879040 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp5635999wrs; Tue, 8 Apr 2025 11:56:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWp+gwWeLutzRXCmxMJsen+3HhbOpshvf/9FWv9o8P2bsabZOBQnGPZbVpJe7CFPsJiQLV8uQ==@linaro.org X-Google-Smtp-Source: AGHT+IEPAARvWzFbumSeEng7omLyPWDYEPTKQ2OfzgJqhfxJmgI8dP5cZfFZ4AOvfsX+eC5ABCHs X-Received: by 2002:a05:6214:501b:b0:6e8:ec18:a1be with SMTP id 6a1803df08f44-6f0d24f8224mr68937736d6.7.1744138598435; Tue, 08 Apr 2025 11:56:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744138598; cv=none; d=google.com; s=arc-20240605; b=a0J7dqKuJtaaoP6+HkxRgVv78WJj426MywenI/5BWzdXdK3zUINMYeWqX0jPejc8l9 TfaJVCi1GE3++ybFLaGj6oZmhCcCuFcYpoQxub4C2gNy//iVDdPQBz3xJ33rthgaX0Cw qeXy4tF7jZ/6RMWeDdmWMwmJ225nohh/Mf1HHEYdeJ3w0ci1H5ONlikUMv2AR0pqqTHj YdpTSAXpFptS6rgkbTUYIgkBaLTB4bIZ6ANxKfZdDx1uDmvDPWs3a4dpu5JWE9bfTFLa cw8Lt1Vs1vgno8lTaoJKcZ3ivmU6OrtjauYt5VzNhDd3U2jTG093VScE+53R3LmLX1b2 c8ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FoWrz4Js4MOELdrFFu3ZPYaMj4eI6d7oY8aA0ah1zNc=; fh=qiPfHDOAZGHNWHa3eASdRC6GKL4KnKON2tlNUULhhhM=; b=WPYRlE13W7QLzburZbQGQ7et/w2UN1ak5iIIDLWNN2HND0qjjP5UPPi6zxbrzP8/t0 GZNBssY0tf/l4cc+hCdJUztt2fqyFYgvKEskrr1a3OnR9hsFSRd8xYLUXS9/LpJkM03f 2rq+cGFgVXTS+wnomw5IL8YNdZcb/yqaZdAnOdxOYwYJBYDTbRSd88fhZG8KhwuqPF+O +evG0Keceo1UK2j2Es8tw0cKi0du+RoPaJwuxaDhkfU0MGmlLMzo2OSBfA7J+w130Ddy Q8hHnTsYXYwsebBgltEkGU03TVitsajsvlo7i1NgSj6XpL4Gp0FGnJdseskjbTBAWBuK HVhA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QVqIcOKT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6ef0f00eda5si115477716d6.162.2025.04.08.11.56.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Apr 2025 11:56:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QVqIcOKT; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2E7F-0004b8-A7; Tue, 08 Apr 2025 14:56:09 -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 1u2E7C-0004aG-IQ for qemu-devel@nongnu.org; Tue, 08 Apr 2025 14:56: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 1u2E77-0004Dd-F0 for qemu-devel@nongnu.org; Tue, 08 Apr 2025 14:56:06 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43d0359b1fcso16175e9.0 for ; Tue, 08 Apr 2025 11:56:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744138559; x=1744743359; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FoWrz4Js4MOELdrFFu3ZPYaMj4eI6d7oY8aA0ah1zNc=; b=QVqIcOKTJiI0xjtOEzOcHx20w5N3amC6LdaxXjHCy8D8cDpHL1Nz2SS8Dfuosr3/z2 QIJGHHN0NAeUwEWevKt/PW2nmirDDMh/JoYDqQFWflTfA1hDI/6yM9axDmKgCIKiR5d5 st9rYnACAogblj+QzVPdUqUo24HtI6IUuw100r+q7HT8VZSBC8Rx09oisghGTo3D4rqZ merefv1PBjHKDOKg8YAr+2T5aX+2eG1ztMsnW5quwE4HBusf7U3+YABGV782U7C92E1L mTSq7oAX+k893rVsRgq08TqcE236QlY9O+XQ9TBkKUiqmoCAMQiZBNlih1/2PmChiYx3 Mh8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744138559; x=1744743359; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FoWrz4Js4MOELdrFFu3ZPYaMj4eI6d7oY8aA0ah1zNc=; b=Vqa4CCL715AHnMQkqmm/d7UtBvpz2GrKTHEaO2ZZ4PXZt9q5QhgIYC2G9gk3Z7cJpl 0VlUrvtXICXNAI+p7J7nmHH5R7pXPG20nh5oc5SW7Vq/LoiNpu77hVy8X5E16dQlK8Us dLDpsmvh8f32mqxsPSZASuRAgn0+VVyFtopqFU4SxllaiPHagcaOsbaphBybLsZQfATg bjOIhvzwrXXeqDfvvkGCagRg3OnR3JCG3MZPMHwaynZZga6IppRdrZ3VVyZ73geOREmk vZI3LpBhK6QSZskFRkl/tlakLac6w9MUKx8YrBfO5ovRNfwQE3/GVCE2kSSBpiFgEKzp r4fA== X-Gm-Message-State: AOJu0YyaAalAzn7fFAhB5YLvA/z73kHnBlsQFyWWv2bq/GWsmu2lDyqP wli4LsYkmMnRVdqRpdjBXQvL/400fcthTa6lu3DeHkH0mtRtO4OkskMtvykJvZiWz1WYEX12xW6 Hm9A= X-Gm-Gg: ASbGncuwoFoRoVY/KKB5FK1nbR29cCrbQFgzAN1iQ4eoEzePIW4n/xK4gDMJE5zBAHB azBTKJuNhsLVyyJvu7Tv59LdDRt74sAx3P6YW5HMkkVu6IL73RYXASlbpxsmei2SY78XHseCdLW 4PaAFRLdCWjGwhxAxZHwjfyCNtdaqKl1F+56PDGD8pfL3Hgjmsn8sd0/TgCxF7s35zuatkbZ9ea qabnX1ApGGDVv3ZB7Am2i3rbq/TpUkBRkKP2t1GwtNWFn0czftrgwlZ13VYgKRRpFpnlqD4xkIH vS7xGlx4EaPcNr87FcNyT0DRiox7Q83cSSFAL4b5YDZRuWsM85woRLJwx7jg9jm9ySA7bI7iBlt zzzCeh1PNee5pVzqjQU0= X-Received: by 2002:a05:600c:6a0b:b0:43c:f680:5c2e with SMTP id 5b1f17b1804b1-43f0e649702mr42361495e9.13.1744138558749; Tue, 08 Apr 2025 11:55:58 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c30226ea8sm15608392f8f.81.2025.04.08.11.55.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 08 Apr 2025 11:55:58 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Keoseong Park , Jeuk Kim , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 4/8] hw/ufs: Fix incorrect comment for segment_size and allocation_unit_size Date: Tue, 8 Apr 2025 20:55:34 +0200 Message-ID: <20250408185538.85538-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250408185538.85538-1-philmd@linaro.org> References: <20250408185538.85538-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@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, T_SPF_TEMPERROR=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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Keoseong Park The comments for segment_size and allocation_unit_size incorrectly described them as 4KB. According to the UFS specification, segment_size is expressed in units of 512 bytes. Given segment_size = 0x2000 (8192), the actual size is 4MB. Similarly, allocation_unit_size = 1 means 1 segment = 4MB. This patch updates the comments to reflect the correct size. Signed-off-by: Keoseong Park Reviewed-by: Jeuk Kim Message-ID: <20250403092140epcms2p355a7f039871b3e5b409754ef450b9158@epcms2p3> Signed-off-by: Philippe Mathieu-Daudé --- hw/ufs/ufs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ufs/ufs.c b/hw/ufs/ufs.c index ee13edacd8f..542f13b10ed 100644 --- a/hw/ufs/ufs.c +++ b/hw/ufs/ufs.c @@ -1753,8 +1753,8 @@ static void ufs_init_hc(UfsHc *u) u->geometry_desc.length = sizeof(GeometryDescriptor); u->geometry_desc.descriptor_idn = UFS_QUERY_DESC_IDN_GEOMETRY; u->geometry_desc.max_number_lu = (UFS_MAX_LUS == 32) ? 0x1 : 0x0; - u->geometry_desc.segment_size = cpu_to_be32(0x2000); /* 4KB */ - u->geometry_desc.allocation_unit_size = 0x1; /* 4KB */ + u->geometry_desc.segment_size = cpu_to_be32(0x2000); /* 4MB: 8192 * 512B */ + u->geometry_desc.allocation_unit_size = 0x1; /* 4MB: 1 segment */ u->geometry_desc.min_addr_block_size = 0x8; /* 4KB */ u->geometry_desc.max_in_buffer_size = 0x8; u->geometry_desc.max_out_buffer_size = 0x8; From patchwork Tue Apr 8 18:55:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 879041 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp5636004wrs; Tue, 8 Apr 2025 11:56:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXHMw5x6vLhN1SfyqWpqqMd5m3DXmooVxtf3pT0rnw7ZWmR47id5mDTtF/A7lrAd7sj/JpvAg==@linaro.org X-Google-Smtp-Source: AGHT+IEwtGyLgl93AAaAqjLszUzrxclhxo3j5OflPXAJqnzSLeBDXWFummw7nGuoxnAZQZ5oAZr6 X-Received: by 2002:a05:620a:28c6:b0:7b6:d273:9b4f with SMTP id af79cd13be357-7c79cd35561mr35617985a.11.1744138599235; Tue, 08 Apr 2025 11:56:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744138599; cv=none; d=google.com; s=arc-20240605; b=Lk6+HDzY+58G1dzQjgJfbeMZmSxGujUZp4REV5Q72/ZrjjubmpDMjhYKp3tlxA+MFW 6Y/0I8iRxmkd5rTM6lTNkzl6lYOyLdXj8mBMBsiijBdjBMqw+wr5NCeJ0z2kIxRUI0u9 qGwD6RqtO2F2dEMRDUNkCMHR8wQWymBT+BOYN21iWFdExqsCN4r2+mfp+O+I2/0tqsVI 1ObGf1bJL8TfTRZr5maV7k3cODGy+IB5RYVjsrU+CYB+kzFr002HADp9WgaW6GQP1GTh EFoaBt07HUnjlfQ4qNMq1Cj+puZVFgOs0osAHtovPr8qwKtW3yT1ieFkzcdo6IIngGEr cU8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rlcZi+8rtV1kSz292TgUOQ9wapPONbfOMzllPxUmecE=; fh=cDk7++D/I/3SRooQKl7OcV2lbWpwGY1J2zxySNGFTls=; b=Ngm0Mm1gie35r9oqutQY8hj6cfWFJyBesSDRsPsog/rJUecVIDG9BhHompX7cC4vDN HxwjaEJzkN3d90ENuv/3K4xURj+gceEmppYahk8/XR12Q/AuGq4mvfReipm4Pq/I15Ac i4cCTFIWVRrfqCROrn0+u+5UwIm17yFlyyAfUxKk9ByxJXhtvoX69lXw4B4JhoS7xsTc DieurJ8MvCTXPfk0eCsGPAl63QZlG6NE4d5XCNWYyeTe8NM6u2SSdvFhDEC02a6DWMaT 6P9XnhKY1tsx5Cy1iPfEJHO35m1wstky36suUKUDt9xvpBnDGveSEoqR5UkWQxLoPcB+ GrIA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kGK64M4w; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c76eac3076si1091455485a.563.2025.04.08.11.56.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Apr 2025 11:56:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kGK64M4w; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2E7I-0004bc-S7; Tue, 08 Apr 2025 14:56:12 -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 1u2E7H-0004bH-MR for qemu-devel@nongnu.org; Tue, 08 Apr 2025 14:56:11 -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 1u2E7C-0004FY-PN for qemu-devel@nongnu.org; Tue, 08 Apr 2025 14:56:11 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-43cfe574976so41267685e9.1 for ; Tue, 08 Apr 2025 11:56:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744138564; x=1744743364; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rlcZi+8rtV1kSz292TgUOQ9wapPONbfOMzllPxUmecE=; b=kGK64M4wXfqtCi/ic0X0ieV2uPfX7j6Sb05H/LR9iDzNZDAqYKx8uOTgk17tukink0 fQU/sf0UGmY+2Z9dtGPm6UQUZtB2lHGaUIHAR+hchA+5/3WxZTaeM883MNFXX9e1MjzN XeOC5fF8QHRvBIouQVOi97/wBSLvi8MM3SlAf6e1QucB93wTXeWfLp4P4Y/e78WJs1M8 h6M2SUeEiYfqCwWTfGf1Np6zJ+9tQJjQV3LqNP4tEEn9DZ0unYo3moRA2qUppRc/y+XA ICZaKFibItoKw+AVfmRN+Khsc2QEl97NNXWidaqd8hSILlTYIo0Hg2DUHVt+9cqXe8c3 lRBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744138564; x=1744743364; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rlcZi+8rtV1kSz292TgUOQ9wapPONbfOMzllPxUmecE=; b=PTPXTLnPHpGap1zxGnWSl0k1FBL51vYj2EBBbpfVLce6bOzI0IEK0R2OaooHIuXtEs nwQotyBV0qhxIEubTf9hXqBVub38clW6EeuvLLgeJ1vy8/a9I2x56QN6NzvKTCN6WOyA xH3CJXHSUK3Btgkh2+iYGp2rj11yvcguzw00hZ3s5pr1+1Bhrd3s8CRXRl6B2rVkoh3I OOBV8Vp6JheCb8kSJbrr+xrQU3zLZHbsRtufSMkWcVZvQbtger5e0FK7rHVcNpCF1ipJ PE8B3thQ9F1xtaQPBVhQfwsUcZfyeTL5jMduM1uj4pROIWTsU4e1g8ZuHQB2DLJ/DxG4 I1vA== X-Gm-Message-State: AOJu0YzSIcaU1Qz/f65Tdi+dWfEXgCNMYbMVB03no/+iJgCTg2YOKt+c Oa4HNUMyDj7yYKrDMiIwpVXRAFZ/TmVtu5dN8euTZlSQmw/ZSU5apnMmlJS5L9WO1fdkWRU/Fd+ w8gE= X-Gm-Gg: ASbGncs2jnsN+0SQLRox0Y3BqXDIViZYk72XCbrWKxfzGBsqBV8nDMtgdvDKtJXbA8D RRRC4OiTUAZ9IVMy+EUoRfo0OrEysUVai6gzi6Hlh4Un1Zaizv9BbOyiNju2UdRZ6AuLVq4Gx4/ x2Fp64OnQkVQ0ZhvDo+DvCaWUmPcJjiFLkXjXlQSZEyhuj1ze94Ol+CGb4Hi39OW5kejDaSiux9 +Z0euypXkegOTuC5ut+eJKKNCopN6SDKet5hhskJ8pO8qwOkSjkcYe8McKZ/oxLcRQcJ1I8aVll SuXIDk3Olz7xim/jc641CgB0db6SZCi7KGthD+dAbnV0rSvGOl3EsY8wNOtP9XTX3SzQsCm76hU m7y4epOwMMGGQqcriIsQ= X-Received: by 2002:a05:600c:c08:b0:43c:e6d1:efe7 with SMTP id 5b1f17b1804b1-43f1ed4b44cmr1946615e9.26.1744138564254; Tue, 08 Apr 2025 11:56:04 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301b816csm15760639f8f.57.2025.04.08.11.56.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 08 Apr 2025 11:56:03 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Guenter Roeck , Bernhard Beschow , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 5/8] hw/arm/imx8mp-evk: Remove unimplemented cpu-idle-states properties from devicetree Date: Tue, 8 Apr 2025 20:55:35 +0200 Message-ID: <20250408185538.85538-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250408185538.85538-1-philmd@linaro.org> References: <20250408185538.85538-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Guenter Roeck The cpu-idle-states property causes a hard boot hang. Rather than documenting the workaround, perform the removal from the devicetree automatically. Signed-off-by: Guenter Roeck Signed-off-by: Bernhard Beschow [Bernhard: split patch, update documentation, adapt commit message] Signed-off-by: Bernhard Beschow Message-ID: <20250405214900.7114-3-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daudé --- docs/system/arm/imx8mp-evk.rst | 12 ++---------- hw/arm/imx8mp-evk.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/docs/system/arm/imx8mp-evk.rst b/docs/system/arm/imx8mp-evk.rst index 00527b0cbed..b2f7d29ade5 100644 --- a/docs/system/arm/imx8mp-evk.rst +++ b/docs/system/arm/imx8mp-evk.rst @@ -35,7 +35,7 @@ Direct Linux Kernel Boot Probably the easiest way to get started with a whole Linux system on the machine is to generate an image with Buildroot. Version 2024.11.1 is tested at the time -of writing and involves three steps. First run the following commands in the +of writing and involves two steps. First run the following commands in the toplevel directory of the Buildroot source tree: .. code-block:: bash @@ -50,14 +50,6 @@ it and resize the SD card image to a power of two: $ qemu-img resize sdcard.img 256M -Finally, the device tree needs to be patched with the following commands which -will remove the ``cpu-idle-states`` properties from CPU nodes: - -.. code-block:: bash - - $ dtc imx8mp-evk.dtb | sed '/cpu-idle-states/d' > imx8mp-evk-patched.dts - $ dtc imx8mp-evk-patched.dts -o imx8mp-evk-patched.dtb - Now that everything is prepared the machine can be started as follows: .. code-block:: bash @@ -65,6 +57,6 @@ Now that everything is prepared the machine can be started as follows: $ qemu-system-aarch64 -M imx8mp-evk -smp 4 -m 3G \ -display none -serial null -serial stdio \ -kernel Image \ - -dtb imx8mp-evk-patched.dtb \ + -dtb imx8mp-evk.dtb \ -append "root=/dev/mmcblk2p2" \ -drive file=sdcard.img,if=sd,bus=2,format=raw,id=mmcblk2 diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c index f17d5db466d..3bbf2bfbea3 100644 --- a/hw/arm/imx8mp-evk.c +++ b/hw/arm/imx8mp-evk.c @@ -15,6 +15,19 @@ #include "system/qtest.h" #include "qemu/error-report.h" #include "qapi/error.h" +#include + +static void imx8mp_evk_modify_dtb(const struct arm_boot_info *info, void *fdt) +{ + int offset; + + /* Remove cpu-idle-states property from CPU nodes */ + offset = fdt_node_offset_by_compatible(fdt, -1, "arm,cortex-a53"); + while (offset >= 0) { + fdt_nop_property(fdt, offset, "cpu-idle-states"); + offset = fdt_node_offset_by_compatible(fdt, offset, "arm,cortex-a53"); + } +} static void imx8mp_evk_init(MachineState *machine) { @@ -32,6 +45,7 @@ static void imx8mp_evk_init(MachineState *machine) .board_id = -1, .ram_size = machine->ram_size, .psci_conduit = QEMU_PSCI_CONDUIT_SMC, + .modify_dtb = imx8mp_evk_modify_dtb, }; s = FSL_IMX8MP(object_new(TYPE_FSL_IMX8MP)); From patchwork Tue Apr 8 18:55:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 879047 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp5636314wrs; Tue, 8 Apr 2025 11:57:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX7zwGB7JG+ASsPaNKTrwjUrXkFxEEJqN85lQFRQlOU0ah9Ie/ySSplDkLZxYgx6HpQdkr/GA==@linaro.org X-Google-Smtp-Source: AGHT+IEHRwTuI3agewtxWcxGkA2doDUFhpVVhciQgn8T0viEhyF/x8Q5DLKePjzZ0xF1hsG2nXRp X-Received: by 2002:a05:620a:2544:b0:7c5:6cf5:9439 with SMTP id af79cd13be357-7c79cc31cc9mr35765885a.37.1744138659552; Tue, 08 Apr 2025 11:57:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744138659; cv=none; d=google.com; s=arc-20240605; b=CAUQlU8cxOXrlZkrV1U6sYqrL15/EgN6Z1CobAa+7tbLrtDIPDjWJWQEJrHTv2YxXt aaLBmN+pZu1vnUYEDpTKamKIG12tedca+J403xa9n4v7/XDpYOaPzLKQ9wGUQLRfblg2 tt1400N6FU5u8nZSr7qUbTzHsdYJ57RbyjwRjGikzzSr8gG7iETdgDLQ1z9gw1HgQc/Q P0IC/Mf7+oC2MGQgOtSLXmX/ahNg05NLeq+ULR4VugGbSe1QyOo2t4W2bidEEPgbcZUR X951JFCjoxgnE2Z7Klp4nO29vH7d8tuSU6zJsM2hAtikndQNYcIJ6pbS1OAVyC1YAjLa V56Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=MvBD1LnrYNmOkAZrAGP0jzg4GO67WuTA1FoobUCdqFg=; fh=cDk7++D/I/3SRooQKl7OcV2lbWpwGY1J2zxySNGFTls=; b=W3wzQPM7b5Dp0JxnRPR95bqmnbju9C2h35VzXwIPxPKfO3xPCCHL7evtWZycFyro0j hU9e1VvHhpPYLPqEONIJ9UebLmRhTXMehTu0icMuDR9HWcL41UUnDo8F4dlo8USf0DsU 47vo2P+8erWcExNmMa/exRPZG0/KYpsyt2R5xVl3JiXKq2OsYJhEDt5KmbYyQQGlSVlf 3wHkHoArpwwwjzpuHtJRbGbF0mZXuIvZV5qz1zDRY3lbIjBIor4YGAjPBNofMzcO89bY wwUsemuBUZvkoMq9NENgzhabwpwuOcUzL5bu7bvdCufhGhh1nLuhMBnqBPkhu08rQ0+o UvDg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tV4VBKw4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c76e748949si1110471685a.76.2025.04.08.11.57.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Apr 2025 11:57:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tV4VBKw4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2E7T-0004fZ-8j; Tue, 08 Apr 2025 14:56:23 -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 1u2E7R-0004eq-NH for qemu-devel@nongnu.org; Tue, 08 Apr 2025 14:56:21 -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 1u2E7H-0004GE-8l for qemu-devel@nongnu.org; Tue, 08 Apr 2025 14:56:21 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-43cf257158fso42152115e9.2 for ; Tue, 08 Apr 2025 11:56:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744138569; x=1744743369; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MvBD1LnrYNmOkAZrAGP0jzg4GO67WuTA1FoobUCdqFg=; b=tV4VBKw42jk+I0OaGQpOe11P5QN7NhAGUnV9042hC7ODalHM1USwkFMmYHW0a83Vw9 7u/iW04lgcjeRIHS66jCXRajipzZ1ub0Rfe2W3rD2dzKR3dXPTW1cdlkN2LlC6q1b07H BoFDJ6ZyXxMLXNa7VjG8JS033EdKMn613VtOSE0HYJIBJs2Qiw6M3v6wnT54MOdIaUDN zHXtnrBRb2uY6R069EKTfsUuokwqkLIAph60HIoiVCLsaJgGTOxu5cUvzNpTJ63t3gYr VUBM+EbfFPp5H6IsJyrc6E+tnck/q+cFthgVV5SoWcgm4BvIXSm7MDQstkE03PbfnnNq bSTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744138569; x=1744743369; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MvBD1LnrYNmOkAZrAGP0jzg4GO67WuTA1FoobUCdqFg=; b=d2RGTn1u40F5svVxdQW58AWBNbvg8AwDYNjqyXSs21wJKSCOaoIQoFQ4qsuhb45HDa 6kMtIICXfJ2rqI8dOPGnI/7lVO3p8FOcBnj0FVQMSwj4xvAW8ec4/+QMlnuOiQ38s9Vf /ftTLVyXR0rlHDp8I3j6KpFYJBhCz23ynk94nDb9d0Ussjcc+WobAXLPokue9NbKwFdC hicEqtkGe5Syt9SAjbwblm0JvSkMEZVXn+XAKmPeOW1p7PC+vzk7OBtzI7wfhtrIqkg1 3iMDxB5zYn7pF/Lj1tZ+v5a3SZlvXUCWbrzEpynbdXa3clbu4Kl7RWcwsNF5SpoG5KKr 32Qg== X-Gm-Message-State: AOJu0YymhAiRkOB0bdbNXN+VfDhdcaot8tE2zdW+GYk6VHLev6b8IILR nU0ul7GohmCbSFkOGzccPsQe56LHF+VumzCwfzgy/7znQVWRecbmKmE+EyDhKs+N9FL+kyoU8zP YJx4= X-Gm-Gg: ASbGncshBvLz6KkxdRemqwsrb60N2MSn3lkR1ra/RcpREgENZDVpJCiNbiRqmotM/jt 6WonbKCWxTfB84TMChPhS8bvWR2ew3moYSwWRyK089ETOa5q+uv68CVXrpxVRO0N6T1VZs6TgbC VNvU20Qj/dh1g4ohO+5L/Gr8nZaMh9+MBeEG8VS35m89AxL8gaLdQp95Yz+0XREAXzbeYgXUKpG XFhyEe2NZWEmnjy5eb0PvWN03v7ItP+PA38IJbJDA8zZY9uhKrUfSTvl6hOyUR4K6YT2e/bfFS5 RGlsPaQkw8erg6V0DUNdFB5dQImdTxDUb4PpkCHd/gA8adIZApIEV4Y+F02s2yZs4RWwXzk17TL hyTFxYe05DdO2ILlxV/s= X-Received: by 2002:a05:600c:1ca1:b0:43c:ea1a:720a with SMTP id 5b1f17b1804b1-43f1ec800a1mr1344865e9.1.1744138568923; Tue, 08 Apr 2025 11:56:08 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c30226ecdsm16359785f8f.99.2025.04.08.11.56.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 08 Apr 2025 11:56:08 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Guenter Roeck , Bernhard Beschow , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 6/8] hw/arm/imx8mp-evk: Temporarily remove unimplemented imx8mp-fspi node from devicetree Date: Tue, 8 Apr 2025 20:55:36 +0200 Message-ID: <20250408185538.85538-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250408185538.85538-1-philmd@linaro.org> References: <20250408185538.85538-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Guenter Roeck The nxp,imx8mp-fspi node triggers a warning backtrace. Remove it from the devicetree file. Signed-off-by: Guenter Roeck Inspired-by: commit bf1da4b308 ("hw/arm/raspi4b: Temporarily disable unimplemented rpi4b devices") Signed-off-by: Bernhard Beschow [Bernhard: split patch, adapt commit message] Message-ID: <20250405214900.7114-4-shentey@gmail.com> Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/imx8mp-evk.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c index 3bbf2bfbea3..b5aec06ec5e 100644 --- a/hw/arm/imx8mp-evk.c +++ b/hw/arm/imx8mp-evk.c @@ -19,7 +19,22 @@ static void imx8mp_evk_modify_dtb(const struct arm_boot_info *info, void *fdt) { - int offset; + int i, offset; + + /* Temporarily disable following nodes until they are implemented */ + const char *nodes_to_remove[] = { + "nxp,imx8mp-fspi", + }; + + for (i = 0; i < ARRAY_SIZE(nodes_to_remove); i++) { + const char *dev_str = nodes_to_remove[i]; + + offset = fdt_node_offset_by_compatible(fdt, -1, dev_str); + while (offset >= 0) { + fdt_nop_node(fdt, offset); + offset = fdt_node_offset_by_compatible(fdt, offset, dev_str); + } + } /* Remove cpu-idle-states property from CPU nodes */ offset = fdt_node_offset_by_compatible(fdt, -1, "arm,cortex-a53"); From patchwork Tue Apr 8 18:55:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 879046 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp5636259wrs; Tue, 8 Apr 2025 11:57:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUlc65b1yP1npqH2XqKCAJHTlIu9cVMaUNnE//Ev3zmfS9wVq3Nc/KFuD4Lob4Yhic3NHJU1A==@linaro.org X-Google-Smtp-Source: AGHT+IHrG+gl+gaca+xyXipKMU1rp8jJIfg2VmNRbsjAiRj7zKQjKE5dxNzw3wcTzFvM2JnBOLfx X-Received: by 2002:a05:622a:10f:b0:472:1aed:c8b4 with SMTP id d75a77b69052e-4795f36d824mr879041cf.34.1744138650783; Tue, 08 Apr 2025 11:57:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744138650; cv=none; d=google.com; s=arc-20240605; b=dTLD9+5ykADxiJfnXkC8mmXKr6TmEOc1SIJ/Mcrxwe/rQ8JeC9VhVl9h8ANbBaV+34 FRheelE6PjTlGqJep6tqpg1+efjqebefWFSHu6ttQNK91isksMVEeiU0m0UkWAqWy78+ 0osO7xIFstRPu1s7/8FSHxsOTMs1q7LM/MfM5sXaNPDNssguw2aEUAG/p0TVMQAOu6EA /yQa6j1LJplhuBHM0kGFubvr4TMtUYtdBBt4wCeGXSJIHKkqsiwvTtksPhlY2xHzjpY8 P9scLLSxTz8I2yS2FMUNZuCFxDtRwJLJwxwKfx9TEpe0Mjv2KLKHYF7P40kYDJ4l/isS g+qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fRz4nIs+qjkpvYNEjkdh+J25JpaBnAH+NnKK2uEtRmI=; fh=uu1wZTdGd+f3mJEFGK8G7BtrrVfm4GDHNdQ59oN6vnY=; b=QVyJcf26ggK4PrIn1/e1mplMzv6sXXIbULyAStHQv2oo3YmxQcZFf3aEFdyYb3ttTa ugXpI7TpXtvZ3eeFNAgKOw9rIzXM9bFJKgBH3vfv3mlNhGaxpb/1YOCWcq0PIEoY8tK5 JmgomHQenemCkNlYsumpJnSd4pupaRf/NrY5ow3oMfLwwxE1vSSQ4jIwi7d6AQ9SXJo5 t25Ix2gffnjGesadSqOnWkSQPwGcvx0K2xTwl6ezqIAea3AWK8HflH+SKyFMJzAhe1kb /5Vus2qXjBu8IuYYbDOzTi+tt0vY+mKFy/ARJ5dWzP6UyHYAhapk2czmC1SNTq/sUdaC fWTQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YbIq8DIa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-47948c50f48si46937371cf.583.2025.04.08.11.57.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Apr 2025 11:57:30 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YbIq8DIa; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2E7Q-0004eC-J8; Tue, 08 Apr 2025 14:56: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 1u2E7P-0004dg-H4 for qemu-devel@nongnu.org; Tue, 08 Apr 2025 14:56:19 -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 1u2E7N-0004Gd-Gl for qemu-devel@nongnu.org; Tue, 08 Apr 2025 14:56:19 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43cf628cb14so46493715e9.1 for ; Tue, 08 Apr 2025 11:56:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744138574; x=1744743374; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fRz4nIs+qjkpvYNEjkdh+J25JpaBnAH+NnKK2uEtRmI=; b=YbIq8DIaV8q98oMZ8vSKVIsUwgTJZ8ODzlFxpsHK5aW3xCcUGULFMnMCRMP0TA4ebk 6CtuA7cHLyHJdLoKD76zGdpmiXhwxeF3Noso0hrRor91pmcnI1PbAaZyl+COOh6Ns7KE ltikv1B1fDIIu1F4nGSLykl8PZ+q/7KkNyrlMI4j14yZmgec39eLNYutqUza254ndVOQ c9TPDvD6/Z7AkK4/wqqL/nlWVnwEkQ4NBvqs1F86gNM2dx0tCAi6xD5dWVgwkSLeN2Fj qDREarmk6CX2heGwFMR6ChEXuTVzDJjYq9qqIH3Bkn6Bj5pxLSfI6nEOFmCD0lbDmEj8 n3MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744138574; x=1744743374; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fRz4nIs+qjkpvYNEjkdh+J25JpaBnAH+NnKK2uEtRmI=; b=R1pYaf2L4DjVgpxT13yQ9+xSToPJ35AaVLgFzDcbhoOEpdFipfcyxJmuGFekz7mdao XoGVp+fsB9I3HZc+u48LzmNhTl+a96S/zls8G6SiGzjY8lbNb9nYhzopyi2POYdlrxSA zndkDKfh5KL6F/VHYrcTA76eWjWxToV2ZAF0PQvlebIgXsyXTSIBGUoCX+H950sy17Hy ugdD0jRANh4ieY6R0t6zqxqNgrUuGey83bxcKu1lQ2Jm2n+0/i5SzoM1K64bzhyhu08+ RKXCAs5b9ozNgnk5rbBDh3nj21B2sM0Di/R0wLsAi2B6DD6t2SAiecLXq79SEsaaPKKO N6ew== X-Gm-Message-State: AOJu0YxcKJHkOkPl4/W7OkIk7Lxq17RQNJq5QZBFaGooLCKjjhS8DKxn 2nNFWRUBJiiqNaQG77kQiLucpEqLtq7bq2GxLFMnxkViNok+r9QUtg+wK2yuVZsXwPSIE21xjs+ rrrw= X-Gm-Gg: ASbGncuZ78c0vodtw8dOX340vB3Tzg17JeaF14dA+pMFi0G3k8ZxL+3A9bLdiJt0QlT 8KgIPS+yg44GwbQfqV2gtFneuxCyfd7my/xksZjeyM3YEZYHpeh2E+St5nPAgEEc0pntDWnSebr Y7WNi/JeqC7XOhShJXrwI76CD9bVdG6u5jz8kfEaiGjENOttn9Qmj4Gv/ITzOLeKyUnG4/JuXCV +xh7JPfL3qlOCELXOc4EVEsq7XhQ2KGyzcRGxBNMdAKUaJPq6oFEX9Gaf9CJavfforQf0jUPrm9 KRUrjvmg9Y6ieOr3+MufrsBRCS/sLQdILmKzRojMINXuFVznB5RVG7vt80YRV/fkYlegF3m6qsY nWDBAzmuHRX1ad/5j+IE= X-Received: by 2002:a5d:648e:0:b0:39c:30d8:3265 with SMTP id ffacd0b85a97d-39d87fa8d3bmr119162f8f.15.1744138573574; Tue, 08 Apr 2025 11:56:13 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301ba17csm15834257f8f.58.2025.04.08.11.56.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 08 Apr 2025 11:56:13 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Klaus Jensen , Alan Adamson , Keith Busch , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 7/8] hw/nvme: fix attachment of private namespaces Date: Tue, 8 Apr 2025 20:55:37 +0200 Message-ID: <20250408185538.85538-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250408185538.85538-1-philmd@linaro.org> References: <20250408185538.85538-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Klaus Jensen Fix regression when attaching private namespaces that gets attached to the wrong controller. Keep track of the original controller "owner" of private namespaces, and only attach if this matches on controller enablement. Fixes: 6ccca4b6bb9f ("hw/nvme: rework csi handling") Reported-by: Alan Adamson Suggested-by: Alan Adamson Signed-off-by: Klaus Jensen Tested-by: Alan Adamson Reviewed-by: Alan Adamson Reviewed-by: Keith Busch Message-ID: <20250408-fix-private-ns-v1-1-28e169b6b60b@samsung.com> Signed-off-by: Philippe Mathieu-Daudé --- hw/nvme/nvme.h | 3 +++ hw/nvme/ctrl.c | 7 ++++++- hw/nvme/ns.c | 4 ++++ hw/nvme/subsys.c | 9 +-------- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/hw/nvme/nvme.h b/hw/nvme/nvme.h index 6f782ba1882..b5c9378ea4e 100644 --- a/hw/nvme/nvme.h +++ b/hw/nvme/nvme.h @@ -268,6 +268,9 @@ typedef struct NvmeNamespace { NvmeSubsystem *subsys; NvmeEnduranceGroup *endgrp; + /* NULL for shared namespaces; set to specific controller if private */ + NvmeCtrl *ctrl; + struct { uint32_t err_rec; } features; diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 518d02dc667..d6b77d4fbc9 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -7755,7 +7755,11 @@ static int nvme_start_ctrl(NvmeCtrl *n) for (int i = 1; i <= NVME_MAX_NAMESPACES; i++) { NvmeNamespace *ns = nvme_subsys_ns(n->subsys, i); - if (ns && nvme_csi_supported(n, ns->csi) && !ns->params.detached) { + if (!ns || (!ns->params.shared && ns->ctrl != n)) { + continue; + } + + if (nvme_csi_supported(n, ns->csi) && !ns->params.detached) { if (!ns->attached || ns->params.shared) { nvme_attach_ns(n, ns); } @@ -8988,6 +8992,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) if (n->namespace.blkconf.blk) { ns = &n->namespace; ns->params.nsid = 1; + ns->ctrl = n; if (nvme_ns_setup(ns, errp)) { return; diff --git a/hw/nvme/ns.c b/hw/nvme/ns.c index 98c1e75a5d2..4ab8ba74f51 100644 --- a/hw/nvme/ns.c +++ b/hw/nvme/ns.c @@ -763,6 +763,10 @@ static void nvme_ns_realize(DeviceState *dev, Error **errp) ns->id_ns.endgid = cpu_to_le16(0x1); ns->id_ns_ind.endgrpid = cpu_to_le16(0x1); + + if (!ns->params.shared) { + ns->ctrl = n; + } } static const Property nvme_ns_props[] = { diff --git a/hw/nvme/subsys.c b/hw/nvme/subsys.c index 2ae56f12a59..b617ac3892a 100644 --- a/hw/nvme/subsys.c +++ b/hw/nvme/subsys.c @@ -56,7 +56,7 @@ int nvme_subsys_register_ctrl(NvmeCtrl *n, Error **errp) { NvmeSubsystem *subsys = n->subsys; NvmeSecCtrlEntry *sctrl = nvme_sctrl(n); - int cntlid, nsid, num_rsvd, num_vfs = n->params.sriov_max_vfs; + int cntlid, num_rsvd, num_vfs = n->params.sriov_max_vfs; if (pci_is_vf(&n->parent_obj)) { cntlid = le16_to_cpu(sctrl->scid); @@ -92,13 +92,6 @@ int nvme_subsys_register_ctrl(NvmeCtrl *n, Error **errp) subsys->ctrls[cntlid] = n; - for (nsid = 1; nsid < ARRAY_SIZE(subsys->namespaces); nsid++) { - NvmeNamespace *ns = subsys->namespaces[nsid]; - if (ns && ns->params.shared && !ns->params.detached) { - nvme_attach_ns(n, ns); - } - } - return cntlid; } From patchwork Tue Apr 8 18:55:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 879043 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp5636103wrs; Tue, 8 Apr 2025 11:56:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWwmaFMTXFc2MzzHmkh2wtphQ/w3zefi2owPA0Pp/wSPt/HK6O3O0QBcFBvXug9aqvWAhUCSg==@linaro.org X-Google-Smtp-Source: AGHT+IG2jIDMJLEEUXYR2ig2XEx522TM6du0Fbtz4cHPY/Ivd8dm0dpLyzmSeY6I6w9qeWhd9rav X-Received: by 2002:a05:620a:2545:b0:7c5:ccc0:2382 with SMTP id af79cd13be357-7c79cc4b0afmr40722385a.52.1744138619243; Tue, 08 Apr 2025 11:56:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744138619; cv=none; d=google.com; s=arc-20240605; b=hPUIirYMATQ/iKDZXBFx6b9uwZuCSkdFuuFzcm9mnNjML+ryW86CjcIsasOkBJwL1S J3OyyDM7K/uAd393kTkTMmmnapWAlBOTOuEMn2A1sa7ta0w0jqvpLD+QLQd+VT95JDd5 ou7X9wjf8E2UwyzxPR1DdFceqYfIzVjT1hQ20pEpjihOfXVRsZFDoc+ZoJPF9GX6DwAY np64GybvmOn4Zr7dJ/VOm+gASDOR0bpwJ1p70PUhWEOzjBh3036tyTB8oNfFpa6Snl7l uQPp6BXtuedwo8DZRu5qoKqhEDqY5WJkYJu+SVzaNawVKVAuMjmE7HTgXFzt5FN2FAiP LQww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Bd4HZgu2rQoNG5y96HldgtWC5Ca0xdeHz+9r0bAk4j8=; fh=M1NL4voHLZjAGRBUAuK+PerGtp9bHW7euyrSFFiIW8Q=; b=BXXeUblX5l6YXXOSTI8zK+yweS1KiQ2cNHdhHRUnVYu6FqMaYI0ZGEyDbA5sAdh69b zZWNA0TLYoaGxYIbj1DWZ77h+vLXCz/uuaUXEtITaRk/axb/kSTD8/ee3j01vieb96Dp 2RjGAWok79QXbD7eZDr96Th4PUSJ3oi0fUNudXJp8qW6ecu8Anys706h4pzVMc+7/HXy 4WIczNWKR7YsbynsBigwHWsWpYwwI6NUwgwTDZs9zxr8U2l0UoIYz4qKtbmvs4TUQ4Uj S56QsWHvxWOF/pmNv8v0oMRy1CSRBBYNhp3x9XnzSuOxRU4nP5Mp90OqZZM1y1YCw+mM JoSA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Fdutjfax; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c76ea57801si1098184185a.213.2025.04.08.11.56.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Apr 2025 11:56:59 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Fdutjfax; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2E7U-0004fh-O0; Tue, 08 Apr 2025 14:56: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 1u2E7S-0004f1-FI for qemu-devel@nongnu.org; Tue, 08 Apr 2025 14:56:22 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u2E7Q-0004Gs-JI for qemu-devel@nongnu.org; Tue, 08 Apr 2025 14:56:22 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-39c31e4c3e5so3678633f8f.0 for ; Tue, 08 Apr 2025 11:56:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744138578; x=1744743378; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Bd4HZgu2rQoNG5y96HldgtWC5Ca0xdeHz+9r0bAk4j8=; b=FdutjfaxUBE/xbCXwenWfTZ4KYczFbINTS2QP6gsN+XZm+puM5DsRMZS8+eNhYTVuC X8gK9waFOZ1jyeXe4gxuKXaPrBVrWhUUiAPDlIF/RZK3tjNDW73V5WdomNvnN5z4X3IZ +rMwZmGBl6O5JfEjnvR/4v+Zz0SYr5MU3MaQTS8Ak+tOeJYw3yNP0LKj4zwcyzN2ylhc plzm9cdvMPle6zw3YnDNdvlte8Pap2L+f8gxvPk+00RBP63+xWq1Mq0KCI6dnOrNLUj4 tY+iBiDlA9cLUNR3h5Hw2Yaw9oYrjPTMcoJsDwQDiRTu0qMXzkmwAyE7Dbbqjma90LMk Cftg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744138578; x=1744743378; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Bd4HZgu2rQoNG5y96HldgtWC5Ca0xdeHz+9r0bAk4j8=; b=emonxfZ/ag+w1KyFk/eR6relg/wyb6yAlaISkQ7LAKPGzLOrfTvb+I8m/CMbIp5pCY 2tc27KFclZjsTjDT2Fl+5Pbr7sBs0nhD53YwyIt/tDTzcaZoj2uIubdvDeV3YNg0gx2N ijg7eqz9ASYYAiJTc1TzpMnJbjPAuT9vb5eHY6BprwfYZCCv6VQb4t3dgc16IQ8xWMML kR8UTeoydRfOvyu0PmHWslSIzoKqx28xL7HzqerxqziOgx8El12yJ6B1qQ/xspm1wzpE 4HSrlQuSooWIWbn6rfJ06Pe0MzRvhyaa4flTddY4BFztkYN3NFqVmzuYLCU0ewWrlk3P tD0g== X-Gm-Message-State: AOJu0YyoajA46EydOa1lYC8kRUvEUFqWV4N4k/SCoApeGgbZoRFX5wcn kENlDDa/lCGF3LQa66rXscZCka3Rxmh4RXwPAZWo5KXsuvf2EZdoR5TP7RNB6LuMLpgjmC5ZhOL 867Q= X-Gm-Gg: ASbGncsD0Zf4tb9FPRah+vkly87PeW4e796106qPjux2/9zVJti3yFTZkjm7yYa5m4I EmwLnkvAgKj0ZqVuK8WCalRXqODR+llxYTHLWgoUyiezz3rd/v1IrAn5G2jx0Eje0PLugVpBevj Q73LsBs9QGAIoW6j8nHDJzFe2XUe2JLRrkbIxihEl1VMeOaU9pKiDw5OXWObNzNhl1KQqH7ufFq CDUf0PA0JVfuSI/vD4FLEiIg8DCHBzxmJxE4J51wiWjK3hWagM1PAl0mns+Ydv8nO2/JQ7CrS5k XMvjA1lRDxkJ7B8WBIt5hy33YG8GeNRj5hXDmZS16JeulV0GyzDNOYOArq9jrWboNB8uSPkiTK4 6MxeVSyms4laNt9hUxYg= X-Received: by 2002:a5d:584c:0:b0:391:2f15:c1f4 with SMTP id ffacd0b85a97d-39d87cddd2amr209773f8f.55.1744138578187; Tue, 08 Apr 2025 11:56:18 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39c301a7064sm16109823f8f.34.2025.04.08.11.56.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 08 Apr 2025 11:56:17 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [PULL 8/8] scripts/checkpatch: Fix typo in SPDX-License-Identifier keyword Date: Tue, 8 Apr 2025 20:55:38 +0200 Message-ID: <20250408185538.85538-9-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250408185538.85538-1-philmd@linaro.org> References: <20250408185538.85538-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Zhao Liu Fix the typo in the error message to help `grep` the example: ERROR: New file '***' requires 'SPDX-License-Identifer' Fixes: fa4d79c64dae ("scripts: mandate that new files have SPDX-License-Identifier") Signed-off-by: Zhao Liu Reviewed-by: Alex Bennée Message-ID: <20250408162702.2350565-1-zhao1.liu@intel.com> Signed-off-by: Philippe Mathieu-Daudé --- scripts/checkpatch.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 6ae9d7febee..365892de042 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1688,11 +1688,11 @@ sub process { /\.(c|h|py|pl|sh|json|inc|Makefile)$/) { # source code files MUST have SPDX license declared ERROR("New file '$expect_spdx_file' requires " . - "'SPDX-License-Identifer'"); + "'SPDX-License-Identifier'"); } else { # Other files MAY have SPDX license if appropriate WARN("Does new file '$expect_spdx_file' need " . - "'SPDX-License-Identifer'?"); + "'SPDX-License-Identifier'?"); } } $expect_spdx = 1;