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

Commit e7c0d217 authored by Alan Cox's avatar Alan Cox Committed by Jeff Garzik
Browse files

pata_ninja32: suspend/resume support 



I had assumed that the standard recovery would be sufficient for this
hardware but it isn't. Fix up the other registers on resume as needed. See
bug #11735

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 054e5f61

drivers/ata/pata_ninja32.c

+34 −9
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#include <linux/libata.h>



#define DRV_NAME "pata_ninja32"

#define DRV_VERSION "0.0.1"

#define DRV_VERSION "0.1.1"





/**
@@ -88,6 +88,17 @@ static struct ata_port_operations ninja32_port_ops = { 
	.set_piomode	= ninja32_set_piomode,

};



static void ninja32_program(void __iomem *base)

{

	iowrite8(0x05, base + 0x01);	/* Enable interrupt lines */

	iowrite8(0xBE, base + 0x02);	/* Burst, ?? setup */

	iowrite8(0x01, base + 0x03);	/* Unknown */

	iowrite8(0x20, base + 0x04);	/* WAIT0 */

	iowrite8(0x8f, base + 0x05);	/* Unknown */

	iowrite8(0xa4, base + 0x1c);	/* Unknown */

	iowrite8(0x83, base + 0x1d);	/* BMDMA control: WAIT0 */

}



static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id)

{

	struct ata_host *host;
@@ -133,18 +144,28 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id) 
	ap->ioaddr.bmdma_addr = base;

	ata_sff_std_ports(&ap->ioaddr);



	iowrite8(0x05, base + 0x01);	/* Enable interrupt lines */

	iowrite8(0xBE, base + 0x02);	/* Burst, ?? setup */

	iowrite8(0x01, base + 0x03);	/* Unknown */

	iowrite8(0x20, base + 0x04);	/* WAIT0 */

	iowrite8(0x8f, base + 0x05);	/* Unknown */

	iowrite8(0xa4, base + 0x1c);	/* Unknown */

	iowrite8(0x83, base + 0x1d);	/* BMDMA control: WAIT0 */

	ninja32_program(base);

	/* FIXME: Should we disable them at remove ? */

	return ata_host_activate(host, dev->irq, ata_sff_interrupt,

				 IRQF_SHARED, &ninja32_sht);

}



#ifdef CONFIG_PM



static int ninja32_reinit_one(struct pci_dev *pdev)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	int rc;



	rc = ata_pci_device_do_resume(pdev);

	if (rc)

		return rc;

	ninja32_program(host->iomap[0]);

	ata_host_resume(host);

	return 0;			

}

#endif



static const struct pci_device_id ninja32[] = {

	{ 0x1145, 0xf021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },

	{ 0x1145, 0xf024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
@@ -155,7 +176,11 @@ static struct pci_driver ninja32_pci_driver = { 
	.name 		= DRV_NAME,

	.id_table	= ninja32,

	.probe 		= ninja32_init_one,

	.remove		= ata_pci_remove_one

	.remove		= ata_pci_remove_one,

#ifdef CONFIG_PM

	.suspend	= ata_pci_device_suspend,

	.resume		= ninja32_reinit_one,

#endif

};



static int __init ninja32_init(void)