lkml.org 
[lkml]   [2013]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 93/94] NTB: Correct USD/DSD Identification
    Date
    3.11-stable review patch.  If anyone has any objections, please let me know.

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

    From: Jon Mason <jon.mason@intel.com>

    commit b6750cfe0710a14fd147ba27fddbecae8ba88c77 upstream.

    Due to ambiguous documentation, the USD/DSD identification is backward
    when compared to the setting in BIOS. Correct the bits to match the
    BIOS setting.

    Signed-off-by: Jon Mason <jon.mason@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/ntb/ntb_hw.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    --- a/drivers/ntb/ntb_hw.c
    +++ b/drivers/ntb/ntb_hw.c
    @@ -531,9 +531,9 @@ static int ntb_xeon_setup(struct ntb_dev
    }

    if (val & SNB_PPD_DEV_TYPE)
    - ndev->dev_type = NTB_DEV_DSD;
    - else
    ndev->dev_type = NTB_DEV_USD;
    + else
    + ndev->dev_type = NTB_DEV_DSD;

    ndev->reg_ofs.pdb = ndev->reg_base + SNB_PDOORBELL_OFFSET;
    ndev->reg_ofs.pdb_mask = ndev->reg_base + SNB_PDBMSK_OFFSET;
    @@ -647,6 +647,9 @@ static int ntb_device_setup(struct ntb_d
    if (rc)
    return rc;

    + dev_info(&ndev->pdev->dev, "Device Type = %s\n",
    + ndev->dev_type == NTB_DEV_USD ? "USD/DSP" : "DSD/USP");
    +
    /* Enable Bus Master and Memory Space on the secondary side */
    writew(PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER, ndev->reg_ofs.spci_cmd);




    \
     
     \ /
      Last update: 2013-11-09 08:41    [W:6.204 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site