Commit 01b7a471 authored by Jag Raman's avatar Jag Raman Committed by David S. Miller

sparc64: skip handshake for LDC channels in RAW mode

LDC channels in RAW mode does not provide any session management. No
handshake protocol is defined for LDC channels in RAW mode. It's
therefore skipped.
Signed-off-by: default avatarJagannathan Raman <jag.raman@oracle.com>
Reviewed-by: default avatarLiam Merwick <liam.merwick@oracle.com>
Reviewed-by: default avatarShannon Nelson <shannon.nelson@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ac6bb025
...@@ -1347,6 +1347,14 @@ int ldc_bind(struct ldc_channel *lp) ...@@ -1347,6 +1347,14 @@ int ldc_bind(struct ldc_channel *lp)
lp->hs_state = LDC_HS_OPEN; lp->hs_state = LDC_HS_OPEN;
ldc_set_state(lp, LDC_STATE_BOUND); ldc_set_state(lp, LDC_STATE_BOUND);
if (lp->cfg.mode == LDC_MODE_RAW) {
/*
* There is no handshake in RAW mode, so handshake
* is completed.
*/
lp->hs_state = LDC_HS_COMPLETE;
}
spin_unlock_irqrestore(&lp->lock, flags); spin_unlock_irqrestore(&lp->lock, flags);
return 0; return 0;
...@@ -1460,11 +1468,13 @@ void ldc_set_state(struct ldc_channel *lp, u8 state) ...@@ -1460,11 +1468,13 @@ void ldc_set_state(struct ldc_channel *lp, u8 state)
lp->state = state; lp->state = state;
} }
EXPORT_SYMBOL(ldc_set_state);
int ldc_mode(struct ldc_channel *lp) int ldc_mode(struct ldc_channel *lp)
{ {
return lp->cfg.mode; return lp->cfg.mode;
} }
EXPORT_SYMBOL(ldc_mode);
int ldc_rx_reset(struct ldc_channel *lp) int ldc_rx_reset(struct ldc_channel *lp)
{ {
......
...@@ -776,7 +776,11 @@ void vio_port_up(struct vio_driver_state *vio) ...@@ -776,7 +776,11 @@ void vio_port_up(struct vio_driver_state *vio)
} }
if (!err) { if (!err) {
if (ldc_mode(vio->lp) == LDC_MODE_RAW)
ldc_set_state(vio->lp, LDC_STATE_CONNECTED);
else
err = ldc_connect(vio->lp); err = ldc_connect(vio->lp);
if (err) if (err)
printk(KERN_WARNING "%s: Port %lu connect failed, " printk(KERN_WARNING "%s: Port %lu connect failed, "
"err=%d\n", "err=%d\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment