Merge tag 'iio-for-5.6b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan writes:
Second set of new device support, features and minor fixes for IIO in the 5.6 cycle
Just a small set this time.
As we are very near the merge window, I've rolled a few fixes in here
rather than adding noise just before release. A short delay here will
do little harm.
New device support
* adis16480
- Add support for adis16490. After earlier rework this is simple ID plus
chip info.
Features
* kxcjk1013
- mount matrix support.
* lsm_6dsx
- mount matrix support.
Cleanups / minor or late breaking fixes
* ad7124
- add support to ad-sigma-delta and use it in this driver to allow
the the interrupt type to be IRQF_TRIGGER_LOW unlike most other devices
using this framework.
* adis
- use delay structure now available in SPI to handle transfer delays
- introduce a timeouts structure to allow support of new devices
* ak8975
- drop platform data support. No one is using it and it adds complexity.
- use device_get_match_data rather than open coding much the same thing.
* dht11
- drop meaningless todo
* at91-samad2_adc
- switch to dma_request_chan
* altas-sensor
- add a helper function to compute number of channels. Needed for new device
support that is under review.
* bma400
- add a lower bound check on scale.
* inv_mpu6050
- add support for temperature data in the fifos for all chips.
- support an odd situation where a board supports only interrupt triggering
on both edges.
* st_lsm6dsx
- check and handle potential error return.
* st_sensors
- fix some values for the LSM9DS0 which is ever so slightly different from
other devices using the same whoami value.
- switch over to generic functions from dt ones, avoiding need for separate
ACPI support.
* stm32-adc
- switch to dma_request_chan
- suppress an error print in deferred probe case.
* stm32-dac
- drop private data structure element for reset controller as only used in
probe.
- reflect more cleanly that the reset controller is optional whilst ensuring
that if is specified any errors are caught.
* stm32-dfsdm
- switch to dma_request_chan
- fix missing application of formatting to single conversions.
- ensure the sampling rate is updated when the oversampling ratio is changed.
* tag 'iio-for-5.6b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio: (29 commits)
iio: dac: stm32-dac: better handle reset controller failures
iio: dac: stm32-dac: use reset controller only at probe time
dt-bindings: iio: accel: kxcjk1013: Document mount-matrix property
iio: accel: kxcjk1013: Support orientation matrix
iio: imu: st_lsm6dsx: add mount matrix support
iio: adc: stm32-adc: don't print an error on probe deferral
dt-bindings: iio: adis16480: add compatible entry for ADIS16490
iio: imu: adis16480: Add support for ADIS16490
iio: accel: bma400: prevent setting accel scale too low
iio: imu/mpu6050: support dual-edge IRQ
iio: imu: inv_mpu6050: add fifo temperature data support
iio: magnetometer: ak8975: Convert to use device_get_match_data()
iio: magnetometer: ak8975: Get rid of platform data
iio: adc: ad7124: Set IRQ type to falling
iio: adc: ad-sigma-delta: Allow custom IRQ flags
iio: imu: adis: use new `delay` structure for SPI transfer delays
iio: adc: stm32-dfsdm: adapt sampling rate to oversampling ratio
iio: adc: stm32-dfsdm: fix single conversion
iio: st_sensors: Make use of device properties
iio: st_sensors: Drop redundant parameter from st_sensors_of_name_probe()
...
Use devm_reset_control_get_optional_exclusive() instead of
devm_reset_control_get_exclusive() as reset controller is optional.
Nevertheless if reset controller is expected but reports an
error, propagate the error code to the caller. In such case
a nice error trace is emitted unless we're deferring the probe
operation.
Dmitry Osipenko [Sun, 12 Jan 2020 20:33:00 +0000 (23:33 +0300)]
iio: accel: kxcjk1013: Support orientation matrix
Hardware could be physically mounted in any possible direction and
userpspace needs to be aware of the mounting orientation in order to
process sensor's data correctly. In particular this helps iio-sensor-proxy
to report display's orientation properly on a phone/tablet devices.
Dan Carpenter [Thu, 16 Jan 2020 10:08:29 +0000 (13:08 +0300)]
iio: accel: bma400: prevent setting accel scale too low
This puts an upper bound on "val2" but it also needs to have a lower
bound (BMA400_SCALE_MIN).
Fixes: 465c811f1f20 ("iio: accel: Add driver for the BMA400") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Andy Shevchenko [Wed, 15 Jan 2020 17:44:24 +0000 (19:44 +0200)]
iio: magnetometer: ak8975: Get rid of platform data
Since IIO framework supports device property API and driver has been moved
already to the use of GPIO descriptors the logical continuation is to
get rid of platform data completely. We are on the safe side here since
there are no users of it in the kernel.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Ad7124 data-sheet specifies that the falling edge
of the DOUT line should be used for an interrupt.
The current irq flag (IRQF_TRIGGER_LOW) used will
cause unwanted behaviour. When enabling the interrupt
it will fire once because the DOUT line is already low.
This will make the driver to read an unfinished conversion
from the chip.
This patch sets the irq type to the one specified in
the data-sheet.
Signed-off-by: Alexandru Tachici <alexandru.tachici@analog.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Before this patch the ad_sigma_delta implementation hardcoded
the irq trigger type to low, assuming that all Sigma-Delta ADCs
have the same interrupt-type.
This patch allows all drivers using the ad_sigma_delta layer to set the
irq trigger type to the one specified in the datasheet.
Signed-off-by: Alexandru Tachici <alexandru.tachici@analog.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Jérôme Pouiller [Wed, 15 Jan 2020 13:55:25 +0000 (13:55 +0000)]
staging: wfx: simplify handling of IEEE80211_TX_CTL_SEND_AFTER_DTIM
When mac80211 ask for a frame to be sent after a DTIM, driver should:
1. Update TIM with multicast bit set (using update_ie). This function
can be called whenever.
2. Keep buffered all frames marked "after dtim"
3. When it receive a suspend_resume indication (see
wfx_suspend_resume_mc()), send all the buffered frames. This
indication is sent by the firmware 4ms before the dtim.
4. If one of the frames returns status "REQUEUE", it means that the
DTIM period was ended before to be able to send the frame.
5. When all the buffered frames were sent or if DTIM period was ended,
driver should update the TIM with multicast bit reset.
All the mess with the asynchronous works can be dropped.
Jérôme Pouiller [Wed, 15 Jan 2020 13:55:22 +0000 (13:55 +0000)]
staging: wfx: firmware never return PS status for stations
At the beginning, firmware could send suspend_resume indication to
notify that a station wake up or sleep down. However, mac80211 already
handles power save status of stations and this behavior has been removed
from the firmware. So now, when suspend_resume indication is received,
it is always to notify that a DTIM is about to be sent.
So, it is possible to simply wfx_suspend_resume().
Jérôme Pouiller [Wed, 15 Jan 2020 13:55:19 +0000 (13:55 +0000)]
staging: wfx: pspoll_mask make no sense
pspoll_mask is here to send data buffered in driver. But since station
is marked buffered, TIM for this station is 1 and mac80211 will call
sta_notify when a ps-poll is received. So pspoll_mask is useless and
sta_alseep_mask is sufficient.
Jérôme Pouiller [Wed, 15 Jan 2020 13:55:18 +0000 (13:55 +0000)]
staging: wfx: replace wfx_tx_get_tid() with ieee80211_get_tid()
wfx_tx_get_tid() was used as a wrapper around ieee80211_get_tid(). It
did sometime return WFX_MAX_TID to ask to upper layers to not include
the frame in "buffered" counter. The objective of this behavior is not
clear, but tests has shown that wfx_tx_get_tid() can be replaced by
ieee80211_get_tid() without any regressions.
BTW, it is not necessary to save the tid in tx_rpiv since it can be
retrieved from the 802.11 header.
Jérôme Pouiller [Wed, 15 Jan 2020 13:55:15 +0000 (13:55 +0000)]
staging: wfx: simplify the link-id allocation
The "link-id" is a slot number provided to the chip. A link-id is
allocated to every station associated with the chip (mainly when the
chip is in AP mode). It is more or less the same thing than the
association ID, but it is limited to 14 values.
Firmware uses the link-id to track the power save status of the
stations.
The current code try to associate a link-id as soon as data are
exchanged with station. It is far easier to rely on sta_add() and
sta_remove().
Until now the value WFX_LINK_ID_NO_ASSOC, was only used when no more
link-id was available. Now, we also use this value for
not-yet-associated stations (that was its primary behavior).
Jérôme Pouiller [Wed, 15 Jan 2020 13:55:10 +0000 (13:55 +0000)]
staging: wfx: fix bss_loss
wfx_tx_confirm_cb() retrieves the station associated with a frame using
the MAC address from the 802.11 header. In the other side wfx_tx()
retrieves the station using sta field from the ieee80211_tx_control
argument.
In wfx_cqm_bssloss_sm(), wfx_tx() was called directly without valid sta
field, but with a valid MAC address in 802.11 header. So there the
processing of this packet was unbalanced and may produce weird bugs.
Jérôme Pouiller [Wed, 15 Jan 2020 13:55:09 +0000 (13:55 +0000)]
staging: wfx: relocate "buffered" information to sta_priv
It simplify the code if field buffered is hosted in the struct sta_priv
instead of in the struct wfx_link_entry. More globally, struct
wfx_link_entry has no real reasons to exist and should be dropped soon.
Jérôme Pouiller [Wed, 15 Jan 2020 13:55:03 +0000 (13:55 +0000)]
staging: wfx: do not update uapsd if not necessary
wfx_conf_tx() is called for each queue. On every call, the function
updates UAPSD mask and PM mode for all queues. It is a pity since the
UAPSD configuration very rarely changes and it makes exchanges between
the host and the chip more difficult to track.
This patch avoid to update UAPSD and Power Mode in most usual cases.
Jérôme Pouiller [Wed, 15 Jan 2020 13:55:02 +0000 (13:55 +0000)]
staging: wfx: with multiple vifs, force PS only if channels differs
When multiple vif are in use (the only supported configuration is one
station and one AP), the driver force power save flag on station.
This behavior allows the station to leave the station channel and make
its business on AP channel.
However, this has a big impact on station performances (especially since
only legacy PS is supported).
When both vifs use the same channel, it is not necessary to keep this
restriction. This greatly improve station performances.
Jérôme Pouiller [Wed, 15 Jan 2020 13:55:01 +0000 (13:55 +0000)]
staging: wfx: update power-save per interface
mac80211 and the device are both able to control power-save per vif.
But, the current code retrieve power-save from wfx_config(). So, it does
not allow to setup power-save independently for each vif. Driver just
has to rely on wfx_bss_info_changed() instead of wfx_config().
wfx_config() has nothing to do anymore, but we keep it since it is
mandatory for mac80211.
Jérôme Pouiller [Wed, 15 Jan 2020 13:54:59 +0000 (13:54 +0000)]
staging: wfx: simplify wfx_scan_complete()
wfx_scan_complete() do nothing with argument hif_ind_scan_cmpl. In add,
hif_ind_scan_cmpl come from hardware API and is not expected to be used
with upper layers of the driver.
Jérôme Pouiller [Wed, 15 Jan 2020 13:54:56 +0000 (13:54 +0000)]
staging: wfx: simplify wfx_set_mcast_filter()
HIF functions return only serious errors (OOM or device freeze). The
current handling of errors in wfx_set_mcast_filter() does not bring
anything. Finally it may disturb the developer more than it helps.
The structure hif_mib_config_data_filter come from hardware
API. It is not intended to be manipulated in upper layers of the driver.
In add, current code for hif_set_config_data_filter() is too dumb. It
should pack data with hardware representation instead of leaving all
work to the caller.
The structure hif_mib_mac_addr_data_frame_condition come from hardware
API. It is not intended to be manipulated in upper layers of the driver.
In add, current code for hif_set_mac_addr_condition() is too dumb. It
should pack data with hardware representation instead of leaving all
work to the caller.
Jérôme Pouiller [Wed, 15 Jan 2020 13:54:52 +0000 (13:54 +0000)]
staging: wfx: simplify hif_set_data_filtering()
The structure hif_mib_set_data_filtering come from hardware API. It is
not intended to be manipulated in upper layers of the driver.
In add, current code for hif_set_data_filtering() is too dumb. It should
pack data with hardware representation instead of leaving all work to
the caller.
The structure hif_mib_uc_mc_bc_data_frame_condition come from hardware
API. It is not intended to be manipulated in upper layers of the driver.
In add, current code for hif_set_uc_mc_bc_condition() is too dumb. It
should pack data with hardware representation instead of leaving all
work to the caller.
Jérôme Pouiller [Wed, 15 Jan 2020 13:54:46 +0000 (13:54 +0000)]
staging: wfx: simplify hif_set_association_mode()
The structure hif_mib_set_association_mode come from hardware API. It is
not intended to be manipulated in upper layers of the driver.
In add, current code for hif_set_association_mode() is too dumb. It
should pack data with hardware representation instead of leaving all
work to the caller.
Jérôme Pouiller [Wed, 15 Jan 2020 13:54:40 +0000 (13:54 +0000)]
staging: wfx: drop wfx_set_cts_work()
wfx_bss_info_changed() is not called from atomic contexts. So, it is not
necessary to raise an asynchronous work to change ERP. Thus
wfx_set_cts_work() become useless.
Jérôme Pouiller [Wed, 15 Jan 2020 13:54:38 +0000 (13:54 +0000)]
staging: wfx: drop wvif->setbssparams_done
setbssparams_done was here to ensure that the firmware does not enable
powersave before to get the first beacon. However, mac80211 already
ensures it gets a beacon before to associate to the BSS. And even, if
it won't, the firmware wake up at least on every DTIM, which is
sufficient to finalize the association.
Jérôme Pouiller [Wed, 15 Jan 2020 13:54:35 +0000 (13:54 +0000)]
staging: wfx: drop wvif->enable_beacon
It seems that current code try to save calls to hif_beacon_transmit() by
keeping a copy of the previous value of bss_conf->enable_beacon.
However, hif_beacon_transmit() does not cost so much and mac80211
already take care to not send useless events.
Jérôme Pouiller [Wed, 15 Jan 2020 13:54:30 +0000 (13:54 +0000)]
staging: wfx: simplify wfx_flush()
Current code of wfx_flush() force to drop packets in some contexts.
However, there is no obvious reasons to do that. It looks like a
workaround for a bug with the old implementation of __wfx_flush().
Jérôme Pouiller [Wed, 15 Jan 2020 13:54:29 +0000 (13:54 +0000)]
staging: wfx: fix __wfx_flush() when drop == false
wfx_tx_queues_clear() only clear not yet sent requests. So, it always
necessary to wait for tx_queue_stats.wait_link_id_empty whatever the
value of "drop" argument.
In add, it is not necessary to return with tx queue locked since all
calls to __wfx_flush() unlock the tx queue just after the call to
__wfx_tx_flush().
Jérôme Pouiller [Wed, 15 Jan 2020 13:54:26 +0000 (13:54 +0000)]
staging: wfx: simplify wfx_upload_ap_templates()
This function built probe response from data retrieved in beacon. Yet,
this job can be done with ieee80211_proberesp_get(). So, we can simplify
that code (and fix bugs like inclusion of TIM in probe responses).
Jérôme Pouiller [Wed, 15 Jan 2020 13:54:21 +0000 (13:54 +0000)]
staging: wfx: drop wdev->output_power
mac80211 and the device are both able to control tx power per vif. But,
the current code retrieve tx power from wfx_config(). So, it does not
allow to setup the tx power independently for each vif. Driver just has
to rely on bss_conf->txpower to get the correct information.
In add, it is no more necessary to protect access to wdev->output_power
with scan_lock.
Jérôme Pouiller [Wed, 15 Jan 2020 13:54:19 +0000 (13:54 +0000)]
staging: wfx: retrieve greenfield mode from sta->ht_cap and bss_conf
wvif->ht_info contains useless copies of sta->ht_cap and
bss_conf->ht_operation_mode. Prefer to retrieve information from the
original structs instead of rely on wvif->ht_info.
Jérôme Pouiller [Wed, 15 Jan 2020 13:54:16 +0000 (13:54 +0000)]
staging: wfx: use specialized structs for HIF arguments
Most of the commands that are sent to device should take struct in
argument. In the current code, when this struct is binary compatible
with a __le32, the driver use a __le32. This behavior is error prone.
This patch fixes that and uses the specialized structs instead.
The structure hif_mib_arp_ip_addr_table come from hardware API. It is
not intended to be manipulated in upper layers of the driver.
In add, current code for hif_set_arp_ipv4_filter() is too dumb. It
should pack data using the hardware representation instead of leaving
all work to the caller.
The structure hif_mib_rcpi_rssi_threshold come from hardware API. It is
not intended to be manipulated in upper layers of the driver.
In add, current code for hif_set_rcpi_rssi_threshold() is dumb. It
should pack data using the hardware representation instead of leaving
all work to the caller.
Hardware API use 10th of dBm for output power unit. Upper layers should
use same units than mac80211 and the conversion should be done by low
level layer of the driver (hif_set_output_power())
In add, current code of hif_set_output_power() use a __le32 while the
device API specify a specific structure for this.
Jérôme Pouiller [Wed, 15 Jan 2020 13:54:07 +0000 (13:54 +0000)]
staging: wfx: send rate policies one by one
Rate policies (aka. tx_rate_retry_policy in hardware API) are sent to
device asynchronously from tx requests. So, the device maintains a list
of active rate policies and the tx requests only reference an existent
rate policy.
The device API allows to send multiple rate policies at once. However,
this property is very rarely used. We prefer to send rate policies one
by one and simplify the architecture.
Jérôme Pouiller [Wed, 15 Jan 2020 13:54:03 +0000 (13:54 +0000)]
staging: wfx: revert unexpected change in debugfs output
It appears that commit 8c7128c4cf4e ("staging: align to fix warnings of
line over 80 characters") do slightly more than what is explained in
commit log.
Especially, it changes the output of the file rx_stats from debugfs.
From some point of view, this file can be considered as a part of the
API. Any change on it should be clearly announced.
Since the change introduced does not seems to have any justification,
revert it.
Reported-by: Pascal Prime <pascal.prime@silabs.com> Cc: Jules Irenge <jbi.octave@gmail.com> Fixes: 8c7128c4cf4e ("staging: align to fix warnings of line over 80 characters") Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> Link: https://lore.kernel.org/r/20200115135338.14374-2-Jerome.Pouiller@silabs.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: rtl8192u: replace printk with natdev_<LEVEL> statements in ieee80211
Checkpatch reports 'WARNING: printk() should include KERN_<LEVEL>
facility level'. Fix this by specifying a relevant KERN_<LEVEL> value
for each line in which it was missing.
Once they are fixed, checkpatch reports 'WARNING: Prefer [subsystem eg:
netdev]_dbg([subsystem]dev, ... then dev_dbg(dev, ... then
pr_debug(... to printk(KERN_DEBUG ...'. Fix this by replacing
relevant printk_<level> statements with their netdev_<level>
equivalent.
Colin Ian King [Tue, 14 Jan 2020 17:11:45 +0000 (17:11 +0000)]
staging: vt6655: remove redundant assignment to variable ret
The variable ret is being initialized with a value that
is never read and is being re-assigned later on. The
assignment is redundant and hence can be removed.
Colin Ian King [Tue, 14 Jan 2020 17:27:20 +0000 (17:27 +0000)]
staging: wilc1000: remove redundant assignment to variable result
The variable result is being initialized with a value that
is never read and is being re-assigned later on. The assignment
is redundant and hence can be removed.
Colin Ian King [Tue, 14 Jan 2020 18:16:04 +0000 (18:16 +0000)]
staging: wlan-ng: ensure error return is actually returned
Currently when the call to prism2sta_ifst fails a netdev_err error
is reported, error return variable result is set to -1 but the
function always returns 0 for success. Fix this by returning
the error value in variable result rather than 0.
Addresses-Coverity: ("Unused value") Fixes: 00b3ed168508 ("Staging: add wlan-ng prism2 usb driver") Signed-off-by: Colin Ian King <colin.king@canonical.com> Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20200114181604.390235-1-colin.king@canonical.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Ole Wiedemann [Fri, 13 Dec 2019 13:10:32 +0000 (14:10 +0100)]
staging: android: ashmem: Replace strcpy with strscpy
Replaced strcpy call with safer strscpy call with given length.
This elimates the need to manually null-terminate the given string,
since strscpy will null terminate the destination anyway.:
Signed-off-by: Ole Wiedemann <ole.wiedemann@fau.de> Co-developed-by: Sebastian Scherbel <sebastian.scherbel@fau.de> Signed-off-by: Sebastian Scherbel <sebastian.scherbel@fau.de> Acked-by: Christian Brauner <christian.brauner@ubuntu.com> Acked-by: Joel Fernandes (Google) <joel@joelfernandes.org> Acked-by: Todd Kjos <tkjos@google.com> Link: https://lore.kernel.org/r/20191213131032.22579-1-ole.wiedemann@fau.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Function ODM_GetRightChnlPlaceforIQK() returns non-zero values only
for channels > 14. According to the TODO code valid only for 5 GHz
should be removed.
- find and remove remaining code valid only for 5 GHz. Most of the
obvious ones have been removed, but things like channel > 14 still
exist.
Remove ODM_GetRightChnlPlaceforIQK() and replace the uses of the
return value with zero.
iio: imu: adis: use new `delay` structure for SPI transfer delays
In a recent change to the SPI subsystem [1], a new `delay` struct was added
to replace the `delay_usecs`. This change replaces the current `delay_usecs`
with `delay` for this driver.
The `spi_transfer_delay_exec()` function [in the SPI framework] makes sure
that both `delay_usecs` & `delay` are used (in this order to preserve
backwards compatibility).
[1] commit bebcfd272df6485 ("spi: introduce `delay` field for
`spi_transfer` + spi_transfer_delay_exec()")
Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
projects / linux.git / log