diff options
| author | Jon Mason <jon.mason@intel.com> | 2013-07-15 15:33:18 -0700 |
|---|---|---|
| committer | Jon Mason <jon.mason@intel.com> | 2013-09-05 11:07:59 -0700 |
| commit | b1ef004303fba92cd28ed32dd3caed3438238f76 (patch) | |
| tree | 78de37a133b409d7a978c386e999bb6060ad7105 /drivers | |
| parent | ed6c24eda97b6bdcd013dbd91cc5c8b02de507e9 (diff) | |
| download | op-kernel-dev-b1ef004303fba92cd28ed32dd3caed3438238f76.zip op-kernel-dev-b1ef004303fba92cd28ed32dd3caed3438238f76.tar.gz | |
NTB: Remove References of non-B2B BWD HW
NTB-RP is not a supported configuration on BWD hardware. Remove the
code attempting to set it up.
Signed-off-by: Jon Mason <jon.mason@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ntb/ntb_hw.c | 16 | ||||
| -rw-r--r-- | drivers/ntb/ntb_regs.h | 1 |
2 files changed, 4 insertions, 13 deletions
diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c index 2f3ff73..69cd834 100644 --- a/drivers/ntb/ntb_hw.c +++ b/drivers/ntb/ntb_hw.c @@ -842,7 +842,7 @@ static int ntb_bwd_setup(struct ntb_device *ndev) break; case NTB_CONN_RP: default: - dev_err(&ndev->pdev->dev, "Only B2B supported at this time\n"); + dev_err(&ndev->pdev->dev, "Unsupported NTB configuration\n"); return -EINVAL; } @@ -859,24 +859,16 @@ static int ntb_bwd_setup(struct ntb_device *ndev) ndev->reg_ofs.ldb = ndev->reg_base + BWD_PDOORBELL_OFFSET; ndev->reg_ofs.ldb_mask = ndev->reg_base + BWD_PDBMSK_OFFSET; + ndev->reg_ofs.rdb = ndev->reg_base + BWD_B2B_DOORBELL_OFFSET; ndev->reg_ofs.bar2_xlat = ndev->reg_base + BWD_SBAR2XLAT_OFFSET; ndev->reg_ofs.bar4_xlat = ndev->reg_base + BWD_SBAR4XLAT_OFFSET; ndev->reg_ofs.lnk_cntl = ndev->reg_base + BWD_NTBCNTL_OFFSET; ndev->reg_ofs.lnk_stat = ndev->reg_base + BWD_LINK_STATUS_OFFSET; ndev->reg_ofs.spad_read = ndev->reg_base + BWD_SPAD_OFFSET; + ndev->reg_ofs.spad_write = ndev->reg_base + BWD_B2B_SPAD_OFFSET; ndev->reg_ofs.spci_cmd = ndev->reg_base + BWD_PCICMD_OFFSET; - - if (ndev->conn_type == NTB_CONN_B2B) { - ndev->reg_ofs.rdb = ndev->reg_base + BWD_B2B_DOORBELL_OFFSET; - ndev->reg_ofs.spad_write = ndev->reg_base + BWD_B2B_SPAD_OFFSET; - ndev->limits.max_spads = BWD_MAX_SPADS; - } else { - ndev->reg_ofs.rdb = ndev->reg_base + BWD_PDOORBELL_OFFSET; - ndev->reg_ofs.spad_write = ndev->reg_base + BWD_SPAD_OFFSET; - ndev->limits.max_spads = BWD_MAX_COMPAT_SPADS; - } - ndev->limits.max_mw = BWD_MAX_MW; + ndev->limits.max_spads = BWD_MAX_SPADS; ndev->limits.max_db_bits = BWD_MAX_DB_BITS; ndev->limits.msix_cnt = BWD_MSIX_CNT; ndev->bits_per_vector = BWD_DB_BITS_PER_VEC; diff --git a/drivers/ntb/ntb_regs.h b/drivers/ntb/ntb_regs.h index b4f4604..aa4bdd3 100644 --- a/drivers/ntb/ntb_regs.h +++ b/drivers/ntb/ntb_regs.h @@ -104,7 +104,6 @@ #define BWD_MSIX_CNT 34 #define BWD_MAX_SPADS 16 -#define BWD_MAX_COMPAT_SPADS 16 #define BWD_MAX_DB_BITS 34 #define BWD_DB_BITS_PER_VEC 1 #define BWD_MAX_MW 2 |
