Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74408776 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc/64s: Consolidate Hypervisor Virtualization 0xea0 interrupt 



Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 9bcb81bf

arch/powerpc/kernel/exceptions-64s.S

+6 −8
Original line number Diff line number Diff line
@@ -1015,6 +1015,12 @@ EXC_COMMON_ASYNC(h_doorbell_common, 0xe80, unknown_exception) 




__EXC_REAL_OOL_MASKABLE_HV(h_virt_irq, 0xea0, 0xec0)

__TRAMP_REAL_REAL_OOL_MASKABLE_HV(h_virt_irq, 0xea0)

__EXC_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0x4ea0, 0x4ec0)

__TRAMP_REAL_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0xea0)

TRAMP_KVM_HV(PACA_EXGEN, 0xea0)

EXC_COMMON_ASYNC(h_virt_irq_common, 0xea0, do_IRQ)





EXC_REAL_NONE(0xec0, 0xf00)
@@ -1153,10 +1159,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR) 
	b	.

#endif



	/* moved from 0xe00 */

__TRAMP_REAL_REAL_OOL_MASKABLE_HV(h_virt_irq, 0xea0)

TRAMP_KVM_HV(PACA_EXGEN, 0xea0)



	/* moved from 0xf00 */

__TRAMP_REAL_REAL_OOL(performance_monitor, 0xf00)

TRAMP_KVM(PACA_EXGEN, 0xf00)
@@ -1293,7 +1295,6 @@ TRAMP_REAL_BEGIN(kvmppc_skip_Hinterrupt) 
/*** Common interrupt handlers ***/





EXC_COMMON_ASYNC(h_virt_irq_common, 0xea0, do_IRQ)

EXC_COMMON_ASYNC(performance_monitor_common, 0xf00, performance_monitor_exception)

EXC_COMMON(instruction_breakpoint_common, 0x1300, instruction_breakpoint_exception)

EXC_COMMON_HV(denorm_common, 0x1500, unknown_exception)
@@ -1319,8 +1320,6 @@ EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception) 
	 * come here.

	 */



__EXC_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0x4ea0, 0x4ec0)



EXC_VIRT_NONE(0x4ec0, 0x4f00)



__EXC_VIRT_OOL(performance_monitor, 0x4f00, 0x4f20)
@@ -1422,7 +1421,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX) 
	b	ret_from_except



	/* Equivalents to the above handlers for relocation-on interrupt vectors */

__TRAMP_REAL_VIRT_OOL_MASKABLE_HV(h_virt_irq, 0xea0)

__TRAMP_REAL_VIRT_OOL(performance_monitor, 0xf00)

__TRAMP_REAL_VIRT_OOL(altivec_unavailable, 0xf20)

__TRAMP_REAL_VIRT_OOL(vsx_unavailable, 0xf40)