[2/6] xive: Do not return a trigger page for an escalation interrupt

Message ID 20171206173928.25628-2-benh@kernel.crashing.org
State Superseded
Headers show
Series
  • [1/6] xive: Mark a freed IRQ's IVE as valid and masked
Related show

Commit Message

Benjamin Herrenschmidt Dec. 6, 2017, 5:39 p.m.
This is bogus, we don't support them. (Thankfully the callers
didn't actually try to use this on escalation interrupts).

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
 hw/xive.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Oliver Dec. 7, 2017, 12:39 a.m. | #1
Tested-by: Oliver O'Halloran <oohall@gmail.com>

On Thu, Dec 7, 2017 at 4:39 AM, Benjamin Herrenschmidt
<benh@kernel.crashing.org> wrote:
> This is bogus, we don't support them. (Thankfully the callers
> didn't actually try to use this on escalation interrupts).
>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> ---
>  hw/xive.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/xive.c b/hw/xive.c
> index 364be549..76939b79 100644
> --- a/hw/xive.c
> +++ b/hw/xive.c
> @@ -2111,8 +2111,8 @@ void *xive_get_trigger_port(uint32_t girq)
>                 return NULL;
>
>         if (GIRQ_IS_ESCALATION(girq)) {
> -               /* Page 2 of the EQ MMIO space is the escalate irq */
> -               return x->eq_mmio + idx * 0x20000 + 0x10000;
> +               /* There is no trigger page for escalation interrupts */
> +               return NULL;
>         } else {
>                 /* Make sure it's an IPI on that chip */
>                 if (girq < x->int_base ||
> --
> 2.14.3
>
> _______________________________________________
> Skiboot mailing list
> Skiboot@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/skiboot

Patch

diff --git a/hw/xive.c b/hw/xive.c
index 364be549..76939b79 100644
--- a/hw/xive.c
+++ b/hw/xive.c
@@ -2111,8 +2111,8 @@  void *xive_get_trigger_port(uint32_t girq)
 		return NULL;
 
 	if (GIRQ_IS_ESCALATION(girq)) {
-		/* Page 2 of the EQ MMIO space is the escalate irq */
-		return x->eq_mmio + idx * 0x20000 + 0x10000;
+		/* There is no trigger page for escalation interrupts */
+		return NULL;
 	} else {
 		/* Make sure it's an IPI on that chip */
 		if (girq < x->int_base ||