lkml.org 
[lkml]   [2016]   [Jul]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH -mm] rapidio/idt_gen3: fixup for original driver patch
Date
This patch has two fixes for the patch
"rapidio/switches: add driver for IDT gen3 switches" currently in -mm tree.

First address Andrew's comment about blocking delay.
The second fix was missed during the original patch preparation.

Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Andre van Herk <andre.van.herk@prodrive-technologies.com>
Cc: Barry Wood <barry.wood@idt.com>
Cc: linux-kernel@vger.kernel.org
---
drivers/rapidio/switches/idt_gen3.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/rapidio/switches/idt_gen3.c b/drivers/rapidio/switches/idt_gen3.c
index 93fbba8..c5923a5 100644
--- a/drivers/rapidio/switches/idt_gen3.c
+++ b/drivers/rapidio/switches/idt_gen3.c
@@ -173,7 +173,8 @@ idtg3_em_init(struct rio_dev *rdev)
rio_write_config_32(rdev, RIO_EM_DEV_INT_EN, 0);

/* Disable port-write event notifications during initialization */
- rio_write_config_32(rdev, rdev->em_efptr + RIO_EM_PW_TX_CTRL, 0);
+ rio_write_config_32(rdev, rdev->em_efptr + RIO_EM_PW_TX_CTRL,
+ RIO_EM_PW_TX_CTRL_PW_DIS);

/* Configure Port-Write notifications for hot-swap events */
tmp = RIO_GET_TOTAL_PORTS(rdev->swpinfo);
@@ -255,7 +256,7 @@ idtg3_em_handler(struct rio_dev *rdev, u8 pnum)
rval | RIO_PLM_SPx_IMP_SPEC_CTL_SOFT_RST);
udelay(10);
rio_write_config_32(rdev, RIO_PLM_SPx_IMP_SPEC_CTL(pnum), rval);
- mdelay(500);
+ msleep(500);
}

return 0;
--
1.7.8.4
\
 
 \ /
  Last update: 2016-07-22 00:21    [W:0.352 / U:0.008 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site