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

Commit ff51a987 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: (82 commits)
  [PATCH] pata_ali: small fixes
  [PATCH] pata_via: VIA 8251 bridged systems are now out and about
  [PATCH] trivial piix: swap bogus dot for comma space
  [PATCH] sata_promise: PHYMODE4 fixup
  [PATCH] libata: always use polling IDENTIFY
  [libata] pata_cs5535: fix build
  [PATCH] ahci: do not powerdown during initialization
  [PATCH] libata: prepare ata_sg_clean() for invocation from EH
  [PATCH] libata: separate out rw ATA taskfile building into ata_build_rw_tf()
  [PATCH] libata: implement ata_exec_internal_sg()
  [PATCH] libata: make sure IRQ is cleared after ata_bmdma_freeze()
  [PATCH] libata: move BMDMA host status recording from EH to interrupt handler
  [PATCH] libata: make sure sdev doesn't go away while rescanning
  [PATCH] libata: don't request sense if the port is frozen
  [PATCH] libata: fix READ CAPACITY simulation
  [PATCH] libata: implement ATA_FLAG_SETXFER_POLLING and use it in pata_via, take #2
  [PATCH] libata: set IRQF_SHARED for legacy PCI IDE IRQs
  [PATCH] libata: remove unused HSM_ST_UNKNOWN
  [PATCH] libata: kill unnecessary sht->max_sectors initializations
  [PATCH] libata: add missing sht->slave_destroy
  ...
parents a80958f4 8e42a5a2

drivers/ata/Kconfig

+35 −0
Original line number Diff line number Diff line
@@ -328,6 +328,15 @@ config PATA_TRIFLEX 


	  If unsure, say N.



config PATA_MARVELL

	tristate "Marvell PATA support via legacy mode"

	depends on PCI

	help

	  This option enables limited support for the Marvell 88SE6145 ATA

	  controller.



	  If unsure, say N.



config PATA_MPIIX

	tristate "Intel PATA MPIIX support"

	depends on PCI
@@ -483,6 +492,32 @@ config PATA_WINBOND 


	  If unsure, say N.



config PATA_WINBOND_VLB

	tristate "Winbond W83759A VLB PATA support (Experimental)"

	depends on ISA && EXPERIMENTAL

	help

	  Support for the Winbond W83759A controller on Vesa Local Bus

	  systems.



config PATA_PLATFORM

	tristate "Generic platform device PATA support"

	depends on EMBEDDED

	help

	  This option enables support for generic directly connected ATA

	  devices commonly found on embedded systems.



	  If unsure, say N.



config PATA_IXP4XX_CF

	tristate "IXP4XX Compact Flash support"

	depends on ARCH_IXP4XX

	help

	  This option enables support for a Compact Flash connected on

	  the ixp4xx expansion bus. This driver had been written for

	  Loft/Avila boards in mind but can work with others.



	  If unsure, say N.



endif

endmenu

drivers/ata/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ obj-$(CONFIG_PATA_NETCELL) += pata_netcell.o 
obj-$(CONFIG_PATA_NS87410)	+= pata_ns87410.o

obj-$(CONFIG_PATA_OPTI)		+= pata_opti.o

obj-$(CONFIG_PATA_OPTIDMA)	+= pata_optidma.o

obj-$(CONFIG_PATA_MARVELL)	+= pata_marvell.o

obj-$(CONFIG_PATA_MPIIX)	+= pata_mpiix.o

obj-$(CONFIG_PATA_OLDPIIX)	+= pata_oldpiix.o

obj-$(CONFIG_PATA_PCMCIA)	+= pata_pcmcia.o
@@ -51,8 +52,11 @@ obj-$(CONFIG_PATA_SERVERWORKS) += pata_serverworks.o 
obj-$(CONFIG_PATA_SIL680)	+= pata_sil680.o

obj-$(CONFIG_PATA_VIA)		+= pata_via.o

