Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28ddafa5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ntb-4.9' of git://github.com/jonmason/ntb 

Pull NTB fixes from Jon Mason:
 "NTB bug fixes for ntb_hw_intel, ntb_perf, and ntb_pingpong.

  Also, a fixup to use jiffies in schedule_timeout_* call instead of a
  constant"

* tag 'ntb-4.9' of git://github.com/jonmason/ntb:
  ntb_perf: potential info leak in debugfs
  ntb: ntb_hw_intel: init peer_addr in struct intel_ntb_dev
  ntb: make DMA_OUT_RESOURCE_TO HZ independent
  ntb_transport: make DMA_OUT_RESOURCE_TO HZ independent
  NTB: ntb_hw_intel: Fix typo in module parameter descriptions
  ntb_pingpong: Fix db_init parameter description
parents a25f0944 819baf88

drivers/ntb/hw/intel/ntb_hw_intel.c

+9 −6
Original line number Diff line number Diff line
@@ -112,17 +112,17 @@ MODULE_PARM_DESC(xeon_b2b_usd_bar2_addr64, 


module_param_named(xeon_b2b_usd_bar4_addr64,

		   xeon_b2b_usd_addr.bar4_addr64, ullong, 0644);

MODULE_PARM_DESC(xeon_b2b_usd_bar2_addr64,

MODULE_PARM_DESC(xeon_b2b_usd_bar4_addr64,

		 "XEON B2B USD BAR 4 64-bit address");



module_param_named(xeon_b2b_usd_bar4_addr32,

		   xeon_b2b_usd_addr.bar4_addr32, ullong, 0644);

MODULE_PARM_DESC(xeon_b2b_usd_bar2_addr64,

MODULE_PARM_DESC(xeon_b2b_usd_bar4_addr32,

		 "XEON B2B USD split-BAR 4 32-bit address");



module_param_named(xeon_b2b_usd_bar5_addr32,

		   xeon_b2b_usd_addr.bar5_addr32, ullong, 0644);

MODULE_PARM_DESC(xeon_b2b_usd_bar2_addr64,

MODULE_PARM_DESC(xeon_b2b_usd_bar5_addr32,

		 "XEON B2B USD split-BAR 5 32-bit address");



module_param_named(xeon_b2b_dsd_bar2_addr64,
@@ -132,17 +132,17 @@ MODULE_PARM_DESC(xeon_b2b_dsd_bar2_addr64, 


module_param_named(xeon_b2b_dsd_bar4_addr64,

		   xeon_b2b_dsd_addr.bar4_addr64, ullong, 0644);

MODULE_PARM_DESC(xeon_b2b_dsd_bar2_addr64,

MODULE_PARM_DESC(xeon_b2b_dsd_bar4_addr64,

		 "XEON B2B DSD BAR 4 64-bit address");



module_param_named(xeon_b2b_dsd_bar4_addr32,

		   xeon_b2b_dsd_addr.bar4_addr32, ullong, 0644);

MODULE_PARM_DESC(xeon_b2b_dsd_bar2_addr64,

MODULE_PARM_DESC(xeon_b2b_dsd_bar4_addr32,

		 "XEON B2B DSD split-BAR 4 32-bit address");



module_param_named(xeon_b2b_dsd_bar5_addr32,

		   xeon_b2b_dsd_addr.bar5_addr32, ullong, 0644);

MODULE_PARM_DESC(xeon_b2b_dsd_bar2_addr64,

MODULE_PARM_DESC(xeon_b2b_dsd_bar5_addr32,

		 "XEON B2B DSD split-BAR 5 32-bit address");



#ifndef ioread64
@@ -1755,6 +1755,8 @@ static int xeon_setup_b2b_mw(struct intel_ntb_dev *ndev, 
					    XEON_B2B_MIN_SIZE);

		if (!ndev->peer_mmio)

			return -EIO;



		ndev->peer_addr = pci_resource_start(pdev, b2b_bar);

	}



	return 0;
@@ -2019,6 +2021,7 @@ static int intel_ntb_init_pci(struct intel_ntb_dev *ndev, struct pci_dev *pdev) 
		goto err_mmio;

	}

	ndev->peer_mmio = ndev->self_mmio;

	ndev->peer_addr = pci_resource_start(pdev, 0);



	return 0;

drivers/ntb/ntb_transport.c

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ enum { 
#define NTB_QP_DEF_NUM_ENTRIES	100

#define NTB_LINK_DOWN_TIMEOUT	10

#define DMA_RETRIES		20

#define DMA_OUT_RESOURCE_TO	50

#define DMA_OUT_RESOURCE_TO	msecs_to_jiffies(50)



static void ntb_transport_rxc_db(unsigned long data);

static const struct ntb_ctx_ops ntb_transport_ops;

drivers/ntb/test/ntb_perf.c

+4 −4
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
#define MAX_THREADS		32

#define MAX_TEST_SIZE		SZ_1M

#define MAX_SRCS		32

#define DMA_OUT_RESOURCE_TO	50

#define DMA_OUT_RESOURCE_TO	msecs_to_jiffies(50)

#define DMA_RETRIES		20

#define SZ_4G			(1ULL << 32)

#define MAX_SEG_ORDER		20 /* no larger than 1M for kmalloc buffer */
@@ -589,7 +589,7 @@ static ssize_t debugfs_run_read(struct file *filp, char __user *ubuf, 
		return -ENOMEM;



	if (mutex_is_locked(&perf->run_mutex)) {

		out_off = snprintf(buf, 64, "running\n");

		out_off = scnprintf(buf, 64, "running\n");

		goto read_from_buf;

	}
@@ -600,14 +600,14 @@ static ssize_t debugfs_run_read(struct file *filp, char __user *ubuf, 
			break;



		if (pctx->status) {

			out_off += snprintf(buf + out_off, 1024 - out_off,

			out_off += scnprintf(buf + out_off, 1024 - out_off,

					    "%d: error %d\n", i,

					    pctx->status);

			continue;

		}



		rate = div64_u64(pctx->copied, pctx->diff_us);

		out_off += snprintf(buf + out_off, 1024 - out_off,

		out_off += scnprintf(buf + out_off, 1024 - out_off,

			"%d: copied %llu bytes in %llu usecs, %llu MBytes/s\n",

			i, pctx->copied, pctx->diff_us, rate);

	}

drivers/ntb/test/ntb_pingpong.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ MODULE_PARM_DESC(delay_ms, "Milliseconds to delay the response to peer"); 


static unsigned long db_init = 0x7;

module_param(db_init, ulong, 0644);

MODULE_PARM_DESC(delay_ms, "Initial doorbell bits to ring on the peer");

MODULE_PARM_DESC(db_init, "Initial doorbell bits to ring on the peer");



struct pp_ctx {

	struct ntb_dev			*ntb;