Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f60d7011 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata-sff: prd is BMDMA specific 



struct ata_prd and ap->prd are BMDMA specific.  Add bmdma_ prefix to
them and move them inside CONFIG_ATA_SFF.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent f47451c4

drivers/ata/libata-sff.c

+15 −12
Original line number Diff line number Diff line
@@ -2650,6 +2650,7 @@ EXPORT_SYMBOL_GPL(ata_bmdma32_port_ops); 
static void ata_bmdma_fill_sg(struct ata_queued_cmd *qc)

{

	struct ata_port *ap = qc->ap;

	struct ata_bmdma_prd *prd = ap->bmdma_prd;

	struct scatterlist *sg;

	unsigned int si, pi;
@@ -2671,8 +2672,8 @@ static void ata_bmdma_fill_sg(struct ata_queued_cmd *qc) 
			if ((offset + sg_len) > 0x10000)

				len = 0x10000 - offset;



			ap->prd[pi].addr = cpu_to_le32(addr);

			ap->prd[pi].flags_len = cpu_to_le32(len & 0xffff);

			prd[pi].addr = cpu_to_le32(addr);

			prd[pi].flags_len = cpu_to_le32(len & 0xffff);

			VPRINTK("PRD[%u] = (0x%X, 0x%X)\n", pi, addr, len);



			pi++;
@@ -2681,7 +2682,7 @@ static void ata_bmdma_fill_sg(struct ata_queued_cmd *qc) 
		}

	}



	ap->prd[pi - 1].flags_len |= cpu_to_le32(ATA_PRD_EOT);

	prd[pi - 1].flags_len |= cpu_to_le32(ATA_PRD_EOT);

}



/**
@@ -2700,6 +2701,7 @@ static void ata_bmdma_fill_sg(struct ata_queued_cmd *qc) 
static void ata_bmdma_fill_sg_dumb(struct ata_queued_cmd *qc)

{

	struct ata_port *ap = qc->ap;

	struct ata_bmdma_prd *prd = ap->bmdma_prd;

	struct scatterlist *sg;

	unsigned int si, pi;
@@ -2722,16 +2724,16 @@ static void ata_bmdma_fill_sg_dumb(struct ata_queued_cmd *qc) 
				len = 0x10000 - offset;



			blen = len & 0xffff;

			ap->prd[pi].addr = cpu_to_le32(addr);

			prd[pi].addr = cpu_to_le32(addr);

			if (blen == 0) {

				/* Some PATA chipsets like the CS5530 can't

				   cope with 0x0000 meaning 64K as the spec

				   says */

				ap->prd[pi].flags_len = cpu_to_le32(0x8000);

				prd[pi].flags_len = cpu_to_le32(0x8000);

				blen = 0x8000;

				ap->prd[++pi].addr = cpu_to_le32(addr + 0x8000);

				prd[++pi].addr = cpu_to_le32(addr + 0x8000);

			}

			ap->prd[pi].flags_len = cpu_to_le32(blen);

			prd[pi].flags_len = cpu_to_le32(blen);

			VPRINTK("PRD[%u] = (0x%X, 0x%X)\n", pi, addr, len);



			pi++;
@@ -2740,7 +2742,7 @@ static void ata_bmdma_fill_sg_dumb(struct ata_queued_cmd *qc) 
		}

	}



	ap->prd[pi - 1].flags_len |= cpu_to_le32(ATA_PRD_EOT);

	prd[pi - 1].flags_len |= cpu_to_le32(ATA_PRD_EOT);

}



/**
@@ -2872,7 +2874,7 @@ void ata_bmdma_setup(struct ata_queued_cmd *qc) 


	/* load PRD table addr. */

	mb();	/* make sure PRD table writes are visible to controller */

	iowrite32(ap->prd_dma, ap->ioaddr.bmdma_addr + ATA_DMA_TABLE_OFS);

	iowrite32(ap->bmdma_prd_dma, ap->ioaddr.bmdma_addr + ATA_DMA_TABLE_OFS);



	/* specify data direction, triple-check start bit is clear */

	dmactl = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_CMD);
@@ -2977,9 +2979,10 @@ EXPORT_SYMBOL_GPL(ata_bmdma_status); 
int ata_bmdma_port_start(struct ata_port *ap)

{

	if (ap->mwdma_mask || ap->udma_mask) {

		ap->prd = dmam_alloc_coherent(ap->host->dev, ATA_PRD_TBL_SZ,

					      &ap->prd_dma, GFP_KERNEL);

		if (!ap->prd)

		ap->bmdma_prd =

			dmam_alloc_coherent(ap->host->dev, ATA_PRD_TBL_SZ,

					    &ap->bmdma_prd_dma, GFP_KERNEL);

		if (!ap->bmdma_prd)

			return -ENOMEM;

	}

drivers/ata/pata_ns87415.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ static void ns87415_bmdma_setup(struct ata_queued_cmd *qc) 


	/* load PRD table addr. */

	mb();	/* make sure PRD table writes are visible to controller */

	iowrite32(ap->prd_dma, ap->ioaddr.bmdma_addr + ATA_DMA_TABLE_OFS);

	iowrite32(ap->bmdma_prd_dma, ap->ioaddr.bmdma_addr + ATA_DMA_TABLE_OFS);



	/* specify data direction, triple-check start bit is clear */

	dmactl = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_CMD);

drivers/ata/pata_scc.c

