dalecki wrote:
> -#if LINUX_VERSION_CODE > 0x020024
> #include <asm/uaccess.h>
> -#endif
*cheer*
> -u32 RDINDOOR (mega_host_config * megaCfg)
> +ulong RDINDOOR (mega_host_config * megaCfg)
> -void WRINDOOR (mega_host_config * megaCfg, u32 value)
> +void WRINDOOR (mega_host_config * megaCfg, ulong value)
> -u32 RDOUTDOOR (mega_host_config * megaCfg)
> +ulong RDOUTDOOR (mega_host_config * megaCfg)
> -void WROUTDOOR (mega_host_config * megaCfg, u32 value)
> +void WROUTDOOR (mega_host_config * megaCfg, ulong value)
[unless there is a prototype not seen in the patch...] this looks like
namespace pollution. Can you mark these 'static' ?
> +#define IO_LOCK_T unsigned long io_flags;
> #define IO_LOCK spin_lock_irqsave(&io_request_lock,io_flags);
> #define IO_UNLOCK spin_unlock_irqrestore(&io_request_lock,io_flags);
hmmm, I'm not sure if its a good idea to hide this stuff in macros.
> +#ifndef PCI_DEVICE_ID_INTEL_80960_RP
> +#define PCI_DEVICE_ID_INTEL_80960_RP 0x1960
> +#endif
please update include/linux/pci_ids.h too when PCI ids are missing from
there. PCI_DEVICE_ID_INTEL_80960_RP at least is not listed there.
> -static spinlock_t serial_lock = SPIN_LOCK_UNLOCKED;
> +volatile static spinlock_t serial_lock;
Why do you need to mark this volatile??
BUG: You still need the SPIN_LOCK_UNLOCKED because I don't see an
associated spin_lock_init in your path.
> +static int mega_driver_ioctl (mega_host_config * megaCfg, Scsi_Cmnd * SCpnt)
> +{
> + unsigned char *data = (unsigned char *)SCpnt->request_buffer;
cast not necessary. request_buffer is a void.
> @@ -820,7 +925,7 @@
> mailbox = (mega_mailbox *) & pScb->mboxData;
> memset (mailbox, 0, sizeof (pScb->mboxData));
>
> - if (data[0] == 0x03) { /* passthrough command */
> + if (data[0] == 0x03) { /* passthrough command */
> unsigned char cdblen = data[2];
> pthru = &pScb->pthru;
> memset (pthru, 0, sizeof (mega_passthru));
this file is beginning to look like it needs a CodingStyle reformat.
-after- the fixes and such have been applied, you might consider running
'indent' on this puppy.
> + switch (data[0])
> + {
> + case FW_FIRE_WRITE:
> + case FW_FIRE_FLASH:
> + printk("megaraid:Write/ Flash called\n");
> + if ((ulong)user_area & (PAGE_SIZE - 1)) {
> + printk("megaraid:user address not aligned on 4K boundary.Error.\n");
> + SCpnt->result = (DID_ERROR << 16);
> + callDone (SCpnt);
> + return NULL;
> + }
> + break;
> + case DCMD_FC_CMD:
> + mega_build_user_sg(user_area, xfer_size, pScb, mbox);
> + break;
> }
> - copy_from_user(kern_area,user_area,xfer_size);
> - pScb->kern_area = kern_area;
What happened to copy_from_user? mega_build_user_sg is called with
user_area as an arg, and it never calls copy_from_user or similar
functions.
(I understand if this is a bug fix to remove copy_from_user, but I just
want to make sure it is intentional...)
> + TRACE (("ISR called reentrantly!!\n"));
> + printk ("ISR called reentrantly!!\n");
All printks need KERN_xxx prefix
> else {
> - printk(KERN_ERR "megaraid: wrong cmd id completed from
>firmware:id=%x\n",sIdx);
> + printk("megaraid: wrong cmd id completed from firmware:id=%x\n",sIdx);
hmmm........
> /* Copy mailbox data into host structure */
> megaCfg->mbox64->xferSegment = 0;
> - memcpy (mbox, mboxData, 16);
> + memcpy ((char *)mbox, mboxData, 16);
wrong. memcpy takes a void* as its first arg, so no need for a cast.
> + while (mbox->numstatus == 0xFF);
> + while (mbox->status == 0xFF);
> + while (mbox->mraid_poll != 0x77);
don't you need barriers or something here?
> megaCfg->mbox = &megaCfg->mailbox64.mailbox;
> - megaCfg->mbox = (mega_mailbox *) ((((u32) megaCfg->mbox) + 16) & 0xfffffff0);
> +#ifdef __LP64__
> + megaCfg->mbox = (mega_mailbox *) ((((u64) megaCfg->mbox) + 16) & ( (ulong)(-1) ^
>0x0F) );
> megaCfg->mbox64 = (mega_mailbox64 *) (megaCfg->mbox - 4);
> - paddr = (paddr + 4 + 16) & 0xfffffff0;
> + paddr = (paddr + 4 + 16) & ( (u64)(-1) ^ 0x0F );
> +#else
> + megaCfg->mbox = (mega_mailbox *) ((((u32) megaCfg->mbox) + 16) & 0xFFFFFFF0);
> + megaCfg->mbox64 = (mega_mailbox64 *) (megaCfg->mbox - 4);
> + paddr = (paddr + 4 + 16) & 0xFFFFFFF0;
> +#endif
heh
> + pci_read_config_word (pdev,
> + PCI_SUBSYSTEM_VENDOR_ID,
> + &subsysvid);
> + pci_read_config_word (pdev,
> + PCI_SUBSYSTEM_ID,
> + &subsysid);
wrong. get these out of struct pci_dev.
pci_dev::subsystem_{vendor,device}.
> + count += mega_findCard (pHostTmpl, PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID,
>0);
> + count += mega_findCard (pHostTmpl, PCI_VENDOR_ID_AMI,
>PCI_DEVICE_ID_AMI_MEGARAID2, 0);
> + count += mega_findCard (pHostTmpl, PCI_VENDOR_ID_AMI,
>PCI_DEVICE_ID_AMI_MEGARAID3, BOARD_QUARTZ);
> + count += mega_findCard (pHostTmpl, PCI_VENDOR_ID_INTEL,
>PCI_DEVICE_ID_INTEL_80960_RP, BOARD_QUARTZ);
The new PCI API would make this and a lot of other mess in this driver
go away. Check out
Documentation/pci.txt
Documentation/DMA-mapping.txt
> +#ifdef CONFIG_PROC_FS
> + if (count) {
> + mega_proc_dir_entry = proc_mkdir("megaraid", &proc_root);
wrong. don't stick random stuff in /proc in 2.4.x. random stuff goes
into /proc/driver unless there is a more suitable subdirectory...
> + megaCfg->proc_read = CREATE_READ_PROC("config", proc_read_config);
> + megaCfg->proc_status = CREATE_READ_PROC("status", proc_read_status);
> + megaCfg->proc_stat = CREATE_READ_PROC("stat", proc_read_stat);
> + megaCfg->proc_mbox = CREATE_READ_PROC("mailbox", proc_read_mbox);
what happens if any of these fail?
> +#define PROCBUFSIZE 4096
procfs itself gives you a page, but treats it as a smaller buffer for
sanity's sake. you should do the same. grep output:
> [jgarzik@rum linux_2_4]$ grep 1024 fs/proc/*.c
> fs/proc/base.c:#define PROC_BLOCK_SIZE (3*1024) /* 4K page size but
>our output routines use some slack for overruns */
> fs/proc/generic.c:#define PROC_BLOCK_SIZE (PAGE_SIZE - 1024)
--
Jeff Garzik |
Building 1024 | The chief enemy of creativity is "good" sense
MandrakeSoft | -- Picasso
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
Please read the FAQ at http://www.tux.org/lkml/
