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

Commit 122401ce authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master'

parents 94ec1ef1 6e9d6b8e

drivers/pci/quirks.c

+2 −2
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static void piix4_mem_quirk(struct pci_dev *dev, const char *name, unsigned int 
/*

 * PIIX4 ACPI: Two IO regions pointed to by longwords at

 *	0x40 (64 bytes of ACPI registers)

 *	0x90 (32 bytes of SMB registers)

 *	0x90 (16 bytes of SMB registers)

 * and a few strange programmable PIIX4 device resources.

 */

static void __devinit quirk_piix4_acpi(struct pci_dev *dev)
@@ -366,7 +366,7 @@ static void __devinit quirk_piix4_acpi(struct pci_dev *dev) 
	pci_read_config_dword(dev, 0x40, &region);

	quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES, "PIIX4 ACPI");

	pci_read_config_dword(dev, 0x90, &region);

	quirk_io_region(dev, region, 32, PCI_BRIDGE_RESOURCES+1, "PIIX4 SMB");

	quirk_io_region(dev, region, 16, PCI_BRIDGE_RESOURCES+1, "PIIX4 SMB");



	/* Device resource A has enables for some of the other ones */

	pci_read_config_dword(dev, 0x5c, &res_a);

drivers/scsi/ahci.c

+23 −23
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <linux/interrupt.h>

#include <linux/sched.h>

#include <linux/dma-mapping.h>

#include <linux/device.h>

#include "scsi.h"

#include <scsi/scsi_host.h>

#include <linux/libata.h>
@@ -600,7 +601,7 @@ static void ahci_eng_timeout(struct ata_port *ap) 
	 	 * not being called from the SCSI EH.

	 	 */

		qc->scsidone = scsi_finish_command;

		ata_qc_complete(qc, ATA_ERR);

		ata_qc_complete(qc, AC_ERR_OTHER);

	}



	spin_unlock_irqrestore(&host_set->lock, flags);
@@ -629,7 +630,7 @@ static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc) 
	if (status & PORT_IRQ_FATAL) {

		ahci_intr_error(ap, status);

		if (qc)

			ata_qc_complete(qc, ATA_ERR);

			ata_qc_complete(qc, AC_ERR_OTHER);

	}



	return 1;
@@ -675,9 +676,9 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs * 
				if (ata_ratelimit()) {

					struct pci_dev *pdev =

						to_pci_dev(ap->host_set->dev);

					printk(KERN_WARNING

					  "ahci(%s): unhandled interrupt on port %u\n",

					  pci_name(pdev), i);

					dev_printk(KERN_WARNING, &pdev->dev,

					  "unhandled interrupt on port %u\n",

					  i);

				}



			VPRINTK("port %u\n", i);
@@ -686,9 +687,8 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs * 
			if (ata_ratelimit()) {

				struct pci_dev *pdev =

					to_pci_dev(ap->host_set->dev);

				printk(KERN_WARNING

				  "ahci(%s): interrupt on disabled port %u\n",

				  pci_name(pdev), i);

				dev_printk(KERN_WARNING, &pdev->dev,

					"interrupt on disabled port %u\n", i);

			}

		}
@@ -760,8 +760,8 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent) 


	tmp = readl(mmio + HOST_CTL);

	if (tmp & HOST_RESET) {

		printk(KERN_ERR DRV_NAME "(%s): controller reset failed (0x%x)\n",

			pci_name(pdev), tmp);

		dev_printk(KERN_ERR, &pdev->dev,

			   "controller reset failed (0x%x)\n", tmp);

		return -EIO;

	}
@@ -789,22 +789,22 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent) 
		if (rc) {

			rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);

			if (rc) {

				printk(KERN_ERR DRV_NAME "(%s): 64-bit DMA enable failed\n",

					pci_name(pdev));

				dev_printk(KERN_ERR, &pdev->dev,

					   "64-bit DMA enable failed\n");

				return rc;

			}

		}

	} else {

		rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);

		if (rc) {

			printk(KERN_ERR DRV_NAME "(%s): 32-bit DMA enable failed\n",

				pci_name(pdev));

			dev_printk(KERN_ERR, &pdev->dev,

				   "32-bit DMA enable failed\n");

			return rc;

		}

		rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);

		if (rc) {

			printk(KERN_ERR DRV_NAME "(%s): 32-bit consistent DMA enable failed\n",

				pci_name(pdev));

			dev_printk(KERN_ERR, &pdev->dev,

				   "32-bit consistent DMA enable failed\n");

			return rc;

		}

	}
