From patchwork Thu Apr 6 13:52:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 96987 Delivered-To: patch@linaro.org Received: by 10.182.246.10 with SMTP id xs10csp741051obc; Thu, 6 Apr 2017 06:53:06 -0700 (PDT) X-Received: by 10.99.53.195 with SMTP id c186mr36224146pga.182.1491486786643; Thu, 06 Apr 2017 06:53:06 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a96si1939554pli.151.2017.04.06.06.53.06; Thu, 06 Apr 2017 06:53:06 -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 S934804AbdDFNxA (ORCPT + 6 others); Thu, 6 Apr 2017 09:53:00 -0400 Received: from mail-pg0-f41.google.com ([74.125.83.41]:34503 "EHLO mail-pg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934818AbdDFNwq (ORCPT ); Thu, 6 Apr 2017 09:52:46 -0400 Received: by mail-pg0-f41.google.com with SMTP id 21so37156272pgg.1 for ; Thu, 06 Apr 2017 06:52:41 -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=XEzY0JduJD9a5n9gvZQb4kMsqB6drzfIMu2lgFATUWrjwRoySAazAjSPgQFk8udPh6 Bd0BxKv6KGNFkhI1ZCHoqNyORO2yYfIyLqajzBic5a3ECxbMmYpTVgFY5BRWUWFlaJRB uRUVJo3jpxeYp1+LssGoZFFLh46fDW/eqaq+0= 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=SqhlcbodgKkVsnFzDci8nfFX/o7RjUINnXORPszXqt6vPohApypk+YpjuN6htdV0RM bplzgntCJLv6hdnDCGkfxOhXE6O3VwIlH/y+XbbQTEvhs/NvcKcwAQbAAhusWI3gw6r6 Qz3p8yG/ARQYqdAEGymingcsksyVqQsnqyXrchT/zjZFoZwLzipPgR1esxPI/1jZPuat dSFkaO7TogWSxAqFwerUxff6KyCjngJ0jX9ubVBPUAUOZxzuzRYF9ItC8Qn5ATfHPdE2 +0yexHSvuLoAbsH3nHKOIGOYoxObUoVkUp+6QdzkRbpTD7Ia5L6eMMSpWRadud5bZ+JU bt2A== X-Gm-Message-State: AFeK/H2Zw9e44TLCFRf2q4t3LQZlmyQ3eNr6cNOJfGDkTJZoCVOAStFCjtI8SQ7bYAofh0mn X-Received: by 10.99.217.17 with SMTP id r17mr37120850pgg.140.1491486760952; Thu, 06 Apr 2017 06:52:40 -0700 (PDT) Received: from localhost.localdomain ([106.51.240.246]) by smtp.gmail.com with ESMTPSA id v11sm4187210pfi.50.2017.04.06.06.52.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Apr 2017 06:52:40 -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.10 6/6] MIPS: IRQ Stack: Fix erroneous jal to plat_irq_dispatch Date: Thu, 6 Apr 2017 19:22:14 +0530 Message-Id: <1491486734-15668-7-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491486734-15668-1-git-send-email-amit.pundir@linaro.org> References: <1491486734-15668-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