From: Christoph Hellwig <hch@infradead.org>
To: James Bottomley <James.Bottomley@SteelEye.com>
Cc: Christoph Hellwig <hch@infradead.org>,
Hannes Reinecke <hare@suse.de>,
SCSI Mailing List <linux-scsi@vger.kernel.org>,
Frederic TEMPORELLI <frederic.temporelli@ext.bull.net>
Subject: Re: [PATCH] aic79xx: use dma_get_required_mask()
Date: Fri, 9 Feb 2007 16:10:11 +0000 [thread overview]
Message-ID: <20070209161011.GA8908@infradead.org> (raw)
In-Reply-To: <1171036539.3627.15.camel@mulgrave.il.steeleye.com>
On Fri, Feb 09, 2007 at 10:55:39AM -0500, James Bottomley wrote:
> On Thu, 2007-02-08 at 19:40 +0000, Christoph Hellwig wrote:
> > The logic here seems odd to me. Shouldn't we first check
> > dma_get_required_mask and the do dma_set_mask?
>
> Yes ... I picked up the mask problem, but not that. And actually
> there's a missing zero check on one of the dma_set_mask()s.
>
> Does this look like the right patch then?
This looks functionally correct to me, but there's some cosmetic issues
left:
> Index: scsi-misc-2.6/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
> ===================================================================
> --- scsi-misc-2.6.orig/drivers/scsi/aic7xxx/aic79xx_osm_pci.c 2007-02-09 09:12:55.000000000 -0500
> +++ scsi-misc-2.6/drivers/scsi/aic7xxx/aic79xx_osm_pci.c 2007-02-09 09:21:32.000000000 -0500
> @@ -132,6 +132,7 @@ ahd_linux_pci_dev_probe(struct pci_dev *
> struct ahd_pci_identity *entry;
> char *name;
> int error;
> + struct device *dev = &pdev->dev;
>
> pci = pdev;
> entry = ahd_find_pci_device(pci);
> @@ -161,20 +162,16 @@ ahd_linux_pci_dev_probe(struct pci_dev *
> pci_set_master(pdev);
>
> if (sizeof(dma_addr_t) > 4) {
> - uint64_t memsize;
> - const uint64_t mask_39bit = 0x7FFFFFFFFFULL;
> -
> - memsize = ahd_linux_get_memsize();
> -
> - if (memsize >= 0x8000000000ULL
> - && pci_set_dma_mask(pdev, DMA_64BIT_MASK) == 0) {
> + if (dma_get_required_mask(dev) > DMA_39BIT_MASK
> + && dma_set_mask(dev, DMA_64BIT_MASK) == 0)
> ahd->flags |= AHD_64BIT_ADDRESSING;
> - } else if (memsize > 0x80000000
> - && pci_set_dma_mask(pdev, mask_39bit) == 0) {
> + else if (dma_get_required_mask(dev) > DMA_32BIT_MASK
> + && dma_set_mask(dev, DMA_39BIT_MASK) == 0)
> ahd->flags |= AHD_39BIT_ADDRESSING;
> - }
> + else
> + dma_set_mask(dev, DMA_32BIT_MASK);
> } else {
I'd rather do the dma_get_required_mask only once, and we we want
&& at the end of the first instead of at the beginning of the second
line. So this block should look like:
u64 required_mask = dma_get_required_mask(dev);
if (required_mask > DMA_39BIT_MASK &&
dma_set_mask(dev, DMA_64BIT_MASK) == 0)
ahd->flags |= AHD_64BIT_ADDRESSING;
else if (required_mask > DMA_32BIT_MASK &&
dma_set_mask(dev, DMA_39BIT_MASK) == 0)
ahd->flags |= AHD_39BIT_ADDRESSING;
else
dma_set_mask(dev, DMA_32BIT_MASK);
next prev parent reply other threads:[~2007-02-09 16:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-07 8:47 [PATCH] aic79xx: use dma_get_required_mask() Hannes Reinecke
2007-02-08 0:27 ` James Bottomley
2007-02-08 19:40 ` Christoph Hellwig
2007-02-09 15:55 ` James Bottomley
2007-02-09 16:10 ` Christoph Hellwig [this message]
2007-02-09 16:36 ` James Bottomley
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=20070209161011.GA8908@infradead.org \
--to=hch@infradead.org \
--cc=James.Bottomley@SteelEye.com \
--cc=frederic.temporelli@ext.bull.net \
--cc=hare@suse.de \
--cc=linux-scsi@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.