@@ -907,10 +907,10 @@ static void ahci_print_info(struct ata_probe_ent *probe_ent) 
	else

		scc_s = "unknown";



	printk(KERN_INFO DRV_NAME "(%s) AHCI %02x%02x.%02x%02x "

	dev_printk(KERN_INFO, &pdev->dev,

		"AHCI %02x%02x.%02x%02x "

		"%u slots %u ports %s Gbps 0x%x impl %s mode\n"

	       	,

	       	pci_name(pdev),



	       	(vers >> 24) & 0xff,

	       	(vers >> 16) & 0xff,
@@ -923,11 +923,11 @@ static void ahci_print_info(struct ata_probe_ent *probe_ent) 
		impl,

		scc_s);



	printk(KERN_INFO DRV_NAME "(%s) flags: "

	dev_printk(KERN_INFO, &pdev->dev,

		"flags: "

	       	"%s%s%s%s%s%s"

	       	"%s%s%s%s%s%s%s\n"

	       	,

	       	pci_name(pdev),



		cap & (1 << 31) ? "64bit " : "",

		cap & (1 << 30) ? "ncq " : "",
@@ -960,7 +960,7 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
	VPRINTK("ENTER\n");



	if (!printed_version++)

		printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");

		dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");



	rc = pci_enable_device(pdev);

	if (rc)

drivers/scsi/ata_piix.c

+9 −6
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <linux/init.h>

#include <linux/blkdev.h>

#include <linux/delay.h>

#include <linux/device.h>

#include "scsi.h"

#include <scsi/scsi_host.h>

#include <linux/libata.h>
@@ -621,18 +622,19 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
{

	static int printed_version;

	struct ata_port_info *port_info[2];

	unsigned int combined = 0, n_ports = 1;

	unsigned int combined = 0;

	unsigned int pata_chan = 0, sata_chan = 0;



	if (!printed_version++)

		printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");

		dev_printk(KERN_DEBUG, &pdev->dev,

			   "version " DRV_VERSION "\n");



	/* no hotplugging support (FIXME) */

	if (!in_module_init)

		return -ENODEV;



	port_info[0] = &piix_port_info[ent->driver_data];

	port_info[1] = NULL;

	port_info[1] = &piix_port_info[ent->driver_data];



	if (port_info[0]->host_flags & PIIX_FLAG_AHCI) {

		u8 tmp;
@@ -670,12 +672,13 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
		port_info[sata_chan] = &piix_port_info[ent->driver_data];

		port_info[sata_chan]->host_flags |= ATA_FLAG_SLAVE_POSS;

		port_info[pata_chan] = &piix_port_info[ich5_pata];

		n_ports++;



		printk(KERN_WARNING DRV_NAME ": combined mode detected\n");

		dev_printk(KERN_WARNING, &pdev->dev,

			   "combined mode detected (p=%u, s=%u)\n",

			   pata_chan, sata_chan);

	}



	return ata_pci_init_one(pdev, port_info, n_ports);

	return ata_pci_init_one(pdev, port_info, 2);

}



static int __init piix_init(void)

drivers/scsi/libata-core.c

+15 −18
Original line number Diff line number Diff line
@@ -2667,14 +2667,14 @@ static int ata_sg_setup(struct ata_queued_cmd *qc) 
 *	None.  (grabs host lock)

 */



void ata_poll_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat)

void ata_poll_qc_complete(struct ata_queued_cmd *qc, unsigned int err_mask)

{

	struct ata_port *ap = qc->ap;

	unsigned long flags;



	spin_lock_irqsave(&ap->host_set->lock, flags);

	ata_irq_on(ap);

	ata_qc_complete(qc, drv_stat);

	ata_qc_complete(qc, err_mask);

	spin_unlock_irqrestore(&ap->host_set->lock, flags);

}
@@ -2771,7 +2771,7 @@ static int ata_pio_complete (struct ata_port *ap) 


	ap->hsm_task_state = HSM_ST_IDLE;



	ata_poll_qc_complete(qc, drv_stat);

	ata_poll_qc_complete(qc, 0);



	/* another command may start at this point */
@@ -3266,18 +3266,15 @@ static void ata_pio_block(struct ata_port *ap) 
static void ata_pio_error(struct ata_port *ap)

{

	struct ata_queued_cmd *qc;

	u8 drv_stat;



	printk(KERN_WARNING "ata%u: PIO error\n", ap->id);



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

	assert(qc != NULL);



	drv_stat = ata_chk_status(ap);

	printk(KERN_WARNING "ata%u: PIO error, drv_stat 0x%x\n",

	       ap->id, drv_stat);



	ap->hsm_task_state = HSM_ST_IDLE;



	ata_poll_qc_complete(qc, drv_stat | ATA_ERR);

	ata_poll_qc_complete(qc, AC_ERR_ATA_BUS);

}



static void ata_pio_task(void *_data)
@@ -3402,7 +3399,7 @@ static void ata_qc_timeout(struct ata_queued_cmd *qc) 
		ap->hsm_task_state = HSM_ST_IDLE;



		/* complete taskfile transaction */

		ata_qc_complete(qc, drv_stat);

		ata_qc_complete(qc, ac_err_mask(drv_stat));

		break;

	}
@@ -3507,7 +3504,7 @@ struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap, 
	return qc;

}



