lkml.org 
[lkml]   [2014]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 02/12] staging: comedi: 8255_pci: fix for newer PCI-DIO48H
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ian Abbott <abbotti@mev.co.uk>

    commit 0283f7a100882684ad32b768f9f1ad81658a0b92 upstream.

    At some point, Measurement Computing / ComputerBoards redesigned the
    PCI-DIO48H to use a PLX PCI interface chip instead of an AMCC chip.
    This meant they had to put their hardware registers in the PCI BAR 2
    region instead of PCI BAR 1. Unfortunately, they kept the same PCI
    device ID for the new design. This means the driver recognizes the
    newer cards, but doesn't work (and is likely to screw up the local
    configuration registers of the PLX chip) because it's using the wrong
    region.

    Since the PCI subvendor and subdevice IDs were both zero on the old
    design, but are the same as the vendor and device on the new design, we
    can tell the old design and new design apart easily enough. Split the
    existing entry for the PCI-DIO48H in `pci_8255_boards[]` into two new
    entries, referenced by different entries in the PCI device ID table
    `pci_8255_pci_table[]`. Use the same board name for both entries.

    Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
    Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/staging/comedi/drivers/cb_pcidio.c | 21 ++++++++-------------
    1 file changed, 8 insertions(+), 13 deletions(-)

    --- a/drivers/staging/comedi/drivers/cb_pcidio.c
    +++ b/drivers/staging/comedi/drivers/cb_pcidio.c
    @@ -56,10 +56,6 @@ struct pcidio_board {
    const char *name; /* name of the board */
    int dev_id;
    int n_8255; /* number of 8255 chips on board */
    -
    - /* indices of base address regions */
    - int pcicontroler_badrindex;
    - int dioregs_badrindex;
    };

    static const struct pcidio_board pcidio_boards[] = {
    @@ -67,22 +63,16 @@ static const struct pcidio_board pcidio_
    .name = "pci-dio24",
    .dev_id = 0x0028,
    .n_8255 = 1,
    - .pcicontroler_badrindex = 1,
    - .dioregs_badrindex = 2,
    },
    {
    .name = "pci-dio24h",
    .dev_id = 0x0014,
    .n_8255 = 1,
    - .pcicontroler_badrindex = 1,
    - .dioregs_badrindex = 2,
    },
    {
    .name = "pci-dio48h",
    .dev_id = 0x000b,
    .n_8255 = 2,
    - .pcicontroler_badrindex = 0,
    - .dioregs_badrindex = 1,
    },
    };

    @@ -239,10 +229,15 @@ found:
    if (comedi_pci_enable(pcidev, thisboard->name))
    return -EIO;

    - devpriv->dio_reg_base
    - =
    + /*
    + * Use PCI BAR 2 region if non-zero length, else use PCI BAR 1 region.
    + * PCI BAR 1 is only used for older PCI-DIO48H boards. At some point
    + * the PCI-DIO48H was redesigned to use the same PCI interface chip
    + * (and same PCI BAR region) as the other boards.
    + */
    + devpriv->dio_reg_base =
    pci_resource_start(devpriv->pci_dev,
    - pcidio_boards[index].dioregs_badrindex);
    + (pci_resource_len(pcidev, 2) ? 2 : 1));

    /*
    * Allocate the subdevice structures. alloc_subdevice() is a



    \
     
     \ /
      Last update: 2014-01-26 05:01    [W:6.361 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site