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

Commit 858c9c40 authored by Sonic Zhang's avatar Sonic Zhang Committed by Jeff Garzik
Browse files

Update libata driver for bf548 atapi controller against the 2.6.24 tree. 



Changes:
1. Remove irq_ack() and port_disable() methods
2. Acocomodate for the libata-link patches
3. Change Kconfig ATAPI mode option into a module param.
4. Add supported WMDMA mode.

Signed-off-by: default avatarSonic Zhang <sonic.zhang@analog.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 01839f6d

drivers/ata/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -650,11 +650,4 @@ config PATA_BF54X 


	  If unsure, say N.



config PATA_BF54X_DMA

	bool "DMA mode"

	depends on PATA_BF54X

	default y

	help

	  Enable DMA mode for Blackfin ATAPI controller.



endif # ATA

drivers/ata/pata_bf54x.c

+37 −40
Original line number Diff line number Diff line
@@ -1092,14 +1092,15 @@ static unsigned int bfin_bus_softreset(struct ata_port *ap, 
 *	Note: Original code is ata_std_softreset().

 */



static int bfin_std_softreset(struct ata_port *ap, unsigned int *classes,

static int bfin_std_softreset(struct ata_link *link, unsigned int *classes,

		unsigned long deadline)

{

	struct ata_port *ap = link->ap;

	unsigned int slave_possible = ap->flags & ATA_FLAG_SLAVE_POSS;

	unsigned int devmask = 0, err_mask;

	u8 err;



	if (ata_port_offline(ap)) {

	if (ata_link_offline(link)) {

		classes[0] = ATA_DEV_NONE;

		goto out;

	}
@@ -1122,9 +1123,11 @@ static int bfin_std_softreset(struct ata_port *ap, unsigned int *classes, 
	}



	/* determine by signature whether we have ATA or ATAPI devices */

	classes[0] = ata_dev_try_classify(ap, 0, &err);

	classes[0] = ata_dev_try_classify(&ap->link.device[0],

				devmask & (1 << 0), &err);

	if (slave_possible && err != 0x81)

		classes[1] = ata_dev_try_classify(ap, 1, &err);

		classes[1] = ata_dev_try_classify(&ap->link.device[1],

					devmask & (1 << 1), &err);



 out:

	return 0;
@@ -1167,7 +1170,7 @@ static unsigned char bfin_bmdma_status(struct ata_port *ap) 
static void bfin_data_xfer(struct ata_device *adev, unsigned char *buf,

			   unsigned int buflen, int write_data)

{

	struct ata_port *ap = adev->ap;

	struct ata_port *ap = adev->link->ap;

	unsigned int words = buflen >> 1;

	unsigned short *buf16 = (u16 *) buf;

	void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr;
@@ -1206,7 +1209,10 @@ static void bfin_irq_clear(struct ata_port *ap) 
	void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr;



	pr_debug("in atapi irq clear\n");

	ATAPI_SET_INT_STATUS(base, 0x1FF);



	ATAPI_SET_INT_STATUS(base, ATAPI_GET_INT_STATUS(base)|ATAPI_DEV_INT

		| MULTI_DONE_INT | UDMAIN_DONE_INT | UDMAOUT_DONE_INT

		| MULTI_TERM_INT | UDMAIN_TERM_INT | UDMAOUT_TERM_INT);

}



/**
@@ -1233,33 +1239,6 @@ static unsigned char bfin_irq_on(struct ata_port *ap) 
	return tmp;

}



/**

 *	bfin_irq_ack - Acknowledge a device interrupt.

 *	@ap: Port on which interrupts are enabled.

 *

 *	Note: Original code is ata_irq_ack().

 */



static unsigned char bfin_irq_ack(struct ata_port *ap, unsigned int chk_drq)

{

	void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr;

	unsigned int bits = chk_drq ? ATA_BUSY | ATA_DRQ : ATA_BUSY;

	unsigned char status;



	pr_debug("in atapi irq ack\n");

	status = ata_busy_wait(ap, bits, 1000);

	if (status & bits)

		if (ata_msg_err(ap))

			dev_err(ap->dev, "abnormal status 0x%X\n", status);



	/* get controller status; clear intr, err bits */

	ATAPI_SET_INT_STATUS(base, ATAPI_GET_INT_STATUS(base)|ATAPI_DEV_INT

		| MULTI_DONE_INT | UDMAIN_DONE_INT | UDMAOUT_DONE_INT

		| MULTI_TERM_INT | UDMAIN_TERM_INT | UDMAOUT_TERM_INT);



	return bfin_bmdma_status(ap);

}



/**

 *	bfin_bmdma_freeze - Freeze DMA controller port

 *	@ap: port to freeze
@@ -1308,8 +1287,9 @@ void bfin_bmdma_thaw(struct ata_port *ap) 
 *	Note: Original code is ata_std_postreset().

 */



static void bfin_std_postreset(struct ata_port *ap, unsigned int *classes)

static void bfin_std_postreset(struct ata_link *link, unsigned int *classes)

{

	struct ata_port *ap = link->ap;

	void __iomem *base = (void __iomem *)ap->ioaddr.ctl_addr;



	/* re-enable interrupts */
@@ -1395,7 +1375,6 @@ static struct scsi_host_template bfin_sht = { 
};



static const struct ata_port_operations bfin_pata_ops = {

	.port_disable		= ata_port_disable,

	.set_piomode		= bfin_set_piomode,

	.set_dmamode		= bfin_set_dmamode,
@@ -1423,7 +1402,6 @@ static const struct ata_port_operations bfin_pata_ops = { 
	.irq_handler		= ata_interrupt,

	.irq_clear		= bfin_irq_clear,

	.irq_on			= bfin_irq_on,

	.irq_ack		= bfin_irq_ack,



	.port_start		= bfin_port_start,

	.port_stop		= bfin_port_stop,
@@ -1437,11 +1415,7 @@ static struct ata_port_info bfin_port_info[] = { 
				| ATA_FLAG_NO_LEGACY,

		.pio_mask	= 0x1f,	/* pio0-4 */

		.mwdma_mask	= 0,

#ifdef CONFIG_PATA_BF54X_DMA

		.udma_mask	= ATA_UDMA5,

#else

		.udma_mask	= 0,

#endif

		.port_ops	= &bfin_pata_ops,

	},

};
@@ -1607,9 +1581,25 @@ static struct platform_driver bfin_atapi_driver = { 
	},

};



#define ATAPI_MODE_SIZE		10

static char bfin_atapi_mode[ATAPI_MODE_SIZE];



static int __init bfin_atapi_init(void)

{

	pr_info("register bfin atapi driver\n");



	switch(bfin_atapi_mode[0]) {

	case 'p':

	case 'P':

		break;

	case 'm':

	case 'M':

		bfin_port_info[0].mwdma_mask = ATA_MWDMA2;

		break;

	default:

		bfin_port_info[0].udma_mask = ATA_UDMA5;

	};



	return platform_driver_register(&bfin_atapi_driver);

}
@@ -1620,6 +1610,13 @@ static void __exit bfin_atapi_exit(void) 


module_init(bfin_atapi_init);

module_exit(bfin_atapi_exit);

/*

 * ATAPI mode:

 * pio/PIO

 * udma/UDMA (default)

 * mwdma/MWDMA

 */

module_param_string(bfin_atapi_mode, bfin_atapi_mode, ATAPI_MODE_SIZE, 0);



MODULE_AUTHOR("Sonic Zhang <sonic.zhang@analog.com>");

MODULE_DESCRIPTION("PATA driver for blackfin 54x ATAPI controller");