+2 −2
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ static void scc_bmdma_setup (struct ata_queued_cmd *qc) 
	void __iomem *mmio = ap->ioaddr.bmdma_addr;



	/* load PRD table addr */

	out_be32(mmio + SCC_DMA_TABLE_OFS, ap->prd_dma);

	out_be32(mmio + SCC_DMA_TABLE_OFS, ap->bmdma_prd_dma);



	/* specify data direction, triple-check start bit is clear */

	dmactl = in_be32(mmio + SCC_DMA_CMD);
@@ -905,7 +905,7 @@ static int scc_port_start (struct ata_port *ap) 
	if (rc)

		return rc;



	out_be32(mmio + SCC_DMA_PTERADD, ap->prd_dma);

	out_be32(mmio + SCC_DMA_PTERADD, ap->bmdma_prd_dma);

	return 0;

}

drivers/ata/sata_nv.c

+2 −2
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ enum ncq_saw_flag_list { 
};



struct nv_swncq_port_priv {

	struct ata_prd	*prd;	 /* our SG list */

	struct ata_bmdma_prd *prd;	 /* our SG list */

	dma_addr_t	prd_dma; /* and its DMA mapping */

	void __iomem	*sactive_block;

	void __iomem	*irq_block;
@@ -2027,7 +2027,7 @@ static void nv_swncq_fill_sg(struct ata_queued_cmd *qc) 
	struct ata_port *ap = qc->ap;

	struct scatterlist *sg;

	struct nv_swncq_port_priv *pp = ap->private_data;

	struct ata_prd *prd;

	struct ata_bmdma_prd *prd;

	unsigned int si, idx;



	prd = pp->prd + ATA_MAX_PRD * qc->tag;

drivers/ata/sata_promise.c

+11 −10
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ static int pdc_sata_scr_write(struct ata_link *link, 
static void pdc_atapi_pkt(struct ata_queued_cmd *qc)

{

	struct ata_port *ap = qc->ap;

	dma_addr_t sg_table = ap->prd_dma;

	dma_addr_t sg_table = ap->bmdma_prd_dma;

	unsigned int cdb_len = qc->dev->cdb_len;

	u8 *cdb = qc->cdb;

	struct pdc_port_priv *pp = ap->private_data;
@@ -588,6 +588,7 @@ static void pdc_atapi_pkt(struct ata_queued_cmd *qc) 
static void pdc_fill_sg(struct ata_queued_cmd *qc)

{

	struct ata_port *ap = qc->ap;

	struct ata_bmdma_prd *prd = ap->bmdma_prd;

	struct scatterlist *sg;

	const u32 SG_COUNT_ASIC_BUG = 41*4;

	unsigned int si, idx;
@@ -614,8 +615,8 @@ static void pdc_fill_sg(struct ata_queued_cmd *qc) 
			if ((offset + sg_len) > 0x10000)

				len = 0x10000 - offset;



			ap->prd[idx].addr = cpu_to_le32(addr);

			ap->prd[idx].flags_len = cpu_to_le32(len & 0xffff);

			prd[idx].addr = cpu_to_le32(addr);

			prd[idx].flags_len = cpu_to_le32(len & 0xffff);

			VPRINTK("PRD[%u] = (0x%X, 0x%X)\n", idx, addr, len);



			idx++;
@@ -624,27 +625,27 @@ static void pdc_fill_sg(struct ata_queued_cmd *qc) 
		}

	}



	len = le32_to_cpu(ap->prd[idx - 1].flags_len);

	len = le32_to_cpu(prd[idx - 1].flags_len);



	if (len > SG_COUNT_ASIC_BUG) {

		u32 addr;



		VPRINTK("Splitting last PRD.\n");



		addr = le32_to_cpu(ap->prd[idx - 1].addr);

		ap->prd[idx - 1].flags_len = cpu_to_le32(len - SG_COUNT_ASIC_BUG);

		addr = le32_to_cpu(prd[idx - 1].addr);

		prd[idx - 1].flags_len = cpu_to_le32(len - SG_COUNT_ASIC_BUG);

		VPRINTK("PRD[%u] = (0x%X, 0x%X)\n", idx - 1, addr, SG_COUNT_ASIC_BUG);



		addr = addr + len - SG_COUNT_ASIC_BUG;

		len = SG_COUNT_ASIC_BUG;

		ap->prd[idx].addr = cpu_to_le32(addr);

		ap->prd[idx].flags_len = cpu_to_le32(len);

		prd[idx].addr = cpu_to_le32(addr);

		prd[idx].flags_len = cpu_to_le32(len);

		VPRINTK("PRD[%u] = (0x%X, 0x%X)\n", idx, addr, len);



		idx++;

	}



	ap->prd[idx - 1].flags_len |= cpu_to_le32(ATA_PRD_EOT);

	prd[idx - 1].flags_len |= cpu_to_le32(ATA_PRD_EOT);

}



static void pdc_qc_prep(struct ata_queued_cmd *qc)
@@ -659,7 +660,7 @@ static void pdc_qc_prep(struct ata_queued_cmd *qc) 
		pdc_fill_sg(qc);

		/*FALLTHROUGH*/

	case ATA_PROT_NODATA:

		i = pdc_pkt_header(&qc->tf, qc->ap->prd_dma,

		i = pdc_pkt_header(&qc->tf, qc->ap->bmdma_prd_dma,

				   qc->dev->devno, pp->pkt);

		if (qc->tf.flags & ATA_TFLAG_LBA48)

			i = pdc_prep_lba48(&qc->tf, pp->pkt, i);