/* * Copyright (c) 2015, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and * only version 2 as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * */ #include #include #include "tsens.h" #define STATUS_OFFSET 0x10a0 #define LAST_TEMP_MASK 0xfff #define STATUS_VALID_BIT BIT(21) #define CODE_SIGN_BIT BIT(11) static int get_temp_8996(struct tsens_device *tmdev, int id, int *temp) { struct tsens_sensor *s = &tmdev->sensor[id]; u32 code; unsigned int sensor_addr; int last_temp = 0, last_temp2 = 0, last_temp3 = 0, ret; sensor_addr = STATUS_OFFSET + s->hw_id * 4; ret = regmap_read(tmdev->map, sensor_addr, &code); if (ret) return ret; last_temp = code & LAST_TEMP_MASK; if (code & STATUS_VALID_BIT) goto done; /* Try a second time */ ret = regmap_read(tmdev->map, sensor_addr, &code); if (ret) return ret; if (code & STATUS_VALID_BIT) { last_temp = code & LAST_TEMP_MASK; goto done; } else { last_temp2 = code & LAST_TEMP_MASK; } /* Try a third/last time */ ret = regmap_read(tmdev->map, sensor_addr, &code); if (ret) return ret; if (code & STATUS_VALID_BIT) { last_temp = code & LAST_TEMP_MASK; goto done; } else { last_temp3 = code & LAST_TEMP_MASK; } if (last_temp == last_temp2) last_temp = last_temp2; else if (last_temp2 == last_temp3) last_temp = last_temp3; done: /* Code sign bit is the sign extension for a negative value */ if (last_temp & CODE_SIGN_BIT) last_temp |= ~CODE_SIGN_BIT; /* Temperatures are in deciCelicius */ *temp = last_temp * 100; return 0; } static const struct tsens_ops ops_8996 = { .init = init_common, .get_temp = get_temp_8996, }; const struct tsens_data data_8996 = { .num_sensors = 13, .ops = &ops_8996, }; a97b6034ed492c1a21fd4ae'>diff
lx/pipeline.json?id=91539eb1fda2d530d3b268eef542c5414e54bf1a'>pipeline.json
diff options
AgeCommit message (Expand)AuthorFilesLines
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 /tools/perf/pmu-events/arch/x86/broadwellx/pipeline.json
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 'tools/perf/pmu-events/arch/x86/broadwellx/pipeline.json')