int ata_qc_complete_noop(struct ata_queued_cmd *qc, u8 drv_stat)

int ata_qc_complete_noop(struct ata_queued_cmd *qc, unsigned int err_mask)

{

	return 0;

}
@@ -3566,7 +3563,7 @@ void ata_qc_free(struct ata_queued_cmd *qc) 
 *	spin_lock_irqsave(host_set lock)

 */



void ata_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat)

void ata_qc_complete(struct ata_queued_cmd *qc, unsigned int err_mask)

{

	int rc;
@@ -3583,7 +3580,7 @@ void ata_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat) 
	qc->flags &= ~ATA_QCFLAG_ACTIVE;



	/* call completion callback */

	rc = qc->complete_fn(qc, drv_stat);

	rc = qc->complete_fn(qc, err_mask);



	/* if callback indicates not to complete command (non-zero),

	 * return immediately
@@ -4169,7 +4166,7 @@ inline unsigned int ata_host_intr (struct ata_port *ap, 
		ap->hsm_task_state = HSM_ST_IDLE;



		/* complete taskfile transaction */

		ata_qc_complete(qc, status);

		ata_qc_complete(qc, ac_err_mask(status));

		break;



	case HSM_ST_ERR:
@@ -4746,11 +4743,11 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int 
	return probe_ent;

}



static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, struct ata_port_info **port, int port_num)

static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, struct ata_port_info *port, int port_num)

