Commit 83e2b5ef authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

x86_64: Share msidef.h and hypertransport.h includes with i386 



They are identical

Indirectly pointed out by Thomas Gleixner

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b5d009ca

include/asm-x86_64/hypertransport.h

+1 −42
Original line number Diff line number Diff line 
#ifndef ASM_HYPERTRANSPORT_H

#define ASM_HYPERTRANSPORT_H



/*

 * Constants for x86 Hypertransport Interrupts.

 */



#define HT_IRQ_LOW_BASE			0xf8000000



#define HT_IRQ_LOW_VECTOR_SHIFT		16

#define  HT_IRQ_LOW_VECTOR_MASK		0x00ff0000

#define  HT_IRQ_LOW_VECTOR(v)		(((v) << HT_IRQ_LOW_VECTOR_SHIFT) & HT_IRQ_LOW_VECTOR_MASK)



#define HT_IRQ_LOW_DEST_ID_SHIFT	8

#define  HT_IRQ_LOW_DEST_ID_MASK	0x0000ff00

#define  HT_IRQ_LOW_DEST_ID(v)		(((v) << HT_IRQ_LOW_DEST_ID_SHIFT) & HT_IRQ_LOW_DEST_ID_MASK)



#define HT_IRQ_LOW_DM_PHYSICAL		0x0000000

#define HT_IRQ_LOW_DM_LOGICAL		0x0000040



#define HT_IRQ_LOW_RQEOI_EDGE		0x0000000

#define HT_IRQ_LOW_RQEOI_LEVEL		0x0000020





#define HT_IRQ_LOW_MT_FIXED		0x0000000

#define HT_IRQ_LOW_MT_ARBITRATED	0x0000004

#define HT_IRQ_LOW_MT_SMI		0x0000008

#define HT_IRQ_LOW_MT_NMI		0x000000c

#define HT_IRQ_LOW_MT_INIT		0x0000010

#define HT_IRQ_LOW_MT_STARTUP		0x0000014

#define HT_IRQ_LOW_MT_EXTINT		0x0000018

#define HT_IRQ_LOW_MT_LINT1		0x000008c

#define HT_IRQ_LOW_MT_LINT0		0x0000098



#define HT_IRQ_LOW_IRQ_MASKED		0x0000001





#define HT_IRQ_HIGH_DEST_ID_SHIFT	0

#define  HT_IRQ_HIGH_DEST_ID_MASK	0x00ffffff

#define  HT_IRQ_HIGH_DEST_ID(v)		((((v) >> 8) << HT_IRQ_HIGH_DEST_ID_SHIFT) & HT_IRQ_HIGH_DEST_ID_MASK)



#endif /* ASM_HYPERTRANSPORT_H */
 
#include <asm-i386/hypertransport.h>

include/asm-x86_64/msidef.h

+1 −47
Original line number Diff line number Diff line 
#ifndef ASM_MSIDEF_H

#define ASM_MSIDEF_H



/*

 * Constants for Intel APIC based MSI messages.

 */



/*

 * Shifts for MSI data

 */



#define MSI_DATA_VECTOR_SHIFT		0

#define  MSI_DATA_VECTOR_MASK		0x000000ff

#define	 MSI_DATA_VECTOR(v)		(((v) << MSI_DATA_VECTOR_SHIFT) & MSI_DATA_VECTOR_MASK)



#define MSI_DATA_DELIVERY_MODE_SHIFT	8

#define  MSI_DATA_DELIVERY_FIXED	(0 << MSI_DATA_DELIVERY_MODE_SHIFT)

#define  MSI_DATA_DELIVERY_LOWPRI	(1 << MSI_DATA_DELIVERY_MODE_SHIFT)



#define MSI_DATA_LEVEL_SHIFT		14

#define	 MSI_DATA_LEVEL_DEASSERT	(0 << MSI_DATA_LEVEL_SHIFT)

#define	 MSI_DATA_LEVEL_ASSERT		(1 << MSI_DATA_LEVEL_SHIFT)



#define MSI_DATA_TRIGGER_SHIFT		15

#define  MSI_DATA_TRIGGER_EDGE		(0 << MSI_DATA_TRIGGER_SHIFT)

#define  MSI_DATA_TRIGGER_LEVEL		(1 << MSI_DATA_TRIGGER_SHIFT)



/*

 * Shift/mask fields for msi address

 */



#define MSI_ADDR_BASE_HI		0

#define MSI_ADDR_BASE_LO		0xfee00000



#define MSI_ADDR_DEST_MODE_SHIFT	2

#define  MSI_ADDR_DEST_MODE_PHYSICAL	(0 << MSI_ADDR_DEST_MODE_SHIFT)

#define	 MSI_ADDR_DEST_MODE_LOGICAL	(1 << MSI_ADDR_DEST_MODE_SHIFT)



#define MSI_ADDR_REDIRECTION_SHIFT	3

#define  MSI_ADDR_REDIRECTION_CPU	(0 << MSI_ADDR_REDIRECTION_SHIFT) /* dedicated cpu */

#define  MSI_ADDR_REDIRECTION_LOWPRI	(1 << MSI_ADDR_REDIRECTION_SHIFT) /* lowest priority */



#define MSI_ADDR_DEST_ID_SHIFT		12

#define	 MSI_ADDR_DEST_ID_MASK		0x00ffff0

#define  MSI_ADDR_DEST_ID(dest)		(((dest) << MSI_ADDR_DEST_ID_SHIFT) & MSI_ADDR_DEST_ID_MASK)



#endif /* ASM_MSIDEF_H */
 
#include <asm-i386/msidef.h>