From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pat LaVarre Subject: Re: [PATCH] atapi request sense work Date: 27 May 2004 18:13:25 -0600 Sender: linux-ide-owner@vger.kernel.org Message-ID: <1085703205.5890.1.camel@patibmrh9> References: <1084717146.3576.3.camel@patibmrh9> <40AD7FB2.10506@pobox.com><1 085153750.6103.33.camel@patibmrh9><200405211746.35015.bzolnier@elka.pw.ed u . pl><1085162347.4791.24.camel@patibmrh9><1085170025.3083.91.camel@pat i bm r h9> <40AE79E1.9020005@pobox.com><1085182749.3122.15.camel@patibmrh9 > < 40AE9493.1040701@pobox.com><1085186021.4510.0.camel@patibmrh9> <108518 8300 .3658.18.camel@patibmrh9><1085608170.4148.138.camel@patibmrh9> <10856 9 9522.3853.1.camel@patibmrh9><40B67A79.9000706@pobox.com> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Return-path: Received: from email-out2.iomega.com ([147.178.1.83]:55509 "EHLO email.iomega.com") by vger.kernel.org with ESMTP id S265478AbUE1ANd (ORCPT ); Thu, 27 May 2004 20:13:33 -0400 In-Reply-To: <40B67A79.9000706@pobox.com> List-Id: linux-ide@vger.kernel.org To: Jeff Garzik Cc: linux-ide@vger.kernel.org Jeff G: > As a first step, ... > create a patch versus mainline, that does > nothing but add this function (and uses it)? Here you go. "Here I chose { inline } over { static inline } because lately I saw you counting libata.ko bytes." "Here I chose u8 over int because lxr.linux.no/source/ suggests Linux readb and inb return u8." This patch names the repeated five lines without changing where they are called. I have included it inline but not also attached. I confirmed the lines repeat via diff -b. I compiled, linked, cleared unit attentions by unsolicited sense, read, and wrote. Sorry I have not yet understood all your English. I think/ hope this is close enough to help. I of course look forward to discovering if/ how I can help more. Pat LaVarre diff -Nurp linux-2.6.7-rc1-bk4/include/linux/ata.h linux-2.6.7-rc1-bk4-pel/include/linux/ata.h diff -Nurp linux-2.6.7-rc1-bk4/include/linux/libata.h linux-2.6.7-rc1-bk4-pel/include/linux/libata.h diff -Nurp linux-2.6.7-rc1-bk4/drivers/scsi/libata-core.c linux-2.6.7-rc1-bk4-pel/drivers/scsi/libata-core.c --- linux-2.6.7-rc1-bk4/drivers/scsi/libata-core.c 2004-05-27 16:40:42.000000000 -0600 +++ linux-2.6.7-rc1-bk4-pel/drivers/scsi/libata-core.c 2004-05-27 17:56:57.192826736 -0600 @@ -2146,6 +2146,22 @@ static void ata_pio_task(void *_data) } /** + * ata_check_bmdma - read PCI IDE BMDMA status + * @ap: struct ata_port + */ + +static u8 ata_check_bmdma(struct ata_port *ap) +{ + u8 host_stat; + if (ap->flags & ATA_FLAG_MMIO) { + void *mmio = (void *) ap->ioaddr.bmdma_addr; + host_stat = readb(mmio + ATA_DMA_STATUS); + } else + host_stat = inb(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS); + return host_stat; +} + +/** * ata_eng_timeout - Handle timeout of queued command * @ap: Port on which timed-out command is active * @@ -2188,11 +2204,7 @@ void ata_eng_timeout(struct ata_port *ap switch (qc->tf.protocol) { case ATA_PROT_DMA: - if (ap->flags & ATA_FLAG_MMIO) { - void *mmio = (void *) ap->ioaddr.bmdma_addr; - host_stat = readb(mmio + ATA_DMA_STATUS); - } else - host_stat = inb(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS); + host_stat = ata_check_bmdma(ap); printk(KERN_ERR "ata%u: DMA timeout, stat 0x%x\n", ap->id, host_stat); @@ -2622,11 +2634,7 @@ inline unsigned int ata_host_intr (struc /* BMDMA completion */ case ATA_PROT_DMA: case ATA_PROT_ATAPI_DMA: - if (ap->flags & ATA_FLAG_MMIO) { - void *mmio = (void *) ap->ioaddr.bmdma_addr; - host_stat = readb(mmio + ATA_DMA_STATUS); - } else - host_stat = inb(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS); + host_stat = ata_check_bmdma(ap); VPRINTK("BUS_DMA (host_stat 0x%X)\n", host_stat); if (!(host_stat & ATA_DMA_INTR)) { diff -Nurp linux-2.6.7-rc1-bk4/drivers/scsi/libata-scsi.c linux-2.6.7-rc1-bk4-pel/drivers/scsi/libata-scsi.c