staging: slicoss: return status of slic_link_event_handler
PATCH 1/4 staging: slicoss: return status of slic_link_event_handler
slic_link_event_handler() issues command READ_LINK_STATUS to be executed asynchronously, which is followed by UP configuration write command. But it can fail while setting up the command and in that case the link will not be up. Lets check the status and return it.
--- drivers/staging/slicoss/slicoss.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/staging/slicoss/slicoss.c +3 -2
@@ -1717,14 +1717,14 @@ static u32 slic_rcvqueue_reinsert(struct adapter *adapter, struct sk_buff *skb)* will also complete asynchronously. * */ -static void slic_link_event_handler (struct adapter *adapter) +static int slic_link_event_handler (struct adapter *adapter) {int status;struct slic_shmem *pshmem;if (adapter->state !=ADAPT_UP ) {/* Adapter is not operational. Ignore. */ -return ; +return -ENODEV ; } pshmem = (struct slic_shmem *)(unsigned long )adapter->phys_shmem;
@@ -1740,6 +1740,7 @@ static void slic_link_event_handler(struct adapter *adapter) (u32) &pshmem->linkstatus,/* no 4GB wrap guaranteed */ 0, 0, 0);#endif +return status; }static void slic_init_cleanup (struct adapter *adapter)
Signature · 1 line
1.9.1
PATCH 2/4 staging: slicoss: use status in slic_if_init
While initializing the interface if we are not able to setup the command to UP the link then we release everything and return the error code.
--- drivers/staging/slicoss/slicoss.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/staging/slicoss/slicoss.c +16 -1
@@ -2379,7 +2379,22 @@ static int slic_if_init(struct adapter *adapter, unsigned long *flags)slic_reg32_write (&slic_regs->slic_icr,ICR_INT_ON ,FLUSH );slic_link_config (adapter,LINK_AUTOSPEED ,LINK_AUTOD ); -slic_link_event_handler (adapter); + rc =slic_link_event_handler (adapter); +if (rc) { +/* disable interrupts then clear pending events */ +slic_reg32_write (&slic_regs->slic_icr,ICR_INT_OFF ,FLUSH ); +slic_reg32_write (&slic_regs->slic_isr,0 ,FLUSH ); +if (adapter->pingtimerset) { +del_timer (&adapter->pingtimer); + adapter->pingtimerset =0 ; + } +if (card->loadtimerset) { +del_timer (&card->loadtimer); + card->loadtimerset =0 ; + } + adapter->state =ADAPT_DOWN ; +slic_adapter_freeresources (adapter); + } err:return rc;
Signature · 1 line
1.9.1
PATCH 3/4 staging: slicoss: use status in slic_ioctl
In reply to Sudip MukherjeeIn the ioctl function if we are not able to UP the link after setting the new parameters then return an error code to the userspace.
--- drivers/staging/slicoss/slicoss.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/slicoss/slicoss.c +2 -1
@@ -2624,7 +2624,8 @@ static int slic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)else duplex =0 ;slic_link_config (adapter, speed, duplex); -slic_link_event_handler (adapter); +if (slic_link_event_handler (adapter)) +return -EFAULT ; } }return 0 ;
Signature · 1 line
1.9.1
PATCH 4/4 staging: slicoss: use status in isr
In reply to Sudip MukherjeeIf we are not able to setup the LINK UP command then don't increment the interrupt count.
---
This is placed at the last as I am not sure if we should be decrement the count. We got the interrupt but we could not service it properly. But in any case this count is not used anywhere.
drivers/staging/slicoss/slicoss.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/staging/slicoss/slicoss.c +2 -1
@@ -2110,7 +2110,8 @@ static void slic_interrupt_card_up(u32 isr, struct adapter *adapter,if (isr &ISR_LEVENT ) { adapter->linkevent_interrupts++; -slic_link_event_handler (adapter); +if (slic_link_event_handler (adapter)) + adapter->linkevent_interrupts--; } if ((isr & ISR_UPC) || (isr & ISR_UPCERR) ||
Signature · 1 line
1.9.1