obj-$(CONFIG_PATA_WINBOND)	+= pata_sl82c105.o

obj-$(CONFIG_PATA_WINBOND_VLB)	+= pata_winbond.o

obj-$(CONFIG_PATA_SIS)		+= pata_sis.o

obj-$(CONFIG_PATA_TRIFLEX)	+= pata_triflex.o

obj-$(CONFIG_PATA_IXP4XX_CF)	+= pata_ixp4xx_cf.o

obj-$(CONFIG_PATA_PLATFORM)	+= pata_platform.o

# Should be last but one libata driver

obj-$(CONFIG_ATA_GENERIC)	+= ata_generic.o

# Should be last libata driver

drivers/ata/ahci.c

+175 −54
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 


enum {

	AHCI_PCI_BAR		= 5,

	AHCI_MAX_PORTS		= 32,

	AHCI_MAX_SG		= 168, /* hardware max is 64K */

	AHCI_DMA_BOUNDARY	= 0xffffffff,

	AHCI_USE_CLUSTERING	= 0,
@@ -77,8 +78,9 @@ enum { 
	RX_FIS_UNK		= 0x60, /* offset of Unknown FIS data */



	board_ahci		= 0,

	board_ahci_vt8251	= 1,

	board_ahci_ign_iferr	= 2,

	board_ahci_pi		= 1,

	board_ahci_vt8251	= 2,

	board_ahci_ign_iferr	= 3,



	/* global controller registers */

	HOST_CAP		= 0x00, /* host capabilities */
@@ -167,9 +169,9 @@ enum { 
	AHCI_FLAG_MSI		= (1 << 0),



	/* ap->flags bits */

	AHCI_FLAG_RESET_NEEDS_CLO	= (1 << 24),

	AHCI_FLAG_NO_NCQ		= (1 << 25),

	AHCI_FLAG_IGN_IRQ_IF_ERR	= (1 << 26), /* ignore IRQ_IF_ERR */

	AHCI_FLAG_NO_NCQ		= (1 << 24),

	AHCI_FLAG_IGN_IRQ_IF_ERR	= (1 << 25), /* ignore IRQ_IF_ERR */

	AHCI_FLAG_HONOR_PI		= (1 << 26), /* honor PORTS_IMPL */

};



struct ahci_cmd_hdr {
@@ -216,6 +218,7 @@ static u8 ahci_check_status(struct ata_port *ap); 
static void ahci_freeze(struct ata_port *ap);

static void ahci_thaw(struct ata_port *ap);

static void ahci_error_handler(struct ata_port *ap);

static void ahci_vt8251_error_handler(struct ata_port *ap);

static void ahci_post_internal_cmd(struct ata_queued_cmd *qc);

static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg);

static int ahci_port_resume(struct ata_port *ap);
@@ -275,6 +278,37 @@ static const struct ata_port_operations ahci_ops = { 
	.port_stop		= ahci_port_stop,

};



static const struct ata_port_operations ahci_vt8251_ops = {

	.port_disable		= ata_port_disable,



	.check_status		= ahci_check_status,

	.check_altstatus	= ahci_check_status,

	.dev_select		= ata_noop_dev_select,



	.tf_read		= ahci_tf_read,



	.qc_prep		= ahci_qc_prep,

	.qc_issue		= ahci_qc_issue,



	.irq_handler		= ahci_interrupt,

	.irq_clear		= ahci_irq_clear,



	.scr_read		= ahci_scr_read,

	.scr_write		= ahci_scr_write,



	.freeze			= ahci_freeze,

	.thaw			= ahci_thaw,



	.error_handler		= ahci_vt8251_error_handler,

	.post_internal_cmd	= ahci_post_internal_cmd,



	.port_suspend		= ahci_port_suspend,

	.port_resume		= ahci_port_resume,



	.port_start		= ahci_port_start,

	.port_stop		= ahci_port_stop,

};



static const struct ata_port_info ahci_port_info[] = {

	/* board_ahci */

	{
@@ -286,16 +320,26 @@ static const struct ata_port_info ahci_port_info[] = { 
		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

		.port_ops	= &ahci_ops,

	},

	/* board_ahci_pi */

	{

		.sht		= &ahci_sht,

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |

				  ATA_FLAG_SKIP_D2H_BSY | AHCI_FLAG_HONOR_PI,

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

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

		.port_ops	= &ahci_ops,

	},

	/* board_ahci_vt8251 */

	{

		.sht		= &ahci_sht,

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |

				  ATA_FLAG_SKIP_D2H_BSY |

				  AHCI_FLAG_RESET_NEEDS_CLO | AHCI_FLAG_NO_NCQ,

				  ATA_FLAG_HRST_TO_RESUME | AHCI_FLAG_NO_NCQ,

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

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

		.port_ops	= &ahci_ops,

		.port_ops	= &ahci_vt8251_ops,

	},

	/* board_ahci_ign_iferr */

	{
@@ -322,22 +366,22 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x2682), board_ahci }, /* ESB2 */

	{ PCI_VDEVICE(INTEL, 0x2683), board_ahci }, /* ESB2 */

	{ PCI_VDEVICE(INTEL, 0x27c6), board_ahci }, /* ICH7-M DH */

	{ PCI_VDEVICE(INTEL, 0x2821), board_ahci }, /* ICH8 */

	{ PCI_VDEVICE(INTEL, 0x2822), board_ahci }, /* ICH8 */

	{ PCI_VDEVICE(INTEL, 0x2824), board_ahci }, /* ICH8 */

	{ PCI_VDEVICE(INTEL, 0x2829), board_ahci }, /* ICH8M */

	{ PCI_VDEVICE(INTEL, 0x282a), board_ahci }, /* ICH8M */

	{ PCI_VDEVICE(INTEL, 0x2922), board_ahci }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x2923), board_ahci }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x2924), board_ahci }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x2925), board_ahci }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x2927), board_ahci }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x2929), board_ahci }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x292a), board_ahci }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x292b), board_ahci }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x292f), board_ahci }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x294d), board_ahci }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x294e), board_ahci }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x2821), board_ahci_pi }, /* ICH8 */

	{ PCI_VDEVICE(INTEL, 0x2822), board_ahci_pi }, /* ICH8 */

	{ PCI_VDEVICE(INTEL, 0x2824), board_ahci_pi }, /* ICH8 */

	{ PCI_VDEVICE(INTEL, 0x2829), board_ahci_pi }, /* ICH8M */

	{ PCI_VDEVICE(INTEL, 0x282a), board_ahci_pi }, /* ICH8M */

	{ PCI_VDEVICE(INTEL, 0x2922), board_ahci_pi }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x2923), board_ahci_pi }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x2924), board_ahci_pi }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x2925), board_ahci_pi }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x2927), board_ahci_pi }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x2929), board_ahci_pi }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x292a), board_ahci_pi }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x292b), board_ahci_pi }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x292f), board_ahci_pi }, /* ICH9M */

	{ PCI_VDEVICE(INTEL, 0x294d), board_ahci_pi }, /* ICH9 */

	{ PCI_VDEVICE(INTEL, 0x294e), board_ahci_pi }, /* ICH9M */



	/* JMicron */

	{ PCI_VDEVICE(JMICRON, 0x2360), board_ahci_ign_iferr }, /* JMB360 */
