* PATCH: I2O updates
@ 2003-03-19 18:00 Alan Cox
2003-03-19 18:42 ` Alan Cox
0 siblings, 1 reply; 2+ messages in thread
From: Alan Cox @ 2003-03-19 18:00 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 346 bytes --]
This brings the I2O layer up to date. It fixes the i2o scsi hang
on boot. It fixes the stack abuse by the i2o_proc code and it
merges i2o_pci into i2o_core. I2O is now dead so no other
transports are likely to appear, so this always rather messy
abstraction can go.
Having applied this "rm i2o_pci.c"
--
Alan Cox <alan@lxorguk.ukuu.org.uk>
[-- Attachment #2: a1 --]
[-- Type: text/x-patch, Size: 2090 bytes --]
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.65/include/linux/i2o.h linux-2.5.65-ac1/include/linux/i2o.h
--- linux-2.5.65/include/linux/i2o.h 2003-02-10 18:38:03.000000000 +0000
+++ linux-2.5.65-ac1/include/linux/i2o.h 2003-03-13 20:35:36.000000000 +0000
@@ -23,7 +23,7 @@
#include <linux/i2o-dev.h>
/* How many different OSM's are we allowing */
-#define MAX_I2O_MODULES 64
+#define MAX_I2O_MODULES 4
/* How many OSMs can register themselves for device status updates? */
#define I2O_MAX_MANAGERS 4
@@ -76,10 +76,16 @@
};
/*
- * Resource data for each PCI I2O controller
+ * Each I2O controller has one of these objects
*/
-struct i2o_pci
+struct i2o_controller
{
+ char name[16];
+ int unit;
+ int type;
+ int enabled;
+
+ struct pci_dev *pdev; /* PCI device */
int irq;
int short_req:1; /* Use small block sizes */
int dpt:1; /* Don't quiesce */
@@ -88,25 +94,6 @@
int mtrr_reg0;
int mtrr_reg1;
#endif
-};
-
-/*
- * Transport types supported by I2O stack
- */
-#define I2O_TYPE_PCI 0x01 /* PCI I2O controller */
-
-
-/*
- * Each I2O controller has one of these objects
- */
-struct i2o_controller
-{
- struct pci_dev *pdev; /* PCI device */
-
- char name[16];
- int unit;
- int type;
- int enabled;
struct notifier_block *event_notifer; /* Events */
atomic_t users;
@@ -143,22 +130,6 @@
struct proc_dir_entry *proc_entry; /* /proc dir */
- union { /* Bus information */
- struct i2o_pci pci;
- } bus;
-
- /* Bus specific destructor */
- void (*destructor)(struct i2o_controller *);
-
- /* Bus specific attach/detach */
- int (*bind)(struct i2o_controller *, struct i2o_device *);
-
- /* Bus specific initiator */
- int (*unbind)(struct i2o_controller *, struct i2o_device *);
-
- /* Bus specific enable/disable */
- void (*bus_enable)(struct i2o_controller *);
- void (*bus_disable)(struct i2o_controller *);
void *page_frame; /* Message buffers */
dma_addr_t page_frame_map; /* Cache map */
[-- Attachment #3: Type: text/x-patch, Size: 2090 bytes --]
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.65/include/linux/i2o.h linux-2.5.65-ac1/include/linux/i2o.h
--- linux-2.5.65/include/linux/i2o.h 2003-02-10 18:38:03.000000000 +0000
+++ linux-2.5.65-ac1/include/linux/i2o.h 2003-03-13 20:35:36.000000000 +0000
@@ -23,7 +23,7 @@
#include <linux/i2o-dev.h>
/* How many different OSM's are we allowing */
-#define MAX_I2O_MODULES 64
+#define MAX_I2O_MODULES 4
/* How many OSMs can register themselves for device status updates? */
#define I2O_MAX_MANAGERS 4
@@ -76,10 +76,16 @@
};
/*
- * Resource data for each PCI I2O controller
+ * Each I2O controller has one of these objects
*/
-struct i2o_pci
+struct i2o_controller
{
+ char name[16];
+ int unit;
+ int type;
+ int enabled;
+
+ struct pci_dev *pdev; /* PCI device */
int irq;
int short_req:1; /* Use small block sizes */
int dpt:1; /* Don't quiesce */
@@ -88,25 +94,6 @@
int mtrr_reg0;
int mtrr_reg1;
#endif
-};
-
-/*
- * Transport types supported by I2O stack
- */
-#define I2O_TYPE_PCI 0x01 /* PCI I2O controller */
-
-
-/*
- * Each I2O controller has one of these objects
- */
-struct i2o_controller
-{
- struct pci_dev *pdev; /* PCI device */
-
- char name[16];
- int unit;
- int type;
- int enabled;
struct notifier_block *event_notifer; /* Events */
atomic_t users;
@@ -143,22 +130,6 @@
struct proc_dir_entry *proc_entry; /* /proc dir */
- union { /* Bus information */
- struct i2o_pci pci;
- } bus;
-
- /* Bus specific destructor */
- void (*destructor)(struct i2o_controller *);
-
- /* Bus specific attach/detach */
- int (*bind)(struct i2o_controller *, struct i2o_device *);
-
- /* Bus specific initiator */
- int (*unbind)(struct i2o_controller *, struct i2o_device *);
-
- /* Bus specific enable/disable */
- void (*bus_enable)(struct i2o_controller *);
- void (*bus_disable)(struct i2o_controller *);
void *page_frame; /* Message buffers */
dma_addr_t page_frame_map; /* Cache map */
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: PATCH: I2O updates
2003-03-19 18:00 PATCH: I2O updates Alan Cox
@ 2003-03-19 18:42 ` Alan Cox
0 siblings, 0 replies; 2+ messages in thread
From: Alan Cox @ 2003-03-19 18:42 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Linux Kernel Mailing List
On Wed, 2003-03-19 at 18:00, Alan Cox wrote:
> This brings the I2O layer up to date. It fixes the i2o scsi hang
> on boot. It fixes the stack abuse by the i2o_proc code and it
> merges i2o_pci into i2o_core. I2O is now dead so no other
> transports are likely to appear, so this always rather messy
> abstraction can go.
I see I found another bug in evolution. I'll resend them
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2003-03-19 17:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-03-19 18:00 PATCH: I2O updates Alan Cox
2003-03-19 18:42 ` Alan Cox
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®