shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

handle pcd multiprocess spin_lock

Browse Source
This commit is contained in:
yangkai
2012-05-05 16:57:30 +08:00
parent e49241ff5f
commit 488dc506d6
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/usb/dwc_otg/dwc_otg_pcd.c
View File

@@ -287,8 +287,7 @@ static int dwc_otg_pcd_ep_enable(struct usb_ep *_ep,
return -ESHUTDOWN;
}
local_irq_save(flags);
// SPIN_LOCK_IRQSAVE(&pcd->lock, flags);
SPIN_LOCK_IRQSAVE(&pcd->lock, flags);
ep->desc = _desc;
ep->ep.maxpacket = le16_to_cpu (_desc->wMaxPacketSize);
@@ -355,8 +354,7 @@ static int dwc_otg_pcd_ep_enable(struct usb_ep *_ep,
ep->dwc_ep.type, ep->dwc_ep.maxpacket, ep->desc );
dwc_otg_ep_activate( GET_CORE_IF(pcd), &ep->dwc_ep );
// SPIN_UNLOCK_IRQRESTORE(&pcd->lock, flags);
local_irq_restore(flags);
SPIN_UNLOCK_IRQRESTORE(&pcd->lock, flags);
return 0;
}
@@ -383,8 +381,7 @@ static int dwc_otg_pcd_ep_disable(struct usb_ep *_ep)
return -EINVAL;
}
// SPIN_LOCK_IRQSAVE(&ep->pcd->lock, flags);
local_irq_save(flags);
SPIN_LOCK_IRQSAVE(&ep->pcd->lock, flags);
request_nuke( ep );
dwc_otg_ep_deactivate( GET_CORE_IF(ep->pcd), &ep->dwc_ep );
@@ -397,8 +394,7 @@ static int dwc_otg_pcd_ep_disable(struct usb_ep *_ep)
release_tx_fifo(GET_CORE_IF(ep->pcd), ep->dwc_ep.tx_fifo_num);
}
// SPIN_UNLOCK_IRQRESTORE(&ep->pcd->lock, flags);
local_irq_restore(flags);
SPIN_UNLOCK_IRQRESTORE(&ep->pcd->lock, flags);
DWC_DEBUGPL(DBG_PCD, "%s disabled\n", _ep->name);
return 0;
@@ -1152,9 +1148,7 @@ static int32_t dwc_otg_pcd_suspend_cb( void *_p ,int suspend)
//#endif
if (pcd->driver && pcd->driver->resume)
{
SPIN_UNLOCK(&pcd->lock);
pcd->driver->suspend(&pcd->gadget);
SPIN_LOCK(&pcd->lock);
}
return 1;
}
@@ -1172,9 +1166,7 @@ static int32_t dwc_otg_pcd_resume_cb( void *_p )
if (pcd->driver && pcd->driver->resume)
{
SPIN_UNLOCK(&pcd->lock);
pcd->driver->resume(&pcd->gadget);
SPIN_LOCK(&pcd->lock);
}
/* Stop the SRP timeout timer. */

3
drivers/usb/dwc_otg/dwc_otg_pcd_intr.c
View File

@@ -558,6 +558,8 @@ void dwc_otg_pcd_stop(dwc_otg_pcd_t *_pcd)
dwc_otg_pcd_ep_t *ep;
gintmsk_data_t intr_mask = {.d32 = 0};
SPIN_LOCK(&_pcd->lock);
num_in_eps = GET_CORE_IF(_pcd)->dev_if->num_in_eps;
num_out_eps = GET_CORE_IF(_pcd)->dev_if->num_out_eps;
@@ -607,6 +609,7 @@ void dwc_otg_pcd_stop(dwc_otg_pcd_t *_pcd)
_pcd->driver->disconnect(&_pcd->gadget);
SPIN_LOCK(&_pcd->lock);
}
SPIN_UNLOCK(&_pcd->lock);
}
/**

4
drivers/usb/dwc_otg/linux/dwc_otg_plat.h
View File

@@ -155,7 +155,7 @@ static __inline__ void MDELAY( const uint32_t _msecs )
*/
static __inline__ void SPIN_LOCK( spinlock_t *_lock )
{
// spin_lock(_lock);
spin_lock(_lock);
}
/**
@@ -166,7 +166,7 @@ static __inline__ void SPIN_LOCK( spinlock_t *_lock )
*/
static __inline__ void SPIN_UNLOCK( spinlock_t *_lock )
{
// spin_unlock(_lock);
spin_unlock(_lock);
}
/**