Skip to content

Commit 7215a78

Browse files
sudeep-hollaJassiBrar
authored andcommitted
mailbox: pcc: Handle all PCC subtypes correctly in pcc_mbox_irq
Commit c45ded7 ("mailbox: pcc: Add support for PCCT extended PCC subspaces(type 3/4)") enabled the type3/4 of PCCT, but the change in pcc_mbox_irq breaks the other PCC subtypes. The kernel reports a warning on an Ampere eMag server -->8 CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.16.0-rc4 #127 Hardware name: MiTAC RAPTOR EV-883832-X3-0001/RAPTOR, BIOS 0.14 02/22/2019 Call trace: dump_backtrace+0x0/0x200 show_stack+0x20/0x30 dump_stack_lvl+0x68/0x84 dump_stack+0x18/0x34 __report_bad_irq+0x54/0x17c note_interrupt+0x330/0x428 handle_irq_event_percpu+0x90/0x98 handle_irq_event+0x4c/0x148 handle_fasteoi_irq+0xc4/0x188 generic_handle_domain_irq+0x44/0x68 gic_handle_irq+0x84/0x2ec call_on_irq_stack+0x28/0x34 do_interrupt_handler+0x88/0x90 el1_interrupt+0x48/0xb0 el1h_64_irq_handler+0x18/0x28 el1h_64_irq+0x7c/0x80 Fixes: c45ded7 ("mailbox: pcc: Add support for PCCT extended PCC subspaces(type 3/4)") Reported-by: Justin He <[email protected]> Tested-by: Justin He <[email protected]> Signed-off-by: Sudeep Holla <[email protected]> Signed-off-by: Jassi Brar <[email protected]>
1 parent 960c405 commit 7215a78

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

drivers/mailbox/pcc.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,11 @@ static irqreturn_t pcc_mbox_irq(int irq, void *p)
241241
if (ret)
242242
return IRQ_NONE;
243243

244-
val &= pchan->cmd_complete.status_mask;
245-
if (!val)
246-
return IRQ_NONE;
244+
if (val) { /* Ensure GAS exists and value is non-zero */
245+
val &= pchan->cmd_complete.status_mask;
246+
if (!val)
247+
return IRQ_NONE;
248+
}
247249

248250
ret = pcc_chan_reg_read(&pchan->error, &val);
249251
if (ret)

0 commit comments

Comments
 (0)