sgi-xp: replace AMO_t typedef by struct amo
Replace the AMO_t typedef by a direct reference to 'struct amo'. Signed-off-by: Dean Nelson <dcn@sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
7fb5e59d63
commit
c39838ce21
@@ -38,8 +38,8 @@
|
||||
/*
|
||||
* The next macros define word or bit representations for given
|
||||
* C-brick nasid in either the SAL provided bit array representing
|
||||
* nasids in the partition/machine or the AMO_t array used for
|
||||
* inter-partition initiation communications.
|
||||
* nasids in the partition/machine or the array of amo structures used
|
||||
* for inter-partition initiation communications.
|
||||
*
|
||||
* For SN2 machines, C-Bricks are alway even numbered NASIDs. As
|
||||
* such, some space will be saved by insisting that nasid information
|
||||
@@ -144,8 +144,8 @@ struct xpc_vars_sn2 {
|
||||
int activate_IRQ_nasid;
|
||||
int activate_IRQ_phys_cpuid;
|
||||
u64 vars_part_pa;
|
||||
u64 amos_page_pa; /* paddr of page of AMOs from MSPEC driver */
|
||||
AMO_t *amos_page; /* vaddr of page of AMOs from MSPEC driver */
|
||||
u64 amos_page_pa; /* paddr of page of amos from MSPEC driver */
|
||||
struct amo *amos_page; /* vaddr of page of amos from MSPEC driver */
|
||||
};
|
||||
|
||||
#define XPC_V_VERSION _XPC_VERSION(3, 1) /* version 3.1 of the cross vars */
|
||||
@@ -153,17 +153,17 @@ struct xpc_vars_sn2 {
|
||||
/*
|
||||
* The following pertains to ia64-sn2 only.
|
||||
*
|
||||
* Memory for XPC's AMO variables is allocated by the MSPEC driver. These
|
||||
* Memory for XPC's amo variables is allocated by the MSPEC driver. These
|
||||
* pages are located in the lowest granule. The lowest granule uses 4k pages
|
||||
* for cached references and an alternate TLB handler to never provide a
|
||||
* cacheable mapping for the entire region. This will prevent speculative
|
||||
* reading of cached copies of our lines from being issued which will cause
|
||||
* a PI FSB Protocol error to be generated by the SHUB. For XPC, we need 64
|
||||
* AMO variables (based on XP_MAX_NPARTITIONS_SN2) to identify the senders of
|
||||
* NOTIFY IRQs, 128 AMO variables (based on XP_NASID_MASK_WORDS) to identify
|
||||
* the senders of ACTIVATE IRQs, 1 AMO variable to identify which remote
|
||||
* amo variables (based on XP_MAX_NPARTITIONS_SN2) to identify the senders of
|
||||
* NOTIFY IRQs, 128 amo variables (based on XP_NASID_MASK_WORDS) to identify
|
||||
* the senders of ACTIVATE IRQs, 1 amo variable to identify which remote
|
||||
* partitions (i.e., XPCs) consider themselves currently engaged with the
|
||||
* local XPC and 1 AMO variable to request partition deactivation.
|
||||
* local XPC and 1 amo variable to request partition deactivation.
|
||||
*/
|
||||
#define XPC_NOTIFY_IRQ_AMOS 0
|
||||
#define XPC_ACTIVATE_IRQ_AMOS (XPC_NOTIFY_IRQ_AMOS + XP_MAX_NPARTITIONS_SN2)
|
||||
@@ -186,7 +186,7 @@ struct xpc_vars_part_sn2 {
|
||||
u64 openclose_args_pa; /* physical address of open and close args */
|
||||
u64 GPs_pa; /* physical address of Get/Put values */
|
||||
|
||||
u64 chctl_amo_pa; /* physical address of chctl flags' AMO_t */
|
||||
u64 chctl_amo_pa; /* physical address of chctl flags' amo */
|
||||
|
||||
int notify_IRQ_nasid; /* nasid of where to send notify IRQs */
|
||||
int notify_IRQ_phys_cpuid; /* CPUID of where to send notify IRQs */
|
||||
@@ -547,8 +547,8 @@ struct xpc_partition_sn2 {
|
||||
int notify_IRQ_phys_cpuid; /* CPUID of where to send notify IRQs */
|
||||
char notify_IRQ_owner[8]; /* notify IRQ's owner's name */
|
||||
|
||||
AMO_t *remote_chctl_amo_va; /* address of remote chctl flags' AMO_t */
|
||||
AMO_t *local_chctl_amo_va; /* address of chctl flags' AMO_t */
|
||||
struct amo *remote_chctl_amo_va; /* addr of remote chctl flags' amo */
|
||||
struct amo *local_chctl_amo_va; /* address of chctl flags' amo */
|
||||
|
||||
struct timer_list dropped_notify_IRQ_timer; /* dropped IRQ timer */
|
||||
};
|
||||
|
Reference in New Issue
Block a user