x86, voyager: move Voyager-specific defines to voyager.h (ed74ca6d) · Commits · 戴 / test

arch/x86/include/asm/hw_irq.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -84,16 +84,6 @@ extern atomic_t irq_mis_count;
		/* EISA */
		extern void eisa_set_level_irq(unsigned int irq);

		/* Voyager functions */
		extern asmlinkage void vic_cpi_interrupt(void);
		extern asmlinkage void vic_sys_interrupt(void);
		extern asmlinkage void vic_cmn_interrupt(void);
		extern asmlinkage void qic_timer_interrupt(void);
		extern asmlinkage void qic_invalidate_interrupt(void);
		extern asmlinkage void qic_reschedule_interrupt(void);
		extern asmlinkage void qic_enable_irq_interrupt(void);
		extern asmlinkage void qic_call_function_interrupt(void);

		/* SMP */
		extern void smp_apic_timer_interrupt(struct pt_regs *);
		extern void smp_spurious_interrupt(struct pt_regs *);

arch/x86/include/asm/irq_vectors.h

+0 −35

Original line number	Diff line number	Diff line
		@@ -135,39 +135,4 @@

		#endif

		/* Voyager specific defines */
		/* These define the CPIs we use in linux */
		#define VIC_CPI_LEVEL0 0
		#define VIC_CPI_LEVEL1 1
		/* now the fake CPIs */
		#define VIC_TIMER_CPI 2
		#define VIC_INVALIDATE_CPI 3
		#define VIC_RESCHEDULE_CPI 4
		#define VIC_ENABLE_IRQ_CPI 5
		#define VIC_CALL_FUNCTION_CPI 6
		#define VIC_CALL_FUNCTION_SINGLE_CPI 7

		/* Now the QIC CPIs: Since we don't need the two initial levels,
		* these are 2 less than the VIC CPIs */
		#define QIC_CPI_OFFSET 1
		#define QIC_TIMER_CPI (VIC_TIMER_CPI - QIC_CPI_OFFSET)
		#define QIC_INVALIDATE_CPI (VIC_INVALIDATE_CPI - QIC_CPI_OFFSET)
		#define QIC_RESCHEDULE_CPI (VIC_RESCHEDULE_CPI - QIC_CPI_OFFSET)
		#define QIC_ENABLE_IRQ_CPI (VIC_ENABLE_IRQ_CPI - QIC_CPI_OFFSET)
		#define QIC_CALL_FUNCTION_CPI (VIC_CALL_FUNCTION_CPI - QIC_CPI_OFFSET)
		#define QIC_CALL_FUNCTION_SINGLE_CPI (VIC_CALL_FUNCTION_SINGLE_CPI - QIC_CPI_OFFSET)

		#define VIC_START_FAKE_CPI VIC_TIMER_CPI
		#define VIC_END_FAKE_CPI VIC_CALL_FUNCTION_SINGLE_CPI

		/* this is the SYS_INT CPI. */
		#define VIC_SYS_INT 8
		#define VIC_CMN_INT 15

		/* This is the boot CPI for alternate processors. It gets overwritten
		* by the above once the system has activated all available processors */
		#define VIC_CPU_BOOT_CPI VIC_CPI_LEVEL0
		#define VIC_CPU_BOOT_ERRATA_CPI (VIC_CPI_LEVEL0 + 8)


		#endif /* _ASM_X86_IRQ_VECTORS_H */

arch/x86/include/asm/voyager.h

+42 −0

Original line number	Diff line number	Diff line
		@@ -527,3 +527,45 @@ extern void voyager_smp_intr_init(void);
		#define VOYAGER_PSI_SUBREAD 2
		#define VOYAGER_PSI_SUBWRITE 3
		extern void voyager_cat_psi(__u8, __u16, __u8 *);

		/* These define the CPIs we use in linux */
		#define VIC_CPI_LEVEL0 0
		#define VIC_CPI_LEVEL1 1
		/* now the fake CPIs */
		#define VIC_TIMER_CPI 2
		#define VIC_INVALIDATE_CPI 3
		#define VIC_RESCHEDULE_CPI 4
		#define VIC_ENABLE_IRQ_CPI 5
		#define VIC_CALL_FUNCTION_CPI 6
		#define VIC_CALL_FUNCTION_SINGLE_CPI 7

		/* Now the QIC CPIs: Since we don't need the two initial levels,
		* these are 2 less than the VIC CPIs */
		#define QIC_CPI_OFFSET 1
		#define QIC_TIMER_CPI (VIC_TIMER_CPI - QIC_CPI_OFFSET)
		#define QIC_INVALIDATE_CPI (VIC_INVALIDATE_CPI - QIC_CPI_OFFSET)
		#define QIC_RESCHEDULE_CPI (VIC_RESCHEDULE_CPI - QIC_CPI_OFFSET)
		#define QIC_ENABLE_IRQ_CPI (VIC_ENABLE_IRQ_CPI - QIC_CPI_OFFSET)
		#define QIC_CALL_FUNCTION_CPI (VIC_CALL_FUNCTION_CPI - QIC_CPI_OFFSET)
		#define QIC_CALL_FUNCTION_SINGLE_CPI (VIC_CALL_FUNCTION_SINGLE_CPI - QIC_CPI_OFFSET)

		#define VIC_START_FAKE_CPI VIC_TIMER_CPI
		#define VIC_END_FAKE_CPI VIC_CALL_FUNCTION_SINGLE_CPI

		/* this is the SYS_INT CPI. */
		#define VIC_SYS_INT 8
		#define VIC_CMN_INT 15

		/* This is the boot CPI for alternate processors. It gets overwritten
		* by the above once the system has activated all available processors */
		#define VIC_CPU_BOOT_CPI VIC_CPI_LEVEL0
		#define VIC_CPU_BOOT_ERRATA_CPI (VIC_CPI_LEVEL0 + 8)

		extern asmlinkage void vic_cpi_interrupt(void);
		extern asmlinkage void vic_sys_interrupt(void);
		extern asmlinkage void vic_cmn_interrupt(void);
		extern asmlinkage void qic_timer_interrupt(void);
		extern asmlinkage void qic_invalidate_interrupt(void);
		extern asmlinkage void qic_reschedule_interrupt(void);
		extern asmlinkage void qic_enable_irq_interrupt(void);
		extern asmlinkage void qic_call_function_interrupt(void);

Admin message