{

	struct ata_probe_ent *probe_ent;



	probe_ent = ata_probe_ent_alloc(pci_dev_to_dev(pdev), port[0]);

	probe_ent = ata_probe_ent_alloc(pci_dev_to_dev(pdev), port);

	if (!probe_ent)

		return NULL;
@@ -4897,9 +4894,9 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info, 


	if (legacy_mode) {

		if (legacy_mode & (1 << 0))

			probe_ent = ata_pci_init_legacy_port(pdev, port, 0);

			probe_ent = ata_pci_init_legacy_port(pdev, port[0], 0);

		if (legacy_mode & (1 << 1))

			probe_ent2 = ata_pci_init_legacy_port(pdev, port, 1);

			probe_ent2 = ata_pci_init_legacy_port(pdev, port[1], 1);

	} else {

		if (n_ports == 2)

			probe_ent = ata_pci_init_native_mode(pdev, port, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);

drivers/scsi/libata-scsi.c

+28 −18
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ void ata_gen_ata_desc_sense(struct ata_queued_cmd *qc) 
	 * Use ata_to_sense_error() to map status register bits

	 * onto sense key, asc & ascq.

	 */

	if (unlikely(tf->command & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ))) {

	if (tf->command & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {

		ata_to_sense_error(qc->ap->id, tf->command, tf->feature,

				   &sb[1], &sb[2], &sb[3]);

		sb[1] &= 0x0f;
@@ -635,7 +635,7 @@ void ata_gen_fixed_sense(struct ata_queued_cmd *qc) 
	 * Use ata_to_sense_error() to map status register bits

	 * onto sense key, asc & ascq.

	 */

	if (unlikely(tf->command & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ))) {

	if (tf->command & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {

		ata_to_sense_error(qc->ap->id, tf->command, tf->feature,

				   &sb[2], &sb[12], &sb[13]);

		sb[2] &= 0x0f;
@@ -644,7 +644,11 @@ void ata_gen_fixed_sense(struct ata_queued_cmd *qc) 
	sb[0] = 0x70;

	sb[7] = 0x0a;



	if (tf->flags & ATA_TFLAG_LBA && !(tf->flags & ATA_TFLAG_LBA48)) {

	if (tf->flags & ATA_TFLAG_LBA48) {

		/* TODO: find solution for LBA48 descriptors */

	}



	else if (tf->flags & ATA_TFLAG_LBA) {

		/* A small (28b) LBA will fit in the 32b info field */

		sb[0] |= 0x80;		/* set valid bit */

		sb[3] = tf->device & 0x0f;
@@ -652,6 +656,10 @@ void ata_gen_fixed_sense(struct ata_queued_cmd *qc) 
		sb[5] = tf->lbam;

		sb[6] = tf->lbal;

	}



	else {

		/* TODO: C/H/S */

	}

}



/**
@@ -1199,10 +1207,12 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicm 
	return 1;

}



static int ata_scsi_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat)

static int ata_scsi_qc_complete(struct ata_queued_cmd *qc,

				unsigned int err_mask)

{

	struct scsi_cmnd *cmd = qc->scsicmd;

 	int need_sense = drv_stat & (ATA_ERR | ATA_BUSY | ATA_DRQ);

	u8 *cdb = cmd->cmnd;

 	int need_sense = (err_mask != 0);



	/* For ATA pass thru (SAT) commands, generate a sense block if

	 * user mandated it or if there's an error.  Note that if we
@@ -1211,8 +1221,8 @@ static int ata_scsi_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat) 
	 * whether the command completed successfully or not. If there

	 * was no error, SK, ASC and ASCQ will all be zero.

	 */

	if (((cmd->cmnd[0] == ATA_16) || (cmd->cmnd[0] == ATA_12)) &&

 	    ((cmd->cmnd[2] & 0x20) || need_sense)) {

	if (((cdb[0] == ATA_16) || (cdb[0] == ATA_12)) &&

 	    ((cdb[2] & 0x20) || need_sense)) {

 		ata_gen_ata_desc_sense(qc);

	} else {

		if (!need_sense) {
@@ -1995,21 +2005,13 @@ void atapi_request_sense(struct ata_port *ap, struct ata_device *dev, 
	DPRINTK("EXIT\n");

}



static int atapi_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat)

static int atapi_qc_complete(struct ata_queued_cmd *qc, unsigned int err_mask)

{

	struct scsi_cmnd *cmd = qc->scsicmd;



	VPRINTK("ENTER, drv_stat == 0x%x\n", drv_stat);



	if (unlikely(drv_stat & (ATA_BUSY | ATA_DRQ)))

		/* FIXME: not quite right; we don't want the

		 * translation of taskfile registers into

		 * a sense descriptors, since that's only

		 * correct for ATA, not ATAPI

		 */

		ata_gen_ata_desc_sense(qc);

	VPRINTK("ENTER, err_mask 0x%X\n", err_mask);



	else if (unlikely(drv_stat & ATA_ERR)) {

	if (unlikely(err_mask & AC_ERR_DEV)) {

		DPRINTK("request check condition\n");



		/* FIXME: command completion with check condition
@@ -2026,6 +2028,14 @@ static int atapi_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat) 
		return 1;

	}



	else if (unlikely(err_mask))

		/* FIXME: not quite right; we don't want the

		 * translation of taskfile registers into

		 * a sense descriptors, since that's only

		 * correct for ATA, not ATAPI

		 */

		ata_gen_ata_desc_sense(qc);



	else {

		u8 *scsicmd = cmd->cmnd;