/* * Copyright (C) 2014 Freescale Semiconductor, Inc. * * Author: Jun Li * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ #ifndef __DRIVERS_USB_CHIPIDEA_OTG_FSM_H #define __DRIVERS_USB_CHIPIDEA_OTG_FSM_H #include /* * A-DEVICE timing constants */ /* Wait for VBUS Rise */ #define TA_WAIT_VRISE (100) /* a_wait_vrise: section 7.1.2 * a_wait_vrise_tmr: section 7.4.5.1 * TA_VBUS_RISE <= 100ms, section 4.4 * Table 4-1: Electrical Characteristics * ->DC Electrical Timing */ /* Wait for VBUS Fall */ #define TA_WAIT_VFALL (1000) /* a_wait_vfall: section 7.1.7 * a_wait_vfall_tmr: section: 7.4.5.2 */ /* Wait for B-Connect */ #define TA_WAIT_BCON (10000) /* a_wait_bcon: section 7.1.3 * TA_WAIT_BCON: should be between 1100 * and 30000 ms, section 5.5, Table 5-1 */ /* A-Idle to B-Disconnect */ #define TA_AIDL_BDIS (5000) /* a_suspend min 200 ms, section 5.2.1 * TA_AIDL_BDIS: section 5.5, Table 5-1 */ /* B-Idle to A-Disconnect */ #define TA_BIDL_ADIS (500) /* TA_BIDL_ADIS: section 5.2.1 * 500ms is used for B switch to host * for safe */ /* * B-device timing constants */ /* Data-Line Pulse Time*/ #define TB_DATA_PLS (10) /* b_srp_init,continue 5~10ms * section:5.1.3 */ /* SRP Fail Time */ #define TB_SRP_FAIL (6000) /* b_srp_init,fail time 5~6s * section:5.1.6 */ /* A-SE0 to B-Reset */ #define TB_ASE0_BRST (155) /* minimum 155 ms, section:5.3.1 */ /* SE0 Time Before SRP */ #define TB_SE0_SRP (1000) /* b_idle,minimum 1s, section:5.1.2 */ /* SSEND time before SRP */ #define TB_SSEND_SRP (1500) /* minimum 1.5 sec, section:5.1.2 */ #define TB_AIDL_BDIS (20) /* 4ms ~ 150ms, section 5.2.1 */ #if IS_ENABLED(CONFIG_USB_OTG_FSM) int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci); int ci_otg_fsm_work(struct ci_hdrc *ci); irqreturn_t ci_otg_fsm_irq(struct ci_hdrc *ci); void ci_hdrc_otg_fsm_start(struct ci_hdrc *ci); void ci_hdrc_otg_fsm_remove(struct ci_hdrc *ci); #else static inline int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci) { return 0; } static inline int ci_otg_fsm_work(struct ci_hdrc *ci) { return -ENXIO; } static inline irqreturn_t ci_otg_fsm_irq(struct ci_hdrc *ci) { return IRQ_NONE; } static inline void ci_hdrc_otg_fsm_start(struct ci_hdrc *ci) { } static inline void ci_hdrc_otg_fsm_remove(struct ci_hdrc *ci) { } #endif #endif /* __DRIVERS_USB_CHIPIDEA_OTG_FSM_H */ git/commit/?id=91539eb1fda2d530d3b268eef542c5414e54bf1a'>root/net/mac80211/agg-rx.c
diff options
context:
space:
mode:
authorIago Abal <mail@iagoabal.eu>2017-01-11 14:00:21 +0100
committerVinod Koul <vinod.koul@intel.com>2017-01-25 15:35:11 +0530
commit91539eb1fda2d530d3b268eef542c5414e54bf1a (patch)
tree960f5ca6342ad20837aff18aad6e8ecd7da32fd6 /net/mac80211/agg-rx.c
parent6610d0edf6dc7ee97e46ab3a538a565c79d26199 (diff)
dmaengine: pl330: fix double lock
The static bug finder EBA (http://www.iagoabal.eu/eba/) reported the following double-lock bug: Double lock: 1. spin_lock_irqsave(pch->lock, flags) at pl330_free_chan_resources:2236; 2. call to function `pl330_release_channel' immediately after; 3. call to function `dma_pl330_rqcb' in line 1753; 4. spin_lock_irqsave(pch->lock, flags) at dma_pl330_rqcb:1505. I have fixed it as suggested by Marek Szyprowski. First, I have replaced `pch->lock' with `pl330->lock' in functions `pl330_alloc_chan_resources' and `pl330_free_chan_resources'. This avoids the double-lock by acquiring a different lock than `dma_pl330_rqcb'. NOTE that, as a result, `pl330_free_chan_resources' executes `list_splice_tail_init' on `pch->work_list' under lock `pl330->lock', whereas in the rest of the code `pch->work_list' is protected by `pch->lock'. I don't know if this may cause race conditions. Similarly `pch->cyclic' is written by `pl330_alloc_chan_resources' under `pl330->lock' but read by `pl330_tx_submit' under `pch->lock'. Second, I have removed locking from `pl330_request_channel' and `pl330_release_channel' functions. Function `pl330_request_channel' is only called from `pl330_alloc_chan_resources', so the lock is already held. Function `pl330_release_channel' is called from `pl330_free_chan_resources', which already holds the lock, and from `pl330_del'. Function `pl330_del' is called in an error path of `pl330_probe' and at the end of `pl330_remove', but I assume that there cannot be concurrent accesses to the protected data at those points. Signed-off-by: Iago Abal <mail@iagoabal.eu> Reviewed-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'net/mac80211/agg-rx.c')