@@ -372,6 +416,10 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(SI, 0x1185), board_ahci }, /* SiS 966 */

	{ PCI_VDEVICE(SI, 0x0186), board_ahci }, /* SiS 968 */



	/* Generic, PCI class code for AHCI */

	{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,

	  0x010601, 0xffffff, board_ahci },



	{ }	/* terminate list */

};
@@ -386,6 +434,11 @@ static struct pci_driver ahci_pci_driver = { 
};





static inline int ahci_nr_ports(u32 cap)

{

	return (cap & 0x1f) + 1;

}



static inline unsigned long ahci_port_base_ul (unsigned long base, unsigned int port)

{

	return base + 0x100 + (port * 0x80);
@@ -559,9 +612,6 @@ static void ahci_power_down(void __iomem *port_mmio, u32 cap) 
static void ahci_init_port(void __iomem *port_mmio, u32 cap,

			   dma_addr_t cmd_slot_dma, dma_addr_t rx_fis_dma)

{

	/* power up */

	ahci_power_up(port_mmio, cap);



	/* enable FIS reception */

	ahci_start_fis_rx(port_mmio, cap, cmd_slot_dma, rx_fis_dma);
@@ -587,19 +637,17 @@ static int ahci_deinit_port(void __iomem *port_mmio, u32 cap, const char **emsg) 
		return rc;

	}



	/* put device into slumber mode */

	ahci_power_down(port_mmio, cap);



	return 0;

}



