The patch titled
Subject: rapidio/idt_gen3: fixup for original driver patch
has been removed from the -mm tree. Its filename was
rapidio-switches-add-driver-for-idt-gen3-switches-fix.patch
This patch was dropped because it was folded into rapidio-switches-add-driver-for-idt-gen3-switches.patch
------------------------------------------------------
From: Alexandre Bounine <alexandre.bounine@xxxxxxx>
Subject: rapidio/idt_gen3: fixup for original driver patch
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.
Link: http://lkml.kernel.org/r/1469137596-18241-1-git-send-email-alexandre.bounine@xxxxxxx
Signed-off-by: Alexandre Bounine <alexandre.bounine@xxxxxxx>
Cc: Matt Porter <mporter@xxxxxxxxxxxxxxxxxxx>
Cc: Andre van Herk <andre.van.herk@xxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: Barry Wood <barry.wood@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rapidio/switches/idt_gen3.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff -puN drivers/rapidio/switches/idt_gen3.c~rapidio-switches-add-driver-for-idt-gen3-switches-fix drivers/rapidio/switches/idt_gen3.c
--- a/drivers/rapidio/switches/idt_gen3.c~rapidio-switches-add-driver-for-idt-gen3-switches-fix
+++ a/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, u
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;
_
Patches currently in -mm which might be from alexandre.bounine@xxxxxxx are
rapidio-add-rapidio-channelized-messaging-driver.patch
rapidio-documentation-fix-mangled-paragraph-in-mport_cdev.patch
rapidio-fix-return-value-description-for-dma_prep-functions.patch
rapidio-tsi721_dma-add-channel-mask-and-queue-size-parameters.patch
rapidio-tsi721-add-pcie-mrrs-override-parameter.patch
rapidio-tsi721-add-messaging-mbox-selector-parameter.patch
rapidio-tsi721_dma-advance-queue-processing-from-transfer-submit-call.patch
rapidio-fix-error-handling-in-mbox-request-release-functions.patch
rapidio-idt_gen2-fix-locking-warning.patch
rapidio-change-inbound-window-size-type-to-u64.patch
rapidio-modify-for-rev3-specification-changes.patch
powerpc-fsl_rio-apply-changes-for-rio-spec-rev-3.patch
rapidio-switches-add-driver-for-idt-gen3-switches.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
