lkml.org 
[lkml]   [2008]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3/8] atiixp/cs5535/scc_pata: fix "idex=ata66" parameter handling
    Don't override the cable type if the "idex=ata66" parameter was used.

    While at it:

    * atiixp.c: factor out cable detection to atiixp_cable_detect() from
    init_hwif_atiixp().

    * cs5535.c: pass 'ide_hwif_t *hwif' instead of 'struct pci_dev *dev' to
    cs5535_cable_detect().

    * scc_pata.c: factor out cable detection to scc_cable_detect() from
    init_hwif_scc() and remove incorrect comment.

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    +16 bytes
    drivers/ide/pci/atiixp.c | 24 +++++++++++++++---------
    drivers/ide/pci/cs5535.c | 8 ++++----
    drivers/ide/pci/scc_pata.c | 9 +++++++--
    3 files changed, 26 insertions(+), 15 deletions(-)

    Index: b/drivers/ide/pci/atiixp.c
    ===================================================================
    --- a/drivers/ide/pci/atiixp.c
    +++ b/drivers/ide/pci/atiixp.c
    @@ -121,6 +121,19 @@ static void atiixp_set_dma_mode(ide_driv
    spin_unlock_irqrestore(&atiixp_lock, flags);
    }

    +static u8 __devinit atiixp_cable_detect(ide_hwif_t *hwif)
    +{
    + struct pci_dev *pdev = to_pci_dev(hwif->dev);
    + u8 udma_mode = 0, ch = hwif->channel;
    +
    + pci_read_config_byte(pdev, ATIIXP_IDE_UDMA_MODE + ch, &udma_mode);
    +
    + if ((udma_mode & 0x07) >= 0x04 || (udma_mode & 0x70) >= 0x40)
    + return ATA_CBL_PATA80;
    + else
    + return ATA_CBL_PATA40;
    +}
    +
    /**
    * init_hwif_atiixp - fill in the hwif for the ATIIXP
    * @hwif: IDE interface
    @@ -131,21 +144,14 @@ static void atiixp_set_dma_mode(ide_driv

    static void __devinit init_hwif_atiixp(ide_hwif_t *hwif)
    {
    - struct pci_dev *pdev = to_pci_dev(hwif->dev);
    - u8 udma_mode = 0, ch = hwif->channel;
    -
    hwif->set_pio_mode = &atiixp_set_pio_mode;
    hwif->set_dma_mode = &atiixp_set_dma_mode;

    if (!hwif->dma_base)
    return;

    - pci_read_config_byte(pdev, ATIIXP_IDE_UDMA_MODE + ch, &udma_mode);
    -
    - if ((udma_mode & 0x07) >= 0x04 || (udma_mode & 0x70) >= 0x40)
    - hwif->cbl = ATA_CBL_PATA80;
    - else
    - hwif->cbl = ATA_CBL_PATA40;
    + if (hwif->cbl != ATA_CBL_PATA40_SHORT)
    + hwif->cbl = atiixp_cable_detect(hwif);
    }

    static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
    Index: b/drivers/ide/pci/cs5535.c
    ===================================================================
    --- a/drivers/ide/pci/cs5535.c
    +++ b/drivers/ide/pci/cs5535.c
    @@ -155,8 +155,9 @@ static void cs5535_set_pio_mode(ide_driv
    cs5535_set_speed(drive, XFER_PIO_0 + pio);
    }

    -static u8 __devinit cs5535_cable_detect(struct pci_dev *dev)
    +static u8 __devinit cs5535_cable_detect(ide_hwif_t *hwif)
    {
    + struct pci_dev *dev = to_pci_dev(hwif->dev);
    u8 bit;

    /* if a 80 wire cable was detected */
    @@ -175,15 +176,14 @@ static u8 __devinit cs5535_cable_detect(
    */
    static void __devinit init_hwif_cs5535(ide_hwif_t *hwif)
    {
    - struct pci_dev *dev = to_pci_dev(hwif->dev);
    -
    hwif->set_pio_mode = &cs5535_set_pio_mode;
    hwif->set_dma_mode = &cs5535_set_dma_mode;

    if (hwif->dma_base == 0)
    return;

    - hwif->cbl = cs5535_cable_detect(dev);
    + if (hwif->cbl != ATA_CBL_PATA40_SHORT)
    + hwif->cbl = cs5535_cable_detect(hwif);
    }

    static const struct ide_port_info cs5535_chipset __devinitdata = {
    Index: b/drivers/ide/pci/scc_pata.c
    ===================================================================
    --- a/drivers/ide/pci/scc_pata.c
    +++ b/drivers/ide/pci/scc_pata.c
    @@ -644,6 +644,11 @@ static void __devinit init_iops_scc(ide_
    init_mmio_iops_scc(hwif);
    }

    +static u8 __devinit scc_cable_detect(ide_hwif_t *hwif)
    +{
    + return ATA_CBL_PATA80;
    +}
    +
    /**
    * init_hwif_scc - set up hwif
    * @hwif: interface to set up
    @@ -678,8 +683,8 @@ static void __devinit init_hwif_scc(ide_
    else
    hwif->ultra_mask = ATA_UDMA5; /* 100MHz */

    - /* we support 80c cable only. */
    - hwif->cbl = ATA_CBL_PATA80;
    + if (hwif->cbl != ATA_CBL_PATA40_SHORT)
    + hwif->cbl = scc_cable_detect(hwif);
    }

    #define DECLARE_SCC_DEV(name_str) \

    \
     
     \ /
      Last update: 2008-01-06 17:55    [W:0.028 / U:3.372 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site