static int ahci_reset_controller(void __iomem *mmio, struct pci_dev *pdev)

{

	u32 cap_save, tmp;

	u32 cap_save, impl_save, tmp;



	cap_save = readl(mmio + HOST_CAP);

	cap_save &= ( (1<<28) | (1<<17) );

	cap_save |= (1 << 27);

	impl_save = readl(mmio + HOST_PORTS_IMPL);



	/* global controller reset */

	tmp = readl(mmio + HOST_CTL);
@@ -620,10 +668,21 @@ static int ahci_reset_controller(void __iomem *mmio, struct pci_dev *pdev) 
		return -EIO;

	}



	/* turn on AHCI mode */

	writel(HOST_AHCI_EN, mmio + HOST_CTL);

	(void) readl(mmio + HOST_CTL);	/* flush */



	/* These write-once registers are normally cleared on reset.

	 * Restore BIOS values... which we HOPE were present before

	 * reset.

	 */

	if (!impl_save) {

		impl_save = (1 << ahci_nr_ports(cap_save)) - 1;

		dev_printk(KERN_WARNING, &pdev->dev,

			   "PORTS_IMPL is zero, forcing 0x%x\n", impl_save);

	}

	writel(cap_save, mmio + HOST_CAP);

	writel(0xf, mmio + HOST_PORTS_IMPL);

	writel(impl_save, mmio + HOST_PORTS_IMPL);

	(void) readl(mmio + HOST_PORTS_IMPL);	/* flush */



	if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
@@ -639,7 +698,8 @@ static int ahci_reset_controller(void __iomem *mmio, struct pci_dev *pdev) 
}



static void ahci_init_controller(void __iomem *mmio, struct pci_dev *pdev,

				 int n_ports, u32 cap)

				 int n_ports, unsigned int port_flags,

				 struct ahci_host_priv *hpriv)

{

	int i, rc;

	u32 tmp;
@@ -648,13 +708,12 @@ static void ahci_init_controller(void __iomem *mmio, struct pci_dev *pdev, 
		void __iomem *port_mmio = ahci_port_base(mmio, i);

		const char *emsg = NULL;



#if 0 /* BIOSen initialize this incorrectly */

		if (!(hpriv->port_map & (1 << i)))

		if ((port_flags & AHCI_FLAG_HONOR_PI) &&

		    !(hpriv->port_map & (1 << i)))

			continue;

#endif



		/* make sure port is not active */

		rc = ahci_deinit_port(port_mmio, cap, &emsg);

		rc = ahci_deinit_port(port_mmio, hpriv->cap, &emsg);

		if (rc)

			dev_printk(KERN_WARNING, &pdev->dev,

				   "%s (%d)\n", emsg, rc);
@@ -729,17 +788,6 @@ static int ahci_clo(struct ata_port *ap) 
	return 0;

}



static int ahci_prereset(struct ata_port *ap)

{

	if ((ap->flags & AHCI_FLAG_RESET_NEEDS_CLO) &&

	    (ata_busy_wait(ap, ATA_BUSY, 1000) & ATA_BUSY)) {

		/* ATA_BUSY hasn't cleared, so send a CLO */

		ahci_clo(ap);

	}



	return ata_std_prereset(ap);

}



static int ahci_softreset(struct ata_port *ap, unsigned int *class)

{

	struct ahci_port_priv *pp = ap->private_data;
@@ -877,6 +925,31 @@ static int ahci_hardreset(struct ata_port *ap, unsigned int *class) 
	return rc;

}



static int ahci_vt8251_hardreset(struct ata_port *ap, unsigned int *class)

{

	void __iomem *mmio = ap->host->mmio_base;

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);

