lkml.org 
[lkml]   [2007]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/5] via82cxxx: backport short cables support from pata_via.c
    Date

    Backport short cables support from pata_via.c.

    This patch should allow UDMA > 2 modes on Acer Ferrari 3400.

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    drivers/ide/pci/via82cxxx.c | 48 +++++++++++++++++++++++++++++++++++++-------
    1 file changed, 41 insertions(+), 7 deletions(-)

    Index: b/drivers/ide/pci/via82cxxx.c
    ===================================================================
    --- a/drivers/ide/pci/via82cxxx.c
    +++ b/drivers/ide/pci/via82cxxx.c
    @@ -1,6 +1,6 @@
    /*
    *
    - * Version 3.40
    + * Version 3.45
    *
    * VIA IDE driver for Linux. Supported southbridges:
    *
    @@ -34,6 +34,8 @@
    #include <linux/pci.h>
    #include <linux/init.h>
    #include <linux/ide.h>
    +#include <linux/dmi.h>
    +
    #include <asm/io.h>

    #ifdef CONFIG_PPC_CHRP
    @@ -415,6 +417,42 @@ static unsigned int __devinit init_chips
    return 0;
    }

    +/*
    + * Cable special cases
    + */
    +
    +static struct dmi_system_id cable_dmi_table[] = {
    + {
    + .ident = "Acer Ferrari 3400",
    + .matches = {
    + DMI_MATCH(DMI_BOARD_VENDOR, "Acer,Inc."),
    + DMI_MATCH(DMI_BOARD_NAME, "Ferrari 3400"),
    + },
    + },
    + { }
    +};
    +
    +static int via_cable_override(void)
    +{
    + /* Systems by DMI */
    + if (dmi_check_system(cable_dmi_table))
    + return 1;
    + return 0;
    +}
    +
    +static u8 __devinit via82cxxx_cable_detect(ide_hwif_t *hwif)
    +{
    + struct via82cxxx_dev *vdev = pci_get_drvdata(hwif->pci_dev);
    +
    + if (via_cable_override())
    + return ATA_CBL_PATA40_SHORT;
    +
    + if ((vdev->via_80w >> hwif->channel) & 1)
    + return ATA_CBL_PATA80;
    + else
    + return ATA_CBL_PATA40;
    +}
    +
    static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
    {
    struct via82cxxx_dev *vdev = pci_get_drvdata(hwif->pci_dev);
    @@ -448,12 +486,8 @@ static void __devinit init_hwif_via82cxx
    hwif->mwdma_mask = 0x07;
    hwif->swdma_mask = 0x07;

    - if (hwif->cbl != ATA_CBL_PATA40_SHORT) {
    - if ((vdev->via_80w >> hwif->channel) & 1)
    - hwif->cbl = ATA_CBL_PATA80;
    - else
    - hwif->cbl = ATA_CBL_PATA40;
    - }
    + if (hwif->cbl != ATA_CBL_PATA40_SHORT)
    + hwif->cbl = via82cxxx_cable_detect(hwif);

    hwif->ide_dma_check = &via82cxxx_ide_dma_check;
    if (!noautodma)
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-06-10 15:49    [W:0.025 / U:0.060 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site