Skip to content

L
linux
Commit 842b7fa8 authored by Alan Cox's avatar Alan Cox Committed by James Bottomley
Browse files
Options

[PATCH] PATCH: Do something about aacraid 

This is a fairly minimal fix for aacraid. It removes the happy cast
pointers to u32 garbage in the 2.6 code and replaces it with the working
2.4 equivalents. I've not backported any of the other changes from 2.4 to
2.6 yet, and some things have gone which are good to be gone (eg the
proc/scsi horror). There is a certain amount of white space noise caused
by realigning with the 2.4 code so I could see what was going on.

Tested on a dual opteron
parent 3d29f7cb
Hide whitespace changes
Inline Side-by-side
Showing with 154 additions and 196 deletions
drivers/scsi/aacraid/README
View file @ 842b7fa8
...@@ -38,15 +38,19 @@ Deanna Bonds <deanna_bonds@adaptec.com> (non-DASD support, PAE fibs and 64 bit, ...@@ -38,15 +38,19 @@ Deanna Bonds <deanna_bonds@adaptec.com> (non-DASD support, PAE fibs and 64 bit,
(fixed 64bit and 64G memory model, changed confusing naming convention (fixed 64bit and 64G memory model, changed confusing naming convention
where fibs that go to the hardware are consistently called hw_fibs and where fibs that go to the hardware are consistently called hw_fibs and
not just fibs like the name of the driver tracking structure) not just fibs like the name of the driver tracking structure)
Mark Salyzyn <Mark_Salyzyn@adaptec.com> Fixed panic issues and added some new product ids for upcoming hbas.
Original Driver Original Driver
------------------------- -------------------------
Adaptec Unix OEM Product Group Adaptec Unix OEM Product Group
Mailing List Mailing List
------------------------- -------------------------
None currently. Also note this is very different to Brian's original driver linux-aacraid-devel@dell.com (Interested parties troll here)
http://mbserver.adaptec.com/ (Currently more Community Support than Devel Support)
Also note this is very different to Brian's original driver
so don't expect him to support it. so don't expect him to support it.
Adaptec does support this driver. Contact either tech support or deanna bonds. Adaptec does support this driver. Contact either tech support or Mark Salyzyn.
Original by Brian Boerner February 2001 Original by Brian Boerner February 2001
Rewritten by Alan Cox, November 2001 Rewritten by Alan Cox, November 2001
drivers/scsi/aacraid/aacraid.h
View file @ 842b7fa8
//#define dprintk(x) printk x #if (!defined(dprintk))
#define dprintk(x) # define dprintk(x)
#endif
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* D E F I N E S * D E F I N E S
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
#define MAXIMUM_NUM_CONTAINERS 31 #define MAXIMUM_NUM_CONTAINERS 31
#define MAXIMUM_NUM_ADAPTERS 8 #define MAXIMUM_NUM_ADAPTERS 8
#define AAC_NUM_FIB 578 #define AAC_NUM_FIB 578
//#define AAC_NUM_IO_FIB 512 //#define AAC_NUM_IO_FIB 512
#define AAC_NUM_IO_FIB 100 #define AAC_NUM_IO_FIB 100
#define AAC_MAX_TARGET (MAXIMUM_NUM_CONTAINERS+1) #define AAC_MAX_TARGET (MAXIMUM_NUM_CONTAINERS+1)
#define AAC_MAX_LUN (8) #define AAC_MAX_LUN (8)
#define AAC_MAX_HOSTPHYSMEMPAGES (0xfffff) #define AAC_MAX_HOSTPHYSMEMPAGES (0xfffff)
...@@ -240,92 +242,6 @@ enum aac_queue_types { ...@@ -240,92 +242,6 @@ enum aac_queue_types {
AdapHighRespQueue /* Host to adapter high priority response traffic */ AdapHighRespQueue /* Host to adapter high priority response traffic */
}; };
/*
* Implement our own version of these so we have 64 bit compatability
* The adapter uses these and can only handle 32 bit addresses
*/
struct aac_list_head {
u32 next;
u32 prev;
};
#define AAC_INIT_LIST_HEAD(ptr) do { \
(ptr)->next = (u32)(ulong)(ptr); \
(ptr)->prev = (u32)(ulong)(ptr); \
} while (0)
/**
* aac_list_empty - tests whether a list is empty
* @head: the list to test.
*/
static __inline__ int aac_list_empty(struct aac_list_head *head)
{
return head->next == ((u32)(ulong)head);
}
/*
* Insert a new entry between two known consecutive entries.
*
* This is only for internal list manipulation where we know
* the prev/next entries already!
*/
static __inline__ void aac_list_add(struct aac_list_head * n,
struct aac_list_head * prev,
struct aac_list_head * next)
{
next->prev = (u32)(ulong)n;
n->next = (u32)(ulong)next;
n->prev = (u32)(ulong)prev;
prev->next = (u32)(ulong)n;
}
/**
* list_add_tail - add a new entry
* @new: new entry to be added
* @head: list head to add it before
*
* Insert a new entry before the specified head.
* This is useful for implementing queues.
*/
static __inline__ void aac_list_add_tail(struct aac_list_head *n, struct aac_list_head *head)
{
aac_list_add(n, (struct aac_list_head*)(ulong)(head->prev), head);
}
/*
* Delete a list entry by making the prev/next entries
* point to each other.
*
* This is only for internal list manipulation where we know
* the prev/next entries already!
*/
static __inline__ void __aac_list_del(struct aac_list_head * p,
struct aac_list_head * n)
{
n->prev = (u32)(ulong)p;
p->next = (u32)(ulong)n;
}
/**
* aac_list_del - deletes entry from list.
* @entry: the element to delete from the list.
* Note: list_empty on entry does not return true after this, the entry is in an undefined state.
*/
static __inline__ void aac_list_del(struct aac_list_head *entry)
{
__aac_list_del((struct aac_list_head*)(ulong)entry->prev,(struct aac_list_head*)(ulong) entry->next);
entry->next = entry->prev = 0;
}
/**
* aac_list_entry - get the struct for this entry
* @ptr: the &struct list_head pointer.
* @type: the type of the struct this is embedded in.
* @member: the name of the list_struct within the struct.
*/
#define aac_list_entry(ptr, type, member) \
((type *)((char *)(ptr)-(ulong)(&((type *)0)->member)))
/* /*
* Assign type values to the FSA communication data structures * Assign type values to the FSA communication data structures
*/ */
...@@ -339,11 +255,11 @@ static __inline__ void aac_list_del(struct aac_list_head *entry) ...@@ -339,11 +255,11 @@ static __inline__ void aac_list_del(struct aac_list_head *entry)
#define FsaNormal 1 #define FsaNormal 1
#define FsaHigh 2 #define FsaHigh 2
/* /*
* Define the FIB. The FIB is the where all the requested data and * Define the FIB. The FIB is the where all the requested data and
* command information are put to the application on the FSA adapter. * command information are put to the application on the FSA adapter.
*/ */
struct aac_fibhdr { struct aac_fibhdr {
u32 XferState; // Current transfer state for this CCB u32 XferState; // Current transfer state for this CCB
u16 Command; // Routing information for the destination u16 Command; // Routing information for the destination
...@@ -359,13 +275,9 @@ struct aac_fibhdr { ...@@ -359,13 +275,9 @@ struct aac_fibhdr {
u32 _ReceiverTimeStart; // Timestamp for receipt of fib u32 _ReceiverTimeStart; // Timestamp for receipt of fib
u32 _ReceiverTimeDone; // Timestamp for completion of fib u32 _ReceiverTimeDone; // Timestamp for completion of fib
} _s; } _s;
struct aac_list_head _FibLinks; // Used to link Adapter Initiated Fibs on the host
// struct list_head _FibLinks; // Used to link Adapter Initiated Fibs on the host
} _u; } _u;
}; };
#define FibLinks _u._FibLinks
#define FIB_DATA_SIZE_IN_BYTES (512 - sizeof(struct aac_fibhdr)) #define FIB_DATA_SIZE_IN_BYTES (512 - sizeof(struct aac_fibhdr))
...@@ -558,12 +470,11 @@ struct aac_queue { ...@@ -558,12 +470,11 @@ struct aac_queue {
spinlock_t lockdata; /* Actual lock (used only on one side of the lock) */ spinlock_t lockdata; /* Actual lock (used only on one side of the lock) */
unsigned long SavedIrql; /* Previous IRQL when the spin lock is taken */ unsigned long SavedIrql; /* Previous IRQL when the spin lock is taken */
u32 padding; /* Padding - FIXME - can remove I believe */ u32 padding; /* Padding - FIXME - can remove I believe */
struct aac_list_head cmdq; /* A queue of FIBs which need to be prcessed by the FS thread. This is */ struct list_head cmdq; /* A queue of FIBs which need to be prcessed by the FS thread. This is */
// struct list_head cmdq; /* A queue of FIBs which need to be prcessed by the FS thread. This is */ /* only valid for command queues which receive entries from the adapter. */
/* only valid for command queues which receive entries from the adapter. */ struct list_head pendingq; /* A queue of outstanding fib's to the adapter. */
struct list_head pendingq; /* A queue of outstanding fib's to the adapter. */ u32 numpending; /* Number of entries on outstanding queue. */
u32 numpending; /* Number of entries on outstanding queue. */ struct aac_dev * dev; /* Back pointer to adapter structure */
struct aac_dev * dev; /* Back pointer to adapter structure */
}; };
/* /*
...@@ -744,7 +655,7 @@ struct aac_fib_context { ...@@ -744,7 +655,7 @@ struct aac_fib_context {
struct semaphore wait_sem; // this is used to wait for the next fib to arrive. struct semaphore wait_sem; // this is used to wait for the next fib to arrive.
int wait; // Set to true when thread is in WaitForSingleObject int wait; // Set to true when thread is in WaitForSingleObject
unsigned long count; // total number of FIBs on FibList unsigned long count; // total number of FIBs on FibList
struct aac_list_head hw_fib_list; // this holds hw_fibs which should be 32 bit addresses struct list_head fib_list; // this holds fibs and their attachd hw_fibs
}; };
struct fsa_scsi_hba { struct fsa_scsi_hba {
...@@ -781,7 +692,11 @@ struct fib { ...@@ -781,7 +692,11 @@ struct fib {
* Outstanding I/O queue. * Outstanding I/O queue.
*/ */
struct list_head queue; struct list_head queue;
/*
* And for the internal issue/reply queues (we may be able
* to merge these two)
*/
struct list_head fiblink;
void *data; void *data;
struct hw_fib *hw_fib; /* Actual shared object */ struct hw_fib *hw_fib; /* Actual shared object */
dma_addr_t hw_fib_pa; /* physical address of hw_fib*/ dma_addr_t hw_fib_pa; /* physical address of hw_fib*/
...@@ -836,19 +751,19 @@ struct aac_adapter_info ...@@ -836,19 +751,19 @@ struct aac_adapter_info
/* /*
* Supported Options * Supported Options
*/ */
#define AAC_OPT_SNAPSHOT cpu_to_le32(1) #define AAC_OPT_SNAPSHOT cpu_to_le32(1)
#define AAC_OPT_CLUSTERS cpu_to_le32(1<<1) #define AAC_OPT_CLUSTERS cpu_to_le32(1<<1)
#define AAC_OPT_WRITE_CACHE cpu_to_le32(1<<2) #define AAC_OPT_WRITE_CACHE cpu_to_le32(1<<2)
#define AAC_OPT_64BIT_DATA cpu_to_le32(1<<3) #define AAC_OPT_64BIT_DATA cpu_to_le32(1<<3)
#define AAC_OPT_HOST_TIME_FIB cpu_to_le32(1<<4) #define AAC_OPT_HOST_TIME_FIB cpu_to_le32(1<<4)
#define AAC_OPT_RAID50 cpu_to_le32(1<<5) #define AAC_OPT_RAID50 cpu_to_le32(1<<5)
#define AAC_OPT_4GB_WINDOW cpu_to_le32(1<<6) #define AAC_OPT_4GB_WINDOW cpu_to_le32(1<<6)
#define AAC_OPT_SCSI_UPGRADEABLE cpu_to_le32(1<<7) #define AAC_OPT_SCSI_UPGRADEABLE cpu_to_le32(1<<7)
#define AAC_OPT_SOFT_ERR_REPORT cpu_to_le32(1<<8) #define AAC_OPT_SOFT_ERR_REPORT cpu_to_le32(1<<8)
#define AAC_OPT_SUPPORTED_RECONDITION cpu_to_le32(1<<9) #define AAC_OPT_SUPPORTED_RECONDITION cpu_to_le32(1<<9)
#define AAC_OPT_SGMAP_HOST64 cpu_to_le32(1<<10) #define AAC_OPT_SGMAP_HOST64 cpu_to_le32(1<<10)
#define AAC_OPT_ALARM cpu_to_le32(1<<11) #define AAC_OPT_ALARM cpu_to_le32(1<<11)
#define AAC_OPT_NONDASD cpu_to_le32(1<<12) #define AAC_OPT_NONDASD cpu_to_le32(1<<12)
struct aac_dev struct aac_dev
{ {
...@@ -862,11 +777,10 @@ struct aac_dev ...@@ -862,11 +777,10 @@ struct aac_dev
*/ */
dma_addr_t hw_fib_pa; dma_addr_t hw_fib_pa;
struct hw_fib *hw_fib_va; struct hw_fib *hw_fib_va;
ulong fib_base_va; struct hw_fib *aif_base_va;
/* /*
* Fib Headers * Fib Headers
*/ */
// dmb struct fib fibs[AAC_NUM_FIB]; /* Doing it here takes up too much from the scsi pool*/
struct fib *fibs; struct fib *fibs;
struct fib *free_fib; struct fib *free_fib;
...@@ -887,7 +801,6 @@ struct aac_dev ...@@ -887,7 +801,6 @@ struct aac_dev
unsigned long fsrev; /* Main driver's revision number */ unsigned long fsrev; /* Main driver's revision number */
struct aac_init *init; /* Holds initialization info to communicate with adapter */ struct aac_init *init; /* Holds initialization info to communicate with adapter */
// void * init_pa; /* Holds physical address of the init struct */
dma_addr_t init_pa; /* Holds physical address of the init struct */ dma_addr_t init_pa; /* Holds physical address of the init struct */
struct pci_dev *pdev; /* Our PCI interface */ struct pci_dev *pdev; /* Our PCI interface */
...@@ -898,7 +811,7 @@ struct aac_dev ...@@ -898,7 +811,7 @@ struct aac_dev
struct Scsi_Host *scsi_host_ptr; struct Scsi_Host *scsi_host_ptr;
struct fsa_scsi_hba fsa_dev; struct fsa_scsi_hba fsa_dev;
int thread_pid; pid_t thread_pid;
int cardtype; int cardtype;
/* /*
......
drivers/scsi/aacraid/commctrl.c
View file @ 842b7fa8
...@@ -148,7 +148,7 @@ static int open_getadapter_fib(struct aac_dev * dev, void *arg) ...@@ -148,7 +148,7 @@ static int open_getadapter_fib(struct aac_dev * dev, void *arg)
* the list to 0. * the list to 0.
*/ */
fibctx->count = 0; fibctx->count = 0;
AAC_INIT_LIST_HEAD(&fibctx->hw_fib_list); INIT_LIST_HEAD(&fibctx->fib_list);
fibctx->jiffies = jiffies/HZ; fibctx->jiffies = jiffies/HZ;
/* /*
* Now add this context onto the adapter's * Now add this context onto the adapter's
...@@ -179,7 +179,7 @@ static int next_getadapter_fib(struct aac_dev * dev, void *arg) ...@@ -179,7 +179,7 @@ static int next_getadapter_fib(struct aac_dev * dev, void *arg)
{ {
struct fib_ioctl f; struct fib_ioctl f;
struct aac_fib_context *fibctx, *aifcp; struct aac_fib_context *fibctx, *aifcp;
struct hw_fib * hw_fib; struct fib *fib;
int status; int status;
struct list_head * entry; struct list_head * entry;
int found; int found;
...@@ -222,25 +222,27 @@ static int next_getadapter_fib(struct aac_dev * dev, void *arg) ...@@ -222,25 +222,27 @@ static int next_getadapter_fib(struct aac_dev * dev, void *arg)
* -EAGAIN * -EAGAIN
*/ */
return_fib: return_fib:
if (!aac_list_empty(&fibctx->hw_fib_list)) { if (!list_empty(&fibctx->fib_list)) {
struct aac_list_head * entry; struct list_head * entry;
/* /*
* Pull the next fib from the fibs * Pull the next fib from the fibs
*/ */
entry = (struct aac_list_head*)(ulong)fibctx->hw_fib_list.next; entry = fibctx->fib_list.next;
aac_list_del(entry); list_del(entry);
hw_fib = aac_list_entry(entry, struct hw_fib, header.FibLinks); fib = list_entry(entry, struct fib, fiblink);
fibctx->count--; fibctx->count--;
spin_unlock_irqrestore(&dev->fib_lock, flags); spin_unlock_irqrestore(&dev->fib_lock, flags);
if (copy_to_user(f.fib, hw_fib, sizeof(struct hw_fib))) { if (copy_to_user(f.fib, fib->hw_fib, sizeof(struct hw_fib))) {
kfree(hw_fib); kfree(fib->hw_fib);
kfree(fib);
return -EFAULT; return -EFAULT;
} }
/* /*
* Free the space occupied by this copy of the fib. * Free the space occupied by this copy of the fib.
*/ */
kfree(hw_fib); kfree(fib->hw_fib);
kfree(fib);
status = 0; status = 0;
fibctx->jiffies = jiffies/HZ; fibctx->jiffies = jiffies/HZ;
} else { } else {
...@@ -262,24 +264,25 @@ static int next_getadapter_fib(struct aac_dev * dev, void *arg) ...@@ -262,24 +264,25 @@ static int next_getadapter_fib(struct aac_dev * dev, void *arg)
int aac_close_fib_context(struct aac_dev * dev, struct aac_fib_context * fibctx) int aac_close_fib_context(struct aac_dev * dev, struct aac_fib_context * fibctx)
{ {
struct hw_fib *hw_fib; struct fib *fib;
/* /*
* First free any FIBs that have not been consumed. * First free any FIBs that have not been consumed.
*/ */
while (!aac_list_empty(&fibctx->hw_fib_list)) { while (!list_empty(&fibctx->fib_list)) {
struct aac_list_head * entry; struct list_head * entry;
/* /*
* Pull the next fib from the fibs * Pull the next fib from the fibs
*/ */
entry = (struct aac_list_head*)(ulong)(fibctx->hw_fib_list.next); entry = fibctx->fib_list.next;
aac_list_del(entry); list_del(entry);
hw_fib = aac_list_entry(entry, struct hw_fib, header.FibLinks); fib = list_entry(entry, struct fib, fiblink);
fibctx->count--; fibctx->count--;
/* /*
* Free the space occupied by this copy of the fib. * Free the space occupied by this copy of the fib.
*/ */
kfree(hw_fib); kfree(fib->hw_fib);
kfree(fib);
} }
/* /*
* Remove the Context from the AdapterFibContext List * Remove the Context from the AdapterFibContext List
......
drivers/scsi/aacraid/comminit.c
View file @ 842b7fa8
...@@ -81,9 +81,9 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co ...@@ -81,9 +81,9 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
* Adapter Fibs are the first thing allocated so that they * Adapter Fibs are the first thing allocated so that they
* start page aligned * start page aligned
*/ */
dev->fib_base_va = (ulong)base; dev->aif_base_va = (struct hw_fib *)base;
init->AdapterFibsVirtualAddress = cpu_to_le32((u32)(ulong)phys); init->AdapterFibsVirtualAddress = cpu_to_le32(0);
init->AdapterFibsPhysicalAddress = cpu_to_le32((u32)phys); init->AdapterFibsPhysicalAddress = cpu_to_le32((u32)phys);
init->AdapterFibsSize = cpu_to_le32(fibsize); init->AdapterFibsSize = cpu_to_le32(fibsize);
init->AdapterFibAlign = cpu_to_le32(sizeof(struct hw_fib)); init->AdapterFibAlign = cpu_to_le32(sizeof(struct hw_fib));
...@@ -94,6 +94,9 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co ...@@ -94,6 +94,9 @@ static int aac_alloc_comm(struct aac_dev *dev, void **commaddr, unsigned long co
* mapping system, but older Firmware did, and had *troubles* dealing * mapping system, but older Firmware did, and had *troubles* dealing
* with the math overloading past 32 bits, thus we must limit this * with the math overloading past 32 bits, thus we must limit this
* field. * field.
*
* FIXME: this assumes the memory is mapped zero->n, which isnt
* always true on real computers.
*/ */
if ((num_physpages << (PAGE_SHIFT - 12)) <= AAC_MAX_HOSTPHYSMEMPAGES) { if ((num_physpages << (PAGE_SHIFT - 12)) <= AAC_MAX_HOSTPHYSMEMPAGES) {
init->HostPhysMemPages = init->HostPhysMemPages =
...@@ -140,7 +143,7 @@ static void aac_queue_init(struct aac_dev * dev, struct aac_queue * q, u32 *mem, ...@@ -140,7 +143,7 @@ static void aac_queue_init(struct aac_dev * dev, struct aac_queue * q, u32 *mem,
q->dev = dev; q->dev = dev;
INIT_LIST_HEAD(&q->pendingq); INIT_LIST_HEAD(&q->pendingq);
init_waitqueue_head(&q->cmdready); init_waitqueue_head(&q->cmdready);
AAC_INIT_LIST_HEAD(&q->cmdq); INIT_LIST_HEAD(&q->cmdq);
init_waitqueue_head(&q->qfull); init_waitqueue_head(&q->qfull);
spin_lock_init(&q->lockdata); spin_lock_init(&q->lockdata);
q->lock = &q->lockdata; q->lock = &q->lockdata;
......
drivers/scsi/aacraid/commsup.c
View file @ 842b7fa8
...@@ -133,13 +133,10 @@ struct fib * fib_alloc(struct aac_dev *dev) ...@@ -133,13 +133,10 @@ struct fib * fib_alloc(struct aac_dev *dev)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&dev->fib_lock, flags); spin_lock_irqsave(&dev->fib_lock, flags);
fibptr = dev->free_fib; fibptr = dev->free_fib;
while(!fibptr){ /* Cannot sleep here or you get hangs. Instead we did the
spin_unlock_irqrestore(&dev->fib_lock, flags); maths at compile time. */
set_current_state(TASK_UNINTERRUPTIBLE); if(!fibptr)
schedule_timeout(1); BUG();
spin_lock_irqsave(&dev->fib_lock, flags);
fibptr = dev->free_fib;
}
dev->free_fib = fibptr->next; dev->free_fib = fibptr->next;
spin_unlock_irqrestore(&dev->fib_lock, flags); spin_unlock_irqrestore(&dev->fib_lock, flags);
/* /*
...@@ -290,7 +287,7 @@ static int aac_get_entry (struct aac_dev * dev, u32 qid, struct aac_entry **entr ...@@ -290,7 +287,7 @@ static int aac_get_entry (struct aac_dev * dev, u32 qid, struct aac_entry **entr
} }
} }
/*Command thread: * /**
* aac_queue_get - get the next free QE * aac_queue_get - get the next free QE
* @dev: Adapter * @dev: Adapter
* @index: Returned index * @index: Returned index
...@@ -450,8 +447,7 @@ int fib_send(u16 command, struct fib * fibptr, unsigned long size, int priority ...@@ -450,8 +447,7 @@ int fib_send(u16 command, struct fib * fibptr, unsigned long size, int priority
* Map the fib into 32bits by using the fib number * Map the fib into 32bits by using the fib number
*/ */
// hw_fib->header.SenderFibAddress = ((u32)(fibptr-dev->fibs)) << 1; hw_fib->header.SenderFibAddress = cpu_to_le32(((u32)(fibptr-dev->fibs)) << 1);
hw_fib->header.SenderFibAddress = cpu_to_le32((u32)(ulong)fibptr->hw_fib_pa);
hw_fib->header.SenderData = (u32)(fibptr - dev->fibs); hw_fib->header.SenderData = (u32)(fibptr - dev->fibs);
/* /*
* Set FIB state to indicate where it came from and if we want a * Set FIB state to indicate where it came from and if we want a
...@@ -492,7 +488,7 @@ int fib_send(u16 command, struct fib * fibptr, unsigned long size, int priority ...@@ -492,7 +488,7 @@ int fib_send(u16 command, struct fib * fibptr, unsigned long size, int priority
dprintk((KERN_DEBUG " Command = %d.\n", hw_fib->header.Command)); dprintk((KERN_DEBUG " Command = %d.\n", hw_fib->header.Command));
dprintk((KERN_DEBUG " XferState = %x.\n", hw_fib->header.XferState)); dprintk((KERN_DEBUG " XferState = %x.\n", hw_fib->header.XferState));
dprintk((KERN_DEBUG " hw_fib va being sent=%p\n",fibptr->hw_fib)); dprintk((KERN_DEBUG " hw_fib va being sent=%p\n",fibptr->hw_fib));
dprintk((KERN_DEBUG " hw_fib pa being sent=%xl\n",(ulong)fibptr->hw_fib_pa)); dprintk((KERN_DEBUG " hw_fib pa being sent=%lx\n",(ulong)fibptr->hw_fib_pa));
dprintk((KERN_DEBUG " fib being sent=%p\n",fibptr)); dprintk((KERN_DEBUG " fib being sent=%p\n",fibptr));
/* /*
* Fill in the Callback and CallbackContext if we are not * Fill in the Callback and CallbackContext if we are not
...@@ -806,8 +802,8 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr) ...@@ -806,8 +802,8 @@ static void aac_handle_aif(struct aac_dev * dev, struct fib * fibptr)
int aac_command_thread(struct aac_dev * dev) int aac_command_thread(struct aac_dev * dev)
{ {
struct hw_fib *hw_fib, *newfib; struct hw_fib *hw_fib, *hw_newfib;
struct fib fibptr; /* for error logging */ struct fib *fib, *newfib;
struct aac_queue_block *queues = dev->queues; struct aac_queue_block *queues = dev->queues;
struct aac_fib_context *fibctx; struct aac_fib_context *fibctx;
unsigned long flags; unsigned long flags;
...@@ -828,42 +824,44 @@ int aac_command_thread(struct aac_dev * dev) ...@@ -828,42 +824,44 @@ int aac_command_thread(struct aac_dev * dev)
* Let the DPC know it has a place to send the AIF's to. * Let the DPC know it has a place to send the AIF's to.
*/ */
dev->aif_thread = 1; dev->aif_thread = 1;
memset(&fibptr, 0, sizeof(struct fib));
add_wait_queue(&queues->queue[HostNormCmdQueue].cmdready, &wait); add_wait_queue(&queues->queue[HostNormCmdQueue].cmdready, &wait);
set_current_state(TASK_INTERRUPTIBLE); set_current_state(TASK_INTERRUPTIBLE);
while(1) while(1)
{ {
spin_lock_irqsave(queues->queue[HostNormCmdQueue].lock, flags); spin_lock_irqsave(queues->queue[HostNormCmdQueue].lock, flags);
while(!aac_list_empty(&(queues->queue[HostNormCmdQueue].cmdq))) { while(!list_empty(&(queues->queue[HostNormCmdQueue].cmdq))) {
struct aac_list_head *entry; struct list_head *entry;
struct aac_aifcmd * aifcmd; struct aac_aifcmd * aifcmd;
set_current_state(TASK_RUNNING); set_current_state(TASK_RUNNING);
entry = (struct aac_list_head*)(ulong)(queues->queue[HostNormCmdQueue].cmdq.next); entry = queues->queue[HostNormCmdQueue].cmdq.next;
dprintk(("aacraid: Command thread: removing fib from cmdq (%p)\n",entry)); list_del(entry);
aac_list_del(entry);
spin_unlock_irqrestore(queues->queue[HostNormCmdQueue].lock, flags); spin_unlock_irqrestore(queues->queue[HostNormCmdQueue].lock, flags);
hw_fib = aac_list_entry(entry, struct hw_fib, header.FibLinks); fib = list_entry(entry, struct fib, fiblink);
/* /*
* We will process the FIB here or pass it to a * We will process the FIB here or pass it to a
* worker thread that is TBD. We Really can't * worker thread that is TBD. We Really can't
* do anything at this point since we don't have * do anything at this point since we don't have
* anything defined for this thread to do. * anything defined for this thread to do.
*/ */
memset(&fibptr, 0, sizeof(struct fib)); hw_fib = fib->hw_fib;
fibptr.type = FSAFS_NTC_FIB_CONTEXT; memset(fib, 0, sizeof(struct fib));
fibptr.size = sizeof( struct fib ); fib->type = FSAFS_NTC_FIB_CONTEXT;
fibptr.hw_fib = hw_fib; fib->size = sizeof( struct fib );
fibptr.data = hw_fib->data; fib->hw_fib = hw_fib;
fibptr.dev = dev; fib->data = hw_fib->data;
fib->dev = dev;
/* /*
* We only handle AifRequest fibs from the adapter. * We only handle AifRequest fibs from the adapter.
*/ */
aifcmd = (struct aac_aifcmd *) hw_fib->data; aifcmd = (struct aac_aifcmd *) hw_fib->data;
if (aifcmd->command == le16_to_cpu(AifCmdDriverNotify)) { if (aifcmd->command == cpu_to_le32(AifCmdDriverNotify)) {
aac_handle_aif(dev, &fibptr); /* Handle Driver Notify Events */
aac_handle_aif(dev, fib);
*(u32 *)hw_fib->data = cpu_to_le32(ST_OK);
fib_adapter_complete(fib, sizeof(u32));
} else { } else {
struct list_head *entry; struct list_head *entry;
/* The u32 here is important and intended. We are using /* The u32 here is important and intended. We are using
...@@ -872,6 +870,10 @@ int aac_command_thread(struct aac_dev * dev) ...@@ -872,6 +870,10 @@ int aac_command_thread(struct aac_dev * dev)
u32 time_now, time_last; u32 time_now, time_last;
unsigned long flagv; unsigned long flagv;
/* Sniff events */
if (aifcmd->command == cpu_to_le32(AifCmdEventNotify))
aac_handle_aif(dev, fib);
time_now = jiffies/HZ; time_now = jiffies/HZ;
spin_lock_irqsave(&dev->fib_lock, flagv); spin_lock_irqsave(&dev->fib_lock, flagv);
...@@ -893,6 +895,11 @@ int aac_command_thread(struct aac_dev * dev) ...@@ -893,6 +895,11 @@ int aac_command_thread(struct aac_dev * dev)
*/ */
if (fibctx->count > 20) if (fibctx->count > 20)
{ {
/*
* It's *not* jiffies folks,
* but jiffies / HZ so do not
* panic ...
*/
time_last = fibctx->jiffies; time_last = fibctx->jiffies;
/* /*
* Has it been > 2 minutes * Has it been > 2 minutes
...@@ -909,17 +916,20 @@ int aac_command_thread(struct aac_dev * dev) ...@@ -909,17 +916,20 @@ int aac_command_thread(struct aac_dev * dev)
* Warning: no sleep allowed while * Warning: no sleep allowed while
* holding spinlock * holding spinlock
*/ */
newfib = kmalloc(sizeof(struct hw_fib), GFP_ATOMIC); hw_newfib = kmalloc(sizeof(struct hw_fib), GFP_ATOMIC);
if (newfib) { newfib = kmalloc(sizeof(struct fib), GFP_ATOMIC);
if (newfib && hw_newfib) {
/* /*
* Make the copy of the FIB * Make the copy of the FIB
*/ */
memcpy(newfib, hw_fib, sizeof(struct hw_fib)); memcpy(hw_newfib, hw_fib, sizeof(struct hw_fib));
memcpy(newfib, fib, sizeof(struct fib));
newfib->hw_fib = hw_newfib;
/* /*
* Put the FIB onto the * Put the FIB onto the
* fibctx's fibs * fibctx's fibs
*/ */
aac_list_add_tail(&newfib->header.FibLinks, &fibctx->hw_fib_list); list_add_tail(&newfib->fiblink, &fibctx->fib_list);
fibctx->count++; fibctx->count++;
/* /*
* Set the event to wake up the * Set the event to wake up the
...@@ -928,6 +938,10 @@ int aac_command_thread(struct aac_dev * dev) ...@@ -928,6 +938,10 @@ int aac_command_thread(struct aac_dev * dev)
up(&fibctx->wait_sem); up(&fibctx->wait_sem);
} else { } else {
printk(KERN_WARNING "aifd: didn't allocate NewFib.\n"); printk(KERN_WARNING "aifd: didn't allocate NewFib.\n");
if(newfib)
kfree(newfib);
if(hw_newfib)
kfree(hw_newfib);
} }
entry = entry->next; entry = entry->next;
} }
...@@ -935,10 +949,11 @@ int aac_command_thread(struct aac_dev * dev) ...@@ -935,10 +949,11 @@ int aac_command_thread(struct aac_dev * dev)
* Set the status of this FIB * Set the status of this FIB
*/ */
*(u32 *)hw_fib->data = cpu_to_le32(ST_OK); *(u32 *)hw_fib->data = cpu_to_le32(ST_OK);
fib_adapter_complete(&fibptr, sizeof(u32)); fib_adapter_complete(fib, sizeof(u32));
spin_unlock_irqrestore(&dev->fib_lock, flagv); spin_unlock_irqrestore(&dev->fib_lock, flagv);
} }
spin_lock_irqsave(queues->queue[HostNormCmdQueue].lock, flags); spin_lock_irqsave(queues->queue[HostNormCmdQueue].lock, flags);
kfree(fib);
} }
/* /*
* There are no more AIF's * There are no more AIF's
......
drivers/scsi/aacraid/dpcsup.c
View file @ 842b7fa8
...@@ -70,12 +70,12 @@ unsigned int aac_response_normal(struct aac_queue * q) ...@@ -70,12 +70,12 @@ unsigned int aac_response_normal(struct aac_queue * q)
*/ */
while(aac_consumer_get(dev, q, &entry)) while(aac_consumer_get(dev, q, &entry))
{ {
u32 fast ; int fast;
fast = (entry->addr & cpu_to_le32(0x01)); u32 index = le32_to_cpu(entry->addr);
hwfib = (struct hw_fib *)((char *)dev->hw_fib_va + fast = index & 0x01;
((entry->addr & ~0x01) - dev->hw_fib_pa)); fib = &dev->fibs[index >> 1];
fib = &dev->fibs[hwfib->header.SenderData]; hwfib = fib->hw_fib;
aac_consumer_free(dev, q, HostNormRespQueue); aac_consumer_free(dev, q, HostNormRespQueue);
/* /*
* Remove this fib from the Outstanding I/O queue. * Remove this fib from the Outstanding I/O queue.
...@@ -169,29 +169,44 @@ unsigned int aac_command_normal(struct aac_queue *q) ...@@ -169,29 +169,44 @@ unsigned int aac_command_normal(struct aac_queue *q)
*/ */
while(aac_consumer_get(dev, q, &entry)) while(aac_consumer_get(dev, q, &entry))
{ {
struct fib fibctx;
struct hw_fib * hw_fib; struct hw_fib * hw_fib;
hw_fib = (struct hw_fib *)((char *)dev->hw_fib_va + u32 index;
((entry->addr & ~0x01) - dev->hw_fib_pa)); struct fib *fib = &fibctx;
if (dev->aif_thread) { index = le32_to_cpu(entry->addr) / sizeof(struct hw_fib);
aac_list_add_tail(&hw_fib->header.FibLinks, &q->cmdq); hw_fib = &dev->aif_base_va[index];
/*
* Allocate a FIB at all costs. For non queued stuff
* we can just use the stack so we are happy. We need
* a fib object in order to manage the linked lists
*/
if (dev->aif_thread)
if((fib = kmalloc(sizeof(struct fib), GFP_ATOMIC)) == NULL)
fib = &fibctx;
memset(fib, 0, sizeof(struct fib));
INIT_LIST_HEAD(&fib->fiblink);
fib->type = FSAFS_NTC_FIB_CONTEXT;
fib->size = sizeof(struct fib);
fib->hw_fib = hw_fib;
fib->data = hw_fib->data;
fib->dev = dev;
if (dev->aif_thread && fib != &fibctx) {
list_add_tail(&fib->fiblink, &q->cmdq);
aac_consumer_free(dev, q, HostNormCmdQueue); aac_consumer_free(dev, q, HostNormCmdQueue);
wake_up_interruptible(&q->cmdready); wake_up_interruptible(&q->cmdready);
} else { } else {
struct fib fibctx;
aac_consumer_free(dev, q, HostNormCmdQueue); aac_consumer_free(dev, q, HostNormCmdQueue);
spin_unlock_irqrestore(q->lock, flags); spin_unlock_irqrestore(q->lock, flags);
memset(&fibctx, 0, sizeof(struct fib));
fibctx.type = FSAFS_NTC_FIB_CONTEXT;
fibctx.size = sizeof(struct fib);
fibctx.hw_fib = hw_fib;
fibctx.data = hw_fib->data;
fibctx.dev = dev;
/* /*
* Set the status of this FIB * Set the status of this FIB
*/ */
*(u32 *)hw_fib->data = cpu_to_le32(ST_OK); *(u32 *)hw_fib->data = cpu_to_le32(ST_OK);
fib_adapter_complete(&fibctx, sizeof(u32)); fib_adapter_complete(fib, sizeof(u32));
spin_lock_irqsave(q->lock, flags); spin_lock_irqsave(q->lock, flags);
} }
} }
......
drivers/scsi/aacraid/sa.c
View file @ 842b7fa8
...@@ -419,6 +419,11 @@ int aac_sa_init(struct aac_dev *dev, unsigned long devnum) ...@@ -419,6 +419,11 @@ int aac_sa_init(struct aac_dev *dev, unsigned long devnum)
* Start any kernel threads needed * Start any kernel threads needed
*/ */
dev->thread_pid = kernel_thread((int (*)(void *))aac_command_thread, dev, 0); dev->thread_pid = kernel_thread((int (*)(void *))aac_command_thread, dev, 0);
if (dev->thread_pid < 0) {
printk(KERN_ERR "aacraid: Unable to create command thread.\n");
return -1;
}
/* /*
* Tell the adapter that all is configure, and it can start * Tell the adapter that all is configure, and it can start
* accepting requests * accepting requests
......
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