From nobody Mon Apr 29 04:02:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1605007305; cv=none; d=zohomail.com; s=zohoarc; b=W8Fo7+aBgnPYSbU0NPvBfbg8a/qmt48Roh6WgLs+aVoX+8ei82uaKo0lDacoirahU6vaa8yf32IIefE4AQWvccNX4JPgOCovl5XKWVVqugdywndQ5ea9iyFWmQri+gQ6JLu0ZHla6Xho9SLAckS0iEOdnBL9tMebVauNYDSKhFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605007305; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WJs7tlmKW/kmWkwqanCXTHgztjaLe8yma/76ieAs5o8=; b=F3lbrWfO0GzBDWpzA4MlD1ZxRcFPA8B/09FnTp7XnG9dacKEulIPCIyq+kaBgkK19e3ig0aU6Opd4cHrzJksjIROC/8Oi0Cy/tDpcMIm2NTW0RUuMdCGFelRYAZBwNdt1CNYLZkycqXLbfb6YENw9rTSjCQKsTgz6ueZkzTLrbY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605007305256970.9948606530963; Tue, 10 Nov 2020 03:21:45 -0800 (PST) Received: from localhost ([::1]:53216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRia-0003o4-7z for importer@patchew.org; Tue, 10 Nov 2020 06:21:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRgO-0001pe-H8 for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:28 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:38909) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRgJ-0006mx-Ct for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:27 -0500 Received: by mail-wm1-x32a.google.com with SMTP id h62so2621555wme.3 for ; Tue, 10 Nov 2020 03:19:22 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 109sm16909498wra.29.2020.11.10.03.19.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 03:19:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=WJs7tlmKW/kmWkwqanCXTHgztjaLe8yma/76ieAs5o8=; b=OgzxRZ/RJXIUh94jWkAiVINcE0Ie4bqQpcmlukeJjTRYMyxvKmKcc10+08NS0/VQlM 9g297idl2PelNK7csLdiUayo/tLLbs7oi0c1kpJIc7/fRNeR1u65eTHBgHVNxa/P2HYa bBRNB+88nxzNK2nD8YjwM9rjZZhFV7R35lrC6lN1H6juYOx0e7vowZaRNwBGXXnu2xe4 vIKvessqwOS8H4Zt7UH8XfMs5Oj6JiJyGcIyFD9i4EsDZU1kK+7bgU2VLk59Iti7ijGC ao2Dq+N57ftvd5EQk58xiiV95LMcTshzWXPcGH+6PxlKy7CaMyvIh66ObYyc8mcXd7yj Akdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WJs7tlmKW/kmWkwqanCXTHgztjaLe8yma/76ieAs5o8=; b=owTIxafaNozcfKoHIy82+8I8DBgKEcj3JqXZ2CX5xpbo/IGD6VAfZwlPyntvC8aRQg ZUMZOvRId0OdrzomLCChn+0s6p4XHM4/iINKZUjvmS71XdntyFdf4i2C0yY+As7oCH4H 5Eau8G54uR7tCEJ2vYLaLvgXT+PkvxbrO0fkkCg0itoFx8MZeUxJzP4vUuLRvjAGoCGI NG87pVc565IXeQIDrF6v9M117efY7P/pWGSKYK0/bQr0MM2ovyhlP3SErwhG9ZUQ60+T shZxC3Sor0og8JBFh5nrd/+ZjoZa4QH7RHPoQ/RLOV8WOPmY2rnyzfhvggGh7PD+P/xM 56UA== X-Gm-Message-State: AOAM530jimVKC921Ljk+iDJd5lOj5IuIQ3yR9oGEHbOH5v/HS4Ky9k1e sKPVuqcBxatsAT/59FbtlSGdBLbR+2rolA== X-Google-Smtp-Source: ABdhPJwWpmHVZ1g+Vy6LbFymSVaIVqVXSXYdBpCbWFxmwITSrKRJczS6ibNjBVSP5usZ7TUlsO/s+A== X-Received: by 2002:a1c:df8a:: with SMTP id w132mr4183531wmg.90.1605007161565; Tue, 10 Nov 2020 03:19:21 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 01/16] hw/arm/Kconfig: ARM_V7M depends on PTIMER Date: Tue, 10 Nov 2020 11:19:02 +0000 Message-Id: <20201110111917.29539-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110111917.29539-1-peter.maydell@linaro.org> References: <20201110111917.29539-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Andrew Jones commit 32bd322a0134 ("hw/timer/armv7m_systick: Rewrite to use ptimers") changed armv7m_systick to build on ptimers. Make sure we have ptimers in the build when building armv7m_systick. Signed-off-by: Andrew Jones Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20201104103343.30392-1-drjones@redhat.com Signed-off-by: Peter Maydell --- hw/arm/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index fdf4464b948..7d5d89e1acf 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -291,6 +291,7 @@ config ZYNQ =20 config ARM_V7M bool + select PTIMER =20 config ALLWINNER_A10 bool --=20 2.20.1 From nobody Mon Apr 29 04:02:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1605007888; cv=none; d=zohomail.com; s=zohoarc; b=HTesZ4ZMxiZ+P5oQm8IhlvqnhiwcnY149nz6Vx5X5vgB+663pWqlm044RsITATfF13W1G+3R+z2V5RUsnH8OOm+kt804qvx8wn3ZOqaFiikryH1IAfPkX8CYP7Qp+mtXz4wgjkbiTxJWP71qHceNKVSWGnMsZdZzQgKZ2t11y0E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605007888; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ou4ZFWD12P9GhCTxff4Tq2wg1qluvGIH4f1ZLPSHzfg=; b=FbDGzDelks1Pelz9eRSi3yXUuDUPk0ikVwabH7PE3ye89ggx77dsqbeFv7y72EEGKL3NO1T22N+V2tzXSybci1LzwY7+mmoL+5TkjIN/u8I9N9EndkbEBC/L5aMveLutFPOAg18/J7Jm4DpSutoiPxptkSBZWgtA7j7fIKsyYKY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605007888367641.6921842484758; Tue, 10 Nov 2020 03:31:28 -0800 (PST) Received: from localhost ([::1]:57510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRry-0000ao-BY for importer@patchew.org; Tue, 10 Nov 2020 06:31:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRgQ-0001uy-8F for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:30 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:52641) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRgN-0006np-Fy for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:29 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 10so2627896wml.2 for ; Tue, 10 Nov 2020 03:19:24 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 109sm16909498wra.29.2020.11.10.03.19.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 03:19:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ou4ZFWD12P9GhCTxff4Tq2wg1qluvGIH4f1ZLPSHzfg=; b=p3kY5cufvNM8ZAOU7z6rUE8JBSqIflRPQsCt4MSubf88gvrqIUbhnykvlDDSUXH3x5 7bv/RpZMs6zPO8z9ni3fX09pZzCRlfhvdA3SOxHHnVeIgxW3qC7O9f5c4F2vFweKF7Zz JEOVo7Zix9xh51+gDJahmcjF5n/Ix7l9zmNYQGvViPv6P/wi6Z/HGfzz+o+oaZtrP486 gXXYpMFUhdos/pPWZhEu33G3YDIMVdmGXiTDFQSrET1zzqKr9H5yBKot7pVA7LTKKBgY 8iciTbD1ZTOeAKxaMvL+kA/3ThwTu2REwBA09vkeUSfp1lw0Th7XSCtZ75zdZJWFURjG KSGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ou4ZFWD12P9GhCTxff4Tq2wg1qluvGIH4f1ZLPSHzfg=; b=LMISDTdLyoKmdusq8FXC7Pt9GBiITbG7U2mIIRCceS7uNIlBJ33gi5svmHugdbqNZk rKbHS00IhU/UxAxdFg4z1dfLTgBa1rYivCfuX/9tzJYiM+YDxm+EfmIhHtX9aBSJRlbT sMJDMtC3xIN/AOF75BhWjKt3y8QP4IAodAYdYxaKDW27jbeAIMcqEDV7s1mW9pdDlt2B 4FVksk5eV98RhWNukUtWBfCKm3/2PQaqFS8KjlGXC5WsyVfv053xs8uNoivkbopgHyYn ZHpnchq5I3fsOUC2GGdnjcWJT4xTGaReIVS29lmuFNOvOPrhUoDMDFR9hcm5pFiY+LGF Q6ew== X-Gm-Message-State: AOAM532eu1Ub7mI0UWNZsRJ3hD4GgnSeNAjJllnQaHegrXd2uTpgkZIX 2GZD9Zns5znN+OFNdRgKEsbac8dK/s+pZA== X-Google-Smtp-Source: ABdhPJwdJixlmcI1NuHeyUeV0AN+X4UnF/uZS3vi7ckNDkG8iHrWl23LtQjQWpbcqllCM68HlPpZEw== X-Received: by 2002:a1c:e087:: with SMTP id x129mr4121004wmg.2.1605007162918; Tue, 10 Nov 2020 03:19:22 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 02/16] ssi: Fix bad printf format specifiers Date: Tue, 10 Nov 2020 11:19:03 +0000 Message-Id: <20201110111917.29539-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110111917.29539-1-peter.maydell@linaro.org> References: <20201110111917.29539-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: AlexChen We should use printf format specifier "%u" instead of "%d" for argument of type "unsigned int". Reported-by: Euler Robot Signed-off-by: Alex Chen Reviewed-by: Alistair Francis Message-id: 5FA280F5.8060902@huawei.com Signed-off-by: Peter Maydell --- hw/ssi/imx_spi.c | 2 +- hw/ssi/xilinx_spi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ssi/imx_spi.c b/hw/ssi/imx_spi.c index 7f703d8328d..d8885ae454e 100644 --- a/hw/ssi/imx_spi.c +++ b/hw/ssi/imx_spi.c @@ -53,7 +53,7 @@ static const char *imx_spi_reg_name(uint32_t reg) case ECSPI_MSGDATA: return "ECSPI_MSGDATA"; default: - sprintf(unknown, "%d ?", reg); + sprintf(unknown, "%u ?", reg); return unknown; } } diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c index fec8817d946..49ff2755935 100644 --- a/hw/ssi/xilinx_spi.c +++ b/hw/ssi/xilinx_spi.c @@ -142,7 +142,7 @@ static void xlx_spi_update_irq(XilinxSPI *s) irq chain unless things really changed. */ if (pending !=3D s->irqline) { s->irqline =3D pending; - DB_PRINT("irq_change of state %d ISR:%x IER:%X\n", + DB_PRINT("irq_change of state %u ISR:%x IER:%X\n", pending, s->regs[R_IPISR], s->regs[R_IPIER]); qemu_set_irq(s->irq, pending); } --=20 2.20.1 From nobody Mon Apr 29 04:02:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1605007729; cv=none; d=zohomail.com; s=zohoarc; b=liv0+aAsusZtRZiuhrxGET6np+SN21jhXDM1IqHji8wbev6WHlhazERzHHMYf3R0N6e1PInfrONhG1nI1giaDY7dkFj5Xzy1sZTQp+jX4T9J6BOu3Lwhymr0onoTG8FcNuvmJ0iiQ2eV67wYO88NAzYEtjay/tqmAFn02Fr7FQo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605007729; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IFXSLaXfL+RUut/92LcuexluyUZ9ecNXkg0uDuqM+CM=; b=hKq7fQ8x3otiXUzFvozaZoTwBL/0TbEzzdMsLlgGK3W6xs+MyM4rCppIjS8V2yxzHeM/BjYKhIfZeXg48a9kauF5kupR5O0BLTrUK/uDgjI5N3PRlmknUSBgBczYIDTh918fT0asOdoa4T1nJ2xuvpXZbj0PhsoHxDg1GbfYbGU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605007729457493.3730529760094; Tue, 10 Nov 2020 03:28:49 -0800 (PST) Received: from localhost ([::1]:49860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRpQ-0005l7-EF for importer@patchew.org; Tue, 10 Nov 2020 06:28:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRgP-0001tR-Qf for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:29 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:45246) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRgN-0006o3-Gw for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:29 -0500 Received: by mail-wr1-x42b.google.com with SMTP id p1so12228442wrf.12 for ; Tue, 10 Nov 2020 03:19:25 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 109sm16909498wra.29.2020.11.10.03.19.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 03:19:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=IFXSLaXfL+RUut/92LcuexluyUZ9ecNXkg0uDuqM+CM=; b=ic1w1Q9PQ4M38Gz/Q7UDAtksxJ/fahQ/OyWXlXVQc7gb1VlJOzXZ/wuqijr+J/+FBj XTO9u81ryEe8sbV0V2XZlRqnVyQa4ayxzh3InwenvHvy6c0bHKx4KbO1JAvMbi97pa1Q Eu73bt6LbwWlAW72wC/5B1pRn/iQeQI6ZhwpozkYeNNAypgN4Z2bXm47w/NqKdI9wtum IgA0lnsPuzwYKvbewGLs0fv4d8H/FBb/VO8mO+bjqzfu9DcxvP744nnZ7nl4TLEq4d1r /Rd6XLXON5rSLaRUbl2/YC3yy3geWsCBEWI+ZDxN2x4OkqUOmDry0eR7nnZOceWF1MMZ k1gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IFXSLaXfL+RUut/92LcuexluyUZ9ecNXkg0uDuqM+CM=; b=WMMSZNi8FJiy4K0kWsQqhP5HP/brCUPiMBjU7NJrFBPIlFn0yXAIUUw5d6mjrnZqvw U/sbalVquFRKCf05wvt7ufqM8ZlHxis9H/8mVpSU+Wu5/mNxoW6qC1mhIJYl4LIwcVaQ uVl1zZtQAfnfARcNFPuEs6eeZxXS6k3Icz3O1mILGK1taammmo4c5RaGHHwQWCdAnrI2 /NFusIgiIePmNYp4+y/njnqWdOTRkz+J2zekBjLrTf9cjYbpKrVefNAMUtL4/chFwvp3 hjziqokuuKawMdoNDoaKay0OQISZw+HiywQAo8FtT/X1wVSD66hHtMBxhYOOHhfDXhVg c0mA== X-Gm-Message-State: AOAM533oA0Ji/U3fdzld/mcokx0llpGVhtHk6jzbfqy4sYe/bM26H7ru jCqj90caSpHrL6e6cfDhQbh1vQYTOc9hug== X-Google-Smtp-Source: ABdhPJymgBEBjdPdLPtwew3tYE2pf6ftybjhwG2kNSJjF654bpz4f/RohO/N6/CpHmUOAzw6tB4VaA== X-Received: by 2002:adf:f549:: with SMTP id j9mr8350067wrp.324.1605007163988; Tue, 10 Nov 2020 03:19:23 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 03/16] target/arm: add spaces around operator Date: Tue, 10 Nov 2020 11:19:04 +0000 Message-Id: <20201110111917.29539-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110111917.29539-1-peter.maydell@linaro.org> References: <20201110111917.29539-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Xinhao Zhang Fix code style. Operator needs spaces both sides. Signed-off-by: Xinhao Zhang Signed-off-by: Kai Deng Message-id: 20201103114529.638233-1-zhangxinhao1@huawei.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/arch_dump.c | 8 ++++---- target/arm/arm-semi.c | 8 ++++---- target/arm/helper.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/target/arm/arch_dump.c b/target/arm/arch_dump.c index 7693e17e964..01848453109 100644 --- a/target/arm/arch_dump.c +++ b/target/arm/arch_dump.c @@ -114,8 +114,8 @@ static int aarch64_write_elf64_prfpreg(WriteCoreDumpFun= ction f, =20 for (i =3D 0; i < 32; ++i) { uint64_t *q =3D aa64_vfp_qreg(env, i); - note.vfp.vregs[2*i + 0] =3D cpu_to_dump64(s, q[0]); - note.vfp.vregs[2*i + 1] =3D cpu_to_dump64(s, q[1]); + note.vfp.vregs[2 * i + 0] =3D cpu_to_dump64(s, q[0]); + note.vfp.vregs[2 * i + 1] =3D cpu_to_dump64(s, q[1]); } =20 if (s->dump_info.d_endian =3D=3D ELFDATA2MSB) { @@ -125,8 +125,8 @@ static int aarch64_write_elf64_prfpreg(WriteCoreDumpFun= ction f, */ for (i =3D 0; i < 32; ++i) { uint64_t tmp =3D note.vfp.vregs[2*i]; - note.vfp.vregs[2*i] =3D note.vfp.vregs[2*i+1]; - note.vfp.vregs[2*i+1] =3D tmp; + note.vfp.vregs[2 * i] =3D note.vfp.vregs[2 * i + 1]; + note.vfp.vregs[2 * i + 1] =3D tmp; } } =20 diff --git a/target/arm/arm-semi.c b/target/arm/arm-semi.c index 8718fd01948..c1df664f7e5 100644 --- a/target/arm/arm-semi.c +++ b/target/arm/arm-semi.c @@ -755,7 +755,7 @@ target_ulong do_arm_semihosting(CPUARMState *env) if (use_gdb_syscalls()) { arm_semi_open_guestfd =3D guestfd; ret =3D arm_gdb_syscall(cpu, arm_semi_open_cb, "open,%s,%x,1a4= ", arg0, - (int)arg2+1, gdb_open_modeflags[arg1]); + (int)arg2 + 1, gdb_open_modeflags[arg1]); } else { ret =3D set_swi_errno(env, open(s, open_modeflags[arg1], 0644)= ); if (ret =3D=3D (uint32_t)-1) { @@ -852,7 +852,7 @@ target_ulong do_arm_semihosting(CPUARMState *env) GET_ARG(1); if (use_gdb_syscalls()) { ret =3D arm_gdb_syscall(cpu, arm_semi_cb, "unlink,%s", - arg0, (int)arg1+1); + arg0, (int)arg1 + 1); } else { s =3D lock_user_string(arg0); if (!s) { @@ -870,7 +870,7 @@ target_ulong do_arm_semihosting(CPUARMState *env) GET_ARG(3); if (use_gdb_syscalls()) { return arm_gdb_syscall(cpu, arm_semi_cb, "rename,%s,%s", - arg0, (int)arg1+1, arg2, (int)arg3+1); + arg0, (int)arg1 + 1, arg2, (int)arg3 + = 1); } else { char *s2; s =3D lock_user_string(arg0); @@ -896,7 +896,7 @@ target_ulong do_arm_semihosting(CPUARMState *env) GET_ARG(1); if (use_gdb_syscalls()) { return arm_gdb_syscall(cpu, arm_semi_cb, "system,%s", - arg0, (int)arg1+1); + arg0, (int)arg1 + 1); } else { s =3D lock_user_string(arg0); if (!s) { diff --git a/target/arm/helper.c b/target/arm/helper.c index 68545919865..11b0803df72 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -12508,7 +12508,7 @@ uint32_t HELPER(usad8)(uint32_t a, uint32_t b) uint32_t sum; sum =3D do_usad(a, b); sum +=3D do_usad(a >> 8, b >> 8); - sum +=3D do_usad(a >> 16, b >>16); + sum +=3D do_usad(a >> 16, b >> 16); sum +=3D do_usad(a >> 24, b >> 24); return sum; } --=20 2.20.1 From nobody Mon Apr 29 04:02:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1605007621; cv=none; d=zohomail.com; s=zohoarc; b=PipDHP3WRO/nnF3hqwU/Scm/Fwx3yBn0doiyS2yTxeLxhY6F5ZsqMLNTwXPBHFoKMv3xDyJyM0U4vdFNwzNNcYcEnlGFUekdbf557LNZfOyh2Vw7yNFJX0mJ13GhIpH3M4utzaGlrOycu9d3aHv0llYHN+nOWGoZnwby5YfbjMo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605007621; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ju+kUkFBMOBFyiWH5JlYSMsJ+dyc+Z8Zg617Qpzid2w=; b=A6Zf4ALTuZcy8HBnhCg0aBrqxLxp8auNUe2MREw66HN3+49z7AjLCKKn7nak/gSnPNxyHPhJILVoPKW4EskPNI7G6cZhqNO2x7Xw7yhBf+gMHONdXukyJD4RAgjeftPwKMMgVZIuWDTgLkzFREVWogHvMZJ7YeDuY5JHSVdorF8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605007621876136.7111074595814; Tue, 10 Nov 2020 03:27:01 -0800 (PST) Received: from localhost ([::1]:41696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRnf-0002Nh-OQ for importer@patchew.org; Tue, 10 Nov 2020 06:26:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRgQ-0001wg-RB for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:30 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:40866) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRgN-0006oD-HJ for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:30 -0500 Received: by mail-wr1-x42a.google.com with SMTP id 33so12234958wrl.7 for ; Tue, 10 Nov 2020 03:19:26 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 109sm16909498wra.29.2020.11.10.03.19.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 03:19:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Ju+kUkFBMOBFyiWH5JlYSMsJ+dyc+Z8Zg617Qpzid2w=; b=hzockvwIS94CUkXwJlWZxeLja9YC6fphHg8VBhOJochArpsBhgStpGG7Cb3Iv4Q3Ed 0CsjCvi0NZNaq8elWiL+nOsxU4C6+UmRWYxvGDqPvO0eje+G43sEP/AlOrYsPeGaXsvf pDwoE3h/iG1uGvnN1gufIhd8T84JHtfkOkuXG64YfF6qNlircDgw5nAp6dwE5OEDItXh vop5E1UnXuU/sSlDW9UcI9P53o7eohCuC19LvEdqdRGGwcq6g/b3Wi//i+Ngp1GY3pEL AQ5ldPNOyeJ4sgc+kUl8y8XECSYysTpac1mgsIHBF2iHUHle+6w5uMg/vZOvyPFKrlC6 VI0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ju+kUkFBMOBFyiWH5JlYSMsJ+dyc+Z8Zg617Qpzid2w=; b=AbQNUKMeG1bqqslbeEYaUBpxPoDJ3JQiX8XZQ7YvlHe1aMfpcxocj33SIvUCKaAA9P QRlbFDnTR1dY6kpJniS2GGdRpb2UwehiM/+WdswU7mC/3Mqpy+AWfQBbaK+IjNTsMe5k 4em3M9vXLahmIsG4nDmU2a78JH8x1DMoxuIfG+A32Oe6K4hG9CSOjW3uFZyQFOPCVOxH BRpYTMfPdo/U0Vvy8S0j1R/16qPVZ9DoUihZt2g/Pm0zfrUxtN/mvtlpmsFMDIn6f1MN XkRoLmvxsIIolQ66SFwh7cmuKPWq3xMC7be62r4UlNJ2mOf6q7hCq0V6R36cCqLG1aC9 yDRQ== X-Gm-Message-State: AOAM5334k85tZVB/MTg5KlZttBJzeOyv5AhYHZH41YwL/Oc9d+1tkfXV +61HHxo26v+NOwMml047OegiZ7clNMpvyA== X-Google-Smtp-Source: ABdhPJypDsJfEkC1wCfZ4jVezau6ecdIYTuVS+xILVXg6gbM7lcKcM8fE9hye1z/i6FzXY8qq4jmoA== X-Received: by 2002:adf:f881:: with SMTP id u1mr24863525wrp.103.1605007165196; Tue, 10 Nov 2020 03:19:25 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 04/16] target/arm: Don't use '#' flag of printf format Date: Tue, 10 Nov 2020 11:19:05 +0000 Message-Id: <20201110111917.29539-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110111917.29539-1-peter.maydell@linaro.org> References: <20201110111917.29539-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Xinhao Zhang Fix code style. Don't use '#' flag of printf format ('%#') in format strings, use '0x' prefix instead Signed-off-by: Xinhao Zhang Signed-off-by: Kai Deng Message-id: 20201103114529.638233-2-zhangxinhao1@huawei.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/translate-a64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 072754fa24d..1867ec293f4 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -12114,7 +12114,7 @@ static void disas_simd_three_reg_same_fp16(DisasCon= text *s, uint32_t insn) gen_helper_advsimd_acgt_f16(tcg_res, tcg_op1, tcg_op2, fps= t); break; default: - fprintf(stderr, "%s: insn %#04x, fpop %#2x @ %#" PRIx64 "\= n", + fprintf(stderr, "%s: insn 0x%04x, fpop 0x%2x @ 0x%" PRIx64= "\n", __func__, insn, fpopcode, s->pc_curr); g_assert_not_reached(); } @@ -13121,7 +13121,7 @@ static void disas_simd_two_reg_misc_fp16(DisasConte= xt *s, uint32_t insn) case 0x7f: /* FSQRT (vector) */ break; default: - fprintf(stderr, "%s: insn %#04x fpop %#2x\n", __func__, insn, fpop= ); + fprintf(stderr, "%s: insn 0x%04x fpop 0x%2x\n", __func__, insn, fp= op); g_assert_not_reached(); } =20 --=20 2.20.1 From nobody Mon Apr 29 04:02:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1605008039; cv=none; d=zohomail.com; s=zohoarc; b=VXIdMUnvUOQ7EreEoZGDBijnAGKgexxyJlgP8pPbbNeoQtV5E7Fbr4QIZRwES4OJqXDS/e9AAqoowxq4Dqicp+6iiprUDgYZRUlcwbNsy1dLTzHaT5OENJtVPj7wq5wUC5gypN54AfGDH9qqwzL4p466R0uha2f/aXufmZ1SIqk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605008039; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1xSX3FHtZwaNdWEesDDxbv6UzUKE+EZ51VclS+NR9fA=; b=Tij6nhcEFPgBCUa0nglOimJRHC8nHAJYksw1/xbKUesL32blUkestniTSOrOXpzcvyQMtz8AdqHPsNEk/1YZ6P0t6MqO8CbEyGmzGyLLGsXCRVhCyD6FuVhhV6ynMxt8SL5n140ENy7IMxEdy5DM0E0uIqtbW1IcSh3le1Ep0NQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605008039697296.9311564066089; Tue, 10 Nov 2020 03:33:59 -0800 (PST) Received: from localhost ([::1]:36776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRuQ-0003fv-Aj for importer@patchew.org; Tue, 10 Nov 2020 06:33:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46252) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRgR-0001xM-2B for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:31 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:43596) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRgN-0006oK-Od for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:30 -0500 Received: by mail-wr1-x42b.google.com with SMTP id s8so5152425wrw.10 for ; Tue, 10 Nov 2020 03:19:27 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 109sm16909498wra.29.2020.11.10.03.19.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 03:19:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=1xSX3FHtZwaNdWEesDDxbv6UzUKE+EZ51VclS+NR9fA=; b=GvE8I6H16jUVUsd6u/Vj7KRuHsLiHs5IROvPaduyQ4ZDDrng47SK3j5fkU5Jq3pm83 e6+omTmPVjM5azmI7uOEt/2d8PPYeYRW70xRlC+Voouz2ri2HsmM1EBgMeD3YhpALMxd SbVYu6e+EZV5J5aCMaDsT9ZgZPPeR1kHBzFBACwLz0a27sdjpVwJmkOCSCH8ztncxjUA Kc7xt8Btf9svpY4IKQKbphB+eNhCH35OGvVAb/zg09cxDJ5CHqBbM3QtRg1n/itXSbPE 4ANqR/g7T/qPYWV+7EoiUN38zFYXxCrQo0K2ANmDM4SlnlmZ9h0g/x6oKqTT6LTeIpGb DEmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1xSX3FHtZwaNdWEesDDxbv6UzUKE+EZ51VclS+NR9fA=; b=iyjXaj4RaZ+DER02zYib+LEGbnE8b5BKXwb5+glrJ64GsW3l4qlPj9dV2SCfG40Hl6 sKGPqNoCn8h/RxAKqvhvMEKQoH+lfbSzH0Uv/HxfAZTQd6zYMfs8N7lQzsqqA4BN5XH2 MPesaLy19Cz/OdKVl0FWDwiFPl1+VW/G5CqqTa9XbvYQy06z7zWULB+6X8EIBq/ik+Rq qoGAg9Y2b/mWLdbe8aSLn9Doen2UlAlsjcSb5aAr64IGa5U4qiXLwYdnB/p7CZfE+Au6 VVNoAfCJPNLliCcP//P7oZdWfGVwnMaeRwBIfEqA094TEqBDl8ZLKFiMB8QgnlUteF8T 5E7g== X-Gm-Message-State: AOAM531R0keUYuDGRjUJEll6QOHFMiIwXlnog7SdKjEeVaLPnIZ85Daq Wi+1YyzxbKjdYxmpnhRIaY8m2iXqBIyfFQ== X-Google-Smtp-Source: ABdhPJzdJpslpKxb5umj1TfrR46eZ9qzx/Uyp5NDfjYyFKderLs9dGvS6ugu95lCbIbETTU2Xiaynw== X-Received: by 2002:adf:e992:: with SMTP id h18mr13900831wrm.356.1605007166310; Tue, 10 Nov 2020 03:19:26 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 05/16] target/arm: add space before the open parenthesis '(' Date: Tue, 10 Nov 2020 11:19:06 +0000 Message-Id: <20201110111917.29539-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110111917.29539-1-peter.maydell@linaro.org> References: <20201110111917.29539-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Xinhao Zhang Fix code style. Space required before the open parenthesis '('. Signed-off-by: Xinhao Zhang Signed-off-by: Kai Deng Message-id: 20201103114529.638233-3-zhangxinhao1@huawei.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/translate.c b/target/arm/translate.c index 29ea1eb7811..f7d4ee393b7 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -9171,7 +9171,7 @@ static void arm_tr_tb_stop(DisasContextBase *dcbase, = CPUState *cpu) - Hardware watchpoints. Hardware breakpoints have already been handled and skip this co= de. */ - switch(dc->base.is_jmp) { + switch (dc->base.is_jmp) { case DISAS_NEXT: case DISAS_TOO_MANY: gen_goto_tb(dc, 1, dc->base.pc_next); --=20 2.20.1 From nobody Mon Apr 29 04:02:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1605007731; cv=none; d=zohomail.com; s=zohoarc; b=g3vTGYYmrM9RDTwqU9OdV3rNMiLPZkLekHfm41rhUWqnNKYxMMcTTGkvjEY875uWkqTMZ6Zq4bSxEArQmOfPZ58i0/fupwLml/FCvWi0askJnTsBf7MP1RmhljSyFwG8XAVeqNJEUaJ7wM40IUXU50AGY75UUnMl8o15unl4oBw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605007731; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=07wHspkIRHHvgkdEXAzCTs5Z3W2ApXwCpFVJfU27vw0=; b=jKDilDplQZazjiYJhLYN3RG8OA+mOXYfJVtGmwWk5AjeI6HhTCqu0ji+fDruYd1zHq+1uwvJ16Xtd3cN8Y9Q3E19pVJvyRbFirv1j5fjAxyyWoRRmLk+hHIjkn0HjJm0URjQI8C4SisDpOi7YqI3xd0NlTvWifjlMWqguZSkb/I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605007731439553.426262378579; Tue, 10 Nov 2020 03:28:51 -0800 (PST) Received: from localhost ([::1]:50064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRpS-0005pv-90 for importer@patchew.org; Tue, 10 Nov 2020 06:28:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRgR-0001ye-Gh for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:31 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:37342) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRgO-0006oT-Tu for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:31 -0500 Received: by mail-wr1-x42d.google.com with SMTP id b6so910483wrt.4 for ; Tue, 10 Nov 2020 03:19:28 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 109sm16909498wra.29.2020.11.10.03.19.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 03:19:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=07wHspkIRHHvgkdEXAzCTs5Z3W2ApXwCpFVJfU27vw0=; b=kreWWZbx+60j1UNPkHDUGv6s0+zy4kub57qgt6lCLpL0+Vj4Lyp9+fM0Wj/gwndRz5 /bEFNu+vpGnDJTrlcrLdGsO46BtZN3M1Zdy3HivobHjsk8TMoJDpGkGOP3xunn0eULfK jb1ZuBSVeWG4B4fVrEmt0NL6HGhfFbR+7t7uDUjBrr5FpONPzKoJmTyjzPh9STwsd7Q3 EAVh/CI+vnxWdrIqUtuvXgXBBO3EMUlgaOoSD5nN0qH/NvRLvd3K6VblsQnN6mXMMQ1j RFExGUpoqjYMuugRnFv0jpEIbAOYzICbD5ShQew30at2IfbhsRooSJS519vXmNcRRfVG 88lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=07wHspkIRHHvgkdEXAzCTs5Z3W2ApXwCpFVJfU27vw0=; b=BMS6a+jZwtcSg8nrc/VC+e9TE/NFN8WfL1F2vEYxPfhDf31Emp0718FnlzYrL/zu95 89L7cj9s49DMfthd5GGHFfEVU2tvOIS9k7+7WdY/vTxNcWfcbASAhTDwBHthcD0bsvl9 mhGnNTJRcY3pODcf+q4vmge7aegpRwHCg6jz/XoO70DY2CDvvZs3VlTDiFI0lVorZqrW OfzOqnuG6zlRz2VMFSEK0OPp19bSXvg8UsxfkX7uYbpmrnTRhlfmtqEPxsOU2C3UHQsx El9cTlUzoZ2rt2lEb4kSbDb5gaAKgviLbB4ATRRkc+RUDgx2J2g/HkTn7wxXI8HGUXNd wFdA== X-Gm-Message-State: AOAM5305Qbxx7D2ACgq4mmiNi8HmadZZXEaEMrDQabrCx1g9aHioj7EZ TL5eyPH3+htrmsTbxEZG37xcbuyZD8fXlg== X-Google-Smtp-Source: ABdhPJwTtl8CLAFkX8t5EZ6YjusDQ8qB8gOWDtJA27mZAvN/1ffD3pJEgBV5RHgrh/40jG36q9tc1g== X-Received: by 2002:a5d:4fc1:: with SMTP id h1mr22994672wrw.226.1605007167289; Tue, 10 Nov 2020 03:19:27 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 06/16] docs: add some notes on the sbsa-ref machine Date: Tue, 10 Nov 2020 11:19:07 +0000 Message-Id: <20201110111917.29539-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110111917.29539-1-peter.maydell@linaro.org> References: <20201110111917.29539-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, WEIRD_QUOTING=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Alex Benn=C3=A9e We should at least document what this machine is about. Reviewed-by: Graeme Gregory Signed-off-by: Alex Benn=C3=A9e Message-id: 20201104165254.24822-1-alex.bennee@linaro.org Cc: Leif Lindholm Cc: Shashi Mallela Signed-off-by: Alex Benn=C3=A9e [PMM: fixed filename mismatch] Signed-off-by: Peter Maydell --- docs/system/arm/sbsa.rst | 32 ++++++++++++++++++++++++++++++++ docs/system/target-arm.rst | 1 + 2 files changed, 33 insertions(+) create mode 100644 docs/system/arm/sbsa.rst diff --git a/docs/system/arm/sbsa.rst b/docs/system/arm/sbsa.rst new file mode 100644 index 00000000000..b8ecfdb62fd --- /dev/null +++ b/docs/system/arm/sbsa.rst @@ -0,0 +1,32 @@ +Arm Server Base System Architecture Reference board (``sbsa-ref``) +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +While the `virt` board is a generic board platform that doesn't match +any real hardware the `sbsa-ref` board intends to look like real +hardware. The `Server Base System Architecture +` defines a +minimum base line of hardware support and importantly how the firmware +reports that to any operating system. It is a static system that +reports a very minimal DT to the firmware for non-discoverable +information about components affected by the qemu command line (i.e. +cpus and memory). As a result it must have a firmware specifically +built to expect a certain hardware layout (as you would in a real +machine). + +It is intended to be a machine for developing firmware and testing +standards compliance with operating systems. + +Supported devices +""""""""""""""""" + +The sbsa-ref board supports: + + - A configurable number of AArch64 CPUs + - GIC version 3 + - System bus AHCI controller + - System bus EHCI controller + - CDROM and hard disc on AHCI bus + - E1000E ethernet card on PCIe bus + - VGA display adaptor on PCIe bus + - A generic SBSA watchdog device + diff --git a/docs/system/target-arm.rst b/docs/system/target-arm.rst index fdcf25c2375..a0d5c57799c 100644 --- a/docs/system/target-arm.rst +++ b/docs/system/target-arm.rst @@ -79,6 +79,7 @@ undocumented; you can get a complete list by running arm/mps2 arm/musca arm/realview + arm/sbsa arm/versatile arm/vexpress arm/aspeed --=20 2.20.1 From nobody Mon Apr 29 04:02:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1605008184; cv=none; d=zohomail.com; s=zohoarc; b=nwB3rrqCWY5/J/XYo2PsFZGzKItKTI+OnsFRDwWTKqW3TwZpCyJ0s4tDTUhBQ2FuW+McpQhHvSwaCXqlmc6FFiBQlLM18hlevZVIwXgwhnV+/9PExHWS0MVn988XZY/1kQCDuTqNSLRb4WsQa6DLN7DuI84EjG5pCmI3w+qzIp8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605008184; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=h6cmnC4syNYJyq+kRB9MZJYpWw99R0j6xzYSNouC8Jw=; b=R6el/uxJu8aHpP6fLj+n3Rh6UoX4/0KaLp4T7jybe5I26qDF1OvK7Z1eaqJmVhClQzTyy41BFLDUB68dIHPV2Uvuobl4cssU/OggE2KBRzqNBR6F+OnRVc3boFsmXkEzLT6sZfIwpVcsXEFNhtgy4zZnMMtzIMY4BclY20Ze95o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605008184811675.2901541528868; Tue, 10 Nov 2020 03:36:24 -0800 (PST) Received: from localhost ([::1]:43102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRwl-0006MP-N6 for importer@patchew.org; Tue, 10 Nov 2020 06:36:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46264) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRgR-0001zX-W3 for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:32 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:43598) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRgP-0006pC-Vx for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:31 -0500 Received: by mail-wr1-x42d.google.com with SMTP id s8so5152521wrw.10 for ; Tue, 10 Nov 2020 03:19:29 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 109sm16909498wra.29.2020.11.10.03.19.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 03:19:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=h6cmnC4syNYJyq+kRB9MZJYpWw99R0j6xzYSNouC8Jw=; b=b7pvJB0TUFGR/k+sBd0GQ9APnQCP97oVlMLSsBR1EafT3OfPlwFAuuXJ6iWplwWm9p qRCU36tFc6WLiktnPqiT3FtMEog9AARfvvAowqVZECAEbN37IB54Au03BZzEvzVgFVAV nl9F9kuxXbKo0iRr7h50ZhLkRVVkOrO2u2eFqx5eefL852V6Egs4ijpuJjacpPaje5rI igRVeM/inEyhQdqklslBZmLJ/zq29GvqGKdSnQqKYCz/nFgO76w9wzn+bAKySad09+mP ilKZnW1wyYxFJOs7m/o3N8pFgd9y+INNlhuTYIc0W9awwc/zC7pfpufITJDraxaLhUNi b3RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h6cmnC4syNYJyq+kRB9MZJYpWw99R0j6xzYSNouC8Jw=; b=EuRF0DZEepPVh1EWZREhCwdnGoKaYqvH0AAJRcNpjHMCiJ9XfcQRYXtBnM8YIiHuYC 6CgLRnhUTNE0GyUotbfn7W7Ki3ZJwpN0IGtDMQ0m8SUoJYsGDs3teIku8Y9cdlBwI+Pl XpFfYqItgWS5vkuxsYmXdofzTyLEK9fITvWCszjkn9V1p9bGatlcbMiuWI2IwfCR9lTQ mrNSEeRCJubJSgnhpElltaa6w/yS8B1isbjXnoubi2abbTp3dNfO99DAizn74rNv8J0E kbAHs2M3X4z3UpbJoTOvviOsH/fsbrPHR0slM0oJJA2q7VV5CgVWLhj+8fkiP7OQDOrL 7JBA== X-Gm-Message-State: AOAM530q3V09dTGXjWaVcFMWkjIurQ7IsomNpmPx0flNt4awnJgTc3uo U7qB3f+1shxP3lTvhLLLFzV5+r5et6PMHA== X-Google-Smtp-Source: ABdhPJzkpNiFPyTchWxlW19p20raHNcPrk36oqL/YcWWjAlT+zJCQINfxS66rLJZPJfTvJ8yXYEctw== X-Received: by 2002:adf:f808:: with SMTP id s8mr8768043wrp.257.1605007168335; Tue, 10 Nov 2020 03:19:28 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 07/16] hw/arm/virt: Remove dependency on Cortex-A15 MPCore peripherals Date: Tue, 10 Nov 2020 11:19:08 +0000 Message-Id: <20201110111917.29539-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110111917.29539-1-peter.maydell@linaro.org> References: <20201110111917.29539-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Philippe Mathieu-Daud=C3=A9 When using a Cortex-A15, the Virt machine does not use any MPCore peripherals. Remove the dependency. Fixes: 7951c7b7c05 ("hw/arm: Express dependencies of the virt machine with = Kconfig") Reported-by: Miroslav Rezanina Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20201107114852.271922-1-philmd@redhat.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 7d5d89e1acf..c9f60e82516 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -6,7 +6,6 @@ config ARM_VIRT imply VFIO_PLATFORM imply VFIO_XGMAC imply TPM_TIS_SYSBUS - select A15MPCORE select ACPI select ARM_SMMUV3 select GPIO_KEY --=20 2.20.1 From nobody Mon Apr 29 04:02:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1605007381; cv=none; d=zohomail.com; s=zohoarc; b=icaFCdS2GVozJ6WMBaGBMrufytrwOFYiOXZJLis2Pjp02jHP+d21iv5MPREyQXbqeA7YfdMV+5UqpBmze/BBJ6n7ckGx569AmgbLlqsuSYRYqOC5dthKuCKiTdK3dnIU14xN40VCZDX7CnKw3yTrfwSs12IWTtwkuG2ChYrzLkk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605007381; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QJd5XkxKLkkgZry9ph7vylC1lYNWAIO4g+OAGMmxr1U=; b=UM3kKw00z7w7wMDhc8XW/a5XGW0Y9qrbl97SOmJKzIN7EkpXbmtiDoSEykQSjkopHaM0f0bVzHvn71aEzjF0QUXww4I73euV6/odCGRiQlU6cyn+0oBx3bPv/szRCwwdrKMi87CB3SpbVlb/rGZ8wA2RQ8+yuzyl4+AlPyu29Eg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605007381573347.91183601091336; Tue, 10 Nov 2020 03:23:01 -0800 (PST) Received: from localhost ([::1]:57562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRjo-0005a8-Ax for importer@patchew.org; Tue, 10 Nov 2020 06:23:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRgT-00022L-7V for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:33 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:38681) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRgR-0006pj-Ab for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:32 -0500 Received: by mail-wr1-x433.google.com with SMTP id p8so11438762wrx.5 for ; Tue, 10 Nov 2020 03:19:30 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 109sm16909498wra.29.2020.11.10.03.19.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 03:19:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=QJd5XkxKLkkgZry9ph7vylC1lYNWAIO4g+OAGMmxr1U=; b=EzbBqCRRw3PlsXXoedZ6ZxzXW0IUTH1NS24sSSwZFr7+Fq/Ket7TDfbVizZrOuzCMe CjhJ5c7VFfeRJMddZpDJuCeCU0ijCg42lA28oacFo7CKnbL3TOKRa+1zddz5CBqQPp+C 45C0ip9i6+uW+BulrPr1+5Kc7GSxpNMHxG5202epACJyw37oV9GJCjmStlRnsYMZI9t1 mOWbSdx3v0MivMSUyzlXlco4Z5rXZbRthIyp6yw7fxxSj3I3Rc/2hOuCeWX5kQw6buVX opsheFsJVKr6wMztxDhvlRlCUJkhdWRyU5hjHwfa9PvcVjwcRZv7iXHd2BmY2SrULGms PB5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QJd5XkxKLkkgZry9ph7vylC1lYNWAIO4g+OAGMmxr1U=; b=LjvBe6H7Q4NH3dwTtrHULUUiAN+XjEvpqYLhZMPmlw3ZcukMwTwarx0oTS0K3iRkrn rWJ4NIr+bGf7+y75bOkwcbhfeRtjg3wHyrzKEZpPXT9v50uSCcQOFhvJPwOpW+fMzJ1w 3Wh6fJg+7zP6gzvVuZZyjJ/bYrK4vC6w+Rn0Gs346UdI1rPVlC96minvgW2UMprndCJb GJyK76ZGiL9JjgpU4RdQYIlUG9KEZ7ZZA8gMD/6CfRM+pm/EXymLJ/adp5Syyb3tTkt3 dLnW+RV0zgrMyxMEdLnBZPzWHoK7TemFxXlKazDUg90PuRbd95mEMftKJzHfztNX38Xw JeRA== X-Gm-Message-State: AOAM531jVgru8jWmBPrukKHb5h2bFSGrTqCQfMb0D/t/Xbpy6n531WAS 2euYwl0099q5nJq/xH4BV6c1XL0cEZx5HQ== X-Google-Smtp-Source: ABdhPJyC50N3lmpTorxeQxdheWHyAELH3BtHb6g2MtkO1ereUNBbqmgYz7J55t7oGjFevzLfZCCFuA== X-Received: by 2002:a5d:504b:: with SMTP id h11mr2615206wrt.322.1605007169523; Tue, 10 Nov 2020 03:19:29 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 08/16] target/arm: Fix neon VTBL/VTBX for len > 1 Date: Tue, 10 Nov 2020 11:19:09 +0000 Message-Id: <20201110111917.29539-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110111917.29539-1-peter.maydell@linaro.org> References: <20201110111917.29539-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x433.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Richard Henderson The helper function did not get updated when we reorganized the vector register file for SVE. Since then, the neon dregs are non-sequential and cannot be simply indexed. At the same time, make the helper function operate on 64-bit quantities so that we do not have to call it twice. Fixes: c39c2b9043e Reported-by: Ard Biesheuvel Signed-off-by: Richard Henderson [PMM: use aa32_vfp_dreg() rather than opencoding] Message-id: 20201105171126.88014-1-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/helper.h | 2 +- target/arm/op_helper.c | 23 +++++++++-------- target/arm/translate-neon.c.inc | 44 +++++++++++---------------------- 3 files changed, 29 insertions(+), 40 deletions(-) diff --git a/target/arm/helper.h b/target/arm/helper.h index 774d2cddb5c..ff8148ddc6b 100644 --- a/target/arm/helper.h +++ b/target/arm/helper.h @@ -245,7 +245,7 @@ DEF_HELPER_FLAGS_2(rsqrte_f32, TCG_CALL_NO_RWG, f32, f3= 2, ptr) DEF_HELPER_FLAGS_2(rsqrte_f64, TCG_CALL_NO_RWG, f64, f64, ptr) DEF_HELPER_FLAGS_1(recpe_u32, TCG_CALL_NO_RWG, i32, i32) DEF_HELPER_FLAGS_1(rsqrte_u32, TCG_CALL_NO_RWG, i32, i32) -DEF_HELPER_FLAGS_4(neon_tbl, TCG_CALL_NO_RWG, i32, i32, i32, ptr, i32) +DEF_HELPER_FLAGS_4(neon_tbl, TCG_CALL_NO_RWG, i64, env, i32, i64, i64) =20 DEF_HELPER_3(shl_cc, i32, env, i32, i32) DEF_HELPER_3(shr_cc, i32, env, i32, i32) diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c index b1065216b2d..aa13b978c0d 100644 --- a/target/arm/op_helper.c +++ b/target/arm/op_helper.c @@ -68,21 +68,24 @@ void raise_exception_ra(CPUARMState *env, uint32_t excp= , uint32_t syndrome, cpu_loop_exit_restore(cs, ra); } =20 -uint32_t HELPER(neon_tbl)(uint32_t ireg, uint32_t def, void *vn, - uint32_t maxindex) +uint64_t HELPER(neon_tbl)(CPUARMState *env, uint32_t desc, + uint64_t ireg, uint64_t def) { - uint32_t val, shift; - uint64_t *table =3D vn; + uint64_t tmp, val =3D 0; + uint32_t maxindex =3D ((desc & 3) + 1) * 8; + uint32_t base_reg =3D desc >> 2; + uint32_t shift, index, reg; =20 - val =3D 0; - for (shift =3D 0; shift < 32; shift +=3D 8) { - uint32_t index =3D (ireg >> shift) & 0xff; + for (shift =3D 0; shift < 64; shift +=3D 8) { + index =3D (ireg >> shift) & 0xff; if (index < maxindex) { - uint32_t tmp =3D (table[index >> 3] >> ((index & 7) << 3)) & 0= xff; - val |=3D tmp << shift; + reg =3D base_reg + (index >> 3); + tmp =3D *aa32_vfp_dreg(env, reg); + tmp =3D ((tmp >> ((index & 7) << 3)) & 0xff) << shift; } else { - val |=3D def & (0xff << shift); + tmp =3D def & (0xffull << shift); } + val |=3D tmp; } return val; } diff --git a/target/arm/translate-neon.c.inc b/target/arm/translate-neon.c.= inc index 59368cb2436..0ae95cb8df8 100644 --- a/target/arm/translate-neon.c.inc +++ b/target/arm/translate-neon.c.inc @@ -2861,9 +2861,8 @@ static bool trans_VEXT(DisasContext *s, arg_VEXT *a) =20 static bool trans_VTBL(DisasContext *s, arg_VTBL *a) { - int n; - TCGv_i32 tmp, tmp2, tmp3, tmp4; - TCGv_ptr ptr1; + TCGv_i64 val, def; + TCGv_i32 desc; =20 if (!arm_dc_feature(s, ARM_FEATURE_NEON)) { return false; @@ -2879,43 +2878,30 @@ static bool trans_VTBL(DisasContext *s, arg_VTBL *a) return true; } =20 - n =3D a->len + 1; - if ((a->vn + n) > 32) { + if ((a->vn + a->len + 1) > 32) { /* * This is UNPREDICTABLE; we choose to UNDEF to avoid the * helper function running off the end of the register file. */ return false; } - n <<=3D 3; - tmp =3D tcg_temp_new_i32(); - if (a->op) { - read_neon_element32(tmp, a->vd, 0, MO_32); - } else { - tcg_gen_movi_i32(tmp, 0); - } - tmp2 =3D tcg_temp_new_i32(); - read_neon_element32(tmp2, a->vm, 0, MO_32); - ptr1 =3D vfp_reg_ptr(true, a->vn); - tmp4 =3D tcg_const_i32(n); - gen_helper_neon_tbl(tmp2, tmp2, tmp, ptr1, tmp4); =20 + desc =3D tcg_const_i32((a->vn << 2) | a->len); + def =3D tcg_temp_new_i64(); if (a->op) { - read_neon_element32(tmp, a->vd, 1, MO_32); + read_neon_element64(def, a->vd, 0, MO_64); } else { - tcg_gen_movi_i32(tmp, 0); + tcg_gen_movi_i64(def, 0); } - tmp3 =3D tcg_temp_new_i32(); - read_neon_element32(tmp3, a->vm, 1, MO_32); - gen_helper_neon_tbl(tmp3, tmp3, tmp, ptr1, tmp4); - tcg_temp_free_i32(tmp); - tcg_temp_free_i32(tmp4); - tcg_temp_free_ptr(ptr1); + val =3D tcg_temp_new_i64(); + read_neon_element64(val, a->vm, 0, MO_64); =20 - write_neon_element32(tmp2, a->vd, 0, MO_32); - write_neon_element32(tmp3, a->vd, 1, MO_32); - tcg_temp_free_i32(tmp2); - tcg_temp_free_i32(tmp3); + gen_helper_neon_tbl(val, cpu_env, desc, val, def); + write_neon_element64(val, a->vd, 0, MO_64); + + tcg_temp_free_i64(def); + tcg_temp_free_i64(val); + tcg_temp_free_i32(desc); return true; } =20 --=20 2.20.1 From nobody Mon Apr 29 04:02:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1605008217; cv=none; d=zohomail.com; s=zohoarc; b=YnkrfwUMksI56UerRuxAED3UlIq2ZZVh+w+Dh8lphnn980D9twBARDEnar+Zn3Eslx16DCWbRyXIV0WHnsqYxXlXtuMHGfeYImgBgx1c4wzVAL7GWf3CqF6GK7e9x6wOJc2D/DUkNBrEVzgpjcqY+8lPRrAJfCywdgi1WHa69T0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605008217; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BrLyYJDU5XDe47dExt9STY1Tj40m+eSWvhd62k1qW3w=; b=BHICEHTqxRFR6KeNtrmshNZRo9OlWUmOr/OOlYCKbQKnbHOqfDe06SowylsT61GgrDkOaBRWeQExPHQKm7ZM/vOvrUnMW4mdYkm+5EmTJeFvYEJbSgKFdiIcr7IF/ERIdFK5lQyEUHxyk238pZ11nFNUREBfDGUPUMBlwmzTstI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605008217807399.4850243192226; Tue, 10 Nov 2020 03:36:57 -0800 (PST) Received: from localhost ([::1]:44118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRxI-0006mx-My for importer@patchew.org; Tue, 10 Nov 2020 06:36:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRgX-0002DS-V7 for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:37 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:34517) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRgV-0006rB-Kx for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:37 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 23so1786499wmg.1 for ; Tue, 10 Nov 2020 03:19:34 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 109sm16909498wra.29.2020.11.10.03.19.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 03:19:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=BrLyYJDU5XDe47dExt9STY1Tj40m+eSWvhd62k1qW3w=; b=K5mSNbKxHFbpTnH10scoVkfQXuMPXyEj2aRliCGCxVW0bbQ86gMT2pBZXUkCk9v9Za UFRp/WBl7HNFnXx9VHOHqg2ICrr3EV+DuupVMLHs8GVRyPR/P1tfBlEVYM9RrV5LL2vW 1EfwYRIB34lJ36z5XTpVC666JuwlYBlAFzg59UBPyBd92pWqdLG9ndGaSa1dCQK4Sshu dd+wQz2maKw71YO8e6xv51/Mf0tC6v6/nq4CEcsfH5uV7LlbhyRxT0z8RPFRMuRqVm/H qvJ35V5pyqawwNc6zvifBwf27xS38GcTJ8zs9cM6lGmeqTps6phho/+bfNpET6QdIMFR NiKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BrLyYJDU5XDe47dExt9STY1Tj40m+eSWvhd62k1qW3w=; b=d2Y0WF/eAF+Cf2c6msV/hk1P5qwxfUBeoWq7DQ/5UNiuvVCS13nbsTGGD32UgPpffc OZoxgRB+gbYLrpZovBflbgVYbX4nZm/jmqTMm+j6N29sxYRKvZqMYr15hlR9WNcEXBRV Ehal8FEOC4HXqOsDYlm+yK1S/hBu8yS8yTbWb66kaWXmp/jeyH60y/9RRiCplH/6DZoO OhCMNVqFMD4NNTuBtLdFN2Y1DM74kpgeM2loqIVi2ZFtIwotvKbnEV9Vq4b8y16r4NdP KsiUHKGLMQwhiiYyGLWM3aeoTj/9eaLoqsyUw46FQYvY+5nL4nMF5L3HqYFeuQ2iOhob EDaQ== X-Gm-Message-State: AOAM532TCfPPthLBOAZX4kuS0kD5YFbPH/Eugbabe2tu2tNDmEZkQoXr 6lC6ZQXy9An8wGv6HmnOhJNK/I7Ze0UvvA== X-Google-Smtp-Source: ABdhPJyVuYlvAatfqZ2uRpC5SsKq9u3h91nk5ah6MGfoh/O5RKZbnBFnBlfN5EYVEQ3RPF/PbJNSBg== X-Received: by 2002:a1c:ed0b:: with SMTP id l11mr4088407wmh.46.1605007170690; Tue, 10 Nov 2020 03:19:30 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 09/16] hw/arm/armsse: Correct expansion MPC interrupt lines Date: Tue, 10 Nov 2020 11:19:10 +0000 Message-Id: <20201110111917.29539-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110111917.29539-1-peter.maydell@linaro.org> References: <20201110111917.29539-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32e.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Philippe Mathieu-Daud=C3=A9 We can use one MPC per SRAM bank, but we currently only wire the IRQ from the first expansion MPC to the IRQ splitter. Fix that. Fixes: bb75e16d5e6 ("hw/arm/iotkit: Wire up MPC interrupt lines") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20201107193403.436146-2-f4bug@amsat.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/armsse.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index a93da37dcbb..baac027659d 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -1074,7 +1074,8 @@ static void armsse_realize(DeviceState *dev, Error **= errp) qdev_get_gpio_in(dev_splitter, 0)); qdev_connect_gpio_out(dev_splitter, 0, qdev_get_gpio_in_named(dev_secctl, - "mpc_status", 0)); + "mpc_status", + i - IOTS_NUM_EXP_= MPC)); } =20 qdev_connect_gpio_out(dev_splitter, 1, --=20 2.20.1 From nobody Mon Apr 29 04:02:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1605008337; cv=none; d=zohomail.com; s=zohoarc; b=SnuIywpxGiQPHwbZxETQ3qqcazNmFGNgsISmXrpb/gNFXJ7L5Hk1a43ZcsgszUkLmXuWZWhXMJRMrRevGjrayM0qemtdo1RDahzTmTrBQ+ZFpUt5D+pna3h8P+pjB2jyLS6Sf0YMyqy4MyTo2ulP2IBsYdXt13nvqSX4/0a2+dY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605008337; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=13y5A/3RdD1ISz9lCnE9vUehU86kOiFH9EjJAMVmudI=; b=V20UbihOKk5LbkbItWvnu+TmYfmYQ+CYER1glE6Io2afa9Ui+9uy3lzRoU0GpDyQn9/D7Z0uD4OCgDDijB+K3gCpQAQZm9XtY5j6FcMpvi/WifEisUwjfmQAjLgQH5+ShxEx/6HVy9HUMFdqYaSPhb5CModm79Dgmi7LnnYIg9I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605008337400211.90265792725074; Tue, 10 Nov 2020 03:38:57 -0800 (PST) Received: from localhost ([::1]:49388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRzE-0000Y6-5J for importer@patchew.org; Tue, 10 Nov 2020 06:38:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRgV-00027k-9s for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:35 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:46226) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRgT-0006qC-DJ for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:34 -0500 Received: by mail-wr1-x42f.google.com with SMTP id d12so10733266wrr.13 for ; Tue, 10 Nov 2020 03:19:32 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 109sm16909498wra.29.2020.11.10.03.19.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 03:19:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=13y5A/3RdD1ISz9lCnE9vUehU86kOiFH9EjJAMVmudI=; b=COcFL/fXMT6yNw4rFMSYfgRnnrelQchFAj9+NcRIGRoV7ThlTVCRms2aIia/5L2BQs t1vkPvW0qZm+bxwJyuml1dASVThJ964g7pIDomHhpdDNbG1A0LZE621OurCWhFNA6C44 ZMNH/mTaks4VgkCSAeQmaqC6je6wop70R/fabosPh4bmGrxg/w6nYH+ZH9mcKxa+cRjh J7BZls9wULO1kxhpxqjpG31WbOLOJDO3YOglGkAHcKxK4ozB1eEnF6c1KyL2ANKbPIt2 nBmRV2luBNOQvXPNVvNfuUpvYo0RQbFbQEEGmxSJ/8we9TbPlQLvTz8xRSYI0NCYPmFj Dshg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=13y5A/3RdD1ISz9lCnE9vUehU86kOiFH9EjJAMVmudI=; b=DFLKZafdxl80DL5CV28GF8G0kobgozc7BkHslfyMS4Cv8k3U7mifkP4pa8aZHBtAo+ H2ixtssSHRr/vmjjiMqEUIS+NGKx56LEmD54AYY2H68V2YjKh+9vyI1FKxcWt2F8ut85 Yfpwws0Ofn1nKeNyytvvq1Jp+JvTXiDpVb9eM1XGSDQmbUdFHPGBqPExNdYpU4QtzkJn ge+gfA0GufqZZSkfw8VBFk4WWw9fYHBpe1U2IbXQE6rzlejgocM4LISX4mXA1Fz+CT/u Nfl54AtcWnuZvMeOb3miJMyMKmNLkX+KYozmrjWpkP+lg8/pKropzEWApAuLC8LoTdkN KHeQ== X-Gm-Message-State: AOAM531B5le4s49eDu0sc+YgoGybR4A1Ev2ameMHLaA4cpyVvwg4D3Ov 5VzKoZJhZqsAc6KrFpW0/Q5WBA0XVe0FoA== X-Google-Smtp-Source: ABdhPJwSSY4ixL+UfwPKbdQt953eq6Kfh0/p1/aefhUxEa7KGG7A7pnr93l3vnhOeFTi6DOoWkBJLA== X-Received: by 2002:a05:6000:1c9:: with SMTP id t9mr17015370wrx.379.1605007171822; Tue, 10 Nov 2020 03:19:31 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 10/16] hw/misc/stm32f2xx_syscfg: Remove extraneous IRQ Date: Tue, 10 Nov 2020 11:19:11 +0000 Message-Id: <20201110111917.29539-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110111917.29539-1-peter.maydell@linaro.org> References: <20201110111917.29539-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Philippe Mathieu-Daud=C3=A9 The system configuration controller (SYSCFG) doesn't have any output IRQ (and the INTC input #71 belongs to the UART6). Remove the invalid code. Fixes: db635521a02 ("stm32f205: Add the stm32f205 SoC") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20201107193403.436146-3-f4bug@amsat.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- include/hw/misc/stm32f2xx_syscfg.h | 2 -- hw/arm/stm32f205_soc.c | 1 - hw/misc/stm32f2xx_syscfg.c | 2 -- 3 files changed, 5 deletions(-) diff --git a/include/hw/misc/stm32f2xx_syscfg.h b/include/hw/misc/stm32f2xx= _syscfg.h index 57a98c533db..8595a3b31b0 100644 --- a/include/hw/misc/stm32f2xx_syscfg.h +++ b/include/hw/misc/stm32f2xx_syscfg.h @@ -53,8 +53,6 @@ struct STM32F2XXSyscfgState { uint32_t syscfg_exticr3; uint32_t syscfg_exticr4; uint32_t syscfg_cmpcr; - - qemu_irq irq; }; =20 #endif /* HW_STM32F2XX_SYSCFG_H */ diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c index a4f3344db25..9cd41bf56da 100644 --- a/hw/arm/stm32f205_soc.c +++ b/hw/arm/stm32f205_soc.c @@ -117,7 +117,6 @@ static void stm32f205_soc_realize(DeviceState *dev_soc,= Error **errp) } busdev =3D SYS_BUS_DEVICE(dev); sysbus_mmio_map(busdev, 0, 0x40013800); - sysbus_connect_irq(busdev, 0, qdev_get_gpio_in(armv7m, 71)); =20 /* Attach UART (uses USART registers) and USART controllers */ for (i =3D 0; i < STM_NUM_USARTS; i++) { diff --git a/hw/misc/stm32f2xx_syscfg.c b/hw/misc/stm32f2xx_syscfg.c index aa59b435498..04c22c28502 100644 --- a/hw/misc/stm32f2xx_syscfg.c +++ b/hw/misc/stm32f2xx_syscfg.c @@ -133,8 +133,6 @@ static void stm32f2xx_syscfg_init(Object *obj) { STM32F2XXSyscfgState *s =3D STM32F2XX_SYSCFG(obj); =20 - sysbus_init_irq(SYS_BUS_DEVICE(obj), &s->irq); - memory_region_init_io(&s->mmio, obj, &stm32f2xx_syscfg_ops, s, TYPE_STM32F2XX_SYSCFG, 0x400); sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio); --=20 2.20.1 From nobody Mon Apr 29 04:02:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1605007523; cv=none; d=zohomail.com; s=zohoarc; b=ecFEUScdcET5dmiFzydPax5PnkY0J/mLu33gEq3Dem6gLGKHucRC/Gqf8WQnJNqd9r61SC7Pkhay5UnPXwvxkMfy0wcEEn13G1x0GaxuQjsyLvmKfilyPJzVFKtskew7xjaBxek23Y++l3lHG4uTBCOtR7Gibt4OjXnWTbC48dk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605007523; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ncROH4SAzxzER5pxRz2Vkiv7YWAfqJ5o51gGiSjIRBA=; b=QJlcclHkt1xqgdhlBeK1IM9XcYHgeYxgWOT4YOKRqZSFvpkSG14ZfCL6xG1csmTwUiyKOU4Ya1Qg8MLOIUWx8+WHTAAPTg8L0HGhlcV8KlG7Lz16FUdCcV9flCARdMgt8/G9ol8eIZ9+vEDgWtwnmG22mu0UbRb4RgMuFVu2IF0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605007523335644.0263760591331; Tue, 10 Nov 2020 03:25:23 -0800 (PST) Received: from localhost ([::1]:37678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRm5-0000Yj-TM for importer@patchew.org; Tue, 10 Nov 2020 06:25:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRgX-0002Bc-BF for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:37 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:37892) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRgU-0006qK-9x for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:37 -0500 Received: by mail-wm1-x330.google.com with SMTP id h62so2622119wme.3 for ; Tue, 10 Nov 2020 03:19:33 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 109sm16909498wra.29.2020.11.10.03.19.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 03:19:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=ncROH4SAzxzER5pxRz2Vkiv7YWAfqJ5o51gGiSjIRBA=; b=iHCYsAZl70cL5cc/9hPJh/k/Z2jaWjnlljwjR6pPPyHDjE3IckVoeoxQl8vqT6amap 283NtfZbjlzVPMpR+mbXJ2HEhBBk3u3jgitq5L1x+ASE/axRE7G3DTYWwzoBLkLT6Kxj wPKq/KS615tYBvkX+5jR1PRYtWRKbB6HU1iR4c49RnXAPkSll/hNFzRta3qvMS9gVV7G pOzyESOwWQpBEvwzw69HTQNBeGkLS7g1WIM29I9KvV43afMAbY3yxWdPGWSnVSV2OZRd rdoziAEveTCVDDoPTH3JUQXP4bP+vZECB6xtOC3XjJggqXEMp1lc1GTOj50RJLr/jpvt /qIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ncROH4SAzxzER5pxRz2Vkiv7YWAfqJ5o51gGiSjIRBA=; b=TOhYn4deF7B4KobiRFFt0hVHB3RgDvxDAo+605HCnmxqs57uA9YQhT3rKnvfYA65qr KmmzsA6gfxuHqGWTmiXJ0v4npVyuS7d8TrGZraiIbiuzhquIsI7jpNCB23C77fWsOfVW eUmUJUVy+JSfoC6/0ORu7j5hKKJOH8SdlMkOS6rrdUblsS+znaPBNpyDug1coa/qqBgR hrE4fuCEl5HrKbiFiGaHZmyUfiC717iSVNxvhusSv+cgHCibMVW9sqivqMVPTSkzyj5i +Fy+T3KhZTEFRhD+mpb1ov57edsn7wUQ0JKJhkVcd4AZPJNyPhGbIEqyYIHtzmHP+CCs geow== X-Gm-Message-State: AOAM531le1wT6uP7HFO6y2SdDVmcvneOdE1ZWLxXtL0azRgcP8WTZf4W j/lO/SWVqsChMsYDINoLa5y+VFnx3dbFfw== X-Google-Smtp-Source: ABdhPJxyqv5V0MkJeTUeo9fc7IOrstjfb4y+XBomMjLqr07Ve2xX8OWeWWqOycYRSgyupn/yr1MeRA== X-Received: by 2002:a7b:c5c3:: with SMTP id n3mr4117152wmk.44.1605007172730; Tue, 10 Nov 2020 03:19:32 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 11/16] hw/arm/nseries: Remove invalid/unnecessary n8x0_uart_setup() Date: Tue, 10 Nov 2020 11:19:12 +0000 Message-Id: <20201110111917.29539-12-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110111917.29539-1-peter.maydell@linaro.org> References: <20201110111917.29539-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Philippe Mathieu-Daud=C3=A9 omap2420_mpu_init() introduced in commit 827df9f3c5f ("Add basic OMAP2 chip support") takes care of creating the 3 UARTs. Then commit 58a26b477e9 ("Emulate a serial bluetooth HCI with H4+ extensions and attach to n8x0's UART") added n8x0_uart_setup() which create the UART and connects it to an IRQ output, overwritting the existing peripheral and its IRQ connection. This is incorrect. Fortunately we don't need to fix this, because commit 6da68df7f9b ("hw/arm/nseries: Replace the bluetooth chardev with a "null" chardev") removed the use of this peripheral. We can simply remove the code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20201107193403.436146-4-f4bug@amsat.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/nseries.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index 76fd7fe9854..6215c18d627 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -789,16 +789,6 @@ static void n8x0_cbus_setup(struct n800_s *s) cbus_attach(cbus, s->tahvo =3D tahvo_init(tahvo_irq, 1)); } =20 -static void n8x0_uart_setup(struct n800_s *s) -{ - Chardev *radio =3D qemu_chr_new("bt-dummy-uart", "null", NULL); - /* - * Note: We used to connect N8X0_BT_RESET_GPIO and N8X0_BT_WKUP_GPIO - * here, but this code has been removed with the bluetooth backend. - */ - omap_uart_attach(s->mpu->uart[BT_UART], radio); -} - static void n8x0_usb_setup(struct n800_s *s) { SysBusDevice *dev; @@ -1362,7 +1352,6 @@ static void n8x0_init(MachineState *machine, n8x0_spi_setup(s); n8x0_dss_setup(s); n8x0_cbus_setup(s); - n8x0_uart_setup(s); if (machine_usb(machine)) { n8x0_usb_setup(s); } --=20 2.20.1 From nobody Mon Apr 29 04:02:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1605008472; cv=none; d=zohomail.com; s=zohoarc; b=Kve94p2Fy0X8us2XcU0vakOz1gZdQ3zsEtVn5mgww9bg3IZ4dfMmJRmupuDOgG3OPJmL3rMWQmhUnrz2e+GRPfbuXsXZf3VBuZKlP2i1P9G9x9PAgfHiYoIjThTgoSZRYANVbLg24vPcJmA1kZPwwamE0utz5GlbDSAJB9FK+lI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605008472; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xXHPGPloU1tq9L5RfDiL3Hd1aT2d/fNx+Yg3ShJ4SUA=; b=m1LRIFe9C6oEcU5tKRpCjp6rZSfDV/0/XJHgNyWDuz8UV5AZ2EexEL0jvFgGrHGVHhT/weL8Xiu8WwV7I/iU7FfpJdfV/iJSRg0cALgLlAXtlOWB1pQ+mA3GecSl8He4MNc2+6Km7MavKe4mX24a4by8rnJdIUazx+M8pufGfQs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605008472026779.0142579166861; Tue, 10 Nov 2020 03:41:12 -0800 (PST) Received: from localhost ([::1]:55710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcS1O-0003Ig-QR for importer@patchew.org; Tue, 10 Nov 2020 06:41:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRgY-0002FK-Rl for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:38 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:37898) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRgW-0006rJ-2a for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:38 -0500 Received: by mail-wm1-x336.google.com with SMTP id h62so2622214wme.3 for ; Tue, 10 Nov 2020 03:19:35 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 109sm16909498wra.29.2020.11.10.03.19.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 03:19:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=xXHPGPloU1tq9L5RfDiL3Hd1aT2d/fNx+Yg3ShJ4SUA=; b=dp8fjVkx6zDd+Roko2LytuBlwo9BO9VqNwDbX3lS0e2K1ODg8PvyRxJv3w7q6hTgqO Fe6jQYaGhGPlIpWHmkK3n/d+y4+jwddX9LB3fXLEjR/ntzgFiJ4EQPokZyuctryB5dqm vyDUoHgTNiYTXojSuNZJM/TedsAMNNndipKdL3hTXNpf2m7aoJJiGxGCWrrw7MhHzzQe wPgTx5eyhVg1FW1ntO2mTabSS81YUuk45ecv/4p/CLmF19rSz+SdSwi2NDzTVUaFD0Dl hg64cNDQRnEPwiu/kX9dB2gF3dvroUD10WbhoP3wgrt9MClJ9UanrDFGJdIFDAOpt/K9 /FDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xXHPGPloU1tq9L5RfDiL3Hd1aT2d/fNx+Yg3ShJ4SUA=; b=JXZshTmd5rx73+rIgImtZbFfe88VijBd4E3Z6pt7S1opslM+ZBF65cVNk39xX6tgeE SPMAUeJKDIy6bADQkj6c6mb/SrlmGAZABrjGyvNMGdiu6J60yoarh5NL8wBkmxECi0u2 rfxPgR83xSXwTGV6B7CnQzm+Mb5n2I+4vMeMfL0FtL5fQGfHC44St5nzXOx8b7TE4Ss2 vS79TXUF0oYUK2neDK9NH/LHQvWIsdhoI0UmIOWd5OgBGFe45526QOjCEoKi/2w9EaI4 glHTMSN11n9juy+6M2rvl4tUkOlDBzRsBR9XysV2yBN2mgnhd88e2YePaYcZdj3lrfyD 7tIA== X-Gm-Message-State: AOAM531aGjB56xzPIow0zFCE7nMTtPOmcXJqW4bYAVgtw70xBGr3RjPI StWWmz7BksL/kRZIKEIOVW600qdLuX0HTA== X-Google-Smtp-Source: ABdhPJzCkULxBybrVy80hQfzZ+Oz8ftgBOAFp1CRGm6SIlMqNLJdmL4ZmAh/qRqgxwXorSihDnqg4w== X-Received: by 2002:a7b:cb82:: with SMTP id m2mr3028935wmi.75.1605007174085; Tue, 10 Nov 2020 03:19:34 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 12/16] hw/arm/musicpal: Don't connect two qemu_irqs directly to the same input Date: Tue, 10 Nov 2020 11:19:13 +0000 Message-Id: <20201110111917.29539-13-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110111917.29539-1-peter.maydell@linaro.org> References: <20201110111917.29539-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x336.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Philippe Mathieu-Daud=C3=A9 The MusicPal board code connects both of the IRQ outputs of the UART to the same INTC qemu_irq. Connecting two qemu_irqs outputs directly to the same input is not valid as it produces subtly wrong behaviour (for instance if both the IRQ lines are high, and then one goes low, the INTC input will see this as a high-to-low transition even though the second IRQ line should still be holding it high). This kind of wiring needs an explicitly created OR gate; add one. Inspired-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20201107193403.436146-5-f4bug@amsat.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/musicpal.c | 17 +++++++++++++---- hw/arm/Kconfig | 1 + 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index 5eb3f969fb4..ebc3ec24ef7 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -27,6 +27,7 @@ #include "ui/console.h" #include "hw/i2c/i2c.h" #include "hw/irq.h" +#include "hw/or-irq.h" #include "hw/audio/wm8750.h" #include "sysemu/block-backend.h" #include "sysemu/runstate.h" @@ -77,8 +78,7 @@ #define MP_TIMER4_IRQ 7 #define MP_EHCI_IRQ 8 #define MP_ETH_IRQ 9 -#define MP_UART1_IRQ 11 -#define MP_UART2_IRQ 11 +#define MP_UART_SHARED_IRQ 11 #define MP_GPIO_IRQ 12 #define MP_RTC_IRQ 28 #define MP_AUDIO_IRQ 30 @@ -1589,6 +1589,7 @@ static void musicpal_init(MachineState *machine) ARMCPU *cpu; qemu_irq pic[32]; DeviceState *dev; + DeviceState *uart_orgate; DeviceState *i2c_dev; DeviceState *lcd_dev; DeviceState *key_dev; @@ -1627,9 +1628,17 @@ static void musicpal_init(MachineState *machine) pic[MP_TIMER2_IRQ], pic[MP_TIMER3_IRQ], pic[MP_TIMER4_IRQ], NULL); =20 - serial_mm_init(address_space_mem, MP_UART1_BASE, 2, pic[MP_UART1_IRQ], + /* Logically OR both UART IRQs together */ + uart_orgate =3D DEVICE(object_new(TYPE_OR_IRQ)); + object_property_set_int(OBJECT(uart_orgate), "num-lines", 2, &error_fa= tal); + qdev_realize_and_unref(uart_orgate, NULL, &error_fatal); + qdev_connect_gpio_out(DEVICE(uart_orgate), 0, pic[MP_UART_SHARED_IRQ]); + + serial_mm_init(address_space_mem, MP_UART1_BASE, 2, + qdev_get_gpio_in(uart_orgate, 0), 1825000, serial_hd(0), DEVICE_NATIVE_ENDIAN); - serial_mm_init(address_space_mem, MP_UART2_BASE, 2, pic[MP_UART2_IRQ], + serial_mm_init(address_space_mem, MP_UART2_BASE, 2, + qdev_get_gpio_in(uart_orgate, 1), 1825000, serial_hd(1), DEVICE_NATIVE_ENDIAN); =20 /* Register flash */ diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index c9f60e82516..7d022eeefdb 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -93,6 +93,7 @@ config MUSCA =20 config MUSICPAL bool + select OR_IRQ select BITBANG_I2C select MARVELL_88W8618 select PTIMER --=20 2.20.1 From nobody Mon Apr 29 04:02:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1605008353; cv=none; d=zohomail.com; s=zohoarc; b=dWQRSoOoyCTuVHuUAVcqxZJ95a2z1t+cd+buEIstPPxxbonL9aq1dZemOEu7CpV4DuhRfaC/ClUteyDE98xZcIh3NGZPvOmwTpuN6VuGWRDevysgYow8a2TO1ChUrA3KYUJTppzdD3qu8WUXuwQEQ4vWRCz06ueMnShXRQ9yIVI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605008353; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BghcIqXYvmJfNsOh/qv6Ssbfk8n2rpw36DfEAPLLbyY=; b=GbxoxnshGIAiAJGj3/T075Dwb+tMMFJRWYIOG+K35dYQNiUSoHVP++XQHUda8/7Z9jlYZ2o7/JEC0/BR1ny9KahPLVBW3JUtl4OPeK5TBJF4j7vMeFxbwzu9FdCO0ADFr1DUaLsZedagiJc9YIWEMNOjngJ+wzn614aVzaUWhEI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605008353680195.21612698934337; Tue, 10 Nov 2020 03:39:13 -0800 (PST) Received: from localhost ([::1]:50458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRzU-00010e-Fm for importer@patchew.org; Tue, 10 Nov 2020 06:39:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRgZ-0002Fr-2a for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:39 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:39958) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRgW-0006rO-En for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:38 -0500 Received: by mail-wr1-x444.google.com with SMTP id 33so12235448wrl.7 for ; Tue, 10 Nov 2020 03:19:36 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 109sm16909498wra.29.2020.11.10.03.19.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 03:19:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=BghcIqXYvmJfNsOh/qv6Ssbfk8n2rpw36DfEAPLLbyY=; b=IH0VJj7QPz7I+u5lyZL9D0zd4cTwqaJOYlrzkUSDeS4HqqwyBE7lESSOt+zrbTvfQ9 QF3KQGMZroy896+6DkvmBFA+QTW8x/Kc7VvmJ2jtXvaCZasqv/gW4i+ig7ab5PcJHAQk Lp6a5A3rgRvp+WrwO06iyVaixcikAbBaWP/pmb0CALKpFaJUTwcOY+nqJktIcHN7s1hn yw53pp4awSqLPKRh6lYvMG92xZQAleS2fAh7rpnYPQjxiUcNBoMLBBH+SUa6Dvsv69yO s2c2P96t8kkne5xLmDhypP3WiblI3oYZrgCqPx1ITpfAw8deWcRTiVYOOlsNZGiC/+oX KJOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BghcIqXYvmJfNsOh/qv6Ssbfk8n2rpw36DfEAPLLbyY=; b=cr5Btg9jFT2hN8ZwFwZPoYv7ugoRjOBR5nTro1JVo19zn2WCkNyTI+27lsP2qSvXx0 cVGaBPks9LhbKWI57a5E9PLixryVTWtdzJM8TkUjOyDOBW+3WSkD4E9uP1HZ8fVQyEH4 cg9eSRcpZvbRmV0G+5XvLhkSy88JMElQNDHljdgggIndzpJKDtsxu1z+/mLEnSgkzFel 6YM8HKbvl4JmsECIL5u6l1nO1NuIOM/md3oA9UyplTe1u9RgT7JbzojjKCt2y5glBEIu 2T80AIuGd2pGUOgz3y8g2Ax1kxK3DHyZFP5eZZvrs9T1T/FE9tQUR+uaRiVRVfq6Zioa sJzQ== X-Gm-Message-State: AOAM533nHz50XVa4ruL3oRIigl+a17s1FOFfmvNK2udOd+9+M81Nx4V+ 0mH/FgII8deVXMIyMtDL3M1Z6ePAnqk7vg== X-Google-Smtp-Source: ABdhPJyh/4HWuc+DuuWxMnQ5cVrljUkGYpBlR5CUccryGRMlHwKi3JQOemDURVC36mqWjV9EZRisww== X-Received: by 2002:a5d:4104:: with SMTP id l4mr23094240wrp.276.1605007174903; Tue, 10 Nov 2020 03:19:34 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 13/16] hw/arm/musicpal: Only use qdev_get_gpio_in() when necessary Date: Tue, 10 Nov 2020 11:19:14 +0000 Message-Id: <20201110111917.29539-14-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110111917.29539-1-peter.maydell@linaro.org> References: <20201110111917.29539-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::444; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Philippe Mathieu-Daud=C3=A9 We don't need to fill the full pic[] array if we only use few of the interrupt lines. Directly call qdev_get_gpio_in() when necessary. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20201107193403.436146-6-f4bug@amsat.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/musicpal.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c index ebc3ec24ef7..458b1cbeb76 100644 --- a/hw/arm/musicpal.c +++ b/hw/arm/musicpal.c @@ -1587,8 +1587,8 @@ static struct arm_boot_info musicpal_binfo =3D { static void musicpal_init(MachineState *machine) { ARMCPU *cpu; - qemu_irq pic[32]; DeviceState *dev; + DeviceState *pic; DeviceState *uart_orgate; DeviceState *i2c_dev; DeviceState *lcd_dev; @@ -1619,20 +1619,20 @@ static void musicpal_init(MachineState *machine) &error_fatal); memory_region_add_subregion(address_space_mem, MP_SRAM_BASE, sram); =20 - dev =3D sysbus_create_simple(TYPE_MV88W8618_PIC, MP_PIC_BASE, + pic =3D sysbus_create_simple(TYPE_MV88W8618_PIC, MP_PIC_BASE, qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ)); - for (i =3D 0; i < 32; i++) { - pic[i] =3D qdev_get_gpio_in(dev, i); - } - sysbus_create_varargs(TYPE_MV88W8618_PIT, MP_PIT_BASE, pic[MP_TIMER1_I= RQ], - pic[MP_TIMER2_IRQ], pic[MP_TIMER3_IRQ], - pic[MP_TIMER4_IRQ], NULL); + sysbus_create_varargs(TYPE_MV88W8618_PIT, MP_PIT_BASE, + qdev_get_gpio_in(pic, MP_TIMER1_IRQ), + qdev_get_gpio_in(pic, MP_TIMER2_IRQ), + qdev_get_gpio_in(pic, MP_TIMER3_IRQ), + qdev_get_gpio_in(pic, MP_TIMER4_IRQ), NULL); =20 /* Logically OR both UART IRQs together */ uart_orgate =3D DEVICE(object_new(TYPE_OR_IRQ)); object_property_set_int(OBJECT(uart_orgate), "num-lines", 2, &error_fa= tal); qdev_realize_and_unref(uart_orgate, NULL, &error_fatal); - qdev_connect_gpio_out(DEVICE(uart_orgate), 0, pic[MP_UART_SHARED_IRQ]); + qdev_connect_gpio_out(DEVICE(uart_orgate), 0, + qdev_get_gpio_in(pic, MP_UART_SHARED_IRQ)); =20 serial_mm_init(address_space_mem, MP_UART1_BASE, 2, qdev_get_gpio_in(uart_orgate, 0), @@ -1674,14 +1674,15 @@ static void musicpal_init(MachineState *machine) OBJECT(get_system_memory()), &error_fatal); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, MP_ETH_BASE); - sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[MP_ETH_IRQ]); + sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, + qdev_get_gpio_in(pic, MP_ETH_IRQ)); =20 sysbus_create_simple("mv88w8618_wlan", MP_WLAN_BASE, NULL); =20 sysbus_create_simple(TYPE_MUSICPAL_MISC, MP_MISC_BASE, NULL); =20 dev =3D sysbus_create_simple(TYPE_MUSICPAL_GPIO, MP_GPIO_BASE, - pic[MP_GPIO_IRQ]); + qdev_get_gpio_in(pic, MP_GPIO_IRQ)); i2c_dev =3D sysbus_create_simple("gpio_i2c", -1, NULL); i2c =3D (I2CBus *)qdev_get_child_bus(i2c_dev, "i2c"); =20 @@ -1713,7 +1714,7 @@ static void musicpal_init(MachineState *machine) NULL); sysbus_realize_and_unref(s, &error_fatal); sysbus_mmio_map(s, 0, MP_AUDIO_BASE); - sysbus_connect_irq(s, 0, pic[MP_AUDIO_IRQ]); + sysbus_connect_irq(s, 0, qdev_get_gpio_in(pic, MP_AUDIO_IRQ)); =20 musicpal_binfo.ram_size =3D MP_RAM_DEFAULT_SIZE; arm_load_kernel(cpu, machine, &musicpal_binfo); --=20 2.20.1 From nobody Mon Apr 29 04:02:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1605008492; cv=none; d=zohomail.com; s=zohoarc; b=kUjAdd4U4uhT6vcar8f6axTtRBotSymmQOOsP1SyMbCHYRqpQ115GaxlcD9gk+NUDQBdMqSlfON+NwZEQ7CVksyTAz8R6LvTgDmdF0uUX5ehJZaLdoq+JBHSj22lLdE/3I37fpY7hmX5ZwQGbBi1w6vyza47mIhD6Ev2Hxc45Mg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605008492; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BEeTNdwwYMcXKSzVH6lUrJm19LvWtCWONokXJVBSspE=; b=eDs1eUP52I+0RAYPXu8K1FxqjgbR621Dxn0KQbj981hq7E98Xt8CeE9JMEihVoGNasSLMie1kx+il2xzaLS0z7UaCF+IyTR8J+H2A1+O4K9BTE7RxzEVhKz+PanRFSej+jQrbgTD2mJY+6l9Ido11v98Yyp2RZ30GkEeab0BmOI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605008492010921.110412054197; Tue, 10 Nov 2020 03:41:32 -0800 (PST) Received: from localhost ([::1]:56778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcS1i-0003je-Ui for importer@patchew.org; Tue, 10 Nov 2020 06:41:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRgZ-0002Gh-Dn for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:39 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:55958) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRgX-0006rb-L6 for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:39 -0500 Received: by mail-wm1-x32d.google.com with SMTP id c9so2609906wml.5 for ; Tue, 10 Nov 2020 03:19:37 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 109sm16909498wra.29.2020.11.10.03.19.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 03:19:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=BEeTNdwwYMcXKSzVH6lUrJm19LvWtCWONokXJVBSspE=; b=QcMBbGaByr/PyndnutQ3lpn80ThkDZ3WQGOp5xCBGKa0e01RyJIFe0M2oKlWZL7sjY XAFgHs4PmDgVvNSJjNh/Bu4dBVdJmB1eDaW+flRqaTJr3A5lEgFnPAND7p3hKkX9WxcM GNx1LPcEFZev9vTsFocXQ9rCpZaRDdt9+3ch7cg+ggMdisVGWwq5XzwIdnl4dscidQzj MHj7/FAVa2uK6/FTzaDmrC2U+ohWGqGz6GePCcglDnibBeja9vLVQ2QzufQaubYXdd51 8bS1HPkbabl3NtaiLIXzSLmHaUTpa2EYtrAGggZTG3RAPEjG11tcBKp9QieYcOh0Mm6o PqxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BEeTNdwwYMcXKSzVH6lUrJm19LvWtCWONokXJVBSspE=; b=on0sPj1qBgPGKby7c933wmky8OB/o97CqQxPzqZx0RYgQfLuNX59mvLZnHTu3GGg1u Opxa8mui4gAqZQ75Qbrwqu68hleLZSOLarmJXHTIQCU0Kzobh8GnLjhDTGeFaCZS4wnY I3eGD3yw5wXtnsti2DLSlha3waDcqg169TPUXV2zoQh0xXb7wsyliUXZLqN+aJABlb/q +oUiy7HuFJ4sg5Ir3TCGYREFF7sdaWOq6fwu+u6fcSNYXHr6L5LISQPEsdJDVZFPp7yQ a1dwXlNRilO7nPM2WCLbGJQ2mE6TIlb7wv7Mm7MmUlCRKFQP0rtqua8xJgcG/L8T8aR0 Ullw== X-Gm-Message-State: AOAM531KO+Jq9/cucGuRMo86MFaBGtunC5WV9t5lymWCNMzfJ4TrLRln dqbB+dP5tEbjYaPqlLPLhsb/BksYL6ogKg== X-Google-Smtp-Source: ABdhPJzv0W8pCR4XIMBjudBzimziBxmofxv+C0L/Uxq0WT2i/KSqLZml2V3AVe18PW97xTOmioIHSg== X-Received: by 2002:a1c:658b:: with SMTP id z133mr2748887wmb.1.1605007176065; Tue, 10 Nov 2020 03:19:36 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 14/16] hw/arm/nseries: Check return value from load_image_targphys() Date: Tue, 10 Nov 2020 11:19:15 +0000 Message-Id: <20201110111917.29539-15-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110111917.29539-1-peter.maydell@linaro.org> References: <20201110111917.29539-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) The nseries machines have a codepath that allows them to load a secondary bootloader. This code wasn't checking that the load_image_targphys() succeeded. Check the return value and report the error to the user. While we're in the vicinity, fix the comment style of the comment documenting what this image load is doing. Fixes: Coverity CID 1192904 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-id: 20201103114918.11807-1-peter.maydell@linaro.org --- hw/arm/nseries.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index 6215c18d627..387eea4d44c 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -1369,7 +1369,8 @@ static void n8x0_init(MachineState *machine, /* No, wait, better start at the ROM. */ s->mpu->cpu->env.regs[15] =3D OMAP2_Q2_BASE + 0x400000; =20 - /* This is intended for loading the `secondary.bin' program from + /* + * This is intended for loading the `secondary.bin' program from * Nokia images (the NOLO bootloader). The entry point seems * to be at OMAP2_Q2_BASE + 0x400000. * @@ -1377,9 +1378,15 @@ static void n8x0_init(MachineState *machine, * for them the entry point needs to be set to OMAP2_SRAM_BASE. * * The code above is for loading the `zImage' file from Nokia - * images. */ - load_image_targphys(option_rom[0].name, OMAP2_Q2_BASE + 0x400000, - machine->ram_size - 0x400000); + * images. + */ + if (load_image_targphys(option_rom[0].name, + OMAP2_Q2_BASE + 0x400000, + machine->ram_size - 0x400000) < 0) { + error_report("Failed to load secondary bootloader %s", + option_rom[0].name); + exit(EXIT_FAILURE); + } =20 n800_setup_nolo_tags(nolo_tags); cpu_physical_memory_write(OMAP2_SRAM_BASE, nolo_tags, 0x10000); --=20 2.20.1 From nobody Mon Apr 29 04:02:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1605007681; cv=none; d=zohomail.com; s=zohoarc; b=QL6E4tEX3efqEEjnCGVENAJ2Q5D5f9ySBy2HjnFKiHWFElDsRsdtJX2JaQCDAEh3oO5QNgtzRzR8TB0fQpE4y8Pc07XsfJprc/ZLQyJbnFXHgLHOX/LXtR5h1/FSMYhfqU0dlLzEf5Z1xMDmbIPcZaoNx0KWNGV7Y2AqfpQRx5M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605007681; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=quh1kPWjY4PNiOnUCa5MfOHlEbZgNdPUy0Qv8wRDzi8=; b=JxzkK2QzW6cYOCXYPQXTtokfcX00TFtx4952K56/3qvjyN30VmA5rxChtnguws1wZUhJ4SMv/EfhRSWgyTaOksCRPzb+9sp1Hh5cv6sLTl/L+Bv0o44tIxLTiQ/l6/Qq+LFJUe4MEiPZeAmSU37ZLbW96MhFZSLbFwOp/IFKBNc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605007681215104.85681993839853; Tue, 10 Nov 2020 03:28:01 -0800 (PST) Received: from localhost ([::1]:46070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRod-0004Cl-Uq for importer@patchew.org; Tue, 10 Nov 2020 06:27:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46420) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRga-0002JR-Ul for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:41 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:44781) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRgZ-0006sY-3C for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:40 -0500 Received: by mail-wr1-x42e.google.com with SMTP id c17so12241595wrc.11 for ; Tue, 10 Nov 2020 03:19:38 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 109sm16909498wra.29.2020.11.10.03.19.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 03:19:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=quh1kPWjY4PNiOnUCa5MfOHlEbZgNdPUy0Qv8wRDzi8=; b=rSrDJOjs9KUEA3yrix9kh6N06M6VGrE0YPFgVCZUTxq2oGT0Gk3DKGo7y/IEXPPVWh +bHzFK3687+VVQd9KXU9cACCsdp/DIqqzKPoUZztGSXwL4aVwlIT/OjJlqF1nqD3CTLE O+dzBiM1ID0FtBT6PMpxg3Q8+UoNKa4PehUI00qexCVA2sLNCTINakvf4TDNyNq0sL2g gXLZs9skqYYx0VnDUoiGIwVoK3y/34annbiUwi7TKnSzhwMp7s+t9IE96lRvpo0t7j9d emzSWAUztIu7De05MpHiCVOXOrwtm/on4Isjc9KbwCt8jG0XJWSobDYAL7AyzUvazMq9 iDpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=quh1kPWjY4PNiOnUCa5MfOHlEbZgNdPUy0Qv8wRDzi8=; b=HXNrR1DWMi6P+FcZ+MGlBJjOOkDfP9n201+LV3Od82+ziVQHsMxUK7bfsgCyOmLmvZ 4S/OQj9ab1gErgNoeePEB9s9YwRs4R62soShMwAQ1racETcXwfeCxLzHQQJAQdeRHeqX aqH7dda2fL3M6S2R/HbzFFGHFUTjQ0Kaxkl/xMqCkih29Rd41ajBbCOO4nJf4+RY56sl ppuVicuuilgb7TnJjBxZpZFzEaevtGQUzpQLyiLxrXvqeE5Su63EffIuJfo5YEFO3WRI UjEys0OjqDs1+qPWjUhImCqe4Nij0GXERHPC+fCzha/khl5d1R++irjodUm8/4Qx6teB cQ1g== X-Gm-Message-State: AOAM533x2p4yvZJoWiDOxqOyqTsNuk3oavwfKS5TXrC6SjbtN3cSFcaS qtIId0Dsi8CiTZkp8vKwaIJW4xwlbA3+8A== X-Google-Smtp-Source: ABdhPJxufAsqMjATA2MsP1uZVcHzdG7aXiI9VEnVTtdt6aJgMfh2kr73lK8JNkTuvU/XORhu4/j/ng== X-Received: by 2002:a5d:4fc1:: with SMTP id h1mr22995484wrw.226.1605007177208; Tue, 10 Nov 2020 03:19:37 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 15/16] tests/qtest/npcm7xx_rng-test: count runs properly Date: Tue, 10 Nov 2020 11:19:16 +0000 Message-Id: <20201110111917.29539-16-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110111917.29539-1-peter.maydell@linaro.org> References: <20201110111917.29539-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42e.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" From: Havard Skinnemoen The number of runs is equal to the number of 0-1 and 1-0 transitions, plus one. Currently, it's counting the number of times these transitions do _not_ happen, plus one. Source: https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-22r1a= .pdf section 2.3.4 point (3). Signed-off-by: Havard Skinnemoen Message-id: 20201103011457.2959989-2-hskinnemoen@google.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- tests/qtest/npcm7xx_rng-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/npcm7xx_rng-test.c b/tests/qtest/npcm7xx_rng-test.c index e7cde85fbbc..c614968ffcd 100644 --- a/tests/qtest/npcm7xx_rng-test.c +++ b/tests/qtest/npcm7xx_rng-test.c @@ -126,7 +126,7 @@ static double calc_runs_p(const unsigned long *buf, uns= igned int nr_bits) pi =3D (double)nr_ones / nr_bits; =20 for (k =3D 0; k < nr_bits - 1; k++) { - vn_obs +=3D !(test_bit(k, buf) ^ test_bit(k + 1, buf)); + vn_obs +=3D (test_bit(k, buf) ^ test_bit(k + 1, buf)); } vn_obs +=3D 1; =20 --=20 2.20.1 From nobody Mon Apr 29 04:02:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1605007889; cv=none; d=zohomail.com; s=zohoarc; b=YkvlSbVlcRgxkPc4MSF55ZCPrM0MBOc81NeIy/55lD2zcSEbEV7OI5GBMuf3YkMTlyBil3O/UOJdIBII8fl+VXZ6lEpBlcLudZV2iJs+Q36MpQtQnWHivfQaFIXogYv1FM6zsYzcWYletSugUddbpJs2Zd7Bg10SUW8tJWKhRSo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605007889; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=o4qInkNkA3gktTk2L3eDgJIykpCUz4uuBCN2VHCIZso=; b=b/WObQA8RfOKavw6O/42g8XSKPN4/S/ALum1lTHRsT6+uW+z2Klx0pmScg7Kf2bKqPysyrg9MhyD6RA7XgPSNhhhIGk43Wa+IaOI1RClVjti6tvLIXNw3r5JLu0lzTXRvUhcYAbRVFnuEnxZ0H+4uHZ7kr2KwGeHitZYSjvtUgg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605007889936581.174822523248; Tue, 10 Nov 2020 03:31:29 -0800 (PST) Received: from localhost ([::1]:57718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRs0-0000gB-K6 for importer@patchew.org; Tue, 10 Nov 2020 06:31:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRgb-0002Kb-P1 for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:41 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:33123) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRgZ-0006sj-Ut for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:19:41 -0500 Received: by mail-wr1-x42f.google.com with SMTP id b8so12248014wrn.0 for ; Tue, 10 Nov 2020 03:19:39 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 109sm16909498wra.29.2020.11.10.03.19.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 03:19:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=o4qInkNkA3gktTk2L3eDgJIykpCUz4uuBCN2VHCIZso=; b=FLgtQ794dj+Ake+JFjeCJewQuv3l4lDdggv2/seOVGwOINrpfsSZ1Ys5ln7ThzllpW W1CnpTJxq0XnmZqAw2mPcN0fIg4wQUS4ydIOPxI8Mw09M+Ki+pTQBOf5dY7AkEvZdRWs n4Q0Gqn41YzlZp+K8DSxO4EMVsVfivUcN7odpd3/OERKTP3O2F1maHPMzpnTnqfLMyPf Ma8FLIlSrkfI35d7ExCHj3S2gRk++Zn9yPGqFWN5Pr07GZ5AFqioCbRt6KI1le2KjXNg giQNJ7+y+h88I/Ru52UNz0x0WQeZ6XdOQEj74+Hjhs9nFOqHOOhhe1pSKzYOr9R9vNYb unEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o4qInkNkA3gktTk2L3eDgJIykpCUz4uuBCN2VHCIZso=; b=AVVONuRH/PoN+ZRvOWmcdrd2xk4MbAdm3ixU9KHX83q6qGnVP1/sdYva5Fs2+qewY7 Ey6oHD9E1Yz1wrTcITTkAik8HL2HkIc5+7pmUgeN7MR3FYbLEqFgswNvQjvlZaFQ1N8t F8XwFKV0TeWwdCs4qulNJSmR0ngujBMEk905m8pzu2gZ+JLHt3ZzKuk4UecMbJpT70D/ 1rpvXKIiUcHev9NQXlcGMYlDTg1Qn+Efptlz17feAQwR2M2CHkxC936IMnLsJzUA8FAr PmVbRvpXTIT8Z+rsfyV5INoI3phdbS/ZdkO3d17DsjTSEo48Hbm1a45ws17Xjgm8U5Kl 2Xlg== X-Gm-Message-State: AOAM532fsWqI88L1kYnYy/kWn01NGk/G+2a2o6iUpiesAov8NDfxvBxT jTTS65c7fRC5i4ClsIl8GwDAcqYJSwsNsw== X-Google-Smtp-Source: ABdhPJwJEyiwk1+/5/NwU/NAH/ee3+VG/UcqkBdC7T4M8f21lrD8wwGX3lx4QkOV8pha6IMWmUVpVA== X-Received: by 2002:adf:9544:: with SMTP id 62mr23003075wrs.223.1605007178401; Tue, 10 Nov 2020 03:19:38 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 16/16] target/arm/translate-neon.c: Handle VTBL UNDEF case before VFP access check Date: Tue, 10 Nov 2020 11:19:17 +0000 Message-Id: <20201110111917.29539-17-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201110111917.29539-1-peter.maydell@linaro.org> References: <20201110111917.29539-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42f.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" Checks for UNDEF cases should go before the "is VFP enabled?" access check, except in special cases. Move a stray UNDEF check in the VTBL trans function up above the access check. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20201109145324.2859-1-peter.maydell@linaro.org --- target/arm/translate-neon.c.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/arm/translate-neon.c.inc b/target/arm/translate-neon.c.= inc index 0ae95cb8df8..2403825d15f 100644 --- a/target/arm/translate-neon.c.inc +++ b/target/arm/translate-neon.c.inc @@ -2874,10 +2874,6 @@ static bool trans_VTBL(DisasContext *s, arg_VTBL *a) return false; } =20 - if (!vfp_access_check(s)) { - return true; - } - if ((a->vn + a->len + 1) > 32) { /* * This is UNPREDICTABLE; we choose to UNDEF to avoid the @@ -2886,6 +2882,10 @@ static bool trans_VTBL(DisasContext *s, arg_VTBL *a) return false; } =20 + if (!vfp_access_check(s)) { + return true; + } + desc =3D tcg_const_i32((a->vn << 2) | a->len); def =3D tcg_temp_new_i64(); if (a->op) { --=20 2.20.1