aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/sata_nv.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata/sata_nv.c')
-rw-r--r--drivers/ata/sata_nv.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index f7a963eb1f02..cbca983165de 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -528,7 +528,7 @@ static void nv_adma_mode(struct ata_port *ap)
528 528
529 if (!(pp->flags & NV_ADMA_PORT_REGISTER_MODE)) 529 if (!(pp->flags & NV_ADMA_PORT_REGISTER_MODE))
530 return; 530 return;
531 531
532 WARN_ON(pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE); 532 WARN_ON(pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE);
533 533
534 tmp = readw(mmio + NV_ADMA_CTL); 534 tmp = readw(mmio + NV_ADMA_CTL);
@@ -568,7 +568,7 @@ static int nv_adma_slave_config(struct scsi_device *sdev)
568 /* Subtract 1 since an extra entry may be needed for padding, see 568 /* Subtract 1 since an extra entry may be needed for padding, see
569 libata-scsi.c */ 569 libata-scsi.c */
570 sg_tablesize = LIBATA_MAX_PRD - 1; 570 sg_tablesize = LIBATA_MAX_PRD - 1;
571 571
572 /* Since the legacy DMA engine is in use, we need to disable ADMA 572 /* Since the legacy DMA engine is in use, we need to disable ADMA
573 on the port. */ 573 on the port. */
574 adma_enable = 0; 574 adma_enable = 0;
@@ -580,7 +580,7 @@ static int nv_adma_slave_config(struct scsi_device *sdev)
580 sg_tablesize = NV_ADMA_SGTBL_TOTAL_LEN; 580 sg_tablesize = NV_ADMA_SGTBL_TOTAL_LEN;
581 adma_enable = 1; 581 adma_enable = 1;
582 } 582 }
583 583
584 pci_read_config_dword(pdev, NV_MCP_SATA_CFG_20, &current_reg); 584 pci_read_config_dword(pdev, NV_MCP_SATA_CFG_20, &current_reg);
585 585
586 if(ap->port_no == 1) 586 if(ap->port_no == 1)
@@ -589,7 +589,7 @@ static int nv_adma_slave_config(struct scsi_device *sdev)
589 else 589 else
590 config_mask = NV_MCP_SATA_CFG_20_PORT0_EN | 590 config_mask = NV_MCP_SATA_CFG_20_PORT0_EN |
591 NV_MCP_SATA_CFG_20_PORT0_PWB_EN; 591 NV_MCP_SATA_CFG_20_PORT0_PWB_EN;
592 592
593 if(adma_enable) { 593 if(adma_enable) {
594 new_reg = current_reg | config_mask; 594 new_reg = current_reg | config_mask;
595 pp->flags &= ~NV_ADMA_ATAPI_SETUP_COMPLETE; 595 pp->flags &= ~NV_ADMA_ATAPI_SETUP_COMPLETE;
@@ -598,10 +598,10 @@ static int nv_adma_slave_config(struct scsi_device *sdev)
598 new_reg = current_reg & ~config_mask; 598 new_reg = current_reg & ~config_mask;
599 pp->flags |= NV_ADMA_ATAPI_SETUP_COMPLETE; 599 pp->flags |= NV_ADMA_ATAPI_SETUP_COMPLETE;
600 } 600 }
601 601
602 if(current_reg != new_reg) 602 if(current_reg != new_reg)
603 pci_write_config_dword(pdev, NV_MCP_SATA_CFG_20, new_reg); 603 pci_write_config_dword(pdev, NV_MCP_SATA_CFG_20, new_reg);
604 604
605 blk_queue_bounce_limit(sdev->request_queue, bounce_limit); 605 blk_queue_bounce_limit(sdev->request_queue, bounce_limit);
606 blk_queue_segment_boundary(sdev->request_queue, segment_boundary); 606 blk_queue_segment_boundary(sdev->request_queue, segment_boundary);
607 blk_queue_max_hw_segments(sdev->request_queue, sg_tablesize); 607 blk_queue_max_hw_segments(sdev->request_queue, sg_tablesize);
@@ -812,13 +812,13 @@ static irqreturn_t nv_adma_interrupt(int irq, void *dev_instance)
812 handled++; /* irq handled if we got here */ 812 handled++; /* irq handled if we got here */
813 } 813 }
814 } 814 }
815 815
816 if(notifier_clears[0] || notifier_clears[1]) { 816 if(notifier_clears[0] || notifier_clears[1]) {
817 /* Note: Both notifier clear registers must be written 817 /* Note: Both notifier clear registers must be written
818 if either is set, even if one is zero, according to NVIDIA. */ 818 if either is set, even if one is zero, according to NVIDIA. */
819 writel(notifier_clears[0], 819 writel(notifier_clears[0],
820 nv_adma_notifier_clear_block(host->ports[0])); 820 nv_adma_notifier_clear_block(host->ports[0]));
821 writel(notifier_clears[1], 821 writel(notifier_clears[1],
822 nv_adma_notifier_clear_block(host->ports[1])); 822 nv_adma_notifier_clear_block(host->ports[1]));
823 } 823 }
824 824