From: Jeff Garzik <jeff@garzik.org>
To: Jeremy Higdon <jeremy@sgi.com>, John Keller <jpk@sgi.com>
Cc: linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org
Subject: Re: [PATCH 1/1] - sgiioc4: fixup use of mmio ops
Date: Wed, 12 Jul 2006 16:36:21 -0400 [thread overview]
Message-ID: <44B55D45.9000708@garzik.org> (raw)
In-Reply-To: <20060712195248.GB740565@sgi.com>
Jeremy Higdon wrote:
>> @@ -381,7 +381,7 @@ ide_dma_sgiioc4(ide_hwif_t * hwif, unsig
>> goto dma_alloc_failure;
>> }
>>
>> - hwif->dma_base = dma_base;
>> + hwif->dma_base = (unsigned long) ioremap(dma_base, num_ports);
>> hwif->dmatable_cpu = pci_alloc_consistent(hwif->pci_dev,
>> IOC4_PRD_ENTRIES * IOC4_PRD_BYTES,
>> &hwif->dmatable_dma);
adding a bug: must check for NULL ioremap return value
>> @@ -607,18 +607,14 @@ ide_init_sgiioc4(ide_hwif_t * hwif)
>> hwif->ide_dma_lostirq = &sgiioc4_ide_dma_lostirq;
>> hwif->ide_dma_timeout = &__ide_dma_timeout;
>>
>> - /*
>> - * The IOC4 uses MMIO rather than Port IO.
>> - * It also needs special workarounds for INB.
>> - */
>> - default_hwif_mmiops(hwif);
>> hwif->INB = &sgiioc4_INB;
>> }
>>
>> static int __devinit
>> sgiioc4_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t * d)
>> {
>> - unsigned long base, ctl, dma_base, irqport;
>> + unsigned long ctl, dma_base, irqport;
>> + unsigned long bar0, cmd_base, cmd_phys_base, virt_base;
New code should use 'void __iomem *' for ioremap return values, wherever
possible.
>> ide_hwif_t *hwif;
>> int h;
>>
>> @@ -636,23 +632,27 @@ sgiioc4_ide_setup_pci_device(struct pci_
>> }
>>
>> /* Get the CmdBlk and CtrlBlk Base Registers */
>> - base = pci_resource_start(dev, 0) + IOC4_CMD_OFFSET;
>> - ctl = pci_resource_start(dev, 0) + IOC4_CTRL_OFFSET;
>> - irqport = pci_resource_start(dev, 0) + IOC4_INTR_OFFSET;
>> + bar0 = pci_resource_start(dev, 0);
>> + virt_base = (unsigned long) ioremap(bar0, pci_resource_len(dev, 0));
>> + cmd_base = virt_base + IOC4_CMD_OFFSET;
>> + ctl = virt_base + IOC4_CTRL_OFFSET;
>> + irqport = virt_base + IOC4_INTR_OFFSET;
>> dma_base = pci_resource_start(dev, 0) + IOC4_DMA_OFFSET;
ditto: new bug here too
>> - if (!request_region(base, IOC4_CMD_CTL_BLK_SIZE, hwif->name)) {
>> + cmd_phys_base = bar0 + IOC4_CMD_OFFSET;
>> + if (!request_mem_region(cmd_phys_base, IOC4_CMD_CTL_BLK_SIZE,
>> + hwif->name)) {
>> printk(KERN_ERR
>> - "%s : %s -- ERROR, Port Addresses "
>> + "%s : %s -- ERROR, Addresses "
>> "0x%p to 0x%p ALREADY in use\n",
>> - __FUNCTION__, hwif->name, (void *) base,
>> - (void *) base + IOC4_CMD_CTL_BLK_SIZE);
>> + __FUNCTION__, hwif->name, (void *) cmd_phys_base,
>> + (void *) cmd_phys_base + IOC4_CMD_CTL_BLK_SIZE);
If 'void __iomem *' were used, no casts would be needed here
next prev parent reply other threads:[~2006-07-12 20:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-12 17:57 [PATCH 1/1] - sgiioc4: fixup use of mmio ops John Keller
2006-07-12 19:52 ` Jeremy Higdon
2006-07-12 20:36 ` Jeff Garzik [this message]
2006-07-13 13:54 ` John Keller
2006-07-13 14:45 ` Jeff Garzik
2006-07-12 23:11 ` Brent Casavant
-- strict thread matches above, loose matches on Subject: below --
2006-07-19 15:31 John Keller
2006-07-20 5:19 ` Jeremy Higdon
2006-07-21 13:16 ` Andrew Morton
2006-07-24 13:56 John Keller
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=44B55D45.9000708@garzik.org \
--to=jeff@garzik.org \
--cc=jeremy@sgi.com \
--cc=jpk@sgi.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@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).