From patchwork Thu Apr 6 13:16:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 96966 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp726711qgd; Thu, 6 Apr 2017 06:16:57 -0700 (PDT) X-Received: by 10.84.225.146 with SMTP id u18mr42720423plj.86.1491484617555; Thu, 06 Apr 2017 06:16:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o64si1864890pga.16.2017.04.06.06.16.57; Thu, 06 Apr 2017 06:16:57 -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 S934632AbdDFNQt (ORCPT + 6 others); Thu, 6 Apr 2017 09:16:49 -0400 Received: from mail-pg0-f42.google.com ([74.125.83.42]:34112 "EHLO mail-pg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933859AbdDFNQo (ORCPT ); Thu, 6 Apr 2017 09:16:44 -0400 Received: by mail-pg0-f42.google.com with SMTP id 21so36272981pgg.1 for ; Thu, 06 Apr 2017 06:16:44 -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=6iuvPjq2NXkmKqRP2BZ1DmT9HI2WCfJmxi+d3PpC3NE=; b=BxNMu/0F6n33curQFFtLZoknm6Pjs1p4aFu4evV7Y19dT9U4h2ezWL4P3JHVYGVPsy l2G+woUVoEEVHXoy5eCOvSYzSVqZT4gyCH7Lo9sHq2FYQiI9vV75lTMblrBViDFN/sj5 hR2TcH/dD1pb+mpu5+1c6pveA0ZAW3Gs27RsY= 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=6iuvPjq2NXkmKqRP2BZ1DmT9HI2WCfJmxi+d3PpC3NE=; b=dhT3niwh3I7BCaq8jqutG4bF2rib+enw5iQqfyRXB5IH3ruDITfx5AETGV0rT8t8ry svk/LWQBuIfBFhgEjxL/mdPX9cvHw4RFYryYQM1WVjL4PKwobomMOrOf0YSoTWscx7Ba zr1pyGnpfQ1/2/Pn1Ve2007sFFNhPA0oK9pMg8av2fvj2eYSbJLPFRd20RIIu3pDBI2V Jku4ewTdp+Vs5PHDRBdAm/orPrx0XvHL3c2RDVEJVHtGgBZ8M88WtNnJjrZB2qPjScIy 5jV4Hvh+8JMluPNrrvU1NZenstItmqy7VRzx6peMt8jUbZPsJyRtosxgQxZackx5rrhz fv5g== X-Gm-Message-State: AFeK/H1qP+xy7gWFpVdAeXgB6/l/xq0eGjUIJvhX8iL9mWG5X4VJM7tnV6n1s0vvu4ep1eUo X-Received: by 10.98.76.140 with SMTP id e12mr34742844pfj.82.1491484598502; Thu, 06 Apr 2017 06:16:38 -0700 (PDT) Received: from localhost.localdomain ([106.51.240.246]) by smtp.gmail.com with ESMTPSA id y6sm4018940pgc.40.2017.04.06.06.16.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Apr 2017 06:16:38 -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.9 6/7] MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch Date: Thu, 6 Apr 2017 18:46:12 +0530 Message-Id: <1491484573-6228-7-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491484573-6228-1-git-send-email-amit.pundir@linaro.org> References: <1491484573-6228-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 0a7ba4b..7ec9612 100644 --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S @@ -329,7 +329,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