From patchwork Mon Jul 30 14:17:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 143143 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4138513ljj; Mon, 30 Jul 2018 07:21:49 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfKX0xaKbhgyUjyPTXiGFEZ5TG4GWgqSYOo+rBB/joWHdn2jbyDGkGMWtOQfXfpuwiRJci1 X-Received: by 2002:ae9:de05:: with SMTP id s5-v6mr15172750qkf.145.1532960509537; Mon, 30 Jul 2018 07:21:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532960509; cv=none; d=google.com; s=arc-20160816; b=h7qKynjRfUxSJeTtA6YKnVC0WGGBpKByvzdoWdSnx1zRhSrI32SZfjCP2xSHo0yXfg 63/mzDWylJ7WiOcaBV2WRYrZkwxb8dGU6k4bH7ChXqdgHSAsRmpqJqIbJRD7XE6yiVqs d1VKS8L6AptRn9NnxFuxxFPJi3/Bi49rLcp9GCDZesejAwyf+Id3S0yeJSsC2F85W+vz b4ED6Iy6tUPrCdNEKubtIOWWxKUN7VTxInpPUed+CVynyMSpbpf9G0qynBzrVPJS6nzl 3zNoZpHzNFmmhFXwlF4y+IDgCJQzms2f7oKwQB8oCcHrLpQ6uBtUp5wbV0eHDlysHDiP kNaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=mdjC985g1d7Ns/Y1g1Es1UjVpFoeOcsDLd4gVhXxheg=; b=jt6H5YnYBpfa+C8EQDsYXZB1cowtCYyw27VSxWvFaUwKnIjQmIUZTSal6P604Y4oM4 Y4jxLNG3dQbRrZod/h0sc9tdk40HR5mIOFDzRyJXdXFDTRLK8Fd+iZ0bwhUXCPW6zq1a vfSd63z0cmTGn/f8/YdwrCSMFdjo+P2Nh64ywiZLon/6oi3JrfYxYHiLTySVG2QEnuJE Dx1NDXIfWMPJ/wZE1GiVmi2zXhtwD9UFyAdDLEBSv5T7m9/Vd/xx3437TXdFKvLVvrJK UucOiih2SJJ7cRDUxouXk/eg6CLEVJUanEvdkZr0xQIqRpF2GqLf3WieVRBkgWruNYmw 6EhA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y39-v6si2158593qtc.351.2018.07.30.07.21.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 30 Jul 2018 07:21:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52896 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk93V-000400-0V for patch@linaro.org; Mon, 30 Jul 2018 10:21:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk8zs-000130-HV for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:18:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fk8zr-0002U0-Lu for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:18:04 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:43820) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fk8zr-00029y-Da for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:18:03 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fk8ze-0004Ew-Pf for qemu-devel@nongnu.org; Mon, 30 Jul 2018 15:17:50 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 30 Jul 2018 15:17:43 +0100 Message-Id: <20180730141748.430-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180730141748.430-1-peter.maydell@linaro.org> References: <20180730141748.430-1-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 1/6] arm/smmuv3: Fix missing VMSD terminator X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" From: "Dr. David Alan Gilbert" The 'vmstate_smmuv3_queue' is missing the end-of-list marker. Fixes: 10a83cb9887 Signed-off-by: Dr. David Alan Gilbert Message-id: 20180727135406.15132-1-dgilbert@redhat.com Reviewed-by: Peter Maydell [PMM: dropped stray blank line] Signed-off-by: Peter Maydell --- hw/arm/smmuv3.c | 1 + 1 file changed, 1 insertion(+) -- 2.17.1 diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 39fbcbf577c..bb6a24e9b84 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -1414,6 +1414,7 @@ static const VMStateDescription vmstate_smmuv3_queue = { VMSTATE_UINT32(prod, SMMUQueue), VMSTATE_UINT32(cons, SMMUQueue), VMSTATE_UINT8(log2size, SMMUQueue), + VMSTATE_END_OF_LIST(), }, }; From patchwork Mon Jul 30 14:17:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 143146 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4144374ljj; Mon, 30 Jul 2018 07:27:22 -0700 (PDT) X-Google-Smtp-Source: AAOMgpftqVMzGzI14AC2M3TsAGXGRp5WhWmfw/vLWM5JyfZgL47rZqap69D6AKtpKEqdHjDxlbr1 X-Received: by 2002:ac8:3615:: with SMTP id m21-v6mr17320801qtb.297.1532960842358; Mon, 30 Jul 2018 07:27:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532960842; cv=none; d=google.com; s=arc-20160816; b=JLYrKXr2U+zZP4q1BnNXDrls7NmtWbHU6NIqavIUCQBGhnSzE7FbagqSiRls6cNkae d24d6+hjwiIIalqedxiuEcsuTqQRmJe/WyOygo90rOYWND+eI46oiz63mweOLIcvaJZi xfv9oSIaUJNOc2S4y6wc0Cr/ZX+5hubx/8csSQEwRxa4Lep05p1vck8futel7yj/wRi2 AC5KHWkCtIUCmShrQrbhKPTbjSEbGBrc2xloXHVfgtuPKjIOl1C9tqVkLsJbfVw831Ln 3iknlfW+21mCwyijsOjUM1m4I3/3p/eUBEw6YjlpQeTMGKll9n3+Eshjn8JjiTidYIsa PsDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=//QAzLzj4j236p8o9axBawzjgTeA9I6QRmi85CVVmYs=; b=EYdf2Y2QeB54AsKUtgUsQW6OspE/9Sa1dD8dAS81q8jB9WZ7sgdPMuW/zoHw5zcD1O i08HJKq/rNWjqHchXSL2jlumKk8L7XndVUBL9lIzNUmCfM7wd0qZ8+dIruw228rBY0r1 VB2+8PgxdYgv/7YW3t/KapPsXV8ykgzQ6RWXnZ/3xckD64TlVxuA3UZNpd+IRl0vRuv/ BHb63nmzcmZwLJSsfnTbVSJmbpoSkCSgL3MEWqt/+TjPRweVGq5E9jQxb3noXBztRcHc EC1Hp7gJQDlKxUH+53rsOWzJcuD2GpOY4Jybt3UaGW5o+MnP/E5Gp57Q5lfNd3s9XrOR ReyA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 54-v6si1440551qvr.265.2018.07.30.07.27.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 30 Jul 2018 07:27:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52923 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk98r-0008KB-TC for patch@linaro.org; Mon, 30 Jul 2018 10:27:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk8zu-000152-GU for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:18:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fk8zq-0002Rh-La for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:18:06 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:43820) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fk8zq-00029y-El for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:18:02 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fk8zf-0004FV-Ft for qemu-devel@nongnu.org; Mon, 30 Jul 2018 15:17:51 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 30 Jul 2018 15:17:44 +0100 Message-Id: <20180730141748.430-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180730141748.430-1-peter.maydell@linaro.org> References: <20180730141748.430-1-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 2/6] hw/arm/sysbus-fdt: Fix assertion in copy_properties_from_host() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" From: Geert Uytterhoeven When copy_properties_from_host() ignores the error for an optional property, it frees the error, but fails to reset it. Hence if two or more optional properties are missing, an assertion is triggered: util/error.c:57: error_setv: Assertion `*errp == NULL' failed. Fis this by resetting err to NULL after ignoring the error. Fixes: 9481cf2e5f2f2bb6 ("hw/arm/sysbus-fdt: helpers for clock node generation") Signed-off-by: Geert Uytterhoeven Message-id: 20180725113000.11014-1-geert+renesas@glider.be Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/sysbus-fdt.c | 1 + 1 file changed, 1 insertion(+) -- 2.17.1 diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c index 0d4c75702c3..43d6a7bb48d 100644 --- a/hw/arm/sysbus-fdt.c +++ b/hw/arm/sysbus-fdt.c @@ -107,6 +107,7 @@ static void copy_properties_from_host(HostProperty *props, int nb_props, /* mandatory property not found: bail out */ exit(1); } + err = NULL; } } } From patchwork Mon Jul 30 14:17:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 143144 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4138587ljj; Mon, 30 Jul 2018 07:21:53 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfpgxR1wAMvpU5BCERXDSgx1e+35qPgxvkJwIQgPaE0MYAwri/NqQE2YMrwo0SzZOa1iteF X-Received: by 2002:a0c:b792:: with SMTP id l18-v6mr15454885qve.110.1532960513267; Mon, 30 Jul 2018 07:21:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532960513; cv=none; d=google.com; s=arc-20160816; b=QOaZeQjUMGm3lOcZuIn7zLyAR8KopADgqrkB5edyuddGFF6gRtlm6HjTjiQvDb5qCH 67UcKM0pOK2C5Lt1epOui4zsx+/G/+54WzCV8De1UhtWHGySmboK/z4GOYBP5ZLv5gbu xvhW+fYGkH7B8GWcVNyzET9AhxconMc+PHr1fijT4pi0w/h8BmEIKjQOC1nAWQ9GLjNN FtdWg8GxukehyM7N8KvDQoDHyMPIUWjuhch0mYkAjUao7M5aaGZee4clMSmN6uulFCeI mOn/bTcfFQxgrfHtMaT8kO73WqOphINNBemWMsVdmsJ7lYauwzjfTE2SrUhX7qQNBvzp IxtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=Diyf6Q9AXCGMRC2BmjYa5ivHY+rjI1+J3qasEe9DhpE=; b=MEHm51mkKXIHydkT9GSVSPeJjwZkGjWiiUxe/b+mJ+YSPcpAgaj8QfDUxBLYkQSIyk q+ir9ZdXmxpRi6irSxh7kLFvtI3uK7BgDp2b/0eUQCgB3dGzC74HwLrDfwrZv5snvoTH hCckvrk6NrYrfT97yRpsNBx9f9iPIpzdCtNQLcqh3ZJjGyOaIf/4K5PuBC5cKJ4HXCxm du/k5maYkSj8pDrbwx6bVNEwP/pFw+L7Qb+K5ET7A7apsbTIpiaIjLgAsBtj7bLe/b0t +sNp+eGiaJpvfIVXUHoHIJnmLh6/ydJo5aoWssww7SYAFT0CPvxYYjScr0Oio/uCUWc7 Hfkg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s14-v6si11287265qtg.54.2018.07.30.07.21.53 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 30 Jul 2018 07:21:53 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk93Y-0003AR-Lv for patch@linaro.org; Mon, 30 Jul 2018 10:21:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58154) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk8zq-00011O-HQ for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:18:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fk8zp-0002QD-Nn for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:18:02 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:43820) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fk8zp-00029y-FZ for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:18:01 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fk8zg-0004Fw-5Q for qemu-devel@nongnu.org; Mon, 30 Jul 2018 15:17:52 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 30 Jul 2018 15:17:45 +0100 Message-Id: <20180730141748.430-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180730141748.430-1-peter.maydell@linaro.org> References: <20180730141748.430-1-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 3/6] armv7m_nvic: Fix m-security subsection name X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" The vmstate save/load code insists that subsections of a VMState must have names which include their parent VMState's name as a leading substring. Unfortunately it neither documents this nor checks it on device init or state save, but instead fails state load with a confusing error message ("Missing section footer for armv7m_nvic"). Fix the name of the m-security subsection of the NVIC, so that state save/load works correctly for the security-enabled NVIC. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20180727113854.20283-2-peter.maydell@linaro.org --- hw/intc/armv7m_nvic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index 6be7fc5266d..cd1e7f17299 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -2064,7 +2064,7 @@ static int nvic_security_post_load(void *opaque, int version_id) } static const VMStateDescription vmstate_nvic_security = { - .name = "nvic/m-security", + .name = "armv7m_nvic/m-security", .version_id = 1, .minimum_version_id = 1, .needed = nvic_security_needed, From patchwork Mon Jul 30 14:17:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 143142 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4137927ljj; Mon, 30 Jul 2018 07:21:14 -0700 (PDT) X-Google-Smtp-Source: AAOMgpejbMlHmWoeBcjiEv3Pv0HWdqhBBufOw8LdnY7bdKgQEriBpljOEz2AleIzwNmxtU1aCah9 X-Received: by 2002:a37:1194:: with SMTP id 20-v6mr16603182qkr.379.1532960474344; Mon, 30 Jul 2018 07:21:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532960474; cv=none; d=google.com; s=arc-20160816; b=QLmA6EIe1mkoaCXJxeE+Gd+s2tmblazhCYZ4/90ous4lZgB8nBkXmH2tKehKb645cO buSoUMZ7CKmfUGVh5MiqZrdboPS8TijsARYWwcH36oLRhBJJLSrC7CfSZYL8MwF3ron5 iCVwaItFB6+wD2Z7oU8dlXzBYhy+qiRiAAko8LboFxmy4wBlVJYWBLKmoiZk+4rZm2Y7 hUxomfD3302I4w+mr+B0yv4U2hN6P/N0cY33GTznYjvjC73v623XKN8as59djHg/6MZD w/znWeS0zPAijhxC/DJbAweq1I0inVNqZvbAH5LHBUigjucf+FAsN89jBPGPdjf0WiS/ A1bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=8YAg0Xd/ghMuwSw+2xEFsKiYWdorn/xecFKnuxjgxJc=; b=H55TBVmJmwtNJ9ybJgG5MO5HBYt/2nzBqK+perzX2ZXnZ9o7g8cMBlq0760Awq0g5x +jw+ry9vQgyGOFD4DrOlbjOjzfF5z3FkzY7scXCp9pWT5BlN3mGYmaY2lPEV+k0kJALP sdFGcEzoT8SYSJRZ+sGOaF8bx9oM1EMh6R60dQR9zPQeBh3kIBaS5EJoelxHYOY3Ljl8 i07diUo9t9cIiBbBJr/riS73PQg64YLTUPqVB0BXrU8iIytDqskKxDZBYUktoSM3hmLa FW6U8Fk9X1CjPmG7Mug9a5KT3KgF/uVDb5fYQ7jNbWNlLjCM4LntUYj9nHoxymeSMO3y lUvg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d67-v6si8120694qkc.197.2018.07.30.07.21.14 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 30 Jul 2018 07:21:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52884 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk92v-0002Lx-LA for patch@linaro.org; Mon, 30 Jul 2018 10:21:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk8zp-00011N-KM for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:18:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fk8zo-0002PO-Os for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:18:01 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:43820) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fk8zo-00029y-Gi for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:18:00 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fk8zg-0004GR-SJ for qemu-devel@nongnu.org; Mon, 30 Jul 2018 15:17:52 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 30 Jul 2018 15:17:46 +0100 Message-Id: <20180730141748.430-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180730141748.430-1-peter.maydell@linaro.org> References: <20180730141748.430-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 4/6] hw/arm/iotkit: Fix IRQ number for timer1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" A cut-and-paste error meant we were incorrectly wiring up the timer1 IRQ to IRQ3. IRQ3 is the interrupt for timer0 -- move timer0 to IRQ4 where it belongs. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-id: 20180727113854.20283-3-peter.maydell@linaro.org --- hw/arm/iotkit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/hw/arm/iotkit.c b/hw/arm/iotkit.c index c76d3ed7435..8cadc8b1608 100644 --- a/hw/arm/iotkit.c +++ b/hw/arm/iotkit.c @@ -382,7 +382,7 @@ static void iotkit_realize(DeviceState *dev, Error **errp) return; } sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer1), 0, - qdev_get_gpio_in(DEVICE(&s->armv7m), 3)); + qdev_get_gpio_in(DEVICE(&s->armv7m), 4)); mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->timer1), 0); object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[1]", &err); if (err) { From patchwork Mon Jul 30 14:17:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 143140 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4135053ljj; Mon, 30 Jul 2018 07:18:29 -0700 (PDT) X-Google-Smtp-Source: AAOMgpepdQNDDJdStCimjjNTQPWMql4H4+tmOKZCVObA0mXRgyppbHh/tXPDc3bGiJ5fEArs/t46 X-Received: by 2002:aed:3ae5:: with SMTP id o92-v6mr16799349qte.127.1532960308988; Mon, 30 Jul 2018 07:18:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532960308; cv=none; d=google.com; s=arc-20160816; b=ZvHI3SUBK1SCFXLPLa9Y2GUdcw2z+wDyJRecLFT/0ziV+NmEJCi632xfbfGUu31pmI zVMKIFkhekHMzMeFFbBDBY5ZnA/J3gcIFyfwA8v4xZauzPEk6G8wGBYhtNZtvrGIRyh9 BYoPRfJUKX6yLdwud69tPa973g5WP2wh9yRMzb9Zzsw5LB3HA+uIPvqoJpyOuILlBy2N 1MPMRkswaNL7gTZP+sisNuLkdLyVtZSQ2UpprBkfOT6rdxR+Wo9cGBactBwS27lH1lTH hFTO4kRI3iBXPikDj5B7xkKG7RNsbylzfhKKLC8RsatyaIccz1f7cHT0eMk7m78qfOHq /Zpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=ZyIVhniFEBQhvEJ+DcKp5VQUmk1d7lGZtKyQUZwRWvM=; b=IRZ7sNM5nM3zZtwgkkUVpjhATQoQQozS5ScmGLS/VgsXLJxdh8gdnrI0xeK2/ffuW4 5SUigMOko6DA6gal+lr+DEBRQXEjCzEOgPMQyXYPUawHOU9k5eOyqzkQQv1WVq1x+TC8 mytgwOW2rlzNhpzsWlvB3CTp+knkF5qWt5MUQ8MxvLDrsAonue2WPqr/aMO/UQ6Jbopo mqyAPacfJmEYQugeXeujj9bUb38py1HVYT94/8Ybe3cAMjxZMzknp6/FVSYt+HizHHte 5h0BC+BsQTPg5InnJXSRL44oqFnZOgAdPHdp41ZL5L3OlTrY/Y2kTQ4YDjGb5PhaIum0 WSmQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u14-v6si4011565qvb.195.2018.07.30.07.18.28 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 30 Jul 2018 07:18:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52877 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk90G-00012Z-9F for patch@linaro.org; Mon, 30 Jul 2018 10:18:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk8zp-00011M-IU for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:18:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fk8zn-0002Nm-Q9 for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:18:00 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:43820) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fk8zn-00029y-Ha for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:17:59 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fk8zh-0004Gs-Hr for qemu-devel@nongnu.org; Mon, 30 Jul 2018 15:17:53 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 30 Jul 2018 15:17:47 +0100 Message-Id: <20180730141748.430-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180730141748.430-1-peter.maydell@linaro.org> References: <20180730141748.430-1-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 5/6] hw/misc/tz-mpc: Zero the LUT on initialization, not just reset X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" In the tz-mpc device we allocate a data block for the LUT, which we then clear to zero in the device's reset method. This is conceptually fine, but unfortunately results in a valgrind complaint about use of uninitialized data on startup: ==30906== Conditional jump or move depends on uninitialised value(s) ==30906== at 0x503609: tz_mpc_translate (tz-mpc.c:439) ==30906== by 0x3F3D90: address_space_translate_iommu (exec.c:511) ==30906== by 0x3F3FF8: flatview_do_translate (exec.c:584) ==30906== by 0x3F4292: flatview_translate (exec.c:644) ==30906== by 0x3F2120: address_space_translate (memory.h:1962) ==30906== by 0x3FB753: address_space_ldl_internal (memory_ldst.inc.c:36) ==30906== by 0x3FB8A6: address_space_ldl (memory_ldst.inc.c:80) ==30906== by 0x619037: ldl_phys (memory_ldst_phys.inc.h:25) ==30906== by 0x61985D: arm_cpu_reset (cpu.c:255) ==30906== by 0x98791B: cpu_reset (cpu.c:249) ==30906== by 0x57FFDB: armv7m_reset (armv7m.c:265) ==30906== by 0x7B1775: qemu_devices_reset (reset.c:69) This is because of a reset ordering problem -- the TZ MPC resets after the CPU, but an M-profile CPU's reset function includes memory loads to get the initial PC and SP, which then go through an MPC that hasn't yet been reset. The simplest fix for this is to zero the LUT when we initialize the data, which will result in the MPC's translate function giving the right answers for these early memory accesses. Reported-by: Thomas Huth Signed-off-by: Peter Maydell Tested-by: Thomas Huth Message-id: 20180724153616.32352-1-peter.maydell@linaro.org --- hw/misc/tz-mpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c index 8316079b4bf..e0c58ba37ec 100644 --- a/hw/misc/tz-mpc.c +++ b/hw/misc/tz-mpc.c @@ -547,7 +547,7 @@ static void tz_mpc_realize(DeviceState *dev, Error **errp) address_space_init(&s->blocked_io_as, &s->blocked_io, "tz-mpc-blocked-io"); - s->blk_lut = g_new(uint32_t, s->blk_max); + s->blk_lut = g_new0(uint32_t, s->blk_max); } static int tz_mpc_post_load(void *opaque, int version_id) From patchwork Mon Jul 30 14:17:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 143145 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4139982ljj; Mon, 30 Jul 2018 07:23:10 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfkh+4anek95ooj+j31/b0Nqka0OOfjRs1rJf/gbziMK8DP6b7YghYMS09BD4kam6/LCBKC X-Received: by 2002:a0c:d957:: with SMTP id t23-v6mr15137823qvj.149.1532960590596; Mon, 30 Jul 2018 07:23:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532960590; cv=none; d=google.com; s=arc-20160816; b=oKqIYK8Dbg4zBGx02SlIMjHze3q9DANDChB2sHo5Pl02Hn4It9xwJq+eexsgys0Xbh C6PODlH2Kps7/scRc4h359uTtwnfj+E5Sd+TWnOL5Xxq0z6Tv/f8SWY1Kgo1ZfkmFx3v 0yG3a8hMVGUXkv35czxuklFE36SxB4dHgzv3VHpD6JzeDOVV9lc3hz7QnQGa2uOZvmbD 32nl+lPOM3f2G/TjFEv7mgB+H/f3qWBr37zPfs9zmWPr6E0P/7NTq8Lg8DppgX1lSlaj H0ADiA422wUiUQwQ/kXF4lEVV/CSb03FQMfAiI8PucklrYw+JOsY7wJuG3s5iTROZd5t 92SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=47+uVUQkpak6LrHO224IXdXOWBhf8cXrPu7n34VHn9Q=; b=Z9NApy7ekEBgfhX1yEIh6yWIHOMRpjsikwgJxPAkNGLV+iQ7QreVILJaEk0IybfLMW GEKsUJ/EEl837vfyt4MZtb3Kf7TDVaVNvahtzxgtuZ/cCiNUCtaFDq0ILFdgQSD6WIKz IU9aYD894NqtssCO7Hbq3WOpETcxQWYnBcKTywQ46iXc0fFr2oRaFDF28l/S2DbA71QM vGoibtGSYqxFKqixIRLQCJgp0lZg2j0SXYgejS9KzOMOth09Wapkiq6g2ny8yZnt/wF8 HxeN5ZGxvEvhS+Mv3q2W+nk8GltCboEwl9y4WSbCXRbpIBi/AiF4J7vs6CHHUcunsHtH TPng== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m54-v6si11480957qtk.122.2018.07.30.07.23.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 30 Jul 2018 07:23:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52903 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk94n-00054s-VP for patch@linaro.org; Mon, 30 Jul 2018 10:23:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58117) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk8zn-00010u-KY for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:18:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fk8zm-0002MU-Pl for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:17:59 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:43820) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fk8zm-00029y-JB for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:17:58 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fk8zi-0004HJ-8O for qemu-devel@nongnu.org; Mon, 30 Jul 2018 15:17:54 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 30 Jul 2018 15:17:48 +0100 Message-Id: <20180730141748.430-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180730141748.430-1-peter.maydell@linaro.org> References: <20180730141748.430-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 6/6] target/arm: Remove duplicate 'host' entry in '-cpu ?' output X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" From: Philippe Mathieu-Daudé Since 86f0a186d6f the TYPE_ARM_HOST_CPU is only compiled when CONFIG_KVM is enabled. Remove the now redundant special-case introduced in a96c0514ab7, to avoid: $ qemu-system-aarch64 -machine virt -cpu \? | fgrep host host host (only available in KVM mode) Signed-off-by: Philippe Mathieu-Daudé Message-id: 20180727132311.2777-1-f4bug@amsat.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/helper.c | 6 ------ 1 file changed, 6 deletions(-) -- 2.17.1 diff --git a/target/arm/helper.c b/target/arm/helper.c index 22d812240af..66afb08ee0f 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -5591,12 +5591,6 @@ void arm_cpu_list(FILE *f, fprintf_function cpu_fprintf) (*cpu_fprintf)(f, "Available CPUs:\n"); g_slist_foreach(list, arm_cpu_list_entry, &s); g_slist_free(list); -#ifdef CONFIG_KVM - /* The 'host' CPU type is dynamically registered only if KVM is - * enabled, so we have to special-case it here: - */ - (*cpu_fprintf)(f, " host (only available in KVM mode)\n"); -#endif } static void arm_cpu_add_definition(gpointer data, gpointer user_data)