diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2010-05-27 15:13:43 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-07-27 12:01:10 -0500 |
| commit | 3d0eab67cf556db4430a42fbb45dc90ef690d30c (patch) | |
| tree | 45c33c8f15521acffa8f6048bc149b834396e6d4 | |
| parent | f7c391015ab64c835a9bb403626b38a51d6432cc (diff) | |
| download | linux-3d0eab67cf556db4430a42fbb45dc90ef690d30c.tar.gz linux-3d0eab67cf556db4430a42fbb45dc90ef690d30c.tar.bz2 linux-3d0eab67cf556db4430a42fbb45dc90ef690d30c.zip | |
[SCSI] hpsa: factor out hpsa_p600_dma_prefetch_quirk
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
| -rw-r--r-- | drivers/scsi/hpsa.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 62f9784ecf8f..9e81e0bcf1e2 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -3396,6 +3396,20 @@ static inline void hpsa_enable_scsi_prefetch(struct ctlr_info *h) #endif } +/* Disable DMA prefetch for the P600. Otherwise an ASIC bug may result + * in a prefetch beyond physical memory. + */ +static inline void hpsa_p600_dma_prefetch_quirk(struct ctlr_info *h) +{ + u32 dma_prefetch; + + if (h->board_id != 0x3225103C) + return; + dma_prefetch = readl(h->vaddr + I2O_DMA1_CFG); + dma_prefetch |= 0x8000; + writel(dma_prefetch, h->vaddr + I2O_DMA1_CFG); +} + static int __devinit hpsa_pci_init(struct ctlr_info *h) { int i, prod_index, err; @@ -3444,17 +3458,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h) goto err_out_free_res; } hpsa_enable_scsi_prefetch(h); - - /* Disabling DMA prefetch for the P600 - * An ASIC bug may result in a prefetch beyond - * physical memory. - */ - if (h->board_id == 0x3225103C) { - u32 dma_prefetch; - dma_prefetch = readl(h->vaddr + I2O_DMA1_CFG); - dma_prefetch |= 0x8000; - writel(dma_prefetch, h->vaddr + I2O_DMA1_CFG); - } + hpsa_p600_dma_prefetch_quirk(h); h->max_commands = readl(&(h->cfgtable->CmdsOutMax)); /* Update the field, and then ring the doorbell */ |