From e8a0c95d73a1fd5e2303e14cb83ab63347c27857 Mon Sep 17 00:00:00 2001 From: Divy Le Ray Date: Sat, 1 Dec 2007 15:57:17 -0800 Subject: [PATCH] --- yaml --- r: 74572 b: refs/heads/master c: 4c14fe91d0209897fda4dea0102c8cd2e1ddd860 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/ahci.c | 4 ---- trunk/drivers/ata/pata_amd.c | 5 ++--- trunk/drivers/ata/pata_via.c | 4 ++-- trunk/drivers/ata/sata_mv.c | 9 --------- trunk/drivers/ata/sata_nv.c | 32 +++++++++--------------------- trunk/drivers/net/chelsio/cxgb2.c | 0 trunk/drivers/net/chelsio/pm3393.c | 0 trunk/drivers/net/chelsio/sge.c | 0 trunk/drivers/net/chelsio/sge.h | 0 10 files changed, 14 insertions(+), 42 deletions(-) mode change 100755 => 100644 trunk/drivers/net/chelsio/cxgb2.c mode change 100755 => 100644 trunk/drivers/net/chelsio/pm3393.c mode change 100755 => 100644 trunk/drivers/net/chelsio/sge.c mode change 100755 => 100644 trunk/drivers/net/chelsio/sge.h diff --git a/[refs] b/[refs] index 99f9a3aa567d..0ff742caad93 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 943547abdfe9b4e27e36a25987909619908dffbf +refs/heads/master: 4c14fe91d0209897fda4dea0102c8cd2e1ddd860 diff --git a/trunk/drivers/ata/ahci.c b/trunk/drivers/ata/ahci.c index 4688dbf2d111..ed9b407e42d4 100644 --- a/trunk/drivers/ata/ahci.c +++ b/trunk/drivers/ata/ahci.c @@ -536,10 +536,6 @@ static const struct pci_device_id ahci_pci_tbl[] = { { PCI_VDEVICE(NVIDIA, 0x0ad9), board_ahci }, /* MCP77 */ { PCI_VDEVICE(NVIDIA, 0x0ada), board_ahci }, /* MCP77 */ { PCI_VDEVICE(NVIDIA, 0x0adb), board_ahci }, /* MCP77 */ - { PCI_VDEVICE(NVIDIA, 0x0ab4), board_ahci }, /* MCP79 */ - { PCI_VDEVICE(NVIDIA, 0x0ab5), board_ahci }, /* MCP79 */ - { PCI_VDEVICE(NVIDIA, 0x0ab6), board_ahci }, /* MCP79 */ - { PCI_VDEVICE(NVIDIA, 0x0ab7), board_ahci }, /* MCP79 */ { PCI_VDEVICE(NVIDIA, 0x0ab8), board_ahci }, /* MCP79 */ { PCI_VDEVICE(NVIDIA, 0x0ab9), board_ahci }, /* MCP79 */ { PCI_VDEVICE(NVIDIA, 0x0aba), board_ahci }, /* MCP79 */ diff --git a/trunk/drivers/ata/pata_amd.c b/trunk/drivers/ata/pata_amd.c index 3cc27b514654..c5779ad4abca 100644 --- a/trunk/drivers/ata/pata_amd.c +++ b/trunk/drivers/ata/pata_amd.c @@ -25,7 +25,7 @@ #include #define DRV_NAME "pata_amd" -#define DRV_VERSION "0.3.10" +#define DRV_VERSION "0.3.9" /** * timing_setup - shared timing computation and load @@ -115,8 +115,7 @@ static void timing_setup(struct ata_port *ap, struct ata_device *adev, int offse } /* UDMA timing */ - if (at.udma) - pci_write_config_byte(pdev, offset + 0x10 + (3 - dn), t); + pci_write_config_byte(pdev, offset + 0x10 + (3 - dn), t); } /** diff --git a/trunk/drivers/ata/pata_via.c b/trunk/drivers/ata/pata_via.c index 453d72bf2598..a4175fbdd170 100644 --- a/trunk/drivers/ata/pata_via.c +++ b/trunk/drivers/ata/pata_via.c @@ -63,7 +63,7 @@ #include #define DRV_NAME "pata_via" -#define DRV_VERSION "0.3.3" +#define DRV_VERSION "0.3.2" /* * The following comes directly from Vojtech Pavlik's ide/pci/via82cxxx @@ -296,7 +296,7 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo } /* Set UDMA unless device is not UDMA capable */ - if (udma_type && t.udma) { + if (udma_type) { u8 cable80_status; /* Get 80-wire cable detection bit */ diff --git a/trunk/drivers/ata/sata_mv.c b/trunk/drivers/ata/sata_mv.c index fe0105d35bae..8d864e5e97ed 100644 --- a/trunk/drivers/ata/sata_mv.c +++ b/trunk/drivers/ata/sata_mv.c @@ -2503,15 +2503,6 @@ static int mv_chip_id(struct ata_host *host, unsigned int board_idx) case chip_7042: hp_flags |= MV_HP_PCIE; - if (pdev->vendor == PCI_VENDOR_ID_TTI && - (pdev->device == 0x2300 || pdev->device == 0x2310)) - { - printk(KERN_WARNING "sata_mv: Highpoint RocketRAID BIOS" - " will CORRUPT DATA on attached drives when" - " configured as \"Legacy\". BEWARE!\n"); - printk(KERN_WARNING "sata_mv: Use BIOS \"JBOD\" volumes" - " instead for safety.\n"); - } case chip_6042: hpriv->ops = &mv6xxx_ops; hp_flags |= MV_HP_GEN_IIE; diff --git a/trunk/drivers/ata/sata_nv.c b/trunk/drivers/ata/sata_nv.c index ed5dc7cb50cd..44f9e5d9e362 100644 --- a/trunk/drivers/ata/sata_nv.c +++ b/trunk/drivers/ata/sata_nv.c @@ -791,13 +791,11 @@ static int nv_adma_check_atapi_dma(struct ata_queued_cmd *qc) static void nv_adma_tf_read(struct ata_port *ap, struct ata_taskfile *tf) { - /* Other than when internal or pass-through commands are executed, - the only time this function will be called in ADMA mode will be - if a command fails. In the failure case we don't care about going - into register mode with ADMA commands pending, as the commands will - all shortly be aborted anyway. We assume that NCQ commands are not - issued via passthrough, which is the only way that switching into - ADMA mode could abort outstanding commands. */ + /* Since commands where a result TF is requested are not + executed in ADMA mode, the only time this function will be called + in ADMA mode will be if a command fails. In this case we + don't care about going into register mode with ADMA commands + pending, as the commands will all shortly be aborted anyway. */ nv_adma_register_mode(ap); ata_tf_read(ap, tf); @@ -1361,9 +1359,11 @@ static int nv_adma_use_reg_mode(struct ata_queued_cmd *qc) struct nv_adma_port_priv *pp = qc->ap->private_data; /* ADMA engine can only be used for non-ATAPI DMA commands, - or interrupt-driven no-data commands. */ + or interrupt-driven no-data commands, where a result taskfile + is not required. */ if ((pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) || - (qc->tf.flags & ATA_TFLAG_POLLING)) + (qc->tf.flags & ATA_TFLAG_POLLING) || + (qc->flags & ATA_QCFLAG_RESULT_TF)) return 1; if ((qc->flags & ATA_QCFLAG_DMAMAP) || @@ -1381,8 +1381,6 @@ static void nv_adma_qc_prep(struct ata_queued_cmd *qc) NV_CPB_CTL_IEN; if (nv_adma_use_reg_mode(qc)) { - BUG_ON(!(pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) && - (qc->flags & ATA_QCFLAG_DMAMAP)); nv_adma_register_mode(qc->ap); ata_qc_prep(qc); return; @@ -1427,21 +1425,9 @@ static unsigned int nv_adma_qc_issue(struct ata_queued_cmd *qc) VPRINTK("ENTER\n"); - /* We can't handle result taskfile with NCQ commands, since - retrieving the taskfile switches us out of ADMA mode and would abort - existing commands. */ - if (unlikely(qc->tf.protocol == ATA_PROT_NCQ && - (qc->flags & ATA_QCFLAG_RESULT_TF))) { - ata_dev_printk(qc->dev, KERN_ERR, - "NCQ w/ RESULT_TF not allowed\n"); - return AC_ERR_SYSTEM; - } - if (nv_adma_use_reg_mode(qc)) { /* use ATA register mode */ VPRINTK("using ATA register mode: 0x%lx\n", qc->flags); - BUG_ON(!(pp->flags & NV_ADMA_ATAPI_SETUP_COMPLETE) && - (qc->flags & ATA_QCFLAG_DMAMAP)); nv_adma_register_mode(qc->ap); return ata_qc_issue_prot(qc); } else diff --git a/trunk/drivers/net/chelsio/cxgb2.c b/trunk/drivers/net/chelsio/cxgb2.c old mode 100755 new mode 100644 diff --git a/trunk/drivers/net/chelsio/pm3393.c b/trunk/drivers/net/chelsio/pm3393.c old mode 100755 new mode 100644 diff --git a/trunk/drivers/net/chelsio/sge.c b/trunk/drivers/net/chelsio/sge.c old mode 100755 new mode 100644 diff --git a/trunk/drivers/net/chelsio/sge.h b/trunk/drivers/net/chelsio/sge.h old mode 100755 new mode 100644