From patchwork Thu Apr 21 11:18:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 564334 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp355315map; Thu, 21 Apr 2022 04:41:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtcUoSaGX+OgAscYnULqYyyRy1AOA4Adjxu+2mDZYnI20UdyWw1AxmXWas9ewEAd32tADV X-Received: by 2002:ac8:5795:0:b0:2f1:f9cd:4076 with SMTP id v21-20020ac85795000000b002f1f9cd4076mr14410639qta.549.1650541286836; Thu, 21 Apr 2022 04:41:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650541286; cv=none; d=google.com; s=arc-20160816; b=Bd3JokOgaJJX0vS4rzaRKT7KkPsNsXMmpneuVWfNEAfyodm6eA6w5tT65gaglW7zEe cLZqxeXj2I+NDKl3N3LmtlSUYK9mUWRi/upDT/h4F6tLEfh8f1DZCd37YbYEIkKX2cYF qJwiqpyXpQhSuLMbPxVcmXV84sCPzp7/ezx3vzsWuYMIBfeRIQ3O5+Wj06MRGwH/Oh4P 4Fh3+wLG4fpcrVuiVNXt/OvpDtUUGkAqbufWFwJM81Z2QxzxQy7v/8aVS2bALb59i/D/ 2uA+YXf/IOAv2pABvVIczFbAQgc148G1FcMUg7D4gkCygrKdbQNpFRzWvObKmXO4HSk+ TQIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=eg02MfewzqD34GfCv6gUqyp7N32TaZTJUBAY/UnbV7k=; b=Np4Iq8oJSsAussxoC2qPKR1+ga2Z68BfXFIPM533/PCL73kpBbEEe96YjqrMSbKmcE gD5HoaXq9eIm5DWG0Z5HnI7QAqbwP8TmIuCdmMOEexMh4ulJR+Fk3yHii2nOWWg7XUUt KDGmwBzhT0ecv+/+hZMNaSE7K1y4Cv7jbbJWuaoTnXX5HfBfRaDA77fJHcTkTupZpCSu FkB6aKLpeqOy02eGp4EG2oQpQRpOXDaoeQW3IetGXWOaTM4DP9GVFaFUHTZWYXZ49ask uz7ZfvTAgpBKf27WVAqyGNLx2vVRQnLpFJNTPQ05wUUFcAoweag7Pg/v4Xdy9cpq1jE9 QY1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tUtl+e+D; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c8-20020a05620a268800b0069e6f343d66si1408152qkp.268.2022.04.21.04.41.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Apr 2022 04:41:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tUtl+e+D; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhVBe-0001T9-EA for patch@linaro.org; Thu, 21 Apr 2022 07:41:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhUq6-0003BT-SN for qemu-devel@nongnu.org; Thu, 21 Apr 2022 07:19:10 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:45931) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhUq4-0003WH-N1 for qemu-devel@nongnu.org; Thu, 21 Apr 2022 07:19:10 -0400 Received: by mail-wr1-x429.google.com with SMTP id w4so6175904wrg.12 for ; Thu, 21 Apr 2022 04:19:07 -0700 (PDT) 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=eg02MfewzqD34GfCv6gUqyp7N32TaZTJUBAY/UnbV7k=; b=tUtl+e+DxAOnuKU7tEpwTfSmYg3VZ+4yL4j9a6aSeve94IyBU1LaDvbE6HlfMSA9iI 1PyNctNWyj0b6dXeWrM+A5fJbjb22l4MO1W8mXZSyhl0gsAh3pM0gzRSnHs5qJ1WIaxj SKzDzV18Ip2ngRmi5ySJX4rnqZvue8oQeDbnWflGPosNImG3Kq8j6DmNgHmDDyixQtjs Wz10f/R8GxMIBtq5GGKEVohbF+2LhUVz6aeeCzYtlGNJR8pYQKAPNmfd5qd9HktIwYet y3dD3NaPt8vgL06PJpEsmEdA8hip7y2XqWGeYB9o5TS2r2SU3ZcYYz+sl16z/ftBmCNr 4PNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eg02MfewzqD34GfCv6gUqyp7N32TaZTJUBAY/UnbV7k=; b=e3n9bEjFdL45kBxO3Io3aM07ZDO/qvuvx97+An5X2i6G3MynD7qckJ07TNG6ZLyVLI udiOZkgy2k0YIfPS6swTMFTDiRf+nLs+vAX74eyUKJvWjv7hwOwtWmFcFCZ6EQ96JzF6 FhdNIH0S1nSfcvR88wj8pdill5io4nL3/9ENswGugvaBo+onH/zMEwwR2ZVcxLtC4JhA nxc0rtQvGgIDMliHVjfIjh8nmELoRurDt9NWqTDEa6vzkGXc22ijQjk1nkjeqcNjrLwQ sFdEqtm/Bjw08lya+xe7i+kAasiYBFCKyV5by9V4hxTdA7CVzL/rFr0rqafeTOsGnhNP dgnA== X-Gm-Message-State: AOAM533tfqXcDZutJZdvsHGC+Rxj2L2dg4RO3NEghrtafOAe2iHs8fdc HKZg6BvISdtab2lwpn7e1Q/ygZd/SZVbbQ== X-Received: by 2002:a5d:4a81:0:b0:207:9abe:2908 with SMTP id o1-20020a5d4a81000000b002079abe2908mr18819233wrq.341.1650539946907; Thu, 21 Apr 2022 04:19:06 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id e4-20020a5d6d04000000b0020a8bbbb72bsm2597694wrq.97.2022.04.21.04.19.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Apr 2022 04:19:06 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 21/31] hw/arm/exynos4210: Connect MCT_G0 and MCT_G1 to both combiners Date: Thu, 21 Apr 2022 12:18:36 +0100 Message-Id: <20220421111846.2011565-22-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220421111846.2011565-1-peter.maydell@linaro.org> References: <20220421111846.2011565-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Currently for the interrupts MCT_G0 and MCT_G1 which are the only ones in the input range of the external combiner and which are also wired to the external GIC, we connect them only to the internal combiner and the external GIC. This seems likely to be a bug, as all other interrupts which are in the input range of both combiners are connected to both combiners. (The fact that the code in exynos4210_combiner_get_gpioin() is also trying to wire up these inputs on both combiners also suggests this.) Wire these interrupts up to both combiners, like the rest. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20220404154658.565020-15-peter.maydell@linaro.org --- hw/arm/exynos4210.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c index a4527f819ef..962d6d0ac2a 100644 --- a/hw/arm/exynos4210.c +++ b/hw/arm/exynos4210.c @@ -281,16 +281,15 @@ static void exynos4210_init_board_irqs(Exynos4210State *s) assert(splitcount < EXYNOS4210_NUM_SPLITTERS); splitter = DEVICE(&s->splitter[splitcount]); - qdev_prop_set_uint16(splitter, "num-lines", 2); + qdev_prop_set_uint16(splitter, "num-lines", irq_id ? 3 : 2); qdev_realize(splitter, NULL, &error_abort); splitcount++; s->irq_table[n] = qdev_get_gpio_in(splitter, 0); qdev_connect_gpio_out(splitter, 0, is->int_combiner_irq[n]); + qdev_connect_gpio_out(splitter, 1, is->ext_combiner_irq[n]); if (irq_id) { - qdev_connect_gpio_out(splitter, 1, + qdev_connect_gpio_out(splitter, 2, qdev_get_gpio_in(extgicdev, irq_id - 32)); - } else { - qdev_connect_gpio_out(splitter, 1, is->ext_combiner_irq[n]); } } for (; n < EXYNOS4210_MAX_INT_COMBINER_IN_IRQ; n++) {