block: lld cleanup patches, take#2
Subsystems (4)
PATCH 1/1 block: lld cleanup patches, take#2
Hello,
Upon ack, please pull from the following git tree.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git tj-block-for-2.6.31
This is the second take of block-lld-cleanup-patches. Changes from the last take[L] are
* Bartlomiej's two mg_disk cleanup patches added.
* ubd build bug fixed.
* hd and mg_disk verified to work.
This patchset contains the following patches.
0001-block-make-blk_end_request_cur-return-bool.patch 0002-block-don-t-init-rq-fields-unnecessarily.patch 0003-amiflop-ataflop-xd-mg_disk-clean-up-unnecessary-stu.patch 0004-ps3disk-simplify-request-completion.patch 0005-sunvdc-kill-vdc_end_request.patch 0006-ubd-cleanup-completion-path.patch 0007-ubd-drop-unnecessary-rq-sector-manipulation.patch 0008-hd-clean-up-request-completion-paths.patch 0009-swim3-clean-up-request-completion-paths.patch 0010-swim-clean-up-request-completion-paths.patch 0011-mg_disk-fold-mg_disk.h-into-mg_disk.c.patch 0012-mg_disk-clean-up-request-completion-paths.patch 0013-mg_disk-fix-dependency-on-libata.patch 0014-mg_disk-use-defines-from-linux-ata.h.patch
hd and um are verified to work. Changes in xd, amiflop, ps3disk, swim3 and swim are somewhat trivial and I'm fairly sure they won't break the drivers. Changes in sunvdc also is fairly trivial and acked by davem. mg_disk changes are a bit more involved but are mostly similar to what happened to hd.
So, all in all, I think it would be fairly safe to pull the patchset.
This patchset is on top of
linux-2.6-block#for-linus[1]
+ block-fix-hd-and-mg_disk patchset[2]
+ pulled into #for-2.6.31[3]
and contains the following changes.
arch/um/drivers/ubd_kern.c | 33 --- block/scsi_ioctl.c | 2 drivers/block/Kconfig | 2 drivers/block/amiflop.c | 7 drivers/block/ataflop.c | 4 drivers/block/hd.c | 36 +-- drivers/block/mg_disk.c | 413 ++++++++++++++++++++++++++++----------------- drivers/block/ps3disk.c | 5 drivers/block/sunvdc.c | 9 drivers/block/swim.c | 7 drivers/block/swim3.c | 31 --- drivers/block/xd.c | 9 include/linux/blkdev.h | 16 + include/linux/mg_disk.h | 206 ---------------------- 14 files changed, 298 insertions(+), 482 deletions(-)
Thanks.
--
tejun
[L] http://thread.gmane.org/gmane.linux.kernel/826541
[1] f2d1f0ae7851be5ebd9613a80dac139270938809
[2] http://thread.gmane.org/gmane.linux.ide/40198
[3] 0f38503f0cc5142fdb40ad1c79a09e7ba0bcb74f
PATCH 1/14 block: make blk_end_request_cur() return bool
In the process of mindlessly copying [__]blk_end_request_all(), [__]blk_end_request_cur() ended up returning void even though they're partial completion functions. Fix it.
[ Impact: fix braindead API ]
--- include/linux/blkdev.h | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-)
include/linux/blkdev.h +12 -4
@@ -903,10 +903,14 @@ static inline void blk_end_request_all(struct request *rq, int error)* * Description: * Complete the current consecutively mapped chunk from @rq. +* +* Return: +* %false - we are done with this request +* %true - still buffers pending for this request */ -static inline void blk_end_request_cur (struct request *rq,int error) +static inline bool blk_end_request_cur (struct request *rq,int error) { -blk_end_request (rq, error, rq->hard_cur_sectors <<9 ); +return blk_end_request (rq, error, rq->hard_cur_sectors <<9 ); }/**
@@ -952,10 +956,14 @@ static inline void __blk_end_request_all(struct request *rq, int error)* Description: * Complete the current consecutively mapped chunk from @rq. Must * be called with queue lock held. +* +* Return: +* %false - we are done with this request +* %true - still buffers pending for this request */ -static inline void __blk_end_request_cur (struct request *rq,int error) +static inline bool __blk_end_request_cur (struct request *rq,int error) { -__blk_end_request (rq, error, rq->hard_cur_sectors <<9 ); +return __blk_end_request (rq, error, rq->hard_cur_sectors <<9 ); }extern void blk_complete_request (struct request *);
Signature · 1 line
1.6.0.2
PATCH 2/14 block: don't init rq fields unnecessarily
In reply to Tejun Heoblk_get_request() always returns properly zeroed requests. Don't set fields to zero/NULL unnecessarily.
[ Impact: cleanup ]
--- block/scsi_ioctl.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
block/scsi_ioctl.c +0 -2
@@ -500,8 +500,6 @@ static int __blk_send_generic(struct request_queue *q, struct gendisk *bd_disk, rq =blk_get_request (q,WRITE , __GFP_WAIT); rq->cmd_type =REQ_TYPE_BLOCK_PC ; - rq->data_len =0 ; - rq->extra_len =0 ; rq->timeout =BLK_DEFAULT_SG_TIMEOUT ; rq->cmd[0 ] = cmd; rq->cmd[4 ] = data;
Signature · 1 line
1.6.0.2
PATCH 3/14 amiflop,ataflop,xd,mg_disk: clean up unnecessary stuff from block drivers
In reply to Tejun Heorq_data_dir() can only be READ or WRITE and rq->sector and nr_sectors are always automatically updated after partial request completion. Don't worry about rq_data_dir() not being either READ or WRITE or manually update sector and nr_sectors.
[ Impact: cleanup ]
--- drivers/block/amiflop.c | 7 ------- drivers/block/ataflop.c | 4 ---- drivers/block/mg_disk.c | 10 ---------- drivers/block/xd.c | 9 ++------- 4 files changed, 2 insertions(+), 28 deletions(-)
drivers/block/amiflop.c +0 -7
@@ -1371,11 +1371,6 @@ static void redo_fd_request(void) "0x%08lx\n", track, sector, data);#endif -if ((rq_data_dir (CURRENT ) !=READ ) && (rq_data_dir (CURRENT ) !=WRITE )) { -printk (KERN_WARNING "do_fd_request: unknown command\n" ); -__blk_end_request_cur (CURRENT , -EIO ); - goto repeat; - }if (get_track (drive, track) ==-1 ) {__blk_end_request_cur (CURRENT , -EIO ); goto repeat;
@@ -1407,8 +1402,6 @@ static void redo_fd_request(void)break ; } } -CURRENT ->nr_sectors -=CURRENT ->current_nr_sectors; -CURRENT ->sector +=CURRENT ->current_nr_sectors;__blk_end_request_cur (CURRENT ,0 ); goto repeat;
drivers/block/ataflop.c +0 -4
@@ -732,8 +732,6 @@ static void do_fd_action( int drive ) }else {/* all sectors finished */ -CURRENT ->nr_sectors -=CURRENT ->current_nr_sectors; -CURRENT ->sector +=CURRENT ->current_nr_sectors;__blk_end_request_cur (CURRENT ,0 );redo_fd_request ();return ;
@@ -1139,8 +1137,6 @@ static void fd_rwsec_done1(int status) }else {/* all sectors finished */ -CURRENT ->nr_sectors -=CURRENT ->current_nr_sectors; -CURRENT ->sector +=CURRENT ->current_nr_sectors;__blk_end_request_cur (CURRENT ,0 );redo_fd_request (); }
drivers/block/mg_disk.c +0 -10
@@ -560,11 +560,6 @@ static void mg_request_poll(struct request_queue *q)case WRITE :mg_write (req);break ; -default : -printk (KERN_WARNING "%s:%d unknown command\n" , - __func__, __LINE__); -__blk_end_request_cur (req, -EIO ); -break ; } } }
@@ -614,11 +609,6 @@ static unsigned int mg_issue_req(struct request *req,outb (MG_CMD_WR_CONF , (unsigned long )host->dev_base +MG_REG_COMMAND );break ; -default : -printk (KERN_WARNING "%s:%d unknown command\n" , - __func__, __LINE__); -__blk_end_request_cur (req, -EIO ); -break ; }return MG_ERR_NONE ; }
drivers/block/xd.c +2 -7
@@ -308,7 +308,6 @@ static void do_xd_request (struct request_queue * q)while ((req =elv_next_request (q)) !=NULL ) {unsigned block = req->sector;unsigned count = req->nr_sectors; -int rw =rq_data_dir (req);XD_INFO *disk = req->rq_disk->private_data;int res =0 ;int retry;
@@ -321,13 +320,9 @@ static void do_xd_request (struct request_queue * q)__blk_end_request_cur (req, -EIO );continue ; } -if (rw !=READ && rw !=WRITE ) { -printk ("do_xd_request: unknown request\n" ); -__blk_end_request_cur (req, -EIO ); -continue ; - }for (retry =0 ; (retry <XD_RETRIES ) && !res; retry++) - res =xd_readwrite (rw, disk, req->buffer, block, count); + res =xd_readwrite (rq_data_dir (req), disk, req->buffer, + block, count);/* wrap up, 0 = success, -errno = fail */ __blk_end_request_cur (req, res); }
Signature · 1 line
1.6.0.2
PATCH 4/14 ps3disk: simplify request completion
In reply to Tejun Heops3disk_interrupt() always completes requests fully but it uses rq->hard_cur_sectors for FLUSH requests for some reason. Drop them and simply use __blk_end_request_all().
[ Impact: cleanup ]
--- drivers/block/ps3disk.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
drivers/block/ps3disk.c +1 -4
@@ -231,7 +231,6 @@ static irqreturn_t ps3disk_interrupt(int irq, void *data)struct request *req;int res, read, error;u64 tag, status; -unsigned long num_sectors;const char *op; res =lv1_storage_get_async_status (dev->sbd.dev_id, &tag, &status);
@@ -261,11 +260,9 @@ static irqreturn_t ps3disk_interrupt(int irq, void *data)if (req->cmd_type ==REQ_TYPE_LINUX_BLOCK && req->cmd[0 ] ==REQ_LB_OP_FLUSH ) { read =0 ; - num_sectors = req->hard_cur_sectors; op ="flush" ; }else { read = !rq_data_dir (req); - num_sectors = req->nr_sectors; op = read ?"read" :"write" ; }if (status) {
@@ -281,7 +278,7 @@ static irqreturn_t ps3disk_interrupt(int irq, void *data) }spin_lock (&priv->lock); -__blk_end_request (req, error, num_sectors <<9 ); +__blk_end_request_all (req, error); priv->req =NULL ;ps3disk_do_request (dev, priv->queue);spin_unlock (&priv->lock);
Signature · 1 line
1.6.0.2
PATCH 5/14 sunvdc: kill vdc_end_request()
In reply to Tejun Heovdc_end_request() is a thin silly wrapper on top of __blk_end_request(). Kill it.
[ Impact: cleanup ]
--- drivers/block/sunvdc.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)
drivers/block/sunvdc.c +2 -7
@@ -212,11 +212,6 @@ static void vdc_end_special(struct vdc_port *port, struct vio_disk_desc *desc)vdc_finish (&port->vio, -err,WAITING_FOR_GEN_CMD ); } -static void vdc_end_request (struct request *req,int error,int num_sectors) -{ -__blk_end_request (req, error, num_sectors <<9 ); -} -static void vdc_end_one (struct vdc_port *port,struct vio_dring_state *dr,unsigned int index) {
@@ -239,7 +234,7 @@ static void vdc_end_one(struct vdc_port *port, struct vio_dring_state *dr, rqe->req =NULL ; -vdc_end_request (req, (desc->status ? -EIO :0 ), desc->size >>9 ); +__blk_end_request (req, (desc->status ? -EIO :0 ), desc->size);if (blk_queue_stopped (port->disk->queue))blk_start_queue (port->disk->queue);
@@ -453,7 +448,7 @@ static void do_vdc_request(struct request_queue *q)blkdev_dequeue_request (req);if (__send_request (req) <0 ) -vdc_end_request (req, -EIO , req->hard_nr_sectors); +__blk_end_request_all (req, -EIO ); } }
Signature · 1 line
1.6.0.2
PATCH 6/14 ubd: cleanup completion path
In reply to Tejun Heoubd had its own block request partial completion mechanism, which is unnecessary as block layer already does it. Kill ubd_end_request() and ubd_finish() and replace them with direct call to blk_end_request().
[ Impact: cleanup ]
--- arch/um/drivers/ubd_kern.c | 23 +---------------------- 1 files changed, 1 insertions(+), 22 deletions(-)
arch/um/drivers/ubd_kern.c +1 -22
@@ -451,23 +451,6 @@ static void do_ubd_request(struct request_queue * q);/* Only changed by ubd_init, which is an initcall. */ static int thread_fd =-1 ; - -static void ubd_end_request (struct request *req,int bytes,int error) -{ -blk_end_request (req, error, bytes); -} - -/* Callable only from interrupt context - otherwise you need to do -* spin_lock_irq()/spin_lock_irqsave() */ -static inline void ubd_finish (struct request *req,int bytes) -{ -if (bytes <0 ){ -ubd_end_request (req,0 , -EIO ); -return ; - } -ubd_end_request (req, bytes,0 ); -} -static LIST_HEAD (restart);/* XXX - move this inside ubd_intr. */
@@ -475,7 +458,6 @@ static LIST_HEAD(restart);static void ubd_handler (void ) {struct io_thread_req *req; -struct request *rq;struct ubd *ubd;struct list_head *list, *next_ele;unsigned long flags;
@@ -492,10 +474,7 @@ static void ubd_handler(void)return ; } - rq = req->req; - rq->nr_sectors -= req->length >>9 ; -if (rq->nr_sectors ==0 ) -ubd_finish (rq, rq->hard_nr_sectors <<9 ); +blk_end_request (req->req,0 , req->length);kfree (req); }reactivate_fd (thread_fd,UBD_IRQ );
Signature · 1 line
1.6.0.2
PATCH 7/14 ubd: drop unnecessary rq->sector manipulation
In reply to Tejun Heoubd curiously updates rq->sector while issuing the request in multiple pieces. Don't do it and simply use local copy of sector.
[ Impact: cleanup ]
--- arch/um/drivers/ubd_kern.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
arch/um/drivers/ubd_kern.c +5 -5
@@ -1222,7 +1222,8 @@ static void do_ubd_request(struct request_queue *q) {struct io_thread_req *io_req;struct request *req; -int n, last_sectors; +sector_t sector; +int n;while (1 ){struct ubd *dev = q->queuedata;
@@ -1238,11 +1239,10 @@ static void do_ubd_request(struct request_queue *q) } req = dev->request; - last_sectors =0 ; + sector = req->sector;while (dev->start_sg < dev->end_sg){struct scatterlist *sg = &dev->sg[dev->start_sg]; - req->sector += last_sectors; io_req =kmalloc (sizeof (struct io_thread_req ),GFP_ATOMIC );if (io_req ==NULL ){
@@ -1251,10 +1251,10 @@ static void do_ubd_request(struct request_queue *q)return ; }prepare_request (req, io_req, - (unsigned long long ) req->sector <<9 , + (unsigned long long )sector <<9 , sg->offset, sg->length,sg_page (sg)); - last_sectors = sg->length >>9 ; + sector += sg->length >>9 ; n =os_write_file (thread_fd, &io_req,sizeof (struct io_thread_req *));if (n !=sizeof (struct io_thread_req *)){
Signature · 1 line
1.6.0.2
PATCH 8/14 hd: clean up request completion paths
In reply to Tejun Heohd read/write_intr() functions manually manipulate request to incrementally complete it, which block layer already supports. Simply use block layer completion routines instead of manual partial completion.
While at it, clear unnecessary elv_next_request() check at the tail of read_intr(). This also makes read and write_intr() more consistent.
[ Impact: cleanup ]
--- drivers/block/hd.c | 36 ++++++++++++------------------------ 1 files changed, 12 insertions(+), 24 deletions(-)
drivers/block/hd.c +12 -24
@@ -452,32 +452,25 @@ static void read_intr(void)bad_rw_intr ();hd_request ();return ; + ok_to_read: req =CURRENT ;insw (HD_DATA , req->buffer,256 ); - req->sector++; - req->buffer +=512 ; - req->errors =0 ; - i = --req->nr_sectors; - --req->current_nr_sectors;#ifdef DEBUG printk ("%s: read: sector %ld, remaining = %ld, buffer=%p\n" , - req->rq_disk->disk_name, req->sector, req->nr_sectors, + req->rq_disk->disk_name, req->sector +1 , req->nr_sectors -1 , req->buffer+512 );#endif -if (req->current_nr_sectors <=0 ) -__blk_end_request_cur (req,0 ); -if (i >0 ) { +if (__blk_end_request (req,0 ,512 )) {SET_HANDLER (&read_intr);return ; } + (void )inb_p (HD_STATUS );#if (HD_DELAY >0 ) last_req =read_timer ();#endif -if (elv_next_request (QUEUE )) -hd_request (); -return ; +hd_request (); }static void write_intr (void )
@@ -499,23 +492,18 @@ static void write_intr(void)bad_rw_intr ();hd_request ();return ; + ok_to_write: - req->sector++; - i = --req->nr_sectors; - --req->current_nr_sectors; - req->buffer +=512 ; -if (!i || (req->bio && req->current_nr_sectors <=0 )) -__blk_end_request_cur (req,0 ); -if (i >0 ) { +if (__blk_end_request (req,0 ,512 )) {SET_HANDLER (&write_intr);outsw (HD_DATA , req->buffer,256 ); - }else { +return ; + } +#if (HD_DELAY >0 ) - last_req =read_timer (); + last_req =read_timer ();#endif -hd_request (); - } -return ; +hd_request (); }static void recal_intr (void )
Signature · 1 line
1.6.0.2
PATCH 9/14 swim3: clean up request completion paths
In reply to Tejun Heoswim3 curiously tries to update request parameters before calling __blk_end_request() when __blk_end_request() will do it anyway, and it updates request for partial completion manually instead of using blk_update_request(). Also, it does some spurious checks on rq such as testing whether rq->sector is negative or current_nr_sectors is zero right after fetching.
Drop unnecessary stuff and use standard block layer mechanisms.
[ Impact: cleanup ]
--- drivers/block/swim3.c | 31 +++++-------------------------- 1 files changed, 5 insertions(+), 26 deletions(-)
drivers/block/swim3.c +5 -26
@@ -319,14 +319,10 @@ static void start_request(struct floppy_state *fs) req->errors, req->current_nr_sectors);#endif -if (req->sector <0 || req->sector >= fs->total_secs) { +if (req->sector >= fs->total_secs) {__blk_end_request_cur (req, -EIO );continue ; } -if (req->current_nr_sectors ==0 ) { -__blk_end_request_cur (req,0 ); -continue ; - }if (fs->ejected) {__blk_end_request_cur (req, -EIO );continue ;
@@ -593,8 +589,6 @@ static void xfer_timeout(unsigned long data)struct floppy_state *fs = (struct floppy_state *) data;struct swim3 __iomem *sw = fs->swim3;struct dbdma_regs __iomem *dr = fs->dma; -struct dbdma_cmd *cp = fs->dma_cmd; -unsigned long s;int n; fs->timeout_pending =0 ;
@@ -605,14 +599,6 @@ static void xfer_timeout(unsigned long data)out_8 (&sw->intr_enable,0 );out_8 (&sw->control_bic,WRITE_SECTORS |DO_ACTION );out_8 (&sw->select,RELAX ); -if (rq_data_dir (fd_req) ==WRITE ) - ++cp; -if (ld_le16 (&cp->xfer_status) !=0 ) - s = fs->scount - ((ld_le16 (&cp->res_count) +511 ) >>9 ); -else - s =0 ; - fd_req->sector += s; - fd_req->current_nr_sectors -= s;printk (KERN_ERR "swim3: timeout %sing sector %ld\n" , (rq_data_dir (fd_req)==WRITE ?"writ" :"read" ), (long )fd_req->sector);__blk_end_request_cur (fd_req, -EIO );
@@ -719,9 +705,7 @@ static irqreturn_t swim3_interrupt(int irq, void *dev_id)if (intr &ERROR_INTR ) { n = fs->scount -1 - resid /512 ;if (n >0 ) { - fd_req->sector += n; - fd_req->current_nr_sectors -= n; - fd_req->buffer += n *512 ; +blk_update_request (fd_req,0 , n <<9 ); fs->req_sector += n; }if (fs->retries <5 ) {
@@ -745,13 +729,7 @@ static irqreturn_t swim3_interrupt(int irq, void *dev_id)start_request (fs);break ; } - fd_req->sector += fs->scount; - fd_req->current_nr_sectors -= fs->scount; - fd_req->buffer += fs->scount *512 ; -if (fd_req->current_nr_sectors <=0 ) { -__blk_end_request_cur (fd_req,0 ); - fs->state = idle; - }else { +if (__blk_end_request (fd_req,0 , fs->scount <<9 )) { fs->req_sector += fs->scount;if (fs->req_sector > fs->secpertrack) { fs->req_sector -= fs->secpertrack;
@@ -761,7 +739,8 @@ static irqreturn_t swim3_interrupt(int irq, void *dev_id) } }act (fs); - } + }else + fs->state = idle; }if (fs->state == idle)start_request (fs);
Signature · 1 line
1.6.0.2
Re: [PATCH 09/14] swim3: clean up request completion paths
Quoted 8 lines · Tejun Heo
swim3 curiously tries to update request parameters before calling
__blk_end_request()when__blk_end_request()will do it anyway, and it updates request for partial completion manually instead of usingblk_update_request(). Also, it does some spurious checks on rq such as testing whetherrq->sectoris negative orcurrent_nr_sectorsis zero right after fetching.Drop unnecessary stuff and use standard block layer mechanisms.
That smells like historical stuff from floppy.c :-)
I'll try to dig a mac with a floppy drive to test that.
Cheers,
Ben.
Quoted 88 lines
[ Impact: cleanup ]
Signed-off-by Tejun Heo <[email protected]>Cc Benjamin Herrenschmidt <[email protected]>--- drivers/block/swim3.c | 31 +++++-------------------------- 1 files changed, 5 insertions(+), 26 deletions(-)drivers/block/swim3.c +5
-26@@ -319,14 +319,10 @@ static void start_request(struct floppy_state *fs) req->errors, req->current_nr_sectors);#endif -if (req->sector <0 || req->sector >= fs->total_secs) { +if (req->sector >= fs->total_secs) {__blk_end_request_cur (req, -EIO );continue ; } -if (req->current_nr_sectors ==0 ) { -__blk_end_request_cur (req,0 ); -continue ; - }if (fs->ejected) {__blk_end_request_cur (req, -EIO );continue ;@@ -593,8 +589,6 @@ static void xfer_timeout(unsigned long data)struct floppy_state *fs = (struct floppy_state *) data;struct swim3 __iomem *sw = fs->swim3;struct dbdma_regs __iomem *dr = fs->dma; -struct dbdma_cmd *cp = fs->dma_cmd; -unsigned long s;int n; fs->timeout_pending =0 ;@@ -605,14 +599,6 @@ static void xfer_timeout(unsigned long data)out_8 (&sw->intr_enable,0 );out_8 (&sw->control_bic,WRITE_SECTORS |DO_ACTION );out_8 (&sw->select,RELAX ); -if (rq_data_dir (fd_req) ==WRITE ) - ++cp; -if (ld_le16 (&cp->xfer_status) !=0 ) - s = fs->scount - ((ld_le16 (&cp->res_count) +511 ) >>9 ); -else - s =0 ; - fd_req->sector += s; - fd_req->current_nr_sectors -= s;printk (KERN_ERR "swim3: timeout %sing sector %ld\n" , (rq_data_dir (fd_req)==WRITE ?"writ" :"read" ), (long )fd_req->sector);__blk_end_request_cur (fd_req, -EIO );@@ -719,9 +705,7 @@ static irqreturn_t swim3_interrupt(int irq, void *dev_id)if (intr &ERROR_INTR ) { n = fs->scount -1 - resid /512 ;if (n >0 ) { - fd_req->sector += n; - fd_req->current_nr_sectors -= n; - fd_req->buffer += n *512 ; +blk_update_request (fd_req,0 , n <<9 ); fs->req_sector += n; }if (fs->retries <5 ) {@@ -745,13 +729,7 @@ static irqreturn_t swim3_interrupt(int irq, void *dev_id)start_request (fs);break ; } - fd_req->sector += fs->scount; - fd_req->current_nr_sectors -= fs->scount; - fd_req->buffer += fs->scount *512 ; -if (fd_req->current_nr_sectors <=0 ) { -__blk_end_request_cur (fd_req,0 ); - fs->state = idle; - }else { +if (__blk_end_request (fd_req,0 , fs->scount <<9 )) { fs->req_sector += fs->scount;if (fs->req_sector > fs->secpertrack) { fs->req_sector -= fs->secpertrack;@@ -761,7 +739,8 @@ static irqreturn_t swim3_interrupt(int irq, void *dev_id) } }act (fs); - } + }else + fs->state = idle; }if (fs->state == idle)start_request (fs);
PATCH 10/14 swim: clean up request completion paths
In reply to Tejun Heoswim curiously tries to update request parameters before calling __blk_end_request() when __blk_end_request() will do it anyway and unnecessarily checks whether current_nr_sectors is zero right after fetching.
Drop unnecessary stuff and use standard block layer mechanisms.
[ Impact: cleanup ]
--- drivers/block/swim.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-)
drivers/block/swim.c +0 -7
@@ -535,10 +535,6 @@ static void redo_fd_request(struct request_queue *q)__blk_end_request_cur (req, -EIO );continue ; } -if (req->current_nr_sectors ==0 ) { -__blk_end_request_cur (req,0 ); -continue ; - }if (!fs->disk_in) {__blk_end_request_cur (req, -EIO );continue ;
@@ -561,9 +557,6 @@ static void redo_fd_request(struct request_queue *q)__blk_end_request_cur (req, -EIO );continue ; } - req->nr_sectors -= req->current_nr_sectors; - req->sector += req->current_nr_sectors; - req->buffer += req->current_nr_sectors *512 ;__blk_end_request_cur (req,0 );break ; }
Signature · 1 line
1.6.0.2
PATCH 11/14 mg_disk: fold mg_disk.h into mg_disk.c
In reply to Tejun Heoinclude/linux/mg_disk.h is used only by drivers/block/mg_disk.c. No reason to put it in a separate header. Fold it into mg_disk.c.
[ Impact: cleanup ]
--- drivers/block/mg_disk.c | 186 ++++++++++++++++++++++++++++++++++++++++++- include/linux/mg_disk.h | 206 ----------------------------------------------- 2 files changed, 185 insertions(+), 207 deletions(-) delete mode 100644 include/linux/mg_disk.h
drivers/block/mg_disk.c +185 -1
@@ -22,10 +22,194 @@#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/gpio.h> -#include <linux/mg_disk.h> #define MG_RES_SEC (CONFIG_MG_DISK_RES << 1) +/* name for block device */ +#define MG_DISK_NAME "mgd" +/* name for platform device */ +#define MG_DEV_NAME "mg_disk" + +#define MG_DISK_MAJ 0 +#define MG_DISK_MAX_PART 16 +#define MG_SECTOR_SIZE 512 +#define MG_MAX_SECTS 256 + +/* Register offsets */ +#define MG_BUFF_OFFSET 0x8000 +#define MG_STORAGE_BUFFER_SIZE 0x200 +#define MG_REG_OFFSET 0xC000 +#define MG_REG_FEATURE (MG_REG_OFFSET + 2)/* write case */ +#define MG_REG_ERROR (MG_REG_OFFSET + 2)/* read case */ +#define MG_REG_SECT_CNT (MG_REG_OFFSET + 4) +#define MG_REG_SECT_NUM (MG_REG_OFFSET + 6) +#define MG_REG_CYL_LOW (MG_REG_OFFSET + 8) +#define MG_REG_CYL_HIGH (MG_REG_OFFSET + 0xA) +#define MG_REG_DRV_HEAD (MG_REG_OFFSET + 0xC) +#define MG_REG_COMMAND (MG_REG_OFFSET + 0xE)/* write case */ +#define MG_REG_STATUS (MG_REG_OFFSET + 0xE)/* read case */ +#define MG_REG_DRV_CTRL (MG_REG_OFFSET + 0x10) +#define MG_REG_BURST_CTRL (MG_REG_OFFSET + 0x12) + +/* "Drive Select/Head Register" bit values */ +#define MG_REG_HEAD_MUST_BE_ON 0xA0/* These 2 bits are always on */ +#define MG_REG_HEAD_DRIVE_MASTER (0x00 | MG_REG_HEAD_MUST_BE_ON) +#define MG_REG_HEAD_DRIVE_SLAVE (0x10 | MG_REG_HEAD_MUST_BE_ON) +#define MG_REG_HEAD_LBA_MODE (0x40 | MG_REG_HEAD_MUST_BE_ON) + + +/* "Device Control Register" bit values */ +#define MG_REG_CTRL_INTR_ENABLE 0x0 +#define MG_REG_CTRL_INTR_DISABLE (0x1<<1) +#define MG_REG_CTRL_RESET (0x1<<2) +#define MG_REG_CTRL_INTR_POLA_ACTIVE_HIGH 0x0 +#define MG_REG_CTRL_INTR_POLA_ACTIVE_LOW (0x1<<4) +#define MG_REG_CTRL_DPD_POLA_ACTIVE_LOW 0x0 +#define MG_REG_CTRL_DPD_POLA_ACTIVE_HIGH (0x1<<5) +#define MG_REG_CTRL_DPD_DISABLE 0x0 +#define MG_REG_CTRL_DPD_ENABLE (0x1<<6) + +/* Status register bit */ +/* error bit in status register */ +#define MG_REG_STATUS_BIT_ERROR 0x01 +/* corrected error in status register */ +#define MG_REG_STATUS_BIT_CORRECTED_ERROR 0x04 +/* data request bit in status register */ +#define MG_REG_STATUS_BIT_DATA_REQ 0x08 +/* DSC - Drive Seek Complete */ +#define MG_REG_STATUS_BIT_SEEK_DONE 0x10 +/* DWF - Drive Write Fault */ +#define MG_REG_STATUS_BIT_WRITE_FAULT 0x20 +#define MG_REG_STATUS_BIT_READY 0x40 +#define MG_REG_STATUS_BIT_BUSY 0x80 + +/* handy status */ +#define MG_STAT_READY (MG_REG_STATUS_BIT_READY | MG_REG_STATUS_BIT_SEEK_DONE) +#define MG_READY_OK (s) (((s) & (MG_STAT_READY | \ + (MG_REG_STATUS_BIT_BUSY | \ + MG_REG_STATUS_BIT_WRITE_FAULT | \ + MG_REG_STATUS_BIT_ERROR))) == MG_STAT_READY) + +/* Error register */ +#define MG_REG_ERR_AMNF 0x01 +#define MG_REG_ERR_ABRT 0x04 +#define MG_REG_ERR_IDNF 0x10 +#define MG_REG_ERR_UNC 0x40 +#define MG_REG_ERR_BBK 0x80 + +/* error code for others */ +#define MG_ERR_NONE 0 +#define MG_ERR_TIMEOUT 0x100 +#define MG_ERR_INIT_STAT 0x101 +#define MG_ERR_TRANSLATION 0x102 +#define MG_ERR_CTRL_RST 0x103 +#define MG_ERR_INV_STAT 0x104 +#define MG_ERR_RSTOUT 0x105 + +#define MG_MAX_ERRORS 6/* Max read/write errors */ + +/* command */ +#define MG_CMD_RD 0x20 +#define MG_CMD_WR 0x30 +#define MG_CMD_SLEEP 0x99 +#define MG_CMD_WAKEUP 0xC3 +#define MG_CMD_ID 0xEC +#define MG_CMD_WR_CONF 0x3C +#define MG_CMD_RD_CONF 0x40 + +/* operation mode */ +#define MG_OP_CASCADE (1 << 0) +#define MG_OP_CASCADE_SYNC_RD (1 << 1) +#define MG_OP_CASCADE_SYNC_WR (1 << 2) +#define MG_OP_INTERLEAVE (1 << 3) + +/* synchronous */ +#define MG_BURST_LAT_4 (3 << 4) +#define MG_BURST_LAT_5 (4 << 4) +#define MG_BURST_LAT_6 (5 << 4) +#define MG_BURST_LAT_7 (6 << 4) +#define MG_BURST_LAT_8 (7 << 4) +#define MG_BURST_LEN_4 (1 << 1) +#define MG_BURST_LEN_8 (2 << 1) +#define MG_BURST_LEN_16 (3 << 1) +#define MG_BURST_LEN_32 (4 << 1) +#define MG_BURST_LEN_CONT (0 << 1) + +/* timeout value (unit: ms) */ +#define MG_TMAX_CONF_TO_CMD 1 +#define MG_TMAX_WAIT_RD_DRQ 10 +#define MG_TMAX_WAIT_WR_DRQ 500 +#define MG_TMAX_RST_TO_BUSY 10 +#define MG_TMAX_HDRST_TO_RDY 500 +#define MG_TMAX_SWRST_TO_RDY 500 +#define MG_TMAX_RSTOUT 3000 + +/* device attribution */ +/* use mflash as boot device */ +#define MG_BOOT_DEV (1 << 0) +/* use mflash as storage device */ +#define MG_STORAGE_DEV (1 << 1) +/* same as MG_STORAGE_DEV, but bootloader already done reset sequence */ +#define MG_STORAGE_DEV_SKIP_RST (1 << 2) + +#define MG_DEV_MASK (MG_BOOT_DEV | MG_STORAGE_DEV | MG_STORAGE_DEV_SKIP_RST) + +/* names of GPIO resource */ +#define MG_RST_PIN "mg_rst" +/* except MG_BOOT_DEV, reset-out pin should be assigned */ +#define MG_RSTOUT_PIN "mg_rstout" + +/* private driver data */ +struct mg_drv_data { +/* disk resource */ +u32 use_polling; + +/* device attribution */ +u32 dev_attr; + +/* internally used */ +struct mg_host *host; +}; + +/* main structure for mflash driver */ +struct mg_host { +struct device *dev; + +struct request_queue *breq; +spinlock_t lock; +struct gendisk *gd; + +struct timer_list timer; +void (*mg_do_intr) (struct mg_host *); + +u16 id[ATA_ID_WORDS ]; + +u16 cyls; +u16 heads; +u16 sectors; +u32 n_sectors; +u32 nres_sectors; + +void __iomem *dev_base; +unsigned int irq; +unsigned int rst; +unsigned int rstout; + +u32 major; +u32 error; +}; + +/* +* Debugging macro and defines +*/ +#undef DO_MG_DEBUG +#ifdef DO_MG_DEBUG +# define MG_DBG(fmt, args...) \ + printk(KERN_DEBUG "%s:%d "fmt, __func__, __LINE__, ##args) +#else /* CONFIG_MG_DEBUG */ +# define MG_DBG(fmt, args...) do { } while (0) +#endif /* CONFIG_MG_DEBUG */ +static void mg_request (struct request_queue *); static void mg_dump_status(const char *msg, unsigned int stat,
include/linux/mg_disk.h deleted +0 -206
206 lines not on this page · raw message
Signature · 1 line
1.6.0.2
PATCH 12/14 mg_disk: clean up request completion paths
In reply to Tejun Heomg_disk implements its own partial completion. Convert to standard block layer partial completion.
[ Impact: cleanup ]
--- drivers/block/mg_disk.c | 117 +++++++++++++--------------------------------- 1 files changed, 33 insertions(+), 84 deletions(-)
drivers/block/mg_disk.c +33 -84
@@ -503,95 +503,68 @@ static unsigned int mg_out(struct mg_host *host,static void mg_read (struct request *req) { -u32 remains, j; +u32 j;struct mg_host *host = req->rq_disk->private_data; - remains = req->nr_sectors; -if (mg_out (host, req->sector, req->nr_sectors,MG_CMD_RD ,NULL ) !=MG_ERR_NONE )mg_bad_rw_intr (host);MG_DBG ("requested %d sects (from %ld), buffer=0x%p\n" , - remains, req->sector, req->buffer); + req->nr_sectors, req->sector, req->buffer); + +do { +u16 *buff = (u16 *)req->buffer; -while (remains) {if (mg_wait (host,MG_REG_STATUS_BIT_DATA_REQ ,MG_TMAX_WAIT_RD_DRQ ) !=MG_ERR_NONE ) {mg_bad_rw_intr (host);return ; } -for (j =0 ; j <MG_SECTOR_SIZE >>1 ; j++) { - *(u16 *)req->buffer = -inw ((unsigned long )host->dev_base + -MG_BUFF_OFFSET + (j <<1 )); - req->buffer +=2 ; - } - - req->sector++; - req->errors =0 ; - remains = --req->nr_sectors; - --req->current_nr_sectors; - -if (req->current_nr_sectors <=0 ) { -MG_DBG ("remain : %d sects\n" , remains); -__blk_end_request_cur (req,0 ); -if (remains >0 ) - req =elv_next_request (host->breq); - } +for (j =0 ; j <MG_SECTOR_SIZE >>1 ; j++) + *buff++ =inw ((unsigned long )host->dev_base + +MG_BUFF_OFFSET + (j <<1 ));outb (MG_CMD_RD_CONF , (unsigned long )host->dev_base +MG_REG_COMMAND ); - } + }while (__blk_end_request (req,0 ,MG_SECTOR_SIZE )); }static void mg_write (struct request *req) { -u32 remains, j; +u32 j;struct mg_host *host = req->rq_disk->private_data; - remains = req->nr_sectors; -if (mg_out (host, req->sector, req->nr_sectors,MG_CMD_WR ,NULL ) !=MG_ERR_NONE ) {mg_bad_rw_intr (host);return ; } -MG_DBG ("requested %d sects (from %ld), buffer=0x%p\n" , - remains, req->sector, req->buffer); -while (remains) { + req->nr_sectors, req->sector, req->buffer); + +do { +u16 *buff = (u16 *)req->buffer; +if (mg_wait (host,MG_REG_STATUS_BIT_DATA_REQ ,MG_TMAX_WAIT_WR_DRQ ) !=MG_ERR_NONE ) {mg_bad_rw_intr (host);return ; } -for (j =0 ; j <MG_SECTOR_SIZE >>1 ; j++) { -outw (*(u16 *)req->buffer, - (unsigned long )host->dev_base + -MG_BUFF_OFFSET + (j <<1 )); - req->buffer +=2 ; - } - req->sector++; - remains = --req->nr_sectors; - --req->current_nr_sectors; - -if (req->current_nr_sectors <=0 ) { -MG_DBG ("remain : %d sects\n" , remains); -__blk_end_request_cur (req,0 ); -if (remains >0 ) - req =elv_next_request (host->breq); - } +for (j =0 ; j <MG_SECTOR_SIZE >>1 ; j++) +outw (*buff++, (unsigned long )host->dev_base + +MG_BUFF_OFFSET + (j <<1 ));outb (MG_CMD_WR_CONF , (unsigned long )host->dev_base +MG_REG_COMMAND ); - } + }while (__blk_end_request (req,0 ,MG_SECTOR_SIZE )); }static void mg_read_intr (struct mg_host *host) {u32 i; +u16 *buff;struct request *req;/* check status */
@@ -612,39 +585,24 @@ static void mg_read_intr(struct mg_host *host) ok_to_read:/* get current segment of request */ req =elv_next_request (host->breq); + buff = (u16 *)req->buffer;/* read 1 sector */ -for (i =0 ; i <MG_SECTOR_SIZE >>1 ; i++) { - *(u16 *)req->buffer = -inw ((unsigned long )host->dev_base +MG_BUFF_OFFSET + - (i <<1 )); - req->buffer +=2 ; - } +for (i =0 ; i <MG_SECTOR_SIZE >>1 ; i++) + *buff++ =inw ((unsigned long )host->dev_base +MG_BUFF_OFFSET + + (i <<1 )); -/* manipulate request */ MG_DBG ("sector %ld, remaining=%ld, buffer=0x%p\n" , req->sector, req->nr_sectors -1 , req->buffer); - req->sector++; - req->errors =0 ; - i = --req->nr_sectors; - --req->current_nr_sectors; - -/* let know if current segment done */ -if (req->current_nr_sectors <=0 ) -__blk_end_request_cur (req,0 ); - -/* set handler if read remains */ -if (i >0 ) { - host->mg_do_intr = mg_read_intr; -mod_timer (&host->timer, jiffies +3 *HZ ); - } -/* send read confirm */ outb (MG_CMD_RD_CONF , (unsigned long )host->dev_base +MG_REG_COMMAND ); -/* goto next request */ -if (!i) +if (__blk_end_request (req,0 ,MG_SECTOR_SIZE )) { +/* set handler if read remains */ + host->mg_do_intr = mg_read_intr; +mod_timer (&host->timer, jiffies +3 *HZ ); + }else /* goto next request */ mg_request (host->breq); }
@@ -653,6 +611,7 @@ static void mg_write_intr(struct mg_host *host)u32 i, j;u16 *buff;struct request *req; +bool rem;/* get current segment of request */ req =elv_next_request (host->breq);
@@ -673,18 +632,8 @@ static void mg_write_intr(struct mg_host *host)return ; ok_to_write: -/* manipulate request */ - req->sector++; - i = --req->nr_sectors; - --req->current_nr_sectors; - req->buffer +=MG_SECTOR_SIZE ; - -/* let know if current segment or all done */ -if (!i || (req->bio && req->current_nr_sectors <=0 )) -__blk_end_request_cur (req,0 ); - -/* write 1 sector and set handler if remains */ -if (i >0 ) { +if ((rem =__blk_end_request (req,0 ,MG_SECTOR_SIZE ))) { +/* write 1 sector and set handler if remains */ buff = (u16 *)req->buffer;for (j =0 ; j <MG_STORAGE_BUFFER_SIZE >>1 ; j++) { outw(*buff, (unsigned long)host->dev_base +
@@ -700,7 +649,7 @@ ok_to_write:/* send write confirm */ outb (MG_CMD_WR_CONF , (unsigned long )host->dev_base +MG_REG_COMMAND ); -if (!i) +if (!rem)mg_request (host->breq); }
Signature · 1 line
1.6.0.2
PATCH 13/14 mg_disk: fix dependency on libata
In reply to Tejun HeoFrom: Bartlomiej Zolnierkiewicz <[email protected]>
Add local copies of ata_id_string() and ata_id_c_string() to mg_disk so there is no need for the driver to depend on ATA and SCSI.
[ Impact: break dependency on libata by copying ata id string functions ]
--- drivers/block/Kconfig | 2 +- drivers/block/mg_disk.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 41 insertions(+), 5 deletions(-)
drivers/block/Kconfig +1 -1
@@ -412,7 +412,7 @@ config ATA_OVER_ETH config MG_DISK tristate "mGine mflash, gflash support" - depends on ARM && ATA && GPIOLIB + depends on ARM && GPIOLIB help mGine mFlash(gFlash) block device driver
drivers/block/mg_disk.c +40 -4
62 lines not on this page · raw message
Signature · 1 line
1.6.0.2
PATCH 14/14 mg_disk: use defines from <linux/ata.h>
In reply to Tejun HeoFrom: Bartlomiej Zolnierkiewicz <[email protected]>
While at it:
- remove MG_REG_HEAD_MUST_BE_ON define
- remove MG_REG_CTRL_INTR_ENABLE define
- remove MG_REG_HEAD_LBA_MODE define
- remove unused defines
--- drivers/block/mg_disk.c | 144 ++++++++++++++--------------------------------- 1 files changed, 43 insertions(+), 101 deletions(-)
drivers/block/mg_disk.c +43 -101
@@ -51,51 +51,10 @@#define MG_REG_DRV_CTRL (MG_REG_OFFSET + 0x10)#define MG_REG_BURST_CTRL (MG_REG_OFFSET + 0x12) -/* "Drive Select/Head Register" bit values */ -#define MG_REG_HEAD_MUST_BE_ON 0xA0/* These 2 bits are always on */ -#define MG_REG_HEAD_DRIVE_MASTER (0x00 | MG_REG_HEAD_MUST_BE_ON) -#define MG_REG_HEAD_DRIVE_SLAVE (0x10 | MG_REG_HEAD_MUST_BE_ON) -#define MG_REG_HEAD_LBA_MODE (0x40 | MG_REG_HEAD_MUST_BE_ON) - - -/* "Device Control Register" bit values */ -#define MG_REG_CTRL_INTR_ENABLE 0x0 -#define MG_REG_CTRL_INTR_DISABLE (0x1<<1) -#define MG_REG_CTRL_RESET (0x1<<2) -#define MG_REG_CTRL_INTR_POLA_ACTIVE_HIGH 0x0 -#define MG_REG_CTRL_INTR_POLA_ACTIVE_LOW (0x1<<4) -#define MG_REG_CTRL_DPD_POLA_ACTIVE_LOW 0x0 -#define MG_REG_CTRL_DPD_POLA_ACTIVE_HIGH (0x1<<5) -#define MG_REG_CTRL_DPD_DISABLE 0x0 -#define MG_REG_CTRL_DPD_ENABLE (0x1<<6) - -/* Status register bit */ -/* error bit in status register */ -#define MG_REG_STATUS_BIT_ERROR 0x01 -/* corrected error in status register */ -#define MG_REG_STATUS_BIT_CORRECTED_ERROR 0x04 -/* data request bit in status register */ -#define MG_REG_STATUS_BIT_DATA_REQ 0x08 -/* DSC - Drive Seek Complete */ -#define MG_REG_STATUS_BIT_SEEK_DONE 0x10 -/* DWF - Drive Write Fault */ -#define MG_REG_STATUS_BIT_WRITE_FAULT 0x20 -#define MG_REG_STATUS_BIT_READY 0x40 -#define MG_REG_STATUS_BIT_BUSY 0x80 -/* handy status */ -#define MG_STAT_READY (MG_REG_STATUS_BIT_READY | MG_REG_STATUS_BIT_SEEK_DONE) -#define MG_READY_OK (s) (((s) & (MG_STAT_READY | \ - (MG_REG_STATUS_BIT_BUSY | \ - MG_REG_STATUS_BIT_WRITE_FAULT | \ - MG_REG_STATUS_BIT_ERROR))) == MG_STAT_READY) - -/* Error register */ -#define MG_REG_ERR_AMNF 0x01 -#define MG_REG_ERR_ABRT 0x04 -#define MG_REG_ERR_IDNF 0x10 -#define MG_REG_ERR_UNC 0x40 -#define MG_REG_ERR_BBK 0x80 +#define MG_STAT_READY (ATA_DRDY | ATA_DSC) +#define MG_READY_OK (s) (((s) & (MG_STAT_READY | (ATA_BUSY | ATA_DF | \ + ATA_ERR))) == MG_STAT_READY)/* error code for others */ #define MG_ERR_NONE 0
@@ -225,41 +184,39 @@ static void mg_dump_status(const char *msg, unsigned int stat, }printk (KERN_ERR "%s: %s: status=0x%02x { " , name, msg, stat &0xff ); -if (stat &MG_REG_STATUS_BIT_BUSY ) +if (stat &ATA_BUSY )printk ("Busy " ); -if (stat &MG_REG_STATUS_BIT_READY ) +if (stat &ATA_DRDY )printk ("DriveReady " ); -if (stat &MG_REG_STATUS_BIT_WRITE_FAULT ) +if (stat &ATA_DF )printk ("WriteFault " ); -if (stat &MG_REG_STATUS_BIT_SEEK_DONE ) +if (stat &ATA_DSC )printk ("SeekComplete " ); -if (stat &MG_REG_STATUS_BIT_DATA_REQ ) +if (stat &ATA_DRQ )printk ("DataRequest " ); -if (stat &MG_REG_STATUS_BIT_CORRECTED_ERROR ) +if (stat &ATA_CORR )printk ("CorrectedError " ); -if (stat &MG_REG_STATUS_BIT_ERROR ) +if (stat &ATA_ERR )printk ("Error " );printk ("}\n" ); -if ((stat &MG_REG_STATUS_BIT_ERROR ) ==0 ) { +if ((stat &ATA_ERR ) ==0 ) { host->error =0 ; }else { host->error =inb ((unsigned long )host->dev_base +MG_REG_ERROR );printk (KERN_ERR "%s: %s: error=0x%02x { " , name, msg, host->error &0xff ); -if (host->error &MG_REG_ERR_BBK ) +if (host->error &ATA_BBK )printk ("BadSector " ); -if (host->error &MG_REG_ERR_UNC ) +if (host->error &ATA_UNC )printk ("UncorrectableError " ); -if (host->error &MG_REG_ERR_IDNF ) +if (host->error &ATA_IDNF )printk ("SectorIdNotFound " ); -if (host->error &MG_REG_ERR_ABRT ) +if (host->error &ATA_ABORTED )printk ("DriveStatusError " ); -if (host->error &MG_REG_ERR_AMNF ) +if (host->error &ATA_AMNF )printk ("AddrMarkNotFound " );printk ("}" ); -if (host->error & - (MG_REG_ERR_BBK |MG_REG_ERR_UNC | -MG_REG_ERR_IDNF |MG_REG_ERR_AMNF )) { +if (host->error & (ATA_BBK |ATA_UNC |ATA_IDNF |ATA_AMNF )) {if (host->breq) { req =elv_next_request (host->breq);if (req)
@@ -284,12 +241,12 @@ static unsigned int mg_wait(struct mg_host *host, u32 expect, u32 msec) do { cur_jiffies = jiffies; - if (status & MG_REG_STATUS_BIT_BUSY) { - if (expect == MG_REG_STATUS_BIT_BUSY) + if (status & ATA_BUSY) { + if (expect == ATA_BUSY) break; } else { /* Check the error condition! */ - if (status & MG_REG_STATUS_BIT_ERROR) { + if (status & ATA_ERR) { mg_dump_status("mg_wait", status, host); break; }
@@ -298,8 +255,8 @@ static unsigned int mg_wait(struct mg_host *host, u32 expect, u32 msec)if (MG_READY_OK (status))break ; -if (expect ==MG_REG_STATUS_BIT_DATA_REQ ) -if (status &MG_REG_STATUS_BIT_DATA_REQ ) +if (expect ==ATA_DRQ ) +if (status &ATA_DRQ )break ; }if (!msec) {
@@ -404,12 +361,10 @@ static int mg_get_disk_id(struct mg_host *host)char serial[ATA_ID_SERNO_LEN +1 ];if (!prv_data->use_polling) -outb (MG_REG_CTRL_INTR_DISABLE , - (unsigned long )host->dev_base + -MG_REG_DRV_CTRL ); +outb (ATA_NIEN , (unsigned long )host->dev_base +MG_REG_DRV_CTRL );outb (MG_CMD_ID , (unsigned long )host->dev_base +MG_REG_COMMAND ); - err =mg_wait (host,MG_REG_STATUS_BIT_DATA_REQ ,MG_TMAX_WAIT_RD_DRQ ); + err =mg_wait (host,ATA_DRQ ,MG_TMAX_WAIT_RD_DRQ );if (err)return err;
@@ -449,8 +404,7 @@ static int mg_get_disk_id(struct mg_host *host) host->n_sectors, host->nres_sectors);if (!prv_data->use_polling) -outb (MG_REG_CTRL_INTR_ENABLE , (unsigned long )host->dev_base + -MG_REG_DRV_CTRL ); +outb (0 , (unsigned long )host->dev_base +MG_REG_DRV_CTRL );return err; }
@@ -464,7 +418,7 @@ static int mg_disk_init(struct mg_host *host)/* hdd rst low */ gpio_set_value (host->rst,0 ); - err =mg_wait (host,MG_REG_STATUS_BIT_BUSY ,MG_TMAX_RST_TO_BUSY ); + err =mg_wait (host,ATA_BUSY ,MG_TMAX_RST_TO_BUSY );if (err)return err;
@@ -475,17 +429,14 @@ static int mg_disk_init(struct mg_host *host)return err;/* soft reset on */ -outb (MG_REG_CTRL_RESET | - (prv_data->use_polling ?MG_REG_CTRL_INTR_DISABLE : -MG_REG_CTRL_INTR_ENABLE ), +outb (ATA_SRST | (prv_data->use_polling ?ATA_NIEN :0 ), (unsigned long )host->dev_base +MG_REG_DRV_CTRL ); - err =mg_wait (host,MG_REG_STATUS_BIT_BUSY ,MG_TMAX_RST_TO_BUSY ); + err =mg_wait (host,ATA_BUSY ,MG_TMAX_RST_TO_BUSY );if (err)return err;/* soft reset off */ -outb (prv_data->use_polling ?MG_REG_CTRL_INTR_DISABLE : -MG_REG_CTRL_INTR_ENABLE , +outb (prv_data->use_polling ?ATA_NIEN :0 , (unsigned long )host->dev_base +MG_REG_DRV_CTRL ); err =mg_wait (host,MG_STAT_READY ,MG_TMAX_SWRST_TO_RDY );if (err)
@@ -531,7 +482,7 @@ static unsigned int mg_out(struct mg_host *host, MG_REG_CYL_LOW);outb ((u8)(sect_num >>16 ), (unsigned long )host->dev_base +MG_REG_CYL_HIGH ); -outb ((u8)((sect_num >>24 ) |MG_REG_HEAD_LBA_MODE ), +outb ((u8)((sect_num >>24 ) |ATA_LBA |ATA_DEVICE_OBS ), (unsigned long )host->dev_base +MG_REG_DRV_HEAD );outb (cmd, (unsigned long )host->dev_base +MG_REG_COMMAND );return MG_ERR_NONE ;
@@ -552,8 +503,8 @@ static void mg_read(struct request *req) do { u16 *buff = (u16 *)req->buffer; - if (mg_wait(host, MG_REG_STATUS_BIT_DATA_REQ, - MG_TMAX_WAIT_RD_DRQ) != MG_ERR_NONE) { + if (mg_wait(host, ATA_DRQ, + MG_TMAX_WAIT_RD_DRQ) != MG_ERR_NONE) { mg_bad_rw_intr(host); return; }
@@ -583,8 +534,7 @@ static void mg_write(struct request *req) do { u16 *buff = (u16 *)req->buffer; - if (mg_wait(host, MG_REG_STATUS_BIT_DATA_REQ, - MG_TMAX_WAIT_WR_DRQ) != MG_ERR_NONE) { + if (mg_wait(host, ATA_DRQ, MG_TMAX_WAIT_WR_DRQ) != MG_ERR_NONE) { mg_bad_rw_intr(host); return; }
@@ -606,11 +556,11 @@ static void mg_read_intr(struct mg_host *host)/* check status */ do { i =inb ((unsigned long )host->dev_base +MG_REG_STATUS ); -if (i &MG_REG_STATUS_BIT_BUSY ) +if (i &ATA_BUSY )break ;if (!MG_READY_OK (i))break ; -if (i &MG_REG_STATUS_BIT_DATA_REQ ) +if (i &ATA_DRQ ) goto ok_to_read; }while (0 );mg_dump_status ("mg_read_intr" , i, host);
@@ -655,11 +605,11 @@ static void mg_write_intr(struct mg_host *host)/* check status */ do { i =inb ((unsigned long )host->dev_base +MG_REG_STATUS ); -if (i &MG_REG_STATUS_BIT_BUSY ) +if (i &ATA_BUSY )break ;if (!MG_READY_OK (i))break ; -if ((req->nr_sectors <=1 ) || (i &MG_REG_STATUS_BIT_DATA_REQ )) +if ((req->nr_sectors <=1 ) || (i &ATA_DRQ )) goto ok_to_write; }while (0 );mg_dump_status ("mg_write_intr" , i, host);
@@ -752,18 +702,15 @@ static unsigned int mg_issue_req(struct request *req,break ;case WRITE :/* TODO : handler */ -outb (MG_REG_CTRL_INTR_DISABLE , - (unsigned long )host->dev_base + -MG_REG_DRV_CTRL ); +outb (ATA_NIEN , (unsigned long )host->dev_base +MG_REG_DRV_CTRL );if (mg_out (host, sect_num, sect_cnt,MG_CMD_WR , &mg_write_intr) !=MG_ERR_NONE ) {mg_bad_rw_intr (host);return host->error; }del_timer (&host->timer); -mg_wait (host,MG_REG_STATUS_BIT_DATA_REQ ,MG_TMAX_WAIT_WR_DRQ ); -outb (MG_REG_CTRL_INTR_ENABLE , (unsigned long )host->dev_base + -MG_REG_DRV_CTRL ); +mg_wait (host,ATA_DRQ ,MG_TMAX_WAIT_WR_DRQ ); +outb (0 , (unsigned long )host->dev_base +MG_REG_DRV_CTRL );if (host->error) {mg_bad_rw_intr (host);return host->error;
@@ -849,9 +796,7 @@ static int mg_suspend(struct platform_device *plat_dev, pm_message_t state)return -EIO ;if (!prv_data->use_polling) -outb (MG_REG_CTRL_INTR_DISABLE , - (unsigned long )host->dev_base + -MG_REG_DRV_CTRL ); +outb (ATA_NIEN , (unsigned long )host->dev_base +MG_REG_DRV_CTRL );outb (MG_CMD_SLEEP , (unsigned long )host->dev_base +MG_REG_COMMAND );/* wait until mflash deep sleep */
@@ -859,9 +804,7 @@ static int mg_suspend(struct platform_device *plat_dev, pm_message_t state)if (mg_wait (host,MG_STAT_READY ,MG_TMAX_CONF_TO_CMD )) {if (!prv_data->use_polling) -outb (MG_REG_CTRL_INTR_ENABLE , - (unsigned long )host->dev_base + -MG_REG_DRV_CTRL ); +outb (0 , (unsigned long )host->dev_base +MG_REG_DRV_CTRL );return -EIO ; }
@@ -884,8 +827,7 @@ static int mg_resume(struct platform_device *plat_dev)return -EIO ;if (!prv_data->use_polling) -outb (MG_REG_CTRL_INTR_ENABLE , (unsigned long )host->dev_base + -MG_REG_DRV_CTRL ); +outb (0 , (unsigned long )host->dev_base +MG_REG_DRV_CTRL );return 0 ; }
Signature · 1 line
1.6.0.2
Jens Axboe
AppliedQuoted 5 lines · Tejun Heo
Hello,
Upon ack, please pull from the following git tree.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.gittj-block-for-2.6.31
Applied, thanks Tejun!
Signature · 1 line
Jens Axboe