Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] run drivers/misc/sgi-xp through scripts/checkpatch.pl [IA64] run rest drivers/misc/sgi-xp through scripts/Lindent [IA64] run some drivers/misc/sgi-xp through scripts/Lindent [IA64] move XP and XPC to drivers/misc/sgi-xp [IA64] minor irq handler cleanups [IA64] simplify notify hooks in mca.c [IA64] do notify DIE_MCA_MONARCH_PROCESS for each monarchs [IA64] disable interrupts on exit of ia64_trace_syscall
This commit is contained in:
Linus Torvalds
Коммит
aca239b793
|
|
@ -266,17 +266,6 @@ config IOSAPIC
|
|||
depends on !IA64_HP_SIM
|
||||
default y
|
||||
|
||||
config IA64_SGI_SN_XP
|
||||
tristate "Support communication between SGI SSIs"
|
||||
depends on IA64_GENERIC || IA64_SGI_SN2
|
||||
select IA64_UNCACHED_ALLOCATOR
|
||||
help
|
||||
An SGI machine can be divided into multiple Single System
|
||||
Images which act independently of each other and have
|
||||
hardware based memory protection from the others. Enabling
|
||||
this feature will allow for direct communication between SSIs
|
||||
based on a network adapter and DMA messaging.
|
||||
|
||||
config FORCE_MAX_ZONEORDER
|
||||
int "MAX_ORDER (11 - 17)" if !HUGETLB_PAGE
|
||||
range 11 17 if !HUGETLB_PAGE
|
||||
|
|
|
|||
|
|
@ -194,8 +194,8 @@ kdump_init_notifier(struct notifier_block *self, unsigned long val, void *data)
|
|||
unw_init_running(kdump_cpu_freeze, NULL);
|
||||
break;
|
||||
case DIE_MCA_MONARCH_LEAVE:
|
||||
/* die_register->signr indicate if MCA is recoverable */
|
||||
if (kdump_on_fatal_mca && !args->signr) {
|
||||
/* *(nd->data) indicate if MCA is recoverable */
|
||||
if (kdump_on_fatal_mca && !(*(nd->data))) {
|
||||
atomic_set(&kdump_in_progress, 1);
|
||||
*(nd->monarch_cpu) = -1;
|
||||
machine_kdump_on_init();
|
||||
|
|
|
|||
|
|
@ -570,6 +570,7 @@ GLOBAL_ENTRY(ia64_trace_syscall)
|
|||
br.call.sptk.many rp=syscall_trace_leave // give parent a chance to catch return value
|
||||
.ret3:
|
||||
(pUStk) cmp.eq.unc p6,p0=r0,r0 // p6 <- pUStk
|
||||
(pUStk) rsm psr.i // disable interrupts
|
||||
br.cond.sptk .work_pending_syscall_end
|
||||
|
||||
strace_error:
|
||||
|
|
|
|||
|
|
@ -109,6 +109,20 @@
|
|||
# define IA64_MCA_DEBUG(fmt...)
|
||||
#endif
|
||||
|
||||
#define NOTIFY_INIT(event, regs, arg, spin) \
|
||||
do { \
|
||||
if ((notify_die((event), "INIT", (regs), (arg), 0, 0) \
|
||||
== NOTIFY_STOP) && ((spin) == 1)) \
|
||||
ia64_mca_spin(__func__); \
|
||||
} while (0)
|
||||
|
||||
#define NOTIFY_MCA(event, regs, arg, spin) \
|
||||
do { \
|
||||
if ((notify_die((event), "MCA", (regs), (arg), 0, 0) \
|
||||
== NOTIFY_STOP) && ((spin) == 1)) \
|
||||
ia64_mca_spin(__func__); \
|
||||
} while (0)
|
||||
|
||||
/* Used by mca_asm.S */
|
||||
DEFINE_PER_CPU(u64, ia64_mca_data); /* == __per_cpu_mca[smp_processor_id()] */
|
||||
DEFINE_PER_CPU(u64, ia64_mca_per_cpu_pte); /* PTE to map per-CPU area */
|
||||
|
|
@ -766,9 +780,8 @@ ia64_mca_rendez_int_handler(int rendez_irq, void *arg)
|
|||
|
||||
/* Mask all interrupts */
|
||||
local_irq_save(flags);
|
||||
if (notify_die(DIE_MCA_RENDZVOUS_ENTER, "MCA", get_irq_regs(),
|
||||
(long)&nd, 0, 0) == NOTIFY_STOP)
|
||||
ia64_mca_spin(__func__);
|
||||
|
||||
NOTIFY_MCA(DIE_MCA_RENDZVOUS_ENTER, get_irq_regs(), (long)&nd, 1);
|
||||
|
||||
ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_DONE;
|
||||
/* Register with the SAL monarch that the slave has
|
||||
|
|
@ -776,17 +789,13 @@ ia64_mca_rendez_int_handler(int rendez_irq, void *arg)
|
|||
*/
|
||||
ia64_sal_mc_rendez();
|
||||
|
||||
if (notify_die(DIE_MCA_RENDZVOUS_PROCESS, "MCA", get_irq_regs(),
|
||||
(long)&nd, 0, 0) == NOTIFY_STOP)
|
||||
ia64_mca_spin(__func__);
|
||||
NOTIFY_MCA(DIE_MCA_RENDZVOUS_PROCESS, get_irq_regs(), (long)&nd, 1);
|
||||
|
||||
/* Wait for the monarch cpu to exit. */
|
||||
while (monarch_cpu != -1)
|
||||
cpu_relax(); /* spin until monarch leaves */
|
||||
|
||||
if (notify_die(DIE_MCA_RENDZVOUS_LEAVE, "MCA", get_irq_regs(),
|
||||
(long)&nd, 0, 0) == NOTIFY_STOP)
|
||||
ia64_mca_spin(__func__);
|
||||
NOTIFY_MCA(DIE_MCA_RENDZVOUS_LEAVE, get_irq_regs(), (long)&nd, 1);
|
||||
|
||||
ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_NOTDONE;
|
||||
/* Enable all interrupts */
|
||||
|
|
@ -1256,7 +1265,7 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
|
|||
int recover, cpu = smp_processor_id();
|
||||
struct task_struct *previous_current;
|
||||
struct ia64_mca_notify_die nd =
|
||||
{ .sos = sos, .monarch_cpu = &monarch_cpu };
|
||||
{ .sos = sos, .monarch_cpu = &monarch_cpu, .data = &recover };
|
||||
static atomic_t mca_count;
|
||||
static cpumask_t mca_cpu;
|
||||
|
||||
|
|
@ -1272,9 +1281,7 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
|
|||
|
||||
previous_current = ia64_mca_modify_original_stack(regs, sw, sos, "MCA");
|
||||
|
||||
if (notify_die(DIE_MCA_MONARCH_ENTER, "MCA", regs, (long)&nd, 0, 0)
|
||||
== NOTIFY_STOP)
|
||||
ia64_mca_spin(__func__);
|
||||
NOTIFY_MCA(DIE_MCA_MONARCH_ENTER, regs, (long)&nd, 1);
|
||||
|
||||
ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_CONCURRENT_MCA;
|
||||
if (sos->monarch) {
|
||||
|
|
@ -1288,13 +1295,12 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
|
|||
* does not work.
|
||||
*/
|
||||
ia64_mca_wakeup_all();
|
||||
if (notify_die(DIE_MCA_MONARCH_PROCESS, "MCA", regs, (long)&nd, 0, 0)
|
||||
== NOTIFY_STOP)
|
||||
ia64_mca_spin(__func__);
|
||||
} else {
|
||||
while (cpu_isset(cpu, mca_cpu))
|
||||
cpu_relax(); /* spin until monarch wakes us */
|
||||
}
|
||||
}
|
||||
|
||||
NOTIFY_MCA(DIE_MCA_MONARCH_PROCESS, regs, (long)&nd, 1);
|
||||
|
||||
/* Get the MCA error record and log it */
|
||||
ia64_mca_log_sal_error_record(SAL_INFO_TYPE_MCA);
|
||||
|
|
@ -1320,9 +1326,7 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
|
|||
mca_insert_tr(0x2); /*Reload dynamic itrs*/
|
||||
}
|
||||
|
||||
if (notify_die(DIE_MCA_MONARCH_LEAVE, "MCA", regs, (long)&nd, 0, recover)
|
||||
== NOTIFY_STOP)
|
||||
ia64_mca_spin(__func__);
|
||||
NOTIFY_MCA(DIE_MCA_MONARCH_LEAVE, regs, (long)&nd, 1);
|
||||
|
||||
if (atomic_dec_return(&mca_count) > 0) {
|
||||
int i;
|
||||
|
|
@ -1643,7 +1647,7 @@ ia64_init_handler(struct pt_regs *regs, struct switch_stack *sw,
|
|||
struct ia64_mca_notify_die nd =
|
||||
{ .sos = sos, .monarch_cpu = &monarch_cpu };
|
||||
|
||||
(void) notify_die(DIE_INIT_ENTER, "INIT", regs, (long)&nd, 0, 0);
|
||||
NOTIFY_INIT(DIE_INIT_ENTER, regs, (long)&nd, 0);
|
||||
|
||||
mprintk(KERN_INFO "Entered OS INIT handler. PSP=%lx cpu=%d monarch=%ld\n",
|
||||
sos->proc_state_param, cpu, sos->monarch);
|
||||
|
|
@ -1680,17 +1684,15 @@ ia64_init_handler(struct pt_regs *regs, struct switch_stack *sw,
|
|||
ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_INIT;
|
||||
while (monarch_cpu == -1)
|
||||
cpu_relax(); /* spin until monarch enters */
|
||||
if (notify_die(DIE_INIT_SLAVE_ENTER, "INIT", regs, (long)&nd, 0, 0)
|
||||
== NOTIFY_STOP)
|
||||
ia64_mca_spin(__func__);
|
||||
if (notify_die(DIE_INIT_SLAVE_PROCESS, "INIT", regs, (long)&nd, 0, 0)
|
||||
== NOTIFY_STOP)
|
||||
ia64_mca_spin(__func__);
|
||||
|
||||
NOTIFY_INIT(DIE_INIT_SLAVE_ENTER, regs, (long)&nd, 1);
|
||||
NOTIFY_INIT(DIE_INIT_SLAVE_PROCESS, regs, (long)&nd, 1);
|
||||
|
||||
while (monarch_cpu != -1)
|
||||
cpu_relax(); /* spin until monarch leaves */
|
||||
if (notify_die(DIE_INIT_SLAVE_LEAVE, "INIT", regs, (long)&nd, 0, 0)
|
||||
== NOTIFY_STOP)
|
||||
ia64_mca_spin(__func__);
|
||||
|
||||
NOTIFY_INIT(DIE_INIT_SLAVE_LEAVE, regs, (long)&nd, 1);
|
||||
|
||||
mprintk("Slave on cpu %d returning to normal service.\n", cpu);
|
||||
set_curr_task(cpu, previous_current);
|
||||
ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_NOTDONE;
|
||||
|
|
@ -1699,9 +1701,7 @@ ia64_init_handler(struct pt_regs *regs, struct switch_stack *sw,
|
|||
}
|
||||
|
||||
monarch_cpu = cpu;
|
||||
if (notify_die(DIE_INIT_MONARCH_ENTER, "INIT", regs, (long)&nd, 0, 0)
|
||||
== NOTIFY_STOP)
|
||||
ia64_mca_spin(__func__);
|
||||
NOTIFY_INIT(DIE_INIT_MONARCH_ENTER, regs, (long)&nd, 1);
|
||||
|
||||
/*
|
||||
* Wait for a bit. On some machines (e.g., HP's zx2000 and zx6000, INIT can be
|
||||
|
|
@ -1716,12 +1716,9 @@ ia64_init_handler(struct pt_regs *regs, struct switch_stack *sw,
|
|||
* to default_monarch_init_process() above and just print all the
|
||||
* tasks.
|
||||
*/
|
||||
if (notify_die(DIE_INIT_MONARCH_PROCESS, "INIT", regs, (long)&nd, 0, 0)
|
||||
== NOTIFY_STOP)
|
||||
ia64_mca_spin(__func__);
|
||||
if (notify_die(DIE_INIT_MONARCH_LEAVE, "INIT", regs, (long)&nd, 0, 0)
|
||||
== NOTIFY_STOP)
|
||||
ia64_mca_spin(__func__);
|
||||
NOTIFY_INIT(DIE_INIT_MONARCH_PROCESS, regs, (long)&nd, 1);
|
||||
NOTIFY_INIT(DIE_INIT_MONARCH_LEAVE, regs, (long)&nd, 1);
|
||||
|
||||
mprintk("\nINIT dump complete. Monarch on cpu %d returning to normal service.\n", cpu);
|
||||
atomic_dec(&monarchs);
|
||||
set_curr_task(cpu, previous_current);
|
||||
|
|
@ -1953,7 +1950,7 @@ ia64_mca_init(void)
|
|||
printk(KERN_INFO "Increasing MCA rendezvous timeout from "
|
||||
"%ld to %ld milliseconds\n", timeout, isrv.v0);
|
||||
timeout = isrv.v0;
|
||||
(void) notify_die(DIE_MCA_NEW_TIMEOUT, "MCA", NULL, timeout, 0, 0);
|
||||
NOTIFY_MCA(DIE_MCA_NEW_TIMEOUT, NULL, timeout, 0);
|
||||
continue;
|
||||
}
|
||||
printk(KERN_ERR "Failed to register rendezvous interrupt "
|
||||
|
|
|
|||
|
|
@ -5511,7 +5511,7 @@ stop_monitoring:
|
|||
}
|
||||
|
||||
static int
|
||||
pfm_do_interrupt_handler(int irq, void *arg, struct pt_regs *regs)
|
||||
pfm_do_interrupt_handler(void *arg, struct pt_regs *regs)
|
||||
{
|
||||
struct task_struct *task;
|
||||
pfm_context_t *ctx;
|
||||
|
|
@ -5591,7 +5591,7 @@ pfm_interrupt_handler(int irq, void *arg)
|
|||
|
||||
start_cycles = ia64_get_itc();
|
||||
|
||||
ret = pfm_do_interrupt_handler(irq, arg, regs);
|
||||
ret = pfm_do_interrupt_handler(arg, regs);
|
||||
|
||||
total_cycles = ia64_get_itc();
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# License. See the file "COPYING" in the main directory of this archive
|
||||
# for more details.
|
||||
#
|
||||
# Copyright (C) 1999,2001-2006 Silicon Graphics, Inc. All Rights Reserved.
|
||||
# Copyright (C) 1999,2001-2006,2008 Silicon Graphics, Inc. All Rights Reserved.
|
||||
#
|
||||
|
||||
EXTRA_CFLAGS += -Iarch/ia64/sn/include
|
||||
|
|
@ -15,9 +15,4 @@ obj-y += setup.o bte.o bte_error.o irq.o mca.o idle.o \
|
|||
sn2/
|
||||
obj-$(CONFIG_IA64_GENERIC) += machvec.o
|
||||
obj-$(CONFIG_SGI_TIOCX) += tiocx.o
|
||||
obj-$(CONFIG_IA64_SGI_SN_XP) += xp.o
|
||||
xp-y := xp_main.o xp_nofault.o
|
||||
obj-$(CONFIG_IA64_SGI_SN_XP) += xpc.o
|
||||
xpc-y := xpc_main.o xpc_channel.o xpc_partition.o
|
||||
obj-$(CONFIG_IA64_SGI_SN_XP) += xpnet.o
|
||||
obj-$(CONFIG_PCI_MSI) += msi_sn.o
|
||||
|
|
|
|||
|
|
@ -187,8 +187,8 @@ void hub_error_init(struct hubdev_info *hubdev_info)
|
|||
{
|
||||
|
||||
if (request_irq(SGI_II_ERROR, hub_eint_handler, IRQF_SHARED,
|
||||
"SN_hub_error", (void *)hubdev_info)) {
|
||||
printk("hub_error_init: Failed to request_irq for 0x%p\n",
|
||||
"SN_hub_error", hubdev_info)) {
|
||||
printk(KERN_ERR "hub_error_init: Failed to request_irq for 0x%p\n",
|
||||
hubdev_info);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -655,7 +655,8 @@ tioce_dma(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma_flags)
|
|||
*
|
||||
* Simply call tioce_do_dma_map() to create a map with the barrier bit set
|
||||
* in the address.
|
||||
*/ static u64
|
||||
*/
|
||||
static u64
|
||||
tioce_dma_consistent(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma_flags)
|
||||
{
|
||||
return tioce_do_dma_map(pdev, paddr, byte_count, 1, dma_flags);
|
||||
|
|
@ -668,7 +669,8 @@ tioce_dma_consistent(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma
|
|||
*
|
||||
* Handle a CE error interrupt. Simply a wrapper around a SAL call which
|
||||
* defers processing to the SGI prom.
|
||||
*/ static irqreturn_t
|
||||
*/
|
||||
static irqreturn_t
|
||||
tioce_error_intr_handler(int irq, void *arg)
|
||||
{
|
||||
struct tioce_common *soft = arg;
|
||||
|
|
|
|||
|
|
@ -360,4 +360,16 @@ config ENCLOSURE_SERVICES
|
|||
driver (SCSI/ATA) which supports enclosures
|
||||
or a SCSI enclosure device (SES) to use these services.
|
||||
|
||||
config SGI_XP
|
||||
tristate "Support communication between SGI SSIs"
|
||||
depends on IA64_GENERIC || IA64_SGI_SN2
|
||||
select IA64_UNCACHED_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
|
||||
select GENERIC_ALLOCATOR if IA64_GENERIC || IA64_SGI_SN2
|
||||
---help---
|
||||
An SGI machine can be divided into multiple Single System
|
||||
Images which act independently of each other and have
|
||||
hardware based memory protection from the others. Enabling
|
||||
this feature will allow for direct communication between SSIs
|
||||
based on a network adapter and DMA messaging.
|
||||
|
||||
endif # MISC_DEVICES
|
||||
|
|
|
|||
|
|
@ -24,3 +24,4 @@ obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o
|
|||
obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o
|
||||
obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o
|
||||
obj-$(CONFIG_KGDB_TESTS) += kgdbts.o
|
||||
obj-$(CONFIG_SGI_XP) += sgi-xp/
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
#
|
||||
# Makefile for SGI's XP devices.
|
||||
#
|
||||
|
||||
obj-$(CONFIG_SGI_XP) += xp.o
|
||||
xp-y := xp_main.o xp_nofault.o
|
||||
|
||||
obj-$(CONFIG_SGI_XP) += xpc.o
|
||||
xpc-y := xpc_main.o xpc_channel.o xpc_partition.o
|
||||
|
||||
obj-$(CONFIG_SGI_XP) += xpnet.o
|
||||
|
|
@ -3,18 +3,15 @@
|
|||
* License. See the file "COPYING" in the main directory of this archive
|
||||
* for more details.
|
||||
*
|
||||
* Copyright (C) 2004-2005 Silicon Graphics, Inc. All rights reserved.
|
||||
* Copyright (C) 2004-2008 Silicon Graphics, Inc. All rights reserved.
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
* External Cross Partition (XP) structures and defines.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef _ASM_IA64_SN_XP_H
|
||||
#define _ASM_IA64_SN_XP_H
|
||||
|
||||
#ifndef _DRIVERS_MISC_SGIXP_XP_H
|
||||
#define _DRIVERS_MISC_SGIXP_XP_H
|
||||
|
||||
#include <linux/cache.h>
|
||||
#include <linux/hardirq.h>
|
||||
|
|
@ -22,14 +19,12 @@
|
|||
#include <asm/sn/types.h>
|
||||
#include <asm/sn/bte.h>
|
||||
|
||||
|
||||
#ifdef USE_DBUG_ON
|
||||
#define DBUG_ON(condition) BUG_ON(condition)
|
||||
#else
|
||||
#define DBUG_ON(condition)
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* Define the maximum number of logically defined partitions the system
|
||||
* can support. It is constrained by the maximum number of hardware
|
||||
|
|
@ -43,7 +38,6 @@
|
|||
*/
|
||||
#define XP_MAX_PARTITIONS 64
|
||||
|
||||
|
||||
/*
|
||||
* Define the number of u64s required to represent all the C-brick nasids
|
||||
* as a bitmap. The cross-partition kernel modules deal only with
|
||||
|
|
@ -54,7 +48,6 @@
|
|||
#define XP_NASID_MASK_BYTES ((XP_MAX_PHYSNODE_ID + 7) / 8)
|
||||
#define XP_NASID_MASK_WORDS ((XP_MAX_PHYSNODE_ID + 63) / 64)
|
||||
|
||||
|
||||
/*
|
||||
* Wrapper for bte_copy() that should it return a failure status will retry
|
||||
* the bte_copy() once in the hope that the failure was due to a temporary
|
||||
|
|
@ -74,7 +67,6 @@ xp_bte_copy(u64 src, u64 vdst, u64 len, u64 mode, void *notification)
|
|||
bte_result_t ret;
|
||||
u64 pdst = ia64_tpa(vdst);
|
||||
|
||||
|
||||
/*
|
||||
* Ensure that the physically mapped memory is contiguous.
|
||||
*
|
||||
|
|
@ -87,16 +79,15 @@ xp_bte_copy(u64 src, u64 vdst, u64 len, u64 mode, void *notification)
|
|||
|
||||
ret = bte_copy(src, pdst, len, mode, notification);
|
||||
if ((ret != BTE_SUCCESS) && BTE_ERROR_RETRY(ret)) {
|
||||
if (!in_interrupt()) {
|
||||
if (!in_interrupt())
|
||||
cond_resched();
|
||||
}
|
||||
|
||||
ret = bte_copy(src, pdst, len, mode, notification);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* XPC establishes channel connections between the local partition and any
|
||||
* other partition that is currently up. Over these channels, kernel-level
|
||||
|
|
@ -122,7 +113,6 @@ xp_bte_copy(u64 src, u64 vdst, u64 len, u64 mode, void *notification)
|
|||
#error XPC_NCHANNELS exceeds MAXIMUM allowed.
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* The format of an XPC message is as follows:
|
||||
*
|
||||
|
|
@ -160,12 +150,10 @@ struct xpc_msg {
|
|||
u64 payload; /* user defined portion of message */
|
||||
};
|
||||
|
||||
|
||||
#define XPC_MSG_PAYLOAD_OFFSET (u64) (&((struct xpc_msg *)0)->payload)
|
||||
#define XPC_MSG_SIZE(_payload_size) \
|
||||
L1_CACHE_ALIGN(XPC_MSG_PAYLOAD_OFFSET + (_payload_size))
|
||||
|
||||
|
||||
/*
|
||||
* Define the return values and values passed to user's callout functions.
|
||||
* (It is important to add new value codes at the end just preceding
|
||||
|
|
@ -267,10 +255,9 @@ enum xpc_retval {
|
|||
/* 115: BTE end */
|
||||
xpcBteSh2End = xpcBteSh2Start + BTEFAIL_SH2_ALL,
|
||||
|
||||
xpcUnknownReason /* 116: unknown reason -- must be last in list */
|
||||
xpcUnknownReason /* 116: unknown reason - must be last in enum */
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* Define the callout function types used by XPC to update the user on
|
||||
* connection activity and state changes (via the user function registered by
|
||||
|
|
@ -375,12 +362,11 @@ enum xpc_retval {
|
|||
* =====================+================================+=====================
|
||||
*/
|
||||
|
||||
typedef void (*xpc_channel_func)(enum xpc_retval reason, partid_t partid,
|
||||
int ch_number, void *data, void *key);
|
||||
|
||||
typedef void (*xpc_notify_func)(enum xpc_retval reason, partid_t partid,
|
||||
int ch_number, void *key);
|
||||
typedef void (*xpc_channel_func) (enum xpc_retval reason, partid_t partid,
|
||||
int ch_number, void *data, void *key);
|
||||
|
||||
typedef void (*xpc_notify_func) (enum xpc_retval reason, partid_t partid,
|
||||
int ch_number, void *key);
|
||||
|
||||
/*
|
||||
* The following is a registration entry. There is a global array of these,
|
||||
|
|
@ -398,50 +384,45 @@ typedef void (*xpc_notify_func)(enum xpc_retval reason, partid_t partid,
|
|||
*/
|
||||
struct xpc_registration {
|
||||
struct mutex mutex;
|
||||
xpc_channel_func func; /* function to call */
|
||||
void *key; /* pointer to user's key */
|
||||
u16 nentries; /* #of msg entries in local msg queue */
|
||||
u16 msg_size; /* message queue's message size */
|
||||
u32 assigned_limit; /* limit on #of assigned kthreads */
|
||||
u32 idle_limit; /* limit on #of idle kthreads */
|
||||
xpc_channel_func func; /* function to call */
|
||||
void *key; /* pointer to user's key */
|
||||
u16 nentries; /* #of msg entries in local msg queue */
|
||||
u16 msg_size; /* message queue's message size */
|
||||
u32 assigned_limit; /* limit on #of assigned kthreads */
|
||||
u32 idle_limit; /* limit on #of idle kthreads */
|
||||
} ____cacheline_aligned;
|
||||
|
||||
|
||||
#define XPC_CHANNEL_REGISTERED(_c) (xpc_registrations[_c].func != NULL)
|
||||
|
||||
|
||||
/* the following are valid xpc_allocate() flags */
|
||||
#define XPC_WAIT 0 /* wait flag */
|
||||
#define XPC_NOWAIT 1 /* no wait flag */
|
||||
|
||||
#define XPC_WAIT 0 /* wait flag */
|
||||
#define XPC_NOWAIT 1 /* no wait flag */
|
||||
|
||||
struct xpc_interface {
|
||||
void (*connect)(int);
|
||||
void (*disconnect)(int);
|
||||
enum xpc_retval (*allocate)(partid_t, int, u32, void **);
|
||||
enum xpc_retval (*send)(partid_t, int, void *);
|
||||
enum xpc_retval (*send_notify)(partid_t, int, void *,
|
||||
xpc_notify_func, void *);
|
||||
void (*received)(partid_t, int, void *);
|
||||
enum xpc_retval (*partid_to_nasids)(partid_t, void *);
|
||||
void (*connect) (int);
|
||||
void (*disconnect) (int);
|
||||
enum xpc_retval (*allocate) (partid_t, int, u32, void **);
|
||||
enum xpc_retval (*send) (partid_t, int, void *);
|
||||
enum xpc_retval (*send_notify) (partid_t, int, void *,
|
||||
xpc_notify_func, void *);
|
||||
void (*received) (partid_t, int, void *);
|
||||
enum xpc_retval (*partid_to_nasids) (partid_t, void *);
|
||||
};
|
||||
|
||||
|
||||
extern struct xpc_interface xpc_interface;
|
||||
|
||||
extern void xpc_set_interface(void (*)(int),
|
||||
void (*)(int),
|
||||
enum xpc_retval (*)(partid_t, int, u32, void **),
|
||||
enum xpc_retval (*)(partid_t, int, void *),
|
||||
enum xpc_retval (*)(partid_t, int, void *, xpc_notify_func,
|
||||
void *),
|
||||
void (*)(partid_t, int, void *),
|
||||
enum xpc_retval (*)(partid_t, void *));
|
||||
void (*)(int),
|
||||
enum xpc_retval (*)(partid_t, int, u32, void **),
|
||||
enum xpc_retval (*)(partid_t, int, void *),
|
||||
enum xpc_retval (*)(partid_t, int, void *,
|
||||
xpc_notify_func, void *),
|
||||
void (*)(partid_t, int, void *),
|
||||
enum xpc_retval (*)(partid_t, void *));
|
||||
extern void xpc_clear_interface(void);
|
||||
|
||||
|
||||
extern enum xpc_retval xpc_connect(int, xpc_channel_func, void *, u16,
|
||||
u16, u32, u32);
|
||||
u16, u32, u32);
|
||||
extern void xpc_disconnect(int);
|
||||
|
||||
static inline enum xpc_retval
|
||||
|
|
@ -458,7 +439,7 @@ xpc_send(partid_t partid, int ch_number, void *payload)
|
|||
|
||||
static inline enum xpc_retval
|
||||
xpc_send_notify(partid_t partid, int ch_number, void *payload,
|
||||
xpc_notify_func func, void *key)
|
||||
xpc_notify_func func, void *key)
|
||||
{
|
||||
return xpc_interface.send_notify(partid, ch_number, payload, func, key);
|
||||
}
|
||||
|
|
@ -475,11 +456,8 @@ xpc_partid_to_nasids(partid_t partid, void *nasids)
|
|||
return xpc_interface.partid_to_nasids(partid, nasids);
|
||||
}
|
||||
|
||||
|
||||
extern u64 xp_nofault_PIOR_target;
|
||||
extern int xp_nofault_PIOR(void *);
|
||||
extern int xp_error_PIOR(void);
|
||||
|
||||
|
||||
#endif /* _ASM_IA64_SN_XP_H */
|
||||
|
||||
#endif /* _DRIVERS_MISC_SGIXP_XP_H */
|
||||
|
|
@ -3,10 +3,9 @@
|
|||
* License. See the file "COPYING" in the main directory of this archive
|
||||
* for more details.
|
||||
*
|
||||
* Copyright (c) 2004-2005 Silicon Graphics, Inc. All Rights Reserved.
|
||||
* Copyright (c) 2004-2008 Silicon Graphics, Inc. All Rights Reserved.
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
* Cross Partition (XP) base.
|
||||
*
|
||||
|
|
@ -15,58 +14,64 @@
|
|||
*
|
||||
*/
|
||||
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <asm/sn/intr.h>
|
||||
#include <asm/sn/sn_sal.h>
|
||||
#include <asm/sn/xp.h>
|
||||
|
||||
#include "xp.h"
|
||||
|
||||
/*
|
||||
* Target of nofault PIO read.
|
||||
* The export of xp_nofault_PIOR needs to happen here since it is defined
|
||||
* in drivers/misc/sgi-xp/xp_nofault.S. The target of the nofault read is
|
||||
* defined here.
|
||||
*/
|
||||
u64 xp_nofault_PIOR_target;
|
||||
EXPORT_SYMBOL_GPL(xp_nofault_PIOR);
|
||||
|
||||
u64 xp_nofault_PIOR_target;
|
||||
EXPORT_SYMBOL_GPL(xp_nofault_PIOR_target);
|
||||
|
||||
/*
|
||||
* xpc_registrations[] keeps track of xpc_connect()'s done by the kernel-level
|
||||
* users of XPC.
|
||||
*/
|
||||
struct xpc_registration xpc_registrations[XPC_NCHANNELS];
|
||||
|
||||
EXPORT_SYMBOL_GPL(xpc_registrations);
|
||||
|
||||
/*
|
||||
* Initialize the XPC interface to indicate that XPC isn't loaded.
|
||||
*/
|
||||
static enum xpc_retval xpc_notloaded(void) { return xpcNotLoaded; }
|
||||
static enum xpc_retval
|
||||
xpc_notloaded(void)
|
||||
{
|
||||
return xpcNotLoaded;
|
||||
}
|
||||
|
||||
struct xpc_interface xpc_interface = {
|
||||
(void (*)(int)) xpc_notloaded,
|
||||
(void (*)(int)) xpc_notloaded,
|
||||
(enum xpc_retval (*)(partid_t, int, u32, void **)) xpc_notloaded,
|
||||
(enum xpc_retval (*)(partid_t, int, void *)) xpc_notloaded,
|
||||
(enum xpc_retval (*)(partid_t, int, void *, xpc_notify_func, void *))
|
||||
xpc_notloaded,
|
||||
(void (*)(partid_t, int, void *)) xpc_notloaded,
|
||||
(enum xpc_retval (*)(partid_t, void *)) xpc_notloaded
|
||||
(void (*)(int))xpc_notloaded,
|
||||
(void (*)(int))xpc_notloaded,
|
||||
(enum xpc_retval(*)(partid_t, int, u32, void **))xpc_notloaded,
|
||||
(enum xpc_retval(*)(partid_t, int, void *))xpc_notloaded,
|
||||
(enum xpc_retval(*)(partid_t, int, void *, xpc_notify_func, void *))
|
||||
xpc_notloaded,
|
||||
(void (*)(partid_t, int, void *))xpc_notloaded,
|
||||
(enum xpc_retval(*)(partid_t, void *))xpc_notloaded
|
||||
};
|
||||
|
||||
EXPORT_SYMBOL_GPL(xpc_interface);
|
||||
|
||||
/*
|
||||
* XPC calls this when it (the XPC module) has been loaded.
|
||||
*/
|
||||
void
|
||||
xpc_set_interface(void (*connect)(int),
|
||||
void (*disconnect)(int),
|
||||
enum xpc_retval (*allocate)(partid_t, int, u32, void **),
|
||||
enum xpc_retval (*send)(partid_t, int, void *),
|
||||
enum xpc_retval (*send_notify)(partid_t, int, void *,
|
||||
xpc_notify_func, void *),
|
||||
void (*received)(partid_t, int, void *),
|
||||
enum xpc_retval (*partid_to_nasids)(partid_t, void *))
|
||||
xpc_set_interface(void (*connect) (int),
|
||||
void (*disconnect) (int),
|
||||
enum xpc_retval (*allocate) (partid_t, int, u32, void **),
|
||||
enum xpc_retval (*send) (partid_t, int, void *),
|
||||
enum xpc_retval (*send_notify) (partid_t, int, void *,
|
||||
xpc_notify_func, void *),
|
||||
void (*received) (partid_t, int, void *),
|
||||
enum xpc_retval (*partid_to_nasids) (partid_t, void *))
|
||||
{
|
||||
xpc_interface.connect = connect;
|
||||
xpc_interface.disconnect = disconnect;
|
||||
|
|
@ -76,7 +81,7 @@ xpc_set_interface(void (*connect)(int),
|
|||
xpc_interface.received = received;
|
||||
xpc_interface.partid_to_nasids = partid_to_nasids;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(xpc_set_interface);
|
||||
|
||||
/*
|
||||
* XPC calls this when it (the XPC module) is being unloaded.
|
||||
|
|
@ -84,20 +89,21 @@ xpc_set_interface(void (*connect)(int),
|
|||
void
|
||||
xpc_clear_interface(void)
|
||||
{
|
||||
xpc_interface.connect = (void (*)(int)) xpc_notloaded;
|
||||
xpc_interface.disconnect = (void (*)(int)) xpc_notloaded;
|
||||
xpc_interface.allocate = (enum xpc_retval (*)(partid_t, int, u32,
|
||||
void **)) xpc_notloaded;
|
||||
xpc_interface.send = (enum xpc_retval (*)(partid_t, int, void *))
|
||||
xpc_notloaded;
|
||||
xpc_interface.send_notify = (enum xpc_retval (*)(partid_t, int, void *,
|
||||
xpc_notify_func, void *)) xpc_notloaded;
|
||||
xpc_interface.connect = (void (*)(int))xpc_notloaded;
|
||||
xpc_interface.disconnect = (void (*)(int))xpc_notloaded;
|
||||
xpc_interface.allocate = (enum xpc_retval(*)(partid_t, int, u32,
|
||||
void **))xpc_notloaded;
|
||||
xpc_interface.send = (enum xpc_retval(*)(partid_t, int, void *))
|
||||
xpc_notloaded;
|
||||
xpc_interface.send_notify = (enum xpc_retval(*)(partid_t, int, void *,
|
||||
xpc_notify_func,
|
||||
void *))xpc_notloaded;
|
||||
xpc_interface.received = (void (*)(partid_t, int, void *))
|
||||
xpc_notloaded;
|
||||
xpc_interface.partid_to_nasids = (enum xpc_retval (*)(partid_t, void *))
|
||||
xpc_notloaded;
|
||||
xpc_notloaded;
|
||||
xpc_interface.partid_to_nasids = (enum xpc_retval(*)(partid_t, void *))
|
||||
xpc_notloaded;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(xpc_clear_interface);
|
||||
|
||||
/*
|
||||
* Register for automatic establishment of a channel connection whenever
|
||||
|
|
@ -125,11 +131,10 @@ xpc_clear_interface(void)
|
|||
*/
|
||||
enum xpc_retval
|
||||
xpc_connect(int ch_number, xpc_channel_func func, void *key, u16 payload_size,
|
||||
u16 nentries, u32 assigned_limit, u32 idle_limit)
|
||||
u16 nentries, u32 assigned_limit, u32 idle_limit)
|
||||
{
|
||||
struct xpc_registration *registration;
|
||||
|
||||
|
||||
DBUG_ON(ch_number < 0 || ch_number >= XPC_NCHANNELS);
|
||||
DBUG_ON(payload_size == 0 || nentries == 0);
|
||||
DBUG_ON(func == NULL);
|
||||
|
|
@ -137,9 +142,8 @@ xpc_connect(int ch_number, xpc_channel_func func, void *key, u16 payload_size,
|
|||
|
||||
registration = &xpc_registrations[ch_number];
|
||||
|
||||
if (mutex_lock_interruptible(®istration->mutex) != 0) {
|
||||
if (mutex_lock_interruptible(®istration->mutex) != 0)
|
||||
return xpcInterrupted;
|
||||
}
|
||||
|
||||
/* if XPC_CHANNEL_REGISTERED(ch_number) */
|
||||
if (registration->func != NULL) {
|
||||
|
|
@ -161,7 +165,7 @@ xpc_connect(int ch_number, xpc_channel_func func, void *key, u16 payload_size,
|
|||
|
||||
return xpcSuccess;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(xpc_connect);
|
||||
|
||||
/*
|
||||
* Remove the registration for automatic connection of the specified channel
|
||||
|
|
@ -181,7 +185,6 @@ xpc_disconnect(int ch_number)
|
|||
{
|
||||
struct xpc_registration *registration;
|
||||
|
||||
|
||||
DBUG_ON(ch_number < 0 || ch_number >= XPC_NCHANNELS);
|
||||
|
||||
registration = &xpc_registrations[ch_number];
|
||||
|
|
@ -213,19 +216,17 @@ xpc_disconnect(int ch_number)
|
|||
|
||||
return;
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL_GPL(xpc_disconnect);
|
||||
|
||||
int __init
|
||||
xp_init(void)
|
||||
{
|
||||
int ret, ch_number;
|
||||
u64 func_addr = *(u64 *) xp_nofault_PIOR;
|
||||
u64 err_func_addr = *(u64 *) xp_error_PIOR;
|
||||
u64 func_addr = *(u64 *)xp_nofault_PIOR;
|
||||
u64 err_func_addr = *(u64 *)xp_error_PIOR;
|
||||
|
||||
|
||||
if (!ia64_platform_is("sn2")) {
|
||||
if (!ia64_platform_is("sn2"))
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
/*
|
||||
* Register a nofault code region which performs a cross-partition
|
||||
|
|
@ -236,55 +237,43 @@ xp_init(void)
|
|||
* least some CPUs on Shubs <= v1.2, which unfortunately we have to
|
||||
* work around).
|
||||
*/
|
||||
if ((ret = sn_register_nofault_code(func_addr, err_func_addr,
|
||||
err_func_addr, 1, 1)) != 0) {
|
||||
ret = sn_register_nofault_code(func_addr, err_func_addr, err_func_addr,
|
||||
1, 1);
|
||||
if (ret != 0) {
|
||||
printk(KERN_ERR "XP: can't register nofault code, error=%d\n",
|
||||
ret);
|
||||
ret);
|
||||
}
|
||||
/*
|
||||
* Setup the nofault PIO read target. (There is no special reason why
|
||||
* SH_IPI_ACCESS was selected.)
|
||||
*/
|
||||
if (is_shub2()) {
|
||||
if (is_shub2())
|
||||
xp_nofault_PIOR_target = SH2_IPI_ACCESS0;
|
||||
} else {
|
||||
else
|
||||
xp_nofault_PIOR_target = SH1_IPI_ACCESS;
|
||||
}
|
||||
|
||||
/* initialize the connection registration mutex */
|
||||
for (ch_number = 0; ch_number < XPC_NCHANNELS; ch_number++) {
|
||||
for (ch_number = 0; ch_number < XPC_NCHANNELS; ch_number++)
|
||||
mutex_init(&xpc_registrations[ch_number].mutex);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
module_init(xp_init);
|
||||
|
||||
module_init(xp_init);
|
||||
|
||||
void __exit
|
||||
xp_exit(void)
|
||||
{
|
||||
u64 func_addr = *(u64 *) xp_nofault_PIOR;
|
||||
u64 err_func_addr = *(u64 *) xp_error_PIOR;
|
||||
|
||||
u64 func_addr = *(u64 *)xp_nofault_PIOR;
|
||||
u64 err_func_addr = *(u64 *)xp_error_PIOR;
|
||||
|
||||
/* unregister the PIO read nofault code region */
|
||||
(void) sn_register_nofault_code(func_addr, err_func_addr,
|
||||
err_func_addr, 1, 0);
|
||||
(void)sn_register_nofault_code(func_addr, err_func_addr,
|
||||
err_func_addr, 1, 0);
|
||||
}
|
||||
module_exit(xp_exit);
|
||||
|
||||
module_exit(xp_exit);
|
||||
|
||||
MODULE_AUTHOR("Silicon Graphics, Inc.");
|
||||
MODULE_DESCRIPTION("Cross Partition (XP) base");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
EXPORT_SYMBOL(xp_nofault_PIOR);
|
||||
EXPORT_SYMBOL(xp_nofault_PIOR_target);
|
||||
EXPORT_SYMBOL(xpc_registrations);
|
||||
EXPORT_SYMBOL(xpc_interface);
|
||||
EXPORT_SYMBOL(xpc_clear_interface);
|
||||
EXPORT_SYMBOL(xpc_set_interface);
|
||||
EXPORT_SYMBOL(xpc_connect);
|
||||
EXPORT_SYMBOL(xpc_disconnect);
|
||||
|
||||
|
|
@ -3,10 +3,9 @@
|
|||
* License. See the file "COPYING" in the main directory of this archive
|
||||
* for more details.
|
||||
*
|
||||
* Copyright (c) 2004-2007 Silicon Graphics, Inc. All Rights Reserved.
|
||||
* Copyright (c) 2004-2008 Silicon Graphics, Inc. All Rights Reserved.
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
* The xp_nofault_PIOR function takes a pointer to a remote PIO register
|
||||
* and attempts to load and consume a value from it. This function
|
||||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -3,10 +3,9 @@
|
|||
* License. See the file "COPYING" in the main directory of this archive
|
||||
* for more details.
|
||||
*
|
||||
* Copyright (C) 1999,2001-2005 Silicon Graphics, Inc. All rights reserved.
|
||||
* Copyright (C) 1999-2008 Silicon Graphics, Inc. All rights reserved.
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
* Cross Partition Network Interface (XPNET) support
|
||||
*
|
||||
|
|
@ -21,8 +20,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/ioport.h>
|
||||
|
|
@ -36,10 +35,8 @@
|
|||
#include <asm/sn/bte.h>
|
||||
#include <asm/sn/io.h>
|
||||
#include <asm/sn/sn_sal.h>
|
||||
#include <asm/types.h>
|
||||
#include <asm/atomic.h>
|
||||
#include <asm/sn/xp.h>
|
||||
|
||||
#include "xp.h"
|
||||
|
||||
/*
|
||||
* The message payload transferred by XPC.
|
||||
|
|
@ -79,7 +76,6 @@ struct xpnet_message {
|
|||
#define XPNET_MSG_ALIGNED_SIZE (L1_CACHE_ALIGN(XPNET_MSG_SIZE))
|
||||
#define XPNET_MSG_NENTRIES (PAGE_SIZE / XPNET_MSG_ALIGNED_SIZE)
|
||||
|
||||
|
||||
#define XPNET_MAX_KTHREADS (XPNET_MSG_NENTRIES + 1)
|
||||
#define XPNET_MAX_IDLE_KTHREADS (XPNET_MSG_NENTRIES + 1)
|
||||
|
||||
|
|
@ -91,9 +87,9 @@ struct xpnet_message {
|
|||
#define XPNET_VERSION_MAJOR(_v) ((_v) >> 4)
|
||||
#define XPNET_VERSION_MINOR(_v) ((_v) & 0xf)
|
||||
|
||||
#define XPNET_VERSION _XPNET_VERSION(1,0) /* version 1.0 */
|
||||
#define XPNET_VERSION_EMBED _XPNET_VERSION(1,1) /* version 1.1 */
|
||||
#define XPNET_MAGIC 0x88786984 /* "XNET" */
|
||||
#define XPNET_VERSION _XPNET_VERSION(1, 0) /* version 1.0 */
|
||||
#define XPNET_VERSION_EMBED _XPNET_VERSION(1, 1) /* version 1.1 */
|
||||
#define XPNET_MAGIC 0x88786984 /* "XNET" */
|
||||
|
||||
#define XPNET_VALID_MSG(_m) \
|
||||
((XPNET_VERSION_MAJOR(_m->version) == XPNET_VERSION_MAJOR(XPNET_VERSION)) \
|
||||
|
|
@ -101,7 +97,6 @@ struct xpnet_message {
|
|||
|
||||
#define XPNET_DEVICE_NAME "xp0"
|
||||
|
||||
|
||||
/*
|
||||
* When messages are queued with xpc_send_notify, a kmalloc'd buffer
|
||||
* of the following type is passed as a notification cookie. When the
|
||||
|
|
@ -145,7 +140,6 @@ static DEFINE_SPINLOCK(xpnet_broadcast_lock);
|
|||
/* 32KB has been determined to be the ideal */
|
||||
#define XPNET_DEF_MTU (0x8000UL)
|
||||
|
||||
|
||||
/*
|
||||
* The partition id is encapsulated in the MAC address. The following
|
||||
* define locates the octet the partid is in.
|
||||
|
|
@ -153,7 +147,6 @@ static DEFINE_SPINLOCK(xpnet_broadcast_lock);
|
|||
#define XPNET_PARTID_OCTET 1
|
||||
#define XPNET_LICENSE_OCTET 2
|
||||
|
||||
|
||||
/*
|
||||
* Define the XPNET debug device structure that is to be used with dev_dbg(),
|
||||
* dev_err(), dev_warn(), and dev_info().
|
||||
|
|
@ -163,7 +156,7 @@ struct device_driver xpnet_dbg_name = {
|
|||
};
|
||||
|
||||
struct device xpnet_dbg_subname = {
|
||||
.bus_id = {0}, /* set to "" */
|
||||
.bus_id = {0}, /* set to "" */
|
||||
.driver = &xpnet_dbg_name
|
||||
};
|
||||
|
||||
|
|
@ -178,14 +171,13 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
|
|||
struct sk_buff *skb;
|
||||
bte_result_t bret;
|
||||
struct xpnet_dev_private *priv =
|
||||
(struct xpnet_dev_private *) xpnet_device->priv;
|
||||
|
||||
(struct xpnet_dev_private *)xpnet_device->priv;
|
||||
|
||||
if (!XPNET_VALID_MSG(msg)) {
|
||||
/*
|
||||
* Packet with a different XPC version. Ignore.
|
||||
*/
|
||||
xpc_received(partid, channel, (void *) msg);
|
||||
xpc_received(partid, channel, (void *)msg);
|
||||
|
||||
priv->stats.rx_errors++;
|
||||
|
||||
|
|
@ -194,14 +186,13 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
|
|||
dev_dbg(xpnet, "received 0x%lx, %d, %d, %d\n", msg->buf_pa, msg->size,
|
||||
msg->leadin_ignore, msg->tailout_ignore);
|
||||
|
||||
|
||||
/* reserve an extra cache line */
|
||||
skb = dev_alloc_skb(msg->size + L1_CACHE_BYTES);
|
||||
if (!skb) {
|
||||
dev_err(xpnet, "failed on dev_alloc_skb(%d)\n",
|
||||
msg->size + L1_CACHE_BYTES);
|
||||
|
||||
xpc_received(partid, channel, (void *) msg);
|
||||
xpc_received(partid, channel, (void *)msg);
|
||||
|
||||
priv->stats.rx_errors++;
|
||||
|
||||
|
|
@ -227,12 +218,13 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
|
|||
* Move the data over from the other side.
|
||||
*/
|
||||
if ((XPNET_VERSION_MINOR(msg->version) == 1) &&
|
||||
(msg->embedded_bytes != 0)) {
|
||||
(msg->embedded_bytes != 0)) {
|
||||
dev_dbg(xpnet, "copying embedded message. memcpy(0x%p, 0x%p, "
|
||||
"%lu)\n", skb->data, &msg->data,
|
||||
(size_t) msg->embedded_bytes);
|
||||
(size_t)msg->embedded_bytes);
|
||||
|
||||
skb_copy_to_linear_data(skb, &msg->data, (size_t)msg->embedded_bytes);
|
||||
skb_copy_to_linear_data(skb, &msg->data,
|
||||
(size_t)msg->embedded_bytes);
|
||||
} else {
|
||||
dev_dbg(xpnet, "transferring buffer to the skb->data area;\n\t"
|
||||
"bte_copy(0x%p, 0x%p, %hu)\n", (void *)msg->buf_pa,
|
||||
|
|
@ -244,16 +236,18 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
|
|||
msg->size, (BTE_NOTIFY | BTE_WACQUIRE), NULL);
|
||||
|
||||
if (bret != BTE_SUCCESS) {
|
||||
// >>> Need better way of cleaning skb. Currently skb
|
||||
// >>> appears in_use and we can't just call
|
||||
// >>> dev_kfree_skb.
|
||||
/*
|
||||
* >>> Need better way of cleaning skb. Currently skb
|
||||
* >>> appears in_use and we can't just call
|
||||
* >>> dev_kfree_skb.
|
||||
*/
|
||||
dev_err(xpnet, "bte_copy(0x%p, 0x%p, 0x%hx) returned "
|
||||
"error=0x%x\n", (void *)msg->buf_pa,
|
||||
(void *)__pa((u64)skb->data &
|
||||
~(L1_CACHE_BYTES - 1)),
|
||||
~(L1_CACHE_BYTES - 1)),
|
||||
msg->size, bret);
|
||||
|
||||
xpc_received(partid, channel, (void *) msg);
|
||||
xpc_received(partid, channel, (void *)msg);
|
||||
|
||||
priv->stats.rx_errors++;
|
||||
|
||||
|
|
@ -262,7 +256,7 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
|
|||
}
|
||||
|
||||
dev_dbg(xpnet, "<skb->head=0x%p skb->data=0x%p skb->tail=0x%p "
|
||||
"skb->end=0x%p skb->len=%d\n", (void *) skb->head,
|
||||
"skb->end=0x%p skb->len=%d\n", (void *)skb->head,
|
||||
(void *)skb->data, skb_tail_pointer(skb), skb_end_pointer(skb),
|
||||
skb->len);
|
||||
|
||||
|
|
@ -275,16 +269,14 @@ xpnet_receive(partid_t partid, int channel, struct xpnet_message *msg)
|
|||
(void *)skb->head, (void *)skb->data, skb_tail_pointer(skb),
|
||||
skb_end_pointer(skb), skb->len);
|
||||
|
||||
|
||||
xpnet_device->last_rx = jiffies;
|
||||
priv->stats.rx_packets++;
|
||||
priv->stats.rx_bytes += skb->len + ETH_HLEN;
|
||||
|
||||
netif_rx_ni(skb);
|
||||
xpc_received(partid, channel, (void *) msg);
|
||||
xpc_received(partid, channel, (void *)msg);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* This is the handler which XPC calls during any sort of change in
|
||||
* state or message reception on a connection.
|
||||
|
|
@ -295,20 +287,19 @@ xpnet_connection_activity(enum xpc_retval reason, partid_t partid, int channel,
|
|||
{
|
||||
long bp;
|
||||
|
||||
|
||||
DBUG_ON(partid <= 0 || partid >= XP_MAX_PARTITIONS);
|
||||
DBUG_ON(channel != XPC_NET_CHANNEL);
|
||||
|
||||
switch(reason) {
|
||||
switch (reason) {
|
||||
case xpcMsgReceived: /* message received */
|
||||
DBUG_ON(data == NULL);
|
||||
|
||||
xpnet_receive(partid, channel, (struct xpnet_message *) data);
|
||||
xpnet_receive(partid, channel, (struct xpnet_message *)data);
|
||||
break;
|
||||
|
||||
case xpcConnected: /* connection completed to a partition */
|
||||
spin_lock_bh(&xpnet_broadcast_lock);
|
||||
xpnet_broadcast_partitions |= 1UL << (partid -1 );
|
||||
xpnet_broadcast_partitions |= 1UL << (partid - 1);
|
||||
bp = xpnet_broadcast_partitions;
|
||||
spin_unlock_bh(&xpnet_broadcast_lock);
|
||||
|
||||
|
|
@ -321,13 +312,12 @@ xpnet_connection_activity(enum xpc_retval reason, partid_t partid, int channel,
|
|||
|
||||
default:
|
||||
spin_lock_bh(&xpnet_broadcast_lock);
|
||||
xpnet_broadcast_partitions &= ~(1UL << (partid -1 ));
|
||||
xpnet_broadcast_partitions &= ~(1UL << (partid - 1));
|
||||
bp = xpnet_broadcast_partitions;
|
||||
spin_unlock_bh(&xpnet_broadcast_lock);
|
||||
|
||||
if (bp == 0) {
|
||||
if (bp == 0)
|
||||
netif_carrier_off(xpnet_device);
|
||||
}
|
||||
|
||||
dev_dbg(xpnet, "%s disconnected from partition %d; "
|
||||
"xpnet_broadcast_partitions=0x%lx\n",
|
||||
|
|
@ -337,13 +327,11 @@ xpnet_connection_activity(enum xpc_retval reason, partid_t partid, int channel,
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
xpnet_dev_open(struct net_device *dev)
|
||||
{
|
||||
enum xpc_retval ret;
|
||||
|
||||
|
||||
dev_dbg(xpnet, "calling xpc_connect(%d, 0x%p, NULL, %ld, %ld, %ld, "
|
||||
"%ld)\n", XPC_NET_CHANNEL, xpnet_connection_activity,
|
||||
XPNET_MSG_SIZE, XPNET_MSG_NENTRIES, XPNET_MAX_KTHREADS,
|
||||
|
|
@ -364,7 +352,6 @@ xpnet_dev_open(struct net_device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
xpnet_dev_stop(struct net_device *dev)
|
||||
{
|
||||
|
|
@ -375,7 +362,6 @@ xpnet_dev_stop(struct net_device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
xpnet_dev_change_mtu(struct net_device *dev, int new_mtu)
|
||||
{
|
||||
|
|
@ -392,7 +378,6 @@ xpnet_dev_change_mtu(struct net_device *dev, int new_mtu)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Required for the net_device structure.
|
||||
*/
|
||||
|
|
@ -402,7 +387,6 @@ xpnet_dev_set_config(struct net_device *dev, struct ifmap *new_map)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Return statistics to the caller.
|
||||
*/
|
||||
|
|
@ -411,13 +395,11 @@ xpnet_dev_get_stats(struct net_device *dev)
|
|||
{
|
||||
struct xpnet_dev_private *priv;
|
||||
|
||||
|
||||
priv = (struct xpnet_dev_private *) dev->priv;
|
||||
priv = (struct xpnet_dev_private *)dev->priv;
|
||||
|
||||
return &priv->stats;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Notification that the other end has received the message and
|
||||
* DMA'd the skb information. At this point, they are done with
|
||||
|
|
@ -426,11 +408,9 @@ xpnet_dev_get_stats(struct net_device *dev)
|
|||
*/
|
||||
static void
|
||||
xpnet_send_completed(enum xpc_retval reason, partid_t partid, int channel,
|
||||
void *__qm)
|
||||
void *__qm)
|
||||
{
|
||||
struct xpnet_pending_msg *queued_msg =
|
||||
(struct xpnet_pending_msg *) __qm;
|
||||
|
||||
struct xpnet_pending_msg *queued_msg = (struct xpnet_pending_msg *)__qm;
|
||||
|
||||
DBUG_ON(queued_msg == NULL);
|
||||
|
||||
|
|
@ -439,14 +419,13 @@ xpnet_send_completed(enum xpc_retval reason, partid_t partid, int channel,
|
|||
|
||||
if (atomic_dec_return(&queued_msg->use_count) == 0) {
|
||||
dev_dbg(xpnet, "all acks for skb->head=-x%p\n",
|
||||
(void *) queued_msg->skb->head);
|
||||
(void *)queued_msg->skb->head);
|
||||
|
||||
dev_kfree_skb_any(queued_msg->skb);
|
||||
kfree(queued_msg);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Network layer has formatted a packet (skb) and is ready to place it
|
||||
* "on the wire". Prepare and send an xpnet_message to all partitions
|
||||
|
|
@ -469,16 +448,13 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
struct xpnet_dev_private *priv;
|
||||
u16 embedded_bytes;
|
||||
|
||||
|
||||
priv = (struct xpnet_dev_private *) dev->priv;
|
||||
|
||||
priv = (struct xpnet_dev_private *)dev->priv;
|
||||
|
||||
dev_dbg(xpnet, ">skb->head=0x%p skb->data=0x%p skb->tail=0x%p "
|
||||
"skb->end=0x%p skb->len=%d\n", (void *) skb->head,
|
||||
"skb->end=0x%p skb->len=%d\n", (void *)skb->head,
|
||||
(void *)skb->data, skb_tail_pointer(skb), skb_end_pointer(skb),
|
||||
skb->len);
|
||||
|
||||
|
||||
/*
|
||||
* The xpnet_pending_msg tracks how many outstanding
|
||||
* xpc_send_notifies are relying on this skb. When none
|
||||
|
|
@ -487,16 +463,15 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
queued_msg = kmalloc(sizeof(struct xpnet_pending_msg), GFP_ATOMIC);
|
||||
if (queued_msg == NULL) {
|
||||
dev_warn(xpnet, "failed to kmalloc %ld bytes; dropping "
|
||||
"packet\n", sizeof(struct xpnet_pending_msg));
|
||||
"packet\n", sizeof(struct xpnet_pending_msg));
|
||||
|
||||
priv->stats.tx_errors++;
|
||||
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
|
||||
/* get the beginning of the first cacheline and end of last */
|
||||
start_addr = ((u64) skb->data & ~(L1_CACHE_BYTES - 1));
|
||||
start_addr = ((u64)skb->data & ~(L1_CACHE_BYTES - 1));
|
||||
end_addr = L1_CACHE_ALIGN((u64)skb_tail_pointer(skb));
|
||||
|
||||
/* calculate how many bytes to embed in the XPC message */
|
||||
|
|
@ -506,7 +481,6 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
embedded_bytes = skb->len;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Since the send occurs asynchronously, we set the count to one
|
||||
* and begin sending. Any sends that happen to complete before
|
||||
|
|
@ -517,14 +491,13 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
atomic_set(&queued_msg->use_count, 1);
|
||||
queued_msg->skb = skb;
|
||||
|
||||
|
||||
second_mac_octet = skb->data[XPNET_PARTID_OCTET];
|
||||
if (second_mac_octet == 0xff) {
|
||||
/* we are being asked to broadcast to all partitions */
|
||||
dp = xpnet_broadcast_partitions;
|
||||
} else if (second_mac_octet != 0) {
|
||||
dp = xpnet_broadcast_partitions &
|
||||
(1UL << (second_mac_octet - 1));
|
||||
(1UL << (second_mac_octet - 1));
|
||||
} else {
|
||||
/* 0 is an invalid partid. Ignore */
|
||||
dp = 0;
|
||||
|
|
@ -543,7 +516,6 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
for (dest_partid = 1; dp && dest_partid < XP_MAX_PARTITIONS;
|
||||
dest_partid++) {
|
||||
|
||||
|
||||
if (!(dp & (1UL << (dest_partid - 1)))) {
|
||||
/* not destined for this partition */
|
||||
continue;
|
||||
|
|
@ -552,20 +524,18 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
/* remove this partition from the destinations mask */
|
||||
dp &= ~(1UL << (dest_partid - 1));
|
||||
|
||||
|
||||
/* found a partition to send to */
|
||||
|
||||
ret = xpc_allocate(dest_partid, XPC_NET_CHANNEL,
|
||||
XPC_NOWAIT, (void **)&msg);
|
||||
if (unlikely(ret != xpcSuccess)) {
|
||||
if (unlikely(ret != xpcSuccess))
|
||||
continue;
|
||||
}
|
||||
|
||||
msg->embedded_bytes = embedded_bytes;
|
||||
if (unlikely(embedded_bytes != 0)) {
|
||||
msg->version = XPNET_VERSION_EMBED;
|
||||
dev_dbg(xpnet, "calling memcpy(0x%p, 0x%p, 0x%lx)\n",
|
||||
&msg->data, skb->data, (size_t) embedded_bytes);
|
||||
&msg->data, skb->data, (size_t)embedded_bytes);
|
||||
skb_copy_from_linear_data(skb, &msg->data,
|
||||
(size_t)embedded_bytes);
|
||||
} else {
|
||||
|
|
@ -573,7 +543,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
}
|
||||
msg->magic = XPNET_MAGIC;
|
||||
msg->size = end_addr - start_addr;
|
||||
msg->leadin_ignore = (u64) skb->data - start_addr;
|
||||
msg->leadin_ignore = (u64)skb->data - start_addr;
|
||||
msg->tailout_ignore = end_addr - (u64)skb_tail_pointer(skb);
|
||||
msg->buf_pa = __pa(start_addr);
|
||||
|
||||
|
|
@ -583,7 +553,6 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
dest_partid, XPC_NET_CHANNEL, msg->buf_pa, msg->size,
|
||||
msg->leadin_ignore, msg->tailout_ignore);
|
||||
|
||||
|
||||
atomic_inc(&queued_msg->use_count);
|
||||
|
||||
ret = xpc_send_notify(dest_partid, XPC_NET_CHANNEL, msg,
|
||||
|
|
@ -592,14 +561,12 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
atomic_dec(&queued_msg->use_count);
|
||||
continue;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (atomic_dec_return(&queued_msg->use_count) == 0) {
|
||||
dev_dbg(xpnet, "no partitions to receive packet destined for "
|
||||
"%d\n", dest_partid);
|
||||
|
||||
|
||||
dev_kfree_skb(skb);
|
||||
kfree(queued_msg);
|
||||
}
|
||||
|
|
@ -610,23 +577,20 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Deal with transmit timeouts coming from the network layer.
|
||||
*/
|
||||
static void
|
||||
xpnet_dev_tx_timeout (struct net_device *dev)
|
||||
xpnet_dev_tx_timeout(struct net_device *dev)
|
||||
{
|
||||
struct xpnet_dev_private *priv;
|
||||
|
||||
|
||||
priv = (struct xpnet_dev_private *) dev->priv;
|
||||
priv = (struct xpnet_dev_private *)dev->priv;
|
||||
|
||||
priv->stats.tx_errors++;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
static int __init
|
||||
xpnet_init(void)
|
||||
{
|
||||
|
|
@ -634,10 +598,8 @@ xpnet_init(void)
|
|||
u32 license_num;
|
||||
int result = -ENOMEM;
|
||||
|
||||
|
||||
if (!ia64_platform_is("sn2")) {
|
||||
if (!ia64_platform_is("sn2"))
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
dev_info(xpnet, "registering network device %s\n", XPNET_DEVICE_NAME);
|
||||
|
||||
|
|
@ -647,9 +609,8 @@ xpnet_init(void)
|
|||
*/
|
||||
xpnet_device = alloc_netdev(sizeof(struct xpnet_dev_private),
|
||||
XPNET_DEVICE_NAME, ether_setup);
|
||||
if (xpnet_device == NULL) {
|
||||
if (xpnet_device == NULL)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
netif_carrier_off(xpnet_device);
|
||||
|
||||
|
|
@ -672,7 +633,7 @@ xpnet_init(void)
|
|||
license_num = sn_partition_serial_number_val();
|
||||
for (i = 3; i >= 0; i--) {
|
||||
xpnet_device->dev_addr[XPNET_LICENSE_OCTET + i] =
|
||||
license_num & 0xff;
|
||||
license_num & 0xff;
|
||||
license_num = license_num >> 8;
|
||||
}
|
||||
|
||||
|
|
@ -690,29 +651,27 @@ xpnet_init(void)
|
|||
xpnet_device->features = NETIF_F_NO_CSUM;
|
||||
|
||||
result = register_netdev(xpnet_device);
|
||||
if (result != 0) {
|
||||
if (result != 0)
|
||||
free_netdev(xpnet_device);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
module_init(xpnet_init);
|
||||
|
||||
module_init(xpnet_init);
|
||||
|
||||
static void __exit
|
||||
xpnet_exit(void)
|
||||
{
|
||||
dev_info(xpnet, "unregistering network device %s\n",
|
||||
xpnet_device[0].name);
|
||||
xpnet_device[0].name);
|
||||
|
||||
unregister_netdev(xpnet_device);
|
||||
|
||||
free_netdev(xpnet_device);
|
||||
}
|
||||
module_exit(xpnet_exit);
|
||||
|
||||
module_exit(xpnet_exit);
|
||||
|
||||
MODULE_AUTHOR("Silicon Graphics, Inc.");
|
||||
MODULE_DESCRIPTION("Cross Partition Network adapter (XPNET)");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
|
|
@ -157,6 +157,7 @@ extern void ia64_mca_printk(const char * fmt, ...)
|
|||
struct ia64_mca_notify_die {
|
||||
struct ia64_sal_os_state *sos;
|
||||
int *monarch_cpu;
|
||||
int *data;
|
||||
};
|
||||
|
||||
DECLARE_PER_CPU(u64, ia64_mca_pal_base);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче