From: Danny Cox <Danny.Cox@ECWeb.com>
To: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Cc: linux-ide@vger.kernel.org
Subject: Re: [PATCH] atapi request sense work
Date: Fri, 21 May 2004 14:23:16 -0400 [thread overview]
Message-ID: <1085163796.833.61.camel@vom> (raw)
In-Reply-To: <200405211746.35015.bzolnier@elka.pw.edu.pl>
Bartlomiej,
On Fri, 2004-05-21 at 11:46, Bartlomiej Zolnierkiewicz wrote:
> Keep posting... seconded.
>
> I'm also reading this and linux-ide needs more traffic/people. ;-)
Okay, here's some more ;-).
I've been lurking up to this point, but I've attached a patch that
fixes something that's been an irritation to me for awhile now (at least
two years plus).
It's especially relevant now too, with the i386 4K stack in place. In
ide.c, ide_unregister(), old_hwif is allocated on the stack. The little
sucker is over 1K all by itself! So, I've modified the code to use
kmalloc().
It may not be right, but I'd still like to see some form of it used.
I'm still a newbie, so please don't flame me to a crisp if I've
committed a grave sin. Thanks!
----------------------------------------------------------
--- drivers/ide/ide.c.old 2004-05-11 08:00:25.000000000 -0400
+++ drivers/ide/ide.c 2004-05-21 14:04:44.904273325 -0400
@@ -615,11 +615,15 @@
ide_hwif_t *hwif, *g;
ide_hwgroup_t *hwgroup;
int irq_count = 0, unit, i;
- ide_hwif_t old_hwif;
+ ide_hwif_t *old_hwif = NULL;
if (index >= MAX_HWIFS)
BUG();
+ old_hwif = kmalloc(sizeof (*old_hwif), GFP_KERNEL);
+ if (old_hwif == NULL)
+ goto abort;
+
BUG_ON(in_interrupt());
BUG_ON(irqs_disabled());
down(&ide_cfg_sem);
@@ -765,120 +769,123 @@
hwif->dma_prdtable = 0;
}
- old_hwif = *hwif;
+
+ *old_hwif = *hwif;
init_hwif_data(hwif, index); /* restore hwif data to pristine status */
init_hwif_default(hwif, index);
- hwif->hwgroup = old_hwif.hwgroup;
+ hwif->hwgroup = old_hwif->hwgroup;
- hwif->gendev.parent = old_hwif.gendev.parent;
+ hwif->gendev.parent = old_hwif->gendev.parent;
- hwif->proc = old_hwif.proc;
+ hwif->proc = old_hwif->proc;
- hwif->major = old_hwif.major;
-// hwif->index = old_hwif.index;
-// hwif->channel = old_hwif.channel;
- hwif->straight8 = old_hwif.straight8;
- hwif->bus_state = old_hwif.bus_state;
+ hwif->major = old_hwif->major;
+// hwif->index = old_hwif->index;
+// hwif->channel = old_hwif->channel;
+ hwif->straight8 = old_hwif->straight8;
+ hwif->bus_state = old_hwif->bus_state;
- hwif->atapi_dma = old_hwif.atapi_dma;
- hwif->ultra_mask = old_hwif.ultra_mask;
- hwif->mwdma_mask = old_hwif.mwdma_mask;
- hwif->swdma_mask = old_hwif.swdma_mask;
+ hwif->atapi_dma = old_hwif->atapi_dma;
+ hwif->ultra_mask = old_hwif->ultra_mask;
+ hwif->mwdma_mask = old_hwif->mwdma_mask;
+ hwif->swdma_mask = old_hwif->swdma_mask;
- hwif->chipset = old_hwif.chipset;
- hwif->hold = old_hwif.hold;
+ hwif->chipset = old_hwif->chipset;
+ hwif->hold = old_hwif->hold;
#ifdef CONFIG_BLK_DEV_IDEPCI
- hwif->pci_dev = old_hwif.pci_dev;
- hwif->cds = old_hwif.cds;
+ hwif->pci_dev = old_hwif->pci_dev;
+ hwif->cds = old_hwif->cds;
#endif /* CONFIG_BLK_DEV_IDEPCI */
#if 0
- hwif->hwifops = old_hwif.hwifops;
+ hwif->hwifops = old_hwif->hwifops;
#else
- hwif->identify = old_hwif.identify;
- hwif->tuneproc = old_hwif.tuneproc;
- hwif->speedproc = old_hwif.speedproc;
- hwif->selectproc = old_hwif.selectproc;
- hwif->reset_poll = old_hwif.reset_poll;
- hwif->pre_reset = old_hwif.pre_reset;
- hwif->resetproc = old_hwif.resetproc;
- hwif->intrproc = old_hwif.intrproc;
- hwif->maskproc = old_hwif.maskproc;
- hwif->quirkproc = old_hwif.quirkproc;
- hwif->busproc = old_hwif.busproc;
+ hwif->identify = old_hwif->identify;
+ hwif->tuneproc = old_hwif->tuneproc;
+ hwif->speedproc = old_hwif->speedproc;
+ hwif->selectproc = old_hwif->selectproc;
+ hwif->reset_poll = old_hwif->reset_poll;
+ hwif->pre_reset = old_hwif->pre_reset;
+ hwif->resetproc = old_hwif->resetproc;
+ hwif->intrproc = old_hwif->intrproc;
+ hwif->maskproc = old_hwif->maskproc;
+ hwif->quirkproc = old_hwif->quirkproc;
+ hwif->busproc = old_hwif->busproc;
#endif
#if 0
- hwif->pioops = old_hwif.pioops;
+ hwif->pioops = old_hwif->pioops;
#else
- hwif->ata_input_data = old_hwif.ata_input_data;
- hwif->ata_output_data = old_hwif.ata_output_data;
- hwif->atapi_input_bytes = old_hwif.atapi_input_bytes;
- hwif->atapi_output_bytes = old_hwif.atapi_output_bytes;
+ hwif->ata_input_data = old_hwif->ata_input_data;
+ hwif->ata_output_data = old_hwif->ata_output_data;
+ hwif->atapi_input_bytes = old_hwif->atapi_input_bytes;
+ hwif->atapi_output_bytes = old_hwif->atapi_output_bytes;
#endif
#if 0
- hwif->dmaops = old_hwif.dmaops;
+ hwif->dmaops = old_hwif->dmaops;
#else
- hwif->ide_dma_read = old_hwif.ide_dma_read;
- hwif->ide_dma_write = old_hwif.ide_dma_write;
- hwif->ide_dma_begin = old_hwif.ide_dma_begin;
- hwif->ide_dma_end = old_hwif.ide_dma_end;
- hwif->ide_dma_check = old_hwif.ide_dma_check;
- hwif->ide_dma_on = old_hwif.ide_dma_on;
- hwif->ide_dma_off_quietly = old_hwif.ide_dma_off_quietly;
- hwif->ide_dma_test_irq = old_hwif.ide_dma_test_irq;
- hwif->ide_dma_host_on = old_hwif.ide_dma_host_on;
- hwif->ide_dma_host_off = old_hwif.ide_dma_host_off;
- hwif->ide_dma_verbose = old_hwif.ide_dma_verbose;
- hwif->ide_dma_lostirq = old_hwif.ide_dma_lostirq;
- hwif->ide_dma_timeout = old_hwif.ide_dma_timeout;
+ hwif->ide_dma_read = old_hwif->ide_dma_read;
+ hwif->ide_dma_write = old_hwif->ide_dma_write;
+ hwif->ide_dma_begin = old_hwif->ide_dma_begin;
+ hwif->ide_dma_end = old_hwif->ide_dma_end;
+ hwif->ide_dma_check = old_hwif->ide_dma_check;
+ hwif->ide_dma_on = old_hwif->ide_dma_on;
+ hwif->ide_dma_off_quietly = old_hwif->ide_dma_off_quietly;
+ hwif->ide_dma_test_irq = old_hwif->ide_dma_test_irq;
+ hwif->ide_dma_host_on = old_hwif->ide_dma_host_on;
+ hwif->ide_dma_host_off = old_hwif->ide_dma_host_off;
+ hwif->ide_dma_verbose = old_hwif->ide_dma_verbose;
+ hwif->ide_dma_lostirq = old_hwif->ide_dma_lostirq;
+ hwif->ide_dma_timeout = old_hwif->ide_dma_timeout;
#endif
#if 0
- hwif->iops = old_hwif.iops;
+ hwif->iops = old_hwif->iops;
#else
- hwif->OUTB = old_hwif.OUTB;
- hwif->OUTBSYNC = old_hwif.OUTBSYNC;
- hwif->OUTW = old_hwif.OUTW;
- hwif->OUTL = old_hwif.OUTL;
- hwif->OUTSW = old_hwif.OUTSW;
- hwif->OUTSL = old_hwif.OUTSL;
-
- hwif->INB = old_hwif.INB;
- hwif->INW = old_hwif.INW;
- hwif->INL = old_hwif.INL;
- hwif->INSW = old_hwif.INSW;
- hwif->INSL = old_hwif.INSL;
-#endif
-
- hwif->mmio = old_hwif.mmio;
- hwif->rqsize = old_hwif.rqsize;
- hwif->no_lba48 = old_hwif.no_lba48;
+ hwif->OUTB = old_hwif->OUTB;
+ hwif->OUTBSYNC = old_hwif->OUTBSYNC;
+ hwif->OUTW = old_hwif->OUTW;
+ hwif->OUTL = old_hwif->OUTL;
+ hwif->OUTSW = old_hwif->OUTSW;
+ hwif->OUTSL = old_hwif->OUTSL;
+
+ hwif->INB = old_hwif->INB;
+ hwif->INW = old_hwif->INW;
+ hwif->INL = old_hwif->INL;
+ hwif->INSW = old_hwif->INSW;
+ hwif->INSL = old_hwif->INSL;
+#endif
+
+ hwif->mmio = old_hwif->mmio;
+ hwif->rqsize = old_hwif->rqsize;
+ hwif->no_lba48 = old_hwif->no_lba48;
#ifndef CONFIG_BLK_DEV_IDECS
- hwif->irq = old_hwif.irq;
+ hwif->irq = old_hwif->irq;
#endif /* CONFIG_BLK_DEV_IDECS */
- hwif->dma_base = old_hwif.dma_base;
- hwif->dma_master = old_hwif.dma_master;
- hwif->dma_command = old_hwif.dma_command;
- hwif->dma_vendor1 = old_hwif.dma_vendor1;
- hwif->dma_status = old_hwif.dma_status;
- hwif->dma_vendor3 = old_hwif.dma_vendor3;
- hwif->dma_prdtable = old_hwif.dma_prdtable;
-
- hwif->dma_extra = old_hwif.dma_extra;
- hwif->config_data = old_hwif.config_data;
- hwif->select_data = old_hwif.select_data;
- hwif->autodma = old_hwif.autodma;
- hwif->udma_four = old_hwif.udma_four;
- hwif->no_dsc = old_hwif.no_dsc;
+ hwif->dma_base = old_hwif->dma_base;
+ hwif->dma_master = old_hwif->dma_master;
+ hwif->dma_command = old_hwif->dma_command;
+ hwif->dma_vendor1 = old_hwif->dma_vendor1;
+ hwif->dma_status = old_hwif->dma_status;
+ hwif->dma_vendor3 = old_hwif->dma_vendor3;
+ hwif->dma_prdtable = old_hwif->dma_prdtable;
+
+ hwif->dma_extra = old_hwif->dma_extra;
+ hwif->config_data = old_hwif->config_data;
+ hwif->select_data = old_hwif->select_data;
+ hwif->autodma = old_hwif->autodma;
+ hwif->udma_four = old_hwif->udma_four;
+ hwif->no_dsc = old_hwif->no_dsc;
- hwif->hwif_data = old_hwif.hwif_data;
+ hwif->hwif_data = old_hwif->hwif_data;
abort:
+ if (old_hwif)
+ kfree(old_hwif);
spin_unlock_irq(&ide_lock);
up(&ide_cfg_sem);
}
--
Daniel S. Cox
Electronic Commerce Systems
next prev parent reply other threads:[~2004-05-21 18:20 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-05-16 14:19 [PATCH] libata DMADIR support Pat LaVarre
2004-05-16 23:16 ` Jeff Garzik
2004-05-17 18:48 ` Pat LaVarre
2004-05-17 19:08 ` Jeff Garzik
2004-05-17 21:06 ` Pat LaVarre
2004-05-17 21:40 ` Jeff Garzik
2004-05-17 21:20 ` Pat LaVarre
2004-05-17 21:32 ` Jeff Garzik
2004-05-17 21:34 ` Jeff Garzik
2004-05-17 22:05 ` Pat LaVarre
2004-05-17 22:36 ` Jeff Garzik
2004-05-17 23:04 ` Pat LaVarre
2004-05-18 22:40 ` Pat LaVarre
2004-05-18 23:07 ` Pat LaVarre
2004-05-18 23:50 ` Jeff Garzik
2004-05-19 22:47 ` Pat LaVarre
2004-05-18 23:48 ` [PATCH] atapi request sense work Jeff Garzik
2004-05-19 20:35 ` Pat LaVarre
2004-05-19 22:19 ` Jeff Garzik
2004-05-19 22:24 ` Pat LaVarre
2004-05-19 22:27 ` Pat LaVarre
2004-05-19 22:54 ` Pat LaVarre
2004-05-21 1:58 ` Pat LaVarre
[not found] ` <6 E36A 11B-AACB-11D8-8B8A-003065635034@ieee.org>
2004-05-21 2:06 ` Pat LaVarre
2004-05-21 3:05 ` Pat LaVarre
2004-05-21 4:04 ` Jeff Garzik
[not found] ` <1 085153750.6103.33.camel@patibmrh9>
2004-05-21 15:35 ` Pat LaVarre
2004-05-21 15:46 ` Bartlomiej Zolnierkiewicz
2004-05-21 17:59 ` Pat LaVarre
2004-05-21 20:07 ` Pat LaVarre
2004-05-21 21:51 ` Jeff Garzik
2004-05-21 23:12 ` Pat LaVarre
2004-05-21 23:24 ` Pat LaVarre
2004-05-21 23:55 ` Jeff Garzik
2004-05-21 23:57 ` Pat LaVarre
2004-05-21 23:39 ` Pat LaVarre
2004-05-21 23:45 ` Jeff Garzik
2004-05-22 0:06 ` Pat LaVarre
2004-05-22 0:12 ` Pat LaVarre
2004-05-22 0:33 ` Pat LaVarre
2004-05-22 1:11 ` Pat LaVarre
2004-05-26 21:49 ` Pat LaVarre
2004-05-27 23:12 ` Pat LaVarre
2004-05-27 23:32 ` Jeff Garzik
2004-05-27 23:38 ` Pat LaVarre
2004-05-27 23:41 ` Jeff Garzik
2004-05-28 0:13 ` Pat LaVarre
2004-05-28 1:28 ` Pat LaVarre
2004-05-24 15:27 ` Pat LaVarre
2004-05-21 21:59 ` Pat LaVarre
2004-05-21 18:23 ` Danny Cox [this message]
2004-05-21 18:39 ` Bartlomiej Zolnierkiewicz
2004-05-21 18:55 ` [PATCH] kmalloc old_hwif Danny Cox
2004-05-21 19:00 ` [PATCH] atapi request sense work Danny Cox
2004-05-21 19:08 ` Bartlomiej Zolnierkiewicz
-- strict thread matches above, loose matches on Subject: below --
2004-05-21 18:45 dwm
2004-05-21 20:44 ` Pat LaVarre
2004-05-30 12:44 Pat LaVarre
2004-05-30 15:15 ` Pat LaVarre
2004-05-31 16:09 ` Pat LaVarre
2004-06-02 0:01 ` Pat LaVarre
2004-06-02 20:52 ` Pat LaVarre
2004-06-02 22:36 ` Pat LaVarre
2004-06-02 22:55 ` Jeff Garzik
2004-06-02 23:53 ` Pat LaVarre
2004-06-03 0:30 ` Pat LaVarre
2004-06-03 0:52 ` Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1085163796.833.61.camel@vom \
--to=danny.cox@ecweb.com \
--cc=B.Zolnierkiewicz@elka.pw.edu.pl \
--cc=linux-ide@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).