adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
* '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
This commit is contained in:
Linus Torvalds 2006-03-31 12:28:01 -08:00
commit d21c356b08
5 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/scsi/ahci.c
View file

@ -293,6 +293,10 @@ static const struct pci_device_id ahci_pci_tbl[] = {
board_ahci }, /* JMicron JMB360 */ board_ahci }, /* JMicron JMB360 */
{ 0x197b, 0x2363, PCI_ANY_ID, PCI_ANY_ID, 0, 0, { 0x197b, 0x2363, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
board_ahci }, /* JMicron JMB363 */ 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 */ { } /* terminate list */
}; };

4
drivers/scsi/ata_piix.c
View file

@ -301,7 +301,7 @@ static struct piix_map_db ich6_map_db = {
.mask = 0x3, .mask = 0x3,
.map = { .map = {
/* PM PS SM SS MAP */ /* PM PS SM SS MAP */
{ P0, P1, P2, P3 }, /* 00b */ { P0, P2, P1, P3 }, /* 00b */
{ IDE, IDE, P1, P3 }, /* 01b */ { IDE, IDE, P1, P3 }, /* 01b */
{ P0, P2, IDE, IDE }, /* 10b */ { P0, P2, IDE, IDE }, /* 10b */
{ RV, RV, RV, RV }, { RV, RV, RV, RV },
@ -312,7 +312,7 @@ static struct piix_map_db ich6m_map_db = {
.mask = 0x3, .mask = 0x3,
.map = { .map = {
/* PM PS SM SS MAP */ /* PM PS SM SS MAP */
{ P0, P1, P2, P3 }, /* 00b */ { P0, P2, RV, RV }, /* 00b */
{ RV, RV, RV, RV }, { RV, RV, RV, RV },
{ P0, P2, IDE, IDE }, /* 10b */ { P0, P2, IDE, IDE }, /* 10b */
{ RV, RV, RV, RV }, { RV, RV, RV, RV },

28
drivers/scsi/libata-core.c
View file

@ -278,7 +278,7 @@ static void ata_unpack_xfermask(unsigned int xfer_mask,
} }
static const struct ata_xfer_ent { static const struct ata_xfer_ent {
unsigned int shift, bits; int shift, bits;
u8 base; u8 base;
} ata_xfer_tbl[] = { } ata_xfer_tbl[] = {
{ ATA_SHIFT_PIO, ATA_BITS_PIO, XFER_PIO_0 }, { 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->private_data = &wait;
qc->complete_fn = ata_qc_complete_internal; qc->complete_fn = ata_qc_complete_internal;
qc->err_mask = ata_qc_issue(qc); ata_qc_issue(qc);
if (qc->err_mask)
ata_qc_complete(qc);
spin_unlock_irqrestore(&ap->host_set->lock, flags); 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: * LOCKING:
* spin_lock_irqsave(host_set lock) * spin_lock_irqsave(host_set lock)
*
* RETURNS:
* Zero on success, AC_ERR_* mask on failure
*/ */
void ata_qc_issue(struct ata_queued_cmd *qc)
unsigned int ata_qc_issue(struct ata_queued_cmd *qc)
{ {
struct ata_port *ap = qc->ap; struct ata_port *ap = qc->ap;
qc->ap->active_tag = qc->tag;
qc->flags |= ATA_QCFLAG_ACTIVE;
if (ata_should_dma_map(qc)) { if (ata_should_dma_map(qc)) {
if (qc->flags & ATA_QCFLAG_SG) { if (qc->flags & ATA_QCFLAG_SG) {
if (ata_sg_setup(qc)) if (ata_sg_setup(qc))
@ -4020,17 +4017,18 @@ unsigned int ata_qc_issue(struct ata_queued_cmd *qc)
ap->ops->qc_prep(qc); ap->ops->qc_prep(qc);
qc->ap->active_tag = qc->tag; qc->err_mask |= ap->ops->qc_issue(qc);
qc->flags |= ATA_QCFLAG_ACTIVE; if (unlikely(qc->err_mask))
goto err;
return ap->ops->qc_issue(qc); return;
sg_err: sg_err:
qc->flags &= ~ATA_QCFLAG_DMAMAP; 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 * ata_qc_issue_prot - issue taskfile to device in proto-dependent manner
* @qc: command to issue to device * @qc: command to issue to device

8
drivers/scsi/libata-scsi.c
View file

@ -1431,9 +1431,7 @@ static void ata_scsi_translate(struct ata_port *ap, struct ata_device *dev,
goto early_finish; goto early_finish;
/* select device, send command to hardware */ /* select device, send command to hardware */
qc->err_mask = ata_qc_issue(qc); ata_qc_issue(qc);
if (qc->err_mask)
ata_qc_complete(qc);
VPRINTK("EXIT\n"); VPRINTK("EXIT\n");
return; return;
@ -2199,9 +2197,7 @@ static void atapi_request_sense(struct ata_queued_cmd *qc)
qc->complete_fn = atapi_sense_complete; qc->complete_fn = atapi_sense_complete;
qc->err_mask = ata_qc_issue(qc); ata_qc_issue(qc);
if (qc->err_mask)
ata_qc_complete(qc);
DPRINTK("EXIT\n"); DPRINTK("EXIT\n");
} }

2
drivers/scsi/libata.h
View file

@ -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 int ata_rwcmd_protocol(struct ata_queued_cmd *qc);
extern void ata_port_flush_task(struct ata_port *ap); extern void ata_port_flush_task(struct ata_port *ap);
extern void ata_qc_free(struct ata_queued_cmd *qc); 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 int ata_check_atapi_dma(struct ata_queued_cmd *qc);
extern void ata_dev_select(struct ata_port *ap, unsigned int device, extern void ata_dev_select(struct ata_port *ap, unsigned int device,
unsigned int wait, unsigned int can_sleep); unsigned int wait, unsigned int can_sleep);