From patchwork Thu Apr 6 12:48:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 96953 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp714316qgd; Thu, 6 Apr 2017 05:49:46 -0700 (PDT) X-Received: by 10.99.94.66 with SMTP id s63mr34092264pgb.34.1491482986173; Thu, 06 Apr 2017 05:49:46 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s4si1781387pgc.281.2017.04.06.05.49.45; Thu, 06 Apr 2017 05:49:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757218AbdDFMto (ORCPT + 6 others); Thu, 6 Apr 2017 08:49:44 -0400 Received: from mail-pg0-f48.google.com ([74.125.83.48]:36783 "EHLO mail-pg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757069AbdDFMtd (ORCPT ); Thu, 6 Apr 2017 08:49:33 -0400 Received: by mail-pg0-f48.google.com with SMTP id g2so34899967pge.3 for ; Thu, 06 Apr 2017 05:49:33 -0700 (PDT) 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; bh=M+Wr0/kRCYW9Om41/J32EQp75b0fi0lar4DBSBzLHkA=; b=NlW9hbLvIaH0v+XTCNJ5GVOkkhOn4/NC3CtTSNwP1OcXmxop7ddKz3yu3DHKHqVKTB JJsNBDmnjV9mnzGpwthrc9q2H9/lN2tPVc9n8QlWmk4ztD0F0Tg/m2Z9G5HeoGGkFEma L/sInwYDRqDSE225bexbhnTxMv+/DQEr9kNtI= 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; bh=M+Wr0/kRCYW9Om41/J32EQp75b0fi0lar4DBSBzLHkA=; b=gzWm68ueZqZy9L1D3SQ05lf2BJvW/LLKYB6U4SUPWoTGVJC5XH9KFJPyHfyT7mfvms mMvnyd7ldCJsXS+JG+O87XxZw8z1d+MqJ9OgKo25JgNcjrjXzE40xrIGYiljWhAKw6d4 ck7NNd+MU8oc67aFbNhqgwDkHdwitpq4WfpY8dvtqaMW9LfuO1YTpqoasIPUJho7k6md G2GaylGEFgVpL/3zz6DAqEG1J/cZwiwFKNyI+qhJTXiDsbguFoOmKrEXAR56T69m1gyZ QL1+3488S/UzUgszPk88enMVcbw4xD6vlDAJ9oVPitAWgfucQviBGyYlPClx4w1a7HDH 3Asg== X-Gm-Message-State: AFeK/H1FhcZUYGbjKvOVcZobOPJxQdwgA406eFwII3am+SalG2IHLfIX87h5+SI21kwzG9Jf X-Received: by 10.99.185.1 with SMTP id z1mr36339195pge.165.1491482967439; Thu, 06 Apr 2017 05:49:27 -0700 (PDT) Received: from localhost.localdomain ([106.51.240.246]) by smtp.gmail.com with ESMTPSA id n7sm3892564pfn.0.2017.04.06.05.49.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Apr 2017 05:49:26 -0700 (PDT) From: Amit Pundir To: gregkh@linuxfoundation.org Cc: stable@vger.kernel.org, james.hogan@imgtec.com, Matt Redfearn , Ralf Baechle , Paul Burton , linux-mips@linux-mips.org Subject: [PATCH for-4.4 6/7] MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch Date: Thu, 6 Apr 2017 18:18:59 +0530 Message-Id: <1491482940-1163-7-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491482940-1163-1-git-send-email-amit.pundir@linaro.org> References: <1491482940-1163-1-git-send-email-amit.pundir@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Matt Redfearn Commit dda45f701c9d ("MIPS: Switch to the irq_stack in interrupts") changed both the normal and vectored interrupt handlers. Unfortunately the vectored version, "except_vec_vi_handler", was incorrectly modified to unconditionally jal to plat_irq_dispatch, rather than doing a jalr to the vectored handler that has been set up. This is ok for many platforms which set the vectored handler to plat_irq_dispatch anyway, but will cause problems with platforms that use other handlers. Fixes: dda45f701c9d ("MIPS: Switch to the irq_stack in interrupts") Signed-off-by: Matt Redfearn Cc: Ralf Baechle Cc: Paul Burton Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/15110/ Signed-off-by: James Hogan (cherry picked from commit c25f8064c1d5731a2ce5664def890140dcdd3e5c) Signed-off-by: Amit Pundir --- arch/mips/kernel/genex.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S index 2c7cd62..619e30e 100644 --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S @@ -330,7 +330,7 @@ NESTED(except_vec_vi_handler, 0, sp) PTR_ADD sp, t0, t1 2: - jal plat_irq_dispatch + jalr v0 /* Restore sp */ move sp, s1