Hello,
I compiled and installed the latest master-user_level_drivers-debian branch
of gnumach, (which has both fallback and new RPCs for interrupt handling).
Using the attached patch, I was able to build libddekit.a and link with netdde.
This enabled the new user-land driver path to work for networking.
I also tried old netdde with this kernel and it seems to still work!?
Damien
diff --git a/libddekit/Makefile b/libddekit/Makefile
index dcc4919bc..653eefb8d 100644
--- a/libddekit/Makefile
+++ b/libddekit/Makefile
@@ -37,7 +37,7 @@ LCLHDRS = $(installhdrs) \
dde.h \
config.h list.h util.h
-MIGSTUBS = experimentalUser.o
+MIGSTUBS = deviceUser.o gnumachUser.o
OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS))
HURDLIBS = ports shouldbeinlibc hurd-slab
diff --git a/libddekit/interrupt.c b/libddekit/interrupt.c
index 940363b1b..46f6d067a 100644
--- a/libddekit/interrupt.c
+++ b/libddekit/interrupt.c
@@ -27,14 +27,14 @@
#define BLOCK_IRQ 0
-#define MACH_INTR_NOTIFY 424242
+#define DEVICE_INTR_NOTIFY 100
typedef struct
{
mach_msg_header_t intr_header;
mach_msg_type_t intr_type;
- int line;
-} mach_intr_notification_t;
+ int id;
+} device_intr_notification_t;
/*
* Internal type for interrupt loop parameters
@@ -46,6 +46,7 @@ struct intloop_params
void(*thread_init)(void *); /* thread initialization */
void(*handler)(void *); /* IRQ handler function */
void *priv; /* private token */
+ mach_port_t irqport; /* delivery port for notifications */
ddekit_sem_t *started;
int start_err;
@@ -61,8 +62,9 @@ static struct
thread_t mach_thread;
} ddekit_irq_ctrl[MAX_INTERRUPTS];
-static mach_port_t master_device;
static mach_port_t master_host;
+static mach_port_t master_device;
+static device_t irq_dev;
/**
* Interrupt service loop
@@ -82,6 +84,7 @@ static void intloop(void *arg)
error (2, ret, "mach_port_allocate");
my_index = params->irq;
+ params->irqport = delivery_port;
ddekit_irq_ctrl[my_index].mach_thread = mach_thread_self ();
ret = thread_get_assignment (mach_thread_self (), &pset);
if (ret)
@@ -95,10 +98,10 @@ static void intloop(void *arg)
error (0, ret, "thread_priority");
// TODO the flags for shared irq should be indicated by params->shared.
- // Be careful. For now, we must use shared irq.
+ // Flags needs to be 0 for new irq interface for now.
// Otherwise, the interrupt handler cannot be installed in the kernel.
- ret = device_intr_register (master_device, params->irq,
- 0, 0x04000000, delivery_port,
+ ret = device_intr_register (irq_dev, my_index,
+ 0, delivery_port,
MACH_MSG_TYPE_MAKE_SEND);
ddekit_printf ("device_intr_register returns %d\n", ret);
if (ret) {
@@ -106,10 +109,9 @@ static void intloop(void *arg)
/* XXX does omega0 error code have any meaning to DDEKit users? */
params->start_err = ret;
ddekit_sem_up(params->started);
- ddekit_printf ("cannot install irq %d\n", params->irq);
+ ddekit_printf ("cannot install irq %d\n", my_index);
return;
}
- device_intr_enable (master_device, params->irq, TRUE);
#if 0
/*
@@ -129,16 +131,16 @@ static void intloop(void *arg)
ddekit_sem_up(params->started);
int irq_server (mach_msg_header_t *inp, mach_msg_header_t *outp) {
- mach_intr_notification_t *intr_header = (mach_intr_notification_t *) inp;
+ device_intr_notification_t *intr_header = (device_intr_notification_t *) inp;
((mig_reply_header_t *) outp)->RetCode = MIG_NO_REPLY;
- if (inp->msgh_id != MACH_INTR_NOTIFY)
+ if (inp->msgh_id != DEVICE_INTR_NOTIFY)
return 0;
/* It's an interrupt not for us. It shouldn't happen. */
- if (intr_header->line != params->irq) {
+ if (intr_header->id != params->irq) {
ddekit_printf ("We get interrupt %d, %d is expected",
- intr_header->line, params->irq);
+ intr_header->id, params->irq);
return 1;
}
@@ -150,9 +152,9 @@ static void intloop(void *arg)
// TODO if it's edged-triggered irq, the interrupt will be lost.
}
params->handler(params->priv);
- /* If the irq has been disabled by the linux device,
- * we don't need to reenable the real one. */
- device_intr_enable (master_device, my_index, TRUE);
+
+ /* Acknowledge the interrupt */
+ device_intr_ack (irq_dev, params->irqport, MACH_MSG_TYPE_MAKE_SEND);
if (ddekit_irq_ctrl[my_index].thread_exit) {
ddekit_lock_unlock (&ddekit_irq_ctrl[my_index].irqlock);
@@ -203,6 +205,7 @@ ddekit_thread_t *ddekit_interrupt_attach(int irq, int shared,
params->priv = priv;
params->started = ddekit_sem_init(0);
params->start_err = 0;
+ params->irqport = MACH_PORT_NULL;
params->shared = shared;
/* construct name */
@@ -279,10 +282,13 @@ void ddekit_interrupt_enable(int irq)
void interrupt_init ()
{
-
error_t err;
err = get_privileged_ports (&master_host, &master_device);
if (err)
error (1, err, "get_privileged_ports");
+
+ err = device_open (master_device, D_READ, "irq", &irq_dev);
+ if (err)
+ error (2, err, "device_open irq");
}
diff --git a/libddekit/memory.c b/libddekit/memory.c
index e567392f0..7c8acc438 100644
--- a/libddekit/memory.c
+++ b/libddekit/memory.c
@@ -17,7 +17,7 @@
#include <string.h>
#include <sys/mman.h>
-#include "mach_U.h"
+#include "gnumach_U.h"
#include <hurd/slab.h>
#include <mach_init.h>
@@ -215,12 +215,13 @@ void ddekit_large_free(void *objp)
void *ddekit_large_malloc(int size)
{
error_t err;
- vm_address_t vstart, pstart;
+ vm_address_t vstart;
+ rpc_phys_addr_t pstart;
extern mach_port_t priv_host;
/* Allocate memory. */
err = vm_allocate_contiguous (priv_host, mach_task_self (),
- &vstart, &pstart, size);
+ &vstart, &pstart, size, 0, 0x100000000, 0);
if (err)
{
error (0, err, "vm_allocate_contiguous");
