2004-09-20 19:25:08

by Mike Miller

Subject: fix for cpqarray for 2.6.9-rc2

This patch fixes a problem with cpqarray and the SA4200 controller.
Our online config utility cannot properly communicate with the controller.
Patch by [email protected].
Applies to 2.6.9-rc2. Please consider this for inclusion.

Thanks,
mikem
-------------------------------------------------------------------------------
diff -burNp lx269-rc2.orig/drivers/block/cpqarray.c lx269-rc2/drivers/block/cpqarray.c
--- lx269-rc2.orig/drivers/block/cpqarray.c 2004-08-14 00:36:17.000000000 -0500
+++ lx269-rc2/drivers/block/cpqarray.c 2004-09-20 14:15:39.781595280 -0500
@@ -1286,6 +1286,7 @@ static int ida_ctlr_ioctl(ctlr_info_t *h
c->req.hdr.sg_cnt = 1;
break;
case IDA_READ:
+ case SENSE_SURF_STATUS:
case READ_FLASH_ROM:
case SENSE_CONTROLLER_PERFORMANCE:
p = kmalloc(io->sg[0].size, GFP_KERNEL);
@@ -1351,6 +1352,7 @@ static int ida_ctlr_ioctl(ctlr_info_t *h
sizeof(ida_ioctl_t),
PCI_DMA_BIDIRECTIONAL);
case IDA_READ:
+ case SENSE_SURF_STATUS:
case DIAG_PASS_THRU:
case SENSE_CONTROLLER_PERFORMANCE:
case READ_FLASH_ROM:
diff -burNp lx269-rc2.orig/drivers/block/ida_cmd.h lx269-rc2/drivers/block/ida_cmd.h
--- lx269-rc2.orig/drivers/block/ida_cmd.h 2004-08-14 00:36:44.000000000 -0500
+++ lx269-rc2/drivers/block/ida_cmd.h 2004-09-20 14:15:39.782595128 -0500
@@ -318,6 +318,8 @@ typedef struct {
__u8 reserved[510];
} mp_delay_t;

+#define SENSE_SURF_STATUS 0x70
+
#define PASSTHRU_A 0x91
typedef struct {
__u8 target;

2004-09-20 19:46:16

by Jeff Garzik

Subject: Re: fix for cpqarray for 2.6.9-rc2

[email protected] wrote:
> diff -burNp lx269-rc2.orig/drivers/block/ida_cmd.h lx269-rc2/drivers/block/ida_cmd.h
> --- lx269-rc2.orig/drivers/block/ida_cmd.h 2004-08-14 00:36:44.000000000 -0500
> +++ lx269-rc2/drivers/block/ida_cmd.h 2004-09-20 14:15:39.782595128 -0500
> @@ -318,6 +318,8 @@ typedef struct {
> __u8 reserved[510];
> } mp_delay_t;
>
> +#define SENSE_SURF_STATUS 0x70


I guess the return codes for this op are along the lines of "calm",
"bitchin", and "gnarly"?

Jeff

2004-09-20 20:20:42

by Mike Miller (OS Dev)

Subject: Re: fix for cpqarray for 2.6.9-rc2

On Mon, Sep 20, 2004 at 03:45:59PM -0400, Jeff Garzik wrote:
> [email protected] wrote:
> >diff -burNp lx269-rc2.orig/drivers/block/ida_cmd.h
> >lx269-rc2/drivers/block/ida_cmd.h
> >--- lx269-rc2.orig/drivers/block/ida_cmd.h 2004-08-14
> >00:36:44.000000000 -0500
> >+++ lx269-rc2/drivers/block/ida_cmd.h 2004-09-20 14:15:39.782595128 -0500
> >@@ -318,6 +318,8 @@ typedef struct {
> > __u8 reserved[510];
> > } mp_delay_t;
> >
> >+#define SENSE_SURF_STATUS 0x70
>
>
> I guess the return codes for this op are along the lines of "calm",
> "bitchin", and "gnarly"?
>
> Jeff

Hint taken, Chirag pls return something meaningful.

mikem
>
>