* [parisc-linux] ncr53c8xx patch for c110
[not found] ` <40D30E3C.1010809@tiscali.be>
@ 2004-06-18 20:01 ` Joel Soete
[not found] ` <35844.127.0.0.1.1087594933.squirrel@www.puszczka.com>
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Joel Soete @ 2004-06-18 20:01 UTC (permalink / raw)
To: James Bottomley, Grant Grundler; +Cc: parisc-linux
[-- Attachment #1: Type: text/plain, Size: 6159 bytes --]
Hello James & Grant,
Joel Soete wrote:
>
> otc I trust that backporting sym_scatter() into ncr_scatter() is a fix
> ;) (i was not very sure)
[snip]
>
>
> James Bottomley wrote:
>
>> Could you try this. It doesn't fix the problems in the ncr driver, but
>> it does force the block layer to respect the DISABLE_CLUSTERING flag.
>>
>> James
>>
>> ===== drivers/block/ll_rw_blk.c 1.244 vs edited =====
>> --- 1.244/drivers/block/ll_rw_blk.c 2004-05-29 11:18:19 -05:00
>> +++ edited/drivers/block/ll_rw_blk.c 2004-06-18 09:27:19 -05:00
>> @@ -850,7 +850,7 @@
>> continue;
>> }
>> new_segment:
>> - if (BIOVEC_VIRT_MERGEABLE(bvprv, bv) &&
>> + if (cluster && BIOVEC_VIRT_MERGEABLE(bvprv, bv) &&
>> !BIOVEC_VIRT_OVERSIZE(hw_seg_size + bv->bv_len)) {
>> hw_seg_size += bv->bv_len;
>> } else {
>>
>>
>
I just test your patch and the following "backport" of sym_scatter in ncr53c8xx:
--- linux-2.6.7-pa1-wrk/drivers/scsi/ncr53c8xx.h.orig 2004-06-18 20:30:09.000000000 +0200
+++ linux-2.6.7-pa1-wrk/drivers/scsi/ncr53c8xx.h 2004-06-18 21:15:45.703972000 +0200
@@ -48,6 +48,18 @@
#include "sym53c8xx_defs.h"
+/*
+ Build a scatter/gather entry.
+ see sym53c8xx_2/sym_hipd.h for more detailed sym_build_sge()
+ implementation ;)
+ */
+
+#define ncr_build_sge(np, data, badd, len) \
+do { \
+ (data)->addr = cpu_to_scr(badd); \
+ (data)->size = cpu_to_scr(len); \
+} while (0)
+
/*==========================================================
**
** Structures used by the detection routine to transmit
--- linux-2.6.7-pa1-wrk/drivers/scsi/ncr53c8xx.c.orig 2004-05-30 01:28:20.000000000 +0200
+++ linux-2.6.7-pa1-wrk/drivers/scsi/ncr53c8xx.c 2004-06-18 21:53:34.803972000 +0200
@@ -91,7 +91,7 @@
*/
/* Name and version of the driver */
-#define SCSI_NCR_DRIVER_NAME "ncr53c8xx-3.4.3e"
+#define SCSI_NCR_DRIVER_NAME "ncr53c8xx-3.4.3f"
#define SCSI_NCR_DEBUG_FLAGS (0)
@@ -839,7 +839,7 @@
struct scr_tblmove smsg ;
struct scr_tblmove cmd ;
struct scr_tblmove sense ;
- struct scr_tblmove data [MAX_SCATTER];
+ struct scr_tblmove data[MAX_SCATTER];
};
@@ -3845,7 +3845,7 @@
direction = scsi_data_direction(cmd);
if (direction != SCSI_DATA_NONE) {
- segments = ncr_scatter (np, cp, cp->cmd);
+ segments = ncr_scatter(np, cp, cp->cmd);
if (segments < 0) {
ncr_free_ccb(np, cp);
return(DID_ERROR);
@@ -7575,44 +7575,57 @@
** sizes to the data segment array.
*/
-static int ncr_scatter(struct ncb *np, struct ccb *cp, struct scsi_cmnd *cmd)
+static int ncr_scatter_no_sglist(struct ncb *np, struct ccb *cp, struct scsi_cmnd *cmd)
{
- struct scr_tblmove *data;
- int segment = 0;
- int use_sg = (int) cmd->use_sg;
+ struct scr_tblmove *data = &cp->phys.data[MAX_SCATTER - 1];
+ int segment;
- data = cp->phys.data;
- cp->data_len = 0;
+ cp->data_len = cmd->request_bufflen;
- if (!use_sg) {
- if (cmd->request_bufflen) {
- u_long baddr = map_scsi_single_data(np, cmd);
-
- data = &data[MAX_SCATTER - 1];
- data[0].addr = cpu_to_scr(baddr);
- data[0].size = cpu_to_scr(cmd->request_bufflen);
- cp->data_len = cmd->request_bufflen;
+ if (cmd->request_bufflen) {
+ dma_addr_t baddr = map_scsi_single_data(np, cmd);
+ if (baddr) {
+ ncr_build_sge(np, data, baddr, cmd->request_bufflen);
segment = 1;
+ } else {
+ segment = -2;
}
+ } else {
+ segment = 0;
}
- else if (use_sg <= MAX_SCATTER) {
+
+ return segment;
+}
+
+static int ncr_scatter(struct ncb *np, struct ccb *cp, struct scsi_cmnd *cmd)
+{
+ int segment = 0;
+ int use_sg = (int) cmd->use_sg;
+
+ cp->data_len = 0;
+
+ if (!use_sg)
+ segment = ncr_scatter_no_sglist(np, cp, cmd);
+ else if ((use_sg = map_scsi_sg_data(np, cmd)) > 0) {
struct scatterlist *scatter = (struct scatterlist *)cmd->buffer;
+ struct scr_tblmove *data;
+
+ if (use_sg > MAX_SCATTER) {
+ unmap_scsi_data(np, cmd);
+ return -1;
+ }
+
+ data = &cp->phys.data[MAX_SCATTER - use_sg];
- use_sg = map_scsi_sg_data(np, cmd);
- data = &data[MAX_SCATTER - use_sg];
+ for (segment = 0; segment < use_sg; segment++) {
+ dma_addr_t baddr = sg_dma_address(&scatter[segment]);
+ unsigned int len = sg_dma_len(&scatter[segment]);
- while (segment < use_sg) {
- u_long baddr = scsi_sg_dma_address(&scatter[segment]);
- unsigned int len = scsi_sg_dma_len(&scatter[segment]);
-
- data[segment].addr = cpu_to_scr(baddr);
- data[segment].size = cpu_to_scr(len);
- cp->data_len += len;
- ++segment;
+ ncr_build_sge(np, &data[segment], baddr, len);
+ cp->data_len += len;
}
- }
- else {
- return -1;
+ } else {
+ segment = -2;
}
return segment;
=========><=========
And all works fine now for me. Unfortunately I don't have other model (C, D, R, J or K) using the same driver to test it more :(
I don't have any cvs ci access, so if there are no negative feedback can somebody ci.
Thanks in advance,
Joel
PS: I just noticed that this cut&past didn't respect my patch tabs (became 8 space) so I attache also the original diff file
(sorry for inconvenience
[-- Attachment #2: ncr53c8xx.diff --]
[-- Type: text/plain, Size: 3409 bytes --]
--- linux-2.6.7-pa1-wrk/drivers/scsi/ncr53c8xx.h.orig 2004-06-18 20:30:09.000000000 +0200
+++ linux-2.6.7-pa1-wrk/drivers/scsi/ncr53c8xx.h 2004-06-18 21:15:45.703972000 +0200
@@ -48,6 +48,18 @@
#include "sym53c8xx_defs.h"
+/*
+ Build a scatter/gather entry.
+ see sym53c8xx_2/sym_hipd.h for more detailed sym_build_sge()
+ implementation ;)
+ */
+
+#define ncr_build_sge(np, data, badd, len) \
+do { \
+ (data)->addr = cpu_to_scr(badd); \
+ (data)->size = cpu_to_scr(len); \
+} while (0)
+
/*==========================================================
**
** Structures used by the detection routine to transmit
--- linux-2.6.7-pa1-wrk/drivers/scsi/ncr53c8xx.c.orig 2004-05-30 01:28:20.000000000 +0200
+++ linux-2.6.7-pa1-wrk/drivers/scsi/ncr53c8xx.c 2004-06-18 21:53:34.803972000 +0200
@@ -91,7 +91,7 @@
*/
/* Name and version of the driver */
-#define SCSI_NCR_DRIVER_NAME "ncr53c8xx-3.4.3e"
+#define SCSI_NCR_DRIVER_NAME "ncr53c8xx-3.4.3f"
#define SCSI_NCR_DEBUG_FLAGS (0)
@@ -839,7 +839,7 @@
struct scr_tblmove smsg ;
struct scr_tblmove cmd ;
struct scr_tblmove sense ;
- struct scr_tblmove data [MAX_SCATTER];
+ struct scr_tblmove data[MAX_SCATTER];
};
@@ -3845,7 +3845,7 @@
direction = scsi_data_direction(cmd);
if (direction != SCSI_DATA_NONE) {
- segments = ncr_scatter (np, cp, cp->cmd);
+ segments = ncr_scatter(np, cp, cp->cmd);
if (segments < 0) {
ncr_free_ccb(np, cp);
return(DID_ERROR);
@@ -7575,44 +7575,57 @@
** sizes to the data segment array.
*/
-static int ncr_scatter(struct ncb *np, struct ccb *cp, struct scsi_cmnd *cmd)
+static int ncr_scatter_no_sglist(struct ncb *np, struct ccb *cp, struct scsi_cmnd *cmd)
{
- struct scr_tblmove *data;
- int segment = 0;
- int use_sg = (int) cmd->use_sg;
+ struct scr_tblmove *data = &cp->phys.data[MAX_SCATTER - 1];
+ int segment;
- data = cp->phys.data;
- cp->data_len = 0;
+ cp->data_len = cmd->request_bufflen;
- if (!use_sg) {
- if (cmd->request_bufflen) {
- u_long baddr = map_scsi_single_data(np, cmd);
-
- data = &data[MAX_SCATTER - 1];
- data[0].addr = cpu_to_scr(baddr);
- data[0].size = cpu_to_scr(cmd->request_bufflen);
- cp->data_len = cmd->request_bufflen;
+ if (cmd->request_bufflen) {
+ dma_addr_t baddr = map_scsi_single_data(np, cmd);
+ if (baddr) {
+ ncr_build_sge(np, data, baddr, cmd->request_bufflen);
segment = 1;
+ } else {
+ segment = -2;
}
+ } else {
+ segment = 0;
}
- else if (use_sg <= MAX_SCATTER) {
+
+ return segment;
+}
+
+static int ncr_scatter(struct ncb *np, struct ccb *cp, struct scsi_cmnd *cmd)
+{
+ int segment = 0;
+ int use_sg = (int) cmd->use_sg;
+
+ cp->data_len = 0;
+
+ if (!use_sg)
+ segment = ncr_scatter_no_sglist(np, cp, cmd);
+ else if ((use_sg = map_scsi_sg_data(np, cmd)) > 0) {
struct scatterlist *scatter = (struct scatterlist *)cmd->buffer;
+ struct scr_tblmove *data;
+
+ if (use_sg > MAX_SCATTER) {
+ unmap_scsi_data(np, cmd);
+ return -1;
+ }
+
+ data = &cp->phys.data[MAX_SCATTER - use_sg];
- use_sg = map_scsi_sg_data(np, cmd);
- data = &data[MAX_SCATTER - use_sg];
+ for (segment = 0; segment < use_sg; segment++) {
+ dma_addr_t baddr = sg_dma_address(&scatter[segment]);
+ unsigned int len = sg_dma_len(&scatter[segment]);
- while (segment < use_sg) {
- u_long baddr = scsi_sg_dma_address(&scatter[segment]);
- unsigned int len = scsi_sg_dma_len(&scatter[segment]);
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [parisc-linux] A couple of minor patches for 2.6.7-pa1g
[not found] ` <20040618212600.GB12572@engsoc.org>
@ 2004-06-19 0:33 ` John David Anglin
[not found] ` <35884.127.0.0.1.1087595933.squirrel@www.puszczka.com>
1 sibling, 0 replies; 8+ messages in thread
From: John David Anglin @ 2004-06-19 0:33 UTC (permalink / raw)
To: Kyle McMartin; +Cc: parisc-linux
> On Fri, Jun 18, 2004 at 11:42:13PM +0200, Andy Walker wrote:
> > -cflags-$(CONFIG_PA7300LC) += -march=1.1 -mschedule=7300
> > +cflags-$(CONFIG_PA7300LC) += -march=1.1 -mschedule=7100LC
>
> Yes it does. Update your GCC.
It was introduced in 3.3.
Dave
--
J. David Anglin dave.anglin@nrc-cnrc.gc.ca
National Research Council of Canada (613) 990-0752 (FAX: 952-6602)
_______________________________________________
parisc-linux mailing list
parisc-linux@lists.parisc-linux.org
http://lists.parisc-linux.org/mailman/listinfo/parisc-linux
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [parisc-linux] A couple of minor patches for 2.6.7-pa1
[not found] ` <35884.127.0.0.1.1087595933.squirrel@www.puszczka.com>
@ 2004-06-19 1:11 ` Grant Grundler
[not found] ` <20040618215310.GD12572@engsoc.org>
1 sibling, 0 replies; 8+ messages in thread
From: Grant Grundler @ 2004-06-19 1:11 UTC (permalink / raw)
To: Andy Walker; +Cc: parisc-linux
On Fri, Jun 18, 2004 at 11:58:53PM +0200, Andy Walker wrote:
> Errm, no thank you - unless there are very good reasons why I need a
> new GCC.
If you want 7300LC scheduling support?
There's a whole raft of bug fixes betweem gcc 3.0.4 and gcc 3.3.3.
But I can understand the reluctance to upgrade.
> The automated builds on http://cvs.parisc-linux.org/download/linux-2.6
These are developement kernels. Treat them like "unstable".
> are broken for the B180 config because of this change which sends out
> the message that current versions are broken on 7300LC. Bad message!
> And I don't think we should be forcing GCC upgrades on people like this.
This is not forcing anyone to upgrade unless they want to use
*exactly* that config file. It's not reasonable to build "unstable"
kernel debs from "stable" tool chain.
thanks,
grant
_______________________________________________
parisc-linux mailing list
parisc-linux@lists.parisc-linux.org
http://lists.parisc-linux.org/mailman/listinfo/parisc-linux
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [parisc-linux] A couple of minor patches for 2.6.7-pa1
[not found] ` <20040618215310.GD12572@engsoc.org>
@ 2004-06-19 1:28 ` Matthew Wilcox
2004-06-19 3:41 ` Kyle McMartin
0 siblings, 1 reply; 8+ messages in thread
From: Matthew Wilcox @ 2004-06-19 1:28 UTC (permalink / raw)
To: Kyle McMartin; +Cc: parisc-linux
On Fri, Jun 18, 2004 at 05:53:10PM -0400, Kyle McMartin wrote:
> willy posted a patch that checks the gcc version and uses 7100 or 7300
> based on it.
Actually, I didn't. Can anyone test this for me?
Index: arch/parisc/Makefile
===================================================================
RCS file: /var/cvs/linux-2.6/arch/parisc/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- arch/parisc/Makefile 19 Apr 2004 22:32:49 -0000 1.12
+++ arch/parisc/Makefile 19 Jun 2004 01:28:37 -0000
@@ -48,7 +48,7 @@ cflags-y += -ffunction-sections
cflags-$(CONFIG_PA7100) += -march=1.1 -mschedule=7100
cflags-$(CONFIG_PA7200) += -march=1.1 -mschedule=7200
cflags-$(CONFIG_PA7100LC) += -march=1.1 -mschedule=7100LC
-cflags-$(CONFIG_PA7300LC) += -march=1.1 -mschedule=7300
+cflags-$(CONFIG_PA7300LC) += $(call check_gcc,-march=1.1 -mschedule=7300,-march=1.1 -mschedule=7100LC)
cflags-$(CONFIG_PA8X00) += -march=2.0 -mschedule=8000
head-y := arch/parisc/kernel/head.o
--
"Next the statesmen will invent cheap lies, putting the blame upon
the nation that is attacked, and every man will be glad of those
conscience-soothing falsities, and will diligently study them, and refuse
to examine any refutations of them; and thus he will by and by convince
himself that the war is just, and will thank God for the better sleep
he enjoys after this process of grotesque self-deception." -- Mark Twain
_______________________________________________
parisc-linux mailing list
parisc-linux@lists.parisc-linux.org
http://lists.parisc-linux.org/mailman/listinfo/parisc-linux
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [parisc-linux] A couple of minor patches for 2.6.7-pa1
2004-06-19 1:28 ` Matthew Wilcox
@ 2004-06-19 3:41 ` Kyle McMartin
0 siblings, 0 replies; 8+ messages in thread
From: Kyle McMartin @ 2004-06-19 3:41 UTC (permalink / raw)
To: Matthew Wilcox; +Cc: parisc-linux
On Sat, Jun 19, 2004 at 02:28:55AM +0100, Matthew Wilcox wrote:
> -cflags-$(CONFIG_PA7300LC) += -march=1.1 -mschedule=7300
> +cflags-$(CONFIG_PA7300LC) += $(call check_gcc,-march=1.1 -mschedule=7300,-march=1.1 -mschedule=7100LC)
>
This works, but only if -Werror is passed to gcc as well, otherwise, it
only generates a warning and goes undetected. Without -Werror, the
kernel compile should succeed, as where it died before would be built
with 7100LC this way, though I'm unaware of the effect of mixing gcc
optimizations like this...
Regards,
--
Kyle McMartin
_______________________________________________
parisc-linux mailing list
parisc-linux@lists.parisc-linux.org
http://lists.parisc-linux.org/mailman/listinfo/parisc-linux
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [parisc-linux] ncr53c8xx patch for c110
2004-06-18 20:01 ` [parisc-linux] ncr53c8xx patch for c110 Joel Soete
[not found] ` <35844.127.0.0.1.1087594933.squirrel@www.puszczka.com>
@ 2004-06-20 5:55 ` Andy Walker
2004-06-20 7:28 ` [parisc-linux] " Grant Grundler
2004-06-21 7:48 ` [parisc-linux] " Andy Walker
3 siblings, 0 replies; 8+ messages in thread
From: Andy Walker @ 2004-06-20 5:55 UTC (permalink / raw)
To: Joel Soete; +Cc: parisc-linux
> Hello James & Grant,
> Joel Soete wrote:
>>
>> otc I trust that backporting sym_scatter() into ncr_scatter() is a fix
>> ;) (i was not very sure)
> [snip]
>>
>>
>> James Bottomley wrote:
>>
>>> Could you try this. It doesn't fix the problems in the ncr driver, but
>>> it does force the block layer to respect the DISABLE_CLUSTERING flag.
>>>
>>> James
>>>
>>> ===== drivers/block/ll_rw_blk.c 1.244 vs edited =====
>>> --- 1.244/drivers/block/ll_rw_blk.c 2004-05-29 11:18:19 -05:00
>>> +++ edited/drivers/block/ll_rw_blk.c 2004-06-18 09:27:19 -05:00
>>> @@ -850,7 +850,7 @@
>>> continue;
>>> }
>>> new_segment:
>>> - if (BIOVEC_VIRT_MERGEABLE(bvprv, bv) &&
>>> + if (cluster && BIOVEC_VIRT_MERGEABLE(bvprv, bv) &&
>>> !BIOVEC_VIRT_OVERSIZE(hw_seg_size + bv->bv_len)) {
>>> hw_seg_size += bv->bv_len;
>>> } else {
>>>
>>>
>>
> I just test your patch and the following "backport" of sym_scatter in
> ncr53c8xx:
> --- linux-2.6.7-pa1-wrk/drivers/scsi/ncr53c8xx.h.orig 2004-06-18
> 20:30:09.000000000 +0200
> +++ linux-2.6.7-pa1-wrk/drivers/scsi/ncr53c8xx.h 2004-06-18
> 21:15:45.703972000 +0200
> @@ -48,6 +48,18 @@
>
> #include "sym53c8xx_defs.h"
>
> +/*
> + Build a scatter/gather entry.
> + see sym53c8xx_2/sym_hipd.h for more detailed sym_build_sge()
> + implementation ;)
> + */
> +
> +#define ncr_build_sge(np, data, badd, len) \
> +do { \
> + (data)->addr = cpu_to_scr(badd); \
> + (data)->size = cpu_to_scr(len); \
> +} while (0)
> +
> /*==========================================================
> **
> ** Structures used by the detection routine to transmit
> --- linux-2.6.7-pa1-wrk/drivers/scsi/ncr53c8xx.c.orig 2004-05-30
> 01:28:20.000000000 +0200
> +++ linux-2.6.7-pa1-wrk/drivers/scsi/ncr53c8xx.c 2004-06-18
> 21:53:34.803972000 +0200
> @@ -91,7 +91,7 @@
> */
>
> /* Name and version of the driver */
> -#define SCSI_NCR_DRIVER_NAME "ncr53c8xx-3.4.3e"
> +#define SCSI_NCR_DRIVER_NAME "ncr53c8xx-3.4.3f"
>
> #define SCSI_NCR_DEBUG_FLAGS (0)
>
> @@ -839,7 +839,7 @@
> struct scr_tblmove smsg ;
> struct scr_tblmove cmd ;
> struct scr_tblmove sense ;
> - struct scr_tblmove data [MAX_SCATTER];
> + struct scr_tblmove data[MAX_SCATTER];
> };
>
>
> @@ -3845,7 +3845,7 @@
>
> direction = scsi_data_direction(cmd);
> if (direction != SCSI_DATA_NONE) {
> - segments = ncr_scatter (np, cp, cp->cmd);
> + segments = ncr_scatter(np, cp, cp->cmd);
> if (segments < 0) {
> ncr_free_ccb(np, cp);
> return(DID_ERROR);
> @@ -7575,44 +7575,57 @@
> ** sizes to the data segment array.
> */
>
> -static int ncr_scatter(struct ncb *np, struct ccb *cp, struct
> scsi_cmnd *cmd)
> +static int ncr_scatter_no_sglist(struct ncb *np, struct ccb *cp, struct
> scsi_cmnd *cmd)
> {
> - struct scr_tblmove *data;
> - int segment = 0;
> - int use_sg = (int) cmd->use_sg;
> + struct scr_tblmove *data = &cp->phys.data[MAX_SCATTER - 1];
> + int segment;
>
> - data = cp->phys.data;
> - cp->data_len = 0;
> + cp->data_len = cmd->request_bufflen;
>
> - if (!use_sg) {
> - if (cmd->request_bufflen) {
> - u_long baddr = map_scsi_single_data(np, cmd);
> -
> - data = &data[MAX_SCATTER - 1];
> - data[0].addr = cpu_to_scr(baddr);
> - data[0].size = cpu_to_scr(cmd->request_bufflen);
> - cp->data_len = cmd->request_bufflen;
> + if (cmd->request_bufflen) {
> + dma_addr_t baddr = map_scsi_single_data(np, cmd);
> + if (baddr) {
> + ncr_build_sge(np, data, baddr,
> cmd->request_bufflen);
> segment = 1;
> + } else {
> + segment = -2;
> }
> + } else {
> + segment = 0;
> }
> - else if (use_sg <= MAX_SCATTER) {
> +
> + return segment;
> +}
> +
> +static int ncr_scatter(struct ncb *np, struct ccb *cp, struct scsi_cmnd
> *cmd)
> +{
> + int segment = 0;
> + int use_sg = (int) cmd->use_sg;
> +
> + cp->data_len = 0;
> +
> + if (!use_sg)
> + segment = ncr_scatter_no_sglist(np, cp, cmd);
> + else if ((use_sg = map_scsi_sg_data(np, cmd)) > 0) {
> struct scatterlist *scatter = (struct scatterlist
> *)cmd->buffer;
> + struct scr_tblmove *data;
> +
> + if (use_sg > MAX_SCATTER) {
> + unmap_scsi_data(np, cmd);
> + return -1;
> + }
> +
> + data = &cp->phys.data[MAX_SCATTER - use_sg];
>
> - use_sg = map_scsi_sg_data(np, cmd);
> - data = &data[MAX_SCATTER - use_sg];
> + for (segment = 0; segment < use_sg; segment++) {
> + dma_addr_t baddr =
> sg_dma_address(&scatter[segment]);
> + unsigned int len = sg_dma_len(&scatter[segment]);
>
> - while (segment < use_sg) {
> - u_long baddr =
> scsi_sg_dma_address(&scatter[segment]);
> - unsigned int len =
> scsi_sg_dma_len(&scatter[segment]);
> -
> - data[segment].addr = cpu_to_scr(baddr);
> - data[segment].size = cpu_to_scr(len);
> - cp->data_len += len;
> - ++segment;
> + ncr_build_sge(np, &data[segment], baddr, len);
> + cp->data_len += len;
> }
> - }
> - else {
> - return -1;
> + } else {
> + segment = -2;
> }
>
> return segment;
> =========><=========
>
> And all works fine now for me. Unfortunately I don't have other model (C,
> D, R, J or K) using the same driver to test it more :(
>
> I don't have any cvs ci access, so if there are no negative feedback can
> somebody ci.
>
> Thanks in advance,
> Joel
Hi folks,
Excellent! Just tried this patch on my C180 and can confirm it works.
I'll give it a spin on the B132L too - but the box is heavily tied up
compiling today.
Thanks for working on this Joel.
-Andy
_______________________________________________
parisc-linux mailing list
parisc-linux@lists.parisc-linux.org
http://lists.parisc-linux.org/mailman/listinfo/parisc-linux
^ permalink raw reply [flat|nested] 8+ messages in thread
* [parisc-linux] Re: ncr53c8xx patch for c110
2004-06-18 20:01 ` [parisc-linux] ncr53c8xx patch for c110 Joel Soete
[not found] ` <35844.127.0.0.1.1087594933.squirrel@www.puszczka.com>
2004-06-20 5:55 ` [parisc-linux] ncr53c8xx patch for c110 Andy Walker
@ 2004-06-20 7:28 ` Grant Grundler
2004-06-21 7:48 ` [parisc-linux] " Andy Walker
3 siblings, 0 replies; 8+ messages in thread
From: Grant Grundler @ 2004-06-20 7:28 UTC (permalink / raw)
To: Joel Soete; +Cc: James Bottomley, parisc-linux
On Fri, Jun 18, 2004 at 08:01:43PM +0000, Joel Soete wrote:
> And all works fine now for me. Unfortunately I don't have other model (C,
> D, R, J or K) using the same driver to test it more :(
>
> I don't have any cvs ci access, so if there are no negative feedback can
> somebody ci.
James owns this. I'll commit it if he tells me it's ok.
I didn't fully review this patch because of extra white space
changes like this one:
> - struct scr_tblmove data [MAX_SCATTER];
> + struct scr_tblmove data[MAX_SCATTER];
Not a reason to reject the patch. but it would be nice
if you submitted white space edits seperately.
> PS: I just noticed that this cut&past didn't respect my patch tabs (became
> 8 space) so I attache also the original diff file (sorry for inconvenience
cut/paste almost nevery works.
Use an editor which can inline the patch file and sends mail
as plain/text. plain/text attachments work for me though it's
preferable to inline the patch.
thanks,
grant
_______________________________________________
parisc-linux mailing list
parisc-linux@lists.parisc-linux.org
http://lists.parisc-linux.org/mailman/listinfo/parisc-linux
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [parisc-linux] ncr53c8xx patch for c110
2004-06-18 20:01 ` [parisc-linux] ncr53c8xx patch for c110 Joel Soete
` (2 preceding siblings ...)
2004-06-20 7:28 ` [parisc-linux] " Grant Grundler
@ 2004-06-21 7:48 ` Andy Walker
3 siblings, 0 replies; 8+ messages in thread
From: Andy Walker @ 2004-06-21 7:48 UTC (permalink / raw)
To: Joel Soete; +Cc: parisc-linux
> Hello James & Grant,
>
> Joel Soete wrote:
>>
>> otc I trust that backporting sym_scatter() into ncr_scatter() is a fix
>> ;) (i was not very sure)
<..snip..>
Patch works fine on the B132L too :-) As far as I know there wasn't
a problem here before (only Ravens seemed affected), but the patch
certainly didn't break anything! The machine has been constantly
compiling big packages (gnome/gtk/perl etc.) since the reboot,
including downloads from portage, large copies.. so the disk has
been getting a thrashing with no hiccoughs.
-Andy
_______________________________________________
parisc-linux mailing list
parisc-linux@lists.parisc-linux.org
http://lists.parisc-linux.org/mailman/listinfo/parisc-linux
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2004-06-21 7:48 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <40BD9F8700009BB8@ocpmta2.freegates.net>
[not found] ` <1087569206.2078.13.camel@mulgrave>
[not found] ` <40D30E3C.1010809@tiscali.be>
2004-06-18 20:01 ` [parisc-linux] ncr53c8xx patch for c110 Joel Soete
[not found] ` <35844.127.0.0.1.1087594933.squirrel@www.puszczka.com>
[not found] ` <20040618212600.GB12572@engsoc.org>
2004-06-19 0:33 ` [parisc-linux] A couple of minor patches for 2.6.7-pa1g John David Anglin
[not found] ` <35884.127.0.0.1.1087595933.squirrel@www.puszczka.com>
2004-06-19 1:11 ` [parisc-linux] A couple of minor patches for 2.6.7-pa1 Grant Grundler
[not found] ` <20040618215310.GD12572@engsoc.org>
2004-06-19 1:28 ` Matthew Wilcox
2004-06-19 3:41 ` Kyle McMartin
2004-06-20 5:55 ` [parisc-linux] ncr53c8xx patch for c110 Andy Walker
2004-06-20 7:28 ` [parisc-linux] " Grant Grundler
2004-06-21 7:48 ` [parisc-linux] " Andy Walker
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox