From patchwork Wed Nov 14 19:27:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151111 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6084235ljp; Wed, 14 Nov 2018 11:27:30 -0800 (PST) X-Google-Smtp-Source: AJdET5cP964OXKiAVmC/FyQOuyy3naL6OX/MEQUFYaLG/a+Cw4G8NcDQz+b5WmG+TFqzkZAzTFJt X-Received: by 2002:a17:902:6801:: with SMTP id h1-v6mr3126871plk.177.1542223650807; Wed, 14 Nov 2018 11:27:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542223650; cv=none; d=google.com; s=arc-20160816; b=cwAm9gF6oe+38IqZz+p17aHySJkkOhlp8HkBTxxOYRY+ylosqpHu5vsYv5dgM62XkL RwwMretmYvr0TI72MJAemzgP67sgPSGBlRbZiKcOuMImXYt/5FBhwuifGqeZ5xQFaT9n qmm3yCbutdLv2eIjtdBUkBPDqozRuJeYwmLptKgcT0DGcfgs1TFosjxQaZ+FnLhG3VfW +pNc0AqzJlCgKxHrn+X4gg/4JYBSQBDSs5yn0fpfbJBky2BJx8zYcb5bmi+wKauKkKUn 9yb2BwFvfoLmoYccUPhu1tCTHQdCTnUhZ1SLgq7sk5JpXePHZsmt0F7Z2SXbhgjOgYQ9 ybbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=tFEdayCQaHDLYkS8XCwkLvKiVnnPK9NQiujQjs/3lCI=; b=xyf31dfhpdJHszfvGSjSomSQ25Z6Rsm89srbRpeLzh5QDMaJCTS3b7FrtZF/QH6rrm WUvttslBxsWaNgn1yyBvuH/9g5fS8sqPFHKMnJHyeFf68Vg4a3aVxT1a9Rejc0UmzUel bm9f4MpF/qLzkFfIJRp0VR3XfHH3gPFEjsCWCWd4MyI3/gDkfWRCW9DNZhhmDQElw42X WOKdCDXmmGUEp8D//UnDX13VbjeDwrihGbcGsjVnrrdLTJNDKzsASD9hITzkr0aWVP+S /C99yHHxvk/cGJBE5gw7eY8iTgVfjR2L62jBJOCtvrJ4sdJP+po93jF6d0POED0SLpS/ 3pPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=YcBuZiMP; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id b1-v6si27326028pfg.27.2018.11.14.11.27.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 11:27:30 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=YcBuZiMP; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8F77D21A07A92; Wed, 14 Nov 2018 11:27:29 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::642; helo=mail-pl1-x642.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1EBEF2118FF3C for ; Wed, 14 Nov 2018 11:27:27 -0800 (PST) Received: by mail-pl1-x642.google.com with SMTP id a14so3644015plm.12 for ; Wed, 14 Nov 2018 11:27:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=uXXuLjEJT7oMxQ98cAUDwXADclXtLGgK2BqGC+bHuxg=; b=YcBuZiMPBLKrFjjmO9UOCNVhj0IFoUFlpqJ9zrPOhNn+oQ0DGy6Zc615Id1X9NfZVe WlC91zLZ6SDKFPI++w1TRXt7uFnnNPNgmBvM44RFa4U5uDeLz7vqHrdnrzMtFaqBcDW5 B6h70xkJY26Nof69hOUfjWfnCo+AqQoRr4Xos= 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; bh=uXXuLjEJT7oMxQ98cAUDwXADclXtLGgK2BqGC+bHuxg=; b=aYhxg+gcbV+CMdPf2mC1WM9wt8bGf1BcQ9UhwLsM4oxcHmp+WvIHZRmpn9FTUjFPrA pzIVJqCh8pOjNLR1EJh2J3n5akMXcuvRnyf0iA7QCNawVQeI9ihGNvH1tgP5tgu9Y9BZ Xqs+GT/jF+xsDh7N/kEhpj0h5/2tCRr5JoiJ9v1gpbANBSjeU6C0LEzF/HuHKCu3z6Mr plCqK1ye7QUT5Vda07EOZsoiTtgNF+Hl79Gox7T4aWxB8PArV1QptohKf5OT24uvYMVk 6WqyHOBXUsldxrt+1SU6sAfiBlcYHvC5P/DMU0vWd2P9dJVotKf0VurEBPXdcB/QY+Wy klGg== X-Gm-Message-State: AGRZ1gLpWHgEI0qXVm9NRzMewbfaP4GJrlaFCpXHVWeMyhIL9mLr/Vta 5KQgR5xYNOgHz51ynha2JX4My9gzO7q8Xw== X-Received: by 2002:a17:902:aa0a:: with SMTP id be10mr3146100plb.266.1542223647333; Wed, 14 Nov 2018 11:27:27 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id k38sm57375277pgb.33.2018.11.14.11.27.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 11:27:26 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 11:27:24 -0800 Message-Id: <20181114192724.27068-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 Subject: [edk2] [PATCH] ArmPkg/ArmGicDxe ARM: fix encoding for GICv3 interrupt acknowledge X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Fix a typo in the 32-bit ARM version of the GICv3 driver, which uses the wrong system register encoding to access ICC_IAR1, and attempted to access ICC_IAR0 instead. This results in boot time hangs both under QEMU emulation and on real hardware. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S | 2 +- ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm diff --git a/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S b/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S index a72f3c865163..c308d2fa3e2f 100644 --- a/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S +++ b/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S @@ -66,7 +66,7 @@ ASM_FUNC(ArmGicV3EndOfInterrupt) // VOID // ); ASM_FUNC(ArmGicV3AcknowledgeInterrupt) - mrc p15, 0, r0, c12, c8, 0 //ICC_IAR1 + mrc p15, 0, r0, c12, c12, 0 //ICC_IAR1 bx lr //VOID diff --git a/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.asm b/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.asm index 4228fb59be54..222047d1ad43 100644 --- a/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.asm +++ b/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.asm @@ -66,7 +66,7 @@ // VOID // ); RVCT_ASM_EXPORT ArmGicV3AcknowledgeInterrupt - mrc p15, 0, r0, c12, c8, 0 //ICC_IAR1 + mrc p15, 0, r0, c12, c12, 0 //ICC_IAR1 bx lr //VOID