sim-card
/
simtrace2
mirror of https://gerrit.osmocom.org/simtrace2
10
0
Fork 0
Code Issues Releases Wiki Activity

WIP: use local_irq_{save,restore}()

This commit is contained in:
Harald Welte 2017-11-04 12:28:30 +01:00
parent 7b36306113
commit 119624f46f
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
firmware/libcommon/include/llist_irqsafe.h
View File

@ -1,19 +1,24 @@
#pragma once
#include "osmocom/core/linuxlist.h"
#include "utils.h"
static inline void llist_add_irqsafe(struct llist_head *_new,
struct llist_head *head)
{
__disable_irq();
unsigned long x;
local_irq_save(x);
llist_add(_new, head);
__enable_irq();
local_irq_retsore(x);
}
static inline void llist_add_tail_irqsafe(struct llist_head *_new,
struct llist_head *head)
{
__disable_irq();
unsigned long x;
local_irq_save(x);
llist_add_tail(_new, head);
__enable_irq();
}
@ -21,15 +26,16 @@ static inline void llist_add_tail_irqsafe(struct llist_head *_new,
static inline struct llist_head *llist_head_dequeue_irqsafe(struct llist_head *head)
{
struct llist_head *lh;
unsigned long x;
__disable_irq();
local_irq_save(x);
if (llist_empty(head)) {
lh = NULL;
} else {
lh = head->next;
llist_del(lh);
}
__enable_irq();
local_irq_restore(x);
return lh;
}

27
firmware/libcommon/source/host_communication.c
View File

@ -1,6 +1,7 @@
#include "board.h"
#include "llist_irqsafe.h"
#include "usb_buf.h"
#include "utils.h"
#include "osmocom/core/linuxlist.h"
#include "osmocom/core/msgb.h"
@ -16,12 +17,13 @@ static void usb_write_cb(uint8_t *arg, uint8_t status, uint32_t transferred,
{
struct msgb *msg = (struct msgb *) arg;
struct usb_buffered_ep *bep = msg->dst;
unsigned long x;
TRACE_DEBUG("%s (EP=0x%02x)\r\n", __func__, bep->ep);
__disable_irq();
local_irq_save(x);
bep->in_progress--;
__enable_irq();
local_irq_restore(x);
TRACE_DEBUG("%u: in_progress=%d\n", bep->ep, bep->in_progress);
if (status != USBD_STATUS_SUCCESS)
@ -34,6 +36,7 @@ int usb_refill_to_host(uint8_t ep)
{
struct usb_buffered_ep *bep = usb_get_buf_ep(ep);
struct msgb *msg;
unsigned long x;
int rc;
#if 0
@ -43,14 +46,14 @@ int usb_refill_to_host(uint8_t ep)
}
#endif
__disable_irq();
local_irq_save(x);
if (bep->in_progress) {
__enable_irq();
local_irq_restore(x);
return 0;
}
if (llist_empty(&bep->queue)) {
__enable_irq();
local_irq_restore(x);
return 0;
}
@ -58,7 +61,7 @@ int usb_refill_to_host(uint8_t ep)
msg = msgb_dequeue(&bep->queue);
__enable_irq();
local_irq_restore(x);
TRACE_DEBUG("%s (EP=0x%02x), in_progress=%d\r\n", __func__, ep, bep->in_progress);
@ -70,9 +73,9 @@ int usb_refill_to_host(uint8_t ep)
TRACE_ERROR("%s error %x\n", __func__, rc);
/* re-insert to head of queue */
llist_add_irqsafe(&msg->list, &bep->queue);
__disable_irq();
local_irq_save(x);
bep->in_progress--;
__enable_irq();
local_irq_restore(x);
TRACE_DEBUG("%02x: in_progress=%d\n", bep->ep, bep->in_progress);
return 0;
}
@ -105,6 +108,7 @@ int usb_refill_from_host(uint8_t ep)
{
struct usb_buffered_ep *bep = usb_get_buf_ep(ep);
struct msgb *msg;
unsigned long x;
int rc;
#if 0
@ -142,16 +146,17 @@ int usb_drain_queue(uint8_t ep)
{
struct usb_buffered_ep *bep = usb_get_buf_ep(ep);
struct msgb *msg;
unsigned long x;
int ret = 0;
/* wait until no transfers are in progress anymore and block
* further interrupts */
while (1) {
__disable_irq();
local_irq_save(x);
if (!bep->in_progress) {
break;
}
__enable_irq();
local_irq_restore(x);
/* retry */
}
@ -162,7 +167,7 @@ int usb_drain_queue(uint8_t ep)
}
/* re-enable interrupts and return number of free'd msgbs */
__enable_irq();
local_irq_restore(x);
return ret;
}