	int rc;



	DPRINTK("ENTER\n");



	ahci_stop_engine(port_mmio);



	rc = sata_port_hardreset(ap, sata_ehc_deb_timing(&ap->eh_context));



	/* vt8251 needs SError cleared for the port to operate */

	ahci_scr_write(ap, SCR_ERROR, ahci_scr_read(ap, SCR_ERROR));



	ahci_start_engine(port_mmio);



	DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class);



	/* vt8251 doesn't clear BSY on signature FIS reception,

	 * request follow-up softreset.

	 */

	return rc ?: -EAGAIN;

}



static void ahci_postreset(struct ata_port *ap, unsigned int *class)

{

	void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;
@@ -1196,7 +1269,23 @@ static void ahci_error_handler(struct ata_port *ap) 
	}



	/* perform recovery */

	ata_do_eh(ap, ahci_prereset, ahci_softreset, ahci_hardreset,

	ata_do_eh(ap, ata_std_prereset, ahci_softreset, ahci_hardreset,

		  ahci_postreset);

}



static void ahci_vt8251_error_handler(struct ata_port *ap)

{

	void __iomem *mmio = ap->host->mmio_base;

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);



	if (!(ap->pflags & ATA_PFLAG_FROZEN)) {

		/* restart engine */

		ahci_stop_engine(port_mmio);

		ahci_start_engine(port_mmio);

	}



	/* perform recovery */

	ata_do_eh(ap, ata_std_prereset, ahci_softreset, ahci_vt8251_hardreset,

		  ahci_postreset);

}
@@ -1226,7 +1315,9 @@ static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg) 
	int rc;



	rc = ahci_deinit_port(port_mmio, hpriv->cap, &emsg);

	if (rc) {

	if (rc == 0)

		ahci_power_down(port_mmio, hpriv->cap);

	else {

		ata_port_printk(ap, KERN_ERR, "%s (%d)\n", emsg, rc);

		ahci_init_port(port_mmio, hpriv->cap,

			       pp->cmd_slot_dma, pp->rx_fis_dma);
@@ -1242,6 +1333,7 @@ static int ahci_port_resume(struct ata_port *ap) 
	void __iomem *mmio = ap->host->mmio_base;

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);



	ahci_power_up(port_mmio, hpriv->cap);

	ahci_init_port(port_mmio, hpriv->cap, pp->cmd_slot_dma, pp->rx_fis_dma);



	return 0;
@@ -1281,7 +1373,8 @@ static int ahci_pci_device_resume(struct pci_dev *pdev) 
		if (rc)

			return rc;



		ahci_init_controller(mmio, pdev, host->n_ports, hpriv->cap);

		ahci_init_controller(mmio, pdev, host->n_ports,

				     host->ports[0]->flags, hpriv);

	}



	ata_host_resume(host);
@@ -1347,6 +1440,9 @@ static int ahci_port_start(struct ata_port *ap) 


	ap->private_data = pp;



	/* power up port */

	ahci_power_up(port_mmio, hpriv->cap);



	/* initialize port */

	ahci_init_port(port_mmio, hpriv->cap, pp->cmd_slot_dma, pp->rx_fis_dma);
