From patchwork Thu Feb 14 12:50:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 158366 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1325709jaa; Thu, 14 Feb 2019 04:51:11 -0800 (PST) X-Received: by 2002:a5d:4804:: with SMTP id l4mr2830745wrq.177.1550148670924; Thu, 14 Feb 2019 04:51:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550148670; cv=none; d=google.com; s=arc-20160816; b=v+VxC2jnK27kKuR9scXAKG3N9BdI7Vwuum2hotYwbFeiS6Kdq0oT6Fyeiv+D5wiOuj L6EnC27/zYUidtd+GXubk4Ym3o5/pFcv9TPrXd0BNsXzUe8vBWOfL3DBDGELI0RQs0Wv sKvigaCbn/QOEICmA+/hikyfij1rZQdf5X0+bVYC4BTvmKTzc58nMNMPJefjMDGIr4EO aibnI9TG1iNG0T5XdBeJibNomDaG/K5gsUtOIJRSIAcQQ7UOyOtwrM/GSw+WAbcWS91G tYE3QGEsD+K9lFIBkbO3sIIz/H85WOvcSFYe46jVxK0rt2PJTRaQRpaUrwN4kx54x83k 9FKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=xO0SmjJi87cMCHBDYE6Aqyprx2bqu1BuqChTWfqFWYg=; b=fLysQXwwtdX8BjmAJlIJiTHYakyan5Sx1M/bGDR6vMZGbM8VDacqLxvjk+mTtp8iIS mMtR0XLnPzTfpRiCxa/A6PZrIsbol3NW/QEYWdl7SL6y7WdKkKyS7G2SuTIY/phZutkn G03C7P1mBo+ujU3567BlmjHF3pSWL4JTgBmAN3sBROvuaTvna7dJ7t7zgjAPcLinbc+m SejPPc0Ll47Or1bBnjs91VTmG/Bo2VOT+e6rgvsnzX08CznL0MzRlY94WwedkGGXumHm +e0/eLD9CVQznd0IQGm/PzpkBUdrmBQ/kQhgR/hg1EzMjLHrxq4HSnP+FXR8BeHGOBnB JcRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jODasDd2; spf=pass (google.com: domain of peter.maydell@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=peter.maydell@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id f16sor1574564wmb.3.2019.02.14.04.51.10 for (Google Transport Security); Thu, 14 Feb 2019 04:51:10 -0800 (PST) Received-SPF: pass (google.com: domain of peter.maydell@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jODasDd2; spf=pass (google.com: domain of peter.maydell@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=peter.maydell@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xO0SmjJi87cMCHBDYE6Aqyprx2bqu1BuqChTWfqFWYg=; b=jODasDd2CprkDE+SMmDJ85XKzxN4RW0kLA7p/4H/kR88P23aVkEW5u39Liy0jXgBfm 67fWPG3UMDqN+EK9ujfMGKZg3fEpDRYmtBkjfy709q8nPFE1sNzCc04I5QbIRcUkDCkT pOlOgUNYvQrH97+f8fomIEqpbkHLUQPj7DtVQ7N1haFuo2pLFkiYAYJteBfqXY3dDCUp iSqOBum1ac9DtwjksTyyRGjxg1DnS4/3K0IKfXPyydLv2kH6+w80P+Co4QfDoXqbIJKU PU8O+zIidJEx0D0qz8mdp4/xoZ2rWPdxdcUlRyDVuQXTkeMZuL8a6dZoR/SlgqIBnOJP 8BPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xO0SmjJi87cMCHBDYE6Aqyprx2bqu1BuqChTWfqFWYg=; b=mpQkvPB/Df8RkJOvZDWNNP6lbqB4aC1+yWfH1EdKLOM54bgj1T6RR+2HU5EwhBHIcZ kd2AWGEEPY9V2U4LHdiE3VoY8lvN/g3BWxH+sU9RnWsVmT1i7neB5gc1wnO+NcRw3HE/ hP6s/z3XE04SGkOzX78WQJBpF4iEE3YZveUj4kLS6ph0A+EcRJ/SA1XMw1vbHSR0g4Yx Vd323saAWoOIAl0Q5YTMY5WGMYeMQ1jt0BYLgutOemYSgJJJXHHSbLmOoo7zkAVK+lOg F4RfVtpjdLJ2ptu5D+cxW3XJZT5EVZMaki5+zZzZbSztxvLb4aMLDqlgPm0ZDYpOHRH5 1dEg== X-Gm-Message-State: AHQUAuafFMGSeHEVjayp9CsgVm5KeJnywPlQhCbZ0XfFazgBh152cH35 krZguPAeVuFxzSchqlBD1WfTGpoDElLTzdur X-Google-Smtp-Source: AHgI3IYa4mmdjqp9q4vbOGXMjaOjY+HKEkQC3TyB6sOMiOKX7U21d9XXEvdIvDKlGJvdDRq7O2wQyw== X-Received: by 2002:a1c:6442:: with SMTP id y63mr2469483wmb.143.1550148670479; Thu, 14 Feb 2019 04:51:10 -0800 (PST) Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id j3sm1488073wmb.39.2019.02.14.04.51.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 04:51:09 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 01/14] hw/arm/armsse: Fix miswiring of expansion IRQs Date: Thu, 14 Feb 2019 12:50:54 +0000 Message-Id: <20190214125107.22178-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190214125107.22178-1-peter.maydell@linaro.org> References: <20190214125107.22178-1-peter.maydell@linaro.org> MIME-Version: 1.0 In commit 91c1e9fcbd7548db368 where we added dual-CPU support to the ARMSSE, we set up the wiring of the expansion IRQs via nested loops: the outer loop on 'i' loops for each CPU, and the inner loop on 'j' loops for each interrupt. Fix a typo which meant we were wiring every expansion IRQ line to external IRQ 0 on CPU 0 and to external IRQ 1 on CPU 1. Fixes: 91c1e9fcbd7548db368 ("hw/arm/armsse: Support dual-CPU configuration") Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé --- hw/arm/armsse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index 5d53071a5a0..9a8c49547db 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -565,7 +565,7 @@ static void armsse_realize(DeviceState *dev, Error **errp) /* Connect EXP_IRQ/EXP_CPUn_IRQ GPIOs to the NVIC's lines 32 and up */ s->exp_irqs[i] = g_new(qemu_irq, s->exp_numirq); for (j = 0; j < s->exp_numirq; j++) { - s->exp_irqs[i][j] = qdev_get_gpio_in(cpudev, i + 32); + s->exp_irqs[i][j] = qdev_get_gpio_in(cpudev, j + 32); } if (i == 0) { gpioname = g_strdup("EXP_IRQ");