Skip to content

L
linux
Commit d0c23f5d authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge bk://kernel.bkbits.net/gregkh/linux/linus-2.5 

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 7d5ab07d 467d43e7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 942 additions and 306 deletions
arch/parisc/kernel/ioctl32.c
View file @ d0c23f5d
...@@ -2902,6 +2902,11 @@ int siocdevprivate_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg) ...@@ -2902,6 +2902,11 @@ int siocdevprivate_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
IOCTL_TABLE_START IOCTL_TABLE_START
#include <linux/compat_ioctl.h> #include <linux/compat_ioctl.h>
/* Might be moved to compat_ioctl.h with some ifdefs... */
COMPATIBLE_IOCTL(TIOCSTART)
COMPATIBLE_IOCTL(TIOCSTOP)
COMPATIBLE_IOCTL(TIOCSLTC)
/* PA-specific ioctls */ /* PA-specific ioctls */
COMPATIBLE_IOCTL(PA_PERF_ON) COMPATIBLE_IOCTL(PA_PERF_ON)
COMPATIBLE_IOCTL(PA_PERF_OFF) COMPATIBLE_IOCTL(PA_PERF_OFF)
......
drivers/ieee1394/amdtp.c
View file @ d0c23f5d
...@@ -268,7 +268,7 @@ struct amdtp_host { ...@@ -268,7 +268,7 @@ struct amdtp_host {
spinlock_t stream_list_lock; spinlock_t stream_list_lock;
}; };
static struct hpsb_highlevel *amdtp_highlevel; static struct hpsb_highlevel amdtp_highlevel;
/* FIXME: This doesn't belong here... */ /* FIXME: This doesn't belong here... */
...@@ -1169,7 +1169,7 @@ static int amdtp_open(struct inode *inode, struct file *file) ...@@ -1169,7 +1169,7 @@ static int amdtp_open(struct inode *inode, struct file *file)
struct amdtp_host *host; struct amdtp_host *host;
int i = ieee1394_file_to_instance(file); int i = ieee1394_file_to_instance(file);
host = hpsb_get_hostinfo_bykey(amdtp_highlevel, i); host = hpsb_get_hostinfo_bykey(&amdtp_highlevel, i);
if (host == NULL) if (host == NULL)
return -ENODEV; return -ENODEV;
...@@ -1201,7 +1201,7 @@ static struct file_operations amdtp_fops = ...@@ -1201,7 +1201,7 @@ static struct file_operations amdtp_fops =
/* IEEE1394 Subsystem functions */ /* IEEE1394 Subsystem functions */
static void amdtp_add_host(struct hpsb_host *host, struct hpsb_highlevel *hl) static void amdtp_add_host(struct hpsb_host *host)
{ {
struct amdtp_host *ah; struct amdtp_host *ah;
int minor; int minor;
...@@ -1210,7 +1210,7 @@ static void amdtp_add_host(struct hpsb_host *host, struct hpsb_highlevel *hl) ...@@ -1210,7 +1210,7 @@ static void amdtp_add_host(struct hpsb_host *host, struct hpsb_highlevel *hl)
if (strcmp(host->driver->name, OHCI1394_DRIVER_NAME) != 0) if (strcmp(host->driver->name, OHCI1394_DRIVER_NAME) != 0)
return; return;
ah = hpsb_create_hostinfo(hl, host, sizeof(*ah)); ah = hpsb_create_hostinfo(&amdtp_highlevel, host, sizeof(*ah));
if (!ah) { if (!ah) {
HPSB_ERR("amdtp: Unable able to alloc hostinfo"); HPSB_ERR("amdtp: Unable able to alloc hostinfo");
return; return;
...@@ -1219,7 +1219,7 @@ static void amdtp_add_host(struct hpsb_host *host, struct hpsb_highlevel *hl) ...@@ -1219,7 +1219,7 @@ static void amdtp_add_host(struct hpsb_host *host, struct hpsb_highlevel *hl)
ah->host = host; ah->host = host;
ah->ohci = host->hostdata; ah->ohci = host->hostdata;
hpsb_set_hostinfo_key(hl, host, ah->ohci->id); hpsb_set_hostinfo_key(&amdtp_highlevel, host, ah->ohci->id);
minor = IEEE1394_MINOR_BLOCK_AMDTP * 16 + ah->ohci->id; minor = IEEE1394_MINOR_BLOCK_AMDTP * 16 + ah->ohci->id;
...@@ -1234,7 +1234,7 @@ static void amdtp_add_host(struct hpsb_host *host, struct hpsb_highlevel *hl) ...@@ -1234,7 +1234,7 @@ static void amdtp_add_host(struct hpsb_host *host, struct hpsb_highlevel *hl)
static void amdtp_remove_host(struct hpsb_host *host) static void amdtp_remove_host(struct hpsb_host *host)
{ {
struct amdtp_host *ah = hpsb_get_hostinfo(amdtp_highlevel, host); struct amdtp_host *ah = hpsb_get_hostinfo(&amdtp_highlevel, host);
if (ah) if (ah)
devfs_remove("amdtp/%d", ah->ohci->id); devfs_remove("amdtp/%d", ah->ohci->id);
...@@ -1242,7 +1242,8 @@ static void amdtp_remove_host(struct hpsb_host *host) ...@@ -1242,7 +1242,8 @@ static void amdtp_remove_host(struct hpsb_host *host)
return; return;
} }
static struct hpsb_highlevel_ops amdtp_highlevel_ops = { static struct hpsb_highlevel amdtp_highlevel = {
.name = "amdtp",
.add_host = amdtp_add_host, .add_host = amdtp_add_host,
.remove_host = amdtp_remove_host, .remove_host = amdtp_remove_host,
}; };
...@@ -1268,14 +1269,7 @@ static int __init amdtp_init_module (void) ...@@ -1268,14 +1269,7 @@ static int __init amdtp_init_module (void)
devfs_mk_dir("amdtp"); devfs_mk_dir("amdtp");
amdtp_highlevel = hpsb_register_highlevel ("amdtp", hpsb_register_highlevel(&amdtp_highlevel);
&amdtp_highlevel_ops);
if (amdtp_highlevel == NULL) {
HPSB_ERR("amdtp: unable to register highlevel ops");
devfs_remove("amdtp");
ieee1394_unregister_chardev(IEEE1394_MINOR_BLOCK_AMDTP);
return -EIO;
}
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
ret = register_ioctl32_conversion(AMDTP_IOC_CHANNEL, NULL); ret = register_ioctl32_conversion(AMDTP_IOC_CHANNEL, NULL);
...@@ -1304,7 +1298,7 @@ static void __exit amdtp_exit_module (void) ...@@ -1304,7 +1298,7 @@ static void __exit amdtp_exit_module (void)
HPSB_ERR("amdtp: Error unregistering ioctl32 translations"); HPSB_ERR("amdtp: Error unregistering ioctl32 translations");
#endif #endif
hpsb_unregister_highlevel(amdtp_highlevel); hpsb_unregister_highlevel(&amdtp_highlevel);
devfs_remove("amdtp"); devfs_remove("amdtp");
ieee1394_unregister_chardev(IEEE1394_MINOR_BLOCK_AMDTP); ieee1394_unregister_chardev(IEEE1394_MINOR_BLOCK_AMDTP);
......
drivers/ieee1394/cmp.c
View file @ d0c23f5d
...@@ -75,7 +75,7 @@ enum { ...@@ -75,7 +75,7 @@ enum {
#define CSR_PCR_MAP 0x900 #define CSR_PCR_MAP 0x900
#define CSR_PCR_MAP_END 0x9fc #define CSR_PCR_MAP_END 0x9fc
static struct hpsb_highlevel *cmp_highlevel; static struct hpsb_highlevel cmp_highlevel;
struct cmp_pcr * struct cmp_pcr *
cmp_register_opcr(struct hpsb_host *host, int opcr_number, int payload, cmp_register_opcr(struct hpsb_host *host, int opcr_number, int payload,
...@@ -85,7 +85,7 @@ cmp_register_opcr(struct hpsb_host *host, int opcr_number, int payload, ...@@ -85,7 +85,7 @@ cmp_register_opcr(struct hpsb_host *host, int opcr_number, int payload,
struct cmp_host *ch; struct cmp_host *ch;
struct plug *plug; struct plug *plug;
ch = hpsb_get_hostinfo(cmp_highlevel, host); ch = hpsb_get_hostinfo(&cmp_highlevel, host);
if (opcr_number >= ch->u.ompr.nplugs || if (opcr_number >= ch->u.ompr.nplugs ||
ch->opcr[opcr_number].update != NULL) ch->opcr[opcr_number].update != NULL)
...@@ -108,7 +108,7 @@ void cmp_unregister_opcr(struct hpsb_host *host, struct cmp_pcr *opcr) ...@@ -108,7 +108,7 @@ void cmp_unregister_opcr(struct hpsb_host *host, struct cmp_pcr *opcr)
struct cmp_host *ch; struct cmp_host *ch;
struct plug *plug; struct plug *plug;
ch = hpsb_get_hostinfo(cmp_highlevel, host); ch = hpsb_get_hostinfo(&cmp_highlevel, host);
plug = (struct plug *)opcr; plug = (struct plug *)opcr;
if (plug - ch->opcr >= ch->u.ompr.nplugs) BUG(); if (plug - ch->opcr >= ch->u.ompr.nplugs) BUG();
...@@ -128,9 +128,9 @@ static void reset_plugs(struct cmp_host *ch) ...@@ -128,9 +128,9 @@ static void reset_plugs(struct cmp_host *ch)
} }
} }
static void cmp_add_host(struct hpsb_host *host, struct hpsb_highlevel *hl) static void cmp_add_host(struct hpsb_host *host)
{ {
struct cmp_host *ch = hpsb_create_hostinfo(hl, host, sizeof (*ch)); struct cmp_host *ch = hpsb_create_hostinfo(&cmp_highlevel, host, sizeof (*ch));
if (ch == NULL) { if (ch == NULL) {
HPSB_ERR("Failed to allocate cmp_host"); HPSB_ERR("Failed to allocate cmp_host");
...@@ -149,7 +149,7 @@ static void cmp_host_reset(struct hpsb_host *host) ...@@ -149,7 +149,7 @@ static void cmp_host_reset(struct hpsb_host *host)
{ {
struct cmp_host *ch; struct cmp_host *ch;
ch = hpsb_get_hostinfo(cmp_highlevel, host); ch = hpsb_get_hostinfo(&cmp_highlevel, host);
if (ch == NULL) { if (ch == NULL) {
HPSB_ERR("cmp: Tried to reset unknown host"); HPSB_ERR("cmp: Tried to reset unknown host");
return; return;
...@@ -168,7 +168,7 @@ static int pcr_read(struct hpsb_host *host, int nodeid, quadlet_t *buf, ...@@ -168,7 +168,7 @@ static int pcr_read(struct hpsb_host *host, int nodeid, quadlet_t *buf,
if (length != 4) if (length != 4)
return RCODE_TYPE_ERROR; return RCODE_TYPE_ERROR;
ch = hpsb_get_hostinfo(cmp_highlevel, host); ch = hpsb_get_hostinfo(&cmp_highlevel, host);
if (csraddr == 0x900) { if (csraddr == 0x900) {
*buf = cpu_to_be32(ch->u.ompr_quadlet); *buf = cpu_to_be32(ch->u.ompr_quadlet);
return RCODE_COMPLETE; return RCODE_COMPLETE;
...@@ -201,7 +201,7 @@ static int pcr_lock(struct hpsb_host *host, int nodeid, quadlet_t *store, ...@@ -201,7 +201,7 @@ static int pcr_lock(struct hpsb_host *host, int nodeid, quadlet_t *store,
int plug; int plug;
struct cmp_host *ch; struct cmp_host *ch;
ch = hpsb_get_hostinfo(cmp_highlevel, host); ch = hpsb_get_hostinfo(&cmp_highlevel, host);
if (extcode != EXTCODE_COMPARE_SWAP) if (extcode != EXTCODE_COMPARE_SWAP)
return RCODE_TYPE_ERROR; return RCODE_TYPE_ERROR;
...@@ -258,7 +258,8 @@ static int pcr_lock(struct hpsb_host *host, int nodeid, quadlet_t *store, ...@@ -258,7 +258,8 @@ static int pcr_lock(struct hpsb_host *host, int nodeid, quadlet_t *store,
} }
static struct hpsb_highlevel_ops cmp_highlevel_ops = { static struct hpsb_highlevel cmp_highlevel = {
.name = "cmp",
.add_host = cmp_add_host, .add_host = cmp_add_host,
.host_reset = cmp_host_reset, .host_reset = cmp_host_reset,
}; };
...@@ -280,14 +281,9 @@ EXPORT_SYMBOL(cmp_unregister_opcr); ...@@ -280,14 +281,9 @@ EXPORT_SYMBOL(cmp_unregister_opcr);
static int __init cmp_init_module (void) static int __init cmp_init_module (void)
{ {
cmp_highlevel = hpsb_register_highlevel ("cmp", hpsb_register_highlevel (&cmp_highlevel);
&cmp_highlevel_ops);
if (cmp_highlevel == NULL) {
HPSB_ERR("cmp: unable to register highlevel ops");
return -EIO;
}
hpsb_register_addrspace(cmp_highlevel, &pcr_ops, hpsb_register_addrspace(&cmp_highlevel, &pcr_ops,
CSR_REGISTER_BASE + CSR_PCR_MAP, CSR_REGISTER_BASE + CSR_PCR_MAP,
CSR_REGISTER_BASE + CSR_PCR_MAP_END); CSR_REGISTER_BASE + CSR_PCR_MAP_END);
...@@ -298,7 +294,7 @@ static int __init cmp_init_module (void) ...@@ -298,7 +294,7 @@ static int __init cmp_init_module (void)
static void __exit cmp_exit_module (void) static void __exit cmp_exit_module (void)
{ {
hpsb_unregister_highlevel(cmp_highlevel); hpsb_unregister_highlevel(&cmp_highlevel);
HPSB_INFO("Unloaded CMP driver"); HPSB_INFO("Unloaded CMP driver");
} }
......
drivers/ieee1394/csr.c
View file @ d0c23f5d
...@@ -90,7 +90,7 @@ static void host_reset(struct hpsb_host *host) ...@@ -90,7 +90,7 @@ static void host_reset(struct hpsb_host *host)
} }
static void add_host(struct hpsb_host *host, struct hpsb_highlevel *hl) static void add_host(struct hpsb_host *host)
{ {
host->csr.lock = SPIN_LOCK_UNLOCKED; host->csr.lock = SPIN_LOCK_UNLOCKED;
...@@ -647,7 +647,8 @@ static int write_fcp(struct hpsb_host *host, int nodeid, int dest, ...@@ -647,7 +647,8 @@ static int write_fcp(struct hpsb_host *host, int nodeid, int dest,
} }
static struct hpsb_highlevel_ops csr_ops = { static struct hpsb_highlevel csr_highlevel = {
.name = "standard registers",
.add_host = add_host, .add_host = add_host,
.host_reset = host_reset, .host_reset = host_reset,
}; };
...@@ -668,35 +669,29 @@ static struct hpsb_address_ops reg_ops = { ...@@ -668,35 +669,29 @@ static struct hpsb_address_ops reg_ops = {
.lock64 = lock64_regs, .lock64 = lock64_regs,
}; };
static struct hpsb_highlevel *hl;
void init_csr(void) void init_csr(void)
{ {
hl = hpsb_register_highlevel("standard registers", &csr_ops); hpsb_register_highlevel(&csr_highlevel);
if (hl == NULL) {
HPSB_ERR("out of memory during ieee1394 initialization");
return;
}
hpsb_register_addrspace(hl, &reg_ops, CSR_REGISTER_BASE, hpsb_register_addrspace(&csr_highlevel, &reg_ops, CSR_REGISTER_BASE,
CSR_REGISTER_BASE + CSR_CONFIG_ROM); CSR_REGISTER_BASE + CSR_CONFIG_ROM);
hpsb_register_addrspace(hl, &map_ops, hpsb_register_addrspace(&csr_highlevel, &map_ops,
CSR_REGISTER_BASE + CSR_CONFIG_ROM, CSR_REGISTER_BASE + CSR_CONFIG_ROM,
CSR_REGISTER_BASE + CSR_CONFIG_ROM_END); CSR_REGISTER_BASE + CSR_CONFIG_ROM_END);
if (fcp) { if (fcp) {
hpsb_register_addrspace(hl, &fcp_ops, hpsb_register_addrspace(&csr_highlevel, &fcp_ops,
CSR_REGISTER_BASE + CSR_FCP_COMMAND, CSR_REGISTER_BASE + CSR_FCP_COMMAND,
CSR_REGISTER_BASE + CSR_FCP_END); CSR_REGISTER_BASE + CSR_FCP_END);
} }
hpsb_register_addrspace(hl, &map_ops, hpsb_register_addrspace(&csr_highlevel, &map_ops,
CSR_REGISTER_BASE + CSR_TOPOLOGY_MAP, CSR_REGISTER_BASE + CSR_TOPOLOGY_MAP,
CSR_REGISTER_BASE + CSR_TOPOLOGY_MAP_END); CSR_REGISTER_BASE + CSR_TOPOLOGY_MAP_END);
hpsb_register_addrspace(hl, &map_ops, hpsb_register_addrspace(&csr_highlevel, &map_ops,
CSR_REGISTER_BASE + CSR_SPEED_MAP, CSR_REGISTER_BASE + CSR_SPEED_MAP,
CSR_REGISTER_BASE + CSR_SPEED_MAP_END); CSR_REGISTER_BASE + CSR_SPEED_MAP_END);
} }
void cleanup_csr(void) void cleanup_csr(void)
{ {
hpsb_unregister_highlevel(hl); hpsb_unregister_highlevel(&csr_highlevel);
} }
drivers/ieee1394/dv1394.c
View file @ d0c23f5d
...@@ -175,8 +175,6 @@ static void ir_tasklet_func(unsigned long data); ...@@ -175,8 +175,6 @@ static void ir_tasklet_func(unsigned long data);
static LIST_HEAD(dv1394_cards); static LIST_HEAD(dv1394_cards);
static spinlock_t dv1394_cards_lock = SPIN_LOCK_UNLOCKED; static spinlock_t dv1394_cards_lock = SPIN_LOCK_UNLOCKED;
static struct hpsb_highlevel *hl_handle; /* = NULL; */
/* translate from a struct file* to the corresponding struct video_card* */ /* translate from a struct file* to the corresponding struct video_card* */
static inline struct video_card* file_to_video_card(struct file *file) static inline struct video_card* file_to_video_card(struct file *file)
...@@ -2620,7 +2618,7 @@ static void dv1394_remove_host (struct hpsb_host *host) ...@@ -2620,7 +2618,7 @@ static void dv1394_remove_host (struct hpsb_host *host)
#endif #endif
} }
static void dv1394_add_host (struct hpsb_host *host, struct hpsb_highlevel *hl) static void dv1394_add_host (struct hpsb_host *host)
{ {
struct ti_ohci *ohci; struct ti_ohci *ohci;
char buf[16]; char buf[16];
...@@ -2776,7 +2774,8 @@ static void dv1394_host_reset(struct hpsb_host *host) ...@@ -2776,7 +2774,8 @@ static void dv1394_host_reset(struct hpsb_host *host)
wake_up_interruptible(&video->waitq); wake_up_interruptible(&video->waitq);
} }
static struct hpsb_highlevel_ops hl_ops = { static struct hpsb_highlevel dv1394_highlevel = {
.name = "dv1394",
.add_host = dv1394_add_host, .add_host = dv1394_add_host,
.remove_host = dv1394_remove_host, .remove_host = dv1394_remove_host,
.host_reset = dv1394_host_reset, .host_reset = dv1394_host_reset,
...@@ -2900,7 +2899,7 @@ static void __exit dv1394_exit_module(void) ...@@ -2900,7 +2899,7 @@ static void __exit dv1394_exit_module(void)
hpsb_unregister_protocol(&dv1394_driver); hpsb_unregister_protocol(&dv1394_driver);
hpsb_unregister_highlevel (hl_handle); hpsb_unregister_highlevel(&dv1394_highlevel);
ieee1394_unregister_chardev(IEEE1394_MINOR_BLOCK_DV1394); ieee1394_unregister_chardev(IEEE1394_MINOR_BLOCK_DV1394);
#ifdef CONFIG_DEVFS_FS #ifdef CONFIG_DEVFS_FS
devfs_remove("ieee1394/dv"); devfs_remove("ieee1394/dv");
...@@ -2937,18 +2936,7 @@ static int __init dv1394_init_module(void) ...@@ -2937,18 +2936,7 @@ static int __init dv1394_init_module(void)
} }
#endif #endif
hl_handle = hpsb_register_highlevel ("dv1394", &hl_ops); hpsb_register_highlevel(&dv1394_highlevel);
if (hl_handle == NULL) {
printk(KERN_ERR "dv1394: hpsb_register_highlevel failed\n");
ieee1394_unregister_chardev(IEEE1394_MINOR_BLOCK_DV1394);
#ifdef CONFIG_DEVFS_FS
devfs_remove("ieee1394/dv");
#endif
#ifdef CONFIG_PROC_FS
dv1394_procfs_del("dv");
#endif
return -ENOMEM;
}
hpsb_register_protocol(&dv1394_driver); hpsb_register_protocol(&dv1394_driver);
......
drivers/ieee1394/eth1394.c
View file @ d0c23f5d
...@@ -78,14 +78,14 @@ ...@@ -78,14 +78,14 @@
printk(KERN_ERR fmt, ## args) printk(KERN_ERR fmt, ## args)
static char version[] __devinitdata = static char version[] __devinitdata =
"$Rev: 895 $ Ben Collins <bcollins@debian.org>"; "$Rev: 906 $ Ben Collins <bcollins@debian.org>";
/* Our ieee1394 highlevel driver */ /* Our ieee1394 highlevel driver */
#define ETHER1394_DRIVER_NAME "ether1394" #define ETHER1394_DRIVER_NAME "ether1394"
static kmem_cache_t *packet_task_cache; static kmem_cache_t *packet_task_cache;
static struct hpsb_highlevel *hl_handle = NULL;
static struct hpsb_highlevel eth1394_highlevel;
/* Use common.lf to determine header len */ /* Use common.lf to determine header len */
static int hdr_type_len[] = { static int hdr_type_len[] = {
...@@ -318,7 +318,7 @@ static int ether1394_init_dev (struct net_device *dev) ...@@ -318,7 +318,7 @@ static int ether1394_init_dev (struct net_device *dev)
* when the module is installed. This is where we add all of our ethernet * when the module is installed. This is where we add all of our ethernet
* devices. One for each host. * devices. One for each host.
*/ */
static void ether1394_add_host (struct hpsb_host *host, struct hpsb_highlevel *hl) static void ether1394_add_host (struct hpsb_host *host)
{ {
struct host_info *hi = NULL; struct host_info *hi = NULL;
struct net_device *dev = NULL; struct net_device *dev = NULL;
...@@ -342,7 +342,7 @@ static void ether1394_add_host (struct hpsb_host *host, struct hpsb_highlevel *h ...@@ -342,7 +342,7 @@ static void ether1394_add_host (struct hpsb_host *host, struct hpsb_highlevel *h
priv->host = host; priv->host = host;
spin_lock_init(&priv->lock); spin_lock_init(&priv->lock);
hi = hpsb_create_hostinfo(hl, host, sizeof(*hi)); hi = hpsb_create_hostinfo(&eth1394_highlevel, host, sizeof(*hi));
if (hi == NULL) if (hi == NULL)
goto out; goto out;
...@@ -373,7 +373,7 @@ static void ether1394_add_host (struct hpsb_host *host, struct hpsb_highlevel *h ...@@ -373,7 +373,7 @@ static void ether1394_add_host (struct hpsb_host *host, struct hpsb_highlevel *h
if (dev != NULL) if (dev != NULL)
kfree (dev); kfree (dev);
if (hi) if (hi)
hpsb_destroy_hostinfo(hl, host); hpsb_destroy_hostinfo(&eth1394_highlevel, host);
ETH1394_PRINT_G (KERN_ERR, "Out of memory\n"); ETH1394_PRINT_G (KERN_ERR, "Out of memory\n");
...@@ -383,7 +383,7 @@ static void ether1394_add_host (struct hpsb_host *host, struct hpsb_highlevel *h ...@@ -383,7 +383,7 @@ static void ether1394_add_host (struct hpsb_host *host, struct hpsb_highlevel *h
/* Remove a card from our list */ /* Remove a card from our list */
static void ether1394_remove_host (struct hpsb_host *host) static void ether1394_remove_host (struct hpsb_host *host)
{ {
struct host_info *hi = hpsb_get_hostinfo(hl_handle, host); struct host_info *hi = hpsb_get_hostinfo(&eth1394_highlevel, host);
if (hi != NULL) { if (hi != NULL) {
struct eth1394_priv *priv = (struct eth1394_priv *)hi->dev->priv; struct eth1394_priv *priv = (struct eth1394_priv *)hi->dev->priv;
...@@ -401,7 +401,7 @@ static void ether1394_remove_host (struct hpsb_host *host) ...@@ -401,7 +401,7 @@ static void ether1394_remove_host (struct hpsb_host *host)
/* A reset has just arisen */ /* A reset has just arisen */
static void ether1394_host_reset (struct hpsb_host *host) static void ether1394_host_reset (struct hpsb_host *host)
{ {
struct host_info *hi = hpsb_get_hostinfo(hl_handle, host); struct host_info *hi = hpsb_get_hostinfo(&eth1394_highlevel, host);
struct net_device *dev; struct net_device *dev;
/* This can happen for hosts that we don't use */ /* This can happen for hosts that we don't use */
...@@ -518,7 +518,7 @@ static int ether1394_write (struct hpsb_host *host, int srcid, int destid, ...@@ -518,7 +518,7 @@ static int ether1394_write (struct hpsb_host *host, int srcid, int destid,
struct sk_buff *skb; struct sk_buff *skb;
char *buf = (char *)data; char *buf = (char *)data;
unsigned long flags; unsigned long flags;
struct host_info *hi = hpsb_get_hostinfo(hl_handle, host); struct host_info *hi = hpsb_get_hostinfo(&eth1394_highlevel, host);
struct net_device *dev; struct net_device *dev;
struct eth1394_priv *priv; struct eth1394_priv *priv;
...@@ -590,7 +590,7 @@ static void ether1394_iso(struct hpsb_iso *iso) ...@@ -590,7 +590,7 @@ static void ether1394_iso(struct hpsb_iso *iso)
quadlet_t *data; quadlet_t *data;
char *buf; char *buf;
unsigned long flags; unsigned long flags;
struct host_info *hi = hpsb_get_hostinfo(hl_handle, iso->host); struct host_info *hi = hpsb_get_hostinfo(&eth1394_highlevel, iso->host);
struct net_device *dev; struct net_device *dev;
struct eth1394_priv *priv; struct eth1394_priv *priv;
unsigned int len; unsigned int len;
...@@ -879,7 +879,8 @@ static struct hpsb_address_ops addr_ops = { ...@@ -879,7 +879,8 @@ static struct hpsb_address_ops addr_ops = {
}; };
/* Ieee1394 highlevel driver functions */ /* Ieee1394 highlevel driver functions */
static struct hpsb_highlevel_ops hl_ops = { static struct hpsb_highlevel eth1394_highlevel = {
.name = ETHER1394_DRIVER_NAME,
.add_host = ether1394_add_host, .add_host = ether1394_add_host,
.remove_host = ether1394_remove_host, .remove_host = ether1394_remove_host,
.host_reset = ether1394_host_reset, .host_reset = ether1394_host_reset,
...@@ -891,14 +892,9 @@ static int __init ether1394_init_module (void) ...@@ -891,14 +892,9 @@ static int __init ether1394_init_module (void)
0, 0, NULL, NULL); 0, 0, NULL, NULL);
/* Register ourselves as a highlevel driver */ /* Register ourselves as a highlevel driver */
hl_handle = hpsb_register_highlevel (ETHER1394_DRIVER_NAME, &hl_ops); hpsb_register_highlevel(&eth1394_highlevel);
if (hl_handle == NULL) { hpsb_register_addrspace(&eth1394_highlevel, &addr_ops, ETHER1394_REGION_ADDR,
ETH1394_PRINT_G (KERN_ERR, "No more memory for driver\n");
return -ENOMEM;
}
hpsb_register_addrspace (hl_handle, &addr_ops, ETHER1394_REGION_ADDR,
ETHER1394_REGION_ADDR_END); ETHER1394_REGION_ADDR_END);
return 0; return 0;
...@@ -906,7 +902,7 @@ static int __init ether1394_init_module (void) ...@@ -906,7 +902,7 @@ static int __init ether1394_init_module (void)
static void __exit ether1394_exit_module (void) static void __exit ether1394_exit_module (void)
{ {
hpsb_unregister_highlevel (hl_handle); hpsb_unregister_highlevel(&eth1394_highlevel);
kmem_cache_destroy(packet_task_cache); kmem_cache_destroy(packet_task_cache);
} }
......
drivers/ieee1394/highlevel.c
View file @ d0c23f5d
...@@ -54,6 +54,9 @@ static struct hl_host_info *hl_get_hostinfo(struct hpsb_highlevel *hl, ...@@ -54,6 +54,9 @@ static struct hl_host_info *hl_get_hostinfo(struct hpsb_highlevel *hl,
struct hl_host_info *hi = NULL; struct hl_host_info *hi = NULL;
struct list_head *lh; struct list_head *lh;
if (!hl || !host)
return NULL;
read_lock(&hl->host_info_lock); read_lock(&hl->host_info_lock);
list_for_each (lh, &hl->host_info_list) { list_for_each (lh, &hl->host_info_list) {
hi = list_entry(lh, struct hl_host_info, list); hi = list_entry(lh, struct hl_host_info, list);
...@@ -185,6 +188,9 @@ void *hpsb_get_hostinfo_bykey(struct hpsb_highlevel *hl, unsigned long key) ...@@ -185,6 +188,9 @@ void *hpsb_get_hostinfo_bykey(struct hpsb_highlevel *hl, unsigned long key)
struct hl_host_info *hi; struct hl_host_info *hi;
void *data = NULL; void *data = NULL;
if (!hl)
return NULL;
read_lock(&hl->host_info_lock); read_lock(&hl->host_info_lock);
list_for_each (lh, &hl->host_info_list) { list_for_each (lh, &hl->host_info_list) {
hi = list_entry(lh, struct hl_host_info, list); hi = list_entry(lh, struct hl_host_info, list);
...@@ -199,42 +205,53 @@ void *hpsb_get_hostinfo_bykey(struct hpsb_highlevel *hl, unsigned long key) ...@@ -199,42 +205,53 @@ void *hpsb_get_hostinfo_bykey(struct hpsb_highlevel *hl, unsigned long key)
} }
struct hpsb_highlevel *hpsb_register_highlevel(const char *name, struct hpsb_host *hpsb_get_host_bykey(struct hpsb_highlevel *hl, unsigned long key)
struct hpsb_highlevel_ops *ops)
{ {
struct hpsb_highlevel *hl;
struct list_head *lh; struct list_head *lh;
unsigned long flags; struct hl_host_info *hi;
struct hpsb_host *host = NULL;
hl = (struct hpsb_highlevel *)kmalloc(sizeof(struct hpsb_highlevel), if (!hl)
GFP_KERNEL);
if (hl == NULL) {
return NULL; return NULL;
read_lock(&hl->host_info_lock);
list_for_each (lh, &hl->host_info_list) {
hi = list_entry(lh, struct hl_host_info, list);
if (hi->key == key) {
host = hi->host;
break;
}
} }
read_unlock(&hl->host_info_lock);
return host;
}
void hpsb_register_highlevel(struct hpsb_highlevel *hl)
{
struct list_head *lh;
unsigned long flags;
INIT_LIST_HEAD(&hl->hl_list);
INIT_LIST_HEAD(&hl->addr_list); INIT_LIST_HEAD(&hl->addr_list);
INIT_LIST_HEAD(&hl->host_info_list); INIT_LIST_HEAD(&hl->host_info_list);
rwlock_init(&hl->host_info_lock); rwlock_init(&hl->host_info_lock);
hl->name = name;
hl->op = ops;
write_lock_irqsave(&hl_drivers_lock, flags); write_lock_irqsave(&hl_drivers_lock, flags);
list_add_tail(&hl->hl_list, &hl_drivers); list_add_tail(&hl->hl_list, &hl_drivers);
write_unlock_irqrestore(&hl_drivers_lock, flags); write_unlock_irqrestore(&hl_drivers_lock, flags);
if (hl->op->add_host) { if (hl->add_host) {
down(&hpsb_hosts_lock); down(&hpsb_hosts_lock);
list_for_each (lh, &hpsb_hosts) { list_for_each (lh, &hpsb_hosts) {
struct hpsb_host *host = list_entry(lh, struct hpsb_host, host_list); struct hpsb_host *host = list_entry(lh, struct hpsb_host, host_list);
hl->op->add_host(host, hl); hl->add_host(host);
} }
up(&hpsb_hosts_lock); up(&hpsb_hosts_lock);
} }
return hl; return;
} }
void hpsb_unregister_highlevel(struct hpsb_highlevel *hl) void hpsb_unregister_highlevel(struct hpsb_highlevel *hl)
...@@ -243,10 +260,6 @@ void hpsb_unregister_highlevel(struct hpsb_highlevel *hl) ...@@ -243,10 +260,6 @@ void hpsb_unregister_highlevel(struct hpsb_highlevel *hl)
struct hpsb_address_serve *as; struct hpsb_address_serve *as;
unsigned long flags; unsigned long flags;
if (hl == NULL) {
return;
}
write_lock_irqsave(&addr_space_lock, flags); write_lock_irqsave(&addr_space_lock, flags);
list_for_each_safe (lh, next, &hl->addr_list) { list_for_each_safe (lh, next, &hl->addr_list) {
as = list_entry(lh, struct hpsb_address_serve, addr_list); as = list_entry(lh, struct hpsb_address_serve, addr_list);
...@@ -259,18 +272,16 @@ void hpsb_unregister_highlevel(struct hpsb_highlevel *hl) ...@@ -259,18 +272,16 @@ void hpsb_unregister_highlevel(struct hpsb_highlevel *hl)
list_del(&hl->hl_list); list_del(&hl->hl_list);
write_unlock_irqrestore(&hl_drivers_lock, flags); write_unlock_irqrestore(&hl_drivers_lock, flags);
if (hl->op->remove_host) { if (hl->remove_host) {
down(&hpsb_hosts_lock); down(&hpsb_hosts_lock);
list_for_each(lh, &hpsb_hosts) { list_for_each(lh, &hpsb_hosts) {
struct hpsb_host *host = list_entry(lh, struct hpsb_host, host_list); struct hpsb_host *host = list_entry(lh, struct hpsb_host, host_list);
hl->op->remove_host(host); hl->remove_host(host);
hpsb_destroy_hostinfo(hl, host); hpsb_destroy_hostinfo(hl, host);
} }
up(&hpsb_hosts_lock); up(&hpsb_hosts_lock);
} }
kfree(hl);
} }
int hpsb_register_addrspace(struct hpsb_highlevel *hl, int hpsb_register_addrspace(struct hpsb_highlevel *hl,
...@@ -386,8 +397,8 @@ void highlevel_add_host(struct hpsb_host *host) ...@@ -386,8 +397,8 @@ void highlevel_add_host(struct hpsb_host *host)
read_lock(&hl_drivers_lock); read_lock(&hl_drivers_lock);
list_for_each(entry, &hl_drivers) { list_for_each(entry, &hl_drivers) {
hl = list_entry(entry, struct hpsb_highlevel, hl_list); hl = list_entry(entry, struct hpsb_highlevel, hl_list);
if (hl->op->add_host) if (hl->add_host)
hl->op->add_host(host, hl); hl->add_host(host);
} }
read_unlock(&hl_drivers_lock); read_unlock(&hl_drivers_lock);
} }
...@@ -401,8 +412,8 @@ void highlevel_remove_host(struct hpsb_host *host) ...@@ -401,8 +412,8 @@ void highlevel_remove_host(struct hpsb_host *host)
list_for_each(entry, &hl_drivers) { list_for_each(entry, &hl_drivers) {
hl = list_entry(entry, struct hpsb_highlevel, hl_list); hl = list_entry(entry, struct hpsb_highlevel, hl_list);
if (hl->op->remove_host) { if (hl->remove_host) {
hl->op->remove_host(host); hl->remove_host(host);
hpsb_destroy_hostinfo(hl, host); hpsb_destroy_hostinfo(hl, host);
} }
} }
...@@ -418,8 +429,8 @@ void highlevel_host_reset(struct hpsb_host *host) ...@@ -418,8 +429,8 @@ void highlevel_host_reset(struct hpsb_host *host)
list_for_each(entry, &hl_drivers) { list_for_each(entry, &hl_drivers) {
hl = list_entry(entry, struct hpsb_highlevel, hl_list); hl = list_entry(entry, struct hpsb_highlevel, hl_list);
if (hl->op->host_reset) if (hl->host_reset)
hl->op->host_reset(host); hl->host_reset(host);
} }
read_unlock(&hl_drivers_lock); read_unlock(&hl_drivers_lock);
} }
...@@ -436,8 +447,8 @@ void highlevel_iso_receive(struct hpsb_host *host, void *data, ...@@ -436,8 +447,8 @@ void highlevel_iso_receive(struct hpsb_host *host, void *data,
while (entry != &hl_drivers) { while (entry != &hl_drivers) {
hl = list_entry(entry, struct hpsb_highlevel, hl_list); hl = list_entry(entry, struct hpsb_highlevel, hl_list);
if (hl->op->iso_receive) { if (hl->iso_receive) {
hl->op->iso_receive(host, channel, data, length); hl->iso_receive(host, channel, data, length);
} }
entry = entry->next; entry = entry->next;
} }
...@@ -456,8 +467,8 @@ void highlevel_fcp_request(struct hpsb_host *host, int nodeid, int direction, ...@@ -456,8 +467,8 @@ void highlevel_fcp_request(struct hpsb_host *host, int nodeid, int direction,
while (entry != &hl_drivers) { while (entry != &hl_drivers) {
hl = list_entry(entry, struct hpsb_highlevel, hl_list); hl = list_entry(entry, struct hpsb_highlevel, hl_list);
if (hl->op->fcp_request) { if (hl->fcp_request) {
hl->op->fcp_request(host, nodeid, direction, cts, data, hl->fcp_request(host, nodeid, direction, cts, data,
length); length);
} }
entry = entry->next; entry = entry->next;
......
drivers/ieee1394/highlevel.h
View file @ d0c23f5d
...@@ -3,21 +3,6 @@ ...@@ -3,21 +3,6 @@
#define IEEE1394_HIGHLEVEL_H #define IEEE1394_HIGHLEVEL_H
struct hpsb_highlevel {
struct list_head hl_list;
/* List of hpsb_address_serve. */
struct list_head addr_list;
const char *name;
struct hpsb_highlevel_ops *op;
/* Used by the highlevel drivers to store data per host */
struct list_head host_info_list;
rwlock_t host_info_lock;
};
struct hpsb_address_serve { struct hpsb_address_serve {
struct list_head as_list; /* global list */ struct list_head as_list; /* global list */
...@@ -35,14 +20,16 @@ struct hpsb_address_serve { ...@@ -35,14 +20,16 @@ struct hpsb_address_serve {
* following structures are of interest to actual highlevel drivers. * following structures are of interest to actual highlevel drivers.
*/ */
struct hpsb_highlevel_ops { struct hpsb_highlevel {
const char *name;
/* Any of the following pointers can legally be NULL, except for /* Any of the following pointers can legally be NULL, except for
* iso_receive which can only be NULL when you don't request * iso_receive which can only be NULL when you don't request
* channels. */ * channels. */
/* New host initialized. Will also be called during /* New host initialized. Will also be called during
* hpsb_register_highlevel for all hosts already installed. */ * hpsb_register_highlevel for all hosts already installed. */
void (*add_host) (struct hpsb_host *host, struct hpsb_highlevel *hl); void (*add_host) (struct hpsb_host *host);
/* Host about to be removed. Will also be called during /* Host about to be removed. Will also be called during
* hpsb_unregister_highlevel once for each host. */ * hpsb_unregister_highlevel once for each host. */
...@@ -66,6 +53,13 @@ struct hpsb_highlevel_ops { ...@@ -66,6 +53,13 @@ struct hpsb_highlevel_ops {
*/ */
void (*fcp_request) (struct hpsb_host *host, int nodeid, int direction, void (*fcp_request) (struct hpsb_host *host, int nodeid, int direction,
int cts, u8 *data, unsigned int length); int cts, u8 *data, unsigned int length);
struct list_head hl_list;
struct list_head addr_list;
struct list_head host_info_list;
rwlock_t host_info_lock;
}; };
struct hpsb_address_ops { struct hpsb_address_ops {
...@@ -131,8 +125,7 @@ void highlevel_fcp_request(struct hpsb_host *host, int nodeid, int direction, ...@@ -131,8 +125,7 @@ void highlevel_fcp_request(struct hpsb_host *host, int nodeid, int direction,
* Register highlevel driver. The name pointer has to stay valid at all times * Register highlevel driver. The name pointer has to stay valid at all times
* because the string is not copied. * because the string is not copied.
*/ */
struct hpsb_highlevel *hpsb_register_highlevel(const char *name, void hpsb_register_highlevel(struct hpsb_highlevel *hl);
struct hpsb_highlevel_ops *ops);
void hpsb_unregister_highlevel(struct hpsb_highlevel *hl); void hpsb_unregister_highlevel(struct hpsb_highlevel *hl);
/* /*
...@@ -162,19 +155,28 @@ void hpsb_unlisten_channel(struct hpsb_highlevel *hl, struct hpsb_host *host, ...@@ -162,19 +155,28 @@ void hpsb_unlisten_channel(struct hpsb_highlevel *hl, struct hpsb_host *host,
/* Retrieve a hostinfo pointer bound to this driver/host */ /* Retrieve a hostinfo pointer bound to this driver/host */
void *hpsb_get_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host); void *hpsb_get_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host);
/* Allocate a hostinfo pointer of data_size bound to this driver/host */ /* Allocate a hostinfo pointer of data_size bound to this driver/host */
void *hpsb_create_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host, void *hpsb_create_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host,
size_t data_size); size_t data_size);
/* Free and remove the hostinfo pointer bound to this driver/host */ /* Free and remove the hostinfo pointer bound to this driver/host */
void hpsb_destroy_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host); void hpsb_destroy_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host);
/* Set an alternate lookup key for the hostinfo bound to this driver/host */ /* Set an alternate lookup key for the hostinfo bound to this driver/host */
void hpsb_set_hostinfo_key(struct hpsb_highlevel *hl, struct hpsb_host *host, unsigned long key); void hpsb_set_hostinfo_key(struct hpsb_highlevel *hl, struct hpsb_host *host, unsigned long key);
/* Retrieve the alternate lookup key for the hostinfo bound to this driver/host */ /* Retrieve the alternate lookup key for the hostinfo bound to this driver/host */
unsigned long hpsb_get_hostinfo_key(struct hpsb_highlevel *hl, struct hpsb_host *host); unsigned long hpsb_get_hostinfo_key(struct hpsb_highlevel *hl, struct hpsb_host *host);
/* Retrive a hostinfo pointer bound to this driver using its alternate key */
/* Retrieve a hostinfo pointer bound to this driver using its alternate key */
void *hpsb_get_hostinfo_bykey(struct hpsb_highlevel *hl, unsigned long key); void *hpsb_get_hostinfo_bykey(struct hpsb_highlevel *hl, unsigned long key);
/* Set the hostinfo pointer to something useful. Usually follows a call to /* Set the hostinfo pointer to something useful. Usually follows a call to
* hpsb_create_hostinfo, where the size is 0. */ * hpsb_create_hostinfo, where the size is 0. */
int hpsb_set_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host, void *data); int hpsb_set_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host, void *data);
/* Retrieve hpsb_host using a highlevel handle and a key */
struct hpsb_host *hpsb_get_host_bykey(struct hpsb_highlevel *hl, unsigned long key);
#endif /* IEEE1394_HIGHLEVEL_H */ #endif /* IEEE1394_HIGHLEVEL_H */
drivers/ieee1394/hosts.c
View file @ d0c23f5d
...@@ -148,9 +148,36 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra) ...@@ -148,9 +148,36 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra)
return h; return h;
} }
static int alloc_hostnum(void)
{
int hostnum = 0;
while (1) {
struct list_head *lh;
int found = 0;
list_for_each(lh, &hpsb_hosts) {
struct hpsb_host *host = list_entry(lh, struct hpsb_host, host_list);
if (host->id == hostnum) {
found = 1;
break;
}
}
if (!found)
return hostnum;
hostnum++;
}
return 0;
}
void hpsb_add_host(struct hpsb_host *host) void hpsb_add_host(struct hpsb_host *host)
{ {
down(&hpsb_hosts_lock); down(&hpsb_hosts_lock);
host->id = alloc_hostnum();
list_add_tail(&host->host_list, &hpsb_hosts); list_add_tail(&host->host_list, &hpsb_hosts);
up(&hpsb_hosts_lock); up(&hpsb_hosts_lock);
......
drivers/ieee1394/hosts.h
View file @ d0c23f5d
...@@ -66,6 +66,8 @@ struct hpsb_host { ...@@ -66,6 +66,8 @@ struct hpsb_host {
struct pci_dev *pdev; struct pci_dev *pdev;
int id;
struct device device; struct device device;
}; };
......
drivers/ieee1394/ieee1394.h
View file @ d0c23f5d
...@@ -52,10 +52,13 @@ ...@@ -52,10 +52,13 @@
#define SPEED_800 0x03 #define SPEED_800 0x03
#define SPEED_1600 0x04 #define SPEED_1600 0x04
#define SPEED_3200 0x05 #define SPEED_3200 0x05
/* The current highest tested speed supported by the subsystem */
#define SPEED_MAX SPEED_800
/* Maps speed values above to a string representation */ /* Maps speed values above to a string representation */
extern const char *hpsb_speedto_str[]; extern const char *hpsb_speedto_str[];
extern const u8 hpsb_speedto_maxrec[];
#define SELFID_PWRCL_NO_POWER 0x0 #define SELFID_PWRCL_NO_POWER 0x0
#define SELFID_PWRCL_PROVIDE_15W 0x1 #define SELFID_PWRCL_PROVIDE_15W 0x1
......
drivers/ieee1394/ieee1394_core.c
View file @ d0c23f5d
...@@ -60,6 +60,7 @@ static kmem_cache_t *hpsb_packet_cache; ...@@ -60,6 +60,7 @@ static kmem_cache_t *hpsb_packet_cache;
/* Some globals used */ /* Some globals used */
const char *hpsb_speedto_str[] = { "S100", "S200", "S400", "S800", "S1600", "S3200" }; const char *hpsb_speedto_str[] = { "S100", "S200", "S400", "S800", "S1600", "S3200" };
const u8 hpsb_speedto_maxrec[] = { 0x7, 0x8, 0x9, 0x10, 0x11, 0x12 };
static void dump_packet(const char *text, quadlet_t *data, int size) static void dump_packet(const char *text, quadlet_t *data, int size)
{ {
...@@ -285,7 +286,7 @@ static void build_speed_map(struct hpsb_host *host, int nodecount) ...@@ -285,7 +286,7 @@ static void build_speed_map(struct hpsb_host *host, int nodecount)
for (i = 0; i < (nodecount * 64); i += 64) { for (i = 0; i < (nodecount * 64); i += 64) {
for (j = 0; j < nodecount; j++) { for (j = 0; j < nodecount; j++) {
map[i+j] = SPEED_400; map[i+j] = SPEED_MAX;
} }
} }
...@@ -1239,6 +1240,7 @@ EXPORT_SYMBOL(hpsb_unref_host); ...@@ -1239,6 +1240,7 @@ EXPORT_SYMBOL(hpsb_unref_host);
/** ieee1394_core.c **/ /** ieee1394_core.c **/
EXPORT_SYMBOL(hpsb_speedto_str); EXPORT_SYMBOL(hpsb_speedto_str);
EXPORT_SYMBOL(hpsb_speedto_maxrec);
EXPORT_SYMBOL(hpsb_set_packet_complete_task); EXPORT_SYMBOL(hpsb_set_packet_complete_task);
EXPORT_SYMBOL(alloc_hpsb_packet); EXPORT_SYMBOL(alloc_hpsb_packet);
EXPORT_SYMBOL(free_hpsb_packet); EXPORT_SYMBOL(free_hpsb_packet);
...@@ -1278,6 +1280,7 @@ EXPORT_SYMBOL(hpsb_unregister_addrspace); ...@@ -1278,6 +1280,7 @@ EXPORT_SYMBOL(hpsb_unregister_addrspace);
EXPORT_SYMBOL(hpsb_listen_channel); EXPORT_SYMBOL(hpsb_listen_channel);
EXPORT_SYMBOL(hpsb_unlisten_channel); EXPORT_SYMBOL(hpsb_unlisten_channel);
EXPORT_SYMBOL(hpsb_get_hostinfo); EXPORT_SYMBOL(hpsb_get_hostinfo);
EXPORT_SYMBOL(hpsb_get_host_bykey);
EXPORT_SYMBOL(hpsb_create_hostinfo); EXPORT_SYMBOL(hpsb_create_hostinfo);
EXPORT_SYMBOL(hpsb_destroy_hostinfo); EXPORT_SYMBOL(hpsb_destroy_hostinfo);
EXPORT_SYMBOL(hpsb_set_hostinfo_key); EXPORT_SYMBOL(hpsb_set_hostinfo_key);
......
drivers/ieee1394/nodemgr.c
View file @ d0c23f5d
...@@ -70,7 +70,6 @@ static char *nodemgr_find_oui_name(int oui) ...@@ -70,7 +70,6 @@ static char *nodemgr_find_oui_name(int oui)
static DECLARE_MUTEX(nodemgr_serialize); static DECLARE_MUTEX(nodemgr_serialize);
static struct hpsb_highlevel *nodemgr_hl;
struct host_info { struct host_info {
struct hpsb_host *host; struct hpsb_host *host;
...@@ -78,10 +77,24 @@ struct host_info { ...@@ -78,10 +77,24 @@ struct host_info {
struct completion exited; struct completion exited;
struct semaphore reset_sem; struct semaphore reset_sem;
int pid; int pid;
int id;
char daemon_name[15]; char daemon_name[15];
}; };
static struct hpsb_highlevel nodemgr_highlevel;
static int nodemgr_driverdata_ne;
static int nodemgr_driverdata_host;
static struct device_driver nodemgr_driver_ne = {
.name = "ieee1394_node",
.bus = &ieee1394_bus_type,
};
static struct device_driver nodemgr_driver_host = {
.name = "ieee1394_host",
.bus = &ieee1394_bus_type,
};
#define fw_attr(class, class_type, field, type, format_string) \ #define fw_attr(class, class_type, field, type, format_string) \
static ssize_t fw_show_##class##_##field (struct device *dev, char *buf)\ static ssize_t fw_show_##class##_##field (struct device *dev, char *buf)\
...@@ -364,7 +377,9 @@ static int nodemgr_bus_match(struct device * dev, struct device_driver * drv) ...@@ -364,7 +377,9 @@ static int nodemgr_bus_match(struct device * dev, struct device_driver * drv)
struct unit_directory *ud; struct unit_directory *ud;
struct ieee1394_device_id *id; struct ieee1394_device_id *id;
if (dev->class_num != DEV_CLASS_UNIT_DIRECTORY) if (dev->driver_data == &nodemgr_driverdata_ne ||
dev->driver_data == &nodemgr_driverdata_host ||
drv == &nodemgr_driver_ne || drv == &nodemgr_driver_host)
return 0; return 0;
ud = container_of(dev, struct unit_directory, device); ud = container_of(dev, struct unit_directory, device);
...@@ -448,7 +463,7 @@ static void nodemgr_update_ud_names(struct host_info *hi, struct node_entry *ne) ...@@ -448,7 +463,7 @@ static void nodemgr_update_ud_names(struct host_info *hi, struct node_entry *ne)
snprintf(ud->device.name, DEVICE_NAME_SIZE, snprintf(ud->device.name, DEVICE_NAME_SIZE,
"IEEE-1394 unit directory %d-" NODE_BUS_FMT "-%u", "IEEE-1394 unit directory %d-" NODE_BUS_FMT "-%u",
hi->id, NODE_BUS_ARGS(ne->nodeid), ud->id); hi->host->id, NODE_BUS_ARGS(ne->nodeid), ud->id);
} }
} }
...@@ -494,18 +509,21 @@ static void nodemgr_remove_host_dev(struct device *dev) ...@@ -494,18 +509,21 @@ static void nodemgr_remove_host_dev(struct device *dev)
static struct device nodemgr_dev_template_ud = { static struct device nodemgr_dev_template_ud = {
.bus = &ieee1394_bus_type, .bus = &ieee1394_bus_type,
.release = nodemgr_release_ud, .release = nodemgr_release_ud,
.class_num = DEV_CLASS_UNIT_DIRECTORY,
}; };
static struct device nodemgr_dev_template_ne = { static struct device nodemgr_dev_template_ne = {
.bus = &ieee1394_bus_type, .bus = &ieee1394_bus_type,
.release = nodemgr_release_ne, .release = nodemgr_release_ne,
.class_num = DEV_CLASS_NODE, .driver = &nodemgr_driver_ne,
.driver_data = &nodemgr_driverdata_ne,
}; };
static struct device nodemgr_dev_template_host = { static struct device nodemgr_dev_template_host = {
.bus = &ieee1394_bus_type, .bus = &ieee1394_bus_type,
.class_num = DEV_CLASS_HOST, .driver = &nodemgr_driver_host,
.driver_data = &nodemgr_driverdata_host,
}; };
...@@ -696,7 +714,7 @@ static struct node_entry *nodemgr_create_node(octlet_t guid, quadlet_t busoption ...@@ -696,7 +714,7 @@ static struct node_entry *nodemgr_create_node(octlet_t guid, quadlet_t busoption
snprintf(ne->device.bus_id, BUS_ID_SIZE, "%016Lx", snprintf(ne->device.bus_id, BUS_ID_SIZE, "%016Lx",
(unsigned long long)(ne->guid)); (unsigned long long)(ne->guid));
snprintf(ne->device.name, DEVICE_NAME_SIZE, snprintf(ne->device.name, DEVICE_NAME_SIZE,
"IEEE-1394 device %d-" NODE_BUS_FMT, hi->id, "IEEE-1394 device %d-" NODE_BUS_FMT, host->id,
NODE_BUS_ARGS(ne->nodeid)); NODE_BUS_ARGS(ne->nodeid));
device_register(&ne->device); device_register(&ne->device);
...@@ -711,7 +729,7 @@ static struct node_entry *nodemgr_create_node(octlet_t guid, quadlet_t busoption ...@@ -711,7 +729,7 @@ static struct node_entry *nodemgr_create_node(octlet_t guid, quadlet_t busoption
HPSB_DEBUG("%s added: ID:BUS[%d-" NODE_BUS_FMT "] GUID[%016Lx]", HPSB_DEBUG("%s added: ID:BUS[%d-" NODE_BUS_FMT "] GUID[%016Lx]",
(host->node_id == nodeid) ? "Host" : "Node", (host->node_id == nodeid) ? "Host" : "Node",
hi->id, NODE_BUS_ARGS(nodeid), (unsigned long long)guid); host->id, NODE_BUS_ARGS(nodeid), (unsigned long long)guid);
return ne; return ne;
} }
...@@ -727,7 +745,7 @@ static int nodemgr_guid_search_cb(struct device *dev, void *__data) ...@@ -727,7 +745,7 @@ static int nodemgr_guid_search_cb(struct device *dev, void *__data)
struct guid_search_baton *search = __data; struct guid_search_baton *search = __data;
struct node_entry *ne; struct node_entry *ne;
if (dev->class_num != DEV_CLASS_NODE) if (dev->driver_data != &nodemgr_driverdata_ne)
return 0; return 0;
ne = container_of(dev, struct node_entry, device); ne = container_of(dev, struct node_entry, device);
...@@ -764,7 +782,7 @@ static int nodemgr_nodeid_search_cb(struct device *dev, void *__data) ...@@ -764,7 +782,7 @@ static int nodemgr_nodeid_search_cb(struct device *dev, void *__data)
struct nodeid_search_baton *search = __data; struct nodeid_search_baton *search = __data;
struct node_entry *ne; struct node_entry *ne;
if (dev->class_num != DEV_CLASS_NODE) if (dev->driver_data != &nodemgr_driverdata_ne)
return 0; return 0;
ne = container_of(dev, struct node_entry, device); ne = container_of(dev, struct node_entry, device);
...@@ -1131,7 +1149,9 @@ static int nodemgr_hotplug(struct device *dev, char **envp, int num_envp, ...@@ -1131,7 +1149,9 @@ static int nodemgr_hotplug(struct device *dev, char **envp, int num_envp,
if (!dev) if (!dev)
return -ENODEV; return -ENODEV;
if (dev->class_num != DEV_CLASS_UNIT_DIRECTORY) /* Have to check driver_data, since on remove, driver == NULL */
if (dev->driver_data == &nodemgr_driverdata_ne ||
dev->driver_data == &nodemgr_driverdata_host)
return -ENODEV; return -ENODEV;
ud = container_of(dev, struct unit_directory, device); ud = container_of(dev, struct unit_directory, device);
...@@ -1173,20 +1193,6 @@ static int nodemgr_hotplug(struct device *dev, char **envp, int num_envp, ...@@ -1173,20 +1193,6 @@ static int nodemgr_hotplug(struct device *dev, char **envp, int num_envp,
#endif /* CONFIG_HOTPLUG */ #endif /* CONFIG_HOTPLUG */
static DECLARE_MUTEX(host_num_sema);
/* Must hold above mutex until the result of the below call is assigned to
* a hostinfo entry. */
static int nodemgr_alloc_host_num(void)
{
int hostnum;
for (hostnum = 0; hpsb_get_hostinfo_bykey(nodemgr_hl, hostnum); hostnum++)
/* Do nothing */;
return hostnum;
}
int hpsb_register_protocol(struct hpsb_protocol_driver *driver) int hpsb_register_protocol(struct hpsb_protocol_driver *driver)
{ {
driver_register(&driver->driver); driver_register(&driver->driver);
...@@ -1258,7 +1264,8 @@ static int nodemgr_driver_search_cb(struct device *dev, void *__data) ...@@ -1258,7 +1264,8 @@ static int nodemgr_driver_search_cb(struct device *dev, void *__data)
struct node_entry *ne = __data; struct node_entry *ne = __data;
struct unit_directory *ud; struct unit_directory *ud;
if (dev->class_num != DEV_CLASS_UNIT_DIRECTORY) if (dev->driver_data == &nodemgr_driverdata_ne ||
dev->driver_data == &nodemgr_driverdata_host)
return 0; return 0;
ud = container_of(dev, struct unit_directory, device); ud = container_of(dev, struct unit_directory, device);
...@@ -1295,7 +1302,7 @@ static void nodemgr_update_node(struct node_entry *ne, quadlet_t busoptions, ...@@ -1295,7 +1302,7 @@ static void nodemgr_update_node(struct node_entry *ne, quadlet_t busoptions,
if (ne->nodeid != nodeid) { if (ne->nodeid != nodeid) {
snprintf(ne->device.name, DEVICE_NAME_SIZE, snprintf(ne->device.name, DEVICE_NAME_SIZE,
"IEEE-1394 device %d-" NODE_BUS_FMT, "IEEE-1394 device %d-" NODE_BUS_FMT,
hi->id, NODE_BUS_ARGS(ne->nodeid)); hi->host->id, NODE_BUS_ARGS(ne->nodeid));
HPSB_DEBUG("Node " NODE_BUS_FMT " changed to " NODE_BUS_FMT, HPSB_DEBUG("Node " NODE_BUS_FMT " changed to " NODE_BUS_FMT,
NODE_BUS_ARGS(ne->nodeid), NODE_BUS_ARGS(nodeid)); NODE_BUS_ARGS(ne->nodeid), NODE_BUS_ARGS(nodeid));
ne->nodeid = nodeid; ne->nodeid = nodeid;
...@@ -1446,7 +1453,7 @@ static int nodemgr_remove_node(struct device *dev, void *__data) ...@@ -1446,7 +1453,7 @@ static int nodemgr_remove_node(struct device *dev, void *__data)
struct cleanup_baton *cleanup = __data; struct cleanup_baton *cleanup = __data;
struct node_entry *ne; struct node_entry *ne;
if (dev->class_num != DEV_CLASS_NODE) if (dev->driver_data != &nodemgr_driverdata_ne)
return 0; return 0;
ne = container_of(dev, struct node_entry, device); ne = container_of(dev, struct node_entry, device);
...@@ -1550,7 +1557,7 @@ static void nodemgr_do_irm_duties(struct hpsb_host *host) ...@@ -1550,7 +1557,7 @@ static void nodemgr_do_irm_duties(struct hpsb_host *host)
else { else {
HPSB_DEBUG("The root node is not cycle master capable; " HPSB_DEBUG("The root node is not cycle master capable; "
"selecting a new root node and resetting..."); "selecting a new root node and resetting...");
hpsb_send_phy_config(host, host->node_id, -1); hpsb_send_phy_config(host, NODEID_TO_NODE(host->node_id), -1);
hpsb_reset_bus(host, LONG_RESET_FORCE_ROOT); hpsb_reset_bus(host, LONG_RESET_FORCE_ROOT);
} }
} }
...@@ -1583,7 +1590,7 @@ static int nodemgr_check_irm_capability(struct hpsb_host *host, int cycles) ...@@ -1583,7 +1590,7 @@ static int nodemgr_check_irm_capability(struct hpsb_host *host, int cycles)
return 1; return 1;
} }
hpsb_send_phy_config(host, host->node_id, -1); hpsb_send_phy_config(host, NODEID_TO_NODE(host->node_id), -1);
hpsb_reset_bus(host, LONG_RESET_FORCE_ROOT); hpsb_reset_bus(host, LONG_RESET_FORCE_ROOT);
return 0; return 0;
...@@ -1732,27 +1739,17 @@ int hpsb_node_lock(struct node_entry *ne, u64 addr, ...@@ -1732,27 +1739,17 @@ int hpsb_node_lock(struct node_entry *ne, u64 addr,
addr, extcode, data, arg); addr, extcode, data, arg);
} }
static void nodemgr_add_host(struct hpsb_host *host, struct hpsb_highlevel *hl) static void nodemgr_add_host(struct hpsb_host *host)
{ {
struct host_info *hi; struct host_info *hi;
int id;
down(&host_num_sema); hi = hpsb_create_hostinfo(&nodemgr_highlevel, host, sizeof(*hi));
/* Must be called before we create the hostinfo entry, else it
* will match entry '0' since all keys default to zero */
id = nodemgr_alloc_host_num();
hi = hpsb_create_hostinfo(hl, host, sizeof(*hi));
if (!hi) { if (!hi) {
up(&host_num_sema);
HPSB_ERR ("NodeMgr: out of memory in add host"); HPSB_ERR ("NodeMgr: out of memory in add host");
return; return;
} }
hi->id = id;
hpsb_set_hostinfo_key(hl, host, hi->id);
up(&host_num_sema);
hi->host = host; hi->host = host;
init_completion(&hi->exited); init_completion(&hi->exited);
sema_init(&hi->reset_sem, 0); sema_init(&hi->reset_sem, 0);
...@@ -1760,11 +1757,11 @@ static void nodemgr_add_host(struct hpsb_host *host, struct hpsb_highlevel *hl) ...@@ -1760,11 +1757,11 @@ static void nodemgr_add_host(struct hpsb_host *host, struct hpsb_highlevel *hl)
memcpy(&host->device, &nodemgr_dev_template_host, memcpy(&host->device, &nodemgr_dev_template_host,
sizeof(host->device)); sizeof(host->device));
host->device.parent = &host->pdev->dev; host->device.parent = &host->pdev->dev;
snprintf(host->device.bus_id, BUS_ID_SIZE, "fw-host%d", hi->id); snprintf(host->device.bus_id, BUS_ID_SIZE, "fw-host%d", host->id);
snprintf(host->device.name, DEVICE_NAME_SIZE, "IEEE-1394 Host %s-%d", snprintf(host->device.name, DEVICE_NAME_SIZE, "IEEE-1394 Host %s-%d",
host->driver->name, hi->id); host->driver->name, host->id);
sprintf(hi->daemon_name, "knodemgrd_%d", hi->id); sprintf(hi->daemon_name, "knodemgrd_%d", host->id);
hi->pid = kernel_thread(nodemgr_host_thread, hi, hi->pid = kernel_thread(nodemgr_host_thread, hi,
CLONE_FS | CLONE_FILES | CLONE_SIGHAND); CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
...@@ -1772,7 +1769,7 @@ static void nodemgr_add_host(struct hpsb_host *host, struct hpsb_highlevel *hl) ...@@ -1772,7 +1769,7 @@ static void nodemgr_add_host(struct hpsb_host *host, struct hpsb_highlevel *hl)
if (hi->pid < 0) { if (hi->pid < 0) {
HPSB_ERR ("NodeMgr: failed to start %s thread for %s", HPSB_ERR ("NodeMgr: failed to start %s thread for %s",
hi->daemon_name, host->driver->name); hi->daemon_name, host->driver->name);
hpsb_destroy_hostinfo(hl, host); hpsb_destroy_hostinfo(&nodemgr_highlevel, host);
return; return;
} }
...@@ -1781,7 +1778,7 @@ static void nodemgr_add_host(struct hpsb_host *host, struct hpsb_highlevel *hl) ...@@ -1781,7 +1778,7 @@ static void nodemgr_add_host(struct hpsb_host *host, struct hpsb_highlevel *hl)
static void nodemgr_host_reset(struct hpsb_host *host) static void nodemgr_host_reset(struct hpsb_host *host)
{ {
struct host_info *hi = hpsb_get_hostinfo(nodemgr_hl, host); struct host_info *hi = hpsb_get_hostinfo(&nodemgr_highlevel, host);
if (hi != NULL) { if (hi != NULL) {
#ifdef CONFIG_IEEE1394_VERBOSEDEBUG #ifdef CONFIG_IEEE1394_VERBOSEDEBUG
...@@ -1796,7 +1793,7 @@ static void nodemgr_host_reset(struct hpsb_host *host) ...@@ -1796,7 +1793,7 @@ static void nodemgr_host_reset(struct hpsb_host *host)
static void nodemgr_remove_host(struct hpsb_host *host) static void nodemgr_remove_host(struct hpsb_host *host)
{ {
struct host_info *hi = hpsb_get_hostinfo(nodemgr_hl, host); struct host_info *hi = hpsb_get_hostinfo(&nodemgr_highlevel, host);
if (hi) { if (hi) {
if (hi->pid >= 0) { if (hi->pid >= 0) {
...@@ -1812,7 +1809,8 @@ static void nodemgr_remove_host(struct hpsb_host *host) ...@@ -1812,7 +1809,8 @@ static void nodemgr_remove_host(struct hpsb_host *host)
return; return;
} }
static struct hpsb_highlevel_ops nodemgr_ops = { static struct hpsb_highlevel nodemgr_highlevel = {
.name = "Node manager",
.add_host = nodemgr_add_host, .add_host = nodemgr_add_host,
.host_reset = nodemgr_host_reset, .host_reset = nodemgr_host_reset,
.remove_host = nodemgr_remove_host, .remove_host = nodemgr_remove_host,
...@@ -1821,16 +1819,17 @@ static struct hpsb_highlevel_ops nodemgr_ops = { ...@@ -1821,16 +1819,17 @@ static struct hpsb_highlevel_ops nodemgr_ops = {
void init_ieee1394_nodemgr(void) void init_ieee1394_nodemgr(void)
{ {
bus_register(&ieee1394_bus_type); bus_register(&ieee1394_bus_type);
driver_register(&nodemgr_driver_host);
driver_register(&nodemgr_driver_ne);
nodemgr_hl = hpsb_register_highlevel("Node manager", &nodemgr_ops); hpsb_register_highlevel(&nodemgr_highlevel);
if (!nodemgr_hl) {
HPSB_ERR("NodeMgr: out of memory during ieee1394 initialization");
}
} }
void cleanup_ieee1394_nodemgr(void) void cleanup_ieee1394_nodemgr(void)
{ {
hpsb_unregister_highlevel(nodemgr_hl); hpsb_unregister_highlevel(&nodemgr_highlevel);
driver_unregister(&nodemgr_driver_ne);
driver_unregister(&nodemgr_driver_host);
bus_unregister(&ieee1394_bus_type); bus_unregister(&ieee1394_bus_type);
} }
drivers/ieee1394/nodemgr.h
View file @ d0c23f5d
...@@ -79,11 +79,6 @@ struct bus_options { ...@@ -79,11 +79,6 @@ struct bus_options {
u16 max_rec; /* Maximum packet size node can receive */ u16 max_rec; /* Maximum packet size node can receive */
}; };
enum {
DEV_CLASS_NODE,
DEV_CLASS_UNIT_DIRECTORY,
DEV_CLASS_HOST,
};
#define UNIT_DIRECTORY_VENDOR_ID 0x01 #define UNIT_DIRECTORY_VENDOR_ID 0x01
#define UNIT_DIRECTORY_MODEL_ID 0x02 #define UNIT_DIRECTORY_MODEL_ID 0x02
......
drivers/ieee1394/ohci1394.c
View file @ d0c23f5d
...@@ -164,7 +164,7 @@ printk(level "%s: " fmt "\n" , OHCI1394_DRIVER_NAME , ## args) ...@@ -164,7 +164,7 @@ printk(level "%s: " fmt "\n" , OHCI1394_DRIVER_NAME , ## args)
printk(level "%s_%d: " fmt "\n" , OHCI1394_DRIVER_NAME, card , ## args) printk(level "%s_%d: " fmt "\n" , OHCI1394_DRIVER_NAME, card , ## args)
static char version[] __devinitdata = static char version[] __devinitdata =
"$Rev: 902 $ Ben Collins <bcollins@debian.org>"; "$Rev: 908 $ Ben Collins <bcollins@debian.org>";
/* Module Parameters */ /* Module Parameters */
static int phys_dma = 1; static int phys_dma = 1;
......
drivers/ieee1394/raw1394.c
View file @ d0c23f5d
...@@ -77,11 +77,11 @@ static int host_count; ...@@ -77,11 +77,11 @@ static int host_count;
static spinlock_t host_info_lock = SPIN_LOCK_UNLOCKED; static spinlock_t host_info_lock = SPIN_LOCK_UNLOCKED;
static atomic_t internal_generation = ATOMIC_INIT(0); static atomic_t internal_generation = ATOMIC_INIT(0);
static struct hpsb_highlevel *hl_handle;
static atomic_t iso_buffer_size; static atomic_t iso_buffer_size;
static const int iso_buffer_max = 4 * 1024 * 1024; /* 4 MB */ static const int iso_buffer_max = 4 * 1024 * 1024; /* 4 MB */
static struct hpsb_highlevel raw1394_highlevel;
static int arm_read (struct hpsb_host *host, int nodeid, quadlet_t *buffer, static int arm_read (struct hpsb_host *host, int nodeid, quadlet_t *buffer,
u64 addr, unsigned int length, u16 flags); u64 addr, unsigned int length, u16 flags);
static int arm_write (struct hpsb_host *host, int nodeid, int destid, static int arm_write (struct hpsb_host *host, int nodeid, int destid,
...@@ -188,7 +188,7 @@ static void queue_complete_cb(struct pending_request *req) ...@@ -188,7 +188,7 @@ static void queue_complete_cb(struct pending_request *req)
} }
static void add_host(struct hpsb_host *host, struct hpsb_highlevel *hl) static void add_host(struct hpsb_host *host)
{ {
struct host_info *hi; struct host_info *hi;
unsigned long flags; unsigned long flags;
...@@ -601,7 +601,7 @@ static void handle_iso_listen(struct file_info *fi, struct pending_request *req) ...@@ -601,7 +601,7 @@ static void handle_iso_listen(struct file_info *fi, struct pending_request *req)
if (fi->listen_channels & (1ULL << channel)) { if (fi->listen_channels & (1ULL << channel)) {
req->req.error = RAW1394_ERROR_ALREADY; req->req.error = RAW1394_ERROR_ALREADY;
} else { } else {
if(hpsb_listen_channel(hl_handle, fi->host, channel)) { if(hpsb_listen_channel(&raw1394_highlevel, fi->host, channel)) {
req->req.error = RAW1394_ERROR_ALREADY; req->req.error = RAW1394_ERROR_ALREADY;
} else { } else {
fi->listen_channels |= 1ULL << channel; fi->listen_channels |= 1ULL << channel;
...@@ -614,7 +614,7 @@ static void handle_iso_listen(struct file_info *fi, struct pending_request *req) ...@@ -614,7 +614,7 @@ static void handle_iso_listen(struct file_info *fi, struct pending_request *req)
channel = ~channel; channel = ~channel;
if (fi->listen_channels & (1ULL << channel)) { if (fi->listen_channels & (1ULL << channel)) {
hpsb_unlisten_channel(hl_handle, fi->host, channel); hpsb_unlisten_channel(&raw1394_highlevel, fi->host, channel);
fi->listen_channels &= ~(1ULL << channel); fi->listen_channels &= ~(1ULL << channel);
} else { } else {
req->req.error = RAW1394_ERROR_INVALID_ARG; req->req.error = RAW1394_ERROR_INVALID_ARG;
...@@ -1679,7 +1679,7 @@ static int arm_register(struct file_info *fi, struct pending_request *req) ...@@ -1679,7 +1679,7 @@ static int arm_register(struct file_info *fi, struct pending_request *req)
spin_unlock_irqrestore(&host_info_lock, flags); spin_unlock_irqrestore(&host_info_lock, flags);
return sizeof(struct raw1394_request); return sizeof(struct raw1394_request);
} }
retval = hpsb_register_addrspace(hl_handle, &arm_ops, req->req.address, retval = hpsb_register_addrspace(&raw1394_highlevel, &arm_ops, req->req.address,
req->req.address + req->req.length); req->req.address + req->req.length);
if (retval) { if (retval) {
/* INSERT ENTRY */ /* INSERT ENTRY */
...@@ -1766,7 +1766,7 @@ static int arm_unregister(struct file_info *fi, struct pending_request *req) ...@@ -1766,7 +1766,7 @@ static int arm_unregister(struct file_info *fi, struct pending_request *req)
spin_unlock_irqrestore(&host_info_lock, flags); spin_unlock_irqrestore(&host_info_lock, flags);
return sizeof(struct raw1394_request); return sizeof(struct raw1394_request);
} }
retval = hpsb_unregister_addrspace(hl_handle, addr->start); retval = hpsb_unregister_addrspace(&raw1394_highlevel, addr->start);
if (!retval) { if (!retval) {
printk(KERN_ERR "raw1394: arm_Unregister failed -> EINVAL\n"); printk(KERN_ERR "raw1394: arm_Unregister failed -> EINVAL\n");
spin_unlock_irqrestore(&host_info_lock, flags); spin_unlock_irqrestore(&host_info_lock, flags);
...@@ -2379,7 +2379,7 @@ static int raw1394_release(struct inode *inode, struct file *file) ...@@ -2379,7 +2379,7 @@ static int raw1394_release(struct inode *inode, struct file *file)
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {
if (fi->listen_channels & (1ULL << i)) { if (fi->listen_channels & (1ULL << i)) {
hpsb_unlisten_channel(hl_handle, fi->host, i); hpsb_unlisten_channel(&raw1394_highlevel, fi->host, i);
} }
} }
...@@ -2424,7 +2424,7 @@ static int raw1394_release(struct inode *inode, struct file *file) ...@@ -2424,7 +2424,7 @@ static int raw1394_release(struct inode *inode, struct file *file)
} }
if (!another_host) { if (!another_host) {
DBGMSG("raw1394_release: call hpsb_arm_unregister"); DBGMSG("raw1394_release: call hpsb_arm_unregister");
retval = hpsb_unregister_addrspace(hl_handle, addr->start); retval = hpsb_unregister_addrspace(&raw1394_highlevel, addr->start);
if (!retval) { if (!retval) {
++fail; ++fail;
printk(KERN_ERR "raw1394_release arm_Unregister failed\n"); printk(KERN_ERR "raw1394_release arm_Unregister failed\n");
...@@ -2507,7 +2507,8 @@ static struct hpsb_protocol_driver raw1394_driver = { ...@@ -2507,7 +2507,8 @@ static struct hpsb_protocol_driver raw1394_driver = {
/******************************************************************************/ /******************************************************************************/
static struct hpsb_highlevel_ops hl_ops = { static struct hpsb_highlevel raw1394_highlevel = {
.name = RAW1394_DEVICE_NAME,
.add_host = add_host, .add_host = add_host,
.remove_host = remove_host, .remove_host = remove_host,
.host_reset = host_reset, .host_reset = host_reset,
...@@ -2528,11 +2529,7 @@ static struct file_operations file_ops = { ...@@ -2528,11 +2529,7 @@ static struct file_operations file_ops = {
static int __init init_raw1394(void) static int __init init_raw1394(void)
{ {
hl_handle = hpsb_register_highlevel(RAW1394_DEVICE_NAME, &hl_ops); hpsb_register_highlevel(&raw1394_highlevel);
if (hl_handle == NULL) {
HPSB_ERR("raw1394 failed to register with ieee1394 highlevel");
return -ENOMEM;
}
devfs_register(NULL, RAW1394_DEVICE_NAME, 0, devfs_register(NULL, RAW1394_DEVICE_NAME, 0,
IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16, IEEE1394_MAJOR, IEEE1394_MINOR_BLOCK_RAW1394 * 16,
...@@ -2542,7 +2539,7 @@ static int __init init_raw1394(void) ...@@ -2542,7 +2539,7 @@ static int __init init_raw1394(void)
THIS_MODULE, &file_ops)) { THIS_MODULE, &file_ops)) {
HPSB_ERR("raw1394 failed to register minor device block"); HPSB_ERR("raw1394 failed to register minor device block");
devfs_remove(RAW1394_DEVICE_NAME); devfs_remove(RAW1394_DEVICE_NAME);
hpsb_unregister_highlevel(hl_handle); hpsb_unregister_highlevel(&raw1394_highlevel);
return -EBUSY; return -EBUSY;
} }
...@@ -2558,7 +2555,7 @@ static void __exit cleanup_raw1394(void) ...@@ -2558,7 +2555,7 @@ static void __exit cleanup_raw1394(void)
hpsb_unregister_protocol(&raw1394_driver); hpsb_unregister_protocol(&raw1394_driver);
ieee1394_unregister_chardev(IEEE1394_MINOR_BLOCK_RAW1394); ieee1394_unregister_chardev(IEEE1394_MINOR_BLOCK_RAW1394);
devfs_remove(RAW1394_DEVICE_NAME); devfs_remove(RAW1394_DEVICE_NAME);
hpsb_unregister_highlevel(hl_handle); hpsb_unregister_highlevel(&raw1394_highlevel);
} }
module_init(init_raw1394); module_init(init_raw1394);
......
drivers/ieee1394/sbp2.c
View file @ d0c23f5d
This diff is collapsed.
drivers/ieee1394/video1394.c
View file @ d0c23f5d
...@@ -146,8 +146,7 @@ printk(level "video1394_%d: " fmt "\n" , card , ## args) ...@@ -146,8 +146,7 @@ printk(level "video1394_%d: " fmt "\n" , card , ## args)
void wakeup_dma_ir_ctx(unsigned long l); void wakeup_dma_ir_ctx(unsigned long l);
void wakeup_dma_it_ctx(unsigned long l); void wakeup_dma_it_ctx(unsigned long l);
static struct hpsb_highlevel *hl_handle = NULL; static struct hpsb_highlevel video1394_highlevel;
static int free_dma_iso_ctx(struct dma_iso_ctx *d) static int free_dma_iso_ctx(struct dma_iso_ctx *d)
{ {
...@@ -1151,7 +1150,7 @@ static int video1394_open(struct inode *inode, struct file *file) ...@@ -1151,7 +1150,7 @@ static int video1394_open(struct inode *inode, struct file *file)
struct ti_ohci *ohci; struct ti_ohci *ohci;
struct file_ctx *ctx; struct file_ctx *ctx;
ohci = hpsb_get_hostinfo_bykey(hl_handle, i); ohci = hpsb_get_hostinfo_bykey(&video1394_highlevel, i);
if (ohci == NULL) if (ohci == NULL)
return -EIO; return -EIO;
...@@ -1236,7 +1235,7 @@ static struct hpsb_protocol_driver video1394_driver = { ...@@ -1236,7 +1235,7 @@ static struct hpsb_protocol_driver video1394_driver = {
}; };
static void video1394_add_host (struct hpsb_host *host, struct hpsb_highlevel *hl) static void video1394_add_host (struct hpsb_host *host)
{ {
struct ti_ohci *ohci; struct ti_ohci *ohci;
char name[16]; char name[16];
...@@ -1248,13 +1247,13 @@ static void video1394_add_host (struct hpsb_host *host, struct hpsb_highlevel *h ...@@ -1248,13 +1247,13 @@ static void video1394_add_host (struct hpsb_host *host, struct hpsb_highlevel *h
ohci = (struct ti_ohci *)host->hostdata; ohci = (struct ti_ohci *)host->hostdata;
if (!hpsb_create_hostinfo(hl, host, 0)) { if (!hpsb_create_hostinfo(&video1394_highlevel, host, 0)) {
PRINT(KERN_ERR, ohci->id, "Cannot allocate hostinfo"); PRINT(KERN_ERR, ohci->id, "Cannot allocate hostinfo");
return; return;
} }
hpsb_set_hostinfo(hl, host, ohci); hpsb_set_hostinfo(&video1394_highlevel, host, ohci);
hpsb_set_hostinfo_key(hl, host, ohci->id); hpsb_set_hostinfo_key(&video1394_highlevel, host, ohci->id);
sprintf(name, "%s/%d", VIDEO1394_DRIVER_NAME, ohci->id); sprintf(name, "%s/%d", VIDEO1394_DRIVER_NAME, ohci->id);
minor = IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci->id; minor = IEEE1394_MINOR_BLOCK_VIDEO1394 * 16 + ohci->id;
...@@ -1267,7 +1266,7 @@ static void video1394_add_host (struct hpsb_host *host, struct hpsb_highlevel *h ...@@ -1267,7 +1266,7 @@ static void video1394_add_host (struct hpsb_host *host, struct hpsb_highlevel *h
static void video1394_remove_host (struct hpsb_host *host) static void video1394_remove_host (struct hpsb_host *host)
{ {
struct ti_ohci *ohci = hpsb_get_hostinfo(hl_handle, host); struct ti_ohci *ohci = hpsb_get_hostinfo(&video1394_highlevel, host);
if (ohci) if (ohci)
devfs_remove("%s/%d", VIDEO1394_DRIVER_NAME, ohci->id); devfs_remove("%s/%d", VIDEO1394_DRIVER_NAME, ohci->id);
...@@ -1276,7 +1275,8 @@ static void video1394_remove_host (struct hpsb_host *host) ...@@ -1276,7 +1275,8 @@ static void video1394_remove_host (struct hpsb_host *host)
} }
static struct hpsb_highlevel_ops hl_ops = { static struct hpsb_highlevel video1394_highlevel = {
.name = VIDEO1394_DRIVER_NAME,
.add_host = video1394_add_host, .add_host = video1394_add_host,
.remove_host = video1394_remove_host, .remove_host = video1394_remove_host,
}; };
...@@ -1415,7 +1415,7 @@ static void __exit video1394_exit_module (void) ...@@ -1415,7 +1415,7 @@ static void __exit video1394_exit_module (void)
hpsb_unregister_protocol(&video1394_driver); hpsb_unregister_protocol(&video1394_driver);
hpsb_unregister_highlevel (hl_handle); hpsb_unregister_highlevel(&video1394_highlevel);
devfs_remove(VIDEO1394_DRIVER_NAME); devfs_remove(VIDEO1394_DRIVER_NAME);
ieee1394_unregister_chardev(IEEE1394_MINOR_BLOCK_VIDEO1394); ieee1394_unregister_chardev(IEEE1394_MINOR_BLOCK_VIDEO1394);
...@@ -1436,13 +1436,7 @@ static int __init video1394_init_module (void) ...@@ -1436,13 +1436,7 @@ static int __init video1394_init_module (void)
devfs_mk_dir(VIDEO1394_DRIVER_NAME); devfs_mk_dir(VIDEO1394_DRIVER_NAME);
hl_handle = hpsb_register_highlevel (VIDEO1394_DRIVER_NAME, &hl_ops); hpsb_register_highlevel(&video1394_highlevel);
if (hl_handle == NULL) {
PRINT_G(KERN_ERR, "No more memory for driver\n");
devfs_remove(VIDEO1394_DRIVER_NAME);
ieee1394_unregister_chardev(IEEE1394_MINOR_BLOCK_VIDEO1394);
return -ENOMEM;
}
hpsb_register_protocol(&video1394_driver); hpsb_register_protocol(&video1394_driver);
......
include/linux/compat_ioctl.h 0 → 100644
View file @ d0c23f5d
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7