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

Commit d21c356b 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:
  [PATCH] libata: fix ata_xfer_tbl termination
  [PATCH] libata: make ata_qc_issue complete failed qcs
  [PATCH] libata: fix ata_qc_issue failure path
  [PATCH] ata_piix: fix ich6/m_map_db
  [libata] ahci: add ATI SB600 PCI IDs
parents 108b42b4 be9a50c8

drivers/scsi/ahci.c

+4 −0
Original line number Diff line number Diff line
@@ -293,6 +293,10 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	  board_ahci }, /* JMicron JMB360 */

	{ 0x197b, 0x2363, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* JMicron JMB363 */

	{ PCI_VENDOR_ID_ATI, 0x4380, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ATI SB600 non-raid */

	{ PCI_VENDOR_ID_ATI, 0x4381, PCI_ANY_ID, PCI_ANY_ID, 0, 0,

	  board_ahci }, /* ATI SB600 raid */

	{ }	/* terminate list */

};

drivers/scsi/ata_piix.c

+2 −2
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ static struct piix_map_db ich6_map_db = { 
	.mask = 0x3,

	.map = {

		/* PM   PS   SM   SS       MAP */

		{  P0,  P1,  P2,  P3 }, /* 00b */

		{  P0,  P2,  P1,  P3 }, /* 00b */

		{ IDE, IDE,  P1,  P3 }, /* 01b */

		{  P0,  P2, IDE, IDE }, /* 10b */

		{  RV,  RV,  RV,  RV },
@@ -312,7 +312,7 @@ static struct piix_map_db ich6m_map_db = { 
	.mask = 0x3,

	.map = {

		/* PM   PS   SM   SS       MAP */

		{  P0,  P1,  P2,  P3 }, /* 00b */

		{  P0,  P2,  RV,  RV }, /* 00b */

		{  RV,  RV,  RV,  RV },

		{  P0,  P2, IDE, IDE }, /* 10b */

		{  RV,  RV,  RV,  RV },

drivers/scsi/libata-core.c

+13 −15
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ static void ata_unpack_xfermask(unsigned int xfer_mask, 
}



static const struct ata_xfer_ent {

	unsigned int shift, bits;

	int shift, bits;

	u8 base;

} ata_xfer_tbl[] = {

	{ ATA_SHIFT_PIO, ATA_BITS_PIO, XFER_PIO_0 },
@@ -989,9 +989,7 @@ ata_exec_internal(struct ata_port *ap, struct ata_device *dev, 
	qc->private_data = &wait;

	qc->complete_fn = ata_qc_complete_internal;



	qc->err_mask = ata_qc_issue(qc);

	if (qc->err_mask)

		ata_qc_complete(qc);

	ata_qc_issue(qc);



	spin_unlock_irqrestore(&ap->host_set->lock, flags);
@@ -3997,15 +3995,14 @@ static inline int ata_should_dma_map(struct ata_queued_cmd *qc) 
 *

 *	LOCKING:

 *	spin_lock_irqsave(host_set lock)

 *

 *	RETURNS:

 *	Zero on success, AC_ERR_* mask on failure

 */



unsigned int ata_qc_issue(struct ata_queued_cmd *qc)

void ata_qc_issue(struct ata_queued_cmd *qc)

{

	struct ata_port *ap = qc->ap;



	qc->ap->active_tag = qc->tag;

	qc->flags |= ATA_QCFLAG_ACTIVE;



	if (ata_should_dma_map(qc)) {

		if (qc->flags & ATA_QCFLAG_SG) {

			if (ata_sg_setup(qc))
@@ -4020,17 +4017,18 @@ unsigned int ata_qc_issue(struct ata_queued_cmd *qc) 


	ap->ops->qc_prep(qc);



	qc->ap->active_tag = qc->tag;

	qc->flags |= ATA_QCFLAG_ACTIVE;



	return ap->ops->qc_issue(qc);

	qc->err_mask |= ap->ops->qc_issue(qc);

	if (unlikely(qc->err_mask))

		goto err;

	return;



sg_err:

	qc->flags &= ~ATA_QCFLAG_DMAMAP;

	return AC_ERR_SYSTEM;

	qc->err_mask |= AC_ERR_SYSTEM;

err:

	ata_qc_complete(qc);

}





/**

 *	ata_qc_issue_prot - issue taskfile to device in proto-dependent manner

 *	@qc: command to issue to device

drivers/scsi/libata-scsi.c

+2 −6
Original line number Diff line number Diff line
@@ -1431,9 +1431,7 @@ static void ata_scsi_translate(struct ata_port *ap, struct ata_device *dev, 
		goto early_finish;



	/* select device, send command to hardware */

	qc->err_mask = ata_qc_issue(qc);

	if (qc->err_mask)

		ata_qc_complete(qc);

	ata_qc_issue(qc);



	VPRINTK("EXIT\n");

	return;
@@ -2199,9 +2197,7 @@ static void atapi_request_sense(struct ata_queued_cmd *qc) 


	qc->complete_fn = atapi_sense_complete;



	qc->err_mask = ata_qc_issue(qc);

	if (qc->err_mask)

		ata_qc_complete(qc);

	ata_qc_issue(qc);



	DPRINTK("EXIT\n");

}

drivers/scsi/libata.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap, 
extern int ata_rwcmd_protocol(struct ata_queued_cmd *qc);

extern void ata_port_flush_task(struct ata_port *ap);

extern void ata_qc_free(struct ata_queued_cmd *qc);

extern unsigned int ata_qc_issue(struct ata_queued_cmd *qc);

extern void ata_qc_issue(struct ata_queued_cmd *qc);

extern int ata_check_atapi_dma(struct ata_queued_cmd *qc);

extern void ata_dev_select(struct ata_port *ap, unsigned int device,

                           unsigned int wait, unsigned int can_sleep);