[4.4,15/38] MIPS: Fix BUILD_ROLLBACK_PROLOGUE for microMIPS

Message ID	20201123121805.043491918@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Paul Burton <paul.burton@imgtec.com>, linux-mips@linux-mips.org, Ralf Baechle <ralf@linux-mips.org>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.4 15/38] MIPS: Fix BUILD_ROLLBACK_PROLOGUE for microMIPS Date: Mon, 23 Nov 2020 13:22:01 +0100 Message-Id: <20201123121805.043491918@linuxfoundation.org> In-Reply-To: <20201123121804.306030358@linuxfoundation.org> References: <20201123121804.306030358@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [4.4,02/38] atm: nicstar: Unmap DMA on send error [4.4,03/38] net: b44: fix error return code in b44_init_one() [4.4,04/38] net: bridge: add missing counters to ndo_get_stats64 callback [4.4,05/38] netlabel: fix our progress tracking in netlbl_unlabel_staticlist() [4.4,06/38] netlabel: fix an uninitialized warning in netlbl_unlabel_staticlist() [4.4,07/38] net/mlx4_core: Fix init_hca fields offset [4.4,08/38] net: x25: Increase refcnt of "struct x25_neigh" in x25_rx_call_request [4.4,09/38] qlcnic: fix error return code in qlcnic_83xx_restart_hw() [4.4,10/38] sctp: change to hold/put transport for proto_unreach_timer [4.4,11/38] net: usb: qmi_wwan: Set DTR quirk for MR400 [4.4,12/38] net: Have netpoll bring-up DSA management interface [4.4,13/38] pinctrl: rockchip: enable gpio pclk for rockchip_gpio_to_irq [4.4,14/38] arm64: psci: Avoid printing in cpu_psci_cpu_die() [4.4,15/38] MIPS: Fix BUILD_ROLLBACK_PROLOGUE for microMIPS [4.4,16/38] Input: adxl34x - clean up a data type in adxl34x_probe() [4.4,17/38] arm: dts: imx6qdl-udoo: fix rgmii phy-mode for ksz9031 phy [4.4,18/38] ARM: dts: imx50-evk: Fix the chip select 1 IOMUX [4.4,19/38] perf lock: Dont free "lock_seq_stat" if read_count isnt zero [4.4,20/38] can: dev: can_restart(): post buffer from the right context [4.4,21/38] can: peak_usb: fix potential integer overflow on shift of a int [4.4,22/38] can: m_can: m_can_handle_state_change(): fix state change [4.4,23/38] MIPS: Alchemy: Fix memleak in alchemy_clk_setup_cpu [4.4,24/38] regulator: ti-abb: Fix array out of bound read access on the first transition [4.4,25/38] libfs: fix error cast of negative value in simple_attr_write() [4.4,26/38,v4.4] powerpc/uaccess-flush: fix corenet64_smp_defconfig build [4.4,27/38] ALSA: ctl: fix error path at adding user-defined element set [4.4,28/38] ALSA: mixart: Fix mutex deadlock [4.4,29/38] tty: serial: imx: keep console clocks always on [4.4,30/38] efivarfs: fix memory leak in efivarfs_create() [4.4,31/38] ext4: fix bogus warning in ext4_update_dx_flag() [4.4,32/38] xtensa: disable preemption around cache alias management calls [4.4,33/38] mac80211: minstrel: remove deferred sampling code [4.4,34/38] mac80211: minstrel: fix tx status processing corner case [4.4,35/38] mac80211: allow driver to prevent two stations w/ same address [4.4,36/38] mac80211: free sta in sta_info_insert_finish() on errors [4.4,37/38] s390/cpum_sf.c: fix file permission for cpum_sfb_size [4.4,38/38] x86/microcode/intel: Check patch signature before saving microcode for early loading

Message ID

20201123121805.043491918@linuxfoundation.org

State

New

Headers

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Paul Burton <paul.burton@imgtec.com>,
	linux-mips@linux-mips.org, Ralf Baechle <ralf@linux-mips.org>,
	Sasha Levin <sashal@kernel.org>
Subject: [PATCH 4.4 15/38] MIPS: Fix BUILD_ROLLBACK_PROLOGUE for microMIPS
Date: Mon, 23 Nov 2020 13:22:01 +0100
Message-Id: <20201123121805.043491918@linuxfoundation.org>
In-Reply-To: <20201123121804.306030358@linuxfoundation.org>
References: <20201123121804.306030358@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

None | expand

Commit Message

Greg KH Nov. 23, 2020, 12:22 p.m. UTC

From: Paul Burton <paul.burton@imgtec.com>

[ Upstream commit 1eefcbc89cf3a8e252e5aeb25825594699b47360 ]

When the kernel is built for microMIPS, branches targets need to be
known to be microMIPS code in order to result in bit 0 of the PC being
set. The branch target in the BUILD_ROLLBACK_PROLOGUE macro was simply
the end of the macro, which may be pointing at padding rather than at
code. This results in recent enough GNU linkers complaining like so:

    mips-img-linux-gnu-ld: arch/mips/built-in.o: .text+0x3e3c: Unsupported branch between ISA modes.
    mips-img-linux-gnu-ld: final link failed: Bad value
    Makefile:936: recipe for target 'vmlinux' failed
    make: *** [vmlinux] Error 1

Fix this by changing the branch target to be the start of the
appropriate handler, skipping over any padding.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14019/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 arch/mips/kernel/genex.S | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
index 7ffd158de76e5..1b837d6f73deb 100644
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -142,9 +142,8 @@  LEAF(__r4k_wait)
 	PTR_LA	k1, __r4k_wait
 	ori	k0, 0x1f	/* 32 byte rollback region */
 	xori	k0, 0x1f
-	bne	k0, k1, 9f
+	bne	k0, k1, \handler
 	MTC0	k0, CP0_EPC
-9:
 	.set pop
 	.endm