* [patch][3/9] ide: add ide_sg_init() helper
@ 2004-09-08 19:26 Bartlomiej Zolnierkiewicz
2004-09-09 3:17 ` Jeff Garzik
0 siblings, 1 reply; 6+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2004-09-08 19:26 UTC (permalink / raw)
To: linux-ide, linux-kernel
[patch] ide: add ide_sg_init() helper
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
---
linux-2.6.9-rc1-bk10-bzolnier/drivers/ide/arm/icside.c | 5 +----
linux-2.6.9-rc1-bk10-bzolnier/drivers/ide/ide-dma.c | 10 ++--------
linux-2.6.9-rc1-bk10-bzolnier/drivers/ide/ppc/pmac.c | 10 ++--------
linux-2.6.9-rc1-bk10-bzolnier/include/linux/ide.h | 9 +++++++++
4 files changed, 14 insertions(+), 20 deletions(-)
diff -puN drivers/ide/arm/icside.c~ide_sg_init drivers/ide/arm/icside.c
--- linux-2.6.9-rc1-bk10/drivers/ide/arm/icside.c~ide_sg_init 2004-09-05 19:51:15.566405800 +0200
+++ linux-2.6.9-rc1-bk10-bzolnier/drivers/ide/arm/icside.c 2004-09-05 19:51:15.581403520 +0200
@@ -225,10 +225,7 @@ static void icside_build_sglist(ide_driv
else
hwif->sg_dma_direction = DMA_FROM_DEVICE;
- memset(sg, 0, sizeof(*sg));
- sg->page = virt_to_page(rq->buffer);
- sg->offset = offset_in_page(rq->buffer);
- sg->length = rq->nr_sectors * SECTOR_SIZE;
+ ide_sg_init(sg, rq->buffer, rq->nr_sectors * SECTOR_SIZE);
nents = 1;
} else {
nents = blk_rq_map_sg(drive->queue, rq, sg);
diff -puN drivers/ide/ide-dma.c~ide_sg_init drivers/ide/ide-dma.c
--- linux-2.6.9-rc1-bk10/drivers/ide/ide-dma.c~ide_sg_init 2004-09-05 19:51:15.568405496 +0200
+++ linux-2.6.9-rc1-bk10-bzolnier/drivers/ide/ide-dma.c 2004-09-05 19:51:15.583403216 +0200
@@ -256,18 +256,12 @@ int ide_raw_build_sglist(ide_drive_t *dr
#else
while (sector_count > 128) {
#endif
- memset(&sg[nents], 0, sizeof(*sg));
- sg[nents].page = virt_to_page(virt_addr);
- sg[nents].offset = offset_in_page(virt_addr);
- sg[nents].length = 128 * SECTOR_SIZE;
+ ide_sg_init(&sg[nents], virt_addr, 128 * SECTOR_SIZE);
nents++;
virt_addr = virt_addr + (128 * SECTOR_SIZE);
sector_count -= 128;
}
- memset(&sg[nents], 0, sizeof(*sg));
- sg[nents].page = virt_to_page(virt_addr);
- sg[nents].offset = offset_in_page(virt_addr);
- sg[nents].length = sector_count * SECTOR_SIZE;
+ ide_sg_init(&sg[nents], virt_addr, sector_count * SECTOR_SIZE);
nents++;
return pci_map_sg(hwif->pci_dev, sg, nents, hwif->sg_dma_direction);
diff -puN drivers/ide/ppc/pmac.c~ide_sg_init drivers/ide/ppc/pmac.c
--- linux-2.6.9-rc1-bk10/drivers/ide/ppc/pmac.c~ide_sg_init 2004-09-05 19:51:15.570405192 +0200
+++ linux-2.6.9-rc1-bk10-bzolnier/drivers/ide/ppc/pmac.c 2004-09-05 19:51:15.585402912 +0200
@@ -1611,18 +1611,12 @@ pmac_ide_raw_build_sglist(ide_drive_t *d
pmif->sg_dma_direction = PCI_DMA_FROMDEVICE;
if (sector_count > 128) {
- memset(&sg[nents], 0, sizeof(*sg));
- sg[nents].page = virt_to_page(virt_addr);
- sg[nents].offset = offset_in_page(virt_addr);
- sg[nents].length = 128 * SECTOR_SIZE;
+ ide_sg_init(&sg[nents], virt_addr, 128 * SECTOR_SIZE);
nents++;
virt_addr = virt_addr + (128 * SECTOR_SIZE);
sector_count -= 128;
}
- memset(&sg[nents], 0, sizeof(*sg));
- sg[nents].page = virt_to_page(virt_addr);
- sg[nents].offset = offset_in_page(virt_addr);
- sg[nents].length = sector_count * SECTOR_SIZE;
+ ide_sg_init(&sg[nents], virt_addr, sector_count * SECTOR_SIZE);
nents++;
return pci_map_sg(hwif->pci_dev, sg, nents, pmif->sg_dma_direction);
diff -puN include/linux/ide.h~ide_sg_init include/linux/ide.h
--- linux-2.6.9-rc1-bk10/include/linux/ide.h~ide_sg_init 2004-09-05 19:51:15.573404736 +0200
+++ linux-2.6.9-rc1-bk10-bzolnier/include/linux/ide.h 2004-09-05 19:51:15.587402608 +0200
@@ -1567,6 +1567,15 @@ typedef struct ide_pci_device_s {
extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
extern void ide_setup_pci_devices(struct pci_dev *, struct pci_dev *, ide_pci_device_t *);
+static inline void ide_sg_init(struct scatterlist *sg, u8 *buf, unsigned int buflen)
+{
+ memset(sg, 0, sizeof(*sg));
+
+ sg->page = virt_to_page(buf);
+ sg->offset = offset_in_page(buf);
+ sg->length = buflen;
+}
+
#define BAD_DMA_DRIVE 0
#define GOOD_DMA_DRIVE 1
_
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [patch][3/9] ide: add ide_sg_init() helper
2004-09-08 19:26 [patch][3/9] ide: add ide_sg_init() helper Bartlomiej Zolnierkiewicz
@ 2004-09-09 3:17 ` Jeff Garzik
2004-09-09 13:54 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 6+ messages in thread
From: Jeff Garzik @ 2004-09-09 3:17 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: linux-ide, linux-kernel
Bartlomiej Zolnierkiewicz wrote:
> +static inline void ide_sg_init(struct scatterlist *sg, u8 *buf, unsigned int buflen)
> +{
> + memset(sg, 0, sizeof(*sg));
> +
> + sg->page = virt_to_page(buf);
> + sg->offset = offset_in_page(buf);
> + sg->length = buflen;
> +}
> +
Surely this should be more generic?
Jeff
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [patch][3/9] ide: add ide_sg_init() helper
2004-09-09 3:17 ` Jeff Garzik
@ 2004-09-09 13:54 ` Bartlomiej Zolnierkiewicz
2004-09-09 14:47 ` Jens Axboe
0 siblings, 1 reply; 6+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2004-09-09 13:54 UTC (permalink / raw)
To: Jeff Garzik; +Cc: linux-ide, linux-kernel
On Thursday 09 September 2004 05:17, Jeff Garzik wrote:
> Bartlomiej Zolnierkiewicz wrote:
> > +static inline void ide_sg_init(struct scatterlist *sg, u8 *buf, unsigned int buflen)
> > +{
> > + memset(sg, 0, sizeof(*sg));
> > +
> > + sg->page = virt_to_page(buf);
> > + sg->offset = offset_in_page(buf);
> > + sg->length = buflen;
> > +}
> > +
>
>
> Surely this should be more generic?
Any idea where to put it? linux/blkdev.h?
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [patch][3/9] ide: add ide_sg_init() helper
2004-09-09 13:54 ` Bartlomiej Zolnierkiewicz
@ 2004-09-09 14:47 ` Jens Axboe
2004-09-09 15:31 ` Bartlomiej Zolnierkiewicz
0 siblings, 1 reply; 6+ messages in thread
From: Jens Axboe @ 2004-09-09 14:47 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: Jeff Garzik, linux-ide, linux-kernel
On Thu, Sep 09 2004, Bartlomiej Zolnierkiewicz wrote:
>
> On Thursday 09 September 2004 05:17, Jeff Garzik wrote:
> > Bartlomiej Zolnierkiewicz wrote:
> > > +static inline void ide_sg_init(struct scatterlist *sg, u8 *buf, unsigned int buflen)
> > > +{
> > > + memset(sg, 0, sizeof(*sg));
> > > +
> > > + sg->page = virt_to_page(buf);
> > > + sg->offset = offset_in_page(buf);
> > > + sg->length = buflen;
> > > +}
> > > +
> >
> >
> > Surely this should be more generic?
>
> Any idea where to put it? linux/blkdev.h?
How about asm/scatterlist.h?
--
Jens Axboe
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [patch][3/9] ide: add ide_sg_init() helper
2004-09-09 14:47 ` Jens Axboe
@ 2004-09-09 15:31 ` Bartlomiej Zolnierkiewicz
2004-09-09 15:38 ` Jens Axboe
0 siblings, 1 reply; 6+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2004-09-09 15:31 UTC (permalink / raw)
To: Jens Axboe; +Cc: Jeff Garzik, linux-ide, linux-kernel
On Thursday 09 September 2004 16:47, Jens Axboe wrote:
> On Thu, Sep 09 2004, Bartlomiej Zolnierkiewicz wrote:
> >
> > On Thursday 09 September 2004 05:17, Jeff Garzik wrote:
> > > Bartlomiej Zolnierkiewicz wrote:
> > > > +static inline void ide_sg_init(struct scatterlist *sg, u8 *buf, unsigned int buflen)
> > > > +{
> > > > + memset(sg, 0, sizeof(*sg));
> > > > +
> > > > + sg->page = virt_to_page(buf);
> > > > + sg->offset = offset_in_page(buf);
> > > > + sg->length = buflen;
> > > > +}
> > > > +
> > >
> > >
> > > Surely this should be more generic?
> >
> > Any idea where to put it? linux/blkdev.h?
>
> How about asm/scatterlist.h?
I would like to avoid duplicating it for every arch
as it is not arch specific.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [patch][3/9] ide: add ide_sg_init() helper
2004-09-09 15:31 ` Bartlomiej Zolnierkiewicz
@ 2004-09-09 15:38 ` Jens Axboe
0 siblings, 0 replies; 6+ messages in thread
From: Jens Axboe @ 2004-09-09 15:38 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: Jeff Garzik, linux-ide, linux-kernel
On Thu, Sep 09 2004, Bartlomiej Zolnierkiewicz wrote:
> On Thursday 09 September 2004 16:47, Jens Axboe wrote:
> > On Thu, Sep 09 2004, Bartlomiej Zolnierkiewicz wrote:
> > >
> > > On Thursday 09 September 2004 05:17, Jeff Garzik wrote:
> > > > Bartlomiej Zolnierkiewicz wrote:
> > > > > +static inline void ide_sg_init(struct scatterlist *sg, u8 *buf, unsigned int buflen)
> > > > > +{
> > > > > + memset(sg, 0, sizeof(*sg));
> > > > > +
> > > > > + sg->page = virt_to_page(buf);
> > > > > + sg->offset = offset_in_page(buf);
> > > > > + sg->length = buflen;
> > > > > +}
> > > > > +
> > > >
> > > >
> > > > Surely this should be more generic?
> > >
> > > Any idea where to put it? linux/blkdev.h?
> >
> > How about asm/scatterlist.h?
>
> I would like to avoid duplicating it for every arch
> as it is not arch specific.
Maybe add linux/scatterlist.h then? It should not be in blkdev.h at
least, as it really has nothing to do with block devices.
--
Jens Axboe
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2004-09-09 15:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-09-08 19:26 [patch][3/9] ide: add ide_sg_init() helper Bartlomiej Zolnierkiewicz
2004-09-09 3:17 ` Jeff Garzik
2004-09-09 13:54 ` Bartlomiej Zolnierkiewicz
2004-09-09 14:47 ` Jens Axboe
2004-09-09 15:31 ` Bartlomiej Zolnierkiewicz
2004-09-09 15:38 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).