FAILED: patch "[PATCH] parisc: Fix exported address of os_hpmc handler" failed to apply to 4.9-stable tree

FAILED: patch "[PATCH] parisc: Fix exported address of os_hpmc handler" failed to apply to 4.9-stable tree

[gregkh]

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

>From 99a3ae51d557d8e38a7aece65678a31f9db215ee Mon Sep 17 00:00:00 2001
From: Helge Deller <deller@gmx.de>
Date: Sun, 14 Oct 2018 21:58:00 +0200
Subject: [PATCH] parisc: Fix exported address of os_hpmc handler

In the C-code we need to put the physical address of the hpmc handler in
the interrupt vector table (IVA) in order to get HPMCs working.  Since
on parisc64 function pointers are indirect (in fact they are function
descriptors) we instead export the address as variable and not as
function.

This reverts a small part of commit f39cce654f9a ("parisc: Add
cfi_startproc and cfi_endproc to assembly code").

Signed-off-by: Helge Deller <deller@gmx.de>
Cc: <stable@vger.kernel.org>    [4.9+]

diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S
index 781c3b9a3e46..fde654115564 100644
--- a/arch/parisc/kernel/hpmc.S
+++ b/arch/parisc/kernel/hpmc.S
@@ -85,7 +85,7 @@ END(hpmc_pim_data)
 
 	.import intr_save, code
 	.align 16
-ENTRY_CFI(os_hpmc)
+ENTRY(os_hpmc)
 .os_hpmc:
 
 	/*
@@ -302,7 +302,6 @@ os_hpmc_6:
 	b .
 	nop
 	.align 16	/* make function length multiple of 16 bytes */
-ENDPROC_CFI(os_hpmc)
 .os_hpmc_end:
 
 

Re: FAILED: patch "[PATCH] parisc: Fix exported address of os_hpmc handler" failed to apply to 4.9-stable tree

[Helge Deller]

On 10.11.2018 19:34, gregkh@linuxfoundation.org wrote:
> The patch below does not apply to the 4.9-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.

Hi Greg,

Can you please cherry-pick the following two trivial upstream commits before applying the one below:
* commit 0ed9d3de5f8f ("parisc: Align os_hpmc_size on word boundary")
* commit d5654e156bc4 ("parisc: Fix HPMC handler by increasing size to multiple of 16 bytes")

After that, the patch below applies as well:
* commit 99a3ae51d557 ("parisc: Fix exported address of os_hpmc handler")

Thanks,
Helge

> 
> ------------------ original commit in Linus's tree ------------------
> 
> From 99a3ae51d557d8e38a7aece65678a31f9db215ee Mon Sep 17 00:00:00 2001
> From: Helge Deller <deller@gmx.de>
> Date: Sun, 14 Oct 2018 21:58:00 +0200
> Subject: [PATCH] parisc: Fix exported address of os_hpmc handler
> 
> In the C-code we need to put the physical address of the hpmc handler in
> the interrupt vector table (IVA) in order to get HPMCs working.  Since
> on parisc64 function pointers are indirect (in fact they are function
> descriptors) we instead export the address as variable and not as
> function.
> 
> This reverts a small part of commit f39cce654f9a ("parisc: Add
> cfi_startproc and cfi_endproc to assembly code").
> 
> Signed-off-by: Helge Deller <deller@gmx.de>
> Cc: <stable@vger.kernel.org>    [4.9+]
> 
> diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S
> index 781c3b9a3e46..fde654115564 100644
> --- a/arch/parisc/kernel/hpmc.S
> +++ b/arch/parisc/kernel/hpmc.S
> @@ -85,7 +85,7 @@ END(hpmc_pim_data)
>  
>  	.import intr_save, code
>  	.align 16
> -ENTRY_CFI(os_hpmc)
> +ENTRY(os_hpmc)
>  .os_hpmc:
>  
>  	/*
> @@ -302,7 +302,6 @@ os_hpmc_6:
>  	b .
>  	nop
>  	.align 16	/* make function length multiple of 16 bytes */
> -ENDPROC_CFI(os_hpmc)
>  .os_hpmc_end:
>  
>  
> 

Re: FAILED: patch "[PATCH] parisc: Fix exported address of os_hpmc handler" failed to apply to 4.9-stable tree

[Sasha Levin]

On Sat, Nov 10, 2018 at 09:48:14PM +0100, Helge Deller wrote:
>On 10.11.2018 19:34, gregkh@linuxfoundation.org wrote:
>> The patch below does not apply to the 4.9-stable tree.
>> If someone wants it applied there, or to any other stable or longterm
>> tree, then please email the backport, including the original git commit
>> id to <stable@vger.kernel.org>.
>
>Hi Greg,
>
>Can you please cherry-pick the following two trivial upstream commits before applying the one below:
>* commit 0ed9d3de5f8f ("parisc: Align os_hpmc_size on word boundary")
>* commit d5654e156bc4 ("parisc: Fix HPMC handler by increasing size to multiple of 16 bytes")
>
>After that, the patch below applies as well:
>* commit 99a3ae51d557 ("parisc: Fix exported address of os_hpmc handler")

Queued all 3 for 4.9, thank you.

--
Thanks,
Sasha