Commit 955c5038 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

parents 62d3af1b 2ab540be

drivers/scsi/libata-core.c

+9 −9
Original line number Diff line number Diff line
@@ -370,6 +370,8 @@ static void ata_tf_read_pio(struct ata_port *ap, struct ata_taskfile *tf) 
{

	struct ata_ioports *ioaddr = &ap->ioaddr;



	tf->command = ata_check_status(ap);

	tf->feature = ata_chk_err(ap);

	tf->nsect = inb(ioaddr->nsect_addr);

	tf->lbal = inb(ioaddr->lbal_addr);

	tf->lbam = inb(ioaddr->lbam_addr);
@@ -402,6 +404,8 @@ static void ata_tf_read_mmio(struct ata_port *ap, struct ata_taskfile *tf) 
{

	struct ata_ioports *ioaddr = &ap->ioaddr;



	tf->command = ata_check_status(ap);

	tf->feature = ata_chk_err(ap);

	tf->nsect = readb((void __iomem *)ioaddr->nsect_addr);

	tf->lbal = readb((void __iomem *)ioaddr->lbal_addr);

	tf->lbam = readb((void __iomem *)ioaddr->lbam_addr);
@@ -4254,11 +4258,10 @@ int ata_device_add(const struct ata_probe_ent *ent) 


	DPRINTK("ENTER\n");

	/* alloc a container for our list of ATA ports (buses) */

	host_set = kmalloc(sizeof(struct ata_host_set) +

	host_set = kzalloc(sizeof(struct ata_host_set) +

			   (ent->n_ports * sizeof(void *)), GFP_KERNEL);

	if (!host_set)

		return 0;

	memset(host_set, 0, sizeof(struct ata_host_set) + (ent->n_ports * sizeof(void *)));

	spin_lock_init(&host_set->lock);



	host_set->dev = dev;
@@ -4298,10 +4301,8 @@ int ata_device_add(const struct ata_probe_ent *ent) 
		count++;

	}



	if (!count) {

		kfree(host_set);

		return 0;

	}

	if (!count)

		goto err_free_ret;



	/* obtain irq, that is shared between channels */

	if (request_irq(ent->irq, ent->port_ops->irq_handler, ent->irq_flags,
@@ -4359,6 +4360,7 @@ int ata_device_add(const struct ata_probe_ent *ent) 
		ata_host_remove(host_set->ports[i], 1);

		scsi_host_put(host_set->ports[i]->host);

	}

err_free_ret:

	kfree(host_set);

	VPRINTK("EXIT, returning 0\n");

	return 0;
@@ -4468,15 +4470,13 @@ ata_probe_ent_alloc(struct device *dev, const struct ata_port_info *port) 
{

	struct ata_probe_ent *probe_ent;



	probe_ent = kmalloc(sizeof(*probe_ent), GFP_KERNEL);

	probe_ent = kzalloc(sizeof(*probe_ent), GFP_KERNEL);

	if (!probe_ent) {

		printk(KERN_ERR DRV_NAME "(%s): out of memory\n",

		       kobject_name(&(dev->kobj)));

		return NULL;

	}



	memset(probe_ent, 0, sizeof(*probe_ent));



	INIT_LIST_HEAD(&probe_ent->node);

	probe_ent->dev = dev;

drivers/scsi/libata-scsi.c

+656 −130

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/libata.h

+2 −1
Original line number Diff line number Diff line
@@ -50,13 +50,14 @@ extern void ata_dev_select(struct ata_port *ap, unsigned int device, 
                           unsigned int wait, unsigned int can_sleep);

extern void ata_tf_to_host_nolock(struct ata_port *ap, const struct ata_taskfile *tf);

extern void swap_buf_le16(u16 *buf, unsigned int buf_words);

extern int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg);

extern int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg);





/* libata-scsi.c */

extern void atapi_request_sense(struct ata_port *ap, struct ata_device *dev,

			 struct scsi_cmnd *cmd);

extern void ata_scsi_scan_host(struct ata_port *ap);

extern void ata_to_sense_error(struct ata_queued_cmd *qc, u8 drv_stat);

extern int ata_scsi_error(struct Scsi_Host *host);

extern unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf,

			       unsigned int buflen);

drivers/scsi/pdc_adma.c

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



#define DRV_NAME	"pdc_adma"

#define DRV_VERSION	"0.01"

#define DRV_VERSION	"0.03"



/* macro to calculate base address for ATA regs */

#define ADMA_ATA_REGS(base,port_no)	((base) + ((port_no) * 0x40))
@@ -79,7 +79,6 @@ enum { 
	aNIEN			= (1 << 8), /* irq mask: 1==masked */

	aGO			= (1 << 7), /* packet trigger ("Go!") */

	aRSTADM			= (1 << 5), /* ADMA logic reset */

	aRSTA			= (1 << 2), /* ATA hard reset */

	aPIOMD4			= 0x0003,   /* PIO mode 4 */



	/* ADMA_STATUS register bits */
@@ -452,25 +451,26 @@ static inline unsigned int adma_intr_pkt(struct ata_host_set *host_set) 
		struct adma_port_priv *pp;

		struct ata_queued_cmd *qc;

		void __iomem *chan = ADMA_REGS(mmio_base, port_no);

		u8 drv_stat, status = readb(chan + ADMA_STATUS);

		u8 drv_stat = 0, status = readb(chan + ADMA_STATUS);



		if (status == 0)

			continue;

		handled = 1;

		adma_enter_reg_mode(ap);

		if ((ap->flags & ATA_FLAG_PORT_DISABLED))

		if (ap->flags & (ATA_FLAG_PORT_DISABLED | ATA_FLAG_NOINTR))

			continue;

		pp = ap->private_data;

		if (!pp || pp->state != adma_state_pkt)

			continue;

		qc = ata_qc_from_tag(ap, ap->active_tag);

		drv_stat = 0;

		if (qc && (!(qc->tf.ctl & ATA_NIEN))) {

			if ((status & (aPERR | aPSD | aUIRQ)))

				drv_stat = ATA_ERR;

			else if (pp->pkt[0] != cDONE)

				drv_stat = ATA_ERR;

			ata_qc_complete(qc, drv_stat);

		}

	}

	return handled;

}
@@ -490,7 +490,7 @@ static inline unsigned int adma_intr_mmio(struct ata_host_set *host_set) 
			if (qc && (!(qc->tf.ctl & ATA_NIEN))) {



				/* check main status, clearing INTRQ */

				u8 status = ata_chk_status(ap);

				u8 status = ata_check_status(ap);

				if ((status & ATA_BUSY))

					continue;

				DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n",
@@ -561,15 +561,15 @@ static int adma_port_start(struct ata_port *ap) 
	if ((pp->pkt_dma & 7) != 0) {

		printk("bad alignment for pp->pkt_dma: %08x\n",

						(u32)pp->pkt_dma);

		goto err_out_kfree2;

		dma_free_coherent(dev, ADMA_PKT_BYTES,

						pp->pkt, pp->pkt_dma);

		goto err_out_kfree;

	}

	memset(pp->pkt, 0, ADMA_PKT_BYTES);

	ap->private_data = pp;

	adma_reinit_engine(ap);

	return 0;



err_out_kfree2:

	kfree(pp);

err_out_kfree:

	kfree(pp);

err_out:

drivers/scsi/sata_promise.c

+4 −0
Original line number Diff line number Diff line
@@ -195,6 +195,8 @@ static struct ata_port_info pdc_port_info[] = { 
static struct pci_device_id pdc_ata_pci_tbl[] = {

	{ PCI_VENDOR_ID_PROMISE, 0x3371, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_2037x },

	{ PCI_VENDOR_ID_PROMISE, 0x3570, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_2037x },

	{ PCI_VENDOR_ID_PROMISE, 0x3571, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_2037x },

	{ PCI_VENDOR_ID_PROMISE, 0x3373, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
@@ -207,6 +209,8 @@ static struct pci_device_id pdc_ata_pci_tbl[] = { 
	  board_2037x },

	{ PCI_VENDOR_ID_PROMISE, 0x3d75, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_2037x },

	{ PCI_VENDOR_ID_PROMISE, 0x3d73, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_2037x },



	{ PCI_VENDOR_ID_PROMISE, 0x3318, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_20319 },