Attachment 301502 Details for Bug 300861 – backport a878539ef994787c447a98c2e3ba0fe3dad984ec and recover AHCI_FLAG_32BIT_ONLY

[patch] backport a878539ef994787c447a98c2e3ba0fe3dad984ec and recover AHCI_FLAG_32BIT_ONLY

RHEL4_SB600_32bit_DMA.patch (text/plain), 1.68 KB, created by Shane Huang on 2008-04-07 11:26:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Shane Huang

Created: 2008-04-07 11:26:09 UTC

Size: 1.68 KB

patch

obsolete

>diff -ruN a/drivers/ata/ahci.c b/drivers/ata/ahci.c
>--- a/drivers/ata/ahci.c	2008-04-07 15:35:06.000000000 +0800
>+++ b/drivers/ata/ahci.c	2008-04-07 17:03:34.000000000 +0800
>@@ -176,6 +176,7 @@
> 	AHCI_FLAG_HONOR_PI		= (1 << 26), /* honor PORTS_IMPL */
> 	AHCI_FLAG_IGN_SERR_INTERNAL	= (1 << 27), /* ignore SERR_INTERNAL */
> 	AHCI_FLAG_SECT255		= (1 << 28), /* max 255 sect */
>+	AHCI_FLAG_32BIT_ONLY		= (1 << 29), /* force 32bit */
> };
> 
> struct ahci_cmd_hdr {
>@@ -365,7 +366,8 @@
> 				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
> 				  ATA_FLAG_SKIP_D2H_BSY |
> 				  AHCI_FLAG_IGN_SERR_INTERNAL |
>-				  AHCI_FLAG_SECT255,
>+				  AHCI_FLAG_SECT255 |
>+				  AHCI_FLAG_32BIT_ONLY,
> 		.pio_mask	= 0x1f, /* pio0-4 */
> 		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */
> 		.port_ops	= &ahci_ops,
>@@ -810,8 +812,11 @@
> {
> 	struct ahci_host_priv *hpriv = ap->host->private_data;
> 
>-	if (hpriv->flags & AHCI_FLAG_SECT255)
>+	if (hpriv->flags & AHCI_FLAG_SECT255) {
> 		dev->max_sectors = 255;
>+		ata_dev_printk(dev, KERN_INFO,
>+			       "SB600 AHCI: limiting to 255 sectors per cmd\n");
>+	}
> }
> 
> static unsigned int ahci_dev_classify(struct ata_port *ap)
>@@ -1604,6 +1609,11 @@
> 		probe_ent->n_ports = cap_n_ports;
> 
> 	using_dac = hpriv->cap & HOST_CAP_64;
>+	if (using_dac && (probe_ent->port_flags & AHCI_FLAG_32BIT_ONLY)) {
>+		dev_printk(KERN_INFO, &pdev->dev,
>+			   "controller can't do 64bit DMA, forcing 32bit\n");
>+		using_dac = 0;
>+	}
> 
> 	if (using_dac &&
> 	    !pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
>@@ -1786,6 +1796,9 @@
> 	if (have_msi)
> 		hpriv->flags |= AHCI_FLAG_MSI;
> 
>+	if (probe_ent->port_flags & AHCI_FLAG_SECT255)
>+		hpriv->flags |= AHCI_FLAG_SECT255;
>+
> 	/* initialize adapter */
> 	rc = ahci_host_init(probe_ent);
> 	if (rc)

Actions: View | Diff

Attachments on bug 300861: 210631 | 210641 | 229871 | 237431 | 237441 | 291697 | 301502 | 301603 | 312501