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

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

[PATCH] hpt36x: Suspend/resume support 



Another chipset which needs some reconfiguration after a resume. All the
chip setup is moved to a new function called in both setup and resume.

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 627d2d32

drivers/ata/pata_hpt366.c

+35 −14
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <linux/libata.h>



#define DRV_NAME	"pata_hpt366"

#define DRV_VERSION	"0.5.1"

#define DRV_VERSION	"0.5.3"



struct hpt_clock {

	u8	xfer_speed;
@@ -339,6 +339,8 @@ static struct scsi_host_template hpt36x_sht = { 
	.slave_configure	= ata_scsi_slave_config,

	.slave_destroy		= ata_scsi_slave_destroy,

	.bios_param		= ata_std_bios_param,

	.resume			= ata_scsi_device_resume,

	.suspend		= ata_scsi_device_suspend,

};



/*
@@ -380,6 +382,27 @@ static struct ata_port_operations hpt366_port_ops = { 
	.host_stop	= ata_host_stop

};



/**

 *	hpt36x_init_chipset	-	common chip setup

 *	@dev: PCI device

 *

 *	Perform the chip setup work that must be done at both init and

 *	resume time

 */



static void hpt36x_init_chipset(struct pci_dev *dev)

{

	u8 drive_fast;

	pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, (L1_CACHE_BYTES / 4));

	pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x78);

	pci_write_config_byte(dev, PCI_MIN_GNT, 0x08);

	pci_write_config_byte(dev, PCI_MAX_LAT, 0x08);



	pci_read_config_byte(dev, 0x51, &drive_fast);

	if (drive_fast & 0x80)

		pci_write_config_byte(dev, 0x51, drive_fast & ~0x80);

}



/**

 *	hpt36x_init_one		-	Initialise an HPT366/368

 *	@dev: PCI device
@@ -415,7 +438,6 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id) 


	u32 class_rev;

	u32 reg1;

	u8 drive_fast;



	pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);

	class_rev &= 0xFF;
@@ -425,14 +447,7 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id) 
	if (class_rev > 2)

			return -ENODEV;



	pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, (L1_CACHE_BYTES / 4));

	pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x78);

	pci_write_config_byte(dev, PCI_MIN_GNT, 0x08);

	pci_write_config_byte(dev, PCI_MAX_LAT, 0x08);



	pci_read_config_byte(dev, 0x51, &drive_fast);

	if (drive_fast & 0x80)

		pci_write_config_byte(dev, 0x51, drive_fast & ~0x80);

	hpt36x_init_chipset(dev);



	pci_read_config_dword(dev, 0x40,  &reg1);
@@ -453,9 +468,15 @@ static int hpt36x_init_one(struct pci_dev *dev, const struct pci_device_id *id) 
	return ata_pci_init_one(dev, port_info, 2);

}



static int hpt36x_reinit_one(struct pci_dev *dev)

{

	hpt36x_init_chipset(dev);

	return ata_pci_device_resume(dev);

}





static const struct pci_device_id hpt36x[] = {

	{ PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT366), },



	{ },

};
@@ -463,7 +484,9 @@ static struct pci_driver hpt36x_pci_driver = { 
	.name 		= DRV_NAME,

	.id_table	= hpt36x,

	.probe 		= hpt36x_init_one,

	.remove		= ata_pci_remove_one

	.remove		= ata_pci_remove_one,

	.suspend	= ata_pci_device_suspend,

	.resume		= hpt36x_reinit_one,

};



static int __init hpt36x_init(void)
@@ -471,13 +494,11 @@ static int __init hpt36x_init(void) 
	return pci_register_driver(&hpt36x_pci_driver);

}





static void __exit hpt36x_exit(void)

{

	pci_unregister_driver(&hpt36x_pci_driver);

}





MODULE_AUTHOR("Alan Cox");

MODULE_DESCRIPTION("low-level driver for the Highpoint HPT366/368");

MODULE_LICENSE("GPL");