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 92/94] NTB: Correct Number of Scratch Pad Registers
    Date
    3.11-stable review patch.  If anyone has any objections, please let me know.

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

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

    commit 87034511519815259e37336f52edf06d114d43b6 upstream.

    The NTB Xeon hardware has 16 scratch pad registers and 16 back-to-back
    scratch pad registers. Correct the #define to represent this and update
    the variable names to reflect their usage.

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

    ---
    drivers/ntb/ntb_hw.c | 2 +-
    drivers/ntb/ntb_regs.h | 4 ++--
    2 files changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/ntb/ntb_hw.c
    +++ b/drivers/ntb/ntb_hw.c
    @@ -547,7 +547,7 @@ static int ntb_xeon_setup(struct ntb_dev
    if (ndev->conn_type == NTB_CONN_B2B) {
    ndev->reg_ofs.sdb = ndev->reg_base + SNB_B2B_DOORBELL_OFFSET;
    ndev->reg_ofs.spad_write = ndev->reg_base + SNB_B2B_SPAD_OFFSET;
    - ndev->limits.max_spads = SNB_MAX_SPADS;
    + ndev->limits.max_spads = SNB_MAX_B2B_SPADS;
    } else {
    ndev->reg_ofs.sdb = ndev->reg_base + SNB_SDOORBELL_OFFSET;
    ndev->reg_ofs.spad_write = ndev->reg_base + SNB_SPAD_OFFSET;
    --- a/drivers/ntb/ntb_regs.h
    +++ b/drivers/ntb/ntb_regs.h
    @@ -53,8 +53,8 @@
    #define NTB_LINK_WIDTH_MASK 0x03f0

    #define SNB_MSIX_CNT 4
    -#define SNB_MAX_SPADS 16
    -#define SNB_MAX_COMPAT_SPADS 8
    +#define SNB_MAX_B2B_SPADS 16
    +#define SNB_MAX_COMPAT_SPADS 16
    /* Reserve the uppermost bit for link interrupt */
    #define SNB_MAX_DB_BITS 15
    #define SNB_DB_BITS_PER_VEC 5



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