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

Commit 34fdccea authored by Brice Goglin's avatar Brice Goglin Committed by Jeff Garzik
Browse files

myri10ge: use pci_map_page to prepare the dmatest buffer 



Allocate a specific page and use pci_map_page for dma test instead
of relying on another existing buffer.

Signed-off-by: default avatarBrice Goglin <brice@myri.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 355c7265

drivers/net/myri10ge/myri10ge.c

+16 −6
Original line number Diff line number Diff line
@@ -717,6 +717,8 @@ static int myri10ge_reset(struct myri10ge_priv *mgp) 
	int status;

	size_t bytes;

	u32 len;

	struct page *dmatest_page;

	dma_addr_t dmatest_bus;



	/* try to send a reset command to the card to see if it

	 * is alive */
@@ -726,6 +728,11 @@ static int myri10ge_reset(struct myri10ge_priv *mgp) 
		dev_err(&mgp->pdev->dev, "failed reset\n");

		return -ENXIO;

	}

	dmatest_page = alloc_page(GFP_KERNEL);

	if (!dmatest_page)

		return -ENOMEM;

	dmatest_bus = pci_map_page(mgp->pdev, dmatest_page, 0, PAGE_SIZE,

				   DMA_BIDIRECTIONAL);



	/* Now exchange information about interrupts  */
@@ -764,8 +771,8 @@ static int myri10ge_reset(struct myri10ge_priv *mgp) 


	len = mgp->tx.boundary;



	cmd.data0 = MYRI10GE_LOWPART_TO_U32(mgp->rx_done.bus);

	cmd.data1 = MYRI10GE_HIGHPART_TO_U32(mgp->rx_done.bus);

	cmd.data0 = MYRI10GE_LOWPART_TO_U32(dmatest_bus);

	cmd.data1 = MYRI10GE_HIGHPART_TO_U32(dmatest_bus);

	cmd.data2 = len * 0x10000;

	status = myri10ge_send_cmd(mgp, MXGEFW_DMA_TEST, &cmd, 0);

	if (status == 0)
@@ -774,8 +781,8 @@ static int myri10ge_reset(struct myri10ge_priv *mgp) 
	else

		dev_warn(&mgp->pdev->dev, "DMA read benchmark failed: %d\n",

			 status);

	cmd.data0 = MYRI10GE_LOWPART_TO_U32(mgp->rx_done.bus);

	cmd.data1 = MYRI10GE_HIGHPART_TO_U32(mgp->rx_done.bus);

	cmd.data0 = MYRI10GE_LOWPART_TO_U32(dmatest_bus);

	cmd.data1 = MYRI10GE_HIGHPART_TO_U32(dmatest_bus);

	cmd.data2 = len * 0x1;

	status = myri10ge_send_cmd(mgp, MXGEFW_DMA_TEST, &cmd, 0);

	if (status == 0)
@@ -785,8 +792,8 @@ static int myri10ge_reset(struct myri10ge_priv *mgp) 
		dev_warn(&mgp->pdev->dev, "DMA write benchmark failed: %d\n",

			 status);



	cmd.data0 = MYRI10GE_LOWPART_TO_U32(mgp->rx_done.bus);

	cmd.data1 = MYRI10GE_HIGHPART_TO_U32(mgp->rx_done.bus);

	cmd.data0 = MYRI10GE_LOWPART_TO_U32(dmatest_bus);

	cmd.data1 = MYRI10GE_HIGHPART_TO_U32(dmatest_bus);

	cmd.data2 = len * 0x10001;

	status = myri10ge_send_cmd(mgp, MXGEFW_DMA_TEST, &cmd, 0);

	if (status == 0)
@@ -796,6 +803,9 @@ static int myri10ge_reset(struct myri10ge_priv *mgp) 
		dev_warn(&mgp->pdev->dev,

			 "DMA read/write benchmark failed: %d\n", status);



	pci_unmap_page(mgp->pdev, dmatest_bus, PAGE_SIZE, DMA_BIDIRECTIONAL);

	put_page(dmatest_page);



	memset(mgp->rx_done.entry, 0, bytes);



	/* reset mcp/driver shared state back to 0 */