lkml.org 
[lkml]   [2006]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] ahci: get JMicron JMB360 working

    I'll be sending this upstream sooner rather than later, since part of
    this is a needed bugfix. This is also a minor milestone: the first
    non-Intel AHCI implementation is working with the AHCI driver. AHCI is
    a nice SATA controller interface, and it's good to see other vendors
    using it. VIA is using it as well, and I hope to integrate a patch for
    VIA AHCI SATA support soon.

    This patch, against latest 2.6.16-rc-git, adds support for JMicron and
    fixes some code that should be Intel-only, but was being executed for
    all vendors.


    diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
    index 19bd346..2fffc7b 100644
    --- a/drivers/scsi/ahci.c
    +++ b/drivers/scsi/ahci.c
    @@ -286,6 +286,8 @@ static const struct pci_device_id ahci_p
    board_ahci }, /* ICH8M */
    { PCI_VENDOR_ID_INTEL, 0x282a, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
    board_ahci }, /* ICH8M */
    + { 0x197b, 0x2360, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
    + board_ahci }, /* JMicron JMB360 */
    { } /* terminate list */
    };

    @@ -802,7 +804,6 @@ static int ahci_host_init(struct ata_pro
    struct pci_dev *pdev = to_pci_dev(probe_ent->dev);
    void __iomem *mmio = probe_ent->mmio_base;
    u32 tmp, cap_save;
    - u16 tmp16;
    unsigned int i, j, using_dac;
    int rc;
    void __iomem *port_mmio;
    @@ -836,9 +837,13 @@ static int ahci_host_init(struct ata_pro
    writel(0xf, mmio + HOST_PORTS_IMPL);
    (void) readl(mmio + HOST_PORTS_IMPL); /* flush */

    - pci_read_config_word(pdev, 0x92, &tmp16);
    - tmp16 |= 0xf;
    - pci_write_config_word(pdev, 0x92, tmp16);
    + if (pdev->vendor == PCI_VENDOR_ID_INTEL) {
    + u16 tmp16;
    +
    + pci_read_config_word(pdev, 0x92, &tmp16);
    + tmp16 |= 0xf;
    + pci_write_config_word(pdev, 0x92, tmp16);
    + }

    hpriv->cap = readl(mmio + HOST_CAP);
    hpriv->port_map = readl(mmio + HOST_PORTS_IMPL);
    @@ -1082,6 +1087,10 @@ static int ahci_init_one (struct pci_dev
    if (have_msi)
    hpriv->flags |= AHCI_FLAG_MSI;

    + /* JMicron-specific fixup: make sure we're in AHCI mode */
    + if (pdev->vendor == 0x197b)
    + pci_write_config_byte(pdev, 0x41, 0xa1);
    +
    /* initialize adapter */
    rc = ahci_host_init(probe_ent);
    if (rc)
    -
    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: 2006-01-29 06:07    [W:0.024 / U:4.132 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site