@@ -1393,7 +1489,7 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent) 
	struct ahci_host_priv *hpriv = probe_ent->private_data;

	struct pci_dev *pdev = to_pci_dev(probe_ent->dev);

	void __iomem *mmio = probe_ent->mmio_base;

	unsigned int i, using_dac;

	unsigned int i, cap_n_ports, using_dac;

	int rc;



	rc = ahci_reset_controller(mmio, pdev);
@@ -1402,10 +1498,34 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent) 


	hpriv->cap = readl(mmio + HOST_CAP);

	hpriv->port_map = readl(mmio + HOST_PORTS_IMPL);

	probe_ent->n_ports = (hpriv->cap & 0x1f) + 1;

	cap_n_ports = ahci_nr_ports(hpriv->cap);



	VPRINTK("cap 0x%x  port_map 0x%x  n_ports %d\n",

		hpriv->cap, hpriv->port_map, probe_ent->n_ports);

		hpriv->cap, hpriv->port_map, cap_n_ports);



	if (probe_ent->port_flags & AHCI_FLAG_HONOR_PI) {

		unsigned int n_ports = cap_n_ports;

		u32 port_map = hpriv->port_map;

		int max_port = 0;



		for (i = 0; i < AHCI_MAX_PORTS && n_ports; i++) {

			if (port_map & (1 << i)) {

				n_ports--;

				port_map &= ~(1 << i);

				max_port = i;

			} else

				probe_ent->dummy_port_mask |= 1 << i;

		}



		if (n_ports || port_map)

			dev_printk(KERN_WARNING, &pdev->dev,

				   "nr_ports (%u) and implemented port map "

				   "(0x%x) don't match\n",

				   cap_n_ports, hpriv->port_map);



		probe_ent->n_ports = max_port + 1;

	} else

		probe_ent->n_ports = cap_n_ports;



	using_dac = hpriv->cap & HOST_CAP_64;

	if (using_dac &&
@@ -1437,7 +1557,8 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent) 
	for (i = 0; i < probe_ent->n_ports; i++)

		ahci_setup_port(&probe_ent->port[i], (unsigned long) mmio, i);



	ahci_init_controller(mmio, pdev, probe_ent->n_ports, hpriv->cap);

	ahci_init_controller(mmio, pdev, probe_ent->n_ports,

			     probe_ent->port_flags, hpriv);



	pci_set_master(pdev);

drivers/ata/ata_generic.c

+7 −4
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <linux/libata.h>



#define DRV_NAME "ata_generic"

#define DRV_VERSION "0.2.6"

#define DRV_VERSION "0.2.10"



/*

 *	A generic parallel ATA driver using libata
@@ -109,7 +109,6 @@ static struct scsi_host_template generic_sht = { 
	.can_queue		= ATA_DEF_QUEUE,

	.this_id		= ATA_SHT_THIS_ID,

	.sg_tablesize		= LIBATA_MAX_PRD,

	.max_sectors		= ATA_MAX_SECTORS,

	.cmd_per_lun		= ATA_SHT_CMD_PER_LUN,

	.emulated		= ATA_SHT_EMULATED,

	.use_clustering		= ATA_SHT_USE_CLUSTERING,
@@ -118,6 +117,8 @@ static struct scsi_host_template generic_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,

};



static struct ata_port_operations generic_port_ops = {
@@ -226,12 +227,14 @@ static struct pci_driver ata_generic_pci_driver = { 
	.name 		= DRV_NAME,

	.id_table	= ata_generic,

	.probe 		= ata_generic_init_one,

	.remove		= ata_pci_remove_one

	.remove		= ata_pci_remove_one,

	.suspend	= ata_pci_device_suspend,

	.resume		= ata_pci_device_resume,

};



static int __init ata_generic_init(void)

{

	return pci_module_init(&ata_generic_pci_driver);

	return pci_register_driver(&ata_generic_pci_driver);

}

drivers/ata/ata_piix.c

+54 −140

File changed.

Preview size limit exceeded, changes collapsed.