diff --git a/patch.sh b/patch.sh
index 04fe7ef1de69a682978d56a5c77c3a3bb62690f4..cb1ca4fcb8fb18f0a429f9fc8da58720dfeb526b 100644
--- a/patch.sh
+++ b/patch.sh
@@ -167,10 +167,6 @@ rt_cleanup () {
rt () {
echo "dir: rt"
-
- #v4.8.1
- ${git_bin} revert --no-edit 0b09f2d43201472327b80f9978cd768b46353a34
-
rt_patch="${KERNEL_REL}${kernel_rt}"
#regenerate="enable"
if [ "x${regenerate}" = "xenable" ] ; then
@@ -195,7 +191,7 @@ local_patch () {
#external_git
#aufs4
-rt
+#rt
#local_patch
pre_backports () {
@@ -234,18 +230,14 @@ patch_backports (){
}
backports () {
- backport_tag="3477d168ba61c5b0ca42d3d4642f3463609a5417"
+ backport_tag="v4.x-y"
- subsystem="iio"
+ subsystem="xyz"
#regenerate="enable"
if [ "x${regenerate}" = "xenable" ] ; then
pre_backports
- cp -vr ~/linux-src/drivers/iio/* ./drivers/iio/
- cp -vr ~/linux-src/drivers/staging/iio/* ./drivers/staging/iio/
- cp -v ~/linux-src/include/linux/hid-sensor-hub.h ./include/linux/
- cp -vr ~/linux-src/include/linux/iio/* ./include/linux/iio/
- cp -v ~/linux-src/include/uapi/linux/iio/types.h ./include/uapi/linux/iio/types.h
+ cp -v ~/linux-src/x/ ./x/
post_backports
fi
@@ -398,20 +390,6 @@ drivers () {
cleanup
fi
- echo "dir: drivers/ti/tps65217"
- #regenerate="enable"
- if [ "x${regenerate}" = "xenable" ] ; then
- start_cleanup
- fi
-
- ${git} "${DIR}/patches/drivers/ti/tps65217/0001-tps65217-Enable-KEY_POWER-press-on-AC-loss-PWR_BUT.patch"
-
- if [ "x${regenerate}" = "xenable" ] ; then
- wdir="drivers/ti/tps65217"
- number=1
- cleanup
- fi
-
echo "dir: drivers/ti/cpsw"
#regenerate="enable"
if [ "x${regenerate}" = "xenable" ] ; then
@@ -485,11 +463,13 @@ soc () {
fi
${git} "${DIR}/patches/soc/imx/0001-first-pass-imx6q-ccimx6sbc.patch"
- ${git} "${DIR}/patches/soc/imx/0002-imx6-wl1835-base-boards.patch"
- ${git} "${DIR}/patches/soc/imx/0003-imx6q-sabresd-add-support-for-wilink8-wlan-and-bluet.patch"
- ${git} "${DIR}/patches/soc/imx/0004-imx6sl-evk-add-support-for-wilink8-wlan-and-bluetoot.patch"
${git} "${DIR}/patches/soc/imx/0005-mcimx6ul-bb-and-ism43362-b81-evb.patch"
+ #need to be re-synced...
+ #${git} "${DIR}/patches/soc/imx/0002-imx6-wl1835-base-boards.patch"
+ #${git} "${DIR}/patches/soc/imx/0003-imx6q-sabresd-add-support-for-wilink8-wlan-and-bluet.patch"
+ #${git} "${DIR}/patches/soc/imx/0004-imx6sl-evk-add-support-for-wilink8-wlan-and-bluetoot.patch"
+
if [ "x${regenerate}" = "xenable" ] ; then
wdir="soc/imx"
number=5
@@ -545,10 +525,13 @@ soc () {
${git} "${DIR}/patches/soc/ti/bone_common/0002-ARM-dts-am335x-bone-common-add-collision-and-carrier.patch"
${git} "${DIR}/patches/soc/ti/bone_common/0003-ARM-dts-am335x-bone-common-disable-running-JTAG.patch"
${git} "${DIR}/patches/soc/ti/bone_common/0004-ARM-dts-am335x-bone-common-overlays.patch"
+ #FIXME: still broken...
+ ${git} "${DIR}/patches/soc/ti/bone_common/0005-HACK-am335x-bone-common.dtsi-pwr-button.patch"
+ ${git} "${DIR}/patches/soc/ti/bone_common/0006-ARM-dts-am335x-bone-common-rtc-defined-in-common.patch"
if [ "x${regenerate}" = "xenable" ] ; then
wdir="soc/ti/bone_common"
- number=4
+ number=6
cleanup
fi
@@ -615,11 +598,10 @@ soc () {
fi
${git} "${DIR}/patches/soc/ti/sancloud/0001-add-am335x-sancloud-bbe.patch"
- ${git} "${DIR}/patches/soc/ti/sancloud/0002-am335x-sancloud-bbe-update-lps331ap-mpu6050-irq-pins.patch"
if [ "x${regenerate}" = "xenable" ] ; then
wdir="soc/ti/sancloud"
- number=2
+ number=1
cleanup
fi
@@ -769,6 +751,7 @@ beaglebone () {
device="am335x-bonegreen-wireless-led-hack.dtb" ; dtb_makefile_append
device="am335x-boneblack-wireless.dtb" ; dtb_makefile_append
+ device="am335x-boneblack-wireless-emmc-overlay.dtb" ; dtb_makefile_append
device="am335x-boneblue.dtb" ; dtb_makefile_append
device="am335x-sancloud-bbe.dtb" ; dtb_makefile_append
@@ -858,7 +841,7 @@ more_fixes () {
}
###
-backports
+#backports
#reverts
#fixes
drivers
diff --git a/patches/backports/iio/0001-backports-iio-from-linux.git.patch b/patches/backports/iio/0001-backports-iio-from-linux.git.patch
deleted file mode 100644
index 86e9257e2d5260adc7fb1bd5302ef4301bbd16dd..0000000000000000000000000000000000000000
--- a/patches/backports/iio/0001-backports-iio-from-linux.git.patch
+++ /dev/null
@@ -1,11829 +0,0 @@
-From 64f1c95e79c1fdaf80a49bc6382f4b6a29985d7e Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 7 Oct 2016 10:01:57 -0500
-Subject: [PATCH] backports: iio: from: linux.git
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- drivers/iio/accel/Kconfig | 56 +-
- drivers/iio/accel/Makefile | 5 +
- drivers/iio/accel/bma180.c | 9 +-
- drivers/iio/accel/dmard06.c | 241 +++
- drivers/iio/accel/dmard09.c | 157 ++
- drivers/iio/accel/kxcjk-1013.c | 1 +
- drivers/iio/accel/kxsd9-i2c.c | 64 +
- drivers/iio/accel/kxsd9-spi.c | 56 +
- drivers/iio/accel/kxsd9.c | 435 +++--
- drivers/iio/accel/kxsd9.h | 12 +
- drivers/iio/accel/mc3230.c | 211 +++
- drivers/iio/accel/mma7660.c | 1 +
- drivers/iio/accel/mxc6255.c | 4 +-
- drivers/iio/accel/ssp_accel_sensor.c | 2 +-
- drivers/iio/adc/Kconfig | 61 +
- drivers/iio/adc/Makefile | 5 +
- drivers/iio/adc/ad7266.c | 4 +-
- drivers/iio/adc/ad7298.c | 20 +-
- drivers/iio/adc/ad7793.c | 10 +-
- drivers/iio/adc/at91_adc.c | 13 +
- drivers/iio/adc/ina2xx-adc.c | 5 -
- drivers/iio/adc/ltc2485.c | 148 ++
- drivers/iio/adc/men_z188_adc.c | 2 +-
- drivers/iio/adc/mt6577_auxadc.c | 291 ++++
- drivers/iio/adc/nau7802.c | 2 +-
- drivers/iio/adc/stx104.c | 380 +++++
- drivers/iio/adc/ti-adc12138.c | 552 +++++++
- drivers/iio/adc/ti-adc161s626.c | 248 +++
- drivers/iio/adc/ti-ads1015.c | 2 +
- drivers/iio/adc/ti-ads8688.c | 4 +-
- drivers/iio/buffer/industrialio-buffer-cb.c | 24 +-
- drivers/iio/buffer/industrialio-triggered-buffer.c | 42 +
- drivers/iio/chemical/Kconfig | 1 +
- drivers/iio/chemical/atlas-ph-sensor.c | 81 +-
- drivers/iio/chemical/vz89x.c | 201 ++-
- .../iio/common/hid-sensors/hid-sensor-trigger.c | 29 +-
- drivers/iio/common/st_sensors/st_sensors_buffer.c | 2 +-
- drivers/iio/common/st_sensors/st_sensors_core.c | 53 +-
- drivers/iio/common/st_sensors/st_sensors_trigger.c | 4 +-
- drivers/iio/dac/Kconfig | 29 +-
- drivers/iio/dac/Makefile | 3 +-
- drivers/iio/dac/ad5755.c | 2 +-
- drivers/iio/dac/ad8801.c | 239 +++
- drivers/iio/dac/cio-dac.c | 144 ++
- drivers/iio/gyro/ssp_gyro_sensor.c | 2 +-
- drivers/iio/humidity/Kconfig | 8 +-
- drivers/iio/industrialio-core.c | 3 +-
- drivers/iio/industrialio-event.c | 8 +
- drivers/iio/industrialio-trigger.c | 95 ++
- drivers/iio/light/Kconfig | 19 +-
- drivers/iio/light/Makefile | 1 +
- drivers/iio/light/si1145.c | 1404 ++++++++++++++++
- drivers/iio/light/us5182d.c | 2 +-
- drivers/iio/light/vcnl4000.c | 72 +-
- drivers/iio/magnetometer/Kconfig | 16 +-
- drivers/iio/magnetometer/Makefile | 1 +
- drivers/iio/magnetometer/ak8974.c | 860 ++++++++++
- drivers/iio/magnetometer/mag3110.c | 23 +-
- drivers/iio/pressure/Kconfig | 24 +-
- drivers/iio/pressure/Makefile | 3 +
- drivers/iio/pressure/ms5611_core.c | 6 +-
- drivers/iio/pressure/zpa2326.c | 1735 ++++++++++++++++++++
- drivers/iio/pressure/zpa2326.h | 89 +
- drivers/iio/pressure/zpa2326_i2c.c | 99 ++
- drivers/iio/pressure/zpa2326_spi.c | 103 ++
- drivers/iio/proximity/sx9500.c | 9 +-
- drivers/iio/temperature/Kconfig | 16 +
- drivers/iio/temperature/Makefile | 1 +
- drivers/iio/temperature/maxim_thermocouple.c | 281 ++++
- drivers/staging/iio/accel/sca3000.h | 1 +
- drivers/staging/iio/accel/sca3000_core.c | 244 ++-
- drivers/staging/iio/adc/ad7280a.c | 2 +-
- drivers/staging/iio/impedance-analyzer/ad5933.c | 38 +-
- drivers/staging/iio/light/isl29018.c | 138 +-
- drivers/staging/iio/light/isl29028.c | 103 +-
- drivers/staging/iio/light/tsl2583.c | 2 +-
- drivers/staging/iio/meter/ade7754.c | 59 +-
- drivers/staging/iio/meter/ade7758_ring.c | 10 +-
- drivers/staging/iio/meter/ade7854.c | 40 +-
- include/linux/hid-sensor-hub.h | 1 +
- include/linux/iio/consumer.h | 12 +
- include/linux/iio/iio.h | 3 +
- include/linux/iio/trigger.h | 26 +
- include/linux/iio/triggered_buffer.h | 8 +
- 84 files changed, 8783 insertions(+), 639 deletions(-)
- create mode 100644 drivers/iio/accel/dmard06.c
- create mode 100644 drivers/iio/accel/dmard09.c
- create mode 100644 drivers/iio/accel/kxsd9-i2c.c
- create mode 100644 drivers/iio/accel/kxsd9-spi.c
- create mode 100644 drivers/iio/accel/kxsd9.h
- create mode 100644 drivers/iio/accel/mc3230.c
- create mode 100644 drivers/iio/adc/ltc2485.c
- create mode 100644 drivers/iio/adc/mt6577_auxadc.c
- create mode 100644 drivers/iio/adc/stx104.c
- create mode 100644 drivers/iio/adc/ti-adc12138.c
- create mode 100644 drivers/iio/adc/ti-adc161s626.c
- create mode 100644 drivers/iio/dac/ad8801.c
- create mode 100644 drivers/iio/dac/cio-dac.c
- create mode 100644 drivers/iio/light/si1145.c
- create mode 100644 drivers/iio/magnetometer/ak8974.c
- create mode 100644 drivers/iio/pressure/zpa2326.c
- create mode 100644 drivers/iio/pressure/zpa2326.h
- create mode 100644 drivers/iio/pressure/zpa2326_i2c.c
- create mode 100644 drivers/iio/pressure/zpa2326_spi.c
- create mode 100644 drivers/iio/temperature/maxim_thermocouple.c
-
-diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
-index 78f148e..2b791fe 100644
---- a/drivers/iio/accel/Kconfig
-+++ b/drivers/iio/accel/Kconfig
-@@ -52,6 +52,27 @@ config BMC150_ACCEL_SPI
- tristate
- select REGMAP_SPI
-
-+config DMARD06
-+ tristate "Domintech DMARD06 Digital Accelerometer Driver"
-+ depends on OF || COMPILE_TEST
-+ depends on I2C
-+ help
-+ Say yes here to build support for the Domintech low-g tri-axial
-+ digital accelerometers: DMARD05, DMARD06, DMARD07.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called dmard06.
-+
-+config DMARD09
-+ tristate "Domintech DMARD09 3-axis Accelerometer Driver"
-+ depends on I2C
-+ help
-+ Say yes here to get support for the Domintech DMARD09 3-axis
-+ accelerometer.
-+
-+ Choosing M will build the driver as a module. If so, the module
-+ will be called dmard09.
-+
- config HID_SENSOR_ACCEL_3D
- depends on HID_SENSOR_HUB
- select IIO_BUFFER
-@@ -98,14 +119,35 @@ config IIO_ST_ACCEL_SPI_3AXIS
-
- config KXSD9
- tristate "Kionix KXSD9 Accelerometer Driver"
-- depends on SPI
-+ select IIO_BUFFER
-+ select IIO_TRIGGERED_BUFFER
- help
- Say yes here to build support for the Kionix KXSD9 accelerometer.
-- Currently this only supports the device via an SPI interface.
-+ It can be accessed using an (optional) SPI or I2C interface.
-
- To compile this driver as a module, choose M here: the module
- will be called kxsd9.
-
-+config KXSD9_SPI
-+ tristate "Kionix KXSD9 SPI transport"
-+ depends on KXSD9
-+ depends on SPI
-+ default KXSD9
-+ select REGMAP_SPI
-+ help
-+ Say yes here to enable the Kionix KXSD9 accelerometer
-+ SPI transport channel.
-+
-+config KXSD9_I2C
-+ tristate "Kionix KXSD9 I2C transport"
-+ depends on KXSD9
-+ depends on I2C
-+ default KXSD9
-+ select REGMAP_I2C
-+ help
-+ Say yes here to enable the Kionix KXSD9 accelerometer
-+ I2C transport channel.
-+
- config KXCJK1013
- tristate "Kionix 3-Axis Accelerometer Driver"
- depends on I2C
-@@ -119,6 +161,16 @@ config KXCJK1013
- To compile this driver as a module, choose M here: the module will
- be called kxcjk-1013.
-
-+config MC3230
-+ tristate "mCube MC3230 Digital Accelerometer Driver"
-+ depends on I2C
-+ help
-+ Say yes here to build support for the mCube MC3230 low-g tri-axial
-+ digital accelerometer.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called mc3230.
-+
- config MMA7455
- tristate
- select IIO_BUFFER
-diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile
-index 6cedbec..f5d3dde 100644
---- a/drivers/iio/accel/Makefile
-+++ b/drivers/iio/accel/Makefile
-@@ -8,9 +8,14 @@ obj-$(CONFIG_BMA220) += bma220_spi.o
- obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel-core.o
- obj-$(CONFIG_BMC150_ACCEL_I2C) += bmc150-accel-i2c.o
- obj-$(CONFIG_BMC150_ACCEL_SPI) += bmc150-accel-spi.o
-+obj-$(CONFIG_DMARD06) += dmard06.o
-+obj-$(CONFIG_DMARD09) += dmard09.o
- obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o
- obj-$(CONFIG_KXCJK1013) += kxcjk-1013.o
- obj-$(CONFIG_KXSD9) += kxsd9.o
-+obj-$(CONFIG_KXSD9_SPI) += kxsd9-spi.o
-+obj-$(CONFIG_KXSD9_I2C) += kxsd9-i2c.o
-+obj-$(CONFIG_MC3230) += mc3230.o
-
- obj-$(CONFIG_MMA7455) += mma7455_core.o
- obj-$(CONFIG_MMA7455_I2C) += mma7455_i2c.o
-diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c
-index e3f88ba..0890934 100644
---- a/drivers/iio/accel/bma180.c
-+++ b/drivers/iio/accel/bma180.c
-@@ -469,13 +469,14 @@ static int bma180_read_raw(struct iio_dev *indio_dev,
-
- switch (mask) {
- case IIO_CHAN_INFO_RAW:
-+ ret = iio_device_claim_direct_mode(indio_dev);
-+ if (ret)
-+ return ret;
-+
- mutex_lock(&data->mutex);
-- if (iio_buffer_enabled(indio_dev)) {
-- mutex_unlock(&data->mutex);
-- return -EBUSY;
-- }
- ret = bma180_get_data_reg(data, chan->scan_index);
- mutex_unlock(&data->mutex);
-+ iio_device_release_direct_mode(indio_dev);
- if (ret < 0)
- return ret;
- *val = sign_extend32(ret >> chan->scan_type.shift,
-diff --git a/drivers/iio/accel/dmard06.c b/drivers/iio/accel/dmard06.c
-new file mode 100644
-index 0000000..656ca8e
---- /dev/null
-+++ b/drivers/iio/accel/dmard06.c
-@@ -0,0 +1,241 @@
-+/*
-+ * IIO driver for Domintech DMARD06 accelerometer
-+ *
-+ * Copyright (C) 2016 Aleksei Mamlin <mamlinav@gmail.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms and conditions of the GNU General Public License,
-+ * version 2, as published by the Free Software Foundation.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/i2c.h>
-+#include <linux/iio/iio.h>
-+
-+#define DMARD06_DRV_NAME "dmard06"
-+
-+/* Device data registers */
-+#define DMARD06_CHIP_ID_REG 0x0f
-+#define DMARD06_TOUT_REG 0x40
-+#define DMARD06_XOUT_REG 0x41
-+#define DMARD06_YOUT_REG 0x42
-+#define DMARD06_ZOUT_REG 0x43
-+#define DMARD06_CTRL1_REG 0x44
-+
-+/* Device ID value */
-+#define DMARD05_CHIP_ID 0x05
-+#define DMARD06_CHIP_ID 0x06
-+#define DMARD07_CHIP_ID 0x07
-+
-+/* Device values */
-+#define DMARD05_AXIS_SCALE_VAL 15625
-+#define DMARD06_AXIS_SCALE_VAL 31250
-+#define DMARD06_TEMP_CENTER_VAL 25
-+#define DMARD06_SIGN_BIT 7
-+
-+/* Device power modes */
-+#define DMARD06_MODE_NORMAL 0x27
-+#define DMARD06_MODE_POWERDOWN 0x00
-+
-+/* Device channels */
-+#define DMARD06_ACCEL_CHANNEL(_axis, _reg) { \
-+ .type = IIO_ACCEL, \
-+ .address = _reg, \
-+ .channel2 = IIO_MOD_##_axis, \
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
-+ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
-+ .modified = 1, \
-+}
-+
-+#define DMARD06_TEMP_CHANNEL(_reg) { \
-+ .type = IIO_TEMP, \
-+ .address = _reg, \
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
-+ BIT(IIO_CHAN_INFO_OFFSET), \
-+}
-+
-+struct dmard06_data {
-+ struct i2c_client *client;
-+ u8 chip_id;
-+};
-+
-+static const struct iio_chan_spec dmard06_channels[] = {
-+ DMARD06_ACCEL_CHANNEL(X, DMARD06_XOUT_REG),
-+ DMARD06_ACCEL_CHANNEL(Y, DMARD06_YOUT_REG),
-+ DMARD06_ACCEL_CHANNEL(Z, DMARD06_ZOUT_REG),
-+ DMARD06_TEMP_CHANNEL(DMARD06_TOUT_REG),
-+};
-+
-+static int dmard06_read_raw(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan,
-+ int *val, int *val2, long mask)
-+{
-+ struct dmard06_data *dmard06 = iio_priv(indio_dev);
-+ int ret;
-+
-+ switch (mask) {
-+ case IIO_CHAN_INFO_RAW:
-+ ret = i2c_smbus_read_byte_data(dmard06->client,
-+ chan->address);
-+ if (ret < 0) {
-+ dev_err(&dmard06->client->dev,
-+ "Error reading data: %d\n", ret);
-+ return ret;
-+ }
-+
-+ *val = sign_extend32(ret, DMARD06_SIGN_BIT);
-+
-+ if (dmard06->chip_id == DMARD06_CHIP_ID)
-+ *val = *val >> 1;
-+
-+ switch (chan->type) {
-+ case IIO_ACCEL:
-+ return IIO_VAL_INT;
-+ case IIO_TEMP:
-+ if (dmard06->chip_id != DMARD06_CHIP_ID)
-+ *val = *val / 2;
-+ return IIO_VAL_INT;
-+ default:
-+ return -EINVAL;
-+ }
-+ case IIO_CHAN_INFO_OFFSET:
-+ switch (chan->type) {
-+ case IIO_TEMP:
-+ *val = DMARD06_TEMP_CENTER_VAL;
-+ return IIO_VAL_INT;
-+ default:
-+ return -EINVAL;
-+ }
-+ case IIO_CHAN_INFO_SCALE:
-+ switch (chan->type) {
-+ case IIO_ACCEL:
-+ *val = 0;
-+ if (dmard06->chip_id == DMARD06_CHIP_ID)
-+ *val2 = DMARD06_AXIS_SCALE_VAL;
-+ else
-+ *val2 = DMARD05_AXIS_SCALE_VAL;
-+ return IIO_VAL_INT_PLUS_MICRO;
-+ default:
-+ return -EINVAL;
-+ }
-+ default:
-+ return -EINVAL;
-+ }
-+}
-+
-+static const struct iio_info dmard06_info = {
-+ .driver_module = THIS_MODULE,
-+ .read_raw = dmard06_read_raw,
-+};
-+
-+static int dmard06_probe(struct i2c_client *client,
-+ const struct i2c_device_id *id)
-+{
-+ int ret;
-+ struct iio_dev *indio_dev;
-+ struct dmard06_data *dmard06;
-+
-+ if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
-+ dev_err(&client->dev, "I2C check functionality failed\n");
-+ return -ENXIO;
-+ }
-+
-+ indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*dmard06));
-+ if (!indio_dev) {
-+ dev_err(&client->dev, "Failed to allocate iio device\n");
-+ return -ENOMEM;
-+ }
-+
-+ dmard06 = iio_priv(indio_dev);
-+ dmard06->client = client;
-+
-+ ret = i2c_smbus_read_byte_data(dmard06->client, DMARD06_CHIP_ID_REG);
-+ if (ret < 0) {
-+ dev_err(&client->dev, "Error reading chip id: %d\n", ret);
-+ return ret;
-+ }
-+
-+ if (ret != DMARD05_CHIP_ID && ret != DMARD06_CHIP_ID &&
-+ ret != DMARD07_CHIP_ID) {
-+ dev_err(&client->dev, "Invalid chip id: %02d\n", ret);
-+ return -ENODEV;
-+ }
-+
-+ dmard06->chip_id = ret;
-+
-+ i2c_set_clientdata(client, indio_dev);
-+ indio_dev->dev.parent = &client->dev;
-+ indio_dev->name = DMARD06_DRV_NAME;
-+ indio_dev->modes = INDIO_DIRECT_MODE;
-+ indio_dev->channels = dmard06_channels;
-+ indio_dev->num_channels = ARRAY_SIZE(dmard06_channels);
-+ indio_dev->info = &dmard06_info;
-+
-+ return devm_iio_device_register(&client->dev, indio_dev);
-+}
-+
-+#ifdef CONFIG_PM_SLEEP
-+static int dmard06_suspend(struct device *dev)
-+{
-+ struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
-+ struct dmard06_data *dmard06 = iio_priv(indio_dev);
-+ int ret;
-+
-+ ret = i2c_smbus_write_byte_data(dmard06->client, DMARD06_CTRL1_REG,
-+ DMARD06_MODE_POWERDOWN);
-+ if (ret < 0)
-+ return ret;
-+
-+ return 0;
-+}
-+
-+static int dmard06_resume(struct device *dev)
-+{
-+ struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
-+ struct dmard06_data *dmard06 = iio_priv(indio_dev);
-+ int ret;
-+
-+ ret = i2c_smbus_write_byte_data(dmard06->client, DMARD06_CTRL1_REG,
-+ DMARD06_MODE_NORMAL);
-+ if (ret < 0)
-+ return ret;
-+
-+ return 0;
-+}
-+
-+static SIMPLE_DEV_PM_OPS(dmard06_pm_ops, dmard06_suspend, dmard06_resume);
-+#define DMARD06_PM_OPS (&dmard06_pm_ops)
-+#else
-+#define DMARD06_PM_OPS NULL
-+#endif
-+
-+static const struct i2c_device_id dmard06_id[] = {
-+ { "dmard05", 0 },
-+ { "dmard06", 0 },
-+ { "dmard07", 0 },
-+ { }
-+};
-+MODULE_DEVICE_TABLE(i2c, dmard06_id);
-+
-+static const struct of_device_id dmard06_of_match[] = {
-+ { .compatible = "domintech,dmard05" },
-+ { .compatible = "domintech,dmard06" },
-+ { .compatible = "domintech,dmard07" },
-+ { }
-+};
-+MODULE_DEVICE_TABLE(of, dmard06_of_match);
-+
-+static struct i2c_driver dmard06_driver = {
-+ .probe = dmard06_probe,
-+ .id_table = dmard06_id,
-+ .driver = {
-+ .name = DMARD06_DRV_NAME,
-+ .of_match_table = of_match_ptr(dmard06_of_match),
-+ .pm = DMARD06_PM_OPS,
-+ },
-+};
-+module_i2c_driver(dmard06_driver);
-+
-+MODULE_AUTHOR("Aleksei Mamlin <mamlinav@gmail.com>");
-+MODULE_DESCRIPTION("Domintech DMARD06 accelerometer driver");
-+MODULE_LICENSE("GPL v2");
-diff --git a/drivers/iio/accel/dmard09.c b/drivers/iio/accel/dmard09.c
-new file mode 100644
-index 0000000..d3a28f9
---- /dev/null
-+++ b/drivers/iio/accel/dmard09.c
-@@ -0,0 +1,157 @@
-+/*
-+ * IIO driver for the 3-axis accelerometer Domintech DMARD09.
-+ *
-+ * Copyright (c) 2016, Jelle van der Waa <jelle@vdwaa.nl>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms and conditions of the GNU General Public License,
-+ * version 2, as published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope 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 <asm/unaligned.h>
-+#include <linux/module.h>
-+#include <linux/i2c.h>
-+#include <linux/iio/iio.h>
-+
-+#define DMARD09_DRV_NAME "dmard09"
-+
-+#define DMARD09_REG_CHIPID 0x18
-+#define DMARD09_REG_STAT 0x0A
-+#define DMARD09_REG_X 0x0C
-+#define DMARD09_REG_Y 0x0E
-+#define DMARD09_REG_Z 0x10
-+#define DMARD09_CHIPID 0x95
-+
-+#define DMARD09_BUF_LEN 8
-+#define DMARD09_AXIS_X 0
-+#define DMARD09_AXIS_Y 1
-+#define DMARD09_AXIS_Z 2
-+#define DMARD09_AXIS_X_OFFSET ((DMARD09_AXIS_X + 1) * 2)
-+#define DMARD09_AXIS_Y_OFFSET ((DMARD09_AXIS_Y + 1 )* 2)
-+#define DMARD09_AXIS_Z_OFFSET ((DMARD09_AXIS_Z + 1) * 2)
-+
-+struct dmard09_data {
-+ struct i2c_client *client;
-+};
-+
-+#define DMARD09_CHANNEL(_axis, offset) { \
-+ .type = IIO_ACCEL, \
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
-+ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
-+ .modified = 1, \
-+ .address = offset, \
-+ .channel2 = IIO_MOD_##_axis, \
-+}
-+
-+static const struct iio_chan_spec dmard09_channels[] = {
-+ DMARD09_CHANNEL(X, DMARD09_AXIS_X_OFFSET),
-+ DMARD09_CHANNEL(Y, DMARD09_AXIS_Y_OFFSET),
-+ DMARD09_CHANNEL(Z, DMARD09_AXIS_Z_OFFSET),
-+};
-+
-+static int dmard09_read_raw(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan,
-+ int *val, int *val2, long mask)
-+{
-+ struct dmard09_data *data = iio_priv(indio_dev);
-+ u8 buf[DMARD09_BUF_LEN];
-+ int ret;
-+ s16 accel;
-+
-+ switch (mask) {
-+ case IIO_CHAN_INFO_RAW:
-+ /*
-+ * Read from the DMAR09_REG_STAT register, since the chip
-+ * caches reads from the individual X, Y, Z registers.
-+ */
-+ ret = i2c_smbus_read_i2c_block_data(data->client,
-+ DMARD09_REG_STAT,
-+ DMARD09_BUF_LEN, buf);
-+ if (ret < 0) {
-+ dev_err(&data->client->dev, "Error reading reg %d\n",
-+ DMARD09_REG_STAT);
-+ return ret;
-+ }
-+
-+ accel = get_unaligned_le16(&buf[chan->address]);
-+
-+ /* Remove lower 3 bits and sign extend */
-+ accel <<= 4;
-+ accel >>= 7;
-+
-+ *val = accel;
-+
-+ return IIO_VAL_INT;
-+ default:
-+ return -EINVAL;
-+ }
-+}
-+
-+static const struct iio_info dmard09_info = {
-+ .driver_module = THIS_MODULE,
-+ .read_raw = dmard09_read_raw,
-+};
-+
-+static int dmard09_probe(struct i2c_client *client,
-+ const struct i2c_device_id *id)
-+{
-+ int ret;
-+ struct iio_dev *indio_dev;
-+ struct dmard09_data *data;
-+
-+ indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
-+ if (!indio_dev) {
-+ dev_err(&client->dev, "iio allocation failed\n");
-+ return -ENOMEM;
-+ }
-+
-+ data = iio_priv(indio_dev);
-+ data->client = client;
-+
-+ ret = i2c_smbus_read_byte_data(data->client, DMARD09_REG_CHIPID);
-+ if (ret < 0) {
-+ dev_err(&client->dev, "Error reading chip id %d\n", ret);
-+ return ret;
-+ }
-+
-+ if (ret != DMARD09_CHIPID) {
-+ dev_err(&client->dev, "Invalid chip id %d\n", ret);
-+ return -ENODEV;
-+ }
-+
-+ i2c_set_clientdata(client, indio_dev);
-+ indio_dev->dev.parent = &client->dev;
-+ indio_dev->name = DMARD09_DRV_NAME;
-+ indio_dev->modes = INDIO_DIRECT_MODE;
-+ indio_dev->channels = dmard09_channels;
-+ indio_dev->num_channels = ARRAY_SIZE(dmard09_channels);
-+ indio_dev->info = &dmard09_info;
-+
-+ return devm_iio_device_register(&client->dev, indio_dev);
-+}
-+
-+static const struct i2c_device_id dmard09_id[] = {
-+ { "dmard09", 0},
-+ { },
-+};
-+
-+MODULE_DEVICE_TABLE(i2c, dmard09_id);
-+
-+static struct i2c_driver dmard09_driver = {
-+ .driver = {
-+ .name = DMARD09_DRV_NAME
-+ },
-+ .probe = dmard09_probe,
-+ .id_table = dmard09_id,
-+};
-+
-+module_i2c_driver(dmard09_driver);
-+
-+MODULE_AUTHOR("Jelle van der Waa <jelle@vdwaa.nl>");
-+MODULE_DESCRIPTION("DMARD09 3-axis accelerometer driver");
-+MODULE_LICENSE("GPL");
-diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
-index 765a723..3f968c4 100644
---- a/drivers/iio/accel/kxcjk-1013.c
-+++ b/drivers/iio/accel/kxcjk-1013.c
-@@ -1392,6 +1392,7 @@ static const struct acpi_device_id kx_acpi_match[] = {
- {"KXCJ1013", KXCJK1013},
- {"KXCJ1008", KXCJ91008},
- {"KXCJ9000", KXCJ91008},
-+ {"KIOX000A", KXCJ91008},
- {"KXTJ1009", KXTJ21009},
- {"SMO8500", KXCJ91008},
- { },
-diff --git a/drivers/iio/accel/kxsd9-i2c.c b/drivers/iio/accel/kxsd9-i2c.c
-new file mode 100644
-index 0000000..95e2085
---- /dev/null
-+++ b/drivers/iio/accel/kxsd9-i2c.c
-@@ -0,0 +1,64 @@
-+#include <linux/device.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+#include <linux/i2c.h>
-+#include <linux/delay.h>
-+#include <linux/regmap.h>
-+
-+#include "kxsd9.h"
-+
-+static int kxsd9_i2c_probe(struct i2c_client *i2c,
-+ const struct i2c_device_id *id)
-+{
-+ static const struct regmap_config config = {
-+ .reg_bits = 8,
-+ .val_bits = 8,
-+ .max_register = 0x0e,
-+ };
-+ struct regmap *regmap;
-+
-+ regmap = devm_regmap_init_i2c(i2c, &config);
-+ if (IS_ERR(regmap)) {
-+ dev_err(&i2c->dev, "Failed to register i2c regmap %d\n",
-+ (int)PTR_ERR(regmap));
-+ return PTR_ERR(regmap);
-+ }
-+
-+ return kxsd9_common_probe(&i2c->dev,
-+ regmap,
-+ i2c->name);
-+}
-+
-+static int kxsd9_i2c_remove(struct i2c_client *client)
-+{
-+ return kxsd9_common_remove(&client->dev);
-+}
-+
-+#ifdef CONFIG_OF
-+static const struct of_device_id kxsd9_of_match[] = {
-+ { .compatible = "kionix,kxsd9", },
-+ { },
-+};
-+MODULE_DEVICE_TABLE(of, kxsd9_of_match);
-+#else
-+#define kxsd9_of_match NULL
-+#endif
-+
-+static const struct i2c_device_id kxsd9_i2c_id[] = {
-+ {"kxsd9", 0},
-+ { },
-+};
-+MODULE_DEVICE_TABLE(i2c, kxsd9_i2c_id);
-+
-+static struct i2c_driver kxsd9_i2c_driver = {
-+ .driver = {
-+ .name = "kxsd9",
-+ .of_match_table = of_match_ptr(kxsd9_of_match),
-+ .pm = &kxsd9_dev_pm_ops,
-+ },
-+ .probe = kxsd9_i2c_probe,
-+ .remove = kxsd9_i2c_remove,
-+ .id_table = kxsd9_i2c_id,
-+};
-+module_i2c_driver(kxsd9_i2c_driver);
-diff --git a/drivers/iio/accel/kxsd9-spi.c b/drivers/iio/accel/kxsd9-spi.c
-new file mode 100644
-index 0000000..b7d0078
---- /dev/null
-+++ b/drivers/iio/accel/kxsd9-spi.c
-@@ -0,0 +1,56 @@
-+#include <linux/device.h>
-+#include <linux/kernel.h>
-+#include <linux/spi/spi.h>
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+#include <linux/regmap.h>
-+
-+#include "kxsd9.h"
-+
-+static int kxsd9_spi_probe(struct spi_device *spi)
-+{
-+ static const struct regmap_config config = {
-+ .reg_bits = 8,
-+ .val_bits = 8,
-+ .max_register = 0x0e,
-+ };
-+ struct regmap *regmap;
-+
-+ spi->mode = SPI_MODE_0;
-+ regmap = devm_regmap_init_spi(spi, &config);
-+ if (IS_ERR(regmap)) {
-+ dev_err(&spi->dev, "%s: regmap allocation failed: %ld\n",
-+ __func__, PTR_ERR(regmap));
-+ return PTR_ERR(regmap);
-+ }
-+
-+ return kxsd9_common_probe(&spi->dev,
-+ regmap,
-+ spi_get_device_id(spi)->name);
-+}
-+
-+static int kxsd9_spi_remove(struct spi_device *spi)
-+{
-+ return kxsd9_common_remove(&spi->dev);
-+}
-+
-+static const struct spi_device_id kxsd9_spi_id[] = {
-+ {"kxsd9", 0},
-+ { },
-+};
-+MODULE_DEVICE_TABLE(spi, kxsd9_spi_id);
-+
-+static struct spi_driver kxsd9_spi_driver = {
-+ .driver = {
-+ .name = "kxsd9",
-+ .pm = &kxsd9_dev_pm_ops,
-+ },
-+ .probe = kxsd9_spi_probe,
-+ .remove = kxsd9_spi_remove,
-+ .id_table = kxsd9_spi_id,
-+};
-+module_spi_driver(kxsd9_spi_driver);
-+
-+MODULE_AUTHOR("Jonathan Cameron <jic23@kernel.org>");
-+MODULE_DESCRIPTION("Kionix KXSD9 SPI driver");
-+MODULE_LICENSE("GPL v2");
-diff --git a/drivers/iio/accel/kxsd9.c b/drivers/iio/accel/kxsd9.c
-index 9d72d4b..9af60ac 100644
---- a/drivers/iio/accel/kxsd9.c
-+++ b/drivers/iio/accel/kxsd9.c
-@@ -12,19 +12,25 @@
- * I have a suitable wire made up.
- *
- * TODO: Support the motion detector
-- * Uses register address incrementing so could have a
-- * heavily optimized ring buffer access function.
- */
-
- #include <linux/device.h>
- #include <linux/kernel.h>
--#include <linux/spi/spi.h>
- #include <linux/sysfs.h>
- #include <linux/slab.h>
- #include <linux/module.h>
--
-+#include <linux/regmap.h>
-+#include <linux/bitops.h>
-+#include <linux/delay.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/pm_runtime.h>
- #include <linux/iio/iio.h>
- #include <linux/iio/sysfs.h>
-+#include <linux/iio/buffer.h>
-+#include <linux/iio/triggered_buffer.h>
-+#include <linux/iio/trigger_consumer.h>
-+
-+#include "kxsd9.h"
-
- #define KXSD9_REG_X 0x00
- #define KXSD9_REG_Y 0x02
-@@ -33,28 +39,45 @@
- #define KXSD9_REG_RESET 0x0a
- #define KXSD9_REG_CTRL_C 0x0c
-
--#define KXSD9_FS_MASK 0x03
-+#define KXSD9_CTRL_C_FS_MASK 0x03
-+#define KXSD9_CTRL_C_FS_8G 0x00
-+#define KXSD9_CTRL_C_FS_6G 0x01
-+#define KXSD9_CTRL_C_FS_4G 0x02
-+#define KXSD9_CTRL_C_FS_2G 0x03
-+#define KXSD9_CTRL_C_MOT_LAT BIT(3)
-+#define KXSD9_CTRL_C_MOT_LEV BIT(4)
-+#define KXSD9_CTRL_C_LP_MASK 0xe0
-+#define KXSD9_CTRL_C_LP_NONE 0x00
-+#define KXSD9_CTRL_C_LP_2000HZC BIT(5)
-+#define KXSD9_CTRL_C_LP_2000HZB BIT(6)
-+#define KXSD9_CTRL_C_LP_2000HZA (BIT(5)|BIT(6))
-+#define KXSD9_CTRL_C_LP_1000HZ BIT(7)
-+#define KXSD9_CTRL_C_LP_500HZ (BIT(7)|BIT(5))
-+#define KXSD9_CTRL_C_LP_100HZ (BIT(7)|BIT(6))
-+#define KXSD9_CTRL_C_LP_50HZ (BIT(7)|BIT(6)|BIT(5))
-
- #define KXSD9_REG_CTRL_B 0x0d
--#define KXSD9_REG_CTRL_A 0x0e
-
--#define KXSD9_READ(a) (0x80 | (a))
--#define KXSD9_WRITE(a) (a)
-+#define KXSD9_CTRL_B_CLK_HLD BIT(7)
-+#define KXSD9_CTRL_B_ENABLE BIT(6)
-+#define KXSD9_CTRL_B_ST BIT(5) /* Self-test */
-+
-+#define KXSD9_REG_CTRL_A 0x0e
-
--#define KXSD9_STATE_RX_SIZE 2
--#define KXSD9_STATE_TX_SIZE 2
- /**
- * struct kxsd9_state - device related storage
-- * @buf_lock: protect the rx and tx buffers.
-- * @us: spi device
-- * @rx: single rx buffer storage
-- * @tx: single tx buffer storage
-- **/
-+ * @dev: pointer to the parent device
-+ * @map: regmap to the device
-+ * @orientation: mounting matrix, flipped axis etc
-+ * @regs: regulators for this device, VDD and IOVDD
-+ * @scale: the current scaling setting
-+ */
- struct kxsd9_state {
-- struct mutex buf_lock;
-- struct spi_device *us;
-- u8 rx[KXSD9_STATE_RX_SIZE] ____cacheline_aligned;
-- u8 tx[KXSD9_STATE_TX_SIZE];
-+ struct device *dev;
-+ struct regmap *map;
-+ struct iio_mount_matrix orientation;
-+ struct regulator_bulk_data regs[2];
-+ u8 scale;
- };
-
- #define KXSD9_SCALE_2G "0.011978"
-@@ -65,6 +88,14 @@ struct kxsd9_state {
- /* reverse order */
- static const int kxsd9_micro_scales[4] = { 47853, 35934, 23927, 11978 };
-
-+#define KXSD9_ZERO_G_OFFSET -2048
-+
-+/*
-+ * Regulator names
-+ */
-+static const char kxsd9_reg_vdd[] = "vdd";
-+static const char kxsd9_reg_iovdd[] = "iovdd";
-+
- static int kxsd9_write_scale(struct iio_dev *indio_dev, int micro)
- {
- int ret, i;
-@@ -79,42 +110,17 @@ static int kxsd9_write_scale(struct iio_dev *indio_dev, int micro)
- if (!foundit)
- return -EINVAL;
-
-- mutex_lock(&st->buf_lock);
-- ret = spi_w8r8(st->us, KXSD9_READ(KXSD9_REG_CTRL_C));
-+ ret = regmap_update_bits(st->map,
-+ KXSD9_REG_CTRL_C,
-+ KXSD9_CTRL_C_FS_MASK,
-+ i);
- if (ret < 0)
- goto error_ret;
-- st->tx[0] = KXSD9_WRITE(KXSD9_REG_CTRL_C);
-- st->tx[1] = (ret & ~KXSD9_FS_MASK) | i;
-
-- ret = spi_write(st->us, st->tx, 2);
--error_ret:
-- mutex_unlock(&st->buf_lock);
-- return ret;
--}
-+ /* Cached scale when the sensor is powered down */
-+ st->scale = i;
-
--static int kxsd9_read(struct iio_dev *indio_dev, u8 address)
--{
-- int ret;
-- struct kxsd9_state *st = iio_priv(indio_dev);
-- struct spi_transfer xfers[] = {
-- {
-- .bits_per_word = 8,
-- .len = 1,
-- .delay_usecs = 200,
-- .tx_buf = st->tx,
-- }, {
-- .bits_per_word = 8,
-- .len = 2,
-- .rx_buf = st->rx,
-- },
-- };
--
-- mutex_lock(&st->buf_lock);
-- st->tx[0] = KXSD9_READ(address);
-- ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers));
-- if (!ret)
-- ret = (((u16)(st->rx[0])) << 8) | (st->rx[1] & 0xF0);
-- mutex_unlock(&st->buf_lock);
-+error_ret:
- return ret;
- }
-
-@@ -136,6 +142,9 @@ static int kxsd9_write_raw(struct iio_dev *indio_dev,
- long mask)
- {
- int ret = -EINVAL;
-+ struct kxsd9_state *st = iio_priv(indio_dev);
-+
-+ pm_runtime_get_sync(st->dev);
-
- if (mask == IIO_CHAN_INFO_SCALE) {
- /* Check no integer component */
-@@ -144,6 +153,9 @@ static int kxsd9_write_raw(struct iio_dev *indio_dev,
- ret = kxsd9_write_scale(indio_dev, val2);
- }
-
-+ pm_runtime_mark_last_busy(st->dev);
-+ pm_runtime_put_autosuspend(st->dev);
-+
- return ret;
- }
-
-@@ -153,46 +165,154 @@ static int kxsd9_read_raw(struct iio_dev *indio_dev,
- {
- int ret = -EINVAL;
- struct kxsd9_state *st = iio_priv(indio_dev);
-+ unsigned int regval;
-+ __be16 raw_val;
-+ u16 nval;
-+
-+ pm_runtime_get_sync(st->dev);
-
- switch (mask) {
- case IIO_CHAN_INFO_RAW:
-- ret = kxsd9_read(indio_dev, chan->address);
-- if (ret < 0)
-+ ret = regmap_bulk_read(st->map, chan->address, &raw_val,
-+ sizeof(raw_val));
-+ if (ret)
- goto error_ret;
-- *val = ret;
-+ nval = be16_to_cpu(raw_val);
-+ /* Only 12 bits are valid */
-+ nval >>= 4;
-+ *val = nval;
-+ ret = IIO_VAL_INT;
-+ break;
-+ case IIO_CHAN_INFO_OFFSET:
-+ /* This has a bias of -2048 */
-+ *val = KXSD9_ZERO_G_OFFSET;
- ret = IIO_VAL_INT;
- break;
- case IIO_CHAN_INFO_SCALE:
-- ret = spi_w8r8(st->us, KXSD9_READ(KXSD9_REG_CTRL_C));
-+ ret = regmap_read(st->map,
-+ KXSD9_REG_CTRL_C,
-+ ®val);
- if (ret < 0)
- goto error_ret;
- *val = 0;
-- *val2 = kxsd9_micro_scales[ret & KXSD9_FS_MASK];
-+ *val2 = kxsd9_micro_scales[regval & KXSD9_CTRL_C_FS_MASK];
- ret = IIO_VAL_INT_PLUS_MICRO;
- break;
- }
-
- error_ret:
-+ pm_runtime_mark_last_busy(st->dev);
-+ pm_runtime_put_autosuspend(st->dev);
-+
- return ret;
- };
--#define KXSD9_ACCEL_CHAN(axis) \
-+
-+static irqreturn_t kxsd9_trigger_handler(int irq, void *p)
-+{
-+ const struct iio_poll_func *pf = p;
-+ struct iio_dev *indio_dev = pf->indio_dev;
-+ struct kxsd9_state *st = iio_priv(indio_dev);
-+ int ret;
-+ /* 4 * 16bit values AND timestamp */
-+ __be16 hw_values[8];
-+
-+ ret = regmap_bulk_read(st->map,
-+ KXSD9_REG_X,
-+ &hw_values,
-+ 8);
-+ if (ret) {
-+ dev_err(st->dev,
-+ "error reading data\n");
-+ return ret;
-+ }
-+
-+ iio_push_to_buffers_with_timestamp(indio_dev,
-+ hw_values,
-+ iio_get_time_ns(indio_dev));
-+ iio_trigger_notify_done(indio_dev->trig);
-+
-+ return IRQ_HANDLED;
-+}
-+
-+static int kxsd9_buffer_preenable(struct iio_dev *indio_dev)
-+{
-+ struct kxsd9_state *st = iio_priv(indio_dev);
-+
-+ pm_runtime_get_sync(st->dev);
-+
-+ return 0;
-+}
-+
-+static int kxsd9_buffer_postdisable(struct iio_dev *indio_dev)
-+{
-+ struct kxsd9_state *st = iio_priv(indio_dev);
-+
-+ pm_runtime_mark_last_busy(st->dev);
-+ pm_runtime_put_autosuspend(st->dev);
-+
-+ return 0;
-+}
-+
-+static const struct iio_buffer_setup_ops kxsd9_buffer_setup_ops = {
-+ .preenable = kxsd9_buffer_preenable,
-+ .postenable = iio_triggered_buffer_postenable,
-+ .predisable = iio_triggered_buffer_predisable,
-+ .postdisable = kxsd9_buffer_postdisable,
-+};
-+
-+static const struct iio_mount_matrix *
-+kxsd9_get_mount_matrix(const struct iio_dev *indio_dev,
-+ const struct iio_chan_spec *chan)
-+{
-+ struct kxsd9_state *st = iio_priv(indio_dev);
-+
-+ return &st->orientation;
-+}
-+
-+static const struct iio_chan_spec_ext_info kxsd9_ext_info[] = {
-+ IIO_MOUNT_MATRIX(IIO_SHARED_BY_TYPE, kxsd9_get_mount_matrix),
-+ { },
-+};
-+
-+#define KXSD9_ACCEL_CHAN(axis, index) \
- { \
- .type = IIO_ACCEL, \
- .modified = 1, \
- .channel2 = IIO_MOD_##axis, \
- .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
-- .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
-+ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | \
-+ BIT(IIO_CHAN_INFO_OFFSET), \
-+ .ext_info = kxsd9_ext_info, \
- .address = KXSD9_REG_##axis, \
-+ .scan_index = index, \
-+ .scan_type = { \
-+ .sign = 'u', \
-+ .realbits = 12, \
-+ .storagebits = 16, \
-+ .shift = 4, \
-+ .endianness = IIO_BE, \
-+ }, \
- }
-
- static const struct iio_chan_spec kxsd9_channels[] = {
-- KXSD9_ACCEL_CHAN(X), KXSD9_ACCEL_CHAN(Y), KXSD9_ACCEL_CHAN(Z),
-+ KXSD9_ACCEL_CHAN(X, 0),
-+ KXSD9_ACCEL_CHAN(Y, 1),
-+ KXSD9_ACCEL_CHAN(Z, 2),
- {
- .type = IIO_VOLTAGE,
- .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
- .indexed = 1,
- .address = KXSD9_REG_AUX,
-- }
-+ .scan_index = 3,
-+ .scan_type = {
-+ .sign = 'u',
-+ .realbits = 12,
-+ .storagebits = 16,
-+ .shift = 4,
-+ .endianness = IIO_BE,
-+ },
-+ },
-+ IIO_CHAN_SOFT_TIMESTAMP(4),
- };
-
- static const struct attribute_group kxsd9_attribute_group = {
-@@ -203,17 +323,69 @@ static int kxsd9_power_up(struct kxsd9_state *st)
- {
- int ret;
-
-- st->tx[0] = 0x0d;
-- st->tx[1] = 0x40;
-- ret = spi_write(st->us, st->tx, 2);
-+ /* Enable the regulators */
-+ ret = regulator_bulk_enable(ARRAY_SIZE(st->regs), st->regs);
-+ if (ret) {
-+ dev_err(st->dev, "Cannot enable regulators\n");
-+ return ret;
-+ }
-+
-+ /* Power up */
-+ ret = regmap_write(st->map,
-+ KXSD9_REG_CTRL_B,
-+ KXSD9_CTRL_B_ENABLE);
- if (ret)
- return ret;
-
-- st->tx[0] = 0x0c;
-- st->tx[1] = 0x9b;
-- return spi_write(st->us, st->tx, 2);
-+ /*
-+ * Set 1000Hz LPF, 2g fullscale, motion wakeup threshold 1g,
-+ * latched wakeup
-+ */
-+ ret = regmap_write(st->map,
-+ KXSD9_REG_CTRL_C,
-+ KXSD9_CTRL_C_LP_1000HZ |
-+ KXSD9_CTRL_C_MOT_LEV |
-+ KXSD9_CTRL_C_MOT_LAT |
-+ st->scale);
-+ if (ret)
-+ return ret;
-+
-+ /*
-+ * Power-up time depends on the LPF setting, but typ 15.9 ms, let's
-+ * set 20 ms to allow for some slack.
-+ */
-+ msleep(20);
-+
-+ return 0;
- };
-
-+static int kxsd9_power_down(struct kxsd9_state *st)
-+{
-+ int ret;
-+
-+ /*
-+ * Set into low power mode - since there may be more users of the
-+ * regulators this is the first step of the power saving: it will
-+ * make sure we conserve power even if there are others users on the
-+ * regulators.
-+ */
-+ ret = regmap_update_bits(st->map,
-+ KXSD9_REG_CTRL_B,
-+ KXSD9_CTRL_B_ENABLE,
-+ 0);
-+ if (ret)
-+ return ret;
-+
-+ /* Disable the regulators */
-+ ret = regulator_bulk_disable(ARRAY_SIZE(st->regs), st->regs);
-+ if (ret) {
-+ dev_err(st->dev, "Cannot disable regulators\n");
-+ return ret;
-+ }
-+
-+ return 0;
-+}
-+
- static const struct iio_info kxsd9_info = {
- .read_raw = &kxsd9_read_raw,
- .write_raw = &kxsd9_write_raw,
-@@ -221,57 +393,136 @@ static const struct iio_info kxsd9_info = {
- .driver_module = THIS_MODULE,
- };
-
--static int kxsd9_probe(struct spi_device *spi)
-+/* Four channels apart from timestamp, scan mask = 0x0f */
-+static const unsigned long kxsd9_scan_masks[] = { 0xf, 0 };
-+
-+int kxsd9_common_probe(struct device *dev,
-+ struct regmap *map,
-+ const char *name)
- {
- struct iio_dev *indio_dev;
- struct kxsd9_state *st;
-+ int ret;
-
-- indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
-+ indio_dev = devm_iio_device_alloc(dev, sizeof(*st));
- if (!indio_dev)
- return -ENOMEM;
-
- st = iio_priv(indio_dev);
-- spi_set_drvdata(spi, indio_dev);
-+ st->dev = dev;
-+ st->map = map;
-
-- st->us = spi;
-- mutex_init(&st->buf_lock);
- indio_dev->channels = kxsd9_channels;
- indio_dev->num_channels = ARRAY_SIZE(kxsd9_channels);
-- indio_dev->name = spi_get_device_id(spi)->name;
-- indio_dev->dev.parent = &spi->dev;
-+ indio_dev->name = name;
-+ indio_dev->dev.parent = dev;
- indio_dev->info = &kxsd9_info;
- indio_dev->modes = INDIO_DIRECT_MODE;
-+ indio_dev->available_scan_masks = kxsd9_scan_masks;
-+
-+ /* Read the mounting matrix, if present */
-+ ret = of_iio_read_mount_matrix(dev,
-+ "mount-matrix",
-+ &st->orientation);
-+ if (ret)
-+ return ret;
-+
-+ /* Fetch and turn on regulators */
-+ st->regs[0].supply = kxsd9_reg_vdd;
-+ st->regs[1].supply = kxsd9_reg_iovdd;
-+ ret = devm_regulator_bulk_get(dev,
-+ ARRAY_SIZE(st->regs),
-+ st->regs);
-+ if (ret) {
-+ dev_err(dev, "Cannot get regulators\n");
-+ return ret;
-+ }
-+ /* Default scaling */
-+ st->scale = KXSD9_CTRL_C_FS_2G;
-
-- spi->mode = SPI_MODE_0;
-- spi_setup(spi);
- kxsd9_power_up(st);
-
-- return iio_device_register(indio_dev);
-+ ret = iio_triggered_buffer_setup(indio_dev,
-+ iio_pollfunc_store_time,
-+ kxsd9_trigger_handler,
-+ &kxsd9_buffer_setup_ops);
-+ if (ret) {
-+ dev_err(dev, "triggered buffer setup failed\n");
-+ goto err_power_down;
-+ }
-+
-+ ret = iio_device_register(indio_dev);
-+ if (ret)
-+ goto err_cleanup_buffer;
-+
-+ dev_set_drvdata(dev, indio_dev);
-+
-+ /* Enable runtime PM */
-+ pm_runtime_get_noresume(dev);
-+ pm_runtime_set_active(dev);
-+ pm_runtime_enable(dev);
-+ /*
-+ * Set autosuspend to two orders of magnitude larger than the
-+ * start-up time. 20ms start-up time means 2000ms autosuspend,
-+ * i.e. 2 seconds.
-+ */
-+ pm_runtime_set_autosuspend_delay(dev, 2000);
-+ pm_runtime_use_autosuspend(dev);
-+ pm_runtime_put(dev);
-+
-+ return 0;
-+
-+err_cleanup_buffer:
-+ iio_triggered_buffer_cleanup(indio_dev);
-+err_power_down:
-+ kxsd9_power_down(st);
-+
-+ return ret;
- }
-+EXPORT_SYMBOL(kxsd9_common_probe);
-
--static int kxsd9_remove(struct spi_device *spi)
-+int kxsd9_common_remove(struct device *dev)
- {
-- iio_device_unregister(spi_get_drvdata(spi));
-+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
-+ struct kxsd9_state *st = iio_priv(indio_dev);
-+
-+ iio_triggered_buffer_cleanup(indio_dev);
-+ iio_device_unregister(indio_dev);
-+ pm_runtime_get_sync(dev);
-+ pm_runtime_put_noidle(dev);
-+ pm_runtime_disable(dev);
-+ kxsd9_power_down(st);
-
- return 0;
- }
-+EXPORT_SYMBOL(kxsd9_common_remove);
-
--static const struct spi_device_id kxsd9_id[] = {
-- {"kxsd9", 0},
-- { },
--};
--MODULE_DEVICE_TABLE(spi, kxsd9_id);
-+#ifdef CONFIG_PM
-+static int kxsd9_runtime_suspend(struct device *dev)
-+{
-+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
-+ struct kxsd9_state *st = iio_priv(indio_dev);
-
--static struct spi_driver kxsd9_driver = {
-- .driver = {
-- .name = "kxsd9",
-- },
-- .probe = kxsd9_probe,
-- .remove = kxsd9_remove,
-- .id_table = kxsd9_id,
-+ return kxsd9_power_down(st);
-+}
-+
-+static int kxsd9_runtime_resume(struct device *dev)
-+{
-+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
-+ struct kxsd9_state *st = iio_priv(indio_dev);
-+
-+ return kxsd9_power_up(st);
-+}
-+#endif /* CONFIG_PM */
-+
-+const struct dev_pm_ops kxsd9_dev_pm_ops = {
-+ SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
-+ pm_runtime_force_resume)
-+ SET_RUNTIME_PM_OPS(kxsd9_runtime_suspend,
-+ kxsd9_runtime_resume, NULL)
- };
--module_spi_driver(kxsd9_driver);
-+EXPORT_SYMBOL(kxsd9_dev_pm_ops);
-
- MODULE_AUTHOR("Jonathan Cameron <jic23@kernel.org>");
--MODULE_DESCRIPTION("Kionix KXSD9 SPI driver");
-+MODULE_DESCRIPTION("Kionix KXSD9 driver");
- MODULE_LICENSE("GPL v2");
-diff --git a/drivers/iio/accel/kxsd9.h b/drivers/iio/accel/kxsd9.h
-new file mode 100644
-index 0000000..7e8a281
---- /dev/null
-+++ b/drivers/iio/accel/kxsd9.h
-@@ -0,0 +1,12 @@
-+#include <linux/device.h>
-+#include <linux/kernel.h>
-+
-+#define KXSD9_STATE_RX_SIZE 2
-+#define KXSD9_STATE_TX_SIZE 2
-+
-+int kxsd9_common_probe(struct device *dev,
-+ struct regmap *map,
-+ const char *name);
-+int kxsd9_common_remove(struct device *dev);
-+
-+extern const struct dev_pm_ops kxsd9_dev_pm_ops;
-diff --git a/drivers/iio/accel/mc3230.c b/drivers/iio/accel/mc3230.c
-new file mode 100644
-index 0000000..4ea2ff6
---- /dev/null
-+++ b/drivers/iio/accel/mc3230.c
-@@ -0,0 +1,211 @@
-+/**
-+ * mCube MC3230 3-Axis Accelerometer
-+ *
-+ * Copyright (c) 2016 Hans de Goede <hdegoede@redhat.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * IIO driver for mCube MC3230; 7-bit I2C address: 0x4c.
-+ */
-+
-+#include <linux/i2c.h>
-+#include <linux/module.h>
-+#include <linux/iio/iio.h>
-+#include <linux/iio/sysfs.h>
-+
-+#define MC3230_REG_XOUT 0x00
-+#define MC3230_REG_YOUT 0x01
-+#define MC3230_REG_ZOUT 0x02
-+
-+#define MC3230_REG_MODE 0x07
-+#define MC3230_MODE_OPCON_MASK 0x03
-+#define MC3230_MODE_OPCON_WAKE 0x01
-+#define MC3230_MODE_OPCON_STANDBY 0x03
-+
-+#define MC3230_REG_CHIP_ID 0x18
-+#define MC3230_CHIP_ID 0x01
-+
-+#define MC3230_REG_PRODUCT_CODE 0x3b
-+#define MC3230_PRODUCT_CODE 0x19
-+
-+/*
-+ * The accelerometer has one measurement range:
-+ *
-+ * -1.5g - +1.5g (8-bit, signed)
-+ *
-+ * scale = (1.5 + 1.5) * 9.81 / (2^8 - 1) = 0.115411765
-+ */
-+
-+static const int mc3230_nscale = 115411765;
-+
-+#define MC3230_CHANNEL(reg, axis) { \
-+ .type = IIO_ACCEL, \
-+ .address = reg, \
-+ .modified = 1, \
-+ .channel2 = IIO_MOD_##axis, \
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
-+ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
-+}
-+
-+static const struct iio_chan_spec mc3230_channels[] = {
-+ MC3230_CHANNEL(MC3230_REG_XOUT, X),
-+ MC3230_CHANNEL(MC3230_REG_YOUT, Y),
-+ MC3230_CHANNEL(MC3230_REG_ZOUT, Z),
-+};
-+
-+struct mc3230_data {
-+ struct i2c_client *client;
-+};
-+
-+static int mc3230_set_opcon(struct mc3230_data *data, int opcon)
-+{
-+ int ret;
-+ struct i2c_client *client = data->client;
-+
-+ ret = i2c_smbus_read_byte_data(client, MC3230_REG_MODE);
-+ if (ret < 0) {
-+ dev_err(&client->dev, "failed to read mode reg: %d\n", ret);
-+ return ret;
-+ }
-+
-+ ret &= ~MC3230_MODE_OPCON_MASK;
-+ ret |= opcon;
-+
-+ ret = i2c_smbus_write_byte_data(client, MC3230_REG_MODE, ret);
-+ if (ret < 0) {
-+ dev_err(&client->dev, "failed to write mode reg: %d\n", ret);
-+ return ret;
-+ }
-+
-+ return 0;
-+}
-+
-+static int mc3230_read_raw(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan,
-+ int *val, int *val2, long mask)
-+{
-+ struct mc3230_data *data = iio_priv(indio_dev);
-+ int ret;
-+
-+ switch (mask) {
-+ case IIO_CHAN_INFO_RAW:
-+ ret = i2c_smbus_read_byte_data(data->client, chan->address);
-+ if (ret < 0)
-+ return ret;
-+ *val = sign_extend32(ret, 7);
-+ return IIO_VAL_INT;
-+ case IIO_CHAN_INFO_SCALE:
-+ *val = 0;
-+ *val2 = mc3230_nscale;
-+ return IIO_VAL_INT_PLUS_NANO;
-+ default:
-+ return -EINVAL;
-+ }
-+}
-+
-+static const struct iio_info mc3230_info = {
-+ .driver_module = THIS_MODULE,
-+ .read_raw = mc3230_read_raw,
-+};
-+
-+static int mc3230_probe(struct i2c_client *client,
-+ const struct i2c_device_id *id)
-+{
-+ int ret;
-+ struct iio_dev *indio_dev;
-+ struct mc3230_data *data;
-+
-+ /* First check chip-id and product-id */
-+ ret = i2c_smbus_read_byte_data(client, MC3230_REG_CHIP_ID);
-+ if (ret != MC3230_CHIP_ID)
-+ return (ret < 0) ? ret : -ENODEV;
-+
-+ ret = i2c_smbus_read_byte_data(client, MC3230_REG_PRODUCT_CODE);
-+ if (ret != MC3230_PRODUCT_CODE)
-+ return (ret < 0) ? ret : -ENODEV;
-+
-+ indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
-+ if (!indio_dev) {
-+ dev_err(&client->dev, "iio allocation failed!\n");
-+ return -ENOMEM;
-+ }
-+
-+ data = iio_priv(indio_dev);
-+ data->client = client;
-+ i2c_set_clientdata(client, indio_dev);
-+
-+ indio_dev->dev.parent = &client->dev;
-+ indio_dev->info = &mc3230_info;
-+ indio_dev->name = "mc3230";
-+ indio_dev->modes = INDIO_DIRECT_MODE;
-+ indio_dev->channels = mc3230_channels;
-+ indio_dev->num_channels = ARRAY_SIZE(mc3230_channels);
-+
-+ ret = mc3230_set_opcon(data, MC3230_MODE_OPCON_WAKE);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = iio_device_register(indio_dev);
-+ if (ret < 0) {
-+ dev_err(&client->dev, "device_register failed\n");
-+ mc3230_set_opcon(data, MC3230_MODE_OPCON_STANDBY);
-+ }
-+
-+ return ret;
-+}
-+
-+static int mc3230_remove(struct i2c_client *client)
-+{
-+ struct iio_dev *indio_dev = i2c_get_clientdata(client);
-+
-+ iio_device_unregister(indio_dev);
-+
-+ return mc3230_set_opcon(iio_priv(indio_dev), MC3230_MODE_OPCON_STANDBY);
-+}
-+
-+#ifdef CONFIG_PM_SLEEP
-+static int mc3230_suspend(struct device *dev)
-+{
-+ struct mc3230_data *data;
-+
-+ data = iio_priv(i2c_get_clientdata(to_i2c_client(dev)));
-+
-+ return mc3230_set_opcon(data, MC3230_MODE_OPCON_STANDBY);
-+}
-+
-+static int mc3230_resume(struct device *dev)
-+{
-+ struct mc3230_data *data;
-+
-+ data = iio_priv(i2c_get_clientdata(to_i2c_client(dev)));
-+
-+ return mc3230_set_opcon(data, MC3230_MODE_OPCON_WAKE);
-+}
-+#endif
-+
-+static SIMPLE_DEV_PM_OPS(mc3230_pm_ops, mc3230_suspend, mc3230_resume);
-+
-+static const struct i2c_device_id mc3230_i2c_id[] = {
-+ {"mc3230", 0},
-+ {}
-+};
-+MODULE_DEVICE_TABLE(i2c, mc3230_i2c_id);
-+
-+static struct i2c_driver mc3230_driver = {
-+ .driver = {
-+ .name = "mc3230",
-+ .pm = &mc3230_pm_ops,
-+ },
-+ .probe = mc3230_probe,
-+ .remove = mc3230_remove,
-+ .id_table = mc3230_i2c_id,
-+};
-+
-+module_i2c_driver(mc3230_driver);
-+
-+MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
-+MODULE_DESCRIPTION("mCube MC3230 3-Axis Accelerometer driver");
-+MODULE_LICENSE("GPL v2");
-diff --git a/drivers/iio/accel/mma7660.c b/drivers/iio/accel/mma7660.c
-index 0acdee5..03beadf 100644
---- a/drivers/iio/accel/mma7660.c
-+++ b/drivers/iio/accel/mma7660.c
-@@ -251,6 +251,7 @@ static const struct i2c_device_id mma7660_i2c_id[] = {
- {"mma7660", 0},
- {}
- };
-+MODULE_DEVICE_TABLE(i2c, mma7660_i2c_id);
-
- static const struct acpi_device_id mma7660_acpi_id[] = {
- {"MMA7660", 0},
-diff --git a/drivers/iio/accel/mxc6255.c b/drivers/iio/accel/mxc6255.c
-index 97ccde7..0abad69 100644
---- a/drivers/iio/accel/mxc6255.c
-+++ b/drivers/iio/accel/mxc6255.c
-@@ -154,7 +154,7 @@ static int mxc6255_probe(struct i2c_client *client,
- return ret;
- }
-
-- if (chip_id != MXC6255_CHIP_ID) {
-+ if ((chip_id & 0x1f) != MXC6255_CHIP_ID) {
- dev_err(&client->dev, "Invalid chip id %x\n", chip_id);
- return -ENODEV;
- }
-@@ -171,12 +171,14 @@ static int mxc6255_probe(struct i2c_client *client,
- }
-
- static const struct acpi_device_id mxc6255_acpi_match[] = {
-+ {"MXC6225", 0},
- {"MXC6255", 0},
- { }
- };
- MODULE_DEVICE_TABLE(acpi, mxc6255_acpi_match);
-
- static const struct i2c_device_id mxc6255_id[] = {
-+ {"mxc6225", 0},
- {"mxc6255", 0},
- { }
- };
-diff --git a/drivers/iio/accel/ssp_accel_sensor.c b/drivers/iio/accel/ssp_accel_sensor.c
-index 4ae05fc..31db009 100644
---- a/drivers/iio/accel/ssp_accel_sensor.c
-+++ b/drivers/iio/accel/ssp_accel_sensor.c
-@@ -74,7 +74,7 @@ static int ssp_accel_write_raw(struct iio_dev *indio_dev,
- return -EINVAL;
- }
-
--static struct iio_info ssp_accel_iio_info = {
-+static const struct iio_info ssp_accel_iio_info = {
- .read_raw = &ssp_accel_read_raw,
- .write_raw = &ssp_accel_write_raw,
- };
-diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
-index 7675772..7edcf32 100644
---- a/drivers/iio/adc/Kconfig
-+++ b/drivers/iio/adc/Kconfig
-@@ -264,6 +264,15 @@ config LPC18XX_ADC
- To compile this driver as a module, choose M here: the module will be
- called lpc18xx_adc.
-
-+config LTC2485
-+ tristate "Linear Technology LTC2485 ADC driver"
-+ depends on I2C
-+ help
-+ Say yes here to build support for Linear Technology LTC2485 ADC.
-+
-+ To compile this driver as a module, choose M here: the module will be
-+ called ltc2485.
-+
- config MAX1027
- tristate "Maxim max1027 ADC driver"
- depends on SPI
-@@ -317,6 +326,19 @@ config MCP3422
- This driver can also be built as a module. If so, the module will be
- called mcp3422.
-
-+config MEDIATEK_MT6577_AUXADC
-+ tristate "MediaTek AUXADC driver"
-+ depends on ARCH_MEDIATEK || COMPILE_TEST
-+ depends on HAS_IOMEM
-+ help
-+ Say yes here to enable support for MediaTek mt65xx AUXADC.
-+
-+ The driver supports immediate mode operation to read from one of sixteen
-+ channels (external or internal).
-+
-+ This driver can also be built as a module. If so, the module will be
-+ called mt6577_auxadc.
-+
- config MEN_Z188_ADC
- tristate "MEN 16z188 ADC IP Core support"
- depends on MCB
-@@ -397,6 +419,21 @@ config ROCKCHIP_SARADC
- To compile this driver as a module, choose M here: the
- module will be called rockchip_saradc.
-
-+config STX104
-+ tristate "Apex Embedded Systems STX104 driver"
-+ depends on X86 && ISA_BUS_API
-+ select GPIOLIB
-+ help
-+ Say yes here to build support for the Apex Embedded Systems STX104
-+ integrated analog PC/104 card.
-+
-+ This driver supports the 16 channels of single-ended (8 channels of
-+ differential) analog inputs, 2 channels of analog output, 4 digital
-+ inputs, and 4 digital outputs provided by the STX104.
-+
-+ The base port addresses for the devices may be configured via the base
-+ array module parameter.
-+
- config TI_ADC081C
- tristate "Texas Instruments ADC081C/ADC101C/ADC121C family"
- depends on I2C
-@@ -417,6 +454,18 @@ config TI_ADC0832
- This driver can also be built as a module. If so, the module will be
- called ti-adc0832.
-
-+config TI_ADC12138
-+ tristate "Texas Instruments ADC12130/ADC12132/ADC12138"
-+ depends on SPI
-+ select IIO_BUFFER
-+ select IIO_TRIGGERED_BUFFER
-+ help
-+ If you say yes here you get support for Texas Instruments ADC12130,
-+ ADC12132 and ADC12138 chips.
-+
-+ This driver can also be built as a module. If so, the module will be
-+ called ti-adc12138.
-+
- config TI_ADC128S052
- tristate "Texas Instruments ADC128S052/ADC122S021/ADC124S021"
- depends on SPI
-@@ -427,6 +476,18 @@ config TI_ADC128S052
- This driver can also be built as a module. If so, the module will be
- called ti-adc128s052.
-
-+config TI_ADC161S626
-+ tristate "Texas Instruments ADC161S626 1-channel differential ADC"
-+ depends on SPI
-+ select IIO_BUFFER
-+ select IIO_TRIGGERED_BUFFER
-+ help
-+ If you say yes here you get support for Texas Instruments ADC141S626,
-+ and ADC161S626 chips.
-+
-+ This driver can also be built as a module. If so, the module will be
-+ called ti-adc161s626.
-+
- config TI_ADS1015
- tristate "Texas Instruments ADS1015 ADC"
- depends on I2C && !SENSORS_ADS1015
-diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
-index 0ba0d50..7a40c04 100644
---- a/drivers/iio/adc/Makefile
-+++ b/drivers/iio/adc/Makefile
-@@ -27,10 +27,12 @@ obj-$(CONFIG_IMX7D_ADC) += imx7d_adc.o
- obj-$(CONFIG_INA2XX_ADC) += ina2xx-adc.o
- obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o
- obj-$(CONFIG_LPC18XX_ADC) += lpc18xx_adc.o
-+obj-$(CONFIG_LTC2485) += ltc2485.o
- obj-$(CONFIG_MAX1027) += max1027.o
- obj-$(CONFIG_MAX1363) += max1363.o
- obj-$(CONFIG_MCP320X) += mcp320x.o
- obj-$(CONFIG_MCP3422) += mcp3422.o
-+obj-$(CONFIG_MEDIATEK_MT6577_AUXADC) += mt6577_auxadc.o
- obj-$(CONFIG_MEN_Z188_ADC) += men_z188_adc.o
- obj-$(CONFIG_MXS_LRADC) += mxs-lradc.o
- obj-$(CONFIG_NAU7802) += nau7802.o
-@@ -38,9 +40,12 @@ obj-$(CONFIG_PALMAS_GPADC) += palmas_gpadc.o
- obj-$(CONFIG_QCOM_SPMI_IADC) += qcom-spmi-iadc.o
- obj-$(CONFIG_QCOM_SPMI_VADC) += qcom-spmi-vadc.o
- obj-$(CONFIG_ROCKCHIP_SARADC) += rockchip_saradc.o
-+obj-$(CONFIG_STX104) += stx104.o
- obj-$(CONFIG_TI_ADC081C) += ti-adc081c.o
- obj-$(CONFIG_TI_ADC0832) += ti-adc0832.o
-+obj-$(CONFIG_TI_ADC12138) += ti-adc12138.o
- obj-$(CONFIG_TI_ADC128S052) += ti-adc128s052.o
-+obj-$(CONFIG_TI_ADC161S626) += ti-adc161s626.o
- obj-$(CONFIG_TI_ADS1015) += ti-ads1015.o
- obj-$(CONFIG_TI_ADS8688) += ti-ads8688.o
- obj-$(CONFIG_TI_AM335X_ADC) += ti_am335x_adc.o
-diff --git a/drivers/iio/adc/ad7266.c b/drivers/iio/adc/ad7266.c
-index c0f6a98..b8d5cfd 100644
---- a/drivers/iio/adc/ad7266.c
-+++ b/drivers/iio/adc/ad7266.c
-@@ -481,7 +481,7 @@ error_free_gpios:
- if (!st->fixed_addr)
- gpio_free_array(st->gpios, ARRAY_SIZE(st->gpios));
- error_disable_reg:
-- if (!IS_ERR_OR_NULL(st->reg))
-+ if (!IS_ERR(st->reg))
- regulator_disable(st->reg);
-
- return ret;
-@@ -496,7 +496,7 @@ static int ad7266_remove(struct spi_device *spi)
- iio_triggered_buffer_cleanup(indio_dev);
- if (!st->fixed_addr)
- gpio_free_array(st->gpios, ARRAY_SIZE(st->gpios));
-- if (!IS_ERR_OR_NULL(st->reg))
-+ if (!IS_ERR(st->reg))
- regulator_disable(st->reg);
-
- return 0;
-diff --git a/drivers/iio/adc/ad7298.c b/drivers/iio/adc/ad7298.c
-index 10ec8fc..e399bf0 100644
---- a/drivers/iio/adc/ad7298.c
-+++ b/drivers/iio/adc/ad7298.c
-@@ -239,16 +239,16 @@ static int ad7298_read_raw(struct iio_dev *indio_dev,
-
- switch (m) {
- case IIO_CHAN_INFO_RAW:
-- mutex_lock(&indio_dev->mlock);
-- if (indio_dev->currentmode == INDIO_BUFFER_TRIGGERED) {
-- ret = -EBUSY;
-- } else {
-- if (chan->address == AD7298_CH_TEMP)
-- ret = ad7298_scan_temp(st, val);
-- else
-- ret = ad7298_scan_direct(st, chan->address);
-- }
-- mutex_unlock(&indio_dev->mlock);
-+ ret = iio_device_claim_direct_mode(indio_dev);
-+ if (ret)
-+ return ret;
-+
-+ if (chan->address == AD7298_CH_TEMP)
-+ ret = ad7298_scan_temp(st, val);
-+ else
-+ ret = ad7298_scan_direct(st, chan->address);
-+
-+ iio_device_release_direct_mode(indio_dev);
-
- if (ret < 0)
- return ret;
-diff --git a/drivers/iio/adc/ad7793.c b/drivers/iio/adc/ad7793.c
-index 847789b..e6706a0 100644
---- a/drivers/iio/adc/ad7793.c
-+++ b/drivers/iio/adc/ad7793.c
-@@ -519,11 +519,9 @@ static int ad7793_write_raw(struct iio_dev *indio_dev,
- int ret, i;
- unsigned int tmp;
-
-- mutex_lock(&indio_dev->mlock);
-- if (iio_buffer_enabled(indio_dev)) {
-- mutex_unlock(&indio_dev->mlock);
-- return -EBUSY;
-- }
-+ ret = iio_device_claim_direct_mode(indio_dev);
-+ if (ret)
-+ return ret;
-
- switch (mask) {
- case IIO_CHAN_INFO_SCALE:
-@@ -548,7 +546,7 @@ static int ad7793_write_raw(struct iio_dev *indio_dev,
- ret = -EINVAL;
- }
-
-- mutex_unlock(&indio_dev->mlock);
-+ iio_device_release_direct_mode(indio_dev);
- return ret;
- }
-
-diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
-index 0438c68..bbdac07 100644
---- a/drivers/iio/adc/at91_adc.c
-+++ b/drivers/iio/adc/at91_adc.c
-@@ -113,6 +113,7 @@
- #define AT91_ADC_TSMR_TSAV (3 << 4) /* Averages samples */
- #define AT91_ADC_TSMR_TSAV_(x) ((x) << 4)
- #define AT91_ADC_TSMR_SCTIM (0x0f << 16) /* Switch closure time */
-+#define AT91_ADC_TSMR_SCTIM_(x) ((x) << 16)
- #define AT91_ADC_TSMR_PENDBC (0x0f << 28) /* Pen Debounce time */
- #define AT91_ADC_TSMR_PENDBC_(x) ((x) << 28)
- #define AT91_ADC_TSMR_NOTSDMA (1 << 22) /* No Touchscreen DMA */
-@@ -150,6 +151,7 @@
- #define MAX_RLPOS_BITS 10
- #define TOUCH_SAMPLE_PERIOD_US_RL 10000 /* 10ms, the SoC can't keep up with 2ms */
- #define TOUCH_SHTIM 0xa
-+#define TOUCH_SCTIM_US 10 /* 10us for the Touchscreen Switches Closure Time */
-
- /**
- * struct at91_adc_reg_desc - Various informations relative to registers
-@@ -1001,7 +1003,9 @@ static void atmel_ts_close(struct input_dev *dev)
-
- static int at91_ts_hw_init(struct at91_adc_state *st, u32 adc_clk_khz)
- {
-+ struct iio_dev *idev = iio_priv_to_dev(st);
- u32 reg = 0;
-+ u32 tssctim = 0;
- int i = 0;
-
- /* a Pen Detect Debounce Time is necessary for the ADC Touch to avoid
-@@ -1034,11 +1038,20 @@ static int at91_ts_hw_init(struct at91_adc_state *st, u32 adc_clk_khz)
- return 0;
- }
-
-+ /* Touchscreen Switches Closure time needed for allowing the value to
-+ * stabilize.
-+ * Switch Closure Time = (TSSCTIM * 4) ADCClock periods
-+ */
-+ tssctim = DIV_ROUND_UP(TOUCH_SCTIM_US * adc_clk_khz / 1000, 4);
-+ dev_dbg(&idev->dev, "adc_clk at: %d KHz, tssctim at: %d\n",
-+ adc_clk_khz, tssctim);
-+
- if (st->touchscreen_type == ATMEL_ADC_TOUCHSCREEN_4WIRE)
- reg = AT91_ADC_TSMR_TSMODE_4WIRE_PRESS;
- else
- reg = AT91_ADC_TSMR_TSMODE_5WIRE;
-
-+ reg |= AT91_ADC_TSMR_SCTIM_(tssctim) & AT91_ADC_TSMR_SCTIM;
- reg |= AT91_ADC_TSMR_TSAV_(st->caps->ts_filter_average)
- & AT91_ADC_TSMR_TSAV;
- reg |= AT91_ADC_TSMR_PENDBC_(st->ts_pendbc) & AT91_ADC_TSMR_PENDBC;
-diff --git a/drivers/iio/adc/ina2xx-adc.c b/drivers/iio/adc/ina2xx-adc.c
-index 955f3fd..59b7d76 100644
---- a/drivers/iio/adc/ina2xx-adc.c
-+++ b/drivers/iio/adc/ina2xx-adc.c
-@@ -114,7 +114,6 @@ struct ina2xx_chip_info {
- struct mutex state_lock;
- unsigned int shunt_resistor;
- int avg;
-- s64 prev_ns; /* track buffer capture time, check for underruns */
- int int_time_vbus; /* Bus voltage integration time uS */
- int int_time_vshunt; /* Shunt voltage integration time uS */
- bool allow_async_readout;
-@@ -509,8 +508,6 @@ static int ina2xx_work_buffer(struct iio_dev *indio_dev)
- iio_push_to_buffers_with_timestamp(indio_dev,
- (unsigned int *)data, time_a);
-
-- chip->prev_ns = time_a;
--
- return (unsigned long)(time_b - time_a) / 1000;
- };
-
-@@ -554,8 +551,6 @@ static int ina2xx_buffer_enable(struct iio_dev *indio_dev)
- dev_dbg(&indio_dev->dev, "Async readout mode: %d\n",
- chip->allow_async_readout);
-
-- chip->prev_ns = iio_get_time_ns(indio_dev);
--
- chip->task = kthread_run(ina2xx_capture_thread, (void *)indio_dev,
- "%s:%d-%uus", indio_dev->name, indio_dev->id,
- sampling_us);
-diff --git a/drivers/iio/adc/ltc2485.c b/drivers/iio/adc/ltc2485.c
-new file mode 100644
-index 0000000..eab91f12
---- /dev/null
-+++ b/drivers/iio/adc/ltc2485.c
-@@ -0,0 +1,148 @@
-+/*
-+ * ltc2485.c - Driver for Linear Technology LTC2485 ADC
-+ *
-+ * Copyright (C) 2016 Alison Schofield <amsfield22@gmail.com>
-+ *
-+ * 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.
-+ *
-+ * Datasheet: http://cds.linear.com/docs/en/datasheet/2485fd.pdf
-+ */
-+
-+#include <linux/delay.h>
-+#include <linux/i2c.h>
-+#include <linux/module.h>
-+
-+#include <linux/iio/iio.h>
-+#include <linux/iio/sysfs.h>
-+
-+/* Power-on configuration: rejects both 50/60Hz, operates at 1x speed */
-+#define LTC2485_CONFIG_DEFAULT 0
-+
-+struct ltc2485_data {
-+ struct i2c_client *client;
-+ ktime_t time_prev; /* last conversion */
-+};
-+
-+static void ltc2485_wait_conv(struct ltc2485_data *data)
-+{
-+ const unsigned int conv_time = 147; /* conversion time ms */
-+ unsigned int time_elapsed;
-+
-+ /* delay if conversion time not passed since last read or write */
-+ time_elapsed = ktime_ms_delta(ktime_get(), data->time_prev);
-+
-+ if (time_elapsed < conv_time)
-+ msleep(conv_time - time_elapsed);
-+}
-+
-+static int ltc2485_read(struct ltc2485_data *data, int *val)
-+{
-+ struct i2c_client *client = data->client;
-+ __be32 buf = 0;
-+ int ret;
-+
-+ ltc2485_wait_conv(data);
-+
-+ ret = i2c_master_recv(client, (char *)&buf, 4);
-+ if (ret < 0) {
-+ dev_err(&client->dev, "i2c_master_recv failed\n");
-+ return ret;
-+ }
-+ data->time_prev = ktime_get();
-+ *val = sign_extend32(be32_to_cpu(buf) >> 6, 24);
-+
-+ return ret;
-+}
-+
-+static int ltc2485_read_raw(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan,
-+ int *val, int *val2, long mask)
-+{
-+ struct ltc2485_data *data = iio_priv(indio_dev);
-+ int ret;
-+
-+ if (mask == IIO_CHAN_INFO_RAW) {
-+ ret = ltc2485_read(data, val);
-+ if (ret < 0)
-+ return ret;
-+
-+ return IIO_VAL_INT;
-+
-+ } else if (mask == IIO_CHAN_INFO_SCALE) {
-+ *val = 5000; /* on board vref millivolts */
-+ *val2 = 25; /* 25 (24 + sign) data bits */
-+ return IIO_VAL_FRACTIONAL_LOG2;
-+
-+ } else {
-+ return -EINVAL;
-+ }
-+}
-+
-+static const struct iio_chan_spec ltc2485_channel[] = {
-+ {
-+ .type = IIO_VOLTAGE,
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
-+ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE)
-+ },
-+};
-+
-+static const struct iio_info ltc2485_info = {
-+ .read_raw = ltc2485_read_raw,
-+ .driver_module = THIS_MODULE,
-+};
-+
-+static int ltc2485_probe(struct i2c_client *client,
-+ const struct i2c_device_id *id)
-+{
-+ struct iio_dev *indio_dev;
-+ struct ltc2485_data *data;
-+ int ret;
-+
-+ if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C |
-+ I2C_FUNC_SMBUS_WRITE_BYTE))
-+ return -EOPNOTSUPP;
-+
-+ indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
-+ if (!indio_dev)
-+ return -ENOMEM;
-+
-+ data = iio_priv(indio_dev);
-+ i2c_set_clientdata(client, indio_dev);
-+ data->client = client;
-+
-+ indio_dev->dev.parent = &client->dev;
-+ indio_dev->name = id->name;
-+ indio_dev->info = <c2485_info;
-+ indio_dev->modes = INDIO_DIRECT_MODE;
-+ indio_dev->channels = ltc2485_channel;
-+ indio_dev->num_channels = ARRAY_SIZE(ltc2485_channel);
-+
-+ ret = i2c_smbus_write_byte(data->client, LTC2485_CONFIG_DEFAULT);
-+ if (ret < 0)
-+ return ret;
-+
-+ data->time_prev = ktime_get();
-+
-+ return devm_iio_device_register(&client->dev, indio_dev);
-+}
-+
-+static const struct i2c_device_id ltc2485_id[] = {
-+ { "ltc2485", 0 },
-+ { }
-+};
-+MODULE_DEVICE_TABLE(i2c, ltc2485_id);
-+
-+static struct i2c_driver ltc2485_driver = {
-+ .driver = {
-+ .name = "ltc2485",
-+ },
-+ .probe = ltc2485_probe,
-+ .id_table = ltc2485_id,
-+};
-+module_i2c_driver(ltc2485_driver);
-+
-+MODULE_AUTHOR("Alison Schofield <amsfield22@gmail.com>");
-+MODULE_DESCRIPTION("Linear Technology LTC2485 ADC driver");
-+MODULE_LICENSE("GPL v2");
-diff --git a/drivers/iio/adc/men_z188_adc.c b/drivers/iio/adc/men_z188_adc.c
-index d095efe..8f3606d 100644
---- a/drivers/iio/adc/men_z188_adc.c
-+++ b/drivers/iio/adc/men_z188_adc.c
-@@ -78,7 +78,7 @@ static int z188_iio_read_raw(struct iio_dev *iio_dev,
- return ret;
- }
-
--static struct iio_info z188_adc_info = {
-+static const struct iio_info z188_adc_info = {
- .read_raw = &z188_iio_read_raw,
- .driver_module = THIS_MODULE,
- };
-diff --git a/drivers/iio/adc/mt6577_auxadc.c b/drivers/iio/adc/mt6577_auxadc.c
-new file mode 100644
-index 0000000..2d104c8
---- /dev/null
-+++ b/drivers/iio/adc/mt6577_auxadc.c
-@@ -0,0 +1,291 @@
-+/*
-+ * Copyright (c) 2016 MediaTek Inc.
-+ * Author: Zhiyong Tao <zhiyong.tao@mediatek.com>
-+ *
-+ * 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.
-+ *
-+ * 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 <linux/clk.h>
-+#include <linux/delay.h>
-+#include <linux/err.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/of.h>
-+#include <linux/of_device.h>
-+#include <linux/platform_device.h>
-+#include <linux/iopoll.h>
-+#include <linux/io.h>
-+#include <linux/iio/iio.h>
-+
-+/* Register definitions */
-+#define MT6577_AUXADC_CON0 0x00
-+#define MT6577_AUXADC_CON1 0x04
-+#define MT6577_AUXADC_CON2 0x10
-+#define MT6577_AUXADC_STA BIT(0)
-+
-+#define MT6577_AUXADC_DAT0 0x14
-+#define MT6577_AUXADC_RDY0 BIT(12)
-+
-+#define MT6577_AUXADC_MISC 0x94
-+#define MT6577_AUXADC_PDN_EN BIT(14)
-+
-+#define MT6577_AUXADC_DAT_MASK 0xfff
-+#define MT6577_AUXADC_SLEEP_US 1000
-+#define MT6577_AUXADC_TIMEOUT_US 10000
-+#define MT6577_AUXADC_POWER_READY_MS 1
-+#define MT6577_AUXADC_SAMPLE_READY_US 25
-+
-+struct mt6577_auxadc_device {
-+ void __iomem *reg_base;
-+ struct clk *adc_clk;
-+ struct mutex lock;
-+};
-+
-+#define MT6577_AUXADC_CHANNEL(idx) { \
-+ .type = IIO_VOLTAGE, \
-+ .indexed = 1, \
-+ .channel = (idx), \
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED), \
-+}
-+
-+static const struct iio_chan_spec mt6577_auxadc_iio_channels[] = {
-+ MT6577_AUXADC_CHANNEL(0),
-+ MT6577_AUXADC_CHANNEL(1),
-+ MT6577_AUXADC_CHANNEL(2),
-+ MT6577_AUXADC_CHANNEL(3),
-+ MT6577_AUXADC_CHANNEL(4),
-+ MT6577_AUXADC_CHANNEL(5),
-+ MT6577_AUXADC_CHANNEL(6),
-+ MT6577_AUXADC_CHANNEL(7),
-+ MT6577_AUXADC_CHANNEL(8),
-+ MT6577_AUXADC_CHANNEL(9),
-+ MT6577_AUXADC_CHANNEL(10),
-+ MT6577_AUXADC_CHANNEL(11),
-+ MT6577_AUXADC_CHANNEL(12),
-+ MT6577_AUXADC_CHANNEL(13),
-+ MT6577_AUXADC_CHANNEL(14),
-+ MT6577_AUXADC_CHANNEL(15),
-+};
-+
-+static inline void mt6577_auxadc_mod_reg(void __iomem *reg,
-+ u32 or_mask, u32 and_mask)
-+{
-+ u32 val;
-+
-+ val = readl(reg);
-+ val |= or_mask;
-+ val &= ~and_mask;
-+ writel(val, reg);
-+}
-+
-+static int mt6577_auxadc_read(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan)
-+{
-+ u32 val;
-+ void __iomem *reg_channel;
-+ int ret;
-+ struct mt6577_auxadc_device *adc_dev = iio_priv(indio_dev);
-+
-+ reg_channel = adc_dev->reg_base + MT6577_AUXADC_DAT0 +
-+ chan->channel * 0x04;
-+
-+ mutex_lock(&adc_dev->lock);
-+
-+ mt6577_auxadc_mod_reg(adc_dev->reg_base + MT6577_AUXADC_CON1,
-+ 0, 1 << chan->channel);
-+
-+ /* read channel and make sure old ready bit == 0 */
-+ ret = readl_poll_timeout(reg_channel, val,
-+ ((val & MT6577_AUXADC_RDY0) == 0),
-+ MT6577_AUXADC_SLEEP_US,
-+ MT6577_AUXADC_TIMEOUT_US);
-+ if (ret < 0) {
-+ dev_err(indio_dev->dev.parent,
-+ "wait for channel[%d] ready bit clear time out\n",
-+ chan->channel);
-+ goto err_timeout;
-+ }
-+
-+ /* set bit to trigger sample */
-+ mt6577_auxadc_mod_reg(adc_dev->reg_base + MT6577_AUXADC_CON1,
-+ 1 << chan->channel, 0);
-+
-+ /* we must delay here for hardware sample channel data */
-+ udelay(MT6577_AUXADC_SAMPLE_READY_US);
-+
-+ /* check MTK_AUXADC_CON2 if auxadc is idle */
-+ ret = readl_poll_timeout(adc_dev->reg_base + MT6577_AUXADC_CON2, val,
-+ ((val & MT6577_AUXADC_STA) == 0),
-+ MT6577_AUXADC_SLEEP_US,
-+ MT6577_AUXADC_TIMEOUT_US);
-+ if (ret < 0) {
-+ dev_err(indio_dev->dev.parent,
-+ "wait for auxadc idle time out\n");
-+ goto err_timeout;
-+ }
-+
-+ /* read channel and make sure ready bit == 1 */
-+ ret = readl_poll_timeout(reg_channel, val,
-+ ((val & MT6577_AUXADC_RDY0) != 0),
-+ MT6577_AUXADC_SLEEP_US,
-+ MT6577_AUXADC_TIMEOUT_US);
-+ if (ret < 0) {
-+ dev_err(indio_dev->dev.parent,
-+ "wait for channel[%d] data ready time out\n",
-+ chan->channel);
-+ goto err_timeout;
-+ }
-+
-+ /* read data */
-+ val = readl(reg_channel) & MT6577_AUXADC_DAT_MASK;
-+
-+ mutex_unlock(&adc_dev->lock);
-+
-+ return val;
-+
-+err_timeout:
-+
-+ mutex_unlock(&adc_dev->lock);
-+
-+ return -ETIMEDOUT;
-+}
-+
-+static int mt6577_auxadc_read_raw(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan,
-+ int *val,
-+ int *val2,
-+ long info)
-+{
-+ switch (info) {
-+ case IIO_CHAN_INFO_PROCESSED:
-+ *val = mt6577_auxadc_read(indio_dev, chan);
-+ if (*val < 0) {
-+ dev_err(indio_dev->dev.parent,
-+ "failed to sample data on channel[%d]\n",
-+ chan->channel);
-+ return *val;
-+ }
-+ return IIO_VAL_INT;
-+
-+ default:
-+ return -EINVAL;
-+ }
-+}
-+
-+static const struct iio_info mt6577_auxadc_info = {
-+ .driver_module = THIS_MODULE,
-+ .read_raw = &mt6577_auxadc_read_raw,
-+};
-+
-+static int mt6577_auxadc_probe(struct platform_device *pdev)
-+{
-+ struct mt6577_auxadc_device *adc_dev;
-+ unsigned long adc_clk_rate;
-+ struct resource *res;
-+ struct iio_dev *indio_dev;
-+ int ret;
-+
-+ indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*adc_dev));
-+ if (!indio_dev)
-+ return -ENOMEM;
-+
-+ adc_dev = iio_priv(indio_dev);
-+ indio_dev->dev.parent = &pdev->dev;
-+ indio_dev->name = dev_name(&pdev->dev);
-+ indio_dev->info = &mt6577_auxadc_info;
-+ indio_dev->modes = INDIO_DIRECT_MODE;
-+ indio_dev->channels = mt6577_auxadc_iio_channels;
-+ indio_dev->num_channels = ARRAY_SIZE(mt6577_auxadc_iio_channels);
-+
-+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+ adc_dev->reg_base = devm_ioremap_resource(&pdev->dev, res);
-+ if (IS_ERR(adc_dev->reg_base)) {
-+ dev_err(&pdev->dev, "failed to get auxadc base address\n");
-+ return PTR_ERR(adc_dev->reg_base);
-+ }
-+
-+ adc_dev->adc_clk = devm_clk_get(&pdev->dev, "main");
-+ if (IS_ERR(adc_dev->adc_clk)) {
-+ dev_err(&pdev->dev, "failed to get auxadc clock\n");
-+ return PTR_ERR(adc_dev->adc_clk);
-+ }
-+
-+ ret = clk_prepare_enable(adc_dev->adc_clk);
-+ if (ret) {
-+ dev_err(&pdev->dev, "failed to enable auxadc clock\n");
-+ return ret;
-+ }
-+
-+ adc_clk_rate = clk_get_rate(adc_dev->adc_clk);
-+ if (!adc_clk_rate) {
-+ ret = -EINVAL;
-+ dev_err(&pdev->dev, "null clock rate\n");
-+ goto err_disable_clk;
-+ }
-+
-+ mutex_init(&adc_dev->lock);
-+
-+ mt6577_auxadc_mod_reg(adc_dev->reg_base + MT6577_AUXADC_MISC,
-+ MT6577_AUXADC_PDN_EN, 0);
-+ mdelay(MT6577_AUXADC_POWER_READY_MS);
-+
-+ platform_set_drvdata(pdev, indio_dev);
-+
-+ ret = iio_device_register(indio_dev);
-+ if (ret < 0) {
-+ dev_err(&pdev->dev, "failed to register iio device\n");
-+ goto err_power_off;
-+ }
-+
-+ return 0;
-+
-+err_power_off:
-+ mt6577_auxadc_mod_reg(adc_dev->reg_base + MT6577_AUXADC_MISC,
-+ 0, MT6577_AUXADC_PDN_EN);
-+err_disable_clk:
-+ clk_disable_unprepare(adc_dev->adc_clk);
-+ return ret;
-+}
-+
-+static int mt6577_auxadc_remove(struct platform_device *pdev)
-+{
-+ struct iio_dev *indio_dev = platform_get_drvdata(pdev);
-+ struct mt6577_auxadc_device *adc_dev = iio_priv(indio_dev);
-+
-+ iio_device_unregister(indio_dev);
-+
-+ mt6577_auxadc_mod_reg(adc_dev->reg_base + MT6577_AUXADC_MISC,
-+ 0, MT6577_AUXADC_PDN_EN);
-+
-+ clk_disable_unprepare(adc_dev->adc_clk);
-+
-+ return 0;
-+}
-+
-+static const struct of_device_id mt6577_auxadc_of_match[] = {
-+ { .compatible = "mediatek,mt2701-auxadc", },
-+ { .compatible = "mediatek,mt8173-auxadc", },
-+ { }
-+};
-+MODULE_DEVICE_TABLE(of, mt6577_auxadc_of_match);
-+
-+static struct platform_driver mt6577_auxadc_driver = {
-+ .driver = {
-+ .name = "mt6577-auxadc",
-+ .of_match_table = mt6577_auxadc_of_match,
-+ },
-+ .probe = mt6577_auxadc_probe,
-+ .remove = mt6577_auxadc_remove,
-+};
-+module_platform_driver(mt6577_auxadc_driver);
-+
-+MODULE_AUTHOR("Zhiyong Tao <zhiyong.tao@mediatek.com>");
-+MODULE_DESCRIPTION("MTK AUXADC Device Driver");
-+MODULE_LICENSE("GPL v2");
-diff --git a/drivers/iio/adc/nau7802.c b/drivers/iio/adc/nau7802.c
-index db9b829..08f4466 100644
---- a/drivers/iio/adc/nau7802.c
-+++ b/drivers/iio/adc/nau7802.c
-@@ -197,7 +197,7 @@ static irqreturn_t nau7802_eoc_trigger(int irq, void *private)
- if (st->conversion_count < NAU7802_MIN_CONVERSIONS)
- st->conversion_count++;
- if (st->conversion_count >= NAU7802_MIN_CONVERSIONS)
-- complete_all(&st->value_ok);
-+ complete(&st->value_ok);
-
- return IRQ_HANDLED;
- }
-diff --git a/drivers/iio/adc/stx104.c b/drivers/iio/adc/stx104.c
-new file mode 100644
-index 0000000..7e36457
---- /dev/null
-+++ b/drivers/iio/adc/stx104.c
-@@ -0,0 +1,380 @@
-+/*
-+ * IIO driver for the Apex Embedded Systems STX104
-+ * Copyright (C) 2016 William Breathitt Gray
-+ *
-+ * 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.
-+ *
-+ * 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 <linux/bitops.h>
-+#include <linux/device.h>
-+#include <linux/errno.h>
-+#include <linux/gpio/driver.h>
-+#include <linux/iio/iio.h>
-+#include <linux/iio/types.h>
-+#include <linux/io.h>
-+#include <linux/ioport.h>
-+#include <linux/isa.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/spinlock.h>
-+
-+#define STX104_OUT_CHAN(chan) { \
-+ .type = IIO_VOLTAGE, \
-+ .channel = chan, \
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
-+ .indexed = 1, \
-+ .output = 1 \
-+}
-+#define STX104_IN_CHAN(chan, diff) { \
-+ .type = IIO_VOLTAGE, \
-+ .channel = chan, \
-+ .channel2 = chan, \
-+ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_HARDWAREGAIN) | \
-+ BIT(IIO_CHAN_INFO_OFFSET) | BIT(IIO_CHAN_INFO_SCALE), \
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
-+ .indexed = 1, \
-+ .differential = diff \
-+}
-+
-+#define STX104_NUM_OUT_CHAN 2
-+
-+#define STX104_EXTENT 16
-+
-+static unsigned int base[max_num_isa_dev(STX104_EXTENT)];
-+static unsigned int num_stx104;
-+module_param_array(base, uint, &num_stx104, 0);
-+MODULE_PARM_DESC(base, "Apex Embedded Systems STX104 base addresses");
-+
-+/**
-+ * struct stx104_iio - IIO device private data structure
-+ * @chan_out_states: channels' output states
-+ * @base: base port address of the IIO device
-+ */
-+struct stx104_iio {
-+ unsigned int chan_out_states[STX104_NUM_OUT_CHAN];
-+ unsigned int base;
-+};
-+
-+/**
-+ * struct stx104_gpio - GPIO device private data structure
-+ * @chip: instance of the gpio_chip
-+ * @lock: synchronization lock to prevent I/O race conditions
-+ * @base: base port address of the GPIO device
-+ * @out_state: output bits state
-+ */
-+struct stx104_gpio {
-+ struct gpio_chip chip;
-+ spinlock_t lock;
-+ unsigned int base;
-+ unsigned int out_state;
-+};
-+
-+/**
-+ * struct stx104_dev - STX104 device private data structure
-+ * @indio_dev: IIO device
-+ * @chip: instance of the gpio_chip
-+ */
-+struct stx104_dev {
-+ struct iio_dev *indio_dev;
-+ struct gpio_chip *chip;
-+};
-+
-+static int stx104_read_raw(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan, int *val, int *val2, long mask)
-+{
-+ struct stx104_iio *const priv = iio_priv(indio_dev);
-+ unsigned int adc_config;
-+ int adbu;
-+ int gain;
-+
-+ switch (mask) {
-+ case IIO_CHAN_INFO_HARDWAREGAIN:
-+ /* get gain configuration */
-+ adc_config = inb(priv->base + 11);
-+ gain = adc_config & 0x3;
-+
-+ *val = 1 << gain;
-+ return IIO_VAL_INT;
-+ case IIO_CHAN_INFO_RAW:
-+ if (chan->output) {
-+ *val = priv->chan_out_states[chan->channel];
-+ return IIO_VAL_INT;
-+ }
-+
-+ /* select ADC channel */
-+ outb(chan->channel | (chan->channel << 4), priv->base + 2);
-+
-+ /* trigger ADC sample capture and wait for completion */
-+ outb(0, priv->base);
-+ while (inb(priv->base + 8) & BIT(7));
-+
-+ *val = inw(priv->base);
-+ return IIO_VAL_INT;
-+ case IIO_CHAN_INFO_OFFSET:
-+ /* get ADC bipolar/unipolar configuration */
-+ adc_config = inb(priv->base + 11);
-+ adbu = !(adc_config & BIT(2));
-+
-+ *val = -32768 * adbu;
-+ return IIO_VAL_INT;
-+ case IIO_CHAN_INFO_SCALE:
-+ /* get ADC bipolar/unipolar and gain configuration */
-+ adc_config = inb(priv->base + 11);
-+ adbu = !(adc_config & BIT(2));
-+ gain = adc_config & 0x3;
-+
-+ *val = 5;
-+ *val2 = 15 - adbu + gain;
-+ return IIO_VAL_FRACTIONAL_LOG2;
-+ }
-+
-+ return -EINVAL;
-+}
-+
-+static int stx104_write_raw(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan, int val, int val2, long mask)
-+{
-+ struct stx104_iio *const priv = iio_priv(indio_dev);
-+
-+ switch (mask) {
-+ case IIO_CHAN_INFO_HARDWAREGAIN:
-+ /* Only four gain states (x1, x2, x4, x8) */
-+ switch (val) {
-+ case 1:
-+ outb(0, priv->base + 11);
-+ break;
-+ case 2:
-+ outb(1, priv->base + 11);
-+ break;
-+ case 4:
-+ outb(2, priv->base + 11);
-+ break;
-+ case 8:
-+ outb(3, priv->base + 11);
-+ break;
-+ default:
-+ return -EINVAL;
-+ }
-+
-+ return 0;
-+ case IIO_CHAN_INFO_RAW:
-+ if (chan->output) {
-+ /* DAC can only accept up to a 16-bit value */
-+ if ((unsigned int)val > 65535)
-+ return -EINVAL;
-+
-+ priv->chan_out_states[chan->channel] = val;
-+ outw(val, priv->base + 4 + 2 * chan->channel);
-+
-+ return 0;
-+ }
-+ return -EINVAL;
-+ }
-+
-+ return -EINVAL;
-+}
-+
-+static const struct iio_info stx104_info = {
-+ .driver_module = THIS_MODULE,
-+ .read_raw = stx104_read_raw,
-+ .write_raw = stx104_write_raw
-+};
-+
-+/* single-ended input channels configuration */
-+static const struct iio_chan_spec stx104_channels_sing[] = {
-+ STX104_OUT_CHAN(0), STX104_OUT_CHAN(1),
-+ STX104_IN_CHAN(0, 0), STX104_IN_CHAN(1, 0), STX104_IN_CHAN(2, 0),
-+ STX104_IN_CHAN(3, 0), STX104_IN_CHAN(4, 0), STX104_IN_CHAN(5, 0),
-+ STX104_IN_CHAN(6, 0), STX104_IN_CHAN(7, 0), STX104_IN_CHAN(8, 0),
-+ STX104_IN_CHAN(9, 0), STX104_IN_CHAN(10, 0), STX104_IN_CHAN(11, 0),
-+ STX104_IN_CHAN(12, 0), STX104_IN_CHAN(13, 0), STX104_IN_CHAN(14, 0),
-+ STX104_IN_CHAN(15, 0)
-+};
-+/* differential input channels configuration */
-+static const struct iio_chan_spec stx104_channels_diff[] = {
-+ STX104_OUT_CHAN(0), STX104_OUT_CHAN(1),
-+ STX104_IN_CHAN(0, 1), STX104_IN_CHAN(1, 1), STX104_IN_CHAN(2, 1),
-+ STX104_IN_CHAN(3, 1), STX104_IN_CHAN(4, 1), STX104_IN_CHAN(5, 1),
-+ STX104_IN_CHAN(6, 1), STX104_IN_CHAN(7, 1)
-+};
-+
-+static int stx104_gpio_get_direction(struct gpio_chip *chip,
-+ unsigned int offset)
-+{
-+ /* GPIO 0-3 are input only, while the rest are output only */
-+ if (offset < 4)
-+ return 1;
-+
-+ return 0;
-+}
-+
-+static int stx104_gpio_direction_input(struct gpio_chip *chip,
-+ unsigned int offset)
-+{
-+ if (offset >= 4)
-+ return -EINVAL;
-+
-+ return 0;
-+}
-+
-+static int stx104_gpio_direction_output(struct gpio_chip *chip,
-+ unsigned int offset, int value)
-+{
-+ if (offset < 4)
-+ return -EINVAL;
-+
-+ chip->set(chip, offset, value);
-+ return 0;
-+}
-+
-+static int stx104_gpio_get(struct gpio_chip *chip, unsigned int offset)
-+{
-+ struct stx104_gpio *const stx104gpio = gpiochip_get_data(chip);
-+
-+ if (offset >= 4)
-+ return -EINVAL;
-+
-+ return !!(inb(stx104gpio->base) & BIT(offset));
-+}
-+
-+static void stx104_gpio_set(struct gpio_chip *chip, unsigned int offset,
-+ int value)
-+{
-+ struct stx104_gpio *const stx104gpio = gpiochip_get_data(chip);
-+ const unsigned int mask = BIT(offset) >> 4;
-+ unsigned long flags;
-+
-+ if (offset < 4)
-+ return;
-+
-+ spin_lock_irqsave(&stx104gpio->lock, flags);
-+
-+ if (value)
-+ stx104gpio->out_state |= mask;
-+ else
-+ stx104gpio->out_state &= ~mask;
-+
-+ outb(stx104gpio->out_state, stx104gpio->base);
-+
-+ spin_unlock_irqrestore(&stx104gpio->lock, flags);
-+}
-+
-+static int stx104_probe(struct device *dev, unsigned int id)
-+{
-+ struct iio_dev *indio_dev;
-+ struct stx104_iio *priv;
-+ struct stx104_gpio *stx104gpio;
-+ struct stx104_dev *stx104dev;
-+ int err;
-+
-+ indio_dev = devm_iio_device_alloc(dev, sizeof(*priv));
-+ if (!indio_dev)
-+ return -ENOMEM;
-+
-+ stx104gpio = devm_kzalloc(dev, sizeof(*stx104gpio), GFP_KERNEL);
-+ if (!stx104gpio)
-+ return -ENOMEM;
-+
-+ stx104dev = devm_kzalloc(dev, sizeof(*stx104dev), GFP_KERNEL);
-+ if (!stx104dev)
-+ return -ENOMEM;
-+
-+ if (!devm_request_region(dev, base[id], STX104_EXTENT,
-+ dev_name(dev))) {
-+ dev_err(dev, "Unable to lock port addresses (0x%X-0x%X)\n",
-+ base[id], base[id] + STX104_EXTENT);
-+ return -EBUSY;
-+ }
-+
-+ indio_dev->info = &stx104_info;
-+ indio_dev->modes = INDIO_DIRECT_MODE;
-+
-+ /* determine if differential inputs */
-+ if (inb(base[id] + 8) & BIT(5)) {
-+ indio_dev->num_channels = ARRAY_SIZE(stx104_channels_diff);
-+ indio_dev->channels = stx104_channels_diff;
-+ } else {
-+ indio_dev->num_channels = ARRAY_SIZE(stx104_channels_sing);
-+ indio_dev->channels = stx104_channels_sing;
-+ }
-+
-+ indio_dev->name = dev_name(dev);
-+
-+ priv = iio_priv(indio_dev);
-+ priv->base = base[id];
-+
-+ /* configure device for software trigger operation */
-+ outb(0, base[id] + 9);
-+
-+ /* initialize gain setting to x1 */
-+ outb(0, base[id] + 11);
-+
-+ /* initialize DAC output to 0V */
-+ outw(0, base[id] + 4);
-+ outw(0, base[id] + 6);
-+
-+ stx104gpio->chip.label = dev_name(dev);
-+ stx104gpio->chip.parent = dev;
-+ stx104gpio->chip.owner = THIS_MODULE;
-+ stx104gpio->chip.base = -1;
-+ stx104gpio->chip.ngpio = 8;
-+ stx104gpio->chip.get_direction = stx104_gpio_get_direction;
-+ stx104gpio->chip.direction_input = stx104_gpio_direction_input;
-+ stx104gpio->chip.direction_output = stx104_gpio_direction_output;
-+ stx104gpio->chip.get = stx104_gpio_get;
-+ stx104gpio->chip.set = stx104_gpio_set;
-+ stx104gpio->base = base[id] + 3;
-+ stx104gpio->out_state = 0x0;
-+
-+ spin_lock_init(&stx104gpio->lock);
-+
-+ stx104dev->indio_dev = indio_dev;
-+ stx104dev->chip = &stx104gpio->chip;
-+ dev_set_drvdata(dev, stx104dev);
-+
-+ err = gpiochip_add_data(&stx104gpio->chip, stx104gpio);
-+ if (err) {
-+ dev_err(dev, "GPIO registering failed (%d)\n", err);
-+ return err;
-+ }
-+
-+ err = iio_device_register(indio_dev);
-+ if (err) {
-+ dev_err(dev, "IIO device registering failed (%d)\n", err);
-+ gpiochip_remove(&stx104gpio->chip);
-+ return err;
-+ }
-+
-+ return 0;
-+}
-+
-+static int stx104_remove(struct device *dev, unsigned int id)
-+{
-+ struct stx104_dev *const stx104dev = dev_get_drvdata(dev);
-+
-+ iio_device_unregister(stx104dev->indio_dev);
-+ gpiochip_remove(stx104dev->chip);
-+
-+ return 0;
-+}
-+
-+static struct isa_driver stx104_driver = {
-+ .probe = stx104_probe,
-+ .driver = {
-+ .name = "stx104"
-+ },
-+ .remove = stx104_remove
-+};
-+
-+module_isa_driver(stx104_driver, num_stx104);
-+
-+MODULE_AUTHOR("William Breathitt Gray <vilhelm.gray@gmail.com>");
-+MODULE_DESCRIPTION("Apex Embedded Systems STX104 IIO driver");
-+MODULE_LICENSE("GPL v2");
-diff --git a/drivers/iio/adc/ti-adc12138.c b/drivers/iio/adc/ti-adc12138.c
-new file mode 100644
-index 0000000..072f03b
---- /dev/null
-+++ b/drivers/iio/adc/ti-adc12138.c
-@@ -0,0 +1,552 @@
-+/*
-+ * ADC12130/ADC12132/ADC12138 12-bit plus sign ADC driver
-+ *
-+ * Copyright (c) 2016 Akinobu Mita <akinobu.mita@gmail.com>
-+ *
-+ * This file is subject to the terms and conditions of version 2 of
-+ * the GNU General Public License. See the file COPYING in the main
-+ * directory of this archive for more details.
-+ *
-+ * Datasheet: http://www.ti.com/lit/ds/symlink/adc12138.pdf
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/interrupt.h>
-+#include <linux/completion.h>
-+#include <linux/clk.h>
-+#include <linux/spi/spi.h>
-+#include <linux/iio/iio.h>
-+#include <linux/iio/buffer.h>
-+#include <linux/iio/trigger.h>
-+#include <linux/iio/triggered_buffer.h>
-+#include <linux/iio/trigger_consumer.h>
-+#include <linux/regulator/consumer.h>
-+
-+#define ADC12138_MODE_AUTO_CAL 0x08
-+#define ADC12138_MODE_READ_STATUS 0x0c
-+#define ADC12138_MODE_ACQUISITION_TIME_6 0x0e
-+#define ADC12138_MODE_ACQUISITION_TIME_10 0x4e
-+#define ADC12138_MODE_ACQUISITION_TIME_18 0x8e
-+#define ADC12138_MODE_ACQUISITION_TIME_34 0xce
-+
-+#define ADC12138_STATUS_CAL BIT(6)
-+
-+enum {
-+ adc12130,
-+ adc12132,
-+ adc12138,
-+};
-+
-+struct adc12138 {
-+ struct spi_device *spi;
-+ unsigned int id;
-+ /* conversion clock */
-+ struct clk *cclk;
-+ /* positive analog voltage reference */
-+ struct regulator *vref_p;
-+ /* negative analog voltage reference */
-+ struct regulator *vref_n;
-+ struct mutex lock;
-+ struct completion complete;
-+ /* The number of cclk periods for the S/H's acquisition time */
-+ unsigned int acquisition_time;
-+
-+ u8 tx_buf[2] ____cacheline_aligned;
-+ u8 rx_buf[2];
-+};
-+
-+#define ADC12138_VOLTAGE_CHANNEL(chan) \
-+ { \
-+ .type = IIO_VOLTAGE, \
-+ .indexed = 1, \
-+ .channel = chan, \
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
-+ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) \
-+ | BIT(IIO_CHAN_INFO_OFFSET), \
-+ .scan_index = chan, \
-+ .scan_type = { \
-+ .sign = 's', \
-+ .realbits = 13, \
-+ .storagebits = 16, \
-+ .shift = 3, \
-+ .endianness = IIO_BE, \
-+ }, \
-+ }
-+
-+#define ADC12138_VOLTAGE_CHANNEL_DIFF(chan1, chan2, si) \
-+ { \
-+ .type = IIO_VOLTAGE, \
-+ .indexed = 1, \
-+ .channel = (chan1), \
-+ .channel2 = (chan2), \
-+ .differential = 1, \
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
-+ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) \
-+ | BIT(IIO_CHAN_INFO_OFFSET), \
-+ .scan_index = si, \
-+ .scan_type = { \
-+ .sign = 's', \
-+ .realbits = 13, \
-+ .storagebits = 16, \
-+ .shift = 3, \
-+ .endianness = IIO_BE, \
-+ }, \
-+ }
-+
-+static const struct iio_chan_spec adc12132_channels[] = {
-+ ADC12138_VOLTAGE_CHANNEL(0),
-+ ADC12138_VOLTAGE_CHANNEL(1),
-+ ADC12138_VOLTAGE_CHANNEL_DIFF(0, 1, 2),
-+ ADC12138_VOLTAGE_CHANNEL_DIFF(1, 0, 3),
-+ IIO_CHAN_SOFT_TIMESTAMP(4),
-+};
-+
-+static const struct iio_chan_spec adc12138_channels[] = {
-+ ADC12138_VOLTAGE_CHANNEL(0),
-+ ADC12138_VOLTAGE_CHANNEL(1),
-+ ADC12138_VOLTAGE_CHANNEL(2),
-+ ADC12138_VOLTAGE_CHANNEL(3),
-+ ADC12138_VOLTAGE_CHANNEL(4),
-+ ADC12138_VOLTAGE_CHANNEL(5),
-+ ADC12138_VOLTAGE_CHANNEL(6),
-+ ADC12138_VOLTAGE_CHANNEL(7),
-+ ADC12138_VOLTAGE_CHANNEL_DIFF(0, 1, 8),
-+ ADC12138_VOLTAGE_CHANNEL_DIFF(1, 0, 9),
-+ ADC12138_VOLTAGE_CHANNEL_DIFF(2, 3, 10),
-+ ADC12138_VOLTAGE_CHANNEL_DIFF(3, 2, 11),
-+ ADC12138_VOLTAGE_CHANNEL_DIFF(4, 5, 12),
-+ ADC12138_VOLTAGE_CHANNEL_DIFF(5, 4, 13),
-+ ADC12138_VOLTAGE_CHANNEL_DIFF(6, 7, 14),
-+ ADC12138_VOLTAGE_CHANNEL_DIFF(7, 6, 15),
-+ IIO_CHAN_SOFT_TIMESTAMP(16),
-+};
-+
-+static int adc12138_mode_programming(struct adc12138 *adc, u8 mode,
-+ void *rx_buf, int len)
-+{
-+ struct spi_transfer xfer = {
-+ .tx_buf = adc->tx_buf,
-+ .rx_buf = adc->rx_buf,
-+ .len = len,
-+ };
-+ int ret;
-+
-+ /* Skip unused bits for ADC12130 and ADC12132 */
-+ if (adc->id != adc12138)
-+ mode = (mode & 0xc0) | ((mode & 0x0f) << 2);
-+
-+ adc->tx_buf[0] = mode;
-+
-+ ret = spi_sync_transfer(adc->spi, &xfer, 1);
-+ if (ret)
-+ return ret;
-+
-+ memcpy(rx_buf, adc->rx_buf, len);
-+
-+ return 0;
-+}
-+
-+static int adc12138_read_status(struct adc12138 *adc)
-+{
-+ u8 rx_buf[2];
-+ int ret;
-+
-+ ret = adc12138_mode_programming(adc, ADC12138_MODE_READ_STATUS,
-+ rx_buf, 2);
-+ if (ret)
-+ return ret;
-+
-+ return (rx_buf[0] << 1) | (rx_buf[1] >> 7);
-+}
-+
-+static int __adc12138_start_conv(struct adc12138 *adc,
-+ struct iio_chan_spec const *channel,
-+ void *data, int len)
-+
-+{
-+ const u8 ch_to_mux[] = { 0, 4, 1, 5, 2, 6, 3, 7 };
-+ u8 mode = (ch_to_mux[channel->channel] << 4) |
-+ (channel->differential ? 0 : 0x80);
-+
-+ return adc12138_mode_programming(adc, mode, data, len);
-+}
-+
-+static int adc12138_start_conv(struct adc12138 *adc,
-+ struct iio_chan_spec const *channel)
-+{
-+ u8 trash;
-+
-+ return __adc12138_start_conv(adc, channel, &trash, 1);
-+}
-+
-+static int adc12138_start_and_read_conv(struct adc12138 *adc,
-+ struct iio_chan_spec const *channel,
-+ __be16 *data)
-+{
-+ return __adc12138_start_conv(adc, channel, data, 2);
-+}
-+
-+static int adc12138_read_conv_data(struct adc12138 *adc, __be16 *value)
-+{
-+ /* Issue a read status instruction and read previous conversion data */
-+ return adc12138_mode_programming(adc, ADC12138_MODE_READ_STATUS,
-+ value, sizeof(*value));
-+}
-+
-+static int adc12138_wait_eoc(struct adc12138 *adc, unsigned long timeout)
-+{
-+ if (!wait_for_completion_timeout(&adc->complete, timeout))
-+ return -ETIMEDOUT;
-+
-+ return 0;
-+}
-+
-+static int adc12138_adc_conversion(struct adc12138 *adc,
-+ struct iio_chan_spec const *channel,
-+ __be16 *value)
-+{
-+ int ret;
-+
-+ reinit_completion(&adc->complete);
-+
-+ ret = adc12138_start_conv(adc, channel);
-+ if (ret)
-+ return ret;
-+
-+ ret = adc12138_wait_eoc(adc, msecs_to_jiffies(100));
-+ if (ret)
-+ return ret;
-+
-+ return adc12138_read_conv_data(adc, value);
-+}
-+
-+static int adc12138_read_raw(struct iio_dev *iio,
-+ struct iio_chan_spec const *channel, int *value,
-+ int *shift, long mask)
-+{
-+ struct adc12138 *adc = iio_priv(iio);
-+ int ret;
-+ __be16 data;
-+
-+ switch (mask) {
-+ case IIO_CHAN_INFO_RAW:
-+ mutex_lock(&adc->lock);
-+ ret = adc12138_adc_conversion(adc, channel, &data);
-+ mutex_unlock(&adc->lock);
-+ if (ret)
-+ return ret;
-+
-+ *value = sign_extend32(be16_to_cpu(data) >> 3, 12);
-+
-+ return IIO_VAL_INT;
-+ case IIO_CHAN_INFO_SCALE:
-+ ret = regulator_get_voltage(adc->vref_p);
-+ if (ret < 0)
-+ return ret;
-+ *value = ret;
-+
-+ if (!IS_ERR(adc->vref_n)) {
-+ ret = regulator_get_voltage(adc->vref_n);
-+ if (ret < 0)
-+ return ret;
-+ *value -= ret;
-+ }
-+
-+ /* convert regulator output voltage to mV */
-+ *value /= 1000;
-+ *shift = channel->scan_type.realbits - 1;
-+
-+ return IIO_VAL_FRACTIONAL_LOG2;
-+ case IIO_CHAN_INFO_OFFSET:
-+ if (!IS_ERR(adc->vref_n)) {
-+ *value = regulator_get_voltage(adc->vref_n);
-+ if (*value < 0)
-+ return *value;
-+ } else {
-+ *value = 0;
-+ }
-+
-+ /* convert regulator output voltage to mV */
-+ *value /= 1000;
-+
-+ return IIO_VAL_INT;
-+ }
-+
-+ return -EINVAL;
-+}
-+
-+static const struct iio_info adc12138_info = {
-+ .read_raw = adc12138_read_raw,
-+ .driver_module = THIS_MODULE,
-+};
-+
-+static int adc12138_init(struct adc12138 *adc)
-+{
-+ int ret;
-+ int status;
-+ u8 mode;
-+ u8 trash;
-+
-+ reinit_completion(&adc->complete);
-+
-+ ret = adc12138_mode_programming(adc, ADC12138_MODE_AUTO_CAL, &trash, 1);
-+ if (ret)
-+ return ret;
-+
-+ /* data output at this time has no significance */
-+ status = adc12138_read_status(adc);
-+ if (status < 0)
-+ return status;
-+
-+ adc12138_wait_eoc(adc, msecs_to_jiffies(100));
-+
-+ status = adc12138_read_status(adc);
-+ if (status & ADC12138_STATUS_CAL) {
-+ dev_warn(&adc->spi->dev,
-+ "Auto Cal sequence is still in progress: %#x\n",
-+ status);
-+ return -EIO;
-+ }
-+
-+ switch (adc->acquisition_time) {
-+ case 6:
-+ mode = ADC12138_MODE_ACQUISITION_TIME_6;
-+ break;
-+ case 10:
-+ mode = ADC12138_MODE_ACQUISITION_TIME_10;
-+ break;
-+ case 18:
-+ mode = ADC12138_MODE_ACQUISITION_TIME_18;
-+ break;
-+ case 34:
-+ mode = ADC12138_MODE_ACQUISITION_TIME_34;
-+ break;
-+ default:
-+ return -EINVAL;
-+ }
-+
-+ return adc12138_mode_programming(adc, mode, &trash, 1);
-+}
-+
-+static irqreturn_t adc12138_trigger_handler(int irq, void *p)
-+{
-+ struct iio_poll_func *pf = p;
-+ struct iio_dev *indio_dev = pf->indio_dev;
-+ struct adc12138 *adc = iio_priv(indio_dev);
-+ __be16 data[20] = { }; /* 16x 2 bytes ADC data + 8 bytes timestamp */
-+ __be16 trash;
-+ int ret;
-+ int scan_index;
-+ int i = 0;
-+
-+ mutex_lock(&adc->lock);
-+
-+ for_each_set_bit(scan_index, indio_dev->active_scan_mask,
-+ indio_dev->masklength) {
-+ const struct iio_chan_spec *scan_chan =
-+ &indio_dev->channels[scan_index];
-+
-+ reinit_completion(&adc->complete);
-+
-+ ret = adc12138_start_and_read_conv(adc, scan_chan,
-+ i ? &data[i - 1] : &trash);
-+ if (ret) {
-+ dev_warn(&adc->spi->dev,
-+ "failed to start conversion\n");
-+ goto out;
-+ }
-+
-+ ret = adc12138_wait_eoc(adc, msecs_to_jiffies(100));
-+ if (ret) {
-+ dev_warn(&adc->spi->dev, "wait eoc timeout\n");
-+ goto out;
-+ }
-+
-+ i++;
-+ }
-+
-+ if (i) {
-+ ret = adc12138_read_conv_data(adc, &data[i - 1]);
-+ if (ret) {
-+ dev_warn(&adc->spi->dev,
-+ "failed to get conversion data\n");
-+ goto out;
-+ }
-+ }
-+
-+ iio_push_to_buffers_with_timestamp(indio_dev, data,
-+ iio_get_time_ns(indio_dev));
-+out:
-+ mutex_unlock(&adc->lock);
-+
-+ iio_trigger_notify_done(indio_dev->trig);
-+
-+ return IRQ_HANDLED;
-+}
-+
-+static irqreturn_t adc12138_eoc_handler(int irq, void *p)
-+{
-+ struct iio_dev *indio_dev = p;
-+ struct adc12138 *adc = iio_priv(indio_dev);
-+
-+ complete(&adc->complete);
-+
-+ return IRQ_HANDLED;
-+}
-+
-+static int adc12138_probe(struct spi_device *spi)
-+{
-+ struct iio_dev *indio_dev;
-+ struct adc12138 *adc;
-+ int ret;
-+
-+ indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*adc));
-+ if (!indio_dev)
-+ return -ENOMEM;
-+
-+ adc = iio_priv(indio_dev);
-+ adc->spi = spi;
-+ adc->id = spi_get_device_id(spi)->driver_data;
-+ mutex_init(&adc->lock);
-+ init_completion(&adc->complete);
-+
-+ indio_dev->name = spi_get_device_id(spi)->name;
-+ indio_dev->dev.parent = &spi->dev;
-+ indio_dev->info = &adc12138_info;
-+ indio_dev->modes = INDIO_DIRECT_MODE;
-+
-+ switch (adc->id) {
-+ case adc12130:
-+ case adc12132:
-+ indio_dev->channels = adc12132_channels;
-+ indio_dev->num_channels = ARRAY_SIZE(adc12132_channels);
-+ break;
-+ case adc12138:
-+ indio_dev->channels = adc12138_channels;
-+ indio_dev->num_channels = ARRAY_SIZE(adc12138_channels);
-+ break;
-+ default:
-+ return -EINVAL;
-+ }
-+
-+ ret = of_property_read_u32(spi->dev.of_node, "ti,acquisition-time",
-+ &adc->acquisition_time);
-+ if (ret)
-+ adc->acquisition_time = 10;
-+
-+ adc->cclk = devm_clk_get(&spi->dev, NULL);
-+ if (IS_ERR(adc->cclk))
-+ return PTR_ERR(adc->cclk);
-+
-+ adc->vref_p = devm_regulator_get(&spi->dev, "vref-p");
-+ if (IS_ERR(adc->vref_p))
-+ return PTR_ERR(adc->vref_p);
-+
-+ adc->vref_n = devm_regulator_get_optional(&spi->dev, "vref-n");
-+ if (IS_ERR(adc->vref_n)) {
-+ /*
-+ * Assume vref_n is 0V if an optional regulator is not
-+ * specified, otherwise return the error code.
-+ */
-+ ret = PTR_ERR(adc->vref_n);
-+ if (ret != -ENODEV)
-+ return ret;
-+ }
-+
-+ ret = devm_request_irq(&spi->dev, spi->irq, adc12138_eoc_handler,
-+ IRQF_TRIGGER_RISING, indio_dev->name, indio_dev);
-+ if (ret)
-+ return ret;
-+
-+ ret = clk_prepare_enable(adc->cclk);
-+ if (ret)
-+ return ret;
-+
-+ ret = regulator_enable(adc->vref_p);
-+ if (ret)
-+ goto err_clk_disable;
-+
-+ if (!IS_ERR(adc->vref_n)) {
-+ ret = regulator_enable(adc->vref_n);
-+ if (ret)
-+ goto err_vref_p_disable;
-+ }
-+
-+ ret = adc12138_init(adc);
-+ if (ret)
-+ goto err_vref_n_disable;
-+
-+ spi_set_drvdata(spi, indio_dev);
-+
-+ ret = iio_triggered_buffer_setup(indio_dev, NULL,
-+ adc12138_trigger_handler, NULL);
-+ if (ret)
-+ goto err_vref_n_disable;
-+
-+ ret = iio_device_register(indio_dev);
-+ if (ret)
-+ goto err_buffer_cleanup;
-+
-+ return 0;
-+err_buffer_cleanup:
-+ iio_triggered_buffer_cleanup(indio_dev);
-+err_vref_n_disable:
-+ if (!IS_ERR(adc->vref_n))
-+ regulator_disable(adc->vref_n);
-+err_vref_p_disable:
-+ regulator_disable(adc->vref_p);
-+err_clk_disable:
-+ clk_disable_unprepare(adc->cclk);
-+
-+ return ret;
-+}
-+
-+static int adc12138_remove(struct spi_device *spi)
-+{
-+ struct iio_dev *indio_dev = spi_get_drvdata(spi);
-+ struct adc12138 *adc = iio_priv(indio_dev);
-+
-+ iio_device_unregister(indio_dev);
-+ iio_triggered_buffer_cleanup(indio_dev);
-+ if (!IS_ERR(adc->vref_n))
-+ regulator_disable(adc->vref_n);
-+ regulator_disable(adc->vref_p);
-+ clk_disable_unprepare(adc->cclk);
-+
-+ return 0;
-+}
-+
-+#ifdef CONFIG_OF
-+
-+static const struct of_device_id adc12138_dt_ids[] = {
-+ { .compatible = "ti,adc12130", },
-+ { .compatible = "ti,adc12132", },
-+ { .compatible = "ti,adc12138", },
-+ {}
-+};
-+MODULE_DEVICE_TABLE(of, adc12138_dt_ids);
-+
-+#endif
-+
-+static const struct spi_device_id adc12138_id[] = {
-+ { "adc12130", adc12130 },
-+ { "adc12132", adc12132 },
-+ { "adc12138", adc12138 },
-+ {}
-+};
-+MODULE_DEVICE_TABLE(spi, adc12138_id);
-+
-+static struct spi_driver adc12138_driver = {
-+ .driver = {
-+ .name = "adc12138",
-+ .of_match_table = of_match_ptr(adc12138_dt_ids),
-+ },
-+ .probe = adc12138_probe,
-+ .remove = adc12138_remove,
-+ .id_table = adc12138_id,
-+};
-+module_spi_driver(adc12138_driver);
-+
-+MODULE_AUTHOR("Akinobu Mita <akinobu.mita@gmail.com>");
-+MODULE_DESCRIPTION("ADC12130/ADC12132/ADC12138 driver");
-+MODULE_LICENSE("GPL v2");
-diff --git a/drivers/iio/adc/ti-adc161s626.c b/drivers/iio/adc/ti-adc161s626.c
-new file mode 100644
-index 0000000..f94b69f
---- /dev/null
-+++ b/drivers/iio/adc/ti-adc161s626.c
-@@ -0,0 +1,248 @@
-+/*
-+ * ti-adc161s626.c - Texas Instruments ADC161S626 1-channel differential ADC
-+ *
-+ * ADC Devices Supported:
-+ * adc141s626 - 14-bit ADC
-+ * adc161s626 - 16-bit ADC
-+ *
-+ * Copyright (C) 2016 Matt Ranostay <mranostay@gmail.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * 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 <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/err.h>
-+#include <linux/spi/spi.h>
-+#include <linux/iio/iio.h>
-+#include <linux/iio/trigger.h>
-+#include <linux/iio/buffer.h>
-+#include <linux/iio/trigger_consumer.h>
-+#include <linux/iio/triggered_buffer.h>
-+
-+#define TI_ADC_DRV_NAME "ti-adc161s626"
-+
-+enum {
-+ TI_ADC141S626,
-+ TI_ADC161S626,
-+};
-+
-+static const struct iio_chan_spec ti_adc141s626_channels[] = {
-+ {
-+ .type = IIO_VOLTAGE,
-+ .channel = 0,
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
-+ .scan_index = 0,
-+ .scan_type = {
-+ .sign = 's',
-+ .realbits = 14,
-+ .storagebits = 16,
-+ },
-+ },
-+ IIO_CHAN_SOFT_TIMESTAMP(1),
-+};
-+
-+static const struct iio_chan_spec ti_adc161s626_channels[] = {
-+ {
-+ .type = IIO_VOLTAGE,
-+ .channel = 0,
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
-+ .scan_index = 0,
-+ .scan_type = {
-+ .sign = 's',
-+ .realbits = 16,
-+ .storagebits = 16,
-+ },
-+ },
-+ IIO_CHAN_SOFT_TIMESTAMP(1),
-+};
-+
-+struct ti_adc_data {
-+ struct iio_dev *indio_dev;
-+ struct spi_device *spi;
-+ u8 read_size;
-+ u8 shift;
-+
-+ u8 buffer[16] ____cacheline_aligned;
-+};
-+
-+static int ti_adc_read_measurement(struct ti_adc_data *data,
-+ struct iio_chan_spec const *chan, int *val)
-+{
-+ int ret;
-+
-+ switch (data->read_size) {
-+ case 2: {
-+ __be16 buf;
-+
-+ ret = spi_read(data->spi, (void *) &buf, 2);
-+ if (ret)
-+ return ret;
-+
-+ *val = be16_to_cpu(buf);
-+ break;
-+ }
-+ case 3: {
-+ __be32 buf;
-+
-+ ret = spi_read(data->spi, (void *) &buf, 3);
-+ if (ret)
-+ return ret;
-+
-+ *val = be32_to_cpu(buf) >> 8;
-+ break;
-+ }
-+ default:
-+ return -EINVAL;
-+ }
-+
-+ *val = sign_extend32(*val >> data->shift, chan->scan_type.realbits - 1);
-+
-+ return 0;
-+}
-+
-+static irqreturn_t ti_adc_trigger_handler(int irq, void *private)
-+{
-+ struct iio_poll_func *pf = private;
-+ struct iio_dev *indio_dev = pf->indio_dev;
-+ struct ti_adc_data *data = iio_priv(indio_dev);
-+ int ret;
-+
-+ ret = ti_adc_read_measurement(data, &indio_dev->channels[0],
-+ (int *) &data->buffer);
-+ if (!ret)
-+ iio_push_to_buffers_with_timestamp(indio_dev,
-+ data->buffer,
-+ iio_get_time_ns(indio_dev));
-+
-+ iio_trigger_notify_done(indio_dev->trig);
-+
-+ return IRQ_HANDLED;
-+}
-+
-+static int ti_adc_read_raw(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan,
-+ int *val, int *val2, long mask)
-+{
-+ struct ti_adc_data *data = iio_priv(indio_dev);
-+ int ret;
-+
-+ if (mask != IIO_CHAN_INFO_RAW)
-+ return -EINVAL;
-+
-+ ret = iio_device_claim_direct_mode(indio_dev);
-+ if (ret)
-+ return ret;
-+
-+ ret = ti_adc_read_measurement(data, chan, val);
-+ iio_device_release_direct_mode(indio_dev);
-+
-+ if (!ret)
-+ return IIO_VAL_INT;
-+
-+ return 0;
-+}
-+
-+static const struct iio_info ti_adc_info = {
-+ .driver_module = THIS_MODULE,
-+ .read_raw = ti_adc_read_raw,
-+};
-+
-+static int ti_adc_probe(struct spi_device *spi)
-+{
-+ struct iio_dev *indio_dev;
-+ struct ti_adc_data *data;
-+ int ret;
-+
-+ indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*data));
-+ if (!indio_dev)
-+ return -ENOMEM;
-+
-+ indio_dev->info = &ti_adc_info;
-+ indio_dev->dev.parent = &spi->dev;
-+ indio_dev->dev.of_node = spi->dev.of_node;
-+ indio_dev->name = TI_ADC_DRV_NAME;
-+ indio_dev->modes = INDIO_DIRECT_MODE;
-+ spi_set_drvdata(spi, indio_dev);
-+
-+ data = iio_priv(indio_dev);
-+ data->spi = spi;
-+
-+ switch (spi_get_device_id(spi)->driver_data) {
-+ case TI_ADC141S626:
-+ indio_dev->channels = ti_adc141s626_channels;
-+ indio_dev->num_channels = ARRAY_SIZE(ti_adc141s626_channels);
-+ data->shift = 0;
-+ data->read_size = 2;
-+ break;
-+ case TI_ADC161S626:
-+ indio_dev->channels = ti_adc161s626_channels;
-+ indio_dev->num_channels = ARRAY_SIZE(ti_adc161s626_channels);
-+ data->shift = 6;
-+ data->read_size = 3;
-+ break;
-+ }
-+
-+ ret = iio_triggered_buffer_setup(indio_dev, NULL,
-+ ti_adc_trigger_handler, NULL);
-+ if (ret)
-+ return ret;
-+
-+ ret = iio_device_register(indio_dev);
-+ if (ret)
-+ goto error_unreg_buffer;
-+
-+ return 0;
-+
-+error_unreg_buffer:
-+ iio_triggered_buffer_cleanup(indio_dev);
-+
-+ return ret;
-+}
-+
-+static int ti_adc_remove(struct spi_device *spi)
-+{
-+ struct iio_dev *indio_dev = spi_get_drvdata(spi);
-+
-+ iio_device_unregister(indio_dev);
-+ iio_triggered_buffer_cleanup(indio_dev);
-+
-+ return 0;
-+}
-+
-+static const struct of_device_id ti_adc_dt_ids[] = {
-+ { .compatible = "ti,adc141s626", },
-+ { .compatible = "ti,adc161s626", },
-+ {}
-+};
-+MODULE_DEVICE_TABLE(of, ti_adc_dt_ids);
-+
-+static const struct spi_device_id ti_adc_id[] = {
-+ {"adc141s626", TI_ADC141S626},
-+ {"adc161s626", TI_ADC161S626},
-+ {},
-+};
-+MODULE_DEVICE_TABLE(spi, ti_adc_id);
-+
-+static struct spi_driver ti_adc_driver = {
-+ .driver = {
-+ .name = TI_ADC_DRV_NAME,
-+ .of_match_table = of_match_ptr(ti_adc_dt_ids),
-+ },
-+ .probe = ti_adc_probe,
-+ .remove = ti_adc_remove,
-+ .id_table = ti_adc_id,
-+};
-+module_spi_driver(ti_adc_driver);
-+
-+MODULE_AUTHOR("Matt Ranostay <mranostay@gmail.com>");
-+MODULE_DESCRIPTION("Texas Instruments ADC1x1S 1-channel differential ADC");
-+MODULE_LICENSE("GPL");
-diff --git a/drivers/iio/adc/ti-ads1015.c b/drivers/iio/adc/ti-ads1015.c
-index 066abaf..cde6f13 100644
---- a/drivers/iio/adc/ti-ads1015.c
-+++ b/drivers/iio/adc/ti-ads1015.c
-@@ -522,6 +522,7 @@ static int ads1015_get_channels_config_of(struct i2c_client *client)
- if (pga > 6) {
- dev_err(&client->dev, "invalid gain on %s\n",
- node->full_name);
-+ of_node_put(node);
- return -EINVAL;
- }
- }
-@@ -532,6 +533,7 @@ static int ads1015_get_channels_config_of(struct i2c_client *client)
- dev_err(&client->dev,
- "invalid data_rate on %s\n",
- node->full_name);
-+ of_node_put(node);
- return -EINVAL;
- }
- }
-diff --git a/drivers/iio/adc/ti-ads8688.c b/drivers/iio/adc/ti-ads8688.c
-index c400439..4a16349 100644
---- a/drivers/iio/adc/ti-ads8688.c
-+++ b/drivers/iio/adc/ti-ads8688.c
-@@ -438,7 +438,7 @@ static int ads8688_probe(struct spi_device *spi)
- return 0;
-
- error_out:
-- if (!IS_ERR_OR_NULL(st->reg))
-+ if (!IS_ERR(st->reg))
- regulator_disable(st->reg);
-
- return ret;
-@@ -451,7 +451,7 @@ static int ads8688_remove(struct spi_device *spi)
-
- iio_device_unregister(indio_dev);
-
-- if (!IS_ERR_OR_NULL(st->reg))
-+ if (!IS_ERR(st->reg))
- regulator_disable(st->reg);
-
- return 0;
-diff --git a/drivers/iio/buffer/industrialio-buffer-cb.c b/drivers/iio/buffer/industrialio-buffer-cb.c
-index 323079c..b8f550e 100644
---- a/drivers/iio/buffer/industrialio-buffer-cb.c
-+++ b/drivers/iio/buffer/industrialio-buffer-cb.c
-@@ -18,6 +18,7 @@ struct iio_cb_buffer {
- int (*cb)(const void *data, void *private);
- void *private;
- struct iio_channel *channels;
-+ struct iio_dev *indio_dev;
- };
-
- static struct iio_cb_buffer *buffer_to_cb_buffer(struct iio_buffer *buffer)
-@@ -52,7 +53,6 @@ struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev,
- {
- int ret;
- struct iio_cb_buffer *cb_buff;
-- struct iio_dev *indio_dev;
- struct iio_channel *chan;
-
- cb_buff = kzalloc(sizeof(*cb_buff), GFP_KERNEL);
-@@ -72,17 +72,17 @@ struct iio_cb_buffer *iio_channel_get_all_cb(struct device *dev,
- goto error_free_cb_buff;
- }
-
-- indio_dev = cb_buff->channels[0].indio_dev;
-+ cb_buff->indio_dev = cb_buff->channels[0].indio_dev;
- cb_buff->buffer.scan_mask
-- = kcalloc(BITS_TO_LONGS(indio_dev->masklength), sizeof(long),
-- GFP_KERNEL);
-+ = kcalloc(BITS_TO_LONGS(cb_buff->indio_dev->masklength),
-+ sizeof(long), GFP_KERNEL);
- if (cb_buff->buffer.scan_mask == NULL) {
- ret = -ENOMEM;
- goto error_release_channels;
- }
- chan = &cb_buff->channels[0];
- while (chan->indio_dev) {
-- if (chan->indio_dev != indio_dev) {
-+ if (chan->indio_dev != cb_buff->indio_dev) {
- ret = -EINVAL;
- goto error_free_scan_mask;
- }
-@@ -105,17 +105,14 @@ EXPORT_SYMBOL_GPL(iio_channel_get_all_cb);
-
- int iio_channel_start_all_cb(struct iio_cb_buffer *cb_buff)
- {
-- return iio_update_buffers(cb_buff->channels[0].indio_dev,
-- &cb_buff->buffer,
-+ return iio_update_buffers(cb_buff->indio_dev, &cb_buff->buffer,
- NULL);
- }
- EXPORT_SYMBOL_GPL(iio_channel_start_all_cb);
-
- void iio_channel_stop_all_cb(struct iio_cb_buffer *cb_buff)
- {
-- iio_update_buffers(cb_buff->channels[0].indio_dev,
-- NULL,
-- &cb_buff->buffer);
-+ iio_update_buffers(cb_buff->indio_dev, NULL, &cb_buff->buffer);
- }
- EXPORT_SYMBOL_GPL(iio_channel_stop_all_cb);
-
-@@ -133,6 +130,13 @@ struct iio_channel
- }
- EXPORT_SYMBOL_GPL(iio_channel_cb_get_channels);
-
-+struct iio_dev
-+*iio_channel_cb_get_iio_dev(const struct iio_cb_buffer *cb_buffer)
-+{
-+ return cb_buffer->indio_dev;
-+}
-+EXPORT_SYMBOL_GPL(iio_channel_cb_get_iio_dev);
-+
- MODULE_AUTHOR("Jonathan Cameron <jic23@kernel.org>");
- MODULE_DESCRIPTION("Industrial I/O callback buffer");
- MODULE_LICENSE("GPL");
-diff --git a/drivers/iio/buffer/industrialio-triggered-buffer.c b/drivers/iio/buffer/industrialio-triggered-buffer.c
-index 4b2858b..d3db1fc 100644
---- a/drivers/iio/buffer/industrialio-triggered-buffer.c
-+++ b/drivers/iio/buffer/industrialio-triggered-buffer.c
-@@ -98,6 +98,48 @@ void iio_triggered_buffer_cleanup(struct iio_dev *indio_dev)
- }
- EXPORT_SYMBOL(iio_triggered_buffer_cleanup);
-
-+static void devm_iio_triggered_buffer_clean(struct device *dev, void *res)
-+{
-+ iio_triggered_buffer_cleanup(*(struct iio_dev **)res);
-+}
-+
-+int devm_iio_triggered_buffer_setup(struct device *dev,
-+ struct iio_dev *indio_dev,
-+ irqreturn_t (*h)(int irq, void *p),
-+ irqreturn_t (*thread)(int irq, void *p),
-+ const struct iio_buffer_setup_ops *ops)
-+{
-+ struct iio_dev **ptr;
-+ int ret;
-+
-+ ptr = devres_alloc(devm_iio_triggered_buffer_clean, sizeof(*ptr),
-+ GFP_KERNEL);
-+ if (!ptr)
-+ return -ENOMEM;
-+
-+ *ptr = indio_dev;
-+
-+ ret = iio_triggered_buffer_setup(indio_dev, h, thread, ops);
-+ if (!ret)
-+ devres_add(dev, ptr);
-+ else
-+ devres_free(ptr);
-+
-+ return ret;
-+}
-+EXPORT_SYMBOL_GPL(devm_iio_triggered_buffer_setup);
-+
-+void devm_iio_triggered_buffer_cleanup(struct device *dev,
-+ struct iio_dev *indio_dev)
-+{
-+ int rc;
-+
-+ rc = devres_release(dev, devm_iio_triggered_buffer_clean,
-+ devm_iio_device_match, indio_dev);
-+ WARN_ON(rc);
-+}
-+EXPORT_SYMBOL_GPL(devm_iio_triggered_buffer_cleanup);
-+
- MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
- MODULE_DESCRIPTION("IIO helper functions for setting up triggered buffers");
- MODULE_LICENSE("GPL");
-diff --git a/drivers/iio/chemical/Kconfig b/drivers/iio/chemical/Kconfig
-index 4bcc025..cea7f98 100644
---- a/drivers/iio/chemical/Kconfig
-+++ b/drivers/iio/chemical/Kconfig
-@@ -16,6 +16,7 @@ config ATLAS_PH_SENSOR
- Atlas Scientific OEM SM sensors:
- * pH SM sensor
- * EC SM sensor
-+ * ORP SM sensor
-
- To compile this driver as module, choose M here: the
- module will be called atlas-ph-sensor.
-diff --git a/drivers/iio/chemical/atlas-ph-sensor.c b/drivers/iio/chemical/atlas-ph-sensor.c
-index 407f141..bd321b3 100644
---- a/drivers/iio/chemical/atlas-ph-sensor.c
-+++ b/drivers/iio/chemical/atlas-ph-sensor.c
-@@ -66,12 +66,17 @@
- #define ATLAS_REG_TDS_DATA 0x1c
- #define ATLAS_REG_PSS_DATA 0x20
-
-+#define ATLAS_REG_ORP_CALIB_STATUS 0x0d
-+#define ATLAS_REG_ORP_DATA 0x0e
-+
- #define ATLAS_PH_INT_TIME_IN_US 450000
- #define ATLAS_EC_INT_TIME_IN_US 650000
-+#define ATLAS_ORP_INT_TIME_IN_US 450000
-
- enum {
- ATLAS_PH_SM,
- ATLAS_EC_SM,
-+ ATLAS_ORP_SM,
- };
-
- struct atlas_data {
-@@ -84,26 +89,10 @@ struct atlas_data {
- __be32 buffer[6]; /* 96-bit data + 32-bit pad + 64-bit timestamp */
- };
-
--static const struct regmap_range atlas_volatile_ranges[] = {
-- regmap_reg_range(ATLAS_REG_INT_CONTROL, ATLAS_REG_INT_CONTROL),
-- regmap_reg_range(ATLAS_REG_PH_DATA, ATLAS_REG_PH_DATA + 4),
-- regmap_reg_range(ATLAS_REG_EC_DATA, ATLAS_REG_PSS_DATA + 4),
--};
--
--static const struct regmap_access_table atlas_volatile_table = {
-- .yes_ranges = atlas_volatile_ranges,
-- .n_yes_ranges = ARRAY_SIZE(atlas_volatile_ranges),
--};
--
- static const struct regmap_config atlas_regmap_config = {
- .name = ATLAS_REGMAP_NAME,
--
- .reg_bits = 8,
- .val_bits = 8,
--
-- .volatile_table = &atlas_volatile_table,
-- .max_register = ATLAS_REG_PSS_DATA + 4,
-- .cache_type = REGCACHE_RBTREE,
- };
-
- static const struct iio_chan_spec atlas_ph_channels[] = {
-@@ -175,6 +164,23 @@ static const struct iio_chan_spec atlas_ec_channels[] = {
- },
- };
-
-+static const struct iio_chan_spec atlas_orp_channels[] = {
-+ {
-+ .type = IIO_VOLTAGE,
-+ .address = ATLAS_REG_ORP_DATA,
-+ .info_mask_separate =
-+ BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
-+ .scan_index = 0,
-+ .scan_type = {
-+ .sign = 's',
-+ .realbits = 32,
-+ .storagebits = 32,
-+ .endianness = IIO_BE,
-+ },
-+ },
-+ IIO_CHAN_SOFT_TIMESTAMP(1),
-+};
-+
- static int atlas_check_ph_calibration(struct atlas_data *data)
- {
- struct device *dev = &data->client->dev;
-@@ -240,6 +246,22 @@ static int atlas_check_ec_calibration(struct atlas_data *data)
- return 0;
- }
-
-+static int atlas_check_orp_calibration(struct atlas_data *data)
-+{
-+ struct device *dev = &data->client->dev;
-+ int ret;
-+ unsigned int val;
-+
-+ ret = regmap_read(data->regmap, ATLAS_REG_ORP_CALIB_STATUS, &val);
-+ if (ret)
-+ return ret;
-+
-+ if (!val)
-+ dev_warn(dev, "device has not been calibrated\n");
-+
-+ return 0;
-+};
-+
- struct atlas_device {
- const struct iio_chan_spec *channels;
- int num_channels;
-@@ -264,7 +286,13 @@ static struct atlas_device atlas_devices[] = {
- .calibration = &atlas_check_ec_calibration,
- .delay = ATLAS_EC_INT_TIME_IN_US,
- },
--
-+ [ATLAS_ORP_SM] = {
-+ .channels = atlas_orp_channels,
-+ .num_channels = 2,
-+ .data_reg = ATLAS_REG_ORP_DATA,
-+ .calibration = &atlas_check_orp_calibration,
-+ .delay = ATLAS_ORP_INT_TIME_IN_US,
-+ },
- };
-
- static int atlas_set_powermode(struct atlas_data *data, int on)
-@@ -402,15 +430,14 @@ static int atlas_read_raw(struct iio_dev *indio_dev,
- case IIO_PH:
- case IIO_CONCENTRATION:
- case IIO_ELECTRICALCONDUCTIVITY:
-- mutex_lock(&indio_dev->mlock);
-+ case IIO_VOLTAGE:
-+ ret = iio_device_claim_direct_mode(indio_dev);
-+ if (ret)
-+ return ret;
-
-- if (iio_buffer_enabled(indio_dev))
-- ret = -EBUSY;
-- else
-- ret = atlas_read_measurement(data,
-- chan->address, ®);
-+ ret = atlas_read_measurement(data, chan->address, ®);
-
-- mutex_unlock(&indio_dev->mlock);
-+ iio_device_release_direct_mode(indio_dev);
- break;
- default:
- ret = -EINVAL;
-@@ -440,6 +467,10 @@ static int atlas_read_raw(struct iio_dev *indio_dev,
- *val = 0; /* 0.000000001 */
- *val2 = 1000;
- return IIO_VAL_INT_PLUS_NANO;
-+ case IIO_VOLTAGE:
-+ *val = 1; /* 0.1 */
-+ *val2 = 10;
-+ break;
- default:
- return -EINVAL;
- }
-@@ -475,6 +506,7 @@ static const struct iio_info atlas_info = {
- static const struct i2c_device_id atlas_id[] = {
- { "atlas-ph-sm", ATLAS_PH_SM},
- { "atlas-ec-sm", ATLAS_EC_SM},
-+ { "atlas-orp-sm", ATLAS_ORP_SM},
- {}
- };
- MODULE_DEVICE_TABLE(i2c, atlas_id);
-@@ -482,6 +514,7 @@ MODULE_DEVICE_TABLE(i2c, atlas_id);
- static const struct of_device_id atlas_dt_ids[] = {
- { .compatible = "atlas,ph-sm", .data = (void *)ATLAS_PH_SM, },
- { .compatible = "atlas,ec-sm", .data = (void *)ATLAS_EC_SM, },
-+ { .compatible = "atlas,orp-sm", .data = (void *)ATLAS_ORP_SM, },
- { }
- };
- MODULE_DEVICE_TABLE(of, atlas_dt_ids);
-diff --git a/drivers/iio/chemical/vz89x.c b/drivers/iio/chemical/vz89x.c
-index 652649d..8e0e441 100644
---- a/drivers/iio/chemical/vz89x.c
-+++ b/drivers/iio/chemical/vz89x.c
-@@ -19,25 +19,55 @@
- #include <linux/mutex.h>
- #include <linux/init.h>
- #include <linux/i2c.h>
-+#include <linux/of.h>
-+#include <linux/of_device.h>
-
- #include <linux/iio/iio.h>
- #include <linux/iio/sysfs.h>
-
- #define VZ89X_REG_MEASUREMENT 0x09
--#define VZ89X_REG_MEASUREMENT_SIZE 6
-+#define VZ89X_REG_MEASUREMENT_RD_SIZE 6
-+#define VZ89X_REG_MEASUREMENT_WR_SIZE 3
-
- #define VZ89X_VOC_CO2_IDX 0
- #define VZ89X_VOC_SHORT_IDX 1
- #define VZ89X_VOC_TVOC_IDX 2
- #define VZ89X_VOC_RESISTANCE_IDX 3
-
-+#define VZ89TE_REG_MEASUREMENT 0x0c
-+#define VZ89TE_REG_MEASUREMENT_RD_SIZE 7
-+#define VZ89TE_REG_MEASUREMENT_WR_SIZE 6
-+
-+#define VZ89TE_VOC_TVOC_IDX 0
-+#define VZ89TE_VOC_CO2_IDX 1
-+#define VZ89TE_VOC_RESISTANCE_IDX 2
-+
-+enum {
-+ VZ89X,
-+ VZ89TE,
-+};
-+
-+struct vz89x_chip_data;
-+
- struct vz89x_data {
- struct i2c_client *client;
-+ const struct vz89x_chip_data *chip;
- struct mutex lock;
- int (*xfer)(struct vz89x_data *data, u8 cmd);
-
-+ bool is_valid;
- unsigned long last_update;
-- u8 buffer[VZ89X_REG_MEASUREMENT_SIZE];
-+ u8 buffer[VZ89TE_REG_MEASUREMENT_RD_SIZE];
-+};
-+
-+struct vz89x_chip_data {
-+ bool (*valid)(struct vz89x_data *data);
-+ const struct iio_chan_spec *channels;
-+ u8 num_channels;
-+
-+ u8 cmd;
-+ u8 read_size;
-+ u8 write_size;
- };
-
- static const struct iio_chan_spec vz89x_channels[] = {
-@@ -70,6 +100,40 @@ static const struct iio_chan_spec vz89x_channels[] = {
- .info_mask_separate =
- BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
- .address = VZ89X_VOC_RESISTANCE_IDX,
-+ .scan_index = -1,
-+ .scan_type = {
-+ .endianness = IIO_LE,
-+ },
-+ },
-+};
-+
-+static const struct iio_chan_spec vz89te_channels[] = {
-+ {
-+ .type = IIO_CONCENTRATION,
-+ .channel2 = IIO_MOD_VOC,
-+ .modified = 1,
-+ .info_mask_separate =
-+ BIT(IIO_CHAN_INFO_OFFSET) | BIT(IIO_CHAN_INFO_RAW),
-+ .address = VZ89TE_VOC_TVOC_IDX,
-+ },
-+
-+ {
-+ .type = IIO_CONCENTRATION,
-+ .channel2 = IIO_MOD_CO2,
-+ .modified = 1,
-+ .info_mask_separate =
-+ BIT(IIO_CHAN_INFO_OFFSET) | BIT(IIO_CHAN_INFO_RAW),
-+ .address = VZ89TE_VOC_CO2_IDX,
-+ },
-+ {
-+ .type = IIO_RESISTANCE,
-+ .info_mask_separate =
-+ BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
-+ .address = VZ89TE_VOC_RESISTANCE_IDX,
-+ .scan_index = -1,
-+ .scan_type = {
-+ .endianness = IIO_BE,
-+ },
- },
- };
-
-@@ -93,29 +157,45 @@ static const struct attribute_group vz89x_attrs_group = {
- * always zero, and by also confirming the VOC_short isn't zero.
- */
-
--static int vz89x_measurement_is_valid(struct vz89x_data *data)
-+static bool vz89x_measurement_is_valid(struct vz89x_data *data)
- {
- if (data->buffer[VZ89X_VOC_SHORT_IDX] == 0)
-- return 1;
-+ return true;
-
-- return !!(data->buffer[VZ89X_REG_MEASUREMENT_SIZE - 1] > 0);
-+ return !!(data->buffer[data->chip->read_size - 1] > 0);
-+}
-+
-+/* VZ89TE device has a modified CRC-8 two complement check */
-+static bool vz89te_measurement_is_valid(struct vz89x_data *data)
-+{
-+ u8 crc = 0;
-+ int i, sum = 0;
-+
-+ for (i = 0; i < (data->chip->read_size - 1); i++) {
-+ sum = crc + data->buffer[i];
-+ crc = sum;
-+ crc += sum / 256;
-+ }
-+
-+ return !((0xff - crc) == data->buffer[data->chip->read_size - 1]);
- }
-
- static int vz89x_i2c_xfer(struct vz89x_data *data, u8 cmd)
- {
-+ const struct vz89x_chip_data *chip = data->chip;
- struct i2c_client *client = data->client;
- struct i2c_msg msg[2];
- int ret;
-- u8 buf[3] = { cmd, 0, 0};
-+ u8 buf[6] = { cmd, 0, 0, 0, 0, 0xf3 };
-
- msg[0].addr = client->addr;
- msg[0].flags = client->flags;
-- msg[0].len = 3;
-+ msg[0].len = chip->write_size;
- msg[0].buf = (char *) &buf;
-
- msg[1].addr = client->addr;
- msg[1].flags = client->flags | I2C_M_RD;
-- msg[1].len = VZ89X_REG_MEASUREMENT_SIZE;
-+ msg[1].len = chip->read_size;
- msg[1].buf = (char *) &data->buffer;
-
- ret = i2c_transfer(client->adapter, msg, 2);
-@@ -133,7 +213,7 @@ static int vz89x_smbus_xfer(struct vz89x_data *data, u8 cmd)
- if (ret < 0)
- return ret;
-
-- for (i = 0; i < VZ89X_REG_MEASUREMENT_SIZE; i++) {
-+ for (i = 0; i < data->chip->read_size; i++) {
- ret = i2c_smbus_read_byte(client);
- if (ret < 0)
- return ret;
-@@ -145,30 +225,47 @@ static int vz89x_smbus_xfer(struct vz89x_data *data, u8 cmd)
-
- static int vz89x_get_measurement(struct vz89x_data *data)
- {
-+ const struct vz89x_chip_data *chip = data->chip;
- int ret;
-
- /* sensor can only be polled once a second max per datasheet */
- if (!time_after(jiffies, data->last_update + HZ))
-- return 0;
-+ return data->is_valid ? 0 : -EAGAIN;
-+
-+ data->is_valid = false;
-+ data->last_update = jiffies;
-
-- ret = data->xfer(data, VZ89X_REG_MEASUREMENT);
-+ ret = data->xfer(data, chip->cmd);
- if (ret < 0)
- return ret;
-
-- ret = vz89x_measurement_is_valid(data);
-+ ret = chip->valid(data);
- if (ret)
- return -EAGAIN;
-
-- data->last_update = jiffies;
-+ data->is_valid = true;
-
- return 0;
- }
-
--static int vz89x_get_resistance_reading(struct vz89x_data *data)
-+static int vz89x_get_resistance_reading(struct vz89x_data *data,
-+ struct iio_chan_spec const *chan,
-+ int *val)
- {
-- u8 *buf = &data->buffer[VZ89X_VOC_RESISTANCE_IDX];
-+ u8 *tmp = (u8 *) &data->buffer[chan->address];
-
-- return buf[0] | (buf[1] << 8);
-+ switch (chan->scan_type.endianness) {
-+ case IIO_LE:
-+ *val = le32_to_cpup((__le32 *) tmp) & GENMASK(23, 0);
-+ break;
-+ case IIO_BE:
-+ *val = be32_to_cpup((__be32 *) tmp) >> 8;
-+ break;
-+ default:
-+ return -EINVAL;
-+ }
-+
-+ return 0;
- }
-
- static int vz89x_read_raw(struct iio_dev *indio_dev,
-@@ -187,15 +284,15 @@ static int vz89x_read_raw(struct iio_dev *indio_dev,
- if (ret)
- return ret;
-
-- switch (chan->address) {
-- case VZ89X_VOC_CO2_IDX:
-- case VZ89X_VOC_SHORT_IDX:
-- case VZ89X_VOC_TVOC_IDX:
-+ switch (chan->type) {
-+ case IIO_CONCENTRATION:
- *val = data->buffer[chan->address];
- return IIO_VAL_INT;
-- case VZ89X_VOC_RESISTANCE_IDX:
-- *val = vz89x_get_resistance_reading(data);
-- return IIO_VAL_INT;
-+ case IIO_RESISTANCE:
-+ ret = vz89x_get_resistance_reading(data, chan, val);
-+ if (!ret)
-+ return IIO_VAL_INT;
-+ break;
- default:
- return -EINVAL;
- }
-@@ -210,12 +307,12 @@ static int vz89x_read_raw(struct iio_dev *indio_dev,
- }
- break;
- case IIO_CHAN_INFO_OFFSET:
-- switch (chan->address) {
-- case VZ89X_VOC_CO2_IDX:
-+ switch (chan->channel2) {
-+ case IIO_MOD_CO2:
- *val = 44;
- *val2 = 250000;
- return IIO_VAL_INT_PLUS_MICRO;
-- case VZ89X_VOC_TVOC_IDX:
-+ case IIO_MOD_VOC:
- *val = -13;
- return IIO_VAL_INT;
- default:
-@@ -232,11 +329,43 @@ static const struct iio_info vz89x_info = {
- .driver_module = THIS_MODULE,
- };
-
-+static const struct vz89x_chip_data vz89x_chips[] = {
-+ {
-+ .valid = vz89x_measurement_is_valid,
-+
-+ .cmd = VZ89X_REG_MEASUREMENT,
-+ .read_size = VZ89X_REG_MEASUREMENT_RD_SIZE,
-+ .write_size = VZ89X_REG_MEASUREMENT_WR_SIZE,
-+
-+ .channels = vz89x_channels,
-+ .num_channels = ARRAY_SIZE(vz89x_channels),
-+ },
-+ {
-+ .valid = vz89te_measurement_is_valid,
-+
-+ .cmd = VZ89TE_REG_MEASUREMENT,
-+ .read_size = VZ89TE_REG_MEASUREMENT_RD_SIZE,
-+ .write_size = VZ89TE_REG_MEASUREMENT_WR_SIZE,
-+
-+ .channels = vz89te_channels,
-+ .num_channels = ARRAY_SIZE(vz89te_channels),
-+ },
-+};
-+
-+static const struct of_device_id vz89x_dt_ids[] = {
-+ { .compatible = "sgx,vz89x", .data = (void *) VZ89X },
-+ { .compatible = "sgx,vz89te", .data = (void *) VZ89TE },
-+ { }
-+};
-+MODULE_DEVICE_TABLE(of, vz89x_dt_ids);
-+
- static int vz89x_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
- {
- struct iio_dev *indio_dev;
- struct vz89x_data *data;
-+ const struct of_device_id *of_id;
-+ int chip_id;
-
- indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
- if (!indio_dev)
-@@ -251,8 +380,15 @@ static int vz89x_probe(struct i2c_client *client,
- else
- return -EOPNOTSUPP;
-
-+ of_id = of_match_device(vz89x_dt_ids, &client->dev);
-+ if (!of_id)
-+ chip_id = id->driver_data;
-+ else
-+ chip_id = (unsigned long)of_id->data;
-+
- i2c_set_clientdata(client, indio_dev);
- data->client = client;
-+ data->chip = &vz89x_chips[chip_id];
- data->last_update = jiffies - HZ;
- mutex_init(&data->lock);
-
-@@ -261,24 +397,19 @@ static int vz89x_probe(struct i2c_client *client,
- indio_dev->name = dev_name(&client->dev);
- indio_dev->modes = INDIO_DIRECT_MODE;
-
-- indio_dev->channels = vz89x_channels;
-- indio_dev->num_channels = ARRAY_SIZE(vz89x_channels);
-+ indio_dev->channels = data->chip->channels;
-+ indio_dev->num_channels = data->chip->num_channels;
-
- return devm_iio_device_register(&client->dev, indio_dev);
- }
-
- static const struct i2c_device_id vz89x_id[] = {
-- { "vz89x", 0 },
-+ { "vz89x", VZ89X },
-+ { "vz89te", VZ89TE },
- { }
- };
- MODULE_DEVICE_TABLE(i2c, vz89x_id);
-
--static const struct of_device_id vz89x_dt_ids[] = {
-- { .compatible = "sgx,vz89x" },
-- { }
--};
--MODULE_DEVICE_TABLE(of, vz89x_dt_ids);
--
- static struct i2c_driver vz89x_driver = {
- .driver = {
- .name = "vz89x",
-diff --git a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
-index 5b41f9d..a3cce3a 100644
---- a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
-+++ b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
-@@ -122,6 +122,14 @@ int hid_sensor_power_state(struct hid_sensor_common *st, bool state)
- #endif
- }
-
-+static void hid_sensor_set_power_work(struct work_struct *work)
-+{
-+ struct hid_sensor_common *attrb = container_of(work,
-+ struct hid_sensor_common,
-+ work);
-+ _hid_sensor_power_state(attrb, true);
-+}
-+
- static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
- bool state)
- {
-@@ -130,6 +138,7 @@ static int hid_sensor_data_rdy_trigger_set_state(struct iio_trigger *trig,
-
- void hid_sensor_remove_trigger(struct hid_sensor_common *attrb)
- {
-+ cancel_work_sync(&attrb->work);
- iio_trigger_unregister(attrb->trigger);
- iio_trigger_free(attrb->trigger);
- }
-@@ -170,6 +179,9 @@ int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name,
- goto error_unreg_trigger;
-
- iio_device_set_drvdata(indio_dev, attrb);
-+
-+ INIT_WORK(&attrb->work, hid_sensor_set_power_work);
-+
- pm_suspend_ignore_children(&attrb->pdev->dev, true);
- pm_runtime_enable(&attrb->pdev->dev);
- /* Default to 3 seconds, but can be changed from sysfs */
-@@ -187,8 +199,7 @@ error_ret:
- }
- EXPORT_SYMBOL(hid_sensor_setup_trigger);
-
--#ifdef CONFIG_PM
--static int hid_sensor_suspend(struct device *dev)
-+static int __maybe_unused hid_sensor_suspend(struct device *dev)
- {
- struct platform_device *pdev = to_platform_device(dev);
- struct iio_dev *indio_dev = platform_get_drvdata(pdev);
-@@ -197,21 +208,27 @@ static int hid_sensor_suspend(struct device *dev)
- return _hid_sensor_power_state(attrb, false);
- }
-
--static int hid_sensor_resume(struct device *dev)
-+static int __maybe_unused hid_sensor_resume(struct device *dev)
- {
- struct platform_device *pdev = to_platform_device(dev);
- struct iio_dev *indio_dev = platform_get_drvdata(pdev);
- struct hid_sensor_common *attrb = iio_device_get_drvdata(indio_dev);
-+ schedule_work(&attrb->work);
-+ return 0;
-+}
-
-+static int __maybe_unused hid_sensor_runtime_resume(struct device *dev)
-+{
-+ struct platform_device *pdev = to_platform_device(dev);
-+ struct iio_dev *indio_dev = platform_get_drvdata(pdev);
-+ struct hid_sensor_common *attrb = iio_device_get_drvdata(indio_dev);
- return _hid_sensor_power_state(attrb, true);
- }
-
--#endif
--
- const struct dev_pm_ops hid_sensor_pm_ops = {
- SET_SYSTEM_SLEEP_PM_OPS(hid_sensor_suspend, hid_sensor_resume)
- SET_RUNTIME_PM_OPS(hid_sensor_suspend,
-- hid_sensor_resume, NULL)
-+ hid_sensor_runtime_resume, NULL)
- };
- EXPORT_SYMBOL(hid_sensor_pm_ops);
-
-diff --git a/drivers/iio/common/st_sensors/st_sensors_buffer.c b/drivers/iio/common/st_sensors/st_sensors_buffer.c
-index d06e728..fe7775b 100644
---- a/drivers/iio/common/st_sensors/st_sensors_buffer.c
-+++ b/drivers/iio/common/st_sensors/st_sensors_buffer.c
-@@ -63,7 +63,7 @@ irqreturn_t st_sensors_trigger_handler(int irq, void *p)
- * the hardware trigger) and the hw_timestamp may get updated.
- * By storing it in a local variable first, we are safe.
- */
-- if (sdata->hw_irq_trigger)
-+ if (iio_trigger_using_own(indio_dev))
- timestamp = sdata->hw_timestamp;
- else
- timestamp = iio_get_time_ns(indio_dev);
-diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
-index 2d5282e..285a64a 100644
---- a/drivers/iio/common/st_sensors/st_sensors_core.c
-+++ b/drivers/iio/common/st_sensors/st_sensors_core.c
-@@ -234,39 +234,35 @@ int st_sensors_power_enable(struct iio_dev *indio_dev)
- int err;
-
- /* Regulators not mandatory, but if requested we should enable them. */
-- pdata->vdd = devm_regulator_get_optional(indio_dev->dev.parent, "vdd");
-- if (!IS_ERR(pdata->vdd)) {
-- err = regulator_enable(pdata->vdd);
-- if (err != 0) {
-- dev_warn(&indio_dev->dev,
-- "Failed to enable specified Vdd supply\n");
-- return err;
-- }
-- } else {
-- err = PTR_ERR(pdata->vdd);
-- if (err != -ENODEV)
-- return err;
-+ pdata->vdd = devm_regulator_get(indio_dev->dev.parent, "vdd");
-+ if (IS_ERR(pdata->vdd)) {
-+ dev_err(&indio_dev->dev, "unable to get Vdd supply\n");
-+ return PTR_ERR(pdata->vdd);
-+ }
-+ err = regulator_enable(pdata->vdd);
-+ if (err != 0) {
-+ dev_warn(&indio_dev->dev,
-+ "Failed to enable specified Vdd supply\n");
-+ return err;
- }
-
-- pdata->vdd_io = devm_regulator_get_optional(indio_dev->dev.parent, "vddio");
-- if (!IS_ERR(pdata->vdd_io)) {
-- err = regulator_enable(pdata->vdd_io);
-- if (err != 0) {
-- dev_warn(&indio_dev->dev,
-- "Failed to enable specified Vdd_IO supply\n");
-- goto st_sensors_disable_vdd;
-- }
-- } else {
-+ pdata->vdd_io = devm_regulator_get(indio_dev->dev.parent, "vddio");
-+ if (IS_ERR(pdata->vdd_io)) {
-+ dev_err(&indio_dev->dev, "unable to get Vdd_IO supply\n");
- err = PTR_ERR(pdata->vdd_io);
-- if (err != -ENODEV)
-- goto st_sensors_disable_vdd;
-+ goto st_sensors_disable_vdd;
-+ }
-+ err = regulator_enable(pdata->vdd_io);
-+ if (err != 0) {
-+ dev_warn(&indio_dev->dev,
-+ "Failed to enable specified Vdd_IO supply\n");
-+ goto st_sensors_disable_vdd;
- }
-
- return 0;
-
- st_sensors_disable_vdd:
-- if (!IS_ERR_OR_NULL(pdata->vdd))
-- regulator_disable(pdata->vdd);
-+ regulator_disable(pdata->vdd);
- return err;
- }
- EXPORT_SYMBOL(st_sensors_power_enable);
-@@ -275,11 +271,8 @@ void st_sensors_power_disable(struct iio_dev *indio_dev)
- {
- struct st_sensor_data *pdata = iio_priv(indio_dev);
-
-- if (!IS_ERR_OR_NULL(pdata->vdd))
-- regulator_disable(pdata->vdd);
--
-- if (!IS_ERR_OR_NULL(pdata->vdd_io))
-- regulator_disable(pdata->vdd_io);
-+ regulator_disable(pdata->vdd);
-+ regulator_disable(pdata->vdd_io);
- }
- EXPORT_SYMBOL(st_sensors_power_disable);
-
-diff --git a/drivers/iio/common/st_sensors/st_sensors_trigger.c b/drivers/iio/common/st_sensors/st_sensors_trigger.c
-index e66f12e..fa73e67 100644
---- a/drivers/iio/common/st_sensors/st_sensors_trigger.c
-+++ b/drivers/iio/common/st_sensors/st_sensors_trigger.c
-@@ -66,7 +66,7 @@ static int st_sensors_new_samples_available(struct iio_dev *indio_dev,
- * @irq: irq number
- * @p: private handler data
- */
--irqreturn_t st_sensors_irq_handler(int irq, void *p)
-+static irqreturn_t st_sensors_irq_handler(int irq, void *p)
- {
- struct iio_trigger *trig = p;
- struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
-@@ -82,7 +82,7 @@ irqreturn_t st_sensors_irq_handler(int irq, void *p)
- * @irq: irq number
- * @p: private handler data
- */
--irqreturn_t st_sensors_irq_thread(int irq, void *p)
-+static irqreturn_t st_sensors_irq_thread(int irq, void *p)
- {
- struct iio_trigger *trig = p;
- struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
-diff --git a/drivers/iio/dac/Kconfig b/drivers/iio/dac/Kconfig
-index ca81447..120b244 100644
---- a/drivers/iio/dac/Kconfig
-+++ b/drivers/iio/dac/Kconfig
-@@ -181,6 +181,25 @@ config AD7303
- To compile this driver as module choose M here: the module will be called
- ad7303.
-
-+config CIO_DAC
-+ tristate "Measurement Computing CIO-DAC IIO driver"
-+ depends on X86 && ISA_BUS_API
-+ help
-+ Say yes here to build support for the Measurement Computing CIO-DAC
-+ analog output device family (CIO-DAC16, CIO-DAC08, PC104-DAC06). The
-+ base port addresses for the devices may be configured via the base
-+ array module parameter.
-+
-+config AD8801
-+ tristate "Analog Devices AD8801/AD8803 DAC driver"
-+ depends on SPI_MASTER
-+ help
-+ Say yes here to build support for Analog Devices AD8801, AD8803 Digital to
-+ Analog Converters (DAC).
-+
-+ To compile this driver as a module choose M here: the module will be called
-+ ad8801.
-+
- config LPC18XX_DAC
- tristate "NXP LPC18xx DAC driver"
- depends on ARCH_LPC18XX || COMPILE_TEST
-@@ -245,16 +264,6 @@ config MCP4922
- To compile this driver as a module, choose M here: the module
- will be called mcp4922.
-
--config STX104
-- tristate "Apex Embedded Systems STX104 DAC driver"
-- depends on X86 && ISA_BUS_API
-- select GPIOLIB
-- help
-- Say yes here to build support for the 2-channel DAC and GPIO on the
-- Apex Embedded Systems STX104 integrated analog PC/104 card. The base
-- port addresses for the devices may be configured via the base array
-- module parameter.
--
- config VF610_DAC
- tristate "Vybrid vf610 DAC driver"
- depends on OF
-diff --git a/drivers/iio/dac/Makefile b/drivers/iio/dac/Makefile
-index 8b78d5c..27642bb 100644
---- a/drivers/iio/dac/Makefile
-+++ b/drivers/iio/dac/Makefile
-@@ -20,11 +20,12 @@ obj-$(CONFIG_AD5764) += ad5764.o
- obj-$(CONFIG_AD5791) += ad5791.o
- obj-$(CONFIG_AD5686) += ad5686.o
- obj-$(CONFIG_AD7303) += ad7303.o
-+obj-$(CONFIG_AD8801) += ad8801.o
-+obj-$(CONFIG_CIO_DAC) += cio-dac.o
- obj-$(CONFIG_LPC18XX_DAC) += lpc18xx_dac.o
- obj-$(CONFIG_M62332) += m62332.o
- obj-$(CONFIG_MAX517) += max517.o
- obj-$(CONFIG_MAX5821) += max5821.o
- obj-$(CONFIG_MCP4725) += mcp4725.o
- obj-$(CONFIG_MCP4922) += mcp4922.o
--obj-$(CONFIG_STX104) += stx104.o
- obj-$(CONFIG_VF610_DAC) += vf610_dac.o
-diff --git a/drivers/iio/dac/ad5755.c b/drivers/iio/dac/ad5755.c
-index 0fde593..5f79682 100644
---- a/drivers/iio/dac/ad5755.c
-+++ b/drivers/iio/dac/ad5755.c
-@@ -655,7 +655,7 @@ static struct ad5755_platform_data *ad5755_parse_dt(struct device *dev)
-
- devnr = 0;
- for_each_child_of_node(np, pp) {
-- if (devnr > AD5755_NUM_CHANNELS) {
-+ if (devnr >= AD5755_NUM_CHANNELS) {
- dev_err(dev,
- "There is to many channels defined in DT\n");
- goto error_out;
-diff --git a/drivers/iio/dac/ad8801.c b/drivers/iio/dac/ad8801.c
-new file mode 100644
-index 0000000..f06faa1
---- /dev/null
-+++ b/drivers/iio/dac/ad8801.c
-@@ -0,0 +1,239 @@
-+/*
-+ * IIO DAC driver for Analog Devices AD8801 DAC
-+ *
-+ * Copyright (C) 2016 Gwenhael Goavec-Merou
-+ * 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.
-+ *
-+ * 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 <linux/iio/iio.h>
-+#include <linux/module.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/spi/spi.h>
-+#include <linux/sysfs.h>
-+
-+#define AD8801_CFG_ADDR_OFFSET 8
-+
-+enum ad8801_device_ids {
-+ ID_AD8801,
-+ ID_AD8803,
-+};
-+
-+struct ad8801_state {
-+ struct spi_device *spi;
-+ unsigned char dac_cache[8]; /* Value write on each channel */
-+ unsigned int vrefh_mv;
-+ unsigned int vrefl_mv;
-+ struct regulator *vrefh_reg;
-+ struct regulator *vrefl_reg;
-+
-+ __be16 data ____cacheline_aligned;
-+};
-+
-+static int ad8801_spi_write(struct ad8801_state *state,
-+ u8 channel, unsigned char value)
-+{
-+ state->data = cpu_to_be16((channel << AD8801_CFG_ADDR_OFFSET) | value);
-+ return spi_write(state->spi, &state->data, sizeof(state->data));
-+}
-+
-+static int ad8801_write_raw(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan, int val, int val2, long mask)
-+{
-+ struct ad8801_state *state = iio_priv(indio_dev);
-+ int ret;
-+
-+ switch (mask) {
-+ case IIO_CHAN_INFO_RAW:
-+ if (val >= 256 || val < 0)
-+ return -EINVAL;
-+
-+ ret = ad8801_spi_write(state, chan->channel, val);
-+ if (ret == 0)
-+ state->dac_cache[chan->channel] = val;
-+ break;
-+ default:
-+ ret = -EINVAL;
-+ }
-+
-+ return ret;
-+}
-+
-+static int ad8801_read_raw(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan, int *val, int *val2, long info)
-+{
-+ struct ad8801_state *state = iio_priv(indio_dev);
-+
-+ switch (info) {
-+ case IIO_CHAN_INFO_RAW:
-+ *val = state->dac_cache[chan->channel];
-+ return IIO_VAL_INT;
-+ case IIO_CHAN_INFO_SCALE:
-+ *val = state->vrefh_mv - state->vrefl_mv;
-+ *val2 = 8;
-+ return IIO_VAL_FRACTIONAL_LOG2;
-+ case IIO_CHAN_INFO_OFFSET:
-+ *val = state->vrefl_mv;
-+ return IIO_VAL_INT;
-+ default:
-+ return -EINVAL;
-+ }
-+
-+ return -EINVAL;
-+}
-+
-+static const struct iio_info ad8801_info = {
-+ .read_raw = ad8801_read_raw,
-+ .write_raw = ad8801_write_raw,
-+ .driver_module = THIS_MODULE,
-+};
-+
-+#define AD8801_CHANNEL(chan) { \
-+ .type = IIO_VOLTAGE, \
-+ .indexed = 1, \
-+ .output = 1, \
-+ .channel = chan, \
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
-+ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | \
-+ BIT(IIO_CHAN_INFO_OFFSET), \
-+}
-+
-+static const struct iio_chan_spec ad8801_channels[] = {
-+ AD8801_CHANNEL(0),
-+ AD8801_CHANNEL(1),
-+ AD8801_CHANNEL(2),
-+ AD8801_CHANNEL(3),
-+ AD8801_CHANNEL(4),
-+ AD8801_CHANNEL(5),
-+ AD8801_CHANNEL(6),
-+ AD8801_CHANNEL(7),
-+};
-+
-+static int ad8801_probe(struct spi_device *spi)
-+{
-+ struct iio_dev *indio_dev;
-+ struct ad8801_state *state;
-+ const struct spi_device_id *id;
-+ int ret;
-+
-+ indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*state));
-+ if (indio_dev == NULL)
-+ return -ENOMEM;
-+
-+ state = iio_priv(indio_dev);
-+ state->spi = spi;
-+ id = spi_get_device_id(spi);
-+
-+ state->vrefh_reg = devm_regulator_get(&spi->dev, "vrefh");
-+ if (IS_ERR(state->vrefh_reg)) {
-+ dev_err(&spi->dev, "Vrefh regulator not specified\n");
-+ return PTR_ERR(state->vrefh_reg);
-+ }
-+
-+ ret = regulator_enable(state->vrefh_reg);
-+ if (ret) {
-+ dev_err(&spi->dev, "Failed to enable vrefh regulator: %d\n",
-+ ret);
-+ return ret;
-+ }
-+
-+ ret = regulator_get_voltage(state->vrefh_reg);
-+ if (ret < 0) {
-+ dev_err(&spi->dev, "Failed to read vrefh regulator: %d\n",
-+ ret);
-+ goto error_disable_vrefh_reg;
-+ }
-+ state->vrefh_mv = ret / 1000;
-+
-+ if (id->driver_data == ID_AD8803) {
-+ state->vrefl_reg = devm_regulator_get(&spi->dev, "vrefl");
-+ if (IS_ERR(state->vrefl_reg)) {
-+ dev_err(&spi->dev, "Vrefl regulator not specified\n");
-+ ret = PTR_ERR(state->vrefl_reg);
-+ goto error_disable_vrefh_reg;
-+ }
-+
-+ ret = regulator_enable(state->vrefl_reg);
-+ if (ret) {
-+ dev_err(&spi->dev, "Failed to enable vrefl regulator: %d\n",
-+ ret);
-+ goto error_disable_vrefh_reg;
-+ }
-+
-+ ret = regulator_get_voltage(state->vrefl_reg);
-+ if (ret < 0) {
-+ dev_err(&spi->dev, "Failed to read vrefl regulator: %d\n",
-+ ret);
-+ goto error_disable_vrefl_reg;
-+ }
-+ state->vrefl_mv = ret / 1000;
-+ } else {
-+ state->vrefl_mv = 0;
-+ state->vrefl_reg = NULL;
-+ }
-+
-+ spi_set_drvdata(spi, indio_dev);
-+ indio_dev->dev.parent = &spi->dev;
-+ indio_dev->info = &ad8801_info;
-+ indio_dev->modes = INDIO_DIRECT_MODE;
-+ indio_dev->channels = ad8801_channels;
-+ indio_dev->num_channels = ARRAY_SIZE(ad8801_channels);
-+ indio_dev->name = id->name;
-+
-+ ret = iio_device_register(indio_dev);
-+ if (ret) {
-+ dev_err(&spi->dev, "Failed to register iio device: %d\n",
-+ ret);
-+ goto error_disable_vrefl_reg;
-+ }
-+
-+ return 0;
-+
-+error_disable_vrefl_reg:
-+ if (state->vrefl_reg)
-+ regulator_disable(state->vrefl_reg);
-+error_disable_vrefh_reg:
-+ regulator_disable(state->vrefh_reg);
-+ return ret;
-+}
-+
-+static int ad8801_remove(struct spi_device *spi)
-+{
-+ struct iio_dev *indio_dev = spi_get_drvdata(spi);
-+ struct ad8801_state *state = iio_priv(indio_dev);
-+
-+ iio_device_unregister(indio_dev);
-+ if (state->vrefl_reg)
-+ regulator_disable(state->vrefl_reg);
-+ regulator_disable(state->vrefh_reg);
-+
-+ return 0;
-+}
-+
-+static const struct spi_device_id ad8801_ids[] = {
-+ {"ad8801", ID_AD8801},
-+ {"ad8803", ID_AD8803},
-+ {}
-+};
-+MODULE_DEVICE_TABLE(spi, ad8801_ids);
-+
-+static struct spi_driver ad8801_driver = {
-+ .driver = {
-+ .name = "ad8801",
-+ },
-+ .probe = ad8801_probe,
-+ .remove = ad8801_remove,
-+ .id_table = ad8801_ids,
-+};
-+module_spi_driver(ad8801_driver);
-+
-+MODULE_AUTHOR("Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>");
-+MODULE_DESCRIPTION("Analog Devices AD8801/AD8803 DAC");
-+MODULE_LICENSE("GPL v2");
-diff --git a/drivers/iio/dac/cio-dac.c b/drivers/iio/dac/cio-dac.c
-new file mode 100644
-index 0000000..5a743e2
---- /dev/null
-+++ b/drivers/iio/dac/cio-dac.c
-@@ -0,0 +1,144 @@
-+/*
-+ * IIO driver for the Measurement Computing CIO-DAC
-+ * Copyright (C) 2016 William Breathitt Gray
-+ *
-+ * 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.
-+ *
-+ * 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.
-+ *
-+ * This driver supports the following Measurement Computing devices: CIO-DAC16,
-+ * CIO-DAC06, and PC104-DAC06.
-+ */
-+#include <linux/bitops.h>
-+#include <linux/device.h>
-+#include <linux/errno.h>
-+#include <linux/iio/iio.h>
-+#include <linux/iio/types.h>
-+#include <linux/io.h>
-+#include <linux/ioport.h>
-+#include <linux/isa.h>
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+
-+#define CIO_DAC_NUM_CHAN 16
-+
-+#define CIO_DAC_CHAN(chan) { \
-+ .type = IIO_VOLTAGE, \
-+ .channel = chan, \
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
-+ .indexed = 1, \
-+ .output = 1 \
-+}
-+
-+#define CIO_DAC_EXTENT 32
-+
-+static unsigned int base[max_num_isa_dev(CIO_DAC_EXTENT)];
-+static unsigned int num_cio_dac;
-+module_param_array(base, uint, &num_cio_dac, 0);
-+MODULE_PARM_DESC(base, "Measurement Computing CIO-DAC base addresses");
-+
-+/**
-+ * struct cio_dac_iio - IIO device private data structure
-+ * @chan_out_states: channels' output states
-+ * @base: base port address of the IIO device
-+ */
-+struct cio_dac_iio {
-+ int chan_out_states[CIO_DAC_NUM_CHAN];
-+ unsigned int base;
-+};
-+
-+static int cio_dac_read_raw(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan, int *val, int *val2, long mask)
-+{
-+ struct cio_dac_iio *const priv = iio_priv(indio_dev);
-+
-+ if (mask != IIO_CHAN_INFO_RAW)
-+ return -EINVAL;
-+
-+ *val = priv->chan_out_states[chan->channel];
-+
-+ return IIO_VAL_INT;
-+}
-+
-+static int cio_dac_write_raw(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan, int val, int val2, long mask)
-+{
-+ struct cio_dac_iio *const priv = iio_priv(indio_dev);
-+ const unsigned int chan_addr_offset = 2 * chan->channel;
-+
-+ if (mask != IIO_CHAN_INFO_RAW)
-+ return -EINVAL;
-+
-+ /* DAC can only accept up to a 16-bit value */
-+ if ((unsigned int)val > 65535)
-+ return -EINVAL;
-+
-+ priv->chan_out_states[chan->channel] = val;
-+ outw(val, priv->base + chan_addr_offset);
-+
-+ return 0;
-+}
-+
-+static const struct iio_info cio_dac_info = {
-+ .driver_module = THIS_MODULE,
-+ .read_raw = cio_dac_read_raw,
-+ .write_raw = cio_dac_write_raw
-+};
-+
-+static const struct iio_chan_spec cio_dac_channels[CIO_DAC_NUM_CHAN] = {
-+ CIO_DAC_CHAN(0), CIO_DAC_CHAN(1), CIO_DAC_CHAN(2), CIO_DAC_CHAN(3),
-+ CIO_DAC_CHAN(4), CIO_DAC_CHAN(5), CIO_DAC_CHAN(6), CIO_DAC_CHAN(7),
-+ CIO_DAC_CHAN(8), CIO_DAC_CHAN(9), CIO_DAC_CHAN(10), CIO_DAC_CHAN(11),
-+ CIO_DAC_CHAN(12), CIO_DAC_CHAN(13), CIO_DAC_CHAN(14), CIO_DAC_CHAN(15)
-+};
-+
-+static int cio_dac_probe(struct device *dev, unsigned int id)
-+{
-+ struct iio_dev *indio_dev;
-+ struct cio_dac_iio *priv;
-+ unsigned int i;
-+
-+ indio_dev = devm_iio_device_alloc(dev, sizeof(*priv));
-+ if (!indio_dev)
-+ return -ENOMEM;
-+
-+ if (!devm_request_region(dev, base[id], CIO_DAC_EXTENT,
-+ dev_name(dev))) {
-+ dev_err(dev, "Unable to request port addresses (0x%X-0x%X)\n",
-+ base[id], base[id] + CIO_DAC_EXTENT);
-+ return -EBUSY;
-+ }
-+
-+ indio_dev->info = &cio_dac_info;
-+ indio_dev->modes = INDIO_DIRECT_MODE;
-+ indio_dev->channels = cio_dac_channels;
-+ indio_dev->num_channels = CIO_DAC_NUM_CHAN;
-+ indio_dev->name = dev_name(dev);
-+
-+ priv = iio_priv(indio_dev);
-+ priv->base = base[id];
-+
-+ /* initialize DAC outputs to 0V */
-+ for (i = 0; i < 32; i += 2)
-+ outw(0, base[id] + i);
-+
-+ return devm_iio_device_register(dev, indio_dev);
-+}
-+
-+static struct isa_driver cio_dac_driver = {
-+ .probe = cio_dac_probe,
-+ .driver = {
-+ .name = "cio-dac"
-+ }
-+};
-+
-+module_isa_driver(cio_dac_driver, num_cio_dac);
-+
-+MODULE_AUTHOR("William Breathitt Gray <vilhelm.gray@gmail.com>");
-+MODULE_DESCRIPTION("Measurement Computing CIO-DAC IIO driver");
-+MODULE_LICENSE("GPL v2");
-diff --git a/drivers/iio/gyro/ssp_gyro_sensor.c b/drivers/iio/gyro/ssp_gyro_sensor.c
-index 0a8afdd..1f25f40 100644
---- a/drivers/iio/gyro/ssp_gyro_sensor.c
-+++ b/drivers/iio/gyro/ssp_gyro_sensor.c
-@@ -74,7 +74,7 @@ static int ssp_gyro_write_raw(struct iio_dev *indio_dev,
- return -EINVAL;
- }
-
--static struct iio_info ssp_gyro_iio_info = {
-+static const struct iio_info ssp_gyro_iio_info = {
- .read_raw = &ssp_gyro_read_raw,
- .write_raw = &ssp_gyro_write_raw,
- };
-diff --git a/drivers/iio/humidity/Kconfig b/drivers/iio/humidity/Kconfig
-index d041243..b17e2e2 100644
---- a/drivers/iio/humidity/Kconfig
-+++ b/drivers/iio/humidity/Kconfig
-@@ -28,11 +28,11 @@ config HDC100X
- tristate "TI HDC100x relative humidity and temperature sensor"
- depends on I2C
- help
-- Say yes here to build support for the TI HDC100x series of
-- relative humidity and temperature sensors.
-+ Say yes here to build support for the Texas Instruments
-+ HDC1000 and HDC1008 relative humidity and temperature sensors.
-
-- To compile this driver as a module, choose M here: the module
-- will be called hdc100x.
-+ To compile this driver as a module, choose M here: the module
-+ will be called hdc100x.
-
- config HTU21
- tristate "Measurement Specialties HTU21 humidity & temperature sensor"
-diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
-index d2b8899..fc340ed 100644
---- a/drivers/iio/industrialio-core.c
-+++ b/drivers/iio/industrialio-core.c
-@@ -1308,7 +1308,7 @@ static void devm_iio_device_release(struct device *dev, void *res)
- iio_device_free(*(struct iio_dev **)res);
- }
-
--static int devm_iio_device_match(struct device *dev, void *res, void *data)
-+int devm_iio_device_match(struct device *dev, void *res, void *data)
- {
- struct iio_dev **r = res;
- if (!r || !*r) {
-@@ -1317,6 +1317,7 @@ static int devm_iio_device_match(struct device *dev, void *res, void *data)
- }
- return *r == data;
- }
-+EXPORT_SYMBOL_GPL(devm_iio_device_match);
-
- /**
- * devm_iio_device_alloc - Resource-managed iio_device_alloc()
-diff --git a/drivers/iio/industrialio-event.c b/drivers/iio/industrialio-event.c
-index 0ebfc92..90fac8e 100644
---- a/drivers/iio/industrialio-event.c
-+++ b/drivers/iio/industrialio-event.c
-@@ -57,6 +57,11 @@ bool iio_event_enabled(const struct iio_event_interface *ev_int)
- *
- * Note: The caller must make sure that this function is not running
- * concurrently for the same indio_dev more than once.
-+ *
-+ * This function may be safely used as soon as a valid reference to iio_dev has
-+ * been obtained via iio_device_alloc(), but any events that are submitted
-+ * before iio_device_register() has successfully completed will be silently
-+ * discarded.
- **/
- int iio_push_event(struct iio_dev *indio_dev, u64 ev_code, s64 timestamp)
- {
-@@ -64,6 +69,9 @@ int iio_push_event(struct iio_dev *indio_dev, u64 ev_code, s64 timestamp)
- struct iio_event_data ev;
- int copied;
-
-+ if (!ev_int)
-+ return 0;
-+
- /* Does anyone care? */
- if (iio_event_enabled(ev_int)) {
-
-diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
-index 7ad82fd..e1e1048 100644
---- a/drivers/iio/industrialio-trigger.c
-+++ b/drivers/iio/industrialio-trigger.c
-@@ -119,6 +119,22 @@ void iio_trigger_unregister(struct iio_trigger *trig_info)
- }
- EXPORT_SYMBOL(iio_trigger_unregister);
-
-+int iio_trigger_set_immutable(struct iio_dev *indio_dev, struct iio_trigger *trig)
-+{
-+ if (!indio_dev || !trig)
-+ return -EINVAL;
-+
-+ mutex_lock(&indio_dev->mlock);
-+ WARN_ON(indio_dev->trig_readonly);
-+
-+ indio_dev->trig = iio_trigger_get(trig);
-+ indio_dev->trig_readonly = true;
-+ mutex_unlock(&indio_dev->mlock);
-+
-+ return 0;
-+}
-+EXPORT_SYMBOL(iio_trigger_set_immutable);
-+
- /* Search for trigger by name, assuming iio_trigger_list_lock held */
- static struct iio_trigger *__iio_trigger_find_by_name(const char *name)
- {
-@@ -255,6 +271,14 @@ static int iio_trigger_attach_poll_func(struct iio_trigger *trig,
- goto out_free_irq;
- }
-
-+ /*
-+ * Check if we just registered to our own trigger: we determine that
-+ * this is the case if the IIO device and the trigger device share the
-+ * same parent device.
-+ */
-+ if (pf->indio_dev->dev.parent == trig->dev.parent)
-+ trig->attached_own_device = true;
-+
- return ret;
-
- out_free_irq:
-@@ -279,6 +303,8 @@ static int iio_trigger_detach_poll_func(struct iio_trigger *trig,
- if (ret)
- return ret;
- }
-+ if (pf->indio_dev->dev.parent == trig->dev.parent)
-+ trig->attached_own_device = false;
- iio_trigger_put_irq(trig, pf->irq);
- free_irq(pf->irq, pf);
- module_put(pf->indio_dev->info->driver_module);
-@@ -384,6 +410,10 @@ static ssize_t iio_trigger_write_current(struct device *dev,
- mutex_unlock(&indio_dev->mlock);
- return -EBUSY;
- }
-+ if (indio_dev->trig_readonly) {
-+ mutex_unlock(&indio_dev->mlock);
-+ return -EPERM;
-+ }
- mutex_unlock(&indio_dev->mlock);
-
- trig = iio_trigger_find_by_name(buf, len);
-@@ -622,6 +652,71 @@ void devm_iio_trigger_free(struct device *dev, struct iio_trigger *iio_trig)
- }
- EXPORT_SYMBOL_GPL(devm_iio_trigger_free);
-
-+static void devm_iio_trigger_unreg(struct device *dev, void *res)
-+{
-+ iio_trigger_unregister(*(struct iio_trigger **)res);
-+}
-+
-+/**
-+ * devm_iio_trigger_register - Resource-managed iio_trigger_register()
-+ * @dev: device this trigger was allocated for
-+ * @trig_info: trigger to register
-+ *
-+ * Managed iio_trigger_register(). The IIO trigger registered with this
-+ * function is automatically unregistered on driver detach. This function
-+ * calls iio_trigger_register() internally. Refer to that function for more
-+ * information.
-+ *
-+ * If an iio_trigger registered with this function needs to be unregistered
-+ * separately, devm_iio_trigger_unregister() must be used.
-+ *
-+ * RETURNS:
-+ * 0 on success, negative error number on failure.
-+ */
-+int devm_iio_trigger_register(struct device *dev, struct iio_trigger *trig_info)
-+{
-+ struct iio_trigger **ptr;
-+ int ret;
-+
-+ ptr = devres_alloc(devm_iio_trigger_unreg, sizeof(*ptr), GFP_KERNEL);
-+ if (!ptr)
-+ return -ENOMEM;
-+
-+ *ptr = trig_info;
-+ ret = iio_trigger_register(trig_info);
-+ if (!ret)
-+ devres_add(dev, ptr);
-+ else
-+ devres_free(ptr);
-+
-+ return ret;
-+}
-+EXPORT_SYMBOL_GPL(devm_iio_trigger_register);
-+
-+/**
-+ * devm_iio_trigger_unregister - Resource-managed iio_trigger_unregister()
-+ * @dev: device this iio_trigger belongs to
-+ * @trig_info: the trigger associated with the device
-+ *
-+ * Unregister trigger registered with devm_iio_trigger_register().
-+ */
-+void devm_iio_trigger_unregister(struct device *dev,
-+ struct iio_trigger *trig_info)
-+{
-+ int rc;
-+
-+ rc = devres_release(dev, devm_iio_trigger_unreg, devm_iio_trigger_match,
-+ trig_info);
-+ WARN_ON(rc);
-+}
-+EXPORT_SYMBOL_GPL(devm_iio_trigger_unregister);
-+
-+bool iio_trigger_using_own(struct iio_dev *indio_dev)
-+{
-+ return indio_dev->trig->attached_own_device;
-+}
-+EXPORT_SYMBOL(iio_trigger_using_own);
-+
- void iio_device_register_trigger_consumer(struct iio_dev *indio_dev)
- {
- indio_dev->groups[indio_dev->groupcounter++] =
-diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig
-index 3574945..ba2e64d 100644
---- a/drivers/iio/light/Kconfig
-+++ b/drivers/iio/light/Kconfig
-@@ -267,6 +267,19 @@ config PA12203001
- This driver can also be built as a module. If so, the module
- will be called pa12203001.
-
-+config SI1145
-+ tristate "SI1132 and SI1141/2/3/5/6/7 combined ALS, UV index and proximity sensor"
-+ depends on I2C
-+ select IIO_BUFFER
-+ select IIO_TRIGGERED_BUFFER
-+ help
-+ Say Y here if you want to build a driver for the Silicon Labs SI1132 or
-+ SI1141/2/3/5/6/7 combined ambient light, UV index and proximity sensor
-+ chips.
-+
-+ To compile this driver as a module, choose M here: the module will be
-+ called si1145.
-+
- config STK3310
- tristate "STK3310 ALS and proximity sensor"
- depends on I2C
-@@ -334,11 +347,11 @@ config US5182D
- will be called us5182d.
-
- config VCNL4000
-- tristate "VCNL4000 combined ALS and proximity sensor"
-+ tristate "VCNL4000/4010/4020 combined ALS and proximity sensor"
- depends on I2C
- help
-- Say Y here if you want to build a driver for the Vishay VCNL4000
-- combined ambient light and proximity sensor.
-+ Say Y here if you want to build a driver for the Vishay VCNL4000,
-+ VCNL4010, VCNL4020 combined ambient light and proximity sensor.
-
- To compile this driver as a module, choose M here: the
- module will be called vcnl4000.
-diff --git a/drivers/iio/light/Makefile b/drivers/iio/light/Makefile
-index 6f2a3c6..c5768df 100644
---- a/drivers/iio/light/Makefile
-+++ b/drivers/iio/light/Makefile
-@@ -26,6 +26,7 @@ obj-$(CONFIG_OPT3001) += opt3001.o
- obj-$(CONFIG_PA12203001) += pa12203001.o
- obj-$(CONFIG_RPR0521) += rpr0521.o
- obj-$(CONFIG_SENSORS_TSL2563) += tsl2563.o
-+obj-$(CONFIG_SI1145) += si1145.o
- obj-$(CONFIG_STK3310) += stk3310.o
- obj-$(CONFIG_TCS3414) += tcs3414.o
- obj-$(CONFIG_TCS3472) += tcs3472.o
-diff --git a/drivers/iio/light/si1145.c b/drivers/iio/light/si1145.c
-new file mode 100644
-index 0000000..096034c
---- /dev/null
-+++ b/drivers/iio/light/si1145.c
-@@ -0,0 +1,1404 @@
-+/*
-+ * si1145.c - Support for Silabs SI1132 and SI1141/2/3/5/6/7 combined ambient
-+ * light, UV index and proximity sensors
-+ *
-+ * Copyright 2014-16 Peter Meerwald-Stadler <pmeerw@pmeerw.net>
-+ * Copyright 2016 Crestez Dan Leonard <leonard.crestez@intel.com>
-+ *
-+ * This file is subject to the terms and conditions of version 2 of
-+ * the GNU General Public License. See the file COPYING in the main
-+ * directory of this archive for more details.
-+ *
-+ * SI1132 (7-bit I2C slave address 0x60)
-+ * SI1141/2/3 (7-bit I2C slave address 0x5a)
-+ * SI1145/6/6 (7-bit I2C slave address 0x60)
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/i2c.h>
-+#include <linux/err.h>
-+#include <linux/slab.h>
-+#include <linux/delay.h>
-+#include <linux/irq.h>
-+#include <linux/gpio.h>
-+
-+#include <linux/iio/iio.h>
-+#include <linux/iio/sysfs.h>
-+#include <linux/iio/trigger.h>
-+#include <linux/iio/trigger_consumer.h>
-+#include <linux/iio/triggered_buffer.h>
-+#include <linux/iio/buffer.h>
-+#include <linux/util_macros.h>
-+
-+#define SI1145_REG_PART_ID 0x00
-+#define SI1145_REG_REV_ID 0x01
-+#define SI1145_REG_SEQ_ID 0x02
-+#define SI1145_REG_INT_CFG 0x03
-+#define SI1145_REG_IRQ_ENABLE 0x04
-+#define SI1145_REG_IRQ_MODE 0x05
-+#define SI1145_REG_HW_KEY 0x07
-+#define SI1145_REG_MEAS_RATE 0x08
-+#define SI1145_REG_PS_LED21 0x0f
-+#define SI1145_REG_PS_LED3 0x10
-+#define SI1145_REG_UCOEF1 0x13
-+#define SI1145_REG_UCOEF2 0x14
-+#define SI1145_REG_UCOEF3 0x15
-+#define SI1145_REG_UCOEF4 0x16
-+#define SI1145_REG_PARAM_WR 0x17
-+#define SI1145_REG_COMMAND 0x18
-+#define SI1145_REG_RESPONSE 0x20
-+#define SI1145_REG_IRQ_STATUS 0x21
-+#define SI1145_REG_ALSVIS_DATA 0x22
-+#define SI1145_REG_ALSIR_DATA 0x24
-+#define SI1145_REG_PS1_DATA 0x26
-+#define SI1145_REG_PS2_DATA 0x28
-+#define SI1145_REG_PS3_DATA 0x2a
-+#define SI1145_REG_AUX_DATA 0x2c
-+#define SI1145_REG_PARAM_RD 0x2e
-+#define SI1145_REG_CHIP_STAT 0x30
-+
-+#define SI1145_UCOEF1_DEFAULT 0x7b
-+#define SI1145_UCOEF2_DEFAULT 0x6b
-+#define SI1145_UCOEF3_DEFAULT 0x01
-+#define SI1145_UCOEF4_DEFAULT 0x00
-+
-+/* Helper to figure out PS_LED register / shift per channel */
-+#define SI1145_PS_LED_REG(ch) \
-+ (((ch) == 2) ? SI1145_REG_PS_LED3 : SI1145_REG_PS_LED21)
-+#define SI1145_PS_LED_SHIFT(ch) \
-+ (((ch) == 1) ? 4 : 0)
-+
-+/* Parameter offsets */
-+#define SI1145_PARAM_CHLIST 0x01
-+#define SI1145_PARAM_PSLED12_SELECT 0x02
-+#define SI1145_PARAM_PSLED3_SELECT 0x03
-+#define SI1145_PARAM_PS_ENCODING 0x05
-+#define SI1145_PARAM_ALS_ENCODING 0x06
-+#define SI1145_PARAM_PS1_ADC_MUX 0x07
-+#define SI1145_PARAM_PS2_ADC_MUX 0x08
-+#define SI1145_PARAM_PS3_ADC_MUX 0x09
-+#define SI1145_PARAM_PS_ADC_COUNTER 0x0a
-+#define SI1145_PARAM_PS_ADC_GAIN 0x0b
-+#define SI1145_PARAM_PS_ADC_MISC 0x0c
-+#define SI1145_PARAM_ALS_ADC_MUX 0x0d
-+#define SI1145_PARAM_ALSIR_ADC_MUX 0x0e
-+#define SI1145_PARAM_AUX_ADC_MUX 0x0f
-+#define SI1145_PARAM_ALSVIS_ADC_COUNTER 0x10
-+#define SI1145_PARAM_ALSVIS_ADC_GAIN 0x11
-+#define SI1145_PARAM_ALSVIS_ADC_MISC 0x12
-+#define SI1145_PARAM_LED_RECOVERY 0x1c
-+#define SI1145_PARAM_ALSIR_ADC_COUNTER 0x1d
-+#define SI1145_PARAM_ALSIR_ADC_GAIN 0x1e
-+#define SI1145_PARAM_ALSIR_ADC_MISC 0x1f
-+#define SI1145_PARAM_ADC_OFFSET 0x1a
-+
-+/* Channel enable masks for CHLIST parameter */
-+#define SI1145_CHLIST_EN_PS1 BIT(0)
-+#define SI1145_CHLIST_EN_PS2 BIT(1)
-+#define SI1145_CHLIST_EN_PS3 BIT(2)
-+#define SI1145_CHLIST_EN_ALSVIS BIT(4)
-+#define SI1145_CHLIST_EN_ALSIR BIT(5)
-+#define SI1145_CHLIST_EN_AUX BIT(6)
-+#define SI1145_CHLIST_EN_UV BIT(7)
-+
-+/* Proximity measurement mode for ADC_MISC parameter */
-+#define SI1145_PS_ADC_MODE_NORMAL BIT(2)
-+/* Signal range mask for ADC_MISC parameter */
-+#define SI1145_ADC_MISC_RANGE BIT(5)
-+
-+/* Commands for REG_COMMAND */
-+#define SI1145_CMD_NOP 0x00
-+#define SI1145_CMD_RESET 0x01
-+#define SI1145_CMD_PS_FORCE 0x05
-+#define SI1145_CMD_ALS_FORCE 0x06
-+#define SI1145_CMD_PSALS_FORCE 0x07
-+#define SI1145_CMD_PS_PAUSE 0x09
-+#define SI1145_CMD_ALS_PAUSE 0x0a
-+#define SI1145_CMD_PSALS_PAUSE 0x0b
-+#define SI1145_CMD_PS_AUTO 0x0d
-+#define SI1145_CMD_ALS_AUTO 0x0e
-+#define SI1145_CMD_PSALS_AUTO 0x0f
-+#define SI1145_CMD_PARAM_QUERY 0x80
-+#define SI1145_CMD_PARAM_SET 0xa0
-+
-+#define SI1145_RSP_INVALID_SETTING 0x80
-+#define SI1145_RSP_COUNTER_MASK 0x0F
-+
-+/* Minimum sleep after each command to ensure it's received */
-+#define SI1145_COMMAND_MINSLEEP_MS 5
-+/* Return -ETIMEDOUT after this long */
-+#define SI1145_COMMAND_TIMEOUT_MS 25
-+
-+/* Interrupt configuration masks for INT_CFG register */
-+#define SI1145_INT_CFG_OE BIT(0) /* enable interrupt */
-+#define SI1145_INT_CFG_MODE BIT(1) /* auto reset interrupt pin */
-+
-+/* Interrupt enable masks for IRQ_ENABLE register */
-+#define SI1145_MASK_ALL_IE (BIT(4) | BIT(3) | BIT(2) | BIT(0))
-+
-+#define SI1145_MUX_TEMP 0x65
-+#define SI1145_MUX_VDD 0x75
-+
-+/* Proximity LED current; see Table 2 in datasheet */
-+#define SI1145_LED_CURRENT_45mA 0x04
-+
-+enum {
-+ SI1132,
-+ SI1141,
-+ SI1142,
-+ SI1143,
-+ SI1145,
-+ SI1146,
-+ SI1147,
-+};
-+
-+struct si1145_part_info {
-+ u8 part;
-+ const struct iio_info *iio_info;
-+ const struct iio_chan_spec *channels;
-+ unsigned int num_channels;
-+ unsigned int num_leds;
-+ bool uncompressed_meas_rate;
-+};
-+
-+/**
-+ * struct si1145_data - si1145 chip state data
-+ * @client: I2C client
-+ * @lock: mutex to protect shared state.
-+ * @cmdlock: Low-level mutex to protect command execution only
-+ * @rsp_seq: Next expected response number or -1 if counter reset required
-+ * @scan_mask: Saved scan mask to avoid duplicate set_chlist
-+ * @autonomous: If automatic measurements are active (for buffer support)
-+ * @part_info: Part information
-+ * @trig: Pointer to iio trigger
-+ * @meas_rate: Value of MEAS_RATE register. Only set in HW in auto mode
-+ */
-+struct si1145_data {
-+ struct i2c_client *client;
-+ struct mutex lock;
-+ struct mutex cmdlock;
-+ int rsp_seq;
-+ const struct si1145_part_info *part_info;
-+ unsigned long scan_mask;
-+ bool autonomous;
-+ struct iio_trigger *trig;
-+ int meas_rate;
-+};
-+
-+/**
-+ * __si1145_command_reset() - Send CMD_NOP and wait for response 0
-+ *
-+ * Does not modify data->rsp_seq
-+ *
-+ * Return: 0 on success and -errno on error.
-+ */
-+static int __si1145_command_reset(struct si1145_data *data)
-+{
-+ struct device *dev = &data->client->dev;
-+ unsigned long stop_jiffies;
-+ int ret;
-+
-+ ret = i2c_smbus_write_byte_data(data->client, SI1145_REG_COMMAND,
-+ SI1145_CMD_NOP);
-+ if (ret < 0)
-+ return ret;
-+ msleep(SI1145_COMMAND_MINSLEEP_MS);
-+
-+ stop_jiffies = jiffies + SI1145_COMMAND_TIMEOUT_MS * HZ / 1000;
-+ while (true) {
-+ ret = i2c_smbus_read_byte_data(data->client,
-+ SI1145_REG_RESPONSE);
-+ if (ret <= 0)
-+ return ret;
-+ if (time_after(jiffies, stop_jiffies)) {
-+ dev_warn(dev, "timeout on reset\n");
-+ return -ETIMEDOUT;
-+ }
-+ msleep(SI1145_COMMAND_MINSLEEP_MS);
-+ continue;
-+ }
-+}
-+
-+/**
-+ * si1145_command() - Execute a command and poll the response register
-+ *
-+ * All conversion overflows are reported as -EOVERFLOW
-+ * INVALID_SETTING is reported as -EINVAL
-+ * Timeouts are reported as -ETIMEDOUT
-+ *
-+ * Return: 0 on success or -errno on failure
-+ */
-+static int si1145_command(struct si1145_data *data, u8 cmd)
-+{
-+ struct device *dev = &data->client->dev;
-+ unsigned long stop_jiffies;
-+ int ret;
-+
-+ mutex_lock(&data->cmdlock);
-+
-+ if (data->rsp_seq < 0) {
-+ ret = __si1145_command_reset(data);
-+ if (ret < 0) {
-+ dev_err(dev, "failed to reset command counter, ret=%d\n",
-+ ret);
-+ goto out;
-+ }
-+ data->rsp_seq = 0;
-+ }
-+
-+ ret = i2c_smbus_write_byte_data(data->client, SI1145_REG_COMMAND, cmd);
-+ if (ret) {
-+ dev_warn(dev, "failed to write command, ret=%d\n", ret);
-+ goto out;
-+ }
-+ /* Sleep a little to ensure the command is received */
-+ msleep(SI1145_COMMAND_MINSLEEP_MS);
-+
-+ stop_jiffies = jiffies + SI1145_COMMAND_TIMEOUT_MS * HZ / 1000;
-+ while (true) {
-+ ret = i2c_smbus_read_byte_data(data->client,
-+ SI1145_REG_RESPONSE);
-+ if (ret < 0) {
-+ dev_warn(dev, "failed to read response, ret=%d\n", ret);
-+ break;
-+ }
-+
-+ if ((ret & ~SI1145_RSP_COUNTER_MASK) == 0) {
-+ if (ret == data->rsp_seq) {
-+ if (time_after(jiffies, stop_jiffies)) {
-+ dev_warn(dev, "timeout on command %#02hhx\n",
-+ cmd);
-+ ret = -ETIMEDOUT;
-+ break;
-+ }
-+ msleep(SI1145_COMMAND_MINSLEEP_MS);
-+ continue;
-+ }
-+ if (ret == ((data->rsp_seq + 1) &
-+ SI1145_RSP_COUNTER_MASK)) {
-+ data->rsp_seq = ret;
-+ ret = 0;
-+ break;
-+ }
-+ dev_warn(dev, "unexpected response counter %d instead of %d\n",
-+ ret, (data->rsp_seq + 1) &
-+ SI1145_RSP_COUNTER_MASK);
-+ ret = -EIO;
-+ } else {
-+ if (ret == SI1145_RSP_INVALID_SETTING) {
-+ dev_warn(dev, "INVALID_SETTING error on command %#02hhx\n",
-+ cmd);
-+ ret = -EINVAL;
-+ } else {
-+ /* All overflows are treated identically */
-+ dev_dbg(dev, "overflow, ret=%d, cmd=%#02hhx\n",
-+ ret, cmd);
-+ ret = -EOVERFLOW;
-+ }
-+ }
-+
-+ /* Force a counter reset next time */
-+ data->rsp_seq = -1;
-+ break;
-+ }
-+
-+out:
-+ mutex_unlock(&data->cmdlock);
-+
-+ return ret;
-+}
-+
-+static int si1145_param_update(struct si1145_data *data, u8 op, u8 param,
-+ u8 value)
-+{
-+ int ret;
-+
-+ ret = i2c_smbus_write_byte_data(data->client,
-+ SI1145_REG_PARAM_WR, value);
-+ if (ret < 0)
-+ return ret;
-+
-+ return si1145_command(data, op | (param & 0x1F));
-+}
-+
-+static int si1145_param_set(struct si1145_data *data, u8 param, u8 value)
-+{
-+ return si1145_param_update(data, SI1145_CMD_PARAM_SET, param, value);
-+}
-+
-+/* Set param. Returns negative errno or current value */
-+static int si1145_param_query(struct si1145_data *data, u8 param)
-+{
-+ int ret;
-+
-+ ret = si1145_command(data, SI1145_CMD_PARAM_QUERY | (param & 0x1F));
-+ if (ret < 0)
-+ return ret;
-+
-+ return i2c_smbus_read_byte_data(data->client, SI1145_REG_PARAM_RD);
-+}
-+
-+/* Expand 8 bit compressed value to 16 bit, see Silabs AN498 */
-+static u16 si1145_uncompress(u8 x)
-+{
-+ u16 result = 0;
-+ u8 exponent = 0;
-+
-+ if (x < 8)
-+ return 0;
-+
-+ exponent = (x & 0xf0) >> 4;
-+ result = 0x10 | (x & 0x0f);
-+
-+ if (exponent >= 4)
-+ return result << (exponent - 4);
-+ return result >> (4 - exponent);
-+}
-+
-+/* Compress 16 bit value to 8 bit, see Silabs AN498 */
-+static u8 si1145_compress(u16 x)
-+{
-+ u32 exponent = 0;
-+ u32 significand = 0;
-+ u32 tmp = x;
-+
-+ if (x == 0x0000)
-+ return 0x00;
-+ if (x == 0x0001)
-+ return 0x08;
-+
-+ while (1) {
-+ tmp >>= 1;
-+ exponent += 1;
-+ if (tmp == 1)
-+ break;
-+ }
-+
-+ if (exponent < 5) {
-+ significand = x << (4 - exponent);
-+ return (exponent << 4) | (significand & 0xF);
-+ }
-+
-+ significand = x >> (exponent - 5);
-+ if (significand & 1) {
-+ significand += 2;
-+ if (significand & 0x0040) {
-+ exponent += 1;
-+ significand >>= 1;
-+ }
-+ }
-+
-+ return (exponent << 4) | ((significand >> 1) & 0xF);
-+}
-+
-+/* Write meas_rate in hardware */
-+static int si1145_set_meas_rate(struct si1145_data *data, int interval)
-+{
-+ if (data->part_info->uncompressed_meas_rate)
-+ return i2c_smbus_write_word_data(data->client,
-+ SI1145_REG_MEAS_RATE, interval);
-+ else
-+ return i2c_smbus_write_byte_data(data->client,
-+ SI1145_REG_MEAS_RATE, interval);
-+}
-+
-+static int si1145_read_samp_freq(struct si1145_data *data, int *val, int *val2)
-+{
-+ *val = 32000;
-+ if (data->part_info->uncompressed_meas_rate)
-+ *val2 = data->meas_rate;
-+ else
-+ *val2 = si1145_uncompress(data->meas_rate);
-+ return IIO_VAL_FRACTIONAL;
-+}
-+
-+/* Set the samp freq in driver private data */
-+static int si1145_store_samp_freq(struct si1145_data *data, int val)
-+{
-+ int ret = 0;
-+ int meas_rate;
-+
-+ if (val <= 0 || val > 32000)
-+ return -ERANGE;
-+ meas_rate = 32000 / val;
-+
-+ mutex_lock(&data->lock);
-+ if (data->autonomous) {
-+ ret = si1145_set_meas_rate(data, meas_rate);
-+ if (ret)
-+ goto out;
-+ }
-+ if (data->part_info->uncompressed_meas_rate)
-+ data->meas_rate = meas_rate;
-+ else
-+ data->meas_rate = si1145_compress(meas_rate);
-+
-+out:
-+ mutex_unlock(&data->lock);
-+
-+ return ret;
-+}
-+
-+static irqreturn_t si1145_trigger_handler(int irq, void *private)
-+{
-+ struct iio_poll_func *pf = private;
-+ struct iio_dev *indio_dev = pf->indio_dev;
-+ struct si1145_data *data = iio_priv(indio_dev);
-+ /*
-+ * Maximum buffer size:
-+ * 6*2 bytes channels data + 4 bytes alignment +
-+ * 8 bytes timestamp
-+ */
-+ u8 buffer[24];
-+ int i, j = 0;
-+ int ret;
-+ u8 irq_status = 0;
-+
-+ if (!data->autonomous) {
-+ ret = si1145_command(data, SI1145_CMD_PSALS_FORCE);
-+ if (ret < 0 && ret != -EOVERFLOW)
-+ goto done;
-+ } else {
-+ irq_status = ret = i2c_smbus_read_byte_data(data->client,
-+ SI1145_REG_IRQ_STATUS);
-+ if (ret < 0)
-+ goto done;
-+ if (!(irq_status & SI1145_MASK_ALL_IE))
-+ goto done;
-+ }
-+
-+ for_each_set_bit(i, indio_dev->active_scan_mask,
-+ indio_dev->masklength) {
-+ int run = 1;
-+
-+ while (i + run < indio_dev->masklength) {
-+ if (!test_bit(i + run, indio_dev->active_scan_mask))
-+ break;
-+ if (indio_dev->channels[i + run].address !=
-+ indio_dev->channels[i].address + 2 * run)
-+ break;
-+ run++;
-+ }
-+
-+ ret = i2c_smbus_read_i2c_block_data_or_emulated(
-+ data->client, indio_dev->channels[i].address,
-+ sizeof(u16) * run, &buffer[j]);
-+ if (ret < 0)
-+ goto done;
-+ j += run * sizeof(u16);
-+ i += run - 1;
-+ }
-+
-+ if (data->autonomous) {
-+ ret = i2c_smbus_write_byte_data(data->client,
-+ SI1145_REG_IRQ_STATUS,
-+ irq_status & SI1145_MASK_ALL_IE);
-+ if (ret < 0)
-+ goto done;
-+ }
-+
-+ iio_push_to_buffers_with_timestamp(indio_dev, buffer,
-+ iio_get_time_ns(indio_dev));
-+
-+done:
-+ iio_trigger_notify_done(indio_dev->trig);
-+ return IRQ_HANDLED;
-+}
-+
-+static int si1145_set_chlist(struct iio_dev *indio_dev, unsigned long scan_mask)
-+{
-+ struct si1145_data *data = iio_priv(indio_dev);
-+ u8 reg = 0, mux;
-+ int ret;
-+ int i;
-+
-+ /* channel list already set, no need to reprogram */
-+ if (data->scan_mask == scan_mask)
-+ return 0;
-+
-+ for_each_set_bit(i, &scan_mask, indio_dev->masklength) {
-+ switch (indio_dev->channels[i].address) {
-+ case SI1145_REG_ALSVIS_DATA:
-+ reg |= SI1145_CHLIST_EN_ALSVIS;
-+ break;
-+ case SI1145_REG_ALSIR_DATA:
-+ reg |= SI1145_CHLIST_EN_ALSIR;
-+ break;
-+ case SI1145_REG_PS1_DATA:
-+ reg |= SI1145_CHLIST_EN_PS1;
-+ break;
-+ case SI1145_REG_PS2_DATA:
-+ reg |= SI1145_CHLIST_EN_PS2;
-+ break;
-+ case SI1145_REG_PS3_DATA:
-+ reg |= SI1145_CHLIST_EN_PS3;
-+ break;
-+ case SI1145_REG_AUX_DATA:
-+ switch (indio_dev->channels[i].type) {
-+ case IIO_UVINDEX:
-+ reg |= SI1145_CHLIST_EN_UV;
-+ break;
-+ default:
-+ reg |= SI1145_CHLIST_EN_AUX;
-+ if (indio_dev->channels[i].type == IIO_TEMP)
-+ mux = SI1145_MUX_TEMP;
-+ else
-+ mux = SI1145_MUX_VDD;
-+ ret = si1145_param_set(data,
-+ SI1145_PARAM_AUX_ADC_MUX, mux);
-+ if (ret < 0)
-+ return ret;
-+
-+ break;
-+ }
-+ }
-+ }
-+
-+ data->scan_mask = scan_mask;
-+ ret = si1145_param_set(data, SI1145_PARAM_CHLIST, reg);
-+
-+ return ret < 0 ? ret : 0;
-+}
-+
-+static int si1145_measure(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan)
-+{
-+ struct si1145_data *data = iio_priv(indio_dev);
-+ u8 cmd;
-+ int ret;
-+
-+ ret = si1145_set_chlist(indio_dev, BIT(chan->scan_index));
-+ if (ret < 0)
-+ return ret;
-+
-+ cmd = (chan->type == IIO_PROXIMITY) ? SI1145_CMD_PS_FORCE :
-+ SI1145_CMD_ALS_FORCE;
-+ ret = si1145_command(data, cmd);
-+ if (ret < 0 && ret != -EOVERFLOW)
-+ return ret;
-+
-+ return i2c_smbus_read_word_data(data->client, chan->address);
-+}
-+
-+/*
-+ * Conversion between iio scale and ADC_GAIN values
-+ * These could be further adjusted but proximity/intensity are dimensionless
-+ */
-+static const int si1145_proximity_scale_available[] = {
-+ 128, 64, 32, 16, 8, 4};
-+static const int si1145_intensity_scale_available[] = {
-+ 128, 64, 32, 16, 8, 4, 2, 1};
-+static IIO_CONST_ATTR(in_proximity_scale_available,
-+ "128 64 32 16 8 4");
-+static IIO_CONST_ATTR(in_intensity_scale_available,
-+ "128 64 32 16 8 4 2 1");
-+static IIO_CONST_ATTR(in_intensity_ir_scale_available,
-+ "128 64 32 16 8 4 2 1");
-+
-+static int si1145_scale_from_adcgain(int regval)
-+{
-+ return 128 >> regval;
-+}
-+
-+static int si1145_proximity_adcgain_from_scale(int val, int val2)
-+{
-+ val = find_closest_descending(val, si1145_proximity_scale_available,
-+ ARRAY_SIZE(si1145_proximity_scale_available));
-+ if (val < 0 || val > 5 || val2 != 0)
-+ return -EINVAL;
-+
-+ return val;
-+}
-+
-+static int si1145_intensity_adcgain_from_scale(int val, int val2)
-+{
-+ val = find_closest_descending(val, si1145_intensity_scale_available,
-+ ARRAY_SIZE(si1145_intensity_scale_available));
-+ if (val < 0 || val > 7 || val2 != 0)
-+ return -EINVAL;
-+
-+ return val;
-+}
-+
-+static int si1145_read_raw(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan,
-+ int *val, int *val2, long mask)
-+{
-+ struct si1145_data *data = iio_priv(indio_dev);
-+ int ret;
-+ u8 reg;
-+
-+ switch (mask) {
-+ case IIO_CHAN_INFO_RAW:
-+ switch (chan->type) {
-+ case IIO_INTENSITY:
-+ case IIO_PROXIMITY:
-+ case IIO_VOLTAGE:
-+ case IIO_TEMP:
-+ case IIO_UVINDEX:
-+ ret = iio_device_claim_direct_mode(indio_dev);
-+ if (ret)
-+ return ret;
-+ ret = si1145_measure(indio_dev, chan);
-+ iio_device_release_direct_mode(indio_dev);
-+
-+ if (ret < 0)
-+ return ret;
-+
-+ *val = ret;
-+
-+ return IIO_VAL_INT;
-+ case IIO_CURRENT:
-+ ret = i2c_smbus_read_byte_data(data->client,
-+ SI1145_PS_LED_REG(chan->channel));
-+ if (ret < 0)
-+ return ret;
-+
-+ *val = (ret >> SI1145_PS_LED_SHIFT(chan->channel))
-+ & 0x0f;
-+
-+ return IIO_VAL_INT;
-+ default:
-+ return -EINVAL;
-+ }
-+ case IIO_CHAN_INFO_SCALE:
-+ switch (chan->type) {
-+ case IIO_PROXIMITY:
-+ reg = SI1145_PARAM_PS_ADC_GAIN;
-+ break;
-+ case IIO_INTENSITY:
-+ if (chan->channel2 == IIO_MOD_LIGHT_IR)
-+ reg = SI1145_PARAM_ALSIR_ADC_GAIN;
-+ else
-+ reg = SI1145_PARAM_ALSVIS_ADC_GAIN;
-+ break;
-+ case IIO_TEMP:
-+ *val = 28;
-+ *val2 = 571429;
-+ return IIO_VAL_INT_PLUS_MICRO;
-+ case IIO_UVINDEX:
-+ *val = 0;
-+ *val2 = 10000;
-+ return IIO_VAL_INT_PLUS_MICRO;
-+ default:
-+ return -EINVAL;
-+ }
-+
-+ ret = si1145_param_query(data, reg);
-+ if (ret < 0)
-+ return ret;
-+
-+ *val = si1145_scale_from_adcgain(ret & 0x07);
-+
-+ return IIO_VAL_INT;
-+ case IIO_CHAN_INFO_OFFSET:
-+ switch (chan->type) {
-+ case IIO_TEMP:
-+ /*
-+ * -ADC offset - ADC counts @ 25°C -
-+ * 35 * ADC counts / °C
-+ */
-+ *val = -256 - 11136 + 25 * 35;
-+ return IIO_VAL_INT;
-+ default:
-+ /*
-+ * All ADC measurements have are by default offset
-+ * by -256
-+ * See AN498 5.6.3
-+ */
-+ ret = si1145_param_query(data, SI1145_PARAM_ADC_OFFSET);
-+ if (ret < 0)
-+ return ret;
-+ *val = -si1145_uncompress(ret);
-+ return IIO_VAL_INT;
-+ }
-+ case IIO_CHAN_INFO_SAMP_FREQ:
-+ return si1145_read_samp_freq(data, val, val2);
-+ default:
-+ return -EINVAL;
-+ }
-+}
-+
-+static int si1145_write_raw(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan,
-+ int val, int val2, long mask)
-+{
-+ struct si1145_data *data = iio_priv(indio_dev);
-+ u8 reg1, reg2, shift;
-+ int ret;
-+
-+ switch (mask) {
-+ case IIO_CHAN_INFO_SCALE:
-+ switch (chan->type) {
-+ case IIO_PROXIMITY:
-+ val = si1145_proximity_adcgain_from_scale(val, val2);
-+ if (val < 0)
-+ return val;
-+ reg1 = SI1145_PARAM_PS_ADC_GAIN;
-+ reg2 = SI1145_PARAM_PS_ADC_COUNTER;
-+ break;
-+ case IIO_INTENSITY:
-+ val = si1145_intensity_adcgain_from_scale(val, val2);
-+ if (val < 0)
-+ return val;
-+ if (chan->channel2 == IIO_MOD_LIGHT_IR) {
-+ reg1 = SI1145_PARAM_ALSIR_ADC_GAIN;
-+ reg2 = SI1145_PARAM_ALSIR_ADC_COUNTER;
-+ } else {
-+ reg1 = SI1145_PARAM_ALSVIS_ADC_GAIN;
-+ reg2 = SI1145_PARAM_ALSVIS_ADC_COUNTER;
-+ }
-+ break;
-+ default:
-+ return -EINVAL;
-+ }
-+
-+ ret = iio_device_claim_direct_mode(indio_dev);
-+ if (ret)
-+ return ret;
-+
-+ ret = si1145_param_set(data, reg1, val);
-+ if (ret < 0) {
-+ iio_device_release_direct_mode(indio_dev);
-+ return ret;
-+ }
-+ /* Set recovery period to one's complement of gain */
-+ ret = si1145_param_set(data, reg2, (~val & 0x07) << 4);
-+ iio_device_release_direct_mode(indio_dev);
-+ return ret;
-+ case IIO_CHAN_INFO_RAW:
-+ if (chan->type != IIO_CURRENT)
-+ return -EINVAL;
-+
-+ if (val < 0 || val > 15 || val2 != 0)
-+ return -EINVAL;
-+
-+ reg1 = SI1145_PS_LED_REG(chan->channel);
-+ shift = SI1145_PS_LED_SHIFT(chan->channel);
-+
-+ ret = iio_device_claim_direct_mode(indio_dev);
-+ if (ret)
-+ return ret;
-+
-+ ret = i2c_smbus_read_byte_data(data->client, reg1);
-+ if (ret < 0) {
-+ iio_device_release_direct_mode(indio_dev);
-+ return ret;
-+ }
-+ ret = i2c_smbus_write_byte_data(data->client, reg1,
-+ (ret & ~(0x0f << shift)) |
-+ ((val & 0x0f) << shift));
-+ iio_device_release_direct_mode(indio_dev);
-+ return ret;
-+ case IIO_CHAN_INFO_SAMP_FREQ:
-+ return si1145_store_samp_freq(data, val);
-+ default:
-+ return -EINVAL;
-+ }
-+}
-+
-+#define SI1145_ST { \
-+ .sign = 'u', \
-+ .realbits = 16, \
-+ .storagebits = 16, \
-+ .endianness = IIO_LE, \
-+}
-+
-+#define SI1145_INTENSITY_CHANNEL(_si) { \
-+ .type = IIO_INTENSITY, \
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
-+ BIT(IIO_CHAN_INFO_OFFSET) | \
-+ BIT(IIO_CHAN_INFO_SCALE), \
-+ .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \
-+ .scan_type = SI1145_ST, \
-+ .scan_index = _si, \
-+ .address = SI1145_REG_ALSVIS_DATA, \
-+}
-+
-+#define SI1145_INTENSITY_IR_CHANNEL(_si) { \
-+ .type = IIO_INTENSITY, \
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
-+ BIT(IIO_CHAN_INFO_OFFSET) | \
-+ BIT(IIO_CHAN_INFO_SCALE), \
-+ .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \
-+ .modified = 1, \
-+ .channel2 = IIO_MOD_LIGHT_IR, \
-+ .scan_type = SI1145_ST, \
-+ .scan_index = _si, \
-+ .address = SI1145_REG_ALSIR_DATA, \
-+}
-+
-+#define SI1145_TEMP_CHANNEL(_si) { \
-+ .type = IIO_TEMP, \
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
-+ BIT(IIO_CHAN_INFO_OFFSET) | \
-+ BIT(IIO_CHAN_INFO_SCALE), \
-+ .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \
-+ .scan_type = SI1145_ST, \
-+ .scan_index = _si, \
-+ .address = SI1145_REG_AUX_DATA, \
-+}
-+
-+#define SI1145_UV_CHANNEL(_si) { \
-+ .type = IIO_UVINDEX, \
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
-+ BIT(IIO_CHAN_INFO_SCALE), \
-+ .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \
-+ .scan_type = SI1145_ST, \
-+ .scan_index = _si, \
-+ .address = SI1145_REG_AUX_DATA, \
-+}
-+
-+#define SI1145_PROXIMITY_CHANNEL(_si, _ch) { \
-+ .type = IIO_PROXIMITY, \
-+ .indexed = 1, \
-+ .channel = _ch, \
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
-+ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | \
-+ BIT(IIO_CHAN_INFO_OFFSET), \
-+ .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \
-+ .scan_type = SI1145_ST, \
-+ .scan_index = _si, \
-+ .address = SI1145_REG_PS1_DATA + _ch * 2, \
-+}
-+
-+#define SI1145_VOLTAGE_CHANNEL(_si) { \
-+ .type = IIO_VOLTAGE, \
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
-+ .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \
-+ .scan_type = SI1145_ST, \
-+ .scan_index = _si, \
-+ .address = SI1145_REG_AUX_DATA, \
-+}
-+
-+#define SI1145_CURRENT_CHANNEL(_ch) { \
-+ .type = IIO_CURRENT, \
-+ .indexed = 1, \
-+ .channel = _ch, \
-+ .output = 1, \
-+ .scan_index = -1, \
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
-+}
-+
-+static const struct iio_chan_spec si1132_channels[] = {
-+ SI1145_INTENSITY_CHANNEL(0),
-+ SI1145_INTENSITY_IR_CHANNEL(1),
-+ SI1145_TEMP_CHANNEL(2),
-+ SI1145_VOLTAGE_CHANNEL(3),
-+ SI1145_UV_CHANNEL(4),
-+ IIO_CHAN_SOFT_TIMESTAMP(6),
-+};
-+
-+static const struct iio_chan_spec si1141_channels[] = {
-+ SI1145_INTENSITY_CHANNEL(0),
-+ SI1145_INTENSITY_IR_CHANNEL(1),
-+ SI1145_PROXIMITY_CHANNEL(2, 0),
-+ SI1145_TEMP_CHANNEL(3),
-+ SI1145_VOLTAGE_CHANNEL(4),
-+ IIO_CHAN_SOFT_TIMESTAMP(5),
-+ SI1145_CURRENT_CHANNEL(0),
-+};
-+
-+static const struct iio_chan_spec si1142_channels[] = {
-+ SI1145_INTENSITY_CHANNEL(0),
-+ SI1145_INTENSITY_IR_CHANNEL(1),
-+ SI1145_PROXIMITY_CHANNEL(2, 0),
-+ SI1145_PROXIMITY_CHANNEL(3, 1),
-+ SI1145_TEMP_CHANNEL(4),
-+ SI1145_VOLTAGE_CHANNEL(5),
-+ IIO_CHAN_SOFT_TIMESTAMP(6),
-+ SI1145_CURRENT_CHANNEL(0),
-+ SI1145_CURRENT_CHANNEL(1),
-+};
-+
-+static const struct iio_chan_spec si1143_channels[] = {
-+ SI1145_INTENSITY_CHANNEL(0),
-+ SI1145_INTENSITY_IR_CHANNEL(1),
-+ SI1145_PROXIMITY_CHANNEL(2, 0),
-+ SI1145_PROXIMITY_CHANNEL(3, 1),
-+ SI1145_PROXIMITY_CHANNEL(4, 2),
-+ SI1145_TEMP_CHANNEL(5),
-+ SI1145_VOLTAGE_CHANNEL(6),
-+ IIO_CHAN_SOFT_TIMESTAMP(7),
-+ SI1145_CURRENT_CHANNEL(0),
-+ SI1145_CURRENT_CHANNEL(1),
-+ SI1145_CURRENT_CHANNEL(2),
-+};
-+
-+static const struct iio_chan_spec si1145_channels[] = {
-+ SI1145_INTENSITY_CHANNEL(0),
-+ SI1145_INTENSITY_IR_CHANNEL(1),
-+ SI1145_PROXIMITY_CHANNEL(2, 0),
-+ SI1145_TEMP_CHANNEL(3),
-+ SI1145_VOLTAGE_CHANNEL(4),
-+ SI1145_UV_CHANNEL(5),
-+ IIO_CHAN_SOFT_TIMESTAMP(6),
-+ SI1145_CURRENT_CHANNEL(0),
-+};
-+
-+static const struct iio_chan_spec si1146_channels[] = {
-+ SI1145_INTENSITY_CHANNEL(0),
-+ SI1145_INTENSITY_IR_CHANNEL(1),
-+ SI1145_TEMP_CHANNEL(2),
-+ SI1145_VOLTAGE_CHANNEL(3),
-+ SI1145_UV_CHANNEL(4),
-+ SI1145_PROXIMITY_CHANNEL(5, 0),
-+ SI1145_PROXIMITY_CHANNEL(6, 1),
-+ IIO_CHAN_SOFT_TIMESTAMP(7),
-+ SI1145_CURRENT_CHANNEL(0),
-+ SI1145_CURRENT_CHANNEL(1),
-+};
-+
-+static const struct iio_chan_spec si1147_channels[] = {
-+ SI1145_INTENSITY_CHANNEL(0),
-+ SI1145_INTENSITY_IR_CHANNEL(1),
-+ SI1145_PROXIMITY_CHANNEL(2, 0),
-+ SI1145_PROXIMITY_CHANNEL(3, 1),
-+ SI1145_PROXIMITY_CHANNEL(4, 2),
-+ SI1145_TEMP_CHANNEL(5),
-+ SI1145_VOLTAGE_CHANNEL(6),
-+ SI1145_UV_CHANNEL(7),
-+ IIO_CHAN_SOFT_TIMESTAMP(8),
-+ SI1145_CURRENT_CHANNEL(0),
-+ SI1145_CURRENT_CHANNEL(1),
-+ SI1145_CURRENT_CHANNEL(2),
-+};
-+
-+static struct attribute *si1132_attributes[] = {
-+ &iio_const_attr_in_intensity_scale_available.dev_attr.attr,
-+ &iio_const_attr_in_intensity_ir_scale_available.dev_attr.attr,
-+ NULL,
-+};
-+
-+static struct attribute *si114x_attributes[] = {
-+ &iio_const_attr_in_intensity_scale_available.dev_attr.attr,
-+ &iio_const_attr_in_intensity_ir_scale_available.dev_attr.attr,
-+ &iio_const_attr_in_proximity_scale_available.dev_attr.attr,
-+ NULL,
-+};
-+
-+static const struct attribute_group si1132_attribute_group = {
-+ .attrs = si1132_attributes,
-+};
-+
-+static const struct attribute_group si114x_attribute_group = {
-+ .attrs = si114x_attributes,
-+};
-+
-+
-+static const struct iio_info si1132_info = {
-+ .read_raw = si1145_read_raw,
-+ .write_raw = si1145_write_raw,
-+ .driver_module = THIS_MODULE,
-+ .attrs = &si1132_attribute_group,
-+};
-+
-+static const struct iio_info si114x_info = {
-+ .read_raw = si1145_read_raw,
-+ .write_raw = si1145_write_raw,
-+ .driver_module = THIS_MODULE,
-+ .attrs = &si114x_attribute_group,
-+};
-+
-+#define SI1145_PART(id, iio_info, chans, leds, uncompressed_meas_rate) \
-+ {id, iio_info, chans, ARRAY_SIZE(chans), leds, uncompressed_meas_rate}
-+
-+static const struct si1145_part_info si1145_part_info[] = {
-+ [SI1132] = SI1145_PART(0x32, &si1132_info, si1132_channels, 0, true),
-+ [SI1141] = SI1145_PART(0x41, &si114x_info, si1141_channels, 1, false),
-+ [SI1142] = SI1145_PART(0x42, &si114x_info, si1142_channels, 2, false),
-+ [SI1143] = SI1145_PART(0x43, &si114x_info, si1143_channels, 3, false),
-+ [SI1145] = SI1145_PART(0x45, &si114x_info, si1145_channels, 1, true),
-+ [SI1146] = SI1145_PART(0x46, &si114x_info, si1146_channels, 2, true),
-+ [SI1147] = SI1145_PART(0x47, &si114x_info, si1147_channels, 3, true),
-+};
-+
-+static int si1145_initialize(struct si1145_data *data)
-+{
-+ struct i2c_client *client = data->client;
-+ int ret;
-+
-+ ret = i2c_smbus_write_byte_data(client, SI1145_REG_COMMAND,
-+ SI1145_CMD_RESET);
-+ if (ret < 0)
-+ return ret;
-+ msleep(SI1145_COMMAND_TIMEOUT_MS);
-+
-+ /* Hardware key, magic value */
-+ ret = i2c_smbus_write_byte_data(client, SI1145_REG_HW_KEY, 0x17);
-+ if (ret < 0)
-+ return ret;
-+ msleep(SI1145_COMMAND_TIMEOUT_MS);
-+
-+ /* Turn off autonomous mode */
-+ ret = si1145_set_meas_rate(data, 0);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* Initialize sampling freq to 10 Hz */
-+ ret = si1145_store_samp_freq(data, 10);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* Set LED currents to 45 mA; have 4 bits, see Table 2 in datasheet */
-+ switch (data->part_info->num_leds) {
-+ case 3:
-+ ret = i2c_smbus_write_byte_data(client,
-+ SI1145_REG_PS_LED3,
-+ SI1145_LED_CURRENT_45mA);
-+ if (ret < 0)
-+ return ret;
-+ /* fallthrough */
-+ case 2:
-+ ret = i2c_smbus_write_byte_data(client,
-+ SI1145_REG_PS_LED21,
-+ (SI1145_LED_CURRENT_45mA << 4) |
-+ SI1145_LED_CURRENT_45mA);
-+ break;
-+ case 1:
-+ ret = i2c_smbus_write_byte_data(client,
-+ SI1145_REG_PS_LED21,
-+ SI1145_LED_CURRENT_45mA);
-+ break;
-+ default:
-+ ret = 0;
-+ break;
-+ }
-+ if (ret < 0)
-+ return ret;
-+
-+ /* Set normal proximity measurement mode */
-+ ret = si1145_param_set(data, SI1145_PARAM_PS_ADC_MISC,
-+ SI1145_PS_ADC_MODE_NORMAL);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = si1145_param_set(data, SI1145_PARAM_PS_ADC_GAIN, 0x01);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* ADC_COUNTER should be one complement of ADC_GAIN */
-+ ret = si1145_param_set(data, SI1145_PARAM_PS_ADC_COUNTER, 0x06 << 4);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* Set ALS visible measurement mode */
-+ ret = si1145_param_set(data, SI1145_PARAM_ALSVIS_ADC_MISC,
-+ SI1145_ADC_MISC_RANGE);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = si1145_param_set(data, SI1145_PARAM_ALSVIS_ADC_GAIN, 0x03);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = si1145_param_set(data, SI1145_PARAM_ALSVIS_ADC_COUNTER,
-+ 0x04 << 4);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* Set ALS IR measurement mode */
-+ ret = si1145_param_set(data, SI1145_PARAM_ALSIR_ADC_MISC,
-+ SI1145_ADC_MISC_RANGE);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = si1145_param_set(data, SI1145_PARAM_ALSIR_ADC_GAIN, 0x01);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = si1145_param_set(data, SI1145_PARAM_ALSIR_ADC_COUNTER,
-+ 0x06 << 4);
-+ if (ret < 0)
-+ return ret;
-+
-+ /*
-+ * Initialize UCOEF to default values in datasheet
-+ * These registers are normally zero on reset
-+ */
-+ if (data->part_info == &si1145_part_info[SI1132] ||
-+ data->part_info == &si1145_part_info[SI1145] ||
-+ data->part_info == &si1145_part_info[SI1146] ||
-+ data->part_info == &si1145_part_info[SI1147]) {
-+ ret = i2c_smbus_write_byte_data(data->client,
-+ SI1145_REG_UCOEF1,
-+ SI1145_UCOEF1_DEFAULT);
-+ if (ret < 0)
-+ return ret;
-+ ret = i2c_smbus_write_byte_data(data->client,
-+ SI1145_REG_UCOEF2, SI1145_UCOEF2_DEFAULT);
-+ if (ret < 0)
-+ return ret;
-+ ret = i2c_smbus_write_byte_data(data->client,
-+ SI1145_REG_UCOEF3, SI1145_UCOEF3_DEFAULT);
-+ if (ret < 0)
-+ return ret;
-+ ret = i2c_smbus_write_byte_data(data->client,
-+ SI1145_REG_UCOEF4, SI1145_UCOEF4_DEFAULT);
-+ if (ret < 0)
-+ return ret;
-+ }
-+
-+ return 0;
-+}
-+
-+/*
-+ * Program the channels we want to measure with CMD_PSALS_AUTO. No need for
-+ * _postdisable as we stop with CMD_PSALS_PAUSE; single measurement (direct)
-+ * mode reprograms the channels list anyway...
-+ */
-+static int si1145_buffer_preenable(struct iio_dev *indio_dev)
-+{
-+ struct si1145_data *data = iio_priv(indio_dev);
-+ int ret;
-+
-+ mutex_lock(&data->lock);
-+ ret = si1145_set_chlist(indio_dev, *indio_dev->active_scan_mask);
-+ mutex_unlock(&data->lock);
-+
-+ return ret;
-+}
-+
-+static bool si1145_validate_scan_mask(struct iio_dev *indio_dev,
-+ const unsigned long *scan_mask)
-+{
-+ struct si1145_data *data = iio_priv(indio_dev);
-+ unsigned int count = 0;
-+ int i;
-+
-+ /* Check that at most one AUX channel is enabled */
-+ for_each_set_bit(i, scan_mask, data->part_info->num_channels) {
-+ if (indio_dev->channels[i].address == SI1145_REG_AUX_DATA)
-+ count++;
-+ }
-+
-+ return count <= 1;
-+}
-+
-+static const struct iio_buffer_setup_ops si1145_buffer_setup_ops = {
-+ .preenable = si1145_buffer_preenable,
-+ .postenable = iio_triggered_buffer_postenable,
-+ .predisable = iio_triggered_buffer_predisable,
-+ .validate_scan_mask = si1145_validate_scan_mask,
-+};
-+
-+/**
-+ * si1145_trigger_set_state() - Set trigger state
-+ *
-+ * When not using triggers interrupts are disabled and measurement rate is
-+ * set to zero in order to minimize power consumption.
-+ */
-+static int si1145_trigger_set_state(struct iio_trigger *trig, bool state)
-+{
-+ struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
-+ struct si1145_data *data = iio_priv(indio_dev);
-+ int err = 0, ret;
-+
-+ mutex_lock(&data->lock);
-+
-+ if (state) {
-+ data->autonomous = true;
-+ err = i2c_smbus_write_byte_data(data->client,
-+ SI1145_REG_INT_CFG, SI1145_INT_CFG_OE);
-+ if (err < 0)
-+ goto disable;
-+ err = i2c_smbus_write_byte_data(data->client,
-+ SI1145_REG_IRQ_ENABLE, SI1145_MASK_ALL_IE);
-+ if (err < 0)
-+ goto disable;
-+ err = si1145_set_meas_rate(data, data->meas_rate);
-+ if (err < 0)
-+ goto disable;
-+ err = si1145_command(data, SI1145_CMD_PSALS_AUTO);
-+ if (err < 0)
-+ goto disable;
-+ } else {
-+disable:
-+ /* Disable as much as possible skipping errors */
-+ ret = si1145_command(data, SI1145_CMD_PSALS_PAUSE);
-+ if (ret < 0 && !err)
-+ err = ret;
-+ ret = si1145_set_meas_rate(data, 0);
-+ if (ret < 0 && !err)
-+ err = ret;
-+ ret = i2c_smbus_write_byte_data(data->client,
-+ SI1145_REG_IRQ_ENABLE, 0);
-+ if (ret < 0 && !err)
-+ err = ret;
-+ ret = i2c_smbus_write_byte_data(data->client,
-+ SI1145_REG_INT_CFG, 0);
-+ if (ret < 0 && !err)
-+ err = ret;
-+ data->autonomous = false;
-+ }
-+
-+ mutex_unlock(&data->lock);
-+ return err;
-+}
-+
-+static const struct iio_trigger_ops si1145_trigger_ops = {
-+ .owner = THIS_MODULE,
-+ .set_trigger_state = si1145_trigger_set_state,
-+};
-+
-+static int si1145_probe_trigger(struct iio_dev *indio_dev)
-+{
-+ struct si1145_data *data = iio_priv(indio_dev);
-+ struct i2c_client *client = data->client;
-+ struct iio_trigger *trig;
-+ int ret;
-+
-+ trig = devm_iio_trigger_alloc(&client->dev,
-+ "%s-dev%d", indio_dev->name, indio_dev->id);
-+ if (!trig)
-+ return -ENOMEM;
-+
-+ trig->dev.parent = &client->dev;
-+ trig->ops = &si1145_trigger_ops;
-+ iio_trigger_set_drvdata(trig, indio_dev);
-+
-+ ret = devm_request_irq(&client->dev, client->irq,
-+ iio_trigger_generic_data_rdy_poll,
-+ IRQF_TRIGGER_FALLING,
-+ "si1145_irq",
-+ trig);
-+ if (ret < 0) {
-+ dev_err(&client->dev, "irq request failed\n");
-+ return ret;
-+ }
-+
-+ ret = iio_trigger_register(trig);
-+ if (ret)
-+ return ret;
-+
-+ data->trig = trig;
-+ indio_dev->trig = iio_trigger_get(data->trig);
-+
-+ return 0;
-+}
-+
-+static void si1145_remove_trigger(struct iio_dev *indio_dev)
-+{
-+ struct si1145_data *data = iio_priv(indio_dev);
-+
-+ if (data->trig) {
-+ iio_trigger_unregister(data->trig);
-+ data->trig = NULL;
-+ }
-+}
-+
-+static int si1145_probe(struct i2c_client *client,
-+ const struct i2c_device_id *id)
-+{
-+ struct si1145_data *data;
-+ struct iio_dev *indio_dev;
-+ u8 part_id, rev_id, seq_id;
-+ int ret;
-+
-+ indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
-+ if (!indio_dev)
-+ return -ENOMEM;
-+
-+ data = iio_priv(indio_dev);
-+ i2c_set_clientdata(client, indio_dev);
-+ data->client = client;
-+ data->part_info = &si1145_part_info[id->driver_data];
-+
-+ part_id = ret = i2c_smbus_read_byte_data(data->client,
-+ SI1145_REG_PART_ID);
-+ if (ret < 0)
-+ return ret;
-+ rev_id = ret = i2c_smbus_read_byte_data(data->client,
-+ SI1145_REG_REV_ID);
-+ if (ret < 0)
-+ return ret;
-+ seq_id = ret = i2c_smbus_read_byte_data(data->client,
-+ SI1145_REG_SEQ_ID);
-+ if (ret < 0)
-+ return ret;
-+ dev_info(&client->dev, "device ID part %#02hhx rev %#02hhx seq %#02hhx\n",
-+ part_id, rev_id, seq_id);
-+ if (part_id != data->part_info->part) {
-+ dev_err(&client->dev, "part ID mismatch got %#02hhx, expected %#02x\n",
-+ part_id, data->part_info->part);
-+ return -ENODEV;
-+ }
-+
-+ indio_dev->dev.parent = &client->dev;
-+ indio_dev->name = id->name;
-+ indio_dev->channels = data->part_info->channels;
-+ indio_dev->num_channels = data->part_info->num_channels;
-+ indio_dev->info = data->part_info->iio_info;
-+ indio_dev->modes = INDIO_DIRECT_MODE;
-+
-+ mutex_init(&data->lock);
-+ mutex_init(&data->cmdlock);
-+
-+ ret = si1145_initialize(data);
-+ if (ret < 0)
-+ return ret;
-+
-+ ret = iio_triggered_buffer_setup(indio_dev, NULL,
-+ si1145_trigger_handler, &si1145_buffer_setup_ops);
-+ if (ret < 0)
-+ return ret;
-+
-+ if (client->irq) {
-+ ret = si1145_probe_trigger(indio_dev);
-+ if (ret < 0)
-+ goto error_free_buffer;
-+ } else {
-+ dev_info(&client->dev, "no irq, using polling\n");
-+ }
-+
-+ ret = iio_device_register(indio_dev);
-+ if (ret < 0)
-+ goto error_free_trigger;
-+
-+ return 0;
-+
-+error_free_trigger:
-+ si1145_remove_trigger(indio_dev);
-+error_free_buffer:
-+ iio_triggered_buffer_cleanup(indio_dev);
-+
-+ return ret;
-+}
-+
-+static const struct i2c_device_id si1145_ids[] = {
-+ { "si1132", SI1132 },
-+ { "si1141", SI1141 },
-+ { "si1142", SI1142 },
-+ { "si1143", SI1143 },
-+ { "si1145", SI1145 },
-+ { "si1146", SI1146 },
-+ { "si1147", SI1147 },
-+ { }
-+};
-+MODULE_DEVICE_TABLE(i2c, si1145_ids);
-+
-+static int si1145_remove(struct i2c_client *client)
-+{
-+ struct iio_dev *indio_dev = i2c_get_clientdata(client);
-+
-+ iio_device_unregister(indio_dev);
-+ si1145_remove_trigger(indio_dev);
-+ iio_triggered_buffer_cleanup(indio_dev);
-+
-+ return 0;
-+}
-+
-+static struct i2c_driver si1145_driver = {
-+ .driver = {
-+ .name = "si1145",
-+ },
-+ .probe = si1145_probe,
-+ .remove = si1145_remove,
-+ .id_table = si1145_ids,
-+};
-+
-+module_i2c_driver(si1145_driver);
-+
-+MODULE_AUTHOR("Peter Meerwald-Stadler <pmeerw@pmeerw.net>");
-+MODULE_DESCRIPTION("Silabs SI1132 and SI1141/2/3/5/6/7 proximity, ambient light and UV index sensor driver");
-+MODULE_LICENSE("GPL");
-diff --git a/drivers/iio/light/us5182d.c b/drivers/iio/light/us5182d.c
-index 20c40f7..18cf2e2 100644
---- a/drivers/iio/light/us5182d.c
-+++ b/drivers/iio/light/us5182d.c
-@@ -894,7 +894,7 @@ static int us5182d_probe(struct i2c_client *client,
- goto out_err;
-
- if (data->default_continuous) {
-- pm_runtime_set_active(&client->dev);
-+ ret = pm_runtime_set_active(&client->dev);
- if (ret < 0)
- goto out_err;
- }
-diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c
-index c9d85bb..360b6e9 100644
---- a/drivers/iio/light/vcnl4000.c
-+++ b/drivers/iio/light/vcnl4000.c
-@@ -1,6 +1,6 @@
- /*
-- * vcnl4000.c - Support for Vishay VCNL4000 combined ambient light and
-- * proximity sensor
-+ * vcnl4000.c - Support for Vishay VCNL4000/4010/4020 combined ambient
-+ * light and proximity sensor
- *
- * Copyright 2012 Peter Meerwald <pmeerw@pmeerw.net>
- *
-@@ -13,6 +13,8 @@
- * TODO:
- * allow to adjust IR current
- * proximity threshold and event handling
-+ * periodic ALS/proximity measurement (VCNL4010/20)
-+ * interrupts (VCNL4010/20)
- */
-
- #include <linux/module.h>
-@@ -24,6 +26,8 @@
- #include <linux/iio/sysfs.h>
-
- #define VCNL4000_DRV_NAME "vcnl4000"
-+#define VCNL4000_ID 0x01
-+#define VCNL4010_ID 0x02 /* for VCNL4020, VCNL4010 */
-
- #define VCNL4000_COMMAND 0x80 /* Command register */
- #define VCNL4000_PROD_REV 0x81 /* Product ID and Revision ID */
-@@ -37,13 +41,14 @@
- #define VCNL4000_PS_MOD_ADJ 0x8a /* Proximity modulator timing adjustment */
-
- /* Bit masks for COMMAND register */
--#define VCNL4000_AL_RDY 0x40 /* ALS data ready? */
--#define VCNL4000_PS_RDY 0x20 /* proximity data ready? */
--#define VCNL4000_AL_OD 0x10 /* start on-demand ALS measurement */
--#define VCNL4000_PS_OD 0x08 /* start on-demand proximity measurement */
-+#define VCNL4000_AL_RDY BIT(6) /* ALS data ready? */
-+#define VCNL4000_PS_RDY BIT(5) /* proximity data ready? */
-+#define VCNL4000_AL_OD BIT(4) /* start on-demand ALS measurement */
-+#define VCNL4000_PS_OD BIT(3) /* start on-demand proximity measurement */
-
- struct vcnl4000_data {
- struct i2c_client *client;
-+ struct mutex lock;
- };
-
- static const struct i2c_device_id vcnl4000_id[] = {
-@@ -59,16 +64,18 @@ static int vcnl4000_measure(struct vcnl4000_data *data, u8 req_mask,
- __be16 buf;
- int ret;
-
-+ mutex_lock(&data->lock);
-+
- ret = i2c_smbus_write_byte_data(data->client, VCNL4000_COMMAND,
- req_mask);
- if (ret < 0)
-- return ret;
-+ goto fail;
-
- /* wait for data to become ready */
- while (tries--) {
- ret = i2c_smbus_read_byte_data(data->client, VCNL4000_COMMAND);
- if (ret < 0)
-- return ret;
-+ goto fail;
- if (ret & rdy_mask)
- break;
- msleep(20); /* measurement takes up to 100 ms */
-@@ -77,17 +84,23 @@ static int vcnl4000_measure(struct vcnl4000_data *data, u8 req_mask,
- if (tries < 0) {
- dev_err(&data->client->dev,
- "vcnl4000_measure() failed, data not ready\n");
-- return -EIO;
-+ ret = -EIO;
-+ goto fail;
- }
-
- ret = i2c_smbus_read_i2c_block_data(data->client,
- data_reg, sizeof(buf), (u8 *) &buf);
- if (ret < 0)
-- return ret;
-+ goto fail;
-
-+ mutex_unlock(&data->lock);
- *val = be16_to_cpu(buf);
-
- return 0;
-+
-+fail:
-+ mutex_unlock(&data->lock);
-+ return ret;
- }
-
- static const struct iio_chan_spec vcnl4000_channels[] = {
-@@ -105,7 +118,7 @@ static int vcnl4000_read_raw(struct iio_dev *indio_dev,
- struct iio_chan_spec const *chan,
- int *val, int *val2, long mask)
- {
-- int ret = -EINVAL;
-+ int ret;
- struct vcnl4000_data *data = iio_priv(indio_dev);
-
- switch (mask) {
-@@ -117,32 +130,27 @@ static int vcnl4000_read_raw(struct iio_dev *indio_dev,
- VCNL4000_AL_RESULT_HI, val);
- if (ret < 0)
- return ret;
-- ret = IIO_VAL_INT;
-- break;
-+ return IIO_VAL_INT;
- case IIO_PROXIMITY:
- ret = vcnl4000_measure(data,
- VCNL4000_PS_OD, VCNL4000_PS_RDY,
- VCNL4000_PS_RESULT_HI, val);
- if (ret < 0)
- return ret;
-- ret = IIO_VAL_INT;
-- break;
-+ return IIO_VAL_INT;
- default:
-- break;
-+ return -EINVAL;
- }
-- break;
- case IIO_CHAN_INFO_SCALE:
-- if (chan->type == IIO_LIGHT) {
-- *val = 0;
-- *val2 = 250000;
-- ret = IIO_VAL_INT_PLUS_MICRO;
-- }
-- break;
-+ if (chan->type != IIO_LIGHT)
-+ return -EINVAL;
-+
-+ *val = 0;
-+ *val2 = 250000;
-+ return IIO_VAL_INT_PLUS_MICRO;
- default:
-- break;
-+ return -EINVAL;
- }
--
-- return ret;
- }
-
- static const struct iio_info vcnl4000_info = {
-@@ -155,7 +163,7 @@ static int vcnl4000_probe(struct i2c_client *client,
- {
- struct vcnl4000_data *data;
- struct iio_dev *indio_dev;
-- int ret;
-+ int ret, prod_id;
-
- indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
- if (!indio_dev)
-@@ -164,13 +172,19 @@ static int vcnl4000_probe(struct i2c_client *client,
- data = iio_priv(indio_dev);
- i2c_set_clientdata(client, indio_dev);
- data->client = client;
-+ mutex_init(&data->lock);
-
- ret = i2c_smbus_read_byte_data(data->client, VCNL4000_PROD_REV);
- if (ret < 0)
- return ret;
-
-- dev_info(&client->dev, "VCNL4000 Ambient light/proximity sensor, Prod %02x, Rev: %02x\n",
-- ret >> 4, ret & 0xf);
-+ prod_id = ret >> 4;
-+ if (prod_id != VCNL4010_ID && prod_id != VCNL4000_ID)
-+ return -ENODEV;
-+
-+ dev_dbg(&client->dev, "%s Ambient light/proximity sensor, Rev: %02x\n",
-+ (prod_id == VCNL4010_ID) ? "VCNL4010/4020" : "VCNL4000",
-+ ret & 0xf);
-
- indio_dev->dev.parent = &client->dev;
- indio_dev->info = &vcnl4000_info;
-diff --git a/drivers/iio/magnetometer/Kconfig b/drivers/iio/magnetometer/Kconfig
-index 1f842ab..421ad90 100644
---- a/drivers/iio/magnetometer/Kconfig
-+++ b/drivers/iio/magnetometer/Kconfig
-@@ -5,8 +5,22 @@
-
- menu "Magnetometer sensors"
-
-+config AK8974
-+ tristate "Asahi Kasei AK8974 3-Axis Magnetometer"
-+ depends on I2C
-+ depends on OF
-+ select REGMAP_I2C
-+ select IIO_BUFFER
-+ select IIO_TRIGGERED_BUFFER
-+ help
-+ Say yes here to build support for Asahi Kasei AK8974 or
-+ AMI305 I2C-based 3-axis magnetometer chips.
-+
-+ To compile this driver as a module, choose M here: the module
-+ will be called ak8974.
-+
- config AK8975
-- tristate "Asahi Kasei AK 3-Axis Magnetometer"
-+ tristate "Asahi Kasei AK8975 3-Axis Magnetometer"
- depends on I2C
- depends on GPIOLIB || COMPILE_TEST
- select IIO_BUFFER
-diff --git a/drivers/iio/magnetometer/Makefile b/drivers/iio/magnetometer/Makefile
-index 92a745c..b86d6cb 100644
---- a/drivers/iio/magnetometer/Makefile
-+++ b/drivers/iio/magnetometer/Makefile
-@@ -3,6 +3,7 @@
- #
-
- # When adding new entries keep the list in alphabetical order
-+obj-$(CONFIG_AK8974) += ak8974.o
- obj-$(CONFIG_AK8975) += ak8975.o
- obj-$(CONFIG_BMC150_MAGN) += bmc150_magn.o
- obj-$(CONFIG_BMC150_MAGN_I2C) += bmc150_magn_i2c.o
-diff --git a/drivers/iio/magnetometer/ak8974.c b/drivers/iio/magnetometer/ak8974.c
-new file mode 100644
-index 0000000..2173531
---- /dev/null
-+++ b/drivers/iio/magnetometer/ak8974.c
-@@ -0,0 +1,860 @@
-+/*
-+ * Driver for the Asahi Kasei EMD Corporation AK8974
-+ * and Aichi Steel AMI305 magnetometer chips.
-+ * Based on a patch from Samu Onkalo and the AK8975 IIO driver.
-+ *
-+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-+ * Copyright (c) 2010 NVIDIA Corporation.
-+ * Copyright (C) 2016 Linaro Ltd.
-+ *
-+ * Author: Samu Onkalo <samu.p.onkalo@nokia.com>
-+ * Author: Linus Walleij <linus.walleij@linaro.org>
-+ */
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/i2c.h>
-+#include <linux/interrupt.h>
-+#include <linux/irq.h> /* For irq_get_irq_data() */
-+#include <linux/completion.h>
-+#include <linux/err.h>
-+#include <linux/mutex.h>
-+#include <linux/delay.h>
-+#include <linux/bitops.h>
-+#include <linux/regmap.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/pm_runtime.h>
-+
-+#include <linux/iio/iio.h>
-+#include <linux/iio/sysfs.h>
-+#include <linux/iio/buffer.h>
-+#include <linux/iio/trigger.h>
-+#include <linux/iio/trigger_consumer.h>
-+#include <linux/iio/triggered_buffer.h>
-+
-+/*
-+ * 16-bit registers are little-endian. LSB is at the address defined below
-+ * and MSB is at the next higher address.
-+ */
-+
-+/* These registers are common for AK8974 and AMI305 */
-+#define AK8974_SELFTEST 0x0C
-+#define AK8974_SELFTEST_IDLE 0x55
-+#define AK8974_SELFTEST_OK 0xAA
-+
-+#define AK8974_INFO 0x0D
-+
-+#define AK8974_WHOAMI 0x0F
-+#define AK8974_WHOAMI_VALUE_AMI305 0x47
-+#define AK8974_WHOAMI_VALUE_AK8974 0x48
-+
-+#define AK8974_DATA_X 0x10
-+#define AK8974_DATA_Y 0x12
-+#define AK8974_DATA_Z 0x14
-+#define AK8974_INT_SRC 0x16
-+#define AK8974_STATUS 0x18
-+#define AK8974_INT_CLEAR 0x1A
-+#define AK8974_CTRL1 0x1B
-+#define AK8974_CTRL2 0x1C
-+#define AK8974_CTRL3 0x1D
-+#define AK8974_INT_CTRL 0x1E
-+#define AK8974_INT_THRES 0x26 /* Absolute any axis value threshold */
-+#define AK8974_PRESET 0x30
-+
-+/* AK8974-specific offsets */
-+#define AK8974_OFFSET_X 0x20
-+#define AK8974_OFFSET_Y 0x22
-+#define AK8974_OFFSET_Z 0x24
-+/* AMI305-specific offsets */
-+#define AMI305_OFFSET_X 0x6C
-+#define AMI305_OFFSET_Y 0x72
-+#define AMI305_OFFSET_Z 0x78
-+
-+/* Different temperature registers */
-+#define AK8974_TEMP 0x31
-+#define AMI305_TEMP 0x60
-+
-+#define AK8974_INT_X_HIGH BIT(7) /* Axis over +threshold */
-+#define AK8974_INT_Y_HIGH BIT(6)
-+#define AK8974_INT_Z_HIGH BIT(5)
-+#define AK8974_INT_X_LOW BIT(4) /* Axis below -threshold */
-+#define AK8974_INT_Y_LOW BIT(3)
-+#define AK8974_INT_Z_LOW BIT(2)
-+#define AK8974_INT_RANGE BIT(1) /* Range overflow (any axis) */
-+
-+#define AK8974_STATUS_DRDY BIT(6) /* Data ready */
-+#define AK8974_STATUS_OVERRUN BIT(5) /* Data overrun */
-+#define AK8974_STATUS_INT BIT(4) /* Interrupt occurred */
-+
-+#define AK8974_CTRL1_POWER BIT(7) /* 0 = standby; 1 = active */
-+#define AK8974_CTRL1_RATE BIT(4) /* 0 = 10 Hz; 1 = 20 Hz */
-+#define AK8974_CTRL1_FORCE_EN BIT(1) /* 0 = normal; 1 = force */
-+#define AK8974_CTRL1_MODE2 BIT(0) /* 0 */
-+
-+#define AK8974_CTRL2_INT_EN BIT(4) /* 1 = enable interrupts */
-+#define AK8974_CTRL2_DRDY_EN BIT(3) /* 1 = enable data ready signal */
-+#define AK8974_CTRL2_DRDY_POL BIT(2) /* 1 = data ready active high */
-+#define AK8974_CTRL2_RESDEF (AK8974_CTRL2_DRDY_POL)
-+
-+#define AK8974_CTRL3_RESET BIT(7) /* Software reset */
-+#define AK8974_CTRL3_FORCE BIT(6) /* Start forced measurement */
-+#define AK8974_CTRL3_SELFTEST BIT(4) /* Set selftest register */
-+#define AK8974_CTRL3_RESDEF 0x00
-+
-+#define AK8974_INT_CTRL_XEN BIT(7) /* Enable interrupt for this axis */
-+#define AK8974_INT_CTRL_YEN BIT(6)
-+#define AK8974_INT_CTRL_ZEN BIT(5)
-+#define AK8974_INT_CTRL_XYZEN (BIT(7)|BIT(6)|BIT(5))
-+#define AK8974_INT_CTRL_POL BIT(3) /* 0 = active low; 1 = active high */
-+#define AK8974_INT_CTRL_PULSE BIT(1) /* 0 = latched; 1 = pulse (50 usec) */
-+#define AK8974_INT_CTRL_RESDEF (AK8974_INT_CTRL_XYZEN | AK8974_INT_CTRL_POL)
-+
-+/* The AMI305 has elaborate FW version and serial number registers */
-+#define AMI305_VER 0xE8
-+#define AMI305_SN 0xEA
-+
-+#define AK8974_MAX_RANGE 2048
-+
-+#define AK8974_POWERON_DELAY 50
-+#define AK8974_ACTIVATE_DELAY 1
-+#define AK8974_SELFTEST_DELAY 1
-+/*
-+ * Set the autosuspend to two orders of magnitude larger than the poweron
-+ * delay to make sane reasonable power tradeoff savings (5 seconds in
-+ * this case).
-+ */
-+#define AK8974_AUTOSUSPEND_DELAY 5000
-+
-+#define AK8974_MEASTIME 3
-+
-+#define AK8974_PWR_ON 1
-+#define AK8974_PWR_OFF 0
-+
-+/**
-+ * struct ak8974 - state container for the AK8974 driver
-+ * @i2c: parent I2C client
-+ * @orientation: mounting matrix, flipped axis etc
-+ * @map: regmap to access the AK8974 registers over I2C
-+ * @regs: the avdd and dvdd power regulators
-+ * @name: the name of the part
-+ * @variant: the whoami ID value (for selecting code paths)
-+ * @lock: locks the magnetometer for exclusive use during a measurement
-+ * @drdy_irq: uses the DRDY IRQ line
-+ * @drdy_complete: completion for DRDY
-+ * @drdy_active_low: the DRDY IRQ is active low
-+ */
-+struct ak8974 {
-+ struct i2c_client *i2c;
-+ struct iio_mount_matrix orientation;
-+ struct regmap *map;
-+ struct regulator_bulk_data regs[2];
-+ const char *name;
-+ u8 variant;
-+ struct mutex lock;
-+ bool drdy_irq;
-+ struct completion drdy_complete;
-+ bool drdy_active_low;
-+};
-+
-+static const char ak8974_reg_avdd[] = "avdd";
-+static const char ak8974_reg_dvdd[] = "dvdd";
-+
-+static int ak8974_set_power(struct ak8974 *ak8974, bool mode)
-+{
-+ int ret;
-+ u8 val;
-+
-+ val = mode ? AK8974_CTRL1_POWER : 0;
-+ val |= AK8974_CTRL1_FORCE_EN;
-+ ret = regmap_write(ak8974->map, AK8974_CTRL1, val);
-+ if (ret < 0)
-+ return ret;
-+
-+ if (mode)
-+ msleep(AK8974_ACTIVATE_DELAY);
-+
-+ return 0;
-+}
-+
-+static int ak8974_reset(struct ak8974 *ak8974)
-+{
-+ int ret;
-+
-+ /* Power on to get register access. Sets CTRL1 reg to reset state */
-+ ret = ak8974_set_power(ak8974, AK8974_PWR_ON);
-+ if (ret)
-+ return ret;
-+ ret = regmap_write(ak8974->map, AK8974_CTRL2, AK8974_CTRL2_RESDEF);
-+ if (ret)
-+ return ret;
-+ ret = regmap_write(ak8974->map, AK8974_CTRL3, AK8974_CTRL3_RESDEF);
-+ if (ret)
-+ return ret;
-+ ret = regmap_write(ak8974->map, AK8974_INT_CTRL,
-+ AK8974_INT_CTRL_RESDEF);
-+ if (ret)
-+ return ret;
-+
-+ /* After reset, power off is default state */
-+ return ak8974_set_power(ak8974, AK8974_PWR_OFF);
-+}
-+
-+static int ak8974_configure(struct ak8974 *ak8974)
-+{
-+ int ret;
-+
-+ ret = regmap_write(ak8974->map, AK8974_CTRL2, AK8974_CTRL2_DRDY_EN |
-+ AK8974_CTRL2_INT_EN);
-+ if (ret)
-+ return ret;
-+ ret = regmap_write(ak8974->map, AK8974_CTRL3, 0);
-+ if (ret)
-+ return ret;
-+ ret = regmap_write(ak8974->map, AK8974_INT_CTRL, AK8974_INT_CTRL_POL);
-+ if (ret)
-+ return ret;
-+
-+ return regmap_write(ak8974->map, AK8974_PRESET, 0);
-+}
-+
-+static int ak8974_trigmeas(struct ak8974 *ak8974)
-+{
-+ unsigned int clear;
-+ u8 mask;
-+ u8 val;
-+ int ret;
-+
-+ /* Clear any previous measurement overflow status */
-+ ret = regmap_read(ak8974->map, AK8974_INT_CLEAR, &clear);
-+ if (ret)
-+ return ret;
-+
-+ /* If we have a DRDY IRQ line, use it */
-+ if (ak8974->drdy_irq) {
-+ mask = AK8974_CTRL2_INT_EN |
-+ AK8974_CTRL2_DRDY_EN |
-+ AK8974_CTRL2_DRDY_POL;
-+ val = AK8974_CTRL2_DRDY_EN;
-+
-+ if (!ak8974->drdy_active_low)
-+ val |= AK8974_CTRL2_DRDY_POL;
-+
-+ init_completion(&ak8974->drdy_complete);
-+ ret = regmap_update_bits(ak8974->map, AK8974_CTRL2,
-+ mask, val);
-+ if (ret)
-+ return ret;
-+ }
-+
-+ /* Force a measurement */
-+ return regmap_update_bits(ak8974->map,
-+ AK8974_CTRL3,
-+ AK8974_CTRL3_FORCE,
-+ AK8974_CTRL3_FORCE);
-+}
-+
-+static int ak8974_await_drdy(struct ak8974 *ak8974)
-+{
-+ int timeout = 2;
-+ unsigned int val;
-+ int ret;
-+
-+ if (ak8974->drdy_irq) {
-+ ret = wait_for_completion_timeout(&ak8974->drdy_complete,
-+ 1 + msecs_to_jiffies(1000));
-+ if (!ret) {
-+ dev_err(&ak8974->i2c->dev,
-+ "timeout waiting for DRDY IRQ\n");
-+ return -ETIMEDOUT;
-+ }
-+ return 0;
-+ }
-+
-+ /* Default delay-based poll loop */
-+ do {
-+ msleep(AK8974_MEASTIME);
-+ ret = regmap_read(ak8974->map, AK8974_STATUS, &val);
-+ if (ret < 0)
-+ return ret;
-+ if (val & AK8974_STATUS_DRDY)
-+ return 0;
-+ } while (--timeout);
-+ if (!timeout) {
-+ dev_err(&ak8974->i2c->dev,
-+ "timeout waiting for DRDY\n");
-+ return -ETIMEDOUT;
-+ }
-+
-+ return 0;
-+}
-+
-+static int ak8974_getresult(struct ak8974 *ak8974, s16 *result)
-+{
-+ unsigned int src;
-+ int ret;
-+
-+ ret = ak8974_await_drdy(ak8974);
-+ if (ret)
-+ return ret;
-+ ret = regmap_read(ak8974->map, AK8974_INT_SRC, &src);
-+ if (ret < 0)
-+ return ret;
-+
-+ /* Out of range overflow! Strong magnet close? */
-+ if (src & AK8974_INT_RANGE) {
-+ dev_err(&ak8974->i2c->dev,
-+ "range overflow in sensor\n");
-+ return -ERANGE;
-+ }
-+
-+ ret = regmap_bulk_read(ak8974->map, AK8974_DATA_X, result, 6);
-+ if (ret)
-+ return ret;
-+
-+ return ret;
-+}
-+
-+static irqreturn_t ak8974_drdy_irq(int irq, void *d)
-+{
-+ struct ak8974 *ak8974 = d;
-+
-+ if (!ak8974->drdy_irq)
-+ return IRQ_NONE;
-+
-+ /* TODO: timestamp here to get good measurement stamps */
-+ return IRQ_WAKE_THREAD;
-+}
-+
-+static irqreturn_t ak8974_drdy_irq_thread(int irq, void *d)
-+{
-+ struct ak8974 *ak8974 = d;
-+ unsigned int val;
-+ int ret;
-+
-+ /* Check if this was a DRDY from us */
-+ ret = regmap_read(ak8974->map, AK8974_STATUS, &val);
-+ if (ret < 0) {
-+ dev_err(&ak8974->i2c->dev, "error reading DRDY status\n");
-+ return IRQ_HANDLED;
-+ }
-+ if (val & AK8974_STATUS_DRDY) {
-+ /* Yes this was our IRQ */
-+ complete(&ak8974->drdy_complete);
-+ return IRQ_HANDLED;
-+ }
-+
-+ /* We may be on a shared IRQ, let the next client check */
-+ return IRQ_NONE;
-+}
-+
-+static int ak8974_selftest(struct ak8974 *ak8974)
-+{
-+ struct device *dev = &ak8974->i2c->dev;
-+ unsigned int val;
-+ int ret;
-+
-+ ret = regmap_read(ak8974->map, AK8974_SELFTEST, &val);
-+ if (ret)
-+ return ret;
-+ if (val != AK8974_SELFTEST_IDLE) {
-+ dev_err(dev, "selftest not idle before test\n");
-+ return -EIO;
-+ }
-+
-+ /* Trigger self-test */
-+ ret = regmap_update_bits(ak8974->map,
-+ AK8974_CTRL3,
-+ AK8974_CTRL3_SELFTEST,
-+ AK8974_CTRL3_SELFTEST);
-+ if (ret) {
-+ dev_err(dev, "could not write CTRL3\n");
-+ return ret;
-+ }
-+
-+ msleep(AK8974_SELFTEST_DELAY);
-+
-+ ret = regmap_read(ak8974->map, AK8974_SELFTEST, &val);
-+ if (ret)
-+ return ret;
-+ if (val != AK8974_SELFTEST_OK) {
-+ dev_err(dev, "selftest result NOT OK (%02x)\n", val);
-+ return -EIO;
-+ }
-+
-+ ret = regmap_read(ak8974->map, AK8974_SELFTEST, &val);
-+ if (ret)
-+ return ret;
-+ if (val != AK8974_SELFTEST_IDLE) {
-+ dev_err(dev, "selftest not idle after test (%02x)\n", val);
-+ return -EIO;
-+ }
-+ dev_dbg(dev, "passed self-test\n");
-+
-+ return 0;
-+}
-+
-+static int ak8974_get_u16_val(struct ak8974 *ak8974, u8 reg, u16 *val)
-+{
-+ int ret;
-+ u16 bulk;
-+
-+ ret = regmap_bulk_read(ak8974->map, reg, &bulk, 2);
-+ if (ret)
-+ return ret;
-+ *val = le16_to_cpu(bulk);
-+
-+ return 0;
-+}
-+
-+static int ak8974_detect(struct ak8974 *ak8974)
-+{
-+ unsigned int whoami;
-+ const char *name;
-+ int ret;
-+ unsigned int fw;
-+ u16 sn;
-+
-+ ret = regmap_read(ak8974->map, AK8974_WHOAMI, &whoami);
-+ if (ret)
-+ return ret;
-+
-+ switch (whoami) {
-+ case AK8974_WHOAMI_VALUE_AMI305:
-+ name = "ami305";
-+ ret = regmap_read(ak8974->map, AMI305_VER, &fw);
-+ if (ret)
-+ return ret;
-+ fw &= 0x7f; /* only bits 0 thru 6 valid */
-+ ret = ak8974_get_u16_val(ak8974, AMI305_SN, &sn);
-+ if (ret)
-+ return ret;
-+ dev_info(&ak8974->i2c->dev,
-+ "detected %s, FW ver %02x, S/N: %04x\n",
-+ name, fw, sn);
-+ break;
-+ case AK8974_WHOAMI_VALUE_AK8974:
-+ name = "ak8974";
-+ dev_info(&ak8974->i2c->dev, "detected AK8974\n");
-+ break;
-+ default:
-+ dev_err(&ak8974->i2c->dev, "unsupported device (%02x) ",
-+ whoami);
-+ return -ENODEV;
-+ }
-+
-+ ak8974->name = name;
-+ ak8974->variant = whoami;
-+
-+ return 0;
-+}
-+
-+static int ak8974_read_raw(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan,
-+ int *val, int *val2,
-+ long mask)
-+{
-+ struct ak8974 *ak8974 = iio_priv(indio_dev);
-+ s16 hw_values[3];
-+ int ret = -EINVAL;
-+
-+ pm_runtime_get_sync(&ak8974->i2c->dev);
-+ mutex_lock(&ak8974->lock);
-+
-+ switch (mask) {
-+ case IIO_CHAN_INFO_RAW:
-+ if (chan->address > 2) {
-+ dev_err(&ak8974->i2c->dev, "faulty channel address\n");
-+ ret = -EIO;
-+ goto out_unlock;
-+ }
-+ ret = ak8974_trigmeas(ak8974);
-+ if (ret)
-+ goto out_unlock;
-+ ret = ak8974_getresult(ak8974, hw_values);
-+ if (ret)
-+ goto out_unlock;
-+
-+ /*
-+ * We read all axes and discard all but one, for optimized
-+ * reading, use the triggered buffer.
-+ */
-+ *val = le16_to_cpu(hw_values[chan->address]);
-+
-+ ret = IIO_VAL_INT;
-+ }
-+
-+ out_unlock:
-+ mutex_unlock(&ak8974->lock);
-+ pm_runtime_mark_last_busy(&ak8974->i2c->dev);
-+ pm_runtime_put_autosuspend(&ak8974->i2c->dev);
-+
-+ return ret;
-+}
-+
-+static void ak8974_fill_buffer(struct iio_dev *indio_dev)
-+{
-+ struct ak8974 *ak8974 = iio_priv(indio_dev);
-+ int ret;
-+ s16 hw_values[8]; /* Three axes + 64bit padding */
-+
-+ pm_runtime_get_sync(&ak8974->i2c->dev);
-+ mutex_lock(&ak8974->lock);
-+
-+ ret = ak8974_trigmeas(ak8974);
-+ if (ret) {
-+ dev_err(&ak8974->i2c->dev, "error triggering measure\n");
-+ goto out_unlock;
-+ }
-+ ret = ak8974_getresult(ak8974, hw_values);
-+ if (ret) {
-+ dev_err(&ak8974->i2c->dev, "error getting measures\n");
-+ goto out_unlock;
-+ }
-+
-+ iio_push_to_buffers_with_timestamp(indio_dev, hw_values,
-+ iio_get_time_ns(indio_dev));
-+
-+ out_unlock:
-+ mutex_unlock(&ak8974->lock);
-+ pm_runtime_mark_last_busy(&ak8974->i2c->dev);
-+ pm_runtime_put_autosuspend(&ak8974->i2c->dev);
-+}
-+
-+static irqreturn_t ak8974_handle_trigger(int irq, void *p)
-+{
-+ const struct iio_poll_func *pf = p;
-+ struct iio_dev *indio_dev = pf->indio_dev;
-+
-+ ak8974_fill_buffer(indio_dev);
-+ iio_trigger_notify_done(indio_dev->trig);
-+
-+ return IRQ_HANDLED;
-+}
-+
-+static const struct iio_mount_matrix *
-+ak8974_get_mount_matrix(const struct iio_dev *indio_dev,
-+ const struct iio_chan_spec *chan)
-+{
-+ struct ak8974 *ak8974 = iio_priv(indio_dev);
-+
-+ return &ak8974->orientation;
-+}
-+
-+static const struct iio_chan_spec_ext_info ak8974_ext_info[] = {
-+ IIO_MOUNT_MATRIX(IIO_SHARED_BY_DIR, ak8974_get_mount_matrix),
-+ { },
-+};
-+
-+#define AK8974_AXIS_CHANNEL(axis, index) \
-+ { \
-+ .type = IIO_MAGN, \
-+ .modified = 1, \
-+ .channel2 = IIO_MOD_##axis, \
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
-+ .ext_info = ak8974_ext_info, \
-+ .address = index, \
-+ .scan_index = index, \
-+ .scan_type = { \
-+ .sign = 's', \
-+ .realbits = 16, \
-+ .storagebits = 16, \
-+ .endianness = IIO_LE \
-+ }, \
-+ }
-+
-+static const struct iio_chan_spec ak8974_channels[] = {
-+ AK8974_AXIS_CHANNEL(X, 0),
-+ AK8974_AXIS_CHANNEL(Y, 1),
-+ AK8974_AXIS_CHANNEL(Z, 2),
-+ IIO_CHAN_SOFT_TIMESTAMP(3),
-+};
-+
-+static const unsigned long ak8974_scan_masks[] = { 0x7, 0 };
-+
-+static const struct iio_info ak8974_info = {
-+ .read_raw = &ak8974_read_raw,
-+ .driver_module = THIS_MODULE,
-+};
-+
-+static bool ak8974_writeable_reg(struct device *dev, unsigned int reg)
-+{
-+ struct i2c_client *i2c = to_i2c_client(dev);
-+ struct iio_dev *indio_dev = i2c_get_clientdata(i2c);
-+ struct ak8974 *ak8974 = iio_priv(indio_dev);
-+
-+ switch (reg) {
-+ case AK8974_CTRL1:
-+ case AK8974_CTRL2:
-+ case AK8974_CTRL3:
-+ case AK8974_INT_CTRL:
-+ case AK8974_INT_THRES:
-+ case AK8974_INT_THRES + 1:
-+ case AK8974_PRESET:
-+ case AK8974_PRESET + 1:
-+ return true;
-+ case AK8974_OFFSET_X:
-+ case AK8974_OFFSET_X + 1:
-+ case AK8974_OFFSET_Y:
-+ case AK8974_OFFSET_Y + 1:
-+ case AK8974_OFFSET_Z:
-+ case AK8974_OFFSET_Z + 1:
-+ if (ak8974->variant == AK8974_WHOAMI_VALUE_AK8974)
-+ return true;
-+ return false;
-+ case AMI305_OFFSET_X:
-+ case AMI305_OFFSET_X + 1:
-+ case AMI305_OFFSET_Y:
-+ case AMI305_OFFSET_Y + 1:
-+ case AMI305_OFFSET_Z:
-+ case AMI305_OFFSET_Z + 1:
-+ if (ak8974->variant == AK8974_WHOAMI_VALUE_AMI305)
-+ return true;
-+ return false;
-+ default:
-+ return false;
-+ }
-+}
-+
-+static const struct regmap_config ak8974_regmap_config = {
-+ .reg_bits = 8,
-+ .val_bits = 8,
-+ .max_register = 0xff,
-+ .writeable_reg = ak8974_writeable_reg,
-+};
-+
-+static int ak8974_probe(struct i2c_client *i2c,
-+ const struct i2c_device_id *id)
-+{
-+ struct iio_dev *indio_dev;
-+ struct ak8974 *ak8974;
-+ unsigned long irq_trig;
-+ int irq = i2c->irq;
-+ int ret;
-+
-+ /* Register with IIO */
-+ indio_dev = devm_iio_device_alloc(&i2c->dev, sizeof(*ak8974));
-+ if (indio_dev == NULL)
-+ return -ENOMEM;
-+
-+ ak8974 = iio_priv(indio_dev);
-+ i2c_set_clientdata(i2c, indio_dev);
-+ ak8974->i2c = i2c;
-+ mutex_init(&ak8974->lock);
-+
-+ ret = of_iio_read_mount_matrix(&i2c->dev,
-+ "mount-matrix",
-+ &ak8974->orientation);
-+ if (ret)
-+ return ret;
-+
-+ ak8974->regs[0].supply = ak8974_reg_avdd;
-+ ak8974->regs[1].supply = ak8974_reg_dvdd;
-+
-+ ret = devm_regulator_bulk_get(&i2c->dev,
-+ ARRAY_SIZE(ak8974->regs),
-+ ak8974->regs);
-+ if (ret < 0) {
-+ dev_err(&i2c->dev, "cannot get regulators\n");
-+ return ret;
-+ }
-+
-+ ret = regulator_bulk_enable(ARRAY_SIZE(ak8974->regs), ak8974->regs);
-+ if (ret < 0) {
-+ dev_err(&i2c->dev, "cannot enable regulators\n");
-+ return ret;
-+ }
-+
-+ /* Take runtime PM online */
-+ pm_runtime_get_noresume(&i2c->dev);
-+ pm_runtime_set_active(&i2c->dev);
-+ pm_runtime_enable(&i2c->dev);
-+
-+ ak8974->map = devm_regmap_init_i2c(i2c, &ak8974_regmap_config);
-+ if (IS_ERR(ak8974->map)) {
-+ dev_err(&i2c->dev, "failed to allocate register map\n");
-+ return PTR_ERR(ak8974->map);
-+ }
-+
-+ ret = ak8974_set_power(ak8974, AK8974_PWR_ON);
-+ if (ret) {
-+ dev_err(&i2c->dev, "could not power on\n");
-+ goto power_off;
-+ }
-+
-+ ret = ak8974_detect(ak8974);
-+ if (ret) {
-+ dev_err(&i2c->dev, "neither AK8974 nor AMI305 found\n");
-+ goto power_off;
-+ }
-+
-+ ret = ak8974_selftest(ak8974);
-+ if (ret)
-+ dev_err(&i2c->dev, "selftest failed (continuing anyway)\n");
-+
-+ ret = ak8974_reset(ak8974);
-+ if (ret) {
-+ dev_err(&i2c->dev, "AK8974 reset failed\n");
-+ goto power_off;
-+ }
-+
-+ pm_runtime_set_autosuspend_delay(&i2c->dev,
-+ AK8974_AUTOSUSPEND_DELAY);
-+ pm_runtime_use_autosuspend(&i2c->dev);
-+ pm_runtime_put(&i2c->dev);
-+
-+ indio_dev->dev.parent = &i2c->dev;
-+ indio_dev->channels = ak8974_channels;
-+ indio_dev->num_channels = ARRAY_SIZE(ak8974_channels);
-+ indio_dev->info = &ak8974_info;
-+ indio_dev->available_scan_masks = ak8974_scan_masks;
-+ indio_dev->modes = INDIO_DIRECT_MODE;
-+ indio_dev->name = ak8974->name;
-+
-+ ret = iio_triggered_buffer_setup(indio_dev, NULL,
-+ ak8974_handle_trigger,
-+ NULL);
-+ if (ret) {
-+ dev_err(&i2c->dev, "triggered buffer setup failed\n");
-+ goto disable_pm;
-+ }
-+
-+ /* If we have a valid DRDY IRQ, make use of it */
-+ if (irq > 0) {
-+ irq_trig = irqd_get_trigger_type(irq_get_irq_data(irq));
-+ if (irq_trig == IRQF_TRIGGER_RISING) {
-+ dev_info(&i2c->dev, "enable rising edge DRDY IRQ\n");
-+ } else if (irq_trig == IRQF_TRIGGER_FALLING) {
-+ ak8974->drdy_active_low = true;
-+ dev_info(&i2c->dev, "enable falling edge DRDY IRQ\n");
-+ } else {
-+ irq_trig = IRQF_TRIGGER_RISING;
-+ }
-+ irq_trig |= IRQF_ONESHOT;
-+ irq_trig |= IRQF_SHARED;
-+
-+ ret = devm_request_threaded_irq(&i2c->dev,
-+ irq,
-+ ak8974_drdy_irq,
-+ ak8974_drdy_irq_thread,
-+ irq_trig,
-+ ak8974->name,
-+ ak8974);
-+ if (ret) {
-+ dev_err(&i2c->dev, "unable to request DRDY IRQ "
-+ "- proceeding without IRQ\n");
-+ goto no_irq;
-+ }
-+ ak8974->drdy_irq = true;
-+ }
-+
-+no_irq:
-+ ret = iio_device_register(indio_dev);
-+ if (ret) {
-+ dev_err(&i2c->dev, "device register failed\n");
-+ goto cleanup_buffer;
-+ }
-+
-+ return 0;
-+
-+cleanup_buffer:
-+ iio_triggered_buffer_cleanup(indio_dev);
-+disable_pm:
-+ pm_runtime_put_noidle(&i2c->dev);
-+ pm_runtime_disable(&i2c->dev);
-+ ak8974_set_power(ak8974, AK8974_PWR_OFF);
-+power_off:
-+ regulator_bulk_disable(ARRAY_SIZE(ak8974->regs), ak8974->regs);
-+
-+ return ret;
-+}
-+
-+static int __exit ak8974_remove(struct i2c_client *i2c)
-+{
-+ struct iio_dev *indio_dev = i2c_get_clientdata(i2c);
-+ struct ak8974 *ak8974 = iio_priv(indio_dev);
-+
-+ iio_device_unregister(indio_dev);
-+ iio_triggered_buffer_cleanup(indio_dev);
-+ pm_runtime_get_sync(&i2c->dev);
-+ pm_runtime_put_noidle(&i2c->dev);
-+ pm_runtime_disable(&i2c->dev);
-+ ak8974_set_power(ak8974, AK8974_PWR_OFF);
-+ regulator_bulk_disable(ARRAY_SIZE(ak8974->regs), ak8974->regs);
-+
-+ return 0;
-+}
-+
-+static int __maybe_unused ak8974_runtime_suspend(struct device *dev)
-+{
-+ struct ak8974 *ak8974 =
-+ iio_priv(i2c_get_clientdata(to_i2c_client(dev)));
-+
-+ ak8974_set_power(ak8974, AK8974_PWR_OFF);
-+ regulator_bulk_disable(ARRAY_SIZE(ak8974->regs), ak8974->regs);
-+
-+ return 0;
-+}
-+
-+static int __maybe_unused ak8974_runtime_resume(struct device *dev)
-+{
-+ struct ak8974 *ak8974 =
-+ iio_priv(i2c_get_clientdata(to_i2c_client(dev)));
-+ int ret;
-+
-+ ret = regulator_bulk_enable(ARRAY_SIZE(ak8974->regs), ak8974->regs);
-+ if (ret)
-+ return ret;
-+ msleep(AK8974_POWERON_DELAY);
-+ ret = ak8974_set_power(ak8974, AK8974_PWR_ON);
-+ if (ret)
-+ goto out_regulator_disable;
-+
-+ ret = ak8974_configure(ak8974);
-+ if (ret)
-+ goto out_disable_power;
-+
-+ return 0;
-+
-+out_disable_power:
-+ ak8974_set_power(ak8974, AK8974_PWR_OFF);
-+out_regulator_disable:
-+ regulator_bulk_disable(ARRAY_SIZE(ak8974->regs), ak8974->regs);
-+
-+ return ret;
-+}
-+
-+static const struct dev_pm_ops ak8974_dev_pm_ops = {
-+ SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
-+ pm_runtime_force_resume)
-+ SET_RUNTIME_PM_OPS(ak8974_runtime_suspend,
-+ ak8974_runtime_resume, NULL)
-+};
-+
-+static const struct i2c_device_id ak8974_id[] = {
-+ {"ami305", 0 },
-+ {"ak8974", 0 },
-+ {}
-+};
-+MODULE_DEVICE_TABLE(i2c, ak8974_id);
-+
-+static const struct of_device_id ak8974_of_match[] = {
-+ { .compatible = "asahi-kasei,ak8974", },
-+ {}
-+};
-+MODULE_DEVICE_TABLE(of, ak8974_of_match);
-+
-+static struct i2c_driver ak8974_driver = {
-+ .driver = {
-+ .name = "ak8974",
-+ .pm = &ak8974_dev_pm_ops,
-+ .of_match_table = of_match_ptr(ak8974_of_match),
-+ },
-+ .probe = ak8974_probe,
-+ .remove = __exit_p(ak8974_remove),
-+ .id_table = ak8974_id,
-+};
-+module_i2c_driver(ak8974_driver);
-+
-+MODULE_DESCRIPTION("AK8974 and AMI305 3-axis magnetometer driver");
-+MODULE_AUTHOR("Samu Onkalo");
-+MODULE_AUTHOR("Linus Walleij");
-+MODULE_LICENSE("GPL v2");
-diff --git a/drivers/iio/magnetometer/mag3110.c b/drivers/iio/magnetometer/mag3110.c
-index f2be4a0..f2b3bd7 100644
---- a/drivers/iio/magnetometer/mag3110.c
-+++ b/drivers/iio/magnetometer/mag3110.c
-@@ -154,34 +154,41 @@ static int mag3110_read_raw(struct iio_dev *indio_dev,
-
- switch (mask) {
- case IIO_CHAN_INFO_RAW:
-- if (iio_buffer_enabled(indio_dev))
-- return -EBUSY;
-+ ret = iio_device_claim_direct_mode(indio_dev);
-+ if (ret)
-+ return ret;
-
- switch (chan->type) {
- case IIO_MAGN: /* in 0.1 uT / LSB */
- ret = mag3110_read(data, buffer);
- if (ret < 0)
-- return ret;
-+ goto release;
- *val = sign_extend32(
- be16_to_cpu(buffer[chan->scan_index]), 15);
-- return IIO_VAL_INT;
-+ ret = IIO_VAL_INT;
-+ break;
- case IIO_TEMP: /* in 1 C / LSB */
- mutex_lock(&data->lock);
- ret = mag3110_request(data);
- if (ret < 0) {
- mutex_unlock(&data->lock);
-- return ret;
-+ goto release;
- }
- ret = i2c_smbus_read_byte_data(data->client,
- MAG3110_DIE_TEMP);
- mutex_unlock(&data->lock);
- if (ret < 0)
-- return ret;
-+ goto release;
- *val = sign_extend32(ret, 7);
-- return IIO_VAL_INT;
-+ ret = IIO_VAL_INT;
-+ break;
- default:
-- return -EINVAL;
-+ ret = -EINVAL;
- }
-+release:
-+ iio_device_release_direct_mode(indio_dev);
-+ return ret;
-+
- case IIO_CHAN_INFO_SCALE:
- switch (chan->type) {
- case IIO_MAGN:
-diff --git a/drivers/iio/pressure/Kconfig b/drivers/iio/pressure/Kconfig
-index d130cdc..15cd416 100644
---- a/drivers/iio/pressure/Kconfig
-+++ b/drivers/iio/pressure/Kconfig
-@@ -8,8 +8,6 @@ menu "Pressure sensors"
- config BMP280
- tristate "Bosch Sensortec BMP180/BMP280 pressure sensor I2C driver"
- depends on (I2C || SPI_MASTER)
-- depends on !(BMP085_I2C=y || BMP085_I2C=m)
-- depends on !(BMP085_SPI=y || BMP085_SPI=m)
- select REGMAP
- select BMP280_I2C if (I2C)
- select BMP280_SPI if (SPI_MASTER)
-@@ -187,4 +185,26 @@ config HP206C
- This driver can also be built as a module. If so, the module will
- be called hp206c.
-
-+config ZPA2326
-+ tristate "Murata ZPA2326 pressure sensor driver"
-+ select IIO_BUFFER
-+ select IIO_TRIGGERED_BUFFER
-+ select REGMAP
-+ select ZPA2326_I2C if I2C
-+ select ZPA2326_SPI if SPI_MASTER
-+ help
-+ Say Y here to build support for the Murata ZPA2326 pressure and
-+ temperature sensor.
-+
-+ To compile this driver as a module, choose M here: the module will
-+ be called zpa2326.
-+
-+config ZPA2326_I2C
-+ tristate
-+ select REGMAP_I2C
-+
-+config ZPA2326_SPI
-+ tristate
-+ select REGMAP_SPI
-+
- endmenu
-diff --git a/drivers/iio/pressure/Makefile b/drivers/iio/pressure/Makefile
-index 7f395be..fff7718 100644
---- a/drivers/iio/pressure/Makefile
-+++ b/drivers/iio/pressure/Makefile
-@@ -22,6 +22,9 @@ st_pressure-y := st_pressure_core.o
- st_pressure-$(CONFIG_IIO_BUFFER) += st_pressure_buffer.o
- obj-$(CONFIG_T5403) += t5403.o
- obj-$(CONFIG_HP206C) += hp206c.o
-+obj-$(CONFIG_ZPA2326) += zpa2326.o
-+obj-$(CONFIG_ZPA2326_I2C) += zpa2326_i2c.o
-+obj-$(CONFIG_ZPA2326_SPI) += zpa2326_spi.o
-
- obj-$(CONFIG_IIO_ST_PRESS_I2C) += st_pressure_i2c.o
- obj-$(CONFIG_IIO_ST_PRESS_SPI) += st_pressure_spi.o
-diff --git a/drivers/iio/pressure/ms5611_core.c b/drivers/iio/pressure/ms5611_core.c
-index feb41f8..a74ed1f 100644
---- a/drivers/iio/pressure/ms5611_core.c
-+++ b/drivers/iio/pressure/ms5611_core.c
-@@ -416,8 +416,7 @@ static int ms5611_init(struct iio_dev *indio_dev)
- return 0;
-
- err_regulator_disable:
-- if (!IS_ERR_OR_NULL(st->vdd))
-- regulator_disable(st->vdd);
-+ regulator_disable(st->vdd);
- return ret;
- }
-
-@@ -425,8 +424,7 @@ static void ms5611_fini(const struct iio_dev *indio_dev)
- {
- const struct ms5611_state *st = iio_priv(indio_dev);
-
-- if (!IS_ERR_OR_NULL(st->vdd))
-- regulator_disable(st->vdd);
-+ regulator_disable(st->vdd);
- }
-
- int ms5611_probe(struct iio_dev *indio_dev, struct device *dev,
-diff --git a/drivers/iio/pressure/zpa2326.c b/drivers/iio/pressure/zpa2326.c
-new file mode 100644
-index 0000000..19d2eb4
---- /dev/null
-+++ b/drivers/iio/pressure/zpa2326.c
-@@ -0,0 +1,1735 @@
-+/*
-+ * Murata ZPA2326 pressure and temperature sensor IIO driver
-+ *
-+ * Copyright (c) 2016 Parrot S.A.
-+ *
-+ * Author: Gregor Boirie <gregor.boirie@parrot.com>
-+ *
-+ * 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.
-+ *
-+ * 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.
-+ */
-+
-+/**
-+ * DOC: ZPA2326 theory of operations
-+ *
-+ * This driver supports %INDIO_DIRECT_MODE and %INDIO_BUFFER_TRIGGERED IIO
-+ * modes.
-+ * A internal hardware trigger is also implemented to dispatch registered IIO
-+ * trigger consumers upon "sample ready" interrupts.
-+ *
-+ * ZPA2326 hardware supports 2 sampling mode: one shot and continuous.
-+ *
-+ * A complete one shot sampling cycle gets device out of low power mode,
-+ * performs pressure and temperature measurements, then automatically switches
-+ * back to low power mode. It is meant for on demand sampling with optimal power
-+ * saving at the cost of lower sampling rate and higher software overhead.
-+ * This is a natural candidate for IIO read_raw hook implementation
-+ * (%INDIO_DIRECT_MODE). It is also used for triggered buffering support to
-+ * ensure explicit synchronization with external trigger events
-+ * (%INDIO_BUFFER_TRIGGERED).
-+ *
-+ * The continuous mode works according to a periodic hardware measurement
-+ * process continuously pushing samples into an internal hardware FIFO (for
-+ * pressure samples only). Measurement cycle completion may be signaled by a
-+ * "sample ready" interrupt.
-+ * Typical software sequence of operations :
-+ * - get device out of low power mode,
-+ * - setup hardware sampling period,
-+ * - at end of period, upon data ready interrupt: pop pressure samples out of
-+ * hardware FIFO and fetch temperature sample
-+ * - when no longer needed, stop sampling process by putting device into
-+ * low power mode.
-+ * This mode is used to implement %INDIO_BUFFER_TRIGGERED mode if device tree
-+ * declares a valid interrupt line. In this case, the internal hardware trigger
-+ * drives acquisition.
-+ *
-+ * Note that hardware sampling frequency is taken into account only when
-+ * internal hardware trigger is attached as the highest sampling rate seems to
-+ * be the most energy efficient.
-+ *
-+ * TODO:
-+ * preset pressure threshold crossing / IIO events ;
-+ * differential pressure sampling ;
-+ * hardware samples averaging.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/delay.h>
-+#include <linux/interrupt.h>
-+#include <linux/regulator/consumer.h>
-+#include <linux/pm_runtime.h>
-+#include <linux/regmap.h>
-+#include <linux/iio/iio.h>
-+#include <linux/iio/sysfs.h>
-+#include <linux/iio/buffer.h>
-+#include <linux/iio/trigger.h>
-+#include <linux/iio/trigger_consumer.h>
-+#include <linux/iio/triggered_buffer.h>
-+#include "zpa2326.h"
-+
-+/* 200 ms should be enough for the longest conversion time in one-shot mode. */
-+#define ZPA2326_CONVERSION_JIFFIES (HZ / 5)
-+
-+/* There should be a 1 ms delay (Tpup) after getting out of reset. */
-+#define ZPA2326_TPUP_USEC_MIN (1000)
-+#define ZPA2326_TPUP_USEC_MAX (2000)
-+
-+/**
-+ * struct zpa2326_frequency - Hardware sampling frequency descriptor
-+ * @hz : Frequency in Hertz.
-+ * @odr: Output Data Rate word as expected by %ZPA2326_CTRL_REG3_REG.
-+ */
-+struct zpa2326_frequency {
-+ int hz;
-+ u16 odr;
-+};
-+
-+/*
-+ * Keep these in strict ascending order: last array entry is expected to
-+ * correspond to the highest sampling frequency.
-+ */
-+static const struct zpa2326_frequency zpa2326_sampling_frequencies[] = {
-+ { .hz = 1, .odr = 1 << ZPA2326_CTRL_REG3_ODR_SHIFT },
-+ { .hz = 5, .odr = 5 << ZPA2326_CTRL_REG3_ODR_SHIFT },
-+ { .hz = 11, .odr = 6 << ZPA2326_CTRL_REG3_ODR_SHIFT },
-+ { .hz = 23, .odr = 7 << ZPA2326_CTRL_REG3_ODR_SHIFT },
-+};
-+
-+/* Return the highest hardware sampling frequency available. */
-+static const struct zpa2326_frequency *zpa2326_highest_frequency(void)
-+{
-+ return &zpa2326_sampling_frequencies[
-+ ARRAY_SIZE(zpa2326_sampling_frequencies) - 1];
-+}
-+
-+/**
-+ * struct zpa_private - Per-device internal private state
-+ * @timestamp: Buffered samples ready datum.
-+ * @regmap: Underlying I2C / SPI bus adapter used to abstract slave register
-+ * accesses.
-+ * @result: Allows sampling logic to get completion status of operations
-+ * that interrupt handlers perform asynchronously.
-+ * @data_ready: Interrupt handler uses this to wake user context up at sampling
-+ * operation completion.
-+ * @trigger: Optional hardware / interrupt driven trigger used to notify
-+ * external devices a new sample is ready.
-+ * @waken: Flag indicating whether or not device has just been powered on.
-+ * @irq: Optional interrupt line: negative or zero if not declared into
-+ * DT, in which case sampling logic keeps polling status register
-+ * to detect completion.
-+ * @frequency: Current hardware sampling frequency.
-+ * @vref: Power / voltage reference.
-+ * @vdd: Power supply.
-+ */
-+struct zpa2326_private {
-+ s64 timestamp;
-+ struct regmap *regmap;
-+ int result;
-+ struct completion data_ready;
-+ struct iio_trigger *trigger;
-+ bool waken;
-+ int irq;
-+ const struct zpa2326_frequency *frequency;
-+ struct regulator *vref;
-+ struct regulator *vdd;
-+};
-+
-+#define zpa2326_err(_idev, _format, _arg...) \
-+ dev_err(_idev->dev.parent, _format, ##_arg)
-+
-+#define zpa2326_warn(_idev, _format, _arg...) \
-+ dev_warn(_idev->dev.parent, _format, ##_arg)
-+
-+#ifdef DEBUG
-+#define zpa2326_dbg(_idev, _format, _arg...) \
-+ dev_dbg(_idev->dev.parent, _format, ##_arg)
-+#else
-+#define zpa2326_dbg(_idev, _format, _arg...)
-+#endif
-+
-+bool zpa2326_isreg_writeable(struct device *dev, unsigned int reg)
-+{
-+ switch (reg) {
-+ case ZPA2326_REF_P_XL_REG:
-+ case ZPA2326_REF_P_L_REG:
-+ case ZPA2326_REF_P_H_REG:
-+ case ZPA2326_RES_CONF_REG:
-+ case ZPA2326_CTRL_REG0_REG:
-+ case ZPA2326_CTRL_REG1_REG:
-+ case ZPA2326_CTRL_REG2_REG:
-+ case ZPA2326_CTRL_REG3_REG:
-+ case ZPA2326_THS_P_LOW_REG:
-+ case ZPA2326_THS_P_HIGH_REG:
-+ return true;
-+
-+ default:
-+ return false;
-+ }
-+}
-+EXPORT_SYMBOL_GPL(zpa2326_isreg_writeable);
-+
-+bool zpa2326_isreg_readable(struct device *dev, unsigned int reg)
-+{
-+ switch (reg) {
-+ case ZPA2326_REF_P_XL_REG:
-+ case ZPA2326_REF_P_L_REG:
-+ case ZPA2326_REF_P_H_REG:
-+ case ZPA2326_DEVICE_ID_REG:
-+ case ZPA2326_RES_CONF_REG:
-+ case ZPA2326_CTRL_REG0_REG:
-+ case ZPA2326_CTRL_REG1_REG:
-+ case ZPA2326_CTRL_REG2_REG:
-+ case ZPA2326_CTRL_REG3_REG:
-+ case ZPA2326_INT_SOURCE_REG:
-+ case ZPA2326_THS_P_LOW_REG:
-+ case ZPA2326_THS_P_HIGH_REG:
-+ case ZPA2326_STATUS_REG:
-+ case ZPA2326_PRESS_OUT_XL_REG:
-+ case ZPA2326_PRESS_OUT_L_REG:
-+ case ZPA2326_PRESS_OUT_H_REG:
-+ case ZPA2326_TEMP_OUT_L_REG:
-+ case ZPA2326_TEMP_OUT_H_REG:
-+ return true;
-+
-+ default:
-+ return false;
-+ }
-+}
-+EXPORT_SYMBOL_GPL(zpa2326_isreg_readable);
-+
-+bool zpa2326_isreg_precious(struct device *dev, unsigned int reg)
-+{
-+ switch (reg) {
-+ case ZPA2326_INT_SOURCE_REG:
-+ case ZPA2326_PRESS_OUT_H_REG:
-+ return true;
-+
-+ default:
-+ return false;
-+ }
-+}
-+EXPORT_SYMBOL_GPL(zpa2326_isreg_precious);
-+
-+/**
-+ * zpa2326_enable_device() - Enable device, i.e. get out of low power mode.
-+ * @indio_dev: The IIO device associated with the hardware to enable.
-+ *
-+ * Required to access complete register space and to perform any sampling
-+ * or control operations.
-+ *
-+ * Return: Zero when successful, a negative error code otherwise.
-+ */
-+static int zpa2326_enable_device(const struct iio_dev *indio_dev)
-+{
-+ int err;
-+
-+ err = regmap_write(((struct zpa2326_private *)
-+ iio_priv(indio_dev))->regmap,
-+ ZPA2326_CTRL_REG0_REG, ZPA2326_CTRL_REG0_ENABLE);
-+ if (err) {
-+ zpa2326_err(indio_dev, "failed to enable device (%d)", err);
-+ return err;
-+ }
-+
-+ zpa2326_dbg(indio_dev, "enabled");
-+
-+ return 0;
-+}
-+
-+/**
-+ * zpa2326_sleep() - Disable device, i.e. switch to low power mode.
-+ * @indio_dev: The IIO device associated with the hardware to disable.
-+ *
-+ * Only %ZPA2326_DEVICE_ID_REG and %ZPA2326_CTRL_REG0_REG registers may be
-+ * accessed once device is in the disabled state.
-+ *
-+ * Return: Zero when successful, a negative error code otherwise.
-+ */
-+static int zpa2326_sleep(const struct iio_dev *indio_dev)
-+{
-+ int err;
-+
-+ err = regmap_write(((struct zpa2326_private *)
-+ iio_priv(indio_dev))->regmap,
-+ ZPA2326_CTRL_REG0_REG, 0);
-+ if (err) {
-+ zpa2326_err(indio_dev, "failed to sleep (%d)", err);
-+ return err;
-+ }
-+
-+ zpa2326_dbg(indio_dev, "sleeping");
-+
-+ return 0;
-+}
-+
-+/**
-+ * zpa2326_reset_device() - Reset device to default hardware state.
-+ * @indio_dev: The IIO device associated with the hardware to reset.
-+ *
-+ * Disable sampling and empty hardware FIFO.
-+ * Device must be enabled before reset, i.e. not in low power mode.
-+ *
-+ * Return: Zero when successful, a negative error code otherwise.
-+ */
-+static int zpa2326_reset_device(const struct iio_dev *indio_dev)
-+{
-+ int err;
-+
-+ err = regmap_write(((struct zpa2326_private *)
-+ iio_priv(indio_dev))->regmap,
-+ ZPA2326_CTRL_REG2_REG, ZPA2326_CTRL_REG2_SWRESET);
-+ if (err) {
-+ zpa2326_err(indio_dev, "failed to reset device (%d)", err);
-+ return err;
-+ }
-+
-+ usleep_range(ZPA2326_TPUP_USEC_MIN, ZPA2326_TPUP_USEC_MAX);
-+
-+ zpa2326_dbg(indio_dev, "reset");
-+
-+ return 0;
-+}
-+
-+/**
-+ * zpa2326_start_oneshot() - Start a single sampling cycle, i.e. in one shot
-+ * mode.
-+ * @indio_dev: The IIO device associated with the sampling hardware.
-+ *
-+ * Device must have been previously enabled and configured for one shot mode.
-+ * Device will be switched back to low power mode at end of cycle.
-+ *
-+ * Return: Zero when successful, a negative error code otherwise.
-+ */
-+static int zpa2326_start_oneshot(const struct iio_dev *indio_dev)
-+{
-+ int err;
-+
-+ err = regmap_write(((struct zpa2326_private *)
-+ iio_priv(indio_dev))->regmap,
-+ ZPA2326_CTRL_REG0_REG,
-+ ZPA2326_CTRL_REG0_ENABLE |
-+ ZPA2326_CTRL_REG0_ONE_SHOT);
-+ if (err) {
-+ zpa2326_err(indio_dev, "failed to start one shot cycle (%d)",
-+ err);
-+ return err;
-+ }
-+
-+ zpa2326_dbg(indio_dev, "one shot cycle started");
-+
-+ return 0;
-+}
-+
-+/**
-+ * zpa2326_power_on() - Power on device to allow subsequent configuration.
-+ * @indio_dev: The IIO device associated with the sampling hardware.
-+ * @private: Internal private state related to @indio_dev.
-+ *
-+ * Sampling will be disabled, preventing strange things from happening in our
-+ * back. Hardware FIFO content will be cleared.
-+ * When successful, device will be left in the enabled state to allow further
-+ * configuration.
-+ *
-+ * Return: Zero when successful, a negative error code otherwise.
-+ */
-+static int zpa2326_power_on(const struct iio_dev *indio_dev,
-+ const struct zpa2326_private *private)
-+{
-+ int err;
-+
-+ err = regulator_enable(private->vref);
-+ if (err)
-+ return err;
-+
-+ err = regulator_enable(private->vdd);
-+ if (err)
-+ goto vref;
-+
-+ zpa2326_dbg(indio_dev, "powered on");
-+
-+ err = zpa2326_enable_device(indio_dev);
-+ if (err)
-+ goto vdd;
-+
-+ err = zpa2326_reset_device(indio_dev);
-+ if (err)
-+ goto sleep;
-+
-+ return 0;
-+
-+sleep:
-+ zpa2326_sleep(indio_dev);
-+vdd:
-+ regulator_disable(private->vdd);
-+vref:
-+ regulator_disable(private->vref);
-+
-+ zpa2326_dbg(indio_dev, "powered off");
-+
-+ return err;
-+}
-+
-+/**
-+ * zpa2326_power_off() - Power off device, i.e. disable attached power
-+ * regulators.
-+ * @indio_dev: The IIO device associated with the sampling hardware.
-+ * @private: Internal private state related to @indio_dev.
-+ *
-+ * Return: Zero when successful, a negative error code otherwise.
-+ */
-+static void zpa2326_power_off(const struct iio_dev *indio_dev,
-+ const struct zpa2326_private *private)
-+{
-+ regulator_disable(private->vdd);
-+ regulator_disable(private->vref);
-+
-+ zpa2326_dbg(indio_dev, "powered off");
-+}
-+
-+/**
-+ * zpa2326_config_oneshot() - Setup device for one shot / on demand mode.
-+ * @indio_dev: The IIO device associated with the sampling hardware.
-+ * @irq: Optional interrupt line the hardware uses to notify new data
-+ * samples are ready. Negative or zero values indicate no interrupts
-+ * are available, meaning polling is required.
-+ *
-+ * Output Data Rate is configured for the highest possible rate so that
-+ * conversion time and power consumption are reduced to a minimum.
-+ * Note that hardware internal averaging machinery (not implemented in this
-+ * driver) is not applicable in this mode.
-+ *
-+ * Device must have been previously enabled before calling
-+ * zpa2326_config_oneshot().
-+ *
-+ * Return: Zero when successful, a negative error code otherwise.
-+ */
-+static int zpa2326_config_oneshot(const struct iio_dev *indio_dev,
-+ int irq)
-+{
-+ struct regmap *regs = ((struct zpa2326_private *)
-+ iio_priv(indio_dev))->regmap;
-+ const struct zpa2326_frequency *freq = zpa2326_highest_frequency();
-+ int err;
-+
-+ /* Setup highest available Output Data Rate for one shot mode. */
-+ err = regmap_write(regs, ZPA2326_CTRL_REG3_REG, freq->odr);
-+ if (err)
-+ return err;
-+
-+ if (irq > 0) {
-+ /* Request interrupt when new sample is available. */
-+ err = regmap_write(regs, ZPA2326_CTRL_REG1_REG,
-+ (u8)~ZPA2326_CTRL_REG1_MASK_DATA_READY);
-+
-+ if (err) {
-+ dev_err(indio_dev->dev.parent,
-+ "failed to setup one shot mode (%d)", err);
-+ return err;
-+ }
-+ }
-+
-+ zpa2326_dbg(indio_dev, "one shot mode setup @%dHz", freq->hz);
-+
-+ return 0;
-+}
-+
-+/**
-+ * zpa2326_clear_fifo() - Clear remaining entries in hardware FIFO.
-+ * @indio_dev: The IIO device associated with the sampling hardware.
-+ * @min_count: Number of samples present within hardware FIFO.
-+ *
-+ * @min_count argument is a hint corresponding to the known minimum number of
-+ * samples currently living in the FIFO. This allows to reduce the number of bus
-+ * accesses by skipping status register read operation as long as we know for
-+ * sure there are still entries left.
-+ *
-+ * Return: Zero when successful, a negative error code otherwise.
-+ */
-+static int zpa2326_clear_fifo(const struct iio_dev *indio_dev,
-+ unsigned int min_count)
-+{
-+ struct regmap *regs = ((struct zpa2326_private *)
-+ iio_priv(indio_dev))->regmap;
-+ int err;
-+ unsigned int val;
-+
-+ if (!min_count) {
-+ /*
-+ * No hint: read status register to determine whether FIFO is
-+ * empty or not.
-+ */
-+ err = regmap_read(regs, ZPA2326_STATUS_REG, &val);
-+
-+ if (err < 0)
-+ goto err;
-+
-+ if (val & ZPA2326_STATUS_FIFO_E)
-+ /* Fifo is empty: nothing to trash. */
-+ return 0;
-+ }
-+
-+ /* Clear FIFO. */
-+ do {
-+ /*
-+ * A single fetch from pressure MSB register is enough to pop
-+ * values out of FIFO.
-+ */
-+ err = regmap_read(regs, ZPA2326_PRESS_OUT_H_REG, &val);
-+ if (err < 0)
-+ goto err;
-+
-+ if (min_count) {
-+ /*
-+ * We know for sure there are at least min_count entries
-+ * left in FIFO. Skip status register read.
-+ */
-+ min_count--;
-+ continue;
-+ }
-+
-+ err = regmap_read(regs, ZPA2326_STATUS_REG, &val);
-+ if (err < 0)
-+ goto err;
-+
-+ } while (!(val & ZPA2326_STATUS_FIFO_E));
-+
-+ zpa2326_dbg(indio_dev, "FIFO cleared");
-+
-+ return 0;
-+
-+err:
-+ zpa2326_err(indio_dev, "failed to clear FIFO (%d)", err);
-+
-+ return err;
-+}
-+
-+/**
-+ * zpa2326_dequeue_pressure() - Retrieve the most recent pressure sample from
-+ * hardware FIFO.
-+ * @indio_dev: The IIO device associated with the sampling hardware.
-+ * @pressure: Sampled pressure output.
-+ *
-+ * Note that ZPA2326 hardware FIFO stores pressure samples only.
-+ *
-+ * Return: Zero when successful, a negative error code otherwise.
-+ */
-+static int zpa2326_dequeue_pressure(const struct iio_dev *indio_dev,
-+ u32 *pressure)
-+{
-+ struct regmap *regs = ((struct zpa2326_private *)
-+ iio_priv(indio_dev))->regmap;
-+ unsigned int val;
-+ int err;
-+ int cleared = -1;
-+
-+ err = regmap_read(regs, ZPA2326_STATUS_REG, &val);
-+ if (err < 0)
-+ return err;
-+
-+ *pressure = 0;
-+
-+ if (val & ZPA2326_STATUS_P_OR) {
-+ /*
-+ * Fifo overrun : first sample dequeued from FIFO is the
-+ * newest.
-+ */
-+ zpa2326_warn(indio_dev, "FIFO overflow");
-+
-+ err = regmap_bulk_read(regs, ZPA2326_PRESS_OUT_XL_REG, pressure,
-+ 3);
-+ if (err)
-+ return err;
-+
-+#define ZPA2326_FIFO_DEPTH (16U)
-+ /* Hardware FIFO may hold no more than 16 pressure samples. */
-+ return zpa2326_clear_fifo(indio_dev, ZPA2326_FIFO_DEPTH - 1);
-+ }
-+
-+ /*
-+ * Fifo has not overflown : retrieve newest sample. We need to pop
-+ * values out until FIFO is empty : last fetched pressure is the newest.
-+ * In nominal cases, we should find a single queued sample only.
-+ */
-+ do {
-+ err = regmap_bulk_read(regs, ZPA2326_PRESS_OUT_XL_REG, pressure,
-+ 3);
-+ if (err)
-+ return err;
-+
-+ err = regmap_read(regs, ZPA2326_STATUS_REG, &val);
-+ if (err < 0)
-+ return err;
-+
-+ cleared++;
-+ } while (!(val & ZPA2326_STATUS_FIFO_E));
-+
-+ if (cleared)
-+ /*
-+ * Samples were pushed by hardware during previous rounds but we
-+ * didn't consume them fast enough: inform user.
-+ */
-+ zpa2326_dbg(indio_dev, "cleared %d FIFO entries", cleared);
-+
-+ return 0;
-+}
-+
-+/**
-+ * zpa2326_fill_sample_buffer() - Enqueue new channel samples to IIO buffer.
-+ * @indio_dev: The IIO device associated with the sampling hardware.
-+ * @private: Internal private state related to @indio_dev.
-+ *
-+ * Return: Zero when successful, a negative error code otherwise.
-+ */
-+static int zpa2326_fill_sample_buffer(struct iio_dev *indio_dev,
-+ const struct zpa2326_private *private)
-+{
-+ struct {
-+ u32 pressure;
-+ u16 temperature;
-+ u64 timestamp;
-+ } sample;
-+ int err;
-+
-+ if (test_bit(0, indio_dev->active_scan_mask)) {
-+ /* Get current pressure from hardware FIFO. */
-+ err = zpa2326_dequeue_pressure(indio_dev, &sample.pressure);
-+ if (err) {
-+ zpa2326_warn(indio_dev, "failed to fetch pressure (%d)",
-+ err);
-+ return err;
-+ }
-+ }
-+
-+ if (test_bit(1, indio_dev->active_scan_mask)) {
-+ /* Get current temperature. */
-+ err = regmap_bulk_read(private->regmap, ZPA2326_TEMP_OUT_L_REG,
-+ &sample.temperature, 2);
-+ if (err) {
-+ zpa2326_warn(indio_dev,
-+ "failed to fetch temperature (%d)", err);
-+ return err;
-+ }
-+ }
-+
-+ /*
-+ * Now push samples using timestamp stored either :
-+ * - by hardware interrupt handler if interrupt is available: see
-+ * zpa2326_handle_irq(),
-+ * - or oneshot completion polling machinery : see
-+ * zpa2326_trigger_handler().
-+ */
-+ zpa2326_dbg(indio_dev, "filling raw samples buffer");
-+
-+ iio_push_to_buffers_with_timestamp(indio_dev, &sample,
-+ private->timestamp);
-+
-+ return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int zpa2326_runtime_suspend(struct device *parent)
-+{
-+ const struct iio_dev *indio_dev = dev_get_drvdata(parent);
-+
-+ if (pm_runtime_autosuspend_expiration(parent))
-+ /* Userspace changed autosuspend delay. */
-+ return -EAGAIN;
-+
-+ zpa2326_power_off(indio_dev, iio_priv(indio_dev));
-+
-+ return 0;
-+}
-+
-+static int zpa2326_runtime_resume(struct device *parent)
-+{
-+ const struct iio_dev *indio_dev = dev_get_drvdata(parent);
-+
-+ return zpa2326_power_on(indio_dev, iio_priv(indio_dev));
-+}
-+
-+const struct dev_pm_ops zpa2326_pm_ops = {
-+ SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
-+ pm_runtime_force_resume)
-+ SET_RUNTIME_PM_OPS(zpa2326_runtime_suspend, zpa2326_runtime_resume,
-+ NULL)
-+};
-+EXPORT_SYMBOL_GPL(zpa2326_pm_ops);
-+
-+/**
-+ * zpa2326_resume() - Request the PM layer to power supply the device.
-+ * @indio_dev: The IIO device associated with the sampling hardware.
-+ *
-+ * Return:
-+ * < 0 - a negative error code meaning failure ;
-+ * 0 - success, device has just been powered up ;
-+ * 1 - success, device was already powered.
-+ */
-+static int zpa2326_resume(const struct iio_dev *indio_dev)
-+{
-+ int err;
-+
-+ err = pm_runtime_get_sync(indio_dev->dev.parent);
-+ if (err < 0)
-+ return err;
-+
-+ if (err > 0) {
-+ /*
-+ * Device was already power supplied: get it out of low power
-+ * mode and inform caller.
-+ */
-+ zpa2326_enable_device(indio_dev);
-+ return 1;
-+ }
-+
-+ /* Inform caller device has just been brought back to life. */
-+ return 0;
-+}
-+
-+/**
-+ * zpa2326_suspend() - Schedule a power down using autosuspend feature of PM
-+ * layer.
-+ * @indio_dev: The IIO device associated with the sampling hardware.
-+ *
-+ * Device is switched to low power mode at first to save power even when
-+ * attached regulator is a "dummy" one.
-+ */
-+static void zpa2326_suspend(struct iio_dev *indio_dev)
-+{
-+ struct device *parent = indio_dev->dev.parent;
-+
-+ zpa2326_sleep(indio_dev);
-+
-+ pm_runtime_mark_last_busy(parent);
-+ pm_runtime_put_autosuspend(parent);
-+}
-+
-+static void zpa2326_init_runtime(struct device *parent)
-+{
-+ pm_runtime_get_noresume(parent);
-+ pm_runtime_set_active(parent);
-+ pm_runtime_enable(parent);
-+ pm_runtime_set_autosuspend_delay(parent, 1000);
-+ pm_runtime_use_autosuspend(parent);
-+ pm_runtime_mark_last_busy(parent);
-+ pm_runtime_put_autosuspend(parent);
-+}
-+
-+static void zpa2326_fini_runtime(struct device *parent)
-+{
-+ pm_runtime_disable(parent);
-+ pm_runtime_set_suspended(parent);
-+}
-+#else /* !CONFIG_PM */
-+static int zpa2326_resume(const struct iio_dev *indio_dev)
-+{
-+ zpa2326_enable_device(indio_dev);
-+
-+ return 0;
-+}
-+
-+static void zpa2326_suspend(struct iio_dev *indio_dev)
-+{
-+ zpa2326_sleep(indio_dev);
-+}
-+
-+#define zpa2326_init_runtime(_parent)
-+#define zpa2326_fini_runtime(_parent)
-+#endif /* !CONFIG_PM */
-+
-+/**
-+ * zpa2326_handle_irq() - Process hardware interrupts.
-+ * @irq: Interrupt line the hardware uses to notify new data has arrived.
-+ * @data: The IIO device associated with the sampling hardware.
-+ *
-+ * Timestamp buffered samples as soon as possible then schedule threaded bottom
-+ * half.
-+ *
-+ * Return: Always successful.
-+ */
-+static irqreturn_t zpa2326_handle_irq(int irq, void *data)
-+{
-+ struct iio_dev *indio_dev = (struct iio_dev *)data;
-+
-+ if (iio_buffer_enabled(indio_dev)) {
-+ /* Timestamping needed for buffered sampling only. */
-+ ((struct zpa2326_private *)
-+ iio_priv(indio_dev))->timestamp = iio_get_time_ns(indio_dev);
-+ }
-+
-+ return IRQ_WAKE_THREAD;
-+}
-+
-+/**
-+ * zpa2326_handle_threaded_irq() - Interrupt bottom-half handler.
-+ * @irq: Interrupt line the hardware uses to notify new data has arrived.
-+ * @data: The IIO device associated with the sampling hardware.
-+ *
-+ * Mainly ensures interrupt is caused by a real "new sample available"
-+ * condition. This relies upon the ability to perform blocking / sleeping bus
-+ * accesses to slave's registers. This is why zpa2326_handle_threaded_irq() is
-+ * called from within a thread, i.e. not called from hard interrupt context.
-+ *
-+ * When device is using its own internal hardware trigger in continuous sampling
-+ * mode, data are available into hardware FIFO once interrupt has occurred. All
-+ * we have to do is to dispatch the trigger, which in turn will fetch data and
-+ * fill IIO buffer.
-+ *
-+ * When not using its own internal hardware trigger, the device has been
-+ * configured in one-shot mode either by an external trigger or the IIO read_raw
-+ * hook. This means one of the latter is currently waiting for sampling
-+ * completion, in which case we must simply wake it up.
-+ *
-+ * See zpa2326_trigger_handler().
-+ *
-+ * Return:
-+ * %IRQ_NONE - no consistent interrupt happened ;
-+ * %IRQ_HANDLED - there was new samples available.
-+ */
-+static irqreturn_t zpa2326_handle_threaded_irq(int irq, void *data)
-+{
-+ struct iio_dev *indio_dev = (struct iio_dev *)data;
-+ struct zpa2326_private *priv = iio_priv(indio_dev);
-+ unsigned int val;
-+ bool cont;
-+ irqreturn_t ret = IRQ_NONE;
-+
-+ /*
-+ * Are we using our own internal trigger in triggered buffer mode, i.e.,
-+ * currently working in continuous sampling mode ?
-+ */
-+ cont = (iio_buffer_enabled(indio_dev) &&
-+ iio_trigger_using_own(indio_dev));
-+
-+ /*
-+ * Device works according to a level interrupt scheme: reading interrupt
-+ * status de-asserts interrupt line.
-+ */
-+ priv->result = regmap_read(priv->regmap, ZPA2326_INT_SOURCE_REG, &val);
-+ if (priv->result < 0) {
-+ if (cont)
-+ return IRQ_NONE;
-+
-+ goto complete;
-+ }
-+
-+ /* Data ready is the only interrupt source we requested. */
-+ if (!(val & ZPA2326_INT_SOURCE_DATA_READY)) {
-+ /*
-+ * Interrupt happened but no new sample available: likely caused
-+ * by spurious interrupts, in which case, returning IRQ_NONE
-+ * allows to benefit from the generic spurious interrupts
-+ * handling.
-+ */
-+ zpa2326_warn(indio_dev, "unexpected interrupt status %02x",
-+ val);
-+
-+ if (cont)
-+ return IRQ_NONE;
-+
-+ priv->result = -ENODATA;
-+ goto complete;
-+ }
-+
-+ /* New sample available: dispatch internal trigger consumers. */
-+ iio_trigger_poll_chained(priv->trigger);
-+
-+ if (cont)
-+ /*
-+ * Internal hardware trigger has been scheduled above : it will
-+ * fetch data on its own.
-+ */
-+ return IRQ_HANDLED;
-+
-+ ret = IRQ_HANDLED;
-+
-+complete:
-+ /*
-+ * Wake up direct or externaly triggered buffer mode waiters: see
-+ * zpa2326_sample_oneshot() and zpa2326_trigger_handler().
-+ */
-+ complete(&priv->data_ready);
-+
-+ return ret;
-+}
-+
-+/**
-+ * zpa2326_wait_oneshot_completion() - Wait for oneshot data ready interrupt.
-+ * @indio_dev: The IIO device associated with the sampling hardware.
-+ * @private: Internal private state related to @indio_dev.
-+ *
-+ * Return: Zero when successful, a negative error code otherwise.
-+ */
-+static int zpa2326_wait_oneshot_completion(const struct iio_dev *indio_dev,
-+ struct zpa2326_private *private)
-+{
-+ int ret;
-+ unsigned int val;
-+
-+ zpa2326_dbg(indio_dev, "waiting for one shot completion interrupt");
-+
-+ ret = wait_for_completion_interruptible_timeout(
-+ &private->data_ready, ZPA2326_CONVERSION_JIFFIES);
-+ if (ret > 0)
-+ /*
-+ * Interrupt handler completed before timeout: return operation
-+ * status.
-+ */
-+ return private->result;
-+
-+ /* Clear all interrupts just to be sure. */
-+ regmap_read(private->regmap, ZPA2326_INT_SOURCE_REG, &val);
-+
-+ if (!ret)
-+ /* Timed out. */
-+ ret = -ETIME;
-+
-+ if (ret != -ERESTARTSYS)
-+ zpa2326_warn(indio_dev, "no one shot interrupt occurred (%d)",
-+ ret);
-+
-+ return ret;
-+}
-+
-+static int zpa2326_init_managed_irq(struct device *parent,
-+ struct iio_dev *indio_dev,
-+ struct zpa2326_private *private,
-+ int irq)
-+{
-+ int err;
-+
-+ private->irq = irq;
-+
-+ if (irq <= 0) {
-+ /*
-+ * Platform declared no interrupt line: device will be polled
-+ * for data availability.
-+ */
-+ dev_info(parent, "no interrupt found, running in polling mode");
-+ return 0;
-+ }
-+
-+ init_completion(&private->data_ready);
-+
-+ /* Request handler to be scheduled into threaded interrupt context. */
-+ err = devm_request_threaded_irq(parent, irq, zpa2326_handle_irq,
-+ zpa2326_handle_threaded_irq,
-+ IRQF_TRIGGER_RISING | IRQF_ONESHOT,
-+ dev_name(parent), indio_dev);
-+ if (err) {
-+ dev_err(parent, "failed to request interrupt %d (%d)", irq,
-+ err);
-+ return err;
-+ }
-+
-+ dev_info(parent, "using interrupt %d", irq);
-+
-+ return 0;
-+}
-+
-+/**
-+ * zpa2326_poll_oneshot_completion() - Actively poll for one shot data ready.
-+ * @indio_dev: The IIO device associated with the sampling hardware.
-+ *
-+ * Loop over registers content to detect end of sampling cycle. Used when DT
-+ * declared no valid interrupt lines.
-+ *
-+ * Return: Zero when successful, a negative error code otherwise.
-+ */
-+static int zpa2326_poll_oneshot_completion(const struct iio_dev *indio_dev)
-+{
-+ unsigned long tmout = jiffies + ZPA2326_CONVERSION_JIFFIES;
-+ struct regmap *regs = ((struct zpa2326_private *)
-+ iio_priv(indio_dev))->regmap;
-+ unsigned int val;
-+ int err;
-+
-+ zpa2326_dbg(indio_dev, "polling for one shot completion");
-+
-+ /*
-+ * At least, 100 ms is needed for the device to complete its one-shot
-+ * cycle.
-+ */
-+ if (msleep_interruptible(100))
-+ return -ERESTARTSYS;
-+
-+ /* Poll for conversion completion in hardware. */
-+ while (true) {
-+ err = regmap_read(regs, ZPA2326_CTRL_REG0_REG, &val);
-+ if (err < 0)
-+ goto err;
-+
-+ if (!(val & ZPA2326_CTRL_REG0_ONE_SHOT))
-+ /* One-shot bit self clears at conversion end. */
-+ break;
-+
-+ if (time_after(jiffies, tmout)) {
-+ /* Prevent from waiting forever : let's time out. */
-+ err = -ETIME;
-+ goto err;
-+ }
-+
-+ usleep_range(10000, 20000);
-+ }
-+
-+ /*
-+ * In oneshot mode, pressure sample availability guarantees that
-+ * temperature conversion has also completed : just check pressure
-+ * status bit to keep things simple.
-+ */
-+ err = regmap_read(regs, ZPA2326_STATUS_REG, &val);
-+ if (err < 0)
-+ goto err;
-+
-+ if (!(val & ZPA2326_STATUS_P_DA)) {
-+ /* No sample available. */
-+ err = -ENODATA;
-+ goto err;
-+ }
-+
-+ return 0;
-+
-+err:
-+ zpa2326_warn(indio_dev, "failed to poll one shot completion (%d)", err);
-+
-+ return err;
-+}
-+
-+/**
-+ * zpa2326_fetch_raw_sample() - Retrieve a raw sample and convert it to CPU
-+ * endianness.
-+ * @indio_dev: The IIO device associated with the sampling hardware.
-+ * @type: Type of measurement / channel to fetch from.
-+ * @value: Sample output.
-+ *
-+ * Return: Zero when successful, a negative error code otherwise.
-+ */
-+static int zpa2326_fetch_raw_sample(const struct iio_dev *indio_dev,
-+ enum iio_chan_type type,
-+ int *value)
-+{
-+ struct regmap *regs = ((struct zpa2326_private *)
-+ iio_priv(indio_dev))->regmap;
-+ int err;
-+
-+ switch (type) {
-+ case IIO_PRESSURE:
-+ zpa2326_dbg(indio_dev, "fetching raw pressure sample");
-+
-+ err = regmap_bulk_read(regs, ZPA2326_PRESS_OUT_XL_REG, value,
-+ 3);
-+ if (err) {
-+ zpa2326_warn(indio_dev, "failed to fetch pressure (%d)",
-+ err);
-+ return err;
-+ }
-+
-+ /* Pressure is a 24 bits wide little-endian unsigned int. */
-+ *value = (((u8 *)value)[2] << 16) | (((u8 *)value)[1] << 8) |
-+ ((u8 *)value)[0];
-+
-+ return IIO_VAL_INT;
-+
-+ case IIO_TEMP:
-+ zpa2326_dbg(indio_dev, "fetching raw temperature sample");
-+
-+ err = regmap_bulk_read(regs, ZPA2326_TEMP_OUT_L_REG, value, 2);
-+ if (err) {
-+ zpa2326_warn(indio_dev,
-+ "failed to fetch temperature (%d)", err);
-+ return err;
-+ }
-+
-+ /* Temperature is a 16 bits wide little-endian signed int. */
-+ *value = (int)le16_to_cpup((__le16 *)value);
-+
-+ return IIO_VAL_INT;
-+
-+ default:
-+ return -EINVAL;
-+ }
-+}
-+
-+/**
-+ * zpa2326_sample_oneshot() - Perform a complete one shot sampling cycle.
-+ * @indio_dev: The IIO device associated with the sampling hardware.
-+ * @type: Type of measurement / channel to fetch from.
-+ * @value: Sample output.
-+ *
-+ * Return: Zero when successful, a negative error code otherwise.
-+ */
-+static int zpa2326_sample_oneshot(struct iio_dev *indio_dev,
-+ enum iio_chan_type type,
-+ int *value)
-+{
-+ int ret;
-+ struct zpa2326_private *priv;
-+
-+ ret = iio_device_claim_direct_mode(indio_dev);
-+ if (ret)
-+ return ret;
-+
-+ ret = zpa2326_resume(indio_dev);
-+ if (ret < 0)
-+ goto release;
-+
-+ priv = iio_priv(indio_dev);
-+
-+ if (ret > 0) {
-+ /*
-+ * We were already power supplied. Just clear hardware FIFO to
-+ * get rid of samples acquired during previous rounds (if any).
-+ * Sampling operation always generates both temperature and
-+ * pressure samples. The latter are always enqueued into
-+ * hardware FIFO. This may lead to situations were pressure
-+ * samples still sit into FIFO when previous cycle(s) fetched
-+ * temperature data only.
-+ * Hence, we need to clear hardware FIFO content to prevent from
-+ * getting outdated values at the end of current cycle.
-+ */
-+ if (type == IIO_PRESSURE) {
-+ ret = zpa2326_clear_fifo(indio_dev, 0);
-+ if (ret)
-+ goto suspend;
-+ }
-+ } else {
-+ /*
-+ * We have just been power supplied, i.e. device is in default
-+ * "out of reset" state, meaning we need to reconfigure it
-+ * entirely.
-+ */
-+ ret = zpa2326_config_oneshot(indio_dev, priv->irq);
-+ if (ret)
-+ goto suspend;
-+ }
-+
-+ /* Start a sampling cycle in oneshot mode. */
-+ ret = zpa2326_start_oneshot(indio_dev);
-+ if (ret)
-+ goto suspend;
-+
-+ /* Wait for sampling cycle to complete. */
-+ if (priv->irq > 0)
-+ ret = zpa2326_wait_oneshot_completion(indio_dev, priv);
-+ else
-+ ret = zpa2326_poll_oneshot_completion(indio_dev);
-+
-+ if (ret)
-+ goto suspend;
-+
-+ /* Retrieve raw sample value and convert it to CPU endianness. */
-+ ret = zpa2326_fetch_raw_sample(indio_dev, type, value);
-+
-+suspend:
-+ zpa2326_suspend(indio_dev);
-+release:
-+ iio_device_release_direct_mode(indio_dev);
-+
-+ return ret;
-+}
-+
-+/**
-+ * zpa2326_trigger_handler() - Perform an IIO buffered sampling round in one
-+ * shot mode.
-+ * @irq: The software interrupt assigned to @data
-+ * @data: The IIO poll function dispatched by external trigger our device is
-+ * attached to.
-+ *
-+ * Bottom-half handler called by the IIO trigger to which our device is
-+ * currently attached. Allows us to synchronize this device buffered sampling
-+ * either with external events (such as timer expiration, external device sample
-+ * ready, etc...) or with its own interrupt (internal hardware trigger).
-+ *
-+ * When using an external trigger, basically run the same sequence of operations
-+ * as for zpa2326_sample_oneshot() with the following hereafter. Hardware FIFO
-+ * is not cleared since already done at buffering enable time and samples
-+ * dequeueing always retrieves the most recent value.
-+ *
-+ * Otherwise, when internal hardware trigger has dispatched us, just fetch data
-+ * from hardware FIFO.
-+ *
-+ * Fetched data will pushed unprocessed to IIO buffer since samples conversion
-+ * is delegated to userspace in buffered mode (endianness, etc...).
-+ *
-+ * Return:
-+ * %IRQ_NONE - no consistent interrupt happened ;
-+ * %IRQ_HANDLED - there was new samples available.
-+ */
-+static irqreturn_t zpa2326_trigger_handler(int irq, void *data)
-+{
-+ struct iio_dev *indio_dev = ((struct iio_poll_func *)
-+ data)->indio_dev;
-+ struct zpa2326_private *priv = iio_priv(indio_dev);
-+ bool cont;
-+
-+ /*
-+ * We have been dispatched, meaning we are in triggered buffer mode.
-+ * Using our own internal trigger implies we are currently in continuous
-+ * hardware sampling mode.
-+ */
-+ cont = iio_trigger_using_own(indio_dev);
-+
-+ if (!cont) {
-+ /* On demand sampling : start a one shot cycle. */
-+ if (zpa2326_start_oneshot(indio_dev))
-+ goto out;
-+
-+ /* Wait for sampling cycle to complete. */
-+ if (priv->irq <= 0) {
-+ /* No interrupt available: poll for completion. */
-+ if (zpa2326_poll_oneshot_completion(indio_dev))
-+ goto out;
-+
-+ /* Only timestamp sample once it is ready. */
-+ priv->timestamp = iio_get_time_ns(indio_dev);
-+ } else {
-+ /* Interrupt handlers will timestamp for us. */
-+ if (zpa2326_wait_oneshot_completion(indio_dev, priv))
-+ goto out;
-+ }
-+ }
-+
-+ /* Enqueue to IIO buffer / userspace. */
-+ zpa2326_fill_sample_buffer(indio_dev, priv);
-+
-+out:
-+ if (!cont)
-+ /* Don't switch to low power if sampling continuously. */
-+ zpa2326_sleep(indio_dev);
-+
-+ /* Inform attached trigger we are done. */
-+ iio_trigger_notify_done(indio_dev->trig);
-+
-+ return IRQ_HANDLED;
-+}
-+
-+/**
-+ * zpa2326_preenable_buffer() - Prepare device for configuring triggered
-+ * sampling
-+ * modes.
-+ * @indio_dev: The IIO device associated with the sampling hardware.
-+ *
-+ * Basically power up device.
-+ * Called with IIO device's lock held.
-+ *
-+ * Return: Zero when successful, a negative error code otherwise.
-+ */
-+static int zpa2326_preenable_buffer(struct iio_dev *indio_dev)
-+{
-+ int ret = zpa2326_resume(indio_dev);
-+
-+ if (ret < 0)
-+ return ret;
-+
-+ /* Tell zpa2326_postenable_buffer() if we have just been powered on. */
-+ ((struct zpa2326_private *)
-+ iio_priv(indio_dev))->waken = iio_priv(indio_dev);
-+
-+ return 0;
-+}
-+
-+/**
-+ * zpa2326_postenable_buffer() - Configure device for triggered sampling.
-+ * @indio_dev: The IIO device associated with the sampling hardware.
-+ *
-+ * Basically setup one-shot mode if plugging external trigger.
-+ * Otherwise, let internal trigger configure continuous sampling :
-+ * see zpa2326_set_trigger_state().
-+ *
-+ * If an error is returned, IIO layer will call our postdisable hook for us,
-+ * i.e. no need to explicitly power device off here.
-+ * Called with IIO device's lock held.
-+ *
-+ * Called with IIO device's lock held.
-+ *
-+ * Return: Zero when successful, a negative error code otherwise.
-+ */
-+static int zpa2326_postenable_buffer(struct iio_dev *indio_dev)
-+{
-+ const struct zpa2326_private *priv = iio_priv(indio_dev);
-+ int err;
-+
-+ if (!priv->waken) {
-+ /*
-+ * We were already power supplied. Just clear hardware FIFO to
-+ * get rid of samples acquired during previous rounds (if any).
-+ */
-+ err = zpa2326_clear_fifo(indio_dev, 0);
-+ if (err)
-+ goto err;
-+ }
-+
-+ if (!iio_trigger_using_own(indio_dev) && priv->waken) {
-+ /*
-+ * We are using an external trigger and we have just been
-+ * powered up: reconfigure one-shot mode.
-+ */
-+ err = zpa2326_config_oneshot(indio_dev, priv->irq);
-+ if (err)
-+ goto err;
-+ }
-+
-+ /* Plug our own trigger event handler. */
-+ err = iio_triggered_buffer_postenable(indio_dev);
-+ if (err)
-+ goto err;
-+
-+ return 0;
-+
-+err:
-+ zpa2326_err(indio_dev, "failed to enable buffering (%d)", err);
-+
-+ return err;
-+}
-+
-+static int zpa2326_postdisable_buffer(struct iio_dev *indio_dev)
-+{
-+ zpa2326_suspend(indio_dev);
-+
-+ return 0;
-+}
-+
-+static const struct iio_buffer_setup_ops zpa2326_buffer_setup_ops = {
-+ .preenable = zpa2326_preenable_buffer,
-+ .postenable = zpa2326_postenable_buffer,
-+ .predisable = iio_triggered_buffer_predisable,
-+ .postdisable = zpa2326_postdisable_buffer
-+};
-+
-+/**
-+ * zpa2326_set_trigger_state() - Start / stop continuous sampling.
-+ * @trig: The trigger being attached to IIO device associated with the sampling
-+ * hardware.
-+ * @state: Tell whether to start (true) or stop (false)
-+ *
-+ * Basically enable / disable hardware continuous sampling mode.
-+ *
-+ * Called with IIO device's lock held at postenable() or predisable() time.
-+ *
-+ * Return: Zero when successful, a negative error code otherwise.
-+ */
-+static int zpa2326_set_trigger_state(struct iio_trigger *trig, bool state)
-+{
-+ const struct iio_dev *indio_dev = dev_get_drvdata(
-+ trig->dev.parent);
-+ const struct zpa2326_private *priv = iio_priv(indio_dev);
-+ int err;
-+
-+ if (!state) {
-+ /*
-+ * Switch trigger off : in case of failure, interrupt is left
-+ * disabled in order to prevent handler from accessing released
-+ * resources.
-+ */
-+ unsigned int val;
-+
-+ /*
-+ * As device is working in continuous mode, handlers may be
-+ * accessing resources we are currently freeing...
-+ * Prevent this by disabling interrupt handlers and ensure
-+ * the device will generate no more interrupts unless explicitly
-+ * required to, i.e. by restoring back to default one shot mode.
-+ */
-+ disable_irq(priv->irq);
-+
-+ /*
-+ * Disable continuous sampling mode to restore settings for
-+ * one shot / direct sampling operations.
-+ */
-+ err = regmap_write(priv->regmap, ZPA2326_CTRL_REG3_REG,
-+ zpa2326_highest_frequency()->odr);
-+ if (err)
-+ return err;
-+
-+ /*
-+ * Now that device won't generate interrupts on its own,
-+ * acknowledge any currently active interrupts (may happen on
-+ * rare occasions while stopping continuous mode).
-+ */
-+ err = regmap_read(priv->regmap, ZPA2326_INT_SOURCE_REG, &val);
-+ if (err < 0)
-+ return err;
-+
-+ /*
-+ * Re-enable interrupts only if we can guarantee the device will
-+ * generate no more interrupts to prevent handlers from
-+ * accessing released resources.
-+ */
-+ enable_irq(priv->irq);
-+
-+ zpa2326_dbg(indio_dev, "continuous mode stopped");
-+ } else {
-+ /*
-+ * Switch trigger on : start continuous sampling at required
-+ * frequency.
-+ */
-+
-+ if (priv->waken) {
-+ /* Enable interrupt if getting out of reset. */
-+ err = regmap_write(priv->regmap, ZPA2326_CTRL_REG1_REG,
-+ (u8)
-+ ~ZPA2326_CTRL_REG1_MASK_DATA_READY);
-+ if (err)
-+ return err;
-+ }
-+
-+ /* Enable continuous sampling at specified frequency. */
-+ err = regmap_write(priv->regmap, ZPA2326_CTRL_REG3_REG,
-+ ZPA2326_CTRL_REG3_ENABLE_MEAS |
-+ priv->frequency->odr);
-+ if (err)
-+ return err;
-+
-+ zpa2326_dbg(indio_dev, "continuous mode setup @%dHz",
-+ priv->frequency->hz);
-+ }
-+
-+ return 0;
-+}
-+
-+static const struct iio_trigger_ops zpa2326_trigger_ops = {
-+ .owner = THIS_MODULE,
-+ .set_trigger_state = zpa2326_set_trigger_state,
-+};
-+
-+/**
-+ * zpa2326_init_trigger() - Create an interrupt driven / hardware trigger
-+ * allowing to notify external devices a new sample is
-+ * ready.
-+ * @parent: Hardware sampling device @indio_dev is a child of.
-+ * @indio_dev: The IIO device associated with the sampling hardware.
-+ * @private: Internal private state related to @indio_dev.
-+ * @irq: Optional interrupt line the hardware uses to notify new data
-+ * samples are ready. Negative or zero values indicate no interrupts
-+ * are available, meaning polling is required.
-+ *
-+ * Only relevant when DT declares a valid interrupt line.
-+ *
-+ * Return: Zero when successful, a negative error code otherwise.
-+ */
-+static int zpa2326_init_managed_trigger(struct device *parent,
-+ struct iio_dev *indio_dev,
-+ struct zpa2326_private *private,
-+ int irq)
-+{
-+ struct iio_trigger *trigger;
-+ int ret;
-+
-+ if (irq <= 0)
-+ return 0;
-+
-+ trigger = devm_iio_trigger_alloc(parent, "%s-dev%d",
-+ indio_dev->name, indio_dev->id);
-+ if (!trigger)
-+ return -ENOMEM;
-+
-+ /* Basic setup. */
-+ trigger->dev.parent = parent;
-+ trigger->ops = &zpa2326_trigger_ops;
-+
-+ private->trigger = trigger;
-+
-+ /* Register to triggers space. */
-+ ret = devm_iio_trigger_register(parent, trigger);
-+ if (ret)
-+ dev_err(parent, "failed to register hardware trigger (%d)",
-+ ret);
-+
-+ return ret;
-+}
-+
-+static int zpa2326_get_frequency(const struct iio_dev *indio_dev)
-+{
-+ return ((struct zpa2326_private *)iio_priv(indio_dev))->frequency->hz;
-+}
-+
-+static int zpa2326_set_frequency(struct iio_dev *indio_dev, int hz)
-+{
-+ struct zpa2326_private *priv = iio_priv(indio_dev);
-+ int freq;
-+ int err;
-+
-+ /* Check if requested frequency is supported. */
-+ for (freq = 0; freq < ARRAY_SIZE(zpa2326_sampling_frequencies); freq++)
-+ if (zpa2326_sampling_frequencies[freq].hz == hz)
-+ break;
-+ if (freq == ARRAY_SIZE(zpa2326_sampling_frequencies))
-+ return -EINVAL;
-+
-+ /* Don't allow changing frequency if buffered sampling is ongoing. */
-+ err = iio_device_claim_direct_mode(indio_dev);
-+ if (err)
-+ return err;
-+
-+ priv->frequency = &zpa2326_sampling_frequencies[freq];
-+
-+ iio_device_release_direct_mode(indio_dev);
-+
-+ return 0;
-+}
-+
-+/* Expose supported hardware sampling frequencies (Hz) through sysfs. */
-+static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("1 5 11 23");
-+
-+static struct attribute *zpa2326_attributes[] = {
-+ &iio_const_attr_sampling_frequency_available.dev_attr.attr,
-+ NULL
-+};
-+
-+static const struct attribute_group zpa2326_attribute_group = {
-+ .attrs = zpa2326_attributes,
-+};
-+
-+static int zpa2326_read_raw(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan,
-+ int *val,
-+ int *val2,
-+ long mask)
-+{
-+ switch (mask) {
-+ case IIO_CHAN_INFO_RAW:
-+ return zpa2326_sample_oneshot(indio_dev, chan->type, val);
-+
-+ case IIO_CHAN_INFO_SCALE:
-+ switch (chan->type) {
-+ case IIO_PRESSURE:
-+ /*
-+ * Pressure resolution is 1/64 Pascal. Scale to kPascal
-+ * as required by IIO ABI.
-+ */
-+ *val = 1;
-+ *val2 = 64000;
-+ return IIO_VAL_FRACTIONAL;
-+
-+ case IIO_TEMP:
-+ /*
-+ * Temperature follows the equation:
-+ * Temp[degC] = Tempcode * 0.00649 - 176.83
-+ * where:
-+ * Tempcode is composed the raw sampled 16 bits.
-+ *
-+ * Hence, to produce a temperature in milli-degrees
-+ * Celsius according to IIO ABI, we need to apply the
-+ * following equation to raw samples:
-+ * Temp[milli degC] = (Tempcode + Offset) * Scale
-+ * where:
-+ * Offset = -176.83 / 0.00649
-+ * Scale = 0.00649 * 1000
-+ */
-+ *val = 6;
-+ *val2 = 490000;
-+ return IIO_VAL_INT_PLUS_MICRO;
-+
-+ default:
-+ return -EINVAL;
-+ }
-+
-+ case IIO_CHAN_INFO_OFFSET:
-+ switch (chan->type) {
-+ case IIO_TEMP:
-+ *val = -17683000;
-+ *val2 = 649;
-+ return IIO_VAL_FRACTIONAL;
-+
-+ default:
-+ return -EINVAL;
-+ }
-+
-+ case IIO_CHAN_INFO_SAMP_FREQ:
-+ *val = zpa2326_get_frequency(indio_dev);
-+ return IIO_VAL_INT;
-+
-+ default:
-+ return -EINVAL;
-+ }
-+}
-+
-+static int zpa2326_write_raw(struct iio_dev *indio_dev,
-+ const struct iio_chan_spec *chan,
-+ int val,
-+ int val2,
-+ long mask)
-+{
-+ if ((mask != IIO_CHAN_INFO_SAMP_FREQ) || val2)
-+ return -EINVAL;
-+
-+ return zpa2326_set_frequency(indio_dev, val);
-+}
-+
-+static const struct iio_chan_spec zpa2326_channels[] = {
-+ [0] = {
-+ .type = IIO_PRESSURE,
-+ .scan_index = 0,
-+ .scan_type = {
-+ .sign = 'u',
-+ .realbits = 24,
-+ .storagebits = 32,
-+ .endianness = IIO_LE,
-+ },
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
-+ BIT(IIO_CHAN_INFO_SCALE),
-+ .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
-+ },
-+ [1] = {
-+ .type = IIO_TEMP,
-+ .scan_index = 1,
-+ .scan_type = {
-+ .sign = 's',
-+ .realbits = 16,
-+ .storagebits = 16,
-+ .endianness = IIO_LE,
-+ },
-+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
-+ BIT(IIO_CHAN_INFO_SCALE) |
-+ BIT(IIO_CHAN_INFO_OFFSET),
-+ .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),
-+ },
-+ [2] = IIO_CHAN_SOFT_TIMESTAMP(2),
-+};
-+
-+static const struct iio_info zpa2326_info = {
-+ .driver_module = THIS_MODULE,
-+ .attrs = &zpa2326_attribute_group,
-+ .read_raw = zpa2326_read_raw,
-+ .write_raw = zpa2326_write_raw,
-+};
-+
-+static struct iio_dev *zpa2326_create_managed_iiodev(struct device *device,
-+ const char *name,
-+ struct regmap *regmap)
-+{
-+ struct iio_dev *indio_dev;
-+
-+ /* Allocate space to hold IIO device internal state. */
-+ indio_dev = devm_iio_device_alloc(device,
-+ sizeof(struct zpa2326_private));
-+ if (!indio_dev)
-+ return NULL;
-+
-+ /* Setup for userspace synchronous on demand sampling. */
-+ indio_dev->modes = INDIO_DIRECT_MODE;
-+ indio_dev->dev.parent = device;
-+ indio_dev->channels = zpa2326_channels;
-+ indio_dev->num_channels = ARRAY_SIZE(zpa2326_channels);
-+ indio_dev->name = name;
-+ indio_dev->info = &zpa2326_info;
-+
-+ return indio_dev;
-+}
-+
-+int zpa2326_probe(struct device *parent,
-+ const char *name,
-+ int irq,
-+ unsigned int hwid,
-+ struct regmap *regmap)
-+{
-+ struct iio_dev *indio_dev;
-+ struct zpa2326_private *priv;
-+ int err;
-+ unsigned int id;
-+
-+ indio_dev = zpa2326_create_managed_iiodev(parent, name, regmap);
-+ if (!indio_dev)
-+ return -ENOMEM;
-+
-+ priv = iio_priv(indio_dev);
-+
-+ priv->vref = devm_regulator_get(parent, "vref");
-+ if (IS_ERR(priv->vref))
-+ return PTR_ERR(priv->vref);
-+
-+ priv->vdd = devm_regulator_get(parent, "vdd");
-+ if (IS_ERR(priv->vdd))
-+ return PTR_ERR(priv->vdd);
-+
-+ /* Set default hardware sampling frequency to highest rate supported. */
-+ priv->frequency = zpa2326_highest_frequency();
-+
-+ /*
-+ * Plug device's underlying bus abstraction : this MUST be set before
-+ * registering interrupt handlers since an interrupt might happen if
-+ * power up sequence is not properly applied.
-+ */
-+ priv->regmap = regmap;
-+
-+ err = devm_iio_triggered_buffer_setup(parent, indio_dev, NULL,
-+ zpa2326_trigger_handler,
-+ &zpa2326_buffer_setup_ops);
-+ if (err)
-+ return err;
-+
-+ err = zpa2326_init_managed_trigger(parent, indio_dev, priv, irq);
-+ if (err)
-+ return err;
-+
-+ err = zpa2326_init_managed_irq(parent, indio_dev, priv, irq);
-+ if (err)
-+ return err;
-+
-+ /* Power up to check device ID and perform initial hardware setup. */
-+ err = zpa2326_power_on(indio_dev, priv);
-+ if (err)
-+ return err;
-+
-+ /* Read id register to check we are talking to the right slave. */
-+ err = regmap_read(regmap, ZPA2326_DEVICE_ID_REG, &id);
-+ if (err)
-+ goto sleep;
-+
-+ if (id != hwid) {
-+ dev_err(parent, "found device with unexpected id %02x", id);
-+ err = -ENODEV;
-+ goto sleep;
-+ }
-+
-+ err = zpa2326_config_oneshot(indio_dev, irq);
-+ if (err)
-+ goto sleep;
-+
-+ /* Setup done : go sleeping. Device will be awaken upon user request. */
-+ err = zpa2326_sleep(indio_dev);
-+ if (err)
-+ goto poweroff;
-+
-+ dev_set_drvdata(parent, indio_dev);
-+
-+ zpa2326_init_runtime(parent);
-+
-+ err = iio_device_register(indio_dev);
-+ if (err) {
-+ zpa2326_fini_runtime(parent);
-+ goto poweroff;
-+ }
-+
-+ return 0;
-+
-+sleep:
-+ /* Put to sleep just in case power regulators are "dummy" ones. */
-+ zpa2326_sleep(indio_dev);
-+poweroff:
-+ zpa2326_power_off(indio_dev, priv);
-+
-+ return err;
-+}
-+EXPORT_SYMBOL_GPL(zpa2326_probe);
-+
-+void zpa2326_remove(const struct device *parent)
-+{
-+ struct iio_dev *indio_dev = dev_get_drvdata(parent);
-+
-+ iio_device_unregister(indio_dev);
-+ zpa2326_fini_runtime(indio_dev->dev.parent);
-+ zpa2326_sleep(indio_dev);
-+ zpa2326_power_off(indio_dev, iio_priv(indio_dev));
-+}
-+EXPORT_SYMBOL_GPL(zpa2326_remove);
-+
-+MODULE_AUTHOR("Gregor Boirie <gregor.boirie@parrot.com>");
-+MODULE_DESCRIPTION("Core driver for Murata ZPA2326 pressure sensor");
-+MODULE_LICENSE("GPL v2");
-diff --git a/drivers/iio/pressure/zpa2326.h b/drivers/iio/pressure/zpa2326.h
-new file mode 100644
-index 0000000..05d3e1e
---- /dev/null
-+++ b/drivers/iio/pressure/zpa2326.h
-@@ -0,0 +1,89 @@
-+/*
-+ * Murata ZPA2326 pressure and temperature sensor IIO driver
-+ *
-+ * Copyright (c) 2016 Parrot S.A.
-+ *
-+ * Author: Gregor Boirie <gregor.boirie@parrot.com>
-+ *
-+ * 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.
-+ *
-+ * 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.
-+ */
-+
-+#ifndef _ZPA2326_H
-+#define _ZPA2326_H
-+
-+/* Register map. */
-+#define ZPA2326_REF_P_XL_REG (0x8)
-+#define ZPA2326_REF_P_L_REG (0x9)
-+#define ZPA2326_REF_P_H_REG (0xa)
-+#define ZPA2326_DEVICE_ID_REG (0xf)
-+#define ZPA2326_DEVICE_ID (0xb9)
-+#define ZPA2326_RES_CONF_REG (0x10)
-+#define ZPA2326_CTRL_REG0_REG (0x20)
-+#define ZPA2326_CTRL_REG0_ONE_SHOT BIT(0)
-+#define ZPA2326_CTRL_REG0_ENABLE BIT(1)
-+#define ZPA2326_CTRL_REG1_REG (0x21)
-+#define ZPA2326_CTRL_REG1_MASK_DATA_READY BIT(2)
-+#define ZPA2326_CTRL_REG2_REG (0x22)
-+#define ZPA2326_CTRL_REG2_SWRESET BIT(2)
-+#define ZPA2326_CTRL_REG3_REG (0x23)
-+#define ZPA2326_CTRL_REG3_ODR_SHIFT (4)
-+#define ZPA2326_CTRL_REG3_ENABLE_MEAS BIT(7)
-+#define ZPA2326_INT_SOURCE_REG (0x24)
-+#define ZPA2326_INT_SOURCE_DATA_READY BIT(2)
-+#define ZPA2326_THS_P_LOW_REG (0x25)
-+#define ZPA2326_THS_P_HIGH_REG (0x26)
-+#define ZPA2326_STATUS_REG (0x27)
-+#define ZPA2326_STATUS_P_DA BIT(1)
-+#define ZPA2326_STATUS_FIFO_E BIT(2)
-+#define ZPA2326_STATUS_P_OR BIT(5)
-+#define ZPA2326_PRESS_OUT_XL_REG (0x28)
-+#define ZPA2326_PRESS_OUT_L_REG (0x29)
-+#define ZPA2326_PRESS_OUT_H_REG (0x2a)
-+#define ZPA2326_TEMP_OUT_L_REG (0x2b)
-+#define ZPA2326_TEMP_OUT_H_REG (0x2c)
-+
-+struct device;
-+struct regmap;
-+
-+bool zpa2326_isreg_writeable(struct device *dev, unsigned int reg);
-+bool zpa2326_isreg_readable(struct device *dev, unsigned int reg);
-+bool zpa2326_isreg_precious(struct device *dev, unsigned int reg);
-+
-+/**
-+ * zpa2326_probe() - Instantiate and register core ZPA2326 IIO device
-+ * @parent: Hardware sampling device the created IIO device will be a child of.
-+ * @name: Arbitrary name to identify the device.
-+ * @irq: Interrupt line, negative if none.
-+ * @hwid: Expected device hardware id.
-+ * @regmap: Registers map used to abstract underlying bus accesses.
-+ *
-+ * Return: Zero when successful, a negative error code otherwise.
-+ */
-+int zpa2326_probe(struct device *parent,
-+ const char *name,
-+ int irq,
-+ unsigned int hwid,
-+ struct regmap *regmap);
-+
-+/**
-+ * zpa2326_remove() - Unregister and destroy core ZPA2326 IIO device.
-+ * @parent: Hardware sampling device the IIO device to remove is a child of.
-+ */
-+void zpa2326_remove(const struct device *parent);
-+
-+#ifdef CONFIG_PM
-+#include <linux/pm.h>
-+extern const struct dev_pm_ops zpa2326_pm_ops;
-+#define ZPA2326_PM_OPS (&zpa2326_pm_ops)
-+#else
-+#define ZPA2326_PM_OPS (NULL)
-+#endif
-+
-+#endif
-diff --git a/drivers/iio/pressure/zpa2326_i2c.c b/drivers/iio/pressure/zpa2326_i2c.c
-new file mode 100644
-index 0000000..e4d27dd
---- /dev/null
-+++ b/drivers/iio/pressure/zpa2326_i2c.c
-@@ -0,0 +1,99 @@
-+/*
-+ * Murata ZPA2326 I2C pressure and temperature sensor driver
-+ *
-+ * Copyright (c) 2016 Parrot S.A.
-+ *
-+ * Author: Gregor Boirie <gregor.boirie@parrot.com>
-+ *
-+ * 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.
-+ *
-+ * 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 <linux/module.h>
-+#include <linux/regmap.h>
-+#include <linux/i2c.h>
-+#include <linux/of_device.h>
-+#include "zpa2326.h"
-+
-+/*
-+ * read_flag_mask:
-+ * - address bit 7 must be set to request a register read operation
-+ */
-+static const struct regmap_config zpa2326_regmap_i2c_config = {
-+ .reg_bits = 8,
-+ .val_bits = 8,
-+ .writeable_reg = zpa2326_isreg_writeable,
-+ .readable_reg = zpa2326_isreg_readable,
-+ .precious_reg = zpa2326_isreg_precious,
-+ .max_register = ZPA2326_TEMP_OUT_H_REG,
-+ .read_flag_mask = BIT(7),
-+ .cache_type = REGCACHE_NONE,
-+};
-+
-+static unsigned int zpa2326_i2c_hwid(const struct i2c_client *client)
-+{
-+#define ZPA2326_SA0(_addr) (_addr & BIT(0))
-+#define ZPA2326_DEVICE_ID_SA0_SHIFT (1)
-+
-+ /* Identification register bit 1 mirrors device address bit 0. */
-+ return (ZPA2326_DEVICE_ID |
-+ (ZPA2326_SA0(client->addr) << ZPA2326_DEVICE_ID_SA0_SHIFT));
-+}
-+
-+static int zpa2326_probe_i2c(struct i2c_client *client,
-+ const struct i2c_device_id *i2c_id)
-+{
-+ struct regmap *regmap;
-+
-+ regmap = devm_regmap_init_i2c(client, &zpa2326_regmap_i2c_config);
-+ if (IS_ERR(regmap)) {
-+ dev_err(&client->dev, "failed to init registers map");
-+ return PTR_ERR(regmap);
-+ }
-+
-+ return zpa2326_probe(&client->dev, i2c_id->name, client->irq,
-+ zpa2326_i2c_hwid(client), regmap);
-+}
-+
-+static int zpa2326_remove_i2c(struct i2c_client *client)
-+{
-+ zpa2326_remove(&client->dev);
-+
-+ return 0;
-+}
-+
-+static const struct i2c_device_id zpa2326_i2c_ids[] = {
-+ { "zpa2326", 0 },
-+ { },
-+};
-+MODULE_DEVICE_TABLE(i2c, zpa2326_i2c_ids);
-+
-+#if defined(CONFIG_OF)
-+static const struct of_device_id zpa2326_i2c_matches[] = {
-+ { .compatible = "murata,zpa2326" },
-+ { }
-+};
-+MODULE_DEVICE_TABLE(of, zpa2326_i2c_matches);
-+#endif
-+
-+static struct i2c_driver zpa2326_i2c_driver = {
-+ .driver = {
-+ .name = "zpa2326-i2c",
-+ .of_match_table = of_match_ptr(zpa2326_i2c_matches),
-+ .pm = ZPA2326_PM_OPS,
-+ },
-+ .probe = zpa2326_probe_i2c,
-+ .remove = zpa2326_remove_i2c,
-+ .id_table = zpa2326_i2c_ids,
-+};
-+module_i2c_driver(zpa2326_i2c_driver);
-+
-+MODULE_AUTHOR("Gregor Boirie <gregor.boirie@parrot.com>");
-+MODULE_DESCRIPTION("I2C driver for Murata ZPA2326 pressure sensor");
-+MODULE_LICENSE("GPL v2");
-diff --git a/drivers/iio/pressure/zpa2326_spi.c b/drivers/iio/pressure/zpa2326_spi.c
-new file mode 100644
-index 0000000..bd2c1c3
---- /dev/null
-+++ b/drivers/iio/pressure/zpa2326_spi.c
-@@ -0,0 +1,103 @@
-+/*
-+ * Murata ZPA2326 SPI pressure and temperature sensor driver
-+ *
-+ * Copyright (c) 2016 Parrot S.A.
-+ *
-+ * Author: Gregor Boirie <gregor.boirie@parrot.com>
-+ *
-+ * 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.
-+ *
-+ * 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 <linux/module.h>
-+#include <linux/regmap.h>
-+#include <linux/spi/spi.h>
-+#include <linux/of_device.h>
-+#include "zpa2326.h"
-+
-+/*
-+ * read_flag_mask:
-+ * - address bit 7 must be set to request a register read operation
-+ * - address bit 6 must be set to request register address auto increment
-+ */
-+static const struct regmap_config zpa2326_regmap_spi_config = {
-+ .reg_bits = 8,
-+ .val_bits = 8,
-+ .writeable_reg = zpa2326_isreg_writeable,
-+ .readable_reg = zpa2326_isreg_readable,
-+ .precious_reg = zpa2326_isreg_precious,
-+ .max_register = ZPA2326_TEMP_OUT_H_REG,
-+ .read_flag_mask = BIT(7) | BIT(6),
-+ .cache_type = REGCACHE_NONE,
-+};
-+
-+static int zpa2326_probe_spi(struct spi_device *spi)
-+{
-+ struct regmap *regmap;
-+ int err;
-+
-+ regmap = devm_regmap_init_spi(spi, &zpa2326_regmap_spi_config);
-+ if (IS_ERR(regmap)) {
-+ dev_err(&spi->dev, "failed to init registers map");
-+ return PTR_ERR(regmap);
-+ }
-+
-+ /*
-+ * Enforce SPI slave settings to prevent from DT misconfiguration.
-+ *
-+ * Clock is idle high. Sampling happens on trailing edge, i.e., rising
-+ * edge. Maximum bus frequency is 1 MHz. Registers are 8 bits wide.
-+ */
-+ spi->mode = SPI_MODE_3;
-+ spi->max_speed_hz = min(spi->max_speed_hz, 1000000U);
-+ spi->bits_per_word = 8;
-+ err = spi_setup(spi);
-+ if (err < 0)
-+ return err;
-+
-+ return zpa2326_probe(&spi->dev, spi_get_device_id(spi)->name,
-+ spi->irq, ZPA2326_DEVICE_ID, regmap);
-+}
-+
-+static int zpa2326_remove_spi(struct spi_device *spi)
-+{
-+ zpa2326_remove(&spi->dev);
-+
-+ return 0;
-+}
-+
-+static const struct spi_device_id zpa2326_spi_ids[] = {
-+ { "zpa2326", 0 },
-+ { },
-+};
-+MODULE_DEVICE_TABLE(spi, zpa2326_spi_ids);
-+
-+#if defined(CONFIG_OF)
-+static const struct of_device_id zpa2326_spi_matches[] = {
-+ { .compatible = "murata,zpa2326" },
-+ { }
-+};
-+MODULE_DEVICE_TABLE(of, zpa2326_spi_matches);
-+#endif
-+
-+static struct spi_driver zpa2326_spi_driver = {
-+ .driver = {
-+ .name = "zpa2326-spi",
-+ .of_match_table = of_match_ptr(zpa2326_spi_matches),
-+ .pm = ZPA2326_PM_OPS,
-+ },
-+ .probe = zpa2326_probe_spi,
-+ .remove = zpa2326_remove_spi,
-+ .id_table = zpa2326_spi_ids,
-+};
-+module_spi_driver(zpa2326_spi_driver);
-+
-+MODULE_AUTHOR("Gregor Boirie <gregor.boirie@parrot.com>");
-+MODULE_DESCRIPTION("SPI driver for Murata ZPA2326 pressure sensor");
-+MODULE_LICENSE("GPL v2");
-diff --git a/drivers/iio/proximity/sx9500.c b/drivers/iio/proximity/sx9500.c
-index 1d74b3a..1f06282 100644
---- a/drivers/iio/proximity/sx9500.c
-+++ b/drivers/iio/proximity/sx9500.c
-@@ -516,7 +516,7 @@ static irqreturn_t sx9500_irq_thread_handler(int irq, void *private)
- sx9500_push_events(indio_dev);
-
- if (val & SX9500_CONVDONE_IRQ)
-- complete_all(&data->completion);
-+ complete(&data->completion);
-
- out:
- mutex_unlock(&data->mutex);
-@@ -1025,6 +1025,12 @@ static const struct acpi_device_id sx9500_acpi_match[] = {
- };
- MODULE_DEVICE_TABLE(acpi, sx9500_acpi_match);
-
-+static const struct of_device_id sx9500_of_match[] = {
-+ { .compatible = "semtech,sx9500", },
-+ { }
-+};
-+MODULE_DEVICE_TABLE(of, sx9500_of_match);
-+
- static const struct i2c_device_id sx9500_id[] = {
- {"sx9500", 0},
- { },
-@@ -1035,6 +1041,7 @@ static struct i2c_driver sx9500_driver = {
- .driver = {
- .name = SX9500_DRIVER_NAME,
- .acpi_match_table = ACPI_PTR(sx9500_acpi_match),
-+ .of_match_table = of_match_ptr(sx9500_of_match),
- .pm = &sx9500_pm_ops,
- },
- .probe = sx9500_probe,
-diff --git a/drivers/iio/temperature/Kconfig b/drivers/iio/temperature/Kconfig
-index c4664e5..5ea77a7 100644
---- a/drivers/iio/temperature/Kconfig
-+++ b/drivers/iio/temperature/Kconfig
-@@ -3,6 +3,22 @@
- #
- menu "Temperature sensors"
-
-+config MAXIM_THERMOCOUPLE
-+ tristate "Maxim thermocouple sensors"
-+ depends on SPI
-+ select IIO_BUFFER
-+ select IIO_TRIGGERED_BUFFER
-+ help
-+ If you say yes here you get support for the Maxim series of
-+ thermocouple sensors connected via SPI.
-+
-+ Supported sensors:
-+ * MAX6675
-+ * MAX31855
-+
-+ This driver can also be built as a module. If so, the module will
-+ be called maxim_thermocouple.
-+
- config MLX90614
- tristate "MLX90614 contact-less infrared sensor"
- depends on I2C
-diff --git a/drivers/iio/temperature/Makefile b/drivers/iio/temperature/Makefile
-index 02bc79d..78c3de0 100644
---- a/drivers/iio/temperature/Makefile
-+++ b/drivers/iio/temperature/Makefile
-@@ -2,6 +2,7 @@
- # Makefile for industrial I/O temperature drivers
- #
-
-+obj-$(CONFIG_MAXIM_THERMOCOUPLE) += maxim_thermocouple.o
- obj-$(CONFIG_MLX90614) += mlx90614.o
- obj-$(CONFIG_TMP006) += tmp006.o
- obj-$(CONFIG_TSYS01) += tsys01.o
-diff --git a/drivers/iio/temperature/maxim_thermocouple.c b/drivers/iio/temperature/maxim_thermocouple.c
-new file mode 100644
-index 0000000..39dd202
---- /dev/null
-+++ b/drivers/iio/temperature/maxim_thermocouple.c
-@@ -0,0 +1,281 @@
-+/*
-+ * maxim_thermocouple.c - Support for Maxim thermocouple chips
-+ *
-+ * Copyright (C) 2016 Matt Ranostay <mranostay@gmail.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * 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 <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/mutex.h>
-+#include <linux/err.h>
-+#include <linux/spi/spi.h>
-+#include <linux/iio/iio.h>
-+#include <linux/iio/trigger.h>
-+#include <linux/iio/buffer.h>
-+#include <linux/iio/triggered_buffer.h>
-+#include <linux/iio/trigger_consumer.h>
-+
-+#define MAXIM_THERMOCOUPLE_DRV_NAME "maxim_thermocouple"
-+
-+enum {
-+ MAX6675,
-+ MAX31855,
-+};
-+
-+static const struct iio_chan_spec max6675_channels[] = {
-+ { /* thermocouple temperature */
-+ .type = IIO_TEMP,
-+ .info_mask_separate =
-+ BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
-+ .scan_index = 0,
-+ .scan_type = {
-+ .sign = 's',
-+ .realbits = 13,
-+ .storagebits = 16,
-+ .shift = 3,
-+ .endianness = IIO_BE,
-+ },
-+ },
-+ IIO_CHAN_SOFT_TIMESTAMP(1),
-+};
-+
-+static const struct iio_chan_spec max31855_channels[] = {
-+ { /* thermocouple temperature */
-+ .type = IIO_TEMP,
-+ .address = 2,
-+ .info_mask_separate =
-+ BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
-+ .scan_index = 0,
-+ .scan_type = {
-+ .sign = 's',
-+ .realbits = 14,
-+ .storagebits = 16,
-+ .shift = 2,
-+ .endianness = IIO_BE,
-+ },
-+ },
-+ { /* cold junction temperature */
-+ .type = IIO_TEMP,
-+ .address = 0,
-+ .channel2 = IIO_MOD_TEMP_AMBIENT,
-+ .modified = 1,
-+ .info_mask_separate =
-+ BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
-+ .scan_index = 1,
-+ .scan_type = {
-+ .sign = 's',
-+ .realbits = 12,
-+ .storagebits = 16,
-+ .shift = 4,
-+ .endianness = IIO_BE,
-+ },
-+ },
-+ IIO_CHAN_SOFT_TIMESTAMP(2),
-+};
-+
-+static const unsigned long max31855_scan_masks[] = {0x3, 0};
-+
-+struct maxim_thermocouple_chip {
-+ const struct iio_chan_spec *channels;
-+ const unsigned long *scan_masks;
-+ u8 num_channels;
-+ u8 read_size;
-+
-+ /* bit-check for valid input */
-+ u32 status_bit;
-+};
-+
-+static const struct maxim_thermocouple_chip maxim_thermocouple_chips[] = {
-+ [MAX6675] = {
-+ .channels = max6675_channels,
-+ .num_channels = ARRAY_SIZE(max6675_channels),
-+ .read_size = 2,
-+ .status_bit = BIT(2),
-+ },
-+ [MAX31855] = {
-+ .channels = max31855_channels,
-+ .num_channels = ARRAY_SIZE(max31855_channels),
-+ .read_size = 4,
-+ .scan_masks = max31855_scan_masks,
-+ .status_bit = BIT(16),
-+ },
-+};
-+
-+struct maxim_thermocouple_data {
-+ struct spi_device *spi;
-+ const struct maxim_thermocouple_chip *chip;
-+
-+ u8 buffer[16] ____cacheline_aligned;
-+};
-+
-+static int maxim_thermocouple_read(struct maxim_thermocouple_data *data,
-+ struct iio_chan_spec const *chan, int *val)
-+{
-+ unsigned int storage_bytes = data->chip->read_size;
-+ unsigned int shift = chan->scan_type.shift + (chan->address * 8);
-+ unsigned int buf;
-+ int ret;
-+
-+ ret = spi_read(data->spi, (void *) &buf, storage_bytes);
-+ if (ret)
-+ return ret;
-+
-+ switch (storage_bytes) {
-+ case 2:
-+ *val = be16_to_cpu(buf);
-+ break;
-+ case 4:
-+ *val = be32_to_cpu(buf);
-+ break;
-+ }
-+
-+ /* check to be sure this is a valid reading */
-+ if (*val & data->chip->status_bit)
-+ return -EINVAL;
-+
-+ *val = sign_extend32(*val >> shift, chan->scan_type.realbits - 1);
-+
-+ return 0;
-+}
-+
-+static irqreturn_t maxim_thermocouple_trigger_handler(int irq, void *private)
-+{
-+ struct iio_poll_func *pf = private;
-+ struct iio_dev *indio_dev = pf->indio_dev;
-+ struct maxim_thermocouple_data *data = iio_priv(indio_dev);
-+ int ret;
-+
-+ ret = spi_read(data->spi, data->buffer, data->chip->read_size);
-+ if (!ret) {
-+ iio_push_to_buffers_with_timestamp(indio_dev, data->buffer,
-+ iio_get_time_ns(indio_dev));
-+ }
-+
-+ iio_trigger_notify_done(indio_dev->trig);
-+
-+ return IRQ_HANDLED;
-+}
-+
-+static int maxim_thermocouple_read_raw(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan,
-+ int *val, int *val2, long mask)
-+{
-+ struct maxim_thermocouple_data *data = iio_priv(indio_dev);
-+ int ret = -EINVAL;
-+
-+ switch (mask) {
-+ case IIO_CHAN_INFO_RAW:
-+ ret = iio_device_claim_direct_mode(indio_dev);
-+ if (ret)
-+ return ret;
-+
-+ ret = maxim_thermocouple_read(data, chan, val);
-+ iio_device_release_direct_mode(indio_dev);
-+
-+ if (!ret)
-+ return IIO_VAL_INT;
-+
-+ break;
-+ case IIO_CHAN_INFO_SCALE:
-+ switch (chan->channel2) {
-+ case IIO_MOD_TEMP_AMBIENT:
-+ *val = 62;
-+ *val2 = 500000; /* 1000 * 0.0625 */
-+ ret = IIO_VAL_INT_PLUS_MICRO;
-+ break;
-+ default:
-+ *val = 250; /* 1000 * 0.25 */
-+ ret = IIO_VAL_INT;
-+ };
-+ break;
-+ }
-+
-+ return ret;
-+}
-+
-+static const struct iio_info maxim_thermocouple_info = {
-+ .driver_module = THIS_MODULE,
-+ .read_raw = maxim_thermocouple_read_raw,
-+};
-+
-+static int maxim_thermocouple_probe(struct spi_device *spi)
-+{
-+ const struct spi_device_id *id = spi_get_device_id(spi);
-+ struct iio_dev *indio_dev;
-+ struct maxim_thermocouple_data *data;
-+ const struct maxim_thermocouple_chip *chip =
-+ &maxim_thermocouple_chips[id->driver_data];
-+ int ret;
-+
-+ indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*data));
-+ if (!indio_dev)
-+ return -ENOMEM;
-+
-+ indio_dev->info = &maxim_thermocouple_info;
-+ indio_dev->name = MAXIM_THERMOCOUPLE_DRV_NAME;
-+ indio_dev->channels = chip->channels;
-+ indio_dev->available_scan_masks = chip->scan_masks;
-+ indio_dev->num_channels = chip->num_channels;
-+ indio_dev->modes = INDIO_DIRECT_MODE;
-+
-+ data = iio_priv(indio_dev);
-+ data->spi = spi;
-+ data->chip = chip;
-+
-+ ret = iio_triggered_buffer_setup(indio_dev, NULL,
-+ maxim_thermocouple_trigger_handler, NULL);
-+ if (ret)
-+ return ret;
-+
-+ ret = iio_device_register(indio_dev);
-+ if (ret)
-+ goto error_unreg_buffer;
-+
-+ return 0;
-+
-+error_unreg_buffer:
-+ iio_triggered_buffer_cleanup(indio_dev);
-+
-+ return ret;
-+}
-+
-+static int maxim_thermocouple_remove(struct spi_device *spi)
-+{
-+ struct iio_dev *indio_dev = spi_get_drvdata(spi);
-+
-+ iio_device_unregister(indio_dev);
-+ iio_triggered_buffer_cleanup(indio_dev);
-+
-+ return 0;
-+}
-+
-+static const struct spi_device_id maxim_thermocouple_id[] = {
-+ {"max6675", MAX6675},
-+ {"max31855", MAX31855},
-+ {},
-+};
-+MODULE_DEVICE_TABLE(spi, maxim_thermocouple_id);
-+
-+static struct spi_driver maxim_thermocouple_driver = {
-+ .driver = {
-+ .name = MAXIM_THERMOCOUPLE_DRV_NAME,
-+ },
-+ .probe = maxim_thermocouple_probe,
-+ .remove = maxim_thermocouple_remove,
-+ .id_table = maxim_thermocouple_id,
-+};
-+module_spi_driver(maxim_thermocouple_driver);
-+
-+MODULE_AUTHOR("Matt Ranostay <mranostay@gmail.com>");
-+MODULE_DESCRIPTION("Maxim thermocouple sensors");
-+MODULE_LICENSE("GPL");
-diff --git a/drivers/staging/iio/accel/sca3000.h b/drivers/staging/iio/accel/sca3000.h
-index 9c8a958..4dcc857 100644
---- a/drivers/staging/iio/accel/sca3000.h
-+++ b/drivers/staging/iio/accel/sca3000.h
-@@ -113,6 +113,7 @@
- #define SCA3000_OUT_CTRL_BUF_X_EN 0x10
- #define SCA3000_OUT_CTRL_BUF_Y_EN 0x08
- #define SCA3000_OUT_CTRL_BUF_Z_EN 0x04
-+#define SCA3000_OUT_CTRL_BUF_DIV_MASK 0x03
- #define SCA3000_OUT_CTRL_BUF_DIV_4 0x02
- #define SCA3000_OUT_CTRL_BUF_DIV_2 0x01
-
-diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
-index b5625f5..d626125 100644
---- a/drivers/staging/iio/accel/sca3000_core.c
-+++ b/drivers/staging/iio/accel/sca3000_core.c
-@@ -402,6 +402,7 @@ static const struct iio_event_spec sca3000_event = {
- .channel2 = mod, \
- .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
- .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE),\
-+ .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ),\
- .address = index, \
- .scan_index = index, \
- .scan_type = { \
-@@ -412,7 +413,7 @@ static const struct iio_event_spec sca3000_event = {
- }, \
- .event_spec = &sca3000_event, \
- .num_event_specs = 1, \
-- }
-+ }
-
- static const struct iio_chan_spec sca3000_channels[] = {
- SCA3000_CHAN(0, IIO_MOD_X),
-@@ -443,6 +444,97 @@ static u8 sca3000_addresses[3][3] = {
- SCA3000_MD_CTRL_OR_Z},
- };
-
-+/**
-+ * __sca3000_get_base_freq() obtain mode specific base frequency
-+ *
-+ * lock must be held
-+ **/
-+static inline int __sca3000_get_base_freq(struct sca3000_state *st,
-+ const struct sca3000_chip_info *info,
-+ int *base_freq)
-+{
-+ int ret;
-+
-+ ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_MODE, 1);
-+ if (ret)
-+ goto error_ret;
-+ switch (0x03 & st->rx[0]) {
-+ case SCA3000_MEAS_MODE_NORMAL:
-+ *base_freq = info->measurement_mode_freq;
-+ break;
-+ case SCA3000_MEAS_MODE_OP_1:
-+ *base_freq = info->option_mode_1_freq;
-+ break;
-+ case SCA3000_MEAS_MODE_OP_2:
-+ *base_freq = info->option_mode_2_freq;
-+ break;
-+ }
-+error_ret:
-+ return ret;
-+}
-+
-+/**
-+ * read_raw handler for IIO_CHAN_INFO_SAMP_FREQ
-+ *
-+ * lock must be held
-+ **/
-+static int read_raw_samp_freq(struct sca3000_state *st, int *val)
-+{
-+ int ret;
-+
-+ ret = __sca3000_get_base_freq(st, st->info, val);
-+ if (ret)
-+ return ret;
-+
-+ ret = sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL);
-+ if (ret < 0)
-+ return ret;
-+
-+ if (*val > 0) {
-+ ret &= SCA3000_OUT_CTRL_BUF_DIV_MASK;
-+ switch (ret) {
-+ case SCA3000_OUT_CTRL_BUF_DIV_2:
-+ *val /= 2;
-+ break;
-+ case SCA3000_OUT_CTRL_BUF_DIV_4:
-+ *val /= 4;
-+ break;
-+ }
-+ }
-+
-+ return 0;
-+}
-+
-+/**
-+ * write_raw handler for IIO_CHAN_INFO_SAMP_FREQ
-+ *
-+ * lock must be held
-+ **/
-+static int write_raw_samp_freq(struct sca3000_state *st, int val)
-+{
-+ int ret, base_freq, ctrlval;
-+
-+ ret = __sca3000_get_base_freq(st, st->info, &base_freq);
-+ if (ret)
-+ return ret;
-+
-+ ret = sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL);
-+ if (ret < 0)
-+ return ret;
-+
-+ ctrlval = ret & ~SCA3000_OUT_CTRL_BUF_DIV_MASK;
-+
-+ if (val == base_freq / 2)
-+ ctrlval |= SCA3000_OUT_CTRL_BUF_DIV_2;
-+ if (val == base_freq / 4)
-+ ctrlval |= SCA3000_OUT_CTRL_BUF_DIV_4;
-+ else if (val != base_freq)
-+ return -EINVAL;
-+
-+ return sca3000_write_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL,
-+ ctrlval);
-+}
-+
- static int sca3000_read_raw(struct iio_dev *indio_dev,
- struct iio_chan_spec const *chan,
- int *val,
-@@ -495,9 +587,36 @@ static int sca3000_read_raw(struct iio_dev *indio_dev,
- *val = -214;
- *val2 = 600000;
- return IIO_VAL_INT_PLUS_MICRO;
-+ case IIO_CHAN_INFO_SAMP_FREQ:
-+ mutex_lock(&st->lock);
-+ ret = read_raw_samp_freq(st, val);
-+ mutex_unlock(&st->lock);
-+ return ret ? ret : IIO_VAL_INT;
-+ default:
-+ return -EINVAL;
-+ }
-+}
-+
-+static int sca3000_write_raw(struct iio_dev *indio_dev,
-+ struct iio_chan_spec const *chan,
-+ int val, int val2, long mask)
-+{
-+ struct sca3000_state *st = iio_priv(indio_dev);
-+ int ret;
-+
-+ switch (mask) {
-+ case IIO_CHAN_INFO_SAMP_FREQ:
-+ if (val2)
-+ return -EINVAL;
-+ mutex_lock(&st->lock);
-+ ret = write_raw_samp_freq(st, val);
-+ mutex_unlock(&st->lock);
-+ return ret;
- default:
- return -EINVAL;
- }
-+
-+ return ret;
- }
-
- /**
-@@ -548,133 +667,12 @@ error_ret:
- return ret;
- }
-
--/**
-- * __sca3000_get_base_freq() obtain mode specific base frequency
-- *
-- * lock must be held
-- **/
--static inline int __sca3000_get_base_freq(struct sca3000_state *st,
-- const struct sca3000_chip_info *info,
-- int *base_freq)
--{
-- int ret;
--
-- ret = sca3000_read_data_short(st, SCA3000_REG_ADDR_MODE, 1);
-- if (ret)
-- goto error_ret;
-- switch (0x03 & st->rx[0]) {
-- case SCA3000_MEAS_MODE_NORMAL:
-- *base_freq = info->measurement_mode_freq;
-- break;
-- case SCA3000_MEAS_MODE_OP_1:
-- *base_freq = info->option_mode_1_freq;
-- break;
-- case SCA3000_MEAS_MODE_OP_2:
-- *base_freq = info->option_mode_2_freq;
-- break;
-- }
--error_ret:
-- return ret;
--}
--
--/**
-- * sca3000_read_frequency() sysfs interface to get the current frequency
-- **/
--static ssize_t sca3000_read_frequency(struct device *dev,
-- struct device_attribute *attr,
-- char *buf)
--{
-- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-- struct sca3000_state *st = iio_priv(indio_dev);
-- int ret, len = 0, base_freq = 0, val;
--
-- mutex_lock(&st->lock);
-- ret = __sca3000_get_base_freq(st, st->info, &base_freq);
-- if (ret)
-- goto error_ret_mut;
-- ret = sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL);
-- mutex_unlock(&st->lock);
-- if (ret < 0)
-- goto error_ret;
-- val = ret;
-- if (base_freq > 0)
-- switch (val & 0x03) {
-- case 0x00:
-- case 0x03:
-- len = sprintf(buf, "%d\n", base_freq);
-- break;
-- case 0x01:
-- len = sprintf(buf, "%d\n", base_freq / 2);
-- break;
-- case 0x02:
-- len = sprintf(buf, "%d\n", base_freq / 4);
-- break;
-- }
--
-- return len;
--error_ret_mut:
-- mutex_unlock(&st->lock);
--error_ret:
-- return ret;
--}
--
--/**
-- * sca3000_set_frequency() sysfs interface to set the current frequency
-- **/
--static ssize_t sca3000_set_frequency(struct device *dev,
-- struct device_attribute *attr,
-- const char *buf,
-- size_t len)
--{
-- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-- struct sca3000_state *st = iio_priv(indio_dev);
-- int ret, base_freq = 0;
-- int ctrlval;
-- int val;
--
-- ret = kstrtoint(buf, 10, &val);
-- if (ret)
-- return ret;
--
-- mutex_lock(&st->lock);
-- /* What mode are we in? */
-- ret = __sca3000_get_base_freq(st, st->info, &base_freq);
-- if (ret)
-- goto error_free_lock;
--
-- ret = sca3000_read_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL);
-- if (ret < 0)
-- goto error_free_lock;
-- ctrlval = ret;
-- /* clear the bits */
-- ctrlval &= ~0x03;
--
-- if (val == base_freq / 2) {
-- ctrlval |= SCA3000_OUT_CTRL_BUF_DIV_2;
-- } else if (val == base_freq / 4) {
-- ctrlval |= SCA3000_OUT_CTRL_BUF_DIV_4;
-- } else if (val != base_freq) {
-- ret = -EINVAL;
-- goto error_free_lock;
-- }
-- ret = sca3000_write_ctrl_reg(st, SCA3000_REG_CTRL_SEL_OUT_CTRL,
-- ctrlval);
--error_free_lock:
-- mutex_unlock(&st->lock);
--
-- return ret ? ret : len;
--}
--
- /*
- * Should only really be registered if ring buffer support is compiled in.
- * Does no harm however and doing it right would add a fair bit of complexity
- */
- static IIO_DEV_ATTR_SAMP_FREQ_AVAIL(sca3000_read_av_freq);
-
--static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
-- sca3000_read_frequency,
-- sca3000_set_frequency);
--
- /**
- * sca3000_read_thresh() - query of a threshold
- **/
-@@ -751,7 +749,6 @@ static struct attribute *sca3000_attributes[] = {
- &iio_dev_attr_measurement_mode_available.dev_attr.attr,
- &iio_dev_attr_measurement_mode.dev_attr.attr,
- &iio_dev_attr_sampling_frequency_available.dev_attr.attr,
-- &iio_dev_attr_sampling_frequency.dev_attr.attr,
- NULL,
- };
-
-@@ -1086,6 +1083,7 @@ error_ret:
- static const struct iio_info sca3000_info = {
- .attrs = &sca3000_attribute_group,
- .read_raw = &sca3000_read_raw,
-+ .write_raw = &sca3000_write_raw,
- .event_attrs = &sca3000_event_attribute_group,
- .read_event_value = &sca3000_read_thresh,
- .write_event_value = &sca3000_write_thresh,
-diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
-index 2177f1d..b460dda 100644
---- a/drivers/staging/iio/adc/ad7280a.c
-+++ b/drivers/staging/iio/adc/ad7280a.c
-@@ -478,7 +478,7 @@ static ssize_t ad7280_store_balance_timer(struct device *dev,
- static struct attribute *ad7280_attributes[AD7280A_MAX_CHAIN *
- AD7280A_CELLS_PER_DEV * 2 + 1];
-
--static struct attribute_group ad7280_attrs_group = {
-+static const struct attribute_group ad7280_attrs_group = {
- .attrs = ad7280_attributes,
- };
-
-diff --git a/drivers/staging/iio/impedance-analyzer/ad5933.c b/drivers/staging/iio/impedance-analyzer/ad5933.c
-index 24c348d..5eecf1c 100644
---- a/drivers/staging/iio/impedance-analyzer/ad5933.c
-+++ b/drivers/staging/iio/impedance-analyzer/ad5933.c
-@@ -156,8 +156,7 @@ static const struct iio_chan_spec ad5933_channels[] = {
- },
- };
-
--static int ad5933_i2c_write(struct i2c_client *client,
-- u8 reg, u8 len, u8 *data)
-+static int ad5933_i2c_write(struct i2c_client *client, u8 reg, u8 len, u8 *data)
- {
- int ret;
-
-@@ -171,8 +170,7 @@ static int ad5933_i2c_write(struct i2c_client *client,
- return 0;
- }
-
--static int ad5933_i2c_read(struct i2c_client *client,
-- u8 reg, u8 len, u8 *data)
-+static int ad5933_i2c_read(struct i2c_client *client, u8 reg, u8 len, u8 *data)
- {
- int ret;
-
-@@ -269,7 +267,8 @@ static int ad5933_setup(struct ad5933_state *st)
- dat = cpu_to_be16(st->settling_cycles);
-
- ret = ad5933_i2c_write(st->client,
-- AD5933_REG_SETTLING_CYCLES, 2, (u8 *)&dat);
-+ AD5933_REG_SETTLING_CYCLES,
-+ 2, (u8 *)&dat);
- if (ret < 0)
- return ret;
-
-@@ -294,8 +293,8 @@ static void ad5933_calc_out_ranges(struct ad5933_state *st)
- */
-
- static ssize_t ad5933_show_frequency(struct device *dev,
-- struct device_attribute *attr,
-- char *buf)
-+ struct device_attribute *attr,
-+ char *buf)
- {
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
- struct ad5933_state *st = iio_priv(indio_dev);
-@@ -322,9 +321,9 @@ static ssize_t ad5933_show_frequency(struct device *dev,
- }
-
- static ssize_t ad5933_store_frequency(struct device *dev,
-- struct device_attribute *attr,
-- const char *buf,
-- size_t len)
-+ struct device_attribute *attr,
-+ const char *buf,
-+ size_t len)
- {
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
- struct ad5933_state *st = iio_priv(indio_dev);
-@@ -357,8 +356,8 @@ static IIO_DEVICE_ATTR(out_voltage0_freq_increment, S_IRUGO | S_IWUSR,
- AD5933_REG_FREQ_INC);
-
- static ssize_t ad5933_show(struct device *dev,
-- struct device_attribute *attr,
-- char *buf)
-+ struct device_attribute *attr,
-+ char *buf)
- {
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
- struct ad5933_state *st = iio_priv(indio_dev);
-@@ -399,9 +398,9 @@ static ssize_t ad5933_show(struct device *dev,
- }
-
- static ssize_t ad5933_store(struct device *dev,
-- struct device_attribute *attr,
-- const char *buf,
-- size_t len)
-+ struct device_attribute *attr,
-+ const char *buf,
-+ size_t len)
- {
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
- struct ad5933_state *st = iio_priv(indio_dev);
-@@ -451,7 +450,8 @@ static ssize_t ad5933_store(struct device *dev,
-
- dat = cpu_to_be16(val);
- ret = ad5933_i2c_write(st->client,
-- AD5933_REG_SETTLING_CYCLES, 2, (u8 *)&dat);
-+ AD5933_REG_SETTLING_CYCLES,
-+ 2, (u8 *)&dat);
- break;
- case AD5933_FREQ_POINTS:
- val = clamp(val, (u16)0, (u16)511);
-@@ -545,8 +545,8 @@ static int ad5933_read_raw(struct iio_dev *indio_dev,
- goto out;
-
- ret = ad5933_i2c_read(st->client,
-- AD5933_REG_TEMP_DATA, 2,
-- (u8 *)&dat);
-+ AD5933_REG_TEMP_DATA,
-+ 2, (u8 *)&dat);
- if (ret < 0)
- goto out;
- mutex_unlock(&indio_dev->mlock);
-@@ -705,7 +705,7 @@ static void ad5933_work(struct work_struct *work)
- }
-
- static int ad5933_probe(struct i2c_client *client,
-- const struct i2c_device_id *id)
-+ const struct i2c_device_id *id)
- {
- int ret, voltage_uv = 0;
- struct ad5933_platform_data *pdata = dev_get_platdata(&client->dev);
-diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
-index 76d9f74..a767a43 100644
---- a/drivers/staging/iio/light/isl29018.c
-+++ b/drivers/staging/iio/light/isl29018.c
-@@ -15,10 +15,6 @@
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
-- *
-- * You should have received a copy of the GNU General Public License along
-- * with this program; if not, write to the Free Software Foundation, Inc.,
-- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
- #include <linux/module.h>
-@@ -32,25 +28,25 @@
- #include <linux/iio/sysfs.h>
- #include <linux/acpi.h>
-
--#define CONVERSION_TIME_MS 100
-+#define ISL29018_CONV_TIME_MS 100
-
- #define ISL29018_REG_ADD_COMMAND1 0x00
--#define COMMMAND1_OPMODE_SHIFT 5
--#define COMMMAND1_OPMODE_MASK (7 << COMMMAND1_OPMODE_SHIFT)
--#define COMMMAND1_OPMODE_POWER_DOWN 0
--#define COMMMAND1_OPMODE_ALS_ONCE 1
--#define COMMMAND1_OPMODE_IR_ONCE 2
--#define COMMMAND1_OPMODE_PROX_ONCE 3
-+#define ISL29018_CMD1_OPMODE_SHIFT 5
-+#define ISL29018_CMD1_OPMODE_MASK (7 << ISL29018_CMD1_OPMODE_SHIFT)
-+#define ISL29018_CMD1_OPMODE_POWER_DOWN 0
-+#define ISL29018_CMD1_OPMODE_ALS_ONCE 1
-+#define ISL29018_CMD1_OPMODE_IR_ONCE 2
-+#define ISL29018_CMD1_OPMODE_PROX_ONCE 3
-
--#define ISL29018_REG_ADD_COMMANDII 0x01
--#define COMMANDII_RESOLUTION_SHIFT 2
--#define COMMANDII_RESOLUTION_MASK (0x3 << COMMANDII_RESOLUTION_SHIFT)
-+#define ISL29018_REG_ADD_COMMAND2 0x01
-+#define ISL29018_CMD2_RESOLUTION_SHIFT 2
-+#define ISL29018_CMD2_RESOLUTION_MASK (0x3 << ISL29018_CMD2_RESOLUTION_SHIFT)
-
--#define COMMANDII_RANGE_SHIFT 0
--#define COMMANDII_RANGE_MASK (0x3 << COMMANDII_RANGE_SHIFT)
-+#define ISL29018_CMD2_RANGE_SHIFT 0
-+#define ISL29018_CMD2_RANGE_MASK (0x3 << ISL29018_CMD2_RANGE_SHIFT)
-
--#define COMMANDII_SCHEME_SHIFT 7
--#define COMMANDII_SCHEME_MASK (0x1 << COMMANDII_SCHEME_SHIFT)
-+#define ISL29018_CMD2_SCHEME_SHIFT 7
-+#define ISL29018_CMD2_SCHEME_MASK (0x1 << ISL29018_CMD2_SCHEME_SHIFT)
-
- #define ISL29018_REG_ADD_DATA_LSB 0x02
- #define ISL29018_REG_ADD_DATA_MSB 0x03
-@@ -127,13 +123,13 @@ static int isl29018_set_integration_time(struct isl29018_chip *chip,
- if (i >= ARRAY_SIZE(isl29018_int_utimes[chip->type]))
- return -EINVAL;
-
-- ret = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMANDII,
-- COMMANDII_RESOLUTION_MASK,
-- i << COMMANDII_RESOLUTION_SHIFT);
-+ ret = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMAND2,
-+ ISL29018_CMD2_RESOLUTION_MASK,
-+ i << ISL29018_CMD2_RESOLUTION_SHIFT);
- if (ret < 0)
- return ret;
-
-- /* keep the same range when integration time changes */
-+ /* Keep the same range when integration time changes */
- int_time = chip->int_time;
- for (i = 0; i < ARRAY_SIZE(isl29018_scales[int_time]); ++i) {
- if (chip->scale.scale == isl29018_scales[int_time][i].scale &&
-@@ -163,9 +159,9 @@ static int isl29018_set_scale(struct isl29018_chip *chip, int scale, int uscale)
- if (i >= ARRAY_SIZE(isl29018_scales[chip->int_time]))
- return -EINVAL;
-
-- ret = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMANDII,
-- COMMANDII_RANGE_MASK,
-- i << COMMANDII_RANGE_SHIFT);
-+ ret = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMAND2,
-+ ISL29018_CMD2_RANGE_MASK,
-+ i << ISL29018_CMD2_RANGE_SHIFT);
- if (ret < 0)
- return ret;
-
-@@ -183,13 +179,13 @@ static int isl29018_read_sensor_input(struct isl29018_chip *chip, int mode)
-
- /* Set mode */
- status = regmap_write(chip->regmap, ISL29018_REG_ADD_COMMAND1,
-- mode << COMMMAND1_OPMODE_SHIFT);
-+ mode << ISL29018_CMD1_OPMODE_SHIFT);
- if (status) {
- dev_err(dev,
- "Error in setting operating mode err %d\n", status);
- return status;
- }
-- msleep(CONVERSION_TIME_MS);
-+ msleep(ISL29018_CONV_TIME_MS);
- status = regmap_read(chip->regmap, ISL29018_REG_ADD_DATA_LSB, &lsb);
- if (status < 0) {
- dev_err(dev,
-@@ -213,8 +209,8 @@ static int isl29018_read_lux(struct isl29018_chip *chip, int *lux)
- int lux_data;
- unsigned int data_x_range;
-
-- lux_data = isl29018_read_sensor_input(chip, COMMMAND1_OPMODE_ALS_ONCE);
--
-+ lux_data = isl29018_read_sensor_input(chip,
-+ ISL29018_CMD1_OPMODE_ALS_ONCE);
- if (lux_data < 0)
- return lux_data;
-
-@@ -230,8 +226,8 @@ static int isl29018_read_ir(struct isl29018_chip *chip, int *ir)
- {
- int ir_data;
-
-- ir_data = isl29018_read_sensor_input(chip, COMMMAND1_OPMODE_IR_ONCE);
--
-+ ir_data = isl29018_read_sensor_input(chip,
-+ ISL29018_CMD1_OPMODE_IR_ONCE);
- if (ir_data < 0)
- return ir_data;
-
-@@ -249,16 +245,16 @@ static int isl29018_read_proximity_ir(struct isl29018_chip *chip, int scheme,
- struct device *dev = regmap_get_device(chip->regmap);
-
- /* Do proximity sensing with required scheme */
-- status = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMANDII,
-- COMMANDII_SCHEME_MASK,
-- scheme << COMMANDII_SCHEME_SHIFT);
-+ status = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMAND2,
-+ ISL29018_CMD2_SCHEME_MASK,
-+ scheme << ISL29018_CMD2_SCHEME_SHIFT);
- if (status) {
- dev_err(dev, "Error in setting operating mode\n");
- return status;
- }
-
- prox_data = isl29018_read_sensor_input(chip,
-- COMMMAND1_OPMODE_PROX_ONCE);
-+ ISL29018_CMD1_OPMODE_PROX_ONCE);
- if (prox_data < 0)
- return prox_data;
-
-@@ -267,8 +263,8 @@ static int isl29018_read_proximity_ir(struct isl29018_chip *chip, int scheme,
- return 0;
- }
-
-- ir_data = isl29018_read_sensor_input(chip, COMMMAND1_OPMODE_IR_ONCE);
--
-+ ir_data = isl29018_read_sensor_input(chip,
-+ ISL29018_CMD1_OPMODE_IR_ONCE);
- if (ir_data < 0)
- return ir_data;
-
-@@ -280,7 +276,7 @@ static int isl29018_read_proximity_ir(struct isl29018_chip *chip, int scheme,
- return 0;
- }
-
--static ssize_t show_scale_available(struct device *dev,
-+static ssize_t isl29018_show_scale_available(struct device *dev,
- struct device_attribute *attr, char *buf)
- {
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-@@ -297,7 +293,7 @@ static ssize_t show_scale_available(struct device *dev,
- return len;
- }
-
--static ssize_t show_int_time_available(struct device *dev,
-+static ssize_t isl29018_show_int_time_available(struct device *dev,
- struct device_attribute *attr, char *buf)
- {
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-@@ -313,8 +309,7 @@ static ssize_t show_int_time_available(struct device *dev,
- return len;
- }
-
--/* proximity scheme */
--static ssize_t show_prox_infrared_suppression(struct device *dev,
-+static ssize_t isl29018_show_prox_infrared_suppression(struct device *dev,
- struct device_attribute *attr,
- char *buf)
- {
-@@ -322,13 +317,13 @@ static ssize_t show_prox_infrared_suppression(struct device *dev,
- struct isl29018_chip *chip = iio_priv(indio_dev);
-
- /*
-- * return the "proximity scheme" i.e. if the chip does on chip
-+ * Return the "proximity scheme" i.e. if the chip does on chip
- * infrared suppression (1 means perform on chip suppression)
- */
- return sprintf(buf, "%d\n", chip->prox_scheme);
- }
-
--static ssize_t store_prox_infrared_suppression(struct device *dev,
-+static ssize_t isl29018_store_prox_infrared_suppression(struct device *dev,
- struct device_attribute *attr,
- const char *buf, size_t count)
- {
-@@ -338,13 +333,11 @@ static ssize_t store_prox_infrared_suppression(struct device *dev,
-
- if (kstrtoint(buf, 10, &val))
- return -EINVAL;
-- if (!(val == 0 || val == 1)) {
-- dev_err(dev, "The mode is not supported\n");
-+ if (!(val == 0 || val == 1))
- return -EINVAL;
-- }
-
- /*
-- * get the "proximity scheme" i.e. if the chip does on chip
-+ * Get the "proximity scheme" i.e. if the chip does on chip
- * infrared suppression (1 means perform on chip suppression)
- */
- mutex_lock(&chip->lock);
-@@ -354,7 +347,6 @@ static ssize_t store_prox_infrared_suppression(struct device *dev,
- return count;
- }
-
--/* Channel IO */
- static int isl29018_write_raw(struct iio_dev *indio_dev,
- struct iio_chan_spec const *chan,
- int val,
-@@ -491,13 +483,13 @@ static const struct iio_chan_spec isl29023_channels[] = {
- };
-
- static IIO_DEVICE_ATTR(in_illuminance_integration_time_available, S_IRUGO,
-- show_int_time_available, NULL, 0);
-+ isl29018_show_int_time_available, NULL, 0);
- static IIO_DEVICE_ATTR(in_illuminance_scale_available, S_IRUGO,
-- show_scale_available, NULL, 0);
-+ isl29018_show_scale_available, NULL, 0);
- static IIO_DEVICE_ATTR(proximity_on_chip_ambient_infrared_suppression,
- S_IRUGO | S_IWUSR,
-- show_prox_infrared_suppression,
-- store_prox_infrared_suppression, 0);
-+ isl29018_show_prox_infrared_suppression,
-+ isl29018_store_prox_infrared_suppression, 0);
-
- #define ISL29018_DEV_ATTR(name) (&iio_dev_attr_##name.dev_attr.attr)
-
-@@ -541,7 +533,7 @@ static int isl29035_detect(struct isl29018_chip *chip)
- if (id != ISL29035_DEVICE_ID)
- return -ENODEV;
-
-- /* clear out brownout bit */
-+ /* Clear brownout bit */
- return regmap_update_bits(chip->regmap, ISL29035_REG_DEVICE_ID,
- ISL29035_BOUT_MASK, 0);
- }
-@@ -574,7 +566,7 @@ static int isl29018_chip_init(struct isl29018_chip *chip)
- * conversions, clear the test registers, and then rewrite all
- * registers to the desired values.
- * ...
-- * FOR ISL29011, ISL29018, ISL29021, ISL29023
-+ * For ISL29011, ISL29018, ISL29021, ISL29023
- * 1. Write 0x00 to register 0x08 (TEST)
- * 2. Write 0x00 to register 0x00 (CMD1)
- * 3. Rewrite all registers to the desired values
-@@ -603,7 +595,7 @@ static int isl29018_chip_init(struct isl29018_chip *chip)
-
- usleep_range(1000, 2000); /* per data sheet, page 10 */
-
-- /* set defaults */
-+ /* Set defaults */
- status = isl29018_set_scale(chip, chip->scale.scale,
- chip->scale.uscale);
- if (status < 0) {
-@@ -635,7 +627,7 @@ static const struct iio_info isl29023_info = {
- .write_raw = isl29018_write_raw,
- };
-
--static bool is_volatile_reg(struct device *dev, unsigned int reg)
-+static bool isl29018_is_volatile_reg(struct device *dev, unsigned int reg)
- {
- switch (reg) {
- case ISL29018_REG_ADD_DATA_LSB:
-@@ -649,37 +641,32 @@ static bool is_volatile_reg(struct device *dev, unsigned int reg)
- }
- }
-
--/*
-- * isl29018_regmap_config: regmap configuration.
-- * Use RBTREE mechanism for caching.
-- */
- static const struct regmap_config isl29018_regmap_config = {
- .reg_bits = 8,
- .val_bits = 8,
-- .volatile_reg = is_volatile_reg,
-+ .volatile_reg = isl29018_is_volatile_reg,
- .max_register = ISL29018_REG_TEST,
- .num_reg_defaults_raw = ISL29018_REG_TEST + 1,
- .cache_type = REGCACHE_RBTREE,
- };
-
--/* isl29035_regmap_config: regmap configuration for ISL29035 */
- static const struct regmap_config isl29035_regmap_config = {
- .reg_bits = 8,
- .val_bits = 8,
-- .volatile_reg = is_volatile_reg,
-+ .volatile_reg = isl29018_is_volatile_reg,
- .max_register = ISL29035_REG_DEVICE_ID,
- .num_reg_defaults_raw = ISL29035_REG_DEVICE_ID + 1,
- .cache_type = REGCACHE_RBTREE,
- };
-
--struct chip_info {
-+struct isl29018_chip_info {
- const struct iio_chan_spec *channels;
- int num_channels;
- const struct iio_info *indio_info;
- const struct regmap_config *regmap_cfg;
- };
-
--static const struct chip_info chip_info_tbl[] = {
-+static const struct isl29018_chip_info isl29018_chip_info_tbl[] = {
- [isl29018] = {
- .channels = isl29018_channels,
- .num_channels = ARRAY_SIZE(isl29018_channels),
-@@ -724,10 +711,8 @@ static int isl29018_probe(struct i2c_client *client,
- int dev_id = 0;
-
- indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip));
-- if (!indio_dev) {
-- dev_err(&client->dev, "iio allocation fails\n");
-+ if (!indio_dev)
- return -ENOMEM;
-- }
- chip = iio_priv(indio_dev);
-
- i2c_set_clientdata(client, indio_dev);
-@@ -750,7 +735,7 @@ static int isl29018_probe(struct i2c_client *client,
- chip->suspended = false;
-
- chip->regmap = devm_regmap_init_i2c(client,
-- chip_info_tbl[dev_id].regmap_cfg);
-+ isl29018_chip_info_tbl[dev_id].regmap_cfg);
- if (IS_ERR(chip->regmap)) {
- err = PTR_ERR(chip->regmap);
- dev_err(&client->dev, "regmap initialization fails: %d\n", err);
-@@ -761,19 +746,13 @@ static int isl29018_probe(struct i2c_client *client,
- if (err)
- return err;
-
-- indio_dev->info = chip_info_tbl[dev_id].indio_info;
-- indio_dev->channels = chip_info_tbl[dev_id].channels;
-- indio_dev->num_channels = chip_info_tbl[dev_id].num_channels;
-+ indio_dev->info = isl29018_chip_info_tbl[dev_id].indio_info;
-+ indio_dev->channels = isl29018_chip_info_tbl[dev_id].channels;
-+ indio_dev->num_channels = isl29018_chip_info_tbl[dev_id].num_channels;
- indio_dev->name = name;
- indio_dev->dev.parent = &client->dev;
- indio_dev->modes = INDIO_DIRECT_MODE;
-- err = devm_iio_device_register(&client->dev, indio_dev);
-- if (err) {
-- dev_err(&client->dev, "iio registration fails\n");
-- return err;
-- }
--
-- return 0;
-+ return devm_iio_device_register(&client->dev, indio_dev);
- }
-
- #ifdef CONFIG_PM_SLEEP
-@@ -840,7 +819,6 @@ static const struct of_device_id isl29018_of_match[] = {
- MODULE_DEVICE_TABLE(of, isl29018_of_match);
-
- static struct i2c_driver isl29018_driver = {
-- .class = I2C_CLASS_HWMON,
- .driver = {
- .name = "isl29018",
- .acpi_match_table = ACPI_PTR(isl29018_acpi_match),
-diff --git a/drivers/staging/iio/light/isl29028.c b/drivers/staging/iio/light/isl29028.c
-index 2e3b1d6..aa413e5 100644
---- a/drivers/staging/iio/light/isl29028.c
-+++ b/drivers/staging/iio/light/isl29028.c
-@@ -27,29 +27,27 @@
- #include <linux/iio/iio.h>
- #include <linux/iio/sysfs.h>
-
--#define CONVERSION_TIME_MS 100
-+#define ISL29028_CONV_TIME_MS 100
-
- #define ISL29028_REG_CONFIGURE 0x01
-
--#define CONFIGURE_ALS_IR_MODE_ALS 0
--#define CONFIGURE_ALS_IR_MODE_IR BIT(0)
--#define CONFIGURE_ALS_IR_MODE_MASK BIT(0)
-+#define ISL29028_CONF_ALS_IR_MODE_ALS 0
-+#define ISL29028_CONF_ALS_IR_MODE_IR BIT(0)
-+#define ISL29028_CONF_ALS_IR_MODE_MASK BIT(0)
-
--#define CONFIGURE_ALS_RANGE_LOW_LUX 0
--#define CONFIGURE_ALS_RANGE_HIGH_LUX BIT(1)
--#define CONFIGURE_ALS_RANGE_MASK BIT(1)
-+#define ISL29028_CONF_ALS_RANGE_LOW_LUX 0
-+#define ISL29028_CONF_ALS_RANGE_HIGH_LUX BIT(1)
-+#define ISL29028_CONF_ALS_RANGE_MASK BIT(1)
-
--#define CONFIGURE_ALS_DIS 0
--#define CONFIGURE_ALS_EN BIT(2)
--#define CONFIGURE_ALS_EN_MASK BIT(2)
-+#define ISL29028_CONF_ALS_DIS 0
-+#define ISL29028_CONF_ALS_EN BIT(2)
-+#define ISL29028_CONF_ALS_EN_MASK BIT(2)
-
--#define CONFIGURE_PROX_DRIVE BIT(3)
-+#define ISL29028_CONF_PROX_SLP_SH 4
-+#define ISL29028_CONF_PROX_SLP_MASK (7 << ISL29028_CONF_PROX_SLP_SH)
-
--#define CONFIGURE_PROX_SLP_SH 4
--#define CONFIGURE_PROX_SLP_MASK (7 << CONFIGURE_PROX_SLP_SH)
--
--#define CONFIGURE_PROX_EN BIT(7)
--#define CONFIGURE_PROX_EN_MASK BIT(7)
-+#define ISL29028_CONF_PROX_EN BIT(7)
-+#define ISL29028_CONF_PROX_EN_MASK BIT(7)
-
- #define ISL29028_REG_INTERRUPT 0x02
-
-@@ -62,10 +60,10 @@
-
- #define ISL29028_NUM_REGS (ISL29028_REG_TEST2_MODE + 1)
-
--enum als_ir_mode {
-- MODE_NONE = 0,
-- MODE_ALS,
-- MODE_IR
-+enum isl29028_als_ir_mode {
-+ ISL29028_MODE_NONE = 0,
-+ ISL29028_MODE_ALS,
-+ ISL29028_MODE_IR,
- };
-
- struct isl29028_chip {
-@@ -76,7 +74,7 @@ struct isl29028_chip {
- bool enable_prox;
-
- int lux_scale;
-- int als_ir_mode;
-+ enum isl29028_als_ir_mode als_ir_mode;
- };
-
- static int isl29028_set_proxim_sampling(struct isl29028_chip *chip,
-@@ -91,7 +89,8 @@ static int isl29028_set_proxim_sampling(struct isl29028_chip *chip,
- break;
- }
- return regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE,
-- CONFIGURE_PROX_SLP_MASK, sel << CONFIGURE_PROX_SLP_SH);
-+ ISL29028_CONF_PROX_SLP_MASK,
-+ sel << ISL29028_CONF_PROX_SLP_SH);
- }
-
- static int isl29028_enable_proximity(struct isl29028_chip *chip, bool enable)
-@@ -100,9 +99,9 @@ static int isl29028_enable_proximity(struct isl29028_chip *chip, bool enable)
- int val = 0;
-
- if (enable)
-- val = CONFIGURE_PROX_EN;
-+ val = ISL29028_CONF_PROX_EN;
- ret = regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE,
-- CONFIGURE_PROX_EN_MASK, val);
-+ ISL29028_CONF_PROX_EN_MASK, val);
- if (ret < 0)
- return ret;
-
-@@ -113,40 +112,40 @@ static int isl29028_enable_proximity(struct isl29028_chip *chip, bool enable)
-
- static int isl29028_set_als_scale(struct isl29028_chip *chip, int lux_scale)
- {
-- int val = (lux_scale == 2000) ? CONFIGURE_ALS_RANGE_HIGH_LUX :
-- CONFIGURE_ALS_RANGE_LOW_LUX;
-+ int val = (lux_scale == 2000) ? ISL29028_CONF_ALS_RANGE_HIGH_LUX :
-+ ISL29028_CONF_ALS_RANGE_LOW_LUX;
-
- return regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE,
-- CONFIGURE_ALS_RANGE_MASK, val);
-+ ISL29028_CONF_ALS_RANGE_MASK, val);
- }
-
- static int isl29028_set_als_ir_mode(struct isl29028_chip *chip,
-- enum als_ir_mode mode)
-+ enum isl29028_als_ir_mode mode)
- {
- int ret = 0;
-
- switch (mode) {
-- case MODE_ALS:
-+ case ISL29028_MODE_ALS:
- ret = regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE,
-- CONFIGURE_ALS_IR_MODE_MASK,
-- CONFIGURE_ALS_IR_MODE_ALS);
-+ ISL29028_CONF_ALS_IR_MODE_MASK,
-+ ISL29028_CONF_ALS_IR_MODE_ALS);
- if (ret < 0)
- return ret;
-
- ret = regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE,
-- CONFIGURE_ALS_RANGE_MASK,
-- CONFIGURE_ALS_RANGE_HIGH_LUX);
-+ ISL29028_CONF_ALS_RANGE_MASK,
-+ ISL29028_CONF_ALS_RANGE_HIGH_LUX);
- break;
-
-- case MODE_IR:
-+ case ISL29028_MODE_IR:
- ret = regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE,
-- CONFIGURE_ALS_IR_MODE_MASK,
-- CONFIGURE_ALS_IR_MODE_IR);
-+ ISL29028_CONF_ALS_IR_MODE_MASK,
-+ ISL29028_CONF_ALS_IR_MODE_IR);
- break;
-
-- case MODE_NONE:
-+ case ISL29028_MODE_NONE:
- return regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE,
-- CONFIGURE_ALS_EN_MASK, CONFIGURE_ALS_DIS);
-+ ISL29028_CONF_ALS_EN_MASK, ISL29028_CONF_ALS_DIS);
- }
-
- if (ret < 0)
-@@ -154,12 +153,13 @@ static int isl29028_set_als_ir_mode(struct isl29028_chip *chip,
-
- /* Enable the ALS/IR */
- ret = regmap_update_bits(chip->regmap, ISL29028_REG_CONFIGURE,
-- CONFIGURE_ALS_EN_MASK, CONFIGURE_ALS_EN);
-+ ISL29028_CONF_ALS_EN_MASK,
-+ ISL29028_CONF_ALS_EN);
- if (ret < 0)
- return ret;
-
- /* Need to wait for conversion time if ALS/IR mode enabled */
-- mdelay(CONVERSION_TIME_MS);
-+ mdelay(ISL29028_CONV_TIME_MS);
- return 0;
- }
-
-@@ -223,14 +223,14 @@ static int isl29028_als_get(struct isl29028_chip *chip, int *als_data)
- int ret;
- int als_ir_data;
-
-- if (chip->als_ir_mode != MODE_ALS) {
-- ret = isl29028_set_als_ir_mode(chip, MODE_ALS);
-+ if (chip->als_ir_mode != ISL29028_MODE_ALS) {
-+ ret = isl29028_set_als_ir_mode(chip, ISL29028_MODE_ALS);
- if (ret < 0) {
- dev_err(dev,
- "Error in enabling ALS mode err %d\n", ret);
- return ret;
- }
-- chip->als_ir_mode = MODE_ALS;
-+ chip->als_ir_mode = ISL29028_MODE_ALS;
- }
-
- ret = isl29028_read_als_ir(chip, &als_ir_data);
-@@ -256,14 +256,14 @@ static int isl29028_ir_get(struct isl29028_chip *chip, int *ir_data)
- struct device *dev = regmap_get_device(chip->regmap);
- int ret;
-
-- if (chip->als_ir_mode != MODE_IR) {
-- ret = isl29028_set_als_ir_mode(chip, MODE_IR);
-+ if (chip->als_ir_mode != ISL29028_MODE_IR) {
-+ ret = isl29028_set_als_ir_mode(chip, ISL29028_MODE_IR);
- if (ret < 0) {
- dev_err(dev,
- "Error in enabling IR mode err %d\n", ret);
- return ret;
- }
-- chip->als_ir_mode = MODE_IR;
-+ chip->als_ir_mode = ISL29028_MODE_IR;
- }
- return isl29028_read_als_ir(chip, ir_data);
- }
-@@ -383,8 +383,8 @@ static int isl29028_read_raw(struct iio_dev *indio_dev,
- }
-
- static IIO_CONST_ATTR(in_proximity_sampling_frequency_available,
-- "1, 3, 5, 10, 13, 20, 83, 100");
--static IIO_CONST_ATTR(in_illuminance_scale_available, "125, 2000");
-+ "1 3 5 10 13 20 83 100");
-+static IIO_CONST_ATTR(in_illuminance_scale_available, "125 2000");
-
- #define ISL29028_DEV_ATTR(name) (&iio_dev_attr_##name.dev_attr.attr)
- #define ISL29028_CONST_ATTR(name) (&iio_const_attr_##name.dev_attr.attr)
-@@ -428,7 +428,7 @@ static int isl29028_chip_init(struct isl29028_chip *chip)
- chip->enable_prox = false;
- chip->prox_sampling = 20;
- chip->lux_scale = 2000;
-- chip->als_ir_mode = MODE_NONE;
-+ chip->als_ir_mode = ISL29028_MODE_NONE;
-
- ret = regmap_write(chip->regmap, ISL29028_REG_TEST1_MODE, 0x0);
- if (ret < 0) {
-@@ -462,7 +462,7 @@ static int isl29028_chip_init(struct isl29028_chip *chip)
- return ret;
- }
-
--static bool is_volatile_reg(struct device *dev, unsigned int reg)
-+static bool isl29028_is_volatile_reg(struct device *dev, unsigned int reg)
- {
- switch (reg) {
- case ISL29028_REG_INTERRUPT:
-@@ -478,7 +478,7 @@ static bool is_volatile_reg(struct device *dev, unsigned int reg)
- static const struct regmap_config isl29028_regmap_config = {
- .reg_bits = 8,
- .val_bits = 8,
-- .volatile_reg = is_volatile_reg,
-+ .volatile_reg = isl29028_is_volatile_reg,
- .max_register = ISL29028_NUM_REGS - 1,
- .num_reg_defaults_raw = ISL29028_NUM_REGS,
- .cache_type = REGCACHE_RBTREE,
-@@ -546,7 +546,6 @@ static const struct of_device_id isl29028_of_match[] = {
- MODULE_DEVICE_TABLE(of, isl29028_of_match);
-
- static struct i2c_driver isl29028_driver = {
-- .class = I2C_CLASS_HWMON,
- .driver = {
- .name = "isl29028",
- .of_match_table = isl29028_of_match,
-diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/staging/iio/light/tsl2583.c
-index 05b4ad4..08f1583 100644
---- a/drivers/staging/iio/light/tsl2583.c
-+++ b/drivers/staging/iio/light/tsl2583.c
-@@ -803,7 +803,7 @@ static struct attribute *sysfs_attrs_ctrl[] = {
- NULL
- };
-
--static struct attribute_group tsl2583_attribute_group = {
-+static const struct attribute_group tsl2583_attribute_group = {
- .attrs = sysfs_attrs_ctrl,
- };
-
-diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c
-index c46bef64..1730959 100644
---- a/drivers/staging/iio/meter/ade7754.c
-+++ b/drivers/staging/iio/meter/ade7754.c
-@@ -23,9 +23,7 @@
- #include "meter.h"
- #include "ade7754.h"
-
--static int ade7754_spi_write_reg_8(struct device *dev,
-- u8 reg_address,
-- u8 val)
-+static int ade7754_spi_write_reg_8(struct device *dev, u8 reg_address, u8 val)
- {
- int ret;
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-@@ -42,8 +40,7 @@ static int ade7754_spi_write_reg_8(struct device *dev,
- }
-
- static int ade7754_spi_write_reg_16(struct device *dev,
-- u8 reg_address,
-- u16 value)
-+ u8 reg_address, u16 value)
- {
- int ret;
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-@@ -59,9 +56,7 @@ static int ade7754_spi_write_reg_16(struct device *dev,
- return ret;
- }
-
--static int ade7754_spi_read_reg_8(struct device *dev,
-- u8 reg_address,
-- u8 *val)
-+static int ade7754_spi_read_reg_8(struct device *dev, u8 reg_address, u8 *val)
- {
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
- struct ade7754_state *st = iio_priv(indio_dev);
-@@ -70,7 +65,7 @@ static int ade7754_spi_read_reg_8(struct device *dev,
- ret = spi_w8r8(st->us, ADE7754_READ_REG(reg_address));
- if (ret < 0) {
- dev_err(&st->us->dev, "problem when reading 8 bit register 0x%02X",
-- reg_address);
-+ reg_address);
- return ret;
- }
- *val = ret;
-@@ -79,8 +74,7 @@ static int ade7754_spi_read_reg_8(struct device *dev,
- }
-
- static int ade7754_spi_read_reg_16(struct device *dev,
-- u8 reg_address,
-- u16 *val)
-+ u8 reg_address, u16 *val)
- {
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
- struct ade7754_state *st = iio_priv(indio_dev);
-@@ -99,8 +93,7 @@ static int ade7754_spi_read_reg_16(struct device *dev,
- }
-
- static int ade7754_spi_read_reg_24(struct device *dev,
-- u8 reg_address,
-- u32 *val)
-+ u8 reg_address, u32 *val)
- {
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
- struct ade7754_state *st = iio_priv(indio_dev);
-@@ -123,7 +116,7 @@ static int ade7754_spi_read_reg_24(struct device *dev,
- ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers));
- if (ret) {
- dev_err(&st->us->dev, "problem when reading 24 bit register 0x%02X",
-- reg_address);
-+ reg_address);
- goto error_ret;
- }
- *val = (st->rx[1] << 16) | (st->rx[2] << 8) | st->rx[3];
-@@ -134,8 +127,8 @@ error_ret:
- }
-
- static ssize_t ade7754_read_8bit(struct device *dev,
-- struct device_attribute *attr,
-- char *buf)
-+ struct device_attribute *attr,
-+ char *buf)
- {
- int ret;
- u8 val = 0;
-@@ -149,8 +142,8 @@ static ssize_t ade7754_read_8bit(struct device *dev,
- }
-
- static ssize_t ade7754_read_16bit(struct device *dev,
-- struct device_attribute *attr,
-- char *buf)
-+ struct device_attribute *attr,
-+ char *buf)
- {
- int ret;
- u16 val = 0;
-@@ -164,8 +157,8 @@ static ssize_t ade7754_read_16bit(struct device *dev,
- }
-
- static ssize_t ade7754_read_24bit(struct device *dev,
-- struct device_attribute *attr,
-- char *buf)
-+ struct device_attribute *attr,
-+ char *buf)
- {
- int ret;
- u32 val = 0;
-@@ -179,9 +172,9 @@ static ssize_t ade7754_read_24bit(struct device *dev,
- }
-
- static ssize_t ade7754_write_8bit(struct device *dev,
-- struct device_attribute *attr,
-- const char *buf,
-- size_t len)
-+ struct device_attribute *attr,
-+ const char *buf,
-+ size_t len)
- {
- struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
- int ret;
-@@ -197,9 +190,9 @@ error_ret:
- }
-
- static ssize_t ade7754_write_16bit(struct device *dev,
-- struct device_attribute *attr,
-- const char *buf,
-- size_t len)
-+ struct device_attribute *attr,
-+ const char *buf,
-+ size_t len)
- {
- struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
- int ret;
-@@ -403,16 +396,14 @@ err_ret:
- }
-
- static ssize_t ade7754_read_frequency(struct device *dev,
-- struct device_attribute *attr,
-- char *buf)
-+ struct device_attribute *attr,
-+ char *buf)
- {
- int ret;
- u8 t;
- int sps;
-
-- ret = ade7754_spi_read_reg_8(dev,
-- ADE7754_WAVMODE,
-- &t);
-+ ret = ade7754_spi_read_reg_8(dev, ADE7754_WAVMODE, &t);
- if (ret)
- return ret;
-
-@@ -423,9 +414,9 @@ static ssize_t ade7754_read_frequency(struct device *dev,
- }
-
- static ssize_t ade7754_write_frequency(struct device *dev,
-- struct device_attribute *attr,
-- const char *buf,
-- size_t len)
-+ struct device_attribute *attr,
-+ const char *buf,
-+ size_t len)
- {
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
- struct ade7754_state *st = iio_priv(indio_dev);
-diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c
-index a6b76d4..57c213d 100644
---- a/drivers/staging/iio/meter/ade7758_ring.c
-+++ b/drivers/staging/iio/meter/ade7758_ring.c
-@@ -38,18 +38,14 @@ static int ade7758_write_waveform_type(struct device *dev, unsigned int type)
- int ret;
- u8 reg;
-
-- ret = ade7758_spi_read_reg_8(dev,
-- ADE7758_WAVMODE,
-- ®);
-+ ret = ade7758_spi_read_reg_8(dev, ADE7758_WAVMODE, ®);
- if (ret)
- goto out;
-
- reg &= ~0x1F;
- reg |= type & 0x1F;
-
-- ret = ade7758_spi_write_reg_8(dev,
-- ADE7758_WAVMODE,
-- reg);
-+ ret = ade7758_spi_write_reg_8(dev, ADE7758_WAVMODE, reg);
- out:
- return ret;
- }
-@@ -94,7 +90,7 @@ static int ade7758_ring_preenable(struct iio_dev *indio_dev)
- indio_dev->masklength);
-
- ade7758_write_waveform_type(&indio_dev->dev,
-- indio_dev->channels[channel].address);
-+ indio_dev->channels[channel].address);
-
- return 0;
- }
-diff --git a/drivers/staging/iio/meter/ade7854.c b/drivers/staging/iio/meter/ade7854.c
-index 75e8685..24edbc3 100644
---- a/drivers/staging/iio/meter/ade7854.c
-+++ b/drivers/staging/iio/meter/ade7854.c
-@@ -23,8 +23,8 @@
- #include "ade7854.h"
-
- static ssize_t ade7854_read_8bit(struct device *dev,
-- struct device_attribute *attr,
-- char *buf)
-+ struct device_attribute *attr,
-+ char *buf)
- {
- int ret;
- u8 val = 0;
-@@ -40,8 +40,8 @@ static ssize_t ade7854_read_8bit(struct device *dev,
- }
-
- static ssize_t ade7854_read_16bit(struct device *dev,
-- struct device_attribute *attr,
-- char *buf)
-+ struct device_attribute *attr,
-+ char *buf)
- {
- int ret;
- u16 val = 0;
-@@ -57,8 +57,8 @@ static ssize_t ade7854_read_16bit(struct device *dev,
- }
-
- static ssize_t ade7854_read_24bit(struct device *dev,
-- struct device_attribute *attr,
-- char *buf)
-+ struct device_attribute *attr,
-+ char *buf)
- {
- int ret;
- u32 val;
-@@ -74,8 +74,8 @@ static ssize_t ade7854_read_24bit(struct device *dev,
- }
-
- static ssize_t ade7854_read_32bit(struct device *dev,
-- struct device_attribute *attr,
-- char *buf)
-+ struct device_attribute *attr,
-+ char *buf)
- {
- int ret;
- u32 val = 0;
-@@ -91,9 +91,9 @@ static ssize_t ade7854_read_32bit(struct device *dev,
- }
-
- static ssize_t ade7854_write_8bit(struct device *dev,
-- struct device_attribute *attr,
-- const char *buf,
-- size_t len)
-+ struct device_attribute *attr,
-+ const char *buf,
-+ size_t len)
- {
- struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-@@ -112,9 +112,9 @@ error_ret:
- }
-
- static ssize_t ade7854_write_16bit(struct device *dev,
-- struct device_attribute *attr,
-- const char *buf,
-- size_t len)
-+ struct device_attribute *attr,
-+ const char *buf,
-+ size_t len)
- {
- struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-@@ -133,9 +133,9 @@ error_ret:
- }
-
- static ssize_t ade7854_write_24bit(struct device *dev,
-- struct device_attribute *attr,
-- const char *buf,
-- size_t len)
-+ struct device_attribute *attr,
-+ const char *buf,
-+ size_t len)
- {
- struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-@@ -154,9 +154,9 @@ error_ret:
- }
-
- static ssize_t ade7854_write_32bit(struct device *dev,
-- struct device_attribute *attr,
-- const char *buf,
-- size_t len)
-+ struct device_attribute *attr,
-+ const char *buf,
-+ size_t len)
- {
- struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
- struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-diff --git a/include/linux/hid-sensor-hub.h b/include/linux/hid-sensor-hub.h
-index c02b5ce..dd85f35 100644
---- a/include/linux/hid-sensor-hub.h
-+++ b/include/linux/hid-sensor-hub.h
-@@ -236,6 +236,7 @@ struct hid_sensor_common {
- struct hid_sensor_hub_attribute_info report_state;
- struct hid_sensor_hub_attribute_info power_state;
- struct hid_sensor_hub_attribute_info sensitivity;
-+ struct work_struct work;
- };
-
- /* Convert from hid unit expo to regular exponent */
-diff --git a/include/linux/iio/consumer.h b/include/linux/iio/consumer.h
-index 3d672f7..9edccfb 100644
---- a/include/linux/iio/consumer.h
-+++ b/include/linux/iio/consumer.h
-@@ -165,6 +165,18 @@ struct iio_channel
- *iio_channel_cb_get_channels(const struct iio_cb_buffer *cb_buffer);
-
- /**
-+ * iio_channel_cb_get_iio_dev() - get access to the underlying device.
-+ * @cb_buffer: The callback buffer from whom we want the device
-+ * information.
-+ *
-+ * This function allows one to obtain information about the device.
-+ * The primary aim is to allow drivers that are consuming a device to query
-+ * things like current trigger.
-+ */
-+struct iio_dev
-+*iio_channel_cb_get_iio_dev(const struct iio_cb_buffer *cb_buffer);
-+
-+/**
- * iio_read_channel_raw() - read from a given channel
- * @chan: The channel being queried.
- * @val: Value read back.
-diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
-index 854e2da..b4a0679 100644
---- a/include/linux/iio/iio.h
-+++ b/include/linux/iio/iio.h
-@@ -483,6 +483,7 @@ struct iio_buffer_setup_ops {
- * @scan_timestamp: [INTERN] set if any buffers have requested timestamp
- * @scan_index_timestamp:[INTERN] cache of the index to the timestamp
- * @trig: [INTERN] current device trigger (buffer modes)
-+ * @trig_readonly [INTERN] mark the current trigger immutable
- * @pollfunc: [DRIVER] function run on trigger being received
- * @pollfunc_event: [DRIVER] function run on events trigger being received
- * @channels: [DRIVER] channel specification structure table
-@@ -523,6 +524,7 @@ struct iio_dev {
- bool scan_timestamp;
- unsigned scan_index_timestamp;
- struct iio_trigger *trig;
-+ bool trig_readonly;
- struct iio_poll_func *pollfunc;
- struct iio_poll_func *pollfunc_event;
-
-@@ -642,6 +644,7 @@ static inline struct iio_dev *iio_priv_to_dev(void *priv)
- }
-
- void iio_device_free(struct iio_dev *indio_dev);
-+int devm_iio_device_match(struct device *dev, void *res, void *data);
- struct iio_dev *devm_iio_device_alloc(struct device *dev, int sizeof_priv);
- void devm_iio_device_free(struct device *dev, struct iio_dev *indio_dev);
- struct iio_trigger *devm_iio_trigger_alloc(struct device *dev,
-diff --git a/include/linux/iio/trigger.h b/include/linux/iio/trigger.h
-index 1c9e028..4f1154f 100644
---- a/include/linux/iio/trigger.h
-+++ b/include/linux/iio/trigger.h
-@@ -56,6 +56,9 @@ struct iio_trigger_ops {
- * @subirqs: [INTERN] information about the 'child' irqs.
- * @pool: [INTERN] bitmap of irqs currently in use.
- * @pool_lock: [INTERN] protection of the irq pool.
-+ * @attached_own_device:[INTERN] if we are using our own device as trigger,
-+ * i.e. if we registered a poll function to the same
-+ * device as the one providing the trigger.
- **/
- struct iio_trigger {
- const struct iio_trigger_ops *ops;
-@@ -73,6 +76,7 @@ struct iio_trigger {
- struct iio_subirq subirqs[CONFIG_IIO_CONSUMERS_PER_TRIGGER];
- unsigned long pool[BITS_TO_LONGS(CONFIG_IIO_CONSUMERS_PER_TRIGGER)];
- struct mutex pool_lock;
-+ bool attached_own_device;
- };
-
-
-@@ -125,12 +129,27 @@ static inline void *iio_trigger_get_drvdata(struct iio_trigger *trig)
- **/
- int iio_trigger_register(struct iio_trigger *trig_info);
-
-+int devm_iio_trigger_register(struct device *dev,
-+ struct iio_trigger *trig_info);
-+
- /**
- * iio_trigger_unregister() - unregister a trigger from the core
- * @trig_info: trigger to be unregistered
- **/
- void iio_trigger_unregister(struct iio_trigger *trig_info);
-
-+void devm_iio_trigger_unregister(struct device *dev,
-+ struct iio_trigger *trig_info);
-+
-+/**
-+ * iio_trigger_set_immutable() - set an immutable trigger on destination
-+ *
-+ * @indio_dev - IIO device structure containing the device
-+ * @trig - trigger to assign to device
-+ *
-+ **/
-+int iio_trigger_set_immutable(struct iio_dev *indio_dev, struct iio_trigger *trig);
-+
- /**
- * iio_trigger_poll() - called on a trigger occurring
- * @trig: trigger which occurred
-@@ -145,6 +164,13 @@ irqreturn_t iio_trigger_generic_data_rdy_poll(int irq, void *private);
- __printf(1, 2) struct iio_trigger *iio_trigger_alloc(const char *fmt, ...);
- void iio_trigger_free(struct iio_trigger *trig);
-
-+/**
-+ * iio_trigger_using_own() - tells us if we use our own HW trigger ourselves
-+ * @indio_dev: device to check
-+ */
-+bool iio_trigger_using_own(struct iio_dev *indio_dev);
-+
-+
- #else
- struct iio_trigger;
- struct iio_trigger_ops;
-diff --git a/include/linux/iio/triggered_buffer.h b/include/linux/iio/triggered_buffer.h
-index f72f70d..3014561 100644
---- a/include/linux/iio/triggered_buffer.h
-+++ b/include/linux/iio/triggered_buffer.h
-@@ -12,4 +12,12 @@ int iio_triggered_buffer_setup(struct iio_dev *indio_dev,
- const struct iio_buffer_setup_ops *setup_ops);
- void iio_triggered_buffer_cleanup(struct iio_dev *indio_dev);
-
-+int devm_iio_triggered_buffer_setup(struct device *dev,
-+ struct iio_dev *indio_dev,
-+ irqreturn_t (*h)(int irq, void *p),
-+ irqreturn_t (*thread)(int irq, void *p),
-+ const struct iio_buffer_setup_ops *ops);
-+void devm_iio_triggered_buffer_cleanup(struct device *dev,
-+ struct iio_dev *indio_dev);
-+
- #endif
---
-2.9.3
-
diff --git a/patches/beaglebone/abbbi/0003-ARM-dts-add-Arrow-BeagleBone-Black-Industrial-dts.patch b/patches/beaglebone/abbbi/0003-ARM-dts-add-Arrow-BeagleBone-Black-Industrial-dts.patch
index c05ce2719ad643b82d510868bd1f64fe42cca39c..1f83a54886ad4e84601b25a6c2a16de65d1f24fb 100644
--- a/patches/beaglebone/abbbi/0003-ARM-dts-add-Arrow-BeagleBone-Black-Industrial-dts.patch
+++ b/patches/beaglebone/abbbi/0003-ARM-dts-add-Arrow-BeagleBone-Black-Industrial-dts.patch
@@ -32,7 +32,7 @@ index 0000000..cc9b1f4
+
+#include "am33xx.dtsi"
+#include "am335x-bone-common.dtsi"
-+#include "am33xx-overlay-edma-fix.dtsi"
++
+
+/ {
+ model = "Arrow BeagleBone Black Industrial";
diff --git a/patches/beaglebone/dtbs/0001-sync-am335x-peripheral-pinmux.patch b/patches/beaglebone/dtbs/0001-sync-am335x-peripheral-pinmux.patch
index eafc50dfc4f156f1beb96daba3512c7144ca5f43..2a20c811f351008feab1614a7a4913caefeac073 100644
--- a/patches/beaglebone/dtbs/0001-sync-am335x-peripheral-pinmux.patch
+++ b/patches/beaglebone/dtbs/0001-sync-am335x-peripheral-pinmux.patch
@@ -1,11 +1,10 @@
-From 1d0d049aae911e253ca570d12ca8477b7e75b899 Mon Sep 17 00:00:00 2001
+From a3aa7009f8f04465fad4dfc7d61e99bcbce97874 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Wed, 5 Oct 2016 14:45:07 -0500
+Date: Wed, 12 Oct 2016 11:35:36 -0500
Subject: [PATCH] sync: am335x-peripheral/pinmux
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
- arch/arm/boot/dts/am335x-abbbi.dts | 29 +++--
arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi | 18 ++++
arch/arm/boot/dts/am335x-bone-pinmux-can1.dtsi | 45 ++++++++
arch/arm/boot/dts/am335x-bone-pinmux-emmc.dtsi | 88 +++++++++++++++
@@ -15,19 +14,13 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
arch/arm/boot/dts/am335x-bone-pinmux-spi1.dtsi | 27 +++++
arch/arm/boot/dts/am335x-bone-pinmux-spi1a.dtsi | 28 +++++
arch/arm/boot/dts/am335x-bone-pinmux-ttyS5.dtsi | 48 +++++++++
- arch/arm/boot/dts/am335x-boneblack-audio.dts | 25 +++--
- arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts | 11 +-
- arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts | 11 +-
- arch/arm/boot/dts/am335x-boneblack-bbbmini.dts | 15 ++-
- .../boot/dts/am335x-boneblack-cape-bone-argus.dts | 15 ++-
- .../arm/boot/dts/am335x-boneblack-emmc-overlay.dts | 11 +-
- .../arm/boot/dts/am335x-boneblack-hdmi-overlay.dts | 16 ++-
- .../boot/dts/am335x-boneblack-nhdmi-overlay.dts | 16 ++-
- arch/arm/boot/dts/am335x-boneblack-overlay.dts | 11 +-
- arch/arm/boot/dts/am335x-boneblack-wl1835mod.dts | 15 ++-
- arch/arm/boot/dts/am335x-boneblack.dts | 4 -
+ arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts | 4 -
+ arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts | 4 -
+ arch/arm/boot/dts/am335x-boneblack-bbbmini.dts | 4 -
+ .../boot/dts/am335x-boneblack-cape-bone-argus.dts | 4 -
+ arch/arm/boot/dts/am335x-boneblack-overlay.dts | 13 ++-
+ arch/arm/boot/dts/am335x-boneblack-wl1835mod.dts | 4 -
arch/arm/boot/dts/am335x-boneblue.dts | 82 +++++++-------
- arch/arm/boot/dts/am335x-bonegreen-overlay.dts | 4 -
arch/arm/boot/dts/am335x-cape-rtc-ds1307.dtsi | 31 ++++++
arch/arm/boot/dts/am335x-peripheral-can1.dtsi | 13 +++
arch/arm/boot/dts/am335x-peripheral-emmc.dtsi | 15 +++
@@ -37,8 +30,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
arch/arm/boot/dts/am335x-peripheral-spi1.dtsi | 13 +++
arch/arm/boot/dts/am335x-peripheral-spi1a.dtsi | 13 +++
arch/arm/boot/dts/am335x-peripheral-ttyS5.dtsi | 13 +++
- arch/arm/boot/dts/am335x-sancloud-bbe.dts | 4 -
- 33 files changed, 795 insertions(+), 97 deletions(-)
+ 25 files changed, 674 insertions(+), 64 deletions(-)
create mode 100644 arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi
create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-can1.dtsi
create mode 100644 arch/arm/boot/dts/am335x-bone-pinmux-emmc.dtsi
@@ -58,59 +50,6 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
create mode 100644 arch/arm/boot/dts/am335x-peripheral-spi1a.dtsi
create mode 100644 arch/arm/boot/dts/am335x-peripheral-ttyS5.dtsi
-diff --git a/arch/arm/boot/dts/am335x-abbbi.dts b/arch/arm/boot/dts/am335x-abbbi.dts
-index cc9b1f4..accf950 100644
---- a/arch/arm/boot/dts/am335x-abbbi.dts
-+++ b/arch/arm/boot/dts/am335x-abbbi.dts
-@@ -35,6 +35,17 @@
- status = "okay";
- };
-
-+&cpu0_opp_table {
-+ /*
-+ * All PG 2.0 silicon may not support 1GHz but some of the early
-+ * BeagleBone Blacks have PG 2.0 silicon which is guaranteed
-+ * to support 1GHz OPP so enable it for PG 2.0 on this board.
-+ */
-+ oppnitro@1000000000 {
-+ opp-supported-hw = <0x06 0x0100>;
-+ };
-+};
-+
- &am33xx_pinmux {
- adi_hdmi_bbbi_pins: adi_hdmi_bbbi_pins {
- pinctrl-single,pins = <
-@@ -129,21 +140,21 @@
-
- / {
- clk_mcasp0_fixed: clk_mcasp0_fixed {
-- #clock-cells = <0>;
-- compatible = "fixed-clock";
-- clock-frequency = <24576000>;
-+ #clock-cells = <0>;
-+ compatible = "fixed-clock";
-+ clock-frequency = <24576000>;
- };
-
- clk_mcasp0: clk_mcasp0 {
-- #clock-cells = <0>;
-- compatible = "gpio-gate-clock";
-- clocks = <&clk_mcasp0_fixed>;
-- enable-gpios = <&gpio1 27 0>; /* BeagleBone Black Clk enable on GPIO1_27 */
-+ #clock-cells = <0>;
-+ compatible = "gpio-gate-clock";
-+ clocks = <&clk_mcasp0_fixed>;
-+ enable-gpios = <&gpio1 27 0>; /* BeagleBone Black Clk enable on GPIO1_27 */
- };
-
- hdmi_audio: hdmi_audio@0 {
-- compatible = "linux,hdmi-audio";
-- status = "okay";
-+ compatible = "linux,hdmi-audio";
-+ status = "okay";
- };
-
- sound {
diff --git a/arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi b/arch/arm/boot/dts/am335x-bone-emmc-in-reset.dtsi
new file mode 100644
index 0000000..7d8f673
@@ -635,116 +574,37 @@ index 0000000..01d0aec
+&uart5 {
+ pinctrl-0 = <&uart5_pins>;
+};
-diff --git a/arch/arm/boot/dts/am335x-boneblack-audio.dts b/arch/arm/boot/dts/am335x-boneblack-audio.dts
-index cac3626..44e9f9c 100644
---- a/arch/arm/boot/dts/am335x-boneblack-audio.dts
-+++ b/arch/arm/boot/dts/am335x-boneblack-audio.dts
-@@ -15,16 +15,16 @@
- compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
-
- clk_mcasp0_fixed: clk_mcasp0_fixed {
-- #clock-cells = <0>;
-- compatible = "fixed-clock";
-- clock-frequency = <24576000>;
-+ #clock-cells = <0>;
-+ compatible = "fixed-clock";
-+ clock-frequency = <24576000>;
- };
-
- clk_mcasp0: clk_mcasp0 {
-- #clock-cells = <0>;
-- compatible = "gpio-gate-clock";
-- clocks = <&clk_mcasp0_fixed>;
-- enable-gpios = <&gpio1 27 GPIO_ACTIVE_HIGH>; /* BeagleBone Black Clk enable on GPIO1_27 */
-+ #clock-cells = <0>;
-+ compatible = "gpio-gate-clock";
-+ clocks = <&clk_mcasp0_fixed>;
-+ enable-gpios = <&gpio1 27 GPIO_ACTIVE_HIGH>; /* BeagleBone Black Clk enable on GPIO1_27 */
- };
- };
-
-@@ -37,3 +37,14 @@
- &mmc1 {
- vmmc-supply = <&vmmcsd_fixed>;
- };
-+
-+&cpu0_opp_table {
-+ /*
-+ * All PG 2.0 silicon may not support 1GHz but some of the early
-+ * BeagleBone Blacks have PG 2.0 silicon which is guaranteed
-+ * to support 1GHz OPP so enable it for PG 2.0 on this board.
-+ */
-+ oppnitro@1000000000 {
-+ opp-supported-hw = <0x06 0x0100>;
-+ };
-+};
diff --git a/arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts b/arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts
-index 857c21e..8d795c0 100644
+index 857c21e..30667ee 100644
--- a/arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-bbb-exp-c.dts
-@@ -33,8 +33,15 @@
+@@ -33,8 +33,4 @@
status = "okay";
};
-&rtc {
- system-power-controller;
-+&cpu0_opp_table {
-+ /*
-+ * All PG 2.0 silicon may not support 1GHz but some of the early
-+ * BeagleBone Blacks have PG 2.0 silicon which is guaranteed
-+ * to support 1GHz OPP so enable it for PG 2.0 on this board.
-+ */
-+ oppnitro@1000000000 {
-+ opp-supported-hw = <0x06 0x0100>;
-+ };
- };
-
+-};
+-
#include "am335x-cape-bbb-exp-c.dtsi"
diff --git a/arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts b/arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts
-index b834fa2..5df881e 100644
+index b834fa2..8bfba37 100644
--- a/arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-bbb-exp-r.dts
-@@ -33,8 +33,15 @@
+@@ -33,8 +33,4 @@
status = "okay";
};
-&rtc {
- system-power-controller;
-+&cpu0_opp_table {
-+ /*
-+ * All PG 2.0 silicon may not support 1GHz but some of the early
-+ * BeagleBone Blacks have PG 2.0 silicon which is guaranteed
-+ * to support 1GHz OPP so enable it for PG 2.0 on this board.
-+ */
-+ oppnitro@1000000000 {
-+ opp-supported-hw = <0x06 0x0100>;
-+ };
- };
-
+-};
+-
#include "am335x-cape-bbb-exp-r.dtsi"
diff --git a/arch/arm/boot/dts/am335x-boneblack-bbbmini.dts b/arch/arm/boot/dts/am335x-boneblack-bbbmini.dts
-index adb317c..5ed89a2 100644
+index adb317c..d267689 100644
--- a/arch/arm/boot/dts/am335x-boneblack-bbbmini.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-bbbmini.dts
-@@ -37,6 +37,17 @@
- status = "okay";
- };
-
-+&cpu0_opp_table {
-+ /*
-+ * All PG 2.0 silicon may not support 1GHz but some of the early
-+ * BeagleBone Blacks have PG 2.0 silicon which is guaranteed
-+ * to support 1GHz OPP so enable it for PG 2.0 on this board.
-+ */
-+ oppnitro@1000000000 {
-+ opp-supported-hw = <0x06 0x0100>;
-+ };
-+};
-+
- &am33xx_pinmux {
- dcan1_pins: pinmux_dcan1_pins {
- pinctrl-single,pins = <
-@@ -194,7 +205,3 @@
+@@ -194,7 +194,3 @@
pinctrl-0 = <&uart5_pins>;
status = "okay";
};
@@ -753,28 +613,10 @@ index adb317c..5ed89a2 100644
- system-power-controller;
-};
diff --git a/arch/arm/boot/dts/am335x-boneblack-cape-bone-argus.dts b/arch/arm/boot/dts/am335x-boneblack-cape-bone-argus.dts
-index cecb0fcc..c97c912 100644
+index cecb0fcc..7318ac6 100644
--- a/arch/arm/boot/dts/am335x-boneblack-cape-bone-argus.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-cape-bone-argus.dts
-@@ -33,6 +33,17 @@
- status = "okay";
- };
-
-+&cpu0_opp_table {
-+ /*
-+ * All PG 2.0 silicon may not support 1GHz but some of the early
-+ * BeagleBone Blacks have PG 2.0 silicon which is guaranteed
-+ * to support 1GHz OPP so enable it for PG 2.0 on this board.
-+ */
-+ oppnitro@1000000000 {
-+ opp-supported-hw = <0x06 0x0100>;
-+ };
-+};
-+
- &am33xx_pinmux {
- nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {
- pinctrl-single,pins = <
-@@ -91,8 +102,4 @@
+@@ -91,8 +91,4 @@
};
};
@@ -783,110 +625,29 @@ index cecb0fcc..c97c912 100644
-};
-
#include "am335x-bone-argus.dtsi"
-diff --git a/arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts
-index 5946a7e..3859359 100644
---- a/arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts
-+++ b/arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts
-@@ -34,6 +34,13 @@
- status = "okay";
- };
-
--&rtc {
-- system-power-controller;
-+&cpu0_opp_table {
-+ /*
-+ * All PG 2.0 silicon may not support 1GHz but some of the early
-+ * BeagleBone Blacks have PG 2.0 silicon which is guaranteed
-+ * to support 1GHz OPP so enable it for PG 2.0 on this board.
-+ */
-+ oppnitro@1000000000 {
-+ opp-supported-hw = <0x06 0x0100>;
-+ };
- };
-diff --git a/arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts
-index 9b0a7ba..4c3a477 100644
---- a/arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts
-+++ b/arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts
-@@ -36,6 +36,18 @@
- };
- };
-
-+
-+&cpu0_opp_table {
-+ /*
-+ * All PG 2.0 silicon may not support 1GHz but some of the early
-+ * BeagleBone Blacks have PG 2.0 silicon which is guaranteed
-+ * to support 1GHz OPP so enable it for PG 2.0 on this board.
-+ */
-+ oppnitro@1000000000 {
-+ opp-supported-hw = <0x06 0x0100>;
-+ };
-+};
-+
- &am33xx_pinmux {
- nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {
- pinctrl-single,pins = <
-@@ -93,7 +105,3 @@
- };
- };
- };
--
--&rtc {
-- system-power-controller;
--};
-diff --git a/arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts
-index 9b0a7ba..4c3a477 100644
---- a/arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts
-+++ b/arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts
-@@ -36,6 +36,18 @@
- };
- };
-
-+
-+&cpu0_opp_table {
-+ /*
-+ * All PG 2.0 silicon may not support 1GHz but some of the early
-+ * BeagleBone Blacks have PG 2.0 silicon which is guaranteed
-+ * to support 1GHz OPP so enable it for PG 2.0 on this board.
-+ */
-+ oppnitro@1000000000 {
-+ opp-supported-hw = <0x06 0x0100>;
-+ };
-+};
-+
- &am33xx_pinmux {
- nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {
- pinctrl-single,pins = <
-@@ -93,7 +105,3 @@
- };
- };
- };
--
--&rtc {
-- system-power-controller;
--};
diff --git a/arch/arm/boot/dts/am335x-boneblack-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-overlay.dts
-index 880629c..d8dece7 100644
+index f4f0c10..11df99b 100644
--- a/arch/arm/boot/dts/am335x-boneblack-overlay.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-overlay.dts
-@@ -36,6 +36,13 @@
+@@ -37,6 +37,13 @@
};
};
-&rtc {
- system-power-controller;
-+&cpu0_opp_table {
-+ /*
-+ * All PG 2.0 silicon may not support 1GHz but some of the early
-+ * BeagleBone Blacks have PG 2.0 silicon which is guaranteed
-+ * to support 1GHz OPP so enable it for PG 2.0 on this board.
-+ */
-+ oppnitro@1000000000 {
-+ opp-supported-hw = <0x06 0x0100>;
-+ };
- };
+-};
++//&cpu0_opp_table {
++// /*
++// * All PG 2.0 silicon may not support 1GHz but some of the early
++// * BeagleBone Blacks have PG 2.0 silicon which is guaranteed
++// * to support 1GHz OPP so enable it for PG 2.0 on this board.
++// */
++// oppnitro@1000000000 {
++// opp-supported-hw = <0x06 0x0100>;
++// };
++//};
diff --git a/arch/arm/boot/dts/am335x-boneblack-wl1835mod.dts b/arch/arm/boot/dts/am335x-boneblack-wl1835mod.dts
-index e376613..f35b64a 100644
+index e376613..cf1e3a9 100644
--- a/arch/arm/boot/dts/am335x-boneblack-wl1835mod.dts
+++ b/arch/arm/boot/dts/am335x-boneblack-wl1835mod.dts
@@ -25,10 +25,6 @@
@@ -900,39 +661,11 @@ index e376613..f35b64a 100644
/* EMMC in reset */
&gpio1 {
emmc_rst {
-@@ -39,4 +35,15 @@
- };
- };
-
-+&cpu0_opp_table {
-+ /*
-+ * All PG 2.0 silicon may not support 1GHz but some of the early
-+ * BeagleBone Blacks have PG 2.0 silicon which is guaranteed
-+ * to support 1GHz OPP so enable it for PG 2.0 on this board.
-+ */
-+ oppnitro@1000000000 {
-+ opp-supported-hw = <0x06 0x0100>;
-+ };
-+};
-+
- #include "am335x-boneblack-wl1835mod-cape.dtsi"
-diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
-index 3def91b..525a25a 100644
---- a/arch/arm/boot/dts/am335x-boneblack.dts
-+++ b/arch/arm/boot/dts/am335x-boneblack.dts
-@@ -103,7 +103,3 @@
- };
- };
- };
--
--&rtc {
-- system-power-controller;
--};
diff --git a/arch/arm/boot/dts/am335x-boneblue.dts b/arch/arm/boot/dts/am335x-boneblue.dts
-index 36b5676..0c7528f 100644
+index 10db73a..8a853d6 100644
--- a/arch/arm/boot/dts/am335x-boneblue.dts
+++ b/arch/arm/boot/dts/am335x-boneblue.dts
-@@ -180,47 +180,47 @@
+@@ -172,47 +172,47 @@
};
@@ -1021,18 +754,6 @@ index 36b5676..0c7528f 100644
/****************************************
-diff --git a/arch/arm/boot/dts/am335x-bonegreen-overlay.dts b/arch/arm/boot/dts/am335x-bonegreen-overlay.dts
-index b87a606..da54bf3 100644
---- a/arch/arm/boot/dts/am335x-bonegreen-overlay.dts
-+++ b/arch/arm/boot/dts/am335x-bonegreen-overlay.dts
-@@ -35,7 +35,3 @@
- line-name = "EMMC ResetN";
- };
- };
--
--&rtc {
-- system-power-controller;
--};
diff --git a/arch/arm/boot/dts/am335x-cape-rtc-ds1307.dtsi b/arch/arm/boot/dts/am335x-cape-rtc-ds1307.dtsi
new file mode 100644
index 0000000..bce6ac5
@@ -1240,18 +961,6 @@ index 0000000..8b42fb0
+
+ status = "okay";
+};
-diff --git a/arch/arm/boot/dts/am335x-sancloud-bbe.dts b/arch/arm/boot/dts/am335x-sancloud-bbe.dts
-index 561f98a..0cb95a8 100644
---- a/arch/arm/boot/dts/am335x-sancloud-bbe.dts
-+++ b/arch/arm/boot/dts/am335x-sancloud-bbe.dts
-@@ -199,7 +199,3 @@
- //orientation = <0xff 0 0 0 1 0 0 0 0xff>;
- };
- };
--
--&rtc {
-- system-power-controller;
--};
--
2.9.3
diff --git a/patches/beaglebone/generated/0001-auto-generated-capes-add-dtbs-to-makefile.patch b/patches/beaglebone/generated/0001-auto-generated-capes-add-dtbs-to-makefile.patch
index 896f3bcfedd099f622704420710e414b027ae5cd..b22e5a1f6cd924e529aa23a1fe801893e178f2bf 100644
--- a/patches/beaglebone/generated/0001-auto-generated-capes-add-dtbs-to-makefile.patch
+++ b/patches/beaglebone/generated/0001-auto-generated-capes-add-dtbs-to-makefile.patch
@@ -1,24 +1,25 @@
-From 19e40c1fca4f6cca8141bd88bb6667320bf2df20 Mon Sep 17 00:00:00 2001
+From 48118fdb4cccf7f64ca238476e23b40fce072f31 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Wed, 5 Oct 2016 14:46:09 -0500
+Date: Wed, 12 Oct 2016 09:31:03 -0500
Subject: [PATCH] auto generated: capes: add dtbs to makefile
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
- arch/arm/boot/dts/Makefile | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
+ arch/arm/boot/dts/Makefile | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index a891417..63c8f7d 100644
+index f7bb3ab..39413c5 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
-@@ -545,6 +545,26 @@ dtb-$(CONFIG_SOC_AM33XX) += \
+@@ -556,6 +556,27 @@ dtb-$(CONFIG_SOC_AM33XX) += \
am335x-base0033.dtb \
am335x-bone.dtb \
am335x-boneblack.dtb \
+ am335x-arduino-tre.dtb \
+ am335x-sancloud-bbe.dtb \
+ am335x-boneblue.dtb \
++ am335x-boneblack-wireless-emmc-overlay.dtb \
+ am335x-boneblack-wireless.dtb \
+ am335x-bonegreen-wireless-led-hack.dtb \
+ am335x-bonegreen-wireless.dtb \
diff --git a/patches/beaglebone/pinmux-helper/0004-gpio-Introduce-GPIO-OF-helper.patch b/patches/beaglebone/pinmux-helper/0004-gpio-Introduce-GPIO-OF-helper.patch
index 4cba43fbb998f462ccb11c1c25d5b3b2e0635064..21b95a327c9ba9026ab61232e2dc245294bac6a2 100644
--- a/patches/beaglebone/pinmux-helper/0004-gpio-Introduce-GPIO-OF-helper.patch
+++ b/patches/beaglebone/pinmux-helper/0004-gpio-Introduce-GPIO-OF-helper.patch
@@ -13,10 +13,10 @@ DT.
create mode 100644 drivers/gpio/gpio-of-helper.c
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
-index 24caedb..356d77e 100644
+index 26ee00f..25e9b24 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
-@@ -86,6 +86,20 @@ config GPIO_SYSFS
+@@ -65,6 +65,20 @@ config GPIO_SYSFS
Kernel drivers may also request that a particular GPIO be
exported to userspace; this can be useful when debugging.
@@ -35,10 +35,10 @@ index 24caedb..356d77e 100644
+ and others.
+
config GPIO_GENERIC
+ depends on HAS_IOMEM # Only for IOMEM drivers
tristate
-
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
-index 2a035ed..aed419d 100644
+index ab28a2d..70a8887 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_GPIOLIB) += gpiolib-legacy.o
diff --git a/patches/defconfig b/patches/defconfig
index 2706002b07e6eb1511ba517711fe7cec6a67d7a6..459fe8ee87023941779ef9657efd39ea2f6e8772 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.8.1 Kernel Configuration
+# Linux/arm 4.9.0-rc1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -75,6 +75,7 @@ CONFIG_HANDLE_DOMAIN_IRQ=y
# CONFIG_IRQ_DOMAIN_DEBUG is not set
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
CONFIG_GENERIC_TIME_VSYSCALL=y
CONFIG_GENERIC_CLOCKEVENTS=y
@@ -257,6 +258,7 @@ CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_OLD_SIGACTION=y
# CONFIG_CPU_NO_EFFICIENT_FFS is not set
+# CONFIG_HAVE_ARCH_VMAP_STACK is not set
#
# GCOV-based kernel profiling
@@ -472,6 +474,7 @@ CONFIG_OUTER_CACHE=y
CONFIG_OUTER_CACHE_SYNC=y
CONFIG_MIGHT_HAVE_CACHE_L2X0=y
CONFIG_CACHE_L2X0=y
+CONFIG_CACHE_L2X0_PMU=y
CONFIG_PL310_ERRATA_588369=y
CONFIG_PL310_ERRATA_727915=y
# CONFIG_PL310_ERRATA_753970 is not set
@@ -515,12 +518,9 @@ CONFIG_VMSPLIT_3G=y
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_ARM_PSCI=y
CONFIG_ARCH_NR_GPIO=0
-CONFIG_HAVE_PREEMPT_LAZY=y
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT__LL is not set
-# CONFIG_PREEMPT_RTB is not set
-# CONFIG_PREEMPT_RT_FULL is not set
+# CONFIG_PREEMPT is not set
CONFIG_HZ_FIXED=0
CONFIG_HZ_100=y
# CONFIG_HZ_200 is not set
@@ -672,6 +672,9 @@ CONFIG_BINFMT_ELF=y
CONFIG_ELFCORE=y
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_BINFMT_SCRIPT=y
+CONFIG_BINFMT_FLAT=y
+CONFIG_BINFMT_ZFLAT=y
+CONFIG_BINFMT_SHARED_FLAT=y
# CONFIG_HAVE_AOUT is not set
CONFIG_BINFMT_MISC=m
CONFIG_COREDUMP=y
@@ -777,6 +780,7 @@ CONFIG_TCP_CONG_YEAH=m
CONFIG_TCP_CONG_ILLINOIS=m
CONFIG_TCP_CONG_DCTCP=m
CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
CONFIG_DEFAULT_CUBIC=y
# CONFIG_DEFAULT_RENO is not set
CONFIG_DEFAULT_TCP_CONG="cubic"
@@ -872,9 +876,10 @@ CONFIG_NF_TABLES_INET=m
CONFIG_NF_TABLES_NETDEV=m
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
+CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_HASH=m
+CONFIG_NFT_SET_RBTREE=m
+CONFIG_NFT_SET_HASH=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m
@@ -882,9 +887,11 @@ CONFIG_NFT_MASQ=m
CONFIG_NFT_REDIR=m
CONFIG_NFT_NAT=m
CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
CONFIG_NFT_REJECT=m
CONFIG_NFT_REJECT_INET=m
CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
CONFIG_NF_DUP_NETDEV=m
CONFIG_NFT_DUP_NETDEV=m
CONFIG_NFT_FWD_NETDEV=m
@@ -1041,7 +1048,6 @@ CONFIG_IP_VS_PE_SIP=m
#
CONFIG_NF_DEFRAG_IPV4=m
CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
@@ -1196,6 +1202,7 @@ CONFIG_HAVE_NET_DSA=y
CONFIG_NET_DSA=m
CONFIG_NET_DSA_HWMON=y
CONFIG_NET_DSA_TAG_BRCM=y
+CONFIG_NET_DSA_TAG_DSA=y
CONFIG_NET_DSA_TAG_EDSA=y
CONFIG_NET_DSA_TAG_TRAILER=y
CONFIG_VLAN_8021Q=m
@@ -1305,7 +1312,9 @@ CONFIG_NET_ACT_CSUM=m
CONFIG_NET_ACT_VLAN=m
CONFIG_NET_ACT_BPF=m
CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_SKBMOD=m
# CONFIG_NET_ACT_IFE is not set
+CONFIG_NET_ACT_TUNNEL_KEY=m
CONFIG_NET_CLS_IND=y
CONFIG_NET_SCH_FIFO=y
CONFIG_DCB=y
@@ -1316,6 +1325,7 @@ CONFIG_BATMAN_ADV_BLA=y
CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y
CONFIG_BATMAN_ADV_MCAST=y
+CONFIG_BATMAN_ADV_DEBUGFS=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
CONFIG_OPENVSWITCH_GRE=m
@@ -1443,6 +1453,7 @@ CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIUART_BCM=y
CONFIG_BT_HCIUART_QCA=y
# CONFIG_BT_HCIUART_AG6XX is not set
+# CONFIG_BT_HCIUART_MRVL is not set
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
@@ -1452,9 +1463,12 @@ CONFIG_BT_MRVL_SDIO=m
CONFIG_BT_ATH3K=m
CONFIG_BT_WILINK=m
CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_IPV6 is not set
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
# CONFIG_AF_RXRPC_DEBUG is not set
CONFIG_RXKAD=y
# CONFIG_AF_KCM is not set
+# CONFIG_STREAM_PARSER is not set
CONFIG_FIB_RULES=y
CONFIG_WIRELESS=y
CONFIG_WIRELESS_EXT=y
@@ -1563,6 +1577,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y
CONFIG_DEV_COREDUMP=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_GENERIC_CPU_DEVICES is not set
CONFIG_SOC_BUS=y
@@ -1594,6 +1609,7 @@ CONFIG_CMA_ALIGNMENT=8
# CONFIG_BRCMSTB_GISB_ARB is not set
CONFIG_OMAP_INTERCONNECT=y
CONFIG_OMAP_OCP2SCP=y
+# CONFIG_QCOM_EBI2 is not set
CONFIG_VEXPRESS_CONFIG=y
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
@@ -1717,7 +1733,6 @@ CONFIG_OF_ADDRESS=y
CONFIG_OF_IRQ=y
CONFIG_OF_NET=y
CONFIG_OF_MDIO=y
-CONFIG_OF_MTD=y
CONFIG_OF_RESERVED_MEM=y
CONFIG_OF_RESOLVE=y
CONFIG_OF_OVERLAY=y
@@ -1753,7 +1768,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
# CONFIG_DUMMY_IRQ is not set
-CONFIG_HWLAT_DETECTOR=m
CONFIG_ICS932S401=m
CONFIG_ENCLOSURE_SERVICES=m
CONFIG_APDS9802ALS=m
@@ -1765,8 +1779,6 @@ CONFIG_SENSORS_APDS990X=m
CONFIG_HMC6352=m
CONFIG_DS1682=m
CONFIG_TI_DAC7512=m
-# CONFIG_BMP085_I2C is not set
-# CONFIG_BMP085_SPI is not set
# CONFIG_USB_SWITCH_FSA9480 is not set
# CONFIG_LATTICE_ECP3_CONFIG is not set
CONFIG_SRAM=y
@@ -2028,8 +2040,11 @@ CONFIG_B53_MDIO_DRIVER=m
# CONFIG_B53_MMAP_DRIVER is not set
# CONFIG_B53_SRAB_DRIVER is not set
CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
+# CONFIG_NET_DSA_QCA8K is not set
CONFIG_ETHERNET=y
# CONFIG_ALTERA_TSE is not set
+CONFIG_NET_VENDOR_AMAZON=y
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_VENDOR_AURORA is not set
CONFIG_NET_CADENCE=y
@@ -2074,6 +2089,7 @@ CONFIG_NET_VENDOR_8390=y
# CONFIG_ETHOC is not set
CONFIG_NET_VENDOR_QUALCOMM=y
# CONFIG_QCA7000 is not set
+# CONFIG_QCOM_EMAC is not set
CONFIG_NET_VENDOR_RENESAS=y
CONFIG_NET_VENDOR_ROCKER=y
CONFIG_NET_VENDOR_SAMSUNG=y
@@ -2104,40 +2120,46 @@ CONFIG_NET_VENDOR_WIZNET=y
CONFIG_PHYLIB=y
CONFIG_SWPHY=y
+#
+# MDIO bus device drivers
+#
+CONFIG_MDIO_BCM_UNIMAC=m
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_HISI_FEMAC is not set
+
#
# MII PHY device drivers
#
+CONFIG_AMD_PHY=m
CONFIG_AQUANTIA_PHY=m
CONFIG_AT803X_PHY=m
-CONFIG_AMD_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=y
-CONFIG_TERANETICS_PHY=m
-CONFIG_SMSC_PHY=y
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
CONFIG_BCM7XXX_PHY=m
CONFIG_BCM87XX_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=y
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_DAVICOM_PHY=m
CONFIG_DP83848_PHY=y
CONFIG_DP83867_PHY=m
-CONFIG_MICROCHIP_PHY=m
CONFIG_FIXED_PHY=y
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_ICPLUS_PHY=m
# CONFIG_INTEL_XWAY_PHY is not set
-# CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MICREL_PHY=y
+CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROSEMI_PHY=y
+CONFIG_NATIONAL_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_SMSC_PHY=y
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_VITESSE_PHY=y
+# CONFIG_XILINX_GMII2RGMII is not set
# CONFIG_MICREL_KS8995MA is not set
CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m
@@ -2393,6 +2415,7 @@ CONFIG_INPUT_EVDEV=m
# Input Device Drivers
#
CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADC is not set
CONFIG_KEYBOARD_ADP5588=m
CONFIG_KEYBOARD_ADP5589=m
CONFIG_KEYBOARD_ATKBD=y
@@ -2488,6 +2511,7 @@ CONFIG_TOUCHSCREEN_AD7879_I2C=m
CONFIG_TOUCHSCREEN_AD7879_SPI=m
CONFIG_TOUCHSCREEN_AR1021_I2C=m
CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
CONFIG_TOUCHSCREEN_BU21013=m
CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m
@@ -2504,11 +2528,11 @@ CONFIG_TOUCHSCREEN_HAMPSHIRE=m
CONFIG_TOUCHSCREEN_EETI=m
CONFIG_TOUCHSCREEN_EGALAX=m
# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
-CONFIG_TOUCHSCREEN_FT6236=m
CONFIG_TOUCHSCREEN_FUJITSU=m
CONFIG_TOUCHSCREEN_GOODIX=m
CONFIG_TOUCHSCREEN_ILI210X=m
CONFIG_TOUCHSCREEN_GUNZE=m
+# CONFIG_TOUCHSCREEN_EKTF2127 is not set
CONFIG_TOUCHSCREEN_ELAN=m
CONFIG_TOUCHSCREEN_ELO=m
CONFIG_TOUCHSCREEN_WACOM_W8001=m
@@ -2583,6 +2607,7 @@ CONFIG_INPUT_MPU3050=m
CONFIG_INPUT_GP2A=m
CONFIG_INPUT_GPIO_BEEPER=m
CONFIG_INPUT_GPIO_TILT_POLLED=m
+# CONFIG_INPUT_GPIO_DECODER is not set
CONFIG_INPUT_ATI_REMOTE2=m
CONFIG_INPUT_KEYSPAN_REMOTE=m
CONFIG_INPUT_KXTJ9=m
@@ -2829,7 +2854,6 @@ CONFIG_HSI_BOARDINFO=y
#
CONFIG_PPS=y
# CONFIG_PPS_DEBUG is not set
-CONFIG_NTP_PPS=y
#
# PPS clients support
@@ -2880,10 +2904,12 @@ CONFIG_GPIO_MAX730X=m
#
# CONFIG_GPIO_74XX_MMIO is not set
# CONFIG_GPIO_ALTERA is not set
+# CONFIG_GPIO_AXP209 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_EM is not set
CONFIG_GPIO_GENERIC_PLATFORM=y
# CONFIG_GPIO_GRGPIO is not set
+# CONFIG_GPIO_MOCKUP is not set
# CONFIG_GPIO_MPC8XXX is not set
CONFIG_GPIO_OMAP=y
CONFIG_GPIO_SYSCON=y
@@ -2903,6 +2929,7 @@ CONFIG_GPIO_PCA953X_IRQ=y
CONFIG_GPIO_PCF857X=m
CONFIG_GPIO_SX150X=y
CONFIG_GPIO_TPIC2810=m
+# CONFIG_GPIO_TS4900 is not set
#
# MFD GPIO expanders
@@ -2910,6 +2937,7 @@ CONFIG_GPIO_TPIC2810=m
CONFIG_GPIO_DA9052=y
CONFIG_GPIO_DA9055=y
CONFIG_GPIO_DLN2=m
+# CONFIG_HTC_EGPIO is not set
CONFIG_GPIO_PALMAS=y
# CONFIG_GPIO_STMPE is not set
CONFIG_GPIO_TPS65218=y
@@ -2964,6 +2992,28 @@ CONFIG_W1_SLAVE_DS2780=m
CONFIG_W1_SLAVE_DS2781=m
CONFIG_W1_SLAVE_DS28E04=m
CONFIG_W1_SLAVE_BQ27000=m
+CONFIG_POWER_AVS=y
+CONFIG_POWER_SEQUENCE=y
+
+#
+# Power Sequence Support
+#
+CONFIG_PWRSEQ_GENERIC=y
+CONFIG_PWRSEQ_GENERIC_INSTANCE_NUMBER=2
+# CONFIG_PWRSEQ_SAMPLE is not set
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_AS3722=y
+# CONFIG_POWER_RESET_BRCMKONA is not set
+# CONFIG_POWER_RESET_BRCMSTB is not set
+CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
+# CONFIG_POWER_RESET_LTC2952 is not set
+CONFIG_POWER_RESET_RESTART=y
+# CONFIG_POWER_RESET_VERSATILE is not set
+CONFIG_POWER_RESET_VEXPRESS=y
+CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
+# CONFIG_SYSCON_REBOOT_MODE is not set
CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
# CONFIG_PDA_POWER is not set
@@ -2999,28 +3049,6 @@ CONFIG_CHARGER_TPS65217=m
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_AXP20X_POWER=y
-CONFIG_POWER_SEQUENCE=y
-
-#
-# Power Sequence Support
-#
-CONFIG_PWRSEQ_GENERIC=y
-CONFIG_PWRSEQ_GENERIC_INSTANCE_NUMBER=2
-# CONFIG_PWRSEQ_SAMPLE is not set
-CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_AS3722=y
-# CONFIG_POWER_RESET_BRCMKONA is not set
-# CONFIG_POWER_RESET_BRCMSTB is not set
-CONFIG_POWER_RESET_GPIO=y
-CONFIG_POWER_RESET_GPIO_RESTART=y
-# CONFIG_POWER_RESET_LTC2952 is not set
-CONFIG_POWER_RESET_RESTART=y
-# CONFIG_POWER_RESET_VERSATILE is not set
-CONFIG_POWER_RESET_VEXPRESS=y
-CONFIG_POWER_RESET_SYSCON=y
-CONFIG_POWER_RESET_SYSCON_POWEROFF=y
-# CONFIG_SYSCON_REBOOT_MODE is not set
-CONFIG_POWER_AVS=y
CONFIG_HWMON=y
CONFIG_HWMON_VID=m
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3186,7 +3214,7 @@ CONFIG_CPU_THERMAL=y
CONFIG_CLOCK_THERMAL=y
CONFIG_DEVFREQ_THERMAL=y
# CONFIG_THERMAL_EMULATION is not set
-# CONFIG_IMX_THERMAL is not set
+# CONFIG_QORIQ_THERMAL is not set
#
# ACPI INT340X thermal drivers
@@ -3224,6 +3252,11 @@ CONFIG_TWL4030_WATCHDOG=m
# USB-based Watchdog Cards
#
# CONFIG_USBPCWATCHDOG is not set
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_SSB_POSSIBLE=y
#
@@ -3275,11 +3308,11 @@ CONFIG_MFD_DA9055=y
CONFIG_MFD_DA9063=y
# CONFIG_MFD_DA9150 is not set
CONFIG_MFD_DLN2=y
+# CONFIG_MFD_EXYNOS_LPASS is not set
CONFIG_MFD_MC13XXX=m
CONFIG_MFD_MC13XXX_SPI=m
CONFIG_MFD_MC13XXX_I2C=m
# CONFIG_MFD_HI6421_PMIC is not set
-# CONFIG_HTC_EGPIO is not set
# CONFIG_HTC_PASIC3 is not set
# CONFIG_HTC_I2CPLD is not set
# CONFIG_INTEL_SOC_PMIC is not set
@@ -3334,6 +3367,7 @@ CONFIG_MFD_PALMAS=y
# CONFIG_MFD_TPS65086 is not set
# CONFIG_MFD_TPS65090 is not set
CONFIG_MFD_TPS65217=y
+# CONFIG_MFD_TI_LP873X is not set
CONFIG_MFD_TPS65218=y
# CONFIG_MFD_TPS6586X is not set
CONFIG_MFD_TPS65910=y
@@ -3383,6 +3417,7 @@ CONFIG_REGULATOR_GPIO=y
# CONFIG_REGULATOR_LP872X is not set
# CONFIG_REGULATOR_LP8755 is not set
# CONFIG_REGULATOR_LTC3589 is not set
+# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
@@ -3581,6 +3616,7 @@ CONFIG_VIDEO_CX231XX_DVB=m
#
CONFIG_DVB_USB=m
# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_DIB3000MC=m
CONFIG_DVB_USB_A800=m
CONFIG_DVB_USB_DIBUSB_MB=m
CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
@@ -3697,7 +3733,7 @@ CONFIG_SMS_SIANO_RC=y
CONFIG_VIDEO_V4L2_TPG=m
#
-# Media ancillary drivers (tuners, sensors, i2c, frontends)
+# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
#
CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
CONFIG_MEDIA_ATTACH=y
@@ -3738,6 +3774,7 @@ CONFIG_VIDEO_CX25840=m
# Camera sensor devices
#
CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_MT9M111=m
CONFIG_VIDEO_MT9V011=m
#
@@ -3979,6 +4016,7 @@ CONFIG_DRM_BRIDGE=y
# Display Interface Bridges
#
# CONFIG_DRM_ANALOGIX_ANX78XX is not set
+# CONFIG_DRM_DUMB_VGA_DAC is not set
# CONFIG_DRM_NXP_PTN3460 is not set
# CONFIG_DRM_PARADE_PS8622 is not set
# CONFIG_DRM_SII902X is not set
@@ -3987,6 +4025,7 @@ CONFIG_DRM_I2C_ADV7511=m
CONFIG_DRM_I2C_ADV7533=y
# CONFIG_DRM_STI is not set
# CONFIG_DRM_ARCPGU is not set
+# CONFIG_DRM_LEGACY is not set
#
# Frame buffer Devices
@@ -4065,6 +4104,8 @@ CONFIG_SOUND_OSS_CORE=y
CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
CONFIG_SND_DMAENGINE_PCM=m
CONFIG_SND_HWDEP=m
CONFIG_SND_RAWMIDI=m
@@ -4153,13 +4194,6 @@ CONFIG_SND_OMAP_SOC_HDMI_AUDIO=m
CONFIG_SND_OMAP_SOC_RX51=m
CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
# CONFIG_SND_SOC_IMG is not set
-
-#
-# Allwinner SoC Audio support
-#
-# CONFIG_SND_SUN4I_CODEC is not set
-# CONFIG_SND_SUN4I_I2S is not set
-# CONFIG_SND_SUN4I_SPDIF is not set
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SOC_I2C_AND_SPI=m
@@ -4189,6 +4223,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
# CONFIG_SND_SOC_CS42XX8_I2C is not set
# CONFIG_SND_SOC_CS4349 is not set
# CONFIG_SND_SOC_CS53L30 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
CONFIG_SND_SOC_ES8328=m
# CONFIG_SND_SOC_GTM601 is not set
# CONFIG_SND_SOC_INNO_RK3036 is not set
@@ -4245,9 +4280,11 @@ CONFIG_SND_SOC_WM8903=m
# CONFIG_SND_SOC_WM8974 is not set
# CONFIG_SND_SOC_WM8978 is not set
# CONFIG_SND_SOC_WM8985 is not set
+# CONFIG_SND_SOC_NAU8810 is not set
CONFIG_SND_SOC_TPA6130A2=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
CONFIG_SND_SIMPLE_CARD=m
+# CONFIG_SND_SIMPLE_SCU_CARD is not set
# CONFIG_SOUND_PRIME is not set
CONFIG_AC97_BUS=m
@@ -4378,7 +4415,7 @@ CONFIG_USB_DYNAMIC_MINORS=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_ULPI_BUS is not set
+# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
CONFIG_USB_MON=m
CONFIG_USB_WUSB=m
CONFIG_USB_WUSB_CBAF=m
@@ -4449,6 +4486,8 @@ CONFIG_USB_MDC800=m
CONFIG_USB_MICROTEK=m
CONFIG_USBIP_CORE=m
CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
CONFIG_USBIP_HOST=m
CONFIG_USBIP_VUDC=m
# CONFIG_USBIP_DEBUG is not set
@@ -4591,6 +4630,7 @@ CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
CONFIG_USB_EZUSB_FX2=m
CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_HSIC_USB4604=m
# CONFIG_USB_LINK_LAYER_TEST is not set
CONFIG_USB_CHAOSKEY=m
# CONFIG_USB_ATM is not set
@@ -4696,6 +4736,7 @@ CONFIG_USB_G_DBGP=m
CONFIG_USB_G_DBGP_SERIAL=y
# CONFIG_USB_G_WEBCAM is not set
CONFIG_USB_LED_TRIG=y
+# CONFIG_USB_ULPI_BUS is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
CONFIG_UWB_I1480U=m
@@ -4779,6 +4820,7 @@ CONFIG_LEDS_MC13783=m
CONFIG_LEDS_TCA6507=m
CONFIG_LEDS_TLC591XX=m
# CONFIG_LEDS_LM355x is not set
+CONFIG_LEDS_IS31FL319X=m
CONFIG_LEDS_IS31FL32XX=m
#
@@ -4838,6 +4880,7 @@ CONFIG_RTC_DRV_ABX80X=m
CONFIG_RTC_DRV_AS3722=y
CONFIG_RTC_DRV_DS1307=y
CONFIG_RTC_DRV_DS1307_HWMON=y
+# CONFIG_RTC_DRV_DS1307_CENTURY is not set
CONFIG_RTC_DRV_DS1374=m
CONFIG_RTC_DRV_DS1374_WDT=y
CONFIG_RTC_DRV_DS1672=m
@@ -4848,7 +4891,6 @@ CONFIG_RTC_DRV_RK808=y
CONFIG_RTC_DRV_RS5C372=m
CONFIG_RTC_DRV_ISL1208=m
CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_ISL12057=y
CONFIG_RTC_DRV_X1205=m
CONFIG_RTC_DRV_PCF8523=y
CONFIG_RTC_DRV_PCF85063=m
@@ -4999,7 +5041,6 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
CONFIG_R8712U=m
CONFIG_R8188EU=m
CONFIG_88EU_AP_MODE=y
-# CONFIG_R8723AU is not set
# CONFIG_VT6656 is not set
#
@@ -5111,6 +5152,7 @@ CONFIG_ASHMEM=y
CONFIG_ION=y
# CONFIG_ION_TEST is not set
# CONFIG_ION_DUMMY is not set
+CONFIG_ION_OF=y
# CONFIG_STAGING_BOARD is not set
# CONFIG_LTE_GDM724X is not set
# CONFIG_MTD_SPINAND_MT29F is not set
@@ -5155,6 +5197,26 @@ CONFIG_FB_TFT_FBTFT_DEVICE=m
# CONFIG_WILC1000_SPI is not set
# CONFIG_MOST is not set
# CONFIG_KS7010 is not set
+CONFIG_GREYBUS=m
+# CONFIG_GREYBUS_ES2 is not set
+CONFIG_GREYBUS_AUDIO=m
+CONFIG_GREYBUS_BOOTROM=m
+CONFIG_GREYBUS_FIRMWARE=m
+CONFIG_GREYBUS_HID=m
+CONFIG_GREYBUS_LIGHT=m
+CONFIG_GREYBUS_LOG=m
+CONFIG_GREYBUS_LOOPBACK=m
+CONFIG_GREYBUS_POWER=m
+CONFIG_GREYBUS_RAW=m
+CONFIG_GREYBUS_VIBRATOR=m
+CONFIG_GREYBUS_BRIDGED_PHY=m
+CONFIG_GREYBUS_GPIO=m
+CONFIG_GREYBUS_I2C=m
+CONFIG_GREYBUS_PWM=m
+CONFIG_GREYBUS_SDIO=m
+CONFIG_GREYBUS_SPI=m
+CONFIG_GREYBUS_UART=m
+CONFIG_GREYBUS_USB=m
# CONFIG_GOLDFISH is not set
CONFIG_CHROME_PLATFORMS=y
# CONFIG_CROS_EC_CHARDEV is not set
@@ -5166,9 +5228,7 @@ CONFIG_COMMON_CLK=y
#
# Common Clock Framework
#
-CONFIG_COMMON_CLK_MAX_GEN=y
CONFIG_COMMON_CLK_MAX77686=m
-# CONFIG_COMMON_CLK_MAX77802 is not set
CONFIG_COMMON_CLK_RK808=m
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI514 is not set
@@ -5184,7 +5244,8 @@ CONFIG_COMMON_CLK_PALMAS=y
# CONFIG_COMMON_CLK_PWM is not set
# CONFIG_COMMON_CLK_PXA is not set
# CONFIG_COMMON_CLK_PIC32 is not set
-# CONFIG_SUNXI_CCU is not set
+# CONFIG_COMMON_CLK_MT8135 is not set
+# CONFIG_COMMON_CLK_MT8173 is not set
CONFIG_COMMON_CLK_TI_ADPLL=y
CONFIG_HWSPINLOCK=y
@@ -5210,6 +5271,7 @@ CONFIG_ARM_TIMER_SP804=y
# CONFIG_EM_TIMER_STI is not set
CONFIG_CLKSRC_VERSATILE=y
CONFIG_MAILBOX=y
+# CONFIG_PLATFORM_MHU is not set
CONFIG_OMAP2PLUS_MBOX=y
CONFIG_OMAP_MBOX_KFIFO_SIZE=256
CONFIG_ALTERA_MBOX=y
@@ -5276,6 +5338,7 @@ CONFIG_EXTCON=y
CONFIG_EXTCON_GPIO=y
# CONFIG_EXTCON_MAX3355 is not set
CONFIG_EXTCON_PALMAS=y
+# CONFIG_EXTCON_QCOM_SPMI_MISC is not set
# CONFIG_EXTCON_RT8973A is not set
# CONFIG_EXTCON_SM5502 is not set
CONFIG_EXTCON_USB_GPIO=y
@@ -6139,7 +6202,7 @@ CONFIG_FTRACE=y
CONFIG_FUNCTION_TRACER=y
# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_SCHED_TRACER is not set
-# CONFIG_MISSED_TIMER_OFFSETS_HIST is not set
+# CONFIG_HWLAT_TRACER is not set
CONFIG_FTRACE_SYSCALLS=y
CONFIG_TRACER_SNAPSHOT=y
# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
@@ -6199,6 +6262,7 @@ CONFIG_KGDB_KDB=y
CONFIG_KDB_DEFAULT_ENABLE=0x1
CONFIG_KDB_KEYBOARD=y
CONFIG_KDB_CONTINUE_CATASTROPHIC=0
+# CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
# CONFIG_UBSAN is not set
CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
# CONFIG_STRICT_DEVMEM is not set
@@ -6239,7 +6303,6 @@ CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_DEVELOP=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
# CONFIG_SECURITY_SMACK is not set
CONFIG_SECURITY_TOMOYO=y
CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
@@ -6497,7 +6560,6 @@ CONFIG_DQL=y
CONFIG_GLOB=y
# CONFIG_GLOB_SELFTEST is not set
CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_LRU_CACHE=m
CONFIG_CLZ_TAB=y
CONFIG_CORDIC=m
@@ -6513,6 +6575,7 @@ CONFIG_FONT_8x16=y
CONFIG_SG_SPLIT=y
CONFIG_SG_POOL=y
CONFIG_ARCH_HAS_SG_CHAIN=y
+CONFIG_SBITMAP=y
CONFIG_VIRTUALIZATION=y
# CONFIG_VHOST_NET is not set
# CONFIG_VHOST_SCSI is not set
diff --git a/patches/defconfig-bone b/patches/defconfig-bone
index d846b0c061996afcd8c64ceaa2447202f8e85baa..459fe8ee87023941779ef9657efd39ea2f6e8772 100644
--- a/patches/defconfig-bone
+++ b/patches/defconfig-bone
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.8.0 Kernel Configuration
+# Linux/arm 4.9.0-rc1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -75,6 +75,7 @@ CONFIG_HANDLE_DOMAIN_IRQ=y
# CONFIG_IRQ_DOMAIN_DEBUG is not set
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
CONFIG_GENERIC_TIME_VSYSCALL=y
CONFIG_GENERIC_CLOCKEVENTS=y
@@ -257,6 +258,7 @@ CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_OLD_SIGACTION=y
# CONFIG_CPU_NO_EFFICIENT_FFS is not set
+# CONFIG_HAVE_ARCH_VMAP_STACK is not set
#
# GCOV-based kernel profiling
@@ -390,7 +392,7 @@ CONFIG_ARCH_OMAP=y
#
CONFIG_OMAP_RESET_CLOCKS=y
CONFIG_OMAP_MUX=y
-CONFIG_OMAP_MUX_DEBUG=y
+# CONFIG_OMAP_MUX_DEBUG is not set
CONFIG_OMAP_MUX_WARNINGS=y
CONFIG_OMAP_32K_TIMER=y
CONFIG_OMAP_DM_TIMER=y
@@ -472,6 +474,7 @@ CONFIG_OUTER_CACHE=y
CONFIG_OUTER_CACHE_SYNC=y
CONFIG_MIGHT_HAVE_CACHE_L2X0=y
CONFIG_CACHE_L2X0=y
+CONFIG_CACHE_L2X0_PMU=y
CONFIG_PL310_ERRATA_588369=y
CONFIG_PL310_ERRATA_727915=y
# CONFIG_PL310_ERRATA_753970 is not set
@@ -633,7 +636,6 @@ CONFIG_CPUFREQ_DT=m
CONFIG_CPUFREQ_DT_PLATDEV=y
# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
# CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
-CONFIG_ARM_TI_CPUFREQ=y
# CONFIG_QORIQ_CPUFREQ is not set
#
@@ -670,6 +672,9 @@ CONFIG_BINFMT_ELF=y
CONFIG_ELFCORE=y
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_BINFMT_SCRIPT=y
+CONFIG_BINFMT_FLAT=y
+CONFIG_BINFMT_ZFLAT=y
+CONFIG_BINFMT_SHARED_FLAT=y
# CONFIG_HAVE_AOUT is not set
CONFIG_BINFMT_MISC=m
CONFIG_COREDUMP=y
@@ -775,6 +780,7 @@ CONFIG_TCP_CONG_YEAH=m
CONFIG_TCP_CONG_ILLINOIS=m
CONFIG_TCP_CONG_DCTCP=m
CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
CONFIG_DEFAULT_CUBIC=y
# CONFIG_DEFAULT_RENO is not set
CONFIG_DEFAULT_TCP_CONG="cubic"
@@ -870,9 +876,10 @@ CONFIG_NF_TABLES_INET=m
CONFIG_NF_TABLES_NETDEV=m
CONFIG_NFT_EXTHDR=m
CONFIG_NFT_META=m
+CONFIG_NFT_NUMGEN=m
CONFIG_NFT_CT=m
-CONFIG_NFT_RBTREE=m
-CONFIG_NFT_HASH=m
+CONFIG_NFT_SET_RBTREE=m
+CONFIG_NFT_SET_HASH=m
CONFIG_NFT_COUNTER=m
CONFIG_NFT_LOG=m
CONFIG_NFT_LIMIT=m
@@ -880,9 +887,11 @@ CONFIG_NFT_MASQ=m
CONFIG_NFT_REDIR=m
CONFIG_NFT_NAT=m
CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
CONFIG_NFT_REJECT=m
CONFIG_NFT_REJECT_INET=m
CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
CONFIG_NF_DUP_NETDEV=m
CONFIG_NFT_DUP_NETDEV=m
CONFIG_NFT_FWD_NETDEV=m
@@ -1039,7 +1048,6 @@ CONFIG_IP_VS_PE_SIP=m
#
CONFIG_NF_DEFRAG_IPV4=m
CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
CONFIG_NF_TABLES_IPV4=m
CONFIG_NFT_CHAIN_ROUTE_IPV4=m
CONFIG_NFT_REJECT_IPV4=m
@@ -1194,6 +1202,7 @@ CONFIG_HAVE_NET_DSA=y
CONFIG_NET_DSA=m
CONFIG_NET_DSA_HWMON=y
CONFIG_NET_DSA_TAG_BRCM=y
+CONFIG_NET_DSA_TAG_DSA=y
CONFIG_NET_DSA_TAG_EDSA=y
CONFIG_NET_DSA_TAG_TRAILER=y
CONFIG_VLAN_8021Q=m
@@ -1303,7 +1312,9 @@ CONFIG_NET_ACT_CSUM=m
CONFIG_NET_ACT_VLAN=m
CONFIG_NET_ACT_BPF=m
CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_SKBMOD=m
# CONFIG_NET_ACT_IFE is not set
+CONFIG_NET_ACT_TUNNEL_KEY=m
CONFIG_NET_CLS_IND=y
CONFIG_NET_SCH_FIFO=y
CONFIG_DCB=y
@@ -1314,6 +1325,7 @@ CONFIG_BATMAN_ADV_BLA=y
CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y
CONFIG_BATMAN_ADV_MCAST=y
+CONFIG_BATMAN_ADV_DEBUGFS=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
CONFIG_OPENVSWITCH_GRE=m
@@ -1441,6 +1453,7 @@ CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIUART_BCM=y
CONFIG_BT_HCIUART_QCA=y
# CONFIG_BT_HCIUART_AG6XX is not set
+# CONFIG_BT_HCIUART_MRVL is not set
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
@@ -1450,9 +1463,12 @@ CONFIG_BT_MRVL_SDIO=m
CONFIG_BT_ATH3K=m
CONFIG_BT_WILINK=m
CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_IPV6 is not set
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
# CONFIG_AF_RXRPC_DEBUG is not set
CONFIG_RXKAD=y
# CONFIG_AF_KCM is not set
+# CONFIG_STREAM_PARSER is not set
CONFIG_FIB_RULES=y
CONFIG_WIRELESS=y
CONFIG_WIRELESS_EXT=y
@@ -1561,6 +1577,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y
CONFIG_DEV_COREDUMP=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_GENERIC_CPU_DEVICES is not set
CONFIG_SOC_BUS=y
@@ -1592,6 +1609,7 @@ CONFIG_CMA_ALIGNMENT=8
# CONFIG_BRCMSTB_GISB_ARB is not set
CONFIG_OMAP_INTERCONNECT=y
CONFIG_OMAP_OCP2SCP=y
+# CONFIG_QCOM_EBI2 is not set
CONFIG_VEXPRESS_CONFIG=y
CONFIG_CONNECTOR=y
CONFIG_PROC_EVENTS=y
@@ -1715,7 +1733,6 @@ CONFIG_OF_ADDRESS=y
CONFIG_OF_IRQ=y
CONFIG_OF_NET=y
CONFIG_OF_MDIO=y
-CONFIG_OF_MTD=y
CONFIG_OF_RESERVED_MEM=y
CONFIG_OF_RESOLVE=y
CONFIG_OF_OVERLAY=y
@@ -1762,8 +1779,6 @@ CONFIG_SENSORS_APDS990X=m
CONFIG_HMC6352=m
CONFIG_DS1682=m
CONFIG_TI_DAC7512=m
-# CONFIG_BMP085_I2C is not set
-# CONFIG_BMP085_SPI is not set
# CONFIG_USB_SWITCH_FSA9480 is not set
# CONFIG_LATTICE_ECP3_CONFIG is not set
CONFIG_SRAM=y
@@ -2019,10 +2034,17 @@ CONFIG_ATM_DUMMY=m
#
CONFIG_NET_DSA_MV88E6060=m
CONFIG_NET_DSA_BCM_SF2=m
-# CONFIG_B53 is not set
+CONFIG_B53=m
+# CONFIG_B53_SPI_DRIVER is not set
+CONFIG_B53_MDIO_DRIVER=m
+# CONFIG_B53_MMAP_DRIVER is not set
+# CONFIG_B53_SRAB_DRIVER is not set
CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
+# CONFIG_NET_DSA_QCA8K is not set
CONFIG_ETHERNET=y
# CONFIG_ALTERA_TSE is not set
+CONFIG_NET_VENDOR_AMAZON=y
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_VENDOR_AURORA is not set
CONFIG_NET_CADENCE=y
@@ -2067,6 +2089,7 @@ CONFIG_NET_VENDOR_8390=y
# CONFIG_ETHOC is not set
CONFIG_NET_VENDOR_QUALCOMM=y
# CONFIG_QCA7000 is not set
+# CONFIG_QCOM_EMAC is not set
CONFIG_NET_VENDOR_RENESAS=y
CONFIG_NET_VENDOR_ROCKER=y
CONFIG_NET_VENDOR_SAMSUNG=y
@@ -2097,40 +2120,46 @@ CONFIG_NET_VENDOR_WIZNET=y
CONFIG_PHYLIB=y
CONFIG_SWPHY=y
+#
+# MDIO bus device drivers
+#
+CONFIG_MDIO_BCM_UNIMAC=m
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_HISI_FEMAC is not set
+
#
# MII PHY device drivers
#
+CONFIG_AMD_PHY=m
CONFIG_AQUANTIA_PHY=m
CONFIG_AT803X_PHY=m
-CONFIG_AMD_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=y
-CONFIG_TERANETICS_PHY=m
-CONFIG_SMSC_PHY=y
-CONFIG_BCM_NET_PHYLIB=m
-CONFIG_BROADCOM_PHY=m
CONFIG_BCM7XXX_PHY=m
CONFIG_BCM87XX_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=y
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_DAVICOM_PHY=m
CONFIG_DP83848_PHY=y
CONFIG_DP83867_PHY=m
-CONFIG_MICROCHIP_PHY=m
CONFIG_FIXED_PHY=y
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_ICPLUS_PHY=m
# CONFIG_INTEL_XWAY_PHY is not set
-# CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MICREL_PHY=y
+CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROSEMI_PHY=y
+CONFIG_NATIONAL_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_SMSC_PHY=y
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_VITESSE_PHY=y
+# CONFIG_XILINX_GMII2RGMII is not set
# CONFIG_MICREL_KS8995MA is not set
CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m
@@ -2386,6 +2415,7 @@ CONFIG_INPUT_EVDEV=m
# Input Device Drivers
#
CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADC is not set
CONFIG_KEYBOARD_ADP5588=m
CONFIG_KEYBOARD_ADP5589=m
CONFIG_KEYBOARD_ATKBD=y
@@ -2407,9 +2437,11 @@ CONFIG_KEYBOARD_OPENCORES=m
CONFIG_KEYBOARD_SAMSUNG=m
CONFIG_KEYBOARD_STOWAWAY=m
CONFIG_KEYBOARD_SUNKBD=m
+# CONFIG_KEYBOARD_STMPE is not set
CONFIG_KEYBOARD_OMAP4=m
CONFIG_KEYBOARD_TWL4030=m
CONFIG_KEYBOARD_XTKBD=m
+CONFIG_KEYBOARD_CROS_EC=m
CONFIG_KEYBOARD_CAP11XX=m
CONFIG_KEYBOARD_BCM=m
CONFIG_INPUT_MOUSE=y
@@ -2479,6 +2511,7 @@ CONFIG_TOUCHSCREEN_AD7879_I2C=m
CONFIG_TOUCHSCREEN_AD7879_SPI=m
CONFIG_TOUCHSCREEN_AR1021_I2C=m
CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
CONFIG_TOUCHSCREEN_BU21013=m
CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m
@@ -2495,11 +2528,11 @@ CONFIG_TOUCHSCREEN_HAMPSHIRE=m
CONFIG_TOUCHSCREEN_EETI=m
CONFIG_TOUCHSCREEN_EGALAX=m
# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
-CONFIG_TOUCHSCREEN_FT6236=m
CONFIG_TOUCHSCREEN_FUJITSU=m
CONFIG_TOUCHSCREEN_GOODIX=m
CONFIG_TOUCHSCREEN_ILI210X=m
CONFIG_TOUCHSCREEN_GUNZE=m
+# CONFIG_TOUCHSCREEN_EKTF2127 is not set
CONFIG_TOUCHSCREEN_ELAN=m
CONFIG_TOUCHSCREEN_ELO=m
CONFIG_TOUCHSCREEN_WACOM_W8001=m
@@ -2553,6 +2586,7 @@ CONFIG_TOUCHSCREEN_TSC2007=m
# CONFIG_TOUCHSCREEN_SILEAD is not set
# CONFIG_TOUCHSCREEN_SIS_I2C is not set
CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_STMPE=m
CONFIG_TOUCHSCREEN_SUR40=m
# CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set
CONFIG_TOUCHSCREEN_SX8654=m
@@ -2573,6 +2607,7 @@ CONFIG_INPUT_MPU3050=m
CONFIG_INPUT_GP2A=m
CONFIG_INPUT_GPIO_BEEPER=m
CONFIG_INPUT_GPIO_TILT_POLLED=m
+# CONFIG_INPUT_GPIO_DECODER is not set
CONFIG_INPUT_ATI_REMOTE2=m
CONFIG_INPUT_KEYSPAN_REMOTE=m
CONFIG_INPUT_KXTJ9=m
@@ -2764,6 +2799,7 @@ CONFIG_I2C_VIPERBOARD=m
#
# Other I2C/SMBus bus drivers
#
+CONFIG_I2C_CROS_EC_TUNNEL=m
# CONFIG_I2C_STUB is not set
# CONFIG_I2C_SLAVE is not set
# CONFIG_I2C_DEBUG_CORE is not set
@@ -2818,7 +2854,6 @@ CONFIG_HSI_BOARDINFO=y
#
CONFIG_PPS=y
# CONFIG_PPS_DEBUG is not set
-CONFIG_NTP_PPS=y
#
# PPS clients support
@@ -2869,10 +2904,12 @@ CONFIG_GPIO_MAX730X=m
#
# CONFIG_GPIO_74XX_MMIO is not set
# CONFIG_GPIO_ALTERA is not set
+# CONFIG_GPIO_AXP209 is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_EM is not set
CONFIG_GPIO_GENERIC_PLATFORM=y
# CONFIG_GPIO_GRGPIO is not set
+# CONFIG_GPIO_MOCKUP is not set
# CONFIG_GPIO_MPC8XXX is not set
CONFIG_GPIO_OMAP=y
CONFIG_GPIO_SYSCON=y
@@ -2892,6 +2929,7 @@ CONFIG_GPIO_PCA953X_IRQ=y
CONFIG_GPIO_PCF857X=m
CONFIG_GPIO_SX150X=y
CONFIG_GPIO_TPIC2810=m
+# CONFIG_GPIO_TS4900 is not set
#
# MFD GPIO expanders
@@ -2899,7 +2937,9 @@ CONFIG_GPIO_TPIC2810=m
CONFIG_GPIO_DA9052=y
CONFIG_GPIO_DA9055=y
CONFIG_GPIO_DLN2=m
+# CONFIG_HTC_EGPIO is not set
CONFIG_GPIO_PALMAS=y
+# CONFIG_GPIO_STMPE is not set
CONFIG_GPIO_TPS65218=y
CONFIG_GPIO_TPS65910=y
CONFIG_GPIO_TWL4030=y
@@ -2952,6 +2992,28 @@ CONFIG_W1_SLAVE_DS2780=m
CONFIG_W1_SLAVE_DS2781=m
CONFIG_W1_SLAVE_DS28E04=m
CONFIG_W1_SLAVE_BQ27000=m
+CONFIG_POWER_AVS=y
+CONFIG_POWER_SEQUENCE=y
+
+#
+# Power Sequence Support
+#
+CONFIG_PWRSEQ_GENERIC=y
+CONFIG_PWRSEQ_GENERIC_INSTANCE_NUMBER=2
+# CONFIG_PWRSEQ_SAMPLE is not set
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_AS3722=y
+# CONFIG_POWER_RESET_BRCMKONA is not set
+# CONFIG_POWER_RESET_BRCMSTB is not set
+CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_GPIO_RESTART=y
+# CONFIG_POWER_RESET_LTC2952 is not set
+CONFIG_POWER_RESET_RESTART=y
+# CONFIG_POWER_RESET_VERSATILE is not set
+CONFIG_POWER_RESET_VEXPRESS=y
+CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
+# CONFIG_SYSCON_REBOOT_MODE is not set
CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
# CONFIG_PDA_POWER is not set
@@ -2962,18 +3024,18 @@ CONFIG_GENERIC_ADC_BATTERY=m
# CONFIG_BATTERY_DS2780 is not set
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_SBS is not set
+CONFIG_BATTERY_SBS=m
CONFIG_BATTERY_BQ27XXX=m
CONFIG_BATTERY_BQ27XXX_I2C=m
CONFIG_BATTERY_DA9052=m
CONFIG_AXP288_FUEL_GAUGE=m
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
-# CONFIG_BATTERY_TWL4030_MADC is not set
+CONFIG_BATTERY_TWL4030_MADC=m
CONFIG_BATTERY_RX51=m
CONFIG_CHARGER_ISP1704=m
# CONFIG_CHARGER_MAX8903 is not set
-# CONFIG_CHARGER_TWL4030 is not set
+CONFIG_CHARGER_TWL4030=m
# CONFIG_CHARGER_LP8727 is not set
CONFIG_CHARGER_GPIO=m
# CONFIG_CHARGER_MANAGER is not set
@@ -2987,20 +3049,6 @@ CONFIG_CHARGER_TPS65217=m
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
# CONFIG_CHARGER_RT9455 is not set
CONFIG_AXP20X_POWER=y
-CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_AS3722=y
-# CONFIG_POWER_RESET_BRCMKONA is not set
-# CONFIG_POWER_RESET_BRCMSTB is not set
-CONFIG_POWER_RESET_GPIO=y
-CONFIG_POWER_RESET_GPIO_RESTART=y
-# CONFIG_POWER_RESET_LTC2952 is not set
-CONFIG_POWER_RESET_RESTART=y
-# CONFIG_POWER_RESET_VERSATILE is not set
-CONFIG_POWER_RESET_VEXPRESS=y
-CONFIG_POWER_RESET_SYSCON=y
-CONFIG_POWER_RESET_SYSCON_POWEROFF=y
-# CONFIG_SYSCON_REBOOT_MODE is not set
-CONFIG_POWER_AVS=y
CONFIG_HWMON=y
CONFIG_HWMON_VID=m
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3166,7 +3214,7 @@ CONFIG_CPU_THERMAL=y
CONFIG_CLOCK_THERMAL=y
CONFIG_DEVFREQ_THERMAL=y
# CONFIG_THERMAL_EMULATION is not set
-# CONFIG_IMX_THERMAL is not set
+# CONFIG_QORIQ_THERMAL is not set
#
# ACPI INT340X thermal drivers
@@ -3191,12 +3239,12 @@ CONFIG_SOFT_WATCHDOG=m
# CONFIG_DA9055_WATCHDOG is not set
# CONFIG_DA9063_WATCHDOG is not set
# CONFIG_GPIO_WATCHDOG is not set
-CONFIG_XILINX_WATCHDOG=y
+CONFIG_XILINX_WATCHDOG=m
# CONFIG_ZIIRAVE_WATCHDOG is not set
-CONFIG_CADENCE_WATCHDOG=y
-CONFIG_DW_WATCHDOG=y
-CONFIG_OMAP_WATCHDOG=y
-CONFIG_TWL4030_WATCHDOG=y
+CONFIG_CADENCE_WATCHDOG=m
+CONFIG_DW_WATCHDOG=m
+CONFIG_OMAP_WATCHDOG=m
+CONFIG_TWL4030_WATCHDOG=m
# CONFIG_MAX63XX_WATCHDOG is not set
# CONFIG_MEN_A21_WDT is not set
@@ -3204,6 +3252,11 @@ CONFIG_TWL4030_WATCHDOG=y
# USB-based Watchdog Cards
#
# CONFIG_USBPCWATCHDOG is not set
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_SSB_POSSIBLE=y
#
@@ -3242,7 +3295,9 @@ CONFIG_MFD_AS3722=y
# CONFIG_MFD_BCM590XX is not set
CONFIG_MFD_AXP20X=y
CONFIG_MFD_AXP20X_I2C=y
-# CONFIG_MFD_CROS_EC is not set
+CONFIG_MFD_CROS_EC=m
+# CONFIG_MFD_CROS_EC_I2C is not set
+CONFIG_MFD_CROS_EC_SPI=m
# CONFIG_MFD_ASIC3 is not set
# CONFIG_PMIC_DA903X is not set
CONFIG_PMIC_DA9052=y
@@ -3253,11 +3308,11 @@ CONFIG_MFD_DA9055=y
CONFIG_MFD_DA9063=y
# CONFIG_MFD_DA9150 is not set
CONFIG_MFD_DLN2=y
+# CONFIG_MFD_EXYNOS_LPASS is not set
CONFIG_MFD_MC13XXX=m
CONFIG_MFD_MC13XXX_SPI=m
CONFIG_MFD_MC13XXX_I2C=m
# CONFIG_MFD_HI6421_PMIC is not set
-# CONFIG_HTC_EGPIO is not set
# CONFIG_HTC_PASIC3 is not set
# CONFIG_HTC_I2CPLD is not set
# CONFIG_INTEL_SOC_PMIC is not set
@@ -3285,7 +3340,7 @@ CONFIG_MFD_VIPERBOARD=m
# CONFIG_MFD_RT5033 is not set
CONFIG_MFD_RTSX_USB=m
# CONFIG_MFD_RC5T583 is not set
-# CONFIG_MFD_RK808 is not set
+CONFIG_MFD_RK808=y
# CONFIG_MFD_RN5T618 is not set
CONFIG_MFD_SEC_CORE=y
# CONFIG_MFD_SI476X_CORE is not set
@@ -3293,7 +3348,13 @@ CONFIG_MFD_SEC_CORE=y
# CONFIG_MFD_SKY81452 is not set
# CONFIG_MFD_SMSC is not set
# CONFIG_ABX500_CORE is not set
-# CONFIG_MFD_STMPE is not set
+CONFIG_MFD_STMPE=y
+
+#
+# STMicroelectronics STMPE Interface Drivers
+#
+CONFIG_STMPE_I2C=y
+# CONFIG_STMPE_SPI is not set
CONFIG_MFD_SYSCON=y
CONFIG_MFD_TI_AM335X_TSCADC=m
# CONFIG_MFD_LP3943 is not set
@@ -3306,6 +3367,7 @@ CONFIG_MFD_PALMAS=y
# CONFIG_MFD_TPS65086 is not set
# CONFIG_MFD_TPS65090 is not set
CONFIG_MFD_TPS65217=y
+# CONFIG_MFD_TI_LP873X is not set
CONFIG_MFD_TPS65218=y
# CONFIG_MFD_TPS6586X is not set
CONFIG_MFD_TPS65910=y
@@ -3355,6 +3417,7 @@ CONFIG_REGULATOR_GPIO=y
# CONFIG_REGULATOR_LP872X is not set
# CONFIG_REGULATOR_LP8755 is not set
# CONFIG_REGULATOR_LTC3589 is not set
+# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
@@ -3373,6 +3436,7 @@ CONFIG_REGULATOR_PFUZE100=y
# CONFIG_REGULATOR_PV88080 is not set
# CONFIG_REGULATOR_PV88090 is not set
CONFIG_REGULATOR_PWM=y
+CONFIG_REGULATOR_RK808=m
CONFIG_REGULATOR_S2MPA01=y
CONFIG_REGULATOR_S2MPS11=y
CONFIG_REGULATOR_S5M8767=y
@@ -3552,6 +3616,7 @@ CONFIG_VIDEO_CX231XX_DVB=m
#
CONFIG_DVB_USB=m
# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_DIB3000MC=m
CONFIG_DVB_USB_A800=m
CONFIG_DVB_USB_DIBUSB_MB=m
CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
@@ -3668,7 +3733,7 @@ CONFIG_SMS_SIANO_RC=y
CONFIG_VIDEO_V4L2_TPG=m
#
-# Media ancillary drivers (tuners, sensors, i2c, frontends)
+# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
#
CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
CONFIG_MEDIA_ATTACH=y
@@ -3709,6 +3774,7 @@ CONFIG_VIDEO_CX25840=m
# Camera sensor devices
#
CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_MT9M111=m
CONFIG_VIDEO_MT9V011=m
#
@@ -3950,6 +4016,7 @@ CONFIG_DRM_BRIDGE=y
# Display Interface Bridges
#
# CONFIG_DRM_ANALOGIX_ANX78XX is not set
+# CONFIG_DRM_DUMB_VGA_DAC is not set
# CONFIG_DRM_NXP_PTN3460 is not set
# CONFIG_DRM_PARADE_PS8622 is not set
# CONFIG_DRM_SII902X is not set
@@ -3958,6 +4025,7 @@ CONFIG_DRM_I2C_ADV7511=m
CONFIG_DRM_I2C_ADV7533=y
# CONFIG_DRM_STI is not set
# CONFIG_DRM_ARCPGU is not set
+# CONFIG_DRM_LEGACY is not set
#
# Frame buffer Devices
@@ -4013,7 +4081,7 @@ CONFIG_BACKLIGHT_PWM=m
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3639 is not set
# CONFIG_BACKLIGHT_LP855X is not set
-# CONFIG_BACKLIGHT_PANDORA is not set
+CONFIG_BACKLIGHT_PANDORA=m
# CONFIG_BACKLIGHT_TPS65217 is not set
CONFIG_BACKLIGHT_GPIO=m
# CONFIG_BACKLIGHT_LV5207LP is not set
@@ -4036,6 +4104,8 @@ CONFIG_SOUND_OSS_CORE=y
CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
CONFIG_SND_DMAENGINE_PCM=m
CONFIG_SND_HWDEP=m
CONFIG_SND_RAWMIDI=m
@@ -4124,13 +4194,6 @@ CONFIG_SND_OMAP_SOC_HDMI_AUDIO=m
CONFIG_SND_OMAP_SOC_RX51=m
CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
# CONFIG_SND_SOC_IMG is not set
-
-#
-# Allwinner SoC Audio support
-#
-CONFIG_SND_SUN4I_CODEC=m
-# CONFIG_SND_SUN4I_I2S is not set
-# CONFIG_SND_SUN4I_SPDIF is not set
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SOC_I2C_AND_SPI=m
@@ -4160,7 +4223,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
# CONFIG_SND_SOC_CS42XX8_I2C is not set
# CONFIG_SND_SOC_CS4349 is not set
# CONFIG_SND_SOC_CS53L30 is not set
-# CONFIG_SND_SOC_ES8328 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_ES8328=m
# CONFIG_SND_SOC_GTM601 is not set
# CONFIG_SND_SOC_INNO_RK3036 is not set
# CONFIG_SND_SOC_MAX98504 is not set
@@ -4216,9 +4280,11 @@ CONFIG_SND_SOC_WM8903=m
# CONFIG_SND_SOC_WM8974 is not set
# CONFIG_SND_SOC_WM8978 is not set
# CONFIG_SND_SOC_WM8985 is not set
+# CONFIG_SND_SOC_NAU8810 is not set
CONFIG_SND_SOC_TPA6130A2=m
CONFIG_SND_SIMPLE_CARD_UTILS=m
CONFIG_SND_SIMPLE_CARD=m
+# CONFIG_SND_SIMPLE_SCU_CARD is not set
# CONFIG_SOUND_PRIME is not set
CONFIG_AC97_BUS=m
@@ -4349,7 +4415,7 @@ CONFIG_USB_DYNAMIC_MINORS=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_ULPI_BUS is not set
+# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
CONFIG_USB_MON=m
CONFIG_USB_WUSB=m
CONFIG_USB_WUSB_CBAF=m
@@ -4420,6 +4486,8 @@ CONFIG_USB_MDC800=m
CONFIG_USB_MICROTEK=m
CONFIG_USBIP_CORE=m
CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
CONFIG_USBIP_HOST=m
CONFIG_USBIP_VUDC=m
# CONFIG_USBIP_DEBUG is not set
@@ -4562,9 +4630,9 @@ CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
CONFIG_USB_EZUSB_FX2=m
CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_HSIC_USB4604=m
# CONFIG_USB_LINK_LAYER_TEST is not set
CONFIG_USB_CHAOSKEY=m
-CONFIG_USB_ONBOARD_DEVICE=y
# CONFIG_USB_ATM is not set
#
@@ -4668,6 +4736,7 @@ CONFIG_USB_G_DBGP=m
CONFIG_USB_G_DBGP_SERIAL=y
# CONFIG_USB_G_WEBCAM is not set
CONFIG_USB_LED_TRIG=y
+# CONFIG_USB_ULPI_BUS is not set
CONFIG_UWB=m
CONFIG_UWB_HWA=m
CONFIG_UWB_I1480U=m
@@ -4751,6 +4820,7 @@ CONFIG_LEDS_MC13783=m
CONFIG_LEDS_TCA6507=m
CONFIG_LEDS_TLC591XX=m
# CONFIG_LEDS_LM355x is not set
+CONFIG_LEDS_IS31FL319X=m
CONFIG_LEDS_IS31FL32XX=m
#
@@ -4810,16 +4880,17 @@ CONFIG_RTC_DRV_ABX80X=m
CONFIG_RTC_DRV_AS3722=y
CONFIG_RTC_DRV_DS1307=y
CONFIG_RTC_DRV_DS1307_HWMON=y
+# CONFIG_RTC_DRV_DS1307_CENTURY is not set
CONFIG_RTC_DRV_DS1374=m
CONFIG_RTC_DRV_DS1374_WDT=y
CONFIG_RTC_DRV_DS1672=m
CONFIG_RTC_DRV_HYM8563=m
CONFIG_RTC_DRV_MAX6900=m
CONFIG_RTC_DRV_MAX77686=y
+CONFIG_RTC_DRV_RK808=y
CONFIG_RTC_DRV_RS5C372=m
CONFIG_RTC_DRV_ISL1208=m
CONFIG_RTC_DRV_ISL12022=m
-CONFIG_RTC_DRV_ISL12057=y
CONFIG_RTC_DRV_X1205=m
CONFIG_RTC_DRV_PCF8523=y
CONFIG_RTC_DRV_PCF85063=m
@@ -4970,7 +5041,6 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
CONFIG_R8712U=m
CONFIG_R8188EU=m
CONFIG_88EU_AP_MODE=y
-# CONFIG_R8723AU is not set
# CONFIG_VT6656 is not set
#
@@ -5082,6 +5152,7 @@ CONFIG_ASHMEM=y
CONFIG_ION=y
# CONFIG_ION_TEST is not set
# CONFIG_ION_DUMMY is not set
+CONFIG_ION_OF=y
# CONFIG_STAGING_BOARD is not set
# CONFIG_LTE_GDM724X is not set
# CONFIG_MTD_SPINAND_MT29F is not set
@@ -5126,8 +5197,30 @@ CONFIG_FB_TFT_FBTFT_DEVICE=m
# CONFIG_WILC1000_SPI is not set
# CONFIG_MOST is not set
# CONFIG_KS7010 is not set
+CONFIG_GREYBUS=m
+# CONFIG_GREYBUS_ES2 is not set
+CONFIG_GREYBUS_AUDIO=m
+CONFIG_GREYBUS_BOOTROM=m
+CONFIG_GREYBUS_FIRMWARE=m
+CONFIG_GREYBUS_HID=m
+CONFIG_GREYBUS_LIGHT=m
+CONFIG_GREYBUS_LOG=m
+CONFIG_GREYBUS_LOOPBACK=m
+CONFIG_GREYBUS_POWER=m
+CONFIG_GREYBUS_RAW=m
+CONFIG_GREYBUS_VIBRATOR=m
+CONFIG_GREYBUS_BRIDGED_PHY=m
+CONFIG_GREYBUS_GPIO=m
+CONFIG_GREYBUS_I2C=m
+CONFIG_GREYBUS_PWM=m
+CONFIG_GREYBUS_SDIO=m
+CONFIG_GREYBUS_SPI=m
+CONFIG_GREYBUS_UART=m
+CONFIG_GREYBUS_USB=m
# CONFIG_GOLDFISH is not set
-# CONFIG_CHROME_PLATFORMS is not set
+CONFIG_CHROME_PLATFORMS=y
+# CONFIG_CROS_EC_CHARDEV is not set
+CONFIG_CROS_EC_PROTO=y
CONFIG_CLKDEV_LOOKUP=y
CONFIG_HAVE_CLK_PREPARE=y
CONFIG_COMMON_CLK=y
@@ -5135,9 +5228,8 @@ CONFIG_COMMON_CLK=y
#
# Common Clock Framework
#
-CONFIG_COMMON_CLK_MAX_GEN=y
CONFIG_COMMON_CLK_MAX77686=m
-# CONFIG_COMMON_CLK_MAX77802 is not set
+CONFIG_COMMON_CLK_RK808=m
# CONFIG_COMMON_CLK_SI5351 is not set
# CONFIG_COMMON_CLK_SI514 is not set
# CONFIG_COMMON_CLK_SI570 is not set
@@ -5152,18 +5244,8 @@ CONFIG_COMMON_CLK_PALMAS=y
# CONFIG_COMMON_CLK_PWM is not set
# CONFIG_COMMON_CLK_PXA is not set
# CONFIG_COMMON_CLK_PIC32 is not set
-CONFIG_SUNXI_CCU=y
-CONFIG_SUNXI_CCU_DIV=y
-CONFIG_SUNXI_CCU_FRAC=y
-CONFIG_SUNXI_CCU_GATE=y
-CONFIG_SUNXI_CCU_MUX=y
-CONFIG_SUNXI_CCU_PHASE=y
-CONFIG_SUNXI_CCU_NK=y
-CONFIG_SUNXI_CCU_NKM=y
-CONFIG_SUNXI_CCU_NKMP=y
-CONFIG_SUNXI_CCU_NM=y
-CONFIG_SUNXI_CCU_MP=y
-CONFIG_SUN8I_H3_CCU=y
+# CONFIG_COMMON_CLK_MT8135 is not set
+# CONFIG_COMMON_CLK_MT8173 is not set
CONFIG_COMMON_CLK_TI_ADPLL=y
CONFIG_HWSPINLOCK=y
@@ -5189,6 +5271,7 @@ CONFIG_ARM_TIMER_SP804=y
# CONFIG_EM_TIMER_STI is not set
CONFIG_CLKSRC_VERSATILE=y
CONFIG_MAILBOX=y
+# CONFIG_PLATFORM_MHU is not set
CONFIG_OMAP2PLUS_MBOX=y
CONFIG_OMAP_MBOX_KFIFO_SIZE=256
CONFIG_ALTERA_MBOX=y
@@ -5252,12 +5335,10 @@ CONFIG_EXTCON=y
#
# CONFIG_EXTCON_ADC_JACK is not set
# CONFIG_EXTCON_AXP288 is not set
-CONFIG_EXTCON_DT_CON=y
-CONFIG_EXTCON_DT_CON_PROXY=y
-CONFIG_EXTCON_DT_CON_GPIO=y
CONFIG_EXTCON_GPIO=y
# CONFIG_EXTCON_MAX3355 is not set
CONFIG_EXTCON_PALMAS=y
+# CONFIG_EXTCON_QCOM_SPMI_MISC is not set
# CONFIG_EXTCON_RT8973A is not set
# CONFIG_EXTCON_SM5502 is not set
CONFIG_EXTCON_USB_GPIO=y
@@ -5285,12 +5366,17 @@ CONFIG_BMA220=m
CONFIG_BMC150_ACCEL=m
CONFIG_BMC150_ACCEL_I2C=m
CONFIG_BMC150_ACCEL_SPI=m
+CONFIG_DMARD06=m
+CONFIG_DMARD09=m
CONFIG_HID_SENSOR_ACCEL_3D=m
CONFIG_IIO_ST_ACCEL_3AXIS=m
CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
CONFIG_KXSD9=m
+CONFIG_KXSD9_SPI=m
+CONFIG_KXSD9_I2C=m
CONFIG_KXCJK1013=m
+CONFIG_MC3230=m
CONFIG_MMA7455=m
CONFIG_MMA7455_I2C=m
CONFIG_MMA7455_SPI=m
@@ -5321,6 +5407,7 @@ CONFIG_AXP288_ADC=m
CONFIG_CC10001_ADC=m
CONFIG_HI8435=m
CONFIG_INA2XX_ADC=m
+CONFIG_LTC2485=m
CONFIG_MAX1027=m
CONFIG_MAX1363=m
CONFIG_MCP320X=m
@@ -5329,7 +5416,9 @@ CONFIG_NAU7802=m
CONFIG_PALMAS_GPADC=m
CONFIG_TI_ADC081C=m
CONFIG_TI_ADC0832=m
+CONFIG_TI_ADC12138=m
CONFIG_TI_ADC128S052=m
+CONFIG_TI_ADC161S626=m
CONFIG_TI_ADS1015=m
CONFIG_TI_ADS8688=m
CONFIG_TI_AM335X_ADC=m
@@ -5386,6 +5475,7 @@ CONFIG_AD5761=m
CONFIG_AD5764=m
CONFIG_AD5791=m
CONFIG_AD7303=m
+CONFIG_AD8801=m
CONFIG_M62332=m
CONFIG_MAX517=m
CONFIG_MAX5821=m
@@ -5487,6 +5577,7 @@ CONFIG_LTR501=m
CONFIG_MAX44000=m
CONFIG_OPT3001=m
CONFIG_PA12203001=m
+CONFIG_SI1145=m
CONFIG_STK3310=m
CONFIG_TCS3414=m
CONFIG_TCS3472=m
@@ -5499,6 +5590,7 @@ CONFIG_VEML6070=m
#
# Magnetometer sensors
#
+CONFIG_AK8974=m
CONFIG_AK8975=m
CONFIG_AK09911=m
CONFIG_BMC150_MAGN=m
@@ -5556,6 +5648,9 @@ CONFIG_IIO_ST_PRESS_I2C=m
CONFIG_IIO_ST_PRESS_SPI=m
CONFIG_T5403=m
CONFIG_HP206C=m
+CONFIG_ZPA2326=m
+CONFIG_ZPA2326_I2C=m
+CONFIG_ZPA2326_SPI=m
#
# Lightning sensors
@@ -5571,15 +5666,18 @@ CONFIG_SX9500=m
#
# Temperature sensors
#
+CONFIG_MAXIM_THERMOCOUPLE=m
CONFIG_MLX90614=m
CONFIG_TMP006=m
CONFIG_TSYS01=m
CONFIG_TSYS02D=m
CONFIG_PWM=y
CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_CROS_EC is not set
# CONFIG_PWM_FSL_FTM is not set
CONFIG_PWM_OMAP_DMTIMER=m
CONFIG_PWM_PCA9685=m
+# CONFIG_PWM_STMPE is not set
CONFIG_PWM_TIECAP=m
CONFIG_PWM_TIEHRPWM=m
CONFIG_PWM_TIPWMSS=y
@@ -6104,6 +6202,7 @@ CONFIG_FTRACE=y
CONFIG_FUNCTION_TRACER=y
# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_SCHED_TRACER is not set
+# CONFIG_HWLAT_TRACER is not set
CONFIG_FTRACE_SYSCALLS=y
CONFIG_TRACER_SNAPSHOT=y
# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
@@ -6163,6 +6262,7 @@ CONFIG_KGDB_KDB=y
CONFIG_KDB_DEFAULT_ENABLE=0x1
CONFIG_KDB_KEYBOARD=y
CONFIG_KDB_CONTINUE_CATASTROPHIC=0
+# CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
# CONFIG_UBSAN is not set
CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
# CONFIG_STRICT_DEVMEM is not set
@@ -6203,7 +6303,6 @@ CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_DEVELOP=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
# CONFIG_SECURITY_SMACK is not set
CONFIG_SECURITY_TOMOYO=y
CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
@@ -6317,7 +6416,7 @@ CONFIG_CRYPTO_RMD320=m
CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_SHA512=m
-# CONFIG_CRYPTO_SHA3 is not set
+CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_TGR192=m
CONFIG_CRYPTO_WP512=m
@@ -6461,7 +6560,6 @@ CONFIG_DQL=y
CONFIG_GLOB=y
# CONFIG_GLOB_SELFTEST is not set
CONFIG_NLATTR=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_LRU_CACHE=m
CONFIG_CLZ_TAB=y
CONFIG_CORDIC=m
@@ -6477,6 +6575,7 @@ CONFIG_FONT_8x16=y
CONFIG_SG_SPLIT=y
CONFIG_SG_POOL=y
CONFIG_ARCH_HAS_SG_CHAIN=y
+CONFIG_SBITMAP=y
CONFIG_VIRTUALIZATION=y
# CONFIG_VHOST_NET is not set
# CONFIG_VHOST_SCSI is not set
diff --git a/patches/drivers/ti/tps65217/0001-tps65217-Enable-KEY_POWER-press-on-AC-loss-PWR_BUT.patch b/patches/drivers/ti/tps65217/0001-tps65217-Enable-KEY_POWER-press-on-AC-loss-PWR_BUT.patch
deleted file mode 100644
index a24df8fd0c58ea4f64254e4e0f64d3da0d08fb85..0000000000000000000000000000000000000000
--- a/patches/drivers/ti/tps65217/0001-tps65217-Enable-KEY_POWER-press-on-AC-loss-PWR_BUT.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From bcd61b5b42cd77827740265e81fa43830a78ae3d Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Mon, 26 Oct 2015 11:42:13 -0500
-Subject: [PATCH] tps65217: Enable KEY_POWER press on AC loss / PWR_BUT
-
-This is an adaption to v3.14.x of the original patch by Andrew Bradford <andrew.bradford@omni-id.com>
-Some minor devm_* changes and DT support done by Pantelis Antoniou <panto@antoniou-consulting.com> for 3.8.x
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- arch/arm/boot/dts/am335x-bone-common.dtsi | 3 +
- drivers/mfd/tps65217.c | 122 +++++++++++++++++++++++++++++-
- include/linux/mfd/tps65217.h | 5 ++
- 3 files changed, 128 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index d0e15df..b9d836e 100644
---- a/arch/arm/boot/dts/am335x-bone-common.dtsi
-+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
-@@ -312,6 +312,9 @@
- */
- ti,pmic-shutdown-controller;
-
-+ interrupt-parent = <&intc>;
-+ interrupts = <7>; /* NNMI */
-+
- regulators {
- dcdc1_reg: regulator@0 {
- regulator-name = "vdds_dpr";
-diff --git a/drivers/mfd/tps65217.c b/drivers/mfd/tps65217.c
-index 049a6fc..403f795 100644
---- a/drivers/mfd/tps65217.c
-+++ b/drivers/mfd/tps65217.c
-@@ -24,8 +24,12 @@
- #include <linux/slab.h>
- #include <linux/regmap.h>
- #include <linux/err.h>
-+#include <linux/input.h>
- #include <linux/of.h>
- #include <linux/of_device.h>
-+#include <linux/of_irq.h>
-+#include <linux/of_gpio.h>
-+#include <linux/interrupt.h>
-
- #include <linux/mfd/core.h>
- #include <linux/mfd/tps65217.h>
-@@ -162,6 +166,82 @@ static const struct of_device_id tps65217_of_match[] = {
- };
- MODULE_DEVICE_TABLE(of, tps65217_of_match);
-
-+static irqreturn_t tps65217_irq(int irq, void *irq_data)
-+{
-+ struct tps65217 *tps = irq_data;
-+ unsigned int int_reg = 0, status_reg = 0;
-+
-+ tps65217_reg_read(tps, TPS65217_REG_INT, &int_reg);
-+ tps65217_reg_read(tps, TPS65217_REG_STATUS, &status_reg);
-+ if (status_reg)
-+ dev_dbg(tps->dev, "status now: 0x%X\n", status_reg);
-+
-+ if (!int_reg)
-+ return IRQ_NONE;
-+
-+ if (int_reg & TPS65217_INT_PBI) {
-+ /* Handle push button */
-+ dev_dbg(tps->dev, "power button status change\n");
-+ input_report_key(tps->pwr_but, KEY_POWER,
-+ status_reg & TPS65217_STATUS_PB);
-+ input_sync(tps->pwr_but);
-+ }
-+ if (int_reg & TPS65217_INT_ACI) {
-+ /* Handle AC power status change */
-+ dev_dbg(tps->dev, "AC power status change\n");
-+ /* Press KEY_POWER when AC not present */
-+ input_report_key(tps->pwr_but, KEY_POWER,
-+ ~status_reg & TPS65217_STATUS_ACPWR);
-+ input_sync(tps->pwr_but);
-+ }
-+ if (int_reg & TPS65217_INT_USBI) {
-+ /* Handle USB power status change */
-+ dev_dbg(tps->dev, "USB power status change\n");
-+ }
-+
-+ return IRQ_HANDLED;
-+}
-+
-+static int tps65217_probe_pwr_but(struct tps65217 *tps)
-+{
-+ int ret;
-+ unsigned int int_reg;
-+
-+ tps->pwr_but = devm_input_allocate_device(tps->dev);
-+ if (!tps->pwr_but) {
-+ dev_err(tps->dev,
-+ "Failed to allocated pwr_but input device\n");
-+ return -ENOMEM;
-+ }
-+
-+ tps->pwr_but->evbit[0] = BIT_MASK(EV_KEY);
-+ tps->pwr_but->keybit[BIT_WORD(KEY_POWER)] = BIT_MASK(KEY_POWER);
-+ tps->pwr_but->name = "tps65217_pwr_but";
-+ ret = input_register_device(tps->pwr_but);
-+ if (ret) {
-+ /* NOTE: devm managed device */
-+ dev_err(tps->dev, "Failed to register button device\n");
-+ return ret;
-+ }
-+ ret = devm_request_threaded_irq(tps->dev,
-+ tps->irq, NULL, tps65217_irq, IRQF_TRIGGER_LOW | IRQF_ONESHOT,
-+ "tps65217", tps);
-+ if (ret != 0) {
-+ dev_err(tps->dev, "Failed to request IRQ %d\n", tps->irq);
-+ return ret;
-+ }
-+
-+ /* enable the power button interrupt */
-+ ret = tps65217_reg_read(tps, TPS65217_REG_INT, &int_reg);
-+ if (ret < 0) {
-+ dev_err(tps->dev, "Failed to read INT reg\n");
-+ return ret;
-+ }
-+ int_reg &= ~TPS65217_INT_PBM;
-+ tps65217_reg_write(tps, TPS65217_REG_INT, int_reg, TPS65217_PROTECT_NONE);
-+ return 0;
-+}
-+
- static int tps65217_probe(struct i2c_client *client,
- const struct i2c_device_id *ids)
- {
-@@ -169,10 +249,13 @@ static int tps65217_probe(struct i2c_client *client,
- unsigned int version;
- unsigned long chip_id = ids->driver_data;
- const struct of_device_id *match;
-+ struct device_node *node;
- bool status_off = false;
-+ int irq = -1, irq_gpio = -1;
- int ret;
-
-- if (client->dev.of_node) {
-+ node = client->dev.of_node;
-+ if (node) {
- match = of_match_device(tps65217_of_match, &client->dev);
- if (!match) {
- dev_err(&client->dev,
-@@ -180,8 +263,31 @@ static int tps65217_probe(struct i2c_client *client,
- return -EINVAL;
- }
- chip_id = (unsigned long)match->data;
-- status_off = of_property_read_bool(client->dev.of_node,
-+ status_off = of_property_read_bool(node,
- "ti,pmic-shutdown-controller");
-+
-+ /* at first try to get irq via OF method */
-+ irq = irq_of_parse_and_map(node, 0);
-+ if (irq <= 0) {
-+ irq = -1;
-+ irq_gpio = of_get_named_gpio(node, "irq-gpio", 0);
-+ if (irq_gpio >= 0) {
-+ /* valid gpio; convert to irq */
-+ ret = devm_gpio_request_one(&client->dev,
-+ irq_gpio, GPIOF_DIR_IN,
-+ "tps65217-gpio-irq");
-+ if (ret != 0)
-+ dev_warn(&client->dev, "Failed to "
-+ "request gpio #%d\n", irq_gpio);
-+ irq = gpio_to_irq(irq_gpio);
-+ if (irq <= 0) {
-+ dev_warn(&client->dev, "Failed to "
-+ "convert gpio #%d to irq\n",
-+ irq_gpio);
-+ irq = -1;
-+ }
-+ }
-+ }
- }
-
- if (!chip_id) {
-@@ -205,6 +311,18 @@ static int tps65217_probe(struct i2c_client *client,
- return ret;
- }
-
-+ tps->irq = irq;
-+ tps->irq_gpio = irq_gpio;
-+
-+ /* we got an irq, request it */
-+ if (tps->irq >= 0) {
-+ ret = tps65217_probe_pwr_but(tps);
-+ if (ret < 0) {
-+ dev_err(tps->dev, "Failed to probe pwr_but\n");
-+ return ret;
-+ }
-+ }
-+
- ret = devm_mfd_add_devices(tps->dev, -1, tps65217s,
- ARRAY_SIZE(tps65217s), NULL, 0, NULL);
- if (ret < 0) {
-diff --git a/include/linux/mfd/tps65217.h b/include/linux/mfd/tps65217.h
-index 1c88231..c4f47e5 100644
---- a/include/linux/mfd/tps65217.h
-+++ b/include/linux/mfd/tps65217.h
-@@ -258,6 +258,11 @@ struct tps65217 {
- struct regulator_desc desc[TPS65217_NUM_REGULATOR];
- struct regmap *regmap;
- u8 *strobes;
-+
-+ /* Power button and IRQ handling */
-+ int irq_gpio; /* might not be set */
-+ int irq;
-+ struct input_dev *pwr_but;
- };
-
- static inline struct tps65217 *dev_to_tps65217(struct device *dev)
---
-2.9.3
-
diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig
index bf169fa607bdbcafc08134543f9d4a8cee5d764a..6bd75604df19ff68c32f5c9ce9dbe17d0792afc6 100644
--- a/patches/ref_omap2plus_defconfig
+++ b/patches/ref_omap2plus_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.8.1 Kernel Configuration
+# Linux/arm 4.9.0-rc1 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -75,6 +75,7 @@ CONFIG_HANDLE_DOMAIN_IRQ=y
# CONFIG_IRQ_DOMAIN_DEBUG is not set
CONFIG_IRQ_FORCED_THREADING=y
CONFIG_SPARSE_IRQ=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
CONFIG_GENERIC_TIME_VSYSCALL=y
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_ARCH_HAS_TICK_BROADCAST=y
@@ -259,6 +260,7 @@ CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_OLD_SIGACTION=y
# CONFIG_CPU_NO_EFFICIENT_FFS is not set
+# CONFIG_HAVE_ARCH_VMAP_STACK is not set
#
# GCOV-based kernel profiling
@@ -435,13 +437,11 @@ CONFIG_OMAP_PACKAGE_CBB=y
# OMAP Legacy Platform Data Board Type
#
CONFIG_MACH_OMAP2_TUSB6010=y
-CONFIG_MACH_OMAP_LDP=y
CONFIG_MACH_OMAP3517EVM=y
CONFIG_MACH_OMAP3_PANDORA=y
CONFIG_MACH_NOKIA_N810=y
CONFIG_MACH_NOKIA_N810_WIMAX=y
CONFIG_MACH_NOKIA_N8X0=y
-CONFIG_MACH_NOKIA_RX51=y
# CONFIG_OMAP3_SDRC_AC_TIMING is not set
# CONFIG_OMAP5_ERRATA_801819 is not set
# CONFIG_ARCH_PICOXCELL is not set
@@ -508,6 +508,7 @@ CONFIG_OUTER_CACHE=y
CONFIG_OUTER_CACHE_SYNC=y
CONFIG_MIGHT_HAVE_CACHE_L2X0=y
CONFIG_CACHE_L2X0=y
+# CONFIG_CACHE_L2X0_PMU is not set
CONFIG_PL310_ERRATA_588369=y
CONFIG_PL310_ERRATA_727915=y
# CONFIG_PL310_ERRATA_753970 is not set
@@ -568,12 +569,9 @@ CONFIG_NR_CPUS=2
CONFIG_HOTPLUG_CPU=y
# CONFIG_ARM_PSCI is not set
CONFIG_ARCH_NR_GPIO=512
-CONFIG_HAVE_PREEMPT_LAZY=y
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT__LL is not set
-# CONFIG_PREEMPT_RTB is not set
-# CONFIG_PREEMPT_RT_FULL is not set
+# CONFIG_PREEMPT is not set
CONFIG_HZ_FIXED=0
CONFIG_HZ_100=y
# CONFIG_HZ_200 is not set
@@ -718,6 +716,7 @@ CONFIG_BINFMT_ELF=y
CONFIG_ELFCORE=y
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BINFMT_FLAT is not set
# CONFIG_HAVE_AOUT is not set
CONFIG_BINFMT_MISC=y
CONFIG_COREDUMP=y
@@ -983,6 +982,7 @@ CONFIG_BT_HCIUART_3WIRE=y
# CONFIG_BT_HCIUART_BCM is not set
# CONFIG_BT_HCIUART_QCA is not set
# CONFIG_BT_HCIUART_AG6XX is not set
+# CONFIG_BT_HCIUART_MRVL is not set
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
@@ -991,9 +991,12 @@ CONFIG_BT_MRVL=m
CONFIG_BT_MRVL_SDIO=m
# CONFIG_BT_ATH3K is not set
CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_IPV6 is not set
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
# CONFIG_AF_RXRPC_DEBUG is not set
CONFIG_RXKAD=y
# CONFIG_AF_KCM is not set
+# CONFIG_STREAM_PARSER is not set
CONFIG_WIRELESS=y
CONFIG_WIRELESS_EXT=y
CONFIG_WEXT_CORE=y
@@ -1058,6 +1061,7 @@ CONFIG_ALLOW_DEV_COREDUMP=y
CONFIG_DEV_COREDUMP=y
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_GENERIC_CPU_DEVICES is not set
CONFIG_SOC_BUS=y
@@ -1089,6 +1093,7 @@ CONFIG_CMA_ALIGNMENT=8
# CONFIG_BRCMSTB_GISB_ARB is not set
CONFIG_OMAP_INTERCONNECT=y
CONFIG_OMAP_OCP2SCP=y
+# CONFIG_QCOM_EBI2 is not set
# CONFIG_VEXPRESS_CONFIG is not set
CONFIG_CONNECTOR=m
CONFIG_MTD=y
@@ -1214,7 +1219,6 @@ CONFIG_OF_ADDRESS=y
CONFIG_OF_IRQ=y
CONFIG_OF_NET=y
CONFIG_OF_MDIO=y
-CONFIG_OF_MTD=y
CONFIG_OF_RESERVED_MEM=y
# CONFIG_OF_OVERLAY is not set
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
@@ -1242,7 +1246,6 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
CONFIG_SENSORS_LIS3LV02D=m
# CONFIG_AD525X_DPOT is not set
# CONFIG_DUMMY_IRQ is not set
-CONFIG_HWLAT_DETECTOR=m
# CONFIG_ICS932S401 is not set
# CONFIG_ENCLOSURE_SERVICES is not set
# CONFIG_APDS9802ALS is not set
@@ -1254,9 +1257,6 @@ CONFIG_SENSORS_TSL2550=m
# CONFIG_HMC6352 is not set
# CONFIG_DS1682 is not set
# CONFIG_TI_DAC7512 is not set
-CONFIG_BMP085=m
-CONFIG_BMP085_I2C=m
-# CONFIG_BMP085_SPI is not set
# CONFIG_USB_SWITCH_FSA9480 is not set
# CONFIG_LATTICE_ECP3_CONFIG is not set
CONFIG_SRAM=y
@@ -1412,7 +1412,6 @@ CONFIG_NET_CORE=y
# CONFIG_EQUALIZER is not set
# CONFIG_NET_TEAM is not set
# CONFIG_MACVLAN is not set
-# CONFIG_IPVLAN is not set
# CONFIG_VXLAN is not set
# CONFIG_MACSEC is not set
# CONFIG_NETCONSOLE is not set
@@ -1432,6 +1431,7 @@ CONFIG_NET_CORE=y
#
CONFIG_ETHERNET=y
# CONFIG_ALTERA_TSE is not set
+CONFIG_NET_VENDOR_AMAZON=y
# CONFIG_NET_VENDOR_ARC is not set
# CONFIG_NET_VENDOR_AURORA is not set
# CONFIG_NET_CADENCE is not set
@@ -1480,39 +1480,45 @@ CONFIG_TI_CPTS=y
CONFIG_PHYLIB=y
CONFIG_SWPHY=y
+#
+# MDIO bus device drivers
+#
+# CONFIG_MDIO_BCM_UNIMAC is not set
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_HISI_FEMAC is not set
+
#
# MII PHY device drivers
#
+# CONFIG_AMD_PHY is not set
# CONFIG_AQUANTIA_PHY is not set
CONFIG_AT803X_PHY=y
-# CONFIG_AMD_PHY is not set
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_TERANETICS_PHY is not set
-CONFIG_SMSC_PHY=y
-# CONFIG_BROADCOM_PHY is not set
# CONFIG_BCM7XXX_PHY is not set
# CONFIG_BCM87XX_PHY is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_STE10XP is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_MICREL_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
# CONFIG_DP83848_PHY is not set
# CONFIG_DP83867_PHY is not set
-# CONFIG_MICROCHIP_PHY is not set
CONFIG_FIXED_PHY=y
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-# CONFIG_MDIO_BCM_UNIMAC is not set
+# CONFIG_ICPLUS_PHY is not set
# CONFIG_INTEL_XWAY_PHY is not set
-# CONFIG_MDIO_HISI_FEMAC is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_MICROCHIP_PHY is not set
+# CONFIG_MICROSEMI_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+CONFIG_SMSC_PHY=y
+# CONFIG_STE10XP is not set
+# CONFIG_TERANETICS_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_XILINX_GMII2RGMII is not set
# CONFIG_MICREL_KS8995MA is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
@@ -1656,6 +1662,7 @@ CONFIG_INPUT_EVDEV=m
# Input Device Drivers
#
CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADC is not set
# CONFIG_KEYBOARD_ADP5588 is not set
# CONFIG_KEYBOARD_ADP5589 is not set
CONFIG_KEYBOARD_ATKBD=m
@@ -1703,11 +1710,11 @@ CONFIG_TOUCHSCREEN_ADS7846=m
# CONFIG_TOUCHSCREEN_EETI is not set
# CONFIG_TOUCHSCREEN_EGALAX is not set
# CONFIG_TOUCHSCREEN_EGALAX_SERIAL is not set
-# CONFIG_TOUCHSCREEN_FT6236 is not set
# CONFIG_TOUCHSCREEN_FUJITSU is not set
# CONFIG_TOUCHSCREEN_GOODIX is not set
# CONFIG_TOUCHSCREEN_ILI210X is not set
# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_EKTF2127 is not set
# CONFIG_TOUCHSCREEN_ELAN is not set
# CONFIG_TOUCHSCREEN_ELO is not set
# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
@@ -1753,6 +1760,7 @@ CONFIG_INPUT_MISC=y
# CONFIG_INPUT_GP2A is not set
# CONFIG_INPUT_GPIO_BEEPER is not set
# CONFIG_INPUT_GPIO_TILT_POLLED is not set
+# CONFIG_INPUT_GPIO_DECODER is not set
# CONFIG_INPUT_ATI_REMOTE2 is not set
# CONFIG_INPUT_KEYSPAN_REMOTE is not set
# CONFIG_INPUT_KXTJ9 is not set
@@ -2016,6 +2024,7 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_GPIO_EM is not set
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_GRGPIO is not set
+# CONFIG_GPIO_MOCKUP is not set
# CONFIG_GPIO_MPC8XXX is not set
CONFIG_GPIO_OMAP=y
# CONFIG_GPIO_SYSCON is not set
@@ -2034,10 +2043,12 @@ CONFIG_GPIO_PCA953X=m
CONFIG_GPIO_PCF857X=y
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_TPIC2810 is not set
+# CONFIG_GPIO_TS4900 is not set
#
# MFD GPIO expanders
#
+# CONFIG_HTC_EGPIO is not set
CONFIG_GPIO_PALMAS=y
# CONFIG_GPIO_TPS65218 is not set
# CONFIG_GPIO_TPS65910 is not set
@@ -2088,6 +2099,24 @@ CONFIG_HDQ_MASTER_OMAP=m
# CONFIG_W1_SLAVE_DS2781 is not set
# CONFIG_W1_SLAVE_DS28E04 is not set
# CONFIG_W1_SLAVE_BQ27000 is not set
+CONFIG_POWER_AVS=y
+
+#
+# Power Sequence Support
+#
+# CONFIG_PWRSEQ_GENERIC is not set
+# CONFIG_PWRSEQ_SAMPLE is not set
+CONFIG_POWER_RESET=y
+# CONFIG_POWER_RESET_BRCMKONA is not set
+# CONFIG_POWER_RESET_BRCMSTB is not set
+# CONFIG_POWER_RESET_GPIO is not set
+# CONFIG_POWER_RESET_GPIO_RESTART is not set
+# CONFIG_POWER_RESET_LTC2952 is not set
+# CONFIG_POWER_RESET_RESTART is not set
+# CONFIG_POWER_RESET_VERSATILE is not set
+# CONFIG_POWER_RESET_SYSCON is not set
+# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
+# CONFIG_SYSCON_REBOOT_MODE is not set
CONFIG_POWER_SUPPLY=y
# CONFIG_POWER_SUPPLY_DEBUG is not set
# CONFIG_PDA_POWER is not set
@@ -2116,24 +2145,6 @@ CONFIG_CHARGER_BQ24735=m
# CONFIG_CHARGER_TPS65217 is not set
# CONFIG_BATTERY_GAUGE_LTC2941 is not set
# CONFIG_CHARGER_RT9455 is not set
-
-#
-# Power Sequence Support
-#
-# CONFIG_PWRSEQ_GENERIC is not set
-# CONFIG_PWRSEQ_SAMPLE is not set
-CONFIG_POWER_RESET=y
-# CONFIG_POWER_RESET_BRCMKONA is not set
-# CONFIG_POWER_RESET_BRCMSTB is not set
-# CONFIG_POWER_RESET_GPIO is not set
-# CONFIG_POWER_RESET_GPIO_RESTART is not set
-# CONFIG_POWER_RESET_LTC2952 is not set
-# CONFIG_POWER_RESET_RESTART is not set
-# CONFIG_POWER_RESET_VERSATILE is not set
-# CONFIG_POWER_RESET_SYSCON is not set
-# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
-# CONFIG_SYSCON_REBOOT_MODE is not set
-CONFIG_POWER_AVS=y
CONFIG_HWMON=m
# CONFIG_HWMON_VID is not set
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -2277,7 +2288,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y
CONFIG_CPU_THERMAL=y
# CONFIG_CLOCK_THERMAL is not set
# CONFIG_THERMAL_EMULATION is not set
-# CONFIG_IMX_THERMAL is not set
+# CONFIG_QORIQ_THERMAL is not set
#
# ACPI INT340X thermal drivers
@@ -2316,6 +2327,11 @@ CONFIG_TWL4030_WATCHDOG=m
# USB-based Watchdog Cards
#
# CONFIG_USBPCWATCHDOG is not set
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
CONFIG_SSB_POSSIBLE=y
#
@@ -2352,10 +2368,10 @@ CONFIG_MFD_CORE=y
# CONFIG_MFD_DA9063 is not set
# CONFIG_MFD_DA9150 is not set
# CONFIG_MFD_DLN2 is not set
+# CONFIG_MFD_EXYNOS_LPASS is not set
# CONFIG_MFD_MC13XXX_SPI is not set
# CONFIG_MFD_MC13XXX_I2C is not set
# CONFIG_MFD_HI6421_PMIC is not set
-# CONFIG_HTC_EGPIO is not set
# CONFIG_HTC_PASIC3 is not set
# CONFIG_HTC_I2CPLD is not set
# CONFIG_INTEL_SOC_PMIC is not set
@@ -2403,6 +2419,7 @@ CONFIG_MFD_PALMAS=y
# CONFIG_MFD_TPS65086 is not set
# CONFIG_MFD_TPS65090 is not set
CONFIG_MFD_TPS65217=y
+# CONFIG_MFD_TI_LP873X is not set
CONFIG_MFD_TPS65218=y
# CONFIG_MFD_TPS6586X is not set
CONFIG_MFD_TPS65910=y
@@ -2447,6 +2464,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_LP872X=y
# CONFIG_REGULATOR_LP8755 is not set
# CONFIG_REGULATOR_LTC3589 is not set
+# CONFIG_REGULATOR_LTC3676 is not set
# CONFIG_REGULATOR_MAX1586 is not set
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
@@ -2541,13 +2559,13 @@ CONFIG_VIDEO_OMAP3=m
# CONFIG_CYPRESS_FIRMWARE is not set
#
-# Media ancillary drivers (tuners, sensors, i2c, frontends)
+# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
#
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
CONFIG_VIDEO_IR_I2C=m
#
-# Encoders, decoders, sensors and other helper chips
+# I2C Encoders, decoders, sensors and other helper chips
#
#
@@ -2586,6 +2604,7 @@ CONFIG_VIDEO_IR_I2C=m
# CONFIG_VIDEO_BT866 is not set
# CONFIG_VIDEO_KS0127 is not set
# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_AD5820 is not set
# CONFIG_VIDEO_SAA7110 is not set
# CONFIG_VIDEO_SAA711X is not set
# CONFIG_VIDEO_TC358743 is not set
@@ -2626,6 +2645,7 @@ CONFIG_VIDEO_TVP5150=m
# CONFIG_VIDEO_OV9650 is not set
# CONFIG_VIDEO_VS6624 is not set
# CONFIG_VIDEO_MT9M032 is not set
+# CONFIG_VIDEO_MT9M111 is not set
# CONFIG_VIDEO_MT9P031 is not set
# CONFIG_VIDEO_MT9T001 is not set
# CONFIG_VIDEO_MT9V011 is not set
@@ -2669,6 +2689,11 @@ CONFIG_VIDEO_TVP5150=m
# Sensors used on soc_camera driver
#
+#
+# SPI helper chips
+#
+# CONFIG_VIDEO_GS1662 is not set
+
#
# Customise DVB Frontends
#
@@ -2901,13 +2926,6 @@ CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
# CONFIG_SND_SOC_IMG is not set
-
-#
-# Allwinner SoC Audio support
-#
-# CONFIG_SND_SUN4I_CODEC is not set
-# CONFIG_SND_SUN4I_I2S is not set
-# CONFIG_SND_SUN4I_SPDIF is not set
# CONFIG_SND_SOC_XTFPGA_I2S is not set
CONFIG_SND_SOC_I2C_AND_SPI=m
@@ -2994,9 +3012,11 @@ CONFIG_SND_SOC_TWL6040=m
# CONFIG_SND_SOC_WM8974 is not set
# CONFIG_SND_SOC_WM8978 is not set
# CONFIG_SND_SOC_WM8985 is not set
+# CONFIG_SND_SOC_NAU8810 is not set
# CONFIG_SND_SOC_TPA6130A2 is not set
CONFIG_SND_SIMPLE_CARD_UTILS=m
CONFIG_SND_SIMPLE_CARD=m
+# CONFIG_SND_SIMPLE_SCU_CARD is not set
# CONFIG_SOUND_PRIME is not set
#
@@ -3112,7 +3132,7 @@ CONFIG_USB_DEFAULT_PERSIST=y
# CONFIG_USB_OTG is not set
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
-# CONFIG_USB_ULPI_BUS is not set
+# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
CONFIG_USB_MON=m
# CONFIG_USB_WUSB_CBAF is not set
@@ -3292,6 +3312,7 @@ CONFIG_USB_TEST=m
# CONFIG_USB_YUREX is not set
# CONFIG_USB_EZUSB_FX2 is not set
# CONFIG_USB_HSIC_USB3503 is not set
+# CONFIG_USB_HSIC_USB4604 is not set
# CONFIG_USB_LINK_LAYER_TEST is not set
# CONFIG_USB_CHAOSKEY is not set
@@ -3385,6 +3406,7 @@ CONFIG_USB_G_NOKIA=m
# CONFIG_USB_G_DBGP is not set
# CONFIG_USB_G_WEBCAM is not set
# CONFIG_USB_LED_TRIG is not set
+# CONFIG_USB_ULPI_BUS is not set
# CONFIG_UWB is not set
CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
@@ -3441,6 +3463,7 @@ CONFIG_LEDS_PWM=m
# CONFIG_LEDS_TCA6507 is not set
# CONFIG_LEDS_TLC591XX is not set
# CONFIG_LEDS_LM355x is not set
+# CONFIG_LEDS_IS31FL319X is not set
# CONFIG_LEDS_IS31FL32XX is not set
#
@@ -3496,6 +3519,7 @@ CONFIG_RTC_INTF_DEV=y
# CONFIG_RTC_DRV_ABX80X is not set
CONFIG_RTC_DRV_DS1307=m
CONFIG_RTC_DRV_DS1307_HWMON=y
+# CONFIG_RTC_DRV_DS1307_CENTURY is not set
# CONFIG_RTC_DRV_DS1374 is not set
# CONFIG_RTC_DRV_DS1672 is not set
# CONFIG_RTC_DRV_HYM8563 is not set
@@ -3503,7 +3527,6 @@ CONFIG_RTC_DRV_DS1307_HWMON=y
# CONFIG_RTC_DRV_RS5C372 is not set
# CONFIG_RTC_DRV_ISL1208 is not set
# CONFIG_RTC_DRV_ISL12022 is not set
-# CONFIG_RTC_DRV_ISL12057 is not set
# CONFIG_RTC_DRV_X1205 is not set
# CONFIG_RTC_DRV_PCF8523 is not set
# CONFIG_RTC_DRV_PCF85063 is not set
@@ -3646,7 +3669,8 @@ CONFIG_COMMON_CLK_PALMAS=m
# CONFIG_COMMON_CLK_PWM is not set
# CONFIG_COMMON_CLK_PXA is not set
# CONFIG_COMMON_CLK_PIC32 is not set
-# CONFIG_SUNXI_CCU is not set
+# CONFIG_COMMON_CLK_MT8135 is not set
+# CONFIG_COMMON_CLK_MT8173 is not set
CONFIG_COMMON_CLK_TI_ADPLL=y
#
@@ -3714,6 +3738,7 @@ CONFIG_EXTCON=m
# CONFIG_EXTCON_GPIO is not set
# CONFIG_EXTCON_MAX3355 is not set
CONFIG_EXTCON_PALMAS=m
+# CONFIG_EXTCON_QCOM_SPMI_MISC is not set
# CONFIG_EXTCON_RT8973A is not set
# CONFIG_EXTCON_SM5502 is not set
CONFIG_EXTCON_USB_GPIO=m
@@ -3957,7 +3982,9 @@ CONFIG_TI_AM335X_ADC=m
#
# Pressure sensors
#
-# CONFIG_BMP280 is not set
+CONFIG_BMP280=m
+CONFIG_BMP280_I2C=m
+CONFIG_BMP280_SPI=m
# CONFIG_HP03 is not set
# CONFIG_MPL115_I2C is not set
# CONFIG_MPL115_SPI is not set
@@ -4340,7 +4367,6 @@ CONFIG_LOCKDEP=y
# CONFIG_DEBUG_ATOMIC_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_LOCK_TORTURE_TEST is not set
-CONFIG_USING_GET_LOCK_PARENT_IP=y
CONFIG_TRACE_IRQFLAGS=y
CONFIG_STACKTRACE=y
# CONFIG_DEBUG_KOBJECT is not set
@@ -4387,7 +4413,7 @@ CONFIG_FTRACE=y
# CONFIG_FUNCTION_TRACER is not set
# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_SCHED_TRACER is not set
-# CONFIG_MISSED_TIMER_OFFSETS_HIST is not set
+# CONFIG_HWLAT_TRACER is not set
# CONFIG_ENABLE_DEFAULT_TRACERS is not set
# CONFIG_FTRACE_SYSCALLS is not set
# CONFIG_TRACER_SNAPSHOT is not set
@@ -4435,6 +4461,7 @@ CONFIG_TRACING_EVENTS_GPIO=y
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
+# CONFIG_ARCH_WANTS_UBSAN_NO_NULL is not set
# CONFIG_UBSAN is not set
CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
# CONFIG_STRICT_DEVMEM is not set
@@ -4679,7 +4706,6 @@ CONFIG_GLOB=y
# CONFIG_GLOB_SELFTEST is not set
CONFIG_NLATTR=y
CONFIG_GENERIC_ATOMIC64=y
-CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
# CONFIG_CORDIC is not set
CONFIG_DDR=y
# CONFIG_IRQ_POLL is not set
@@ -4701,4 +4727,5 @@ CONFIG_FONT_8x16=y
CONFIG_SG_SPLIT=y
CONFIG_SG_POOL=y
CONFIG_ARCH_HAS_SG_CHAIN=y
+CONFIG_SBITMAP=y
# CONFIG_VIRTUALIZATION is not set
diff --git a/patches/rt/0001-merge-CONFIG_PREEMPT_RT-Patch-Set.patch b/patches/rt/0001-merge-CONFIG_PREEMPT_RT-Patch-Set.patch
deleted file mode 100644
index f8fcacc568fc8129409cfa64dd700924af646485..0000000000000000000000000000000000000000
--- a/patches/rt/0001-merge-CONFIG_PREEMPT_RT-Patch-Set.patch
+++ /dev/null
@@ -1,26195 +0,0 @@
-From 01b018f21ab90dd49ede8cf9c0baba51ef147a6e Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 7 Oct 2016 10:01:18 -0500
-Subject: [PATCH] merge: CONFIG_PREEMPT_RT Patch Set
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- Documentation/hwlat_detector.txt | 64 +
- Documentation/sysrq.txt | 11 +-
- Documentation/trace/histograms.txt | 186 +++
- arch/Kconfig | 2 +
- arch/arm/Kconfig | 3 +-
- arch/arm/include/asm/switch_to.h | 8 +
- arch/arm/include/asm/thread_info.h | 8 +-
- arch/arm/kernel/asm-offsets.c | 1 +
- arch/arm/kernel/entry-armv.S | 19 +-
- arch/arm/kernel/entry-common.S | 9 +-
- arch/arm/kernel/process.c | 24 +
- arch/arm/kernel/signal.c | 3 +-
- arch/arm/kernel/smp.c | 5 +-
- arch/arm/kernel/unwind.c | 14 +-
- arch/arm/kvm/arm.c | 6 +-
- arch/arm/mach-exynos/platsmp.c | 12 +-
- arch/arm/mach-hisi/platmcpm.c | 22 +-
- arch/arm/mach-omap2/omap-smp.c | 10 +-
- arch/arm/mach-prima2/platsmp.c | 10 +-
- arch/arm/mach-qcom/platsmp.c | 10 +-
- arch/arm/mach-spear/platsmp.c | 10 +-
- arch/arm/mach-sti/platsmp.c | 10 +-
- arch/arm/mm/fault.c | 6 +
- arch/arm/mm/highmem.c | 58 +-
- arch/arm/plat-versatile/platsmp.c | 10 +-
- arch/arm64/Kconfig | 3 +-
- arch/arm64/include/asm/thread_info.h | 6 +-
- arch/arm64/kernel/asm-offsets.c | 1 +
- arch/arm64/kernel/entry.S | 13 +-
- arch/mips/Kconfig | 2 +-
- arch/powerpc/Kconfig | 6 +-
- arch/powerpc/include/asm/thread_info.h | 11 +-
- arch/powerpc/kernel/asm-offsets.c | 1 +
- arch/powerpc/kernel/entry_32.S | 17 +-
- arch/powerpc/kernel/entry_64.S | 14 +-
- arch/powerpc/kernel/irq.c | 2 +
- arch/powerpc/kernel/misc_32.S | 2 +
- arch/powerpc/kernel/misc_64.S | 2 +
- arch/powerpc/kvm/Kconfig | 1 +
- arch/powerpc/platforms/ps3/device-init.c | 2 +-
- arch/sh/kernel/irq.c | 2 +
- arch/sparc/Kconfig | 6 +-
- arch/sparc/kernel/irq_64.c | 2 +
- arch/x86/Kconfig | 8 +-
- arch/x86/crypto/aesni-intel_glue.c | 24 +-
- arch/x86/crypto/cast5_avx_glue.c | 21 +-
- arch/x86/crypto/glue_helper.c | 31 +-
- arch/x86/entry/common.c | 11 +-
- arch/x86/entry/entry_32.S | 16 +
- arch/x86/entry/entry_64.S | 18 +
- arch/x86/include/asm/preempt.h | 31 +-
- arch/x86/include/asm/signal.h | 13 +
- arch/x86/include/asm/stackprotector.h | 9 +-
- arch/x86/include/asm/thread_info.h | 10 +
- arch/x86/include/asm/uv/uv_bau.h | 14 +-
- arch/x86/kernel/apic/io_apic.c | 3 +-
- arch/x86/kernel/asm-offsets.c | 2 +
- arch/x86/kernel/cpu/mcheck/mce.c | 120 +-
- arch/x86/kernel/dumpstack_32.c | 4 +-
- arch/x86/kernel/dumpstack_64.c | 8 +-
- arch/x86/kernel/irq_32.c | 2 +
- arch/x86/kernel/process_32.c | 32 +
- arch/x86/kvm/lapic.c | 1 +
- arch/x86/kvm/x86.c | 7 +
- arch/x86/mm/highmem_32.c | 13 +-
- arch/x86/mm/iomap_32.c | 11 +-
- arch/x86/platform/uv/tlb_uv.c | 26 +-
- arch/x86/platform/uv/uv_time.c | 21 +-
- block/blk-core.c | 23 +-
- block/blk-ioc.c | 5 +-
- block/blk-mq-cpu.c | 17 +-
- block/blk-mq.c | 38 +-
- block/blk-mq.h | 4 +-
- block/blk-softirq.c | 3 +
- block/bounce.c | 4 +-
- crypto/algapi.c | 4 +-
- crypto/api.c | 6 +-
- crypto/internal.h | 4 +-
- drivers/acpi/acpica/acglobal.h | 2 +-
- drivers/acpi/acpica/hwregs.c | 4 +-
- drivers/acpi/acpica/hwxface.c | 4 +-
- drivers/acpi/acpica/utmutex.c | 4 +-
- drivers/ata/libata-sff.c | 12 +-
- drivers/block/zram/zram_drv.c | 30 +-
- drivers/block/zram/zram_drv.h | 41 +
- drivers/char/random.c | 14 +-
- drivers/clocksource/tcb_clksrc.c | 69 +-
- drivers/clocksource/timer-atmel-pit.c | 24 +-
- drivers/clocksource/timer-atmel-st.c | 34 +-
- drivers/cpufreq/Kconfig.x86 | 2 +-
- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +
- drivers/gpu/drm/i915/i915_gem_shrinker.c | 2 +-
- drivers/gpu/drm/i915/i915_irq.c | 2 +
- drivers/gpu/drm/i915/intel_display.c | 2 +-
- drivers/gpu/drm/i915/intel_sprite.c | 11 +-
- drivers/gpu/drm/msm/msm_gem_shrinker.c | 2 +-
- drivers/gpu/drm/radeon/radeon_display.c | 2 +
- drivers/hv/vmbus_drv.c | 4 +-
- drivers/ide/alim15x3.c | 4 +-
- drivers/ide/hpt366.c | 4 +-
- drivers/ide/ide-io-std.c | 8 +-
- drivers/ide/ide-io.c | 2 +-
- drivers/ide/ide-iops.c | 4 +-
- drivers/ide/ide-probe.c | 4 +-
- drivers/ide/ide-taskfile.c | 6 +-
- drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 4 +-
- drivers/input/gameport/gameport.c | 12 +-
- drivers/iommu/amd_iommu.c | 12 +-
- drivers/iommu/intel-iommu.c | 8 +-
- drivers/iommu/iova.c | 9 +-
- drivers/leds/trigger/Kconfig | 2 +-
- drivers/md/bcache/Kconfig | 1 +
- drivers/md/dm-rq.c | 2 +-
- drivers/md/raid5.c | 7 +-
- drivers/md/raid5.h | 1 +
- drivers/misc/Kconfig | 42 +-
- drivers/misc/Makefile | 1 +
- drivers/misc/hwlat_detector.c | 1240 ++++++++++++++++++++
- drivers/mmc/host/mmci.c | 5 -
- drivers/net/ethernet/3com/3c59x.c | 8 +-
- drivers/net/ethernet/realtek/8139too.c | 2 +-
- .../net/wireless/intersil/orinoco/orinoco_usb.c | 2 +-
- drivers/pci/access.c | 2 +-
- drivers/scsi/fcoe/fcoe.c | 16 +-
- drivers/scsi/fcoe/fcoe_ctlr.c | 4 +-
- drivers/scsi/libfc/fc_exch.c | 4 +-
- drivers/scsi/libsas/sas_ata.c | 4 +-
- drivers/scsi/qla2xxx/qla_inline.h | 4 +-
- drivers/scsi/qla2xxx/qla_isr.c | 4 +
- drivers/thermal/x86_pkg_temp_thermal.c | 50 +-
- drivers/tty/serial/8250/8250_core.c | 11 +-
- drivers/tty/serial/8250/8250_port.c | 5 +-
- drivers/tty/serial/amba-pl011.c | 15 +-
- drivers/tty/serial/omap-serial.c | 12 +-
- drivers/tty/serial/sc16is7xx.c | 2 +-
- drivers/usb/core/hcd.c | 4 +-
- drivers/usb/gadget/function/f_fs.c | 2 +-
- drivers/usb/gadget/legacy/inode.c | 4 +-
- fs/aio.c | 24 +-
- fs/autofs4/autofs_i.h | 1 +
- fs/autofs4/expire.c | 2 +-
- fs/buffer.c | 21 +-
- fs/cifs/readdir.c | 2 +-
- fs/dcache.c | 52 +-
- fs/eventpoll.c | 4 +-
- fs/exec.c | 2 +
- fs/fuse/dir.c | 2 +-
- fs/jbd2/checkpoint.c | 2 +
- fs/jbd2/transaction.c | 6 +-
- fs/namei.c | 4 +-
- fs/namespace.c | 8 +-
- fs/nfs/dir.c | 12 +-
- fs/nfs/inode.c | 4 +
- fs/nfs/unlink.c | 35 +-
- fs/ntfs/aops.c | 18 +-
- fs/proc/base.c | 2 +-
- fs/proc/proc_sysctl.c | 2 +-
- fs/timerfd.c | 5 +-
- include/acpi/platform/aclinux.h | 15 +
- include/asm-generic/bug.h | 14 +
- include/linux/blk-mq.h | 1 +
- include/linux/blkdev.h | 3 +-
- include/linux/bottom_half.h | 34 +
- include/linux/buffer_head.h | 42 +
- include/linux/cgroup-defs.h | 2 +
- include/linux/completion.h | 9 +-
- include/linux/cpu.h | 4 +
- include/linux/dcache.h | 5 +-
- include/linux/delay.h | 6 +
- include/linux/ftrace.h | 2 +
- include/linux/highmem.h | 32 +-
- include/linux/hrtimer.h | 27 +-
- include/linux/idr.h | 4 +
- include/linux/init_task.h | 7 +
- include/linux/interrupt.h | 69 +-
- include/linux/irq.h | 4 +-
- include/linux/irq_work.h | 7 +
- include/linux/irqdesc.h | 1 +
- include/linux/irqflags.h | 29 +-
- include/linux/jbd2.h | 24 +
- include/linux/kdb.h | 2 +
- include/linux/kernel.h | 5 +
- include/linux/lglock.h | 24 +
- include/linux/list_bl.h | 30 +-
- include/linux/locallock.h | 278 +++++
- include/linux/mm_types.h | 4 +
- include/linux/mutex.h | 20 +-
- include/linux/mutex_rt.h | 84 ++
- include/linux/netdevice.h | 42 +-
- include/linux/netfilter/x_tables.h | 7 +
- include/linux/nfs_fs.h | 4 +
- include/linux/nfs_xdr.h | 2 +-
- include/linux/notifier.h | 34 +-
- include/linux/percpu.h | 29 +
- include/linux/pid.h | 1 +
- include/linux/preempt.h | 78 +-
- include/linux/printk.h | 2 +
- include/linux/radix-tree.h | 18 +-
- include/linux/random.h | 2 +-
- include/linux/rbtree.h | 2 +-
- include/linux/rbtree_augmented.h | 1 +
- include/linux/rcu_assign_pointer.h | 53 +
- include/linux/rcupdate.h | 75 +-
- include/linux/rcutree.h | 21 +-
- include/linux/rtmutex.h | 30 +-
- include/linux/rwlock_rt.h | 99 ++
- include/linux/rwlock_types.h | 4 +
- include/linux/rwlock_types_rt.h | 33 +
- include/linux/rwsem.h | 6 +
- include/linux/rwsem_rt.h | 167 +++
- include/linux/sched.h | 207 +++-
- include/linux/seqlock.h | 65 +-
- include/linux/signal.h | 1 +
- include/linux/skbuff.h | 7 +
- include/linux/smp.h | 3 +
- include/linux/spinlock.h | 18 +-
- include/linux/spinlock_api_smp.h | 4 +-
- include/linux/spinlock_rt.h | 165 +++
- include/linux/spinlock_types.h | 79 +-
- include/linux/spinlock_types_nort.h | 33 +
- include/linux/spinlock_types_raw.h | 56 +
- include/linux/spinlock_types_rt.h | 48 +
- include/linux/srcu.h | 6 +-
- include/linux/suspend.h | 6 +
- include/linux/swait.h | 1 +
- include/linux/swap.h | 9 +-
- include/linux/swork.h | 24 +
- include/linux/thread_info.h | 12 +-
- include/linux/timer.h | 2 +-
- include/linux/trace_events.h | 3 +
- include/linux/uaccess.h | 2 +
- include/linux/uprobes.h | 1 +
- include/linux/vmstat.h | 4 +
- include/linux/wait.h | 1 +
- include/net/dst.h | 2 +-
- include/net/gen_stats.h | 9 +-
- include/net/neighbour.h | 4 +-
- include/net/net_seq_lock.h | 15 +
- include/net/netns/ipv4.h | 1 +
- include/net/sch_generic.h | 21 +-
- include/trace/events/hist.h | 73 ++
- include/trace/events/latency_hist.h | 29 +
- init/Kconfig | 11 +-
- init/Makefile | 2 +-
- init/main.c | 1 +
- ipc/msg.c | 101 +-
- ipc/sem.c | 10 +
- kernel/Kconfig.locks | 4 +-
- kernel/Kconfig.preempt | 33 +-
- kernel/Makefile | 7 +
- kernel/cgroup.c | 9 +-
- kernel/cpu.c | 324 ++++-
- kernel/debug/kdb/kdb_io.c | 6 +-
- kernel/events/core.c | 2 +
- kernel/exit.c | 2 +-
- kernel/fork.c | 32 +-
- kernel/futex.c | 91 +-
- kernel/irq/handle.c | 8 +-
- kernel/irq/manage.c | 66 +-
- kernel/irq/settings.h | 12 +
- kernel/irq/spurious.c | 8 +
- kernel/irq_work.c | 56 +-
- kernel/ksysfs.c | 12 +
- kernel/locking/Makefile | 9 +-
- kernel/locking/lglock.c | 91 +-
- kernel/locking/lockdep.c | 2 +
- kernel/locking/locktorture.c | 1 -
- kernel/locking/rt.c | 498 ++++++++
- kernel/locking/rtmutex.c | 828 ++++++++++++-
- kernel/locking/rtmutex_common.h | 17 +-
- kernel/locking/spinlock.c | 7 +
- kernel/locking/spinlock_debug.c | 5 +
- kernel/panic.c | 2 +
- kernel/power/hibernate.c | 14 +
- kernel/power/suspend.c | 9 +
- kernel/printk/printk.c | 147 ++-
- kernel/ptrace.c | 9 +-
- kernel/rcu/rcutorture.c | 7 +
- kernel/rcu/tree.c | 148 ++-
- kernel/rcu/tree.h | 7 +-
- kernel/rcu/tree_plugin.h | 161 +--
- kernel/rcu/update.c | 2 +
- kernel/relay.c | 14 +-
- kernel/sched/Makefile | 2 +-
- kernel/sched/completion.c | 32 +-
- kernel/sched/core.c | 413 +++++--
- kernel/sched/deadline.c | 1 +
- kernel/sched/debug.c | 7 +
- kernel/sched/fair.c | 16 +-
- kernel/sched/features.h | 8 +
- kernel/sched/rt.c | 2 +
- kernel/sched/sched.h | 10 +
- kernel/sched/swait.c | 21 +
- kernel/sched/swork.c | 173 +++
- kernel/signal.c | 120 +-
- kernel/softirq.c | 780 +++++++++---
- kernel/stop_machine.c | 53 +-
- kernel/time/hrtimer.c | 258 +++-
- kernel/time/itimer.c | 1 +
- kernel/time/jiffies.c | 7 +-
- kernel/time/ntp.c | 26 +
- kernel/time/posix-cpu-timers.c | 193 ++-
- kernel/time/posix-timers.c | 37 +-
- kernel/time/tick-broadcast-hrtimer.c | 1 +
- kernel/time/tick-common.c | 10 +-
- kernel/time/tick-sched.c | 30 +-
- kernel/time/timekeeping.c | 6 +-
- kernel/time/timekeeping.h | 3 +-
- kernel/time/timer.c | 98 +-
- kernel/trace/Kconfig | 105 ++
- kernel/trace/Makefile | 4 +
- kernel/trace/latency_hist.c | 1178 +++++++++++++++++++
- kernel/trace/trace.c | 38 +-
- kernel/trace/trace.h | 2 +
- kernel/trace/trace_events.c | 2 +
- kernel/trace/trace_irqsoff.c | 11 +
- kernel/trace/trace_output.c | 19 +-
- kernel/user.c | 4 +-
- kernel/watchdog.c | 11 +
- kernel/workqueue.c | 229 ++--
- kernel/workqueue_internal.h | 5 +-
- lib/Kconfig | 1 +
- lib/Kconfig.debug | 10 +
- lib/debugobjects.c | 5 +-
- lib/idr.c | 43 +-
- lib/irq_poll.c | 5 +
- lib/locking-selftest.c | 50 +
- lib/percpu_ida.c | 20 +-
- lib/radix-tree.c | 19 +-
- lib/scatterlist.c | 6 +-
- lib/smp_processor_id.c | 5 +-
- mm/Kconfig | 2 +-
- mm/backing-dev.c | 4 +-
- mm/compaction.c | 6 +-
- mm/filemap.c | 60 +-
- mm/highmem.c | 6 +-
- mm/memcontrol.c | 41 +-
- mm/mmu_context.c | 2 +
- mm/page_alloc.c | 153 ++-
- mm/slab.h | 4 +
- mm/slub.c | 135 ++-
- mm/swap.c | 80 +-
- mm/truncate.c | 7 +-
- mm/vmalloc.c | 13 +-
- mm/vmstat.c | 12 +
- mm/workingset.c | 23 +-
- mm/zsmalloc.c | 73 +-
- net/core/dev.c | 93 +-
- net/core/filter.c | 6 +-
- net/core/gen_estimator.c | 6 +-
- net/core/gen_stats.c | 8 +-
- net/core/skbuff.c | 35 +-
- net/core/sock.c | 3 +-
- net/ipv4/icmp.c | 38 +
- net/ipv4/sysctl_net_ipv4.c | 7 +
- net/ipv4/tcp_ipv4.c | 7 +
- net/mac80211/rx.c | 2 +-
- net/netfilter/core.c | 6 +
- net/packet/af_packet.c | 5 +-
- net/rds/ib_rdma.c | 3 +-
- net/sched/sch_api.c | 2 +-
- net/sched/sch_generic.c | 14 +-
- net/sunrpc/svc_xprt.c | 6 +-
- scripts/mkcompile_h | 4 +-
- sound/core/pcm_native.c | 8 +-
- 365 files changed, 11435 insertions(+), 1889 deletions(-)
- create mode 100644 Documentation/hwlat_detector.txt
- create mode 100644 Documentation/trace/histograms.txt
- create mode 100644 drivers/misc/hwlat_detector.c
- create mode 100644 include/linux/locallock.h
- create mode 100644 include/linux/mutex_rt.h
- create mode 100644 include/linux/rcu_assign_pointer.h
- create mode 100644 include/linux/rwlock_rt.h
- create mode 100644 include/linux/rwlock_types_rt.h
- create mode 100644 include/linux/rwsem_rt.h
- create mode 100644 include/linux/spinlock_rt.h
- create mode 100644 include/linux/spinlock_types_nort.h
- create mode 100644 include/linux/spinlock_types_raw.h
- create mode 100644 include/linux/spinlock_types_rt.h
- create mode 100644 include/linux/swork.h
- create mode 100644 include/net/net_seq_lock.h
- create mode 100644 include/trace/events/hist.h
- create mode 100644 include/trace/events/latency_hist.h
- create mode 100644 kernel/locking/rt.c
- create mode 100644 kernel/sched/swork.c
- create mode 100644 kernel/trace/latency_hist.c
-
-diff --git a/Documentation/hwlat_detector.txt b/Documentation/hwlat_detector.txt
-new file mode 100644
-index 0000000..cb61516
---- /dev/null
-+++ b/Documentation/hwlat_detector.txt
-@@ -0,0 +1,64 @@
-+Introduction:
-+-------------
-+
-+The module hwlat_detector is a special purpose kernel module that is used to
-+detect large system latencies induced by the behavior of certain underlying
-+hardware or firmware, independent of Linux itself. The code was developed
-+originally to detect SMIs (System Management Interrupts) on x86 systems,
-+however there is nothing x86 specific about this patchset. It was
-+originally written for use by the "RT" patch since the Real Time
-+kernel is highly latency sensitive.
-+
-+SMIs are usually not serviced by the Linux kernel, which typically does not
-+even know that they are occuring. SMIs are instead are set up by BIOS code
-+and are serviced by BIOS code, usually for "critical" events such as
-+management of thermal sensors and fans. Sometimes though, SMIs are used for
-+other tasks and those tasks can spend an inordinate amount of time in the
-+handler (sometimes measured in milliseconds). Obviously this is a problem if
-+you are trying to keep event service latencies down in the microsecond range.
-+
-+The hardware latency detector works by hogging all of the cpus for configurable
-+amounts of time (by calling stop_machine()), polling the CPU Time Stamp Counter
-+for some period, then looking for gaps in the TSC data. Any gap indicates a
-+time when the polling was interrupted and since the machine is stopped and
-+interrupts turned off the only thing that could do that would be an SMI.
-+
-+Note that the SMI detector should *NEVER* be used in a production environment.
-+It is intended to be run manually to determine if the hardware platform has a
-+problem with long system firmware service routines.
-+
-+Usage:
-+------
-+
-+Loading the module hwlat_detector passing the parameter "enabled=1" (or by
-+setting the "enable" entry in "hwlat_detector" debugfs toggled on) is the only
-+step required to start the hwlat_detector. It is possible to redefine the
-+threshold in microseconds (us) above which latency spikes will be taken
-+into account (parameter "threshold=").
-+
-+Example:
-+
-+ # modprobe hwlat_detector enabled=1 threshold=100
-+
-+After the module is loaded, it creates a directory named "hwlat_detector" under
-+the debugfs mountpoint, "/debug/hwlat_detector" for this text. It is necessary
-+to have debugfs mounted, which might be on /sys/debug on your system.
-+
-+The /debug/hwlat_detector interface contains the following files:
-+
-+count - number of latency spikes observed since last reset
-+enable - a global enable/disable toggle (0/1), resets count
-+max - maximum hardware latency actually observed (usecs)
-+sample - a pipe from which to read current raw sample data
-+ in the format <timestamp> <latency observed usecs>
-+ (can be opened O_NONBLOCK for a single sample)
-+threshold - minimum latency value to be considered (usecs)
-+width - time period to sample with CPUs held (usecs)
-+ must be less than the total window size (enforced)
-+window - total period of sampling, width being inside (usecs)
-+
-+By default we will set width to 500,000 and window to 1,000,000, meaning that
-+we will sample every 1,000,000 usecs (1s) for 500,000 usecs (0.5s). If we
-+observe any latencies that exceed the threshold (initially 100 usecs),
-+then we write to a global sample ring buffer of 8K samples, which is
-+consumed by reading from the "sample" (pipe) debugfs file interface.
-diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt
-index 3a3b30a..9e0745c 100644
---- a/Documentation/sysrq.txt
-+++ b/Documentation/sysrq.txt
-@@ -59,10 +59,17 @@ On PowerPC - Press 'ALT - Print Screen (or F13) - <command key>,
- On other - If you know of the key combos for other architectures, please
- let me know so I can add them to this section.
-
--On all - write a character to /proc/sysrq-trigger. e.g.:
--
-+On all - write a character to /proc/sysrq-trigger, e.g.:
- echo t > /proc/sysrq-trigger
-
-+On all - Enable network SysRq by writing a cookie to icmp_echo_sysrq, e.g.
-+ echo 0x01020304 >/proc/sys/net/ipv4/icmp_echo_sysrq
-+ Send an ICMP echo request with this pattern plus the particular
-+ SysRq command key. Example:
-+ # ping -c1 -s57 -p0102030468
-+ will trigger the SysRq-H (help) command.
-+
-+
- * What are the 'command' keys?
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- 'b' - Will immediately reboot the system without syncing or unmounting
-diff --git a/Documentation/trace/histograms.txt b/Documentation/trace/histograms.txt
-new file mode 100644
-index 0000000..6f2aeab
---- /dev/null
-+++ b/Documentation/trace/histograms.txt
-@@ -0,0 +1,186 @@
-+ Using the Linux Kernel Latency Histograms
-+
-+
-+This document gives a short explanation how to enable, configure and use
-+latency histograms. Latency histograms are primarily relevant in the
-+context of real-time enabled kernels (CONFIG_PREEMPT/CONFIG_PREEMPT_RT)
-+and are used in the quality management of the Linux real-time
-+capabilities.
-+
-+
-+* Purpose of latency histograms
-+
-+A latency histogram continuously accumulates the frequencies of latency
-+data. There are two types of histograms
-+- potential sources of latencies
-+- effective latencies
-+
-+
-+* Potential sources of latencies
-+
-+Potential sources of latencies are code segments where interrupts,
-+preemption or both are disabled (aka critical sections). To create
-+histograms of potential sources of latency, the kernel stores the time
-+stamp at the start of a critical section, determines the time elapsed
-+when the end of the section is reached, and increments the frequency
-+counter of that latency value - irrespective of whether any concurrently
-+running process is affected by latency or not.
-+- Configuration items (in the Kernel hacking/Tracers submenu)
-+ CONFIG_INTERRUPT_OFF_LATENCY
-+ CONFIG_PREEMPT_OFF_LATENCY
-+
-+
-+* Effective latencies
-+
-+Effective latencies are actually occuring during wakeup of a process. To
-+determine effective latencies, the kernel stores the time stamp when a
-+process is scheduled to be woken up, and determines the duration of the
-+wakeup time shortly before control is passed over to this process. Note
-+that the apparent latency in user space may be somewhat longer, since the
-+process may be interrupted after control is passed over to it but before
-+the execution in user space takes place. Simply measuring the interval
-+between enqueuing and wakeup may also not appropriate in cases when a
-+process is scheduled as a result of a timer expiration. The timer may have
-+missed its deadline, e.g. due to disabled interrupts, but this latency
-+would not be registered. Therefore, the offsets of missed timers are
-+recorded in a separate histogram. If both wakeup latency and missed timer
-+offsets are configured and enabled, a third histogram may be enabled that
-+records the overall latency as a sum of the timer latency, if any, and the
-+wakeup latency. This histogram is called "timerandwakeup".
-+- Configuration items (in the Kernel hacking/Tracers submenu)
-+ CONFIG_WAKEUP_LATENCY
-+ CONFIG_MISSED_TIMER_OFSETS
-+
-+
-+* Usage
-+
-+The interface to the administration of the latency histograms is located
-+in the debugfs file system. To mount it, either enter
-+
-+mount -t sysfs nodev /sys
-+mount -t debugfs nodev /sys/kernel/debug
-+
-+from shell command line level, or add
-+
-+nodev /sys sysfs defaults 0 0
-+nodev /sys/kernel/debug debugfs defaults 0 0
-+
-+to the file /etc/fstab. All latency histogram related files are then
-+available in the directory /sys/kernel/debug/tracing/latency_hist. A
-+particular histogram type is enabled by writing non-zero to the related
-+variable in the /sys/kernel/debug/tracing/latency_hist/enable directory.
-+Select "preemptirqsoff" for the histograms of potential sources of
-+latencies and "wakeup" for histograms of effective latencies etc. The
-+histogram data - one per CPU - are available in the files
-+
-+/sys/kernel/debug/tracing/latency_hist/preemptoff/CPUx
-+/sys/kernel/debug/tracing/latency_hist/irqsoff/CPUx
-+/sys/kernel/debug/tracing/latency_hist/preemptirqsoff/CPUx
-+/sys/kernel/debug/tracing/latency_hist/wakeup/CPUx
-+/sys/kernel/debug/tracing/latency_hist/wakeup/sharedprio/CPUx
-+/sys/kernel/debug/tracing/latency_hist/missed_timer_offsets/CPUx
-+/sys/kernel/debug/tracing/latency_hist/timerandwakeup/CPUx
-+
-+The histograms are reset by writing non-zero to the file "reset" in a
-+particular latency directory. To reset all latency data, use
-+
-+#!/bin/sh
-+
-+TRACINGDIR=/sys/kernel/debug/tracing
-+HISTDIR=$TRACINGDIR/latency_hist
-+
-+if test -d $HISTDIR
-+then
-+ cd $HISTDIR
-+ for i in `find . | grep /reset$`
-+ do
-+ echo 1 >$i
-+ done
-+fi
-+
-+
-+* Data format
-+
-+Latency data are stored with a resolution of one microsecond. The
-+maximum latency is 10,240 microseconds. The data are only valid, if the
-+overflow register is empty. Every output line contains the latency in
-+microseconds in the first row and the number of samples in the second
-+row. To display only lines with a positive latency count, use, for
-+example,
-+
-+grep -v " 0$" /sys/kernel/debug/tracing/latency_hist/preemptoff/CPU0
-+
-+#Minimum latency: 0 microseconds.
-+#Average latency: 0 microseconds.
-+#Maximum latency: 25 microseconds.
-+#Total samples: 3104770694
-+#There are 0 samples greater or equal than 10240 microseconds
-+#usecs samples
-+ 0 2984486876
-+ 1 49843506
-+ 2 58219047
-+ 3 5348126
-+ 4 2187960
-+ 5 3388262
-+ 6 959289
-+ 7 208294
-+ 8 40420
-+ 9 4485
-+ 10 14918
-+ 11 18340
-+ 12 25052
-+ 13 19455
-+ 14 5602
-+ 15 969
-+ 16 47
-+ 17 18
-+ 18 14
-+ 19 1
-+ 20 3
-+ 21 2
-+ 22 5
-+ 23 2
-+ 25 1
-+
-+
-+* Wakeup latency of a selected process
-+
-+To only collect wakeup latency data of a particular process, write the
-+PID of the requested process to
-+
-+/sys/kernel/debug/tracing/latency_hist/wakeup/pid
-+
-+PIDs are not considered, if this variable is set to 0.
-+
-+
-+* Details of the process with the highest wakeup latency so far
-+
-+Selected data of the process that suffered from the highest wakeup
-+latency that occurred in a particular CPU are available in the file
-+
-+/sys/kernel/debug/tracing/latency_hist/wakeup/max_latency-CPUx.
-+
-+In addition, other relevant system data at the time when the
-+latency occurred are given.
-+
-+The format of the data is (all in one line):
-+<PID> <Priority> <Latency> (<Timeroffset>) <Command> \
-+<- <PID> <Priority> <Command> <Timestamp>
-+
-+The value of <Timeroffset> is only relevant in the combined timer
-+and wakeup latency recording. In the wakeup recording, it is
-+always 0, in the missed_timer_offsets recording, it is the same
-+as <Latency>.
-+
-+When retrospectively searching for the origin of a latency and
-+tracing was not enabled, it may be helpful to know the name and
-+some basic data of the task that (finally) was switching to the
-+late real-tlme task. In addition to the victim's data, also the
-+data of the possible culprit are therefore displayed after the
-+"<-" symbol.
-+
-+Finally, the timestamp of the time when the latency occurred
-+in <seconds>.<microseconds> after the most recent system boot
-+is provided.
-+
-+These data are also reset when the wakeup histogram is reset.
-diff --git a/arch/Kconfig b/arch/Kconfig
-index fd6e971..085134e 100644
---- a/arch/Kconfig
-+++ b/arch/Kconfig
-@@ -9,6 +9,7 @@ config OPROFILE
- tristate "OProfile system profiling"
- depends on PROFILING
- depends on HAVE_OPROFILE
-+ depends on !PREEMPT_RT_FULL
- select RING_BUFFER
- select RING_BUFFER_ALLOW_SWAP
- help
-@@ -52,6 +53,7 @@ config KPROBES
- config JUMP_LABEL
- bool "Optimize very unlikely/likely branches"
- depends on HAVE_ARCH_JUMP_LABEL
-+ depends on (!INTERRUPT_OFF_HIST && !PREEMPT_OFF_HIST && !WAKEUP_LATENCY_HIST && !MISSED_TIMER_OFFSETS_HIST)
- help
- This option enables a transparent branch optimization that
- makes certain almost-always-true or almost-always-false branch
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index a9c4e48..6eefe4f 100644
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -36,7 +36,7 @@ config ARM
- select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT)
- select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6
- select HAVE_ARCH_HARDENED_USERCOPY
-- select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU
-+ select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU && !PREEMPT_RT_BASE
- select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU
- select HAVE_ARCH_MMAP_RND_BITS if MMU
- select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)
-@@ -75,6 +75,7 @@ config ARM
- select HAVE_PERF_EVENTS
- select HAVE_PERF_REGS
- select HAVE_PERF_USER_STACK_DUMP
-+ select HAVE_PREEMPT_LAZY
- select HAVE_RCU_TABLE_FREE if (SMP && ARM_LPAE)
- select HAVE_REGS_AND_STACK_ACCESS_API
- select HAVE_SYSCALL_TRACEPOINTS
-diff --git a/arch/arm/include/asm/switch_to.h b/arch/arm/include/asm/switch_to.h
-index 12ebfcc..c962084 100644
---- a/arch/arm/include/asm/switch_to.h
-+++ b/arch/arm/include/asm/switch_to.h
-@@ -3,6 +3,13 @@
-
- #include <linux/thread_info.h>
-
-+#if defined CONFIG_PREEMPT_RT_FULL && defined CONFIG_HIGHMEM
-+void switch_kmaps(struct task_struct *prev_p, struct task_struct *next_p);
-+#else
-+static inline void
-+switch_kmaps(struct task_struct *prev_p, struct task_struct *next_p) { }
-+#endif
-+
- /*
- * For v7 SMP cores running a preemptible kernel we may be pre-empted
- * during a TLB maintenance operation, so execute an inner-shareable dsb
-@@ -25,6 +32,7 @@ extern struct task_struct *__switch_to(struct task_struct *, struct thread_info
- #define switch_to(prev,next,last) \
- do { \
- __complete_pending_tlbi(); \
-+ switch_kmaps(prev, next); \
- last = __switch_to(prev,task_thread_info(prev), task_thread_info(next)); \
- } while (0)
-
-diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
-index 776757d..1f36a4e 100644
---- a/arch/arm/include/asm/thread_info.h
-+++ b/arch/arm/include/asm/thread_info.h
-@@ -49,6 +49,7 @@ struct cpu_context_save {
- struct thread_info {
- unsigned long flags; /* low level flags */
- int preempt_count; /* 0 => preemptable, <0 => bug */
-+ int preempt_lazy_count; /* 0 => preemptable, <0 => bug */
- mm_segment_t addr_limit; /* address limit */
- struct task_struct *task; /* main task structure */
- __u32 cpu; /* cpu */
-@@ -142,7 +143,8 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
- #define TIF_SYSCALL_TRACE 4 /* syscall trace active */
- #define TIF_SYSCALL_AUDIT 5 /* syscall auditing active */
- #define TIF_SYSCALL_TRACEPOINT 6 /* syscall tracepoint instrumentation */
--#define TIF_SECCOMP 7 /* seccomp syscall filtering active */
-+#define TIF_SECCOMP 8 /* seccomp syscall filtering active */
-+#define TIF_NEED_RESCHED_LAZY 7
-
- #define TIF_NOHZ 12 /* in adaptive nohz mode */
- #define TIF_USING_IWMMXT 17
-@@ -152,6 +154,7 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
- #define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
- #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
- #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
-+#define _TIF_NEED_RESCHED_LAZY (1 << TIF_NEED_RESCHED_LAZY)
- #define _TIF_UPROBE (1 << TIF_UPROBE)
- #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
- #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT)
-@@ -167,7 +170,8 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
- * Change these and you break ASM code in entry-common.S
- */
- #define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
-- _TIF_NOTIFY_RESUME | _TIF_UPROBE)
-+ _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
-+ _TIF_NEED_RESCHED_LAZY)
-
- #endif /* __KERNEL__ */
- #endif /* __ASM_ARM_THREAD_INFO_H */
-diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c
-index 6080082..3866da3 100644
---- a/arch/arm/kernel/asm-offsets.c
-+++ b/arch/arm/kernel/asm-offsets.c
-@@ -65,6 +65,7 @@ int main(void)
- BLANK();
- DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
- DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count));
-+ DEFINE(TI_PREEMPT_LAZY, offsetof(struct thread_info, preempt_lazy_count));
- DEFINE(TI_ADDR_LIMIT, offsetof(struct thread_info, addr_limit));
- DEFINE(TI_TASK, offsetof(struct thread_info, task));
- DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
-diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
-index 9f157e7..468e224 100644
---- a/arch/arm/kernel/entry-armv.S
-+++ b/arch/arm/kernel/entry-armv.S
-@@ -220,11 +220,18 @@ __irq_svc:
-
- #ifdef CONFIG_PREEMPT
- ldr r8, [tsk, #TI_PREEMPT] @ get preempt count
-- ldr r0, [tsk, #TI_FLAGS] @ get flags
- teq r8, #0 @ if preempt count != 0
-+ bne 1f @ return from exeption
-+ ldr r0, [tsk, #TI_FLAGS] @ get flags
-+ tst r0, #_TIF_NEED_RESCHED @ if NEED_RESCHED is set
-+ blne svc_preempt @ preempt!
-+
-+ ldr r8, [tsk, #TI_PREEMPT_LAZY] @ get preempt lazy count
-+ teq r8, #0 @ if preempt lazy count != 0
- movne r0, #0 @ force flags to 0
-- tst r0, #_TIF_NEED_RESCHED
-+ tst r0, #_TIF_NEED_RESCHED_LAZY
- blne svc_preempt
-+1:
- #endif
-
- svc_exit r5, irq = 1 @ return from exception
-@@ -239,8 +246,14 @@ svc_preempt:
- 1: bl preempt_schedule_irq @ irq en/disable is done inside
- ldr r0, [tsk, #TI_FLAGS] @ get new tasks TI_FLAGS
- tst r0, #_TIF_NEED_RESCHED
-+ bne 1b
-+ tst r0, #_TIF_NEED_RESCHED_LAZY
- reteq r8 @ go again
-- b 1b
-+ ldr r0, [tsk, #TI_PREEMPT_LAZY] @ get preempt lazy count
-+ teq r0, #0 @ if preempt lazy count != 0
-+ beq 1b
-+ ret r8 @ go again
-+
- #endif
-
- __und_fault:
-diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
-index 10c3283..8872937 100644
---- a/arch/arm/kernel/entry-common.S
-+++ b/arch/arm/kernel/entry-common.S
-@@ -36,7 +36,9 @@ ret_fast_syscall:
- UNWIND(.cantunwind )
- disable_irq_notrace @ disable interrupts
- ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing
-- tst r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK
-+ tst r1, #((_TIF_SYSCALL_WORK | _TIF_WORK_MASK) & ~_TIF_SECCOMP)
-+ bne fast_work_pending
-+ tst r1, #_TIF_SECCOMP
- bne fast_work_pending
-
- /* perform architecture specific actions before user return */
-@@ -62,8 +64,11 @@ ret_fast_syscall:
- str r0, [sp, #S_R0 + S_OFF]! @ save returned r0
- disable_irq_notrace @ disable interrupts
- ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing
-- tst r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK
-+ tst r1, #((_TIF_SYSCALL_WORK | _TIF_WORK_MASK) & ~_TIF_SECCOMP)
-+ bne do_slower_path
-+ tst r1, #_TIF_SECCOMP
- beq no_work_pending
-+do_slower_path:
- UNWIND(.fnend )
- ENDPROC(ret_fast_syscall)
-
-diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
-index 612eb53..cd3006d 100644
---- a/arch/arm/kernel/process.c
-+++ b/arch/arm/kernel/process.c
-@@ -323,6 +323,30 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
- }
-
- #ifdef CONFIG_MMU
-+/*
-+ * CONFIG_SPLIT_PTLOCK_CPUS results in a page->ptl lock. If the lock is not
-+ * initialized by pgtable_page_ctor() then a coredump of the vector page will
-+ * fail.
-+ */
-+static int __init vectors_user_mapping_init_page(void)
-+{
-+ struct page *page;
-+ unsigned long addr = 0xffff0000;
-+ pgd_t *pgd;
-+ pud_t *pud;
-+ pmd_t *pmd;
-+
-+ pgd = pgd_offset_k(addr);
-+ pud = pud_offset(pgd, addr);
-+ pmd = pmd_offset(pud, addr);
-+ page = pmd_page(*(pmd));
-+
-+ pgtable_page_ctor(page);
-+
-+ return 0;
-+}
-+late_initcall(vectors_user_mapping_init_page);
-+
- #ifdef CONFIG_KUSER_HELPERS
- /*
- * The vectors page is always readable from user space for the
-diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
-index 7b8f214..96541e0 100644
---- a/arch/arm/kernel/signal.c
-+++ b/arch/arm/kernel/signal.c
-@@ -572,7 +572,8 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
- */
- trace_hardirqs_off();
- do {
-- if (likely(thread_flags & _TIF_NEED_RESCHED)) {
-+ if (likely(thread_flags & (_TIF_NEED_RESCHED |
-+ _TIF_NEED_RESCHED_LAZY))) {
- schedule();
- } else {
- if (unlikely(!user_mode(regs)))
-diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
-index 8615216..e5ca865 100644
---- a/arch/arm/kernel/smp.c
-+++ b/arch/arm/kernel/smp.c
-@@ -234,8 +234,6 @@ int __cpu_disable(void)
- flush_cache_louis();
- local_flush_tlb_all();
-
-- clear_tasks_mm_cpumask(cpu);
--
- return 0;
- }
-
-@@ -251,6 +249,9 @@ void __cpu_die(unsigned int cpu)
- pr_err("CPU%u: cpu didn't die\n", cpu);
- return;
- }
-+
-+ clear_tasks_mm_cpumask(cpu);
-+
- pr_notice("CPU%u: shutdown\n", cpu);
-
- /*
-diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c
-index 0bee233..314cfb2 100644
---- a/arch/arm/kernel/unwind.c
-+++ b/arch/arm/kernel/unwind.c
-@@ -93,7 +93,7 @@ extern const struct unwind_idx __start_unwind_idx[];
- static const struct unwind_idx *__origin_unwind_idx;
- extern const struct unwind_idx __stop_unwind_idx[];
-
--static DEFINE_SPINLOCK(unwind_lock);
-+static DEFINE_RAW_SPINLOCK(unwind_lock);
- static LIST_HEAD(unwind_tables);
-
- /* Convert a prel31 symbol to an absolute address */
-@@ -201,7 +201,7 @@ static const struct unwind_idx *unwind_find_idx(unsigned long addr)
- /* module unwind tables */
- struct unwind_table *table;
-
-- spin_lock_irqsave(&unwind_lock, flags);
-+ raw_spin_lock_irqsave(&unwind_lock, flags);
- list_for_each_entry(table, &unwind_tables, list) {
- if (addr >= table->begin_addr &&
- addr < table->end_addr) {
-@@ -213,7 +213,7 @@ static const struct unwind_idx *unwind_find_idx(unsigned long addr)
- break;
- }
- }
-- spin_unlock_irqrestore(&unwind_lock, flags);
-+ raw_spin_unlock_irqrestore(&unwind_lock, flags);
- }
-
- pr_debug("%s: idx = %p\n", __func__, idx);
-@@ -529,9 +529,9 @@ struct unwind_table *unwind_table_add(unsigned long start, unsigned long size,
- tab->begin_addr = text_addr;
- tab->end_addr = text_addr + text_size;
-
-- spin_lock_irqsave(&unwind_lock, flags);
-+ raw_spin_lock_irqsave(&unwind_lock, flags);
- list_add_tail(&tab->list, &unwind_tables);
-- spin_unlock_irqrestore(&unwind_lock, flags);
-+ raw_spin_unlock_irqrestore(&unwind_lock, flags);
-
- return tab;
- }
-@@ -543,9 +543,9 @@ void unwind_table_del(struct unwind_table *tab)
- if (!tab)
- return;
-
-- spin_lock_irqsave(&unwind_lock, flags);
-+ raw_spin_lock_irqsave(&unwind_lock, flags);
- list_del(&tab->list);
-- spin_unlock_irqrestore(&unwind_lock, flags);
-+ raw_spin_unlock_irqrestore(&unwind_lock, flags);
-
- kfree(tab);
- }
-diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
-index c94b90d..244dde7 100644
---- a/arch/arm/kvm/arm.c
-+++ b/arch/arm/kvm/arm.c
-@@ -584,7 +584,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
- * involves poking the GIC, which must be done in a
- * non-preemptible context.
- */
-- preempt_disable();
-+ migrate_disable();
- kvm_pmu_flush_hwstate(vcpu);
- kvm_timer_flush_hwstate(vcpu);
- kvm_vgic_flush_hwstate(vcpu);
-@@ -605,7 +605,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
- kvm_pmu_sync_hwstate(vcpu);
- kvm_timer_sync_hwstate(vcpu);
- kvm_vgic_sync_hwstate(vcpu);
-- preempt_enable();
-+ migrate_enable();
- continue;
- }
-
-@@ -661,7 +661,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
-
- kvm_vgic_sync_hwstate(vcpu);
-
-- preempt_enable();
-+ migrate_enable();
-
- ret = handle_exit(vcpu, run, ret);
- }
-diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
-index 98ffe1e..df9769d 100644
---- a/arch/arm/mach-exynos/platsmp.c
-+++ b/arch/arm/mach-exynos/platsmp.c
-@@ -229,7 +229,7 @@ static void __iomem *scu_base_addr(void)
- return (void __iomem *)(S5P_VA_SCU);
- }
-
--static DEFINE_SPINLOCK(boot_lock);
-+static DEFINE_RAW_SPINLOCK(boot_lock);
-
- static void exynos_secondary_init(unsigned int cpu)
- {
-@@ -242,8 +242,8 @@ static void exynos_secondary_init(unsigned int cpu)
- /*
- * Synchronise with the boot thread.
- */
-- spin_lock(&boot_lock);
-- spin_unlock(&boot_lock);
-+ raw_spin_lock(&boot_lock);
-+ raw_spin_unlock(&boot_lock);
- }
-
- int exynos_set_boot_addr(u32 core_id, unsigned long boot_addr)
-@@ -307,7 +307,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
- * Set synchronisation state between this boot processor
- * and the secondary one
- */
-- spin_lock(&boot_lock);
-+ raw_spin_lock(&boot_lock);
-
- /*
- * The secondary processor is waiting to be released from
-@@ -334,7 +334,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
-
- if (timeout == 0) {
- printk(KERN_ERR "cpu1 power enable failed");
-- spin_unlock(&boot_lock);
-+ raw_spin_unlock(&boot_lock);
- return -ETIMEDOUT;
- }
- }
-@@ -380,7 +380,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
- * calibrations, then wait for it to finish
- */
- fail:
-- spin_unlock(&boot_lock);
-+ raw_spin_unlock(&boot_lock);
-
- return pen_release != -1 ? ret : 0;
- }
-diff --git a/arch/arm/mach-hisi/platmcpm.c b/arch/arm/mach-hisi/platmcpm.c
-index 4b653a8..b03d5a9 100644
---- a/arch/arm/mach-hisi/platmcpm.c
-+++ b/arch/arm/mach-hisi/platmcpm.c
-@@ -61,7 +61,7 @@
-
- static void __iomem *sysctrl, *fabric;
- static int hip04_cpu_table[HIP04_MAX_CLUSTERS][HIP04_MAX_CPUS_PER_CLUSTER];
--static DEFINE_SPINLOCK(boot_lock);
-+static DEFINE_RAW_SPINLOCK(boot_lock);
- static u32 fabric_phys_addr;
- /*
- * [0]: bootwrapper physical address
-@@ -113,7 +113,7 @@ static int hip04_boot_secondary(unsigned int l_cpu, struct task_struct *idle)
- if (cluster >= HIP04_MAX_CLUSTERS || cpu >= HIP04_MAX_CPUS_PER_CLUSTER)
- return -EINVAL;
-
-- spin_lock_irq(&boot_lock);
-+ raw_spin_lock_irq(&boot_lock);
-
- if (hip04_cpu_table[cluster][cpu])
- goto out;
-@@ -147,7 +147,7 @@ static int hip04_boot_secondary(unsigned int l_cpu, struct task_struct *idle)
-
- out:
- hip04_cpu_table[cluster][cpu]++;
-- spin_unlock_irq(&boot_lock);
-+ raw_spin_unlock_irq(&boot_lock);
-
- return 0;
- }
-@@ -162,11 +162,11 @@ static void hip04_cpu_die(unsigned int l_cpu)
- cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
- cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
-
-- spin_lock(&boot_lock);
-+ raw_spin_lock(&boot_lock);
- hip04_cpu_table[cluster][cpu]--;
- if (hip04_cpu_table[cluster][cpu] == 1) {
- /* A power_up request went ahead of us. */
-- spin_unlock(&boot_lock);
-+ raw_spin_unlock(&boot_lock);
- return;
- } else if (hip04_cpu_table[cluster][cpu] > 1) {
- pr_err("Cluster %d CPU%d boots multiple times\n", cluster, cpu);
-@@ -174,7 +174,7 @@ static void hip04_cpu_die(unsigned int l_cpu)
- }
-
- last_man = hip04_cluster_is_down(cluster);
-- spin_unlock(&boot_lock);
-+ raw_spin_unlock(&boot_lock);
- if (last_man) {
- /* Since it's Cortex A15, disable L2 prefetching. */
- asm volatile(
-@@ -203,7 +203,7 @@ static int hip04_cpu_kill(unsigned int l_cpu)
- cpu >= HIP04_MAX_CPUS_PER_CLUSTER);
-
- count = TIMEOUT_MSEC / POLL_MSEC;
-- spin_lock_irq(&boot_lock);
-+ raw_spin_lock_irq(&boot_lock);
- for (tries = 0; tries < count; tries++) {
- if (hip04_cpu_table[cluster][cpu])
- goto err;
-@@ -211,10 +211,10 @@ static int hip04_cpu_kill(unsigned int l_cpu)
- data = readl_relaxed(sysctrl + SC_CPU_RESET_STATUS(cluster));
- if (data & CORE_WFI_STATUS(cpu))
- break;
-- spin_unlock_irq(&boot_lock);
-+ raw_spin_unlock_irq(&boot_lock);
- /* Wait for clean L2 when the whole cluster is down. */
- msleep(POLL_MSEC);
-- spin_lock_irq(&boot_lock);
-+ raw_spin_lock_irq(&boot_lock);
- }
- if (tries >= count)
- goto err;
-@@ -231,10 +231,10 @@ static int hip04_cpu_kill(unsigned int l_cpu)
- goto err;
- if (hip04_cluster_is_down(cluster))
- hip04_set_snoop_filter(cluster, 0);
-- spin_unlock_irq(&boot_lock);
-+ raw_spin_unlock_irq(&boot_lock);
- return 1;
- err:
-- spin_unlock_irq(&boot_lock);
-+ raw_spin_unlock_irq(&boot_lock);
- return 0;
- }
- #endif
-diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
-index b4de3da..b528933 100644
---- a/arch/arm/mach-omap2/omap-smp.c
-+++ b/arch/arm/mach-omap2/omap-smp.c
-@@ -64,7 +64,7 @@ static const struct omap_smp_config omap5_cfg __initconst = {
- .startup_addr = omap5_secondary_startup,
- };
-
--static DEFINE_SPINLOCK(boot_lock);
-+static DEFINE_RAW_SPINLOCK(boot_lock);
-
- void __iomem *omap4_get_scu_base(void)
- {
-@@ -131,8 +131,8 @@ static void omap4_secondary_init(unsigned int cpu)
- /*
- * Synchronise with the boot thread.
- */
-- spin_lock(&boot_lock);
-- spin_unlock(&boot_lock);
-+ raw_spin_lock(&boot_lock);
-+ raw_spin_unlock(&boot_lock);
- }
-
- static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
-@@ -146,7 +146,7 @@ static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
- * Set synchronisation state between this boot processor
- * and the secondary one
- */
-- spin_lock(&boot_lock);
-+ raw_spin_lock(&boot_lock);
-
- /*
- * Update the AuxCoreBoot0 with boot state for secondary core.
-@@ -223,7 +223,7 @@ static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
- * Now the secondary core is starting up let it run its
- * calibrations, then wait for it to finish
- */
-- spin_unlock(&boot_lock);
-+ raw_spin_unlock(&boot_lock);
-
- return 0;
- }
-diff --git a/arch/arm/mach-prima2/platsmp.c b/arch/arm/mach-prima2/platsmp.c
-index 0875b99..18b6d98 100644
---- a/arch/arm/mach-prima2/platsmp.c
-+++ b/arch/arm/mach-prima2/platsmp.c
-@@ -22,7 +22,7 @@
-
- static void __iomem *clk_base;
-
--static DEFINE_SPINLOCK(boot_lock);
-+static DEFINE_RAW_SPINLOCK(boot_lock);
-
- static void sirfsoc_secondary_init(unsigned int cpu)
- {
-@@ -36,8 +36,8 @@ static void sirfsoc_secondary_init(unsigned int cpu)
- /*
- * Synchronise with the boot thread.
- */
-- spin_lock(&boot_lock);
-- spin_unlock(&boot_lock);
-+ raw_spin_lock(&boot_lock);
-+ raw_spin_unlock(&boot_lock);
- }
-
- static const struct of_device_id clk_ids[] = {
-@@ -75,7 +75,7 @@ static int sirfsoc_boot_secondary(unsigned int cpu, struct task_struct *idle)
- /* make sure write buffer is drained */
- mb();
-
-- spin_lock(&boot_lock);
-+ raw_spin_lock(&boot_lock);
-
- /*
- * The secondary processor is waiting to be released from
-@@ -107,7 +107,7 @@ static int sirfsoc_boot_secondary(unsigned int cpu, struct task_struct *idle)
- * now the secondary core is starting up let it run its
- * calibrations, then wait for it to finish
- */
-- spin_unlock(&boot_lock);
-+ raw_spin_unlock(&boot_lock);
-
- return pen_release != -1 ? -ENOSYS : 0;
- }
-diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c
-index 5494c9e..e8ce157 100644
---- a/arch/arm/mach-qcom/platsmp.c
-+++ b/arch/arm/mach-qcom/platsmp.c
-@@ -46,7 +46,7 @@
-
- extern void secondary_startup_arm(void);
-
--static DEFINE_SPINLOCK(boot_lock);
-+static DEFINE_RAW_SPINLOCK(boot_lock);
-
- #ifdef CONFIG_HOTPLUG_CPU
- static void qcom_cpu_die(unsigned int cpu)
-@@ -60,8 +60,8 @@ static void qcom_secondary_init(unsigned int cpu)
- /*
- * Synchronise with the boot thread.
- */
-- spin_lock(&boot_lock);
-- spin_unlock(&boot_lock);
-+ raw_spin_lock(&boot_lock);
-+ raw_spin_unlock(&boot_lock);
- }
-
- static int scss_release_secondary(unsigned int cpu)
-@@ -284,7 +284,7 @@ static int qcom_boot_secondary(unsigned int cpu, int (*func)(unsigned int))
- * set synchronisation state between this boot processor
- * and the secondary one
- */
-- spin_lock(&boot_lock);
-+ raw_spin_lock(&boot_lock);
-
- /*
- * Send the secondary CPU a soft interrupt, thereby causing
-@@ -297,7 +297,7 @@ static int qcom_boot_secondary(unsigned int cpu, int (*func)(unsigned int))
- * now the secondary core is starting up let it run its
- * calibrations, then wait for it to finish
- */
-- spin_unlock(&boot_lock);
-+ raw_spin_unlock(&boot_lock);
-
- return ret;
- }
-diff --git a/arch/arm/mach-spear/platsmp.c b/arch/arm/mach-spear/platsmp.c
-index 8d1e2d5..7fa56cc 100644
---- a/arch/arm/mach-spear/platsmp.c
-+++ b/arch/arm/mach-spear/platsmp.c
-@@ -32,7 +32,7 @@ static void write_pen_release(int val)
- sync_cache_w(&pen_release);
- }
-
--static DEFINE_SPINLOCK(boot_lock);
-+static DEFINE_RAW_SPINLOCK(boot_lock);
-
- static void __iomem *scu_base = IOMEM(VA_SCU_BASE);
-
-@@ -47,8 +47,8 @@ static void spear13xx_secondary_init(unsigned int cpu)
- /*
- * Synchronise with the boot thread.
- */
-- spin_lock(&boot_lock);
-- spin_unlock(&boot_lock);
-+ raw_spin_lock(&boot_lock);
-+ raw_spin_unlock(&boot_lock);
- }
-
- static int spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle)
-@@ -59,7 +59,7 @@ static int spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle)
- * set synchronisation state between this boot processor
- * and the secondary one
- */
-- spin_lock(&boot_lock);
-+ raw_spin_lock(&boot_lock);
-
- /*
- * The secondary processor is waiting to be released from
-@@ -84,7 +84,7 @@ static int spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle)
- * now the secondary core is starting up let it run its
- * calibrations, then wait for it to finish
- */
-- spin_unlock(&boot_lock);
-+ raw_spin_unlock(&boot_lock);
-
- return pen_release != -1 ? -ENOSYS : 0;
- }
-diff --git a/arch/arm/mach-sti/platsmp.c b/arch/arm/mach-sti/platsmp.c
-index ea5a227..b988e08 100644
---- a/arch/arm/mach-sti/platsmp.c
-+++ b/arch/arm/mach-sti/platsmp.c
-@@ -35,7 +35,7 @@ static void write_pen_release(int val)
- sync_cache_w(&pen_release);
- }
-
--static DEFINE_SPINLOCK(boot_lock);
-+static DEFINE_RAW_SPINLOCK(boot_lock);
-
- static void sti_secondary_init(unsigned int cpu)
- {
-@@ -48,8 +48,8 @@ static void sti_secondary_init(unsigned int cpu)
- /*
- * Synchronise with the boot thread.
- */
-- spin_lock(&boot_lock);
-- spin_unlock(&boot_lock);
-+ raw_spin_lock(&boot_lock);
-+ raw_spin_unlock(&boot_lock);
- }
-
- static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle)
-@@ -60,7 +60,7 @@ static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle)
- * set synchronisation state between this boot processor
- * and the secondary one
- */
-- spin_lock(&boot_lock);
-+ raw_spin_lock(&boot_lock);
-
- /*
- * The secondary processor is waiting to be released from
-@@ -91,7 +91,7 @@ static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle)
- * now the secondary core is starting up let it run its
- * calibrations, then wait for it to finish
- */
-- spin_unlock(&boot_lock);
-+ raw_spin_unlock(&boot_lock);
-
- return pen_release != -1 ? -ENOSYS : 0;
- }
-diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
-index 3a2e678..3ed1e9b 100644
---- a/arch/arm/mm/fault.c
-+++ b/arch/arm/mm/fault.c
-@@ -430,6 +430,9 @@ do_translation_fault(unsigned long addr, unsigned int fsr,
- if (addr < TASK_SIZE)
- return do_page_fault(addr, fsr, regs);
-
-+ if (interrupts_enabled(regs))
-+ local_irq_enable();
-+
- if (user_mode(regs))
- goto bad_area;
-
-@@ -497,6 +500,9 @@ do_translation_fault(unsigned long addr, unsigned int fsr,
- static int
- do_sect_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
- {
-+ if (interrupts_enabled(regs))
-+ local_irq_enable();
-+
- do_bad_area(addr, fsr, regs);
- return 0;
- }
-diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c
-index d02f818..542692d 100644
---- a/arch/arm/mm/highmem.c
-+++ b/arch/arm/mm/highmem.c
-@@ -34,6 +34,11 @@ static inline pte_t get_fixmap_pte(unsigned long vaddr)
- return *ptep;
- }
-
-+static unsigned int fixmap_idx(int type)
-+{
-+ return FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
-+}
-+
- void *kmap(struct page *page)
- {
- might_sleep();
-@@ -54,12 +59,13 @@ EXPORT_SYMBOL(kunmap);
-
- void *kmap_atomic(struct page *page)
- {
-+ pte_t pte = mk_pte(page, kmap_prot);
- unsigned int idx;
- unsigned long vaddr;
- void *kmap;
- int type;
-
-- preempt_disable();
-+ preempt_disable_nort();
- pagefault_disable();
- if (!PageHighMem(page))
- return page_address(page);
-@@ -79,7 +85,7 @@ void *kmap_atomic(struct page *page)
-
- type = kmap_atomic_idx_push();
-
-- idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
-+ idx = fixmap_idx(type);
- vaddr = __fix_to_virt(idx);
- #ifdef CONFIG_DEBUG_HIGHMEM
- /*
-@@ -93,7 +99,10 @@ void *kmap_atomic(struct page *page)
- * in place, so the contained TLB flush ensures the TLB is updated
- * with the new mapping.
- */
-- set_fixmap_pte(idx, mk_pte(page, kmap_prot));
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ current->kmap_pte[type] = pte;
-+#endif
-+ set_fixmap_pte(idx, pte);
-
- return (void *)vaddr;
- }
-@@ -106,44 +115,75 @@ void __kunmap_atomic(void *kvaddr)
-
- if (kvaddr >= (void *)FIXADDR_START) {
- type = kmap_atomic_idx();
-- idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
-+ idx = fixmap_idx(type);
-
- if (cache_is_vivt())
- __cpuc_flush_dcache_area((void *)vaddr, PAGE_SIZE);
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ current->kmap_pte[type] = __pte(0);
-+#endif
- #ifdef CONFIG_DEBUG_HIGHMEM
- BUG_ON(vaddr != __fix_to_virt(idx));
-- set_fixmap_pte(idx, __pte(0));
- #else
- (void) idx; /* to kill a warning */
- #endif
-+ set_fixmap_pte(idx, __pte(0));
- kmap_atomic_idx_pop();
- } else if (vaddr >= PKMAP_ADDR(0) && vaddr < PKMAP_ADDR(LAST_PKMAP)) {
- /* this address was obtained through kmap_high_get() */
- kunmap_high(pte_page(pkmap_page_table[PKMAP_NR(vaddr)]));
- }
- pagefault_enable();
-- preempt_enable();
-+ preempt_enable_nort();
- }
- EXPORT_SYMBOL(__kunmap_atomic);
-
- void *kmap_atomic_pfn(unsigned long pfn)
- {
-+ pte_t pte = pfn_pte(pfn, kmap_prot);
- unsigned long vaddr;
- int idx, type;
- struct page *page = pfn_to_page(pfn);
-
-- preempt_disable();
-+ preempt_disable_nort();
- pagefault_disable();
- if (!PageHighMem(page))
- return page_address(page);
-
- type = kmap_atomic_idx_push();
-- idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
-+ idx = fixmap_idx(type);
- vaddr = __fix_to_virt(idx);
- #ifdef CONFIG_DEBUG_HIGHMEM
- BUG_ON(!pte_none(get_fixmap_pte(vaddr)));
- #endif
-- set_fixmap_pte(idx, pfn_pte(pfn, kmap_prot));
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ current->kmap_pte[type] = pte;
-+#endif
-+ set_fixmap_pte(idx, pte);
-
- return (void *)vaddr;
- }
-+#if defined CONFIG_PREEMPT_RT_FULL
-+void switch_kmaps(struct task_struct *prev_p, struct task_struct *next_p)
-+{
-+ int i;
-+
-+ /*
-+ * Clear @prev's kmap_atomic mappings
-+ */
-+ for (i = 0; i < prev_p->kmap_idx; i++) {
-+ int idx = fixmap_idx(i);
-+
-+ set_fixmap_pte(idx, __pte(0));
-+ }
-+ /*
-+ * Restore @next_p's kmap_atomic mappings
-+ */
-+ for (i = 0; i < next_p->kmap_idx; i++) {
-+ int idx = fixmap_idx(i);
-+
-+ if (!pte_none(next_p->kmap_pte[i]))
-+ set_fixmap_pte(idx, next_p->kmap_pte[i]);
-+ }
-+}
-+#endif
-diff --git a/arch/arm/plat-versatile/platsmp.c b/arch/arm/plat-versatile/platsmp.c
-index c236651..6b60f58 100644
---- a/arch/arm/plat-versatile/platsmp.c
-+++ b/arch/arm/plat-versatile/platsmp.c
-@@ -32,7 +32,7 @@ static void write_pen_release(int val)
- sync_cache_w(&pen_release);
- }
-
--static DEFINE_SPINLOCK(boot_lock);
-+static DEFINE_RAW_SPINLOCK(boot_lock);
-
- void versatile_secondary_init(unsigned int cpu)
- {
-@@ -45,8 +45,8 @@ void versatile_secondary_init(unsigned int cpu)
- /*
- * Synchronise with the boot thread.
- */
-- spin_lock(&boot_lock);
-- spin_unlock(&boot_lock);
-+ raw_spin_lock(&boot_lock);
-+ raw_spin_unlock(&boot_lock);
- }
-
- int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
-@@ -57,7 +57,7 @@ int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
- * Set synchronisation state between this boot processor
- * and the secondary one
- */
-- spin_lock(&boot_lock);
-+ raw_spin_lock(&boot_lock);
-
- /*
- * This is really belt and braces; we hold unintended secondary
-@@ -87,7 +87,7 @@ int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
- * now the secondary core is starting up let it run its
- * calibrations, then wait for it to finish
- */
-- spin_unlock(&boot_lock);
-+ raw_spin_unlock(&boot_lock);
-
- return pen_release != -1 ? -ENOSYS : 0;
- }
-diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index bc3f00f..0f3df6d 100644
---- a/arch/arm64/Kconfig
-+++ b/arch/arm64/Kconfig
-@@ -90,6 +90,7 @@ config ARM64
- select HAVE_PERF_EVENTS
- select HAVE_PERF_REGS
- select HAVE_PERF_USER_STACK_DUMP
-+ select HAVE_PREEMPT_LAZY
- select HAVE_REGS_AND_STACK_ACCESS_API
- select HAVE_RCU_TABLE_FREE
- select HAVE_SYSCALL_TRACEPOINTS
-@@ -689,7 +690,7 @@ config XEN_DOM0
-
- config XEN
- bool "Xen guest support on ARM64"
-- depends on ARM64 && OF
-+ depends on ARM64 && OF && !PREEMPT_RT_FULL
- select SWIOTLB_XEN
- select PARAVIRT
- help
-diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h
-index abd64bd..9170788 100644
---- a/arch/arm64/include/asm/thread_info.h
-+++ b/arch/arm64/include/asm/thread_info.h
-@@ -49,6 +49,7 @@ struct thread_info {
- mm_segment_t addr_limit; /* address limit */
- struct task_struct *task; /* main task structure */
- int preempt_count; /* 0 => preemptable, <0 => bug */
-+ int preempt_lazy_count; /* 0 => preemptable, <0 => bug */
- int cpu; /* cpu */
- };
-
-@@ -109,6 +110,7 @@ static inline struct thread_info *current_thread_info(void)
- #define TIF_NEED_RESCHED 1
- #define TIF_NOTIFY_RESUME 2 /* callback before returning to user */
- #define TIF_FOREIGN_FPSTATE 3 /* CPU's FP state is not current's */
-+#define TIF_NEED_RESCHED_LAZY 4
- #define TIF_NOHZ 7
- #define TIF_SYSCALL_TRACE 8
- #define TIF_SYSCALL_AUDIT 9
-@@ -124,6 +126,7 @@ static inline struct thread_info *current_thread_info(void)
- #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
- #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
- #define _TIF_FOREIGN_FPSTATE (1 << TIF_FOREIGN_FPSTATE)
-+#define _TIF_NEED_RESCHED_LAZY (1 << TIF_NEED_RESCHED_LAZY)
- #define _TIF_NOHZ (1 << TIF_NOHZ)
- #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
- #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT)
-@@ -132,7 +135,8 @@ static inline struct thread_info *current_thread_info(void)
- #define _TIF_32BIT (1 << TIF_32BIT)
-
- #define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
-- _TIF_NOTIFY_RESUME | _TIF_FOREIGN_FPSTATE)
-+ _TIF_NOTIFY_RESUME | _TIF_FOREIGN_FPSTATE | \
-+ _TIF_NEED_RESCHED_LAZY)
-
- #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
-diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
-index 05070b7..acfeddb 100644
---- a/arch/arm64/kernel/asm-offsets.c
-+++ b/arch/arm64/kernel/asm-offsets.c
-@@ -37,6 +37,7 @@ int main(void)
- BLANK();
- DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
- DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count));
-+ DEFINE(TI_PREEMPT_LAZY, offsetof(struct thread_info, preempt_lazy_count));
- DEFINE(TI_ADDR_LIMIT, offsetof(struct thread_info, addr_limit));
- DEFINE(TI_TASK, offsetof(struct thread_info, task));
- DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
-diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
-index 441420c..404792bd 100644
---- a/arch/arm64/kernel/entry.S
-+++ b/arch/arm64/kernel/entry.S
-@@ -434,11 +434,16 @@ el1_irq:
-
- #ifdef CONFIG_PREEMPT
- ldr w24, [tsk, #TI_PREEMPT] // get preempt count
-- cbnz w24, 1f // preempt count != 0
-+ cbnz w24, 2f // preempt count != 0
- ldr x0, [tsk, #TI_FLAGS] // get flags
-- tbz x0, #TIF_NEED_RESCHED, 1f // needs rescheduling?
-- bl el1_preempt
-+ tbnz x0, #TIF_NEED_RESCHED, 1f // needs rescheduling?
-+
-+ ldr w24, [tsk, #TI_PREEMPT_LAZY] // get preempt lazy count
-+ cbnz w24, 2f // preempt lazy count != 0
-+ tbz x0, #TIF_NEED_RESCHED_LAZY, 2f // needs rescheduling?
- 1:
-+ bl el1_preempt
-+2:
- #endif
- #ifdef CONFIG_TRACE_IRQFLAGS
- bl trace_hardirqs_on
-@@ -452,6 +457,7 @@ el1_preempt:
- 1: bl preempt_schedule_irq // irq en/disable is done inside
- ldr x0, [tsk, #TI_FLAGS] // get new tasks TI_FLAGS
- tbnz x0, #TIF_NEED_RESCHED, 1b // needs rescheduling?
-+ tbnz x0, #TIF_NEED_RESCHED_LAZY, 1b // needs rescheduling?
- ret x24
- #endif
-
-@@ -708,6 +714,7 @@ ret_fast_syscall_trace:
- */
- work_pending:
- tbnz x1, #TIF_NEED_RESCHED, work_resched
-+ tbnz x1, #TIF_NEED_RESCHED_LAZY, work_resched
- /* TIF_SIGPENDING, TIF_NOTIFY_RESUME or TIF_FOREIGN_FPSTATE case */
- mov x0, sp // 'regs'
- enable_irq // enable interrupts for do_notify_resume()
-diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
-index 212ff92..71ad38d 100644
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -2480,7 +2480,7 @@ config MIPS_ASID_BITS_VARIABLE
- #
- config HIGHMEM
- bool "High Memory Support"
-- depends on 32BIT && CPU_SUPPORTS_HIGHMEM && SYS_SUPPORTS_HIGHMEM && !CPU_MIPS32_3_5_EVA
-+ depends on 32BIT && CPU_SUPPORTS_HIGHMEM && SYS_SUPPORTS_HIGHMEM && !CPU_MIPS32_3_5_EVA && !PREEMPT_RT_FULL
-
- config CPU_SUPPORTS_HIGHMEM
- bool
-diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
-index 927d2ab..cb773b8 100644
---- a/arch/powerpc/Kconfig
-+++ b/arch/powerpc/Kconfig
-@@ -57,10 +57,11 @@ config LOCKDEP_SUPPORT
-
- config RWSEM_GENERIC_SPINLOCK
- bool
-+ default y if PREEMPT_RT_FULL
-
- config RWSEM_XCHGADD_ALGORITHM
- bool
-- default y
-+ default y if !PREEMPT_RT_FULL
-
- config GENERIC_LOCKBREAK
- bool
-@@ -140,6 +141,7 @@ config PPC
- select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
- select GENERIC_STRNCPY_FROM_USER
- select GENERIC_STRNLEN_USER
-+ select HAVE_PREEMPT_LAZY
- select HAVE_MOD_ARCH_SPECIFIC
- select MODULES_USE_ELF_RELA
- select CLONE_BACKWARDS
-@@ -326,7 +328,7 @@ menu "Kernel options"
-
- config HIGHMEM
- bool "High memory support"
-- depends on PPC32
-+ depends on PPC32 && !PREEMPT_RT_FULL
-
- source kernel/Kconfig.hz
- source kernel/Kconfig.preempt
-diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
-index 87e4b2d..981e501 100644
---- a/arch/powerpc/include/asm/thread_info.h
-+++ b/arch/powerpc/include/asm/thread_info.h
-@@ -43,6 +43,8 @@ struct thread_info {
- int cpu; /* cpu we're on */
- int preempt_count; /* 0 => preemptable,
- <0 => BUG */
-+ int preempt_lazy_count; /* 0 => preemptable,
-+ <0 => BUG */
- unsigned long local_flags; /* private flags for thread */
- #ifdef CONFIG_LIVEPATCH
- unsigned long *livepatch_sp;
-@@ -88,8 +90,7 @@ static inline struct thread_info *current_thread_info(void)
- #define TIF_SYSCALL_TRACE 0 /* syscall trace active */
- #define TIF_SIGPENDING 1 /* signal pending */
- #define TIF_NEED_RESCHED 2 /* rescheduling necessary */
--#define TIF_POLLING_NRFLAG 3 /* true if poll_idle() is polling
-- TIF_NEED_RESCHED */
-+#define TIF_NEED_RESCHED_LAZY 3 /* lazy rescheduling necessary */
- #define TIF_32BIT 4 /* 32 bit binary */
- #define TIF_RESTORE_TM 5 /* need to restore TM FP/VEC/VSX */
- #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */
-@@ -107,6 +108,8 @@ static inline struct thread_info *current_thread_info(void)
- #if defined(CONFIG_PPC64)
- #define TIF_ELF2ABI 18 /* function descriptors must die! */
- #endif
-+#define TIF_POLLING_NRFLAG 19 /* true if poll_idle() is polling
-+ TIF_NEED_RESCHED */
-
- /* as above, but as bit values */
- #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
-@@ -125,14 +128,16 @@ static inline struct thread_info *current_thread_info(void)
- #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
- #define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
- #define _TIF_NOHZ (1<<TIF_NOHZ)
-+#define _TIF_NEED_RESCHED_LAZY (1<<TIF_NEED_RESCHED_LAZY)
- #define _TIF_SYSCALL_DOTRACE (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
- _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
- _TIF_NOHZ)
-
- #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
- _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
-- _TIF_RESTORE_TM)
-+ _TIF_RESTORE_TM | _TIF_NEED_RESCHED_LAZY)
- #define _TIF_PERSYSCALL_MASK (_TIF_RESTOREALL|_TIF_NOERROR)
-+#define _TIF_NEED_RESCHED_MASK (_TIF_NEED_RESCHED | _TIF_NEED_RESCHED_LAZY)
-
- /* Bits in local_flags */
- /* Don't move TLF_NAPPING without adjusting the code in entry_32.S */
-diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
-index b89d14c..81ae8f4 100644
---- a/arch/powerpc/kernel/asm-offsets.c
-+++ b/arch/powerpc/kernel/asm-offsets.c
-@@ -156,6 +156,7 @@ int main(void)
- DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
- DEFINE(TI_LOCAL_FLAGS, offsetof(struct thread_info, local_flags));
- DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count));
-+ DEFINE(TI_PREEMPT_LAZY, offsetof(struct thread_info, preempt_lazy_count));
- DEFINE(TI_TASK, offsetof(struct thread_info, task));
- DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
-
-diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
-index 9899032..f95b93f 100644
---- a/arch/powerpc/kernel/entry_32.S
-+++ b/arch/powerpc/kernel/entry_32.S
-@@ -835,7 +835,14 @@ resume_kernel:
- cmpwi 0,r0,0 /* if non-zero, just restore regs and return */
- bne restore
- andi. r8,r8,_TIF_NEED_RESCHED
-+ bne+ 1f
-+ lwz r0,TI_PREEMPT_LAZY(r9)
-+ cmpwi 0,r0,0 /* if non-zero, just restore regs and return */
-+ bne restore
-+ lwz r0,TI_FLAGS(r9)
-+ andi. r0,r0,_TIF_NEED_RESCHED_LAZY
- beq+ restore
-+1:
- lwz r3,_MSR(r1)
- andi. r0,r3,MSR_EE /* interrupts off? */
- beq restore /* don't schedule if so */
-@@ -846,11 +853,11 @@ resume_kernel:
- */
- bl trace_hardirqs_off
- #endif
--1: bl preempt_schedule_irq
-+2: bl preempt_schedule_irq
- CURRENT_THREAD_INFO(r9, r1)
- lwz r3,TI_FLAGS(r9)
-- andi. r0,r3,_TIF_NEED_RESCHED
-- bne- 1b
-+ andi. r0,r3,_TIF_NEED_RESCHED_MASK
-+ bne- 2b
- #ifdef CONFIG_TRACE_IRQFLAGS
- /* And now, to properly rebalance the above, we tell lockdep they
- * are being turned back on, which will happen when we return
-@@ -1171,7 +1178,7 @@ global_dbcr0:
- #endif /* !(CONFIG_4xx || CONFIG_BOOKE) */
-
- do_work: /* r10 contains MSR_KERNEL here */
-- andi. r0,r9,_TIF_NEED_RESCHED
-+ andi. r0,r9,_TIF_NEED_RESCHED_MASK
- beq do_user_signal
-
- do_resched: /* r10 contains MSR_KERNEL here */
-@@ -1192,7 +1199,7 @@ recheck:
- MTMSRD(r10) /* disable interrupts */
- CURRENT_THREAD_INFO(r9, r1)
- lwz r9,TI_FLAGS(r9)
-- andi. r0,r9,_TIF_NEED_RESCHED
-+ andi. r0,r9,_TIF_NEED_RESCHED_MASK
- bne- do_resched
- andi. r0,r9,_TIF_USER_WORK_MASK
- beq restore_user
-diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
-index 5afd03e..f5d4c2a 100644
---- a/arch/powerpc/kernel/entry_64.S
-+++ b/arch/powerpc/kernel/entry_64.S
-@@ -657,7 +657,7 @@ _GLOBAL(ret_from_except_lite)
- bl restore_math
- b restore
- #endif
--1: andi. r0,r4,_TIF_NEED_RESCHED
-+1: andi. r0,r4,_TIF_NEED_RESCHED_MASK
- beq 2f
- bl restore_interrupts
- SCHEDULE_USER
-@@ -719,10 +719,18 @@ resume_kernel:
-
- #ifdef CONFIG_PREEMPT
- /* Check if we need to preempt */
-+ lwz r8,TI_PREEMPT(r9)
-+ cmpwi 0,r8,0 /* if non-zero, just restore regs and return */
-+ bne restore
- andi. r0,r4,_TIF_NEED_RESCHED
-+ bne+ check_count
-+
-+ andi. r0,r4,_TIF_NEED_RESCHED_LAZY
- beq+ restore
-+ lwz r8,TI_PREEMPT_LAZY(r9)
-+
- /* Check that preempt_count() == 0 and interrupts are enabled */
-- lwz r8,TI_PREEMPT(r9)
-+check_count:
- cmpwi cr1,r8,0
- ld r0,SOFTE(r1)
- cmpdi r0,0
-@@ -739,7 +747,7 @@ resume_kernel:
- /* Re-test flags and eventually loop */
- CURRENT_THREAD_INFO(r9, r1)
- ld r4,TI_FLAGS(r9)
-- andi. r0,r4,_TIF_NEED_RESCHED
-+ andi. r0,r4,_TIF_NEED_RESCHED_MASK
- bne 1b
-
- /*
-diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
-index 08887cf..f1770ea 100644
---- a/arch/powerpc/kernel/irq.c
-+++ b/arch/powerpc/kernel/irq.c
-@@ -633,6 +633,7 @@ void irq_ctx_init(void)
- }
- }
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- void do_softirq_own_stack(void)
- {
- struct thread_info *curtp, *irqtp;
-@@ -650,6 +651,7 @@ void do_softirq_own_stack(void)
- if (irqtp->flags)
- set_bits(irqtp->flags, &curtp->flags);
- }
-+#endif
-
- irq_hw_number_t virq_to_hw(unsigned int virq)
- {
-diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
-index d9c912b..7b2e997 100644
---- a/arch/powerpc/kernel/misc_32.S
-+++ b/arch/powerpc/kernel/misc_32.S
-@@ -40,6 +40,7 @@
- * We store the saved ksp_limit in the unused part
- * of the STACK_FRAME_OVERHEAD
- */
-+#ifndef CONFIG_PREEMPT_RT_FULL
- _GLOBAL(call_do_softirq)
- mflr r0
- stw r0,4(r1)
-@@ -56,6 +57,7 @@ _GLOBAL(call_do_softirq)
- stw r10,THREAD+KSP_LIMIT(r2)
- mtlr r0
- blr
-+#endif
-
- /*
- * void call_do_irq(struct pt_regs *regs, struct thread_info *irqtp);
-diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
-index cb19515..c919a2b 100644
---- a/arch/powerpc/kernel/misc_64.S
-+++ b/arch/powerpc/kernel/misc_64.S
-@@ -30,6 +30,7 @@
-
- .text
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- _GLOBAL(call_do_softirq)
- mflr r0
- std r0,16(r1)
-@@ -40,6 +41,7 @@ _GLOBAL(call_do_softirq)
- ld r0,16(r1)
- mtlr r0
- blr
-+#endif
-
- _GLOBAL(call_do_irq)
- mflr r0
-diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
-index c2024ac..2303788 100644
---- a/arch/powerpc/kvm/Kconfig
-+++ b/arch/powerpc/kvm/Kconfig
-@@ -172,6 +172,7 @@ config KVM_E500MC
- config KVM_MPIC
- bool "KVM in-kernel MPIC emulation"
- depends on KVM && E500
-+ depends on !PREEMPT_RT_FULL
- select HAVE_KVM_IRQCHIP
- select HAVE_KVM_IRQFD
- select HAVE_KVM_IRQ_ROUTING
-diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c
-index 57caaf1..030c9bf 100644
---- a/arch/powerpc/platforms/ps3/device-init.c
-+++ b/arch/powerpc/platforms/ps3/device-init.c
-@@ -752,7 +752,7 @@ static int ps3_notification_read_write(struct ps3_notification_device *dev,
- }
- pr_debug("%s:%u: notification %s issued\n", __func__, __LINE__, op);
-
-- res = wait_event_interruptible(dev->done.wait,
-+ res = swait_event_interruptible(dev->done.wait,
- dev->done.done || kthread_should_stop());
- if (kthread_should_stop())
- res = -EINTR;
-diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
-index 6c0378c..abd58b4 100644
---- a/arch/sh/kernel/irq.c
-+++ b/arch/sh/kernel/irq.c
-@@ -147,6 +147,7 @@ void irq_ctx_exit(int cpu)
- hardirq_ctx[cpu] = NULL;
- }
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- void do_softirq_own_stack(void)
- {
- struct thread_info *curctx;
-@@ -174,6 +175,7 @@ void do_softirq_own_stack(void)
- "r5", "r6", "r7", "r8", "r9", "r15", "t", "pr"
- );
- }
-+#endif
- #else
- static inline void handle_one_irq(unsigned int irq)
- {
-diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
-index 59b0960..1b073eb 100644
---- a/arch/sparc/Kconfig
-+++ b/arch/sparc/Kconfig
-@@ -187,12 +187,10 @@ config NR_CPUS
- source kernel/Kconfig.hz
-
- config RWSEM_GENERIC_SPINLOCK
-- bool
-- default y if SPARC32
-+ def_bool PREEMPT_RT_FULL
-
- config RWSEM_XCHGADD_ALGORITHM
-- bool
-- default y if SPARC64
-+ def_bool !RWSEM_GENERIC_SPINLOCK && !PREEMPT_RT_FULL
-
- config GENERIC_HWEIGHT
- bool
-diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
-index 34a7930..7737405 100644
---- a/arch/sparc/kernel/irq_64.c
-+++ b/arch/sparc/kernel/irq_64.c
-@@ -854,6 +854,7 @@ void __irq_entry handler_irq(int pil, struct pt_regs *regs)
- set_irq_regs(old_regs);
- }
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- void do_softirq_own_stack(void)
- {
- void *orig_sp, *sp = softirq_stack[smp_processor_id()];
-@@ -868,6 +869,7 @@ void do_softirq_own_stack(void)
- __asm__ __volatile__("mov %0, %%sp"
- : : "r" (orig_sp));
- }
-+#endif
-
- #ifdef CONFIG_HOTPLUG_CPU
- void fixup_irqs(void)
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 2a1f0ce..bd4ab87 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -17,6 +17,7 @@ config X86_64
- ### Arch settings
- config X86
- def_bool y
-+ select HAVE_PREEMPT_LAZY
- select ACPI_LEGACY_TABLES_LOOKUP if ACPI
- select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
- select ANON_INODES
-@@ -231,8 +232,11 @@ config ARCH_MAY_HAVE_PC_FDC
- def_bool y
- depends on ISA_DMA_API
-
-+config RWSEM_GENERIC_SPINLOCK
-+ def_bool PREEMPT_RT_FULL
-+
- config RWSEM_XCHGADD_ALGORITHM
-- def_bool y
-+ def_bool !RWSEM_GENERIC_SPINLOCK && !PREEMPT_RT_FULL
-
- config GENERIC_CALIBRATE_DELAY
- def_bool y
-@@ -885,7 +889,7 @@ config IOMMU_HELPER
- config MAXSMP
- bool "Enable Maximum number of SMP Processors and NUMA Nodes"
- depends on X86_64 && SMP && DEBUG_KERNEL
-- select CPUMASK_OFFSTACK
-+ select CPUMASK_OFFSTACK if !PREEMPT_RT_FULL
- ---help---
- Enable maximum number of CPUS and NUMA Nodes for this architecture.
- If unsure, say N.
-diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
-index 0ab5ee1..fff8f6f 100644
---- a/arch/x86/crypto/aesni-intel_glue.c
-+++ b/arch/x86/crypto/aesni-intel_glue.c
-@@ -372,14 +372,14 @@ static int ecb_encrypt(struct blkcipher_desc *desc,
- err = blkcipher_walk_virt(desc, &walk);
- desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
-
-- kernel_fpu_begin();
- while ((nbytes = walk.nbytes)) {
-+ kernel_fpu_begin();
- aesni_ecb_enc(ctx, walk.dst.virt.addr, walk.src.virt.addr,
-- nbytes & AES_BLOCK_MASK);
-+ nbytes & AES_BLOCK_MASK);
-+ kernel_fpu_end();
- nbytes &= AES_BLOCK_SIZE - 1;
- err = blkcipher_walk_done(desc, &walk, nbytes);
- }
-- kernel_fpu_end();
-
- return err;
- }
-@@ -396,14 +396,14 @@ static int ecb_decrypt(struct blkcipher_desc *desc,
- err = blkcipher_walk_virt(desc, &walk);
- desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
-
-- kernel_fpu_begin();
- while ((nbytes = walk.nbytes)) {
-+ kernel_fpu_begin();
- aesni_ecb_dec(ctx, walk.dst.virt.addr, walk.src.virt.addr,
- nbytes & AES_BLOCK_MASK);
-+ kernel_fpu_end();
- nbytes &= AES_BLOCK_SIZE - 1;
- err = blkcipher_walk_done(desc, &walk, nbytes);
- }
-- kernel_fpu_end();
-
- return err;
- }
-@@ -420,14 +420,14 @@ static int cbc_encrypt(struct blkcipher_desc *desc,
- err = blkcipher_walk_virt(desc, &walk);
- desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
-
-- kernel_fpu_begin();
- while ((nbytes = walk.nbytes)) {
-+ kernel_fpu_begin();
- aesni_cbc_enc(ctx, walk.dst.virt.addr, walk.src.virt.addr,
- nbytes & AES_BLOCK_MASK, walk.iv);
-+ kernel_fpu_end();
- nbytes &= AES_BLOCK_SIZE - 1;
- err = blkcipher_walk_done(desc, &walk, nbytes);
- }
-- kernel_fpu_end();
-
- return err;
- }
-@@ -444,14 +444,14 @@ static int cbc_decrypt(struct blkcipher_desc *desc,
- err = blkcipher_walk_virt(desc, &walk);
- desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
-
-- kernel_fpu_begin();
- while ((nbytes = walk.nbytes)) {
-+ kernel_fpu_begin();
- aesni_cbc_dec(ctx, walk.dst.virt.addr, walk.src.virt.addr,
- nbytes & AES_BLOCK_MASK, walk.iv);
-+ kernel_fpu_end();
- nbytes &= AES_BLOCK_SIZE - 1;
- err = blkcipher_walk_done(desc, &walk, nbytes);
- }
-- kernel_fpu_end();
-
- return err;
- }
-@@ -503,18 +503,20 @@ static int ctr_crypt(struct blkcipher_desc *desc,
- err = blkcipher_walk_virt_block(desc, &walk, AES_BLOCK_SIZE);
- desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
-
-- kernel_fpu_begin();
- while ((nbytes = walk.nbytes) >= AES_BLOCK_SIZE) {
-+ kernel_fpu_begin();
- aesni_ctr_enc_tfm(ctx, walk.dst.virt.addr, walk.src.virt.addr,
- nbytes & AES_BLOCK_MASK, walk.iv);
-+ kernel_fpu_end();
- nbytes &= AES_BLOCK_SIZE - 1;
- err = blkcipher_walk_done(desc, &walk, nbytes);
- }
- if (walk.nbytes) {
-+ kernel_fpu_begin();
- ctr_crypt_final(ctx, &walk);
-+ kernel_fpu_end();
- err = blkcipher_walk_done(desc, &walk, 0);
- }
-- kernel_fpu_end();
-
- return err;
- }
-diff --git a/arch/x86/crypto/cast5_avx_glue.c b/arch/x86/crypto/cast5_avx_glue.c
-index 8648158..d769913 100644
---- a/arch/x86/crypto/cast5_avx_glue.c
-+++ b/arch/x86/crypto/cast5_avx_glue.c
-@@ -59,7 +59,7 @@ static inline void cast5_fpu_end(bool fpu_enabled)
- static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,
- bool enc)
- {
-- bool fpu_enabled = false;
-+ bool fpu_enabled;
- struct cast5_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
- const unsigned int bsize = CAST5_BLOCK_SIZE;
- unsigned int nbytes;
-@@ -75,7 +75,7 @@ static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,
- u8 *wsrc = walk->src.virt.addr;
- u8 *wdst = walk->dst.virt.addr;
-
-- fpu_enabled = cast5_fpu_begin(fpu_enabled, nbytes);
-+ fpu_enabled = cast5_fpu_begin(false, nbytes);
-
- /* Process multi-block batch */
- if (nbytes >= bsize * CAST5_PARALLEL_BLOCKS) {
-@@ -103,10 +103,9 @@ static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,
- } while (nbytes >= bsize);
-
- done:
-+ cast5_fpu_end(fpu_enabled);
- err = blkcipher_walk_done(desc, walk, nbytes);
- }
--
-- cast5_fpu_end(fpu_enabled);
- return err;
- }
-
-@@ -227,7 +226,7 @@ done:
- static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
- struct scatterlist *src, unsigned int nbytes)
- {
-- bool fpu_enabled = false;
-+ bool fpu_enabled;
- struct blkcipher_walk walk;
- int err;
-
-@@ -236,12 +235,11 @@ static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
- desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
-
- while ((nbytes = walk.nbytes)) {
-- fpu_enabled = cast5_fpu_begin(fpu_enabled, nbytes);
-+ fpu_enabled = cast5_fpu_begin(false, nbytes);
- nbytes = __cbc_decrypt(desc, &walk);
-+ cast5_fpu_end(fpu_enabled);
- err = blkcipher_walk_done(desc, &walk, nbytes);
- }
--
-- cast5_fpu_end(fpu_enabled);
- return err;
- }
-
-@@ -311,7 +309,7 @@ done:
- static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,
- struct scatterlist *src, unsigned int nbytes)
- {
-- bool fpu_enabled = false;
-+ bool fpu_enabled;
- struct blkcipher_walk walk;
- int err;
-
-@@ -320,13 +318,12 @@ static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,
- desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
-
- while ((nbytes = walk.nbytes) >= CAST5_BLOCK_SIZE) {
-- fpu_enabled = cast5_fpu_begin(fpu_enabled, nbytes);
-+ fpu_enabled = cast5_fpu_begin(false, nbytes);
- nbytes = __ctr_crypt(desc, &walk);
-+ cast5_fpu_end(fpu_enabled);
- err = blkcipher_walk_done(desc, &walk, nbytes);
- }
-
-- cast5_fpu_end(fpu_enabled);
--
- if (walk.nbytes) {
- ctr_crypt_final(desc, &walk);
- err = blkcipher_walk_done(desc, &walk, 0);
-diff --git a/arch/x86/crypto/glue_helper.c b/arch/x86/crypto/glue_helper.c
-index 6a85598..3a506ce 100644
---- a/arch/x86/crypto/glue_helper.c
-+++ b/arch/x86/crypto/glue_helper.c
-@@ -39,7 +39,7 @@ static int __glue_ecb_crypt_128bit(const struct common_glue_ctx *gctx,
- void *ctx = crypto_blkcipher_ctx(desc->tfm);
- const unsigned int bsize = 128 / 8;
- unsigned int nbytes, i, func_bytes;
-- bool fpu_enabled = false;
-+ bool fpu_enabled;
- int err;
-
- err = blkcipher_walk_virt(desc, walk);
-@@ -49,7 +49,7 @@ static int __glue_ecb_crypt_128bit(const struct common_glue_ctx *gctx,
- u8 *wdst = walk->dst.virt.addr;
-
- fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
-- desc, fpu_enabled, nbytes);
-+ desc, false, nbytes);
-
- for (i = 0; i < gctx->num_funcs; i++) {
- func_bytes = bsize * gctx->funcs[i].num_blocks;
-@@ -71,10 +71,10 @@ static int __glue_ecb_crypt_128bit(const struct common_glue_ctx *gctx,
- }
-
- done:
-+ glue_fpu_end(fpu_enabled);
- err = blkcipher_walk_done(desc, walk, nbytes);
- }
-
-- glue_fpu_end(fpu_enabled);
- return err;
- }
-
-@@ -194,7 +194,7 @@ int glue_cbc_decrypt_128bit(const struct common_glue_ctx *gctx,
- struct scatterlist *src, unsigned int nbytes)
- {
- const unsigned int bsize = 128 / 8;
-- bool fpu_enabled = false;
-+ bool fpu_enabled;
- struct blkcipher_walk walk;
- int err;
-
-@@ -203,12 +203,12 @@ int glue_cbc_decrypt_128bit(const struct common_glue_ctx *gctx,
-
- while ((nbytes = walk.nbytes)) {
- fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
-- desc, fpu_enabled, nbytes);
-+ desc, false, nbytes);
- nbytes = __glue_cbc_decrypt_128bit(gctx, desc, &walk);
-+ glue_fpu_end(fpu_enabled);
- err = blkcipher_walk_done(desc, &walk, nbytes);
- }
-
-- glue_fpu_end(fpu_enabled);
- return err;
- }
- EXPORT_SYMBOL_GPL(glue_cbc_decrypt_128bit);
-@@ -277,7 +277,7 @@ int glue_ctr_crypt_128bit(const struct common_glue_ctx *gctx,
- struct scatterlist *src, unsigned int nbytes)
- {
- const unsigned int bsize = 128 / 8;
-- bool fpu_enabled = false;
-+ bool fpu_enabled;
- struct blkcipher_walk walk;
- int err;
-
-@@ -286,13 +286,12 @@ int glue_ctr_crypt_128bit(const struct common_glue_ctx *gctx,
-
- while ((nbytes = walk.nbytes) >= bsize) {
- fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
-- desc, fpu_enabled, nbytes);
-+ desc, false, nbytes);
- nbytes = __glue_ctr_crypt_128bit(gctx, desc, &walk);
-+ glue_fpu_end(fpu_enabled);
- err = blkcipher_walk_done(desc, &walk, nbytes);
- }
-
-- glue_fpu_end(fpu_enabled);
--
- if (walk.nbytes) {
- glue_ctr_crypt_final_128bit(
- gctx->funcs[gctx->num_funcs - 1].fn_u.ctr, desc, &walk);
-@@ -347,7 +346,7 @@ int glue_xts_crypt_128bit(const struct common_glue_ctx *gctx,
- void *tweak_ctx, void *crypt_ctx)
- {
- const unsigned int bsize = 128 / 8;
-- bool fpu_enabled = false;
-+ bool fpu_enabled;
- struct blkcipher_walk walk;
- int err;
-
-@@ -360,21 +359,21 @@ int glue_xts_crypt_128bit(const struct common_glue_ctx *gctx,
-
- /* set minimum length to bsize, for tweak_fn */
- fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
-- desc, fpu_enabled,
-+ desc, false,
- nbytes < bsize ? bsize : nbytes);
--
- /* calculate first value of T */
- tweak_fn(tweak_ctx, walk.iv, walk.iv);
-+ glue_fpu_end(fpu_enabled);
-
- while (nbytes) {
-+ fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
-+ desc, false, nbytes);
- nbytes = __glue_xts_crypt_128bit(gctx, crypt_ctx, desc, &walk);
-
-+ glue_fpu_end(fpu_enabled);
- err = blkcipher_walk_done(desc, &walk, nbytes);
- nbytes = walk.nbytes;
- }
--
-- glue_fpu_end(fpu_enabled);
--
- return err;
- }
- EXPORT_SYMBOL_GPL(glue_xts_crypt_128bit);
-diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
-index 1433f6b..f963fde 100644
---- a/arch/x86/entry/common.c
-+++ b/arch/x86/entry/common.c
-@@ -136,7 +136,7 @@ static long syscall_trace_enter(struct pt_regs *regs)
-
- #define EXIT_TO_USERMODE_LOOP_FLAGS \
- (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
-- _TIF_NEED_RESCHED | _TIF_USER_RETURN_NOTIFY)
-+ _TIF_NEED_RESCHED_MASK | _TIF_USER_RETURN_NOTIFY)
-
- static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags)
- {
-@@ -152,9 +152,16 @@ static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags)
- /* We have work to do. */
- local_irq_enable();
-
-- if (cached_flags & _TIF_NEED_RESCHED)
-+ if (cached_flags & _TIF_NEED_RESCHED_MASK)
- schedule();
-
-+#ifdef ARCH_RT_DELAYS_SIGNAL_SEND
-+ if (unlikely(current->forced_info.si_signo)) {
-+ struct task_struct *t = current;
-+ force_sig_info(t->forced_info.si_signo, &t->forced_info, t);
-+ t->forced_info.si_signo = 0;
-+ }
-+#endif
- if (cached_flags & _TIF_UPROBE)
- uprobe_notify_resume(regs);
-
-diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
-index 0b56666..aa14923 100644
---- a/arch/x86/entry/entry_32.S
-+++ b/arch/x86/entry/entry_32.S
-@@ -271,8 +271,24 @@ END(ret_from_exception)
- ENTRY(resume_kernel)
- DISABLE_INTERRUPTS(CLBR_ANY)
- need_resched:
-+ # preempt count == 0 + NEED_RS set?
- cmpl $0, PER_CPU_VAR(__preempt_count)
-+#ifndef CONFIG_PREEMPT_LAZY
- jnz restore_all
-+#else
-+ jz test_int_off
-+
-+ # atleast preempt count == 0 ?
-+ cmpl $_PREEMPT_ENABLED,PER_CPU_VAR(__preempt_count)
-+ jne restore_all
-+
-+ cmpl $0,TI_preempt_lazy_count(%ebp) # non-zero preempt_lazy_count ?
-+ jnz restore_all
-+
-+ testl $_TIF_NEED_RESCHED_LAZY, TI_flags(%ebp)
-+ jz restore_all
-+test_int_off:
-+#endif
- testl $X86_EFLAGS_IF, PT_EFLAGS(%esp) # interrupts off (exception path) ?
- jz restore_all
- call preempt_schedule_irq
-diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
-index 02fff3e..81ec3d0 100644
---- a/arch/x86/entry/entry_64.S
-+++ b/arch/x86/entry/entry_64.S
-@@ -512,7 +512,23 @@ retint_kernel:
- bt $9, EFLAGS(%rsp) /* were interrupts off? */
- jnc 1f
- 0: cmpl $0, PER_CPU_VAR(__preempt_count)
-+#ifndef CONFIG_PREEMPT_LAZY
- jnz 1f
-+#else
-+ jz do_preempt_schedule_irq
-+
-+ # atleast preempt count == 0 ?
-+ cmpl $_PREEMPT_ENABLED,PER_CPU_VAR(__preempt_count)
-+ jnz 1f
-+
-+ GET_THREAD_INFO(%rcx)
-+ cmpl $0, TI_preempt_lazy_count(%rcx)
-+ jnz 1f
-+
-+ bt $TIF_NEED_RESCHED_LAZY,TI_flags(%rcx)
-+ jnc 1f
-+do_preempt_schedule_irq:
-+#endif
- call preempt_schedule_irq
- jmp 0b
- 1:
-@@ -817,6 +833,7 @@ bad_gs:
- jmp 2b
- .previous
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- /* Call softirq on interrupt stack. Interrupts are off. */
- ENTRY(do_softirq_own_stack)
- pushq %rbp
-@@ -829,6 +846,7 @@ ENTRY(do_softirq_own_stack)
- decl PER_CPU_VAR(irq_count)
- ret
- END(do_softirq_own_stack)
-+#endif
-
- #ifdef CONFIG_XEN
- idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
-diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
-index 17f2186..11bd1b7 100644
---- a/arch/x86/include/asm/preempt.h
-+++ b/arch/x86/include/asm/preempt.h
-@@ -79,17 +79,46 @@ static __always_inline void __preempt_count_sub(int val)
- * a decrement which hits zero means we have no preempt_count and should
- * reschedule.
- */
--static __always_inline bool __preempt_count_dec_and_test(void)
-+static __always_inline bool ____preempt_count_dec_and_test(void)
- {
- GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), e);
- }
-
-+static __always_inline bool __preempt_count_dec_and_test(void)
-+{
-+ if (____preempt_count_dec_and_test())
-+ return true;
-+#ifdef CONFIG_PREEMPT_LAZY
-+ if (current_thread_info()->preempt_lazy_count)
-+ return false;
-+ return test_thread_flag(TIF_NEED_RESCHED_LAZY);
-+#else
-+ return false;
-+#endif
-+}
-+
- /*
- * Returns true when we need to resched and can (barring IRQ state).
- */
- static __always_inline bool should_resched(int preempt_offset)
- {
-+#ifdef CONFIG_PREEMPT_LAZY
-+ u32 tmp;
-+
-+ tmp = raw_cpu_read_4(__preempt_count);
-+ if (tmp == preempt_offset)
-+ return true;
-+
-+ /* preempt count == 0 ? */
-+ tmp &= ~PREEMPT_NEED_RESCHED;
-+ if (tmp)
-+ return false;
-+ if (current_thread_info()->preempt_lazy_count)
-+ return false;
-+ return test_thread_flag(TIF_NEED_RESCHED_LAZY);
-+#else
- return unlikely(raw_cpu_read_4(__preempt_count) == preempt_offset);
-+#endif
- }
-
- #ifdef CONFIG_PREEMPT
-diff --git a/arch/x86/include/asm/signal.h b/arch/x86/include/asm/signal.h
-index dd1e7d6..d59bedb 100644
---- a/arch/x86/include/asm/signal.h
-+++ b/arch/x86/include/asm/signal.h
-@@ -23,6 +23,19 @@ typedef struct {
- unsigned long sig[_NSIG_WORDS];
- } sigset_t;
-
-+/*
-+ * Because some traps use the IST stack, we must keep preemption
-+ * disabled while calling do_trap(), but do_trap() may call
-+ * force_sig_info() which will grab the signal spin_locks for the
-+ * task, which in PREEMPT_RT_FULL are mutexes. By defining
-+ * ARCH_RT_DELAYS_SIGNAL_SEND the force_sig_info() will set
-+ * TIF_NOTIFY_RESUME and set up the signal to be sent on exit of the
-+ * trap.
-+ */
-+#if defined(CONFIG_PREEMPT_RT_FULL)
-+#define ARCH_RT_DELAYS_SIGNAL_SEND
-+#endif
-+
- #ifndef CONFIG_COMPAT
- typedef sigset_t compat_sigset_t;
- #endif
-diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
-index 58505f0..02fa396 100644
---- a/arch/x86/include/asm/stackprotector.h
-+++ b/arch/x86/include/asm/stackprotector.h
-@@ -59,7 +59,7 @@
- */
- static __always_inline void boot_init_stack_canary(void)
- {
-- u64 canary;
-+ u64 uninitialized_var(canary);
- u64 tsc;
-
- #ifdef CONFIG_X86_64
-@@ -70,8 +70,15 @@ static __always_inline void boot_init_stack_canary(void)
- * of randomness. The TSC only matters for very early init,
- * there it already has some randomness on most systems. Later
- * on during the bootup the random pool has true entropy too.
-+ *
-+ * For preempt-rt we need to weaken the randomness a bit, as
-+ * we can't call into the random generator from atomic context
-+ * due to locking constraints. We just leave canary
-+ * uninitialized and use the TSC based randomness on top of it.
- */
-+#ifndef CONFIG_PREEMPT_RT_FULL
- get_random_bytes(&canary, sizeof(canary));
-+#endif
- tsc = rdtsc();
- canary += tsc + (tsc << 32UL);
-
-diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
-index 8b7c8d8..631059e 100644
---- a/arch/x86/include/asm/thread_info.h
-+++ b/arch/x86/include/asm/thread_info.h
-@@ -57,6 +57,8 @@ struct thread_info {
- __u32 flags; /* low level flags */
- __u32 status; /* thread synchronous flags */
- __u32 cpu; /* current CPU */
-+ int preempt_lazy_count; /* 0 => lazy preemptable
-+ <0 => BUG */
- };
-
- #define INIT_THREAD_INFO(tsk) \
-@@ -73,6 +75,10 @@ struct thread_info {
-
- #include <asm/asm-offsets.h>
-
-+#define GET_THREAD_INFO(reg) \
-+ _ASM_MOV PER_CPU_VAR(cpu_current_top_of_stack),reg ; \
-+ _ASM_SUB $(THREAD_SIZE),reg ;
-+
- #endif
-
- /*
-@@ -91,6 +97,7 @@ struct thread_info {
- #define TIF_SYSCALL_EMU 6 /* syscall emulation active */
- #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */
- #define TIF_SECCOMP 8 /* secure computing */
-+#define TIF_NEED_RESCHED_LAZY 9 /* lazy rescheduling necessary */
- #define TIF_USER_RETURN_NOTIFY 11 /* notify kernel of userspace return */
- #define TIF_UPROBE 12 /* breakpointed or singlestepping */
- #define TIF_NOTSC 16 /* TSC is not accessible in userland */
-@@ -115,6 +122,7 @@ struct thread_info {
- #define _TIF_SYSCALL_EMU (1 << TIF_SYSCALL_EMU)
- #define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT)
- #define _TIF_SECCOMP (1 << TIF_SECCOMP)
-+#define _TIF_NEED_RESCHED_LAZY (1 << TIF_NEED_RESCHED_LAZY)
- #define _TIF_USER_RETURN_NOTIFY (1 << TIF_USER_RETURN_NOTIFY)
- #define _TIF_UPROBE (1 << TIF_UPROBE)
- #define _TIF_NOTSC (1 << TIF_NOTSC)
-@@ -151,6 +159,8 @@ struct thread_info {
- #define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY)
- #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
-
-+#define _TIF_NEED_RESCHED_MASK (_TIF_NEED_RESCHED | _TIF_NEED_RESCHED_LAZY)
-+
- #define STACK_WARN (THREAD_SIZE/8)
-
- /*
-diff --git a/arch/x86/include/asm/uv/uv_bau.h b/arch/x86/include/asm/uv/uv_bau.h
-index cc44d92..df278aa 100644
---- a/arch/x86/include/asm/uv/uv_bau.h
-+++ b/arch/x86/include/asm/uv/uv_bau.h
-@@ -615,9 +615,9 @@ struct bau_control {
- cycles_t send_message;
- cycles_t period_end;
- cycles_t period_time;
-- spinlock_t uvhub_lock;
-- spinlock_t queue_lock;
-- spinlock_t disable_lock;
-+ raw_spinlock_t uvhub_lock;
-+ raw_spinlock_t queue_lock;
-+ raw_spinlock_t disable_lock;
- /* tunables */
- int max_concurr;
- int max_concurr_const;
-@@ -776,15 +776,15 @@ static inline int atom_asr(short i, struct atomic_short *v)
- * to be lowered below the current 'v'. atomic_add_unless can only stop
- * on equal.
- */
--static inline int atomic_inc_unless_ge(spinlock_t *lock, atomic_t *v, int u)
-+static inline int atomic_inc_unless_ge(raw_spinlock_t *lock, atomic_t *v, int u)
- {
-- spin_lock(lock);
-+ raw_spin_lock(lock);
- if (atomic_read(v) >= u) {
-- spin_unlock(lock);
-+ raw_spin_unlock(lock);
- return 0;
- }
- atomic_inc(v);
-- spin_unlock(lock);
-+ raw_spin_unlock(lock);
- return 1;
- }
-
-diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index 7491f41..0b2f8433 100644
---- a/arch/x86/kernel/apic/io_apic.c
-+++ b/arch/x86/kernel/apic/io_apic.c
-@@ -1712,7 +1712,8 @@ static bool io_apic_level_ack_pending(struct mp_chip_data *data)
- static inline bool ioapic_irqd_mask(struct irq_data *data)
- {
- /* If we are moving the irq we need to mask it */
-- if (unlikely(irqd_is_setaffinity_pending(data))) {
-+ if (unlikely(irqd_is_setaffinity_pending(data) &&
-+ !irqd_irq_inprogress(data))) {
- mask_ioapic_irq(data);
- return true;
- }
-diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
-index 2bd5c6f..a2c317f 100644
---- a/arch/x86/kernel/asm-offsets.c
-+++ b/arch/x86/kernel/asm-offsets.c
-@@ -31,6 +31,7 @@ void common(void) {
- BLANK();
- OFFSET(TI_flags, thread_info, flags);
- OFFSET(TI_status, thread_info, status);
-+ OFFSET(TI_preempt_lazy_count, thread_info, preempt_lazy_count);
-
- BLANK();
- OFFSET(TASK_addr_limit, task_struct, thread.addr_limit);
-@@ -88,4 +89,5 @@ void common(void) {
-
- BLANK();
- DEFINE(PTREGS_SIZE, sizeof(struct pt_regs));
-+ DEFINE(_PREEMPT_ENABLED, PREEMPT_ENABLED);
- }
-diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
-index 79d8ec8..accbf0e 100644
---- a/arch/x86/kernel/cpu/mcheck/mce.c
-+++ b/arch/x86/kernel/cpu/mcheck/mce.c
-@@ -41,6 +41,8 @@
- #include <linux/debugfs.h>
- #include <linux/irq_work.h>
- #include <linux/export.h>
-+#include <linux/jiffies.h>
-+#include <linux/swork.h>
-
- #include <asm/processor.h>
- #include <asm/traps.h>
-@@ -1291,7 +1293,7 @@ void mce_log_therm_throt_event(__u64 status)
- static unsigned long check_interval = INITIAL_CHECK_INTERVAL;
-
- static DEFINE_PER_CPU(unsigned long, mce_next_interval); /* in jiffies */
--static DEFINE_PER_CPU(struct timer_list, mce_timer);
-+static DEFINE_PER_CPU(struct hrtimer, mce_timer);
-
- static unsigned long mce_adjust_timer_default(unsigned long interval)
- {
-@@ -1300,32 +1302,18 @@ static unsigned long mce_adjust_timer_default(unsigned long interval)
-
- static unsigned long (*mce_adjust_timer)(unsigned long interval) = mce_adjust_timer_default;
-
--static void __restart_timer(struct timer_list *t, unsigned long interval)
-+static enum hrtimer_restart __restart_timer(struct hrtimer *timer, unsigned long interval)
- {
-- unsigned long when = jiffies + interval;
-- unsigned long flags;
--
-- local_irq_save(flags);
--
-- if (timer_pending(t)) {
-- if (time_before(when, t->expires))
-- mod_timer(t, when);
-- } else {
-- t->expires = round_jiffies(when);
-- add_timer_on(t, smp_processor_id());
-- }
--
-- local_irq_restore(flags);
-+ if (!interval)
-+ return HRTIMER_NORESTART;
-+ hrtimer_forward_now(timer, ns_to_ktime(jiffies_to_nsecs(interval)));
-+ return HRTIMER_RESTART;
- }
-
--static void mce_timer_fn(unsigned long data)
-+static enum hrtimer_restart mce_timer_fn(struct hrtimer *timer)
- {
-- struct timer_list *t = this_cpu_ptr(&mce_timer);
-- int cpu = smp_processor_id();
- unsigned long iv;
-
-- WARN_ON(cpu != data);
--
- iv = __this_cpu_read(mce_next_interval);
-
- if (mce_available(this_cpu_ptr(&cpu_info))) {
-@@ -1348,7 +1336,7 @@ static void mce_timer_fn(unsigned long data)
-
- done:
- __this_cpu_write(mce_next_interval, iv);
-- __restart_timer(t, iv);
-+ return __restart_timer(timer, iv);
- }
-
- /*
-@@ -1356,7 +1344,7 @@ done:
- */
- void mce_timer_kick(unsigned long interval)
- {
-- struct timer_list *t = this_cpu_ptr(&mce_timer);
-+ struct hrtimer *t = this_cpu_ptr(&mce_timer);
- unsigned long iv = __this_cpu_read(mce_next_interval);
-
- __restart_timer(t, interval);
-@@ -1371,7 +1359,7 @@ static void mce_timer_delete_all(void)
- int cpu;
-
- for_each_online_cpu(cpu)
-- del_timer_sync(&per_cpu(mce_timer, cpu));
-+ hrtimer_cancel(&per_cpu(mce_timer, cpu));
- }
-
- static void mce_do_trigger(struct work_struct *work)
-@@ -1381,6 +1369,56 @@ static void mce_do_trigger(struct work_struct *work)
-
- static DECLARE_WORK(mce_trigger_work, mce_do_trigger);
-
-+static void __mce_notify_work(struct swork_event *event)
-+{
-+ /* Not more than two messages every minute */
-+ static DEFINE_RATELIMIT_STATE(ratelimit, 60*HZ, 2);
-+
-+ /* wake processes polling /dev/mcelog */
-+ wake_up_interruptible(&mce_chrdev_wait);
-+
-+ /*
-+ * There is no risk of missing notifications because
-+ * work_pending is always cleared before the function is
-+ * executed.
-+ */
-+ if (mce_helper[0] && !work_pending(&mce_trigger_work))
-+ schedule_work(&mce_trigger_work);
-+
-+ if (__ratelimit(&ratelimit))
-+ pr_info(HW_ERR "Machine check events logged\n");
-+}
-+
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+static bool notify_work_ready __read_mostly;
-+static struct swork_event notify_work;
-+
-+static int mce_notify_work_init(void)
-+{
-+ int err;
-+
-+ err = swork_get();
-+ if (err)
-+ return err;
-+
-+ INIT_SWORK(¬ify_work, __mce_notify_work);
-+ notify_work_ready = true;
-+ return 0;
-+}
-+
-+static void mce_notify_work(void)
-+{
-+ if (notify_work_ready)
-+ swork_queue(¬ify_work);
-+}
-+#else
-+static void mce_notify_work(void)
-+{
-+ __mce_notify_work(NULL);
-+}
-+static inline int mce_notify_work_init(void) { return 0; }
-+#endif
-+
- /*
- * Notify the user(s) about new machine check events.
- * Can be called from interrupt context, but not from machine check/NMI
-@@ -1388,19 +1426,8 @@ static DECLARE_WORK(mce_trigger_work, mce_do_trigger);
- */
- int mce_notify_irq(void)
- {
-- /* Not more than two messages every minute */
-- static DEFINE_RATELIMIT_STATE(ratelimit, 60*HZ, 2);
--
- if (test_and_clear_bit(0, &mce_need_notify)) {
-- /* wake processes polling /dev/mcelog */
-- wake_up_interruptible(&mce_chrdev_wait);
--
-- if (mce_helper[0])
-- schedule_work(&mce_trigger_work);
--
-- if (__ratelimit(&ratelimit))
-- pr_info(HW_ERR "Machine check events logged\n");
--
-+ mce_notify_work();
- return 1;
- }
- return 0;
-@@ -1717,7 +1744,7 @@ static void __mcheck_cpu_clear_vendor(struct cpuinfo_x86 *c)
- }
- }
-
--static void mce_start_timer(unsigned int cpu, struct timer_list *t)
-+static void mce_start_timer(unsigned int cpu, struct hrtimer *t)
- {
- unsigned long iv = check_interval * HZ;
-
-@@ -1726,16 +1753,17 @@ static void mce_start_timer(unsigned int cpu, struct timer_list *t)
-
- per_cpu(mce_next_interval, cpu) = iv;
-
-- t->expires = round_jiffies(jiffies + iv);
-- add_timer_on(t, cpu);
-+ hrtimer_start_range_ns(t, ns_to_ktime(jiffies_to_usecs(iv) * 1000ULL),
-+ 0, HRTIMER_MODE_REL_PINNED);
- }
-
- static void __mcheck_cpu_init_timer(void)
- {
-- struct timer_list *t = this_cpu_ptr(&mce_timer);
-+ struct hrtimer *t = this_cpu_ptr(&mce_timer);
- unsigned int cpu = smp_processor_id();
-
-- setup_pinned_timer(t, mce_timer_fn, cpu);
-+ hrtimer_init(t, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-+ t->function = mce_timer_fn;
- mce_start_timer(cpu, t);
- }
-
-@@ -2459,6 +2487,8 @@ static void mce_disable_cpu(void *h)
- if (!mce_available(raw_cpu_ptr(&cpu_info)))
- return;
-
-+ hrtimer_cancel(this_cpu_ptr(&mce_timer));
-+
- if (!(action & CPU_TASKS_FROZEN))
- cmci_clear();
-
-@@ -2481,6 +2511,7 @@ static void mce_reenable_cpu(void *h)
- if (b->init)
- wrmsrl(msr_ops.ctl(i), b->ctl);
- }
-+ __mcheck_cpu_init_timer();
- }
-
- /* Get notified when a cpu comes on/off. Be hotplug friendly. */
-@@ -2488,7 +2519,6 @@ static int
- mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
- {
- unsigned int cpu = (unsigned long)hcpu;
-- struct timer_list *t = &per_cpu(mce_timer, cpu);
-
- switch (action & ~CPU_TASKS_FROZEN) {
- case CPU_ONLINE:
-@@ -2508,11 +2538,9 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
- break;
- case CPU_DOWN_PREPARE:
- smp_call_function_single(cpu, mce_disable_cpu, &action, 1);
-- del_timer_sync(t);
- break;
- case CPU_DOWN_FAILED:
- smp_call_function_single(cpu, mce_reenable_cpu, &action, 1);
-- mce_start_timer(cpu, t);
- break;
- }
-
-@@ -2551,6 +2579,10 @@ static __init int mcheck_init_device(void)
- goto err_out;
- }
-
-+ err = mce_notify_work_init();
-+ if (err)
-+ goto err_out;
-+
- if (!zalloc_cpumask_var(&mce_device_initialized, GFP_KERNEL)) {
- err = -ENOMEM;
- goto err_out;
-diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
-index 0967571..eea7557 100644
---- a/arch/x86/kernel/dumpstack_32.c
-+++ b/arch/x86/kernel/dumpstack_32.c
-@@ -42,7 +42,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
- unsigned long *stack, unsigned long bp,
- const struct stacktrace_ops *ops, void *data)
- {
-- const unsigned cpu = get_cpu();
-+ const unsigned cpu = get_cpu_light();
- int graph = 0;
- u32 *prev_esp;
-
-@@ -84,7 +84,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
- break;
- touch_nmi_watchdog();
- }
-- put_cpu();
-+ put_cpu_light();
- }
- EXPORT_SYMBOL(dump_trace);
-
-diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
-index 9ee4520..2cd610b 100644
---- a/arch/x86/kernel/dumpstack_64.c
-+++ b/arch/x86/kernel/dumpstack_64.c
-@@ -152,7 +152,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
- unsigned long *stack, unsigned long bp,
- const struct stacktrace_ops *ops, void *data)
- {
-- const unsigned cpu = get_cpu();
-+ const unsigned cpu = get_cpu_light();
- unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
- unsigned long dummy;
- unsigned used = 0;
-@@ -239,7 +239,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
- * This handles the process stack:
- */
- bp = ops->walk_stack(task, stack, bp, ops, data, NULL, &graph);
-- put_cpu();
-+ put_cpu_light();
- }
- EXPORT_SYMBOL(dump_trace);
-
-@@ -253,7 +253,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
- int cpu;
- int i;
-
-- preempt_disable();
-+ migrate_disable();
- cpu = smp_processor_id();
-
- irq_stack_end = (unsigned long *)(per_cpu(irq_stack_ptr, cpu));
-@@ -299,7 +299,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
- stack++;
- touch_nmi_watchdog();
- }
-- preempt_enable();
-+ migrate_enable();
-
- pr_cont("\n");
- show_trace_log_lvl(task, regs, sp, bp, log_lvl);
-diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
-index 1f38d9a..053bf3b 100644
---- a/arch/x86/kernel/irq_32.c
-+++ b/arch/x86/kernel/irq_32.c
-@@ -127,6 +127,7 @@ void irq_ctx_init(int cpu)
- cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
- }
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- void do_softirq_own_stack(void)
- {
- struct irq_stack *irqstk;
-@@ -143,6 +144,7 @@ void do_softirq_own_stack(void)
-
- call_on_stack(__do_softirq, isp);
- }
-+#endif
-
- bool handle_irq(struct irq_desc *desc, struct pt_regs *regs)
- {
-diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index d86be29..b0e29d1 100644
---- a/arch/x86/kernel/process_32.c
-+++ b/arch/x86/kernel/process_32.c
-@@ -35,6 +35,7 @@
- #include <linux/uaccess.h>
- #include <linux/io.h>
- #include <linux/kdebug.h>
-+#include <linux/highmem.h>
-
- #include <asm/pgtable.h>
- #include <asm/ldt.h>
-@@ -210,6 +211,35 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
- }
- EXPORT_SYMBOL_GPL(start_thread);
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+static void switch_kmaps(struct task_struct *prev_p, struct task_struct *next_p)
-+{
-+ int i;
-+
-+ /*
-+ * Clear @prev's kmap_atomic mappings
-+ */
-+ for (i = 0; i < prev_p->kmap_idx; i++) {
-+ int idx = i + KM_TYPE_NR * smp_processor_id();
-+ pte_t *ptep = kmap_pte - idx;
-+
-+ kpte_clear_flush(ptep, __fix_to_virt(FIX_KMAP_BEGIN + idx));
-+ }
-+ /*
-+ * Restore @next_p's kmap_atomic mappings
-+ */
-+ for (i = 0; i < next_p->kmap_idx; i++) {
-+ int idx = i + KM_TYPE_NR * smp_processor_id();
-+
-+ if (!pte_none(next_p->kmap_pte[i]))
-+ set_pte(kmap_pte - idx, next_p->kmap_pte[i]);
-+ }
-+}
-+#else
-+static inline void
-+switch_kmaps(struct task_struct *prev_p, struct task_struct *next_p) { }
-+#endif
-+
-
- /*
- * switch_to(x,y) should switch tasks from x to y.
-@@ -286,6 +316,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
- task_thread_info(next_p)->flags & _TIF_WORK_CTXSW_NEXT))
- __switch_to_xtra(prev_p, next_p, tss);
-
-+ switch_kmaps(prev_p, next_p);
-+
- /*
- * Leave lazy mode, flushing any hypercalls made here.
- * This must be done before restoring TLS segments so
-diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
-index b62c852..d907b28 100644
---- a/arch/x86/kvm/lapic.c
-+++ b/arch/x86/kvm/lapic.c
-@@ -1938,6 +1938,7 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu)
- hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC,
- HRTIMER_MODE_ABS_PINNED);
- apic->lapic_timer.timer.function = apic_timer_fn;
-+ apic->lapic_timer.timer.irqsafe = 1;
-
- /*
- * APIC is created enabled. This will prevent kvm_lapic_set_base from
-diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index 699f872..24f30c8 100644
---- a/arch/x86/kvm/x86.c
-+++ b/arch/x86/kvm/x86.c
-@@ -5865,6 +5865,13 @@ int kvm_arch_init(void *opaque)
- goto out;
- }
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) {
-+ printk(KERN_ERR "RT requires X86_FEATURE_CONSTANT_TSC\n");
-+ return -EOPNOTSUPP;
-+ }
-+#endif
-+
- r = kvm_mmu_module_init();
- if (r)
- goto out_free_percpu;
-diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
-index 6d18b70..f752724 100644
---- a/arch/x86/mm/highmem_32.c
-+++ b/arch/x86/mm/highmem_32.c
-@@ -32,10 +32,11 @@ EXPORT_SYMBOL(kunmap);
- */
- void *kmap_atomic_prot(struct page *page, pgprot_t prot)
- {
-+ pte_t pte = mk_pte(page, prot);
- unsigned long vaddr;
- int idx, type;
-
-- preempt_disable();
-+ preempt_disable_nort();
- pagefault_disable();
-
- if (!PageHighMem(page))
-@@ -45,7 +46,10 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
- idx = type + KM_TYPE_NR*smp_processor_id();
- vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
- BUG_ON(!pte_none(*(kmap_pte-idx)));
-- set_pte(kmap_pte-idx, mk_pte(page, prot));
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ current->kmap_pte[type] = pte;
-+#endif
-+ set_pte(kmap_pte-idx, pte);
- arch_flush_lazy_mmu_mode();
-
- return (void *)vaddr;
-@@ -88,6 +92,9 @@ void __kunmap_atomic(void *kvaddr)
- * is a bad idea also, in case the page changes cacheability
- * attributes or becomes a protected page in a hypervisor.
- */
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ current->kmap_pte[type] = __pte(0);
-+#endif
- kpte_clear_flush(kmap_pte-idx, vaddr);
- kmap_atomic_idx_pop();
- arch_flush_lazy_mmu_mode();
-@@ -100,7 +107,7 @@ void __kunmap_atomic(void *kvaddr)
- #endif
-
- pagefault_enable();
-- preempt_enable();
-+ preempt_enable_nort();
- }
- EXPORT_SYMBOL(__kunmap_atomic);
-
-diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
-index ada98b3..585f682 100644
---- a/arch/x86/mm/iomap_32.c
-+++ b/arch/x86/mm/iomap_32.c
-@@ -56,6 +56,7 @@ EXPORT_SYMBOL_GPL(iomap_free);
-
- void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
- {
-+ pte_t pte = pfn_pte(pfn, prot);
- unsigned long vaddr;
- int idx, type;
-
-@@ -65,7 +66,12 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
- type = kmap_atomic_idx_push();
- idx = type + KM_TYPE_NR * smp_processor_id();
- vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
-- set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
-+ WARN_ON(!pte_none(*(kmap_pte - idx)));
-+
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ current->kmap_pte[type] = pte;
-+#endif
-+ set_pte(kmap_pte - idx, pte);
- arch_flush_lazy_mmu_mode();
-
- return (void *)vaddr;
-@@ -113,6 +119,9 @@ iounmap_atomic(void __iomem *kvaddr)
- * is a bad idea also, in case the page changes cacheability
- * attributes or becomes a protected page in a hypervisor.
- */
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ current->kmap_pte[type] = __pte(0);
-+#endif
- kpte_clear_flush(kmap_pte-idx, vaddr);
- kmap_atomic_idx_pop();
- }
-diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
-index fdb4d42..8ab90fb 100644
---- a/arch/x86/platform/uv/tlb_uv.c
-+++ b/arch/x86/platform/uv/tlb_uv.c
-@@ -729,9 +729,9 @@ static void destination_plugged(struct bau_desc *bau_desc,
-
- quiesce_local_uvhub(hmaster);
-
-- spin_lock(&hmaster->queue_lock);
-+ raw_spin_lock(&hmaster->queue_lock);
- reset_with_ipi(&bau_desc->distribution, bcp);
-- spin_unlock(&hmaster->queue_lock);
-+ raw_spin_unlock(&hmaster->queue_lock);
-
- end_uvhub_quiesce(hmaster);
-
-@@ -751,9 +751,9 @@ static void destination_timeout(struct bau_desc *bau_desc,
-
- quiesce_local_uvhub(hmaster);
-
-- spin_lock(&hmaster->queue_lock);
-+ raw_spin_lock(&hmaster->queue_lock);
- reset_with_ipi(&bau_desc->distribution, bcp);
-- spin_unlock(&hmaster->queue_lock);
-+ raw_spin_unlock(&hmaster->queue_lock);
-
- end_uvhub_quiesce(hmaster);
-
-@@ -774,7 +774,7 @@ static void disable_for_period(struct bau_control *bcp, struct ptc_stats *stat)
- cycles_t tm1;
-
- hmaster = bcp->uvhub_master;
-- spin_lock(&hmaster->disable_lock);
-+ raw_spin_lock(&hmaster->disable_lock);
- if (!bcp->baudisabled) {
- stat->s_bau_disabled++;
- tm1 = get_cycles();
-@@ -787,7 +787,7 @@ static void disable_for_period(struct bau_control *bcp, struct ptc_stats *stat)
- }
- }
- }
-- spin_unlock(&hmaster->disable_lock);
-+ raw_spin_unlock(&hmaster->disable_lock);
- }
-
- static void count_max_concurr(int stat, struct bau_control *bcp,
-@@ -850,7 +850,7 @@ static void record_send_stats(cycles_t time1, cycles_t time2,
- */
- static void uv1_throttle(struct bau_control *hmaster, struct ptc_stats *stat)
- {
-- spinlock_t *lock = &hmaster->uvhub_lock;
-+ raw_spinlock_t *lock = &hmaster->uvhub_lock;
- atomic_t *v;
-
- v = &hmaster->active_descriptor_count;
-@@ -983,7 +983,7 @@ static int check_enable(struct bau_control *bcp, struct ptc_stats *stat)
- struct bau_control *hmaster;
-
- hmaster = bcp->uvhub_master;
-- spin_lock(&hmaster->disable_lock);
-+ raw_spin_lock(&hmaster->disable_lock);
- if (bcp->baudisabled && (get_cycles() >= bcp->set_bau_on_time)) {
- stat->s_bau_reenabled++;
- for_each_present_cpu(tcpu) {
-@@ -995,10 +995,10 @@ static int check_enable(struct bau_control *bcp, struct ptc_stats *stat)
- tbcp->period_giveups = 0;
- }
- }
-- spin_unlock(&hmaster->disable_lock);
-+ raw_spin_unlock(&hmaster->disable_lock);
- return 0;
- }
-- spin_unlock(&hmaster->disable_lock);
-+ raw_spin_unlock(&hmaster->disable_lock);
- return -1;
- }
-
-@@ -1916,9 +1916,9 @@ static void __init init_per_cpu_tunables(void)
- bcp->cong_reps = congested_reps;
- bcp->disabled_period = sec_2_cycles(disabled_period);
- bcp->giveup_limit = giveup_limit;
-- spin_lock_init(&bcp->queue_lock);
-- spin_lock_init(&bcp->uvhub_lock);
-- spin_lock_init(&bcp->disable_lock);
-+ raw_spin_lock_init(&bcp->queue_lock);
-+ raw_spin_lock_init(&bcp->uvhub_lock);
-+ raw_spin_lock_init(&bcp->disable_lock);
- }
- }
-
-diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c
-index b333fc4..8b85916 100644
---- a/arch/x86/platform/uv/uv_time.c
-+++ b/arch/x86/platform/uv/uv_time.c
-@@ -57,7 +57,7 @@ static DEFINE_PER_CPU(struct clock_event_device, cpu_ced);
-
- /* There is one of these allocated per node */
- struct uv_rtc_timer_head {
-- spinlock_t lock;
-+ raw_spinlock_t lock;
- /* next cpu waiting for timer, local node relative: */
- int next_cpu;
- /* number of cpus on this node: */
-@@ -177,7 +177,7 @@ static __init int uv_rtc_allocate_timers(void)
- uv_rtc_deallocate_timers();
- return -ENOMEM;
- }
-- spin_lock_init(&head->lock);
-+ raw_spin_lock_init(&head->lock);
- head->ncpus = uv_blade_nr_possible_cpus(bid);
- head->next_cpu = -1;
- blade_info[bid] = head;
-@@ -231,7 +231,7 @@ static int uv_rtc_set_timer(int cpu, u64 expires)
- unsigned long flags;
- int next_cpu;
-
-- spin_lock_irqsave(&head->lock, flags);
-+ raw_spin_lock_irqsave(&head->lock, flags);
-
- next_cpu = head->next_cpu;
- *t = expires;
-@@ -243,12 +243,12 @@ static int uv_rtc_set_timer(int cpu, u64 expires)
- if (uv_setup_intr(cpu, expires)) {
- *t = ULLONG_MAX;
- uv_rtc_find_next_timer(head, pnode);
-- spin_unlock_irqrestore(&head->lock, flags);
-+ raw_spin_unlock_irqrestore(&head->lock, flags);
- return -ETIME;
- }
- }
-
-- spin_unlock_irqrestore(&head->lock, flags);
-+ raw_spin_unlock_irqrestore(&head->lock, flags);
- return 0;
- }
-
-@@ -267,7 +267,7 @@ static int uv_rtc_unset_timer(int cpu, int force)
- unsigned long flags;
- int rc = 0;
-
-- spin_lock_irqsave(&head->lock, flags);
-+ raw_spin_lock_irqsave(&head->lock, flags);
-
- if ((head->next_cpu == bcpu && uv_read_rtc(NULL) >= *t) || force)
- rc = 1;
-@@ -279,7 +279,7 @@ static int uv_rtc_unset_timer(int cpu, int force)
- uv_rtc_find_next_timer(head, pnode);
- }
-
-- spin_unlock_irqrestore(&head->lock, flags);
-+ raw_spin_unlock_irqrestore(&head->lock, flags);
-
- return rc;
- }
-@@ -299,13 +299,18 @@ static int uv_rtc_unset_timer(int cpu, int force)
- static cycle_t uv_read_rtc(struct clocksource *cs)
- {
- unsigned long offset;
-+ cycle_t cycles;
-
-+ preempt_disable();
- if (uv_get_min_hub_revision_id() == 1)
- offset = 0;
- else
- offset = (uv_blade_processor_id() * L1_CACHE_BYTES) % PAGE_SIZE;
-
-- return (cycle_t)uv_read_local_mmr(UVH_RTC | offset);
-+ cycles = (cycle_t)uv_read_local_mmr(UVH_RTC | offset);
-+ preempt_enable();
-+
-+ return cycles;
- }
-
- /*
-diff --git a/block/blk-core.c b/block/blk-core.c
-index 36c7ac3..caa5fc1 100644
---- a/block/blk-core.c
-+++ b/block/blk-core.c
-@@ -125,6 +125,9 @@ void blk_rq_init(struct request_queue *q, struct request *rq)
-
- INIT_LIST_HEAD(&rq->queuelist);
- INIT_LIST_HEAD(&rq->timeout_list);
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ INIT_WORK(&rq->work, __blk_mq_complete_request_remote_work);
-+#endif
- rq->cpu = -1;
- rq->q = q;
- rq->__sector = (sector_t) -1;
-@@ -233,7 +236,7 @@ EXPORT_SYMBOL(blk_start_queue_async);
- **/
- void blk_start_queue(struct request_queue *q)
- {
-- WARN_ON(!irqs_disabled());
-+ WARN_ON_NONRT(!irqs_disabled());
-
- queue_flag_clear(QUEUE_FLAG_STOPPED, q);
- __blk_run_queue(q);
-@@ -659,7 +662,7 @@ int blk_queue_enter(struct request_queue *q, bool nowait)
- if (nowait)
- return -EBUSY;
-
-- ret = wait_event_interruptible(q->mq_freeze_wq,
-+ ret = swait_event_interruptible(q->mq_freeze_wq,
- !atomic_read(&q->mq_freeze_depth) ||
- blk_queue_dying(q));
- if (blk_queue_dying(q))
-@@ -679,7 +682,7 @@ static void blk_queue_usage_counter_release(struct percpu_ref *ref)
- struct request_queue *q =
- container_of(ref, struct request_queue, q_usage_counter);
-
-- wake_up_all(&q->mq_freeze_wq);
-+ swake_up_all(&q->mq_freeze_wq);
- }
-
- static void blk_rq_timed_out_timer(unsigned long data)
-@@ -748,7 +751,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
- q->bypass_depth = 1;
- __set_bit(QUEUE_FLAG_BYPASS, &q->queue_flags);
-
-- init_waitqueue_head(&q->mq_freeze_wq);
-+ init_swait_queue_head(&q->mq_freeze_wq);
-
- /*
- * Init percpu_ref in atomic mode so that it's faster to shutdown.
-@@ -3171,7 +3174,7 @@ static void queue_unplugged(struct request_queue *q, unsigned int depth,
- blk_run_queue_async(q);
- else
- __blk_run_queue(q);
-- spin_unlock(q->queue_lock);
-+ spin_unlock_irq(q->queue_lock);
- }
-
- static void flush_plug_callbacks(struct blk_plug *plug, bool from_schedule)
-@@ -3219,7 +3222,6 @@ EXPORT_SYMBOL(blk_check_plugged);
- void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
- {
- struct request_queue *q;
-- unsigned long flags;
- struct request *rq;
- LIST_HEAD(list);
- unsigned int depth;
-@@ -3239,11 +3241,6 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
- q = NULL;
- depth = 0;
-
-- /*
-- * Save and disable interrupts here, to avoid doing it for every
-- * queue lock we have to take.
-- */
-- local_irq_save(flags);
- while (!list_empty(&list)) {
- rq = list_entry_rq(list.next);
- list_del_init(&rq->queuelist);
-@@ -3256,7 +3253,7 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
- queue_unplugged(q, depth, from_schedule);
- q = rq->q;
- depth = 0;
-- spin_lock(q->queue_lock);
-+ spin_lock_irq(q->queue_lock);
- }
-
- /*
-@@ -3283,8 +3280,6 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
- */
- if (q)
- queue_unplugged(q, depth, from_schedule);
--
-- local_irq_restore(flags);
- }
-
- void blk_finish_plug(struct blk_plug *plug)
-diff --git a/block/blk-ioc.c b/block/blk-ioc.c
-index 381cb50..dc87852 100644
---- a/block/blk-ioc.c
-+++ b/block/blk-ioc.c
-@@ -7,6 +7,7 @@
- #include <linux/bio.h>
- #include <linux/blkdev.h>
- #include <linux/slab.h>
-+#include <linux/delay.h>
-
- #include "blk.h"
-
-@@ -109,7 +110,7 @@ static void ioc_release_fn(struct work_struct *work)
- spin_unlock(q->queue_lock);
- } else {
- spin_unlock_irqrestore(&ioc->lock, flags);
-- cpu_relax();
-+ cpu_chill();
- spin_lock_irqsave_nested(&ioc->lock, flags, 1);
- }
- }
-@@ -187,7 +188,7 @@ retry:
- spin_unlock(icq->q->queue_lock);
- } else {
- spin_unlock_irqrestore(&ioc->lock, flags);
-- cpu_relax();
-+ cpu_chill();
- goto retry;
- }
- }
-diff --git a/block/blk-mq-cpu.c b/block/blk-mq-cpu.c
-index bb3ed48..628c6c1 100644
---- a/block/blk-mq-cpu.c
-+++ b/block/blk-mq-cpu.c
-@@ -16,7 +16,7 @@
- #include "blk-mq.h"
-
- static LIST_HEAD(blk_mq_cpu_notify_list);
--static DEFINE_RAW_SPINLOCK(blk_mq_cpu_notify_lock);
-+static DEFINE_SPINLOCK(blk_mq_cpu_notify_lock);
-
- static int blk_mq_main_cpu_notify(struct notifier_block *self,
- unsigned long action, void *hcpu)
-@@ -25,7 +25,10 @@ static int blk_mq_main_cpu_notify(struct notifier_block *self,
- struct blk_mq_cpu_notifier *notify;
- int ret = NOTIFY_OK;
-
-- raw_spin_lock(&blk_mq_cpu_notify_lock);
-+ if (action != CPU_POST_DEAD)
-+ return NOTIFY_OK;
-+
-+ spin_lock(&blk_mq_cpu_notify_lock);
-
- list_for_each_entry(notify, &blk_mq_cpu_notify_list, list) {
- ret = notify->notify(notify->data, action, cpu);
-@@ -33,7 +36,7 @@ static int blk_mq_main_cpu_notify(struct notifier_block *self,
- break;
- }
-
-- raw_spin_unlock(&blk_mq_cpu_notify_lock);
-+ spin_unlock(&blk_mq_cpu_notify_lock);
- return ret;
- }
-
-@@ -41,16 +44,16 @@ void blk_mq_register_cpu_notifier(struct blk_mq_cpu_notifier *notifier)
- {
- BUG_ON(!notifier->notify);
-
-- raw_spin_lock(&blk_mq_cpu_notify_lock);
-+ spin_lock(&blk_mq_cpu_notify_lock);
- list_add_tail(¬ifier->list, &blk_mq_cpu_notify_list);
-- raw_spin_unlock(&blk_mq_cpu_notify_lock);
-+ spin_unlock(&blk_mq_cpu_notify_lock);
- }
-
- void blk_mq_unregister_cpu_notifier(struct blk_mq_cpu_notifier *notifier)
- {
-- raw_spin_lock(&blk_mq_cpu_notify_lock);
-+ spin_lock(&blk_mq_cpu_notify_lock);
- list_del(¬ifier->list);
-- raw_spin_unlock(&blk_mq_cpu_notify_lock);
-+ spin_unlock(&blk_mq_cpu_notify_lock);
- }
-
- void blk_mq_init_cpu_notifier(struct blk_mq_cpu_notifier *notifier,
-diff --git a/block/blk-mq.c b/block/blk-mq.c
-index c207fa9..ac71b04 100644
---- a/block/blk-mq.c
-+++ b/block/blk-mq.c
-@@ -92,7 +92,7 @@ EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_start);
-
- static void blk_mq_freeze_queue_wait(struct request_queue *q)
- {
-- wait_event(q->mq_freeze_wq, percpu_ref_is_zero(&q->q_usage_counter));
-+ swait_event(q->mq_freeze_wq, percpu_ref_is_zero(&q->q_usage_counter));
- }
-
- /*
-@@ -130,7 +130,7 @@ void blk_mq_unfreeze_queue(struct request_queue *q)
- WARN_ON_ONCE(freeze_depth < 0);
- if (!freeze_depth) {
- percpu_ref_reinit(&q->q_usage_counter);
-- wake_up_all(&q->mq_freeze_wq);
-+ swake_up_all(&q->mq_freeze_wq);
- }
- }
- EXPORT_SYMBOL_GPL(blk_mq_unfreeze_queue);
-@@ -149,7 +149,7 @@ void blk_mq_wake_waiters(struct request_queue *q)
- * dying, we need to ensure that processes currently waiting on
- * the queue are notified as well.
- */
-- wake_up_all(&q->mq_freeze_wq);
-+ swake_up_all(&q->mq_freeze_wq);
- }
-
- bool blk_mq_can_queue(struct blk_mq_hw_ctx *hctx)
-@@ -197,6 +197,9 @@ static void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx,
- rq->resid_len = 0;
- rq->sense = NULL;
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ INIT_WORK(&rq->work, __blk_mq_complete_request_remote_work);
-+#endif
- INIT_LIST_HEAD(&rq->timeout_list);
- rq->timeout = 0;
-
-@@ -379,6 +382,17 @@ void blk_mq_end_request(struct request *rq, int error)
- }
- EXPORT_SYMBOL(blk_mq_end_request);
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+
-+void __blk_mq_complete_request_remote_work(struct work_struct *work)
-+{
-+ struct request *rq = container_of(work, struct request, work);
-+
-+ rq->q->softirq_done_fn(rq);
-+}
-+
-+#else
-+
- static void __blk_mq_complete_request_remote(void *data)
- {
- struct request *rq = data;
-@@ -386,6 +400,8 @@ static void __blk_mq_complete_request_remote(void *data)
- rq->q->softirq_done_fn(rq);
- }
-
-+#endif
-+
- static void blk_mq_ipi_complete_request(struct request *rq)
- {
- struct blk_mq_ctx *ctx = rq->mq_ctx;
-@@ -397,19 +413,23 @@ static void blk_mq_ipi_complete_request(struct request *rq)
- return;
- }
-
-- cpu = get_cpu();
-+ cpu = get_cpu_light();
- if (!test_bit(QUEUE_FLAG_SAME_FORCE, &rq->q->queue_flags))
- shared = cpus_share_cache(cpu, ctx->cpu);
-
- if (cpu != ctx->cpu && !shared && cpu_online(ctx->cpu)) {
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ schedule_work_on(ctx->cpu, &rq->work);
-+#else
- rq->csd.func = __blk_mq_complete_request_remote;
- rq->csd.info = rq;
- rq->csd.flags = 0;
- smp_call_function_single_async(ctx->cpu, &rq->csd);
-+#endif
- } else {
- rq->q->softirq_done_fn(rq);
- }
-- put_cpu();
-+ put_cpu_light();
- }
-
- static void __blk_mq_complete_request(struct request *rq)
-@@ -938,14 +958,14 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async)
- return;
-
- if (!async) {
-- int cpu = get_cpu();
-+ int cpu = get_cpu_light();
- if (cpumask_test_cpu(cpu, hctx->cpumask)) {
- __blk_mq_run_hw_queue(hctx);
-- put_cpu();
-+ put_cpu_light();
- return;
- }
-
-- put_cpu();
-+ put_cpu_light();
- }
-
- kblockd_schedule_delayed_work_on(blk_mq_hctx_next_cpu(hctx),
-@@ -1667,7 +1687,7 @@ static int blk_mq_hctx_notify(void *data, unsigned long action,
- {
- struct blk_mq_hw_ctx *hctx = data;
-
-- if (action == CPU_DEAD || action == CPU_DEAD_FROZEN)
-+ if (action == CPU_POST_DEAD)
- return blk_mq_hctx_cpu_offline(hctx, cpu);
-
- /*
-diff --git a/block/blk-mq.h b/block/blk-mq.h
-index 9087b11..0401d76 100644
---- a/block/blk-mq.h
-+++ b/block/blk-mq.h
-@@ -86,12 +86,12 @@ static inline struct blk_mq_ctx *__blk_mq_get_ctx(struct request_queue *q,
- */
- static inline struct blk_mq_ctx *blk_mq_get_ctx(struct request_queue *q)
- {
-- return __blk_mq_get_ctx(q, get_cpu());
-+ return __blk_mq_get_ctx(q, get_cpu_light());
- }
-
- static inline void blk_mq_put_ctx(struct blk_mq_ctx *ctx)
- {
-- put_cpu();
-+ put_cpu_light();
- }
-
- struct blk_mq_alloc_data {
-diff --git a/block/blk-softirq.c b/block/blk-softirq.c
-index 53b1737..81c3c0a 100644
---- a/block/blk-softirq.c
-+++ b/block/blk-softirq.c
-@@ -51,6 +51,7 @@ static void trigger_softirq(void *data)
- raise_softirq_irqoff(BLOCK_SOFTIRQ);
-
- local_irq_restore(flags);
-+ preempt_check_resched_rt();
- }
-
- /*
-@@ -93,6 +94,7 @@ static int blk_cpu_notify(struct notifier_block *self, unsigned long action,
- this_cpu_ptr(&blk_cpu_done));
- raise_softirq_irqoff(BLOCK_SOFTIRQ);
- local_irq_enable();
-+ preempt_check_resched_rt();
- }
-
- return NOTIFY_OK;
-@@ -150,6 +152,7 @@ do_local:
- goto do_local;
-
- local_irq_restore(flags);
-+ preempt_check_resched_rt();
- }
-
- /**
-diff --git a/block/bounce.c b/block/bounce.c
-index 1cb5dd3..2f1ec8a 100644
---- a/block/bounce.c
-+++ b/block/bounce.c
-@@ -55,11 +55,11 @@ static void bounce_copy_vec(struct bio_vec *to, unsigned char *vfrom)
- unsigned long flags;
- unsigned char *vto;
-
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- vto = kmap_atomic(to->bv_page);
- memcpy(vto + to->bv_offset, vfrom, to->bv_len);
- kunmap_atomic(vto);
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- }
-
- #else /* CONFIG_HIGHMEM */
-diff --git a/crypto/algapi.c b/crypto/algapi.c
-index df939b5..efe5e06 100644
---- a/crypto/algapi.c
-+++ b/crypto/algapi.c
-@@ -718,13 +718,13 @@ EXPORT_SYMBOL_GPL(crypto_spawn_tfm2);
-
- int crypto_register_notifier(struct notifier_block *nb)
- {
-- return blocking_notifier_chain_register(&crypto_chain, nb);
-+ return srcu_notifier_chain_register(&crypto_chain, nb);
- }
- EXPORT_SYMBOL_GPL(crypto_register_notifier);
-
- int crypto_unregister_notifier(struct notifier_block *nb)
- {
-- return blocking_notifier_chain_unregister(&crypto_chain, nb);
-+ return srcu_notifier_chain_unregister(&crypto_chain, nb);
- }
- EXPORT_SYMBOL_GPL(crypto_unregister_notifier);
-
-diff --git a/crypto/api.c b/crypto/api.c
-index bbc147c..bc1a848 100644
---- a/crypto/api.c
-+++ b/crypto/api.c
-@@ -31,7 +31,7 @@ EXPORT_SYMBOL_GPL(crypto_alg_list);
- DECLARE_RWSEM(crypto_alg_sem);
- EXPORT_SYMBOL_GPL(crypto_alg_sem);
-
--BLOCKING_NOTIFIER_HEAD(crypto_chain);
-+SRCU_NOTIFIER_HEAD(crypto_chain);
- EXPORT_SYMBOL_GPL(crypto_chain);
-
- static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg);
-@@ -236,10 +236,10 @@ int crypto_probing_notify(unsigned long val, void *v)
- {
- int ok;
-
-- ok = blocking_notifier_call_chain(&crypto_chain, val, v);
-+ ok = srcu_notifier_call_chain(&crypto_chain, val, v);
- if (ok == NOTIFY_DONE) {
- request_module("cryptomgr");
-- ok = blocking_notifier_call_chain(&crypto_chain, val, v);
-+ ok = srcu_notifier_call_chain(&crypto_chain, val, v);
- }
-
- return ok;
-diff --git a/crypto/internal.h b/crypto/internal.h
-index 7eefcdb..0ecc7f5 100644
---- a/crypto/internal.h
-+++ b/crypto/internal.h
-@@ -47,7 +47,7 @@ struct crypto_larval {
-
- extern struct list_head crypto_alg_list;
- extern struct rw_semaphore crypto_alg_sem;
--extern struct blocking_notifier_head crypto_chain;
-+extern struct srcu_notifier_head crypto_chain;
-
- #ifdef CONFIG_PROC_FS
- void __init crypto_init_proc(void);
-@@ -146,7 +146,7 @@ static inline int crypto_is_moribund(struct crypto_alg *alg)
-
- static inline void crypto_notify(unsigned long val, void *v)
- {
-- blocking_notifier_call_chain(&crypto_chain, val, v);
-+ srcu_notifier_call_chain(&crypto_chain, val, v);
- }
-
- #endif /* _CRYPTO_INTERNAL_H */
-diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
-index fded776..bda5232 100644
---- a/drivers/acpi/acpica/acglobal.h
-+++ b/drivers/acpi/acpica/acglobal.h
-@@ -116,7 +116,7 @@ ACPI_GLOBAL(u8, acpi_gbl_global_lock_pending);
- * interrupt level
- */
- ACPI_GLOBAL(acpi_spinlock, acpi_gbl_gpe_lock); /* For GPE data structs and registers */
--ACPI_GLOBAL(acpi_spinlock, acpi_gbl_hardware_lock); /* For ACPI H/W except GPE registers */
-+ACPI_GLOBAL(acpi_raw_spinlock, acpi_gbl_hardware_lock); /* For ACPI H/W except GPE registers */
- ACPI_GLOBAL(acpi_spinlock, acpi_gbl_reference_count_lock);
-
- /* Mutex for _OSI support */
-diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
-index 3b7fb99..696bf8e 100644
---- a/drivers/acpi/acpica/hwregs.c
-+++ b/drivers/acpi/acpica/hwregs.c
-@@ -363,14 +363,14 @@ acpi_status acpi_hw_clear_acpi_status(void)
- ACPI_BITMASK_ALL_FIXED_STATUS,
- ACPI_FORMAT_UINT64(acpi_gbl_xpm1a_status.address)));
-
-- lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);
-+ raw_spin_lock_irqsave(acpi_gbl_hardware_lock, lock_flags);
-
- /* Clear the fixed events in PM1 A/B */
-
- status = acpi_hw_register_write(ACPI_REGISTER_PM1_STATUS,
- ACPI_BITMASK_ALL_FIXED_STATUS);
-
-- acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);
-+ raw_spin_unlock_irqrestore(acpi_gbl_hardware_lock, lock_flags);
-
- if (ACPI_FAILURE(status)) {
- goto exit;
-diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
-index 98c26ff..6e236f2 100644
---- a/drivers/acpi/acpica/hwxface.c
-+++ b/drivers/acpi/acpica/hwxface.c
-@@ -373,7 +373,7 @@ acpi_status acpi_write_bit_register(u32 register_id, u32 value)
- return_ACPI_STATUS(AE_BAD_PARAMETER);
- }
-
-- lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);
-+ raw_spin_lock_irqsave(acpi_gbl_hardware_lock, lock_flags);
-
- /*
- * At this point, we know that the parent register is one of the
-@@ -434,7 +434,7 @@ acpi_status acpi_write_bit_register(u32 register_id, u32 value)
-
- unlock_and_exit:
-
-- acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);
-+ raw_spin_unlock_irqrestore(acpi_gbl_hardware_lock, lock_flags);
- return_ACPI_STATUS(status);
- }
-
-diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c
-index 1507337..357e7ca 100644
---- a/drivers/acpi/acpica/utmutex.c
-+++ b/drivers/acpi/acpica/utmutex.c
-@@ -88,7 +88,7 @@ acpi_status acpi_ut_mutex_initialize(void)
- return_ACPI_STATUS (status);
- }
-
-- status = acpi_os_create_lock (&acpi_gbl_hardware_lock);
-+ status = acpi_os_create_raw_lock (&acpi_gbl_hardware_lock);
- if (ACPI_FAILURE (status)) {
- return_ACPI_STATUS (status);
- }
-@@ -145,7 +145,7 @@ void acpi_ut_mutex_terminate(void)
- /* Delete the spinlocks */
-
- acpi_os_delete_lock(acpi_gbl_gpe_lock);
-- acpi_os_delete_lock(acpi_gbl_hardware_lock);
-+ acpi_os_delete_raw_lock(acpi_gbl_hardware_lock);
- acpi_os_delete_lock(acpi_gbl_reference_count_lock);
-
- /* Delete the reader/writer lock */
-diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
-index 051b615..7ad293b 100644
---- a/drivers/ata/libata-sff.c
-+++ b/drivers/ata/libata-sff.c
-@@ -678,9 +678,9 @@ unsigned int ata_sff_data_xfer_noirq(struct ata_device *dev, unsigned char *buf,
- unsigned long flags;
- unsigned int consumed;
-
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- consumed = ata_sff_data_xfer32(dev, buf, buflen, rw);
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
-
- return consumed;
- }
-@@ -719,7 +719,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)
- unsigned long flags;
-
- /* FIXME: use a bounce buffer */
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- buf = kmap_atomic(page);
-
- /* do the actual data transfer */
-@@ -727,7 +727,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)
- do_write);
-
- kunmap_atomic(buf);
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- } else {
- buf = page_address(page);
- ap->ops->sff_data_xfer(qc->dev, buf + offset, qc->sect_size,
-@@ -864,7 +864,7 @@ next_sg:
- unsigned long flags;
-
- /* FIXME: use bounce buffer */
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- buf = kmap_atomic(page);
-
- /* do the actual data transfer */
-@@ -872,7 +872,7 @@ next_sg:
- count, rw);
-
- kunmap_atomic(buf);
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- } else {
- buf = page_address(page);
- consumed = ap->ops->sff_data_xfer(dev, buf + offset,
-diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
-index 04365b1..d16c876 100644
---- a/drivers/block/zram/zram_drv.c
-+++ b/drivers/block/zram/zram_drv.c
-@@ -519,6 +519,8 @@ static struct zram_meta *zram_meta_alloc(char *pool_name, u64 disksize)
- goto out_error;
- }
-
-+ zram_meta_init_table_locks(meta, disksize);
-+
- return meta;
-
- out_error:
-@@ -567,12 +569,12 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index)
- unsigned long handle;
- unsigned int size;
-
-- bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value);
-+ zram_lock_table(&meta->table[index]);
- handle = meta->table[index].handle;
- size = zram_get_obj_size(meta, index);
-
- if (!handle || zram_test_flag(meta, index, ZRAM_ZERO)) {
-- bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value);
-+ zram_unlock_table(&meta->table[index]);
- clear_page(mem);
- return 0;
- }
-@@ -587,7 +589,7 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index)
- zcomp_stream_put(zram->comp);
- }
- zs_unmap_object(meta->mem_pool, handle);
-- bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value);
-+ zram_unlock_table(&meta->table[index]);
-
- /* Should NEVER happen. Return bio error if it does. */
- if (unlikely(ret)) {
-@@ -607,14 +609,14 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
- struct zram_meta *meta = zram->meta;
- page = bvec->bv_page;
-
-- bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value);
-+ zram_lock_table(&meta->table[index]);
- if (unlikely(!meta->table[index].handle) ||
- zram_test_flag(meta, index, ZRAM_ZERO)) {
-- bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value);
-+ zram_unlock_table(&meta->table[index]);
- handle_zero_page(bvec);
- return 0;
- }
-- bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value);
-+ zram_unlock_table(&meta->table[index]);
-
- if (is_partial_io(bvec))
- /* Use a temporary buffer to decompress the page */
-@@ -691,10 +693,10 @@ compress_again:
- if (user_mem)
- kunmap_atomic(user_mem);
- /* Free memory associated with this sector now. */
-- bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value);
-+ zram_lock_table(&meta->table[index]);
- zram_free_page(zram, index);
- zram_set_flag(meta, index, ZRAM_ZERO);
-- bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value);
-+ zram_unlock_table(&meta->table[index]);
-
- atomic64_inc(&zram->stats.zero_pages);
- ret = 0;
-@@ -785,12 +787,12 @@ compress_again:
- * Free memory associated with this sector
- * before overwriting unused sectors.
- */
-- bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value);
-+ zram_lock_table(&meta->table[index]);
- zram_free_page(zram, index);
-
- meta->table[index].handle = handle;
- zram_set_obj_size(meta, index, clen);
-- bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value);
-+ zram_unlock_table(&meta->table[index]);
-
- /* Update stats */
- atomic64_add(clen, &zram->stats.compr_data_size);
-@@ -833,9 +835,9 @@ static void zram_bio_discard(struct zram *zram, u32 index,
- }
-
- while (n >= PAGE_SIZE) {
-- bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value);
-+ zram_lock_table(&meta->table[index]);
- zram_free_page(zram, index);
-- bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value);
-+ zram_unlock_table(&meta->table[index]);
- atomic64_inc(&zram->stats.notify_free);
- index++;
- n -= PAGE_SIZE;
-@@ -964,9 +966,9 @@ static void zram_slot_free_notify(struct block_device *bdev,
- zram = bdev->bd_disk->private_data;
- meta = zram->meta;
-
-- bit_spin_lock(ZRAM_ACCESS, &meta->table[index].value);
-+ zram_lock_table(&meta->table[index]);
- zram_free_page(zram, index);
-- bit_spin_unlock(ZRAM_ACCESS, &meta->table[index].value);
-+ zram_unlock_table(&meta->table[index]);
- atomic64_inc(&zram->stats.notify_free);
- }
-
-diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h
-index 74fcf10..fd4020c 100644
---- a/drivers/block/zram/zram_drv.h
-+++ b/drivers/block/zram/zram_drv.h
-@@ -73,6 +73,9 @@ enum zram_pageflags {
- struct zram_table_entry {
- unsigned long handle;
- unsigned long value;
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ spinlock_t lock;
-+#endif
- };
-
- struct zram_stats {
-@@ -120,4 +123,42 @@ struct zram {
- */
- bool claim; /* Protected by bdev->bd_mutex */
- };
-+
-+#ifndef CONFIG_PREEMPT_RT_BASE
-+static inline void zram_lock_table(struct zram_table_entry *table)
-+{
-+ bit_spin_lock(ZRAM_ACCESS, &table->value);
-+}
-+
-+static inline void zram_unlock_table(struct zram_table_entry *table)
-+{
-+ bit_spin_unlock(ZRAM_ACCESS, &table->value);
-+}
-+
-+static inline void zram_meta_init_table_locks(struct zram_meta *meta, u64 disksize) { }
-+#else /* CONFIG_PREEMPT_RT_BASE */
-+static inline void zram_lock_table(struct zram_table_entry *table)
-+{
-+ spin_lock(&table->lock);
-+ __set_bit(ZRAM_ACCESS, &table->value);
-+}
-+
-+static inline void zram_unlock_table(struct zram_table_entry *table)
-+{
-+ __clear_bit(ZRAM_ACCESS, &table->value);
-+ spin_unlock(&table->lock);
-+}
-+
-+static inline void zram_meta_init_table_locks(struct zram_meta *meta, u64 disksize)
-+{
-+ size_t num_pages = disksize >> PAGE_SHIFT;
-+ size_t index;
-+
-+ for (index = 0; index < num_pages; index++) {
-+ spinlock_t *lock = &meta->table[index].lock;
-+ spin_lock_init(lock);
-+ }
-+}
-+#endif /* CONFIG_PREEMPT_RT_BASE */
-+
- #endif
-diff --git a/drivers/char/random.c b/drivers/char/random.c
-index 3efb3bf..c894d2e 100644
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -1028,8 +1028,6 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num)
- } sample;
- long delta, delta2, delta3;
-
-- preempt_disable();
--
- sample.jiffies = jiffies;
- sample.cycles = random_get_entropy();
- sample.num = num;
-@@ -1070,7 +1068,6 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num)
- */
- credit_entropy_bits(r, min_t(int, fls(delta>>1), 11));
- }
-- preempt_enable();
- }
-
- void add_input_randomness(unsigned int type, unsigned int code,
-@@ -1123,28 +1120,27 @@ static __u32 get_reg(struct fast_pool *f, struct pt_regs *regs)
- return *(ptr + f->reg_idx++);
- }
-
--void add_interrupt_randomness(int irq, int irq_flags)
-+void add_interrupt_randomness(int irq, int irq_flags, __u64 ip)
- {
- struct entropy_store *r;
- struct fast_pool *fast_pool = this_cpu_ptr(&irq_randomness);
-- struct pt_regs *regs = get_irq_regs();
- unsigned long now = jiffies;
- cycles_t cycles = random_get_entropy();
- __u32 c_high, j_high;
-- __u64 ip;
- unsigned long seed;
- int credit = 0;
-
- if (cycles == 0)
-- cycles = get_reg(fast_pool, regs);
-+ cycles = get_reg(fast_pool, NULL);
- c_high = (sizeof(cycles) > 4) ? cycles >> 32 : 0;
- j_high = (sizeof(now) > 4) ? now >> 32 : 0;
- fast_pool->pool[0] ^= cycles ^ j_high ^ irq;
- fast_pool->pool[1] ^= now ^ c_high;
-- ip = regs ? instruction_pointer(regs) : _RET_IP_;
-+ if (!ip)
-+ ip = _RET_IP_;
- fast_pool->pool[2] ^= ip;
- fast_pool->pool[3] ^= (sizeof(ip) > 4) ? ip >> 32 :
-- get_reg(fast_pool, regs);
-+ get_reg(fast_pool, NULL);
-
- fast_mix(fast_pool);
- add_interrupt_bench(cycles);
-diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c
-index 4da2af9..5b6f57f 100644
---- a/drivers/clocksource/tcb_clksrc.c
-+++ b/drivers/clocksource/tcb_clksrc.c
-@@ -23,8 +23,7 @@
- * this 32 bit free-running counter. the second channel is not used.
- *
- * - The third channel may be used to provide a 16-bit clockevent
-- * source, used in either periodic or oneshot mode. This runs
-- * at 32 KiHZ, and can handle delays of up to two seconds.
-+ * source, used in either periodic or oneshot mode.
- *
- * A boot clocksource and clockevent source are also currently needed,
- * unless the relevant platforms (ARM/AT91, AVR32/AT32) are changed so
-@@ -74,6 +73,8 @@ static struct clocksource clksrc = {
- struct tc_clkevt_device {
- struct clock_event_device clkevt;
- struct clk *clk;
-+ bool clk_enabled;
-+ u32 freq;
- void __iomem *regs;
- };
-
-@@ -82,15 +83,26 @@ static struct tc_clkevt_device *to_tc_clkevt(struct clock_event_device *clkevt)
- return container_of(clkevt, struct tc_clkevt_device, clkevt);
- }
-
--/* For now, we always use the 32K clock ... this optimizes for NO_HZ,
-- * because using one of the divided clocks would usually mean the
-- * tick rate can never be less than several dozen Hz (vs 0.5 Hz).
-- *
-- * A divided clock could be good for high resolution timers, since
-- * 30.5 usec resolution can seem "low".
-- */
- static u32 timer_clock;
-
-+static void tc_clk_disable(struct clock_event_device *d)
-+{
-+ struct tc_clkevt_device *tcd = to_tc_clkevt(d);
-+
-+ clk_disable(tcd->clk);
-+ tcd->clk_enabled = false;
-+}
-+
-+static void tc_clk_enable(struct clock_event_device *d)
-+{
-+ struct tc_clkevt_device *tcd = to_tc_clkevt(d);
-+
-+ if (tcd->clk_enabled)
-+ return;
-+ clk_enable(tcd->clk);
-+ tcd->clk_enabled = true;
-+}
-+
- static int tc_shutdown(struct clock_event_device *d)
- {
- struct tc_clkevt_device *tcd = to_tc_clkevt(d);
-@@ -98,8 +110,14 @@ static int tc_shutdown(struct clock_event_device *d)
-
- __raw_writel(0xff, regs + ATMEL_TC_REG(2, IDR));
- __raw_writel(ATMEL_TC_CLKDIS, regs + ATMEL_TC_REG(2, CCR));
-+ return 0;
-+}
-+
-+static int tc_shutdown_clk_off(struct clock_event_device *d)
-+{
-+ tc_shutdown(d);
- if (!clockevent_state_detached(d))
-- clk_disable(tcd->clk);
-+ tc_clk_disable(d);
-
- return 0;
- }
-@@ -112,9 +130,9 @@ static int tc_set_oneshot(struct clock_event_device *d)
- if (clockevent_state_oneshot(d) || clockevent_state_periodic(d))
- tc_shutdown(d);
-
-- clk_enable(tcd->clk);
-+ tc_clk_enable(d);
-
-- /* slow clock, count up to RC, then irq and stop */
-+ /* count up to RC, then irq and stop */
- __raw_writel(timer_clock | ATMEL_TC_CPCSTOP | ATMEL_TC_WAVE |
- ATMEL_TC_WAVESEL_UP_AUTO, regs + ATMEL_TC_REG(2, CMR));
- __raw_writel(ATMEL_TC_CPCS, regs + ATMEL_TC_REG(2, IER));
-@@ -134,12 +152,12 @@ static int tc_set_periodic(struct clock_event_device *d)
- /* By not making the gentime core emulate periodic mode on top
- * of oneshot, we get lower overhead and improved accuracy.
- */
-- clk_enable(tcd->clk);
-+ tc_clk_enable(d);
-
-- /* slow clock, count up to RC, then irq and restart */
-+ /* count up to RC, then irq and restart */
- __raw_writel(timer_clock | ATMEL_TC_WAVE | ATMEL_TC_WAVESEL_UP_AUTO,
- regs + ATMEL_TC_REG(2, CMR));
-- __raw_writel((32768 + HZ / 2) / HZ, tcaddr + ATMEL_TC_REG(2, RC));
-+ __raw_writel((tcd->freq + HZ / 2) / HZ, tcaddr + ATMEL_TC_REG(2, RC));
-
- /* Enable clock and interrupts on RC compare */
- __raw_writel(ATMEL_TC_CPCS, regs + ATMEL_TC_REG(2, IER));
-@@ -166,9 +184,13 @@ static struct tc_clkevt_device clkevt = {
- .features = CLOCK_EVT_FEAT_PERIODIC |
- CLOCK_EVT_FEAT_ONESHOT,
- /* Should be lower than at91rm9200's system timer */
-+#ifdef CONFIG_ATMEL_TCB_CLKSRC_USE_SLOW_CLOCK
- .rating = 125,
-+#else
-+ .rating = 200,
-+#endif
- .set_next_event = tc_next_event,
-- .set_state_shutdown = tc_shutdown,
-+ .set_state_shutdown = tc_shutdown_clk_off,
- .set_state_periodic = tc_set_periodic,
- .set_state_oneshot = tc_set_oneshot,
- },
-@@ -188,8 +210,9 @@ static irqreturn_t ch2_irq(int irq, void *handle)
- return IRQ_NONE;
- }
-
--static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
-+static int __init setup_clkevents(struct atmel_tc *tc, int divisor_idx)
- {
-+ unsigned divisor = atmel_tc_divisors[divisor_idx];
- int ret;
- struct clk *t2_clk = tc->clk[2];
- int irq = tc->irq[2];
-@@ -210,7 +233,11 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
- clkevt.regs = tc->regs;
- clkevt.clk = t2_clk;
-
-- timer_clock = clk32k_divisor_idx;
-+ timer_clock = divisor_idx;
-+ if (!divisor)
-+ clkevt.freq = 32768;
-+ else
-+ clkevt.freq = clk_get_rate(t2_clk) / divisor;
-
- clkevt.clkevt.cpumask = cpumask_of(0);
-
-@@ -221,7 +248,7 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
- return ret;
- }
-
-- clockevents_config_and_register(&clkevt.clkevt, 32768, 1, 0xffff);
-+ clockevents_config_and_register(&clkevt.clkevt, clkevt.freq, 1, 0xffff);
-
- return ret;
- }
-@@ -358,7 +385,11 @@ static int __init tcb_clksrc_init(void)
- goto err_disable_t1;
-
- /* channel 2: periodic and oneshot timer support */
-+#ifdef CONFIG_ATMEL_TCB_CLKSRC_USE_SLOW_CLOCK
- ret = setup_clkevents(tc, clk32k_divisor_idx);
-+#else
-+ ret = setup_clkevents(tc, best_divisor_idx);
-+#endif
- if (ret)
- goto err_unregister_clksrc;
-
-diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c
-index 7f0f5b2..1553f19 100644
---- a/drivers/clocksource/timer-atmel-pit.c
-+++ b/drivers/clocksource/timer-atmel-pit.c
-@@ -46,6 +46,7 @@ struct pit_data {
- u32 cycle;
- u32 cnt;
- unsigned int irq;
-+ bool irq_requested;
- struct clk *mck;
- };
-
-@@ -96,15 +97,29 @@ static int pit_clkevt_shutdown(struct clock_event_device *dev)
-
- /* disable irq, leaving the clocksource active */
- pit_write(data->base, AT91_PIT_MR, (data->cycle - 1) | AT91_PIT_PITEN);
-+ if (data->irq_requested) {
-+ free_irq(data->irq, data);
-+ data->irq_requested = false;
-+ }
- return 0;
- }
-
-+static irqreturn_t at91sam926x_pit_interrupt(int irq, void *dev_id);
- /*
- * Clockevent device: interrupts every 1/HZ (== pit_cycles * MCK/16)
- */
- static int pit_clkevt_set_periodic(struct clock_event_device *dev)
- {
- struct pit_data *data = clkevt_to_pit_data(dev);
-+ int ret;
-+
-+ ret = request_irq(data->irq, at91sam926x_pit_interrupt,
-+ IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
-+ "at91_tick", data);
-+ if (ret)
-+ panic(pr_fmt("Unable to setup IRQ\n"));
-+
-+ data->irq_requested = true;
-
- /* update clocksource counter */
- data->cnt += data->cycle * PIT_PICNT(pit_read(data->base, AT91_PIT_PIVR));
-@@ -211,15 +226,6 @@ static int __init at91sam926x_pit_common_init(struct pit_data *data)
- return ret;
- }
-
-- /* Set up irq handler */
-- ret = request_irq(data->irq, at91sam926x_pit_interrupt,
-- IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
-- "at91_tick", data);
-- if (ret) {
-- pr_err("Unable to setup IRQ\n");
-- return ret;
-- }
--
- /* Set up and register clockevents */
- data->clkevt.name = "pit";
- data->clkevt.features = CLOCK_EVT_FEAT_PERIODIC;
-diff --git a/drivers/clocksource/timer-atmel-st.c b/drivers/clocksource/timer-atmel-st.c
-index e90ab5b..9e12408 100644
---- a/drivers/clocksource/timer-atmel-st.c
-+++ b/drivers/clocksource/timer-atmel-st.c
-@@ -115,18 +115,29 @@ static void clkdev32k_disable_and_flush_irq(void)
- last_crtr = read_CRTR();
- }
-
-+static int atmel_st_irq;
-+
- static int clkevt32k_shutdown(struct clock_event_device *evt)
- {
- clkdev32k_disable_and_flush_irq();
- irqmask = 0;
- regmap_write(regmap_st, AT91_ST_IER, irqmask);
-+ free_irq(atmel_st_irq, regmap_st);
- return 0;
- }
-
- static int clkevt32k_set_oneshot(struct clock_event_device *dev)
- {
-+ int ret;
-+
- clkdev32k_disable_and_flush_irq();
-
-+ ret = request_irq(atmel_st_irq, at91rm9200_timer_interrupt,
-+ IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
-+ "at91_tick", regmap_st);
-+ if (ret)
-+ panic(pr_fmt("Unable to setup IRQ\n"));
-+
- /*
- * ALM for oneshot irqs, set by next_event()
- * before 32 seconds have passed.
-@@ -139,8 +150,16 @@ static int clkevt32k_set_oneshot(struct clock_event_device *dev)
-
- static int clkevt32k_set_periodic(struct clock_event_device *dev)
- {
-+ int ret;
-+
- clkdev32k_disable_and_flush_irq();
-
-+ ret = request_irq(atmel_st_irq, at91rm9200_timer_interrupt,
-+ IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
-+ "at91_tick", regmap_st);
-+ if (ret)
-+ panic(pr_fmt("Unable to setup IRQ\n"));
-+
- /* PIT for periodic irqs; fixed rate of 1/HZ */
- irqmask = AT91_ST_PITS;
- regmap_write(regmap_st, AT91_ST_PIMR, timer_latch);
-@@ -198,7 +217,7 @@ static int __init atmel_st_timer_init(struct device_node *node)
- {
- struct clk *sclk;
- unsigned int sclk_rate, val;
-- int irq, ret;
-+ int ret;
-
- regmap_st = syscon_node_to_regmap(node);
- if (IS_ERR(regmap_st)) {
-@@ -212,21 +231,12 @@ static int __init atmel_st_timer_init(struct device_node *node)
- regmap_read(regmap_st, AT91_ST_SR, &val);
-
- /* Get the interrupts property */
-- irq = irq_of_parse_and_map(node, 0);
-- if (!irq) {
-+ atmel_st_irq = irq_of_parse_and_map(node, 0);
-+ if (!atmel_st_irq) {
- pr_err("Unable to get IRQ from DT\n");
- return -EINVAL;
- }
-
-- /* Make IRQs happen for the system timer */
-- ret = request_irq(irq, at91rm9200_timer_interrupt,
-- IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
-- "at91_tick", regmap_st);
-- if (ret) {
-- pr_err("Unable to setup IRQ\n");
-- return ret;
-- }
--
- sclk = of_clk_get(node, 0);
- if (IS_ERR(sclk)) {
- pr_err("Unable to get slow clock\n");
-diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
-index adbd1de..1fac507 100644
---- a/drivers/cpufreq/Kconfig.x86
-+++ b/drivers/cpufreq/Kconfig.x86
-@@ -124,7 +124,7 @@ config X86_POWERNOW_K7_ACPI
-
- config X86_POWERNOW_K8
- tristate "AMD Opteron/Athlon64 PowerNow!"
-- depends on ACPI && ACPI_PROCESSOR && X86_ACPI_CPUFREQ
-+ depends on ACPI && ACPI_PROCESSOR && X86_ACPI_CPUFREQ && !PREEMPT_RT_BASE
- help
- This adds the CPUFreq driver for K8/early Opteron/Athlon64 processors.
- Support for K10 and newer processors is now in acpi-cpufreq.
-diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-index b35e5b6..ce60807 100644
---- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-@@ -1302,7 +1302,9 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params,
- if (ret)
- return ret;
-
-+#ifndef CONFIG_PREEMPT_RT_BASE
- trace_i915_gem_ring_dispatch(params->request, params->dispatch_flags);
-+#endif
-
- i915_gem_execbuffer_move_to_active(vmas, params->request);
-
-diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c
-index 6f10b42..dd3a9a6 100644
---- a/drivers/gpu/drm/i915/i915_gem_shrinker.c
-+++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c
-@@ -40,7 +40,7 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
- if (!mutex_is_locked(mutex))
- return false;
-
--#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER)
-+#if (defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER)) && !defined(CONFIG_PREEMPT_RT_BASE)
- return mutex->owner == task;
- #else
- /* Since UP may be pre-empted, we cannot assume that we own the lock */
-diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 1c2aec3..1d85c0c 100644
---- a/drivers/gpu/drm/i915/i915_irq.c
-+++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -812,6 +812,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
- spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
-
- /* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */
-+ preempt_disable_rt();
-
- /* Get optional system timestamp before query. */
- if (stime)
-@@ -863,6 +864,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
- *etime = ktime_get();
-
- /* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */
-+ preempt_enable_rt();
-
- spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
-
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 175595f..d2439b8e 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -11613,7 +11613,7 @@ void intel_check_page_flip(struct drm_i915_private *dev_priv, int pipe)
- struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
- struct intel_flip_work *work;
-
-- WARN_ON(!in_interrupt());
-+ WARN_ON_NONRT(!in_interrupt());
-
- if (crtc == NULL)
- return;
-diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
-index 7c08e4f..7c6a239 100644
---- a/drivers/gpu/drm/i915/intel_sprite.c
-+++ b/drivers/gpu/drm/i915/intel_sprite.c
-@@ -38,6 +38,7 @@
- #include "intel_drv.h"
- #include <drm/i915_drm.h>
- #include "i915_drv.h"
-+#include <linux/locallock.h>
-
- static bool
- format_is_yuv(uint32_t format)
-@@ -64,6 +65,8 @@ int intel_usecs_to_scanlines(const struct drm_display_mode *adjusted_mode,
- 1000 * adjusted_mode->crtc_htotal);
- }
-
-+static DEFINE_LOCAL_IRQ_LOCK(pipe_update_lock);
-+
- /**
- * intel_pipe_update_start() - start update of a set of display registers
- * @crtc: the crtc of which the registers are going to be updated
-@@ -94,7 +97,7 @@ void intel_pipe_update_start(struct intel_crtc *crtc)
- min = vblank_start - intel_usecs_to_scanlines(adjusted_mode, 100);
- max = vblank_start - 1;
-
-- local_irq_disable();
-+ local_lock_irq(pipe_update_lock);
-
- if (min <= 0 || max <= 0)
- return;
-@@ -124,11 +127,11 @@ void intel_pipe_update_start(struct intel_crtc *crtc)
- break;
- }
-
-- local_irq_enable();
-+ local_unlock_irq(pipe_update_lock);
-
- timeout = schedule_timeout(timeout);
-
-- local_irq_disable();
-+ local_lock_irq(pipe_update_lock);
- }
-
- finish_wait(wq, &wait);
-@@ -180,7 +183,7 @@ void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work
- crtc->base.state->event = NULL;
- }
-
-- local_irq_enable();
-+ local_unlock_irq(pipe_update_lock);
-
- if (crtc->debug.start_vbl_count &&
- crtc->debug.start_vbl_count != end_vbl_count) {
-diff --git a/drivers/gpu/drm/msm/msm_gem_shrinker.c b/drivers/gpu/drm/msm/msm_gem_shrinker.c
-index 283d284..d01f6ed 100644
---- a/drivers/gpu/drm/msm/msm_gem_shrinker.c
-+++ b/drivers/gpu/drm/msm/msm_gem_shrinker.c
-@@ -23,7 +23,7 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
- if (!mutex_is_locked(mutex))
- return false;
-
--#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_MUTEXES)
-+#if (defined(CONFIG_SMP) || defined(CONFIG_DEBUG_MUTEXES)) && !defined(CONFIG_PREEMPT_RT_BASE)
- return mutex->owner == task;
- #else
- /* Since UP may be pre-empted, we cannot assume that we own the lock */
-diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index c3206fb..6e24231 100644
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -1869,6 +1869,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
- struct radeon_device *rdev = dev->dev_private;
-
- /* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */
-+ preempt_disable_rt();
-
- /* Get optional system timestamp before query. */
- if (stime)
-@@ -1961,6 +1962,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
- *etime = ktime_get();
-
- /* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */
-+ preempt_enable_rt();
-
- /* Decode into vertical and horizontal scanout position. */
- *vpos = position & 0x1fff;
-diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
-index e82f7e1..b57d917 100644
---- a/drivers/hv/vmbus_drv.c
-+++ b/drivers/hv/vmbus_drv.c
-@@ -761,6 +761,8 @@ static void vmbus_isr(void)
- void *page_addr;
- struct hv_message *msg;
- union hv_synic_event_flags *event;
-+ struct pt_regs *regs = get_irq_regs();
-+ u64 ip = regs ? instruction_pointer(regs) : 0;
- bool handled = false;
-
- page_addr = hv_context.synic_event_page[cpu];
-@@ -808,7 +810,7 @@ static void vmbus_isr(void)
- tasklet_schedule(hv_context.msg_dpc[cpu]);
- }
-
-- add_interrupt_randomness(HYPERVISOR_CALLBACK_VECTOR, 0);
-+ add_interrupt_randomness(HYPERVISOR_CALLBACK_VECTOR, 0, ip);
- }
-
-
-diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
-index 36f76e2..394f142f 100644
---- a/drivers/ide/alim15x3.c
-+++ b/drivers/ide/alim15x3.c
-@@ -234,7 +234,7 @@ static int init_chipset_ali15x3(struct pci_dev *dev)
-
- isa_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
-
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
-
- if (m5229_revision < 0xC2) {
- /*
-@@ -325,7 +325,7 @@ out:
- }
- pci_dev_put(north);
- pci_dev_put(isa_dev);
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- return 0;
- }
-
-diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
-index 0ceae5c..c212e85 100644
---- a/drivers/ide/hpt366.c
-+++ b/drivers/ide/hpt366.c
-@@ -1236,7 +1236,7 @@ static int init_dma_hpt366(ide_hwif_t *hwif,
-
- dma_old = inb(base + 2);
-
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
-
- dma_new = dma_old;
- pci_read_config_byte(dev, hwif->channel ? 0x4b : 0x43, &masterdma);
-@@ -1247,7 +1247,7 @@ static int init_dma_hpt366(ide_hwif_t *hwif,
- if (dma_new != dma_old)
- outb(dma_new, base + 2);
-
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
-
- printk(KERN_INFO " %s: BM-DMA at 0x%04lx-0x%04lx\n",
- hwif->name, base, base + 7);
-diff --git a/drivers/ide/ide-io-std.c b/drivers/ide/ide-io-std.c
-index 1976397..4169433 100644
---- a/drivers/ide/ide-io-std.c
-+++ b/drivers/ide/ide-io-std.c
-@@ -175,7 +175,7 @@ void ide_input_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
- unsigned long uninitialized_var(flags);
-
- if ((io_32bit & 2) && !mmio) {
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- ata_vlb_sync(io_ports->nsect_addr);
- }
-
-@@ -186,7 +186,7 @@ void ide_input_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
- insl(data_addr, buf, words);
-
- if ((io_32bit & 2) && !mmio)
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
-
- if (((len + 1) & 3) < 2)
- return;
-@@ -219,7 +219,7 @@ void ide_output_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
- unsigned long uninitialized_var(flags);
-
- if ((io_32bit & 2) && !mmio) {
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- ata_vlb_sync(io_ports->nsect_addr);
- }
-
-@@ -230,7 +230,7 @@ void ide_output_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
- outsl(data_addr, buf, words);
-
- if ((io_32bit & 2) && !mmio)
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
-
- if (((len + 1) & 3) < 2)
- return;
-diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
-index 669ea1e..e12e43e 100644
---- a/drivers/ide/ide-io.c
-+++ b/drivers/ide/ide-io.c
-@@ -659,7 +659,7 @@ void ide_timer_expiry (unsigned long data)
- /* disable_irq_nosync ?? */
- disable_irq(hwif->irq);
- /* local CPU only, as if we were handling an interrupt */
-- local_irq_disable();
-+ local_irq_disable_nort();
- if (hwif->polling) {
- startstop = handler(drive);
- } else if (drive_is_ready(drive)) {
-diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
-index 376f2dc..f014dd1 100644
---- a/drivers/ide/ide-iops.c
-+++ b/drivers/ide/ide-iops.c
-@@ -129,12 +129,12 @@ int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad,
- if ((stat & ATA_BUSY) == 0)
- break;
-
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- *rstat = stat;
- return -EBUSY;
- }
- }
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- }
- /*
- * Allow status to settle, then read it again.
-diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
-index 0b63fac..4ceba37 100644
---- a/drivers/ide/ide-probe.c
-+++ b/drivers/ide/ide-probe.c
-@@ -196,10 +196,10 @@ static void do_identify(ide_drive_t *drive, u8 cmd, u16 *id)
- int bswap = 1;
-
- /* local CPU only; some systems need this */
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- /* read 512 bytes of id info */
- hwif->tp_ops->input_data(drive, NULL, id, SECTOR_SIZE);
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
-
- drive->dev_flags |= IDE_DFLAG_ID_READ;
- #ifdef DEBUG
-diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
-index a716693..be0568c 100644
---- a/drivers/ide/ide-taskfile.c
-+++ b/drivers/ide/ide-taskfile.c
-@@ -250,7 +250,7 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
-
- page_is_high = PageHighMem(page);
- if (page_is_high)
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
-
- buf = kmap_atomic(page) + offset;
-
-@@ -271,7 +271,7 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
- kunmap_atomic(buf);
-
- if (page_is_high)
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
-
- len -= nr_bytes;
- }
-@@ -414,7 +414,7 @@ static ide_startstop_t pre_task_out_intr(ide_drive_t *drive,
- }
-
- if ((drive->dev_flags & IDE_DFLAG_UNMASK) == 0)
-- local_irq_disable();
-+ local_irq_disable_nort();
-
- ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE);
-
-diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
-index d3394b6..506bfba 100644
---- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
-+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
-@@ -897,7 +897,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
-
- ipoib_dbg_mcast(priv, "restarting multicast task\n");
-
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- netif_addr_lock(dev);
- spin_lock(&priv->lock);
-
-@@ -979,7 +979,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
-
- spin_unlock(&priv->lock);
- netif_addr_unlock(dev);
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
-
- /*
- * make sure the in-flight joins have finished before we attempt
-diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
-index 4a2a9e3..e970d9a 100644
---- a/drivers/input/gameport/gameport.c
-+++ b/drivers/input/gameport/gameport.c
-@@ -91,13 +91,13 @@ static int gameport_measure_speed(struct gameport *gameport)
- tx = ~0;
-
- for (i = 0; i < 50; i++) {
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- t1 = ktime_get_ns();
- for (t = 0; t < 50; t++)
- gameport_read(gameport);
- t2 = ktime_get_ns();
- t3 = ktime_get_ns();
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- udelay(i * 10);
- t = (t2 - t1) - (t3 - t2);
- if (t < tx)
-@@ -124,12 +124,12 @@ static int old_gameport_measure_speed(struct gameport *gameport)
- tx = 1 << 30;
-
- for(i = 0; i < 50; i++) {
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- GET_TIME(t1);
- for (t = 0; t < 50; t++) gameport_read(gameport);
- GET_TIME(t2);
- GET_TIME(t3);
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- udelay(i * 10);
- if ((t = DELTA(t2,t1) - DELTA(t3,t2)) < tx) tx = t;
- }
-@@ -148,11 +148,11 @@ static int old_gameport_measure_speed(struct gameport *gameport)
- tx = 1 << 30;
-
- for(i = 0; i < 50; i++) {
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- t1 = rdtsc();
- for (t = 0; t < 50; t++) gameport_read(gameport);
- t2 = rdtsc();
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- udelay(i * 10);
- if (t2 - t1 < tx) tx = t2 - t1;
- }
-diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
-index 96de97a..a6ec875 100644
---- a/drivers/iommu/amd_iommu.c
-+++ b/drivers/iommu/amd_iommu.c
-@@ -1832,10 +1832,10 @@ static int __attach_device(struct iommu_dev_data *dev_data,
- int ret;
-
- /*
-- * Must be called with IRQs disabled. Warn here to detect early
-- * when its not.
-+ * Must be called with IRQs disabled on a non RT kernel. Warn here to
-+ * detect early when its not.
- */
-- WARN_ON(!irqs_disabled());
-+ WARN_ON_NONRT(!irqs_disabled());
-
- /* lock domain */
- spin_lock(&domain->lock);
-@@ -2003,10 +2003,10 @@ static void __detach_device(struct iommu_dev_data *dev_data)
- struct protection_domain *domain;
-
- /*
-- * Must be called with IRQs disabled. Warn here to detect early
-- * when its not.
-+ * Must be called with IRQs disabled on a non RT kernel. Warn here to
-+ * detect early when its not.
- */
-- WARN_ON(!irqs_disabled());
-+ WARN_ON_NONRT(!irqs_disabled());
-
- if (WARN_ON(!dev_data->domain))
- return;
-diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
-index ebb5bf3..598f5df 100644
---- a/drivers/iommu/intel-iommu.c
-+++ b/drivers/iommu/intel-iommu.c
-@@ -479,7 +479,7 @@ struct deferred_flush_data {
- struct deferred_flush_table *tables;
- };
-
--DEFINE_PER_CPU(struct deferred_flush_data, deferred_flush);
-+static DEFINE_PER_CPU(struct deferred_flush_data, deferred_flush);
-
- /* bitmap for indexing intel_iommus */
- static int g_num_of_iommus;
-@@ -3626,10 +3626,8 @@ static void add_unmap(struct dmar_domain *dom, unsigned long iova_pfn,
- struct intel_iommu *iommu;
- struct deferred_flush_entry *entry;
- struct deferred_flush_data *flush_data;
-- unsigned int cpuid;
-
-- cpuid = get_cpu();
-- flush_data = per_cpu_ptr(&deferred_flush, cpuid);
-+ flush_data = raw_cpu_ptr(&deferred_flush);
-
- /* Flush all CPUs' entries to avoid deferring too much. If
- * this becomes a bottleneck, can just flush us, and rely on
-@@ -3662,8 +3660,6 @@ static void add_unmap(struct dmar_domain *dom, unsigned long iova_pfn,
- }
- flush_data->size++;
- spin_unlock_irqrestore(&flush_data->lock, flags);
--
-- put_cpu();
- }
-
- static void intel_unmap(struct device *dev, dma_addr_t dev_addr, size_t size)
-diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c
-index e23001b..359d5d1 100644
---- a/drivers/iommu/iova.c
-+++ b/drivers/iommu/iova.c
-@@ -22,6 +22,7 @@
- #include <linux/slab.h>
- #include <linux/smp.h>
- #include <linux/bitops.h>
-+#include <linux/cpu.h>
-
- static bool iova_rcache_insert(struct iova_domain *iovad,
- unsigned long pfn,
-@@ -420,10 +421,8 @@ retry:
-
- /* Try replenishing IOVAs by flushing rcache. */
- flushed_rcache = true;
-- preempt_disable();
- for_each_online_cpu(cpu)
- free_cpu_cached_iovas(cpu, iovad);
-- preempt_enable();
- goto retry;
- }
-
-@@ -751,7 +750,7 @@ static bool __iova_rcache_insert(struct iova_domain *iovad,
- bool can_insert = false;
- unsigned long flags;
-
-- cpu_rcache = get_cpu_ptr(rcache->cpu_rcaches);
-+ cpu_rcache = raw_cpu_ptr(rcache->cpu_rcaches);
- spin_lock_irqsave(&cpu_rcache->lock, flags);
-
- if (!iova_magazine_full(cpu_rcache->loaded)) {
-@@ -781,7 +780,6 @@ static bool __iova_rcache_insert(struct iova_domain *iovad,
- iova_magazine_push(cpu_rcache->loaded, iova_pfn);
-
- spin_unlock_irqrestore(&cpu_rcache->lock, flags);
-- put_cpu_ptr(rcache->cpu_rcaches);
-
- if (mag_to_free) {
- iova_magazine_free_pfns(mag_to_free, iovad);
-@@ -815,7 +813,7 @@ static unsigned long __iova_rcache_get(struct iova_rcache *rcache,
- bool has_pfn = false;
- unsigned long flags;
-
-- cpu_rcache = get_cpu_ptr(rcache->cpu_rcaches);
-+ cpu_rcache = raw_cpu_ptr(rcache->cpu_rcaches);
- spin_lock_irqsave(&cpu_rcache->lock, flags);
-
- if (!iova_magazine_empty(cpu_rcache->loaded)) {
-@@ -837,7 +835,6 @@ static unsigned long __iova_rcache_get(struct iova_rcache *rcache,
- iova_pfn = iova_magazine_pop(cpu_rcache->loaded, limit_pfn);
-
- spin_unlock_irqrestore(&cpu_rcache->lock, flags);
-- put_cpu_ptr(rcache->cpu_rcaches);
-
- return iova_pfn;
- }
-diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
-index 3f9ddb9..09da5b6 100644
---- a/drivers/leds/trigger/Kconfig
-+++ b/drivers/leds/trigger/Kconfig
-@@ -69,7 +69,7 @@ config LEDS_TRIGGER_BACKLIGHT
-
- config LEDS_TRIGGER_CPU
- bool "LED CPU Trigger"
-- depends on LEDS_TRIGGERS
-+ depends on LEDS_TRIGGERS && !PREEMPT_RT_BASE
- help
- This allows LEDs to be controlled by active CPUs. This shows
- the active CPUs across an array of LEDs so you can see which
-diff --git a/drivers/md/bcache/Kconfig b/drivers/md/bcache/Kconfig
-index 4d20088..98b64ed 100644
---- a/drivers/md/bcache/Kconfig
-+++ b/drivers/md/bcache/Kconfig
-@@ -1,6 +1,7 @@
-
- config BCACHE
- tristate "Block device as cache"
-+ depends on !PREEMPT_RT_FULL
- ---help---
- Allows a block device to be used as cache for other devices; uses
- a btree for indexing and the layout is optimized for SSDs.
-diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c
-index 1ca7463..ce512e6 100644
---- a/drivers/md/dm-rq.c
-+++ b/drivers/md/dm-rq.c
-@@ -802,7 +802,7 @@ static void dm_old_request_fn(struct request_queue *q)
- /* Establish tio->ti before queuing work (map_tio_request) */
- tio->ti = ti;
- queue_kthread_work(&md->kworker, &tio->work);
-- BUG_ON(!irqs_disabled());
-+ BUG_ON_NONRT(!irqs_disabled());
- }
- }
-
-diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
-index ee7fc37..ae59c9e 100644
---- a/drivers/md/raid5.c
-+++ b/drivers/md/raid5.c
-@@ -1928,8 +1928,9 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request)
- struct raid5_percpu *percpu;
- unsigned long cpu;
-
-- cpu = get_cpu();
-+ cpu = get_cpu_light();
- percpu = per_cpu_ptr(conf->percpu, cpu);
-+ spin_lock(&percpu->lock);
- if (test_bit(STRIPE_OP_BIOFILL, &ops_request)) {
- ops_run_biofill(sh);
- overlap_clear++;
-@@ -1985,7 +1986,8 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request)
- if (test_and_clear_bit(R5_Overlap, &dev->flags))
- wake_up(&sh->raid_conf->wait_for_overlap);
- }
-- put_cpu();
-+ spin_unlock(&percpu->lock);
-+ put_cpu_light();
- }
-
- static struct stripe_head *alloc_stripe(struct kmem_cache *sc, gfp_t gfp,
-@@ -6438,6 +6440,7 @@ static int raid5_alloc_percpu(struct r5conf *conf)
- __func__, cpu);
- break;
- }
-+ spin_lock_init(&per_cpu_ptr(conf->percpu, cpu)->lock);
- }
- put_online_cpus();
-
-diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h
-index 517d4b6..efe9188 100644
---- a/drivers/md/raid5.h
-+++ b/drivers/md/raid5.h
-@@ -504,6 +504,7 @@ struct r5conf {
- int recovery_disabled;
- /* per cpu variables */
- struct raid5_percpu {
-+ spinlock_t lock; /* Protection for -RT */
- struct page *spare_page; /* Used when checking P/Q in raid6 */
- struct flex_array *scribble; /* space for constructing buffer
- * lists and performing address
-diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
-index d002528..9faab40 100644
---- a/drivers/misc/Kconfig
-+++ b/drivers/misc/Kconfig
-@@ -54,6 +54,7 @@ config AD525X_DPOT_SPI
- config ATMEL_TCLIB
- bool "Atmel AT32/AT91 Timer/Counter Library"
- depends on (AVR32 || ARCH_AT91)
-+ default y if PREEMPT_RT_FULL
- help
- Select this if you want a library to allocate the Timer/Counter
- blocks found on many Atmel processors. This facilitates using
-@@ -69,8 +70,7 @@ config ATMEL_TCB_CLKSRC
- are combined to make a single 32-bit timer.
-
- When GENERIC_CLOCKEVENTS is defined, the third timer channel
-- may be used as a clock event device supporting oneshot mode
-- (delays of up to two seconds) based on the 32 KiHz clock.
-+ may be used as a clock event device supporting oneshot mode.
-
- config ATMEL_TCB_CLKSRC_BLOCK
- int
-@@ -84,6 +84,15 @@ config ATMEL_TCB_CLKSRC_BLOCK
- TC can be used for other purposes, such as PWM generation and
- interval timing.
-
-+config ATMEL_TCB_CLKSRC_USE_SLOW_CLOCK
-+ bool "TC Block use 32 KiHz clock"
-+ depends on ATMEL_TCB_CLKSRC
-+ default y if !PREEMPT_RT_FULL
-+ help
-+ Select this to use 32 KiHz base clock rate as TC block clock
-+ source for clock events.
-+
-+
- config DUMMY_IRQ
- tristate "Dummy IRQ handler"
- default n
-@@ -114,6 +123,35 @@ config IBM_ASM
- for information on the specific driver level and support statement
- for your IBM server.
-
-+config HWLAT_DETECTOR
-+ tristate "Testing module to detect hardware-induced latencies"
-+ depends on DEBUG_FS
-+ depends on RING_BUFFER
-+ default m
-+ ---help---
-+ A simple hardware latency detector. Use this module to detect
-+ large latencies introduced by the behavior of the underlying
-+ system firmware external to Linux. We do this using periodic
-+ use of stop_machine to grab all available CPUs and measure
-+ for unexplainable gaps in the CPU timestamp counter(s). By
-+ default, the module is not enabled until the "enable" file
-+ within the "hwlat_detector" debugfs directory is toggled.
-+
-+ This module is often used to detect SMI (System Management
-+ Interrupts) on x86 systems, though is not x86 specific. To
-+ this end, we default to using a sample window of 1 second,
-+ during which we will sample for 0.5 seconds. If an SMI or
-+ similar event occurs during that time, it is recorded
-+ into an 8K samples global ring buffer until retreived.
-+
-+ WARNING: This software should never be enabled (it can be built
-+ but should not be turned on after it is loaded) in a production
-+ environment where high latencies are a concern since the
-+ sampling mechanism actually introduces latencies for
-+ regular tasks while the CPU(s) are being held.
-+
-+ If unsure, say N
-+
- config PHANTOM
- tristate "Sensable PHANToM (PCI)"
- depends on PCI
-diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
-index fb32516..8643df9 100644
---- a/drivers/misc/Makefile
-+++ b/drivers/misc/Makefile
-@@ -38,6 +38,7 @@ obj-$(CONFIG_C2PORT) += c2port/
- obj-$(CONFIG_HMC6352) += hmc6352.o
- obj-y += eeprom/
- obj-y += cb710/
-+obj-$(CONFIG_HWLAT_DETECTOR) += hwlat_detector.o
- obj-$(CONFIG_SPEAR13XX_PCIE_GADGET) += spear13xx_pcie_gadget.o
- obj-$(CONFIG_VMWARE_BALLOON) += vmw_balloon.o
- obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o
-diff --git a/drivers/misc/hwlat_detector.c b/drivers/misc/hwlat_detector.c
-new file mode 100644
-index 0000000..52f5ad5
---- /dev/null
-+++ b/drivers/misc/hwlat_detector.c
-@@ -0,0 +1,1240 @@
-+/*
-+ * hwlat_detector.c - A simple Hardware Latency detector.
-+ *
-+ * Use this module to detect large system latencies induced by the behavior of
-+ * certain underlying system hardware or firmware, independent of Linux itself.
-+ * The code was developed originally to detect the presence of SMIs on Intel
-+ * and AMD systems, although there is no dependency upon x86 herein.
-+ *
-+ * The classical example usage of this module is in detecting the presence of
-+ * SMIs or System Management Interrupts on Intel and AMD systems. An SMI is a
-+ * somewhat special form of hardware interrupt spawned from earlier CPU debug
-+ * modes in which the (BIOS/EFI/etc.) firmware arranges for the South Bridge
-+ * LPC (or other device) to generate a special interrupt under certain
-+ * circumstances, for example, upon expiration of a special SMI timer device,
-+ * due to certain external thermal readings, on certain I/O address accesses,
-+ * and other situations. An SMI hits a special CPU pin, triggers a special
-+ * SMI mode (complete with special memory map), and the OS is unaware.
-+ *
-+ * Although certain hardware-inducing latencies are necessary (for example,
-+ * a modern system often requires an SMI handler for correct thermal control
-+ * and remote management) they can wreak havoc upon any OS-level performance
-+ * guarantees toward low-latency, especially when the OS is not even made
-+ * aware of the presence of these interrupts. For this reason, we need a
-+ * somewhat brute force mechanism to detect these interrupts. In this case,
-+ * we do it by hogging all of the CPU(s) for configurable timer intervals,
-+ * sampling the built-in CPU timer, looking for discontiguous readings.
-+ *
-+ * WARNING: This implementation necessarily introduces latencies. Therefore,
-+ * you should NEVER use this module in a production environment
-+ * requiring any kind of low-latency performance guarantee(s).
-+ *
-+ * Copyright (C) 2008-2009 Jon Masters, Red Hat, Inc. <jcm@redhat.com>
-+ *
-+ * Includes useful feedback from Clark Williams <clark@redhat.com>
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2. This program is licensed "as is" without any
-+ * warranty of any kind, whether express or implied.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/ring_buffer.h>
-+#include <linux/time.h>
-+#include <linux/hrtimer.h>
-+#include <linux/kthread.h>
-+#include <linux/debugfs.h>
-+#include <linux/seq_file.h>
-+#include <linux/uaccess.h>
-+#include <linux/version.h>
-+#include <linux/delay.h>
-+#include <linux/slab.h>
-+#include <linux/trace_clock.h>
-+
-+#define BUF_SIZE_DEFAULT 262144UL /* 8K*(sizeof(entry)) */
-+#define BUF_FLAGS (RB_FL_OVERWRITE) /* no block on full */
-+#define U64STR_SIZE 22 /* 20 digits max */
-+
-+#define VERSION "1.0.0"
-+#define BANNER "hwlat_detector: "
-+#define DRVNAME "hwlat_detector"
-+#define DEFAULT_SAMPLE_WINDOW 1000000 /* 1s */
-+#define DEFAULT_SAMPLE_WIDTH 500000 /* 0.5s */
-+#define DEFAULT_LAT_THRESHOLD 10 /* 10us */
-+
-+/* Module metadata */
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Jon Masters <jcm@redhat.com>");
-+MODULE_DESCRIPTION("A simple hardware latency detector");
-+MODULE_VERSION(VERSION);
-+
-+/* Module parameters */
-+
-+static int debug;
-+static int enabled;
-+static int threshold;
-+
-+module_param(debug, int, 0); /* enable debug */
-+module_param(enabled, int, 0); /* enable detector */
-+module_param(threshold, int, 0); /* latency threshold */
-+
-+/* Buffering and sampling */
-+
-+static struct ring_buffer *ring_buffer; /* sample buffer */
-+static DEFINE_MUTEX(ring_buffer_mutex); /* lock changes */
-+static unsigned long buf_size = BUF_SIZE_DEFAULT;
-+static struct task_struct *kthread; /* sampling thread */
-+
-+/* DebugFS filesystem entries */
-+
-+static struct dentry *debug_dir; /* debugfs directory */
-+static struct dentry *debug_max; /* maximum TSC delta */
-+static struct dentry *debug_count; /* total detect count */
-+static struct dentry *debug_sample_width; /* sample width us */
-+static struct dentry *debug_sample_window; /* sample window us */
-+static struct dentry *debug_sample; /* raw samples us */
-+static struct dentry *debug_threshold; /* threshold us */
-+static struct dentry *debug_enable; /* enable/disable */
-+
-+/* Individual samples and global state */
-+
-+struct sample; /* latency sample */
-+struct data; /* Global state */
-+
-+/* Sampling functions */
-+static int __buffer_add_sample(struct sample *sample);
-+static struct sample *buffer_get_sample(struct sample *sample);
-+
-+/* Threading and state */
-+static int kthread_fn(void *unused);
-+static int start_kthread(void);
-+static int stop_kthread(void);
-+static void __reset_stats(void);
-+static int init_stats(void);
-+
-+/* Debugfs interface */
-+static ssize_t simple_data_read(struct file *filp, char __user *ubuf,
-+ size_t cnt, loff_t *ppos, const u64 *entry);
-+static ssize_t simple_data_write(struct file *filp, const char __user *ubuf,
-+ size_t cnt, loff_t *ppos, u64 *entry);
-+static int debug_sample_fopen(struct inode *inode, struct file *filp);
-+static ssize_t debug_sample_fread(struct file *filp, char __user *ubuf,
-+ size_t cnt, loff_t *ppos);
-+static int debug_sample_release(struct inode *inode, struct file *filp);
-+static int debug_enable_fopen(struct inode *inode, struct file *filp);
-+static ssize_t debug_enable_fread(struct file *filp, char __user *ubuf,
-+ size_t cnt, loff_t *ppos);
-+static ssize_t debug_enable_fwrite(struct file *file,
-+ const char __user *user_buffer,
-+ size_t user_size, loff_t *offset);
-+
-+/* Initialization functions */
-+static int init_debugfs(void);
-+static void free_debugfs(void);
-+static int detector_init(void);
-+static void detector_exit(void);
-+
-+/* Individual latency samples are stored here when detected and packed into
-+ * the ring_buffer circular buffer, where they are overwritten when
-+ * more than buf_size/sizeof(sample) samples are received. */
-+struct sample {
-+ u64 seqnum; /* unique sequence */
-+ u64 duration; /* ktime delta */
-+ u64 outer_duration; /* ktime delta (outer loop) */
-+ struct timespec timestamp; /* wall time */
-+ unsigned long lost;
-+};
-+
-+/* keep the global state somewhere. */
-+static struct data {
-+
-+ struct mutex lock; /* protect changes */
-+
-+ u64 count; /* total since reset */
-+ u64 max_sample; /* max hardware latency */
-+ u64 threshold; /* sample threshold level */
-+
-+ u64 sample_window; /* total sampling window (on+off) */
-+ u64 sample_width; /* active sampling portion of window */
-+
-+ atomic_t sample_open; /* whether the sample file is open */
-+
-+ wait_queue_head_t wq; /* waitqeue for new sample values */
-+
-+} data;
-+
-+/**
-+ * __buffer_add_sample - add a new latency sample recording to the ring buffer
-+ * @sample: The new latency sample value
-+ *
-+ * This receives a new latency sample and records it in a global ring buffer.
-+ * No additional locking is used in this case.
-+ */
-+static int __buffer_add_sample(struct sample *sample)
-+{
-+ return ring_buffer_write(ring_buffer,
-+ sizeof(struct sample), sample);
-+}
-+
-+/**
-+ * buffer_get_sample - remove a hardware latency sample from the ring buffer
-+ * @sample: Pre-allocated storage for the sample
-+ *
-+ * This retrieves a hardware latency sample from the global circular buffer
-+ */
-+static struct sample *buffer_get_sample(struct sample *sample)
-+{
-+ struct ring_buffer_event *e = NULL;
-+ struct sample *s = NULL;
-+ unsigned int cpu = 0;
-+
-+ if (!sample)
-+ return NULL;
-+
-+ mutex_lock(&ring_buffer_mutex);
-+ for_each_online_cpu(cpu) {
-+ e = ring_buffer_consume(ring_buffer, cpu, NULL, &sample->lost);
-+ if (e)
-+ break;
-+ }
-+
-+ if (e) {
-+ s = ring_buffer_event_data(e);
-+ memcpy(sample, s, sizeof(struct sample));
-+ } else
-+ sample = NULL;
-+ mutex_unlock(&ring_buffer_mutex);
-+
-+ return sample;
-+}
-+
-+#ifndef CONFIG_TRACING
-+#define time_type ktime_t
-+#define time_get() ktime_get()
-+#define time_to_us(x) ktime_to_us(x)
-+#define time_sub(a, b) ktime_sub(a, b)
-+#define init_time(a, b) (a).tv64 = b
-+#define time_u64(a) ((a).tv64)
-+#else
-+#define time_type u64
-+#define time_get() trace_clock_local()
-+#define time_to_us(x) div_u64(x, 1000)
-+#define time_sub(a, b) ((a) - (b))
-+#define init_time(a, b) (a = b)
-+#define time_u64(a) a
-+#endif
-+/**
-+ * get_sample - sample the CPU TSC and look for likely hardware latencies
-+ *
-+ * Used to repeatedly capture the CPU TSC (or similar), looking for potential
-+ * hardware-induced latency. Called with interrupts disabled and with
-+ * data.lock held.
-+ */
-+static int get_sample(void)
-+{
-+ time_type start, t1, t2, last_t2;
-+ s64 diff, total = 0;
-+ u64 sample = 0;
-+ u64 outer_sample = 0;
-+ int ret = -1;
-+
-+ init_time(last_t2, 0);
-+ start = time_get(); /* start timestamp */
-+
-+ do {
-+
-+ t1 = time_get(); /* we'll look for a discontinuity */
-+ t2 = time_get();
-+
-+ if (time_u64(last_t2)) {
-+ /* Check the delta from outer loop (t2 to next t1) */
-+ diff = time_to_us(time_sub(t1, last_t2));
-+ /* This shouldn't happen */
-+ if (diff < 0) {
-+ pr_err(BANNER "time running backwards\n");
-+ goto out;
-+ }
-+ if (diff > outer_sample)
-+ outer_sample = diff;
-+ }
-+ last_t2 = t2;
-+
-+ total = time_to_us(time_sub(t2, start)); /* sample width */
-+
-+ /* This checks the inner loop (t1 to t2) */
-+ diff = time_to_us(time_sub(t2, t1)); /* current diff */
-+
-+ /* This shouldn't happen */
-+ if (diff < 0) {
-+ pr_err(BANNER "time running backwards\n");
-+ goto out;
-+ }
-+
-+ if (diff > sample)
-+ sample = diff; /* only want highest value */
-+
-+ } while (total <= data.sample_width);
-+
-+ ret = 0;
-+
-+ /* If we exceed the threshold value, we have found a hardware latency */
-+ if (sample > data.threshold || outer_sample > data.threshold) {
-+ struct sample s;
-+
-+ ret = 1;
-+
-+ data.count++;
-+ s.seqnum = data.count;
-+ s.duration = sample;
-+ s.outer_duration = outer_sample;
-+ s.timestamp = CURRENT_TIME;
-+ __buffer_add_sample(&s);
-+
-+ /* Keep a running maximum ever recorded hardware latency */
-+ if (sample > data.max_sample)
-+ data.max_sample = sample;
-+ }
-+
-+out:
-+ return ret;
-+}
-+
-+/*
-+ * kthread_fn - The CPU time sampling/hardware latency detection kernel thread
-+ * @unused: A required part of the kthread API.
-+ *
-+ * Used to periodically sample the CPU TSC via a call to get_sample. We
-+ * disable interrupts, which does (intentionally) introduce latency since we
-+ * need to ensure nothing else might be running (and thus pre-empting).
-+ * Obviously this should never be used in production environments.
-+ *
-+ * Currently this runs on which ever CPU it was scheduled on, but most
-+ * real-worald hardware latency situations occur across several CPUs,
-+ * but we might later generalize this if we find there are any actualy
-+ * systems with alternate SMI delivery or other hardware latencies.
-+ */
-+static int kthread_fn(void *unused)
-+{
-+ int ret;
-+ u64 interval;
-+
-+ while (!kthread_should_stop()) {
-+
-+ mutex_lock(&data.lock);
-+
-+ local_irq_disable();
-+ ret = get_sample();
-+ local_irq_enable();
-+
-+ if (ret > 0)
-+ wake_up(&data.wq); /* wake up reader(s) */
-+
-+ interval = data.sample_window - data.sample_width;
-+ do_div(interval, USEC_PER_MSEC); /* modifies interval value */
-+
-+ mutex_unlock(&data.lock);
-+
-+ if (msleep_interruptible(interval))
-+ break;
-+ }
-+
-+ return 0;
-+}
-+
-+/**
-+ * start_kthread - Kick off the hardware latency sampling/detector kthread
-+ *
-+ * This starts a kernel thread that will sit and sample the CPU timestamp
-+ * counter (TSC or similar) and look for potential hardware latencies.
-+ */
-+static int start_kthread(void)
-+{
-+ kthread = kthread_run(kthread_fn, NULL,
-+ DRVNAME);
-+ if (IS_ERR(kthread)) {
-+ pr_err(BANNER "could not start sampling thread\n");
-+ enabled = 0;
-+ return -ENOMEM;
-+ }
-+
-+ return 0;
-+}
-+
-+/**
-+ * stop_kthread - Inform the hardware latency samping/detector kthread to stop
-+ *
-+ * This kicks the running hardware latency sampling/detector kernel thread and
-+ * tells it to stop sampling now. Use this on unload and at system shutdown.
-+ */
-+static int stop_kthread(void)
-+{
-+ int ret;
-+
-+ ret = kthread_stop(kthread);
-+
-+ return ret;
-+}
-+
-+/**
-+ * __reset_stats - Reset statistics for the hardware latency detector
-+ *
-+ * We use data to store various statistics and global state. We call this
-+ * function in order to reset those when "enable" is toggled on or off, and
-+ * also at initialization. Should be called with data.lock held.
-+ */
-+static void __reset_stats(void)
-+{
-+ data.count = 0;
-+ data.max_sample = 0;
-+ ring_buffer_reset(ring_buffer); /* flush out old sample entries */
-+}
-+
-+/**
-+ * init_stats - Setup global state statistics for the hardware latency detector
-+ *
-+ * We use data to store various statistics and global state. We also use
-+ * a global ring buffer (ring_buffer) to keep raw samples of detected hardware
-+ * induced system latencies. This function initializes these structures and
-+ * allocates the global ring buffer also.
-+ */
-+static int init_stats(void)
-+{
-+ int ret = -ENOMEM;
-+
-+ mutex_init(&data.lock);
-+ init_waitqueue_head(&data.wq);
-+ atomic_set(&data.sample_open, 0);
-+
-+ ring_buffer = ring_buffer_alloc(buf_size, BUF_FLAGS);
-+
-+ if (WARN(!ring_buffer, KERN_ERR BANNER
-+ "failed to allocate ring buffer!\n"))
-+ goto out;
-+
-+ __reset_stats();
-+ data.threshold = threshold ?: DEFAULT_LAT_THRESHOLD; /* threshold us */
-+ data.sample_window = DEFAULT_SAMPLE_WINDOW; /* window us */
-+ data.sample_width = DEFAULT_SAMPLE_WIDTH; /* width us */
-+
-+ ret = 0;
-+
-+out:
-+ return ret;
-+
-+}
-+
-+/*
-+ * simple_data_read - Wrapper read function for global state debugfs entries
-+ * @filp: The active open file structure for the debugfs "file"
-+ * @ubuf: The userspace provided buffer to read value into
-+ * @cnt: The maximum number of bytes to read
-+ * @ppos: The current "file" position
-+ * @entry: The entry to read from
-+ *
-+ * This function provides a generic read implementation for the global state
-+ * "data" structure debugfs filesystem entries. It would be nice to use
-+ * simple_attr_read directly, but we need to make sure that the data.lock
-+ * is held during the actual read.
-+ */
-+static ssize_t simple_data_read(struct file *filp, char __user *ubuf,
-+ size_t cnt, loff_t *ppos, const u64 *entry)
-+{
-+ char buf[U64STR_SIZE];
-+ u64 val = 0;
-+ int len = 0;
-+
-+ memset(buf, 0, sizeof(buf));
-+
-+ if (!entry)
-+ return -EFAULT;
-+
-+ mutex_lock(&data.lock);
-+ val = *entry;
-+ mutex_unlock(&data.lock);
-+
-+ len = snprintf(buf, sizeof(buf), "%llu\n", (unsigned long long)val);
-+
-+ return simple_read_from_buffer(ubuf, cnt, ppos, buf, len);
-+
-+}
-+
-+/*
-+ * simple_data_write - Wrapper write function for global state debugfs entries
-+ * @filp: The active open file structure for the debugfs "file"
-+ * @ubuf: The userspace provided buffer to write value from
-+ * @cnt: The maximum number of bytes to write
-+ * @ppos: The current "file" position
-+ * @entry: The entry to write to
-+ *
-+ * This function provides a generic write implementation for the global state
-+ * "data" structure debugfs filesystem entries. It would be nice to use
-+ * simple_attr_write directly, but we need to make sure that the data.lock
-+ * is held during the actual write.
-+ */
-+static ssize_t simple_data_write(struct file *filp, const char __user *ubuf,
-+ size_t cnt, loff_t *ppos, u64 *entry)
-+{
-+ char buf[U64STR_SIZE];
-+ int csize = min(cnt, sizeof(buf));
-+ u64 val = 0;
-+ int err = 0;
-+
-+ memset(buf, '\0', sizeof(buf));
-+ if (copy_from_user(buf, ubuf, csize))
-+ return -EFAULT;
-+
-+ buf[U64STR_SIZE-1] = '\0'; /* just in case */
-+ err = kstrtoull(buf, 10, &val);
-+ if (err)
-+ return -EINVAL;
-+
-+ mutex_lock(&data.lock);
-+ *entry = val;
-+ mutex_unlock(&data.lock);
-+
-+ return csize;
-+}
-+
-+/**
-+ * debug_count_fopen - Open function for "count" debugfs entry
-+ * @inode: The in-kernel inode representation of the debugfs "file"
-+ * @filp: The active open file structure for the debugfs "file"
-+ *
-+ * This function provides an open implementation for the "count" debugfs
-+ * interface to the hardware latency detector.
-+ */
-+static int debug_count_fopen(struct inode *inode, struct file *filp)
-+{
-+ return 0;
-+}
-+
-+/**
-+ * debug_count_fread - Read function for "count" debugfs entry
-+ * @filp: The active open file structure for the debugfs "file"
-+ * @ubuf: The userspace provided buffer to read value into
-+ * @cnt: The maximum number of bytes to read
-+ * @ppos: The current "file" position
-+ *
-+ * This function provides a read implementation for the "count" debugfs
-+ * interface to the hardware latency detector. Can be used to read the
-+ * number of latency readings exceeding the configured threshold since
-+ * the detector was last reset (e.g. by writing a zero into "count").
-+ */
-+static ssize_t debug_count_fread(struct file *filp, char __user *ubuf,
-+ size_t cnt, loff_t *ppos)
-+{
-+ return simple_data_read(filp, ubuf, cnt, ppos, &data.count);
-+}
-+
-+/**
-+ * debug_count_fwrite - Write function for "count" debugfs entry
-+ * @filp: The active open file structure for the debugfs "file"
-+ * @ubuf: The user buffer that contains the value to write
-+ * @cnt: The maximum number of bytes to write to "file"
-+ * @ppos: The current position in the debugfs "file"
-+ *
-+ * This function provides a write implementation for the "count" debugfs
-+ * interface to the hardware latency detector. Can be used to write a
-+ * desired value, especially to zero the total count.
-+ */
-+static ssize_t debug_count_fwrite(struct file *filp,
-+ const char __user *ubuf,
-+ size_t cnt,
-+ loff_t *ppos)
-+{
-+ return simple_data_write(filp, ubuf, cnt, ppos, &data.count);
-+}
-+
-+/**
-+ * debug_enable_fopen - Dummy open function for "enable" debugfs interface
-+ * @inode: The in-kernel inode representation of the debugfs "file"
-+ * @filp: The active open file structure for the debugfs "file"
-+ *
-+ * This function provides an open implementation for the "enable" debugfs
-+ * interface to the hardware latency detector.
-+ */
-+static int debug_enable_fopen(struct inode *inode, struct file *filp)
-+{
-+ return 0;
-+}
-+
-+/**
-+ * debug_enable_fread - Read function for "enable" debugfs interface
-+ * @filp: The active open file structure for the debugfs "file"
-+ * @ubuf: The userspace provided buffer to read value into
-+ * @cnt: The maximum number of bytes to read
-+ * @ppos: The current "file" position
-+ *
-+ * This function provides a read implementation for the "enable" debugfs
-+ * interface to the hardware latency detector. Can be used to determine
-+ * whether the detector is currently enabled ("0\n" or "1\n" returned).
-+ */
-+static ssize_t debug_enable_fread(struct file *filp, char __user *ubuf,
-+ size_t cnt, loff_t *ppos)
-+{
-+ char buf[4];
-+
-+ if ((cnt < sizeof(buf)) || (*ppos))
-+ return 0;
-+
-+ buf[0] = enabled ? '1' : '0';
-+ buf[1] = '\n';
-+ buf[2] = '\0';
-+ if (copy_to_user(ubuf, buf, strlen(buf)))
-+ return -EFAULT;
-+ return *ppos = strlen(buf);
-+}
-+
-+/**
-+ * debug_enable_fwrite - Write function for "enable" debugfs interface
-+ * @filp: The active open file structure for the debugfs "file"
-+ * @ubuf: The user buffer that contains the value to write
-+ * @cnt: The maximum number of bytes to write to "file"
-+ * @ppos: The current position in the debugfs "file"
-+ *
-+ * This function provides a write implementation for the "enable" debugfs
-+ * interface to the hardware latency detector. Can be used to enable or
-+ * disable the detector, which will have the side-effect of possibly
-+ * also resetting the global stats and kicking off the measuring
-+ * kthread (on an enable) or the converse (upon a disable).
-+ */
-+static ssize_t debug_enable_fwrite(struct file *filp,
-+ const char __user *ubuf,
-+ size_t cnt,
-+ loff_t *ppos)
-+{
-+ char buf[4];
-+ int csize = min(cnt, sizeof(buf));
-+ long val = 0;
-+ int err = 0;
-+
-+ memset(buf, '\0', sizeof(buf));
-+ if (copy_from_user(buf, ubuf, csize))
-+ return -EFAULT;
-+
-+ buf[sizeof(buf)-1] = '\0'; /* just in case */
-+ err = kstrtoul(buf, 10, &val);
-+ if (err)
-+ return -EINVAL;
-+
-+ if (val) {
-+ if (enabled)
-+ goto unlock;
-+ enabled = 1;
-+ __reset_stats();
-+ if (start_kthread())
-+ return -EFAULT;
-+ } else {
-+ if (!enabled)
-+ goto unlock;
-+ enabled = 0;
-+ err = stop_kthread();
-+ if (err) {
-+ pr_err(BANNER "cannot stop kthread\n");
-+ return -EFAULT;
-+ }
-+ wake_up(&data.wq); /* reader(s) should return */
-+ }
-+unlock:
-+ return csize;
-+}
-+
-+/**
-+ * debug_max_fopen - Open function for "max" debugfs entry
-+ * @inode: The in-kernel inode representation of the debugfs "file"
-+ * @filp: The active open file structure for the debugfs "file"
-+ *
-+ * This function provides an open implementation for the "max" debugfs
-+ * interface to the hardware latency detector.
-+ */
-+static int debug_max_fopen(struct inode *inode, struct file *filp)
-+{
-+ return 0;
-+}
-+
-+/**
-+ * debug_max_fread - Read function for "max" debugfs entry
-+ * @filp: The active open file structure for the debugfs "file"
-+ * @ubuf: The userspace provided buffer to read value into
-+ * @cnt: The maximum number of bytes to read
-+ * @ppos: The current "file" position
-+ *
-+ * This function provides a read implementation for the "max" debugfs
-+ * interface to the hardware latency detector. Can be used to determine
-+ * the maximum latency value observed since it was last reset.
-+ */
-+static ssize_t debug_max_fread(struct file *filp, char __user *ubuf,
-+ size_t cnt, loff_t *ppos)
-+{
-+ return simple_data_read(filp, ubuf, cnt, ppos, &data.max_sample);
-+}
-+
-+/**
-+ * debug_max_fwrite - Write function for "max" debugfs entry
-+ * @filp: The active open file structure for the debugfs "file"
-+ * @ubuf: The user buffer that contains the value to write
-+ * @cnt: The maximum number of bytes to write to "file"
-+ * @ppos: The current position in the debugfs "file"
-+ *
-+ * This function provides a write implementation for the "max" debugfs
-+ * interface to the hardware latency detector. Can be used to reset the
-+ * maximum or set it to some other desired value - if, then, subsequent
-+ * measurements exceed this value, the maximum will be updated.
-+ */
-+static ssize_t debug_max_fwrite(struct file *filp,
-+ const char __user *ubuf,
-+ size_t cnt,
-+ loff_t *ppos)
-+{
-+ return simple_data_write(filp, ubuf, cnt, ppos, &data.max_sample);
-+}
-+
-+
-+/**
-+ * debug_sample_fopen - An open function for "sample" debugfs interface
-+ * @inode: The in-kernel inode representation of this debugfs "file"
-+ * @filp: The active open file structure for the debugfs "file"
-+ *
-+ * This function handles opening the "sample" file within the hardware
-+ * latency detector debugfs directory interface. This file is used to read
-+ * raw samples from the global ring_buffer and allows the user to see a
-+ * running latency history. Can be opened blocking or non-blocking,
-+ * affecting whether it behaves as a buffer read pipe, or does not.
-+ * Implements simple locking to prevent multiple simultaneous use.
-+ */
-+static int debug_sample_fopen(struct inode *inode, struct file *filp)
-+{
-+ if (!atomic_add_unless(&data.sample_open, 1, 1))
-+ return -EBUSY;
-+ else
-+ return 0;
-+}
-+
-+/**
-+ * debug_sample_fread - A read function for "sample" debugfs interface
-+ * @filp: The active open file structure for the debugfs "file"
-+ * @ubuf: The user buffer that will contain the samples read
-+ * @cnt: The maximum bytes to read from the debugfs "file"
-+ * @ppos: The current position in the debugfs "file"
-+ *
-+ * This function handles reading from the "sample" file within the hardware
-+ * latency detector debugfs directory interface. This file is used to read
-+ * raw samples from the global ring_buffer and allows the user to see a
-+ * running latency history. By default this will block pending a new
-+ * value written into the sample buffer, unless there are already a
-+ * number of value(s) waiting in the buffer, or the sample file was
-+ * previously opened in a non-blocking mode of operation.
-+ */
-+static ssize_t debug_sample_fread(struct file *filp, char __user *ubuf,
-+ size_t cnt, loff_t *ppos)
-+{
-+ int len = 0;
-+ char buf[64];
-+ struct sample *sample = NULL;
-+
-+ if (!enabled)
-+ return 0;
-+
-+ sample = kzalloc(sizeof(struct sample), GFP_KERNEL);
-+ if (!sample)
-+ return -ENOMEM;
-+
-+ while (!buffer_get_sample(sample)) {
-+
-+ DEFINE_WAIT(wait);
-+
-+ if (filp->f_flags & O_NONBLOCK) {
-+ len = -EAGAIN;
-+ goto out;
-+ }
-+
-+ prepare_to_wait(&data.wq, &wait, TASK_INTERRUPTIBLE);
-+ schedule();
-+ finish_wait(&data.wq, &wait);
-+
-+ if (signal_pending(current)) {
-+ len = -EINTR;
-+ goto out;
-+ }
-+
-+ if (!enabled) { /* enable was toggled */
-+ len = 0;
-+ goto out;
-+ }
-+ }
-+
-+ len = snprintf(buf, sizeof(buf), "%010lu.%010lu\t%llu\t%llu\n",
-+ sample->timestamp.tv_sec,
-+ sample->timestamp.tv_nsec,
-+ sample->duration,
-+ sample->outer_duration);
-+
-+
-+ /* handling partial reads is more trouble than it's worth */
-+ if (len > cnt)
-+ goto out;
-+
-+ if (copy_to_user(ubuf, buf, len))
-+ len = -EFAULT;
-+
-+out:
-+ kfree(sample);
-+ return len;
-+}
-+
-+/**
-+ * debug_sample_release - Release function for "sample" debugfs interface
-+ * @inode: The in-kernel inode represenation of the debugfs "file"
-+ * @filp: The active open file structure for the debugfs "file"
-+ *
-+ * This function completes the close of the debugfs interface "sample" file.
-+ * Frees the sample_open "lock" so that other users may open the interface.
-+ */
-+static int debug_sample_release(struct inode *inode, struct file *filp)
-+{
-+ atomic_dec(&data.sample_open);
-+
-+ return 0;
-+}
-+
-+/**
-+ * debug_threshold_fopen - Open function for "threshold" debugfs entry
-+ * @inode: The in-kernel inode representation of the debugfs "file"
-+ * @filp: The active open file structure for the debugfs "file"
-+ *
-+ * This function provides an open implementation for the "threshold" debugfs
-+ * interface to the hardware latency detector.
-+ */
-+static int debug_threshold_fopen(struct inode *inode, struct file *filp)
-+{
-+ return 0;
-+}
-+
-+/**
-+ * debug_threshold_fread - Read function for "threshold" debugfs entry
-+ * @filp: The active open file structure for the debugfs "file"
-+ * @ubuf: The userspace provided buffer to read value into
-+ * @cnt: The maximum number of bytes to read
-+ * @ppos: The current "file" position
-+ *
-+ * This function provides a read implementation for the "threshold" debugfs
-+ * interface to the hardware latency detector. It can be used to determine
-+ * the current threshold level at which a latency will be recorded in the
-+ * global ring buffer, typically on the order of 10us.
-+ */
-+static ssize_t debug_threshold_fread(struct file *filp, char __user *ubuf,
-+ size_t cnt, loff_t *ppos)
-+{
-+ return simple_data_read(filp, ubuf, cnt, ppos, &data.threshold);
-+}
-+
-+/**
-+ * debug_threshold_fwrite - Write function for "threshold" debugfs entry
-+ * @filp: The active open file structure for the debugfs "file"
-+ * @ubuf: The user buffer that contains the value to write
-+ * @cnt: The maximum number of bytes to write to "file"
-+ * @ppos: The current position in the debugfs "file"
-+ *
-+ * This function provides a write implementation for the "threshold" debugfs
-+ * interface to the hardware latency detector. It can be used to configure
-+ * the threshold level at which any subsequently detected latencies will
-+ * be recorded into the global ring buffer.
-+ */
-+static ssize_t debug_threshold_fwrite(struct file *filp,
-+ const char __user *ubuf,
-+ size_t cnt,
-+ loff_t *ppos)
-+{
-+ int ret;
-+
-+ ret = simple_data_write(filp, ubuf, cnt, ppos, &data.threshold);
-+
-+ if (enabled)
-+ wake_up_process(kthread);
-+
-+ return ret;
-+}
-+
-+/**
-+ * debug_width_fopen - Open function for "width" debugfs entry
-+ * @inode: The in-kernel inode representation of the debugfs "file"
-+ * @filp: The active open file structure for the debugfs "file"
-+ *
-+ * This function provides an open implementation for the "width" debugfs
-+ * interface to the hardware latency detector.
-+ */
-+static int debug_width_fopen(struct inode *inode, struct file *filp)
-+{
-+ return 0;
-+}
-+
-+/**
-+ * debug_width_fread - Read function for "width" debugfs entry
-+ * @filp: The active open file structure for the debugfs "file"
-+ * @ubuf: The userspace provided buffer to read value into
-+ * @cnt: The maximum number of bytes to read
-+ * @ppos: The current "file" position
-+ *
-+ * This function provides a read implementation for the "width" debugfs
-+ * interface to the hardware latency detector. It can be used to determine
-+ * for how many us of the total window us we will actively sample for any
-+ * hardware-induced latecy periods. Obviously, it is not possible to
-+ * sample constantly and have the system respond to a sample reader, or,
-+ * worse, without having the system appear to have gone out to lunch.
-+ */
-+static ssize_t debug_width_fread(struct file *filp, char __user *ubuf,
-+ size_t cnt, loff_t *ppos)
-+{
-+ return simple_data_read(filp, ubuf, cnt, ppos, &data.sample_width);
-+}
-+
-+/**
-+ * debug_width_fwrite - Write function for "width" debugfs entry
-+ * @filp: The active open file structure for the debugfs "file"
-+ * @ubuf: The user buffer that contains the value to write
-+ * @cnt: The maximum number of bytes to write to "file"
-+ * @ppos: The current position in the debugfs "file"
-+ *
-+ * This function provides a write implementation for the "width" debugfs
-+ * interface to the hardware latency detector. It can be used to configure
-+ * for how many us of the total window us we will actively sample for any
-+ * hardware-induced latency periods. Obviously, it is not possible to
-+ * sample constantly and have the system respond to a sample reader, or,
-+ * worse, without having the system appear to have gone out to lunch. It
-+ * is enforced that width is less that the total window size.
-+ */
-+static ssize_t debug_width_fwrite(struct file *filp,
-+ const char __user *ubuf,
-+ size_t cnt,
-+ loff_t *ppos)
-+{
-+ char buf[U64STR_SIZE];
-+ int csize = min(cnt, sizeof(buf));
-+ u64 val = 0;
-+ int err = 0;
-+
-+ memset(buf, '\0', sizeof(buf));
-+ if (copy_from_user(buf, ubuf, csize))
-+ return -EFAULT;
-+
-+ buf[U64STR_SIZE-1] = '\0'; /* just in case */
-+ err = kstrtoull(buf, 10, &val);
-+ if (err)
-+ return -EINVAL;
-+
-+ mutex_lock(&data.lock);
-+ if (val < data.sample_window)
-+ data.sample_width = val;
-+ else {
-+ mutex_unlock(&data.lock);
-+ return -EINVAL;
-+ }
-+ mutex_unlock(&data.lock);
-+
-+ if (enabled)
-+ wake_up_process(kthread);
-+
-+ return csize;
-+}
-+
-+/**
-+ * debug_window_fopen - Open function for "window" debugfs entry
-+ * @inode: The in-kernel inode representation of the debugfs "file"
-+ * @filp: The active open file structure for the debugfs "file"
-+ *
-+ * This function provides an open implementation for the "window" debugfs
-+ * interface to the hardware latency detector. The window is the total time
-+ * in us that will be considered one sample period. Conceptually, windows
-+ * occur back-to-back and contain a sample width period during which
-+ * actual sampling occurs.
-+ */
-+static int debug_window_fopen(struct inode *inode, struct file *filp)
-+{
-+ return 0;
-+}
-+
-+/**
-+ * debug_window_fread - Read function for "window" debugfs entry
-+ * @filp: The active open file structure for the debugfs "file"
-+ * @ubuf: The userspace provided buffer to read value into
-+ * @cnt: The maximum number of bytes to read
-+ * @ppos: The current "file" position
-+ *
-+ * This function provides a read implementation for the "window" debugfs
-+ * interface to the hardware latency detector. The window is the total time
-+ * in us that will be considered one sample period. Conceptually, windows
-+ * occur back-to-back and contain a sample width period during which
-+ * actual sampling occurs. Can be used to read the total window size.
-+ */
-+static ssize_t debug_window_fread(struct file *filp, char __user *ubuf,
-+ size_t cnt, loff_t *ppos)
-+{
-+ return simple_data_read(filp, ubuf, cnt, ppos, &data.sample_window);
-+}
-+
-+/**
-+ * debug_window_fwrite - Write function for "window" debugfs entry
-+ * @filp: The active open file structure for the debugfs "file"
-+ * @ubuf: The user buffer that contains the value to write
-+ * @cnt: The maximum number of bytes to write to "file"
-+ * @ppos: The current position in the debugfs "file"
-+ *
-+ * This function provides a write implementation for the "window" debufds
-+ * interface to the hardware latency detetector. The window is the total time
-+ * in us that will be considered one sample period. Conceptually, windows
-+ * occur back-to-back and contain a sample width period during which
-+ * actual sampling occurs. Can be used to write a new total window size. It
-+ * is enfoced that any value written must be greater than the sample width
-+ * size, or an error results.
-+ */
-+static ssize_t debug_window_fwrite(struct file *filp,
-+ const char __user *ubuf,
-+ size_t cnt,
-+ loff_t *ppos)
-+{
-+ char buf[U64STR_SIZE];
-+ int csize = min(cnt, sizeof(buf));
-+ u64 val = 0;
-+ int err = 0;
-+
-+ memset(buf, '\0', sizeof(buf));
-+ if (copy_from_user(buf, ubuf, csize))
-+ return -EFAULT;
-+
-+ buf[U64STR_SIZE-1] = '\0'; /* just in case */
-+ err = kstrtoull(buf, 10, &val);
-+ if (err)
-+ return -EINVAL;
-+
-+ mutex_lock(&data.lock);
-+ if (data.sample_width < val)
-+ data.sample_window = val;
-+ else {
-+ mutex_unlock(&data.lock);
-+ return -EINVAL;
-+ }
-+ mutex_unlock(&data.lock);
-+
-+ return csize;
-+}
-+
-+/*
-+ * Function pointers for the "count" debugfs file operations
-+ */
-+static const struct file_operations count_fops = {
-+ .open = debug_count_fopen,
-+ .read = debug_count_fread,
-+ .write = debug_count_fwrite,
-+ .owner = THIS_MODULE,
-+};
-+
-+/*
-+ * Function pointers for the "enable" debugfs file operations
-+ */
-+static const struct file_operations enable_fops = {
-+ .open = debug_enable_fopen,
-+ .read = debug_enable_fread,
-+ .write = debug_enable_fwrite,
-+ .owner = THIS_MODULE,
-+};
-+
-+/*
-+ * Function pointers for the "max" debugfs file operations
-+ */
-+static const struct file_operations max_fops = {
-+ .open = debug_max_fopen,
-+ .read = debug_max_fread,
-+ .write = debug_max_fwrite,
-+ .owner = THIS_MODULE,
-+};
-+
-+/*
-+ * Function pointers for the "sample" debugfs file operations
-+ */
-+static const struct file_operations sample_fops = {
-+ .open = debug_sample_fopen,
-+ .read = debug_sample_fread,
-+ .release = debug_sample_release,
-+ .owner = THIS_MODULE,
-+};
-+
-+/*
-+ * Function pointers for the "threshold" debugfs file operations
-+ */
-+static const struct file_operations threshold_fops = {
-+ .open = debug_threshold_fopen,
-+ .read = debug_threshold_fread,
-+ .write = debug_threshold_fwrite,
-+ .owner = THIS_MODULE,
-+};
-+
-+/*
-+ * Function pointers for the "width" debugfs file operations
-+ */
-+static const struct file_operations width_fops = {
-+ .open = debug_width_fopen,
-+ .read = debug_width_fread,
-+ .write = debug_width_fwrite,
-+ .owner = THIS_MODULE,
-+};
-+
-+/*
-+ * Function pointers for the "window" debugfs file operations
-+ */
-+static const struct file_operations window_fops = {
-+ .open = debug_window_fopen,
-+ .read = debug_window_fread,
-+ .write = debug_window_fwrite,
-+ .owner = THIS_MODULE,
-+};
-+
-+/**
-+ * init_debugfs - A function to initialize the debugfs interface files
-+ *
-+ * This function creates entries in debugfs for "hwlat_detector", including
-+ * files to read values from the detector, current samples, and the
-+ * maximum sample that has been captured since the hardware latency
-+ * dectector was started.
-+ */
-+static int init_debugfs(void)
-+{
-+ int ret = -ENOMEM;
-+
-+ debug_dir = debugfs_create_dir(DRVNAME, NULL);
-+ if (!debug_dir)
-+ goto err_debug_dir;
-+
-+ debug_sample = debugfs_create_file("sample", 0444,
-+ debug_dir, NULL,
-+ &sample_fops);
-+ if (!debug_sample)
-+ goto err_sample;
-+
-+ debug_count = debugfs_create_file("count", 0444,
-+ debug_dir, NULL,
-+ &count_fops);
-+ if (!debug_count)
-+ goto err_count;
-+
-+ debug_max = debugfs_create_file("max", 0444,
-+ debug_dir, NULL,
-+ &max_fops);
-+ if (!debug_max)
-+ goto err_max;
-+
-+ debug_sample_window = debugfs_create_file("window", 0644,
-+ debug_dir, NULL,
-+ &window_fops);
-+ if (!debug_sample_window)
-+ goto err_window;
-+
-+ debug_sample_width = debugfs_create_file("width", 0644,
-+ debug_dir, NULL,
-+ &width_fops);
-+ if (!debug_sample_width)
-+ goto err_width;
-+
-+ debug_threshold = debugfs_create_file("threshold", 0644,
-+ debug_dir, NULL,
-+ &threshold_fops);
-+ if (!debug_threshold)
-+ goto err_threshold;
-+
-+ debug_enable = debugfs_create_file("enable", 0644,
-+ debug_dir, &enabled,
-+ &enable_fops);
-+ if (!debug_enable)
-+ goto err_enable;
-+
-+ else {
-+ ret = 0;
-+ goto out;
-+ }
-+
-+err_enable:
-+ debugfs_remove(debug_threshold);
-+err_threshold:
-+ debugfs_remove(debug_sample_width);
-+err_width:
-+ debugfs_remove(debug_sample_window);
-+err_window:
-+ debugfs_remove(debug_max);
-+err_max:
-+ debugfs_remove(debug_count);
-+err_count:
-+ debugfs_remove(debug_sample);
-+err_sample:
-+ debugfs_remove(debug_dir);
-+err_debug_dir:
-+out:
-+ return ret;
-+}
-+
-+/**
-+ * free_debugfs - A function to cleanup the debugfs file interface
-+ */
-+static void free_debugfs(void)
-+{
-+ /* could also use a debugfs_remove_recursive */
-+ debugfs_remove(debug_enable);
-+ debugfs_remove(debug_threshold);
-+ debugfs_remove(debug_sample_width);
-+ debugfs_remove(debug_sample_window);
-+ debugfs_remove(debug_max);
-+ debugfs_remove(debug_count);
-+ debugfs_remove(debug_sample);
-+ debugfs_remove(debug_dir);
-+}
-+
-+/**
-+ * detector_init - Standard module initialization code
-+ */
-+static int detector_init(void)
-+{
-+ int ret = -ENOMEM;
-+
-+ pr_info(BANNER "version %s\n", VERSION);
-+
-+ ret = init_stats();
-+ if (ret)
-+ goto out;
-+
-+ ret = init_debugfs();
-+ if (ret)
-+ goto err_stats;
-+
-+ if (enabled)
-+ ret = start_kthread();
-+
-+ goto out;
-+
-+err_stats:
-+ ring_buffer_free(ring_buffer);
-+out:
-+ return ret;
-+
-+}
-+
-+/**
-+ * detector_exit - Standard module cleanup code
-+ */
-+static void detector_exit(void)
-+{
-+ int err;
-+
-+ if (enabled) {
-+ enabled = 0;
-+ err = stop_kthread();
-+ if (err)
-+ pr_err(BANNER "cannot stop kthread\n");
-+ }
-+
-+ free_debugfs();
-+ ring_buffer_free(ring_buffer); /* free up the ring buffer */
-+
-+}
-+
-+module_init(detector_init);
-+module_exit(detector_exit);
-diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
-index df990bb..1a16270 100644
---- a/drivers/mmc/host/mmci.c
-+++ b/drivers/mmc/host/mmci.c
-@@ -1147,15 +1147,12 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id)
- struct sg_mapping_iter *sg_miter = &host->sg_miter;
- struct variant_data *variant = host->variant;
- void __iomem *base = host->base;
-- unsigned long flags;
- u32 status;
-
- status = readl(base + MMCISTATUS);
-
- dev_dbg(mmc_dev(host->mmc), "irq1 (pio) %08x\n", status);
-
-- local_irq_save(flags);
--
- do {
- unsigned int remain, len;
- char *buffer;
-@@ -1195,8 +1192,6 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id)
-
- sg_miter_stop(sg_miter);
-
-- local_irq_restore(flags);
--
- /*
- * If we have less than the fifo 'half-full' threshold to transfer,
- * trigger a PIO interrupt as soon as any data is available.
-diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
-index 25c55ab..5a1d117 100644
---- a/drivers/net/ethernet/3com/3c59x.c
-+++ b/drivers/net/ethernet/3com/3c59x.c
-@@ -842,9 +842,9 @@ static void poll_vortex(struct net_device *dev)
- {
- struct vortex_private *vp = netdev_priv(dev);
- unsigned long flags;
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- (vp->full_bus_master_rx ? boomerang_interrupt:vortex_interrupt)(dev->irq,dev);
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- }
- #endif
-
-@@ -1910,12 +1910,12 @@ static void vortex_tx_timeout(struct net_device *dev)
- * Block interrupts because vortex_interrupt does a bare spin_lock()
- */
- unsigned long flags;
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- if (vp->full_bus_master_tx)
- boomerang_interrupt(dev->irq, dev);
- else
- vortex_interrupt(dev->irq, dev);
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- }
- }
-
-diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
-index da4c2d8..1420dfb 100644
---- a/drivers/net/ethernet/realtek/8139too.c
-+++ b/drivers/net/ethernet/realtek/8139too.c
-@@ -2233,7 +2233,7 @@ static void rtl8139_poll_controller(struct net_device *dev)
- struct rtl8139_private *tp = netdev_priv(dev);
- const int irq = tp->pci_dev->irq;
-
-- disable_irq(irq);
-+ disable_irq_nosync(irq);
- rtl8139_interrupt(irq, dev);
- enable_irq(irq);
- }
-diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
-index 56f109b..02afc79 100644
---- a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
-+++ b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
-@@ -697,7 +697,7 @@ static void ezusb_req_ctx_wait(struct ezusb_priv *upriv,
- while (!ctx->done.done && msecs--)
- udelay(1000);
- } else {
-- wait_event_interruptible(ctx->done.wait,
-+ swait_event_interruptible(ctx->done.wait,
- ctx->done.done);
- }
- break;
-diff --git a/drivers/pci/access.c b/drivers/pci/access.c
-index d11cdbb..223bbb9 100644
---- a/drivers/pci/access.c
-+++ b/drivers/pci/access.c
-@@ -672,7 +672,7 @@ void pci_cfg_access_unlock(struct pci_dev *dev)
- WARN_ON(!dev->block_cfg_access);
-
- dev->block_cfg_access = 0;
-- wake_up_all(&pci_cfg_wait);
-+ wake_up_all_locked(&pci_cfg_wait);
- raw_spin_unlock_irqrestore(&pci_lock, flags);
- }
- EXPORT_SYMBOL_GPL(pci_cfg_access_unlock);
-diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
-index 9bd41a3..8e2d436 100644
---- a/drivers/scsi/fcoe/fcoe.c
-+++ b/drivers/scsi/fcoe/fcoe.c
-@@ -1455,11 +1455,11 @@ err2:
- static int fcoe_alloc_paged_crc_eof(struct sk_buff *skb, int tlen)
- {
- struct fcoe_percpu_s *fps;
-- int rc;
-+ int rc, cpu = get_cpu_light();
-
-- fps = &get_cpu_var(fcoe_percpu);
-+ fps = &per_cpu(fcoe_percpu, cpu);
- rc = fcoe_get_paged_crc_eof(skb, tlen, fps);
-- put_cpu_var(fcoe_percpu);
-+ put_cpu_light();
-
- return rc;
- }
-@@ -1646,11 +1646,11 @@ static inline int fcoe_filter_frames(struct fc_lport *lport,
- return 0;
- }
-
-- stats = per_cpu_ptr(lport->stats, get_cpu());
-+ stats = per_cpu_ptr(lport->stats, get_cpu_light());
- stats->InvalidCRCCount++;
- if (stats->InvalidCRCCount < 5)
- printk(KERN_WARNING "fcoe: dropping frame with CRC error\n");
-- put_cpu();
-+ put_cpu_light();
- return -EINVAL;
- }
-
-@@ -1693,7 +1693,7 @@ static void fcoe_recv_frame(struct sk_buff *skb)
- */
- hp = (struct fcoe_hdr *) skb_network_header(skb);
-
-- stats = per_cpu_ptr(lport->stats, get_cpu());
-+ stats = per_cpu_ptr(lport->stats, get_cpu_light());
- if (unlikely(FC_FCOE_DECAPS_VER(hp) != FC_FCOE_VER)) {
- if (stats->ErrorFrames < 5)
- printk(KERN_WARNING "fcoe: FCoE version "
-@@ -1725,13 +1725,13 @@ static void fcoe_recv_frame(struct sk_buff *skb)
- goto drop;
-
- if (!fcoe_filter_frames(lport, fp)) {
-- put_cpu();
-+ put_cpu_light();
- fc_exch_recv(lport, fp);
- return;
- }
- drop:
- stats->ErrorFrames++;
-- put_cpu();
-+ put_cpu_light();
- kfree_skb(skb);
- }
-
-diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
-index dcf3653..1a1f2e4 100644
---- a/drivers/scsi/fcoe/fcoe_ctlr.c
-+++ b/drivers/scsi/fcoe/fcoe_ctlr.c
-@@ -834,7 +834,7 @@ static unsigned long fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
-
- INIT_LIST_HEAD(&del_list);
-
-- stats = per_cpu_ptr(fip->lp->stats, get_cpu());
-+ stats = per_cpu_ptr(fip->lp->stats, get_cpu_light());
-
- list_for_each_entry_safe(fcf, next, &fip->fcfs, list) {
- deadline = fcf->time + fcf->fka_period + fcf->fka_period / 2;
-@@ -870,7 +870,7 @@ static unsigned long fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
- sel_time = fcf->time;
- }
- }
-- put_cpu();
-+ put_cpu_light();
-
- list_for_each_entry_safe(fcf, next, &del_list, list) {
- /* Removes fcf from current list */
-diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
-index e72673b..da598a6 100644
---- a/drivers/scsi/libfc/fc_exch.c
-+++ b/drivers/scsi/libfc/fc_exch.c
-@@ -814,10 +814,10 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
- }
- memset(ep, 0, sizeof(*ep));
-
-- cpu = get_cpu();
-+ cpu = get_cpu_light();
- pool = per_cpu_ptr(mp->pool, cpu);
- spin_lock_bh(&pool->lock);
-- put_cpu();
-+ put_cpu_light();
-
- /* peek cache of free slot */
- if (pool->left != FC_XID_UNKNOWN) {
-diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
-index 763f012..d0f61b5 100644
---- a/drivers/scsi/libsas/sas_ata.c
-+++ b/drivers/scsi/libsas/sas_ata.c
-@@ -190,7 +190,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
- /* TODO: audit callers to ensure they are ready for qc_issue to
- * unconditionally re-enable interrupts
- */
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- spin_unlock(ap->lock);
-
- /* If the device fell off, no sense in issuing commands */
-@@ -252,7 +252,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
-
- out:
- spin_lock(ap->lock);
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- return ret;
- }
-
-diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h
-index edc48f3..ee5c6f9 100644
---- a/drivers/scsi/qla2xxx/qla_inline.h
-+++ b/drivers/scsi/qla2xxx/qla_inline.h
-@@ -59,12 +59,12 @@ qla2x00_poll(struct rsp_que *rsp)
- {
- unsigned long flags;
- struct qla_hw_data *ha = rsp->hw;
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- if (IS_P3P_TYPE(ha))
- qla82xx_poll(0, rsp);
- else
- ha->isp_ops->intr_handler(0, rsp);
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- }
-
- static inline uint8_t *
-diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
-index 987f1c7..18391e0 100644
---- a/drivers/scsi/qla2xxx/qla_isr.c
-+++ b/drivers/scsi/qla2xxx/qla_isr.c
-@@ -3125,7 +3125,11 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp)
- * kref_put().
- */
- kref_get(&qentry->irq_notify.kref);
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ swork_queue(&qentry->irq_notify.swork);
-+#else
- schedule_work(&qentry->irq_notify.work);
-+#endif
- }
-
- /*
-diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
-index 97f0a2b..a4f45aa 100644
---- a/drivers/thermal/x86_pkg_temp_thermal.c
-+++ b/drivers/thermal/x86_pkg_temp_thermal.c
-@@ -29,6 +29,7 @@
- #include <linux/pm.h>
- #include <linux/thermal.h>
- #include <linux/debugfs.h>
-+#include <linux/swork.h>
- #include <asm/cpu_device_id.h>
- #include <asm/mce.h>
-
-@@ -352,7 +353,7 @@ static void pkg_temp_thermal_threshold_work_fn(struct work_struct *work)
- }
- }
-
--static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
-+static void platform_thermal_notify_work(struct swork_event *event)
- {
- unsigned long flags;
- int cpu = smp_processor_id();
-@@ -369,7 +370,7 @@ static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
- pkg_work_scheduled[phy_id]) {
- disable_pkg_thres_interrupt();
- spin_unlock_irqrestore(&pkg_work_lock, flags);
-- return -EINVAL;
-+ return;
- }
- pkg_work_scheduled[phy_id] = 1;
- spin_unlock_irqrestore(&pkg_work_lock, flags);
-@@ -378,9 +379,48 @@ static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
- schedule_delayed_work_on(cpu,
- &per_cpu(pkg_temp_thermal_threshold_work, cpu),
- msecs_to_jiffies(notify_delay_ms));
-+}
-+
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+static struct swork_event notify_work;
-+
-+static int thermal_notify_work_init(void)
-+{
-+ int err;
-+
-+ err = swork_get();
-+ if (err)
-+ return err;
-+
-+ INIT_SWORK(¬ify_work, platform_thermal_notify_work);
- return 0;
- }
-
-+static void thermal_notify_work_cleanup(void)
-+{
-+ swork_put();
-+}
-+
-+static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
-+{
-+ swork_queue(¬ify_work);
-+ return 0;
-+}
-+
-+#else /* !CONFIG_PREEMPT_RT_FULL */
-+
-+static int thermal_notify_work_init(void) { return 0; }
-+
-+static void thermal_notify_work_cleanup(void) { }
-+
-+static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
-+{
-+ platform_thermal_notify_work(NULL);
-+
-+ return 0;
-+}
-+#endif /* CONFIG_PREEMPT_RT_FULL */
-+
- static int find_siblings_cpu(int cpu)
- {
- int i;
-@@ -584,6 +624,9 @@ static int __init pkg_temp_thermal_init(void)
- if (!x86_match_cpu(pkg_temp_thermal_ids))
- return -ENODEV;
-
-+ if (!thermal_notify_work_init())
-+ return -ENODEV;
-+
- spin_lock_init(&pkg_work_lock);
- platform_thermal_package_notify =
- pkg_temp_thermal_platform_thermal_notify;
-@@ -608,7 +651,7 @@ err_ret:
- kfree(pkg_work_scheduled);
- platform_thermal_package_notify = NULL;
- platform_thermal_package_rate_control = NULL;
--
-+ thermal_notify_work_cleanup();
- return -ENODEV;
- }
-
-@@ -633,6 +676,7 @@ static void __exit pkg_temp_thermal_exit(void)
- mutex_unlock(&phy_dev_list_mutex);
- platform_thermal_package_notify = NULL;
- platform_thermal_package_rate_control = NULL;
-+ thermal_notify_work_cleanup();
- for_each_online_cpu(i)
- cancel_delayed_work_sync(
- &per_cpu(pkg_temp_thermal_threshold_work, i));
-diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
-index dcf43f6..a9ae571 100644
---- a/drivers/tty/serial/8250/8250_core.c
-+++ b/drivers/tty/serial/8250/8250_core.c
-@@ -58,7 +58,16 @@ static struct uart_driver serial8250_reg;
-
- static unsigned int skip_txen_test; /* force skip of txen test at init time */
-
--#define PASS_LIMIT 512
-+/*
-+ * On -rt we can have a more delays, and legitimately
-+ * so - so don't drop work spuriously and spam the
-+ * syslog:
-+ */
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+# define PASS_LIMIT 1000000
-+#else
-+# define PASS_LIMIT 512
-+#endif
-
- #include <asm/serial.h>
- /*
-diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
-index bdfa659..747e8f83 100644
---- a/drivers/tty/serial/8250/8250_port.c
-+++ b/drivers/tty/serial/8250/8250_port.c
-@@ -35,6 +35,7 @@
- #include <linux/nmi.h>
- #include <linux/mutex.h>
- #include <linux/slab.h>
-+#include <linux/kdb.h>
- #include <linux/uaccess.h>
- #include <linux/pm_runtime.h>
- #include <linux/timer.h>
-@@ -3110,9 +3111,9 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s,
-
- serial8250_rpm_get(up);
-
-- if (port->sysrq)
-+ if (port->sysrq || oops_in_progress)
- locked = 0;
-- else if (oops_in_progress)
-+ else if (in_kdb_printk())
- locked = spin_trylock_irqsave(&port->lock, flags);
- else
- spin_lock_irqsave(&port->lock, flags);
-diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index 8a9e213..dd1f9a4 100644
---- a/drivers/tty/serial/amba-pl011.c
-+++ b/drivers/tty/serial/amba-pl011.c
-@@ -2167,13 +2167,19 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
-
- clk_enable(uap->clk);
-
-- local_irq_save(flags);
-+ /*
-+ * local_irq_save(flags);
-+ *
-+ * This local_irq_save() is nonsense. If we come in via sysrq
-+ * handling then interrupts are already disabled. Aside of
-+ * that the port.sysrq check is racy on SMP regardless.
-+ */
- if (uap->port.sysrq)
- locked = 0;
- else if (oops_in_progress)
-- locked = spin_trylock(&uap->port.lock);
-+ locked = spin_trylock_irqsave(&uap->port.lock, flags);
- else
-- spin_lock(&uap->port.lock);
-+ spin_lock_irqsave(&uap->port.lock, flags);
-
- /*
- * First save the CR then disable the interrupts
-@@ -2197,8 +2203,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
- pl011_write(old_cr, uap, REG_CR);
-
- if (locked)
-- spin_unlock(&uap->port.lock);
-- local_irq_restore(flags);
-+ spin_unlock_irqrestore(&uap->port.lock, flags);
-
- clk_disable(uap->clk);
- }
-diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
-index a2a5299..0ee7c4c 100644
---- a/drivers/tty/serial/omap-serial.c
-+++ b/drivers/tty/serial/omap-serial.c
-@@ -1257,13 +1257,10 @@ serial_omap_console_write(struct console *co, const char *s,
-
- pm_runtime_get_sync(up->dev);
-
-- local_irq_save(flags);
-- if (up->port.sysrq)
-- locked = 0;
-- else if (oops_in_progress)
-- locked = spin_trylock(&up->port.lock);
-+ if (up->port.sysrq || oops_in_progress)
-+ locked = spin_trylock_irqsave(&up->port.lock, flags);
- else
-- spin_lock(&up->port.lock);
-+ spin_lock_irqsave(&up->port.lock, flags);
-
- /*
- * First save the IER then disable the interrupts
-@@ -1292,8 +1289,7 @@ serial_omap_console_write(struct console *co, const char *s,
- pm_runtime_mark_last_busy(up->dev);
- pm_runtime_put_autosuspend(up->dev);
- if (locked)
-- spin_unlock(&up->port.lock);
-- local_irq_restore(flags);
-+ spin_unlock_irqrestore(&up->port.lock, flags);
- }
-
- static int __init
-diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
-index f36e6df..e086ea4 100644
---- a/drivers/tty/serial/sc16is7xx.c
-+++ b/drivers/tty/serial/sc16is7xx.c
-@@ -1240,7 +1240,7 @@ static int sc16is7xx_probe(struct device *dev,
-
- /* Setup interrupt */
- ret = devm_request_irq(dev, irq, sc16is7xx_irq,
-- IRQF_ONESHOT | flags, dev_name(dev), s);
-+ flags, dev_name(dev), s);
- if (!ret)
- return 0;
-
-diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
-index d2e3f65..fdd027a 100644
---- a/drivers/usb/core/hcd.c
-+++ b/drivers/usb/core/hcd.c
-@@ -1760,9 +1760,9 @@ static void __usb_hcd_giveback_urb(struct urb *urb)
- * and no one may trigger the above deadlock situation when
- * running complete() in tasklet.
- */
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- urb->complete(urb);
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
-
- usb_anchor_resume_wakeups(anchor);
- atomic_dec(&urb->use_count);
-diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
-index 5c8429f..fa835fb 100644
---- a/drivers/usb/gadget/function/f_fs.c
-+++ b/drivers/usb/gadget/function/f_fs.c
-@@ -1509,7 +1509,7 @@ static void ffs_data_put(struct ffs_data *ffs)
- pr_info("%s(): freeing\n", __func__);
- ffs_data_clear(ffs);
- BUG_ON(waitqueue_active(&ffs->ev.waitq) ||
-- waitqueue_active(&ffs->ep0req_completion.wait));
-+ swait_active(&ffs->ep0req_completion.wait));
- kfree(ffs->dev_name);
- kfree(ffs);
- }
-diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
-index 16104b5e..5c506c2 100644
---- a/drivers/usb/gadget/legacy/inode.c
-+++ b/drivers/usb/gadget/legacy/inode.c
-@@ -346,7 +346,7 @@ ep_io (struct ep_data *epdata, void *buf, unsigned len)
- spin_unlock_irq (&epdata->dev->lock);
-
- if (likely (value == 0)) {
-- value = wait_event_interruptible (done.wait, done.done);
-+ value = swait_event_interruptible (done.wait, done.done);
- if (value != 0) {
- spin_lock_irq (&epdata->dev->lock);
- if (likely (epdata->ep != NULL)) {
-@@ -355,7 +355,7 @@ ep_io (struct ep_data *epdata, void *buf, unsigned len)
- usb_ep_dequeue (epdata->ep, epdata->req);
- spin_unlock_irq (&epdata->dev->lock);
-
-- wait_event (done.wait, done.done);
-+ swait_event (done.wait, done.done);
- if (epdata->status == -ECONNRESET)
- epdata->status = -EINTR;
- } else {
-diff --git a/fs/aio.c b/fs/aio.c
-index 4fe81d1..e68c06a 100644
---- a/fs/aio.c
-+++ b/fs/aio.c
-@@ -40,6 +40,7 @@
- #include <linux/ramfs.h>
- #include <linux/percpu-refcount.h>
- #include <linux/mount.h>
-+#include <linux/swork.h>
-
- #include <asm/kmap_types.h>
- #include <asm/uaccess.h>
-@@ -115,7 +116,7 @@ struct kioctx {
- struct page **ring_pages;
- long nr_pages;
-
-- struct work_struct free_work;
-+ struct swork_event free_work;
-
- /*
- * signals when all in-flight requests are done
-@@ -258,6 +259,7 @@ static int __init aio_setup(void)
- .mount = aio_mount,
- .kill_sb = kill_anon_super,
- };
-+ BUG_ON(swork_get());
- aio_mnt = kern_mount(&aio_fs);
- if (IS_ERR(aio_mnt))
- panic("Failed to create aio fs mount.");
-@@ -578,9 +580,9 @@ static int kiocb_cancel(struct aio_kiocb *kiocb)
- return cancel(&kiocb->common);
- }
-
--static void free_ioctx(struct work_struct *work)
-+static void free_ioctx(struct swork_event *sev)
- {
-- struct kioctx *ctx = container_of(work, struct kioctx, free_work);
-+ struct kioctx *ctx = container_of(sev, struct kioctx, free_work);
-
- pr_debug("freeing %p\n", ctx);
-
-@@ -599,8 +601,8 @@ static void free_ioctx_reqs(struct percpu_ref *ref)
- if (ctx->rq_wait && atomic_dec_and_test(&ctx->rq_wait->count))
- complete(&ctx->rq_wait->comp);
-
-- INIT_WORK(&ctx->free_work, free_ioctx);
-- schedule_work(&ctx->free_work);
-+ INIT_SWORK(&ctx->free_work, free_ioctx);
-+ swork_queue(&ctx->free_work);
- }
-
- /*
-@@ -608,9 +610,9 @@ static void free_ioctx_reqs(struct percpu_ref *ref)
- * and ctx->users has dropped to 0, so we know no more kiocbs can be submitted -
- * now it's safe to cancel any that need to be.
- */
--static void free_ioctx_users(struct percpu_ref *ref)
-+static void free_ioctx_users_work(struct swork_event *sev)
- {
-- struct kioctx *ctx = container_of(ref, struct kioctx, users);
-+ struct kioctx *ctx = container_of(sev, struct kioctx, free_work);
- struct aio_kiocb *req;
-
- spin_lock_irq(&ctx->ctx_lock);
-@@ -629,6 +631,14 @@ static void free_ioctx_users(struct percpu_ref *ref)
- percpu_ref_put(&ctx->reqs);
- }
-
-+static void free_ioctx_users(struct percpu_ref *ref)
-+{
-+ struct kioctx *ctx = container_of(ref, struct kioctx, users);
-+
-+ INIT_SWORK(&ctx->free_work, free_ioctx_users_work);
-+ swork_queue(&ctx->free_work);
-+}
-+
- static int ioctx_add_table(struct kioctx *ctx, struct mm_struct *mm)
- {
- unsigned i, new_nr;
-diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h
-index a439548..7c39264 100644
---- a/fs/autofs4/autofs_i.h
-+++ b/fs/autofs4/autofs_i.h
-@@ -30,6 +30,7 @@
- #include <linux/sched.h>
- #include <linux/mount.h>
- #include <linux/namei.h>
-+#include <linux/delay.h>
- #include <asm/current.h>
- #include <linux/uaccess.h>
-
-diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
-index d8e6d42..2e689ab 100644
---- a/fs/autofs4/expire.c
-+++ b/fs/autofs4/expire.c
-@@ -148,7 +148,7 @@ again:
- parent = p->d_parent;
- if (!spin_trylock(&parent->d_lock)) {
- spin_unlock(&p->d_lock);
-- cpu_relax();
-+ cpu_chill();
- goto relock;
- }
- spin_unlock(&p->d_lock);
-diff --git a/fs/buffer.c b/fs/buffer.c
-index 9c8eb9b..d15d77f 100644
---- a/fs/buffer.c
-+++ b/fs/buffer.c
-@@ -301,8 +301,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
- * decide that the page is now completely done.
- */
- first = page_buffers(page);
-- local_irq_save(flags);
-- bit_spin_lock(BH_Uptodate_Lock, &first->b_state);
-+ flags = bh_uptodate_lock_irqsave(first);
- clear_buffer_async_read(bh);
- unlock_buffer(bh);
- tmp = bh;
-@@ -315,8 +314,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
- }
- tmp = tmp->b_this_page;
- } while (tmp != bh);
-- bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
-- local_irq_restore(flags);
-+ bh_uptodate_unlock_irqrestore(first, flags);
-
- /*
- * If none of the buffers had errors and they are all
-@@ -328,9 +326,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
- return;
-
- still_busy:
-- bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
-- local_irq_restore(flags);
-- return;
-+ bh_uptodate_unlock_irqrestore(first, flags);
- }
-
- /*
-@@ -358,8 +354,7 @@ void end_buffer_async_write(struct buffer_head *bh, int uptodate)
- }
-
- first = page_buffers(page);
-- local_irq_save(flags);
-- bit_spin_lock(BH_Uptodate_Lock, &first->b_state);
-+ flags = bh_uptodate_lock_irqsave(first);
-
- clear_buffer_async_write(bh);
- unlock_buffer(bh);
-@@ -371,15 +366,12 @@ void end_buffer_async_write(struct buffer_head *bh, int uptodate)
- }
- tmp = tmp->b_this_page;
- }
-- bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
-- local_irq_restore(flags);
-+ bh_uptodate_unlock_irqrestore(first, flags);
- end_page_writeback(page);
- return;
-
- still_busy:
-- bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
-- local_irq_restore(flags);
-- return;
-+ bh_uptodate_unlock_irqrestore(first, flags);
- }
- EXPORT_SYMBOL(end_buffer_async_write);
-
-@@ -3384,6 +3376,7 @@ struct buffer_head *alloc_buffer_head(gfp_t gfp_flags)
- struct buffer_head *ret = kmem_cache_zalloc(bh_cachep, gfp_flags);
- if (ret) {
- INIT_LIST_HEAD(&ret->b_assoc_buffers);
-+ buffer_head_init_locks(ret);
- preempt_disable();
- __this_cpu_inc(bh_accounting.nr);
- recalc_bh_state();
-diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
-index 65cf85d..585b991f 100644
---- a/fs/cifs/readdir.c
-+++ b/fs/cifs/readdir.c
-@@ -80,7 +80,7 @@ cifs_prime_dcache(struct dentry *parent, struct qstr *name,
- struct inode *inode;
- struct super_block *sb = parent->d_sb;
- struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
-- DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
-+ DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
-
- cifs_dbg(FYI, "%s: for %s\n", __func__, name->name);
-
-diff --git a/fs/dcache.c b/fs/dcache.c
-index 5c7cc95..a9bb31f 100644
---- a/fs/dcache.c
-+++ b/fs/dcache.c
-@@ -19,6 +19,7 @@
- #include <linux/mm.h>
- #include <linux/fs.h>
- #include <linux/fsnotify.h>
-+#include <linux/delay.h>
- #include <linux/slab.h>
- #include <linux/init.h>
- #include <linux/hash.h>
-@@ -750,6 +751,8 @@ static inline bool fast_dput(struct dentry *dentry)
- */
- void dput(struct dentry *dentry)
- {
-+ struct dentry *parent;
-+
- if (unlikely(!dentry))
- return;
-
-@@ -788,9 +791,18 @@ repeat:
- return;
-
- kill_it:
-- dentry = dentry_kill(dentry);
-- if (dentry) {
-- cond_resched();
-+ parent = dentry_kill(dentry);
-+ if (parent) {
-+ int r;
-+
-+ if (parent == dentry) {
-+ /* the task with the highest priority won't schedule */
-+ r = cond_resched();
-+ if (!r)
-+ cpu_chill();
-+ } else {
-+ dentry = parent;
-+ }
- goto repeat;
- }
- }
-@@ -2321,7 +2333,7 @@ again:
- if (dentry->d_lockref.count == 1) {
- if (!spin_trylock(&inode->i_lock)) {
- spin_unlock(&dentry->d_lock);
-- cpu_relax();
-+ cpu_chill();
- goto again;
- }
- dentry->d_flags &= ~DCACHE_CANT_MOUNT;
-@@ -2381,21 +2393,24 @@ static inline void end_dir_add(struct inode *dir, unsigned n)
-
- static void d_wait_lookup(struct dentry *dentry)
- {
-- if (d_in_lookup(dentry)) {
-- DECLARE_WAITQUEUE(wait, current);
-- add_wait_queue(dentry->d_wait, &wait);
-- do {
-- set_current_state(TASK_UNINTERRUPTIBLE);
-- spin_unlock(&dentry->d_lock);
-- schedule();
-- spin_lock(&dentry->d_lock);
-- } while (d_in_lookup(dentry));
-- }
-+ struct swait_queue __wait;
-+
-+ if (!d_in_lookup(dentry))
-+ return;
-+
-+ INIT_LIST_HEAD(&__wait.task_list);
-+ do {
-+ prepare_to_swait(dentry->d_wait, &__wait, TASK_UNINTERRUPTIBLE);
-+ spin_unlock(&dentry->d_lock);
-+ schedule();
-+ spin_lock(&dentry->d_lock);
-+ } while (d_in_lookup(dentry));
-+ finish_swait(dentry->d_wait, &__wait);
- }
-
- struct dentry *d_alloc_parallel(struct dentry *parent,
- const struct qstr *name,
-- wait_queue_head_t *wq)
-+ struct swait_queue_head *wq)
- {
- unsigned int hash = name->hash;
- struct hlist_bl_head *b = in_lookup_hash(parent, hash);
-@@ -2504,7 +2519,7 @@ void __d_lookup_done(struct dentry *dentry)
- hlist_bl_lock(b);
- dentry->d_flags &= ~DCACHE_PAR_LOOKUP;
- __hlist_bl_del(&dentry->d_u.d_in_lookup_hash);
-- wake_up_all(dentry->d_wait);
-+ swake_up_all(dentry->d_wait);
- dentry->d_wait = NULL;
- hlist_bl_unlock(b);
- INIT_HLIST_NODE(&dentry->d_u.d_alias);
-@@ -3601,6 +3616,11 @@ EXPORT_SYMBOL(d_genocide);
-
- void __init vfs_caches_init_early(void)
- {
-+ int i;
-+
-+ for (i = 0; i < ARRAY_SIZE(in_lookup_hashtable); i++)
-+ INIT_HLIST_BL_HEAD(&in_lookup_hashtable[i]);
-+
- dcache_init_early();
- inode_init_early();
- }
-diff --git a/fs/eventpoll.c b/fs/eventpoll.c
-index 10db912..42af0a0 100644
---- a/fs/eventpoll.c
-+++ b/fs/eventpoll.c
-@@ -510,12 +510,12 @@ static int ep_poll_wakeup_proc(void *priv, void *cookie, int call_nests)
- */
- static void ep_poll_safewake(wait_queue_head_t *wq)
- {
-- int this_cpu = get_cpu();
-+ int this_cpu = get_cpu_light();
-
- ep_call_nested(&poll_safewake_ncalls, EP_MAX_NESTS,
- ep_poll_wakeup_proc, NULL, wq, (void *) (long) this_cpu);
-
-- put_cpu();
-+ put_cpu_light();
- }
-
- static void ep_remove_wait_queue(struct eppoll_entry *pwq)
-diff --git a/fs/exec.c b/fs/exec.c
-index 6fcfb3f..751370a 100644
---- a/fs/exec.c
-+++ b/fs/exec.c
-@@ -1012,12 +1012,14 @@ static int exec_mmap(struct mm_struct *mm)
- }
- }
- task_lock(tsk);
-+ preempt_disable_rt();
- active_mm = tsk->active_mm;
- tsk->mm = mm;
- tsk->active_mm = mm;
- activate_mm(active_mm, mm);
- tsk->mm->vmacache_seqnum = 0;
- vmacache_flush(tsk);
-+ preempt_enable_rt();
- task_unlock(tsk);
- if (old_mm) {
- up_read(&old_mm->mmap_sem);
-diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
-index c47b778..50b2106 100644
---- a/fs/fuse/dir.c
-+++ b/fs/fuse/dir.c
-@@ -1174,7 +1174,7 @@ static int fuse_direntplus_link(struct file *file,
- struct inode *dir = d_inode(parent);
- struct fuse_conn *fc;
- struct inode *inode;
-- DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
-+ DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
-
- if (!o->nodeid) {
- /*
-diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
-index 684996c..6e18a06 100644
---- a/fs/jbd2/checkpoint.c
-+++ b/fs/jbd2/checkpoint.c
-@@ -116,6 +116,8 @@ void __jbd2_log_wait_for_space(journal_t *journal)
- nblocks = jbd2_space_needed(journal);
- while (jbd2_log_space_left(journal) < nblocks) {
- write_unlock(&journal->j_state_lock);
-+ if (current->plug)
-+ io_schedule();
- mutex_lock(&journal->j_checkpoint_mutex);
-
- /*
-diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
-index b5bc3e2..3d8246a 100644
---- a/fs/jbd2/transaction.c
-+++ b/fs/jbd2/transaction.c
-@@ -159,6 +159,7 @@ static void wait_transaction_locked(journal_t *journal)
- read_unlock(&journal->j_state_lock);
- if (need_to_start)
- jbd2_log_start_commit(journal, tid);
-+ jbd2_might_wait_for_commit(journal);
- schedule();
- finish_wait(&journal->j_wait_transaction_locked, &wait);
- }
-@@ -182,8 +183,6 @@ static int add_transaction_credits(journal_t *journal, int blocks,
- int needed;
- int total = blocks + rsv_blocks;
-
-- jbd2_might_wait_for_commit(journal);
--
- /*
- * If the current transaction is locked down for commit, wait
- * for the lock to be released.
-@@ -214,6 +213,7 @@ static int add_transaction_credits(journal_t *journal, int blocks,
- if (atomic_read(&journal->j_reserved_credits) + total >
- journal->j_max_transaction_buffers) {
- read_unlock(&journal->j_state_lock);
-+ jbd2_might_wait_for_commit(journal);
- wait_event(journal->j_wait_reserved,
- atomic_read(&journal->j_reserved_credits) + total <=
- journal->j_max_transaction_buffers);
-@@ -238,6 +238,7 @@ static int add_transaction_credits(journal_t *journal, int blocks,
- if (jbd2_log_space_left(journal) < jbd2_space_needed(journal)) {
- atomic_sub(total, &t->t_outstanding_credits);
- read_unlock(&journal->j_state_lock);
-+ jbd2_might_wait_for_commit(journal);
- write_lock(&journal->j_state_lock);
- if (jbd2_log_space_left(journal) < jbd2_space_needed(journal))
- __jbd2_log_wait_for_space(journal);
-@@ -255,6 +256,7 @@ static int add_transaction_credits(journal_t *journal, int blocks,
- sub_reserved_credits(journal, rsv_blocks);
- atomic_sub(total, &t->t_outstanding_credits);
- read_unlock(&journal->j_state_lock);
-+ jbd2_might_wait_for_commit(journal);
- wait_event(journal->j_wait_reserved,
- atomic_read(&journal->j_reserved_credits) + rsv_blocks
- <= journal->j_max_transaction_buffers / 2);
-diff --git a/fs/namei.c b/fs/namei.c
-index adb0414..a89dfaf 100644
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -1629,7 +1629,7 @@ static struct dentry *lookup_slow(const struct qstr *name,
- {
- struct dentry *dentry = ERR_PTR(-ENOENT), *old;
- struct inode *inode = dir->d_inode;
-- DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
-+ DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
-
- inode_lock_shared(inode);
- /* Don't go there if it's already dead */
-@@ -3086,7 +3086,7 @@ static int lookup_open(struct nameidata *nd, struct path *path,
- struct dentry *dentry;
- int error, create_error = 0;
- umode_t mode = op->mode;
-- DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
-+ DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
-
- if (unlikely(IS_DEADDIR(dir_inode)))
- return -ENOENT;
-diff --git a/fs/namespace.c b/fs/namespace.c
-index 7bb2cda..cf79b18 100644
---- a/fs/namespace.c
-+++ b/fs/namespace.c
-@@ -14,6 +14,7 @@
- #include <linux/mnt_namespace.h>
- #include <linux/user_namespace.h>
- #include <linux/namei.h>
-+#include <linux/delay.h>
- #include <linux/security.h>
- #include <linux/idr.h>
- #include <linux/init.h> /* init_rootfs */
-@@ -353,8 +354,11 @@ int __mnt_want_write(struct vfsmount *m)
- * incremented count after it has set MNT_WRITE_HOLD.
- */
- smp_mb();
-- while (ACCESS_ONCE(mnt->mnt.mnt_flags) & MNT_WRITE_HOLD)
-- cpu_relax();
-+ while (ACCESS_ONCE(mnt->mnt.mnt_flags) & MNT_WRITE_HOLD) {
-+ preempt_enable();
-+ cpu_chill();
-+ preempt_disable();
-+ }
- /*
- * After the slowpath clears MNT_WRITE_HOLD, mnt_is_readonly will
- * be set to match its requirements. So we must not load that until
-diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
-index 177fefb..938ed59 100644
---- a/fs/nfs/dir.c
-+++ b/fs/nfs/dir.c
-@@ -485,7 +485,7 @@ static
- void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry)
- {
- struct qstr filename = QSTR_INIT(entry->name, entry->len);
-- DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
-+ DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
- struct dentry *dentry;
- struct dentry *alias;
- struct inode *dir = d_inode(parent);
-@@ -1484,7 +1484,7 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry,
- struct file *file, unsigned open_flags,
- umode_t mode, int *opened)
- {
-- DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
-+ DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
- struct nfs_open_context *ctx;
- struct dentry *res;
- struct iattr attr = { .ia_valid = ATTR_OPEN };
-@@ -1799,7 +1799,11 @@ int nfs_rmdir(struct inode *dir, struct dentry *dentry)
-
- trace_nfs_rmdir_enter(dir, dentry);
- if (d_really_is_positive(dentry)) {
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ down(&NFS_I(d_inode(dentry))->rmdir_sem);
-+#else
- down_write(&NFS_I(d_inode(dentry))->rmdir_sem);
-+#endif
- error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name);
- /* Ensure the VFS deletes this inode */
- switch (error) {
-@@ -1809,7 +1813,11 @@ int nfs_rmdir(struct inode *dir, struct dentry *dentry)
- case -ENOENT:
- nfs_dentry_handle_enoent(dentry);
- }
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ up(&NFS_I(d_inode(dentry))->rmdir_sem);
-+#else
- up_write(&NFS_I(d_inode(dentry))->rmdir_sem);
-+#endif
- } else
- error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name);
- trace_nfs_rmdir_exit(dir, dentry, error);
-diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
-index bf4ec5e..36cd5fc9 100644
---- a/fs/nfs/inode.c
-+++ b/fs/nfs/inode.c
-@@ -1957,7 +1957,11 @@ static void init_once(void *foo)
- nfsi->nrequests = 0;
- nfsi->commit_info.ncommit = 0;
- atomic_set(&nfsi->commit_info.rpcs_out, 0);
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ sema_init(&nfsi->rmdir_sem, 1);
-+#else
- init_rwsem(&nfsi->rmdir_sem);
-+#endif
- nfs4_init_once(nfsi);
- }
-
-diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
-index 191aa57..58990c8 100644
---- a/fs/nfs/unlink.c
-+++ b/fs/nfs/unlink.c
-@@ -12,7 +12,7 @@
- #include <linux/sunrpc/clnt.h>
- #include <linux/nfs_fs.h>
- #include <linux/sched.h>
--#include <linux/wait.h>
-+#include <linux/swait.h>
- #include <linux/namei.h>
- #include <linux/fsnotify.h>
-
-@@ -51,6 +51,29 @@ static void nfs_async_unlink_done(struct rpc_task *task, void *calldata)
- rpc_restart_call_prepare(task);
- }
-
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+static void nfs_down_anon(struct semaphore *sema)
-+{
-+ down(sema);
-+}
-+
-+static void nfs_up_anon(struct semaphore *sema)
-+{
-+ up(sema);
-+}
-+
-+#else
-+static void nfs_down_anon(struct rw_semaphore *rwsem)
-+{
-+ down_read_non_owner(rwsem);
-+}
-+
-+static void nfs_up_anon(struct rw_semaphore *rwsem)
-+{
-+ up_read_non_owner(rwsem);
-+}
-+#endif
-+
- /**
- * nfs_async_unlink_release - Release the sillydelete data.
- * @task: rpc_task of the sillydelete
-@@ -64,7 +87,7 @@ static void nfs_async_unlink_release(void *calldata)
- struct dentry *dentry = data->dentry;
- struct super_block *sb = dentry->d_sb;
-
-- up_read_non_owner(&NFS_I(d_inode(dentry->d_parent))->rmdir_sem);
-+ nfs_up_anon(&NFS_I(d_inode(dentry->d_parent))->rmdir_sem);
- d_lookup_done(dentry);
- nfs_free_unlinkdata(data);
- dput(dentry);
-@@ -117,10 +140,10 @@ static int nfs_call_unlink(struct dentry *dentry, struct nfs_unlinkdata *data)
- struct inode *dir = d_inode(dentry->d_parent);
- struct dentry *alias;
-
-- down_read_non_owner(&NFS_I(dir)->rmdir_sem);
-+ nfs_down_anon(&NFS_I(dir)->rmdir_sem);
- alias = d_alloc_parallel(dentry->d_parent, &data->args.name, &data->wq);
- if (IS_ERR(alias)) {
-- up_read_non_owner(&NFS_I(dir)->rmdir_sem);
-+ nfs_up_anon(&NFS_I(dir)->rmdir_sem);
- return 0;
- }
- if (!d_in_lookup(alias)) {
-@@ -142,7 +165,7 @@ static int nfs_call_unlink(struct dentry *dentry, struct nfs_unlinkdata *data)
- ret = 0;
- spin_unlock(&alias->d_lock);
- dput(alias);
-- up_read_non_owner(&NFS_I(dir)->rmdir_sem);
-+ nfs_up_anon(&NFS_I(dir)->rmdir_sem);
- /*
- * If we'd displaced old cached devname, free it. At that
- * point dentry is definitely not a root, so we won't need
-@@ -182,7 +205,7 @@ nfs_async_unlink(struct dentry *dentry, const struct qstr *name)
- goto out_free_name;
- }
- data->res.dir_attr = &data->dir_attr;
-- init_waitqueue_head(&data->wq);
-+ init_swait_queue_head(&data->wq);
-
- status = -EBUSY;
- spin_lock(&dentry->d_lock);
-diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c
-index fe251f1..e89da4f 100644
---- a/fs/ntfs/aops.c
-+++ b/fs/ntfs/aops.c
-@@ -92,13 +92,13 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
- ofs = 0;
- if (file_ofs < init_size)
- ofs = init_size - file_ofs;
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- kaddr = kmap_atomic(page);
- memset(kaddr + bh_offset(bh) + ofs, 0,
- bh->b_size - ofs);
- flush_dcache_page(page);
- kunmap_atomic(kaddr);
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- }
- } else {
- clear_buffer_uptodate(bh);
-@@ -107,8 +107,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
- "0x%llx.", (unsigned long long)bh->b_blocknr);
- }
- first = page_buffers(page);
-- local_irq_save(flags);
-- bit_spin_lock(BH_Uptodate_Lock, &first->b_state);
-+ flags = bh_uptodate_lock_irqsave(first);
- clear_buffer_async_read(bh);
- unlock_buffer(bh);
- tmp = bh;
-@@ -123,8 +122,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
- }
- tmp = tmp->b_this_page;
- } while (tmp != bh);
-- bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
-- local_irq_restore(flags);
-+ bh_uptodate_unlock_irqrestore(first, flags);
- /*
- * If none of the buffers had errors then we can set the page uptodate,
- * but we first have to perform the post read mst fixups, if the
-@@ -145,13 +143,13 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
- recs = PAGE_SIZE / rec_size;
- /* Should have been verified before we got here... */
- BUG_ON(!recs);
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- kaddr = kmap_atomic(page);
- for (i = 0; i < recs; i++)
- post_read_mst_fixup((NTFS_RECORD*)(kaddr +
- i * rec_size), rec_size);
- kunmap_atomic(kaddr);
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- flush_dcache_page(page);
- if (likely(page_uptodate && !PageError(page)))
- SetPageUptodate(page);
-@@ -159,9 +157,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
- unlock_page(page);
- return;
- still_busy:
-- bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
-- local_irq_restore(flags);
-- return;
-+ bh_uptodate_unlock_irqrestore(first, flags);
- }
-
- /**
-diff --git a/fs/proc/base.c b/fs/proc/base.c
-index ac0df4d..ad1a472 100644
---- a/fs/proc/base.c
-+++ b/fs/proc/base.c
-@@ -1819,7 +1819,7 @@ bool proc_fill_cache(struct file *file, struct dir_context *ctx,
-
- child = d_hash_and_lookup(dir, &qname);
- if (!child) {
-- DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
-+ DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
- child = d_alloc_parallel(dir, &qname, &wq);
- if (IS_ERR(child))
- goto end_instantiate;
-diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
-index 1b93650..c553bf3 100644
---- a/fs/proc/proc_sysctl.c
-+++ b/fs/proc/proc_sysctl.c
-@@ -627,7 +627,7 @@ static bool proc_sys_fill_cache(struct file *file,
-
- child = d_lookup(dir, &qname);
- if (!child) {
-- DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
-+ DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
- child = d_alloc_parallel(dir, &qname, &wq);
- if (IS_ERR(child))
- return false;
-diff --git a/fs/timerfd.c b/fs/timerfd.c
-index 9ae4abb..8644b67 100644
---- a/fs/timerfd.c
-+++ b/fs/timerfd.c
-@@ -460,7 +460,10 @@ static int do_timerfd_settime(int ufd, int flags,
- break;
- }
- spin_unlock_irq(&ctx->wqh.lock);
-- cpu_relax();
-+ if (isalarm(ctx))
-+ hrtimer_wait_for_timer(&ctx->t.alarm.timer);
-+ else
-+ hrtimer_wait_for_timer(&ctx->t.tmr);
- }
-
- /*
-diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
-index 93b61b1..58270ad 100644
---- a/include/acpi/platform/aclinux.h
-+++ b/include/acpi/platform/aclinux.h
-@@ -131,6 +131,7 @@
-
- #define acpi_cache_t struct kmem_cache
- #define acpi_spinlock spinlock_t *
-+#define acpi_raw_spinlock raw_spinlock_t *
- #define acpi_cpu_flags unsigned long
-
- /* Use native linux version of acpi_os_allocate_zeroed */
-@@ -149,6 +150,20 @@
- #define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_thread_id
- #define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_create_lock
-
-+#define acpi_os_create_raw_lock(__handle) \
-+({ \
-+ raw_spinlock_t *lock = ACPI_ALLOCATE(sizeof(*lock)); \
-+ \
-+ if (lock) { \
-+ *(__handle) = lock; \
-+ raw_spin_lock_init(*(__handle)); \
-+ } \
-+ lock ? AE_OK : AE_NO_MEMORY; \
-+ })
-+
-+#define acpi_os_delete_raw_lock(__handle) kfree(__handle)
-+
-+
- /*
- * OSL interfaces used by debugger/disassembler
- */
-diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
-index 6f96247..fa53a21 100644
---- a/include/asm-generic/bug.h
-+++ b/include/asm-generic/bug.h
-@@ -215,6 +215,20 @@ void __warn(const char *file, int line, void *caller, unsigned taint,
- # define WARN_ON_SMP(x) ({0;})
- #endif
-
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+# define BUG_ON_RT(c) BUG_ON(c)
-+# define BUG_ON_NONRT(c) do { } while (0)
-+# define WARN_ON_RT(condition) WARN_ON(condition)
-+# define WARN_ON_NONRT(condition) do { } while (0)
-+# define WARN_ON_ONCE_NONRT(condition) do { } while (0)
-+#else
-+# define BUG_ON_RT(c) do { } while (0)
-+# define BUG_ON_NONRT(c) BUG_ON(c)
-+# define WARN_ON_RT(condition) do { } while (0)
-+# define WARN_ON_NONRT(condition) WARN_ON(condition)
-+# define WARN_ON_ONCE_NONRT(condition) WARN_ON_ONCE(condition)
-+#endif
-+
- #endif /* __ASSEMBLY__ */
-
- #endif
-diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
-index e43bbff..c238922 100644
---- a/include/linux/blk-mq.h
-+++ b/include/linux/blk-mq.h
-@@ -222,6 +222,7 @@ static inline u16 blk_mq_unique_tag_to_tag(u32 unique_tag)
-
- struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *, const int ctx_index);
- struct blk_mq_hw_ctx *blk_mq_alloc_single_hw_queue(struct blk_mq_tag_set *, unsigned int, int);
-+void __blk_mq_complete_request_remote_work(struct work_struct *work);
-
- int blk_mq_request_started(struct request *rq);
- void blk_mq_start_request(struct request *rq);
-diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
-index e79055c..8583c1a 100644
---- a/include/linux/blkdev.h
-+++ b/include/linux/blkdev.h
-@@ -89,6 +89,7 @@ struct request {
- struct list_head queuelist;
- union {
- struct call_single_data csd;
-+ struct work_struct work;
- u64 fifo_time;
- };
-
-@@ -467,7 +468,7 @@ struct request_queue {
- struct throtl_data *td;
- #endif
- struct rcu_head rcu_head;
-- wait_queue_head_t mq_freeze_wq;
-+ struct swait_queue_head mq_freeze_wq;
- struct percpu_ref q_usage_counter;
- struct list_head all_q_node;
-
-diff --git a/include/linux/bottom_half.h b/include/linux/bottom_half.h
-index 8fdcb78..d07dbee 100644
---- a/include/linux/bottom_half.h
-+++ b/include/linux/bottom_half.h
-@@ -3,6 +3,39 @@
-
- #include <linux/preempt.h>
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+
-+extern void __local_bh_disable(void);
-+extern void _local_bh_enable(void);
-+extern void __local_bh_enable(void);
-+
-+static inline void local_bh_disable(void)
-+{
-+ __local_bh_disable();
-+}
-+
-+static inline void __local_bh_disable_ip(unsigned long ip, unsigned int cnt)
-+{
-+ __local_bh_disable();
-+}
-+
-+static inline void local_bh_enable(void)
-+{
-+ __local_bh_enable();
-+}
-+
-+static inline void __local_bh_enable_ip(unsigned long ip, unsigned int cnt)
-+{
-+ __local_bh_enable();
-+}
-+
-+static inline void local_bh_enable_ip(unsigned long ip)
-+{
-+ __local_bh_enable();
-+}
-+
-+#else
-+
- #ifdef CONFIG_TRACE_IRQFLAGS
- extern void __local_bh_disable_ip(unsigned long ip, unsigned int cnt);
- #else
-@@ -30,5 +63,6 @@ static inline void local_bh_enable(void)
- {
- __local_bh_enable_ip(_THIS_IP_, SOFTIRQ_DISABLE_OFFSET);
- }
-+#endif
-
- #endif /* _LINUX_BH_H */
-diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
-index ebbacd1..be5e87f 100644
---- a/include/linux/buffer_head.h
-+++ b/include/linux/buffer_head.h
-@@ -75,8 +75,50 @@ struct buffer_head {
- struct address_space *b_assoc_map; /* mapping this buffer is
- associated with */
- atomic_t b_count; /* users using this buffer_head */
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ spinlock_t b_uptodate_lock;
-+#if IS_ENABLED(CONFIG_JBD2)
-+ spinlock_t b_state_lock;
-+ spinlock_t b_journal_head_lock;
-+#endif
-+#endif
- };
-
-+static inline unsigned long bh_uptodate_lock_irqsave(struct buffer_head *bh)
-+{
-+ unsigned long flags;
-+
-+#ifndef CONFIG_PREEMPT_RT_BASE
-+ local_irq_save(flags);
-+ bit_spin_lock(BH_Uptodate_Lock, &bh->b_state);
-+#else
-+ spin_lock_irqsave(&bh->b_uptodate_lock, flags);
-+#endif
-+ return flags;
-+}
-+
-+static inline void
-+bh_uptodate_unlock_irqrestore(struct buffer_head *bh, unsigned long flags)
-+{
-+#ifndef CONFIG_PREEMPT_RT_BASE
-+ bit_spin_unlock(BH_Uptodate_Lock, &bh->b_state);
-+ local_irq_restore(flags);
-+#else
-+ spin_unlock_irqrestore(&bh->b_uptodate_lock, flags);
-+#endif
-+}
-+
-+static inline void buffer_head_init_locks(struct buffer_head *bh)
-+{
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ spin_lock_init(&bh->b_uptodate_lock);
-+#if IS_ENABLED(CONFIG_JBD2)
-+ spin_lock_init(&bh->b_state_lock);
-+ spin_lock_init(&bh->b_journal_head_lock);
-+#endif
-+#endif
-+}
-+
- /*
- * macro tricks to expand the set_buffer_foo(), clear_buffer_foo()
- * and buffer_foo() functions.
-diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h
-index 5b17de6..56027cc 100644
---- a/include/linux/cgroup-defs.h
-+++ b/include/linux/cgroup-defs.h
-@@ -16,6 +16,7 @@
- #include <linux/percpu-refcount.h>
- #include <linux/percpu-rwsem.h>
- #include <linux/workqueue.h>
-+#include <linux/swork.h>
-
- #ifdef CONFIG_CGROUPS
-
-@@ -137,6 +138,7 @@ struct cgroup_subsys_state {
- /* percpu_ref killing and RCU release */
- struct rcu_head rcu_head;
- struct work_struct destroy_work;
-+ struct swork_event destroy_swork;
- };
-
- /*
-diff --git a/include/linux/completion.h b/include/linux/completion.h
-index 5d5aaae..3bca159 100644
---- a/include/linux/completion.h
-+++ b/include/linux/completion.h
-@@ -7,8 +7,7 @@
- * Atomic wait-for-completion handler data structures.
- * See kernel/sched/completion.c for details.
- */
--
--#include <linux/wait.h>
-+#include <linux/swait.h>
-
- /*
- * struct completion - structure used to maintain state for a "completion"
-@@ -24,11 +23,11 @@
- */
- struct completion {
- unsigned int done;
-- wait_queue_head_t wait;
-+ struct swait_queue_head wait;
- };
-
- #define COMPLETION_INITIALIZER(work) \
-- { 0, __WAIT_QUEUE_HEAD_INITIALIZER((work).wait) }
-+ { 0, __SWAIT_QUEUE_HEAD_INITIALIZER((work).wait) }
-
- #define COMPLETION_INITIALIZER_ONSTACK(work) \
- ({ init_completion(&work); work; })
-@@ -73,7 +72,7 @@ struct completion {
- static inline void init_completion(struct completion *x)
- {
- x->done = 0;
-- init_waitqueue_head(&x->wait);
-+ init_swait_queue_head(&x->wait);
- }
-
- /**
-diff --git a/include/linux/cpu.h b/include/linux/cpu.h
-index 797d9c8..6eabd9e 100644
---- a/include/linux/cpu.h
-+++ b/include/linux/cpu.h
-@@ -201,6 +201,8 @@ extern void get_online_cpus(void);
- extern void put_online_cpus(void);
- extern void cpu_hotplug_disable(void);
- extern void cpu_hotplug_enable(void);
-+extern void pin_current_cpu(void);
-+extern void unpin_current_cpu(void);
- #define hotcpu_notifier(fn, pri) cpu_notifier(fn, pri)
- #define __hotcpu_notifier(fn, pri) __cpu_notifier(fn, pri)
- #define register_hotcpu_notifier(nb) register_cpu_notifier(nb)
-@@ -218,6 +220,8 @@ static inline void cpu_hotplug_done(void) {}
- #define put_online_cpus() do { } while (0)
- #define cpu_hotplug_disable() do { } while (0)
- #define cpu_hotplug_enable() do { } while (0)
-+static inline void pin_current_cpu(void) { }
-+static inline void unpin_current_cpu(void) { }
- #define hotcpu_notifier(fn, pri) do { (void)(fn); } while (0)
- #define __hotcpu_notifier(fn, pri) do { (void)(fn); } while (0)
- /* These aren't inline functions due to a GCC bug. */
-diff --git a/include/linux/dcache.h b/include/linux/dcache.h
-index 5ff3e9a..ed04315 100644
---- a/include/linux/dcache.h
-+++ b/include/linux/dcache.h
-@@ -11,6 +11,7 @@
- #include <linux/rcupdate.h>
- #include <linux/lockref.h>
- #include <linux/stringhash.h>
-+#include <linux/wait.h>
-
- struct path;
- struct vfsmount;
-@@ -100,7 +101,7 @@ struct dentry {
-
- union {
- struct list_head d_lru; /* LRU list */
-- wait_queue_head_t *d_wait; /* in-lookup ones only */
-+ struct swait_queue_head *d_wait; /* in-lookup ones only */
- };
- struct list_head d_child; /* child of parent list */
- struct list_head d_subdirs; /* our children */
-@@ -230,7 +231,7 @@ extern void d_set_d_op(struct dentry *dentry, const struct dentry_operations *op
- extern struct dentry * d_alloc(struct dentry *, const struct qstr *);
- extern struct dentry * d_alloc_pseudo(struct super_block *, const struct qstr *);
- extern struct dentry * d_alloc_parallel(struct dentry *, const struct qstr *,
-- wait_queue_head_t *);
-+ struct swait_queue_head *);
- extern struct dentry * d_splice_alias(struct inode *, struct dentry *);
- extern struct dentry * d_add_ci(struct dentry *, struct inode *, struct qstr *);
- extern struct dentry * d_exact_alias(struct dentry *, struct inode *);
-diff --git a/include/linux/delay.h b/include/linux/delay.h
-index a6ecb34..37caab3 100644
---- a/include/linux/delay.h
-+++ b/include/linux/delay.h
-@@ -52,4 +52,10 @@ static inline void ssleep(unsigned int seconds)
- msleep(seconds * 1000);
- }
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+extern void cpu_chill(void);
-+#else
-+# define cpu_chill() cpu_relax()
-+#endif
-+
- #endif /* defined(_LINUX_DELAY_H) */
-diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
-index 7d565af..8e31b4d 100644
---- a/include/linux/ftrace.h
-+++ b/include/linux/ftrace.h
-@@ -714,6 +714,7 @@ static inline void __ftrace_enabled_restore(int enabled)
- #define CALLER_ADDR5 ((unsigned long)ftrace_return_address(5))
- #define CALLER_ADDR6 ((unsigned long)ftrace_return_address(6))
-
-+#ifdef CONFIG_USING_GET_LOCK_PARENT_IP
- static inline unsigned long get_lock_parent_ip(void)
- {
- unsigned long addr = CALLER_ADDR0;
-@@ -725,6 +726,7 @@ static inline unsigned long get_lock_parent_ip(void)
- return addr;
- return CALLER_ADDR2;
- }
-+#endif
-
- #ifdef CONFIG_IRQSOFF_TRACER
- extern void time_hardirqs_on(unsigned long a0, unsigned long a1);
-diff --git a/include/linux/highmem.h b/include/linux/highmem.h
-index bb3f329..a117a33 100644
---- a/include/linux/highmem.h
-+++ b/include/linux/highmem.h
-@@ -7,6 +7,7 @@
- #include <linux/mm.h>
- #include <linux/uaccess.h>
- #include <linux/hardirq.h>
-+#include <linux/sched.h>
-
- #include <asm/cacheflush.h>
-
-@@ -65,7 +66,7 @@ static inline void kunmap(struct page *page)
-
- static inline void *kmap_atomic(struct page *page)
- {
-- preempt_disable();
-+ preempt_disable_nort();
- pagefault_disable();
- return page_address(page);
- }
-@@ -74,7 +75,7 @@ static inline void *kmap_atomic(struct page *page)
- static inline void __kunmap_atomic(void *addr)
- {
- pagefault_enable();
-- preempt_enable();
-+ preempt_enable_nort();
- }
-
- #define kmap_atomic_pfn(pfn) kmap_atomic(pfn_to_page(pfn))
-@@ -86,32 +87,51 @@ static inline void __kunmap_atomic(void *addr)
-
- #if defined(CONFIG_HIGHMEM) || defined(CONFIG_X86_32)
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- DECLARE_PER_CPU(int, __kmap_atomic_idx);
-+#endif
-
- static inline int kmap_atomic_idx_push(void)
- {
-+#ifndef CONFIG_PREEMPT_RT_FULL
- int idx = __this_cpu_inc_return(__kmap_atomic_idx) - 1;
-
--#ifdef CONFIG_DEBUG_HIGHMEM
-+# ifdef CONFIG_DEBUG_HIGHMEM
- WARN_ON_ONCE(in_irq() && !irqs_disabled());
- BUG_ON(idx >= KM_TYPE_NR);
--#endif
-+# endif
- return idx;
-+#else
-+ current->kmap_idx++;
-+ BUG_ON(current->kmap_idx > KM_TYPE_NR);
-+ return current->kmap_idx - 1;
-+#endif
- }
-
- static inline int kmap_atomic_idx(void)
- {
-+#ifndef CONFIG_PREEMPT_RT_FULL
- return __this_cpu_read(__kmap_atomic_idx) - 1;
-+#else
-+ return current->kmap_idx - 1;
-+#endif
- }
-
- static inline void kmap_atomic_idx_pop(void)
- {
--#ifdef CONFIG_DEBUG_HIGHMEM
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+# ifdef CONFIG_DEBUG_HIGHMEM
- int idx = __this_cpu_dec_return(__kmap_atomic_idx);
-
- BUG_ON(idx < 0);
--#else
-+# else
- __this_cpu_dec(__kmap_atomic_idx);
-+# endif
-+#else
-+ current->kmap_idx--;
-+# ifdef CONFIG_DEBUG_HIGHMEM
-+ BUG_ON(current->kmap_idx < 0);
-+# endif
- #endif
- }
-
-diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
-index 5e00f80..65d0671 100644
---- a/include/linux/hrtimer.h
-+++ b/include/linux/hrtimer.h
-@@ -87,6 +87,9 @@ enum hrtimer_restart {
- * @function: timer expiry callback function
- * @base: pointer to the timer base (per cpu and per clock)
- * @state: state information (See bit values above)
-+ * @cb_entry: list entry to defer timers from hardirq context
-+ * @irqsafe: timer can run in hardirq context
-+ * @praecox: timer expiry time if expired at the time of programming
- * @is_rel: Set if the timer was armed relative
- * @start_pid: timer statistics field to store the pid of the task which
- * started the timer
-@@ -103,6 +106,11 @@ struct hrtimer {
- enum hrtimer_restart (*function)(struct hrtimer *);
- struct hrtimer_clock_base *base;
- u8 state;
-+ struct list_head cb_entry;
-+ int irqsafe;
-+#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
-+ ktime_t praecox;
-+#endif
- u8 is_rel;
- #ifdef CONFIG_TIMER_STATS
- int start_pid;
-@@ -123,11 +131,7 @@ struct hrtimer_sleeper {
- struct task_struct *task;
- };
-
--#ifdef CONFIG_64BIT
- # define HRTIMER_CLOCK_BASE_ALIGN 64
--#else
--# define HRTIMER_CLOCK_BASE_ALIGN 32
--#endif
-
- /**
- * struct hrtimer_clock_base - the timer base for a specific clock
-@@ -136,6 +140,7 @@ struct hrtimer_sleeper {
- * timer to a base on another cpu.
- * @clockid: clock id for per_cpu support
- * @active: red black tree root node for the active timers
-+ * @expired: list head for deferred timers.
- * @get_time: function to retrieve the current time of the clock
- * @offset: offset of this clock to the monotonic base
- */
-@@ -144,6 +149,7 @@ struct hrtimer_clock_base {
- int index;
- clockid_t clockid;
- struct timerqueue_head active;
-+ struct list_head expired;
- ktime_t (*get_time)(void);
- ktime_t offset;
- } __attribute__((__aligned__(HRTIMER_CLOCK_BASE_ALIGN)));
-@@ -187,6 +193,7 @@ struct hrtimer_cpu_base {
- raw_spinlock_t lock;
- seqcount_t seq;
- struct hrtimer *running;
-+ struct hrtimer *running_soft;
- unsigned int cpu;
- unsigned int active_bases;
- unsigned int clock_was_set_seq;
-@@ -203,6 +210,9 @@ struct hrtimer_cpu_base {
- unsigned int nr_hangs;
- unsigned int max_hang_time;
- #endif
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ wait_queue_head_t wait;
-+#endif
- struct hrtimer_clock_base clock_base[HRTIMER_MAX_CLOCK_BASES];
- } ____cacheline_aligned;
-
-@@ -412,6 +422,13 @@ static inline void hrtimer_restart(struct hrtimer *timer)
- hrtimer_start_expires(timer, HRTIMER_MODE_ABS);
- }
-
-+/* Softirq preemption could deadlock timer removal */
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ extern void hrtimer_wait_for_timer(const struct hrtimer *timer);
-+#else
-+# define hrtimer_wait_for_timer(timer) do { cpu_relax(); } while (0)
-+#endif
-+
- /* Query timers: */
- extern ktime_t __hrtimer_get_remaining(const struct hrtimer *timer, bool adjust);
-
-@@ -436,7 +453,7 @@ static inline int hrtimer_is_queued(struct hrtimer *timer)
- * Helper function to check, whether the timer is running the callback
- * function
- */
--static inline int hrtimer_callback_running(struct hrtimer *timer)
-+static inline int hrtimer_callback_running(const struct hrtimer *timer)
- {
- return timer->base->cpu_base->running == timer;
- }
-diff --git a/include/linux/idr.h b/include/linux/idr.h
-index 083d61e..5899796 100644
---- a/include/linux/idr.h
-+++ b/include/linux/idr.h
-@@ -95,10 +95,14 @@ bool idr_is_empty(struct idr *idp);
- * Each idr_preload() should be matched with an invocation of this
- * function. See idr_preload() for details.
- */
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+void idr_preload_end(void);
-+#else
- static inline void idr_preload_end(void)
- {
- preempt_enable();
- }
-+#endif
-
- /**
- * idr_find - return pointer for given id
-diff --git a/include/linux/init_task.h b/include/linux/init_task.h
-index f8834f8..a688d5e 100644
---- a/include/linux/init_task.h
-+++ b/include/linux/init_task.h
-@@ -148,6 +148,12 @@ extern struct task_group root_task_group;
- # define INIT_PERF_EVENTS(tsk)
- #endif
-
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+# define INIT_TIMER_LIST .posix_timer_list = NULL,
-+#else
-+# define INIT_TIMER_LIST
-+#endif
-+
- #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
- # define INIT_VTIME(tsk) \
- .vtime_seqcount = SEQCNT_ZERO(tsk.vtime_seqcount), \
-@@ -239,6 +245,7 @@ extern struct task_group root_task_group;
- .cpu_timers = INIT_CPU_TIMERS(tsk.cpu_timers), \
- .pi_lock = __RAW_SPIN_LOCK_UNLOCKED(tsk.pi_lock), \
- .timer_slack_ns = 50000, /* 50 usec default slack */ \
-+ INIT_TIMER_LIST \
- .pids = { \
- [PIDTYPE_PID] = INIT_PID_LINK(PIDTYPE_PID), \
- [PIDTYPE_PGID] = INIT_PID_LINK(PIDTYPE_PGID), \
-diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
-index b6683f0..c8f1785 100644
---- a/include/linux/interrupt.h
-+++ b/include/linux/interrupt.h
-@@ -14,6 +14,7 @@
- #include <linux/hrtimer.h>
- #include <linux/kref.h>
- #include <linux/workqueue.h>
-+#include <linux/swork.h>
-
- #include <linux/atomic.h>
- #include <asm/ptrace.h>
-@@ -61,6 +62,7 @@
- * interrupt handler after suspending interrupts. For system
- * wakeup devices users need to implement wakeup detection in
- * their interrupt handlers.
-+ * IRQF_NO_SOFTIRQ_CALL - Do not process softirqs in the irq thread context (RT)
- */
- #define IRQF_SHARED 0x00000080
- #define IRQF_PROBE_SHARED 0x00000100
-@@ -74,6 +76,7 @@
- #define IRQF_NO_THREAD 0x00010000
- #define IRQF_EARLY_RESUME 0x00020000
- #define IRQF_COND_SUSPEND 0x00040000
-+#define IRQF_NO_SOFTIRQ_CALL 0x00080000
-
- #define IRQF_TIMER (__IRQF_TIMER | IRQF_NO_SUSPEND | IRQF_NO_THREAD)
-
-@@ -196,7 +199,7 @@ extern void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id);
- #ifdef CONFIG_LOCKDEP
- # define local_irq_enable_in_hardirq() do { } while (0)
- #else
--# define local_irq_enable_in_hardirq() local_irq_enable()
-+# define local_irq_enable_in_hardirq() local_irq_enable_nort()
- #endif
-
- extern void disable_irq_nosync(unsigned int irq);
-@@ -227,7 +230,11 @@ extern void resume_device_irqs(void);
- struct irq_affinity_notify {
- unsigned int irq;
- struct kref kref;
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ struct swork_event swork;
-+#else
- struct work_struct work;
-+#endif
- void (*notify)(struct irq_affinity_notify *, const cpumask_t *mask);
- void (*release)(struct kref *ref);
- };
-@@ -398,9 +405,13 @@ extern int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which,
- bool state);
-
- #ifdef CONFIG_IRQ_FORCED_THREADING
-+# ifndef CONFIG_PREEMPT_RT_BASE
- extern bool force_irqthreads;
-+# else
-+# define force_irqthreads (true)
-+# endif
- #else
--#define force_irqthreads (0)
-+#define force_irqthreads (false)
- #endif
-
- #ifndef __ARCH_SET_SOFTIRQ_PENDING
-@@ -457,9 +468,10 @@ struct softirq_action
- void (*action)(struct softirq_action *);
- };
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- asmlinkage void do_softirq(void);
- asmlinkage void __do_softirq(void);
--
-+static inline void thread_do_softirq(void) { do_softirq(); }
- #ifdef __ARCH_HAS_DO_SOFTIRQ
- void do_softirq_own_stack(void);
- #else
-@@ -468,13 +480,25 @@ static inline void do_softirq_own_stack(void)
- __do_softirq();
- }
- #endif
-+#else
-+extern void thread_do_softirq(void);
-+#endif
-
- extern void open_softirq(int nr, void (*action)(struct softirq_action *));
- extern void softirq_init(void);
- extern void __raise_softirq_irqoff(unsigned int nr);
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+extern void __raise_softirq_irqoff_ksoft(unsigned int nr);
-+#else
-+static inline void __raise_softirq_irqoff_ksoft(unsigned int nr)
-+{
-+ __raise_softirq_irqoff(nr);
-+}
-+#endif
-
- extern void raise_softirq_irqoff(unsigned int nr);
- extern void raise_softirq(unsigned int nr);
-+extern void softirq_check_pending_idle(void);
-
- DECLARE_PER_CPU(struct task_struct *, ksoftirqd);
-
-@@ -496,8 +520,9 @@ static inline struct task_struct *this_cpu_ksoftirqd(void)
- to be executed on some cpu at least once after this.
- * If the tasklet is already scheduled, but its execution is still not
- started, it will be executed only once.
-- * If this tasklet is already running on another CPU (or schedule is called
-- from tasklet itself), it is rescheduled for later.
-+ * If this tasklet is already running on another CPU, it is rescheduled
-+ for later.
-+ * Schedule must not be called from the tasklet itself (a lockup occurs)
- * Tasklet is strictly serialized wrt itself, but not
- wrt another tasklets. If client needs some intertask synchronization,
- he makes it with spinlocks.
-@@ -522,27 +547,36 @@ struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(1), func, data }
- enum
- {
- TASKLET_STATE_SCHED, /* Tasklet is scheduled for execution */
-- TASKLET_STATE_RUN /* Tasklet is running (SMP only) */
-+ TASKLET_STATE_RUN, /* Tasklet is running (SMP only) */
-+ TASKLET_STATE_PENDING /* Tasklet is pending */
- };
-
--#ifdef CONFIG_SMP
-+#define TASKLET_STATEF_SCHED (1 << TASKLET_STATE_SCHED)
-+#define TASKLET_STATEF_RUN (1 << TASKLET_STATE_RUN)
-+#define TASKLET_STATEF_PENDING (1 << TASKLET_STATE_PENDING)
-+
-+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL)
- static inline int tasklet_trylock(struct tasklet_struct *t)
- {
- return !test_and_set_bit(TASKLET_STATE_RUN, &(t)->state);
- }
-
-+static inline int tasklet_tryunlock(struct tasklet_struct *t)
-+{
-+ return cmpxchg(&t->state, TASKLET_STATEF_RUN, 0) == TASKLET_STATEF_RUN;
-+}
-+
- static inline void tasklet_unlock(struct tasklet_struct *t)
- {
- smp_mb__before_atomic();
- clear_bit(TASKLET_STATE_RUN, &(t)->state);
- }
-
--static inline void tasklet_unlock_wait(struct tasklet_struct *t)
--{
-- while (test_bit(TASKLET_STATE_RUN, &(t)->state)) { barrier(); }
--}
-+extern void tasklet_unlock_wait(struct tasklet_struct *t);
-+
- #else
- #define tasklet_trylock(t) 1
-+#define tasklet_tryunlock(t) 1
- #define tasklet_unlock_wait(t) do { } while (0)
- #define tasklet_unlock(t) do { } while (0)
- #endif
-@@ -591,12 +625,7 @@ static inline void tasklet_disable(struct tasklet_struct *t)
- smp_mb();
- }
-
--static inline void tasklet_enable(struct tasklet_struct *t)
--{
-- smp_mb__before_atomic();
-- atomic_dec(&t->count);
--}
--
-+extern void tasklet_enable(struct tasklet_struct *t);
- extern void tasklet_kill(struct tasklet_struct *t);
- extern void tasklet_kill_immediate(struct tasklet_struct *t, unsigned int cpu);
- extern void tasklet_init(struct tasklet_struct *t,
-@@ -627,6 +656,12 @@ void tasklet_hrtimer_cancel(struct tasklet_hrtimer *ttimer)
- tasklet_kill(&ttimer->tasklet);
- }
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+extern void softirq_early_init(void);
-+#else
-+static inline void softirq_early_init(void) { }
-+#endif
-+
- /*
- * Autoprobing for irqs:
- *
-diff --git a/include/linux/irq.h b/include/linux/irq.h
-index 0ac26c8..ede85f1 100644
---- a/include/linux/irq.h
-+++ b/include/linux/irq.h
-@@ -72,6 +72,7 @@ enum irqchip_irq_state;
- * IRQ_IS_POLLED - Always polled by another interrupt. Exclude
- * it from the spurious interrupt detection
- * mechanism and from core side polling.
-+ * IRQ_NO_SOFTIRQ_CALL - No softirq processing in the irq thread context (RT)
- * IRQ_DISABLE_UNLAZY - Disable lazy irq disable
- */
- enum {
-@@ -99,13 +100,14 @@ enum {
- IRQ_PER_CPU_DEVID = (1 << 17),
- IRQ_IS_POLLED = (1 << 18),
- IRQ_DISABLE_UNLAZY = (1 << 19),
-+ IRQ_NO_SOFTIRQ_CALL = (1 << 20),
- };
-
- #define IRQF_MODIFY_MASK \
- (IRQ_TYPE_SENSE_MASK | IRQ_NOPROBE | IRQ_NOREQUEST | \
- IRQ_NOAUTOEN | IRQ_MOVE_PCNTXT | IRQ_LEVEL | IRQ_NO_BALANCING | \
- IRQ_PER_CPU | IRQ_NESTED_THREAD | IRQ_NOTHREAD | IRQ_PER_CPU_DEVID | \
-- IRQ_IS_POLLED | IRQ_DISABLE_UNLAZY)
-+ IRQ_IS_POLLED | IRQ_DISABLE_UNLAZY | IRQ_NO_SOFTIRQ_CALL)
-
- #define IRQ_NO_BALANCING_MASK (IRQ_PER_CPU | IRQ_NO_BALANCING)
-
-diff --git a/include/linux/irq_work.h b/include/linux/irq_work.h
-index 47b9ebd..2543aab 100644
---- a/include/linux/irq_work.h
-+++ b/include/linux/irq_work.h
-@@ -16,6 +16,7 @@
- #define IRQ_WORK_BUSY 2UL
- #define IRQ_WORK_FLAGS 3UL
- #define IRQ_WORK_LAZY 4UL /* Doesn't want IPI, wait for tick */
-+#define IRQ_WORK_HARD_IRQ 8UL /* Run hard IRQ context, even on RT */
-
- struct irq_work {
- unsigned long flags;
-@@ -51,4 +52,10 @@ static inline bool irq_work_needs_cpu(void) { return false; }
- static inline void irq_work_run(void) { }
- #endif
-
-+#if defined(CONFIG_IRQ_WORK) && defined(CONFIG_PREEMPT_RT_FULL)
-+void irq_work_tick_soft(void);
-+#else
-+static inline void irq_work_tick_soft(void) { }
-+#endif
-+
- #endif /* _LINUX_IRQ_WORK_H */
-diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
-index b51beeb..219d982 100644
---- a/include/linux/irqdesc.h
-+++ b/include/linux/irqdesc.h
-@@ -64,6 +64,7 @@ struct irq_desc {
- unsigned int irqs_unhandled;
- atomic_t threads_handled;
- int threads_handled_last;
-+ u64 random_ip;
- raw_spinlock_t lock;
- struct cpumask *percpu_enabled;
- const struct cpumask *percpu_affinity;
-diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
-index 5dd1272..9b77034 100644
---- a/include/linux/irqflags.h
-+++ b/include/linux/irqflags.h
-@@ -25,8 +25,6 @@
- # define trace_softirqs_enabled(p) ((p)->softirqs_enabled)
- # define trace_hardirq_enter() do { current->hardirq_context++; } while (0)
- # define trace_hardirq_exit() do { current->hardirq_context--; } while (0)
--# define lockdep_softirq_enter() do { current->softirq_context++; } while (0)
--# define lockdep_softirq_exit() do { current->softirq_context--; } while (0)
- # define INIT_TRACE_IRQFLAGS .softirqs_enabled = 1,
- #else
- # define trace_hardirqs_on() do { } while (0)
-@@ -39,9 +37,15 @@
- # define trace_softirqs_enabled(p) 0
- # define trace_hardirq_enter() do { } while (0)
- # define trace_hardirq_exit() do { } while (0)
-+# define INIT_TRACE_IRQFLAGS
-+#endif
-+
-+#if defined(CONFIG_TRACE_IRQFLAGS) && !defined(CONFIG_PREEMPT_RT_FULL)
-+# define lockdep_softirq_enter() do { current->softirq_context++; } while (0)
-+# define lockdep_softirq_exit() do { current->softirq_context--; } while (0)
-+#else
- # define lockdep_softirq_enter() do { } while (0)
- # define lockdep_softirq_exit() do { } while (0)
--# define INIT_TRACE_IRQFLAGS
- #endif
-
- #if defined(CONFIG_IRQSOFF_TRACER) || \
-@@ -148,4 +152,23 @@
-
- #define irqs_disabled_flags(flags) raw_irqs_disabled_flags(flags)
-
-+/*
-+ * local_irq* variants depending on RT/!RT
-+ */
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+# define local_irq_disable_nort() do { } while (0)
-+# define local_irq_enable_nort() do { } while (0)
-+# define local_irq_save_nort(flags) local_save_flags(flags)
-+# define local_irq_restore_nort(flags) (void)(flags)
-+# define local_irq_disable_rt() local_irq_disable()
-+# define local_irq_enable_rt() local_irq_enable()
-+#else
-+# define local_irq_disable_nort() local_irq_disable()
-+# define local_irq_enable_nort() local_irq_enable()
-+# define local_irq_save_nort(flags) local_irq_save(flags)
-+# define local_irq_restore_nort(flags) local_irq_restore(flags)
-+# define local_irq_disable_rt() do { } while (0)
-+# define local_irq_enable_rt() do { } while (0)
-+#endif
-+
- #endif
-diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
-index dfaa1f4..d57dd06 100644
---- a/include/linux/jbd2.h
-+++ b/include/linux/jbd2.h
-@@ -347,32 +347,56 @@ static inline struct journal_head *bh2jh(struct buffer_head *bh)
-
- static inline void jbd_lock_bh_state(struct buffer_head *bh)
- {
-+#ifndef CONFIG_PREEMPT_RT_BASE
- bit_spin_lock(BH_State, &bh->b_state);
-+#else
-+ spin_lock(&bh->b_state_lock);
-+#endif
- }
-
- static inline int jbd_trylock_bh_state(struct buffer_head *bh)
- {
-+#ifndef CONFIG_PREEMPT_RT_BASE
- return bit_spin_trylock(BH_State, &bh->b_state);
-+#else
-+ return spin_trylock(&bh->b_state_lock);
-+#endif
- }
-
- static inline int jbd_is_locked_bh_state(struct buffer_head *bh)
- {
-+#ifndef CONFIG_PREEMPT_RT_BASE
- return bit_spin_is_locked(BH_State, &bh->b_state);
-+#else
-+ return spin_is_locked(&bh->b_state_lock);
-+#endif
- }
-
- static inline void jbd_unlock_bh_state(struct buffer_head *bh)
- {
-+#ifndef CONFIG_PREEMPT_RT_BASE
- bit_spin_unlock(BH_State, &bh->b_state);
-+#else
-+ spin_unlock(&bh->b_state_lock);
-+#endif
- }
-
- static inline void jbd_lock_bh_journal_head(struct buffer_head *bh)
- {
-+#ifndef CONFIG_PREEMPT_RT_BASE
- bit_spin_lock(BH_JournalHead, &bh->b_state);
-+#else
-+ spin_lock(&bh->b_journal_head_lock);
-+#endif
- }
-
- static inline void jbd_unlock_bh_journal_head(struct buffer_head *bh)
- {
-+#ifndef CONFIG_PREEMPT_RT_BASE
- bit_spin_unlock(BH_JournalHead, &bh->b_state);
-+#else
-+ spin_unlock(&bh->b_journal_head_lock);
-+#endif
- }
-
- #define J_ASSERT(assert) BUG_ON(!(assert))
-diff --git a/include/linux/kdb.h b/include/linux/kdb.h
-index 410deca..0861beb 100644
---- a/include/linux/kdb.h
-+++ b/include/linux/kdb.h
-@@ -167,6 +167,7 @@ extern __printf(2, 0) int vkdb_printf(enum kdb_msgsrc src, const char *fmt,
- extern __printf(1, 2) int kdb_printf(const char *, ...);
- typedef __printf(1, 2) int (*kdb_printf_t)(const char *, ...);
-
-+#define in_kdb_printk() (kdb_trap_printk)
- extern void kdb_init(int level);
-
- /* Access to kdb specific polling devices */
-@@ -201,6 +202,7 @@ extern int kdb_register_flags(char *, kdb_func_t, char *, char *,
- extern int kdb_unregister(char *);
- #else /* ! CONFIG_KGDB_KDB */
- static inline __printf(1, 2) int kdb_printf(const char *fmt, ...) { return 0; }
-+#define in_kdb_printk() (0)
- static inline void kdb_init(int level) {}
- static inline int kdb_register(char *cmd, kdb_func_t func, char *usage,
- char *help, short minlen) { return 0; }
-diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index d96a611..37de2ce 100644
---- a/include/linux/kernel.h
-+++ b/include/linux/kernel.h
-@@ -194,6 +194,9 @@ extern int _cond_resched(void);
- */
- # define might_sleep() \
- do { __might_sleep(__FILE__, __LINE__, 0); might_resched(); } while (0)
-+
-+# define might_sleep_no_state_check() \
-+ do { ___might_sleep(__FILE__, __LINE__, 0); might_resched(); } while (0)
- # define sched_annotate_sleep() (current->task_state_change = 0)
- #else
- static inline void ___might_sleep(const char *file, int line,
-@@ -201,6 +204,7 @@ extern int _cond_resched(void);
- static inline void __might_sleep(const char *file, int line,
- int preempt_offset) { }
- # define might_sleep() do { might_resched(); } while (0)
-+# define might_sleep_no_state_check() do { might_resched(); } while (0)
- # define sched_annotate_sleep() do { } while (0)
- #endif
-
-@@ -491,6 +495,7 @@ extern enum system_states {
- SYSTEM_HALT,
- SYSTEM_POWER_OFF,
- SYSTEM_RESTART,
-+ SYSTEM_SUSPEND,
- } system_state;
-
- #define TAINT_PROPRIETARY_MODULE 0
-diff --git a/include/linux/lglock.h b/include/linux/lglock.h
-index c92ebd1..6f035f6 100644
---- a/include/linux/lglock.h
-+++ b/include/linux/lglock.h
-@@ -34,13 +34,30 @@
- #endif
-
- struct lglock {
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ struct rt_mutex __percpu *lock;
-+#else
- arch_spinlock_t __percpu *lock;
-+#endif
- #ifdef CONFIG_DEBUG_LOCK_ALLOC
- struct lock_class_key lock_key;
- struct lockdep_map lock_dep_map;
- #endif
- };
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+# define DEFINE_LGLOCK(name) \
-+ static DEFINE_PER_CPU(struct rt_mutex, name ## _lock) \
-+ = __RT_MUTEX_INITIALIZER( name ## _lock); \
-+ struct lglock name = { .lock = &name ## _lock }
-+
-+# define DEFINE_STATIC_LGLOCK(name) \
-+ static DEFINE_PER_CPU(struct rt_mutex, name ## _lock) \
-+ = __RT_MUTEX_INITIALIZER( name ## _lock); \
-+ static struct lglock name = { .lock = &name ## _lock }
-+
-+#else
-+
- #define DEFINE_LGLOCK(name) \
- static DEFINE_PER_CPU(arch_spinlock_t, name ## _lock) \
- = __ARCH_SPIN_LOCK_UNLOCKED; \
-@@ -50,6 +67,7 @@ struct lglock {
- static DEFINE_PER_CPU(arch_spinlock_t, name ## _lock) \
- = __ARCH_SPIN_LOCK_UNLOCKED; \
- static struct lglock name = { .lock = &name ## _lock }
-+#endif
-
- void lg_lock_init(struct lglock *lg, char *name);
-
-@@ -64,6 +82,12 @@ void lg_double_unlock(struct lglock *lg, int cpu1, int cpu2);
- void lg_global_lock(struct lglock *lg);
- void lg_global_unlock(struct lglock *lg);
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+#define lg_global_trylock_relax(name) lg_global_lock(name)
-+#else
-+void lg_global_trylock_relax(struct lglock *lg);
-+#endif
-+
- #else
- /* When !CONFIG_SMP, map lglock to spinlock */
- #define lglock spinlock
-diff --git a/include/linux/list_bl.h b/include/linux/list_bl.h
-index cb48330..4e50623 100644
---- a/include/linux/list_bl.h
-+++ b/include/linux/list_bl.h
-@@ -2,6 +2,7 @@
- #define _LINUX_LIST_BL_H
-
- #include <linux/list.h>
-+#include <linux/spinlock.h>
- #include <linux/bit_spinlock.h>
-
- /*
-@@ -32,13 +33,24 @@
-
- struct hlist_bl_head {
- struct hlist_bl_node *first;
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ raw_spinlock_t lock;
-+#endif
- };
-
- struct hlist_bl_node {
- struct hlist_bl_node *next, **pprev;
- };
--#define INIT_HLIST_BL_HEAD(ptr) \
-- ((ptr)->first = NULL)
-+
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+#define INIT_HLIST_BL_HEAD(h) \
-+do { \
-+ (h)->first = NULL; \
-+ raw_spin_lock_init(&(h)->lock); \
-+} while (0)
-+#else
-+#define INIT_HLIST_BL_HEAD(h) (h)->first = NULL
-+#endif
-
- static inline void INIT_HLIST_BL_NODE(struct hlist_bl_node *h)
- {
-@@ -118,12 +130,26 @@ static inline void hlist_bl_del_init(struct hlist_bl_node *n)
-
- static inline void hlist_bl_lock(struct hlist_bl_head *b)
- {
-+#ifndef CONFIG_PREEMPT_RT_BASE
- bit_spin_lock(0, (unsigned long *)b);
-+#else
-+ raw_spin_lock(&b->lock);
-+#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
-+ __set_bit(0, (unsigned long *)b);
-+#endif
-+#endif
- }
-
- static inline void hlist_bl_unlock(struct hlist_bl_head *b)
- {
-+#ifndef CONFIG_PREEMPT_RT_BASE
- __bit_spin_unlock(0, (unsigned long *)b);
-+#else
-+#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
-+ __clear_bit(0, (unsigned long *)b);
-+#endif
-+ raw_spin_unlock(&b->lock);
-+#endif
- }
-
- static inline bool hlist_bl_is_locked(struct hlist_bl_head *b)
-diff --git a/include/linux/locallock.h b/include/linux/locallock.h
-new file mode 100644
-index 0000000..845c77f
---- /dev/null
-+++ b/include/linux/locallock.h
-@@ -0,0 +1,278 @@
-+#ifndef _LINUX_LOCALLOCK_H
-+#define _LINUX_LOCALLOCK_H
-+
-+#include <linux/percpu.h>
-+#include <linux/spinlock.h>
-+
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+
-+#ifdef CONFIG_DEBUG_SPINLOCK
-+# define LL_WARN(cond) WARN_ON(cond)
-+#else
-+# define LL_WARN(cond) do { } while (0)
-+#endif
-+
-+/*
-+ * per cpu lock based substitute for local_irq_*()
-+ */
-+struct local_irq_lock {
-+ spinlock_t lock;
-+ struct task_struct *owner;
-+ int nestcnt;
-+ unsigned long flags;
-+};
-+
-+#define DEFINE_LOCAL_IRQ_LOCK(lvar) \
-+ DEFINE_PER_CPU(struct local_irq_lock, lvar) = { \
-+ .lock = __SPIN_LOCK_UNLOCKED((lvar).lock) }
-+
-+#define DECLARE_LOCAL_IRQ_LOCK(lvar) \
-+ DECLARE_PER_CPU(struct local_irq_lock, lvar)
-+
-+#define local_irq_lock_init(lvar) \
-+ do { \
-+ int __cpu; \
-+ for_each_possible_cpu(__cpu) \
-+ spin_lock_init(&per_cpu(lvar, __cpu).lock); \
-+ } while (0)
-+
-+/*
-+ * spin_lock|trylock|unlock_local flavour that does not migrate disable
-+ * used for __local_lock|trylock|unlock where get_local_var/put_local_var
-+ * already takes care of the migrate_disable/enable
-+ * for CONFIG_PREEMPT_BASE map to the normal spin_* calls.
-+ */
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+# define spin_lock_local(lock) rt_spin_lock__no_mg(lock)
-+# define spin_trylock_local(lock) rt_spin_trylock__no_mg(lock)
-+# define spin_unlock_local(lock) rt_spin_unlock__no_mg(lock)
-+#else
-+# define spin_lock_local(lock) spin_lock(lock)
-+# define spin_trylock_local(lock) spin_trylock(lock)
-+# define spin_unlock_local(lock) spin_unlock(lock)
-+#endif
-+
-+static inline void __local_lock(struct local_irq_lock *lv)
-+{
-+ if (lv->owner != current) {
-+ spin_lock_local(&lv->lock);
-+ LL_WARN(lv->owner);
-+ LL_WARN(lv->nestcnt);
-+ lv->owner = current;
-+ }
-+ lv->nestcnt++;
-+}
-+
-+#define local_lock(lvar) \
-+ do { __local_lock(&get_local_var(lvar)); } while (0)
-+
-+#define local_lock_on(lvar, cpu) \
-+ do { __local_lock(&per_cpu(lvar, cpu)); } while (0)
-+
-+static inline int __local_trylock(struct local_irq_lock *lv)
-+{
-+ if (lv->owner != current && spin_trylock_local(&lv->lock)) {
-+ LL_WARN(lv->owner);
-+ LL_WARN(lv->nestcnt);
-+ lv->owner = current;
-+ lv->nestcnt = 1;
-+ return 1;
-+ }
-+ return 0;
-+}
-+
-+#define local_trylock(lvar) \
-+ ({ \
-+ int __locked; \
-+ __locked = __local_trylock(&get_local_var(lvar)); \
-+ if (!__locked) \
-+ put_local_var(lvar); \
-+ __locked; \
-+ })
-+
-+static inline void __local_unlock(struct local_irq_lock *lv)
-+{
-+ LL_WARN(lv->nestcnt == 0);
-+ LL_WARN(lv->owner != current);
-+ if (--lv->nestcnt)
-+ return;
-+
-+ lv->owner = NULL;
-+ spin_unlock_local(&lv->lock);
-+}
-+
-+#define local_unlock(lvar) \
-+ do { \
-+ __local_unlock(this_cpu_ptr(&lvar)); \
-+ put_local_var(lvar); \
-+ } while (0)
-+
-+#define local_unlock_on(lvar, cpu) \
-+ do { __local_unlock(&per_cpu(lvar, cpu)); } while (0)
-+
-+static inline void __local_lock_irq(struct local_irq_lock *lv)
-+{
-+ spin_lock_irqsave(&lv->lock, lv->flags);
-+ LL_WARN(lv->owner);
-+ LL_WARN(lv->nestcnt);
-+ lv->owner = current;
-+ lv->nestcnt = 1;
-+}
-+
-+#define local_lock_irq(lvar) \
-+ do { __local_lock_irq(&get_local_var(lvar)); } while (0)
-+
-+#define local_lock_irq_on(lvar, cpu) \
-+ do { __local_lock_irq(&per_cpu(lvar, cpu)); } while (0)
-+
-+static inline void __local_unlock_irq(struct local_irq_lock *lv)
-+{
-+ LL_WARN(!lv->nestcnt);
-+ LL_WARN(lv->owner != current);
-+ lv->owner = NULL;
-+ lv->nestcnt = 0;
-+ spin_unlock_irq(&lv->lock);
-+}
-+
-+#define local_unlock_irq(lvar) \
-+ do { \
-+ __local_unlock_irq(this_cpu_ptr(&lvar)); \
-+ put_local_var(lvar); \
-+ } while (0)
-+
-+#define local_unlock_irq_on(lvar, cpu) \
-+ do { \
-+ __local_unlock_irq(&per_cpu(lvar, cpu)); \
-+ } while (0)
-+
-+static inline int __local_lock_irqsave(struct local_irq_lock *lv)
-+{
-+ if (lv->owner != current) {
-+ __local_lock_irq(lv);
-+ return 0;
-+ } else {
-+ lv->nestcnt++;
-+ return 1;
-+ }
-+}
-+
-+#define local_lock_irqsave(lvar, _flags) \
-+ do { \
-+ if (__local_lock_irqsave(&get_local_var(lvar))) \
-+ put_local_var(lvar); \
-+ _flags = __this_cpu_read(lvar.flags); \
-+ } while (0)
-+
-+#define local_lock_irqsave_on(lvar, _flags, cpu) \
-+ do { \
-+ __local_lock_irqsave(&per_cpu(lvar, cpu)); \
-+ _flags = per_cpu(lvar, cpu).flags; \
-+ } while (0)
-+
-+static inline int __local_unlock_irqrestore(struct local_irq_lock *lv,
-+ unsigned long flags)
-+{
-+ LL_WARN(!lv->nestcnt);
-+ LL_WARN(lv->owner != current);
-+ if (--lv->nestcnt)
-+ return 0;
-+
-+ lv->owner = NULL;
-+ spin_unlock_irqrestore(&lv->lock, lv->flags);
-+ return 1;
-+}
-+
-+#define local_unlock_irqrestore(lvar, flags) \
-+ do { \
-+ if (__local_unlock_irqrestore(this_cpu_ptr(&lvar), flags)) \
-+ put_local_var(lvar); \
-+ } while (0)
-+
-+#define local_unlock_irqrestore_on(lvar, flags, cpu) \
-+ do { \
-+ __local_unlock_irqrestore(&per_cpu(lvar, cpu), flags); \
-+ } while (0)
-+
-+#define local_spin_trylock_irq(lvar, lock) \
-+ ({ \
-+ int __locked; \
-+ local_lock_irq(lvar); \
-+ __locked = spin_trylock(lock); \
-+ if (!__locked) \
-+ local_unlock_irq(lvar); \
-+ __locked; \
-+ })
-+
-+#define local_spin_lock_irq(lvar, lock) \
-+ do { \
-+ local_lock_irq(lvar); \
-+ spin_lock(lock); \
-+ } while (0)
-+
-+#define local_spin_unlock_irq(lvar, lock) \
-+ do { \
-+ spin_unlock(lock); \
-+ local_unlock_irq(lvar); \
-+ } while (0)
-+
-+#define local_spin_lock_irqsave(lvar, lock, flags) \
-+ do { \
-+ local_lock_irqsave(lvar, flags); \
-+ spin_lock(lock); \
-+ } while (0)
-+
-+#define local_spin_unlock_irqrestore(lvar, lock, flags) \
-+ do { \
-+ spin_unlock(lock); \
-+ local_unlock_irqrestore(lvar, flags); \
-+ } while (0)
-+
-+#define get_locked_var(lvar, var) \
-+ (*({ \
-+ local_lock(lvar); \
-+ this_cpu_ptr(&var); \
-+ }))
-+
-+#define put_locked_var(lvar, var) local_unlock(lvar);
-+
-+#define local_lock_cpu(lvar) \
-+ ({ \
-+ local_lock(lvar); \
-+ smp_processor_id(); \
-+ })
-+
-+#define local_unlock_cpu(lvar) local_unlock(lvar)
-+
-+#else /* PREEMPT_RT_BASE */
-+
-+#define DEFINE_LOCAL_IRQ_LOCK(lvar) __typeof__(const int) lvar
-+#define DECLARE_LOCAL_IRQ_LOCK(lvar) extern __typeof__(const int) lvar
-+
-+static inline void local_irq_lock_init(int lvar) { }
-+
-+#define local_lock(lvar) preempt_disable()
-+#define local_unlock(lvar) preempt_enable()
-+#define local_lock_irq(lvar) local_irq_disable()
-+#define local_lock_irq_on(lvar, cpu) local_irq_disable()
-+#define local_unlock_irq(lvar) local_irq_enable()
-+#define local_unlock_irq_on(lvar, cpu) local_irq_enable()
-+#define local_lock_irqsave(lvar, flags) local_irq_save(flags)
-+#define local_unlock_irqrestore(lvar, flags) local_irq_restore(flags)
-+
-+#define local_spin_trylock_irq(lvar, lock) spin_trylock_irq(lock)
-+#define local_spin_lock_irq(lvar, lock) spin_lock_irq(lock)
-+#define local_spin_unlock_irq(lvar, lock) spin_unlock_irq(lock)
-+#define local_spin_lock_irqsave(lvar, lock, flags) \
-+ spin_lock_irqsave(lock, flags)
-+#define local_spin_unlock_irqrestore(lvar, lock, flags) \
-+ spin_unlock_irqrestore(lock, flags)
-+
-+#define get_locked_var(lvar, var) get_cpu_var(var)
-+#define put_locked_var(lvar, var) put_cpu_var(var)
-+
-+#define local_lock_cpu(lvar) get_cpu()
-+#define local_unlock_cpu(lvar) put_cpu()
-+
-+#endif
-+
-+#endif
-diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 903200f..df670d4 100644
---- a/include/linux/mm_types.h
-+++ b/include/linux/mm_types.h
-@@ -11,6 +11,7 @@
- #include <linux/completion.h>
- #include <linux/cpumask.h>
- #include <linux/uprobes.h>
-+#include <linux/rcupdate.h>
- #include <linux/page-flags-layout.h>
- #include <linux/workqueue.h>
- #include <asm/page.h>
-@@ -508,6 +509,9 @@ struct mm_struct {
- bool tlb_flush_pending;
- #endif
- struct uprobes_state uprobes_state;
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ struct rcu_head delayed_drop;
-+#endif
- #ifdef CONFIG_X86_INTEL_MPX
- /* address of the bounds directory */
- void __user *bd_addr;
-diff --git a/include/linux/mutex.h b/include/linux/mutex.h
-index 2cb7531..b3fdfc8 100644
---- a/include/linux/mutex.h
-+++ b/include/linux/mutex.h
-@@ -19,6 +19,17 @@
- #include <asm/processor.h>
- #include <linux/osq_lock.h>
-
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+# define __DEP_MAP_MUTEX_INITIALIZER(lockname) \
-+ , .dep_map = { .name = #lockname }
-+#else
-+# define __DEP_MAP_MUTEX_INITIALIZER(lockname)
-+#endif
-+
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+# include <linux/mutex_rt.h>
-+#else
-+
- /*
- * Simple, straightforward mutexes with strict semantics:
- *
-@@ -99,13 +110,6 @@ do { \
- static inline void mutex_destroy(struct mutex *lock) {}
- #endif
-
--#ifdef CONFIG_DEBUG_LOCK_ALLOC
--# define __DEP_MAP_MUTEX_INITIALIZER(lockname) \
-- , .dep_map = { .name = #lockname }
--#else
--# define __DEP_MAP_MUTEX_INITIALIZER(lockname)
--#endif
--
- #define __MUTEX_INITIALIZER(lockname) \
- { .count = ATOMIC_INIT(1) \
- , .wait_lock = __SPIN_LOCK_UNLOCKED(lockname.wait_lock) \
-@@ -173,6 +177,8 @@ extern int __must_check mutex_lock_killable(struct mutex *lock);
- extern int mutex_trylock(struct mutex *lock);
- extern void mutex_unlock(struct mutex *lock);
-
-+#endif /* !PREEMPT_RT_FULL */
-+
- extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock);
-
- #endif /* __LINUX_MUTEX_H */
-diff --git a/include/linux/mutex_rt.h b/include/linux/mutex_rt.h
-new file mode 100644
-index 0000000..c38a44b
---- /dev/null
-+++ b/include/linux/mutex_rt.h
-@@ -0,0 +1,84 @@
-+#ifndef __LINUX_MUTEX_RT_H
-+#define __LINUX_MUTEX_RT_H
-+
-+#ifndef __LINUX_MUTEX_H
-+#error "Please include mutex.h"
-+#endif
-+
-+#include <linux/rtmutex.h>
-+
-+/* FIXME: Just for __lockfunc */
-+#include <linux/spinlock.h>
-+
-+struct mutex {
-+ struct rt_mutex lock;
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+ struct lockdep_map dep_map;
-+#endif
-+};
-+
-+#define __MUTEX_INITIALIZER(mutexname) \
-+ { \
-+ .lock = __RT_MUTEX_INITIALIZER(mutexname.lock) \
-+ __DEP_MAP_MUTEX_INITIALIZER(mutexname) \
-+ }
-+
-+#define DEFINE_MUTEX(mutexname) \
-+ struct mutex mutexname = __MUTEX_INITIALIZER(mutexname)
-+
-+extern void __mutex_do_init(struct mutex *lock, const char *name, struct lock_class_key *key);
-+extern void __lockfunc _mutex_lock(struct mutex *lock);
-+extern int __lockfunc _mutex_lock_interruptible(struct mutex *lock);
-+extern int __lockfunc _mutex_lock_killable(struct mutex *lock);
-+extern void __lockfunc _mutex_lock_nested(struct mutex *lock, int subclass);
-+extern void __lockfunc _mutex_lock_nest_lock(struct mutex *lock, struct lockdep_map *nest_lock);
-+extern int __lockfunc _mutex_lock_interruptible_nested(struct mutex *lock, int subclass);
-+extern int __lockfunc _mutex_lock_killable_nested(struct mutex *lock, int subclass);
-+extern int __lockfunc _mutex_trylock(struct mutex *lock);
-+extern void __lockfunc _mutex_unlock(struct mutex *lock);
-+
-+#define mutex_is_locked(l) rt_mutex_is_locked(&(l)->lock)
-+#define mutex_lock(l) _mutex_lock(l)
-+#define mutex_lock_interruptible(l) _mutex_lock_interruptible(l)
-+#define mutex_lock_killable(l) _mutex_lock_killable(l)
-+#define mutex_trylock(l) _mutex_trylock(l)
-+#define mutex_unlock(l) _mutex_unlock(l)
-+#define mutex_destroy(l) rt_mutex_destroy(&(l)->lock)
-+
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+# define mutex_lock_nested(l, s) _mutex_lock_nested(l, s)
-+# define mutex_lock_interruptible_nested(l, s) \
-+ _mutex_lock_interruptible_nested(l, s)
-+# define mutex_lock_killable_nested(l, s) \
-+ _mutex_lock_killable_nested(l, s)
-+
-+# define mutex_lock_nest_lock(lock, nest_lock) \
-+do { \
-+ typecheck(struct lockdep_map *, &(nest_lock)->dep_map); \
-+ _mutex_lock_nest_lock(lock, &(nest_lock)->dep_map); \
-+} while (0)
-+
-+#else
-+# define mutex_lock_nested(l, s) _mutex_lock(l)
-+# define mutex_lock_interruptible_nested(l, s) \
-+ _mutex_lock_interruptible(l)
-+# define mutex_lock_killable_nested(l, s) \
-+ _mutex_lock_killable(l)
-+# define mutex_lock_nest_lock(lock, nest_lock) mutex_lock(lock)
-+#endif
-+
-+# define mutex_init(mutex) \
-+do { \
-+ static struct lock_class_key __key; \
-+ \
-+ rt_mutex_init(&(mutex)->lock); \
-+ __mutex_do_init((mutex), #mutex, &__key); \
-+} while (0)
-+
-+# define __mutex_init(mutex, name, key) \
-+do { \
-+ rt_mutex_init(&(mutex)->lock); \
-+ __mutex_do_init((mutex), name, key); \
-+} while (0)
-+
-+#endif
-diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
-index e8d79d4..2ae8fa1 100644
---- a/include/linux/netdevice.h
-+++ b/include/linux/netdevice.h
-@@ -2409,14 +2409,53 @@ void netdev_freemem(struct net_device *dev);
- void synchronize_net(void);
- int init_dummy_netdev(struct net_device *dev);
-
--DECLARE_PER_CPU(int, xmit_recursion);
- #define XMIT_RECURSION_LIMIT 10
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+static inline int dev_recursion_level(void)
-+{
-+ return current->xmit_recursion;
-+}
-+
-+static inline int xmit_rec_read(void)
-+{
-+ return current->xmit_recursion;
-+}
-+
-+static inline void xmit_rec_inc(void)
-+{
-+ current->xmit_recursion++;
-+}
-+
-+static inline void xmit_rec_dec(void)
-+{
-+ current->xmit_recursion--;
-+}
-+
-+#else
-+
-+DECLARE_PER_CPU(int, xmit_recursion);
-
- static inline int dev_recursion_level(void)
- {
- return this_cpu_read(xmit_recursion);
- }
-
-+static inline int xmit_rec_read(void)
-+{
-+ return __this_cpu_read(xmit_recursion);
-+}
-+
-+static inline void xmit_rec_inc(void)
-+{
-+ __this_cpu_inc(xmit_recursion);
-+}
-+
-+static inline void xmit_rec_dec(void)
-+{
-+ __this_cpu_dec(xmit_recursion);
-+}
-+#endif
-+
- struct net_device *dev_get_by_index(struct net *net, int ifindex);
- struct net_device *__dev_get_by_index(struct net *net, int ifindex);
- struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
-@@ -2794,6 +2833,7 @@ struct softnet_data {
- unsigned int dropped;
- struct sk_buff_head input_pkt_queue;
- struct napi_struct backlog;
-+ struct sk_buff_head tofree_queue;
-
- };
-
-diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
-index 2ad1a2b..b4d1015 100644
---- a/include/linux/netfilter/x_tables.h
-+++ b/include/linux/netfilter/x_tables.h
-@@ -4,6 +4,7 @@
-
- #include <linux/netdevice.h>
- #include <linux/static_key.h>
-+#include <linux/locallock.h>
- #include <uapi/linux/netfilter/x_tables.h>
-
- /* Test a struct->invflags and a boolean for inequality */
-@@ -300,6 +301,8 @@ void xt_free_table_info(struct xt_table_info *info);
- */
- DECLARE_PER_CPU(seqcount_t, xt_recseq);
-
-+DECLARE_LOCAL_IRQ_LOCK(xt_write_lock);
-+
- /* xt_tee_enabled - true if x_tables needs to handle reentrancy
- *
- * Enabled if current ip(6)tables ruleset has at least one -j TEE rule.
-@@ -320,6 +323,9 @@ static inline unsigned int xt_write_recseq_begin(void)
- {
- unsigned int addend;
-
-+ /* RT protection */
-+ local_lock(xt_write_lock);
-+
- /*
- * Low order bit of sequence is set if we already
- * called xt_write_recseq_begin().
-@@ -350,6 +356,7 @@ static inline void xt_write_recseq_end(unsigned int addend)
- /* this is kind of a write_seqcount_end(), but addend is 0 or 1 */
- smp_wmb();
- __this_cpu_add(xt_recseq.sequence, addend);
-+ local_unlock(xt_write_lock);
- }
-
- /*
-diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
-index 810124b..d54ca43 100644
---- a/include/linux/nfs_fs.h
-+++ b/include/linux/nfs_fs.h
-@@ -165,7 +165,11 @@ struct nfs_inode {
-
- /* Readers: in-flight sillydelete RPC calls */
- /* Writers: rmdir */
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ struct semaphore rmdir_sem;
-+#else
- struct rw_semaphore rmdir_sem;
-+#endif
-
- #if IS_ENABLED(CONFIG_NFS_V4)
- struct nfs4_cached_acl *nfs4_acl;
-diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
-index 7cc0dee..a20f49ee 100644
---- a/include/linux/nfs_xdr.h
-+++ b/include/linux/nfs_xdr.h
-@@ -1484,7 +1484,7 @@ struct nfs_unlinkdata {
- struct nfs_removeargs args;
- struct nfs_removeres res;
- struct dentry *dentry;
-- wait_queue_head_t wq;
-+ struct swait_queue_head wq;
- struct rpc_cred *cred;
- struct nfs_fattr dir_attr;
- long timeout;
-diff --git a/include/linux/notifier.h b/include/linux/notifier.h
-index 4149868..babe5b9 100644
---- a/include/linux/notifier.h
-+++ b/include/linux/notifier.h
-@@ -6,7 +6,7 @@
- *
- * Alan Cox <Alan.Cox@linux.org>
- */
--
-+
- #ifndef _LINUX_NOTIFIER_H
- #define _LINUX_NOTIFIER_H
- #include <linux/errno.h>
-@@ -42,9 +42,7 @@
- * in srcu_notifier_call_chain(): no cache bounces and no memory barriers.
- * As compensation, srcu_notifier_chain_unregister() is rather expensive.
- * SRCU notifier chains should be used when the chain will be called very
-- * often but notifier_blocks will seldom be removed. Also, SRCU notifier
-- * chains are slightly more difficult to use because they require special
-- * runtime initialization.
-+ * often but notifier_blocks will seldom be removed.
- */
-
- struct notifier_block;
-@@ -90,7 +88,7 @@ struct srcu_notifier_head {
- (name)->head = NULL; \
- } while (0)
-
--/* srcu_notifier_heads must be initialized and cleaned up dynamically */
-+/* srcu_notifier_heads must be cleaned up dynamically */
- extern void srcu_init_notifier_head(struct srcu_notifier_head *nh);
- #define srcu_cleanup_notifier_head(name) \
- cleanup_srcu_struct(&(name)->srcu);
-@@ -103,7 +101,13 @@ extern void srcu_init_notifier_head(struct srcu_notifier_head *nh);
- .head = NULL }
- #define RAW_NOTIFIER_INIT(name) { \
- .head = NULL }
--/* srcu_notifier_heads cannot be initialized statically */
-+
-+#define SRCU_NOTIFIER_INIT(name, pcpu) \
-+ { \
-+ .mutex = __MUTEX_INITIALIZER(name.mutex), \
-+ .head = NULL, \
-+ .srcu = __SRCU_STRUCT_INIT(name.srcu, pcpu), \
-+ }
-
- #define ATOMIC_NOTIFIER_HEAD(name) \
- struct atomic_notifier_head name = \
-@@ -115,6 +119,18 @@ extern void srcu_init_notifier_head(struct srcu_notifier_head *nh);
- struct raw_notifier_head name = \
- RAW_NOTIFIER_INIT(name)
-
-+#define _SRCU_NOTIFIER_HEAD(name, mod) \
-+ static DEFINE_PER_CPU(struct srcu_struct_array, \
-+ name##_head_srcu_array); \
-+ mod struct srcu_notifier_head name = \
-+ SRCU_NOTIFIER_INIT(name, name##_head_srcu_array)
-+
-+#define SRCU_NOTIFIER_HEAD(name) \
-+ _SRCU_NOTIFIER_HEAD(name, )
-+
-+#define SRCU_NOTIFIER_HEAD_STATIC(name) \
-+ _SRCU_NOTIFIER_HEAD(name, static)
-+
- #ifdef __KERNEL__
-
- extern int atomic_notifier_chain_register(struct atomic_notifier_head *nh,
-@@ -184,12 +200,12 @@ static inline int notifier_to_errno(int ret)
-
- /*
- * Declared notifiers so far. I can imagine quite a few more chains
-- * over time (eg laptop power reset chains, reboot chain (to clean
-+ * over time (eg laptop power reset chains, reboot chain (to clean
- * device units up), device [un]mount chain, module load/unload chain,
-- * low memory chain, screenblank chain (for plug in modular screenblankers)
-+ * low memory chain, screenblank chain (for plug in modular screenblankers)
- * VC switch chains (for loadable kernel svgalib VC switch helpers) etc...
- */
--
-+
- /* CPU notfiers are defined in include/linux/cpu.h. */
-
- /* netdevice notifiers are defined in include/linux/netdevice.h */
-diff --git a/include/linux/percpu.h b/include/linux/percpu.h
-index 56939d3..1c7e33f 100644
---- a/include/linux/percpu.h
-+++ b/include/linux/percpu.h
-@@ -18,6 +18,35 @@
- #define PERCPU_MODULE_RESERVE 0
- #endif
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+
-+#define get_local_var(var) (*({ \
-+ migrate_disable(); \
-+ this_cpu_ptr(&var); }))
-+
-+#define put_local_var(var) do { \
-+ (void)&(var); \
-+ migrate_enable(); \
-+} while (0)
-+
-+# define get_local_ptr(var) ({ \
-+ migrate_disable(); \
-+ this_cpu_ptr(var); })
-+
-+# define put_local_ptr(var) do { \
-+ (void)(var); \
-+ migrate_enable(); \
-+} while (0)
-+
-+#else
-+
-+#define get_local_var(var) get_cpu_var(var)
-+#define put_local_var(var) put_cpu_var(var)
-+#define get_local_ptr(var) get_cpu_ptr(var)
-+#define put_local_ptr(var) put_cpu_ptr(var)
-+
-+#endif
-+
- /* minimum unit size, also is the maximum supported allocation size */
- #define PCPU_MIN_UNIT_SIZE PFN_ALIGN(32 << 10)
-
-diff --git a/include/linux/pid.h b/include/linux/pid.h
-index 23705a5..2cc64b7 100644
---- a/include/linux/pid.h
-+++ b/include/linux/pid.h
-@@ -2,6 +2,7 @@
- #define _LINUX_PID_H
-
- #include <linux/rcupdate.h>
-+#include <linux/atomic.h>
-
- enum pid_type
- {
-diff --git a/include/linux/preempt.h b/include/linux/preempt.h
-index 75e4e30..1cfb1cb 100644
---- a/include/linux/preempt.h
-+++ b/include/linux/preempt.h
-@@ -50,7 +50,11 @@
- #define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT)
- #define NMI_OFFSET (1UL << NMI_SHIFT)
-
--#define SOFTIRQ_DISABLE_OFFSET (2 * SOFTIRQ_OFFSET)
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+# define SOFTIRQ_DISABLE_OFFSET (2 * SOFTIRQ_OFFSET)
-+#else
-+# define SOFTIRQ_DISABLE_OFFSET (0)
-+#endif
-
- /* We use the MSB mostly because its available */
- #define PREEMPT_NEED_RESCHED 0x80000000
-@@ -59,9 +63,15 @@
- #include <asm/preempt.h>
-
- #define hardirq_count() (preempt_count() & HARDIRQ_MASK)
--#define softirq_count() (preempt_count() & SOFTIRQ_MASK)
- #define irq_count() (preempt_count() & (HARDIRQ_MASK | SOFTIRQ_MASK \
- | NMI_MASK))
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+# define softirq_count() (preempt_count() & SOFTIRQ_MASK)
-+# define in_serving_softirq() (softirq_count() & SOFTIRQ_OFFSET)
-+#else
-+# define softirq_count() (0UL)
-+extern int in_serving_softirq(void);
-+#endif
-
- /*
- * Are we doing bottom half or hardware interrupt processing?
-@@ -72,7 +82,6 @@
- #define in_irq() (hardirq_count())
- #define in_softirq() (softirq_count())
- #define in_interrupt() (irq_count())
--#define in_serving_softirq() (softirq_count() & SOFTIRQ_OFFSET)
-
- /*
- * Are we in NMI context?
-@@ -91,7 +100,11 @@
- /*
- * The preempt_count offset after spin_lock()
- */
-+#if !defined(CONFIG_PREEMPT_RT_FULL)
- #define PREEMPT_LOCK_OFFSET PREEMPT_DISABLE_OFFSET
-+#else
-+#define PREEMPT_LOCK_OFFSET 0
-+#endif
-
- /*
- * The preempt_count offset needed for things like:
-@@ -140,6 +153,20 @@ extern void preempt_count_sub(int val);
- #define preempt_count_inc() preempt_count_add(1)
- #define preempt_count_dec() preempt_count_sub(1)
-
-+#ifdef CONFIG_PREEMPT_LAZY
-+#define add_preempt_lazy_count(val) do { preempt_lazy_count() += (val); } while (0)
-+#define sub_preempt_lazy_count(val) do { preempt_lazy_count() -= (val); } while (0)
-+#define inc_preempt_lazy_count() add_preempt_lazy_count(1)
-+#define dec_preempt_lazy_count() sub_preempt_lazy_count(1)
-+#define preempt_lazy_count() (current_thread_info()->preempt_lazy_count)
-+#else
-+#define add_preempt_lazy_count(val) do { } while (0)
-+#define sub_preempt_lazy_count(val) do { } while (0)
-+#define inc_preempt_lazy_count() do { } while (0)
-+#define dec_preempt_lazy_count() do { } while (0)
-+#define preempt_lazy_count() (0)
-+#endif
-+
- #ifdef CONFIG_PREEMPT_COUNT
-
- #define preempt_disable() \
-@@ -148,13 +175,25 @@ do { \
- barrier(); \
- } while (0)
-
-+#define preempt_lazy_disable() \
-+do { \
-+ inc_preempt_lazy_count(); \
-+ barrier(); \
-+} while (0)
-+
- #define sched_preempt_enable_no_resched() \
- do { \
- barrier(); \
- preempt_count_dec(); \
- } while (0)
-
--#define preempt_enable_no_resched() sched_preempt_enable_no_resched()
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+# define preempt_enable_no_resched() sched_preempt_enable_no_resched()
-+# define preempt_check_resched_rt() preempt_check_resched()
-+#else
-+# define preempt_enable_no_resched() preempt_enable()
-+# define preempt_check_resched_rt() barrier();
-+#endif
-
- #define preemptible() (preempt_count() == 0 && !irqs_disabled())
-
-@@ -179,6 +218,13 @@ do { \
- __preempt_schedule(); \
- } while (0)
-
-+#define preempt_lazy_enable() \
-+do { \
-+ dec_preempt_lazy_count(); \
-+ barrier(); \
-+ preempt_check_resched(); \
-+} while (0)
-+
- #else /* !CONFIG_PREEMPT */
- #define preempt_enable() \
- do { \
-@@ -224,6 +270,7 @@ do { \
- #define preempt_disable_notrace() barrier()
- #define preempt_enable_no_resched_notrace() barrier()
- #define preempt_enable_notrace() barrier()
-+#define preempt_check_resched_rt() barrier()
- #define preemptible() 0
-
- #endif /* CONFIG_PREEMPT_COUNT */
-@@ -244,10 +291,31 @@ do { \
- } while (0)
- #define preempt_fold_need_resched() \
- do { \
-- if (tif_need_resched()) \
-+ if (tif_need_resched_now()) \
- set_preempt_need_resched(); \
- } while (0)
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+# define preempt_disable_rt() preempt_disable()
-+# define preempt_enable_rt() preempt_enable()
-+# define preempt_disable_nort() barrier()
-+# define preempt_enable_nort() barrier()
-+# ifdef CONFIG_SMP
-+ extern void migrate_disable(void);
-+ extern void migrate_enable(void);
-+# else /* CONFIG_SMP */
-+# define migrate_disable() barrier()
-+# define migrate_enable() barrier()
-+# endif /* CONFIG_SMP */
-+#else
-+# define preempt_disable_rt() barrier()
-+# define preempt_enable_rt() barrier()
-+# define preempt_disable_nort() preempt_disable()
-+# define preempt_enable_nort() preempt_enable()
-+# define migrate_disable() preempt_disable()
-+# define migrate_enable() preempt_enable()
-+#endif
-+
- #ifdef CONFIG_PREEMPT_NOTIFIERS
-
- struct preempt_notifier;
-diff --git a/include/linux/printk.h b/include/linux/printk.h
-index 696a56b..310aa32 100644
---- a/include/linux/printk.h
-+++ b/include/linux/printk.h
-@@ -125,9 +125,11 @@ struct va_format {
- #ifdef CONFIG_EARLY_PRINTK
- extern asmlinkage __printf(1, 2)
- void early_printk(const char *fmt, ...);
-+extern void printk_kill(void);
- #else
- static inline __printf(1, 2) __cold
- void early_printk(const char *s, ...) { }
-+static inline void printk_kill(void) { }
- #endif
-
- #ifdef CONFIG_PRINTK_NMI
-diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h
-index 4c45105..fd9ea1c 100644
---- a/include/linux/radix-tree.h
-+++ b/include/linux/radix-tree.h
-@@ -280,18 +280,28 @@ bool __radix_tree_delete_node(struct radix_tree_root *root,
- struct radix_tree_node *node);
- void *radix_tree_delete_item(struct radix_tree_root *, unsigned long, void *);
- void *radix_tree_delete(struct radix_tree_root *, unsigned long);
--struct radix_tree_node *radix_tree_replace_clear_tags(
-- struct radix_tree_root *root,
-- unsigned long index, void *entry);
-+void radix_tree_clear_tags(struct radix_tree_root *root,
-+ struct radix_tree_node *node,
-+ void **slot);
- unsigned int radix_tree_gang_lookup(struct radix_tree_root *root,
- void **results, unsigned long first_index,
- unsigned int max_items);
- unsigned int radix_tree_gang_lookup_slot(struct radix_tree_root *root,
- void ***results, unsigned long *indices,
- unsigned long first_index, unsigned int max_items);
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+static inline int radix_tree_preload(gfp_t gm) { return 0; }
-+static inline int radix_tree_maybe_preload(gfp_t gfp_mask) { return 0; }
-+static inline int radix_tree_maybe_preload_order(gfp_t gfp_mask, int order)
-+{
-+ return 0;
-+};
-+
-+#else
- int radix_tree_preload(gfp_t gfp_mask);
- int radix_tree_maybe_preload(gfp_t gfp_mask);
- int radix_tree_maybe_preload_order(gfp_t gfp_mask, int order);
-+#endif
- void radix_tree_init(void);
- void *radix_tree_tag_set(struct radix_tree_root *root,
- unsigned long index, unsigned int tag);
-@@ -316,7 +326,7 @@ unsigned long radix_tree_locate_item(struct radix_tree_root *root, void *item);
-
- static inline void radix_tree_preload_end(void)
- {
-- preempt_enable();
-+ preempt_enable_nort();
- }
-
- /**
-diff --git a/include/linux/random.h b/include/linux/random.h
-index 3d6e981..f6e8860 100644
---- a/include/linux/random.h
-+++ b/include/linux/random.h
-@@ -20,7 +20,7 @@ struct random_ready_callback {
- extern void add_device_randomness(const void *, unsigned int);
- extern void add_input_randomness(unsigned int type, unsigned int code,
- unsigned int value);
--extern void add_interrupt_randomness(int irq, int irq_flags);
-+extern void add_interrupt_randomness(int irq, int irq_flags, __u64 ip);
-
- extern void get_random_bytes(void *buf, int nbytes);
- extern int add_random_ready_callback(struct random_ready_callback *rdy);
-diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h
-index e585018..25c6447 100644
---- a/include/linux/rbtree.h
-+++ b/include/linux/rbtree.h
-@@ -31,7 +31,7 @@
-
- #include <linux/kernel.h>
- #include <linux/stddef.h>
--#include <linux/rcupdate.h>
-+#include <linux/rcu_assign_pointer.h>
-
- struct rb_node {
- unsigned long __rb_parent_color;
-diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
-index d076183..36bfb4d 100644
---- a/include/linux/rbtree_augmented.h
-+++ b/include/linux/rbtree_augmented.h
-@@ -26,6 +26,7 @@
-
- #include <linux/compiler.h>
- #include <linux/rbtree.h>
-+#include <linux/rcupdate.h>
-
- /*
- * Please note - only struct rb_augment_callbacks and the prototypes for
-diff --git a/include/linux/rcu_assign_pointer.h b/include/linux/rcu_assign_pointer.h
-new file mode 100644
-index 0000000..1f49a6d
---- /dev/null
-+++ b/include/linux/rcu_assign_pointer.h
-@@ -0,0 +1,53 @@
-+#ifndef __LINUX_RCU_ASSIGN_POINTER_H__
-+#define __LINUX_RCU_ASSIGN_POINTER_H__
-+#include <linux/compiler.h>
-+
-+/**
-+ * RCU_INITIALIZER() - statically initialize an RCU-protected global variable
-+ * @v: The value to statically initialize with.
-+ */
-+#define RCU_INITIALIZER(v) (typeof(*(v)) __force __rcu *)(v)
-+
-+/**
-+ * rcu_assign_pointer() - assign to RCU-protected pointer
-+ * @p: pointer to assign to
-+ * @v: value to assign (publish)
-+ *
-+ * Assigns the specified value to the specified RCU-protected
-+ * pointer, ensuring that any concurrent RCU readers will see
-+ * any prior initialization.
-+ *
-+ * Inserts memory barriers on architectures that require them
-+ * (which is most of them), and also prevents the compiler from
-+ * reordering the code that initializes the structure after the pointer
-+ * assignment. More importantly, this call documents which pointers
-+ * will be dereferenced by RCU read-side code.
-+ *
-+ * In some special cases, you may use RCU_INIT_POINTER() instead
-+ * of rcu_assign_pointer(). RCU_INIT_POINTER() is a bit faster due
-+ * to the fact that it does not constrain either the CPU or the compiler.
-+ * That said, using RCU_INIT_POINTER() when you should have used
-+ * rcu_assign_pointer() is a very bad thing that results in
-+ * impossible-to-diagnose memory corruption. So please be careful.
-+ * See the RCU_INIT_POINTER() comment header for details.
-+ *
-+ * Note that rcu_assign_pointer() evaluates each of its arguments only
-+ * once, appearances notwithstanding. One of the "extra" evaluations
-+ * is in typeof() and the other visible only to sparse (__CHECKER__),
-+ * neither of which actually execute the argument. As with most cpp
-+ * macros, this execute-arguments-only-once property is important, so
-+ * please be careful when making changes to rcu_assign_pointer() and the
-+ * other macros that it invokes.
-+ */
-+#define rcu_assign_pointer(p, v) \
-+({ \
-+ uintptr_t _r_a_p__v = (uintptr_t)(v); \
-+ \
-+ if (__builtin_constant_p(v) && (_r_a_p__v) == (uintptr_t)NULL) \
-+ WRITE_ONCE((p), (typeof(p))(_r_a_p__v)); \
-+ else \
-+ smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
-+ _r_a_p__v; \
-+})
-+
-+#endif
-diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
-index 1aa62e1..2a614ac 100644
---- a/include/linux/rcupdate.h
-+++ b/include/linux/rcupdate.h
-@@ -46,6 +46,7 @@
- #include <linux/compiler.h>
- #include <linux/ktime.h>
- #include <linux/irqflags.h>
-+#include <linux/rcu_assign_pointer.h>
-
- #include <asm/barrier.h>
-
-@@ -178,6 +179,9 @@ void call_rcu(struct rcu_head *head,
-
- #endif /* #else #ifdef CONFIG_PREEMPT_RCU */
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+#define call_rcu_bh call_rcu
-+#else
- /**
- * call_rcu_bh() - Queue an RCU for invocation after a quicker grace period.
- * @head: structure to be used for queueing the RCU updates.
-@@ -201,6 +205,7 @@ void call_rcu(struct rcu_head *head,
- */
- void call_rcu_bh(struct rcu_head *head,
- rcu_callback_t func);
-+#endif
-
- /**
- * call_rcu_sched() - Queue an RCU for invocation after sched grace period.
-@@ -301,6 +306,11 @@ void synchronize_rcu(void);
- * types of kernel builds, the rcu_read_lock() nesting depth is unknowable.
- */
- #define rcu_preempt_depth() (current->rcu_read_lock_nesting)
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+#define sched_rcu_preempt_depth() rcu_preempt_depth()
-+#else
-+static inline int sched_rcu_preempt_depth(void) { return 0; }
-+#endif
-
- #else /* #ifdef CONFIG_PREEMPT_RCU */
-
-@@ -326,6 +336,8 @@ static inline int rcu_preempt_depth(void)
- return 0;
- }
-
-+#define sched_rcu_preempt_depth() rcu_preempt_depth()
-+
- #endif /* #else #ifdef CONFIG_PREEMPT_RCU */
-
- /* Internal to kernel */
-@@ -500,7 +512,14 @@ extern struct lockdep_map rcu_callback_map;
- int debug_lockdep_rcu_enabled(void);
-
- int rcu_read_lock_held(void);
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+static inline int rcu_read_lock_bh_held(void)
-+{
-+ return rcu_read_lock_held();
-+}
-+#else
- int rcu_read_lock_bh_held(void);
-+#endif
-
- /**
- * rcu_read_lock_sched_held() - might we be in RCU-sched read-side critical section?
-@@ -621,54 +640,6 @@ static inline void rcu_preempt_sleep_check(void)
- })
-
- /**
-- * RCU_INITIALIZER() - statically initialize an RCU-protected global variable
-- * @v: The value to statically initialize with.
-- */
--#define RCU_INITIALIZER(v) (typeof(*(v)) __force __rcu *)(v)
--
--/**
-- * rcu_assign_pointer() - assign to RCU-protected pointer
-- * @p: pointer to assign to
-- * @v: value to assign (publish)
-- *
-- * Assigns the specified value to the specified RCU-protected
-- * pointer, ensuring that any concurrent RCU readers will see
-- * any prior initialization.
-- *
-- * Inserts memory barriers on architectures that require them
-- * (which is most of them), and also prevents the compiler from
-- * reordering the code that initializes the structure after the pointer
-- * assignment. More importantly, this call documents which pointers
-- * will be dereferenced by RCU read-side code.
-- *
-- * In some special cases, you may use RCU_INIT_POINTER() instead
-- * of rcu_assign_pointer(). RCU_INIT_POINTER() is a bit faster due
-- * to the fact that it does not constrain either the CPU or the compiler.
-- * That said, using RCU_INIT_POINTER() when you should have used
-- * rcu_assign_pointer() is a very bad thing that results in
-- * impossible-to-diagnose memory corruption. So please be careful.
-- * See the RCU_INIT_POINTER() comment header for details.
-- *
-- * Note that rcu_assign_pointer() evaluates each of its arguments only
-- * once, appearances notwithstanding. One of the "extra" evaluations
-- * is in typeof() and the other visible only to sparse (__CHECKER__),
-- * neither of which actually execute the argument. As with most cpp
-- * macros, this execute-arguments-only-once property is important, so
-- * please be careful when making changes to rcu_assign_pointer() and the
-- * other macros that it invokes.
-- */
--#define rcu_assign_pointer(p, v) \
--({ \
-- uintptr_t _r_a_p__v = (uintptr_t)(v); \
-- \
-- if (__builtin_constant_p(v) && (_r_a_p__v) == (uintptr_t)NULL) \
-- WRITE_ONCE((p), (typeof(p))(_r_a_p__v)); \
-- else \
-- smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
-- _r_a_p__v; \
--})
--
--/**
- * rcu_access_pointer() - fetch RCU pointer with no dereferencing
- * @p: The pointer to read
- *
-@@ -946,10 +917,14 @@ static inline void rcu_read_unlock(void)
- static inline void rcu_read_lock_bh(void)
- {
- local_bh_disable();
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ rcu_read_lock();
-+#else
- __acquire(RCU_BH);
- rcu_lock_acquire(&rcu_bh_lock_map);
- RCU_LOCKDEP_WARN(!rcu_is_watching(),
- "rcu_read_lock_bh() used illegally while idle");
-+#endif
- }
-
- /*
-@@ -959,10 +934,14 @@ static inline void rcu_read_lock_bh(void)
- */
- static inline void rcu_read_unlock_bh(void)
- {
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ rcu_read_unlock();
-+#else
- RCU_LOCKDEP_WARN(!rcu_is_watching(),
- "rcu_read_unlock_bh() used illegally while idle");
- rcu_lock_release(&rcu_bh_lock_map);
- __release(RCU_BH);
-+#endif
- local_bh_enable();
- }
-
-diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h
-index 63a4e4c..08ab12d 100644
---- a/include/linux/rcutree.h
-+++ b/include/linux/rcutree.h
-@@ -44,7 +44,11 @@ static inline void rcu_virt_note_context_switch(int cpu)
- rcu_note_context_switch();
- }
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+# define synchronize_rcu_bh synchronize_rcu
-+#else
- void synchronize_rcu_bh(void);
-+#endif
- void synchronize_sched_expedited(void);
- void synchronize_rcu_expedited(void);
-
-@@ -72,7 +76,11 @@ static inline void synchronize_rcu_bh_expedited(void)
- }
-
- void rcu_barrier(void);
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+# define rcu_barrier_bh rcu_barrier
-+#else
- void rcu_barrier_bh(void);
-+#endif
- void rcu_barrier_sched(void);
- unsigned long get_state_synchronize_rcu(void);
- void cond_synchronize_rcu(unsigned long oldstate);
-@@ -82,17 +90,14 @@ void cond_synchronize_sched(unsigned long oldstate);
- extern unsigned long rcutorture_testseq;
- extern unsigned long rcutorture_vernum;
- unsigned long rcu_batches_started(void);
--unsigned long rcu_batches_started_bh(void);
- unsigned long rcu_batches_started_sched(void);
- unsigned long rcu_batches_completed(void);
--unsigned long rcu_batches_completed_bh(void);
- unsigned long rcu_batches_completed_sched(void);
- unsigned long rcu_exp_batches_completed(void);
- unsigned long rcu_exp_batches_completed_sched(void);
- void show_rcu_gp_kthreads(void);
-
- void rcu_force_quiescent_state(void);
--void rcu_bh_force_quiescent_state(void);
- void rcu_sched_force_quiescent_state(void);
-
- void rcu_idle_enter(void);
-@@ -109,6 +114,16 @@ extern int rcu_scheduler_active __read_mostly;
-
- bool rcu_is_watching(void);
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+void rcu_bh_force_quiescent_state(void);
-+unsigned long rcu_batches_started_bh(void);
-+unsigned long rcu_batches_completed_bh(void);
-+#else
-+# define rcu_bh_force_quiescent_state rcu_force_quiescent_state
-+# define rcu_batches_completed_bh rcu_batches_completed
-+# define rcu_batches_started_bh rcu_batches_completed
-+#endif
-+
- void rcu_all_qs(void);
-
- /* RCUtree hotplug events */
-diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h
-index 1abba5c..30211c62 100644
---- a/include/linux/rtmutex.h
-+++ b/include/linux/rtmutex.h
-@@ -13,11 +13,15 @@
- #define __LINUX_RT_MUTEX_H
-
- #include <linux/linkage.h>
-+#include <linux/spinlock_types_raw.h>
- #include <linux/rbtree.h>
--#include <linux/spinlock_types.h>
-
- extern int max_lock_depth; /* for sysctl */
-
-+#ifdef CONFIG_DEBUG_MUTEXES
-+#include <linux/debug_locks.h>
-+#endif
-+
- /**
- * The rt_mutex structure
- *
-@@ -31,8 +35,8 @@ struct rt_mutex {
- struct rb_root waiters;
- struct rb_node *waiters_leftmost;
- struct task_struct *owner;
--#ifdef CONFIG_DEBUG_RT_MUTEXES
- int save_state;
-+#ifdef CONFIG_DEBUG_RT_MUTEXES
- const char *name, *file;
- int line;
- void *magic;
-@@ -55,22 +59,33 @@ struct hrtimer_sleeper;
- # define rt_mutex_debug_check_no_locks_held(task) do { } while (0)
- #endif
-
-+# define rt_mutex_init(mutex) \
-+ do { \
-+ raw_spin_lock_init(&(mutex)->wait_lock); \
-+ __rt_mutex_init(mutex, #mutex); \
-+ } while (0)
-+
- #ifdef CONFIG_DEBUG_RT_MUTEXES
- # define __DEBUG_RT_MUTEX_INITIALIZER(mutexname) \
- , .name = #mutexname, .file = __FILE__, .line = __LINE__
--# define rt_mutex_init(mutex) __rt_mutex_init(mutex, __func__)
- extern void rt_mutex_debug_task_free(struct task_struct *tsk);
- #else
- # define __DEBUG_RT_MUTEX_INITIALIZER(mutexname)
--# define rt_mutex_init(mutex) __rt_mutex_init(mutex, NULL)
- # define rt_mutex_debug_task_free(t) do { } while (0)
- #endif
-
--#define __RT_MUTEX_INITIALIZER(mutexname) \
-- { .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(mutexname.wait_lock) \
-+#define __RT_MUTEX_INITIALIZER_PLAIN(mutexname) \
-+ .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(mutexname.wait_lock) \
- , .waiters = RB_ROOT \
- , .owner = NULL \
-- __DEBUG_RT_MUTEX_INITIALIZER(mutexname)}
-+ __DEBUG_RT_MUTEX_INITIALIZER(mutexname)
-+
-+#define __RT_MUTEX_INITIALIZER(mutexname) \
-+ { __RT_MUTEX_INITIALIZER_PLAIN(mutexname) }
-+
-+#define __RT_MUTEX_INITIALIZER_SAVE_STATE(mutexname) \
-+ { __RT_MUTEX_INITIALIZER_PLAIN(mutexname) \
-+ , .save_state = 1 }
-
- #define DEFINE_RT_MUTEX(mutexname) \
- struct rt_mutex mutexname = __RT_MUTEX_INITIALIZER(mutexname)
-@@ -91,6 +106,7 @@ extern void rt_mutex_destroy(struct rt_mutex *lock);
-
- extern void rt_mutex_lock(struct rt_mutex *lock);
- extern int rt_mutex_lock_interruptible(struct rt_mutex *lock);
-+extern int rt_mutex_lock_killable(struct rt_mutex *lock);
- extern int rt_mutex_timed_lock(struct rt_mutex *lock,
- struct hrtimer_sleeper *timeout);
-
-diff --git a/include/linux/rwlock_rt.h b/include/linux/rwlock_rt.h
-new file mode 100644
-index 0000000..49ed2d4
---- /dev/null
-+++ b/include/linux/rwlock_rt.h
-@@ -0,0 +1,99 @@
-+#ifndef __LINUX_RWLOCK_RT_H
-+#define __LINUX_RWLOCK_RT_H
-+
-+#ifndef __LINUX_SPINLOCK_H
-+#error Do not include directly. Use spinlock.h
-+#endif
-+
-+#define rwlock_init(rwl) \
-+do { \
-+ static struct lock_class_key __key; \
-+ \
-+ rt_mutex_init(&(rwl)->lock); \
-+ __rt_rwlock_init(rwl, #rwl, &__key); \
-+} while (0)
-+
-+extern void __lockfunc rt_write_lock(rwlock_t *rwlock);
-+extern void __lockfunc rt_read_lock(rwlock_t *rwlock);
-+extern int __lockfunc rt_write_trylock(rwlock_t *rwlock);
-+extern int __lockfunc rt_write_trylock_irqsave(rwlock_t *trylock, unsigned long *flags);
-+extern int __lockfunc rt_read_trylock(rwlock_t *rwlock);
-+extern void __lockfunc rt_write_unlock(rwlock_t *rwlock);
-+extern void __lockfunc rt_read_unlock(rwlock_t *rwlock);
-+extern unsigned long __lockfunc rt_write_lock_irqsave(rwlock_t *rwlock);
-+extern unsigned long __lockfunc rt_read_lock_irqsave(rwlock_t *rwlock);
-+extern void __rt_rwlock_init(rwlock_t *rwlock, char *name, struct lock_class_key *key);
-+
-+#define read_trylock(lock) __cond_lock(lock, rt_read_trylock(lock))
-+#define write_trylock(lock) __cond_lock(lock, rt_write_trylock(lock))
-+
-+#define write_trylock_irqsave(lock, flags) \
-+ __cond_lock(lock, rt_write_trylock_irqsave(lock, &flags))
-+
-+#define read_lock_irqsave(lock, flags) \
-+ do { \
-+ typecheck(unsigned long, flags); \
-+ flags = rt_read_lock_irqsave(lock); \
-+ } while (0)
-+
-+#define write_lock_irqsave(lock, flags) \
-+ do { \
-+ typecheck(unsigned long, flags); \
-+ flags = rt_write_lock_irqsave(lock); \
-+ } while (0)
-+
-+#define read_lock(lock) rt_read_lock(lock)
-+
-+#define read_lock_bh(lock) \
-+ do { \
-+ local_bh_disable(); \
-+ rt_read_lock(lock); \
-+ } while (0)
-+
-+#define read_lock_irq(lock) read_lock(lock)
-+
-+#define write_lock(lock) rt_write_lock(lock)
-+
-+#define write_lock_bh(lock) \
-+ do { \
-+ local_bh_disable(); \
-+ rt_write_lock(lock); \
-+ } while (0)
-+
-+#define write_lock_irq(lock) write_lock(lock)
-+
-+#define read_unlock(lock) rt_read_unlock(lock)
-+
-+#define read_unlock_bh(lock) \
-+ do { \
-+ rt_read_unlock(lock); \
-+ local_bh_enable(); \
-+ } while (0)
-+
-+#define read_unlock_irq(lock) read_unlock(lock)
-+
-+#define write_unlock(lock) rt_write_unlock(lock)
-+
-+#define write_unlock_bh(lock) \
-+ do { \
-+ rt_write_unlock(lock); \
-+ local_bh_enable(); \
-+ } while (0)
-+
-+#define write_unlock_irq(lock) write_unlock(lock)
-+
-+#define read_unlock_irqrestore(lock, flags) \
-+ do { \
-+ typecheck(unsigned long, flags); \
-+ (void) flags; \
-+ rt_read_unlock(lock); \
-+ } while (0)
-+
-+#define write_unlock_irqrestore(lock, flags) \
-+ do { \
-+ typecheck(unsigned long, flags); \
-+ (void) flags; \
-+ rt_write_unlock(lock); \
-+ } while (0)
-+
-+#endif
-diff --git a/include/linux/rwlock_types.h b/include/linux/rwlock_types.h
-index cc0072e..5317cd9 100644
---- a/include/linux/rwlock_types.h
-+++ b/include/linux/rwlock_types.h
-@@ -1,6 +1,10 @@
- #ifndef __LINUX_RWLOCK_TYPES_H
- #define __LINUX_RWLOCK_TYPES_H
-
-+#if !defined(__LINUX_SPINLOCK_TYPES_H)
-+# error "Do not include directly, include spinlock_types.h"
-+#endif
-+
- /*
- * include/linux/rwlock_types.h - generic rwlock type definitions
- * and initializers
-diff --git a/include/linux/rwlock_types_rt.h b/include/linux/rwlock_types_rt.h
-new file mode 100644
-index 0000000..51b28d77
---- /dev/null
-+++ b/include/linux/rwlock_types_rt.h
-@@ -0,0 +1,33 @@
-+#ifndef __LINUX_RWLOCK_TYPES_RT_H
-+#define __LINUX_RWLOCK_TYPES_RT_H
-+
-+#ifndef __LINUX_SPINLOCK_TYPES_H
-+#error "Do not include directly. Include spinlock_types.h instead"
-+#endif
-+
-+/*
-+ * rwlocks - rtmutex which allows single reader recursion
-+ */
-+typedef struct {
-+ struct rt_mutex lock;
-+ int read_depth;
-+ unsigned int break_lock;
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+ struct lockdep_map dep_map;
-+#endif
-+} rwlock_t;
-+
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+# define RW_DEP_MAP_INIT(lockname) .dep_map = { .name = #lockname }
-+#else
-+# define RW_DEP_MAP_INIT(lockname)
-+#endif
-+
-+#define __RW_LOCK_UNLOCKED(name) \
-+ { .lock = __RT_MUTEX_INITIALIZER_SAVE_STATE(name.lock), \
-+ RW_DEP_MAP_INIT(name) }
-+
-+#define DEFINE_RWLOCK(name) \
-+ rwlock_t name = __RW_LOCK_UNLOCKED(name)
-+
-+#endif
-diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h
-index dd1d142..8e1f44f 100644
---- a/include/linux/rwsem.h
-+++ b/include/linux/rwsem.h
-@@ -19,6 +19,10 @@
- #include <linux/osq_lock.h>
- #endif
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+#include <linux/rwsem_rt.h>
-+#else /* PREEMPT_RT_FULL */
-+
- struct rw_semaphore;
-
- #ifdef CONFIG_RWSEM_GENERIC_SPINLOCK
-@@ -184,4 +188,6 @@ extern void up_read_non_owner(struct rw_semaphore *sem);
- # define up_read_non_owner(sem) up_read(sem)
- #endif
-
-+#endif /* !PREEMPT_RT_FULL */
-+
- #endif /* _LINUX_RWSEM_H */
-diff --git a/include/linux/rwsem_rt.h b/include/linux/rwsem_rt.h
-new file mode 100644
-index 0000000..e26bd95
---- /dev/null
-+++ b/include/linux/rwsem_rt.h
-@@ -0,0 +1,167 @@
-+#ifndef _LINUX_RWSEM_RT_H
-+#define _LINUX_RWSEM_RT_H
-+
-+#ifndef _LINUX_RWSEM_H
-+#error "Include rwsem.h"
-+#endif
-+
-+/*
-+ * RW-semaphores are a spinlock plus a reader-depth count.
-+ *
-+ * Note that the semantics are different from the usual
-+ * Linux rw-sems, in PREEMPT_RT mode we do not allow
-+ * multiple readers to hold the lock at once, we only allow
-+ * a read-lock owner to read-lock recursively. This is
-+ * better for latency, makes the implementation inherently
-+ * fair and makes it simpler as well.
-+ */
-+
-+#include <linux/rtmutex.h>
-+
-+struct rw_semaphore {
-+ struct rt_mutex lock;
-+ int read_depth;
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+ struct lockdep_map dep_map;
-+#endif
-+};
-+
-+#define __RWSEM_INITIALIZER(name) \
-+ { .lock = __RT_MUTEX_INITIALIZER(name.lock), \
-+ RW_DEP_MAP_INIT(name) }
-+
-+#define DECLARE_RWSEM(lockname) \
-+ struct rw_semaphore lockname = __RWSEM_INITIALIZER(lockname)
-+
-+extern void __rt_rwsem_init(struct rw_semaphore *rwsem, const char *name,
-+ struct lock_class_key *key);
-+
-+#define __rt_init_rwsem(sem, name, key) \
-+ do { \
-+ rt_mutex_init(&(sem)->lock); \
-+ __rt_rwsem_init((sem), (name), (key));\
-+ } while (0)
-+
-+#define __init_rwsem(sem, name, key) __rt_init_rwsem(sem, name, key)
-+
-+# define rt_init_rwsem(sem) \
-+do { \
-+ static struct lock_class_key __key; \
-+ \
-+ __rt_init_rwsem((sem), #sem, &__key); \
-+} while (0)
-+
-+extern void rt_down_write(struct rw_semaphore *rwsem);
-+extern int rt_down_write_killable(struct rw_semaphore *rwsem);
-+extern void rt_down_read_nested(struct rw_semaphore *rwsem, int subclass);
-+extern void rt_down_write_nested(struct rw_semaphore *rwsem, int subclass);
-+extern int rt_down_write_killable_nested(struct rw_semaphore *rwsem,
-+ int subclass);
-+extern void rt_down_write_nested_lock(struct rw_semaphore *rwsem,
-+ struct lockdep_map *nest);
-+extern void rt__down_read(struct rw_semaphore *rwsem);
-+extern void rt_down_read(struct rw_semaphore *rwsem);
-+extern int rt_down_write_trylock(struct rw_semaphore *rwsem);
-+extern int rt__down_read_trylock(struct rw_semaphore *rwsem);
-+extern int rt_down_read_trylock(struct rw_semaphore *rwsem);
-+extern void __rt_up_read(struct rw_semaphore *rwsem);
-+extern void rt_up_read(struct rw_semaphore *rwsem);
-+extern void rt_up_write(struct rw_semaphore *rwsem);
-+extern void rt_downgrade_write(struct rw_semaphore *rwsem);
-+
-+#define init_rwsem(sem) rt_init_rwsem(sem)
-+#define rwsem_is_locked(s) rt_mutex_is_locked(&(s)->lock)
-+
-+static inline int rwsem_is_contended(struct rw_semaphore *sem)
-+{
-+ /* rt_mutex_has_waiters() */
-+ return !RB_EMPTY_ROOT(&sem->lock.waiters);
-+}
-+
-+static inline void __down_read(struct rw_semaphore *sem)
-+{
-+ rt__down_read(sem);
-+}
-+
-+static inline void down_read(struct rw_semaphore *sem)
-+{
-+ rt_down_read(sem);
-+}
-+
-+static inline int __down_read_trylock(struct rw_semaphore *sem)
-+{
-+ return rt__down_read_trylock(sem);
-+}
-+
-+static inline int down_read_trylock(struct rw_semaphore *sem)
-+{
-+ return rt_down_read_trylock(sem);
-+}
-+
-+static inline void down_write(struct rw_semaphore *sem)
-+{
-+ rt_down_write(sem);
-+}
-+
-+static inline int down_write_killable(struct rw_semaphore *sem)
-+{
-+ return rt_down_write_killable(sem);
-+}
-+
-+static inline int down_write_trylock(struct rw_semaphore *sem)
-+{
-+ return rt_down_write_trylock(sem);
-+}
-+
-+static inline void __up_read(struct rw_semaphore *sem)
-+{
-+ __rt_up_read(sem);
-+}
-+
-+static inline void up_read(struct rw_semaphore *sem)
-+{
-+ rt_up_read(sem);
-+}
-+
-+static inline void up_write(struct rw_semaphore *sem)
-+{
-+ rt_up_write(sem);
-+}
-+
-+static inline void downgrade_write(struct rw_semaphore *sem)
-+{
-+ rt_downgrade_write(sem);
-+}
-+
-+static inline void down_read_nested(struct rw_semaphore *sem, int subclass)
-+{
-+ return rt_down_read_nested(sem, subclass);
-+}
-+
-+static inline void down_write_nested(struct rw_semaphore *sem, int subclass)
-+{
-+ rt_down_write_nested(sem, subclass);
-+}
-+
-+static inline int down_write_killable_nested(struct rw_semaphore *sem,
-+ int subclass)
-+{
-+ return rt_down_write_killable_nested(sem, subclass);
-+}
-+
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+static inline void down_write_nest_lock(struct rw_semaphore *sem,
-+ struct rw_semaphore *nest_lock)
-+{
-+ rt_down_write_nested_lock(sem, &nest_lock->dep_map);
-+}
-+
-+#else
-+
-+static inline void down_write_nest_lock(struct rw_semaphore *sem,
-+ struct rw_semaphore *nest_lock)
-+{
-+ rt_down_write_nested_lock(sem, NULL);
-+}
-+#endif
-+#endif
-diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 62c68e5..c873ce0 100644
---- a/include/linux/sched.h
-+++ b/include/linux/sched.h
-@@ -26,6 +26,7 @@ struct sched_param {
- #include <linux/nodemask.h>
- #include <linux/mm_types.h>
- #include <linux/preempt.h>
-+#include <asm/kmap_types.h>
-
- #include <asm/page.h>
- #include <asm/ptrace.h>
-@@ -243,10 +244,7 @@ extern char ___assert_task_state[1 - 2*!!(
- TASK_UNINTERRUPTIBLE | __TASK_STOPPED | \
- __TASK_TRACED | EXIT_ZOMBIE | EXIT_DEAD)
-
--#define task_is_traced(task) ((task->state & __TASK_TRACED) != 0)
- #define task_is_stopped(task) ((task->state & __TASK_STOPPED) != 0)
--#define task_is_stopped_or_traced(task) \
-- ((task->state & (__TASK_STOPPED | __TASK_TRACED)) != 0)
- #define task_contributes_to_load(task) \
- ((task->state & TASK_UNINTERRUPTIBLE) != 0 && \
- (task->flags & PF_FROZEN) == 0 && \
-@@ -312,6 +310,11 @@ extern char ___assert_task_state[1 - 2*!!(
-
- #endif
-
-+#define __set_current_state_no_track(state_value) \
-+ do { current->state = (state_value); } while (0)
-+#define set_current_state_no_track(state_value) \
-+ set_mb(current->state, (state_value))
-+
- /* Task command name length */
- #define TASK_COMM_LEN 16
-
-@@ -1009,8 +1012,18 @@ struct wake_q_head {
- struct wake_q_head name = { WAKE_Q_TAIL, &name.first }
-
- extern void wake_q_add(struct wake_q_head *head,
-- struct task_struct *task);
--extern void wake_up_q(struct wake_q_head *head);
-+ struct task_struct *task);
-+extern void __wake_up_q(struct wake_q_head *head, bool sleeper);
-+
-+static inline void wake_up_q(struct wake_q_head *head)
-+{
-+ __wake_up_q(head, false);
-+}
-+
-+static inline void wake_up_q_sleeper(struct wake_q_head *head)
-+{
-+ __wake_up_q(head, true);
-+}
-
- /*
- * sched-domains (multiprocessor balancing) declarations:
-@@ -1459,6 +1472,7 @@ struct tlbflush_unmap_batch {
-
- struct task_struct {
- volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
-+ volatile long saved_state; /* saved state for "spinlock sleepers" */
- void *stack;
- atomic_t usage;
- unsigned int flags; /* per process flags, defined below */
-@@ -1495,6 +1509,12 @@ struct task_struct {
- #endif
-
- unsigned int policy;
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ int migrate_disable;
-+# ifdef CONFIG_SCHED_DEBUG
-+ int migrate_disable_atomic;
-+# endif
-+#endif
- int nr_cpus_allowed;
- cpumask_t cpus_allowed;
-
-@@ -1629,6 +1649,9 @@ struct task_struct {
-
- struct task_cputime cputime_expires;
- struct list_head cpu_timers[3];
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ struct task_struct *posix_timer_list;
-+#endif
-
- /* process credentials */
- const struct cred __rcu *real_cred; /* objective and real subjective task
-@@ -1659,10 +1682,15 @@ struct task_struct {
- /* signal handlers */
- struct signal_struct *signal;
- struct sighand_struct *sighand;
-+ struct sigqueue *sigqueue_cache;
-
- sigset_t blocked, real_blocked;
- sigset_t saved_sigmask; /* restored if set_restore_sigmask() was used */
- struct sigpending pending;
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ /* TODO: move me into ->restart_block ? */
-+ struct siginfo forced_info;
-+#endif
-
- unsigned long sas_ss_sp;
- size_t sas_ss_size;
-@@ -1891,6 +1919,12 @@ struct task_struct {
- /* bitmask and counter of trace recursion */
- unsigned long trace_recursion;
- #endif /* CONFIG_TRACING */
-+#ifdef CONFIG_WAKEUP_LATENCY_HIST
-+ u64 preempt_timestamp_hist;
-+#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
-+ long timer_offset;
-+#endif
-+#endif
- #ifdef CONFIG_KCOV
- /* Coverage collection mode enabled for this task (0 if disabled). */
- enum kcov_mode kcov_mode;
-@@ -1916,9 +1950,23 @@ struct task_struct {
- unsigned int sequential_io;
- unsigned int sequential_io_avg;
- #endif
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ struct rcu_head put_rcu;
-+ int softirq_nestcnt;
-+ unsigned int softirqs_raised;
-+#endif
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+# if defined CONFIG_HIGHMEM || defined CONFIG_X86_32
-+ int kmap_idx;
-+ pte_t kmap_pte[KM_TYPE_NR];
-+# endif
-+#endif
- #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
- unsigned long task_state_change;
- #endif
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ int xmit_recursion;
-+#endif
- int pagefault_disabled;
- #ifdef CONFIG_MMU
- struct task_struct *oom_reaper_list;
-@@ -1939,14 +1987,6 @@ extern int arch_task_struct_size __read_mostly;
- # define arch_task_struct_size (sizeof(struct task_struct))
- #endif
-
--/* Future-safe accessor for struct task_struct's cpus_allowed. */
--#define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
--
--static inline int tsk_nr_cpus_allowed(struct task_struct *p)
--{
-- return p->nr_cpus_allowed;
--}
--
- #define TNF_MIGRATED 0x01
- #define TNF_NO_GROUP 0x02
- #define TNF_SHARED 0x04
-@@ -2162,6 +2202,15 @@ extern struct pid *cad_pid;
- extern void free_task(struct task_struct *tsk);
- #define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0)
-
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+extern void __put_task_struct_cb(struct rcu_head *rhp);
-+
-+static inline void put_task_struct(struct task_struct *t)
-+{
-+ if (atomic_dec_and_test(&t->usage))
-+ call_rcu(&t->put_rcu, __put_task_struct_cb);
-+}
-+#else
- extern void __put_task_struct(struct task_struct *t);
-
- static inline void put_task_struct(struct task_struct *t)
-@@ -2169,6 +2218,7 @@ static inline void put_task_struct(struct task_struct *t)
- if (atomic_dec_and_test(&t->usage))
- __put_task_struct(t);
- }
-+#endif
-
- struct task_struct *task_rcu_dereference(struct task_struct **ptask);
- struct task_struct *try_get_task_struct(struct task_struct **ptask);
-@@ -2210,6 +2260,7 @@ extern void thread_group_cputime_adjusted(struct task_struct *p, cputime_t *ut,
- /*
- * Per process flags
- */
-+#define PF_IN_SOFTIRQ 0x00000001 /* Task is serving softirq */
- #define PF_EXITING 0x00000004 /* getting shut down */
- #define PF_EXITPIDONE 0x00000008 /* pi exit done on shut down */
- #define PF_VCPU 0x00000010 /* I'm a virtual CPU */
-@@ -2378,6 +2429,10 @@ extern void do_set_cpus_allowed(struct task_struct *p,
-
- extern int set_cpus_allowed_ptr(struct task_struct *p,
- const struct cpumask *new_mask);
-+int migrate_me(void);
-+void tell_sched_cpu_down_begin(int cpu);
-+void tell_sched_cpu_down_done(int cpu);
-+
- #else
- static inline void do_set_cpus_allowed(struct task_struct *p,
- const struct cpumask *new_mask)
-@@ -2390,6 +2445,9 @@ static inline int set_cpus_allowed_ptr(struct task_struct *p,
- return -EINVAL;
- return 0;
- }
-+static inline int migrate_me(void) { return 0; }
-+static inline void tell_sched_cpu_down_begin(int cpu) { }
-+static inline void tell_sched_cpu_down_done(int cpu) { }
- #endif
-
- #ifdef CONFIG_NO_HZ_COMMON
-@@ -2624,6 +2682,7 @@ extern void xtime_update(unsigned long ticks);
-
- extern int wake_up_state(struct task_struct *tsk, unsigned int state);
- extern int wake_up_process(struct task_struct *tsk);
-+extern int wake_up_lock_sleeper(struct task_struct * tsk);
- extern void wake_up_new_task(struct task_struct *tsk);
- #ifdef CONFIG_SMP
- extern void kick_process(struct task_struct *tsk);
-@@ -2832,6 +2891,17 @@ static inline void mmdrop(struct mm_struct *mm)
- __mmdrop(mm);
- }
-
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+extern void __mmdrop_delayed(struct rcu_head *rhp);
-+static inline void mmdrop_delayed(struct mm_struct *mm)
-+{
-+ if (atomic_dec_and_test(&mm->mm_count))
-+ call_rcu(&mm->delayed_drop, __mmdrop_delayed);
-+}
-+#else
-+# define mmdrop_delayed(mm) mmdrop(mm)
-+#endif
-+
- static inline bool mmget_not_zero(struct mm_struct *mm)
- {
- return atomic_inc_not_zero(&mm->mm_users);
-@@ -3168,6 +3238,43 @@ static inline int test_tsk_need_resched(struct task_struct *tsk)
- return unlikely(test_tsk_thread_flag(tsk,TIF_NEED_RESCHED));
- }
-
-+#ifdef CONFIG_PREEMPT_LAZY
-+static inline void set_tsk_need_resched_lazy(struct task_struct *tsk)
-+{
-+ set_tsk_thread_flag(tsk,TIF_NEED_RESCHED_LAZY);
-+}
-+
-+static inline void clear_tsk_need_resched_lazy(struct task_struct *tsk)
-+{
-+ clear_tsk_thread_flag(tsk,TIF_NEED_RESCHED_LAZY);
-+}
-+
-+static inline int test_tsk_need_resched_lazy(struct task_struct *tsk)
-+{
-+ return unlikely(test_tsk_thread_flag(tsk,TIF_NEED_RESCHED_LAZY));
-+}
-+
-+static inline int need_resched_lazy(void)
-+{
-+ return test_thread_flag(TIF_NEED_RESCHED_LAZY);
-+}
-+
-+static inline int need_resched_now(void)
-+{
-+ return test_thread_flag(TIF_NEED_RESCHED);
-+}
-+
-+#else
-+static inline void clear_tsk_need_resched_lazy(struct task_struct *tsk) { }
-+static inline int need_resched_lazy(void) { return 0; }
-+
-+static inline int need_resched_now(void)
-+{
-+ return test_thread_flag(TIF_NEED_RESCHED);
-+}
-+
-+#endif
-+
- static inline int restart_syscall(void)
- {
- set_tsk_thread_flag(current, TIF_SIGPENDING);
-@@ -3199,6 +3306,51 @@ static inline int signal_pending_state(long state, struct task_struct *p)
- return (state & TASK_INTERRUPTIBLE) || __fatal_signal_pending(p);
- }
-
-+static inline bool __task_is_stopped_or_traced(struct task_struct *task)
-+{
-+ if (task->state & (__TASK_STOPPED | __TASK_TRACED))
-+ return true;
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ if (task->saved_state & (__TASK_STOPPED | __TASK_TRACED))
-+ return true;
-+#endif
-+ return false;
-+}
-+
-+static inline bool task_is_stopped_or_traced(struct task_struct *task)
-+{
-+ bool traced_stopped;
-+
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ unsigned long flags;
-+
-+ raw_spin_lock_irqsave(&task->pi_lock, flags);
-+ traced_stopped = __task_is_stopped_or_traced(task);
-+ raw_spin_unlock_irqrestore(&task->pi_lock, flags);
-+#else
-+ traced_stopped = __task_is_stopped_or_traced(task);
-+#endif
-+ return traced_stopped;
-+}
-+
-+static inline bool task_is_traced(struct task_struct *task)
-+{
-+ bool traced = false;
-+
-+ if (task->state & __TASK_TRACED)
-+ return true;
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ /* in case the task is sleeping on tasklist_lock */
-+ raw_spin_lock_irq(&task->pi_lock);
-+ if (task->state & __TASK_TRACED)
-+ traced = true;
-+ else if (task->saved_state & __TASK_TRACED)
-+ traced = true;
-+ raw_spin_unlock_irq(&task->pi_lock);
-+#endif
-+ return traced;
-+}
-+
- /*
- * cond_resched() and cond_resched_lock(): latency reduction via
- * explicit rescheduling in places that are safe. The return
-@@ -3220,12 +3372,16 @@ extern int __cond_resched_lock(spinlock_t *lock);
- __cond_resched_lock(lock); \
- })
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- extern int __cond_resched_softirq(void);
-
- #define cond_resched_softirq() ({ \
- ___might_sleep(__FILE__, __LINE__, SOFTIRQ_DISABLE_OFFSET); \
- __cond_resched_softirq(); \
- })
-+#else
-+# define cond_resched_softirq() cond_resched()
-+#endif
-
- static inline void cond_resched_rcu(void)
- {
-@@ -3387,6 +3543,31 @@ static inline void set_task_cpu(struct task_struct *p, unsigned int cpu)
-
- #endif /* CONFIG_SMP */
-
-+static inline int __migrate_disabled(struct task_struct *p)
-+{
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ return p->migrate_disable;
-+#else
-+ return 0;
-+#endif
-+}
-+
-+/* Future-safe accessor for struct task_struct's cpus_allowed. */
-+static inline const struct cpumask *tsk_cpus_allowed(struct task_struct *p)
-+{
-+ if (__migrate_disabled(p))
-+ return cpumask_of(task_cpu(p));
-+
-+ return &p->cpus_allowed;
-+}
-+
-+static inline int tsk_nr_cpus_allowed(struct task_struct *p)
-+{
-+ if (__migrate_disabled(p))
-+ return 1;
-+ return p->nr_cpus_allowed;
-+}
-+
- extern long sched_setaffinity(pid_t pid, const struct cpumask *new_mask);
- extern long sched_getaffinity(pid_t pid, struct cpumask *mask);
-
-diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h
-index ead9765..3d7223f 100644
---- a/include/linux/seqlock.h
-+++ b/include/linux/seqlock.h
-@@ -220,20 +220,30 @@ static inline int read_seqcount_retry(const seqcount_t *s, unsigned start)
- return __read_seqcount_retry(s, start);
- }
-
--
--
--static inline void raw_write_seqcount_begin(seqcount_t *s)
-+static inline void __raw_write_seqcount_begin(seqcount_t *s)
- {
- s->sequence++;
- smp_wmb();
- }
-
--static inline void raw_write_seqcount_end(seqcount_t *s)
-+static inline void raw_write_seqcount_begin(seqcount_t *s)
-+{
-+ preempt_disable_rt();
-+ __raw_write_seqcount_begin(s);
-+}
-+
-+static inline void __raw_write_seqcount_end(seqcount_t *s)
- {
- smp_wmb();
- s->sequence++;
- }
-
-+static inline void raw_write_seqcount_end(seqcount_t *s)
-+{
-+ __raw_write_seqcount_end(s);
-+ preempt_enable_rt();
-+}
-+
- /**
- * raw_write_seqcount_barrier - do a seq write barrier
- * @s: pointer to seqcount_t
-@@ -428,10 +438,32 @@ typedef struct {
- /*
- * Read side functions for starting and finalizing a read side section.
- */
-+#ifndef CONFIG_PREEMPT_RT_FULL
- static inline unsigned read_seqbegin(const seqlock_t *sl)
- {
- return read_seqcount_begin(&sl->seqcount);
- }
-+#else
-+/*
-+ * Starvation safe read side for RT
-+ */
-+static inline unsigned read_seqbegin(seqlock_t *sl)
-+{
-+ unsigned ret;
-+
-+repeat:
-+ ret = ACCESS_ONCE(sl->seqcount.sequence);
-+ if (unlikely(ret & 1)) {
-+ /*
-+ * Take the lock and let the writer proceed (i.e. evtl
-+ * boost it), otherwise we could loop here forever.
-+ */
-+ spin_unlock_wait(&sl->lock);
-+ goto repeat;
-+ }
-+ return ret;
-+}
-+#endif
-
- static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start)
- {
-@@ -446,36 +478,45 @@ static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start)
- static inline void write_seqlock(seqlock_t *sl)
- {
- spin_lock(&sl->lock);
-- write_seqcount_begin(&sl->seqcount);
-+ __raw_write_seqcount_begin(&sl->seqcount);
-+}
-+
-+static inline int try_write_seqlock(seqlock_t *sl)
-+{
-+ if (spin_trylock(&sl->lock)) {
-+ __raw_write_seqcount_begin(&sl->seqcount);
-+ return 1;
-+ }
-+ return 0;
- }
-
- static inline void write_sequnlock(seqlock_t *sl)
- {
-- write_seqcount_end(&sl->seqcount);
-+ __raw_write_seqcount_end(&sl->seqcount);
- spin_unlock(&sl->lock);
- }
-
- static inline void write_seqlock_bh(seqlock_t *sl)
- {
- spin_lock_bh(&sl->lock);
-- write_seqcount_begin(&sl->seqcount);
-+ __raw_write_seqcount_begin(&sl->seqcount);
- }
-
- static inline void write_sequnlock_bh(seqlock_t *sl)
- {
-- write_seqcount_end(&sl->seqcount);
-+ __raw_write_seqcount_end(&sl->seqcount);
- spin_unlock_bh(&sl->lock);
- }
-
- static inline void write_seqlock_irq(seqlock_t *sl)
- {
- spin_lock_irq(&sl->lock);
-- write_seqcount_begin(&sl->seqcount);
-+ __raw_write_seqcount_begin(&sl->seqcount);
- }
-
- static inline void write_sequnlock_irq(seqlock_t *sl)
- {
-- write_seqcount_end(&sl->seqcount);
-+ __raw_write_seqcount_end(&sl->seqcount);
- spin_unlock_irq(&sl->lock);
- }
-
-@@ -484,7 +525,7 @@ static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl)
- unsigned long flags;
-
- spin_lock_irqsave(&sl->lock, flags);
-- write_seqcount_begin(&sl->seqcount);
-+ __raw_write_seqcount_begin(&sl->seqcount);
- return flags;
- }
-
-@@ -494,7 +535,7 @@ static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl)
- static inline void
- write_sequnlock_irqrestore(seqlock_t *sl, unsigned long flags)
- {
-- write_seqcount_end(&sl->seqcount);
-+ __raw_write_seqcount_end(&sl->seqcount);
- spin_unlock_irqrestore(&sl->lock, flags);
- }
-
-diff --git a/include/linux/signal.h b/include/linux/signal.h
-index b63f63e..295540f 100644
---- a/include/linux/signal.h
-+++ b/include/linux/signal.h
-@@ -233,6 +233,7 @@ static inline void init_sigpending(struct sigpending *sig)
- }
-
- extern void flush_sigqueue(struct sigpending *queue);
-+extern void flush_task_sigqueue(struct task_struct *tsk);
-
- /* Test if 'sig' is valid signal. Use this instead of testing _NSIG directly */
- static inline int valid_signal(unsigned long sig)
-diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
-index 0f665cb..59c38d1 100644
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -284,6 +284,7 @@ struct sk_buff_head {
-
- __u32 qlen;
- spinlock_t lock;
-+ raw_spinlock_t raw_lock;
- };
-
- struct sk_buff;
-@@ -1565,6 +1566,12 @@ static inline void skb_queue_head_init(struct sk_buff_head *list)
- __skb_queue_head_init(list);
- }
-
-+static inline void skb_queue_head_init_raw(struct sk_buff_head *list)
-+{
-+ raw_spin_lock_init(&list->raw_lock);
-+ __skb_queue_head_init(list);
-+}
-+
- static inline void skb_queue_head_init_class(struct sk_buff_head *list,
- struct lock_class_key *class)
- {
-diff --git a/include/linux/smp.h b/include/linux/smp.h
-index eccae469..64ec52d 100644
---- a/include/linux/smp.h
-+++ b/include/linux/smp.h
-@@ -185,6 +185,9 @@ static inline void smp_init(void) { }
- #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
- #define put_cpu() preempt_enable()
-
-+#define get_cpu_light() ({ migrate_disable(); smp_processor_id(); })
-+#define put_cpu_light() migrate_enable()
-+
- /*
- * Callback to arch code if there's nosmp or maxcpus=0 on the
- * boot command line:
-diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
-index 47dd0ce..02928fa 100644
---- a/include/linux/spinlock.h
-+++ b/include/linux/spinlock.h
-@@ -271,7 +271,11 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock)
- #define raw_spin_can_lock(lock) (!raw_spin_is_locked(lock))
-
- /* Include rwlock functions */
--#include <linux/rwlock.h>
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+# include <linux/rwlock_rt.h>
-+#else
-+# include <linux/rwlock.h>
-+#endif
-
- /*
- * Pull the _spin_*()/_read_*()/_write_*() functions/declarations:
-@@ -282,6 +286,10 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock)
- # include <linux/spinlock_api_up.h>
- #endif
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+# include <linux/spinlock_rt.h>
-+#else /* PREEMPT_RT_FULL */
-+
- /*
- * Map the spin_lock functions to the raw variants for PREEMPT_RT=n
- */
-@@ -347,6 +355,12 @@ static __always_inline void spin_unlock(spinlock_t *lock)
- raw_spin_unlock(&lock->rlock);
- }
-
-+static __always_inline int spin_unlock_no_deboost(spinlock_t *lock)
-+{
-+ raw_spin_unlock(&lock->rlock);
-+ return 0;
-+}
-+
- static __always_inline void spin_unlock_bh(spinlock_t *lock)
- {
- raw_spin_unlock_bh(&lock->rlock);
-@@ -416,4 +430,6 @@ extern int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock);
- #define atomic_dec_and_lock(atomic, lock) \
- __cond_lock(lock, _atomic_dec_and_lock(atomic, lock))
-
-+#endif /* !PREEMPT_RT_FULL */
-+
- #endif /* __LINUX_SPINLOCK_H */
-diff --git a/include/linux/spinlock_api_smp.h b/include/linux/spinlock_api_smp.h
-index 5344268..043263f 100644
---- a/include/linux/spinlock_api_smp.h
-+++ b/include/linux/spinlock_api_smp.h
-@@ -189,6 +189,8 @@ static inline int __raw_spin_trylock_bh(raw_spinlock_t *lock)
- return 0;
- }
-
--#include <linux/rwlock_api_smp.h>
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+# include <linux/rwlock_api_smp.h>
-+#endif
-
- #endif /* __LINUX_SPINLOCK_API_SMP_H */
-diff --git a/include/linux/spinlock_rt.h b/include/linux/spinlock_rt.h
-new file mode 100644
-index 0000000..7eb8758
---- /dev/null
-+++ b/include/linux/spinlock_rt.h
-@@ -0,0 +1,165 @@
-+#ifndef __LINUX_SPINLOCK_RT_H
-+#define __LINUX_SPINLOCK_RT_H
-+
-+#ifndef __LINUX_SPINLOCK_H
-+#error Do not include directly. Use spinlock.h
-+#endif
-+
-+#include <linux/bug.h>
-+
-+extern void
-+__rt_spin_lock_init(spinlock_t *lock, char *name, struct lock_class_key *key);
-+
-+#define spin_lock_init(slock) \
-+do { \
-+ static struct lock_class_key __key; \
-+ \
-+ rt_mutex_init(&(slock)->lock); \
-+ __rt_spin_lock_init(slock, #slock, &__key); \
-+} while (0)
-+
-+void __lockfunc rt_spin_lock__no_mg(spinlock_t *lock);
-+void __lockfunc rt_spin_unlock__no_mg(spinlock_t *lock);
-+int __lockfunc rt_spin_trylock__no_mg(spinlock_t *lock);
-+
-+extern void __lockfunc rt_spin_lock(spinlock_t *lock);
-+extern unsigned long __lockfunc rt_spin_lock_trace_flags(spinlock_t *lock);
-+extern void __lockfunc rt_spin_lock_nested(spinlock_t *lock, int subclass);
-+extern void __lockfunc rt_spin_unlock(spinlock_t *lock);
-+extern int __lockfunc rt_spin_unlock_no_deboost(spinlock_t *lock);
-+extern void __lockfunc rt_spin_unlock_wait(spinlock_t *lock);
-+extern int __lockfunc rt_spin_trylock_irqsave(spinlock_t *lock, unsigned long *flags);
-+extern int __lockfunc rt_spin_trylock_bh(spinlock_t *lock);
-+extern int __lockfunc rt_spin_trylock(spinlock_t *lock);
-+extern int atomic_dec_and_spin_lock(atomic_t *atomic, spinlock_t *lock);
-+
-+/*
-+ * lockdep-less calls, for derived types like rwlock:
-+ * (for trylock they can use rt_mutex_trylock() directly.
-+ */
-+extern void __lockfunc __rt_spin_lock__no_mg(struct rt_mutex *lock);
-+extern void __lockfunc __rt_spin_lock(struct rt_mutex *lock);
-+extern void __lockfunc __rt_spin_unlock(struct rt_mutex *lock);
-+extern int __lockfunc __rt_spin_trylock(struct rt_mutex *lock);
-+
-+#define spin_lock(lock) rt_spin_lock(lock)
-+
-+#define spin_lock_bh(lock) \
-+ do { \
-+ local_bh_disable(); \
-+ rt_spin_lock(lock); \
-+ } while (0)
-+
-+#define spin_lock_irq(lock) spin_lock(lock)
-+
-+#define spin_do_trylock(lock) __cond_lock(lock, rt_spin_trylock(lock))
-+
-+#define spin_trylock(lock) \
-+({ \
-+ int __locked; \
-+ __locked = spin_do_trylock(lock); \
-+ __locked; \
-+})
-+
-+#ifdef CONFIG_LOCKDEP
-+# define spin_lock_nested(lock, subclass) \
-+ do { \
-+ rt_spin_lock_nested(lock, subclass); \
-+ } while (0)
-+
-+#define spin_lock_bh_nested(lock, subclass) \
-+ do { \
-+ local_bh_disable(); \
-+ rt_spin_lock_nested(lock, subclass); \
-+ } while (0)
-+
-+# define spin_lock_irqsave_nested(lock, flags, subclass) \
-+ do { \
-+ typecheck(unsigned long, flags); \
-+ flags = 0; \
-+ rt_spin_lock_nested(lock, subclass); \
-+ } while (0)
-+#else
-+# define spin_lock_nested(lock, subclass) spin_lock(lock)
-+# define spin_lock_bh_nested(lock, subclass) spin_lock_bh(lock)
-+
-+# define spin_lock_irqsave_nested(lock, flags, subclass) \
-+ do { \
-+ typecheck(unsigned long, flags); \
-+ flags = 0; \
-+ spin_lock(lock); \
-+ } while (0)
-+#endif
-+
-+#define spin_lock_irqsave(lock, flags) \
-+ do { \
-+ typecheck(unsigned long, flags); \
-+ flags = 0; \
-+ spin_lock(lock); \
-+ } while (0)
-+
-+static inline unsigned long spin_lock_trace_flags(spinlock_t *lock)
-+{
-+ unsigned long flags = 0;
-+#ifdef CONFIG_TRACE_IRQFLAGS
-+ flags = rt_spin_lock_trace_flags(lock);
-+#else
-+ spin_lock(lock); /* lock_local */
-+#endif
-+ return flags;
-+}
-+
-+/* FIXME: we need rt_spin_lock_nest_lock */
-+#define spin_lock_nest_lock(lock, nest_lock) spin_lock_nested(lock, 0)
-+
-+#define spin_unlock(lock) rt_spin_unlock(lock)
-+#define spin_unlock_no_deboost(lock) rt_spin_unlock_no_deboost(lock)
-+
-+#define spin_unlock_bh(lock) \
-+ do { \
-+ rt_spin_unlock(lock); \
-+ local_bh_enable(); \
-+ } while (0)
-+
-+#define spin_unlock_irq(lock) spin_unlock(lock)
-+
-+#define spin_unlock_irqrestore(lock, flags) \
-+ do { \
-+ typecheck(unsigned long, flags); \
-+ (void) flags; \
-+ spin_unlock(lock); \
-+ } while (0)
-+
-+#define spin_trylock_bh(lock) __cond_lock(lock, rt_spin_trylock_bh(lock))
-+#define spin_trylock_irq(lock) spin_trylock(lock)
-+
-+#define spin_trylock_irqsave(lock, flags) \
-+ rt_spin_trylock_irqsave(lock, &(flags))
-+
-+#define spin_unlock_wait(lock) rt_spin_unlock_wait(lock)
-+
-+#ifdef CONFIG_GENERIC_LOCKBREAK
-+# define spin_is_contended(lock) ((lock)->break_lock)
-+#else
-+# define spin_is_contended(lock) (((void)(lock), 0))
-+#endif
-+
-+static inline int spin_can_lock(spinlock_t *lock)
-+{
-+ return !rt_mutex_is_locked(&lock->lock);
-+}
-+
-+static inline int spin_is_locked(spinlock_t *lock)
-+{
-+ return rt_mutex_is_locked(&lock->lock);
-+}
-+
-+static inline void assert_spin_locked(spinlock_t *lock)
-+{
-+ BUG_ON(!spin_is_locked(lock));
-+}
-+
-+#define atomic_dec_and_lock(atomic, lock) \
-+ atomic_dec_and_spin_lock(atomic, lock)
-+
-+#endif
-diff --git a/include/linux/spinlock_types.h b/include/linux/spinlock_types.h
-index 73548eb..10bac71 100644
---- a/include/linux/spinlock_types.h
-+++ b/include/linux/spinlock_types.h
-@@ -9,80 +9,15 @@
- * Released under the General Public License (GPL).
- */
-
--#if defined(CONFIG_SMP)
--# include <asm/spinlock_types.h>
--#else
--# include <linux/spinlock_types_up.h>
--#endif
--
--#include <linux/lockdep.h>
--
--typedef struct raw_spinlock {
-- arch_spinlock_t raw_lock;
--#ifdef CONFIG_GENERIC_LOCKBREAK
-- unsigned int break_lock;
--#endif
--#ifdef CONFIG_DEBUG_SPINLOCK
-- unsigned int magic, owner_cpu;
-- void *owner;
--#endif
--#ifdef CONFIG_DEBUG_LOCK_ALLOC
-- struct lockdep_map dep_map;
--#endif
--} raw_spinlock_t;
--
--#define SPINLOCK_MAGIC 0xdead4ead
--
--#define SPINLOCK_OWNER_INIT ((void *)-1L)
--
--#ifdef CONFIG_DEBUG_LOCK_ALLOC
--# define SPIN_DEP_MAP_INIT(lockname) .dep_map = { .name = #lockname }
--#else
--# define SPIN_DEP_MAP_INIT(lockname)
--#endif
-+#include <linux/spinlock_types_raw.h>
-
--#ifdef CONFIG_DEBUG_SPINLOCK
--# define SPIN_DEBUG_INIT(lockname) \
-- .magic = SPINLOCK_MAGIC, \
-- .owner_cpu = -1, \
-- .owner = SPINLOCK_OWNER_INIT,
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+# include <linux/spinlock_types_nort.h>
-+# include <linux/rwlock_types.h>
- #else
--# define SPIN_DEBUG_INIT(lockname)
-+# include <linux/rtmutex.h>
-+# include <linux/spinlock_types_rt.h>
-+# include <linux/rwlock_types_rt.h>
- #endif
-
--#define __RAW_SPIN_LOCK_INITIALIZER(lockname) \
-- { \
-- .raw_lock = __ARCH_SPIN_LOCK_UNLOCKED, \
-- SPIN_DEBUG_INIT(lockname) \
-- SPIN_DEP_MAP_INIT(lockname) }
--
--#define __RAW_SPIN_LOCK_UNLOCKED(lockname) \
-- (raw_spinlock_t) __RAW_SPIN_LOCK_INITIALIZER(lockname)
--
--#define DEFINE_RAW_SPINLOCK(x) raw_spinlock_t x = __RAW_SPIN_LOCK_UNLOCKED(x)
--
--typedef struct spinlock {
-- union {
-- struct raw_spinlock rlock;
--
--#ifdef CONFIG_DEBUG_LOCK_ALLOC
--# define LOCK_PADSIZE (offsetof(struct raw_spinlock, dep_map))
-- struct {
-- u8 __padding[LOCK_PADSIZE];
-- struct lockdep_map dep_map;
-- };
--#endif
-- };
--} spinlock_t;
--
--#define __SPIN_LOCK_INITIALIZER(lockname) \
-- { { .rlock = __RAW_SPIN_LOCK_INITIALIZER(lockname) } }
--
--#define __SPIN_LOCK_UNLOCKED(lockname) \
-- (spinlock_t ) __SPIN_LOCK_INITIALIZER(lockname)
--
--#define DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x)
--
--#include <linux/rwlock_types.h>
--
- #endif /* __LINUX_SPINLOCK_TYPES_H */
-diff --git a/include/linux/spinlock_types_nort.h b/include/linux/spinlock_types_nort.h
-new file mode 100644
-index 0000000..f1dac1f
---- /dev/null
-+++ b/include/linux/spinlock_types_nort.h
-@@ -0,0 +1,33 @@
-+#ifndef __LINUX_SPINLOCK_TYPES_NORT_H
-+#define __LINUX_SPINLOCK_TYPES_NORT_H
-+
-+#ifndef __LINUX_SPINLOCK_TYPES_H
-+#error "Do not include directly. Include spinlock_types.h instead"
-+#endif
-+
-+/*
-+ * The non RT version maps spinlocks to raw_spinlocks
-+ */
-+typedef struct spinlock {
-+ union {
-+ struct raw_spinlock rlock;
-+
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+# define LOCK_PADSIZE (offsetof(struct raw_spinlock, dep_map))
-+ struct {
-+ u8 __padding[LOCK_PADSIZE];
-+ struct lockdep_map dep_map;
-+ };
-+#endif
-+ };
-+} spinlock_t;
-+
-+#define __SPIN_LOCK_INITIALIZER(lockname) \
-+ { { .rlock = __RAW_SPIN_LOCK_INITIALIZER(lockname) } }
-+
-+#define __SPIN_LOCK_UNLOCKED(lockname) \
-+ (spinlock_t ) __SPIN_LOCK_INITIALIZER(lockname)
-+
-+#define DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x)
-+
-+#endif
-diff --git a/include/linux/spinlock_types_raw.h b/include/linux/spinlock_types_raw.h
-new file mode 100644
-index 0000000..edffc4d
---- /dev/null
-+++ b/include/linux/spinlock_types_raw.h
-@@ -0,0 +1,56 @@
-+#ifndef __LINUX_SPINLOCK_TYPES_RAW_H
-+#define __LINUX_SPINLOCK_TYPES_RAW_H
-+
-+#if defined(CONFIG_SMP)
-+# include <asm/spinlock_types.h>
-+#else
-+# include <linux/spinlock_types_up.h>
-+#endif
-+
-+#include <linux/lockdep.h>
-+
-+typedef struct raw_spinlock {
-+ arch_spinlock_t raw_lock;
-+#ifdef CONFIG_GENERIC_LOCKBREAK
-+ unsigned int break_lock;
-+#endif
-+#ifdef CONFIG_DEBUG_SPINLOCK
-+ unsigned int magic, owner_cpu;
-+ void *owner;
-+#endif
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+ struct lockdep_map dep_map;
-+#endif
-+} raw_spinlock_t;
-+
-+#define SPINLOCK_MAGIC 0xdead4ead
-+
-+#define SPINLOCK_OWNER_INIT ((void *)-1L)
-+
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+# define SPIN_DEP_MAP_INIT(lockname) .dep_map = { .name = #lockname }
-+#else
-+# define SPIN_DEP_MAP_INIT(lockname)
-+#endif
-+
-+#ifdef CONFIG_DEBUG_SPINLOCK
-+# define SPIN_DEBUG_INIT(lockname) \
-+ .magic = SPINLOCK_MAGIC, \
-+ .owner_cpu = -1, \
-+ .owner = SPINLOCK_OWNER_INIT,
-+#else
-+# define SPIN_DEBUG_INIT(lockname)
-+#endif
-+
-+#define __RAW_SPIN_LOCK_INITIALIZER(lockname) \
-+ { \
-+ .raw_lock = __ARCH_SPIN_LOCK_UNLOCKED, \
-+ SPIN_DEBUG_INIT(lockname) \
-+ SPIN_DEP_MAP_INIT(lockname) }
-+
-+#define __RAW_SPIN_LOCK_UNLOCKED(lockname) \
-+ (raw_spinlock_t) __RAW_SPIN_LOCK_INITIALIZER(lockname)
-+
-+#define DEFINE_RAW_SPINLOCK(x) raw_spinlock_t x = __RAW_SPIN_LOCK_UNLOCKED(x)
-+
-+#endif
-diff --git a/include/linux/spinlock_types_rt.h b/include/linux/spinlock_types_rt.h
-new file mode 100644
-index 0000000..3e3d8c5
---- /dev/null
-+++ b/include/linux/spinlock_types_rt.h
-@@ -0,0 +1,48 @@
-+#ifndef __LINUX_SPINLOCK_TYPES_RT_H
-+#define __LINUX_SPINLOCK_TYPES_RT_H
-+
-+#ifndef __LINUX_SPINLOCK_TYPES_H
-+#error "Do not include directly. Include spinlock_types.h instead"
-+#endif
-+
-+#include <linux/cache.h>
-+
-+/*
-+ * PREEMPT_RT: spinlocks - an RT mutex plus lock-break field:
-+ */
-+typedef struct spinlock {
-+ struct rt_mutex lock;
-+ unsigned int break_lock;
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+ struct lockdep_map dep_map;
-+#endif
-+} spinlock_t;
-+
-+#ifdef CONFIG_DEBUG_RT_MUTEXES
-+# define __RT_SPIN_INITIALIZER(name) \
-+ { \
-+ .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(name.wait_lock), \
-+ .save_state = 1, \
-+ .file = __FILE__, \
-+ .line = __LINE__ , \
-+ }
-+#else
-+# define __RT_SPIN_INITIALIZER(name) \
-+ { \
-+ .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(name.wait_lock), \
-+ .save_state = 1, \
-+ }
-+#endif
-+
-+/*
-+.wait_list = PLIST_HEAD_INIT_RAW((name).lock.wait_list, (name).lock.wait_lock)
-+*/
-+
-+#define __SPIN_LOCK_UNLOCKED(name) \
-+ { .lock = __RT_SPIN_INITIALIZER(name.lock), \
-+ SPIN_DEP_MAP_INIT(name) }
-+
-+#define DEFINE_SPINLOCK(name) \
-+ spinlock_t name = __SPIN_LOCK_UNLOCKED(name)
-+
-+#endif
-diff --git a/include/linux/srcu.h b/include/linux/srcu.h
-index dc8eb63..e793d3a 100644
---- a/include/linux/srcu.h
-+++ b/include/linux/srcu.h
-@@ -84,10 +84,10 @@ int init_srcu_struct(struct srcu_struct *sp);
-
- void process_srcu(struct work_struct *work);
-
--#define __SRCU_STRUCT_INIT(name) \
-+#define __SRCU_STRUCT_INIT(name, pcpu_name) \
- { \
- .completed = -300, \
-- .per_cpu_ref = &name##_srcu_array, \
-+ .per_cpu_ref = &pcpu_name, \
- .queue_lock = __SPIN_LOCK_UNLOCKED(name.queue_lock), \
- .running = false, \
- .batch_queue = RCU_BATCH_INIT(name.batch_queue), \
-@@ -119,7 +119,7 @@ void process_srcu(struct work_struct *work);
- */
- #define __DEFINE_SRCU(name, is_static) \
- static DEFINE_PER_CPU(struct srcu_struct_array, name##_srcu_array);\
-- is_static struct srcu_struct name = __SRCU_STRUCT_INIT(name)
-+ is_static struct srcu_struct name = __SRCU_STRUCT_INIT(name, name##_srcu_array)
- #define DEFINE_SRCU(name) __DEFINE_SRCU(name, /* not static */)
- #define DEFINE_STATIC_SRCU(name) __DEFINE_SRCU(name, static)
-
-diff --git a/include/linux/suspend.h b/include/linux/suspend.h
-index 7693e39..b36eede 100644
---- a/include/linux/suspend.h
-+++ b/include/linux/suspend.h
-@@ -193,6 +193,12 @@ struct platform_freeze_ops {
- void (*end)(void);
- };
-
-+#if defined(CONFIG_SUSPEND) || defined(CONFIG_HIBERNATION)
-+extern bool pm_in_action;
-+#else
-+# define pm_in_action false
-+#endif
-+
- #ifdef CONFIG_SUSPEND
- /**
- * suspend_set_ops - set platform dependent suspend operations
-diff --git a/include/linux/swait.h b/include/linux/swait.h
-index c1f9c62..83f004a 100644
---- a/include/linux/swait.h
-+++ b/include/linux/swait.h
-@@ -87,6 +87,7 @@ static inline int swait_active(struct swait_queue_head *q)
- extern void swake_up(struct swait_queue_head *q);
- extern void swake_up_all(struct swait_queue_head *q);
- extern void swake_up_locked(struct swait_queue_head *q);
-+extern void swake_up_all_locked(struct swait_queue_head *q);
-
- extern void __prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait);
- extern void prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait, int state);
-diff --git a/include/linux/swap.h b/include/linux/swap.h
-index 4a529c9..4ae9a44 100644
---- a/include/linux/swap.h
-+++ b/include/linux/swap.h
-@@ -11,6 +11,7 @@
- #include <linux/fs.h>
- #include <linux/atomic.h>
- #include <linux/page-flags.h>
-+#include <linux/locallock.h>
- #include <asm/page.h>
-
- struct notifier_block;
-@@ -243,7 +244,8 @@ struct swap_info_struct {
- void *workingset_eviction(struct address_space *mapping, struct page *page);
- bool workingset_refault(void *shadow);
- void workingset_activation(struct page *page);
--extern struct list_lru workingset_shadow_nodes;
-+extern struct list_lru __workingset_shadow_nodes;
-+DECLARE_LOCAL_IRQ_LOCK(workingset_shadow_lock);
-
- static inline unsigned int workingset_node_pages(struct radix_tree_node *node)
- {
-@@ -257,7 +259,7 @@ static inline void workingset_node_pages_inc(struct radix_tree_node *node)
-
- static inline void workingset_node_pages_dec(struct radix_tree_node *node)
- {
-- VM_BUG_ON(!workingset_node_pages(node));
-+ VM_WARN_ON_ONCE(!workingset_node_pages(node));
- node->count--;
- }
-
-@@ -273,7 +275,7 @@ static inline void workingset_node_shadows_inc(struct radix_tree_node *node)
-
- static inline void workingset_node_shadows_dec(struct radix_tree_node *node)
- {
-- VM_BUG_ON(!workingset_node_shadows(node));
-+ VM_WARN_ON_ONCE(!workingset_node_shadows(node));
- node->count -= 1U << RADIX_TREE_COUNT_SHIFT;
- }
-
-@@ -288,6 +290,7 @@ extern unsigned long nr_free_pagecache_pages(void);
-
-
- /* linux/mm/swap.c */
-+DECLARE_LOCAL_IRQ_LOCK(swapvec_lock);
- extern void lru_cache_add(struct page *);
- extern void lru_cache_add_anon(struct page *page);
- extern void lru_cache_add_file(struct page *page);
-diff --git a/include/linux/swork.h b/include/linux/swork.h
-new file mode 100644
-index 0000000..f175fa9
---- /dev/null
-+++ b/include/linux/swork.h
-@@ -0,0 +1,24 @@
-+#ifndef _LINUX_SWORK_H
-+#define _LINUX_SWORK_H
-+
-+#include <linux/list.h>
-+
-+struct swork_event {
-+ struct list_head item;
-+ unsigned long flags;
-+ void (*func)(struct swork_event *);
-+};
-+
-+static inline void INIT_SWORK(struct swork_event *event,
-+ void (*func)(struct swork_event *))
-+{
-+ event->flags = 0;
-+ event->func = func;
-+}
-+
-+bool swork_queue(struct swork_event *sev);
-+
-+int swork_get(void);
-+void swork_put(void);
-+
-+#endif /* _LINUX_SWORK_H */
-diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
-index 2b5b10e..8bf15b1 100644
---- a/include/linux/thread_info.h
-+++ b/include/linux/thread_info.h
-@@ -103,7 +103,17 @@ static inline int test_ti_thread_flag(struct thread_info *ti, int flag)
- #define test_thread_flag(flag) \
- test_ti_thread_flag(current_thread_info(), flag)
-
--#define tif_need_resched() test_thread_flag(TIF_NEED_RESCHED)
-+#ifdef CONFIG_PREEMPT_LAZY
-+#define tif_need_resched() (test_thread_flag(TIF_NEED_RESCHED) || \
-+ test_thread_flag(TIF_NEED_RESCHED_LAZY))
-+#define tif_need_resched_now() (test_thread_flag(TIF_NEED_RESCHED))
-+#define tif_need_resched_lazy() test_thread_flag(TIF_NEED_RESCHED_LAZY))
-+
-+#else
-+#define tif_need_resched() test_thread_flag(TIF_NEED_RESCHED)
-+#define tif_need_resched_now() test_thread_flag(TIF_NEED_RESCHED)
-+#define tif_need_resched_lazy() 0
-+#endif
-
- #ifndef CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES
- static inline int arch_within_stack_frames(const void * const stack,
-diff --git a/include/linux/timer.h b/include/linux/timer.h
-index 51d601f..83cea62 100644
---- a/include/linux/timer.h
-+++ b/include/linux/timer.h
-@@ -241,7 +241,7 @@ extern void add_timer(struct timer_list *timer);
-
- extern int try_to_del_timer_sync(struct timer_list *timer);
-
--#ifdef CONFIG_SMP
-+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL)
- extern int del_timer_sync(struct timer_list *timer);
- #else
- # define del_timer_sync(t) del_timer(t)
-diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
-index be00761..15154b1 100644
---- a/include/linux/trace_events.h
-+++ b/include/linux/trace_events.h
-@@ -56,6 +56,9 @@ struct trace_entry {
- unsigned char flags;
- unsigned char preempt_count;
- int pid;
-+ unsigned short migrate_disable;
-+ unsigned short padding;
-+ unsigned char preempt_lazy_count;
- };
-
- #define TRACE_EVENT_TYPE_MAX \
-diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
-index f30c187..83bf0f7 100644
---- a/include/linux/uaccess.h
-+++ b/include/linux/uaccess.h
-@@ -24,6 +24,7 @@ static __always_inline void pagefault_disabled_dec(void)
- */
- static inline void pagefault_disable(void)
- {
-+ migrate_disable();
- pagefault_disabled_inc();
- /*
- * make sure to have issued the store before a pagefault
-@@ -40,6 +41,7 @@ static inline void pagefault_enable(void)
- */
- barrier();
- pagefault_disabled_dec();
-+ migrate_enable();
- }
-
- /*
-diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
-index 4a29c75..0a294e9 100644
---- a/include/linux/uprobes.h
-+++ b/include/linux/uprobes.h
-@@ -27,6 +27,7 @@
- #include <linux/errno.h>
- #include <linux/rbtree.h>
- #include <linux/types.h>
-+#include <linux/wait.h>
-
- struct vm_area_struct;
- struct mm_struct;
-diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
-index 6137719..e28c5a4 100644
---- a/include/linux/vmstat.h
-+++ b/include/linux/vmstat.h
-@@ -33,7 +33,9 @@ DECLARE_PER_CPU(struct vm_event_state, vm_event_states);
- */
- static inline void __count_vm_event(enum vm_event_item item)
- {
-+ preempt_disable_rt();
- raw_cpu_inc(vm_event_states.event[item]);
-+ preempt_enable_rt();
- }
-
- static inline void count_vm_event(enum vm_event_item item)
-@@ -43,7 +45,9 @@ static inline void count_vm_event(enum vm_event_item item)
-
- static inline void __count_vm_events(enum vm_event_item item, long delta)
- {
-+ preempt_disable_rt();
- raw_cpu_add(vm_event_states.event[item], delta);
-+ preempt_enable_rt();
- }
-
- static inline void count_vm_events(enum vm_event_item item, long delta)
-diff --git a/include/linux/wait.h b/include/linux/wait.h
-index c3ff74d..6022215 100644
---- a/include/linux/wait.h
-+++ b/include/linux/wait.h
-@@ -8,6 +8,7 @@
- #include <linux/spinlock.h>
- #include <asm/current.h>
- #include <uapi/linux/wait.h>
-+#include <linux/atomic.h>
-
- typedef struct __wait_queue wait_queue_t;
- typedef int (*wait_queue_func_t)(wait_queue_t *wait, unsigned mode, int flags, void *key);
-diff --git a/include/net/dst.h b/include/net/dst.h
-index 6835d22..55a5a96 100644
---- a/include/net/dst.h
-+++ b/include/net/dst.h
-@@ -446,7 +446,7 @@ static inline void dst_confirm(struct dst_entry *dst)
- static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n,
- struct sk_buff *skb)
- {
-- const struct hh_cache *hh;
-+ struct hh_cache *hh;
-
- if (dst->pending_confirm) {
- unsigned long now = jiffies;
-diff --git a/include/net/gen_stats.h b/include/net/gen_stats.h
-index 231e121..d125222 100644
---- a/include/net/gen_stats.h
-+++ b/include/net/gen_stats.h
-@@ -5,6 +5,7 @@
- #include <linux/socket.h>
- #include <linux/rtnetlink.h>
- #include <linux/pkt_sched.h>
-+#include <net/net_seq_lock.h>
-
- struct gnet_stats_basic_cpu {
- struct gnet_stats_basic_packed bstats;
-@@ -33,11 +34,11 @@ int gnet_stats_start_copy_compat(struct sk_buff *skb, int type,
- spinlock_t *lock, struct gnet_dump *d,
- int padattr);
-
--int gnet_stats_copy_basic(const seqcount_t *running,
-+int gnet_stats_copy_basic(net_seqlock_t *running,
- struct gnet_dump *d,
- struct gnet_stats_basic_cpu __percpu *cpu,
- struct gnet_stats_basic_packed *b);
--void __gnet_stats_copy_basic(const seqcount_t *running,
-+void __gnet_stats_copy_basic(net_seqlock_t *running,
- struct gnet_stats_basic_packed *bstats,
- struct gnet_stats_basic_cpu __percpu *cpu,
- struct gnet_stats_basic_packed *b);
-@@ -55,14 +56,14 @@ int gen_new_estimator(struct gnet_stats_basic_packed *bstats,
- struct gnet_stats_basic_cpu __percpu *cpu_bstats,
- struct gnet_stats_rate_est64 *rate_est,
- spinlock_t *stats_lock,
-- seqcount_t *running, struct nlattr *opt);
-+ net_seqlock_t *running, struct nlattr *opt);
- void gen_kill_estimator(struct gnet_stats_basic_packed *bstats,
- struct gnet_stats_rate_est64 *rate_est);
- int gen_replace_estimator(struct gnet_stats_basic_packed *bstats,
- struct gnet_stats_basic_cpu __percpu *cpu_bstats,
- struct gnet_stats_rate_est64 *rate_est,
- spinlock_t *stats_lock,
-- seqcount_t *running, struct nlattr *opt);
-+ net_seqlock_t *running, struct nlattr *opt);
- bool gen_estimator_active(const struct gnet_stats_basic_packed *bstats,
- const struct gnet_stats_rate_est64 *rate_est);
- #endif
-diff --git a/include/net/neighbour.h b/include/net/neighbour.h
-index 8b68384..bf65600 100644
---- a/include/net/neighbour.h
-+++ b/include/net/neighbour.h
-@@ -446,7 +446,7 @@ static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb)
- }
- #endif
-
--static inline int neigh_hh_output(const struct hh_cache *hh, struct sk_buff *skb)
-+static inline int neigh_hh_output(struct hh_cache *hh, struct sk_buff *skb)
- {
- unsigned int seq;
- int hh_len;
-@@ -501,7 +501,7 @@ struct neighbour_cb {
-
- #define NEIGH_CB(skb) ((struct neighbour_cb *)(skb)->cb)
-
--static inline void neigh_ha_snapshot(char *dst, const struct neighbour *n,
-+static inline void neigh_ha_snapshot(char *dst, struct neighbour *n,
- const struct net_device *dev)
- {
- unsigned int seq;
-diff --git a/include/net/net_seq_lock.h b/include/net/net_seq_lock.h
-new file mode 100644
-index 0000000..a703429
---- /dev/null
-+++ b/include/net/net_seq_lock.h
-@@ -0,0 +1,15 @@
-+#ifndef __NET_NET_SEQ_LOCK_H__
-+#define __NET_NET_SEQ_LOCK_H__
-+
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+# define net_seqlock_t seqlock_t
-+# define net_seq_begin(__r) read_seqbegin(__r)
-+# define net_seq_retry(__r, __s) read_seqretry(__r, __s)
-+
-+#else
-+# define net_seqlock_t seqcount_t
-+# define net_seq_begin(__r) read_seqcount_begin(__r)
-+# define net_seq_retry(__r, __s) read_seqcount_retry(__r, __s)
-+#endif
-+
-+#endif
-diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
-index d061ffe..12ef433 100644
---- a/include/net/netns/ipv4.h
-+++ b/include/net/netns/ipv4.h
-@@ -70,6 +70,7 @@ struct netns_ipv4 {
-
- int sysctl_icmp_echo_ignore_all;
- int sysctl_icmp_echo_ignore_broadcasts;
-+ int sysctl_icmp_echo_sysrq;
- int sysctl_icmp_ignore_bogus_error_responses;
- int sysctl_icmp_ratelimit;
- int sysctl_icmp_ratemask;
-diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
-index 909aff2..c47219d 100644
---- a/include/net/sch_generic.h
-+++ b/include/net/sch_generic.h
-@@ -10,6 +10,7 @@
- #include <linux/dynamic_queue_limits.h>
- #include <net/gen_stats.h>
- #include <net/rtnetlink.h>
-+#include <net/net_seq_lock.h>
-
- struct Qdisc_ops;
- struct qdisc_walker;
-@@ -78,7 +79,7 @@ struct Qdisc {
- struct sk_buff *gso_skb ____cacheline_aligned_in_smp;
- struct sk_buff_head q;
- struct gnet_stats_basic_packed bstats;
-- seqcount_t running;
-+ net_seqlock_t running;
- struct gnet_stats_queue qstats;
- unsigned long state;
- struct Qdisc *next_sched;
-@@ -90,13 +91,22 @@ struct Qdisc {
- spinlock_t busylock ____cacheline_aligned_in_smp;
- };
-
--static inline bool qdisc_is_running(const struct Qdisc *qdisc)
-+static inline bool qdisc_is_running(struct Qdisc *qdisc)
- {
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ return spin_is_locked(&qdisc->running.lock) ? true : false;
-+#else
- return (raw_read_seqcount(&qdisc->running) & 1) ? true : false;
-+#endif
- }
-
- static inline bool qdisc_run_begin(struct Qdisc *qdisc)
- {
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ if (try_write_seqlock(&qdisc->running))
-+ return true;
-+ return false;
-+#else
- if (qdisc_is_running(qdisc))
- return false;
- /* Variant of write_seqcount_begin() telling lockdep a trylock
-@@ -105,11 +115,16 @@ static inline bool qdisc_run_begin(struct Qdisc *qdisc)
- raw_write_seqcount_begin(&qdisc->running);
- seqcount_acquire(&qdisc->running.dep_map, 0, 1, _RET_IP_);
- return true;
-+#endif
- }
-
- static inline void qdisc_run_end(struct Qdisc *qdisc)
- {
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ write_sequnlock(&qdisc->running);
-+#else
- write_seqcount_end(&qdisc->running);
-+#endif
- }
-
- static inline bool qdisc_may_bulk(const struct Qdisc *qdisc)
-@@ -300,7 +315,7 @@ static inline spinlock_t *qdisc_root_sleeping_lock(const struct Qdisc *qdisc)
- return qdisc_lock(root);
- }
-
--static inline seqcount_t *qdisc_root_sleeping_running(const struct Qdisc *qdisc)
-+static inline net_seqlock_t *qdisc_root_sleeping_running(const struct Qdisc *qdisc)
- {
- struct Qdisc *root = qdisc_root_sleeping(qdisc);
-
-diff --git a/include/trace/events/hist.h b/include/trace/events/hist.h
-new file mode 100644
-index 0000000..f7710de
---- /dev/null
-+++ b/include/trace/events/hist.h
-@@ -0,0 +1,73 @@
-+#undef TRACE_SYSTEM
-+#define TRACE_SYSTEM hist
-+
-+#if !defined(_TRACE_HIST_H) || defined(TRACE_HEADER_MULTI_READ)
-+#define _TRACE_HIST_H
-+
-+#include "latency_hist.h"
-+#include <linux/tracepoint.h>
-+
-+#if !defined(CONFIG_PREEMPT_OFF_HIST) && !defined(CONFIG_INTERRUPT_OFF_HIST)
-+#define trace_preemptirqsoff_hist(a, b)
-+#define trace_preemptirqsoff_hist_rcuidle(a, b)
-+#else
-+TRACE_EVENT(preemptirqsoff_hist,
-+
-+ TP_PROTO(int reason, int starthist),
-+
-+ TP_ARGS(reason, starthist),
-+
-+ TP_STRUCT__entry(
-+ __field(int, reason)
-+ __field(int, starthist)
-+ ),
-+
-+ TP_fast_assign(
-+ __entry->reason = reason;
-+ __entry->starthist = starthist;
-+ ),
-+
-+ TP_printk("reason=%s starthist=%s", getaction(__entry->reason),
-+ __entry->starthist ? "start" : "stop")
-+);
-+#endif
-+
-+#ifndef CONFIG_MISSED_TIMER_OFFSETS_HIST
-+#define trace_hrtimer_interrupt(a, b, c, d)
-+#else
-+TRACE_EVENT(hrtimer_interrupt,
-+
-+ TP_PROTO(int cpu, long long offset, struct task_struct *curr,
-+ struct task_struct *task),
-+
-+ TP_ARGS(cpu, offset, curr, task),
-+
-+ TP_STRUCT__entry(
-+ __field(int, cpu)
-+ __field(long long, offset)
-+ __array(char, ccomm, TASK_COMM_LEN)
-+ __field(int, cprio)
-+ __array(char, tcomm, TASK_COMM_LEN)
-+ __field(int, tprio)
-+ ),
-+
-+ TP_fast_assign(
-+ __entry->cpu = cpu;
-+ __entry->offset = offset;
-+ memcpy(__entry->ccomm, curr->comm, TASK_COMM_LEN);
-+ __entry->cprio = curr->prio;
-+ memcpy(__entry->tcomm, task != NULL ? task->comm : "<none>",
-+ task != NULL ? TASK_COMM_LEN : 7);
-+ __entry->tprio = task != NULL ? task->prio : -1;
-+ ),
-+
-+ TP_printk("cpu=%d offset=%lld curr=%s[%d] thread=%s[%d]",
-+ __entry->cpu, __entry->offset, __entry->ccomm,
-+ __entry->cprio, __entry->tcomm, __entry->tprio)
-+);
-+#endif
-+
-+#endif /* _TRACE_HIST_H */
-+
-+/* This part must be outside protection */
-+#include <trace/define_trace.h>
-diff --git a/include/trace/events/latency_hist.h b/include/trace/events/latency_hist.h
-new file mode 100644
-index 0000000..d3f2fbd
---- /dev/null
-+++ b/include/trace/events/latency_hist.h
-@@ -0,0 +1,29 @@
-+#ifndef _LATENCY_HIST_H
-+#define _LATENCY_HIST_H
-+
-+enum hist_action {
-+ IRQS_ON,
-+ PREEMPT_ON,
-+ TRACE_STOP,
-+ IRQS_OFF,
-+ PREEMPT_OFF,
-+ TRACE_START,
-+};
-+
-+static char *actions[] = {
-+ "IRQS_ON",
-+ "PREEMPT_ON",
-+ "TRACE_STOP",
-+ "IRQS_OFF",
-+ "PREEMPT_OFF",
-+ "TRACE_START",
-+};
-+
-+static inline char *getaction(int action)
-+{
-+ if (action >= 0 && action <= sizeof(actions)/sizeof(actions[0]))
-+ return actions[action];
-+ return "unknown";
-+}
-+
-+#endif /* _LATENCY_HIST_H */
-diff --git a/init/Kconfig b/init/Kconfig
-index cac3f09..b6c9166 100644
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -496,7 +496,7 @@ config TINY_RCU
-
- config RCU_EXPERT
- bool "Make expert-level adjustments to RCU configuration"
-- default n
-+ default y if PREEMPT_RT_FULL
- help
- This option needs to be enabled if you wish to make
- expert-level adjustments to RCU configuration. By default,
-@@ -613,7 +613,7 @@ config RCU_FANOUT_LEAF
-
- config RCU_FAST_NO_HZ
- bool "Accelerate last non-dyntick-idle CPU's grace periods"
-- depends on NO_HZ_COMMON && SMP && RCU_EXPERT
-+ depends on NO_HZ_COMMON && SMP && RCU_EXPERT && !PREEMPT_RT_FULL
- default n
- help
- This option permits CPUs to enter dynticks-idle state even if
-@@ -640,7 +640,7 @@ config TREE_RCU_TRACE
- config RCU_BOOST
- bool "Enable RCU priority boosting"
- depends on RT_MUTEXES && PREEMPT_RCU && RCU_EXPERT
-- default n
-+ default y if PREEMPT_RT_FULL
- help
- This option boosts the priority of preempted RCU readers that
- block the current preemptible RCU grace period for too long.
-@@ -1054,6 +1054,7 @@ config CFS_BANDWIDTH
- config RT_GROUP_SCHED
- bool "Group scheduling for SCHED_RR/FIFO"
- depends on CGROUP_SCHED
-+ depends on !PREEMPT_RT_FULL
- default n
- help
- This feature lets you explicitly allocate real CPU bandwidth
-@@ -1761,6 +1762,7 @@ choice
-
- config SLAB
- bool "SLAB"
-+ depends on !PREEMPT_RT_FULL
- select HAVE_HARDENED_USERCOPY_ALLOCATOR
- help
- The regular slab allocator that is established and known to work
-@@ -1781,6 +1783,7 @@ config SLUB
- config SLOB
- depends on EXPERT
- bool "SLOB (Simple Allocator)"
-+ depends on !PREEMPT_RT_FULL
- help
- SLOB replaces the stock allocator with a drastically simpler
- allocator. SLOB is generally more space efficient but
-@@ -1799,7 +1802,7 @@ config SLAB_FREELIST_RANDOM
-
- config SLUB_CPU_PARTIAL
- default y
-- depends on SLUB && SMP
-+ depends on SLUB && SMP && !PREEMPT_RT_FULL
- bool "SLUB per cpu partial cache"
- help
- Per cpu partial caches accellerate objects allocation and freeing
-diff --git a/init/Makefile b/init/Makefile
-index 7bc47ee..88cf473 100644
---- a/init/Makefile
-+++ b/init/Makefile
-@@ -33,4 +33,4 @@ silent_chk_compile.h = :
- include/generated/compile.h: FORCE
- @$($(quiet)chk_compile.h)
- $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
-- "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)"
-+ "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CONFIG_PREEMPT_RT_FULL)" "$(CC) $(KBUILD_CFLAGS)"
-diff --git a/init/main.c b/init/main.c
-index a8a58e2..e4c979e 100644
---- a/init/main.c
-+++ b/init/main.c
-@@ -507,6 +507,7 @@ asmlinkage __visible void __init start_kernel(void)
- setup_command_line(command_line);
- setup_nr_cpu_ids();
- setup_per_cpu_areas();
-+ softirq_early_init();
- boot_cpu_state_init();
- smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */
-
-diff --git a/ipc/msg.c b/ipc/msg.c
-index c6521c2..996d890 100644
---- a/ipc/msg.c
-+++ b/ipc/msg.c
-@@ -183,20 +183,14 @@ static void ss_wakeup(struct list_head *h, int kill)
- }
- }
-
--static void expunge_all(struct msg_queue *msq, int res)
-+static void expunge_all(struct msg_queue *msq, int res,
-+ struct wake_q_head *wake_q)
- {
- struct msg_receiver *msr, *t;
-
- list_for_each_entry_safe(msr, t, &msq->q_receivers, r_list) {
-- msr->r_msg = NULL; /* initialize expunge ordering */
-- wake_up_process(msr->r_tsk);
-- /*
-- * Ensure that the wakeup is visible before setting r_msg as
-- * the receiving end depends on it: either spinning on a nil,
-- * or dealing with -EAGAIN cases. See lockless receive part 1
-- * and 2 in do_msgrcv().
-- */
-- smp_wmb(); /* barrier (B) */
-+
-+ wake_q_add(wake_q, msr->r_tsk);
- msr->r_msg = ERR_PTR(res);
- }
- }
-@@ -213,11 +207,13 @@ static void freeque(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp)
- {
- struct msg_msg *msg, *t;
- struct msg_queue *msq = container_of(ipcp, struct msg_queue, q_perm);
-+ WAKE_Q(wake_q);
-
-- expunge_all(msq, -EIDRM);
-+ expunge_all(msq, -EIDRM, &wake_q);
- ss_wakeup(&msq->q_senders, 1);
- msg_rmid(ns, msq);
- ipc_unlock_object(&msq->q_perm);
-+ wake_up_q(&wake_q);
- rcu_read_unlock();
-
- list_for_each_entry_safe(msg, t, &msq->q_messages, m_list) {
-@@ -342,6 +338,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd,
- struct kern_ipc_perm *ipcp;
- struct msqid64_ds uninitialized_var(msqid64);
- struct msg_queue *msq;
-+ WAKE_Q(wake_q);
- int err;
-
- if (cmd == IPC_SET) {
-@@ -389,7 +386,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd,
- /* sleeping receivers might be excluded by
- * stricter permissions.
- */
-- expunge_all(msq, -EAGAIN);
-+ expunge_all(msq, -EAGAIN, &wake_q);
- /* sleeping senders might be able to send
- * due to a larger queue size.
- */
-@@ -402,6 +399,7 @@ static int msgctl_down(struct ipc_namespace *ns, int msqid, int cmd,
-
- out_unlock0:
- ipc_unlock_object(&msq->q_perm);
-+ wake_up_q(&wake_q);
- out_unlock1:
- rcu_read_unlock();
- out_up:
-@@ -566,7 +564,8 @@ static int testmsg(struct msg_msg *msg, long type, int mode)
- return 0;
- }
-
--static inline int pipelined_send(struct msg_queue *msq, struct msg_msg *msg)
-+static inline int pipelined_send(struct msg_queue *msq, struct msg_msg *msg,
-+ struct wake_q_head *wake_q)
- {
- struct msg_receiver *msr, *t;
-
-@@ -577,27 +576,13 @@ static inline int pipelined_send(struct msg_queue *msq, struct msg_msg *msg)
-
- list_del(&msr->r_list);
- if (msr->r_maxsize < msg->m_ts) {
-- /* initialize pipelined send ordering */
-- msr->r_msg = NULL;
-- wake_up_process(msr->r_tsk);
-- /* barrier (B) see barrier comment below */
-- smp_wmb();
-+ wake_q_add(wake_q, msr->r_tsk);
- msr->r_msg = ERR_PTR(-E2BIG);
- } else {
-- msr->r_msg = NULL;
- msq->q_lrpid = task_pid_vnr(msr->r_tsk);
- msq->q_rtime = get_seconds();
-- wake_up_process(msr->r_tsk);
-- /*
-- * Ensure that the wakeup is visible before
-- * setting r_msg, as the receiving can otherwise
-- * exit - once r_msg is set, the receiver can
-- * continue. See lockless receive part 1 and 2
-- * in do_msgrcv(). Barrier (B).
-- */
-- smp_wmb();
-+ wake_q_add(wake_q, msr->r_tsk);
- msr->r_msg = msg;
--
- return 1;
- }
- }
-@@ -613,6 +598,7 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext,
- struct msg_msg *msg;
- int err;
- struct ipc_namespace *ns;
-+ WAKE_Q(wake_q);
-
- ns = current->nsproxy->ipc_ns;
-
-@@ -698,7 +684,7 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext,
- msq->q_lspid = task_tgid_vnr(current);
- msq->q_stime = get_seconds();
-
-- if (!pipelined_send(msq, msg)) {
-+ if (!pipelined_send(msq, msg, &wake_q)) {
- /* no one is waiting for this message, enqueue it */
- list_add_tail(&msg->m_list, &msq->q_messages);
- msq->q_cbytes += msgsz;
-@@ -712,6 +698,7 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext,
-
- out_unlock0:
- ipc_unlock_object(&msq->q_perm);
-+ wake_up_q(&wake_q);
- out_unlock1:
- rcu_read_unlock();
- if (msg != NULL)
-@@ -932,57 +919,25 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, int msgfl
- rcu_read_lock();
-
- /* Lockless receive, part 2:
-- * Wait until pipelined_send or expunge_all are outside of
-- * wake_up_process(). There is a race with exit(), see
-- * ipc/mqueue.c for the details. The correct serialization
-- * ensures that a receiver cannot continue without the wakeup
-- * being visibible _before_ setting r_msg:
-+ * The work in pipelined_send() and expunge_all():
-+ * - Set pointer to message
-+ * - Queue the receiver task for later wakeup
-+ * - Wake up the process after the lock is dropped.
- *
-- * CPU 0 CPU 1
-- * <loop receiver>
-- * smp_rmb(); (A) <-- pair -. <waker thread>
-- * <load ->r_msg> | msr->r_msg = NULL;
-- * | wake_up_process();
-- * <continue> `------> smp_wmb(); (B)
-- * msr->r_msg = msg;
-- *
-- * Where (A) orders the message value read and where (B) orders
-- * the write to the r_msg -- done in both pipelined_send and
-- * expunge_all.
-+ * Should the process wake up before this wakeup (due to a
-+ * signal) it will either see the message and continue …
- */
-- for (;;) {
-- /*
-- * Pairs with writer barrier in pipelined_send
-- * or expunge_all.
-- */
-- smp_rmb(); /* barrier (A) */
-- msg = (struct msg_msg *)msr_d.r_msg;
-- if (msg)
-- break;
-
-- /*
-- * The cpu_relax() call is a compiler barrier
-- * which forces everything in this loop to be
-- * re-loaded.
-- */
-- cpu_relax();
-- }
--
-- /* Lockless receive, part 3:
-- * If there is a message or an error then accept it without
-- * locking.
-- */
-+ msg = (struct msg_msg *)msr_d.r_msg;
- if (msg != ERR_PTR(-EAGAIN))
- goto out_unlock1;
-
-- /* Lockless receive, part 3:
-- * Acquire the queue spinlock.
-- */
-+ /*
-+ * … or see -EAGAIN, acquire the lock to check the message
-+ * again.
-+ */
- ipc_lock_object(&msq->q_perm);
-
-- /* Lockless receive, part 4:
-- * Repeat test after acquiring the spinlock.
-- */
- msg = (struct msg_msg *)msr_d.r_msg;
- if (msg != ERR_PTR(-EAGAIN))
- goto out_unlock0;
-diff --git a/ipc/sem.c b/ipc/sem.c
-index 7c9d4f7..684410a 100644
---- a/ipc/sem.c
-+++ b/ipc/sem.c
-@@ -686,6 +686,13 @@ undo:
- static void wake_up_sem_queue_prepare(struct list_head *pt,
- struct sem_queue *q, int error)
- {
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ struct task_struct *p = q->sleeper;
-+ get_task_struct(p);
-+ q->status = error;
-+ wake_up_process(p);
-+ put_task_struct(p);
-+#else
- if (list_empty(pt)) {
- /*
- * Hold preempt off so that we don't get preempted and have the
-@@ -697,6 +704,7 @@ static void wake_up_sem_queue_prepare(struct list_head *pt,
- q->pid = error;
-
- list_add_tail(&q->list, pt);
-+#endif
- }
-
- /**
-@@ -710,6 +718,7 @@ static void wake_up_sem_queue_prepare(struct list_head *pt,
- */
- static void wake_up_sem_queue_do(struct list_head *pt)
- {
-+#ifndef CONFIG_PREEMPT_RT_BASE
- struct sem_queue *q, *t;
- int did_something;
-
-@@ -722,6 +731,7 @@ static void wake_up_sem_queue_do(struct list_head *pt)
- }
- if (did_something)
- preempt_enable();
-+#endif
- }
-
- static void unlink_queue(struct sem_array *sma, struct sem_queue *q)
-diff --git a/kernel/Kconfig.locks b/kernel/Kconfig.locks
-index ebdb004..b9e6aa7 100644
---- a/kernel/Kconfig.locks
-+++ b/kernel/Kconfig.locks
-@@ -225,11 +225,11 @@ config ARCH_SUPPORTS_ATOMIC_RMW
-
- config MUTEX_SPIN_ON_OWNER
- def_bool y
-- depends on SMP && !DEBUG_MUTEXES && ARCH_SUPPORTS_ATOMIC_RMW
-+ depends on SMP && !DEBUG_MUTEXES && ARCH_SUPPORTS_ATOMIC_RMW && !PREEMPT_RT_FULL
-
- config RWSEM_SPIN_ON_OWNER
- def_bool y
-- depends on SMP && RWSEM_XCHGADD_ALGORITHM && ARCH_SUPPORTS_ATOMIC_RMW
-+ depends on SMP && RWSEM_XCHGADD_ALGORITHM && ARCH_SUPPORTS_ATOMIC_RMW && !PREEMPT_RT_FULL
-
- config LOCK_SPIN_ON_OWNER
- def_bool y
-diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt
-index 3f9c974..11dbe26 100644
---- a/kernel/Kconfig.preempt
-+++ b/kernel/Kconfig.preempt
-@@ -1,3 +1,16 @@
-+config PREEMPT
-+ bool
-+ select PREEMPT_COUNT
-+
-+config PREEMPT_RT_BASE
-+ bool
-+ select PREEMPT
-+
-+config HAVE_PREEMPT_LAZY
-+ bool
-+
-+config PREEMPT_LAZY
-+ def_bool y if HAVE_PREEMPT_LAZY && PREEMPT_RT_FULL
-
- choice
- prompt "Preemption Model"
-@@ -33,9 +46,9 @@ config PREEMPT_VOLUNTARY
-
- Select this if you are building a kernel for a desktop system.
-
--config PREEMPT
-+config PREEMPT__LL
- bool "Preemptible Kernel (Low-Latency Desktop)"
-- select PREEMPT_COUNT
-+ select PREEMPT
- select UNINLINE_SPIN_UNLOCK if !ARCH_INLINE_SPIN_UNLOCK
- help
- This option reduces the latency of the kernel by making
-@@ -52,6 +65,22 @@ config PREEMPT
- embedded system with latency requirements in the milliseconds
- range.
-
-+config PREEMPT_RTB
-+ bool "Preemptible Kernel (Basic RT)"
-+ select PREEMPT_RT_BASE
-+ help
-+ This option is basically the same as (Low-Latency Desktop) but
-+ enables changes which are preliminary for the full preemptible
-+ RT kernel.
-+
-+config PREEMPT_RT_FULL
-+ bool "Fully Preemptible Kernel (RT)"
-+ depends on IRQ_FORCED_THREADING
-+ select PREEMPT_RT_BASE
-+ select PREEMPT_RCU
-+ help
-+ All and everything
-+
- endchoice
-
- config PREEMPT_COUNT
-diff --git a/kernel/Makefile b/kernel/Makefile
-index e2ec54e..bff8214 100644
---- a/kernel/Makefile
-+++ b/kernel/Makefile
-@@ -11,6 +11,13 @@ obj-y = fork.o exec_domain.o panic.o \
- notifier.o ksysfs.o cred.o reboot.o \
- async.o range.o smpboot.o
-
-+# Tracing may do some dangerous __builtin_return_address() operations
-+# We know they are dangerous, we don't need gcc telling us that.
-+ifdef CONFIG_USING_GET_LOCK_PARENT_IP
-+FRAME_CFLAGS := $(call cc-disable-warning,frame-address)
-+KBUILD_CFLAGS += $(FRAME_CFLAGS)
-+endif
-+
- obj-$(CONFIG_MULTIUSER) += groups.o
-
- ifdef CONFIG_FUNCTION_TRACER
-diff --git a/kernel/cgroup.c b/kernel/cgroup.c
-index d6b729b..11d61b2 100644
---- a/kernel/cgroup.c
-+++ b/kernel/cgroup.c
-@@ -5027,10 +5027,10 @@ static void css_free_rcu_fn(struct rcu_head *rcu_head)
- queue_work(cgroup_destroy_wq, &css->destroy_work);
- }
-
--static void css_release_work_fn(struct work_struct *work)
-+static void css_release_work_fn(struct swork_event *sev)
- {
- struct cgroup_subsys_state *css =
-- container_of(work, struct cgroup_subsys_state, destroy_work);
-+ container_of(sev, struct cgroup_subsys_state, destroy_swork);
- struct cgroup_subsys *ss = css->ss;
- struct cgroup *cgrp = css->cgroup;
-
-@@ -5071,8 +5071,8 @@ static void css_release(struct percpu_ref *ref)
- struct cgroup_subsys_state *css =
- container_of(ref, struct cgroup_subsys_state, refcnt);
-
-- INIT_WORK(&css->destroy_work, css_release_work_fn);
-- queue_work(cgroup_destroy_wq, &css->destroy_work);
-+ INIT_SWORK(&css->destroy_swork, css_release_work_fn);
-+ swork_queue(&css->destroy_swork);
- }
-
- static void init_and_link_css(struct cgroup_subsys_state *css,
-@@ -5716,6 +5716,7 @@ static int __init cgroup_wq_init(void)
- */
- cgroup_destroy_wq = alloc_workqueue("cgroup_destroy", 0, 1);
- BUG_ON(!cgroup_destroy_wq);
-+ BUG_ON(swork_get());
-
- /*
- * Used to destroy pidlists and separate to serve as flush domain.
-diff --git a/kernel/cpu.c b/kernel/cpu.c
-index 341bf80..b575429 100644
---- a/kernel/cpu.c
-+++ b/kernel/cpu.c
-@@ -152,8 +152,8 @@ static struct {
- #endif
- } cpu_hotplug = {
- .active_writer = NULL,
-- .wq = __WAIT_QUEUE_HEAD_INITIALIZER(cpu_hotplug.wq),
- .lock = __MUTEX_INITIALIZER(cpu_hotplug.lock),
-+ .wq = __WAIT_QUEUE_HEAD_INITIALIZER(cpu_hotplug.wq),
- #ifdef CONFIG_DEBUG_LOCK_ALLOC
- .dep_map = {.name = "cpu_hotplug.lock" },
- #endif
-@@ -166,6 +166,289 @@ static struct {
- #define cpuhp_lock_acquire() lock_map_acquire(&cpu_hotplug.dep_map)
- #define cpuhp_lock_release() lock_map_release(&cpu_hotplug.dep_map)
-
-+/**
-+ * hotplug_pcp - per cpu hotplug descriptor
-+ * @unplug: set when pin_current_cpu() needs to sync tasks
-+ * @sync_tsk: the task that waits for tasks to finish pinned sections
-+ * @refcount: counter of tasks in pinned sections
-+ * @grab_lock: set when the tasks entering pinned sections should wait
-+ * @synced: notifier for @sync_tsk to tell cpu_down it's finished
-+ * @mutex: the mutex to make tasks wait (used when @grab_lock is true)
-+ * @mutex_init: zero if the mutex hasn't been initialized yet.
-+ *
-+ * Although @unplug and @sync_tsk may point to the same task, the @unplug
-+ * is used as a flag and still exists after @sync_tsk has exited and
-+ * @sync_tsk set to NULL.
-+ */
-+struct hotplug_pcp {
-+ struct task_struct *unplug;
-+ struct task_struct *sync_tsk;
-+ int refcount;
-+ int grab_lock;
-+ struct completion synced;
-+ struct completion unplug_wait;
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ /*
-+ * Note, on PREEMPT_RT, the hotplug lock must save the state of
-+ * the task, otherwise the mutex will cause the task to fail
-+ * to sleep when required. (Because it's called from migrate_disable())
-+ *
-+ * The spinlock_t on PREEMPT_RT is a mutex that saves the task's
-+ * state.
-+ */
-+ spinlock_t lock;
-+#else
-+ struct mutex mutex;
-+#endif
-+ int mutex_init;
-+};
-+
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+# define hotplug_lock(hp) rt_spin_lock__no_mg(&(hp)->lock)
-+# define hotplug_unlock(hp) rt_spin_unlock__no_mg(&(hp)->lock)
-+#else
-+# define hotplug_lock(hp) mutex_lock(&(hp)->mutex)
-+# define hotplug_unlock(hp) mutex_unlock(&(hp)->mutex)
-+#endif
-+
-+static DEFINE_PER_CPU(struct hotplug_pcp, hotplug_pcp);
-+
-+/**
-+ * pin_current_cpu - Prevent the current cpu from being unplugged
-+ *
-+ * Lightweight version of get_online_cpus() to prevent cpu from being
-+ * unplugged when code runs in a migration disabled region.
-+ *
-+ * Must be called with preemption disabled (preempt_count = 1)!
-+ */
-+void pin_current_cpu(void)
-+{
-+ struct hotplug_pcp *hp;
-+ int force = 0;
-+
-+retry:
-+ hp = this_cpu_ptr(&hotplug_pcp);
-+
-+ if (!hp->unplug || hp->refcount || force || preempt_count() > 1 ||
-+ hp->unplug == current) {
-+ hp->refcount++;
-+ return;
-+ }
-+ if (hp->grab_lock) {
-+ preempt_enable();
-+ hotplug_lock(hp);
-+ hotplug_unlock(hp);
-+ } else {
-+ preempt_enable();
-+ /*
-+ * Try to push this task off of this CPU.
-+ */
-+ if (!migrate_me()) {
-+ preempt_disable();
-+ hp = this_cpu_ptr(&hotplug_pcp);
-+ if (!hp->grab_lock) {
-+ /*
-+ * Just let it continue it's already pinned
-+ * or about to sleep.
-+ */
-+ force = 1;
-+ goto retry;
-+ }
-+ preempt_enable();
-+ }
-+ }
-+ preempt_disable();
-+ goto retry;
-+}
-+
-+/**
-+ * unpin_current_cpu - Allow unplug of current cpu
-+ *
-+ * Must be called with preemption or interrupts disabled!
-+ */
-+void unpin_current_cpu(void)
-+{
-+ struct hotplug_pcp *hp = this_cpu_ptr(&hotplug_pcp);
-+
-+ WARN_ON(hp->refcount <= 0);
-+
-+ /* This is safe. sync_unplug_thread is pinned to this cpu */
-+ if (!--hp->refcount && hp->unplug && hp->unplug != current)
-+ wake_up_process(hp->unplug);
-+}
-+
-+static void wait_for_pinned_cpus(struct hotplug_pcp *hp)
-+{
-+ set_current_state(TASK_UNINTERRUPTIBLE);
-+ while (hp->refcount) {
-+ schedule_preempt_disabled();
-+ set_current_state(TASK_UNINTERRUPTIBLE);
-+ }
-+}
-+
-+static int sync_unplug_thread(void *data)
-+{
-+ struct hotplug_pcp *hp = data;
-+
-+ wait_for_completion(&hp->unplug_wait);
-+ preempt_disable();
-+ hp->unplug = current;
-+ wait_for_pinned_cpus(hp);
-+
-+ /*
-+ * This thread will synchronize the cpu_down() with threads
-+ * that have pinned the CPU. When the pinned CPU count reaches
-+ * zero, we inform the cpu_down code to continue to the next step.
-+ */
-+ set_current_state(TASK_UNINTERRUPTIBLE);
-+ preempt_enable();
-+ complete(&hp->synced);
-+
-+ /*
-+ * If all succeeds, the next step will need tasks to wait till
-+ * the CPU is offline before continuing. To do this, the grab_lock
-+ * is set and tasks going into pin_current_cpu() will block on the
-+ * mutex. But we still need to wait for those that are already in
-+ * pinned CPU sections. If the cpu_down() failed, the kthread_should_stop()
-+ * will kick this thread out.
-+ */
-+ while (!hp->grab_lock && !kthread_should_stop()) {
-+ schedule();
-+ set_current_state(TASK_UNINTERRUPTIBLE);
-+ }
-+
-+ /* Make sure grab_lock is seen before we see a stale completion */
-+ smp_mb();
-+
-+ /*
-+ * Now just before cpu_down() enters stop machine, we need to make
-+ * sure all tasks that are in pinned CPU sections are out, and new
-+ * tasks will now grab the lock, keeping them from entering pinned
-+ * CPU sections.
-+ */
-+ if (!kthread_should_stop()) {
-+ preempt_disable();
-+ wait_for_pinned_cpus(hp);
-+ preempt_enable();
-+ complete(&hp->synced);
-+ }
-+
-+ set_current_state(TASK_UNINTERRUPTIBLE);
-+ while (!kthread_should_stop()) {
-+ schedule();
-+ set_current_state(TASK_UNINTERRUPTIBLE);
-+ }
-+ set_current_state(TASK_RUNNING);
-+
-+ /*
-+ * Force this thread off this CPU as it's going down and
-+ * we don't want any more work on this CPU.
-+ */
-+ current->flags &= ~PF_NO_SETAFFINITY;
-+ set_cpus_allowed_ptr(current, cpu_present_mask);
-+ migrate_me();
-+ return 0;
-+}
-+
-+static void __cpu_unplug_sync(struct hotplug_pcp *hp)
-+{
-+ wake_up_process(hp->sync_tsk);
-+ wait_for_completion(&hp->synced);
-+}
-+
-+static void __cpu_unplug_wait(unsigned int cpu)
-+{
-+ struct hotplug_pcp *hp = &per_cpu(hotplug_pcp, cpu);
-+
-+ complete(&hp->unplug_wait);
-+ wait_for_completion(&hp->synced);
-+}
-+
-+/*
-+ * Start the sync_unplug_thread on the target cpu and wait for it to
-+ * complete.
-+ */
-+static int cpu_unplug_begin(unsigned int cpu)
-+{
-+ struct hotplug_pcp *hp = &per_cpu(hotplug_pcp, cpu);
-+ int err;
-+
-+ /* Protected by cpu_hotplug.lock */
-+ if (!hp->mutex_init) {
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ spin_lock_init(&hp->lock);
-+#else
-+ mutex_init(&hp->mutex);
-+#endif
-+ hp->mutex_init = 1;
-+ }
-+
-+ /* Inform the scheduler to migrate tasks off this CPU */
-+ tell_sched_cpu_down_begin(cpu);
-+
-+ init_completion(&hp->synced);
-+ init_completion(&hp->unplug_wait);
-+
-+ hp->sync_tsk = kthread_create(sync_unplug_thread, hp, "sync_unplug/%d", cpu);
-+ if (IS_ERR(hp->sync_tsk)) {
-+ err = PTR_ERR(hp->sync_tsk);
-+ hp->sync_tsk = NULL;
-+ return err;
-+ }
-+ kthread_bind(hp->sync_tsk, cpu);
-+
-+ /*
-+ * Wait for tasks to get out of the pinned sections,
-+ * it's still OK if new tasks enter. Some CPU notifiers will
-+ * wait for tasks that are going to enter these sections and
-+ * we must not have them block.
-+ */
-+ wake_up_process(hp->sync_tsk);
-+ return 0;
-+}
-+
-+static void cpu_unplug_sync(unsigned int cpu)
-+{
-+ struct hotplug_pcp *hp = &per_cpu(hotplug_pcp, cpu);
-+
-+ init_completion(&hp->synced);
-+ /* The completion needs to be initialzied before setting grab_lock */
-+ smp_wmb();
-+
-+ /* Grab the mutex before setting grab_lock */
-+ hotplug_lock(hp);
-+ hp->grab_lock = 1;
-+
-+ /*
-+ * The CPU notifiers have been completed.
-+ * Wait for tasks to get out of pinned CPU sections and have new
-+ * tasks block until the CPU is completely down.
-+ */
-+ __cpu_unplug_sync(hp);
-+
-+ /* All done with the sync thread */
-+ kthread_stop(hp->sync_tsk);
-+ hp->sync_tsk = NULL;
-+}
-+
-+static void cpu_unplug_done(unsigned int cpu)
-+{
-+ struct hotplug_pcp *hp = &per_cpu(hotplug_pcp, cpu);
-+
-+ hp->unplug = NULL;
-+ /* Let all tasks know cpu unplug is finished before cleaning up */
-+ smp_wmb();
-+
-+ if (hp->sync_tsk)
-+ kthread_stop(hp->sync_tsk);
-+
-+ if (hp->grab_lock) {
-+ hotplug_unlock(hp);
-+ /* protected by cpu_hotplug.lock */
-+ hp->grab_lock = 0;
-+ }
-+ tell_sched_cpu_down_done(cpu);
-+}
-
- void get_online_cpus(void)
- {
-@@ -710,10 +993,14 @@ static int takedown_cpu(unsigned int cpu)
- struct cpuhp_cpu_state *st = per_cpu_ptr(&cpuhp_state, cpu);
- int err;
-
-+ __cpu_unplug_wait(cpu);
- /* Park the smpboot threads */
- kthread_park(per_cpu_ptr(&cpuhp_state, cpu)->thread);
- smpboot_park_threads(cpu);
-
-+ /* Notifiers are done. Don't let any more tasks pin this CPU. */
-+ cpu_unplug_sync(cpu);
-+
- /*
- * Prevent irq alloc/free while the dying cpu reorganizes the
- * interrupt affinities.
-@@ -799,6 +1086,9 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
- struct cpuhp_cpu_state *st = per_cpu_ptr(&cpuhp_state, cpu);
- int prev_state, ret = 0;
- bool hasdied = false;
-+ int mycpu;
-+ cpumask_var_t cpumask;
-+ cpumask_var_t cpumask_org;
-
- if (num_online_cpus() == 1)
- return -EBUSY;
-@@ -806,7 +1096,34 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
- if (!cpu_present(cpu))
- return -EINVAL;
-
-+ /* Move the downtaker off the unplug cpu */
-+ if (!alloc_cpumask_var(&cpumask, GFP_KERNEL))
-+ return -ENOMEM;
-+ if (!alloc_cpumask_var(&cpumask_org, GFP_KERNEL)) {
-+ free_cpumask_var(cpumask);
-+ return -ENOMEM;
-+ }
-+
-+ cpumask_copy(cpumask_org, tsk_cpus_allowed(current));
-+ cpumask_andnot(cpumask, cpu_online_mask, cpumask_of(cpu));
-+ set_cpus_allowed_ptr(current, cpumask);
-+ free_cpumask_var(cpumask);
-+ migrate_disable();
-+ mycpu = smp_processor_id();
-+ if (mycpu == cpu) {
-+ printk(KERN_ERR "Yuck! Still on unplug CPU\n!");
-+ migrate_enable();
-+ ret = -EBUSY;
-+ goto restore_cpus;
-+ }
-+
-+ migrate_enable();
- cpu_hotplug_begin();
-+ ret = cpu_unplug_begin(cpu);
-+ if (ret) {
-+ printk("cpu_unplug_begin(%d) failed\n", cpu);
-+ goto out_cancel;
-+ }
-
- cpuhp_tasks_frozen = tasks_frozen;
-
-@@ -845,10 +1162,15 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
-
- hasdied = prev_state != st->state && st->state == CPUHP_OFFLINE;
- out:
-+ cpu_unplug_done(cpu);
-+out_cancel:
- cpu_hotplug_done();
- /* This post dead nonsense must die */
- if (!ret && hasdied)
- cpu_notify_nofail(CPU_POST_DEAD, cpu);
-+restore_cpus:
-+ set_cpus_allowed_ptr(current, cpumask_org);
-+ free_cpumask_var(cpumask_org);
- return ret;
- }
-
-diff --git a/kernel/debug/kdb/kdb_io.c b/kernel/debug/kdb/kdb_io.c
-index fc1ef73..83c6665 100644
---- a/kernel/debug/kdb/kdb_io.c
-+++ b/kernel/debug/kdb/kdb_io.c
-@@ -554,7 +554,6 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)
- int linecount;
- int colcount;
- int logging, saved_loglevel = 0;
-- int saved_trap_printk;
- int got_printf_lock = 0;
- int retlen = 0;
- int fnd, len;
-@@ -565,8 +564,6 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)
- unsigned long uninitialized_var(flags);
-
- preempt_disable();
-- saved_trap_printk = kdb_trap_printk;
-- kdb_trap_printk = 0;
-
- /* Serialize kdb_printf if multiple cpus try to write at once.
- * But if any cpu goes recursive in kdb, just print the output,
-@@ -855,7 +852,6 @@ kdb_print_out:
- } else {
- __release(kdb_printf_lock);
- }
-- kdb_trap_printk = saved_trap_printk;
- preempt_enable();
- return retlen;
- }
-@@ -865,9 +861,11 @@ int kdb_printf(const char *fmt, ...)
- va_list ap;
- int r;
-
-+ kdb_trap_printk++;
- va_start(ap, fmt);
- r = vkdb_printf(KDB_MSGSRC_INTERNAL, fmt, ap);
- va_end(ap);
-+ kdb_trap_printk--;
-
- return r;
- }
-diff --git a/kernel/events/core.c b/kernel/events/core.c
-index fc9bb22..bc2db7e 100644
---- a/kernel/events/core.c
-+++ b/kernel/events/core.c
-@@ -1042,6 +1042,7 @@ static void __perf_mux_hrtimer_init(struct perf_cpu_context *cpuctx, int cpu)
- raw_spin_lock_init(&cpuctx->hrtimer_lock);
- hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED);
- timer->function = perf_mux_hrtimer_handler;
-+ timer->irqsafe = 1;
- }
-
- static int perf_mux_hrtimer_restart(struct perf_cpu_context *cpuctx)
-@@ -8215,6 +8216,7 @@ static void perf_swevent_init_hrtimer(struct perf_event *event)
-
- hrtimer_init(&hwc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
- hwc->hrtimer.function = perf_swevent_hrtimer;
-+ hwc->hrtimer.irqsafe = 1;
-
- /*
- * Since hrtimers have a fixed rate, we can do a static freq->period
-diff --git a/kernel/exit.c b/kernel/exit.c
-index 091a78b..170b672 100644
---- a/kernel/exit.c
-+++ b/kernel/exit.c
-@@ -143,7 +143,7 @@ static void __exit_signal(struct task_struct *tsk)
- * Do this under ->siglock, we can race with another thread
- * doing sigqueue_free() if we have SIGQUEUE_PREALLOC signals.
- */
-- flush_sigqueue(&tsk->pending);
-+ flush_task_sigqueue(tsk);
- tsk->sighand = NULL;
- spin_unlock(&sighand->siglock);
-
-diff --git a/kernel/fork.c b/kernel/fork.c
-index beb3172..e398cb9 100644
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -251,7 +251,9 @@ static inline void put_signal_struct(struct signal_struct *sig)
- if (atomic_dec_and_test(&sig->sigcnt))
- free_signal_struct(sig);
- }
--
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+static
-+#endif
- void __put_task_struct(struct task_struct *tsk)
- {
- WARN_ON(!tsk->exit_state);
-@@ -268,7 +270,18 @@ void __put_task_struct(struct task_struct *tsk)
- if (!profile_handoff_task(tsk))
- free_task(tsk);
- }
-+#ifndef CONFIG_PREEMPT_RT_BASE
- EXPORT_SYMBOL_GPL(__put_task_struct);
-+#else
-+void __put_task_struct_cb(struct rcu_head *rhp)
-+{
-+ struct task_struct *tsk = container_of(rhp, struct task_struct, put_rcu);
-+
-+ __put_task_struct(tsk);
-+
-+}
-+EXPORT_SYMBOL_GPL(__put_task_struct_cb);
-+#endif
-
- void __init __weak arch_task_cache_init(void) { }
-
-@@ -702,6 +715,19 @@ void __mmdrop(struct mm_struct *mm)
- }
- EXPORT_SYMBOL_GPL(__mmdrop);
-
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+/*
-+ * RCU callback for delayed mm drop. Not strictly rcu, but we don't
-+ * want another facility to make this work.
-+ */
-+void __mmdrop_delayed(struct rcu_head *rhp)
-+{
-+ struct mm_struct *mm = container_of(rhp, struct mm_struct, delayed_drop);
-+
-+ __mmdrop(mm);
-+}
-+#endif
-+
- static inline void __mmput(struct mm_struct *mm)
- {
- VM_BUG_ON(atomic_read(&mm->mm_users));
-@@ -1274,6 +1300,9 @@ static void rt_mutex_init_task(struct task_struct *p)
- */
- static void posix_cpu_timers_init(struct task_struct *tsk)
- {
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ tsk->posix_timer_list = NULL;
-+#endif
- tsk->cputime_expires.prof_exp = 0;
- tsk->cputime_expires.virt_exp = 0;
- tsk->cputime_expires.sched_exp = 0;
-@@ -1399,6 +1428,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
- spin_lock_init(&p->alloc_lock);
-
- init_sigpending(&p->pending);
-+ p->sigqueue_cache = NULL;
-
- p->utime = p->stime = p->gtime = 0;
- p->utimescaled = p->stimescaled = 0;
-diff --git a/kernel/futex.c b/kernel/futex.c
-index 46cb3a3..6de82b9 100644
---- a/kernel/futex.c
-+++ b/kernel/futex.c
-@@ -895,7 +895,9 @@ void exit_pi_state_list(struct task_struct *curr)
- * task still owns the PI-state:
- */
- if (head->next != next) {
-+ raw_spin_unlock_irq(&curr->pi_lock);
- spin_unlock(&hb->lock);
-+ raw_spin_lock_irq(&curr->pi_lock);
- continue;
- }
-
-@@ -1290,6 +1292,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,
- struct futex_pi_state *pi_state = this->pi_state;
- u32 uninitialized_var(curval), newval;
- WAKE_Q(wake_q);
-+ WAKE_Q(wake_sleeper_q);
- bool deboost;
- int ret = 0;
-
-@@ -1356,7 +1359,8 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,
-
- raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
-
-- deboost = rt_mutex_futex_unlock(&pi_state->pi_mutex, &wake_q);
-+ deboost = rt_mutex_futex_unlock(&pi_state->pi_mutex, &wake_q,
-+ &wake_sleeper_q);
-
- /*
- * First unlock HB so the waiter does not spin on it once he got woken
-@@ -1364,8 +1368,9 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,
- * deboost first (and lose our higher priority), then the task might get
- * scheduled away before the wake up can take place.
- */
-- spin_unlock(&hb->lock);
-+ deboost |= spin_unlock_no_deboost(&hb->lock);
- wake_up_q(&wake_q);
-+ wake_up_q_sleeper(&wake_sleeper_q);
- if (deboost)
- rt_mutex_adjust_prio(current);
-
-@@ -1915,6 +1920,16 @@ retry_private:
- requeue_pi_wake_futex(this, &key2, hb2);
- drop_count++;
- continue;
-+ } else if (ret == -EAGAIN) {
-+ /*
-+ * Waiter was woken by timeout or
-+ * signal and has set pi_blocked_on to
-+ * PI_WAKEUP_INPROGRESS before we
-+ * tried to enqueue it on the rtmutex.
-+ */
-+ this->pi_state = NULL;
-+ put_pi_state(pi_state);
-+ continue;
- } else if (ret) {
- /*
- * rt_mutex_start_proxy_lock() detected a
-@@ -2805,7 +2820,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
- struct hrtimer_sleeper timeout, *to = NULL;
- struct rt_mutex_waiter rt_waiter;
- struct rt_mutex *pi_mutex = NULL;
-- struct futex_hash_bucket *hb;
-+ struct futex_hash_bucket *hb, *hb2;
- union futex_key key2 = FUTEX_KEY_INIT;
- struct futex_q q = futex_q_init;
- int res, ret;
-@@ -2830,10 +2845,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
- * The waiter is allocated on our stack, manipulated by the requeue
- * code while we sleep on uaddr.
- */
-- debug_rt_mutex_init_waiter(&rt_waiter);
-- RB_CLEAR_NODE(&rt_waiter.pi_tree_entry);
-- RB_CLEAR_NODE(&rt_waiter.tree_entry);
-- rt_waiter.task = NULL;
-+ rt_mutex_init_waiter(&rt_waiter, false);
-
- ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, VERIFY_WRITE);
- if (unlikely(ret != 0))
-@@ -2864,20 +2876,55 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
- /* Queue the futex_q, drop the hb lock, wait for wakeup. */
- futex_wait_queue_me(hb, &q, to);
-
-- spin_lock(&hb->lock);
-- ret = handle_early_requeue_pi_wakeup(hb, &q, &key2, to);
-- spin_unlock(&hb->lock);
-- if (ret)
-- goto out_put_keys;
-+ /*
-+ * On RT we must avoid races with requeue and trying to block
-+ * on two mutexes (hb->lock and uaddr2's rtmutex) by
-+ * serializing access to pi_blocked_on with pi_lock.
-+ */
-+ raw_spin_lock_irq(¤t->pi_lock);
-+ if (current->pi_blocked_on) {
-+ /*
-+ * We have been requeued or are in the process of
-+ * being requeued.
-+ */
-+ raw_spin_unlock_irq(¤t->pi_lock);
-+ } else {
-+ /*
-+ * Setting pi_blocked_on to PI_WAKEUP_INPROGRESS
-+ * prevents a concurrent requeue from moving us to the
-+ * uaddr2 rtmutex. After that we can safely acquire
-+ * (and possibly block on) hb->lock.
-+ */
-+ current->pi_blocked_on = PI_WAKEUP_INPROGRESS;
-+ raw_spin_unlock_irq(¤t->pi_lock);
-+
-+ spin_lock(&hb->lock);
-+
-+ /*
-+ * Clean up pi_blocked_on. We might leak it otherwise
-+ * when we succeeded with the hb->lock in the fast
-+ * path.
-+ */
-+ raw_spin_lock_irq(¤t->pi_lock);
-+ current->pi_blocked_on = NULL;
-+ raw_spin_unlock_irq(¤t->pi_lock);
-+
-+ ret = handle_early_requeue_pi_wakeup(hb, &q, &key2, to);
-+ spin_unlock(&hb->lock);
-+ if (ret)
-+ goto out_put_keys;
-+ }
-
- /*
-- * In order for us to be here, we know our q.key == key2, and since
-- * we took the hb->lock above, we also know that futex_requeue() has
-- * completed and we no longer have to concern ourselves with a wakeup
-- * race with the atomic proxy lock acquisition by the requeue code. The
-- * futex_requeue dropped our key1 reference and incremented our key2
-- * reference count.
-+ * In order to be here, we have either been requeued, are in
-+ * the process of being requeued, or requeue successfully
-+ * acquired uaddr2 on our behalf. If pi_blocked_on was
-+ * non-null above, we may be racing with a requeue. Do not
-+ * rely on q->lock_ptr to be hb2->lock until after blocking on
-+ * hb->lock or hb2->lock. The futex_requeue dropped our key1
-+ * reference and incremented our key2 reference count.
- */
-+ hb2 = hash_futex(&key2);
-
- /* Check if the requeue code acquired the second futex for us. */
- if (!q.rt_waiter) {
-@@ -2886,14 +2933,15 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
- * did a lock-steal - fix up the PI-state in that case.
- */
- if (q.pi_state && (q.pi_state->owner != current)) {
-- spin_lock(q.lock_ptr);
-+ spin_lock(&hb2->lock);
-+ BUG_ON(&hb2->lock != q.lock_ptr);
- ret = fixup_pi_state_owner(uaddr2, &q, current);
- /*
- * Drop the reference to the pi state which
- * the requeue_pi() code acquired for us.
- */
- put_pi_state(q.pi_state);
-- spin_unlock(q.lock_ptr);
-+ spin_unlock(&hb2->lock);
- }
- } else {
- /*
-@@ -2906,7 +2954,8 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
- ret = rt_mutex_finish_proxy_lock(pi_mutex, to, &rt_waiter);
- debug_rt_mutex_free_waiter(&rt_waiter);
-
-- spin_lock(q.lock_ptr);
-+ spin_lock(&hb2->lock);
-+ BUG_ON(&hb2->lock != q.lock_ptr);
- /*
- * Fixup the pi_state owner and possibly acquire the lock if we
- * haven't already.
-diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
-index d3f2490..f87aa8f 100644
---- a/kernel/irq/handle.c
-+++ b/kernel/irq/handle.c
-@@ -181,10 +181,16 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc)
- {
- irqreturn_t retval;
- unsigned int flags = 0;
-+ struct pt_regs *regs = get_irq_regs();
-+ u64 ip = regs ? instruction_pointer(regs) : 0;
-
- retval = __handle_irq_event_percpu(desc, &flags);
-
-- add_interrupt_randomness(desc->irq_data.irq, flags);
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ desc->random_ip = ip;
-+#else
-+ add_interrupt_randomness(desc->irq_data.irq, flags, ip);
-+#endif
-
- if (!noirqdebug)
- note_interrupt(desc, retval);
-diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
-index 9530fcd..fadf8f8 100644
---- a/kernel/irq/manage.c
-+++ b/kernel/irq/manage.c
-@@ -22,6 +22,7 @@
- #include "internals.h"
-
- #ifdef CONFIG_IRQ_FORCED_THREADING
-+# ifndef CONFIG_PREEMPT_RT_BASE
- __read_mostly bool force_irqthreads;
-
- static int __init setup_forced_irqthreads(char *arg)
-@@ -30,6 +31,7 @@ static int __init setup_forced_irqthreads(char *arg)
- return 0;
- }
- early_param("threadirqs", setup_forced_irqthreads);
-+# endif
- #endif
-
- static void __synchronize_hardirq(struct irq_desc *desc)
-@@ -233,7 +235,12 @@ int irq_set_affinity_locked(struct irq_data *data, const struct cpumask *mask,
-
- if (desc->affinity_notify) {
- kref_get(&desc->affinity_notify->kref);
-+
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ swork_queue(&desc->affinity_notify->swork);
-+#else
- schedule_work(&desc->affinity_notify->work);
-+#endif
- }
- irqd_set(data, IRQD_AFFINITY_SET);
-
-@@ -271,10 +278,8 @@ int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m)
- }
- EXPORT_SYMBOL_GPL(irq_set_affinity_hint);
-
--static void irq_affinity_notify(struct work_struct *work)
-+static void _irq_affinity_notify(struct irq_affinity_notify *notify)
- {
-- struct irq_affinity_notify *notify =
-- container_of(work, struct irq_affinity_notify, work);
- struct irq_desc *desc = irq_to_desc(notify->irq);
- cpumask_var_t cpumask;
- unsigned long flags;
-@@ -296,6 +301,35 @@ out:
- kref_put(¬ify->kref, notify->release);
- }
-
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+static void init_helper_thread(void)
-+{
-+ static int init_sworker_once;
-+
-+ if (init_sworker_once)
-+ return;
-+ if (WARN_ON(swork_get()))
-+ return;
-+ init_sworker_once = 1;
-+}
-+
-+static void irq_affinity_notify(struct swork_event *swork)
-+{
-+ struct irq_affinity_notify *notify =
-+ container_of(swork, struct irq_affinity_notify, swork);
-+ _irq_affinity_notify(notify);
-+}
-+
-+#else
-+
-+static void irq_affinity_notify(struct work_struct *work)
-+{
-+ struct irq_affinity_notify *notify =
-+ container_of(work, struct irq_affinity_notify, work);
-+ _irq_affinity_notify(notify);
-+}
-+#endif
-+
- /**
- * irq_set_affinity_notifier - control notification of IRQ affinity changes
- * @irq: Interrupt for which to enable/disable notification
-@@ -324,7 +358,12 @@ irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify)
- if (notify) {
- notify->irq = irq;
- kref_init(¬ify->kref);
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ INIT_SWORK(¬ify->swork, irq_affinity_notify);
-+ init_helper_thread();
-+#else
- INIT_WORK(¬ify->work, irq_affinity_notify);
-+#endif
- }
-
- raw_spin_lock_irqsave(&desc->lock, flags);
-@@ -879,7 +918,15 @@ irq_forced_thread_fn(struct irq_desc *desc, struct irqaction *action)
- local_bh_disable();
- ret = action->thread_fn(action->irq, action->dev_id);
- irq_finalize_oneshot(desc, action);
-- local_bh_enable();
-+ /*
-+ * Interrupts which have real time requirements can be set up
-+ * to avoid softirq processing in the thread handler. This is
-+ * safe as these interrupts do not raise soft interrupts.
-+ */
-+ if (irq_settings_no_softirq_call(desc))
-+ _local_bh_enable();
-+ else
-+ local_bh_enable();
- return ret;
- }
-
-@@ -976,6 +1023,12 @@ static int irq_thread(void *data)
- if (action_ret == IRQ_WAKE_THREAD)
- irq_wake_secondary(desc, action);
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ migrate_disable();
-+ add_interrupt_randomness(action->irq, 0,
-+ desc->random_ip ^ (unsigned long) action);
-+ migrate_enable();
-+#endif
- wake_threads_waitq(desc);
- }
-
-@@ -1336,6 +1389,9 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
- irqd_set(&desc->irq_data, IRQD_NO_BALANCING);
- }
-
-+ if (new->flags & IRQF_NO_SOFTIRQ_CALL)
-+ irq_settings_set_no_softirq_call(desc);
-+
- /* Set default affinity mask once everything is setup */
- setup_affinity(desc, mask);
-
-@@ -2061,7 +2117,7 @@ EXPORT_SYMBOL_GPL(irq_get_irqchip_state);
- * This call sets the internal irqchip state of an interrupt,
- * depending on the value of @which.
- *
-- * This function should be called with preemption disabled if the
-+ * This function should be called with migration disabled if the
- * interrupt controller has per-cpu registers.
- */
- int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which,
-diff --git a/kernel/irq/settings.h b/kernel/irq/settings.h
-index 320579d..2df2d44 100644
---- a/kernel/irq/settings.h
-+++ b/kernel/irq/settings.h
-@@ -16,6 +16,7 @@ enum {
- _IRQ_PER_CPU_DEVID = IRQ_PER_CPU_DEVID,
- _IRQ_IS_POLLED = IRQ_IS_POLLED,
- _IRQ_DISABLE_UNLAZY = IRQ_DISABLE_UNLAZY,
-+ _IRQ_NO_SOFTIRQ_CALL = IRQ_NO_SOFTIRQ_CALL,
- _IRQF_MODIFY_MASK = IRQF_MODIFY_MASK,
- };
-
-@@ -30,6 +31,7 @@ enum {
- #define IRQ_PER_CPU_DEVID GOT_YOU_MORON
- #define IRQ_IS_POLLED GOT_YOU_MORON
- #define IRQ_DISABLE_UNLAZY GOT_YOU_MORON
-+#define IRQ_NO_SOFTIRQ_CALL GOT_YOU_MORON
- #undef IRQF_MODIFY_MASK
- #define IRQF_MODIFY_MASK GOT_YOU_MORON
-
-@@ -40,6 +42,16 @@ irq_settings_clr_and_set(struct irq_desc *desc, u32 clr, u32 set)
- desc->status_use_accessors |= (set & _IRQF_MODIFY_MASK);
- }
-
-+static inline bool irq_settings_no_softirq_call(struct irq_desc *desc)
-+{
-+ return desc->status_use_accessors & _IRQ_NO_SOFTIRQ_CALL;
-+}
-+
-+static inline void irq_settings_set_no_softirq_call(struct irq_desc *desc)
-+{
-+ desc->status_use_accessors |= _IRQ_NO_SOFTIRQ_CALL;
-+}
-+
- static inline bool irq_settings_is_per_cpu(struct irq_desc *desc)
- {
- return desc->status_use_accessors & _IRQ_PER_CPU;
-diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
-index 5707f97..73f38dc 100644
---- a/kernel/irq/spurious.c
-+++ b/kernel/irq/spurious.c
-@@ -442,6 +442,10 @@ MODULE_PARM_DESC(noirqdebug, "Disable irq lockup detection when true");
-
- static int __init irqfixup_setup(char *str)
- {
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ pr_warn("irqfixup boot option not supported w/ CONFIG_PREEMPT_RT_BASE\n");
-+ return 1;
-+#endif
- irqfixup = 1;
- printk(KERN_WARNING "Misrouted IRQ fixup support enabled.\n");
- printk(KERN_WARNING "This may impact system performance.\n");
-@@ -454,6 +458,10 @@ module_param(irqfixup, int, 0644);
-
- static int __init irqpoll_setup(char *str)
- {
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ pr_warn("irqpoll boot option not supported w/ CONFIG_PREEMPT_RT_BASE\n");
-+ return 1;
-+#endif
- irqfixup = 2;
- printk(KERN_WARNING "Misrouted IRQ fixup and polling support "
- "enabled\n");
-diff --git a/kernel/irq_work.c b/kernel/irq_work.c
-index bcf107c..2899ba0 100644
---- a/kernel/irq_work.c
-+++ b/kernel/irq_work.c
-@@ -17,6 +17,7 @@
- #include <linux/cpu.h>
- #include <linux/notifier.h>
- #include <linux/smp.h>
-+#include <linux/interrupt.h>
- #include <asm/processor.h>
-
-
-@@ -65,6 +66,8 @@ void __weak arch_irq_work_raise(void)
- */
- bool irq_work_queue_on(struct irq_work *work, int cpu)
- {
-+ struct llist_head *list;
-+
- /* All work should have been flushed before going offline */
- WARN_ON_ONCE(cpu_is_offline(cpu));
-
-@@ -75,7 +78,12 @@ bool irq_work_queue_on(struct irq_work *work, int cpu)
- if (!irq_work_claim(work))
- return false;
-
-- if (llist_add(&work->llnode, &per_cpu(raised_list, cpu)))
-+ if (IS_ENABLED(CONFIG_PREEMPT_RT_FULL) && !(work->flags & IRQ_WORK_HARD_IRQ))
-+ list = &per_cpu(lazy_list, cpu);
-+ else
-+ list = &per_cpu(raised_list, cpu);
-+
-+ if (llist_add(&work->llnode, list))
- arch_send_call_function_single_ipi(cpu);
-
- return true;
-@@ -86,6 +94,9 @@ EXPORT_SYMBOL_GPL(irq_work_queue_on);
- /* Enqueue the irq work @work on the current CPU */
- bool irq_work_queue(struct irq_work *work)
- {
-+ struct llist_head *list;
-+ bool lazy_work, realtime = IS_ENABLED(CONFIG_PREEMPT_RT_FULL);
-+
- /* Only queue if not already pending */
- if (!irq_work_claim(work))
- return false;
-@@ -93,13 +104,15 @@ bool irq_work_queue(struct irq_work *work)
- /* Queue the entry and raise the IPI if needed. */
- preempt_disable();
-
-- /* If the work is "lazy", handle it from next tick if any */
-- if (work->flags & IRQ_WORK_LAZY) {
-- if (llist_add(&work->llnode, this_cpu_ptr(&lazy_list)) &&
-- tick_nohz_tick_stopped())
-- arch_irq_work_raise();
-- } else {
-- if (llist_add(&work->llnode, this_cpu_ptr(&raised_list)))
-+ lazy_work = work->flags & IRQ_WORK_LAZY;
-+
-+ if (lazy_work || (realtime && !(work->flags & IRQ_WORK_HARD_IRQ)))
-+ list = this_cpu_ptr(&lazy_list);
-+ else
-+ list = this_cpu_ptr(&raised_list);
-+
-+ if (llist_add(&work->llnode, list)) {
-+ if (!lazy_work || tick_nohz_tick_stopped())
- arch_irq_work_raise();
- }
-
-@@ -116,9 +129,8 @@ bool irq_work_needs_cpu(void)
- raised = this_cpu_ptr(&raised_list);
- lazy = this_cpu_ptr(&lazy_list);
-
-- if (llist_empty(raised) || arch_irq_work_has_interrupt())
-- if (llist_empty(lazy))
-- return false;
-+ if (llist_empty(raised) && llist_empty(lazy))
-+ return false;
-
- /* All work should have been flushed before going offline */
- WARN_ON_ONCE(cpu_is_offline(smp_processor_id()));
-@@ -132,7 +144,7 @@ static void irq_work_run_list(struct llist_head *list)
- struct irq_work *work;
- struct llist_node *llnode;
-
-- BUG_ON(!irqs_disabled());
-+ BUG_ON_NONRT(!irqs_disabled());
-
- if (llist_empty(list))
- return;
-@@ -169,7 +181,16 @@ static void irq_work_run_list(struct llist_head *list)
- void irq_work_run(void)
- {
- irq_work_run_list(this_cpu_ptr(&raised_list));
-- irq_work_run_list(this_cpu_ptr(&lazy_list));
-+ if (IS_ENABLED(CONFIG_PREEMPT_RT_FULL)) {
-+ /*
-+ * NOTE: we raise softirq via IPI for safety,
-+ * and execute in irq_work_tick() to move the
-+ * overhead from hard to soft irq context.
-+ */
-+ if (!llist_empty(this_cpu_ptr(&lazy_list)))
-+ raise_softirq(TIMER_SOFTIRQ);
-+ } else
-+ irq_work_run_list(this_cpu_ptr(&lazy_list));
- }
- EXPORT_SYMBOL_GPL(irq_work_run);
-
-@@ -179,8 +200,17 @@ void irq_work_tick(void)
-
- if (!llist_empty(raised) && !arch_irq_work_has_interrupt())
- irq_work_run_list(raised);
-+
-+ if (!IS_ENABLED(CONFIG_PREEMPT_RT_FULL))
-+ irq_work_run_list(this_cpu_ptr(&lazy_list));
-+}
-+
-+#if defined(CONFIG_IRQ_WORK) && defined(CONFIG_PREEMPT_RT_FULL)
-+void irq_work_tick_soft(void)
-+{
- irq_work_run_list(this_cpu_ptr(&lazy_list));
- }
-+#endif
-
- /*
- * Synchronize against the irq_work @entry, ensures the entry is not
-diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
-index ee1bc1b..ddef079 100644
---- a/kernel/ksysfs.c
-+++ b/kernel/ksysfs.c
-@@ -136,6 +136,15 @@ KERNEL_ATTR_RO(vmcoreinfo);
-
- #endif /* CONFIG_KEXEC_CORE */
-
-+#if defined(CONFIG_PREEMPT_RT_FULL)
-+static ssize_t realtime_show(struct kobject *kobj,
-+ struct kobj_attribute *attr, char *buf)
-+{
-+ return sprintf(buf, "%d\n", 1);
-+}
-+KERNEL_ATTR_RO(realtime);
-+#endif
-+
- /* whether file capabilities are enabled */
- static ssize_t fscaps_show(struct kobject *kobj,
- struct kobj_attribute *attr, char *buf)
-@@ -225,6 +234,9 @@ static struct attribute * kernel_attrs[] = {
- &rcu_expedited_attr.attr,
- &rcu_normal_attr.attr,
- #endif
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ &realtime_attr.attr,
-+#endif
- NULL
- };
-
-diff --git a/kernel/locking/Makefile b/kernel/locking/Makefile
-index 31322a4..c6bba92 100644
---- a/kernel/locking/Makefile
-+++ b/kernel/locking/Makefile
-@@ -2,7 +2,7 @@
- # and is generally not a function of system call inputs.
- KCOV_INSTRUMENT := n
-
--obj-y += mutex.o semaphore.o rwsem.o percpu-rwsem.o
-+obj-y += semaphore.o percpu-rwsem.o
-
- ifdef CONFIG_FUNCTION_TRACER
- CFLAGS_REMOVE_lockdep.o = $(CC_FLAGS_FTRACE)
-@@ -11,7 +11,11 @@ CFLAGS_REMOVE_mutex-debug.o = $(CC_FLAGS_FTRACE)
- CFLAGS_REMOVE_rtmutex-debug.o = $(CC_FLAGS_FTRACE)
- endif
-
-+ifneq ($(CONFIG_PREEMPT_RT_FULL),y)
-+obj-y += mutex.o
- obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
-+obj-y += rwsem.o
-+endif
- obj-$(CONFIG_LOCKDEP) += lockdep.o
- ifeq ($(CONFIG_PROC_FS),y)
- obj-$(CONFIG_LOCKDEP) += lockdep_proc.o
-@@ -25,7 +29,10 @@ obj-$(CONFIG_RT_MUTEXES) += rtmutex.o
- obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o
- obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
- obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
-+ifneq ($(CONFIG_PREEMPT_RT_FULL),y)
- obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
- obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem-xadd.o
-+endif
-+obj-$(CONFIG_PREEMPT_RT_FULL) += rt.o
- obj-$(CONFIG_QUEUED_RWLOCKS) += qrwlock.o
- obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o
-diff --git a/kernel/locking/lglock.c b/kernel/locking/lglock.c
-index 951cfcd..57e0ea7 100644
---- a/kernel/locking/lglock.c
-+++ b/kernel/locking/lglock.c
-@@ -4,6 +4,15 @@
- #include <linux/cpu.h>
- #include <linux/string.h>
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+# define lg_lock_ptr arch_spinlock_t
-+# define lg_do_lock(l) arch_spin_lock(l)
-+# define lg_do_unlock(l) arch_spin_unlock(l)
-+#else
-+# define lg_lock_ptr struct rt_mutex
-+# define lg_do_lock(l) __rt_spin_lock__no_mg(l)
-+# define lg_do_unlock(l) __rt_spin_unlock(l)
-+#endif
- /*
- * Note there is no uninit, so lglocks cannot be defined in
- * modules (but it's fine to use them from there)
-@@ -12,51 +21,60 @@
-
- void lg_lock_init(struct lglock *lg, char *name)
- {
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ int i;
-+
-+ for_each_possible_cpu(i) {
-+ struct rt_mutex *lock = per_cpu_ptr(lg->lock, i);
-+
-+ rt_mutex_init(lock);
-+ }
-+#endif
- LOCKDEP_INIT_MAP(&lg->lock_dep_map, name, &lg->lock_key, 0);
- }
- EXPORT_SYMBOL(lg_lock_init);
-
- void lg_local_lock(struct lglock *lg)
- {
-- arch_spinlock_t *lock;
-+ lg_lock_ptr *lock;
-
-- preempt_disable();
-+ migrate_disable();
- lock_acquire_shared(&lg->lock_dep_map, 0, 0, NULL, _RET_IP_);
- lock = this_cpu_ptr(lg->lock);
-- arch_spin_lock(lock);
-+ lg_do_lock(lock);
- }
- EXPORT_SYMBOL(lg_local_lock);
-
- void lg_local_unlock(struct lglock *lg)
- {
-- arch_spinlock_t *lock;
-+ lg_lock_ptr *lock;
-
- lock_release(&lg->lock_dep_map, 1, _RET_IP_);
- lock = this_cpu_ptr(lg->lock);
-- arch_spin_unlock(lock);
-- preempt_enable();
-+ lg_do_unlock(lock);
-+ migrate_enable();
- }
- EXPORT_SYMBOL(lg_local_unlock);
-
- void lg_local_lock_cpu(struct lglock *lg, int cpu)
- {
-- arch_spinlock_t *lock;
-+ lg_lock_ptr *lock;
-
-- preempt_disable();
-+ preempt_disable_nort();
- lock_acquire_shared(&lg->lock_dep_map, 0, 0, NULL, _RET_IP_);
- lock = per_cpu_ptr(lg->lock, cpu);
-- arch_spin_lock(lock);
-+ lg_do_lock(lock);
- }
- EXPORT_SYMBOL(lg_local_lock_cpu);
-
- void lg_local_unlock_cpu(struct lglock *lg, int cpu)
- {
-- arch_spinlock_t *lock;
-+ lg_lock_ptr *lock;
-
- lock_release(&lg->lock_dep_map, 1, _RET_IP_);
- lock = per_cpu_ptr(lg->lock, cpu);
-- arch_spin_unlock(lock);
-- preempt_enable();
-+ lg_do_unlock(lock);
-+ preempt_enable_nort();
- }
- EXPORT_SYMBOL(lg_local_unlock_cpu);
-
-@@ -68,30 +86,30 @@ void lg_double_lock(struct lglock *lg, int cpu1, int cpu2)
- if (cpu2 < cpu1)
- swap(cpu1, cpu2);
-
-- preempt_disable();
-+ preempt_disable_nort();
- lock_acquire_shared(&lg->lock_dep_map, 0, 0, NULL, _RET_IP_);
-- arch_spin_lock(per_cpu_ptr(lg->lock, cpu1));
-- arch_spin_lock(per_cpu_ptr(lg->lock, cpu2));
-+ lg_do_lock(per_cpu_ptr(lg->lock, cpu1));
-+ lg_do_lock(per_cpu_ptr(lg->lock, cpu2));
- }
-
- void lg_double_unlock(struct lglock *lg, int cpu1, int cpu2)
- {
- lock_release(&lg->lock_dep_map, 1, _RET_IP_);
-- arch_spin_unlock(per_cpu_ptr(lg->lock, cpu1));
-- arch_spin_unlock(per_cpu_ptr(lg->lock, cpu2));
-- preempt_enable();
-+ lg_do_unlock(per_cpu_ptr(lg->lock, cpu1));
-+ lg_do_unlock(per_cpu_ptr(lg->lock, cpu2));
-+ preempt_enable_nort();
- }
-
- void lg_global_lock(struct lglock *lg)
- {
- int i;
-
-- preempt_disable();
-+ preempt_disable_nort();
- lock_acquire_exclusive(&lg->lock_dep_map, 0, 0, NULL, _RET_IP_);
- for_each_possible_cpu(i) {
-- arch_spinlock_t *lock;
-+ lg_lock_ptr *lock;
- lock = per_cpu_ptr(lg->lock, i);
-- arch_spin_lock(lock);
-+ lg_do_lock(lock);
- }
- }
- EXPORT_SYMBOL(lg_global_lock);
-@@ -102,10 +120,35 @@ void lg_global_unlock(struct lglock *lg)
-
- lock_release(&lg->lock_dep_map, 1, _RET_IP_);
- for_each_possible_cpu(i) {
-- arch_spinlock_t *lock;
-+ lg_lock_ptr *lock;
- lock = per_cpu_ptr(lg->lock, i);
-- arch_spin_unlock(lock);
-+ lg_do_unlock(lock);
- }
-- preempt_enable();
-+ preempt_enable_nort();
- }
- EXPORT_SYMBOL(lg_global_unlock);
-+
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+/*
-+ * HACK: If you use this, you get to keep the pieces.
-+ * Used in queue_stop_cpus_work() when stop machinery
-+ * is called from inactive CPU, so we can't schedule.
-+ */
-+# define lg_do_trylock_relax(l) \
-+ do { \
-+ while (!__rt_spin_trylock(l)) \
-+ cpu_relax(); \
-+ } while (0)
-+
-+void lg_global_trylock_relax(struct lglock *lg)
-+{
-+ int i;
-+
-+ lock_acquire_exclusive(&lg->lock_dep_map, 0, 0, NULL, _RET_IP_);
-+ for_each_possible_cpu(i) {
-+ lg_lock_ptr *lock;
-+ lock = per_cpu_ptr(lg->lock, i);
-+ lg_do_trylock_relax(lock);
-+ }
-+}
-+#endif
-diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 589d763..4b48c4b 100644
---- a/kernel/locking/lockdep.c
-+++ b/kernel/locking/lockdep.c
-@@ -3686,6 +3686,7 @@ static void check_flags(unsigned long flags)
- }
- }
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- /*
- * We dont accurately track softirq state in e.g.
- * hardirq contexts (such as on 4KSTACKS), so only
-@@ -3700,6 +3701,7 @@ static void check_flags(unsigned long flags)
- DEBUG_LOCKS_WARN_ON(!current->softirqs_enabled);
- }
- }
-+#endif
-
- if (!debug_locks)
- print_irqtrace_events(current);
-diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c
-index f8c5af5..78806877 100644
---- a/kernel/locking/locktorture.c
-+++ b/kernel/locking/locktorture.c
-@@ -26,7 +26,6 @@
- #include <linux/kthread.h>
- #include <linux/sched/rt.h>
- #include <linux/spinlock.h>
--#include <linux/rwlock.h>
- #include <linux/mutex.h>
- #include <linux/rwsem.h>
- #include <linux/smp.h>
-diff --git a/kernel/locking/rt.c b/kernel/locking/rt.c
-new file mode 100644
-index 0000000..665754c
---- /dev/null
-+++ b/kernel/locking/rt.c
-@@ -0,0 +1,498 @@
-+/*
-+ * kernel/rt.c
-+ *
-+ * Real-Time Preemption Support
-+ *
-+ * started by Ingo Molnar:
-+ *
-+ * Copyright (C) 2004-2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
-+ * Copyright (C) 2006, Timesys Corp., Thomas Gleixner <tglx@timesys.com>
-+ *
-+ * historic credit for proving that Linux spinlocks can be implemented via
-+ * RT-aware mutexes goes to many people: The Pmutex project (Dirk Grambow
-+ * and others) who prototyped it on 2.4 and did lots of comparative
-+ * research and analysis; TimeSys, for proving that you can implement a
-+ * fully preemptible kernel via the use of IRQ threading and mutexes;
-+ * Bill Huey for persuasively arguing on lkml that the mutex model is the
-+ * right one; and to MontaVista, who ported pmutexes to 2.6.
-+ *
-+ * This code is a from-scratch implementation and is not based on pmutexes,
-+ * but the idea of converting spinlocks to mutexes is used here too.
-+ *
-+ * lock debugging, locking tree, deadlock detection:
-+ *
-+ * Copyright (C) 2004, LynuxWorks, Inc., Igor Manyilov, Bill Huey
-+ * Released under the General Public License (GPL).
-+ *
-+ * Includes portions of the generic R/W semaphore implementation from:
-+ *
-+ * Copyright (c) 2001 David Howells (dhowells@redhat.com).
-+ * - Derived partially from idea by Andrea Arcangeli <andrea@suse.de>
-+ * - Derived also from comments by Linus
-+ *
-+ * Pending ownership of locks and ownership stealing:
-+ *
-+ * Copyright (C) 2005, Kihon Technologies Inc., Steven Rostedt
-+ *
-+ * (also by Steven Rostedt)
-+ * - Converted single pi_lock to individual task locks.
-+ *
-+ * By Esben Nielsen:
-+ * Doing priority inheritance with help of the scheduler.
-+ *
-+ * Copyright (C) 2006, Timesys Corp., Thomas Gleixner <tglx@timesys.com>
-+ * - major rework based on Esben Nielsens initial patch
-+ * - replaced thread_info references by task_struct refs
-+ * - removed task->pending_owner dependency
-+ * - BKL drop/reacquire for semaphore style locks to avoid deadlocks
-+ * in the scheduler return path as discussed with Steven Rostedt
-+ *
-+ * Copyright (C) 2006, Kihon Technologies Inc.
-+ * Steven Rostedt <rostedt@goodmis.org>
-+ * - debugged and patched Thomas Gleixner's rework.
-+ * - added back the cmpxchg to the rework.
-+ * - turned atomic require back on for SMP.
-+ */
-+
-+#include <linux/spinlock.h>
-+#include <linux/rtmutex.h>
-+#include <linux/sched.h>
-+#include <linux/delay.h>
-+#include <linux/module.h>
-+#include <linux/kallsyms.h>
-+#include <linux/syscalls.h>
-+#include <linux/interrupt.h>
-+#include <linux/plist.h>
-+#include <linux/fs.h>
-+#include <linux/futex.h>
-+#include <linux/hrtimer.h>
-+
-+#include "rtmutex_common.h"
-+
-+/*
-+ * struct mutex functions
-+ */
-+void __mutex_do_init(struct mutex *mutex, const char *name,
-+ struct lock_class_key *key)
-+{
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+ /*
-+ * Make sure we are not reinitializing a held lock:
-+ */
-+ debug_check_no_locks_freed((void *)mutex, sizeof(*mutex));
-+ lockdep_init_map(&mutex->dep_map, name, key, 0);
-+#endif
-+ mutex->lock.save_state = 0;
-+}
-+EXPORT_SYMBOL(__mutex_do_init);
-+
-+void __lockfunc _mutex_lock(struct mutex *lock)
-+{
-+ mutex_acquire(&lock->dep_map, 0, 0, _RET_IP_);
-+ rt_mutex_lock(&lock->lock);
-+}
-+EXPORT_SYMBOL(_mutex_lock);
-+
-+int __lockfunc _mutex_lock_interruptible(struct mutex *lock)
-+{
-+ int ret;
-+
-+ mutex_acquire(&lock->dep_map, 0, 0, _RET_IP_);
-+ ret = rt_mutex_lock_interruptible(&lock->lock);
-+ if (ret)
-+ mutex_release(&lock->dep_map, 1, _RET_IP_);
-+ return ret;
-+}
-+EXPORT_SYMBOL(_mutex_lock_interruptible);
-+
-+int __lockfunc _mutex_lock_killable(struct mutex *lock)
-+{
-+ int ret;
-+
-+ mutex_acquire(&lock->dep_map, 0, 0, _RET_IP_);
-+ ret = rt_mutex_lock_killable(&lock->lock);
-+ if (ret)
-+ mutex_release(&lock->dep_map, 1, _RET_IP_);
-+ return ret;
-+}
-+EXPORT_SYMBOL(_mutex_lock_killable);
-+
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+void __lockfunc _mutex_lock_nested(struct mutex *lock, int subclass)
-+{
-+ mutex_acquire_nest(&lock->dep_map, subclass, 0, NULL, _RET_IP_);
-+ rt_mutex_lock(&lock->lock);
-+}
-+EXPORT_SYMBOL(_mutex_lock_nested);
-+
-+void __lockfunc _mutex_lock_nest_lock(struct mutex *lock, struct lockdep_map *nest)
-+{
-+ mutex_acquire_nest(&lock->dep_map, 0, 0, nest, _RET_IP_);
-+ rt_mutex_lock(&lock->lock);
-+}
-+EXPORT_SYMBOL(_mutex_lock_nest_lock);
-+
-+int __lockfunc _mutex_lock_interruptible_nested(struct mutex *lock, int subclass)
-+{
-+ int ret;
-+
-+ mutex_acquire_nest(&lock->dep_map, subclass, 0, NULL, _RET_IP_);
-+ ret = rt_mutex_lock_interruptible(&lock->lock);
-+ if (ret)
-+ mutex_release(&lock->dep_map, 1, _RET_IP_);
-+ return ret;
-+}
-+EXPORT_SYMBOL(_mutex_lock_interruptible_nested);
-+
-+int __lockfunc _mutex_lock_killable_nested(struct mutex *lock, int subclass)
-+{
-+ int ret;
-+
-+ mutex_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
-+ ret = rt_mutex_lock_killable(&lock->lock);
-+ if (ret)
-+ mutex_release(&lock->dep_map, 1, _RET_IP_);
-+ return ret;
-+}
-+EXPORT_SYMBOL(_mutex_lock_killable_nested);
-+#endif
-+
-+int __lockfunc _mutex_trylock(struct mutex *lock)
-+{
-+ int ret = rt_mutex_trylock(&lock->lock);
-+
-+ if (ret)
-+ mutex_acquire(&lock->dep_map, 0, 1, _RET_IP_);
-+
-+ return ret;
-+}
-+EXPORT_SYMBOL(_mutex_trylock);
-+
-+void __lockfunc _mutex_unlock(struct mutex *lock)
-+{
-+ mutex_release(&lock->dep_map, 1, _RET_IP_);
-+ rt_mutex_unlock(&lock->lock);
-+}
-+EXPORT_SYMBOL(_mutex_unlock);
-+
-+/*
-+ * rwlock_t functions
-+ */
-+int __lockfunc rt_write_trylock(rwlock_t *rwlock)
-+{
-+ int ret;
-+
-+ migrate_disable();
-+ ret = rt_mutex_trylock(&rwlock->lock);
-+ if (ret)
-+ rwlock_acquire(&rwlock->dep_map, 0, 1, _RET_IP_);
-+ else
-+ migrate_enable();
-+
-+ return ret;
-+}
-+EXPORT_SYMBOL(rt_write_trylock);
-+
-+int __lockfunc rt_write_trylock_irqsave(rwlock_t *rwlock, unsigned long *flags)
-+{
-+ int ret;
-+
-+ *flags = 0;
-+ ret = rt_write_trylock(rwlock);
-+ return ret;
-+}
-+EXPORT_SYMBOL(rt_write_trylock_irqsave);
-+
-+int __lockfunc rt_read_trylock(rwlock_t *rwlock)
-+{
-+ struct rt_mutex *lock = &rwlock->lock;
-+ int ret = 1;
-+
-+ /*
-+ * recursive read locks succeed when current owns the lock,
-+ * but not when read_depth == 0 which means that the lock is
-+ * write locked.
-+ */
-+ if (rt_mutex_owner(lock) != current) {
-+ migrate_disable();
-+ ret = rt_mutex_trylock(lock);
-+ if (ret)
-+ rwlock_acquire(&rwlock->dep_map, 0, 1, _RET_IP_);
-+ else
-+ migrate_enable();
-+
-+ } else if (!rwlock->read_depth) {
-+ ret = 0;
-+ }
-+
-+ if (ret)
-+ rwlock->read_depth++;
-+
-+ return ret;
-+}
-+EXPORT_SYMBOL(rt_read_trylock);
-+
-+void __lockfunc rt_write_lock(rwlock_t *rwlock)
-+{
-+ rwlock_acquire(&rwlock->dep_map, 0, 0, _RET_IP_);
-+ __rt_spin_lock(&rwlock->lock);
-+}
-+EXPORT_SYMBOL(rt_write_lock);
-+
-+void __lockfunc rt_read_lock(rwlock_t *rwlock)
-+{
-+ struct rt_mutex *lock = &rwlock->lock;
-+
-+
-+ /*
-+ * recursive read locks succeed when current owns the lock
-+ */
-+ if (rt_mutex_owner(lock) != current) {
-+ rwlock_acquire(&rwlock->dep_map, 0, 0, _RET_IP_);
-+ __rt_spin_lock(lock);
-+ }
-+ rwlock->read_depth++;
-+}
-+
-+EXPORT_SYMBOL(rt_read_lock);
-+
-+void __lockfunc rt_write_unlock(rwlock_t *rwlock)
-+{
-+ /* NOTE: we always pass in '1' for nested, for simplicity */
-+ rwlock_release(&rwlock->dep_map, 1, _RET_IP_);
-+ __rt_spin_unlock(&rwlock->lock);
-+ migrate_enable();
-+}
-+EXPORT_SYMBOL(rt_write_unlock);
-+
-+void __lockfunc rt_read_unlock(rwlock_t *rwlock)
-+{
-+ /* Release the lock only when read_depth is down to 0 */
-+ if (--rwlock->read_depth == 0) {
-+ rwlock_release(&rwlock->dep_map, 1, _RET_IP_);
-+ __rt_spin_unlock(&rwlock->lock);
-+ migrate_enable();
-+ }
-+}
-+EXPORT_SYMBOL(rt_read_unlock);
-+
-+unsigned long __lockfunc rt_write_lock_irqsave(rwlock_t *rwlock)
-+{
-+ rt_write_lock(rwlock);
-+
-+ return 0;
-+}
-+EXPORT_SYMBOL(rt_write_lock_irqsave);
-+
-+unsigned long __lockfunc rt_read_lock_irqsave(rwlock_t *rwlock)
-+{
-+ rt_read_lock(rwlock);
-+
-+ return 0;
-+}
-+EXPORT_SYMBOL(rt_read_lock_irqsave);
-+
-+void __rt_rwlock_init(rwlock_t *rwlock, char *name, struct lock_class_key *key)
-+{
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+ /*
-+ * Make sure we are not reinitializing a held lock:
-+ */
-+ debug_check_no_locks_freed((void *)rwlock, sizeof(*rwlock));
-+ lockdep_init_map(&rwlock->dep_map, name, key, 0);
-+#endif
-+ rwlock->lock.save_state = 1;
-+ rwlock->read_depth = 0;
-+}
-+EXPORT_SYMBOL(__rt_rwlock_init);
-+
-+/*
-+ * rw_semaphores
-+ */
-+
-+void rt_up_write(struct rw_semaphore *rwsem)
-+{
-+ rwsem_release(&rwsem->dep_map, 1, _RET_IP_);
-+ rt_mutex_unlock(&rwsem->lock);
-+}
-+EXPORT_SYMBOL(rt_up_write);
-+
-+void __rt_up_read(struct rw_semaphore *rwsem)
-+{
-+ if (--rwsem->read_depth == 0)
-+ rt_mutex_unlock(&rwsem->lock);
-+}
-+
-+void rt_up_read(struct rw_semaphore *rwsem)
-+{
-+ rwsem_release(&rwsem->dep_map, 1, _RET_IP_);
-+ __rt_up_read(rwsem);
-+}
-+EXPORT_SYMBOL(rt_up_read);
-+
-+/*
-+ * downgrade a write lock into a read lock
-+ * - just wake up any readers at the front of the queue
-+ */
-+void rt_downgrade_write(struct rw_semaphore *rwsem)
-+{
-+ BUG_ON(rt_mutex_owner(&rwsem->lock) != current);
-+ rwsem->read_depth = 1;
-+}
-+EXPORT_SYMBOL(rt_downgrade_write);
-+
-+int rt_down_write_trylock(struct rw_semaphore *rwsem)
-+{
-+ int ret = rt_mutex_trylock(&rwsem->lock);
-+
-+ if (ret)
-+ rwsem_acquire(&rwsem->dep_map, 0, 1, _RET_IP_);
-+ return ret;
-+}
-+EXPORT_SYMBOL(rt_down_write_trylock);
-+
-+void rt_down_write(struct rw_semaphore *rwsem)
-+{
-+ rwsem_acquire(&rwsem->dep_map, 0, 0, _RET_IP_);
-+ rt_mutex_lock(&rwsem->lock);
-+}
-+EXPORT_SYMBOL(rt_down_write);
-+
-+int rt_down_write_killable(struct rw_semaphore *rwsem)
-+{
-+ int ret;
-+
-+ rwsem_acquire(&rwsem->dep_map, 0, 0, _RET_IP_);
-+ ret = rt_mutex_lock_killable(&rwsem->lock);
-+ if (ret)
-+ rwsem_release(&rwsem->dep_map, 1, _RET_IP_);
-+ return ret;
-+}
-+EXPORT_SYMBOL(rt_down_write_killable);
-+
-+int rt_down_write_killable_nested(struct rw_semaphore *rwsem, int subclass)
-+{
-+ int ret;
-+
-+ rwsem_acquire(&rwsem->dep_map, subclass, 0, _RET_IP_);
-+ ret = rt_mutex_lock_killable(&rwsem->lock);
-+ if (ret)
-+ rwsem_release(&rwsem->dep_map, 1, _RET_IP_);
-+ return ret;
-+}
-+EXPORT_SYMBOL(rt_down_write_killable_nested);
-+
-+void rt_down_write_nested(struct rw_semaphore *rwsem, int subclass)
-+{
-+ rwsem_acquire(&rwsem->dep_map, subclass, 0, _RET_IP_);
-+ rt_mutex_lock(&rwsem->lock);
-+}
-+EXPORT_SYMBOL(rt_down_write_nested);
-+
-+void rt_down_write_nested_lock(struct rw_semaphore *rwsem,
-+ struct lockdep_map *nest)
-+{
-+ rwsem_acquire_nest(&rwsem->dep_map, 0, 0, nest, _RET_IP_);
-+ rt_mutex_lock(&rwsem->lock);
-+}
-+EXPORT_SYMBOL(rt_down_write_nested_lock);
-+
-+int rt__down_read_trylock(struct rw_semaphore *rwsem)
-+{
-+ struct rt_mutex *lock = &rwsem->lock;
-+ int ret = 1;
-+
-+ /*
-+ * recursive read locks succeed when current owns the rwsem,
-+ * but not when read_depth == 0 which means that the rwsem is
-+ * write locked.
-+ */
-+ if (rt_mutex_owner(lock) != current)
-+ ret = rt_mutex_trylock(&rwsem->lock);
-+ else if (!rwsem->read_depth)
-+ ret = 0;
-+
-+ if (ret)
-+ rwsem->read_depth++;
-+ return ret;
-+
-+}
-+
-+int rt_down_read_trylock(struct rw_semaphore *rwsem)
-+{
-+ int ret;
-+
-+ ret = rt__down_read_trylock(rwsem);
-+ if (ret)
-+ rwsem_acquire(&rwsem->dep_map, 0, 1, _RET_IP_);
-+
-+ return ret;
-+}
-+EXPORT_SYMBOL(rt_down_read_trylock);
-+
-+void rt__down_read(struct rw_semaphore *rwsem)
-+{
-+ struct rt_mutex *lock = &rwsem->lock;
-+
-+ if (rt_mutex_owner(lock) != current)
-+ rt_mutex_lock(&rwsem->lock);
-+ rwsem->read_depth++;
-+}
-+EXPORT_SYMBOL(rt__down_read);
-+
-+static void __rt_down_read(struct rw_semaphore *rwsem, int subclass)
-+{
-+ rwsem_acquire_read(&rwsem->dep_map, subclass, 0, _RET_IP_);
-+ rt__down_read(rwsem);
-+}
-+
-+void rt_down_read(struct rw_semaphore *rwsem)
-+{
-+ __rt_down_read(rwsem, 0);
-+}
-+EXPORT_SYMBOL(rt_down_read);
-+
-+void rt_down_read_nested(struct rw_semaphore *rwsem, int subclass)
-+{
-+ __rt_down_read(rwsem, subclass);
-+}
-+EXPORT_SYMBOL(rt_down_read_nested);
-+
-+void __rt_rwsem_init(struct rw_semaphore *rwsem, const char *name,
-+ struct lock_class_key *key)
-+{
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+ /*
-+ * Make sure we are not reinitializing a held lock:
-+ */
-+ debug_check_no_locks_freed((void *)rwsem, sizeof(*rwsem));
-+ lockdep_init_map(&rwsem->dep_map, name, key, 0);
-+#endif
-+ rwsem->read_depth = 0;
-+ rwsem->lock.save_state = 0;
-+}
-+EXPORT_SYMBOL(__rt_rwsem_init);
-+
-+/**
-+ * atomic_dec_and_mutex_lock - return holding mutex if we dec to 0
-+ * @cnt: the atomic which we are to dec
-+ * @lock: the mutex to return holding if we dec to 0
-+ *
-+ * return true and hold lock if we dec to 0, return false otherwise
-+ */
-+int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock)
-+{
-+ /* dec if we can't possibly hit 0 */
-+ if (atomic_add_unless(cnt, -1, 1))
-+ return 0;
-+ /* we might hit 0, so take the lock */
-+ mutex_lock(lock);
-+ if (!atomic_dec_and_test(cnt)) {
-+ /* when we actually did the dec, we didn't hit 0 */
-+ mutex_unlock(lock);
-+ return 0;
-+ }
-+ /* we hit 0, and we hold the lock */
-+ return 1;
-+}
-+EXPORT_SYMBOL(atomic_dec_and_mutex_lock);
-diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
-index 1ec0f48..2576f7c 100644
---- a/kernel/locking/rtmutex.c
-+++ b/kernel/locking/rtmutex.c
-@@ -7,6 +7,11 @@
- * Copyright (C) 2005-2006 Timesys Corp., Thomas Gleixner <tglx@timesys.com>
- * Copyright (C) 2005 Kihon Technologies Inc., Steven Rostedt
- * Copyright (C) 2006 Esben Nielsen
-+ * Adaptive Spinlocks:
-+ * Copyright (C) 2008 Novell, Inc., Gregory Haskins, Sven Dietrich,
-+ * and Peter Morreale,
-+ * Adaptive Spinlocks simplification:
-+ * Copyright (C) 2008 Red Hat, Inc., Steven Rostedt <srostedt@redhat.com>
- *
- * See Documentation/locking/rt-mutex-design.txt for details.
- */
-@@ -16,6 +21,7 @@
- #include <linux/sched/rt.h>
- #include <linux/sched/deadline.h>
- #include <linux/timer.h>
-+#include <linux/ww_mutex.h>
-
- #include "rtmutex_common.h"
-
-@@ -69,6 +75,12 @@ static void fixup_rt_mutex_waiters(struct rt_mutex *lock)
- clear_rt_mutex_waiters(lock);
- }
-
-+static int rt_mutex_real_waiter(struct rt_mutex_waiter *waiter)
-+{
-+ return waiter && waiter != PI_WAKEUP_INPROGRESS &&
-+ waiter != PI_REQUEUE_INPROGRESS;
-+}
-+
- /*
- * We can speed up the acquire/release, if there's no debugging state to be
- * set up.
-@@ -350,6 +362,14 @@ static bool rt_mutex_cond_detect_deadlock(struct rt_mutex_waiter *waiter,
- return debug_rt_mutex_detect_deadlock(waiter, chwalk);
- }
-
-+static void rt_mutex_wake_waiter(struct rt_mutex_waiter *waiter)
-+{
-+ if (waiter->savestate)
-+ wake_up_lock_sleeper(waiter->task);
-+ else
-+ wake_up_process(waiter->task);
-+}
-+
- /*
- * Max number of times we'll walk the boosting chain:
- */
-@@ -357,7 +377,8 @@ int max_lock_depth = 1024;
-
- static inline struct rt_mutex *task_blocked_on_lock(struct task_struct *p)
- {
-- return p->pi_blocked_on ? p->pi_blocked_on->lock : NULL;
-+ return rt_mutex_real_waiter(p->pi_blocked_on) ?
-+ p->pi_blocked_on->lock : NULL;
- }
-
- /*
-@@ -493,7 +514,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
- * reached or the state of the chain has changed while we
- * dropped the locks.
- */
-- if (!waiter)
-+ if (!rt_mutex_real_waiter(waiter))
- goto out_unlock_pi;
-
- /*
-@@ -655,13 +676,16 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
- * follow here. This is the end of the chain we are walking.
- */
- if (!rt_mutex_owner(lock)) {
-+ struct rt_mutex_waiter *lock_top_waiter;
-+
- /*
- * If the requeue [7] above changed the top waiter,
- * then we need to wake the new top waiter up to try
- * to get the lock.
- */
-- if (prerequeue_top_waiter != rt_mutex_top_waiter(lock))
-- wake_up_process(rt_mutex_top_waiter(lock)->task);
-+ lock_top_waiter = rt_mutex_top_waiter(lock);
-+ if (prerequeue_top_waiter != lock_top_waiter)
-+ rt_mutex_wake_waiter(lock_top_waiter);
- raw_spin_unlock_irq(&lock->wait_lock);
- return 0;
- }
-@@ -754,6 +778,25 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
- return ret;
- }
-
-+
-+#define STEAL_NORMAL 0
-+#define STEAL_LATERAL 1
-+
-+/*
-+ * Note that RT tasks are excluded from lateral-steals to prevent the
-+ * introduction of an unbounded latency
-+ */
-+static inline int lock_is_stealable(struct task_struct *task,
-+ struct task_struct *pendowner, int mode)
-+{
-+ if (mode == STEAL_NORMAL || rt_task(task)) {
-+ if (task->prio >= pendowner->prio)
-+ return 0;
-+ } else if (task->prio > pendowner->prio)
-+ return 0;
-+ return 1;
-+}
-+
- /*
- * Try to take an rt-mutex
- *
-@@ -764,8 +807,9 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
- * @waiter: The waiter that is queued to the lock's wait tree if the
- * callsite called task_blocked_on_lock(), otherwise NULL
- */
--static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
-- struct rt_mutex_waiter *waiter)
-+static int __try_to_take_rt_mutex(struct rt_mutex *lock,
-+ struct task_struct *task,
-+ struct rt_mutex_waiter *waiter, int mode)
- {
- /*
- * Before testing whether we can acquire @lock, we set the
-@@ -802,8 +846,10 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
- * If waiter is not the highest priority waiter of
- * @lock, give up.
- */
-- if (waiter != rt_mutex_top_waiter(lock))
-+ if (waiter != rt_mutex_top_waiter(lock)) {
-+ /* XXX lock_is_stealable() ? */
- return 0;
-+ }
-
- /*
- * We can acquire the lock. Remove the waiter from the
-@@ -821,14 +867,10 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
- * not need to be dequeued.
- */
- if (rt_mutex_has_waiters(lock)) {
-- /*
-- * If @task->prio is greater than or equal to
-- * the top waiter priority (kernel view),
-- * @task lost.
-- */
-- if (task->prio >= rt_mutex_top_waiter(lock)->prio)
-- return 0;
-+ struct task_struct *pown = rt_mutex_top_waiter(lock)->task;
-
-+ if (task != pown && !lock_is_stealable(task, pown, mode))
-+ return 0;
- /*
- * The current top waiter stays enqueued. We
- * don't have to change anything in the lock
-@@ -877,6 +919,438 @@ takeit:
- return 1;
- }
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+/*
-+ * preemptible spin_lock functions:
-+ */
-+static inline void rt_spin_lock_fastlock(struct rt_mutex *lock,
-+ void (*slowfn)(struct rt_mutex *lock,
-+ bool mg_off),
-+ bool do_mig_dis)
-+{
-+ might_sleep_no_state_check();
-+
-+ if (do_mig_dis)
-+ migrate_disable();
-+
-+ if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current)))
-+ rt_mutex_deadlock_account_lock(lock, current);
-+ else
-+ slowfn(lock, do_mig_dis);
-+}
-+
-+static inline int rt_spin_lock_fastunlock(struct rt_mutex *lock,
-+ int (*slowfn)(struct rt_mutex *lock))
-+{
-+ if (likely(rt_mutex_cmpxchg_release(lock, current, NULL))) {
-+ rt_mutex_deadlock_account_unlock(current);
-+ return 0;
-+ }
-+ return slowfn(lock);
-+}
-+#ifdef CONFIG_SMP
-+/*
-+ * Note that owner is a speculative pointer and dereferencing relies
-+ * on rcu_read_lock() and the check against the lock owner.
-+ */
-+static int adaptive_wait(struct rt_mutex *lock,
-+ struct task_struct *owner)
-+{
-+ int res = 0;
-+
-+ rcu_read_lock();
-+ for (;;) {
-+ if (owner != rt_mutex_owner(lock))
-+ break;
-+ /*
-+ * Ensure that owner->on_cpu is dereferenced _after_
-+ * checking the above to be valid.
-+ */
-+ barrier();
-+ if (!owner->on_cpu) {
-+ res = 1;
-+ break;
-+ }
-+ cpu_relax();
-+ }
-+ rcu_read_unlock();
-+ return res;
-+}
-+#else
-+static int adaptive_wait(struct rt_mutex *lock,
-+ struct task_struct *orig_owner)
-+{
-+ return 1;
-+}
-+#endif
-+
-+static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
-+ struct rt_mutex_waiter *waiter,
-+ struct task_struct *task,
-+ enum rtmutex_chainwalk chwalk);
-+/*
-+ * Slow path lock function spin_lock style: this variant is very
-+ * careful not to miss any non-lock wakeups.
-+ *
-+ * We store the current state under p->pi_lock in p->saved_state and
-+ * the try_to_wake_up() code handles this accordingly.
-+ */
-+static void noinline __sched rt_spin_lock_slowlock(struct rt_mutex *lock,
-+ bool mg_off)
-+{
-+ struct task_struct *lock_owner, *self = current;
-+ struct rt_mutex_waiter waiter, *top_waiter;
-+ unsigned long flags;
-+ int ret;
-+
-+ rt_mutex_init_waiter(&waiter, true);
-+
-+ raw_spin_lock_irqsave(&lock->wait_lock, flags);
-+
-+ if (__try_to_take_rt_mutex(lock, self, NULL, STEAL_LATERAL)) {
-+ raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
-+ return;
-+ }
-+
-+ BUG_ON(rt_mutex_owner(lock) == self);
-+
-+ /*
-+ * We save whatever state the task is in and we'll restore it
-+ * after acquiring the lock taking real wakeups into account
-+ * as well. We are serialized via pi_lock against wakeups. See
-+ * try_to_wake_up().
-+ */
-+ raw_spin_lock(&self->pi_lock);
-+ self->saved_state = self->state;
-+ __set_current_state_no_track(TASK_UNINTERRUPTIBLE);
-+ raw_spin_unlock(&self->pi_lock);
-+
-+ ret = task_blocks_on_rt_mutex(lock, &waiter, self, RT_MUTEX_MIN_CHAINWALK);
-+ BUG_ON(ret);
-+
-+ for (;;) {
-+ /* Try to acquire the lock again. */
-+ if (__try_to_take_rt_mutex(lock, self, &waiter, STEAL_LATERAL))
-+ break;
-+
-+ top_waiter = rt_mutex_top_waiter(lock);
-+ lock_owner = rt_mutex_owner(lock);
-+
-+ raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
-+
-+ debug_rt_mutex_print_deadlock(&waiter);
-+
-+ if (top_waiter != &waiter || adaptive_wait(lock, lock_owner)) {
-+ if (mg_off)
-+ migrate_enable();
-+ schedule();
-+ if (mg_off)
-+ migrate_disable();
-+ }
-+
-+ raw_spin_lock_irqsave(&lock->wait_lock, flags);
-+
-+ raw_spin_lock(&self->pi_lock);
-+ __set_current_state_no_track(TASK_UNINTERRUPTIBLE);
-+ raw_spin_unlock(&self->pi_lock);
-+ }
-+
-+ /*
-+ * Restore the task state to current->saved_state. We set it
-+ * to the original state above and the try_to_wake_up() code
-+ * has possibly updated it when a real (non-rtmutex) wakeup
-+ * happened while we were blocked. Clear saved_state so
-+ * try_to_wakeup() does not get confused.
-+ */
-+ raw_spin_lock(&self->pi_lock);
-+ __set_current_state_no_track(self->saved_state);
-+ self->saved_state = TASK_RUNNING;
-+ raw_spin_unlock(&self->pi_lock);
-+
-+ /*
-+ * try_to_take_rt_mutex() sets the waiter bit
-+ * unconditionally. We might have to fix that up:
-+ */
-+ fixup_rt_mutex_waiters(lock);
-+
-+ BUG_ON(rt_mutex_has_waiters(lock) && &waiter == rt_mutex_top_waiter(lock));
-+ BUG_ON(!RB_EMPTY_NODE(&waiter.tree_entry));
-+
-+ raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
-+
-+ debug_rt_mutex_free_waiter(&waiter);
-+}
-+
-+static void mark_wakeup_next_waiter(struct wake_q_head *wake_q,
-+ struct wake_q_head *wake_sleeper_q,
-+ struct rt_mutex *lock);
-+/*
-+ * Slow path to release a rt_mutex spin_lock style
-+ */
-+static int noinline __sched rt_spin_lock_slowunlock(struct rt_mutex *lock)
-+{
-+ unsigned long flags;
-+ WAKE_Q(wake_q);
-+ WAKE_Q(wake_sleeper_q);
-+
-+ raw_spin_lock_irqsave(&lock->wait_lock, flags);
-+
-+ debug_rt_mutex_unlock(lock);
-+
-+ rt_mutex_deadlock_account_unlock(current);
-+
-+ if (!rt_mutex_has_waiters(lock)) {
-+ lock->owner = NULL;
-+ raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
-+ return 0;
-+ }
-+
-+ mark_wakeup_next_waiter(&wake_q, &wake_sleeper_q, lock);
-+
-+ raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
-+ wake_up_q(&wake_q);
-+ wake_up_q_sleeper(&wake_sleeper_q);
-+
-+ /* Undo pi boosting.when necessary */
-+ rt_mutex_adjust_prio(current);
-+ return 0;
-+}
-+
-+static int noinline __sched rt_spin_lock_slowunlock_no_deboost(struct rt_mutex *lock)
-+{
-+ unsigned long flags;
-+ WAKE_Q(wake_q);
-+ WAKE_Q(wake_sleeper_q);
-+
-+ raw_spin_lock_irqsave(&lock->wait_lock, flags);
-+
-+ debug_rt_mutex_unlock(lock);
-+
-+ rt_mutex_deadlock_account_unlock(current);
-+
-+ if (!rt_mutex_has_waiters(lock)) {
-+ lock->owner = NULL;
-+ raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
-+ return 0;
-+ }
-+
-+ mark_wakeup_next_waiter(&wake_q, &wake_sleeper_q, lock);
-+
-+ raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
-+ wake_up_q(&wake_q);
-+ wake_up_q_sleeper(&wake_sleeper_q);
-+ return 1;
-+}
-+
-+void __lockfunc rt_spin_lock__no_mg(spinlock_t *lock)
-+{
-+ rt_spin_lock_fastlock(&lock->lock, rt_spin_lock_slowlock, false);
-+ spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
-+}
-+EXPORT_SYMBOL(rt_spin_lock__no_mg);
-+
-+void __lockfunc rt_spin_lock(spinlock_t *lock)
-+{
-+ rt_spin_lock_fastlock(&lock->lock, rt_spin_lock_slowlock, true);
-+ spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
-+}
-+EXPORT_SYMBOL(rt_spin_lock);
-+
-+void __lockfunc __rt_spin_lock(struct rt_mutex *lock)
-+{
-+ rt_spin_lock_fastlock(lock, rt_spin_lock_slowlock, true);
-+}
-+EXPORT_SYMBOL(__rt_spin_lock);
-+
-+void __lockfunc __rt_spin_lock__no_mg(struct rt_mutex *lock)
-+{
-+ rt_spin_lock_fastlock(lock, rt_spin_lock_slowlock, false);
-+}
-+EXPORT_SYMBOL(__rt_spin_lock__no_mg);
-+
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+void __lockfunc rt_spin_lock_nested(spinlock_t *lock, int subclass)
-+{
-+ spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
-+ rt_spin_lock_fastlock(&lock->lock, rt_spin_lock_slowlock, true);
-+}
-+EXPORT_SYMBOL(rt_spin_lock_nested);
-+#endif
-+
-+void __lockfunc rt_spin_unlock__no_mg(spinlock_t *lock)
-+{
-+ /* NOTE: we always pass in '1' for nested, for simplicity */
-+ spin_release(&lock->dep_map, 1, _RET_IP_);
-+ rt_spin_lock_fastunlock(&lock->lock, rt_spin_lock_slowunlock);
-+}
-+EXPORT_SYMBOL(rt_spin_unlock__no_mg);
-+
-+void __lockfunc rt_spin_unlock(spinlock_t *lock)
-+{
-+ /* NOTE: we always pass in '1' for nested, for simplicity */
-+ spin_release(&lock->dep_map, 1, _RET_IP_);
-+ rt_spin_lock_fastunlock(&lock->lock, rt_spin_lock_slowunlock);
-+ migrate_enable();
-+}
-+EXPORT_SYMBOL(rt_spin_unlock);
-+
-+int __lockfunc rt_spin_unlock_no_deboost(spinlock_t *lock)
-+{
-+ int ret;
-+
-+ /* NOTE: we always pass in '1' for nested, for simplicity */
-+ spin_release(&lock->dep_map, 1, _RET_IP_);
-+ ret = rt_spin_lock_fastunlock(&lock->lock, rt_spin_lock_slowunlock_no_deboost);
-+ migrate_enable();
-+ return ret;
-+}
-+
-+void __lockfunc __rt_spin_unlock(struct rt_mutex *lock)
-+{
-+ rt_spin_lock_fastunlock(lock, rt_spin_lock_slowunlock);
-+}
-+EXPORT_SYMBOL(__rt_spin_unlock);
-+
-+/*
-+ * Wait for the lock to get unlocked: instead of polling for an unlock
-+ * (like raw spinlocks do), we lock and unlock, to force the kernel to
-+ * schedule if there's contention:
-+ */
-+void __lockfunc rt_spin_unlock_wait(spinlock_t *lock)
-+{
-+ spin_lock(lock);
-+ spin_unlock(lock);
-+}
-+EXPORT_SYMBOL(rt_spin_unlock_wait);
-+
-+int __lockfunc __rt_spin_trylock(struct rt_mutex *lock)
-+{
-+ return rt_mutex_trylock(lock);
-+}
-+
-+int __lockfunc rt_spin_trylock__no_mg(spinlock_t *lock)
-+{
-+ int ret;
-+
-+ ret = rt_mutex_trylock(&lock->lock);
-+ if (ret)
-+ spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
-+ return ret;
-+}
-+EXPORT_SYMBOL(rt_spin_trylock__no_mg);
-+
-+int __lockfunc rt_spin_trylock(spinlock_t *lock)
-+{
-+ int ret;
-+
-+ migrate_disable();
-+ ret = rt_mutex_trylock(&lock->lock);
-+ if (ret)
-+ spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
-+ else
-+ migrate_enable();
-+ return ret;
-+}
-+EXPORT_SYMBOL(rt_spin_trylock);
-+
-+int __lockfunc rt_spin_trylock_bh(spinlock_t *lock)
-+{
-+ int ret;
-+
-+ local_bh_disable();
-+ ret = rt_mutex_trylock(&lock->lock);
-+ if (ret) {
-+ migrate_disable();
-+ spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
-+ } else
-+ local_bh_enable();
-+ return ret;
-+}
-+EXPORT_SYMBOL(rt_spin_trylock_bh);
-+
-+int __lockfunc rt_spin_trylock_irqsave(spinlock_t *lock, unsigned long *flags)
-+{
-+ int ret;
-+
-+ *flags = 0;
-+ ret = rt_mutex_trylock(&lock->lock);
-+ if (ret) {
-+ migrate_disable();
-+ spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
-+ }
-+ return ret;
-+}
-+EXPORT_SYMBOL(rt_spin_trylock_irqsave);
-+
-+int atomic_dec_and_spin_lock(atomic_t *atomic, spinlock_t *lock)
-+{
-+ /* Subtract 1 from counter unless that drops it to 0 (ie. it was 1) */
-+ if (atomic_add_unless(atomic, -1, 1))
-+ return 0;
-+ rt_spin_lock(lock);
-+ if (atomic_dec_and_test(atomic))
-+ return 1;
-+ rt_spin_unlock(lock);
-+ return 0;
-+}
-+EXPORT_SYMBOL(atomic_dec_and_spin_lock);
-+
-+ void
-+__rt_spin_lock_init(spinlock_t *lock, char *name, struct lock_class_key *key)
-+{
-+#ifdef CONFIG_DEBUG_LOCK_ALLOC
-+ /*
-+ * Make sure we are not reinitializing a held lock:
-+ */
-+ debug_check_no_locks_freed((void *)lock, sizeof(*lock));
-+ lockdep_init_map(&lock->dep_map, name, key, 0);
-+#endif
-+}
-+EXPORT_SYMBOL(__rt_spin_lock_init);
-+
-+#endif /* PREEMPT_RT_FULL */
-+
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ static inline int __sched
-+__mutex_lock_check_stamp(struct rt_mutex *lock, struct ww_acquire_ctx *ctx)
-+{
-+ struct ww_mutex *ww = container_of(lock, struct ww_mutex, base.lock);
-+ struct ww_acquire_ctx *hold_ctx = ACCESS_ONCE(ww->ctx);
-+
-+ if (!hold_ctx)
-+ return 0;
-+
-+ if (unlikely(ctx == hold_ctx))
-+ return -EALREADY;
-+
-+ if (ctx->stamp - hold_ctx->stamp <= LONG_MAX &&
-+ (ctx->stamp != hold_ctx->stamp || ctx > hold_ctx)) {
-+#ifdef CONFIG_DEBUG_MUTEXES
-+ DEBUG_LOCKS_WARN_ON(ctx->contending_lock);
-+ ctx->contending_lock = ww;
-+#endif
-+ return -EDEADLK;
-+ }
-+
-+ return 0;
-+}
-+#else
-+ static inline int __sched
-+__mutex_lock_check_stamp(struct rt_mutex *lock, struct ww_acquire_ctx *ctx)
-+{
-+ BUG();
-+ return 0;
-+}
-+
-+#endif
-+
-+static inline int
-+try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
-+ struct rt_mutex_waiter *waiter)
-+{
-+ return __try_to_take_rt_mutex(lock, task, waiter, STEAL_NORMAL);
-+}
-+
- /*
- * Task blocks on lock.
- *
-@@ -907,6 +1381,23 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
- return -EDEADLK;
-
- raw_spin_lock(&task->pi_lock);
-+
-+ /*
-+ * In the case of futex requeue PI, this will be a proxy
-+ * lock. The task will wake unaware that it is enqueueed on
-+ * this lock. Avoid blocking on two locks and corrupting
-+ * pi_blocked_on via the PI_WAKEUP_INPROGRESS
-+ * flag. futex_wait_requeue_pi() sets this when it wakes up
-+ * before requeue (due to a signal or timeout). Do not enqueue
-+ * the task if PI_WAKEUP_INPROGRESS is set.
-+ */
-+ if (task != current && task->pi_blocked_on == PI_WAKEUP_INPROGRESS) {
-+ raw_spin_unlock(&task->pi_lock);
-+ return -EAGAIN;
-+ }
-+
-+ BUG_ON(rt_mutex_real_waiter(task->pi_blocked_on));
-+
- __rt_mutex_adjust_prio(task);
- waiter->task = task;
- waiter->lock = lock;
-@@ -930,7 +1421,7 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
- rt_mutex_enqueue_pi(owner, waiter);
-
- __rt_mutex_adjust_prio(owner);
-- if (owner->pi_blocked_on)
-+ if (rt_mutex_real_waiter(owner->pi_blocked_on))
- chain_walk = 1;
- } else if (rt_mutex_cond_detect_deadlock(waiter, chwalk)) {
- chain_walk = 1;
-@@ -972,6 +1463,7 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
- * Called with lock->wait_lock held and interrupts disabled.
- */
- static void mark_wakeup_next_waiter(struct wake_q_head *wake_q,
-+ struct wake_q_head *wake_sleeper_q,
- struct rt_mutex *lock)
- {
- struct rt_mutex_waiter *waiter;
-@@ -1000,7 +1492,10 @@ static void mark_wakeup_next_waiter(struct wake_q_head *wake_q,
-
- raw_spin_unlock(¤t->pi_lock);
-
-- wake_q_add(wake_q, waiter->task);
-+ if (waiter->savestate)
-+ wake_q_add(wake_sleeper_q, waiter->task);
-+ else
-+ wake_q_add(wake_q, waiter->task);
- }
-
- /*
-@@ -1014,7 +1509,7 @@ static void remove_waiter(struct rt_mutex *lock,
- {
- bool is_top_waiter = (waiter == rt_mutex_top_waiter(lock));
- struct task_struct *owner = rt_mutex_owner(lock);
-- struct rt_mutex *next_lock;
-+ struct rt_mutex *next_lock = NULL;
-
- raw_spin_lock(¤t->pi_lock);
- rt_mutex_dequeue(lock, waiter);
-@@ -1038,7 +1533,8 @@ static void remove_waiter(struct rt_mutex *lock,
- __rt_mutex_adjust_prio(owner);
-
- /* Store the lock on which owner is blocked or NULL */
-- next_lock = task_blocked_on_lock(owner);
-+ if (rt_mutex_real_waiter(owner->pi_blocked_on))
-+ next_lock = task_blocked_on_lock(owner);
-
- raw_spin_unlock(&owner->pi_lock);
-
-@@ -1074,17 +1570,17 @@ void rt_mutex_adjust_pi(struct task_struct *task)
- raw_spin_lock_irqsave(&task->pi_lock, flags);
-
- waiter = task->pi_blocked_on;
-- if (!waiter || (waiter->prio == task->prio &&
-+ if (!rt_mutex_real_waiter(waiter) || (waiter->prio == task->prio &&
- !dl_prio(task->prio))) {
- raw_spin_unlock_irqrestore(&task->pi_lock, flags);
- return;
- }
- next_lock = waiter->lock;
-- raw_spin_unlock_irqrestore(&task->pi_lock, flags);
-
- /* gets dropped in rt_mutex_adjust_prio_chain()! */
- get_task_struct(task);
-
-+ raw_spin_unlock_irqrestore(&task->pi_lock, flags);
- rt_mutex_adjust_prio_chain(task, RT_MUTEX_MIN_CHAINWALK, NULL,
- next_lock, NULL, task);
- }
-@@ -1102,7 +1598,8 @@ void rt_mutex_adjust_pi(struct task_struct *task)
- static int __sched
- __rt_mutex_slowlock(struct rt_mutex *lock, int state,
- struct hrtimer_sleeper *timeout,
-- struct rt_mutex_waiter *waiter)
-+ struct rt_mutex_waiter *waiter,
-+ struct ww_acquire_ctx *ww_ctx)
- {
- int ret = 0;
-
-@@ -1125,6 +1622,12 @@ __rt_mutex_slowlock(struct rt_mutex *lock, int state,
- break;
- }
-
-+ if (ww_ctx && ww_ctx->acquired > 0) {
-+ ret = __mutex_lock_check_stamp(lock, ww_ctx);
-+ if (ret)
-+ break;
-+ }
-+
- raw_spin_unlock_irq(&lock->wait_lock);
-
- debug_rt_mutex_print_deadlock(waiter);
-@@ -1159,21 +1662,96 @@ static void rt_mutex_handle_deadlock(int res, int detect_deadlock,
- }
- }
-
-+static __always_inline void ww_mutex_lock_acquired(struct ww_mutex *ww,
-+ struct ww_acquire_ctx *ww_ctx)
-+{
-+#ifdef CONFIG_DEBUG_MUTEXES
-+ /*
-+ * If this WARN_ON triggers, you used ww_mutex_lock to acquire,
-+ * but released with a normal mutex_unlock in this call.
-+ *
-+ * This should never happen, always use ww_mutex_unlock.
-+ */
-+ DEBUG_LOCKS_WARN_ON(ww->ctx);
-+
-+ /*
-+ * Not quite done after calling ww_acquire_done() ?
-+ */
-+ DEBUG_LOCKS_WARN_ON(ww_ctx->done_acquire);
-+
-+ if (ww_ctx->contending_lock) {
-+ /*
-+ * After -EDEADLK you tried to
-+ * acquire a different ww_mutex? Bad!
-+ */
-+ DEBUG_LOCKS_WARN_ON(ww_ctx->contending_lock != ww);
-+
-+ /*
-+ * You called ww_mutex_lock after receiving -EDEADLK,
-+ * but 'forgot' to unlock everything else first?
-+ */
-+ DEBUG_LOCKS_WARN_ON(ww_ctx->acquired > 0);
-+ ww_ctx->contending_lock = NULL;
-+ }
-+
-+ /*
-+ * Naughty, using a different class will lead to undefined behavior!
-+ */
-+ DEBUG_LOCKS_WARN_ON(ww_ctx->ww_class != ww->ww_class);
-+#endif
-+ ww_ctx->acquired++;
-+}
-+
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+static void ww_mutex_account_lock(struct rt_mutex *lock,
-+ struct ww_acquire_ctx *ww_ctx)
-+{
-+ struct ww_mutex *ww = container_of(lock, struct ww_mutex, base.lock);
-+ struct rt_mutex_waiter *waiter, *n;
-+
-+ /*
-+ * This branch gets optimized out for the common case,
-+ * and is only important for ww_mutex_lock.
-+ */
-+ ww_mutex_lock_acquired(ww, ww_ctx);
-+ ww->ctx = ww_ctx;
-+
-+ /*
-+ * Give any possible sleeping processes the chance to wake up,
-+ * so they can recheck if they have to back off.
-+ */
-+ rbtree_postorder_for_each_entry_safe(waiter, n, &lock->waiters,
-+ tree_entry) {
-+ /* XXX debug rt mutex waiter wakeup */
-+
-+ BUG_ON(waiter->lock != lock);
-+ rt_mutex_wake_waiter(waiter);
-+ }
-+}
-+
-+#else
-+
-+static void ww_mutex_account_lock(struct rt_mutex *lock,
-+ struct ww_acquire_ctx *ww_ctx)
-+{
-+ BUG();
-+}
-+#endif
-+
- /*
- * Slow path lock function:
- */
- static int __sched
- rt_mutex_slowlock(struct rt_mutex *lock, int state,
- struct hrtimer_sleeper *timeout,
-- enum rtmutex_chainwalk chwalk)
-+ enum rtmutex_chainwalk chwalk,
-+ struct ww_acquire_ctx *ww_ctx)
- {
- struct rt_mutex_waiter waiter;
- unsigned long flags;
- int ret = 0;
-
-- debug_rt_mutex_init_waiter(&waiter);
-- RB_CLEAR_NODE(&waiter.pi_tree_entry);
-- RB_CLEAR_NODE(&waiter.tree_entry);
-+ rt_mutex_init_waiter(&waiter, false);
-
- /*
- * Technically we could use raw_spin_[un]lock_irq() here, but this can
-@@ -1187,6 +1765,8 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
-
- /* Try to acquire the lock again: */
- if (try_to_take_rt_mutex(lock, current, NULL)) {
-+ if (ww_ctx)
-+ ww_mutex_account_lock(lock, ww_ctx);
- raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
- return 0;
- }
-@@ -1201,13 +1781,23 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
-
- if (likely(!ret))
- /* sleep on the mutex */
-- ret = __rt_mutex_slowlock(lock, state, timeout, &waiter);
-+ ret = __rt_mutex_slowlock(lock, state, timeout, &waiter,
-+ ww_ctx);
-+ else if (ww_ctx) {
-+ /* ww_mutex received EDEADLK, let it become EALREADY */
-+ ret = __mutex_lock_check_stamp(lock, ww_ctx);
-+ BUG_ON(!ret);
-+ }
-
- if (unlikely(ret)) {
- __set_current_state(TASK_RUNNING);
- if (rt_mutex_has_waiters(lock))
- remove_waiter(lock, &waiter);
-- rt_mutex_handle_deadlock(ret, chwalk, &waiter);
-+ /* ww_mutex want to report EDEADLK/EALREADY, let them */
-+ if (!ww_ctx)
-+ rt_mutex_handle_deadlock(ret, chwalk, &waiter);
-+ } else if (ww_ctx) {
-+ ww_mutex_account_lock(lock, ww_ctx);
- }
-
- /*
-@@ -1267,7 +1857,8 @@ static inline int rt_mutex_slowtrylock(struct rt_mutex *lock)
- * Return whether the current task needs to undo a potential priority boosting.
- */
- static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
-- struct wake_q_head *wake_q)
-+ struct wake_q_head *wake_q,
-+ struct wake_q_head *wake_sleeper_q)
- {
- unsigned long flags;
-
-@@ -1323,7 +1914,7 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
- *
- * Queue the next waiter for wakeup once we release the wait_lock.
- */
-- mark_wakeup_next_waiter(wake_q, lock);
-+ mark_wakeup_next_waiter(wake_q, wake_sleeper_q, lock);
-
- raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
-
-@@ -1339,31 +1930,36 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
- */
- static inline int
- rt_mutex_fastlock(struct rt_mutex *lock, int state,
-+ struct ww_acquire_ctx *ww_ctx,
- int (*slowfn)(struct rt_mutex *lock, int state,
- struct hrtimer_sleeper *timeout,
-- enum rtmutex_chainwalk chwalk))
-+ enum rtmutex_chainwalk chwalk,
-+ struct ww_acquire_ctx *ww_ctx))
- {
- if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current))) {
- rt_mutex_deadlock_account_lock(lock, current);
- return 0;
- } else
-- return slowfn(lock, state, NULL, RT_MUTEX_MIN_CHAINWALK);
-+ return slowfn(lock, state, NULL, RT_MUTEX_MIN_CHAINWALK,
-+ ww_ctx);
- }
-
- static inline int
- rt_mutex_timed_fastlock(struct rt_mutex *lock, int state,
- struct hrtimer_sleeper *timeout,
- enum rtmutex_chainwalk chwalk,
-+ struct ww_acquire_ctx *ww_ctx,
- int (*slowfn)(struct rt_mutex *lock, int state,
- struct hrtimer_sleeper *timeout,
-- enum rtmutex_chainwalk chwalk))
-+ enum rtmutex_chainwalk chwalk,
-+ struct ww_acquire_ctx *ww_ctx))
- {
- if (chwalk == RT_MUTEX_MIN_CHAINWALK &&
- likely(rt_mutex_cmpxchg_acquire(lock, NULL, current))) {
- rt_mutex_deadlock_account_lock(lock, current);
- return 0;
- } else
-- return slowfn(lock, state, timeout, chwalk);
-+ return slowfn(lock, state, timeout, chwalk, ww_ctx);
- }
-
- static inline int
-@@ -1380,17 +1976,20 @@ rt_mutex_fasttrylock(struct rt_mutex *lock,
- static inline void
- rt_mutex_fastunlock(struct rt_mutex *lock,
- bool (*slowfn)(struct rt_mutex *lock,
-- struct wake_q_head *wqh))
-+ struct wake_q_head *wqh,
-+ struct wake_q_head *wq_sleeper))
- {
- WAKE_Q(wake_q);
-+ WAKE_Q(wake_sleeper_q);
-
- if (likely(rt_mutex_cmpxchg_release(lock, current, NULL))) {
- rt_mutex_deadlock_account_unlock(current);
-
- } else {
-- bool deboost = slowfn(lock, &wake_q);
-+ bool deboost = slowfn(lock, &wake_q, &wake_sleeper_q);
-
- wake_up_q(&wake_q);
-+ wake_up_q_sleeper(&wake_sleeper_q);
-
- /* Undo pi boosting if necessary: */
- if (deboost)
-@@ -1407,7 +2006,7 @@ void __sched rt_mutex_lock(struct rt_mutex *lock)
- {
- might_sleep();
-
-- rt_mutex_fastlock(lock, TASK_UNINTERRUPTIBLE, rt_mutex_slowlock);
-+ rt_mutex_fastlock(lock, TASK_UNINTERRUPTIBLE, NULL, rt_mutex_slowlock);
- }
- EXPORT_SYMBOL_GPL(rt_mutex_lock);
-
-@@ -1424,7 +2023,7 @@ int __sched rt_mutex_lock_interruptible(struct rt_mutex *lock)
- {
- might_sleep();
-
-- return rt_mutex_fastlock(lock, TASK_INTERRUPTIBLE, rt_mutex_slowlock);
-+ return rt_mutex_fastlock(lock, TASK_INTERRUPTIBLE, NULL, rt_mutex_slowlock);
- }
- EXPORT_SYMBOL_GPL(rt_mutex_lock_interruptible);
-
-@@ -1437,11 +2036,30 @@ int rt_mutex_timed_futex_lock(struct rt_mutex *lock,
- might_sleep();
-
- return rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout,
-- RT_MUTEX_FULL_CHAINWALK,
-+ RT_MUTEX_FULL_CHAINWALK, NULL,
- rt_mutex_slowlock);
- }
-
- /**
-+ * rt_mutex_lock_killable - lock a rt_mutex killable
-+ *
-+ * @lock: the rt_mutex to be locked
-+ * @detect_deadlock: deadlock detection on/off
-+ *
-+ * Returns:
-+ * 0 on success
-+ * -EINTR when interrupted by a signal
-+ * -EDEADLK when the lock would deadlock (when deadlock detection is on)
-+ */
-+int __sched rt_mutex_lock_killable(struct rt_mutex *lock)
-+{
-+ might_sleep();
-+
-+ return rt_mutex_fastlock(lock, TASK_KILLABLE, NULL, rt_mutex_slowlock);
-+}
-+EXPORT_SYMBOL_GPL(rt_mutex_lock_killable);
-+
-+/**
- * rt_mutex_timed_lock - lock a rt_mutex interruptible
- * the timeout structure is provided
- * by the caller
-@@ -1461,6 +2079,7 @@ rt_mutex_timed_lock(struct rt_mutex *lock, struct hrtimer_sleeper *timeout)
-
- return rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout,
- RT_MUTEX_MIN_CHAINWALK,
-+ NULL,
- rt_mutex_slowlock);
- }
- EXPORT_SYMBOL_GPL(rt_mutex_timed_lock);
-@@ -1478,7 +2097,11 @@ EXPORT_SYMBOL_GPL(rt_mutex_timed_lock);
- */
- int __sched rt_mutex_trylock(struct rt_mutex *lock)
- {
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ if (WARN_ON_ONCE(in_irq() || in_nmi()))
-+#else
- if (WARN_ON_ONCE(in_irq() || in_nmi() || in_serving_softirq()))
-+#endif
- return 0;
-
- return rt_mutex_fasttrylock(lock, rt_mutex_slowtrylock);
-@@ -1504,13 +2127,14 @@ EXPORT_SYMBOL_GPL(rt_mutex_unlock);
- * required or not.
- */
- bool __sched rt_mutex_futex_unlock(struct rt_mutex *lock,
-- struct wake_q_head *wqh)
-+ struct wake_q_head *wqh,
-+ struct wake_q_head *wq_sleeper)
- {
- if (likely(rt_mutex_cmpxchg_release(lock, current, NULL))) {
- rt_mutex_deadlock_account_unlock(current);
- return false;
- }
-- return rt_mutex_slowunlock(lock, wqh);
-+ return rt_mutex_slowunlock(lock, wqh, wq_sleeper);
- }
-
- /**
-@@ -1543,13 +2167,12 @@ EXPORT_SYMBOL_GPL(rt_mutex_destroy);
- void __rt_mutex_init(struct rt_mutex *lock, const char *name)
- {
- lock->owner = NULL;
-- raw_spin_lock_init(&lock->wait_lock);
- lock->waiters = RB_ROOT;
- lock->waiters_leftmost = NULL;
-
- debug_rt_mutex_init(lock, name);
- }
--EXPORT_SYMBOL_GPL(__rt_mutex_init);
-+EXPORT_SYMBOL(__rt_mutex_init);
-
- /**
- * rt_mutex_init_proxy_locked - initialize and lock a rt_mutex on behalf of a
-@@ -1564,7 +2187,7 @@ EXPORT_SYMBOL_GPL(__rt_mutex_init);
- void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
- struct task_struct *proxy_owner)
- {
-- __rt_mutex_init(lock, NULL);
-+ rt_mutex_init(lock);
- debug_rt_mutex_proxy_lock(lock, proxy_owner);
- rt_mutex_set_owner(lock, proxy_owner);
- rt_mutex_deadlock_account_lock(lock, proxy_owner);
-@@ -1612,6 +2235,35 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock,
- return 1;
- }
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ /*
-+ * In PREEMPT_RT there's an added race.
-+ * If the task, that we are about to requeue, times out,
-+ * it can set the PI_WAKEUP_INPROGRESS. This tells the requeue
-+ * to skip this task. But right after the task sets
-+ * its pi_blocked_on to PI_WAKEUP_INPROGRESS it can then
-+ * block on the spin_lock(&hb->lock), which in RT is an rtmutex.
-+ * This will replace the PI_WAKEUP_INPROGRESS with the actual
-+ * lock that it blocks on. We *must not* place this task
-+ * on this proxy lock in that case.
-+ *
-+ * To prevent this race, we first take the task's pi_lock
-+ * and check if it has updated its pi_blocked_on. If it has,
-+ * we assume that it woke up and we return -EAGAIN.
-+ * Otherwise, we set the task's pi_blocked_on to
-+ * PI_REQUEUE_INPROGRESS, so that if the task is waking up
-+ * it will know that we are in the process of requeuing it.
-+ */
-+ raw_spin_lock(&task->pi_lock);
-+ if (task->pi_blocked_on) {
-+ raw_spin_unlock(&task->pi_lock);
-+ raw_spin_unlock_irq(&lock->wait_lock);
-+ return -EAGAIN;
-+ }
-+ task->pi_blocked_on = PI_REQUEUE_INPROGRESS;
-+ raw_spin_unlock(&task->pi_lock);
-+#endif
-+
- /* We enforce deadlock detection for futexes */
- ret = task_blocks_on_rt_mutex(lock, waiter, task,
- RT_MUTEX_FULL_CHAINWALK);
-@@ -1626,7 +2278,7 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock,
- ret = 0;
- }
-
-- if (unlikely(ret))
-+ if (ret && rt_mutex_has_waiters(lock))
- remove_waiter(lock, waiter);
-
- raw_spin_unlock_irq(&lock->wait_lock);
-@@ -1682,7 +2334,7 @@ int rt_mutex_finish_proxy_lock(struct rt_mutex *lock,
- set_current_state(TASK_INTERRUPTIBLE);
-
- /* sleep on the mutex */
-- ret = __rt_mutex_slowlock(lock, TASK_INTERRUPTIBLE, to, waiter);
-+ ret = __rt_mutex_slowlock(lock, TASK_INTERRUPTIBLE, to, waiter, NULL);
-
- if (unlikely(ret))
- remove_waiter(lock, waiter);
-@@ -1697,3 +2349,89 @@ int rt_mutex_finish_proxy_lock(struct rt_mutex *lock,
-
- return ret;
- }
-+
-+static inline int
-+ww_mutex_deadlock_injection(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)
-+{
-+#ifdef CONFIG_DEBUG_WW_MUTEX_SLOWPATH
-+ unsigned tmp;
-+
-+ if (ctx->deadlock_inject_countdown-- == 0) {
-+ tmp = ctx->deadlock_inject_interval;
-+ if (tmp > UINT_MAX/4)
-+ tmp = UINT_MAX;
-+ else
-+ tmp = tmp*2 + tmp + tmp/2;
-+
-+ ctx->deadlock_inject_interval = tmp;
-+ ctx->deadlock_inject_countdown = tmp;
-+ ctx->contending_lock = lock;
-+
-+ ww_mutex_unlock(lock);
-+
-+ return -EDEADLK;
-+ }
-+#endif
-+
-+ return 0;
-+}
-+
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+int __sched
-+__ww_mutex_lock_interruptible(struct ww_mutex *lock, struct ww_acquire_ctx *ww_ctx)
-+{
-+ int ret;
-+
-+ might_sleep();
-+
-+ mutex_acquire_nest(&lock->base.dep_map, 0, 0, &ww_ctx->dep_map, _RET_IP_);
-+ ret = rt_mutex_slowlock(&lock->base.lock, TASK_INTERRUPTIBLE, NULL, 0, ww_ctx);
-+ if (ret)
-+ mutex_release(&lock->base.dep_map, 1, _RET_IP_);
-+ else if (!ret && ww_ctx->acquired > 1)
-+ return ww_mutex_deadlock_injection(lock, ww_ctx);
-+
-+ return ret;
-+}
-+EXPORT_SYMBOL_GPL(__ww_mutex_lock_interruptible);
-+
-+int __sched
-+__ww_mutex_lock(struct ww_mutex *lock, struct ww_acquire_ctx *ww_ctx)
-+{
-+ int ret;
-+
-+ might_sleep();
-+
-+ mutex_acquire_nest(&lock->base.dep_map, 0, 0, &ww_ctx->dep_map, _RET_IP_);
-+ ret = rt_mutex_slowlock(&lock->base.lock, TASK_UNINTERRUPTIBLE, NULL, 0, ww_ctx);
-+ if (ret)
-+ mutex_release(&lock->base.dep_map, 1, _RET_IP_);
-+ else if (!ret && ww_ctx->acquired > 1)
-+ return ww_mutex_deadlock_injection(lock, ww_ctx);
-+
-+ return ret;
-+}
-+EXPORT_SYMBOL_GPL(__ww_mutex_lock);
-+
-+void __sched ww_mutex_unlock(struct ww_mutex *lock)
-+{
-+ int nest = !!lock->ctx;
-+
-+ /*
-+ * The unlocking fastpath is the 0->1 transition from 'locked'
-+ * into 'unlocked' state:
-+ */
-+ if (nest) {
-+#ifdef CONFIG_DEBUG_MUTEXES
-+ DEBUG_LOCKS_WARN_ON(!lock->ctx->acquired);
-+#endif
-+ if (lock->ctx->acquired > 0)
-+ lock->ctx->acquired--;
-+ lock->ctx = NULL;
-+ }
-+
-+ mutex_release(&lock->base.dep_map, nest, _RET_IP_);
-+ rt_mutex_unlock(&lock->base.lock);
-+}
-+EXPORT_SYMBOL(ww_mutex_unlock);
-+#endif
-diff --git a/kernel/locking/rtmutex_common.h b/kernel/locking/rtmutex_common.h
-index 4f5f83c..289f062 100644
---- a/kernel/locking/rtmutex_common.h
-+++ b/kernel/locking/rtmutex_common.h
-@@ -27,6 +27,7 @@ struct rt_mutex_waiter {
- struct rb_node pi_tree_entry;
- struct task_struct *task;
- struct rt_mutex *lock;
-+ bool savestate;
- #ifdef CONFIG_DEBUG_RT_MUTEXES
- unsigned long ip;
- struct pid *deadlock_task_pid;
-@@ -97,6 +98,9 @@ enum rtmutex_chainwalk {
- /*
- * PI-futex support (proxy locking functions, etc.):
- */
-+#define PI_WAKEUP_INPROGRESS ((struct rt_mutex_waiter *) 1)
-+#define PI_REQUEUE_INPROGRESS ((struct rt_mutex_waiter *) 2)
-+
- extern struct task_struct *rt_mutex_next_owner(struct rt_mutex *lock);
- extern void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
- struct task_struct *proxy_owner);
-@@ -110,7 +114,8 @@ extern int rt_mutex_finish_proxy_lock(struct rt_mutex *lock,
- struct rt_mutex_waiter *waiter);
- extern int rt_mutex_timed_futex_lock(struct rt_mutex *l, struct hrtimer_sleeper *to);
- extern bool rt_mutex_futex_unlock(struct rt_mutex *lock,
-- struct wake_q_head *wqh);
-+ struct wake_q_head *wqh,
-+ struct wake_q_head *wq_sleeper);
- extern void rt_mutex_adjust_prio(struct task_struct *task);
-
- #ifdef CONFIG_DEBUG_RT_MUTEXES
-@@ -119,4 +124,14 @@ extern void rt_mutex_adjust_prio(struct task_struct *task);
- # include "rtmutex.h"
- #endif
-
-+static inline void
-+rt_mutex_init_waiter(struct rt_mutex_waiter *waiter, bool savestate)
-+{
-+ debug_rt_mutex_init_waiter(waiter);
-+ waiter->task = NULL;
-+ waiter->savestate = savestate;
-+ RB_CLEAR_NODE(&waiter->pi_tree_entry);
-+ RB_CLEAR_NODE(&waiter->tree_entry);
-+}
-+
- #endif
-diff --git a/kernel/locking/spinlock.c b/kernel/locking/spinlock.c
-index db3ccb1..9097796 100644
---- a/kernel/locking/spinlock.c
-+++ b/kernel/locking/spinlock.c
-@@ -124,8 +124,11 @@ void __lockfunc __raw_##op##_lock_bh(locktype##_t *lock) \
- * __[spin|read|write]_lock_bh()
- */
- BUILD_LOCK_OPS(spin, raw_spinlock);
-+
-+#ifndef CONFIG_PREEMPT_RT_FULL
- BUILD_LOCK_OPS(read, rwlock);
- BUILD_LOCK_OPS(write, rwlock);
-+#endif
-
- #endif
-
-@@ -209,6 +212,8 @@ void __lockfunc _raw_spin_unlock_bh(raw_spinlock_t *lock)
- EXPORT_SYMBOL(_raw_spin_unlock_bh);
- #endif
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+
- #ifndef CONFIG_INLINE_READ_TRYLOCK
- int __lockfunc _raw_read_trylock(rwlock_t *lock)
- {
-@@ -353,6 +358,8 @@ void __lockfunc _raw_write_unlock_bh(rwlock_t *lock)
- EXPORT_SYMBOL(_raw_write_unlock_bh);
- #endif
-
-+#endif /* !PREEMPT_RT_FULL */
-+
- #ifdef CONFIG_DEBUG_LOCK_ALLOC
-
- void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass)
-diff --git a/kernel/locking/spinlock_debug.c b/kernel/locking/spinlock_debug.c
-index 0374a59..9497033 100644
---- a/kernel/locking/spinlock_debug.c
-+++ b/kernel/locking/spinlock_debug.c
-@@ -31,6 +31,7 @@ void __raw_spin_lock_init(raw_spinlock_t *lock, const char *name,
-
- EXPORT_SYMBOL(__raw_spin_lock_init);
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- void __rwlock_init(rwlock_t *lock, const char *name,
- struct lock_class_key *key)
- {
-@@ -48,6 +49,7 @@ void __rwlock_init(rwlock_t *lock, const char *name,
- }
-
- EXPORT_SYMBOL(__rwlock_init);
-+#endif
-
- static void spin_dump(raw_spinlock_t *lock, const char *msg)
- {
-@@ -159,6 +161,7 @@ void do_raw_spin_unlock(raw_spinlock_t *lock)
- arch_spin_unlock(&lock->raw_lock);
- }
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- static void rwlock_bug(rwlock_t *lock, const char *msg)
- {
- if (!debug_locks_off())
-@@ -300,3 +303,5 @@ void do_raw_write_unlock(rwlock_t *lock)
- debug_write_unlock(lock);
- arch_write_unlock(&lock->raw_lock);
- }
-+
-+#endif
-diff --git a/kernel/panic.c b/kernel/panic.c
-index ca8cea1..6b69811 100644
---- a/kernel/panic.c
-+++ b/kernel/panic.c
-@@ -449,9 +449,11 @@ static u64 oops_id;
-
- static int init_oops_id(void)
- {
-+#ifndef CONFIG_PREEMPT_RT_FULL
- if (!oops_id)
- get_random_bytes(&oops_id, sizeof(oops_id));
- else
-+#endif
- oops_id++;
-
- return 0;
-diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
-index 33c79b6..f53375b 100644
---- a/kernel/power/hibernate.c
-+++ b/kernel/power/hibernate.c
-@@ -286,6 +286,8 @@ static int create_image(int platform_mode)
-
- local_irq_disable();
-
-+ system_state = SYSTEM_SUSPEND;
-+
- error = syscore_suspend();
- if (error) {
- printk(KERN_ERR "PM: Some system devices failed to power down, "
-@@ -315,6 +317,7 @@ static int create_image(int platform_mode)
- syscore_resume();
-
- Enable_irqs:
-+ system_state = SYSTEM_RUNNING;
- local_irq_enable();
-
- Enable_cpus:
-@@ -444,6 +447,7 @@ static int resume_target_kernel(bool platform_mode)
- goto Enable_cpus;
-
- local_irq_disable();
-+ system_state = SYSTEM_SUSPEND;
-
- error = syscore_suspend();
- if (error)
-@@ -477,6 +481,7 @@ static int resume_target_kernel(bool platform_mode)
- syscore_resume();
-
- Enable_irqs:
-+ system_state = SYSTEM_RUNNING;
- local_irq_enable();
-
- Enable_cpus:
-@@ -562,6 +567,7 @@ int hibernation_platform_enter(void)
- goto Enable_cpus;
-
- local_irq_disable();
-+ system_state = SYSTEM_SUSPEND;
- syscore_suspend();
- if (pm_wakeup_pending()) {
- error = -EAGAIN;
-@@ -574,6 +580,7 @@ int hibernation_platform_enter(void)
-
- Power_up:
- syscore_resume();
-+ system_state = SYSTEM_RUNNING;
- local_irq_enable();
-
- Enable_cpus:
-@@ -674,6 +681,10 @@ static int load_image_and_restore(void)
- return error;
- }
-
-+#ifndef CONFIG_SUSPEND
-+bool pm_in_action;
-+#endif
-+
- /**
- * hibernate - Carry out system hibernation, including saving the image.
- */
-@@ -687,6 +698,8 @@ int hibernate(void)
- return -EPERM;
- }
-
-+ pm_in_action = true;
-+
- lock_system_sleep();
- /* The snapshot device should not be opened while we're running */
- if (!atomic_add_unless(&snapshot_device_available, -1, 0)) {
-@@ -764,6 +777,7 @@ int hibernate(void)
- atomic_inc(&snapshot_device_available);
- Unlock:
- unlock_system_sleep();
-+ pm_in_action = false;
- return error;
- }
-
-diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
-index 0acab9d..aac06aa 100644
---- a/kernel/power/suspend.c
-+++ b/kernel/power/suspend.c
-@@ -361,6 +361,8 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
- arch_suspend_disable_irqs();
- BUG_ON(!irqs_disabled());
-
-+ system_state = SYSTEM_SUSPEND;
-+
- error = syscore_suspend();
- if (!error) {
- *wakeup = pm_wakeup_pending();
-@@ -377,6 +379,8 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
- syscore_resume();
- }
-
-+ system_state = SYSTEM_RUNNING;
-+
- arch_suspend_enable_irqs();
- BUG_ON(irqs_disabled());
-
-@@ -519,6 +523,8 @@ static int enter_state(suspend_state_t state)
- return error;
- }
-
-+bool pm_in_action;
-+
- /**
- * pm_suspend - Externally visible function for suspending the system.
- * @state: System sleep state to enter.
-@@ -533,6 +539,8 @@ int pm_suspend(suspend_state_t state)
- if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX)
- return -EINVAL;
-
-+ pm_in_action = true;
-+
- error = enter_state(state);
- if (error) {
- suspend_stats.fail++;
-@@ -540,6 +548,7 @@ int pm_suspend(suspend_state_t state)
- } else {
- suspend_stats.success++;
- }
-+ pm_in_action = false;
- return error;
- }
- EXPORT_SYMBOL(pm_suspend);
-diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
-index eea6dbc..6f01c7e 100644
---- a/kernel/printk/printk.c
-+++ b/kernel/printk/printk.c
-@@ -351,6 +351,65 @@ __packed __aligned(4)
- */
- DEFINE_RAW_SPINLOCK(logbuf_lock);
-
-+#ifdef CONFIG_EARLY_PRINTK
-+struct console *early_console;
-+
-+static void early_vprintk(const char *fmt, va_list ap)
-+{
-+ if (early_console) {
-+ char buf[512];
-+ int n = vscnprintf(buf, sizeof(buf), fmt, ap);
-+
-+ early_console->write(early_console, buf, n);
-+ }
-+}
-+
-+asmlinkage void early_printk(const char *fmt, ...)
-+{
-+ va_list ap;
-+
-+ va_start(ap, fmt);
-+ early_vprintk(fmt, ap);
-+ va_end(ap);
-+}
-+
-+/*
-+ * This is independent of any log levels - a global
-+ * kill switch that turns off all of printk.
-+ *
-+ * Used by the NMI watchdog if early-printk is enabled.
-+ */
-+static bool __read_mostly printk_killswitch;
-+
-+static int __init force_early_printk_setup(char *str)
-+{
-+ printk_killswitch = true;
-+ return 0;
-+}
-+early_param("force_early_printk", force_early_printk_setup);
-+
-+void printk_kill(void)
-+{
-+ printk_killswitch = true;
-+}
-+
-+#ifdef CONFIG_PRINTK
-+static int forced_early_printk(const char *fmt, va_list ap)
-+{
-+ if (!printk_killswitch)
-+ return 0;
-+ early_vprintk(fmt, ap);
-+ return 1;
-+}
-+#endif
-+
-+#else
-+static inline int forced_early_printk(const char *fmt, va_list ap)
-+{
-+ return 0;
-+}
-+#endif
-+
- #ifdef CONFIG_PRINTK
- DECLARE_WAIT_QUEUE_HEAD(log_wait);
- /* the next printk record to read by syslog(READ) or /proc/kmsg */
-@@ -1340,6 +1399,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
- {
- char *text;
- int len = 0;
-+ int attempts = 0;
-
- text = kmalloc(LOG_LINE_MAX + PREFIX_MAX, GFP_KERNEL);
- if (!text)
-@@ -1351,6 +1411,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
- u64 seq;
- u32 idx;
- enum log_flags prev;
-+ int num_msg;
-+try_again:
-+ attempts++;
-+ if (attempts > 10) {
-+ len = -EBUSY;
-+ goto out;
-+ }
-+ num_msg = 0;
-
- /*
- * Find first record that fits, including all following records,
-@@ -1366,6 +1434,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
- prev = msg->flags;
- idx = log_next(idx);
- seq++;
-+ num_msg++;
-+ if (num_msg > 5) {
-+ num_msg = 0;
-+ raw_spin_unlock_irq(&logbuf_lock);
-+ raw_spin_lock_irq(&logbuf_lock);
-+ if (clear_seq < log_first_seq)
-+ goto try_again;
-+ }
- }
-
- /* move first record forward until length fits into the buffer */
-@@ -1379,6 +1455,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
- prev = msg->flags;
- idx = log_next(idx);
- seq++;
-+ num_msg++;
-+ if (num_msg > 5) {
-+ num_msg = 0;
-+ raw_spin_unlock_irq(&logbuf_lock);
-+ raw_spin_lock_irq(&logbuf_lock);
-+ if (clear_seq < log_first_seq)
-+ goto try_again;
-+ }
- }
-
- /* last message fitting into this dump */
-@@ -1419,6 +1503,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
- clear_seq = log_next_seq;
- clear_idx = log_next_idx;
- }
-+out:
- raw_spin_unlock_irq(&logbuf_lock);
-
- kfree(text);
-@@ -1572,6 +1657,12 @@ static void call_console_drivers(int level,
- if (!console_drivers)
- return;
-
-+ if (IS_ENABLED(CONFIG_PREEMPT_RT_BASE)) {
-+ if (in_irq() || in_nmi())
-+ return;
-+ }
-+
-+ migrate_disable();
- for_each_console(con) {
- if (exclusive_console && con != exclusive_console)
- continue;
-@@ -1587,6 +1678,7 @@ static void call_console_drivers(int level,
- else
- con->write(con, text, len);
- }
-+ migrate_enable();
- }
-
- /*
-@@ -1750,6 +1842,13 @@ asmlinkage int vprintk_emit(int facility, int level,
- /* cpu currently holding logbuf_lock in this function */
- static unsigned int logbuf_cpu = UINT_MAX;
-
-+ /*
-+ * Fall back to early_printk if a debugging subsystem has
-+ * killed printk output
-+ */
-+ if (unlikely(forced_early_printk(fmt, args)))
-+ return 1;
-+
- if (level == LOGLEVEL_SCHED) {
- level = LOGLEVEL_DEFAULT;
- in_sched = true;
-@@ -1894,13 +1993,23 @@ asmlinkage int vprintk_emit(int facility, int level,
-
- /* If called from the scheduler, we can not call up(). */
- if (!in_sched) {
-+ int may_trylock = 1;
-+
- lockdep_off();
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ /*
-+ * we can't take a sleeping lock with IRQs or preeption disabled
-+ * so we can't print in these contexts
-+ */
-+ if (!(preempt_count() == 0 && !irqs_disabled()))
-+ may_trylock = 0;
-+#endif
- /*
- * Try to acquire and then immediately release the console
- * semaphore. The release will print out buffers and wake up
- * /dev/kmsg and syslog() users.
- */
-- if (console_trylock())
-+ if (may_trylock && console_trylock())
- console_unlock();
- lockdep_on();
- }
-@@ -2023,26 +2132,6 @@ DEFINE_PER_CPU(printk_func_t, printk_func);
-
- #endif /* CONFIG_PRINTK */
-
--#ifdef CONFIG_EARLY_PRINTK
--struct console *early_console;
--
--asmlinkage __visible void early_printk(const char *fmt, ...)
--{
-- va_list ap;
-- char buf[512];
-- int n;
--
-- if (!early_console)
-- return;
--
-- va_start(ap, fmt);
-- n = vscnprintf(buf, sizeof(buf), fmt, ap);
-- va_end(ap);
--
-- early_console->write(early_console, buf, n);
--}
--#endif
--
- static int __add_preferred_console(char *name, int idx, char *options,
- char *brl_options)
- {
-@@ -2312,11 +2401,16 @@ static void console_cont_flush(char *text, size_t size)
- goto out;
-
- len = cont_print_text(text, size);
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ raw_spin_unlock_irqrestore(&logbuf_lock, flags);
-+ call_console_drivers(cont.level, NULL, 0, text, len);
-+#else
- raw_spin_unlock(&logbuf_lock);
- stop_critical_timings();
- call_console_drivers(cont.level, NULL, 0, text, len);
- start_critical_timings();
- local_irq_restore(flags);
-+#endif
- return;
- out:
- raw_spin_unlock_irqrestore(&logbuf_lock, flags);
-@@ -2440,13 +2534,17 @@ skip:
- console_idx = log_next(console_idx);
- console_seq++;
- console_prev = msg->flags;
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ raw_spin_unlock_irqrestore(&logbuf_lock, flags);
-+ call_console_drivers(level, ext_text, ext_len, text, len);
-+#else
- raw_spin_unlock(&logbuf_lock);
-
- stop_critical_timings(); /* don't trace print latency */
- call_console_drivers(level, ext_text, ext_len, text, len);
- start_critical_timings();
- local_irq_restore(flags);
--
-+#endif
- if (do_cond_resched)
- cond_resched();
- }
-@@ -2498,6 +2596,11 @@ void console_unblank(void)
- {
- struct console *c;
-
-+ if (IS_ENABLED(CONFIG_PREEMPT_RT_BASE)) {
-+ if (in_irq() || in_nmi())
-+ return;
-+ }
-+
- /*
- * console_unblank can no longer be called in interrupt context unless
- * oops_in_progress is set to 1..
-diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 1d3b766..ce66663 100644
---- a/kernel/ptrace.c
-+++ b/kernel/ptrace.c
-@@ -128,7 +128,14 @@ static bool ptrace_freeze_traced(struct task_struct *task)
-
- spin_lock_irq(&task->sighand->siglock);
- if (task_is_traced(task) && !__fatal_signal_pending(task)) {
-- task->state = __TASK_TRACED;
-+ unsigned long flags;
-+
-+ raw_spin_lock_irqsave(&task->pi_lock, flags);
-+ if (task->state & __TASK_TRACED)
-+ task->state = __TASK_TRACED;
-+ else
-+ task->saved_state = __TASK_TRACED;
-+ raw_spin_unlock_irqrestore(&task->pi_lock, flags);
- ret = true;
- }
- spin_unlock_irq(&task->sighand->siglock);
-diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
-index 971e2b1..a304670 100644
---- a/kernel/rcu/rcutorture.c
-+++ b/kernel/rcu/rcutorture.c
-@@ -404,6 +404,7 @@ static struct rcu_torture_ops rcu_ops = {
- .name = "rcu"
- };
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- /*
- * Definitions for rcu_bh torture testing.
- */
-@@ -443,6 +444,12 @@ static struct rcu_torture_ops rcu_bh_ops = {
- .name = "rcu_bh"
- };
-
-+#else
-+static struct rcu_torture_ops rcu_bh_ops = {
-+ .ttype = INVALID_RCU_FLAVOR,
-+};
-+#endif
-+
- /*
- * Don't even think about trying any of these in real life!!!
- * The names includes "busted", and they really means it!
-diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
-index 5d80925..2b4bc2b 100644
---- a/kernel/rcu/tree.c
-+++ b/kernel/rcu/tree.c
-@@ -56,6 +56,11 @@
- #include <linux/random.h>
- #include <linux/trace_events.h>
- #include <linux/suspend.h>
-+#include <linux/delay.h>
-+#include <linux/gfp.h>
-+#include <linux/oom.h>
-+#include <linux/smpboot.h>
-+#include "../time/tick-internal.h"
-
- #include "tree.h"
- #include "rcu.h"
-@@ -259,6 +264,19 @@ void rcu_sched_qs(void)
- this_cpu_ptr(&rcu_sched_data), true);
- }
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+static void rcu_preempt_qs(void);
-+
-+void rcu_bh_qs(void)
-+{
-+ unsigned long flags;
-+
-+ /* Callers to this function, rcu_preempt_qs(), must disable irqs. */
-+ local_irq_save(flags);
-+ rcu_preempt_qs();
-+ local_irq_restore(flags);
-+}
-+#else
- void rcu_bh_qs(void)
- {
- if (__this_cpu_read(rcu_bh_data.cpu_no_qs.s)) {
-@@ -268,6 +286,7 @@ void rcu_bh_qs(void)
- __this_cpu_write(rcu_bh_data.cpu_no_qs.b.norm, false);
- }
- }
-+#endif
-
- static DEFINE_PER_CPU(int, rcu_sched_qs_mask);
-
-@@ -448,11 +467,13 @@ EXPORT_SYMBOL_GPL(rcu_batches_started_sched);
- /*
- * Return the number of RCU BH batches started thus far for debug & stats.
- */
-+#ifndef CONFIG_PREEMPT_RT_FULL
- unsigned long rcu_batches_started_bh(void)
- {
- return rcu_bh_state.gpnum;
- }
- EXPORT_SYMBOL_GPL(rcu_batches_started_bh);
-+#endif
-
- /*
- * Return the number of RCU batches completed thus far for debug & stats.
-@@ -472,6 +493,7 @@ unsigned long rcu_batches_completed_sched(void)
- }
- EXPORT_SYMBOL_GPL(rcu_batches_completed_sched);
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- /*
- * Return the number of RCU BH batches completed thus far for debug & stats.
- */
-@@ -480,6 +502,7 @@ unsigned long rcu_batches_completed_bh(void)
- return rcu_bh_state.completed;
- }
- EXPORT_SYMBOL_GPL(rcu_batches_completed_bh);
-+#endif
-
- /*
- * Return the number of RCU expedited batches completed thus far for
-@@ -503,6 +526,7 @@ unsigned long rcu_exp_batches_completed_sched(void)
- }
- EXPORT_SYMBOL_GPL(rcu_exp_batches_completed_sched);
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- /*
- * Force a quiescent state.
- */
-@@ -521,6 +545,13 @@ void rcu_bh_force_quiescent_state(void)
- }
- EXPORT_SYMBOL_GPL(rcu_bh_force_quiescent_state);
-
-+#else
-+void rcu_force_quiescent_state(void)
-+{
-+}
-+EXPORT_SYMBOL_GPL(rcu_force_quiescent_state);
-+#endif
-+
- /*
- * Force a quiescent state for RCU-sched.
- */
-@@ -571,9 +602,11 @@ void rcutorture_get_gp_data(enum rcutorture_type test_type, int *flags,
- case RCU_FLAVOR:
- rsp = rcu_state_p;
- break;
-+#ifndef CONFIG_PREEMPT_RT_FULL
- case RCU_BH_FLAVOR:
- rsp = &rcu_bh_state;
- break;
-+#endif
- case RCU_SCHED_FLAVOR:
- rsp = &rcu_sched_state;
- break;
-@@ -3013,18 +3046,17 @@ __rcu_process_callbacks(struct rcu_state *rsp)
- /*
- * Do RCU core processing for the current CPU.
- */
--static void rcu_process_callbacks(struct softirq_action *unused)
-+static void rcu_process_callbacks(void)
- {
- struct rcu_state *rsp;
-
- if (cpu_is_offline(smp_processor_id()))
- return;
-- trace_rcu_utilization(TPS("Start RCU core"));
- for_each_rcu_flavor(rsp)
- __rcu_process_callbacks(rsp);
-- trace_rcu_utilization(TPS("End RCU core"));
- }
-
-+static DEFINE_PER_CPU(struct task_struct *, rcu_cpu_kthread_task);
- /*
- * Schedule RCU callback invocation. If the specified type of RCU
- * does not support RCU priority boosting, just do a direct call,
-@@ -3036,20 +3068,107 @@ static void invoke_rcu_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
- {
- if (unlikely(!READ_ONCE(rcu_scheduler_fully_active)))
- return;
-- if (likely(!rsp->boost)) {
-- rcu_do_batch(rsp, rdp);
-- return;
-- }
-- invoke_rcu_callbacks_kthread();
-+ rcu_do_batch(rsp, rdp);
-+}
-+
-+static void rcu_wake_cond(struct task_struct *t, int status)
-+{
-+ /*
-+ * If the thread is yielding, only wake it when this
-+ * is invoked from idle
-+ */
-+ if (t && (status != RCU_KTHREAD_YIELDING || is_idle_task(current)))
-+ wake_up_process(t);
- }
-
-+/*
-+ * Wake up this CPU's rcuc kthread to do RCU core processing.
-+ */
- static void invoke_rcu_core(void)
- {
-- if (cpu_online(smp_processor_id()))
-- raise_softirq(RCU_SOFTIRQ);
-+ unsigned long flags;
-+ struct task_struct *t;
-+
-+ if (!cpu_online(smp_processor_id()))
-+ return;
-+ local_irq_save(flags);
-+ __this_cpu_write(rcu_cpu_has_work, 1);
-+ t = __this_cpu_read(rcu_cpu_kthread_task);
-+ if (t != NULL && current != t)
-+ rcu_wake_cond(t, __this_cpu_read(rcu_cpu_kthread_status));
-+ local_irq_restore(flags);
-+}
-+
-+static void rcu_cpu_kthread_park(unsigned int cpu)
-+{
-+ per_cpu(rcu_cpu_kthread_status, cpu) = RCU_KTHREAD_OFFCPU;
-+}
-+
-+static int rcu_cpu_kthread_should_run(unsigned int cpu)
-+{
-+ return __this_cpu_read(rcu_cpu_has_work);
- }
-
- /*
-+ * Per-CPU kernel thread that invokes RCU callbacks. This replaces the
-+ * RCU softirq used in flavors and configurations of RCU that do not
-+ * support RCU priority boosting.
-+ */
-+static void rcu_cpu_kthread(unsigned int cpu)
-+{
-+ unsigned int *statusp = this_cpu_ptr(&rcu_cpu_kthread_status);
-+ char work, *workp = this_cpu_ptr(&rcu_cpu_has_work);
-+ int spincnt;
-+
-+ for (spincnt = 0; spincnt < 10; spincnt++) {
-+ trace_rcu_utilization(TPS("Start CPU kthread@rcu_wait"));
-+ local_bh_disable();
-+ *statusp = RCU_KTHREAD_RUNNING;
-+ this_cpu_inc(rcu_cpu_kthread_loops);
-+ local_irq_disable();
-+ work = *workp;
-+ *workp = 0;
-+ local_irq_enable();
-+ if (work)
-+ rcu_process_callbacks();
-+ local_bh_enable();
-+ if (*workp == 0) {
-+ trace_rcu_utilization(TPS("End CPU kthread@rcu_wait"));
-+ *statusp = RCU_KTHREAD_WAITING;
-+ return;
-+ }
-+ }
-+ *statusp = RCU_KTHREAD_YIELDING;
-+ trace_rcu_utilization(TPS("Start CPU kthread@rcu_yield"));
-+ schedule_timeout_interruptible(2);
-+ trace_rcu_utilization(TPS("End CPU kthread@rcu_yield"));
-+ *statusp = RCU_KTHREAD_WAITING;
-+}
-+
-+static struct smp_hotplug_thread rcu_cpu_thread_spec = {
-+ .store = &rcu_cpu_kthread_task,
-+ .thread_should_run = rcu_cpu_kthread_should_run,
-+ .thread_fn = rcu_cpu_kthread,
-+ .thread_comm = "rcuc/%u",
-+ .setup = rcu_cpu_kthread_setup,
-+ .park = rcu_cpu_kthread_park,
-+};
-+
-+/*
-+ * Spawn per-CPU RCU core processing kthreads.
-+ */
-+static int __init rcu_spawn_core_kthreads(void)
-+{
-+ int cpu;
-+
-+ for_each_possible_cpu(cpu)
-+ per_cpu(rcu_cpu_has_work, cpu) = 0;
-+ BUG_ON(smpboot_register_percpu_thread(&rcu_cpu_thread_spec));
-+ return 0;
-+}
-+early_initcall(rcu_spawn_core_kthreads);
-+
-+/*
- * Handle any core-RCU processing required by a call_rcu() invocation.
- */
- static void __call_rcu_core(struct rcu_state *rsp, struct rcu_data *rdp,
-@@ -3192,6 +3311,7 @@ void call_rcu_sched(struct rcu_head *head, rcu_callback_t func)
- }
- EXPORT_SYMBOL_GPL(call_rcu_sched);
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- /*
- * Queue an RCU callback for invocation after a quicker grace period.
- */
-@@ -3200,6 +3320,7 @@ void call_rcu_bh(struct rcu_head *head, rcu_callback_t func)
- __call_rcu(head, func, &rcu_bh_state, -1, 0);
- }
- EXPORT_SYMBOL_GPL(call_rcu_bh);
-+#endif
-
- /*
- * Queue an RCU callback for lazy invocation after a grace period.
-@@ -3291,6 +3412,7 @@ void synchronize_sched(void)
- }
- EXPORT_SYMBOL_GPL(synchronize_sched);
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- /**
- * synchronize_rcu_bh - wait until an rcu_bh grace period has elapsed.
- *
-@@ -3317,6 +3439,7 @@ void synchronize_rcu_bh(void)
- wait_rcu_gp(call_rcu_bh);
- }
- EXPORT_SYMBOL_GPL(synchronize_rcu_bh);
-+#endif
-
- /**
- * get_state_synchronize_rcu - Snapshot current RCU state
-@@ -3695,6 +3818,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
- mutex_unlock(&rsp->barrier_mutex);
- }
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- /**
- * rcu_barrier_bh - Wait until all in-flight call_rcu_bh() callbacks complete.
- */
-@@ -3703,6 +3827,7 @@ void rcu_barrier_bh(void)
- _rcu_barrier(&rcu_bh_state);
- }
- EXPORT_SYMBOL_GPL(rcu_barrier_bh);
-+#endif
-
- /**
- * rcu_barrier_sched - Wait for in-flight call_rcu_sched() callbacks.
-@@ -4196,12 +4321,13 @@ void __init rcu_init(void)
-
- rcu_bootup_announce();
- rcu_init_geometry();
-+#ifndef CONFIG_PREEMPT_RT_FULL
- rcu_init_one(&rcu_bh_state);
-+#endif
- rcu_init_one(&rcu_sched_state);
- if (dump_tree)
- rcu_dump_rcu_node_tree(&rcu_sched_state);
- __rcu_init_preempt();
-- open_softirq(RCU_SOFTIRQ, rcu_process_callbacks);
-
- /*
- * We don't need protection against CPU-hotplug here because
-diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
-index f714f87..7163119 100644
---- a/kernel/rcu/tree.h
-+++ b/kernel/rcu/tree.h
-@@ -587,18 +587,18 @@ extern struct list_head rcu_struct_flavors;
- */
- extern struct rcu_state rcu_sched_state;
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- extern struct rcu_state rcu_bh_state;
-+#endif
-
- #ifdef CONFIG_PREEMPT_RCU
- extern struct rcu_state rcu_preempt_state;
- #endif /* #ifdef CONFIG_PREEMPT_RCU */
-
--#ifdef CONFIG_RCU_BOOST
- DECLARE_PER_CPU(unsigned int, rcu_cpu_kthread_status);
- DECLARE_PER_CPU(int, rcu_cpu_kthread_cpu);
- DECLARE_PER_CPU(unsigned int, rcu_cpu_kthread_loops);
- DECLARE_PER_CPU(char, rcu_cpu_has_work);
--#endif /* #ifdef CONFIG_RCU_BOOST */
-
- #ifndef RCU_TREE_NONCORE
-
-@@ -618,10 +618,9 @@ void call_rcu(struct rcu_head *head, rcu_callback_t func);
- static void __init __rcu_init_preempt(void);
- static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags);
- static void rcu_preempt_boost_start_gp(struct rcu_node *rnp);
--static void invoke_rcu_callbacks_kthread(void);
- static bool rcu_is_callbacks_kthread(void);
-+static void rcu_cpu_kthread_setup(unsigned int cpu);
- #ifdef CONFIG_RCU_BOOST
--static void rcu_preempt_do_callbacks(void);
- static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp,
- struct rcu_node *rnp);
- #endif /* #ifdef CONFIG_RCU_BOOST */
-diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
-index 0082fce..e08cdda 100644
---- a/kernel/rcu/tree_plugin.h
-+++ b/kernel/rcu/tree_plugin.h
-@@ -24,25 +24,10 @@
- * Paul E. McKenney <paulmck@linux.vnet.ibm.com>
- */
-
--#include <linux/delay.h>
--#include <linux/gfp.h>
--#include <linux/oom.h>
--#include <linux/smpboot.h>
--#include "../time/tick-internal.h"
--
- #ifdef CONFIG_RCU_BOOST
-
- #include "../locking/rtmutex_common.h"
-
--/*
-- * Control variables for per-CPU and per-rcu_node kthreads. These
-- * handle all flavors of RCU.
-- */
--static DEFINE_PER_CPU(struct task_struct *, rcu_cpu_kthread_task);
--DEFINE_PER_CPU(unsigned int, rcu_cpu_kthread_status);
--DEFINE_PER_CPU(unsigned int, rcu_cpu_kthread_loops);
--DEFINE_PER_CPU(char, rcu_cpu_has_work);
--
- #else /* #ifdef CONFIG_RCU_BOOST */
-
- /*
-@@ -55,6 +40,14 @@ DEFINE_PER_CPU(char, rcu_cpu_has_work);
-
- #endif /* #else #ifdef CONFIG_RCU_BOOST */
-
-+/*
-+ * Control variables for per-CPU and per-rcu_node kthreads. These
-+ * handle all flavors of RCU.
-+ */
-+DEFINE_PER_CPU(unsigned int, rcu_cpu_kthread_status);
-+DEFINE_PER_CPU(unsigned int, rcu_cpu_kthread_loops);
-+DEFINE_PER_CPU(char, rcu_cpu_has_work);
-+
- #ifdef CONFIG_RCU_NOCB_CPU
- static cpumask_var_t rcu_nocb_mask; /* CPUs to have callbacks offloaded. */
- static bool have_rcu_nocb_mask; /* Was rcu_nocb_mask allocated? */
-@@ -426,7 +419,7 @@ void rcu_read_unlock_special(struct task_struct *t)
- }
-
- /* Hardware IRQ handlers cannot block, complain if they get here. */
-- if (in_irq() || in_serving_softirq()) {
-+ if (preempt_count() & (HARDIRQ_MASK | SOFTIRQ_OFFSET)) {
- lockdep_rcu_suspicious(__FILE__, __LINE__,
- "rcu_read_unlock() from irq or softirq with blocking in critical section!!!\n");
- pr_alert("->rcu_read_unlock_special: %#x (b: %d, enq: %d nq: %d)\n",
-@@ -632,15 +625,6 @@ static void rcu_preempt_check_callbacks(void)
- t->rcu_read_unlock_special.b.need_qs = true;
- }
-
--#ifdef CONFIG_RCU_BOOST
--
--static void rcu_preempt_do_callbacks(void)
--{
-- rcu_do_batch(rcu_state_p, this_cpu_ptr(rcu_data_p));
--}
--
--#endif /* #ifdef CONFIG_RCU_BOOST */
--
- /*
- * Queue a preemptible-RCU callback for invocation after a grace period.
- */
-@@ -829,6 +813,19 @@ void exit_rcu(void)
-
- #endif /* #else #ifdef CONFIG_PREEMPT_RCU */
-
-+/*
-+ * If boosting, set rcuc kthreads to realtime priority.
-+ */
-+static void rcu_cpu_kthread_setup(unsigned int cpu)
-+{
-+#ifdef CONFIG_RCU_BOOST
-+ struct sched_param sp;
-+
-+ sp.sched_priority = kthread_prio;
-+ sched_setscheduler_nocheck(current, SCHED_FIFO, &sp);
-+#endif /* #ifdef CONFIG_RCU_BOOST */
-+}
-+
- #ifdef CONFIG_RCU_BOOST
-
- #include "../locking/rtmutex_common.h"
-@@ -860,16 +857,6 @@ static void rcu_initiate_boost_trace(struct rcu_node *rnp)
-
- #endif /* #else #ifdef CONFIG_RCU_TRACE */
-
--static void rcu_wake_cond(struct task_struct *t, int status)
--{
-- /*
-- * If the thread is yielding, only wake it when this
-- * is invoked from idle
-- */
-- if (status != RCU_KTHREAD_YIELDING || is_idle_task(current))
-- wake_up_process(t);
--}
--
- /*
- * Carry out RCU priority boosting on the task indicated by ->exp_tasks
- * or ->boost_tasks, advancing the pointer to the next task in the
-@@ -1013,23 +1000,6 @@ static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags)
- }
-
- /*
-- * Wake up the per-CPU kthread to invoke RCU callbacks.
-- */
--static void invoke_rcu_callbacks_kthread(void)
--{
-- unsigned long flags;
--
-- local_irq_save(flags);
-- __this_cpu_write(rcu_cpu_has_work, 1);
-- if (__this_cpu_read(rcu_cpu_kthread_task) != NULL &&
-- current != __this_cpu_read(rcu_cpu_kthread_task)) {
-- rcu_wake_cond(__this_cpu_read(rcu_cpu_kthread_task),
-- __this_cpu_read(rcu_cpu_kthread_status));
-- }
-- local_irq_restore(flags);
--}
--
--/*
- * Is the current CPU running the RCU-callbacks kthread?
- * Caller must have preemption disabled.
- */
-@@ -1083,67 +1053,6 @@ static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp,
- return 0;
- }
-
--static void rcu_kthread_do_work(void)
--{
-- rcu_do_batch(&rcu_sched_state, this_cpu_ptr(&rcu_sched_data));
-- rcu_do_batch(&rcu_bh_state, this_cpu_ptr(&rcu_bh_data));
-- rcu_preempt_do_callbacks();
--}
--
--static void rcu_cpu_kthread_setup(unsigned int cpu)
--{
-- struct sched_param sp;
--
-- sp.sched_priority = kthread_prio;
-- sched_setscheduler_nocheck(current, SCHED_FIFO, &sp);
--}
--
--static void rcu_cpu_kthread_park(unsigned int cpu)
--{
-- per_cpu(rcu_cpu_kthread_status, cpu) = RCU_KTHREAD_OFFCPU;
--}
--
--static int rcu_cpu_kthread_should_run(unsigned int cpu)
--{
-- return __this_cpu_read(rcu_cpu_has_work);
--}
--
--/*
-- * Per-CPU kernel thread that invokes RCU callbacks. This replaces the
-- * RCU softirq used in flavors and configurations of RCU that do not
-- * support RCU priority boosting.
-- */
--static void rcu_cpu_kthread(unsigned int cpu)
--{
-- unsigned int *statusp = this_cpu_ptr(&rcu_cpu_kthread_status);
-- char work, *workp = this_cpu_ptr(&rcu_cpu_has_work);
-- int spincnt;
--
-- for (spincnt = 0; spincnt < 10; spincnt++) {
-- trace_rcu_utilization(TPS("Start CPU kthread@rcu_wait"));
-- local_bh_disable();
-- *statusp = RCU_KTHREAD_RUNNING;
-- this_cpu_inc(rcu_cpu_kthread_loops);
-- local_irq_disable();
-- work = *workp;
-- *workp = 0;
-- local_irq_enable();
-- if (work)
-- rcu_kthread_do_work();
-- local_bh_enable();
-- if (*workp == 0) {
-- trace_rcu_utilization(TPS("End CPU kthread@rcu_wait"));
-- *statusp = RCU_KTHREAD_WAITING;
-- return;
-- }
-- }
-- *statusp = RCU_KTHREAD_YIELDING;
-- trace_rcu_utilization(TPS("Start CPU kthread@rcu_yield"));
-- schedule_timeout_interruptible(2);
-- trace_rcu_utilization(TPS("End CPU kthread@rcu_yield"));
-- *statusp = RCU_KTHREAD_WAITING;
--}
--
- /*
- * Set the per-rcu_node kthread's affinity to cover all CPUs that are
- * served by the rcu_node in question. The CPU hotplug lock is still
-@@ -1174,26 +1083,12 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
- free_cpumask_var(cm);
- }
-
--static struct smp_hotplug_thread rcu_cpu_thread_spec = {
-- .store = &rcu_cpu_kthread_task,
-- .thread_should_run = rcu_cpu_kthread_should_run,
-- .thread_fn = rcu_cpu_kthread,
-- .thread_comm = "rcuc/%u",
-- .setup = rcu_cpu_kthread_setup,
-- .park = rcu_cpu_kthread_park,
--};
--
- /*
- * Spawn boost kthreads -- called as soon as the scheduler is running.
- */
- static void __init rcu_spawn_boost_kthreads(void)
- {
- struct rcu_node *rnp;
-- int cpu;
--
-- for_each_possible_cpu(cpu)
-- per_cpu(rcu_cpu_has_work, cpu) = 0;
-- BUG_ON(smpboot_register_percpu_thread(&rcu_cpu_thread_spec));
- rcu_for_each_leaf_node(rcu_state_p, rnp)
- (void)rcu_spawn_one_boost_kthread(rcu_state_p, rnp);
- }
-@@ -1216,11 +1111,6 @@ static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags)
- raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
- }
-
--static void invoke_rcu_callbacks_kthread(void)
--{
-- WARN_ON_ONCE(1);
--}
--
- static bool rcu_is_callbacks_kthread(void)
- {
- return false;
-@@ -1244,7 +1134,7 @@ static void rcu_prepare_kthreads(int cpu)
-
- #endif /* #else #ifdef CONFIG_RCU_BOOST */
-
--#if !defined(CONFIG_RCU_FAST_NO_HZ)
-+#if !defined(CONFIG_RCU_FAST_NO_HZ) || defined(CONFIG_PREEMPT_RT_FULL)
-
- /*
- * Check to see if any future RCU-related work will need to be done
-@@ -1261,7 +1151,9 @@ int rcu_needs_cpu(u64 basemono, u64 *nextevt)
- return IS_ENABLED(CONFIG_RCU_NOCB_CPU_ALL)
- ? 0 : rcu_cpu_has_callbacks(NULL);
- }
-+#endif /* !defined(CONFIG_RCU_FAST_NO_HZ) || defined(CONFIG_PREEMPT_RT_FULL) */
-
-+#if !defined(CONFIG_RCU_FAST_NO_HZ)
- /*
- * Because we do not have RCU_FAST_NO_HZ, don't bother cleaning up
- * after it.
-@@ -1357,6 +1249,8 @@ static bool __maybe_unused rcu_try_advance_all_cbs(void)
- return cbs_ready;
- }
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+
- /*
- * Allow the CPU to enter dyntick-idle mode unless it has callbacks ready
- * to invoke. If the CPU has callbacks, try to advance them. Tell the
-@@ -1402,6 +1296,7 @@ int rcu_needs_cpu(u64 basemono, u64 *nextevt)
- *nextevt = basemono + dj * TICK_NSEC;
- return 0;
- }
-+#endif /* #ifndef CONFIG_PREEMPT_RT_FULL */
-
- /*
- * Prepare a CPU for idle from an RCU perspective. The first major task
-diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
-index f0d8322..b40d346 100644
---- a/kernel/rcu/update.c
-+++ b/kernel/rcu/update.c
-@@ -295,6 +295,7 @@ int rcu_read_lock_held(void)
- }
- EXPORT_SYMBOL_GPL(rcu_read_lock_held);
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- /**
- * rcu_read_lock_bh_held() - might we be in RCU-bh read-side critical section?
- *
-@@ -321,6 +322,7 @@ int rcu_read_lock_bh_held(void)
- return in_softirq() || irqs_disabled();
- }
- EXPORT_SYMBOL_GPL(rcu_read_lock_bh_held);
-+#endif
-
- #endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */
-
-diff --git a/kernel/relay.c b/kernel/relay.c
-index d797502..cf05c17 100644
---- a/kernel/relay.c
-+++ b/kernel/relay.c
-@@ -336,6 +336,10 @@ static void wakeup_readers(unsigned long data)
- {
- struct rchan_buf *buf = (struct rchan_buf *)data;
- wake_up_interruptible(&buf->read_wait);
-+ /*
-+ * Stupid polling for now:
-+ */
-+ mod_timer(&buf->timer, jiffies + 1);
- }
-
- /**
-@@ -353,6 +357,7 @@ static void __relay_reset(struct rchan_buf *buf, unsigned int init)
- init_waitqueue_head(&buf->read_wait);
- kref_init(&buf->kref);
- setup_timer(&buf->timer, wakeup_readers, (unsigned long)buf);
-+ mod_timer(&buf->timer, jiffies + 1);
- } else
- del_timer_sync(&buf->timer);
-
-@@ -767,15 +772,6 @@ size_t relay_switch_subbuf(struct rchan_buf *buf, size_t length)
- else
- buf->early_bytes += buf->chan->subbuf_size -
- buf->padding[old_subbuf];
-- smp_mb();
-- if (waitqueue_active(&buf->read_wait))
-- /*
-- * Calling wake_up_interruptible() from here
-- * will deadlock if we happen to be logging
-- * from the scheduler (trying to re-grab
-- * rq->lock), so defer it.
-- */
-- mod_timer(&buf->timer, jiffies + 1);
- }
-
- old = buf->data;
-diff --git a/kernel/sched/Makefile b/kernel/sched/Makefile
-index 5e59b83..7337a7f 100644
---- a/kernel/sched/Makefile
-+++ b/kernel/sched/Makefile
-@@ -17,7 +17,7 @@ endif
-
- obj-y += core.o loadavg.o clock.o cputime.o
- obj-y += idle_task.o fair.o rt.o deadline.o stop_task.o
--obj-y += wait.o swait.o completion.o idle.o
-+obj-y += wait.o swait.o swork.o completion.o idle.o
- obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o
- obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o
- obj-$(CONFIG_SCHEDSTATS) += stats.o
-diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
-index 8d0f35d..b62cf64 100644
---- a/kernel/sched/completion.c
-+++ b/kernel/sched/completion.c
-@@ -30,10 +30,10 @@ void complete(struct completion *x)
- {
- unsigned long flags;
-
-- spin_lock_irqsave(&x->wait.lock, flags);
-+ raw_spin_lock_irqsave(&x->wait.lock, flags);
- x->done++;
-- __wake_up_locked(&x->wait, TASK_NORMAL, 1);
-- spin_unlock_irqrestore(&x->wait.lock, flags);
-+ swake_up_locked(&x->wait);
-+ raw_spin_unlock_irqrestore(&x->wait.lock, flags);
- }
- EXPORT_SYMBOL(complete);
-
-@@ -50,10 +50,10 @@ void complete_all(struct completion *x)
- {
- unsigned long flags;
-
-- spin_lock_irqsave(&x->wait.lock, flags);
-+ raw_spin_lock_irqsave(&x->wait.lock, flags);
- x->done += UINT_MAX/2;
-- __wake_up_locked(&x->wait, TASK_NORMAL, 0);
-- spin_unlock_irqrestore(&x->wait.lock, flags);
-+ swake_up_all_locked(&x->wait);
-+ raw_spin_unlock_irqrestore(&x->wait.lock, flags);
- }
- EXPORT_SYMBOL(complete_all);
-
-@@ -62,20 +62,20 @@ do_wait_for_common(struct completion *x,
- long (*action)(long), long timeout, int state)
- {
- if (!x->done) {
-- DECLARE_WAITQUEUE(wait, current);
-+ DECLARE_SWAITQUEUE(wait);
-
-- __add_wait_queue_tail_exclusive(&x->wait, &wait);
-+ __prepare_to_swait(&x->wait, &wait);
- do {
- if (signal_pending_state(state, current)) {
- timeout = -ERESTARTSYS;
- break;
- }
- __set_current_state(state);
-- spin_unlock_irq(&x->wait.lock);
-+ raw_spin_unlock_irq(&x->wait.lock);
- timeout = action(timeout);
-- spin_lock_irq(&x->wait.lock);
-+ raw_spin_lock_irq(&x->wait.lock);
- } while (!x->done && timeout);
-- __remove_wait_queue(&x->wait, &wait);
-+ __finish_swait(&x->wait, &wait);
- if (!x->done)
- return timeout;
- }
-@@ -89,9 +89,9 @@ __wait_for_common(struct completion *x,
- {
- might_sleep();
-
-- spin_lock_irq(&x->wait.lock);
-+ raw_spin_lock_irq(&x->wait.lock);
- timeout = do_wait_for_common(x, action, timeout, state);
-- spin_unlock_irq(&x->wait.lock);
-+ raw_spin_unlock_irq(&x->wait.lock);
- return timeout;
- }
-
-@@ -277,12 +277,12 @@ bool try_wait_for_completion(struct completion *x)
- if (!READ_ONCE(x->done))
- return 0;
-
-- spin_lock_irqsave(&x->wait.lock, flags);
-+ raw_spin_lock_irqsave(&x->wait.lock, flags);
- if (!x->done)
- ret = 0;
- else
- x->done--;
-- spin_unlock_irqrestore(&x->wait.lock, flags);
-+ raw_spin_unlock_irqrestore(&x->wait.lock, flags);
- return ret;
- }
- EXPORT_SYMBOL(try_wait_for_completion);
-@@ -311,7 +311,7 @@ bool completion_done(struct completion *x)
- * after it's acquired the lock.
- */
- smp_rmb();
-- spin_unlock_wait(&x->wait.lock);
-+ raw_spin_unlock_wait(&x->wait.lock);
- return true;
- }
- EXPORT_SYMBOL(completion_done);
-diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index 44817c6..7566621 100644
---- a/kernel/sched/core.c
-+++ b/kernel/sched/core.c
-@@ -129,7 +129,11 @@ const_debug unsigned int sysctl_sched_features =
- * Number of tasks to iterate in a single balance run.
- * Limited because this is done with IRQs disabled.
- */
-+#ifndef CONFIG_PREEMPT_RT_FULL
- const_debug unsigned int sysctl_sched_nr_migrate = 32;
-+#else
-+const_debug unsigned int sysctl_sched_nr_migrate = 8;
-+#endif
-
- /*
- * period over which we average the RT time consumption, measured
-@@ -345,6 +349,7 @@ static void init_rq_hrtick(struct rq *rq)
-
- hrtimer_init(&rq->hrtick_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
- rq->hrtick_timer.function = hrtick;
-+ rq->hrtick_timer.irqsafe = 1;
- }
- #else /* CONFIG_SCHED_HRTICK */
- static inline void hrtick_clear(struct rq *rq)
-@@ -449,7 +454,7 @@ void wake_q_add(struct wake_q_head *head, struct task_struct *task)
- head->lastp = &node->next;
- }
-
--void wake_up_q(struct wake_q_head *head)
-+void __wake_up_q(struct wake_q_head *head, bool sleeper)
- {
- struct wake_q_node *node = head->first;
-
-@@ -466,7 +471,10 @@ void wake_up_q(struct wake_q_head *head)
- * wake_up_process() implies a wmb() to pair with the queueing
- * in wake_q_add() so as not to miss wakeups.
- */
-- wake_up_process(task);
-+ if (sleeper)
-+ wake_up_lock_sleeper(task);
-+ else
-+ wake_up_process(task);
- put_task_struct(task);
- }
- }
-@@ -502,6 +510,38 @@ void resched_curr(struct rq *rq)
- trace_sched_wake_idle_without_ipi(cpu);
- }
-
-+#ifdef CONFIG_PREEMPT_LAZY
-+void resched_curr_lazy(struct rq *rq)
-+{
-+ struct task_struct *curr = rq->curr;
-+ int cpu;
-+
-+ if (!sched_feat(PREEMPT_LAZY)) {
-+ resched_curr(rq);
-+ return;
-+ }
-+
-+ lockdep_assert_held(&rq->lock);
-+
-+ if (test_tsk_need_resched(curr))
-+ return;
-+
-+ if (test_tsk_need_resched_lazy(curr))
-+ return;
-+
-+ set_tsk_need_resched_lazy(curr);
-+
-+ cpu = cpu_of(rq);
-+ if (cpu == smp_processor_id())
-+ return;
-+
-+ /* NEED_RESCHED_LAZY must be visible before we test polling */
-+ smp_mb();
-+ if (!tsk_is_polling(curr))
-+ smp_send_reschedule(cpu);
-+}
-+#endif
-+
- void resched_cpu(int cpu)
- {
- struct rq *rq = cpu_rq(cpu);
-@@ -525,11 +565,14 @@ void resched_cpu(int cpu)
- */
- int get_nohz_timer_target(void)
- {
-- int i, cpu = smp_processor_id();
-+ int i, cpu;
- struct sched_domain *sd;
-
-+ preempt_disable_rt();
-+ cpu = smp_processor_id();
-+
- if (!idle_cpu(cpu) && is_housekeeping_cpu(cpu))
-- return cpu;
-+ goto preempt_en_rt;
-
- rcu_read_lock();
- for_each_domain(cpu, sd) {
-@@ -548,6 +591,8 @@ int get_nohz_timer_target(void)
- cpu = housekeeping_any_cpu();
- unlock:
- rcu_read_unlock();
-+preempt_en_rt:
-+ preempt_enable_rt();
- return cpu;
- }
- /*
-@@ -1089,6 +1134,11 @@ void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask)
-
- lockdep_assert_held(&p->pi_lock);
-
-+ if (__migrate_disabled(p)) {
-+ cpumask_copy(&p->cpus_allowed, new_mask);
-+ return;
-+ }
-+
- queued = task_on_rq_queued(p);
- running = task_current(rq, p);
-
-@@ -1111,6 +1161,84 @@ void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask)
- enqueue_task(rq, p, ENQUEUE_RESTORE);
- }
-
-+static DEFINE_PER_CPU(struct cpumask, sched_cpumasks);
-+static DEFINE_MUTEX(sched_down_mutex);
-+static cpumask_t sched_down_cpumask;
-+
-+void tell_sched_cpu_down_begin(int cpu)
-+{
-+ mutex_lock(&sched_down_mutex);
-+ cpumask_set_cpu(cpu, &sched_down_cpumask);
-+ mutex_unlock(&sched_down_mutex);
-+}
-+
-+void tell_sched_cpu_down_done(int cpu)
-+{
-+ mutex_lock(&sched_down_mutex);
-+ cpumask_clear_cpu(cpu, &sched_down_cpumask);
-+ mutex_unlock(&sched_down_mutex);
-+}
-+
-+/**
-+ * migrate_me - try to move the current task off this cpu
-+ *
-+ * Used by the pin_current_cpu() code to try to get tasks
-+ * to move off the current CPU as it is going down.
-+ * It will only move the task if the task isn't pinned to
-+ * the CPU (with migrate_disable, affinity or NO_SETAFFINITY)
-+ * and the task has to be in a RUNNING state. Otherwise the
-+ * movement of the task will wake it up (change its state
-+ * to running) when the task did not expect it.
-+ *
-+ * Returns 1 if it succeeded in moving the current task
-+ * 0 otherwise.
-+ */
-+int migrate_me(void)
-+{
-+ struct task_struct *p = current;
-+ struct migration_arg arg;
-+ struct cpumask *cpumask;
-+ struct cpumask *mask;
-+ unsigned int dest_cpu;
-+ struct rq_flags rf;
-+ struct rq *rq;
-+
-+ /*
-+ * We can not migrate tasks bounded to a CPU or tasks not
-+ * running. The movement of the task will wake it up.
-+ */
-+ if (p->flags & PF_NO_SETAFFINITY || p->state)
-+ return 0;
-+
-+ mutex_lock(&sched_down_mutex);
-+ rq = task_rq_lock(p, &rf);
-+
-+ cpumask = this_cpu_ptr(&sched_cpumasks);
-+ mask = &p->cpus_allowed;
-+
-+ cpumask_andnot(cpumask, mask, &sched_down_cpumask);
-+
-+ if (!cpumask_weight(cpumask)) {
-+ /* It's only on this CPU? */
-+ task_rq_unlock(rq, p, &rf);
-+ mutex_unlock(&sched_down_mutex);
-+ return 0;
-+ }
-+
-+ dest_cpu = cpumask_any_and(cpu_active_mask, cpumask);
-+
-+ arg.task = p;
-+ arg.dest_cpu = dest_cpu;
-+
-+ task_rq_unlock(rq, p, &rf);
-+
-+ stop_one_cpu(cpu_of(rq), migration_cpu_stop, &arg);
-+ tlb_migrate_finish(p->mm);
-+ mutex_unlock(&sched_down_mutex);
-+
-+ return 1;
-+}
-+
- /*
- * Change a given task's CPU affinity. Migrate the thread to a
- * proper CPU and schedule it away if the CPU it's executing on
-@@ -1168,7 +1296,7 @@ static int __set_cpus_allowed_ptr(struct task_struct *p,
- }
-
- /* Can the task run on the task's current CPU? If so, we're done */
-- if (cpumask_test_cpu(task_cpu(p), new_mask))
-+ if (cpumask_test_cpu(task_cpu(p), new_mask) || __migrate_disabled(p))
- goto out;
-
- dest_cpu = cpumask_any_and(cpu_valid_mask, new_mask);
-@@ -1355,6 +1483,18 @@ out:
- return ret;
- }
-
-+static bool check_task_state(struct task_struct *p, long match_state)
-+{
-+ bool match = false;
-+
-+ raw_spin_lock_irq(&p->pi_lock);
-+ if (p->state == match_state || p->saved_state == match_state)
-+ match = true;
-+ raw_spin_unlock_irq(&p->pi_lock);
-+
-+ return match;
-+}
-+
- /*
- * wait_task_inactive - wait for a thread to unschedule.
- *
-@@ -1399,7 +1539,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
- * is actually now running somewhere else!
- */
- while (task_running(rq, p)) {
-- if (match_state && unlikely(p->state != match_state))
-+ if (match_state && !check_task_state(p, match_state))
- return 0;
- cpu_relax();
- }
-@@ -1414,7 +1554,8 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
- running = task_running(rq, p);
- queued = task_on_rq_queued(p);
- ncsw = 0;
-- if (!match_state || p->state == match_state)
-+ if (!match_state || p->state == match_state ||
-+ p->saved_state == match_state)
- ncsw = p->nvcsw | LONG_MIN; /* sets MSB */
- task_rq_unlock(rq, p, &rf);
-
-@@ -1670,10 +1811,6 @@ static inline void ttwu_activate(struct rq *rq, struct task_struct *p, int en_fl
- {
- activate_task(rq, p, en_flags);
- p->on_rq = TASK_ON_RQ_QUEUED;
--
-- /* if a worker is waking up, notify workqueue */
-- if (p->flags & PF_WQ_WORKER)
-- wq_worker_waking_up(p, cpu_of(rq));
- }
-
- /*
-@@ -2008,8 +2145,27 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
- */
- smp_mb__before_spinlock();
- raw_spin_lock_irqsave(&p->pi_lock, flags);
-- if (!(p->state & state))
-+ if (!(p->state & state)) {
-+ /*
-+ * The task might be running due to a spinlock sleeper
-+ * wakeup. Check the saved state and set it to running
-+ * if the wakeup condition is true.
-+ */
-+ if (!(wake_flags & WF_LOCK_SLEEPER)) {
-+ if (p->saved_state & state) {
-+ p->saved_state = TASK_RUNNING;
-+ success = 1;
-+ }
-+ }
- goto out;
-+ }
-+
-+ /*
-+ * If this is a regular wakeup, then we can unconditionally
-+ * clear the saved state of a "lock sleeper".
-+ */
-+ if (!(wake_flags & WF_LOCK_SLEEPER))
-+ p->saved_state = TASK_RUNNING;
-
- trace_sched_waking(p);
-
-@@ -2093,53 +2249,6 @@ out:
- }
-
- /**
-- * try_to_wake_up_local - try to wake up a local task with rq lock held
-- * @p: the thread to be awakened
-- *
-- * Put @p on the run-queue if it's not already there. The caller must
-- * ensure that this_rq() is locked, @p is bound to this_rq() and not
-- * the current task.
-- */
--static void try_to_wake_up_local(struct task_struct *p, struct pin_cookie cookie)
--{
-- struct rq *rq = task_rq(p);
--
-- if (WARN_ON_ONCE(rq != this_rq()) ||
-- WARN_ON_ONCE(p == current))
-- return;
--
-- lockdep_assert_held(&rq->lock);
--
-- if (!raw_spin_trylock(&p->pi_lock)) {
-- /*
-- * This is OK, because current is on_cpu, which avoids it being
-- * picked for load-balance and preemption/IRQs are still
-- * disabled avoiding further scheduler activity on it and we've
-- * not yet picked a replacement task.
-- */
-- lockdep_unpin_lock(&rq->lock, cookie);
-- raw_spin_unlock(&rq->lock);
-- raw_spin_lock(&p->pi_lock);
-- raw_spin_lock(&rq->lock);
-- lockdep_repin_lock(&rq->lock, cookie);
-- }
--
-- if (!(p->state & TASK_NORMAL))
-- goto out;
--
-- trace_sched_waking(p);
--
-- if (!task_on_rq_queued(p))
-- ttwu_activate(rq, p, ENQUEUE_WAKEUP);
--
-- ttwu_do_wakeup(rq, p, 0, cookie);
-- if (schedstat_enabled())
-- ttwu_stat(p, smp_processor_id(), 0);
--out:
-- raw_spin_unlock(&p->pi_lock);
--}
--
--/**
- * wake_up_process - Wake up a specific process
- * @p: The process to be woken up.
- *
-@@ -2157,6 +2266,18 @@ int wake_up_process(struct task_struct *p)
- }
- EXPORT_SYMBOL(wake_up_process);
-
-+/**
-+ * wake_up_lock_sleeper - Wake up a specific process blocked on a "sleeping lock"
-+ * @p: The process to be woken up.
-+ *
-+ * Same as wake_up_process() above, but wake_flags=WF_LOCK_SLEEPER to indicate
-+ * the nature of the wakeup.
-+ */
-+int wake_up_lock_sleeper(struct task_struct *p)
-+{
-+ return try_to_wake_up(p, TASK_ALL, WF_LOCK_SLEEPER);
-+}
-+
- int wake_up_state(struct task_struct *p, unsigned int state)
- {
- return try_to_wake_up(p, state, 0);
-@@ -2433,6 +2554,9 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p)
- p->on_cpu = 0;
- #endif
- init_task_preempt_count(p);
-+#ifdef CONFIG_HAVE_PREEMPT_LAZY
-+ task_thread_info(p)->preempt_lazy_count = 0;
-+#endif
- #ifdef CONFIG_SMP
- plist_node_init(&p->pushable_tasks, MAX_PRIO);
- RB_CLEAR_NODE(&p->pushable_dl_tasks);
-@@ -2761,8 +2885,12 @@ static struct rq *finish_task_switch(struct task_struct *prev)
- finish_arch_post_lock_switch();
-
- fire_sched_in_preempt_notifiers(current);
-+ /*
-+ * We use mmdrop_delayed() here so we don't have to do the
-+ * full __mmdrop() when we are the last user.
-+ */
- if (mm)
-- mmdrop(mm);
-+ mmdrop_delayed(mm);
- if (unlikely(prev_state == TASK_DEAD)) {
- if (prev->sched_class->task_dead)
- prev->sched_class->task_dead(prev);
-@@ -3237,6 +3365,77 @@ static inline void schedule_debug(struct task_struct *prev)
- schedstat_inc(this_rq(), sched_count);
- }
-
-+#if defined(CONFIG_PREEMPT_RT_FULL) && defined(CONFIG_SMP)
-+
-+void migrate_disable(void)
-+{
-+ struct task_struct *p = current;
-+
-+ if (in_atomic() || irqs_disabled()) {
-+#ifdef CONFIG_SCHED_DEBUG
-+ p->migrate_disable_atomic++;
-+#endif
-+ return;
-+ }
-+
-+#ifdef CONFIG_SCHED_DEBUG
-+ if (unlikely(p->migrate_disable_atomic)) {
-+ tracing_off();
-+ WARN_ON_ONCE(1);
-+ }
-+#endif
-+
-+ if (p->migrate_disable) {
-+ p->migrate_disable++;
-+ return;
-+ }
-+
-+ preempt_disable();
-+ preempt_lazy_disable();
-+ pin_current_cpu();
-+ p->migrate_disable = 1;
-+ preempt_enable();
-+}
-+EXPORT_SYMBOL(migrate_disable);
-+
-+void migrate_enable(void)
-+{
-+ struct task_struct *p = current;
-+
-+ if (in_atomic() || irqs_disabled()) {
-+#ifdef CONFIG_SCHED_DEBUG
-+ p->migrate_disable_atomic--;
-+#endif
-+ return;
-+ }
-+
-+#ifdef CONFIG_SCHED_DEBUG
-+ if (unlikely(p->migrate_disable_atomic)) {
-+ tracing_off();
-+ WARN_ON_ONCE(1);
-+ }
-+#endif
-+ WARN_ON_ONCE(p->migrate_disable <= 0);
-+
-+ if (p->migrate_disable > 1) {
-+ p->migrate_disable--;
-+ return;
-+ }
-+
-+ preempt_disable();
-+ /*
-+ * Clearing migrate_disable causes tsk_cpus_allowed to
-+ * show the tasks original cpu affinity.
-+ */
-+ p->migrate_disable = 0;
-+
-+ unpin_current_cpu();
-+ preempt_enable();
-+ preempt_lazy_enable();
-+}
-+EXPORT_SYMBOL(migrate_enable);
-+#endif
-+
- /*
- * Pick up the highest-prio task:
- */
-@@ -3364,19 +3563,6 @@ static void __sched notrace __schedule(bool preempt)
- } else {
- deactivate_task(rq, prev, DEQUEUE_SLEEP);
- prev->on_rq = 0;
--
-- /*
-- * If a worker went to sleep, notify and ask workqueue
-- * whether it wants to wake up a task to maintain
-- * concurrency.
-- */
-- if (prev->flags & PF_WQ_WORKER) {
-- struct task_struct *to_wakeup;
--
-- to_wakeup = wq_worker_sleeping(prev);
-- if (to_wakeup)
-- try_to_wake_up_local(to_wakeup, cookie);
-- }
- }
- switch_count = &prev->nvcsw;
- }
-@@ -3386,6 +3572,7 @@ static void __sched notrace __schedule(bool preempt)
-
- next = pick_next_task(rq, prev, cookie);
- clear_tsk_need_resched(prev);
-+ clear_tsk_need_resched_lazy(prev);
- clear_preempt_need_resched();
- rq->clock_skip_update = 0;
-
-@@ -3407,9 +3594,20 @@ STACK_FRAME_NON_STANDARD(__schedule); /* switch_to() */
-
- static inline void sched_submit_work(struct task_struct *tsk)
- {
-- if (!tsk->state || tsk_is_pi_blocked(tsk))
-+ if (!tsk->state)
- return;
- /*
-+ * If a worker went to sleep, notify and ask workqueue whether
-+ * it wants to wake up a task to maintain concurrency.
-+ */
-+ if (tsk->flags & PF_WQ_WORKER)
-+ wq_worker_sleeping(tsk);
-+
-+
-+ if (tsk_is_pi_blocked(tsk))
-+ return;
-+
-+ /*
- * If we are going to sleep and we have plugged IO queued,
- * make sure to submit it to avoid deadlocks.
- */
-@@ -3417,6 +3615,12 @@ static inline void sched_submit_work(struct task_struct *tsk)
- blk_schedule_flush_plug(tsk);
- }
-
-+static void sched_update_worker(struct task_struct *tsk)
-+{
-+ if (tsk->flags & PF_WQ_WORKER)
-+ wq_worker_running(tsk);
-+}
-+
- asmlinkage __visible void __sched schedule(void)
- {
- struct task_struct *tsk = current;
-@@ -3427,6 +3631,7 @@ asmlinkage __visible void __sched schedule(void)
- __schedule(false);
- sched_preempt_enable_no_resched();
- } while (need_resched());
-+ sched_update_worker(tsk);
- }
- EXPORT_SYMBOL(schedule);
-
-@@ -3490,6 +3695,30 @@ static void __sched notrace preempt_schedule_common(void)
- } while (need_resched());
- }
-
-+#ifdef CONFIG_PREEMPT_LAZY
-+/*
-+ * If TIF_NEED_RESCHED is then we allow to be scheduled away since this is
-+ * set by a RT task. Oterwise we try to avoid beeing scheduled out as long as
-+ * preempt_lazy_count counter >0.
-+ */
-+static __always_inline int preemptible_lazy(void)
-+{
-+ if (test_thread_flag(TIF_NEED_RESCHED))
-+ return 1;
-+ if (current_thread_info()->preempt_lazy_count)
-+ return 0;
-+ return 1;
-+}
-+
-+#else
-+
-+static inline int preemptible_lazy(void)
-+{
-+ return 1;
-+}
-+
-+#endif
-+
- #ifdef CONFIG_PREEMPT
- /*
- * this is the entry point to schedule() from in-kernel preemption
-@@ -3504,7 +3733,8 @@ asmlinkage __visible void __sched notrace preempt_schedule(void)
- */
- if (likely(!preemptible()))
- return;
--
-+ if (!preemptible_lazy())
-+ return;
- preempt_schedule_common();
- }
- NOKPROBE_SYMBOL(preempt_schedule);
-@@ -3531,6 +3761,9 @@ asmlinkage __visible void __sched notrace preempt_schedule_notrace(void)
- if (likely(!preemptible()))
- return;
-
-+ if (!preemptible_lazy())
-+ return;
-+
- do {
- /*
- * Because the function tracer can trace preempt_count_sub()
-@@ -3553,7 +3786,16 @@ asmlinkage __visible void __sched notrace preempt_schedule_notrace(void)
- * an infinite recursion.
- */
- prev_ctx = exception_enter();
-+ /*
-+ * The add/subtract must not be traced by the function
-+ * tracer. But we still want to account for the
-+ * preempt off latency tracer. Since the _notrace versions
-+ * of add/subtract skip the accounting for latency tracer
-+ * we must force it manually.
-+ */
-+ start_critical_timings();
- __schedule(true);
-+ stop_critical_timings();
- exception_exit(prev_ctx);
-
- preempt_latency_stop(1);
-@@ -4901,6 +5143,7 @@ int __cond_resched_lock(spinlock_t *lock)
- }
- EXPORT_SYMBOL(__cond_resched_lock);
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- int __sched __cond_resched_softirq(void)
- {
- BUG_ON(!in_softirq());
-@@ -4914,6 +5157,7 @@ int __sched __cond_resched_softirq(void)
- return 0;
- }
- EXPORT_SYMBOL(__cond_resched_softirq);
-+#endif
-
- /**
- * yield - yield the current processor to other threads.
-@@ -5283,7 +5527,9 @@ void init_idle(struct task_struct *idle, int cpu)
-
- /* Set the preempt count _outside_ the spinlocks! */
- init_idle_preempt_count(idle, cpu);
--
-+#ifdef CONFIG_HAVE_PREEMPT_LAZY
-+ task_thread_info(idle)->preempt_lazy_count = 0;
-+#endif
- /*
- * The idle tasks have their own, simple scheduling class:
- */
-@@ -5426,6 +5672,8 @@ void sched_setnuma(struct task_struct *p, int nid)
- #endif /* CONFIG_NUMA_BALANCING */
-
- #ifdef CONFIG_HOTPLUG_CPU
-+static DEFINE_PER_CPU(struct mm_struct *, idle_last_mm);
-+
- /*
- * Ensures that the idle task is using init_mm right before its cpu goes
- * offline.
-@@ -5440,7 +5688,12 @@ void idle_task_exit(void)
- switch_mm_irqs_off(mm, &init_mm, current);
- finish_arch_post_lock_switch();
- }
-- mmdrop(mm);
-+ /*
-+ * Defer the cleanup to an alive cpu. On RT we can neither
-+ * call mmdrop() nor mmdrop_delayed() from here.
-+ */
-+ per_cpu(idle_last_mm, smp_processor_id()) = mm;
-+
- }
-
- /*
-@@ -7315,6 +7568,10 @@ int sched_cpu_dying(unsigned int cpu)
- update_max_interval();
- nohz_balance_exit_idle(cpu);
- hrtick_clear(rq);
-+ if (per_cpu(idle_last_mm, cpu)) {
-+ mmdrop(per_cpu(idle_last_mm, cpu));
-+ per_cpu(idle_last_mm, cpu) = NULL;
-+ }
- return 0;
- }
- #endif
-@@ -7566,7 +7823,7 @@ void __init sched_init(void)
- #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
- static inline int preempt_count_equals(int preempt_offset)
- {
-- int nested = preempt_count() + rcu_preempt_depth();
-+ int nested = preempt_count() + sched_rcu_preempt_depth();
-
- return (nested == preempt_offset);
- }
-diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
-index 1ce8867..766da04 100644
---- a/kernel/sched/deadline.c
-+++ b/kernel/sched/deadline.c
-@@ -697,6 +697,7 @@ void init_dl_task_timer(struct sched_dl_entity *dl_se)
-
- hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
- timer->function = dl_task_timer;
-+ timer->irqsafe = 1;
- }
-
- static
-diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
-index 2a0a999..48a9b6f 100644
---- a/kernel/sched/debug.c
-+++ b/kernel/sched/debug.c
-@@ -552,6 +552,9 @@ void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq)
- P(rt_throttled);
- PN(rt_time);
- PN(rt_runtime);
-+#ifdef CONFIG_SMP
-+ P(rt_nr_migratory);
-+#endif
-
- #undef PN
- #undef P
-@@ -947,6 +950,10 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
- #endif
- P(policy);
- P(prio);
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ P(migrate_disable);
-+#endif
-+ P(nr_cpus_allowed);
- #undef PN
- #undef __PN
- #undef P
-diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
-index 039de34..678399d 100644
---- a/kernel/sched/fair.c
-+++ b/kernel/sched/fair.c
-@@ -3486,7 +3486,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
- ideal_runtime = sched_slice(cfs_rq, curr);
- delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime;
- if (delta_exec > ideal_runtime) {
-- resched_curr(rq_of(cfs_rq));
-+ resched_curr_lazy(rq_of(cfs_rq));
- /*
- * The current task ran long enough, ensure it doesn't get
- * re-elected due to buddy favours.
-@@ -3510,7 +3510,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
- return;
-
- if (delta > ideal_runtime)
-- resched_curr(rq_of(cfs_rq));
-+ resched_curr_lazy(rq_of(cfs_rq));
- }
-
- static void
-@@ -3655,7 +3655,7 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued)
- * validating it and just reschedule.
- */
- if (queued) {
-- resched_curr(rq_of(cfs_rq));
-+ resched_curr_lazy(rq_of(cfs_rq));
- return;
- }
- /*
-@@ -3837,7 +3837,7 @@ static void __account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec)
- * hierarchy can be throttled
- */
- if (!assign_cfs_rq_runtime(cfs_rq) && likely(cfs_rq->curr))
-- resched_curr(rq_of(cfs_rq));
-+ resched_curr_lazy(rq_of(cfs_rq));
- }
-
- static __always_inline
-@@ -4465,7 +4465,7 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p)
-
- if (delta < 0) {
- if (rq->curr == p)
-- resched_curr(rq);
-+ resched_curr_lazy(rq);
- return;
- }
- hrtick_start(rq, delta);
-@@ -5654,7 +5654,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
- return;
-
- preempt:
-- resched_curr(rq);
-+ resched_curr_lazy(rq);
- /*
- * Only set the backward buddy when the current task is still
- * on the rq. This can happen when a wakeup gets interleaved
-@@ -8380,7 +8380,7 @@ static void task_fork_fair(struct task_struct *p)
- * 'current' within the tree based on its new key value.
- */
- swap(curr->vruntime, se->vruntime);
-- resched_curr(rq);
-+ resched_curr_lazy(rq);
- }
-
- se->vruntime -= cfs_rq->min_vruntime;
-@@ -8404,7 +8404,7 @@ prio_changed_fair(struct rq *rq, struct task_struct *p, int oldprio)
- */
- if (rq->curr == p) {
- if (p->prio > oldprio)
-- resched_curr(rq);
-+ resched_curr_lazy(rq);
- } else
- check_preempt_curr(rq, p, 0);
- }
-diff --git a/kernel/sched/features.h b/kernel/sched/features.h
-index 69631fa..6d28fcd 100644
---- a/kernel/sched/features.h
-+++ b/kernel/sched/features.h
-@@ -45,11 +45,19 @@ SCHED_FEAT(LB_BIAS, true)
- */
- SCHED_FEAT(NONTASK_CAPACITY, true)
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+SCHED_FEAT(TTWU_QUEUE, false)
-+# ifdef CONFIG_PREEMPT_LAZY
-+SCHED_FEAT(PREEMPT_LAZY, true)
-+# endif
-+#else
-+
- /*
- * Queue remote wakeups on the target CPU and process them
- * using the scheduler IPI. Reduces rq->lock contention/bounces.
- */
- SCHED_FEAT(TTWU_QUEUE, true)
-+#endif
-
- #ifdef HAVE_RT_PUSH_IPI
- /*
-diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
-index d5690b7..731cd0e 100644
---- a/kernel/sched/rt.c
-+++ b/kernel/sched/rt.c
-@@ -47,6 +47,7 @@ void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime)
-
- hrtimer_init(&rt_b->rt_period_timer,
- CLOCK_MONOTONIC, HRTIMER_MODE_REL);
-+ rt_b->rt_period_timer.irqsafe = 1;
- rt_b->rt_period_timer.function = sched_rt_period_timer;
- }
-
-@@ -101,6 +102,7 @@ void init_rt_rq(struct rt_rq *rt_rq)
- rt_rq->push_cpu = nr_cpu_ids;
- raw_spin_lock_init(&rt_rq->push_lock);
- init_irq_work(&rt_rq->push_work, push_irq_work_func);
-+ rt_rq->push_work.flags |= IRQ_WORK_HARD_IRQ;
- #endif
- #endif /* CONFIG_SMP */
- /* We start is dequeued state, because no RT tasks are queued */
-diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
-index c64fc51..af58f9b3 100644
---- a/kernel/sched/sched.h
-+++ b/kernel/sched/sched.h
-@@ -1138,6 +1138,7 @@ static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev)
- #define WF_SYNC 0x01 /* waker goes to sleep after wakeup */
- #define WF_FORK 0x02 /* child wakeup after fork */
- #define WF_MIGRATED 0x4 /* internal use, task got migrated */
-+#define WF_LOCK_SLEEPER 0x08 /* wakeup spinlock "sleeper" */
-
- /*
- * To aid in avoiding the subversion of "niceness" due to uneven distribution
-@@ -1316,6 +1317,15 @@ extern void init_sched_fair_class(void);
- extern void resched_curr(struct rq *rq);
- extern void resched_cpu(int cpu);
-
-+#ifdef CONFIG_PREEMPT_LAZY
-+extern void resched_curr_lazy(struct rq *rq);
-+#else
-+static inline void resched_curr_lazy(struct rq *rq)
-+{
-+ resched_curr(rq);
-+}
-+#endif
-+
- extern struct rt_bandwidth def_rt_bandwidth;
- extern void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime);
-
-diff --git a/kernel/sched/swait.c b/kernel/sched/swait.c
-index 82f0dff..ef027ff 100644
---- a/kernel/sched/swait.c
-+++ b/kernel/sched/swait.c
-@@ -1,5 +1,6 @@
- #include <linux/sched.h>
- #include <linux/swait.h>
-+#include <linux/suspend.h>
-
- void __init_swait_queue_head(struct swait_queue_head *q, const char *name,
- struct lock_class_key *key)
-@@ -29,6 +30,25 @@ void swake_up_locked(struct swait_queue_head *q)
- }
- EXPORT_SYMBOL(swake_up_locked);
-
-+void swake_up_all_locked(struct swait_queue_head *q)
-+{
-+ struct swait_queue *curr;
-+ int wakes = 0;
-+
-+ while (!list_empty(&q->task_list)) {
-+
-+ curr = list_first_entry(&q->task_list, typeof(*curr),
-+ task_list);
-+ wake_up_process(curr->task);
-+ list_del_init(&curr->task_list);
-+ wakes++;
-+ }
-+ if (pm_in_action)
-+ return;
-+ WARN(wakes > 2, "complete_all() with %d waiters\n", wakes);
-+}
-+EXPORT_SYMBOL(swake_up_all_locked);
-+
- void swake_up(struct swait_queue_head *q)
- {
- unsigned long flags;
-@@ -54,6 +74,7 @@ void swake_up_all(struct swait_queue_head *q)
- if (!swait_active(q))
- return;
-
-+ WARN_ON(irqs_disabled());
- raw_spin_lock_irq(&q->lock);
- list_splice_init(&q->task_list, &tmp);
- while (!list_empty(&tmp)) {
-diff --git a/kernel/sched/swork.c b/kernel/sched/swork.c
-new file mode 100644
-index 0000000..1950f40
---- /dev/null
-+++ b/kernel/sched/swork.c
-@@ -0,0 +1,173 @@
-+/*
-+ * Copyright (C) 2014 BMW Car IT GmbH, Daniel Wagner daniel.wagner@bmw-carit.de
-+ *
-+ * Provides a framework for enqueuing callbacks from irq context
-+ * PREEMPT_RT_FULL safe. The callbacks are executed in kthread context.
-+ */
-+
-+#include <linux/swait.h>
-+#include <linux/swork.h>
-+#include <linux/kthread.h>
-+#include <linux/slab.h>
-+#include <linux/spinlock.h>
-+#include <linux/export.h>
-+
-+#define SWORK_EVENT_PENDING (1 << 0)
-+
-+static DEFINE_MUTEX(worker_mutex);
-+static struct sworker *glob_worker;
-+
-+struct sworker {
-+ struct list_head events;
-+ struct swait_queue_head wq;
-+
-+ raw_spinlock_t lock;
-+
-+ struct task_struct *task;
-+ int refs;
-+};
-+
-+static bool swork_readable(struct sworker *worker)
-+{
-+ bool r;
-+
-+ if (kthread_should_stop())
-+ return true;
-+
-+ raw_spin_lock_irq(&worker->lock);
-+ r = !list_empty(&worker->events);
-+ raw_spin_unlock_irq(&worker->lock);
-+
-+ return r;
-+}
-+
-+static int swork_kthread(void *arg)
-+{
-+ struct sworker *worker = arg;
-+
-+ for (;;) {
-+ swait_event_interruptible(worker->wq,
-+ swork_readable(worker));
-+ if (kthread_should_stop())
-+ break;
-+
-+ raw_spin_lock_irq(&worker->lock);
-+ while (!list_empty(&worker->events)) {
-+ struct swork_event *sev;
-+
-+ sev = list_first_entry(&worker->events,
-+ struct swork_event, item);
-+ list_del(&sev->item);
-+ raw_spin_unlock_irq(&worker->lock);
-+
-+ WARN_ON_ONCE(!test_and_clear_bit(SWORK_EVENT_PENDING,
-+ &sev->flags));
-+ sev->func(sev);
-+ raw_spin_lock_irq(&worker->lock);
-+ }
-+ raw_spin_unlock_irq(&worker->lock);
-+ }
-+ return 0;
-+}
-+
-+static struct sworker *swork_create(void)
-+{
-+ struct sworker *worker;
-+
-+ worker = kzalloc(sizeof(*worker), GFP_KERNEL);
-+ if (!worker)
-+ return ERR_PTR(-ENOMEM);
-+
-+ INIT_LIST_HEAD(&worker->events);
-+ raw_spin_lock_init(&worker->lock);
-+ init_swait_queue_head(&worker->wq);
-+
-+ worker->task = kthread_run(swork_kthread, worker, "kswork");
-+ if (IS_ERR(worker->task)) {
-+ kfree(worker);
-+ return ERR_PTR(-ENOMEM);
-+ }
-+
-+ return worker;
-+}
-+
-+static void swork_destroy(struct sworker *worker)
-+{
-+ kthread_stop(worker->task);
-+
-+ WARN_ON(!list_empty(&worker->events));
-+ kfree(worker);
-+}
-+
-+/**
-+ * swork_queue - queue swork
-+ *
-+ * Returns %false if @work was already on a queue, %true otherwise.
-+ *
-+ * The work is queued and processed on a random CPU
-+ */
-+bool swork_queue(struct swork_event *sev)
-+{
-+ unsigned long flags;
-+
-+ if (test_and_set_bit(SWORK_EVENT_PENDING, &sev->flags))
-+ return false;
-+
-+ raw_spin_lock_irqsave(&glob_worker->lock, flags);
-+ list_add_tail(&sev->item, &glob_worker->events);
-+ raw_spin_unlock_irqrestore(&glob_worker->lock, flags);
-+
-+ swake_up(&glob_worker->wq);
-+ return true;
-+}
-+EXPORT_SYMBOL_GPL(swork_queue);
-+
-+/**
-+ * swork_get - get an instance of the sworker
-+ *
-+ * Returns an negative error code if the initialization if the worker did not
-+ * work, %0 otherwise.
-+ *
-+ */
-+int swork_get(void)
-+{
-+ struct sworker *worker;
-+
-+ mutex_lock(&worker_mutex);
-+ if (!glob_worker) {
-+ worker = swork_create();
-+ if (IS_ERR(worker)) {
-+ mutex_unlock(&worker_mutex);
-+ return -ENOMEM;
-+ }
-+
-+ glob_worker = worker;
-+ }
-+
-+ glob_worker->refs++;
-+ mutex_unlock(&worker_mutex);
-+
-+ return 0;
-+}
-+EXPORT_SYMBOL_GPL(swork_get);
-+
-+/**
-+ * swork_put - puts an instance of the sworker
-+ *
-+ * Will destroy the sworker thread. This function must not be called until all
-+ * queued events have been completed.
-+ */
-+void swork_put(void)
-+{
-+ mutex_lock(&worker_mutex);
-+
-+ glob_worker->refs--;
-+ if (glob_worker->refs > 0)
-+ goto out;
-+
-+ swork_destroy(glob_worker);
-+ glob_worker = NULL;
-+out:
-+ mutex_unlock(&worker_mutex);
-+}
-+EXPORT_SYMBOL_GPL(swork_put);
-diff --git a/kernel/signal.c b/kernel/signal.c
-index af21afc..7ead97a 100644
---- a/kernel/signal.c
-+++ b/kernel/signal.c
-@@ -14,6 +14,7 @@
- #include <linux/export.h>
- #include <linux/init.h>
- #include <linux/sched.h>
-+#include <linux/sched/rt.h>
- #include <linux/fs.h>
- #include <linux/tty.h>
- #include <linux/binfmts.h>
-@@ -352,13 +353,30 @@ static bool task_participate_group_stop(struct task_struct *task)
- return false;
- }
-
-+static inline struct sigqueue *get_task_cache(struct task_struct *t)
-+{
-+ struct sigqueue *q = t->sigqueue_cache;
-+
-+ if (cmpxchg(&t->sigqueue_cache, q, NULL) != q)
-+ return NULL;
-+ return q;
-+}
-+
-+static inline int put_task_cache(struct task_struct *t, struct sigqueue *q)
-+{
-+ if (cmpxchg(&t->sigqueue_cache, NULL, q) == NULL)
-+ return 0;
-+ return 1;
-+}
-+
- /*
- * allocate a new signal queue record
- * - this may be called without locks if and only if t == current, otherwise an
- * appropriate lock must be held to stop the target task from exiting
- */
- static struct sigqueue *
--__sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimit)
-+__sigqueue_do_alloc(int sig, struct task_struct *t, gfp_t flags,
-+ int override_rlimit, int fromslab)
- {
- struct sigqueue *q = NULL;
- struct user_struct *user;
-@@ -375,7 +393,10 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
- if (override_rlimit ||
- atomic_read(&user->sigpending) <=
- task_rlimit(t, RLIMIT_SIGPENDING)) {
-- q = kmem_cache_alloc(sigqueue_cachep, flags);
-+ if (!fromslab)
-+ q = get_task_cache(t);
-+ if (!q)
-+ q = kmem_cache_alloc(sigqueue_cachep, flags);
- } else {
- print_dropped_signal(sig);
- }
-@@ -392,6 +413,13 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
- return q;
- }
-
-+static struct sigqueue *
-+__sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags,
-+ int override_rlimit)
-+{
-+ return __sigqueue_do_alloc(sig, t, flags, override_rlimit, 0);
-+}
-+
- static void __sigqueue_free(struct sigqueue *q)
- {
- if (q->flags & SIGQUEUE_PREALLOC)
-@@ -401,6 +429,21 @@ static void __sigqueue_free(struct sigqueue *q)
- kmem_cache_free(sigqueue_cachep, q);
- }
-
-+static void sigqueue_free_current(struct sigqueue *q)
-+{
-+ struct user_struct *up;
-+
-+ if (q->flags & SIGQUEUE_PREALLOC)
-+ return;
-+
-+ up = q->user;
-+ if (rt_prio(current->normal_prio) && !put_task_cache(current, q)) {
-+ atomic_dec(&up->sigpending);
-+ free_uid(up);
-+ } else
-+ __sigqueue_free(q);
-+}
-+
- void flush_sigqueue(struct sigpending *queue)
- {
- struct sigqueue *q;
-@@ -414,6 +457,21 @@ void flush_sigqueue(struct sigpending *queue)
- }
-
- /*
-+ * Called from __exit_signal. Flush tsk->pending and
-+ * tsk->sigqueue_cache
-+ */
-+void flush_task_sigqueue(struct task_struct *tsk)
-+{
-+ struct sigqueue *q;
-+
-+ flush_sigqueue(&tsk->pending);
-+
-+ q = get_task_cache(tsk);
-+ if (q)
-+ kmem_cache_free(sigqueue_cachep, q);
-+}
-+
-+/*
- * Flush all pending signals for this kthread.
- */
- void flush_signals(struct task_struct *t)
-@@ -525,7 +583,7 @@ static void collect_signal(int sig, struct sigpending *list, siginfo_t *info)
- still_pending:
- list_del_init(&first->list);
- copy_siginfo(info, &first->info);
-- __sigqueue_free(first);
-+ sigqueue_free_current(first);
- } else {
- /*
- * Ok, it wasn't in the queue. This must be
-@@ -560,6 +618,8 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
- {
- int signr;
-
-+ WARN_ON_ONCE(tsk != current);
-+
- /* We only dequeue private signals from ourselves, we don't let
- * signalfd steal them
- */
-@@ -1156,8 +1216,8 @@ int do_send_sig_info(int sig, struct siginfo *info, struct task_struct *p,
- * We don't want to have recursive SIGSEGV's etc, for example,
- * that is why we also clear SIGNAL_UNKILLABLE.
- */
--int
--force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
-+static int
-+do_force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
- {
- unsigned long int flags;
- int ret, blocked, ignored;
-@@ -1182,6 +1242,39 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
- return ret;
- }
-
-+int force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
-+{
-+/*
-+ * On some archs, PREEMPT_RT has to delay sending a signal from a trap
-+ * since it can not enable preemption, and the signal code's spin_locks
-+ * turn into mutexes. Instead, it must set TIF_NOTIFY_RESUME which will
-+ * send the signal on exit of the trap.
-+ */
-+#ifdef ARCH_RT_DELAYS_SIGNAL_SEND
-+ if (in_atomic()) {
-+ if (WARN_ON_ONCE(t != current))
-+ return 0;
-+ if (WARN_ON_ONCE(t->forced_info.si_signo))
-+ return 0;
-+
-+ if (is_si_special(info)) {
-+ WARN_ON_ONCE(info != SEND_SIG_PRIV);
-+ t->forced_info.si_signo = sig;
-+ t->forced_info.si_errno = 0;
-+ t->forced_info.si_code = SI_KERNEL;
-+ t->forced_info.si_pid = 0;
-+ t->forced_info.si_uid = 0;
-+ } else {
-+ t->forced_info = *info;
-+ }
-+
-+ set_tsk_thread_flag(t, TIF_NOTIFY_RESUME);
-+ return 0;
-+ }
-+#endif
-+ return do_force_sig_info(sig, info, t);
-+}
-+
- /*
- * Nuke all other threads in the group.
- */
-@@ -1216,12 +1309,12 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk,
- * Disable interrupts early to avoid deadlocks.
- * See rcu_read_unlock() comment header for details.
- */
-- local_irq_save(*flags);
-+ local_irq_save_nort(*flags);
- rcu_read_lock();
- sighand = rcu_dereference(tsk->sighand);
- if (unlikely(sighand == NULL)) {
- rcu_read_unlock();
-- local_irq_restore(*flags);
-+ local_irq_restore_nort(*flags);
- break;
- }
- /*
-@@ -1242,7 +1335,7 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk,
- }
- spin_unlock(&sighand->siglock);
- rcu_read_unlock();
-- local_irq_restore(*flags);
-+ local_irq_restore_nort(*flags);
- }
-
- return sighand;
-@@ -1485,7 +1578,8 @@ EXPORT_SYMBOL(kill_pid);
- */
- struct sigqueue *sigqueue_alloc(void)
- {
-- struct sigqueue *q = __sigqueue_alloc(-1, current, GFP_KERNEL, 0);
-+ /* Preallocated sigqueue objects always from the slabcache ! */
-+ struct sigqueue *q = __sigqueue_do_alloc(-1, current, GFP_KERNEL, 0, 1);
-
- if (q)
- q->flags |= SIGQUEUE_PREALLOC;
-@@ -1846,15 +1940,7 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
- if (gstop_done && ptrace_reparented(current))
- do_notify_parent_cldstop(current, false, why);
-
-- /*
-- * Don't want to allow preemption here, because
-- * sys_ptrace() needs this task to be inactive.
-- *
-- * XXX: implement read_unlock_no_resched().
-- */
-- preempt_disable();
- read_unlock(&tasklist_lock);
-- preempt_enable_no_resched();
- freezable_schedule();
- } else {
- /*
-diff --git a/kernel/softirq.c b/kernel/softirq.c
-index 17caf4b..a602b71 100644
---- a/kernel/softirq.c
-+++ b/kernel/softirq.c
-@@ -21,10 +21,12 @@
- #include <linux/freezer.h>
- #include <linux/kthread.h>
- #include <linux/rcupdate.h>
-+#include <linux/delay.h>
- #include <linux/ftrace.h>
- #include <linux/smp.h>
- #include <linux/smpboot.h>
- #include <linux/tick.h>
-+#include <linux/locallock.h>
- #include <linux/irq.h>
-
- #define CREATE_TRACE_POINTS
-@@ -56,12 +58,108 @@ EXPORT_SYMBOL(irq_stat);
- static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
-
- DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+#define TIMER_SOFTIRQS ((1 << TIMER_SOFTIRQ) | (1 << HRTIMER_SOFTIRQ))
-+DEFINE_PER_CPU(struct task_struct *, ktimer_softirqd);
-+#endif
-
- const char * const softirq_to_name[NR_SOFTIRQS] = {
- "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
- "TASKLET", "SCHED", "HRTIMER", "RCU"
- };
-
-+#ifdef CONFIG_NO_HZ_COMMON
-+# ifdef CONFIG_PREEMPT_RT_FULL
-+
-+struct softirq_runner {
-+ struct task_struct *runner[NR_SOFTIRQS];
-+};
-+
-+static DEFINE_PER_CPU(struct softirq_runner, softirq_runners);
-+
-+static inline void softirq_set_runner(unsigned int sirq)
-+{
-+ struct softirq_runner *sr = this_cpu_ptr(&softirq_runners);
-+
-+ sr->runner[sirq] = current;
-+}
-+
-+static inline void softirq_clr_runner(unsigned int sirq)
-+{
-+ struct softirq_runner *sr = this_cpu_ptr(&softirq_runners);
-+
-+ sr->runner[sirq] = NULL;
-+}
-+
-+/*
-+ * On preempt-rt a softirq running context might be blocked on a
-+ * lock. There might be no other runnable task on this CPU because the
-+ * lock owner runs on some other CPU. So we have to go into idle with
-+ * the pending bit set. Therefor we need to check this otherwise we
-+ * warn about false positives which confuses users and defeats the
-+ * whole purpose of this test.
-+ *
-+ * This code is called with interrupts disabled.
-+ */
-+void softirq_check_pending_idle(void)
-+{
-+ static int rate_limit;
-+ struct softirq_runner *sr = this_cpu_ptr(&softirq_runners);
-+ u32 warnpending;
-+ int i;
-+
-+ if (rate_limit >= 10)
-+ return;
-+
-+ warnpending = local_softirq_pending() & SOFTIRQ_STOP_IDLE_MASK;
-+ for (i = 0; i < NR_SOFTIRQS; i++) {
-+ struct task_struct *tsk = sr->runner[i];
-+
-+ /*
-+ * The wakeup code in rtmutex.c wakes up the task
-+ * _before_ it sets pi_blocked_on to NULL under
-+ * tsk->pi_lock. So we need to check for both: state
-+ * and pi_blocked_on.
-+ */
-+ if (tsk) {
-+ raw_spin_lock(&tsk->pi_lock);
-+ if (tsk->pi_blocked_on || tsk->state == TASK_RUNNING) {
-+ /* Clear all bits pending in that task */
-+ warnpending &= ~(tsk->softirqs_raised);
-+ warnpending &= ~(1 << i);
-+ }
-+ raw_spin_unlock(&tsk->pi_lock);
-+ }
-+ }
-+
-+ if (warnpending) {
-+ printk(KERN_ERR "NOHZ: local_softirq_pending %02x\n",
-+ warnpending);
-+ rate_limit++;
-+ }
-+}
-+# else
-+/*
-+ * On !PREEMPT_RT we just printk rate limited:
-+ */
-+void softirq_check_pending_idle(void)
-+{
-+ static int rate_limit;
-+
-+ if (rate_limit < 10 &&
-+ (local_softirq_pending() & SOFTIRQ_STOP_IDLE_MASK)) {
-+ printk(KERN_ERR "NOHZ: local_softirq_pending %02x\n",
-+ local_softirq_pending());
-+ rate_limit++;
-+ }
-+}
-+# endif
-+
-+#else /* !CONFIG_NO_HZ_COMMON */
-+static inline void softirq_set_runner(unsigned int sirq) { }
-+static inline void softirq_clr_runner(unsigned int sirq) { }
-+#endif
-+
- /*
- * we cannot loop indefinitely here to avoid userspace starvation,
- * but we also don't want to introduce a worst case 1/HZ latency
-@@ -77,6 +175,79 @@ static void wakeup_softirqd(void)
- wake_up_process(tsk);
- }
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+static void wakeup_timer_softirqd(void)
-+{
-+ /* Interrupts are disabled: no need to stop preemption */
-+ struct task_struct *tsk = __this_cpu_read(ktimer_softirqd);
-+
-+ if (tsk && tsk->state != TASK_RUNNING)
-+ wake_up_process(tsk);
-+}
-+#endif
-+
-+static void handle_softirq(unsigned int vec_nr)
-+{
-+ struct softirq_action *h = softirq_vec + vec_nr;
-+ int prev_count;
-+
-+ prev_count = preempt_count();
-+
-+ kstat_incr_softirqs_this_cpu(vec_nr);
-+
-+ trace_softirq_entry(vec_nr);
-+ h->action(h);
-+ trace_softirq_exit(vec_nr);
-+ if (unlikely(prev_count != preempt_count())) {
-+ pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
-+ vec_nr, softirq_to_name[vec_nr], h->action,
-+ prev_count, preempt_count());
-+ preempt_count_set(prev_count);
-+ }
-+}
-+
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+static inline int ksoftirqd_softirq_pending(void)
-+{
-+ return local_softirq_pending();
-+}
-+
-+static void handle_pending_softirqs(u32 pending)
-+{
-+ struct softirq_action *h = softirq_vec;
-+ int softirq_bit;
-+
-+ local_irq_enable();
-+
-+ h = softirq_vec;
-+
-+ while ((softirq_bit = ffs(pending))) {
-+ unsigned int vec_nr;
-+
-+ h += softirq_bit - 1;
-+ vec_nr = h - softirq_vec;
-+ handle_softirq(vec_nr);
-+
-+ h++;
-+ pending >>= softirq_bit;
-+ }
-+
-+ rcu_bh_qs();
-+ local_irq_disable();
-+}
-+
-+static void run_ksoftirqd(unsigned int cpu)
-+{
-+ local_irq_disable();
-+ if (ksoftirqd_softirq_pending()) {
-+ __do_softirq();
-+ local_irq_enable();
-+ cond_resched_rcu_qs();
-+ return;
-+ }
-+ local_irq_enable();
-+}
-+
- /*
- * preempt_count and SOFTIRQ_OFFSET usage:
- * - preempt_count is changed by SOFTIRQ_OFFSET on entering or leaving
-@@ -232,10 +403,8 @@ asmlinkage __visible void __softirq_entry __do_softirq(void)
- unsigned long end = jiffies + MAX_SOFTIRQ_TIME;
- unsigned long old_flags = current->flags;
- int max_restart = MAX_SOFTIRQ_RESTART;
-- struct softirq_action *h;
- bool in_hardirq;
- __u32 pending;
-- int softirq_bit;
-
- /*
- * Mask out PF_MEMALLOC s current task context is borrowed for the
-@@ -254,36 +423,7 @@ restart:
- /* Reset the pending bitmask before enabling irqs */
- set_softirq_pending(0);
-
-- local_irq_enable();
--
-- h = softirq_vec;
--
-- while ((softirq_bit = ffs(pending))) {
-- unsigned int vec_nr;
-- int prev_count;
--
-- h += softirq_bit - 1;
--
-- vec_nr = h - softirq_vec;
-- prev_count = preempt_count();
--
-- kstat_incr_softirqs_this_cpu(vec_nr);
--
-- trace_softirq_entry(vec_nr);
-- h->action(h);
-- trace_softirq_exit(vec_nr);
-- if (unlikely(prev_count != preempt_count())) {
-- pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
-- vec_nr, softirq_to_name[vec_nr], h->action,
-- prev_count, preempt_count());
-- preempt_count_set(prev_count);
-- }
-- h++;
-- pending >>= softirq_bit;
-- }
--
-- rcu_bh_qs();
-- local_irq_disable();
-+ handle_pending_softirqs(pending);
-
- pending = local_softirq_pending();
- if (pending) {
-@@ -320,6 +460,310 @@ asmlinkage __visible void do_softirq(void)
- }
-
- /*
-+ * This function must run with irqs disabled!
-+ */
-+void raise_softirq_irqoff(unsigned int nr)
-+{
-+ __raise_softirq_irqoff(nr);
-+
-+ /*
-+ * If we're in an interrupt or softirq, we're done
-+ * (this also catches softirq-disabled code). We will
-+ * actually run the softirq once we return from
-+ * the irq or softirq.
-+ *
-+ * Otherwise we wake up ksoftirqd to make sure we
-+ * schedule the softirq soon.
-+ */
-+ if (!in_interrupt())
-+ wakeup_softirqd();
-+}
-+
-+void __raise_softirq_irqoff(unsigned int nr)
-+{
-+ trace_softirq_raise(nr);
-+ or_softirq_pending(1UL << nr);
-+}
-+
-+static inline void local_bh_disable_nort(void) { local_bh_disable(); }
-+static inline void _local_bh_enable_nort(void) { _local_bh_enable(); }
-+static void ksoftirqd_set_sched_params(unsigned int cpu) { }
-+
-+#else /* !PREEMPT_RT_FULL */
-+
-+/*
-+ * On RT we serialize softirq execution with a cpu local lock per softirq
-+ */
-+static DEFINE_PER_CPU(struct local_irq_lock [NR_SOFTIRQS], local_softirq_locks);
-+
-+void __init softirq_early_init(void)
-+{
-+ int i;
-+
-+ for (i = 0; i < NR_SOFTIRQS; i++)
-+ local_irq_lock_init(local_softirq_locks[i]);
-+}
-+
-+static void lock_softirq(int which)
-+{
-+ local_lock(local_softirq_locks[which]);
-+}
-+
-+static void unlock_softirq(int which)
-+{
-+ local_unlock(local_softirq_locks[which]);
-+}
-+
-+static void do_single_softirq(int which)
-+{
-+ unsigned long old_flags = current->flags;
-+
-+ current->flags &= ~PF_MEMALLOC;
-+ vtime_account_irq_enter(current);
-+ current->flags |= PF_IN_SOFTIRQ;
-+ lockdep_softirq_enter();
-+ local_irq_enable();
-+ handle_softirq(which);
-+ local_irq_disable();
-+ lockdep_softirq_exit();
-+ current->flags &= ~PF_IN_SOFTIRQ;
-+ vtime_account_irq_enter(current);
-+ tsk_restore_flags(current, old_flags, PF_MEMALLOC);
-+}
-+
-+/*
-+ * Called with interrupts disabled. Process softirqs which were raised
-+ * in current context (or on behalf of ksoftirqd).
-+ */
-+static void do_current_softirqs(void)
-+{
-+ while (current->softirqs_raised) {
-+ int i = __ffs(current->softirqs_raised);
-+ unsigned int pending, mask = (1U << i);
-+
-+ current->softirqs_raised &= ~mask;
-+ local_irq_enable();
-+
-+ /*
-+ * If the lock is contended, we boost the owner to
-+ * process the softirq or leave the critical section
-+ * now.
-+ */
-+ lock_softirq(i);
-+ local_irq_disable();
-+ softirq_set_runner(i);
-+ /*
-+ * Check with the local_softirq_pending() bits,
-+ * whether we need to process this still or if someone
-+ * else took care of it.
-+ */
-+ pending = local_softirq_pending();
-+ if (pending & mask) {
-+ set_softirq_pending(pending & ~mask);
-+ do_single_softirq(i);
-+ }
-+ softirq_clr_runner(i);
-+ WARN_ON(current->softirq_nestcnt != 1);
-+ local_irq_enable();
-+ unlock_softirq(i);
-+ local_irq_disable();
-+ }
-+}
-+
-+void __local_bh_disable(void)
-+{
-+ if (++current->softirq_nestcnt == 1)
-+ migrate_disable();
-+}
-+EXPORT_SYMBOL(__local_bh_disable);
-+
-+void __local_bh_enable(void)
-+{
-+ if (WARN_ON(current->softirq_nestcnt == 0))
-+ return;
-+
-+ local_irq_disable();
-+ if (current->softirq_nestcnt == 1 && current->softirqs_raised)
-+ do_current_softirqs();
-+ local_irq_enable();
-+
-+ if (--current->softirq_nestcnt == 0)
-+ migrate_enable();
-+}
-+EXPORT_SYMBOL(__local_bh_enable);
-+
-+void _local_bh_enable(void)
-+{
-+ if (WARN_ON(current->softirq_nestcnt == 0))
-+ return;
-+ if (--current->softirq_nestcnt == 0)
-+ migrate_enable();
-+}
-+EXPORT_SYMBOL(_local_bh_enable);
-+
-+int in_serving_softirq(void)
-+{
-+ return current->flags & PF_IN_SOFTIRQ;
-+}
-+EXPORT_SYMBOL(in_serving_softirq);
-+
-+/* Called with preemption disabled */
-+static void run_ksoftirqd(unsigned int cpu)
-+{
-+ local_irq_disable();
-+ current->softirq_nestcnt++;
-+
-+ do_current_softirqs();
-+ current->softirq_nestcnt--;
-+ local_irq_enable();
-+ cond_resched_rcu_qs();
-+}
-+
-+/*
-+ * Called from netif_rx_ni(). Preemption enabled, but migration
-+ * disabled. So the cpu can't go away under us.
-+ */
-+void thread_do_softirq(void)
-+{
-+ if (!in_serving_softirq() && current->softirqs_raised) {
-+ current->softirq_nestcnt++;
-+ do_current_softirqs();
-+ current->softirq_nestcnt--;
-+ }
-+}
-+
-+static void do_raise_softirq_irqoff(unsigned int nr)
-+{
-+ unsigned int mask;
-+
-+ mask = 1UL << nr;
-+
-+ trace_softirq_raise(nr);
-+ or_softirq_pending(mask);
-+
-+ /*
-+ * If we are not in a hard interrupt and inside a bh disabled
-+ * region, we simply raise the flag on current. local_bh_enable()
-+ * will make sure that the softirq is executed. Otherwise we
-+ * delegate it to ksoftirqd.
-+ */
-+ if (!in_irq() && current->softirq_nestcnt)
-+ current->softirqs_raised |= mask;
-+ else if (!__this_cpu_read(ksoftirqd) || !__this_cpu_read(ktimer_softirqd))
-+ return;
-+
-+ if (mask & TIMER_SOFTIRQS)
-+ __this_cpu_read(ktimer_softirqd)->softirqs_raised |= mask;
-+ else
-+ __this_cpu_read(ksoftirqd)->softirqs_raised |= mask;
-+}
-+
-+static void wakeup_proper_softirq(unsigned int nr)
-+{
-+ if ((1UL << nr) & TIMER_SOFTIRQS)
-+ wakeup_timer_softirqd();
-+ else
-+ wakeup_softirqd();
-+}
-+
-+
-+void __raise_softirq_irqoff(unsigned int nr)
-+{
-+ do_raise_softirq_irqoff(nr);
-+ if (!in_irq() && !current->softirq_nestcnt)
-+ wakeup_proper_softirq(nr);
-+}
-+
-+/*
-+ * Same as __raise_softirq_irqoff() but will process them in ksoftirqd
-+ */
-+void __raise_softirq_irqoff_ksoft(unsigned int nr)
-+{
-+ unsigned int mask;
-+
-+ if (WARN_ON_ONCE(!__this_cpu_read(ksoftirqd) ||
-+ !__this_cpu_read(ktimer_softirqd)))
-+ return;
-+ mask = 1UL << nr;
-+
-+ trace_softirq_raise(nr);
-+ or_softirq_pending(mask);
-+ if (mask & TIMER_SOFTIRQS)
-+ __this_cpu_read(ktimer_softirqd)->softirqs_raised |= mask;
-+ else
-+ __this_cpu_read(ksoftirqd)->softirqs_raised |= mask;
-+ wakeup_proper_softirq(nr);
-+}
-+
-+/*
-+ * This function must run with irqs disabled!
-+ */
-+void raise_softirq_irqoff(unsigned int nr)
-+{
-+ do_raise_softirq_irqoff(nr);
-+
-+ /*
-+ * If we're in an hard interrupt we let irq return code deal
-+ * with the wakeup of ksoftirqd.
-+ */
-+ if (in_irq())
-+ return;
-+ /*
-+ * If we are in thread context but outside of a bh disabled
-+ * region, we need to wake ksoftirqd as well.
-+ *
-+ * CHECKME: Some of the places which do that could be wrapped
-+ * into local_bh_disable/enable pairs. Though it's unclear
-+ * whether this is worth the effort. To find those places just
-+ * raise a WARN() if the condition is met.
-+ */
-+ if (!current->softirq_nestcnt)
-+ wakeup_proper_softirq(nr);
-+}
-+
-+static inline int ksoftirqd_softirq_pending(void)
-+{
-+ return current->softirqs_raised;
-+}
-+
-+static inline void local_bh_disable_nort(void) { }
-+static inline void _local_bh_enable_nort(void) { }
-+
-+static inline void ksoftirqd_set_sched_params(unsigned int cpu)
-+{
-+ /* Take over all but timer pending softirqs when starting */
-+ local_irq_disable();
-+ current->softirqs_raised = local_softirq_pending() & ~TIMER_SOFTIRQS;
-+ local_irq_enable();
-+}
-+
-+static inline void ktimer_softirqd_set_sched_params(unsigned int cpu)
-+{
-+ struct sched_param param = { .sched_priority = 1 };
-+
-+ sched_setscheduler(current, SCHED_FIFO, ¶m);
-+
-+ /* Take over timer pending softirqs when starting */
-+ local_irq_disable();
-+ current->softirqs_raised = local_softirq_pending() & TIMER_SOFTIRQS;
-+ local_irq_enable();
-+}
-+
-+static inline void ktimer_softirqd_clr_sched_params(unsigned int cpu,
-+ bool online)
-+{
-+ struct sched_param param = { .sched_priority = 0 };
-+
-+ sched_setscheduler(current, SCHED_NORMAL, ¶m);
-+}
-+
-+static int ktimer_softirqd_should_run(unsigned int cpu)
-+{
-+ return current->softirqs_raised;
-+}
-+
-+#endif /* PREEMPT_RT_FULL */
-+/*
- * Enter an interrupt context.
- */
- void irq_enter(void)
-@@ -330,9 +774,9 @@ void irq_enter(void)
- * Prevent raise_softirq from needlessly waking up ksoftirqd
- * here, as softirq will be serviced on return from interrupt.
- */
-- local_bh_disable();
-+ local_bh_disable_nort();
- tick_irq_enter();
-- _local_bh_enable();
-+ _local_bh_enable_nort();
- }
-
- __irq_enter();
-@@ -340,6 +784,7 @@ void irq_enter(void)
-
- static inline void invoke_softirq(void)
- {
-+#ifndef CONFIG_PREEMPT_RT_FULL
- if (!force_irqthreads) {
- #ifdef CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK
- /*
-@@ -359,6 +804,18 @@ static inline void invoke_softirq(void)
- } else {
- wakeup_softirqd();
- }
-+#else /* PREEMPT_RT_FULL */
-+ unsigned long flags;
-+
-+ local_irq_save(flags);
-+ if (__this_cpu_read(ksoftirqd) &&
-+ __this_cpu_read(ksoftirqd)->softirqs_raised)
-+ wakeup_softirqd();
-+ if (__this_cpu_read(ktimer_softirqd) &&
-+ __this_cpu_read(ktimer_softirqd)->softirqs_raised)
-+ wakeup_timer_softirqd();
-+ local_irq_restore(flags);
-+#endif
- }
-
- static inline void tick_irq_exit(void)
-@@ -395,26 +852,6 @@ void irq_exit(void)
- trace_hardirq_exit(); /* must be last! */
- }
-
--/*
-- * This function must run with irqs disabled!
-- */
--inline void raise_softirq_irqoff(unsigned int nr)
--{
-- __raise_softirq_irqoff(nr);
--
-- /*
-- * If we're in an interrupt or softirq, we're done
-- * (this also catches softirq-disabled code). We will
-- * actually run the softirq once we return from
-- * the irq or softirq.
-- *
-- * Otherwise we wake up ksoftirqd to make sure we
-- * schedule the softirq soon.
-- */
-- if (!in_interrupt())
-- wakeup_softirqd();
--}
--
- void raise_softirq(unsigned int nr)
- {
- unsigned long flags;
-@@ -424,12 +861,6 @@ void raise_softirq(unsigned int nr)
- local_irq_restore(flags);
- }
-
--void __raise_softirq_irqoff(unsigned int nr)
--{
-- trace_softirq_raise(nr);
-- or_softirq_pending(1UL << nr);
--}
--
- void open_softirq(int nr, void (*action)(struct softirq_action *))
- {
- softirq_vec[nr].action = action;
-@@ -446,15 +877,45 @@ struct tasklet_head {
- static DEFINE_PER_CPU(struct tasklet_head, tasklet_vec);
- static DEFINE_PER_CPU(struct tasklet_head, tasklet_hi_vec);
-
-+static void inline
-+__tasklet_common_schedule(struct tasklet_struct *t, struct tasklet_head *head, unsigned int nr)
-+{
-+ if (tasklet_trylock(t)) {
-+again:
-+ /* We may have been preempted before tasklet_trylock
-+ * and __tasklet_action may have already run.
-+ * So double check the sched bit while the takslet
-+ * is locked before adding it to the list.
-+ */
-+ if (test_bit(TASKLET_STATE_SCHED, &t->state)) {
-+ t->next = NULL;
-+ *head->tail = t;
-+ head->tail = &(t->next);
-+ raise_softirq_irqoff(nr);
-+ tasklet_unlock(t);
-+ } else {
-+ /* This is subtle. If we hit the corner case above
-+ * It is possible that we get preempted right here,
-+ * and another task has successfully called
-+ * tasklet_schedule(), then this function, and
-+ * failed on the trylock. Thus we must be sure
-+ * before releasing the tasklet lock, that the
-+ * SCHED_BIT is clear. Otherwise the tasklet
-+ * may get its SCHED_BIT set, but not added to the
-+ * list
-+ */
-+ if (!tasklet_tryunlock(t))
-+ goto again;
-+ }
-+ }
-+}
-+
- void __tasklet_schedule(struct tasklet_struct *t)
- {
- unsigned long flags;
-
- local_irq_save(flags);
-- t->next = NULL;
-- *__this_cpu_read(tasklet_vec.tail) = t;
-- __this_cpu_write(tasklet_vec.tail, &(t->next));
-- raise_softirq_irqoff(TASKLET_SOFTIRQ);
-+ __tasklet_common_schedule(t, this_cpu_ptr(&tasklet_vec), TASKLET_SOFTIRQ);
- local_irq_restore(flags);
- }
- EXPORT_SYMBOL(__tasklet_schedule);
-@@ -464,10 +925,7 @@ void __tasklet_hi_schedule(struct tasklet_struct *t)
- unsigned long flags;
-
- local_irq_save(flags);
-- t->next = NULL;
-- *__this_cpu_read(tasklet_hi_vec.tail) = t;
-- __this_cpu_write(tasklet_hi_vec.tail, &(t->next));
-- raise_softirq_irqoff(HI_SOFTIRQ);
-+ __tasklet_common_schedule(t, this_cpu_ptr(&tasklet_hi_vec), HI_SOFTIRQ);
- local_irq_restore(flags);
- }
- EXPORT_SYMBOL(__tasklet_hi_schedule);
-@@ -476,82 +934,122 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
- {
- BUG_ON(!irqs_disabled());
-
-- t->next = __this_cpu_read(tasklet_hi_vec.head);
-- __this_cpu_write(tasklet_hi_vec.head, t);
-- __raise_softirq_irqoff(HI_SOFTIRQ);
-+ __tasklet_hi_schedule(t);
- }
- EXPORT_SYMBOL(__tasklet_hi_schedule_first);
-
--static void tasklet_action(struct softirq_action *a)
-+void tasklet_enable(struct tasklet_struct *t)
- {
-- struct tasklet_struct *list;
-+ if (!atomic_dec_and_test(&t->count))
-+ return;
-+ if (test_and_clear_bit(TASKLET_STATE_PENDING, &t->state))
-+ tasklet_schedule(t);
-+}
-+EXPORT_SYMBOL(tasklet_enable);
-
-- local_irq_disable();
-- list = __this_cpu_read(tasklet_vec.head);
-- __this_cpu_write(tasklet_vec.head, NULL);
-- __this_cpu_write(tasklet_vec.tail, this_cpu_ptr(&tasklet_vec.head));
-- local_irq_enable();
-+static void __tasklet_action(struct softirq_action *a,
-+ struct tasklet_struct *list)
-+{
-+ int loops = 1000000;
-
- while (list) {
- struct tasklet_struct *t = list;
-
- list = list->next;
-
-- if (tasklet_trylock(t)) {
-- if (!atomic_read(&t->count)) {
-- if (!test_and_clear_bit(TASKLET_STATE_SCHED,
-- &t->state))
-- BUG();
-- t->func(t->data);
-- tasklet_unlock(t);
-- continue;
-- }
-- tasklet_unlock(t);
-+ /*
-+ * Should always succeed - after a tasklist got on the
-+ * list (after getting the SCHED bit set from 0 to 1),
-+ * nothing but the tasklet softirq it got queued to can
-+ * lock it:
-+ */
-+ if (!tasklet_trylock(t)) {
-+ WARN_ON(1);
-+ continue;
- }
-
-- local_irq_disable();
- t->next = NULL;
-- *__this_cpu_read(tasklet_vec.tail) = t;
-- __this_cpu_write(tasklet_vec.tail, &(t->next));
-- __raise_softirq_irqoff(TASKLET_SOFTIRQ);
-- local_irq_enable();
-+
-+ /*
-+ * If we cannot handle the tasklet because it's disabled,
-+ * mark it as pending. tasklet_enable() will later
-+ * re-schedule the tasklet.
-+ */
-+ if (unlikely(atomic_read(&t->count))) {
-+out_disabled:
-+ /* implicit unlock: */
-+ wmb();
-+ t->state = TASKLET_STATEF_PENDING;
-+ continue;
-+ }
-+
-+ /*
-+ * After this point on the tasklet might be rescheduled
-+ * on another CPU, but it can only be added to another
-+ * CPU's tasklet list if we unlock the tasklet (which we
-+ * dont do yet).
-+ */
-+ if (!test_and_clear_bit(TASKLET_STATE_SCHED, &t->state))
-+ WARN_ON(1);
-+
-+again:
-+ t->func(t->data);
-+
-+ /*
-+ * Try to unlock the tasklet. We must use cmpxchg, because
-+ * another CPU might have scheduled or disabled the tasklet.
-+ * We only allow the STATE_RUN -> 0 transition here.
-+ */
-+ while (!tasklet_tryunlock(t)) {
-+ /*
-+ * If it got disabled meanwhile, bail out:
-+ */
-+ if (atomic_read(&t->count))
-+ goto out_disabled;
-+ /*
-+ * If it got scheduled meanwhile, re-execute
-+ * the tasklet function:
-+ */
-+ if (test_and_clear_bit(TASKLET_STATE_SCHED, &t->state))
-+ goto again;
-+ if (!--loops) {
-+ printk("hm, tasklet state: %08lx\n", t->state);
-+ WARN_ON(1);
-+ tasklet_unlock(t);
-+ break;
-+ }
-+ }
- }
- }
-
-+static void tasklet_action(struct softirq_action *a)
-+{
-+ struct tasklet_struct *list;
-+
-+ local_irq_disable();
-+
-+ list = __this_cpu_read(tasklet_vec.head);
-+ __this_cpu_write(tasklet_vec.head, NULL);
-+ __this_cpu_write(tasklet_vec.tail, this_cpu_ptr(&tasklet_vec.head));
-+
-+ local_irq_enable();
-+
-+ __tasklet_action(a, list);
-+}
-+
- static void tasklet_hi_action(struct softirq_action *a)
- {
- struct tasklet_struct *list;
-
- local_irq_disable();
-+
- list = __this_cpu_read(tasklet_hi_vec.head);
- __this_cpu_write(tasklet_hi_vec.head, NULL);
- __this_cpu_write(tasklet_hi_vec.tail, this_cpu_ptr(&tasklet_hi_vec.head));
-- local_irq_enable();
-
-- while (list) {
-- struct tasklet_struct *t = list;
--
-- list = list->next;
--
-- if (tasklet_trylock(t)) {
-- if (!atomic_read(&t->count)) {
-- if (!test_and_clear_bit(TASKLET_STATE_SCHED,
-- &t->state))
-- BUG();
-- t->func(t->data);
-- tasklet_unlock(t);
-- continue;
-- }
-- tasklet_unlock(t);
-- }
-+ local_irq_enable();
-
-- local_irq_disable();
-- t->next = NULL;
-- *__this_cpu_read(tasklet_hi_vec.tail) = t;
-- __this_cpu_write(tasklet_hi_vec.tail, &(t->next));
-- __raise_softirq_irqoff(HI_SOFTIRQ);
-- local_irq_enable();
-- }
-+ __tasklet_action(a, list);
- }
-
- void tasklet_init(struct tasklet_struct *t,
-@@ -572,7 +1070,7 @@ void tasklet_kill(struct tasklet_struct *t)
-
- while (test_and_set_bit(TASKLET_STATE_SCHED, &t->state)) {
- do {
-- yield();
-+ msleep(1);
- } while (test_bit(TASKLET_STATE_SCHED, &t->state));
- }
- tasklet_unlock_wait(t);
-@@ -646,25 +1144,26 @@ void __init softirq_init(void)
- open_softirq(HI_SOFTIRQ, tasklet_hi_action);
- }
-
--static int ksoftirqd_should_run(unsigned int cpu)
--{
-- return local_softirq_pending();
--}
--
--static void run_ksoftirqd(unsigned int cpu)
-+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL)
-+void tasklet_unlock_wait(struct tasklet_struct *t)
- {
-- local_irq_disable();
-- if (local_softirq_pending()) {
-+ while (test_bit(TASKLET_STATE_RUN, &(t)->state)) {
- /*
-- * We can safely run softirq on inline stack, as we are not deep
-- * in the task stack here.
-+ * Hack for now to avoid this busy-loop:
- */
-- __do_softirq();
-- local_irq_enable();
-- cond_resched_rcu_qs();
-- return;
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ msleep(1);
-+#else
-+ barrier();
-+#endif
- }
-- local_irq_enable();
-+}
-+EXPORT_SYMBOL(tasklet_unlock_wait);
-+#endif
-+
-+static int ksoftirqd_should_run(unsigned int cpu)
-+{
-+ return ksoftirqd_softirq_pending();
- }
-
- #ifdef CONFIG_HOTPLUG_CPU
-@@ -746,16 +1245,31 @@ static struct notifier_block cpu_nfb = {
-
- static struct smp_hotplug_thread softirq_threads = {
- .store = &ksoftirqd,
-+ .setup = ksoftirqd_set_sched_params,
- .thread_should_run = ksoftirqd_should_run,
- .thread_fn = run_ksoftirqd,
- .thread_comm = "ksoftirqd/%u",
- };
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+static struct smp_hotplug_thread softirq_timer_threads = {
-+ .store = &ktimer_softirqd,
-+ .setup = ktimer_softirqd_set_sched_params,
-+ .cleanup = ktimer_softirqd_clr_sched_params,
-+ .thread_should_run = ktimer_softirqd_should_run,
-+ .thread_fn = run_ksoftirqd,
-+ .thread_comm = "ktimersoftd/%u",
-+};
-+#endif
-+
- static __init int spawn_ksoftirqd(void)
- {
- register_cpu_notifier(&cpu_nfb);
-
- BUG_ON(smpboot_register_percpu_thread(&softirq_threads));
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ BUG_ON(smpboot_register_percpu_thread(&softirq_timer_threads));
-+#endif
-
- return 0;
- }
-diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
-index 4a1ca5f..3226e22 100644
---- a/kernel/stop_machine.c
-+++ b/kernel/stop_machine.c
-@@ -37,7 +37,7 @@ struct cpu_stop_done {
- struct cpu_stopper {
- struct task_struct *thread;
-
-- spinlock_t lock;
-+ raw_spinlock_t lock;
- bool enabled; /* is this stopper enabled? */
- struct list_head works; /* list of pending works */
-
-@@ -83,14 +83,14 @@ static bool cpu_stop_queue_work(unsigned int cpu, struct cpu_stop_work *work)
- unsigned long flags;
- bool enabled;
-
-- spin_lock_irqsave(&stopper->lock, flags);
-+ raw_spin_lock_irqsave(&stopper->lock, flags);
- enabled = stopper->enabled;
- if (enabled)
- __cpu_stop_queue_work(stopper, work);
- else if (work->done)
- cpu_stop_signal_done(work->done);
-- spin_unlock_irqrestore(&stopper->lock, flags);
-
-+ raw_spin_unlock_irqrestore(&stopper->lock, flags);
- return enabled;
- }
-
-@@ -232,8 +232,8 @@ static int cpu_stop_queue_two_works(int cpu1, struct cpu_stop_work *work1,
- int err;
-
- lg_double_lock(&stop_cpus_lock, cpu1, cpu2);
-- spin_lock_irq(&stopper1->lock);
-- spin_lock_nested(&stopper2->lock, SINGLE_DEPTH_NESTING);
-+ raw_spin_lock_irq(&stopper1->lock);
-+ raw_spin_lock_nested(&stopper2->lock, SINGLE_DEPTH_NESTING);
-
- err = -ENOENT;
- if (!stopper1->enabled || !stopper2->enabled)
-@@ -243,8 +243,8 @@ static int cpu_stop_queue_two_works(int cpu1, struct cpu_stop_work *work1,
- __cpu_stop_queue_work(stopper1, work1);
- __cpu_stop_queue_work(stopper2, work2);
- unlock:
-- spin_unlock(&stopper2->lock);
-- spin_unlock_irq(&stopper1->lock);
-+ raw_spin_unlock(&stopper2->lock);
-+ raw_spin_unlock_irq(&stopper1->lock);
- lg_double_unlock(&stop_cpus_lock, cpu1, cpu2);
-
- return err;
-@@ -321,18 +321,21 @@ static DEFINE_MUTEX(stop_cpus_mutex);
-
- static bool queue_stop_cpus_work(const struct cpumask *cpumask,
- cpu_stop_fn_t fn, void *arg,
-- struct cpu_stop_done *done)
-+ struct cpu_stop_done *done, bool inactive)
- {
- struct cpu_stop_work *work;
- unsigned int cpu;
- bool queued = false;
-
- /*
-- * Disable preemption while queueing to avoid getting
-- * preempted by a stopper which might wait for other stoppers
-- * to enter @fn which can lead to deadlock.
-+ * Make sure that all work is queued on all cpus before
-+ * any of the cpus can execute it.
- */
-- lg_global_lock(&stop_cpus_lock);
-+ if (!inactive)
-+ lg_global_lock(&stop_cpus_lock);
-+ else
-+ lg_global_trylock_relax(&stop_cpus_lock);
-+
- for_each_cpu(cpu, cpumask) {
- work = &per_cpu(cpu_stopper.stop_work, cpu);
- work->fn = fn;
-@@ -352,7 +355,7 @@ static int __stop_cpus(const struct cpumask *cpumask,
- struct cpu_stop_done done;
-
- cpu_stop_init_done(&done, cpumask_weight(cpumask));
-- if (!queue_stop_cpus_work(cpumask, fn, arg, &done))
-+ if (!queue_stop_cpus_work(cpumask, fn, arg, &done, false))
- return -ENOENT;
- wait_for_completion(&done.completion);
- return done.ret;
-@@ -433,9 +436,9 @@ static int cpu_stop_should_run(unsigned int cpu)
- unsigned long flags;
- int run;
-
-- spin_lock_irqsave(&stopper->lock, flags);
-+ raw_spin_lock_irqsave(&stopper->lock, flags);
- run = !list_empty(&stopper->works);
-- spin_unlock_irqrestore(&stopper->lock, flags);
-+ raw_spin_unlock_irqrestore(&stopper->lock, flags);
- return run;
- }
-
-@@ -446,13 +449,13 @@ static void cpu_stopper_thread(unsigned int cpu)
-
- repeat:
- work = NULL;
-- spin_lock_irq(&stopper->lock);
-+ raw_spin_lock_irq(&stopper->lock);
- if (!list_empty(&stopper->works)) {
- work = list_first_entry(&stopper->works,
- struct cpu_stop_work, list);
- list_del_init(&work->list);
- }
-- spin_unlock_irq(&stopper->lock);
-+ raw_spin_unlock_irq(&stopper->lock);
-
- if (work) {
- cpu_stop_fn_t fn = work->fn;
-@@ -460,6 +463,16 @@ repeat:
- struct cpu_stop_done *done = work->done;
- int ret;
-
-+ /*
-+ * Wait until the stopper finished scheduling on all
-+ * cpus
-+ */
-+ lg_global_lock(&stop_cpus_lock);
-+ /*
-+ * Let other cpu threads continue as well
-+ */
-+ lg_global_unlock(&stop_cpus_lock);
-+
- /* cpu stop callbacks must not sleep, make in_atomic() == T */
- preempt_count_inc();
- ret = fn(arg);
-@@ -526,10 +539,12 @@ static int __init cpu_stop_init(void)
- for_each_possible_cpu(cpu) {
- struct cpu_stopper *stopper = &per_cpu(cpu_stopper, cpu);
-
-- spin_lock_init(&stopper->lock);
-+ raw_spin_lock_init(&stopper->lock);
- INIT_LIST_HEAD(&stopper->works);
- }
-
-+ lg_lock_init(&stop_cpus_lock, "stop_cpus_lock");
-+
- BUG_ON(smpboot_register_percpu_thread(&cpu_stop_threads));
- stop_machine_unpark(raw_smp_processor_id());
- stop_machine_initialized = true;
-@@ -624,7 +639,7 @@ int stop_machine_from_inactive_cpu(cpu_stop_fn_t fn, void *data,
- set_state(&msdata, MULTI_STOP_PREPARE);
- cpu_stop_init_done(&done, num_active_cpus());
- queue_stop_cpus_work(cpu_active_mask, multi_cpu_stop, &msdata,
-- &done);
-+ &done, true);
- ret = multi_cpu_stop(&msdata);
-
- /* Busy wait for completion. */
-diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
-index 9ba7c82..d85f638 100644
---- a/kernel/time/hrtimer.c
-+++ b/kernel/time/hrtimer.c
-@@ -53,6 +53,7 @@
- #include <asm/uaccess.h>
-
- #include <trace/events/timer.h>
-+#include <trace/events/hist.h>
-
- #include "tick-internal.h"
-
-@@ -695,6 +696,29 @@ static void hrtimer_switch_to_hres(void)
- retrigger_next_event(NULL);
- }
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+
-+static struct swork_event clock_set_delay_work;
-+
-+static void run_clock_set_delay(struct swork_event *event)
-+{
-+ clock_was_set();
-+}
-+
-+void clock_was_set_delayed(void)
-+{
-+ swork_queue(&clock_set_delay_work);
-+}
-+
-+static __init int create_clock_set_delay_thread(void)
-+{
-+ WARN_ON(swork_get());
-+ INIT_SWORK(&clock_set_delay_work, run_clock_set_delay);
-+ return 0;
-+}
-+early_initcall(create_clock_set_delay_thread);
-+#else /* PREEMPT_RT_FULL */
-+
- static void clock_was_set_work(struct work_struct *work)
- {
- clock_was_set();
-@@ -710,6 +734,7 @@ void clock_was_set_delayed(void)
- {
- schedule_work(&hrtimer_work);
- }
-+#endif
-
- #else
-
-@@ -719,11 +744,8 @@ static inline int hrtimer_is_hres_enabled(void) { return 0; }
- static inline void hrtimer_switch_to_hres(void) { }
- static inline void
- hrtimer_force_reprogram(struct hrtimer_cpu_base *base, int skip_equal) { }
--static inline int hrtimer_reprogram(struct hrtimer *timer,
-- struct hrtimer_clock_base *base)
--{
-- return 0;
--}
-+static inline void hrtimer_reprogram(struct hrtimer *timer,
-+ struct hrtimer_clock_base *base) { }
- static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base) { }
- static inline void retrigger_next_event(void *arg) { }
-
-@@ -855,6 +877,32 @@ u64 hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval)
- }
- EXPORT_SYMBOL_GPL(hrtimer_forward);
-
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+# define wake_up_timer_waiters(b) wake_up(&(b)->wait)
-+
-+/**
-+ * hrtimer_wait_for_timer - Wait for a running timer
-+ *
-+ * @timer: timer to wait for
-+ *
-+ * The function waits in case the timers callback function is
-+ * currently executed on the waitqueue of the timer base. The
-+ * waitqueue is woken up after the timer callback function has
-+ * finished execution.
-+ */
-+void hrtimer_wait_for_timer(const struct hrtimer *timer)
-+{
-+ struct hrtimer_clock_base *base = timer->base;
-+
-+ if (base && base->cpu_base && !timer->irqsafe)
-+ wait_event(base->cpu_base->wait,
-+ !(hrtimer_callback_running(timer)));
-+}
-+
-+#else
-+# define wake_up_timer_waiters(b) do { } while (0)
-+#endif
-+
- /*
- * enqueue_hrtimer - internal function to (re)start a timer
- *
-@@ -896,6 +944,11 @@ static void __remove_hrtimer(struct hrtimer *timer,
- if (!(state & HRTIMER_STATE_ENQUEUED))
- return;
-
-+ if (unlikely(!list_empty(&timer->cb_entry))) {
-+ list_del_init(&timer->cb_entry);
-+ return;
-+ }
-+
- if (!timerqueue_del(&base->active, &timer->node))
- cpu_base->active_bases &= ~(1 << base->index);
-
-@@ -991,7 +1044,16 @@ void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
- new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED);
-
- timer_stats_hrtimer_set_start_info(timer);
-+#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
-+ {
-+ ktime_t now = new_base->get_time();
-
-+ if (ktime_to_ns(tim) < ktime_to_ns(now))
-+ timer->praecox = now;
-+ else
-+ timer->praecox = ktime_set(0, 0);
-+ }
-+#endif
- leftmost = enqueue_hrtimer(timer, new_base);
- if (!leftmost)
- goto unlock;
-@@ -1063,7 +1125,7 @@ int hrtimer_cancel(struct hrtimer *timer)
-
- if (ret >= 0)
- return ret;
-- cpu_relax();
-+ hrtimer_wait_for_timer(timer);
- }
- }
- EXPORT_SYMBOL_GPL(hrtimer_cancel);
-@@ -1127,6 +1189,7 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
-
- base = hrtimer_clockid_to_base(clock_id);
- timer->base = &cpu_base->clock_base[base];
-+ INIT_LIST_HEAD(&timer->cb_entry);
- timerqueue_init(&timer->node);
-
- #ifdef CONFIG_TIMER_STATS
-@@ -1167,6 +1230,7 @@ bool hrtimer_active(const struct hrtimer *timer)
- seq = raw_read_seqcount_begin(&cpu_base->seq);
-
- if (timer->state != HRTIMER_STATE_INACTIVE ||
-+ cpu_base->running_soft == timer ||
- cpu_base->running == timer)
- return true;
-
-@@ -1265,10 +1329,112 @@ static void __run_hrtimer(struct hrtimer_cpu_base *cpu_base,
- cpu_base->running = NULL;
- }
-
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+static void hrtimer_rt_reprogram(int restart, struct hrtimer *timer,
-+ struct hrtimer_clock_base *base)
-+{
-+ int leftmost;
-+
-+ if (restart != HRTIMER_NORESTART &&
-+ !(timer->state & HRTIMER_STATE_ENQUEUED)) {
-+
-+ leftmost = enqueue_hrtimer(timer, base);
-+ if (!leftmost)
-+ return;
-+#ifdef CONFIG_HIGH_RES_TIMERS
-+ if (!hrtimer_is_hres_active(timer)) {
-+ /*
-+ * Kick to reschedule the next tick to handle the new timer
-+ * on dynticks target.
-+ */
-+ if (base->cpu_base->nohz_active)
-+ wake_up_nohz_cpu(base->cpu_base->cpu);
-+ } else {
-+
-+ hrtimer_reprogram(timer, base);
-+ }
-+#endif
-+ }
-+}
-+
-+/*
-+ * The changes in mainline which removed the callback modes from
-+ * hrtimer are not yet working with -rt. The non wakeup_process()
-+ * based callbacks which involve sleeping locks need to be treated
-+ * seperately.
-+ */
-+static void hrtimer_rt_run_pending(void)
-+{
-+ enum hrtimer_restart (*fn)(struct hrtimer *);
-+ struct hrtimer_cpu_base *cpu_base;
-+ struct hrtimer_clock_base *base;
-+ struct hrtimer *timer;
-+ int index, restart;
-+
-+ local_irq_disable();
-+ cpu_base = &per_cpu(hrtimer_bases, smp_processor_id());
-+
-+ raw_spin_lock(&cpu_base->lock);
-+
-+ for (index = 0; index < HRTIMER_MAX_CLOCK_BASES; index++) {
-+ base = &cpu_base->clock_base[index];
-+
-+ while (!list_empty(&base->expired)) {
-+ timer = list_first_entry(&base->expired,
-+ struct hrtimer, cb_entry);
-+
-+ /*
-+ * Same as the above __run_hrtimer function
-+ * just we run with interrupts enabled.
-+ */
-+ debug_deactivate(timer);
-+ cpu_base->running_soft = timer;
-+ raw_write_seqcount_barrier(&cpu_base->seq);
-+
-+ __remove_hrtimer(timer, base, HRTIMER_STATE_INACTIVE, 0);
-+ timer_stats_account_hrtimer(timer);
-+ fn = timer->function;
-+
-+ raw_spin_unlock_irq(&cpu_base->lock);
-+ restart = fn(timer);
-+ raw_spin_lock_irq(&cpu_base->lock);
-+
-+ hrtimer_rt_reprogram(restart, timer, base);
-+ raw_write_seqcount_barrier(&cpu_base->seq);
-+
-+ WARN_ON_ONCE(cpu_base->running_soft != timer);
-+ cpu_base->running_soft = NULL;
-+ }
-+ }
-+
-+ raw_spin_unlock_irq(&cpu_base->lock);
-+
-+ wake_up_timer_waiters(cpu_base);
-+}
-+
-+static int hrtimer_rt_defer(struct hrtimer *timer)
-+{
-+ if (timer->irqsafe)
-+ return 0;
-+
-+ __remove_hrtimer(timer, timer->base, timer->state, 0);
-+ list_add_tail(&timer->cb_entry, &timer->base->expired);
-+ return 1;
-+}
-+
-+#else
-+
-+static inline int hrtimer_rt_defer(struct hrtimer *timer) { return 0; }
-+
-+#endif
-+
-+static enum hrtimer_restart hrtimer_wakeup(struct hrtimer *timer);
-+
- static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now)
- {
- struct hrtimer_clock_base *base = cpu_base->clock_base;
- unsigned int active = cpu_base->active_bases;
-+ int raise = 0;
-
- for (; active; base++, active >>= 1) {
- struct timerqueue_node *node;
-@@ -1284,6 +1450,15 @@ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now)
-
- timer = container_of(node, struct hrtimer, node);
-
-+ trace_hrtimer_interrupt(raw_smp_processor_id(),
-+ ktime_to_ns(ktime_sub(ktime_to_ns(timer->praecox) ?
-+ timer->praecox : hrtimer_get_expires(timer),
-+ basenow)),
-+ current,
-+ timer->function == hrtimer_wakeup ?
-+ container_of(timer, struct hrtimer_sleeper,
-+ timer)->task : NULL);
-+
- /*
- * The immediate goal for using the softexpires is
- * minimizing wakeups, not running timers at the
-@@ -1299,9 +1474,14 @@ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now)
- if (basenow.tv64 < hrtimer_get_softexpires_tv64(timer))
- break;
-
-- __run_hrtimer(cpu_base, base, timer, &basenow);
-+ if (!hrtimer_rt_defer(timer))
-+ __run_hrtimer(cpu_base, base, timer, &basenow);
-+ else
-+ raise = 1;
- }
- }
-+ if (raise)
-+ raise_softirq_irqoff(HRTIMER_SOFTIRQ);
- }
-
- #ifdef CONFIG_HIGH_RES_TIMERS
-@@ -1464,16 +1644,18 @@ static enum hrtimer_restart hrtimer_wakeup(struct hrtimer *timer)
- void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, struct task_struct *task)
- {
- sl->timer.function = hrtimer_wakeup;
-+ sl->timer.irqsafe = 1;
- sl->task = task;
- }
- EXPORT_SYMBOL_GPL(hrtimer_init_sleeper);
-
--static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mode)
-+static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mode,
-+ unsigned long state)
- {
- hrtimer_init_sleeper(t, current);
-
- do {
-- set_current_state(TASK_INTERRUPTIBLE);
-+ set_current_state(state);
- hrtimer_start_expires(&t->timer, mode);
-
- if (likely(t->task))
-@@ -1515,7 +1697,8 @@ long __sched hrtimer_nanosleep_restart(struct restart_block *restart)
- HRTIMER_MODE_ABS);
- hrtimer_set_expires_tv64(&t.timer, restart->nanosleep.expires);
-
-- if (do_nanosleep(&t, HRTIMER_MODE_ABS))
-+ /* cpu_chill() does not care about restart state. */
-+ if (do_nanosleep(&t, HRTIMER_MODE_ABS, TASK_INTERRUPTIBLE))
- goto out;
-
- rmtp = restart->nanosleep.rmtp;
-@@ -1532,8 +1715,10 @@ out:
- return ret;
- }
-
--long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,
-- const enum hrtimer_mode mode, const clockid_t clockid)
-+static long
-+__hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,
-+ const enum hrtimer_mode mode, const clockid_t clockid,
-+ unsigned long state)
- {
- struct restart_block *restart;
- struct hrtimer_sleeper t;
-@@ -1546,7 +1731,7 @@ long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,
-
- hrtimer_init_on_stack(&t.timer, clockid, mode);
- hrtimer_set_expires_range_ns(&t.timer, timespec_to_ktime(*rqtp), slack);
-- if (do_nanosleep(&t, mode))
-+ if (do_nanosleep(&t, mode, state))
- goto out;
-
- /* Absolute timers do not update the rmtp value and restart: */
-@@ -1573,6 +1758,12 @@ out:
- return ret;
- }
-
-+long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,
-+ const enum hrtimer_mode mode, const clockid_t clockid)
-+{
-+ return __hrtimer_nanosleep(rqtp, rmtp, mode, clockid, TASK_INTERRUPTIBLE);
-+}
-+
- SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,
- struct timespec __user *, rmtp)
- {
-@@ -1587,6 +1778,26 @@ SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,
- return hrtimer_nanosleep(&tu, rmtp, HRTIMER_MODE_REL, CLOCK_MONOTONIC);
- }
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+/*
-+ * Sleep for 1 ms in hope whoever holds what we want will let it go.
-+ */
-+void cpu_chill(void)
-+{
-+ struct timespec tu = {
-+ .tv_nsec = NSEC_PER_MSEC,
-+ };
-+ unsigned int freeze_flag = current->flags & PF_NOFREEZE;
-+
-+ current->flags |= PF_NOFREEZE;
-+ __hrtimer_nanosleep(&tu, NULL, HRTIMER_MODE_REL, CLOCK_MONOTONIC,
-+ TASK_UNINTERRUPTIBLE);
-+ if (!freeze_flag)
-+ current->flags &= ~PF_NOFREEZE;
-+}
-+EXPORT_SYMBOL(cpu_chill);
-+#endif
-+
- /*
- * Functions related to boot-time initialization:
- */
-@@ -1598,10 +1809,14 @@ int hrtimers_prepare_cpu(unsigned int cpu)
- for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) {
- cpu_base->clock_base[i].cpu_base = cpu_base;
- timerqueue_init_head(&cpu_base->clock_base[i].active);
-+ INIT_LIST_HEAD(&cpu_base->clock_base[i].expired);
- }
-
- cpu_base->cpu = cpu;
- hrtimer_init_hres(cpu_base);
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ init_waitqueue_head(&cpu_base->wait);
-+#endif
- return 0;
- }
-
-@@ -1671,9 +1886,26 @@ int hrtimers_dead_cpu(unsigned int scpu)
-
- #endif /* CONFIG_HOTPLUG_CPU */
-
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+
-+static void run_hrtimer_softirq(struct softirq_action *h)
-+{
-+ hrtimer_rt_run_pending();
-+}
-+
-+static void hrtimers_open_softirq(void)
-+{
-+ open_softirq(HRTIMER_SOFTIRQ, run_hrtimer_softirq);
-+}
-+
-+#else
-+static void hrtimers_open_softirq(void) { }
-+#endif
-+
- void __init hrtimers_init(void)
- {
- hrtimers_prepare_cpu(smp_processor_id());
-+ hrtimers_open_softirq();
- }
-
- /**
-diff --git a/kernel/time/itimer.c b/kernel/time/itimer.c
-index 1d5c720..184de67 100644
---- a/kernel/time/itimer.c
-+++ b/kernel/time/itimer.c
-@@ -213,6 +213,7 @@ again:
- /* We are sharing ->siglock with it_real_fn() */
- if (hrtimer_try_to_cancel(timer) < 0) {
- spin_unlock_irq(&tsk->sighand->siglock);
-+ hrtimer_wait_for_timer(&tsk->signal->real_timer);
- goto again;
- }
- expires = timeval_to_ktime(value->it_value);
-diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
-index 555e21f..a5d6435 100644
---- a/kernel/time/jiffies.c
-+++ b/kernel/time/jiffies.c
-@@ -74,7 +74,8 @@ static struct clocksource clocksource_jiffies = {
- .max_cycles = 10,
- };
-
--__cacheline_aligned_in_smp DEFINE_SEQLOCK(jiffies_lock);
-+__cacheline_aligned_in_smp DEFINE_RAW_SPINLOCK(jiffies_lock);
-+__cacheline_aligned_in_smp seqcount_t jiffies_seq;
-
- #if (BITS_PER_LONG < 64)
- u64 get_jiffies_64(void)
-@@ -83,9 +84,9 @@ u64 get_jiffies_64(void)
- u64 ret;
-
- do {
-- seq = read_seqbegin(&jiffies_lock);
-+ seq = read_seqcount_begin(&jiffies_seq);
- ret = jiffies_64;
-- } while (read_seqretry(&jiffies_lock, seq));
-+ } while (read_seqcount_retry(&jiffies_seq, seq));
- return ret;
- }
- EXPORT_SYMBOL(get_jiffies_64);
-diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
-index 6df8927..05b7391 100644
---- a/kernel/time/ntp.c
-+++ b/kernel/time/ntp.c
-@@ -17,6 +17,7 @@
- #include <linux/module.h>
- #include <linux/rtc.h>
- #include <linux/math64.h>
-+#include <linux/swork.h>
-
- #include "ntp_internal.h"
- #include "timekeeping_internal.h"
-@@ -568,10 +569,35 @@ static void sync_cmos_clock(struct work_struct *work)
- &sync_cmos_work, timespec64_to_jiffies(&next));
- }
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+
-+static void run_clock_set_delay(struct swork_event *event)
-+{
-+ queue_delayed_work(system_power_efficient_wq, &sync_cmos_work, 0);
-+}
-+
-+static struct swork_event ntp_cmos_swork;
-+
-+void ntp_notify_cmos_timer(void)
-+{
-+ swork_queue(&ntp_cmos_swork);
-+}
-+
-+static __init int create_cmos_delay_thread(void)
-+{
-+ WARN_ON(swork_get());
-+ INIT_SWORK(&ntp_cmos_swork, run_clock_set_delay);
-+ return 0;
-+}
-+early_initcall(create_cmos_delay_thread);
-+
-+#else
-+
- void ntp_notify_cmos_timer(void)
- {
- queue_delayed_work(system_power_efficient_wq, &sync_cmos_work, 0);
- }
-+#endif /* CONFIG_PREEMPT_RT_FULL */
-
- #else
- void ntp_notify_cmos_timer(void) { }
-diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
-index 39008d7..633f4ea 100644
---- a/kernel/time/posix-cpu-timers.c
-+++ b/kernel/time/posix-cpu-timers.c
-@@ -3,6 +3,7 @@
- */
-
- #include <linux/sched.h>
-+#include <linux/sched/rt.h>
- #include <linux/posix-timers.h>
- #include <linux/errno.h>
- #include <linux/math64.h>
-@@ -620,7 +621,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags,
- /*
- * Disarm any old timer after extracting its expiry time.
- */
-- WARN_ON_ONCE(!irqs_disabled());
-+ WARN_ON_ONCE_NONRT(!irqs_disabled());
-
- ret = 0;
- old_incr = timer->it.cpu.incr;
-@@ -1064,7 +1065,7 @@ void posix_cpu_timer_schedule(struct k_itimer *timer)
- /*
- * Now re-arm for the new expiry time.
- */
-- WARN_ON_ONCE(!irqs_disabled());
-+ WARN_ON_ONCE_NONRT(!irqs_disabled());
- arm_timer(timer);
- unlock_task_sighand(p, &flags);
-
-@@ -1153,13 +1154,13 @@ static inline int fastpath_timer_check(struct task_struct *tsk)
- * already updated our counts. We need to check if any timers fire now.
- * Interrupts are disabled.
- */
--void run_posix_cpu_timers(struct task_struct *tsk)
-+static void __run_posix_cpu_timers(struct task_struct *tsk)
- {
- LIST_HEAD(firing);
- struct k_itimer *timer, *next;
- unsigned long flags;
-
-- WARN_ON_ONCE(!irqs_disabled());
-+ WARN_ON_ONCE_NONRT(!irqs_disabled());
-
- /*
- * The fast path checks that there are no expired thread or thread
-@@ -1213,6 +1214,190 @@ void run_posix_cpu_timers(struct task_struct *tsk)
- }
- }
-
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+#include <linux/kthread.h>
-+#include <linux/cpu.h>
-+DEFINE_PER_CPU(struct task_struct *, posix_timer_task);
-+DEFINE_PER_CPU(struct task_struct *, posix_timer_tasklist);
-+
-+static int posix_cpu_timers_thread(void *data)
-+{
-+ int cpu = (long)data;
-+
-+ BUG_ON(per_cpu(posix_timer_task,cpu) != current);
-+
-+ while (!kthread_should_stop()) {
-+ struct task_struct *tsk = NULL;
-+ struct task_struct *next = NULL;
-+
-+ if (cpu_is_offline(cpu))
-+ goto wait_to_die;
-+
-+ /* grab task list */
-+ raw_local_irq_disable();
-+ tsk = per_cpu(posix_timer_tasklist, cpu);
-+ per_cpu(posix_timer_tasklist, cpu) = NULL;
-+ raw_local_irq_enable();
-+
-+ /* its possible the list is empty, just return */
-+ if (!tsk) {
-+ set_current_state(TASK_INTERRUPTIBLE);
-+ schedule();
-+ __set_current_state(TASK_RUNNING);
-+ continue;
-+ }
-+
-+ /* Process task list */
-+ while (1) {
-+ /* save next */
-+ next = tsk->posix_timer_list;
-+
-+ /* run the task timers, clear its ptr and
-+ * unreference it
-+ */
-+ __run_posix_cpu_timers(tsk);
-+ tsk->posix_timer_list = NULL;
-+ put_task_struct(tsk);
-+
-+ /* check if this is the last on the list */
-+ if (next == tsk)
-+ break;
-+ tsk = next;
-+ }
-+ }
-+ return 0;
-+
-+wait_to_die:
-+ /* Wait for kthread_stop */
-+ set_current_state(TASK_INTERRUPTIBLE);
-+ while (!kthread_should_stop()) {
-+ schedule();
-+ set_current_state(TASK_INTERRUPTIBLE);
-+ }
-+ __set_current_state(TASK_RUNNING);
-+ return 0;
-+}
-+
-+static inline int __fastpath_timer_check(struct task_struct *tsk)
-+{
-+ /* tsk == current, ensure it is safe to use ->signal/sighand */
-+ if (unlikely(tsk->exit_state))
-+ return 0;
-+
-+ if (!task_cputime_zero(&tsk->cputime_expires))
-+ return 1;
-+
-+ if (!task_cputime_zero(&tsk->signal->cputime_expires))
-+ return 1;
-+
-+ return 0;
-+}
-+
-+void run_posix_cpu_timers(struct task_struct *tsk)
-+{
-+ unsigned long cpu = smp_processor_id();
-+ struct task_struct *tasklist;
-+
-+ BUG_ON(!irqs_disabled());
-+ if(!per_cpu(posix_timer_task, cpu))
-+ return;
-+ /* get per-cpu references */
-+ tasklist = per_cpu(posix_timer_tasklist, cpu);
-+
-+ /* check to see if we're already queued */
-+ if (!tsk->posix_timer_list && __fastpath_timer_check(tsk)) {
-+ get_task_struct(tsk);
-+ if (tasklist) {
-+ tsk->posix_timer_list = tasklist;
-+ } else {
-+ /*
-+ * The list is terminated by a self-pointing
-+ * task_struct
-+ */
-+ tsk->posix_timer_list = tsk;
-+ }
-+ per_cpu(posix_timer_tasklist, cpu) = tsk;
-+
-+ wake_up_process(per_cpu(posix_timer_task, cpu));
-+ }
-+}
-+
-+/*
-+ * posix_cpu_thread_call - callback that gets triggered when a CPU is added.
-+ * Here we can start up the necessary migration thread for the new CPU.
-+ */
-+static int posix_cpu_thread_call(struct notifier_block *nfb,
-+ unsigned long action, void *hcpu)
-+{
-+ int cpu = (long)hcpu;
-+ struct task_struct *p;
-+ struct sched_param param;
-+
-+ switch (action) {
-+ case CPU_UP_PREPARE:
-+ p = kthread_create(posix_cpu_timers_thread, hcpu,
-+ "posixcputmr/%d",cpu);
-+ if (IS_ERR(p))
-+ return NOTIFY_BAD;
-+ p->flags |= PF_NOFREEZE;
-+ kthread_bind(p, cpu);
-+ /* Must be high prio to avoid getting starved */
-+ param.sched_priority = MAX_RT_PRIO-1;
-+ sched_setscheduler(p, SCHED_FIFO, ¶m);
-+ per_cpu(posix_timer_task,cpu) = p;
-+ break;
-+ case CPU_ONLINE:
-+ /* Strictly unneccessary, as first user will wake it. */
-+ wake_up_process(per_cpu(posix_timer_task,cpu));
-+ break;
-+#ifdef CONFIG_HOTPLUG_CPU
-+ case CPU_UP_CANCELED:
-+ /* Unbind it from offline cpu so it can run. Fall thru. */
-+ kthread_bind(per_cpu(posix_timer_task, cpu),
-+ cpumask_any(cpu_online_mask));
-+ kthread_stop(per_cpu(posix_timer_task,cpu));
-+ per_cpu(posix_timer_task,cpu) = NULL;
-+ break;
-+ case CPU_DEAD:
-+ kthread_stop(per_cpu(posix_timer_task,cpu));
-+ per_cpu(posix_timer_task,cpu) = NULL;
-+ break;
-+#endif
-+ }
-+ return NOTIFY_OK;
-+}
-+
-+/* Register at highest priority so that task migration (migrate_all_tasks)
-+ * happens before everything else.
-+ */
-+static struct notifier_block posix_cpu_thread_notifier = {
-+ .notifier_call = posix_cpu_thread_call,
-+ .priority = 10
-+};
-+
-+static int __init posix_cpu_thread_init(void)
-+{
-+ void *hcpu = (void *)(long)smp_processor_id();
-+ /* Start one for boot CPU. */
-+ unsigned long cpu;
-+
-+ /* init the per-cpu posix_timer_tasklets */
-+ for_each_possible_cpu(cpu)
-+ per_cpu(posix_timer_tasklist, cpu) = NULL;
-+
-+ posix_cpu_thread_call(&posix_cpu_thread_notifier, CPU_UP_PREPARE, hcpu);
-+ posix_cpu_thread_call(&posix_cpu_thread_notifier, CPU_ONLINE, hcpu);
-+ register_cpu_notifier(&posix_cpu_thread_notifier);
-+ return 0;
-+}
-+early_initcall(posix_cpu_thread_init);
-+#else /* CONFIG_PREEMPT_RT_BASE */
-+void run_posix_cpu_timers(struct task_struct *tsk)
-+{
-+ __run_posix_cpu_timers(tsk);
-+}
-+#endif /* CONFIG_PREEMPT_RT_BASE */
-+
- /*
- * Set one of the process-wide special case CPU timers or RLIMIT_CPU.
- * The tsk->sighand->siglock must be held by the caller.
-diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
-index f2826c3..464a981 100644
---- a/kernel/time/posix-timers.c
-+++ b/kernel/time/posix-timers.c
-@@ -506,6 +506,7 @@ static enum hrtimer_restart posix_timer_fn(struct hrtimer *timer)
- static struct pid *good_sigevent(sigevent_t * event)
- {
- struct task_struct *rtn = current->group_leader;
-+ int sig = event->sigev_signo;
-
- if ((event->sigev_notify & SIGEV_THREAD_ID ) &&
- (!(rtn = find_task_by_vpid(event->sigev_notify_thread_id)) ||
-@@ -514,7 +515,8 @@ static struct pid *good_sigevent(sigevent_t * event)
- return NULL;
-
- if (((event->sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_NONE) &&
-- ((event->sigev_signo <= 0) || (event->sigev_signo > SIGRTMAX)))
-+ (sig <= 0 || sig > SIGRTMAX || sig_kernel_only(sig) ||
-+ sig_kernel_coredump(sig)))
- return NULL;
-
- return task_pid(rtn);
-@@ -826,6 +828,20 @@ SYSCALL_DEFINE1(timer_getoverrun, timer_t, timer_id)
- return overrun;
- }
-
-+/*
-+ * Protected by RCU!
-+ */
-+static void timer_wait_for_callback(struct k_clock *kc, struct k_itimer *timr)
-+{
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ if (kc->timer_set == common_timer_set)
-+ hrtimer_wait_for_timer(&timr->it.real.timer);
-+ else
-+ /* FIXME: Whacky hack for posix-cpu-timers */
-+ schedule_timeout(1);
-+#endif
-+}
-+
- /* Set a POSIX.1b interval timer. */
- /* timr->it_lock is taken. */
- static int
-@@ -903,6 +919,7 @@ retry:
- if (!timr)
- return -EINVAL;
-
-+ rcu_read_lock();
- kc = clockid_to_kclock(timr->it_clock);
- if (WARN_ON_ONCE(!kc || !kc->timer_set))
- error = -EINVAL;
-@@ -911,9 +928,12 @@ retry:
-
- unlock_timer(timr, flag);
- if (error == TIMER_RETRY) {
-+ timer_wait_for_callback(kc, timr);
- rtn = NULL; // We already got the old time...
-+ rcu_read_unlock();
- goto retry;
- }
-+ rcu_read_unlock();
-
- if (old_setting && !error &&
- copy_to_user(old_setting, &old_spec, sizeof (old_spec)))
-@@ -951,10 +971,15 @@ retry_delete:
- if (!timer)
- return -EINVAL;
-
-+ rcu_read_lock();
- if (timer_delete_hook(timer) == TIMER_RETRY) {
- unlock_timer(timer, flags);
-+ timer_wait_for_callback(clockid_to_kclock(timer->it_clock),
-+ timer);
-+ rcu_read_unlock();
- goto retry_delete;
- }
-+ rcu_read_unlock();
-
- spin_lock(¤t->sighand->siglock);
- list_del(&timer->list);
-@@ -980,8 +1005,18 @@ static void itimer_delete(struct k_itimer *timer)
- retry_delete:
- spin_lock_irqsave(&timer->it_lock, flags);
-
-+ /* On RT we can race with a deletion */
-+ if (!timer->it_signal) {
-+ unlock_timer(timer, flags);
-+ return;
-+ }
-+
- if (timer_delete_hook(timer) == TIMER_RETRY) {
-+ rcu_read_lock();
- unlock_timer(timer, flags);
-+ timer_wait_for_callback(clockid_to_kclock(timer->it_clock),
-+ timer);
-+ rcu_read_unlock();
- goto retry_delete;
- }
- list_del(&timer->list);
-diff --git a/kernel/time/tick-broadcast-hrtimer.c b/kernel/time/tick-broadcast-hrtimer.c
-index 690b797..fe8ba16 100644
---- a/kernel/time/tick-broadcast-hrtimer.c
-+++ b/kernel/time/tick-broadcast-hrtimer.c
-@@ -107,5 +107,6 @@ void tick_setup_hrtimer_broadcast(void)
- {
- hrtimer_init(&bctimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
- bctimer.function = bc_handler;
-+ bctimer.irqsafe = true;
- clockevents_register_device(&ce_broadcast_hrtimer);
- }
-diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
-index 4fcd99e..5a47f2e 100644
---- a/kernel/time/tick-common.c
-+++ b/kernel/time/tick-common.c
-@@ -79,13 +79,15 @@ int tick_is_oneshot_available(void)
- static void tick_periodic(int cpu)
- {
- if (tick_do_timer_cpu == cpu) {
-- write_seqlock(&jiffies_lock);
-+ raw_spin_lock(&jiffies_lock);
-+ write_seqcount_begin(&jiffies_seq);
-
- /* Keep track of the next tick event */
- tick_next_period = ktime_add(tick_next_period, tick_period);
-
- do_timer(1);
-- write_sequnlock(&jiffies_lock);
-+ write_seqcount_end(&jiffies_seq);
-+ raw_spin_unlock(&jiffies_lock);
- update_wall_time();
- }
-
-@@ -157,9 +159,9 @@ void tick_setup_periodic(struct clock_event_device *dev, int broadcast)
- ktime_t next;
-
- do {
-- seq = read_seqbegin(&jiffies_lock);
-+ seq = read_seqcount_begin(&jiffies_seq);
- next = tick_next_period;
-- } while (read_seqretry(&jiffies_lock, seq));
-+ } while (read_seqcount_retry(&jiffies_seq, seq));
-
- clockevents_switch_state(dev, CLOCK_EVT_STATE_ONESHOT);
-
-diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
-index 2ec7c00..c1b30b8 100644
---- a/kernel/time/tick-sched.c
-+++ b/kernel/time/tick-sched.c
-@@ -62,7 +62,8 @@ static void tick_do_update_jiffies64(ktime_t now)
- return;
-
- /* Reevaluate with jiffies_lock held */
-- write_seqlock(&jiffies_lock);
-+ raw_spin_lock(&jiffies_lock);
-+ write_seqcount_begin(&jiffies_seq);
-
- delta = ktime_sub(now, last_jiffies_update);
- if (delta.tv64 >= tick_period.tv64) {
-@@ -85,10 +86,12 @@ static void tick_do_update_jiffies64(ktime_t now)
- /* Keep the tick_next_period variable up to date */
- tick_next_period = ktime_add(last_jiffies_update, tick_period);
- } else {
-- write_sequnlock(&jiffies_lock);
-+ write_seqcount_end(&jiffies_seq);
-+ raw_spin_unlock(&jiffies_lock);
- return;
- }
-- write_sequnlock(&jiffies_lock);
-+ write_seqcount_end(&jiffies_seq);
-+ raw_spin_unlock(&jiffies_lock);
- update_wall_time();
- }
-
-@@ -99,12 +102,14 @@ static ktime_t tick_init_jiffy_update(void)
- {
- ktime_t period;
-
-- write_seqlock(&jiffies_lock);
-+ raw_spin_lock(&jiffies_lock);
-+ write_seqcount_begin(&jiffies_seq);
- /* Did we start the jiffies update yet ? */
- if (last_jiffies_update.tv64 == 0)
- last_jiffies_update = tick_next_period;
- period = last_jiffies_update;
-- write_sequnlock(&jiffies_lock);
-+ write_seqcount_end(&jiffies_seq);
-+ raw_spin_unlock(&jiffies_lock);
- return period;
- }
-
-@@ -212,6 +217,7 @@ static void nohz_full_kick_func(struct irq_work *work)
-
- static DEFINE_PER_CPU(struct irq_work, nohz_full_kick_work) = {
- .func = nohz_full_kick_func,
-+ .flags = IRQ_WORK_HARD_IRQ,
- };
-
- /*
-@@ -670,10 +676,10 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts,
-
- /* Read jiffies and the time when jiffies were updated last */
- do {
-- seq = read_seqbegin(&jiffies_lock);
-+ seq = read_seqcount_begin(&jiffies_seq);
- basemono = last_jiffies_update.tv64;
- basejiff = jiffies;
-- } while (read_seqretry(&jiffies_lock, seq));
-+ } while (read_seqcount_retry(&jiffies_seq, seq));
- ts->last_jiffies = basejiff;
-
- if (rcu_needs_cpu(basemono, &next_rcu) ||
-@@ -874,14 +880,7 @@ static bool can_stop_idle_tick(int cpu, struct tick_sched *ts)
- return false;
-
- if (unlikely(local_softirq_pending() && cpu_online(cpu))) {
-- static int ratelimit;
--
-- if (ratelimit < 10 &&
-- (local_softirq_pending() & SOFTIRQ_STOP_IDLE_MASK)) {
-- pr_warn("NOHZ: local_softirq_pending %02x\n",
-- (unsigned int) local_softirq_pending());
-- ratelimit++;
-- }
-+ softirq_check_pending_idle();
- return false;
- }
-
-@@ -1190,6 +1189,7 @@ void tick_setup_sched_timer(void)
- * Emulate tick processing via per-CPU hrtimers:
- */
- hrtimer_init(&ts->sched_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
-+ ts->sched_timer.irqsafe = 1;
- ts->sched_timer.function = tick_sched_timer;
-
- /* Get the next period (per-CPU) */
-diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
-index e07fb09..04f0072 100644
---- a/kernel/time/timekeeping.c
-+++ b/kernel/time/timekeeping.c
-@@ -2325,8 +2325,10 @@ EXPORT_SYMBOL(hardpps);
- */
- void xtime_update(unsigned long ticks)
- {
-- write_seqlock(&jiffies_lock);
-+ raw_spin_lock(&jiffies_lock);
-+ write_seqcount_begin(&jiffies_seq);
- do_timer(ticks);
-- write_sequnlock(&jiffies_lock);
-+ write_seqcount_end(&jiffies_seq);
-+ raw_spin_unlock(&jiffies_lock);
- update_wall_time();
- }
-diff --git a/kernel/time/timekeeping.h b/kernel/time/timekeeping.h
-index 704f595..763a3e5 100644
---- a/kernel/time/timekeeping.h
-+++ b/kernel/time/timekeeping.h
-@@ -19,7 +19,8 @@ extern void timekeeping_resume(void);
- extern void do_timer(unsigned long ticks);
- extern void update_wall_time(void);
-
--extern seqlock_t jiffies_lock;
-+extern raw_spinlock_t jiffies_lock;
-+extern seqcount_t jiffies_seq;
-
- #define CS_NAME_LEN 32
-
-diff --git a/kernel/time/timer.c b/kernel/time/timer.c
-index 32bf6f7..ba53447 100644
---- a/kernel/time/timer.c
-+++ b/kernel/time/timer.c
-@@ -193,8 +193,11 @@ EXPORT_SYMBOL(jiffies_64);
- #endif
-
- struct timer_base {
-- spinlock_t lock;
-+ raw_spinlock_t lock;
- struct timer_list *running_timer;
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ struct swait_queue_head wait_for_running_timer;
-+#endif
- unsigned long clk;
- unsigned long next_expiry;
- unsigned int cpu;
-@@ -947,10 +950,10 @@ static struct timer_base *lock_timer_base(struct timer_list *timer,
-
- if (!(tf & TIMER_MIGRATING)) {
- base = get_timer_base(tf);
-- spin_lock_irqsave(&base->lock, *flags);
-+ raw_spin_lock_irqsave(&base->lock, *flags);
- if (timer->flags == tf)
- return base;
-- spin_unlock_irqrestore(&base->lock, *flags);
-+ raw_spin_unlock_irqrestore(&base->lock, *flags);
- }
- cpu_relax();
- }
-@@ -1017,9 +1020,9 @@ __mod_timer(struct timer_list *timer, unsigned long expires, bool pending_only)
- /* See the comment in lock_timer_base() */
- timer->flags |= TIMER_MIGRATING;
-
-- spin_unlock(&base->lock);
-+ raw_spin_unlock(&base->lock);
- base = new_base;
-- spin_lock(&base->lock);
-+ raw_spin_lock(&base->lock);
- WRITE_ONCE(timer->flags,
- (timer->flags & ~TIMER_BASEMASK) | base->cpu);
- }
-@@ -1040,7 +1043,7 @@ __mod_timer(struct timer_list *timer, unsigned long expires, bool pending_only)
- }
-
- out_unlock:
-- spin_unlock_irqrestore(&base->lock, flags);
-+ raw_spin_unlock_irqrestore(&base->lock, flags);
-
- return ret;
- }
-@@ -1134,19 +1137,46 @@ void add_timer_on(struct timer_list *timer, int cpu)
- if (base != new_base) {
- timer->flags |= TIMER_MIGRATING;
-
-- spin_unlock(&base->lock);
-+ raw_spin_unlock(&base->lock);
- base = new_base;
-- spin_lock(&base->lock);
-+ raw_spin_lock(&base->lock);
- WRITE_ONCE(timer->flags,
- (timer->flags & ~TIMER_BASEMASK) | cpu);
- }
-
- debug_activate(timer, timer->expires);
- internal_add_timer(base, timer);
-- spin_unlock_irqrestore(&base->lock, flags);
-+ raw_spin_unlock_irqrestore(&base->lock, flags);
- }
- EXPORT_SYMBOL_GPL(add_timer_on);
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+/*
-+ * Wait for a running timer
-+ */
-+static void wait_for_running_timer(struct timer_list *timer)
-+{
-+ struct timer_base *base;
-+ u32 tf = timer->flags;
-+
-+ if (tf & TIMER_MIGRATING)
-+ return;
-+
-+ base = get_timer_base(tf);
-+ swait_event(base->wait_for_running_timer,
-+ base->running_timer != timer);
-+}
-+
-+# define wakeup_timer_waiters(b) swake_up_all(&(b)->wait_for_running_timer)
-+#else
-+static inline void wait_for_running_timer(struct timer_list *timer)
-+{
-+ cpu_relax();
-+}
-+
-+# define wakeup_timer_waiters(b) do { } while (0)
-+#endif
-+
- /**
- * del_timer - deactive a timer.
- * @timer: the timer to be deactivated
-@@ -1170,7 +1200,7 @@ int del_timer(struct timer_list *timer)
- if (timer_pending(timer)) {
- base = lock_timer_base(timer, &flags);
- ret = detach_if_pending(timer, base, true);
-- spin_unlock_irqrestore(&base->lock, flags);
-+ raw_spin_unlock_irqrestore(&base->lock, flags);
- }
-
- return ret;
-@@ -1198,13 +1228,13 @@ int try_to_del_timer_sync(struct timer_list *timer)
- timer_stats_timer_clear_start_info(timer);
- ret = detach_if_pending(timer, base, true);
- }
-- spin_unlock_irqrestore(&base->lock, flags);
-+ raw_spin_unlock_irqrestore(&base->lock, flags);
-
- return ret;
- }
- EXPORT_SYMBOL(try_to_del_timer_sync);
-
--#ifdef CONFIG_SMP
-+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL)
- /**
- * del_timer_sync - deactivate a timer and wait for the handler to finish.
- * @timer: the timer to be deactivated
-@@ -1264,7 +1294,7 @@ int del_timer_sync(struct timer_list *timer)
- int ret = try_to_del_timer_sync(timer);
- if (ret >= 0)
- return ret;
-- cpu_relax();
-+ wait_for_running_timer(timer);
- }
- }
- EXPORT_SYMBOL(del_timer_sync);
-@@ -1329,14 +1359,17 @@ static void expire_timers(struct timer_base *base, struct hlist_head *head)
- fn = timer->function;
- data = timer->data;
-
-- if (timer->flags & TIMER_IRQSAFE) {
-- spin_unlock(&base->lock);
-+ if (!IS_ENABLED(CONFIG_PREEMPT_RT_FULL) &&
-+ timer->flags & TIMER_IRQSAFE) {
-+ raw_spin_unlock(&base->lock);
- call_timer_fn(timer, fn, data);
-- spin_lock(&base->lock);
-+ base->running_timer = NULL;
-+ raw_spin_lock(&base->lock);
- } else {
-- spin_unlock_irq(&base->lock);
-+ raw_spin_unlock_irq(&base->lock);
- call_timer_fn(timer, fn, data);
-- spin_lock_irq(&base->lock);
-+ base->running_timer = NULL;
-+ raw_spin_lock_irq(&base->lock);
- }
- }
- }
-@@ -1505,7 +1538,7 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
- if (cpu_is_offline(smp_processor_id()))
- return expires;
-
-- spin_lock(&base->lock);
-+ raw_spin_lock(&base->lock);
- nextevt = __next_timer_interrupt(base);
- is_max_delta = (nextevt == base->clk + NEXT_TIMER_MAX_DELTA);
- base->next_expiry = nextevt;
-@@ -1529,7 +1562,7 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
- if ((expires - basem) > TICK_NSEC)
- base->is_idle = true;
- }
-- spin_unlock(&base->lock);
-+ raw_spin_unlock(&base->lock);
-
- return cmp_next_hrtimer_event(basem, expires);
- }
-@@ -1594,13 +1627,13 @@ void update_process_times(int user_tick)
-
- /* Note: this timer irq context must be accounted for as well. */
- account_process_tick(p, user_tick);
-+ scheduler_tick();
- run_local_timers();
- rcu_check_callbacks(user_tick);
--#ifdef CONFIG_IRQ_WORK
-+#if defined(CONFIG_IRQ_WORK)
- if (in_irq())
- irq_work_tick();
- #endif
-- scheduler_tick();
- run_posix_cpu_timers(p);
- }
-
-@@ -1616,7 +1649,7 @@ static inline void __run_timers(struct timer_base *base)
- if (!time_after_eq(jiffies, base->clk))
- return;
-
-- spin_lock_irq(&base->lock);
-+ raw_spin_lock_irq(&base->lock);
-
- while (time_after_eq(jiffies, base->clk)) {
-
-@@ -1626,8 +1659,8 @@ static inline void __run_timers(struct timer_base *base)
- while (levels--)
- expire_timers(base, heads + levels);
- }
-- base->running_timer = NULL;
-- spin_unlock_irq(&base->lock);
-+ raw_spin_unlock_irq(&base->lock);
-+ wakeup_timer_waiters(base);
- }
-
- /*
-@@ -1637,6 +1670,8 @@ static void run_timer_softirq(struct softirq_action *h)
- {
- struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]);
-
-+ irq_work_tick_soft();
-+
- __run_timers(base);
- if (IS_ENABLED(CONFIG_NO_HZ_COMMON) && base->nohz_active)
- __run_timers(this_cpu_ptr(&timer_bases[BASE_DEF]));
-@@ -1822,16 +1857,16 @@ int timers_dead_cpu(unsigned int cpu)
- * The caller is globally serialized and nobody else
- * takes two locks at once, deadlock is not possible.
- */
-- spin_lock_irq(&new_base->lock);
-- spin_lock_nested(&old_base->lock, SINGLE_DEPTH_NESTING);
-+ raw_spin_lock_irq(&new_base->lock);
-+ raw_spin_lock_nested(&old_base->lock, SINGLE_DEPTH_NESTING);
-
- BUG_ON(old_base->running_timer);
-
- for (i = 0; i < WHEEL_SIZE; i++)
- migrate_timer_list(new_base, old_base->vectors + i);
-
-- spin_unlock(&old_base->lock);
-- spin_unlock_irq(&new_base->lock);
-+ raw_spin_unlock(&old_base->lock);
-+ raw_spin_unlock_irq(&new_base->lock);
- put_cpu_ptr(&timer_bases);
- }
- return 0;
-@@ -1847,8 +1882,11 @@ static void __init init_timer_cpu(int cpu)
- for (i = 0; i < NR_BASES; i++) {
- base = per_cpu_ptr(&timer_bases[i], cpu);
- base->cpu = cpu;
-- spin_lock_init(&base->lock);
-+ raw_spin_lock_init(&base->lock);
- base->clk = jiffies;
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ init_swait_queue_head(&base->wait_for_running_timer);
-+#endif
- }
- }
-
-diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
-index f4b86e8..340f14e 100644
---- a/kernel/trace/Kconfig
-+++ b/kernel/trace/Kconfig
-@@ -187,6 +187,24 @@ config IRQSOFF_TRACER
- enabled. This option and the preempt-off timing option can be
- used together or separately.)
-
-+config INTERRUPT_OFF_HIST
-+ bool "Interrupts-off Latency Histogram"
-+ depends on IRQSOFF_TRACER
-+ help
-+ This option generates continuously updated histograms (one per cpu)
-+ of the duration of time periods with interrupts disabled. The
-+ histograms are disabled by default. To enable them, write a non-zero
-+ number to
-+
-+ /sys/kernel/debug/tracing/latency_hist/enable/preemptirqsoff
-+
-+ If PREEMPT_OFF_HIST is also selected, additional histograms (one
-+ per cpu) are generated that accumulate the duration of time periods
-+ when both interrupts and preemption are disabled. The histogram data
-+ will be located in the debug file system at
-+
-+ /sys/kernel/debug/tracing/latency_hist/irqsoff
-+
- config PREEMPT_TRACER
- bool "Preemption-off Latency Tracer"
- default n
-@@ -197,6 +215,7 @@ config PREEMPT_TRACER
- select RING_BUFFER_ALLOW_SWAP
- select TRACER_SNAPSHOT
- select TRACER_SNAPSHOT_PER_CPU_SWAP
-+ select USING_GET_LOCK_PARENT_IP
- help
- This option measures the time spent in preemption-off critical
- sections, with microsecond accuracy.
-@@ -211,6 +230,24 @@ config PREEMPT_TRACER
- enabled. This option and the irqs-off timing option can be
- used together or separately.)
-
-+config PREEMPT_OFF_HIST
-+ bool "Preemption-off Latency Histogram"
-+ depends on PREEMPT_TRACER
-+ help
-+ This option generates continuously updated histograms (one per cpu)
-+ of the duration of time periods with preemption disabled. The
-+ histograms are disabled by default. To enable them, write a non-zero
-+ number to
-+
-+ /sys/kernel/debug/tracing/latency_hist/enable/preemptirqsoff
-+
-+ If INTERRUPT_OFF_HIST is also selected, additional histograms (one
-+ per cpu) are generated that accumulate the duration of time periods
-+ when both interrupts and preemption are disabled. The histogram data
-+ will be located in the debug file system at
-+
-+ /sys/kernel/debug/tracing/latency_hist/preemptoff
-+
- config SCHED_TRACER
- bool "Scheduling Latency Tracer"
- select GENERIC_TRACER
-@@ -221,6 +258,74 @@ config SCHED_TRACER
- This tracer tracks the latency of the highest priority task
- to be scheduled in, starting from the point it has woken up.
-
-+config WAKEUP_LATENCY_HIST
-+ bool "Scheduling Latency Histogram"
-+ depends on SCHED_TRACER
-+ help
-+ This option generates continuously updated histograms (one per cpu)
-+ of the scheduling latency of the highest priority task.
-+ The histograms are disabled by default. To enable them, write a
-+ non-zero number to
-+
-+ /sys/kernel/debug/tracing/latency_hist/enable/wakeup
-+
-+ Two different algorithms are used, one to determine the latency of
-+ processes that exclusively use the highest priority of the system and
-+ another one to determine the latency of processes that share the
-+ highest system priority with other processes. The former is used to
-+ improve hardware and system software, the latter to optimize the
-+ priority design of a given system. The histogram data will be
-+ located in the debug file system at
-+
-+ /sys/kernel/debug/tracing/latency_hist/wakeup
-+
-+ and
-+
-+ /sys/kernel/debug/tracing/latency_hist/wakeup/sharedprio
-+
-+ If both Scheduling Latency Histogram and Missed Timer Offsets
-+ Histogram are selected, additional histogram data will be collected
-+ that contain, in addition to the wakeup latency, the timer latency, in
-+ case the wakeup was triggered by an expired timer. These histograms
-+ are available in the
-+
-+ /sys/kernel/debug/tracing/latency_hist/timerandwakeup
-+
-+ directory. They reflect the apparent interrupt and scheduling latency
-+ and are best suitable to determine the worst-case latency of a given
-+ system. To enable these histograms, write a non-zero number to
-+
-+ /sys/kernel/debug/tracing/latency_hist/enable/timerandwakeup
-+
-+config MISSED_TIMER_OFFSETS_HIST
-+ depends on HIGH_RES_TIMERS
-+ select GENERIC_TRACER
-+ bool "Missed Timer Offsets Histogram"
-+ help
-+ Generate a histogram of missed timer offsets in microseconds. The
-+ histograms are disabled by default. To enable them, write a non-zero
-+ number to
-+
-+ /sys/kernel/debug/tracing/latency_hist/enable/missed_timer_offsets
-+
-+ The histogram data will be located in the debug file system at
-+
-+ /sys/kernel/debug/tracing/latency_hist/missed_timer_offsets
-+
-+ If both Scheduling Latency Histogram and Missed Timer Offsets
-+ Histogram are selected, additional histogram data will be collected
-+ that contain, in addition to the wakeup latency, the timer latency, in
-+ case the wakeup was triggered by an expired timer. These histograms
-+ are available in the
-+
-+ /sys/kernel/debug/tracing/latency_hist/timerandwakeup
-+
-+ directory. They reflect the apparent interrupt and scheduling latency
-+ and are best suitable to determine the worst-case latency of a given
-+ system. To enable these histograms, write a non-zero number to
-+
-+ /sys/kernel/debug/tracing/latency_hist/enable/timerandwakeup
-+
- config ENABLE_DEFAULT_TRACERS
- bool "Trace process context switches and events"
- depends on !GENERIC_TRACER
-diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
-index d0a1617..6bf9e9f 100644
---- a/kernel/trace/Makefile
-+++ b/kernel/trace/Makefile
-@@ -41,6 +41,10 @@ obj-$(CONFIG_FUNCTION_TRACER) += trace_functions.o
- obj-$(CONFIG_IRQSOFF_TRACER) += trace_irqsoff.o
- obj-$(CONFIG_PREEMPT_TRACER) += trace_irqsoff.o
- obj-$(CONFIG_SCHED_TRACER) += trace_sched_wakeup.o
-+obj-$(CONFIG_INTERRUPT_OFF_HIST) += latency_hist.o
-+obj-$(CONFIG_PREEMPT_OFF_HIST) += latency_hist.o
-+obj-$(CONFIG_WAKEUP_LATENCY_HIST) += latency_hist.o
-+obj-$(CONFIG_MISSED_TIMER_OFFSETS_HIST) += latency_hist.o
- obj-$(CONFIG_NOP_TRACER) += trace_nop.o
- obj-$(CONFIG_STACK_TRACER) += trace_stack.o
- obj-$(CONFIG_MMIOTRACE) += trace_mmiotrace.o
-diff --git a/kernel/trace/latency_hist.c b/kernel/trace/latency_hist.c
-new file mode 100644
-index 0000000..7f6ee70
---- /dev/null
-+++ b/kernel/trace/latency_hist.c
-@@ -0,0 +1,1178 @@
-+/*
-+ * kernel/trace/latency_hist.c
-+ *
-+ * Add support for histograms of preemption-off latency and
-+ * interrupt-off latency and wakeup latency, it depends on
-+ * Real-Time Preemption Support.
-+ *
-+ * Copyright (C) 2005 MontaVista Software, Inc.
-+ * Yi Yang <yyang@ch.mvista.com>
-+ *
-+ * Converted to work with the new latency tracer.
-+ * Copyright (C) 2008 Red Hat, Inc.
-+ * Steven Rostedt <srostedt@redhat.com>
-+ *
-+ */
-+#include <linux/module.h>
-+#include <linux/debugfs.h>
-+#include <linux/seq_file.h>
-+#include <linux/percpu.h>
-+#include <linux/kallsyms.h>
-+#include <linux/uaccess.h>
-+#include <linux/sched.h>
-+#include <linux/sched/rt.h>
-+#include <linux/slab.h>
-+#include <linux/atomic.h>
-+#include <asm/div64.h>
-+
-+#include "trace.h"
-+#include <trace/events/sched.h>
-+
-+#define NSECS_PER_USECS 1000L
-+
-+#define CREATE_TRACE_POINTS
-+#include <trace/events/hist.h>
-+
-+enum {
-+ IRQSOFF_LATENCY = 0,
-+ PREEMPTOFF_LATENCY,
-+ PREEMPTIRQSOFF_LATENCY,
-+ WAKEUP_LATENCY,
-+ WAKEUP_LATENCY_SHAREDPRIO,
-+ MISSED_TIMER_OFFSETS,
-+ TIMERANDWAKEUP_LATENCY,
-+ MAX_LATENCY_TYPE,
-+};
-+
-+#define MAX_ENTRY_NUM 10240
-+
-+struct hist_data {
-+ atomic_t hist_mode; /* 0 log, 1 don't log */
-+ long offset; /* set it to MAX_ENTRY_NUM/2 for a bipolar scale */
-+ long min_lat;
-+ long max_lat;
-+ unsigned long long below_hist_bound_samples;
-+ unsigned long long above_hist_bound_samples;
-+ long long accumulate_lat;
-+ unsigned long long total_samples;
-+ unsigned long long hist_array[MAX_ENTRY_NUM];
-+};
-+
-+struct enable_data {
-+ int latency_type;
-+ int enabled;
-+};
-+
-+static char *latency_hist_dir_root = "latency_hist";
-+
-+#ifdef CONFIG_INTERRUPT_OFF_HIST
-+static DEFINE_PER_CPU(struct hist_data, irqsoff_hist);
-+static char *irqsoff_hist_dir = "irqsoff";
-+static DEFINE_PER_CPU(cycles_t, hist_irqsoff_start);
-+static DEFINE_PER_CPU(int, hist_irqsoff_counting);
-+#endif
-+
-+#ifdef CONFIG_PREEMPT_OFF_HIST
-+static DEFINE_PER_CPU(struct hist_data, preemptoff_hist);
-+static char *preemptoff_hist_dir = "preemptoff";
-+static DEFINE_PER_CPU(cycles_t, hist_preemptoff_start);
-+static DEFINE_PER_CPU(int, hist_preemptoff_counting);
-+#endif
-+
-+#if defined(CONFIG_PREEMPT_OFF_HIST) && defined(CONFIG_INTERRUPT_OFF_HIST)
-+static DEFINE_PER_CPU(struct hist_data, preemptirqsoff_hist);
-+static char *preemptirqsoff_hist_dir = "preemptirqsoff";
-+static DEFINE_PER_CPU(cycles_t, hist_preemptirqsoff_start);
-+static DEFINE_PER_CPU(int, hist_preemptirqsoff_counting);
-+#endif
-+
-+#if defined(CONFIG_PREEMPT_OFF_HIST) || defined(CONFIG_INTERRUPT_OFF_HIST)
-+static notrace void probe_preemptirqsoff_hist(void *v, int reason, int start);
-+static struct enable_data preemptirqsoff_enabled_data = {
-+ .latency_type = PREEMPTIRQSOFF_LATENCY,
-+ .enabled = 0,
-+};
-+#endif
-+
-+#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
-+ defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
-+struct maxlatproc_data {
-+ char comm[FIELD_SIZEOF(struct task_struct, comm)];
-+ char current_comm[FIELD_SIZEOF(struct task_struct, comm)];
-+ int pid;
-+ int current_pid;
-+ int prio;
-+ int current_prio;
-+ long latency;
-+ long timeroffset;
-+ cycle_t timestamp;
-+};
-+#endif
-+
-+#ifdef CONFIG_WAKEUP_LATENCY_HIST
-+static DEFINE_PER_CPU(struct hist_data, wakeup_latency_hist);
-+static DEFINE_PER_CPU(struct hist_data, wakeup_latency_hist_sharedprio);
-+static char *wakeup_latency_hist_dir = "wakeup";
-+static char *wakeup_latency_hist_dir_sharedprio = "sharedprio";
-+static notrace void probe_wakeup_latency_hist_start(void *v,
-+ struct task_struct *p);
-+static notrace void probe_wakeup_latency_hist_stop(void *v,
-+ bool preempt, struct task_struct *prev, struct task_struct *next);
-+static notrace void probe_sched_migrate_task(void *,
-+ struct task_struct *task, int cpu);
-+static struct enable_data wakeup_latency_enabled_data = {
-+ .latency_type = WAKEUP_LATENCY,
-+ .enabled = 0,
-+};
-+static DEFINE_PER_CPU(struct maxlatproc_data, wakeup_maxlatproc);
-+static DEFINE_PER_CPU(struct maxlatproc_data, wakeup_maxlatproc_sharedprio);
-+static DEFINE_PER_CPU(struct task_struct *, wakeup_task);
-+static DEFINE_PER_CPU(int, wakeup_sharedprio);
-+static unsigned long wakeup_pid;
-+#endif
-+
-+#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
-+static DEFINE_PER_CPU(struct hist_data, missed_timer_offsets);
-+static char *missed_timer_offsets_dir = "missed_timer_offsets";
-+static notrace void probe_hrtimer_interrupt(void *v, int cpu,
-+ long long offset, struct task_struct *curr, struct task_struct *task);
-+static struct enable_data missed_timer_offsets_enabled_data = {
-+ .latency_type = MISSED_TIMER_OFFSETS,
-+ .enabled = 0,
-+};
-+static DEFINE_PER_CPU(struct maxlatproc_data, missed_timer_offsets_maxlatproc);
-+static unsigned long missed_timer_offsets_pid;
-+#endif
-+
-+#if defined(CONFIG_WAKEUP_LATENCY_HIST) && \
-+ defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
-+static DEFINE_PER_CPU(struct hist_data, timerandwakeup_latency_hist);
-+static char *timerandwakeup_latency_hist_dir = "timerandwakeup";
-+static struct enable_data timerandwakeup_enabled_data = {
-+ .latency_type = TIMERANDWAKEUP_LATENCY,
-+ .enabled = 0,
-+};
-+static DEFINE_PER_CPU(struct maxlatproc_data, timerandwakeup_maxlatproc);
-+#endif
-+
-+void notrace latency_hist(int latency_type, int cpu, long latency,
-+ long timeroffset, cycle_t stop,
-+ struct task_struct *p)
-+{
-+ struct hist_data *my_hist;
-+#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
-+ defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
-+ struct maxlatproc_data *mp = NULL;
-+#endif
-+
-+ if (!cpu_possible(cpu) || latency_type < 0 ||
-+ latency_type >= MAX_LATENCY_TYPE)
-+ return;
-+
-+ switch (latency_type) {
-+#ifdef CONFIG_INTERRUPT_OFF_HIST
-+ case IRQSOFF_LATENCY:
-+ my_hist = &per_cpu(irqsoff_hist, cpu);
-+ break;
-+#endif
-+#ifdef CONFIG_PREEMPT_OFF_HIST
-+ case PREEMPTOFF_LATENCY:
-+ my_hist = &per_cpu(preemptoff_hist, cpu);
-+ break;
-+#endif
-+#if defined(CONFIG_PREEMPT_OFF_HIST) && defined(CONFIG_INTERRUPT_OFF_HIST)
-+ case PREEMPTIRQSOFF_LATENCY:
-+ my_hist = &per_cpu(preemptirqsoff_hist, cpu);
-+ break;
-+#endif
-+#ifdef CONFIG_WAKEUP_LATENCY_HIST
-+ case WAKEUP_LATENCY:
-+ my_hist = &per_cpu(wakeup_latency_hist, cpu);
-+ mp = &per_cpu(wakeup_maxlatproc, cpu);
-+ break;
-+ case WAKEUP_LATENCY_SHAREDPRIO:
-+ my_hist = &per_cpu(wakeup_latency_hist_sharedprio, cpu);
-+ mp = &per_cpu(wakeup_maxlatproc_sharedprio, cpu);
-+ break;
-+#endif
-+#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
-+ case MISSED_TIMER_OFFSETS:
-+ my_hist = &per_cpu(missed_timer_offsets, cpu);
-+ mp = &per_cpu(missed_timer_offsets_maxlatproc, cpu);
-+ break;
-+#endif
-+#if defined(CONFIG_WAKEUP_LATENCY_HIST) && \
-+ defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
-+ case TIMERANDWAKEUP_LATENCY:
-+ my_hist = &per_cpu(timerandwakeup_latency_hist, cpu);
-+ mp = &per_cpu(timerandwakeup_maxlatproc, cpu);
-+ break;
-+#endif
-+
-+ default:
-+ return;
-+ }
-+
-+ latency += my_hist->offset;
-+
-+ if (atomic_read(&my_hist->hist_mode) == 0)
-+ return;
-+
-+ if (latency < 0 || latency >= MAX_ENTRY_NUM) {
-+ if (latency < 0)
-+ my_hist->below_hist_bound_samples++;
-+ else
-+ my_hist->above_hist_bound_samples++;
-+ } else
-+ my_hist->hist_array[latency]++;
-+
-+ if (unlikely(latency > my_hist->max_lat ||
-+ my_hist->min_lat == LONG_MAX)) {
-+#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
-+ defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
-+ if (latency_type == WAKEUP_LATENCY ||
-+ latency_type == WAKEUP_LATENCY_SHAREDPRIO ||
-+ latency_type == MISSED_TIMER_OFFSETS ||
-+ latency_type == TIMERANDWAKEUP_LATENCY) {
-+ strncpy(mp->comm, p->comm, sizeof(mp->comm));
-+ strncpy(mp->current_comm, current->comm,
-+ sizeof(mp->current_comm));
-+ mp->pid = task_pid_nr(p);
-+ mp->current_pid = task_pid_nr(current);
-+ mp->prio = p->prio;
-+ mp->current_prio = current->prio;
-+ mp->latency = latency;
-+ mp->timeroffset = timeroffset;
-+ mp->timestamp = stop;
-+ }
-+#endif
-+ my_hist->max_lat = latency;
-+ }
-+ if (unlikely(latency < my_hist->min_lat))
-+ my_hist->min_lat = latency;
-+ my_hist->total_samples++;
-+ my_hist->accumulate_lat += latency;
-+}
-+
-+static void *l_start(struct seq_file *m, loff_t *pos)
-+{
-+ loff_t *index_ptr = NULL;
-+ loff_t index = *pos;
-+ struct hist_data *my_hist = m->private;
-+
-+ if (index == 0) {
-+ char minstr[32], avgstr[32], maxstr[32];
-+
-+ atomic_dec(&my_hist->hist_mode);
-+
-+ if (likely(my_hist->total_samples)) {
-+ long avg = (long) div64_s64(my_hist->accumulate_lat,
-+ my_hist->total_samples);
-+ snprintf(minstr, sizeof(minstr), "%ld",
-+ my_hist->min_lat - my_hist->offset);
-+ snprintf(avgstr, sizeof(avgstr), "%ld",
-+ avg - my_hist->offset);
-+ snprintf(maxstr, sizeof(maxstr), "%ld",
-+ my_hist->max_lat - my_hist->offset);
-+ } else {
-+ strcpy(minstr, "<undef>");
-+ strcpy(avgstr, minstr);
-+ strcpy(maxstr, minstr);
-+ }
-+
-+ seq_printf(m, "#Minimum latency: %s microseconds\n"
-+ "#Average latency: %s microseconds\n"
-+ "#Maximum latency: %s microseconds\n"
-+ "#Total samples: %llu\n"
-+ "#There are %llu samples lower than %ld"
-+ " microseconds.\n"
-+ "#There are %llu samples greater or equal"
-+ " than %ld microseconds.\n"
-+ "#usecs\t%16s\n",
-+ minstr, avgstr, maxstr,
-+ my_hist->total_samples,
-+ my_hist->below_hist_bound_samples,
-+ -my_hist->offset,
-+ my_hist->above_hist_bound_samples,
-+ MAX_ENTRY_NUM - my_hist->offset,
-+ "samples");
-+ }
-+ if (index < MAX_ENTRY_NUM) {
-+ index_ptr = kmalloc(sizeof(loff_t), GFP_KERNEL);
-+ if (index_ptr)
-+ *index_ptr = index;
-+ }
-+
-+ return index_ptr;
-+}
-+
-+static void *l_next(struct seq_file *m, void *p, loff_t *pos)
-+{
-+ loff_t *index_ptr = p;
-+ struct hist_data *my_hist = m->private;
-+
-+ if (++*pos >= MAX_ENTRY_NUM) {
-+ atomic_inc(&my_hist->hist_mode);
-+ return NULL;
-+ }
-+ *index_ptr = *pos;
-+ return index_ptr;
-+}
-+
-+static void l_stop(struct seq_file *m, void *p)
-+{
-+ kfree(p);
-+}
-+
-+static int l_show(struct seq_file *m, void *p)
-+{
-+ int index = *(loff_t *) p;
-+ struct hist_data *my_hist = m->private;
-+
-+ seq_printf(m, "%6ld\t%16llu\n", index - my_hist->offset,
-+ my_hist->hist_array[index]);
-+ return 0;
-+}
-+
-+static const struct seq_operations latency_hist_seq_op = {
-+ .start = l_start,
-+ .next = l_next,
-+ .stop = l_stop,
-+ .show = l_show
-+};
-+
-+static int latency_hist_open(struct inode *inode, struct file *file)
-+{
-+ int ret;
-+
-+ ret = seq_open(file, &latency_hist_seq_op);
-+ if (!ret) {
-+ struct seq_file *seq = file->private_data;
-+ seq->private = inode->i_private;
-+ }
-+ return ret;
-+}
-+
-+static const struct file_operations latency_hist_fops = {
-+ .open = latency_hist_open,
-+ .read = seq_read,
-+ .llseek = seq_lseek,
-+ .release = seq_release,
-+};
-+
-+#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
-+ defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
-+static void clear_maxlatprocdata(struct maxlatproc_data *mp)
-+{
-+ mp->comm[0] = mp->current_comm[0] = '\0';
-+ mp->prio = mp->current_prio = mp->pid = mp->current_pid =
-+ mp->latency = mp->timeroffset = -1;
-+ mp->timestamp = 0;
-+}
-+#endif
-+
-+static void hist_reset(struct hist_data *hist)
-+{
-+ atomic_dec(&hist->hist_mode);
-+
-+ memset(hist->hist_array, 0, sizeof(hist->hist_array));
-+ hist->below_hist_bound_samples = 0ULL;
-+ hist->above_hist_bound_samples = 0ULL;
-+ hist->min_lat = LONG_MAX;
-+ hist->max_lat = LONG_MIN;
-+ hist->total_samples = 0ULL;
-+ hist->accumulate_lat = 0LL;
-+
-+ atomic_inc(&hist->hist_mode);
-+}
-+
-+static ssize_t
-+latency_hist_reset(struct file *file, const char __user *a,
-+ size_t size, loff_t *off)
-+{
-+ int cpu;
-+ struct hist_data *hist = NULL;
-+#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
-+ defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
-+ struct maxlatproc_data *mp = NULL;
-+#endif
-+ off_t latency_type = (off_t) file->private_data;
-+
-+ for_each_online_cpu(cpu) {
-+
-+ switch (latency_type) {
-+#ifdef CONFIG_PREEMPT_OFF_HIST
-+ case PREEMPTOFF_LATENCY:
-+ hist = &per_cpu(preemptoff_hist, cpu);
-+ break;
-+#endif
-+#ifdef CONFIG_INTERRUPT_OFF_HIST
-+ case IRQSOFF_LATENCY:
-+ hist = &per_cpu(irqsoff_hist, cpu);
-+ break;
-+#endif
-+#if defined(CONFIG_INTERRUPT_OFF_HIST) && defined(CONFIG_PREEMPT_OFF_HIST)
-+ case PREEMPTIRQSOFF_LATENCY:
-+ hist = &per_cpu(preemptirqsoff_hist, cpu);
-+ break;
-+#endif
-+#ifdef CONFIG_WAKEUP_LATENCY_HIST
-+ case WAKEUP_LATENCY:
-+ hist = &per_cpu(wakeup_latency_hist, cpu);
-+ mp = &per_cpu(wakeup_maxlatproc, cpu);
-+ break;
-+ case WAKEUP_LATENCY_SHAREDPRIO:
-+ hist = &per_cpu(wakeup_latency_hist_sharedprio, cpu);
-+ mp = &per_cpu(wakeup_maxlatproc_sharedprio, cpu);
-+ break;
-+#endif
-+#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
-+ case MISSED_TIMER_OFFSETS:
-+ hist = &per_cpu(missed_timer_offsets, cpu);
-+ mp = &per_cpu(missed_timer_offsets_maxlatproc, cpu);
-+ break;
-+#endif
-+#if defined(CONFIG_WAKEUP_LATENCY_HIST) && \
-+ defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
-+ case TIMERANDWAKEUP_LATENCY:
-+ hist = &per_cpu(timerandwakeup_latency_hist, cpu);
-+ mp = &per_cpu(timerandwakeup_maxlatproc, cpu);
-+ break;
-+#endif
-+ }
-+
-+ hist_reset(hist);
-+#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
-+ defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
-+ if (latency_type == WAKEUP_LATENCY ||
-+ latency_type == WAKEUP_LATENCY_SHAREDPRIO ||
-+ latency_type == MISSED_TIMER_OFFSETS ||
-+ latency_type == TIMERANDWAKEUP_LATENCY)
-+ clear_maxlatprocdata(mp);
-+#endif
-+ }
-+
-+ return size;
-+}
-+
-+#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
-+ defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
-+static ssize_t
-+show_pid(struct file *file, char __user *ubuf, size_t cnt, loff_t *ppos)
-+{
-+ char buf[64];
-+ int r;
-+ unsigned long *this_pid = file->private_data;
-+
-+ r = snprintf(buf, sizeof(buf), "%lu\n", *this_pid);
-+ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r);
-+}
-+
-+static ssize_t do_pid(struct file *file, const char __user *ubuf,
-+ size_t cnt, loff_t *ppos)
-+{
-+ char buf[64];
-+ unsigned long pid;
-+ unsigned long *this_pid = file->private_data;
-+
-+ if (cnt >= sizeof(buf))
-+ return -EINVAL;
-+
-+ if (copy_from_user(&buf, ubuf, cnt))
-+ return -EFAULT;
-+
-+ buf[cnt] = '\0';
-+
-+ if (kstrtoul(buf, 10, &pid))
-+ return -EINVAL;
-+
-+ *this_pid = pid;
-+
-+ return cnt;
-+}
-+#endif
-+
-+#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
-+ defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
-+static ssize_t
-+show_maxlatproc(struct file *file, char __user *ubuf, size_t cnt, loff_t *ppos)
-+{
-+ int r;
-+ struct maxlatproc_data *mp = file->private_data;
-+ int strmaxlen = (TASK_COMM_LEN * 2) + (8 * 8);
-+ unsigned long long t;
-+ unsigned long usecs, secs;
-+ char *buf;
-+
-+ if (mp->pid == -1 || mp->current_pid == -1) {
-+ buf = "(none)\n";
-+ return simple_read_from_buffer(ubuf, cnt, ppos, buf,
-+ strlen(buf));
-+ }
-+
-+ buf = kmalloc(strmaxlen, GFP_KERNEL);
-+ if (buf == NULL)
-+ return -ENOMEM;
-+
-+ t = ns2usecs(mp->timestamp);
-+ usecs = do_div(t, USEC_PER_SEC);
-+ secs = (unsigned long) t;
-+ r = snprintf(buf, strmaxlen,
-+ "%d %d %ld (%ld) %s <- %d %d %s %lu.%06lu\n", mp->pid,
-+ MAX_RT_PRIO-1 - mp->prio, mp->latency, mp->timeroffset, mp->comm,
-+ mp->current_pid, MAX_RT_PRIO-1 - mp->current_prio, mp->current_comm,
-+ secs, usecs);
-+ r = simple_read_from_buffer(ubuf, cnt, ppos, buf, r);
-+ kfree(buf);
-+ return r;
-+}
-+#endif
-+
-+static ssize_t
-+show_enable(struct file *file, char __user *ubuf, size_t cnt, loff_t *ppos)
-+{
-+ char buf[64];
-+ struct enable_data *ed = file->private_data;
-+ int r;
-+
-+ r = snprintf(buf, sizeof(buf), "%d\n", ed->enabled);
-+ return simple_read_from_buffer(ubuf, cnt, ppos, buf, r);
-+}
-+
-+static ssize_t
-+do_enable(struct file *file, const char __user *ubuf, size_t cnt, loff_t *ppos)
-+{
-+ char buf[64];
-+ long enable;
-+ struct enable_data *ed = file->private_data;
-+
-+ if (cnt >= sizeof(buf))
-+ return -EINVAL;
-+
-+ if (copy_from_user(&buf, ubuf, cnt))
-+ return -EFAULT;
-+
-+ buf[cnt] = 0;
-+
-+ if (kstrtoul(buf, 10, &enable))
-+ return -EINVAL;
-+
-+ if ((enable && ed->enabled) || (!enable && !ed->enabled))
-+ return cnt;
-+
-+ if (enable) {
-+ int ret;
-+
-+ switch (ed->latency_type) {
-+#if defined(CONFIG_INTERRUPT_OFF_HIST) || defined(CONFIG_PREEMPT_OFF_HIST)
-+ case PREEMPTIRQSOFF_LATENCY:
-+ ret = register_trace_preemptirqsoff_hist(
-+ probe_preemptirqsoff_hist, NULL);
-+ if (ret) {
-+ pr_info("wakeup trace: Couldn't assign "
-+ "probe_preemptirqsoff_hist "
-+ "to trace_preemptirqsoff_hist\n");
-+ return ret;
-+ }
-+ break;
-+#endif
-+#ifdef CONFIG_WAKEUP_LATENCY_HIST
-+ case WAKEUP_LATENCY:
-+ ret = register_trace_sched_wakeup(
-+ probe_wakeup_latency_hist_start, NULL);
-+ if (ret) {
-+ pr_info("wakeup trace: Couldn't assign "
-+ "probe_wakeup_latency_hist_start "
-+ "to trace_sched_wakeup\n");
-+ return ret;
-+ }
-+ ret = register_trace_sched_wakeup_new(
-+ probe_wakeup_latency_hist_start, NULL);
-+ if (ret) {
-+ pr_info("wakeup trace: Couldn't assign "
-+ "probe_wakeup_latency_hist_start "
-+ "to trace_sched_wakeup_new\n");
-+ unregister_trace_sched_wakeup(
-+ probe_wakeup_latency_hist_start, NULL);
-+ return ret;
-+ }
-+ ret = register_trace_sched_switch(
-+ probe_wakeup_latency_hist_stop, NULL);
-+ if (ret) {
-+ pr_info("wakeup trace: Couldn't assign "
-+ "probe_wakeup_latency_hist_stop "
-+ "to trace_sched_switch\n");
-+ unregister_trace_sched_wakeup(
-+ probe_wakeup_latency_hist_start, NULL);
-+ unregister_trace_sched_wakeup_new(
-+ probe_wakeup_latency_hist_start, NULL);
-+ return ret;
-+ }
-+ ret = register_trace_sched_migrate_task(
-+ probe_sched_migrate_task, NULL);
-+ if (ret) {
-+ pr_info("wakeup trace: Couldn't assign "
-+ "probe_sched_migrate_task "
-+ "to trace_sched_migrate_task\n");
-+ unregister_trace_sched_wakeup(
-+ probe_wakeup_latency_hist_start, NULL);
-+ unregister_trace_sched_wakeup_new(
-+ probe_wakeup_latency_hist_start, NULL);
-+ unregister_trace_sched_switch(
-+ probe_wakeup_latency_hist_stop, NULL);
-+ return ret;
-+ }
-+ break;
-+#endif
-+#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
-+ case MISSED_TIMER_OFFSETS:
-+ ret = register_trace_hrtimer_interrupt(
-+ probe_hrtimer_interrupt, NULL);
-+ if (ret) {
-+ pr_info("wakeup trace: Couldn't assign "
-+ "probe_hrtimer_interrupt "
-+ "to trace_hrtimer_interrupt\n");
-+ return ret;
-+ }
-+ break;
-+#endif
-+#if defined(CONFIG_WAKEUP_LATENCY_HIST) && \
-+ defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
-+ case TIMERANDWAKEUP_LATENCY:
-+ if (!wakeup_latency_enabled_data.enabled ||
-+ !missed_timer_offsets_enabled_data.enabled)
-+ return -EINVAL;
-+ break;
-+#endif
-+ default:
-+ break;
-+ }
-+ } else {
-+ switch (ed->latency_type) {
-+#if defined(CONFIG_INTERRUPT_OFF_HIST) || defined(CONFIG_PREEMPT_OFF_HIST)
-+ case PREEMPTIRQSOFF_LATENCY:
-+ {
-+ int cpu;
-+
-+ unregister_trace_preemptirqsoff_hist(
-+ probe_preemptirqsoff_hist, NULL);
-+ for_each_online_cpu(cpu) {
-+#ifdef CONFIG_INTERRUPT_OFF_HIST
-+ per_cpu(hist_irqsoff_counting,
-+ cpu) = 0;
-+#endif
-+#ifdef CONFIG_PREEMPT_OFF_HIST
-+ per_cpu(hist_preemptoff_counting,
-+ cpu) = 0;
-+#endif
-+#if defined(CONFIG_INTERRUPT_OFF_HIST) && defined(CONFIG_PREEMPT_OFF_HIST)
-+ per_cpu(hist_preemptirqsoff_counting,
-+ cpu) = 0;
-+#endif
-+ }
-+ }
-+ break;
-+#endif
-+#ifdef CONFIG_WAKEUP_LATENCY_HIST
-+ case WAKEUP_LATENCY:
-+ {
-+ int cpu;
-+
-+ unregister_trace_sched_wakeup(
-+ probe_wakeup_latency_hist_start, NULL);
-+ unregister_trace_sched_wakeup_new(
-+ probe_wakeup_latency_hist_start, NULL);
-+ unregister_trace_sched_switch(
-+ probe_wakeup_latency_hist_stop, NULL);
-+ unregister_trace_sched_migrate_task(
-+ probe_sched_migrate_task, NULL);
-+
-+ for_each_online_cpu(cpu) {
-+ per_cpu(wakeup_task, cpu) = NULL;
-+ per_cpu(wakeup_sharedprio, cpu) = 0;
-+ }
-+ }
-+#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
-+ timerandwakeup_enabled_data.enabled = 0;
-+#endif
-+ break;
-+#endif
-+#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
-+ case MISSED_TIMER_OFFSETS:
-+ unregister_trace_hrtimer_interrupt(
-+ probe_hrtimer_interrupt, NULL);
-+#ifdef CONFIG_WAKEUP_LATENCY_HIST
-+ timerandwakeup_enabled_data.enabled = 0;
-+#endif
-+ break;
-+#endif
-+ default:
-+ break;
-+ }
-+ }
-+ ed->enabled = enable;
-+ return cnt;
-+}
-+
-+static const struct file_operations latency_hist_reset_fops = {
-+ .open = tracing_open_generic,
-+ .write = latency_hist_reset,
-+};
-+
-+static const struct file_operations enable_fops = {
-+ .open = tracing_open_generic,
-+ .read = show_enable,
-+ .write = do_enable,
-+};
-+
-+#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
-+ defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
-+static const struct file_operations pid_fops = {
-+ .open = tracing_open_generic,
-+ .read = show_pid,
-+ .write = do_pid,
-+};
-+
-+static const struct file_operations maxlatproc_fops = {
-+ .open = tracing_open_generic,
-+ .read = show_maxlatproc,
-+};
-+#endif
-+
-+#if defined(CONFIG_INTERRUPT_OFF_HIST) || defined(CONFIG_PREEMPT_OFF_HIST)
-+static notrace void probe_preemptirqsoff_hist(void *v, int reason,
-+ int starthist)
-+{
-+ int cpu = raw_smp_processor_id();
-+ int time_set = 0;
-+
-+ if (starthist) {
-+ cycle_t uninitialized_var(start);
-+
-+ if (!preempt_count() && !irqs_disabled())
-+ return;
-+
-+#ifdef CONFIG_INTERRUPT_OFF_HIST
-+ if ((reason == IRQS_OFF || reason == TRACE_START) &&
-+ !per_cpu(hist_irqsoff_counting, cpu)) {
-+ per_cpu(hist_irqsoff_counting, cpu) = 1;
-+ start = ftrace_now(cpu);
-+ time_set++;
-+ per_cpu(hist_irqsoff_start, cpu) = start;
-+ }
-+#endif
-+
-+#ifdef CONFIG_PREEMPT_OFF_HIST
-+ if ((reason == PREEMPT_OFF || reason == TRACE_START) &&
-+ !per_cpu(hist_preemptoff_counting, cpu)) {
-+ per_cpu(hist_preemptoff_counting, cpu) = 1;
-+ if (!(time_set++))
-+ start = ftrace_now(cpu);
-+ per_cpu(hist_preemptoff_start, cpu) = start;
-+ }
-+#endif
-+
-+#if defined(CONFIG_INTERRUPT_OFF_HIST) && defined(CONFIG_PREEMPT_OFF_HIST)
-+ if (per_cpu(hist_irqsoff_counting, cpu) &&
-+ per_cpu(hist_preemptoff_counting, cpu) &&
-+ !per_cpu(hist_preemptirqsoff_counting, cpu)) {
-+ per_cpu(hist_preemptirqsoff_counting, cpu) = 1;
-+ if (!time_set)
-+ start = ftrace_now(cpu);
-+ per_cpu(hist_preemptirqsoff_start, cpu) = start;
-+ }
-+#endif
-+ } else {
-+ cycle_t uninitialized_var(stop);
-+
-+#ifdef CONFIG_INTERRUPT_OFF_HIST
-+ if ((reason == IRQS_ON || reason == TRACE_STOP) &&
-+ per_cpu(hist_irqsoff_counting, cpu)) {
-+ cycle_t start = per_cpu(hist_irqsoff_start, cpu);
-+
-+ stop = ftrace_now(cpu);
-+ time_set++;
-+ if (start) {
-+ long latency = ((long) (stop - start)) /
-+ NSECS_PER_USECS;
-+
-+ latency_hist(IRQSOFF_LATENCY, cpu, latency, 0,
-+ stop, NULL);
-+ }
-+ per_cpu(hist_irqsoff_counting, cpu) = 0;
-+ }
-+#endif
-+
-+#ifdef CONFIG_PREEMPT_OFF_HIST
-+ if ((reason == PREEMPT_ON || reason == TRACE_STOP) &&
-+ per_cpu(hist_preemptoff_counting, cpu)) {
-+ cycle_t start = per_cpu(hist_preemptoff_start, cpu);
-+
-+ if (!(time_set++))
-+ stop = ftrace_now(cpu);
-+ if (start) {
-+ long latency = ((long) (stop - start)) /
-+ NSECS_PER_USECS;
-+
-+ latency_hist(PREEMPTOFF_LATENCY, cpu, latency,
-+ 0, stop, NULL);
-+ }
-+ per_cpu(hist_preemptoff_counting, cpu) = 0;
-+ }
-+#endif
-+
-+#if defined(CONFIG_INTERRUPT_OFF_HIST) && defined(CONFIG_PREEMPT_OFF_HIST)
-+ if ((!per_cpu(hist_irqsoff_counting, cpu) ||
-+ !per_cpu(hist_preemptoff_counting, cpu)) &&
-+ per_cpu(hist_preemptirqsoff_counting, cpu)) {
-+ cycle_t start = per_cpu(hist_preemptirqsoff_start, cpu);
-+
-+ if (!time_set)
-+ stop = ftrace_now(cpu);
-+ if (start) {
-+ long latency = ((long) (stop - start)) /
-+ NSECS_PER_USECS;
-+
-+ latency_hist(PREEMPTIRQSOFF_LATENCY, cpu,
-+ latency, 0, stop, NULL);
-+ }
-+ per_cpu(hist_preemptirqsoff_counting, cpu) = 0;
-+ }
-+#endif
-+ }
-+}
-+#endif
-+
-+#ifdef CONFIG_WAKEUP_LATENCY_HIST
-+static DEFINE_RAW_SPINLOCK(wakeup_lock);
-+static notrace void probe_sched_migrate_task(void *v, struct task_struct *task,
-+ int cpu)
-+{
-+ int old_cpu = task_cpu(task);
-+
-+ if (cpu != old_cpu) {
-+ unsigned long flags;
-+ struct task_struct *cpu_wakeup_task;
-+
-+ raw_spin_lock_irqsave(&wakeup_lock, flags);
-+
-+ cpu_wakeup_task = per_cpu(wakeup_task, old_cpu);
-+ if (task == cpu_wakeup_task) {
-+ put_task_struct(cpu_wakeup_task);
-+ per_cpu(wakeup_task, old_cpu) = NULL;
-+ cpu_wakeup_task = per_cpu(wakeup_task, cpu) = task;
-+ get_task_struct(cpu_wakeup_task);
-+ }
-+
-+ raw_spin_unlock_irqrestore(&wakeup_lock, flags);
-+ }
-+}
-+
-+static notrace void probe_wakeup_latency_hist_start(void *v,
-+ struct task_struct *p)
-+{
-+ unsigned long flags;
-+ struct task_struct *curr = current;
-+ int cpu = task_cpu(p);
-+ struct task_struct *cpu_wakeup_task;
-+
-+ raw_spin_lock_irqsave(&wakeup_lock, flags);
-+
-+ cpu_wakeup_task = per_cpu(wakeup_task, cpu);
-+
-+ if (wakeup_pid) {
-+ if ((cpu_wakeup_task && p->prio == cpu_wakeup_task->prio) ||
-+ p->prio == curr->prio)
-+ per_cpu(wakeup_sharedprio, cpu) = 1;
-+ if (likely(wakeup_pid != task_pid_nr(p)))
-+ goto out;
-+ } else {
-+ if (likely(!rt_task(p)) ||
-+ (cpu_wakeup_task && p->prio > cpu_wakeup_task->prio) ||
-+ p->prio > curr->prio)
-+ goto out;
-+ if ((cpu_wakeup_task && p->prio == cpu_wakeup_task->prio) ||
-+ p->prio == curr->prio)
-+ per_cpu(wakeup_sharedprio, cpu) = 1;
-+ }
-+
-+ if (cpu_wakeup_task)
-+ put_task_struct(cpu_wakeup_task);
-+ cpu_wakeup_task = per_cpu(wakeup_task, cpu) = p;
-+ get_task_struct(cpu_wakeup_task);
-+ cpu_wakeup_task->preempt_timestamp_hist =
-+ ftrace_now(raw_smp_processor_id());
-+out:
-+ raw_spin_unlock_irqrestore(&wakeup_lock, flags);
-+}
-+
-+static notrace void probe_wakeup_latency_hist_stop(void *v,
-+ bool preempt, struct task_struct *prev, struct task_struct *next)
-+{
-+ unsigned long flags;
-+ int cpu = task_cpu(next);
-+ long latency;
-+ cycle_t stop;
-+ struct task_struct *cpu_wakeup_task;
-+
-+ raw_spin_lock_irqsave(&wakeup_lock, flags);
-+
-+ cpu_wakeup_task = per_cpu(wakeup_task, cpu);
-+
-+ if (cpu_wakeup_task == NULL)
-+ goto out;
-+
-+ /* Already running? */
-+ if (unlikely(current == cpu_wakeup_task))
-+ goto out_reset;
-+
-+ if (next != cpu_wakeup_task) {
-+ if (next->prio < cpu_wakeup_task->prio)
-+ goto out_reset;
-+
-+ if (next->prio == cpu_wakeup_task->prio)
-+ per_cpu(wakeup_sharedprio, cpu) = 1;
-+
-+ goto out;
-+ }
-+
-+ if (current->prio == cpu_wakeup_task->prio)
-+ per_cpu(wakeup_sharedprio, cpu) = 1;
-+
-+ /*
-+ * The task we are waiting for is about to be switched to.
-+ * Calculate latency and store it in histogram.
-+ */
-+ stop = ftrace_now(raw_smp_processor_id());
-+
-+ latency = ((long) (stop - next->preempt_timestamp_hist)) /
-+ NSECS_PER_USECS;
-+
-+ if (per_cpu(wakeup_sharedprio, cpu)) {
-+ latency_hist(WAKEUP_LATENCY_SHAREDPRIO, cpu, latency, 0, stop,
-+ next);
-+ per_cpu(wakeup_sharedprio, cpu) = 0;
-+ } else {
-+ latency_hist(WAKEUP_LATENCY, cpu, latency, 0, stop, next);
-+#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
-+ if (timerandwakeup_enabled_data.enabled) {
-+ latency_hist(TIMERANDWAKEUP_LATENCY, cpu,
-+ next->timer_offset + latency, next->timer_offset,
-+ stop, next);
-+ }
-+#endif
-+ }
-+
-+out_reset:
-+#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
-+ next->timer_offset = 0;
-+#endif
-+ put_task_struct(cpu_wakeup_task);
-+ per_cpu(wakeup_task, cpu) = NULL;
-+out:
-+ raw_spin_unlock_irqrestore(&wakeup_lock, flags);
-+}
-+#endif
-+
-+#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
-+static notrace void probe_hrtimer_interrupt(void *v, int cpu,
-+ long long latency_ns, struct task_struct *curr,
-+ struct task_struct *task)
-+{
-+ if (latency_ns <= 0 && task != NULL && rt_task(task) &&
-+ (task->prio < curr->prio ||
-+ (task->prio == curr->prio &&
-+ !cpumask_test_cpu(cpu, &task->cpus_allowed)))) {
-+ long latency;
-+ cycle_t now;
-+
-+ if (missed_timer_offsets_pid) {
-+ if (likely(missed_timer_offsets_pid !=
-+ task_pid_nr(task)))
-+ return;
-+ }
-+
-+ now = ftrace_now(cpu);
-+ latency = (long) div_s64(-latency_ns, NSECS_PER_USECS);
-+ latency_hist(MISSED_TIMER_OFFSETS, cpu, latency, latency, now,
-+ task);
-+#ifdef CONFIG_WAKEUP_LATENCY_HIST
-+ task->timer_offset = latency;
-+#endif
-+ }
-+}
-+#endif
-+
-+static __init int latency_hist_init(void)
-+{
-+ struct dentry *latency_hist_root = NULL;
-+ struct dentry *dentry;
-+#ifdef CONFIG_WAKEUP_LATENCY_HIST
-+ struct dentry *dentry_sharedprio;
-+#endif
-+ struct dentry *entry;
-+ struct dentry *enable_root;
-+ int i = 0;
-+ struct hist_data *my_hist;
-+ char name[64];
-+ char *cpufmt = "CPU%d";
-+#if defined(CONFIG_WAKEUP_LATENCY_HIST) || \
-+ defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
-+ char *cpufmt_maxlatproc = "max_latency-CPU%d";
-+ struct maxlatproc_data *mp = NULL;
-+#endif
-+
-+ dentry = tracing_init_dentry();
-+ latency_hist_root = debugfs_create_dir(latency_hist_dir_root, dentry);
-+ enable_root = debugfs_create_dir("enable", latency_hist_root);
-+
-+#ifdef CONFIG_INTERRUPT_OFF_HIST
-+ dentry = debugfs_create_dir(irqsoff_hist_dir, latency_hist_root);
-+ for_each_possible_cpu(i) {
-+ sprintf(name, cpufmt, i);
-+ entry = debugfs_create_file(name, 0444, dentry,
-+ &per_cpu(irqsoff_hist, i), &latency_hist_fops);
-+ my_hist = &per_cpu(irqsoff_hist, i);
-+ atomic_set(&my_hist->hist_mode, 1);
-+ my_hist->min_lat = LONG_MAX;
-+ }
-+ entry = debugfs_create_file("reset", 0644, dentry,
-+ (void *)IRQSOFF_LATENCY, &latency_hist_reset_fops);
-+#endif
-+
-+#ifdef CONFIG_PREEMPT_OFF_HIST
-+ dentry = debugfs_create_dir(preemptoff_hist_dir,
-+ latency_hist_root);
-+ for_each_possible_cpu(i) {
-+ sprintf(name, cpufmt, i);
-+ entry = debugfs_create_file(name, 0444, dentry,
-+ &per_cpu(preemptoff_hist, i), &latency_hist_fops);
-+ my_hist = &per_cpu(preemptoff_hist, i);
-+ atomic_set(&my_hist->hist_mode, 1);
-+ my_hist->min_lat = LONG_MAX;
-+ }
-+ entry = debugfs_create_file("reset", 0644, dentry,
-+ (void *)PREEMPTOFF_LATENCY, &latency_hist_reset_fops);
-+#endif
-+
-+#if defined(CONFIG_INTERRUPT_OFF_HIST) && defined(CONFIG_PREEMPT_OFF_HIST)
-+ dentry = debugfs_create_dir(preemptirqsoff_hist_dir,
-+ latency_hist_root);
-+ for_each_possible_cpu(i) {
-+ sprintf(name, cpufmt, i);
-+ entry = debugfs_create_file(name, 0444, dentry,
-+ &per_cpu(preemptirqsoff_hist, i), &latency_hist_fops);
-+ my_hist = &per_cpu(preemptirqsoff_hist, i);
-+ atomic_set(&my_hist->hist_mode, 1);
-+ my_hist->min_lat = LONG_MAX;
-+ }
-+ entry = debugfs_create_file("reset", 0644, dentry,
-+ (void *)PREEMPTIRQSOFF_LATENCY, &latency_hist_reset_fops);
-+#endif
-+
-+#if defined(CONFIG_INTERRUPT_OFF_HIST) || defined(CONFIG_PREEMPT_OFF_HIST)
-+ entry = debugfs_create_file("preemptirqsoff", 0644,
-+ enable_root, (void *)&preemptirqsoff_enabled_data,
-+ &enable_fops);
-+#endif
-+
-+#ifdef CONFIG_WAKEUP_LATENCY_HIST
-+ dentry = debugfs_create_dir(wakeup_latency_hist_dir,
-+ latency_hist_root);
-+ dentry_sharedprio = debugfs_create_dir(
-+ wakeup_latency_hist_dir_sharedprio, dentry);
-+ for_each_possible_cpu(i) {
-+ sprintf(name, cpufmt, i);
-+
-+ entry = debugfs_create_file(name, 0444, dentry,
-+ &per_cpu(wakeup_latency_hist, i),
-+ &latency_hist_fops);
-+ my_hist = &per_cpu(wakeup_latency_hist, i);
-+ atomic_set(&my_hist->hist_mode, 1);
-+ my_hist->min_lat = LONG_MAX;
-+
-+ entry = debugfs_create_file(name, 0444, dentry_sharedprio,
-+ &per_cpu(wakeup_latency_hist_sharedprio, i),
-+ &latency_hist_fops);
-+ my_hist = &per_cpu(wakeup_latency_hist_sharedprio, i);
-+ atomic_set(&my_hist->hist_mode, 1);
-+ my_hist->min_lat = LONG_MAX;
-+
-+ sprintf(name, cpufmt_maxlatproc, i);
-+
-+ mp = &per_cpu(wakeup_maxlatproc, i);
-+ entry = debugfs_create_file(name, 0444, dentry, mp,
-+ &maxlatproc_fops);
-+ clear_maxlatprocdata(mp);
-+
-+ mp = &per_cpu(wakeup_maxlatproc_sharedprio, i);
-+ entry = debugfs_create_file(name, 0444, dentry_sharedprio, mp,
-+ &maxlatproc_fops);
-+ clear_maxlatprocdata(mp);
-+ }
-+ entry = debugfs_create_file("pid", 0644, dentry,
-+ (void *)&wakeup_pid, &pid_fops);
-+ entry = debugfs_create_file("reset", 0644, dentry,
-+ (void *)WAKEUP_LATENCY, &latency_hist_reset_fops);
-+ entry = debugfs_create_file("reset", 0644, dentry_sharedprio,
-+ (void *)WAKEUP_LATENCY_SHAREDPRIO, &latency_hist_reset_fops);
-+ entry = debugfs_create_file("wakeup", 0644,
-+ enable_root, (void *)&wakeup_latency_enabled_data,
-+ &enable_fops);
-+#endif
-+
-+#ifdef CONFIG_MISSED_TIMER_OFFSETS_HIST
-+ dentry = debugfs_create_dir(missed_timer_offsets_dir,
-+ latency_hist_root);
-+ for_each_possible_cpu(i) {
-+ sprintf(name, cpufmt, i);
-+ entry = debugfs_create_file(name, 0444, dentry,
-+ &per_cpu(missed_timer_offsets, i), &latency_hist_fops);
-+ my_hist = &per_cpu(missed_timer_offsets, i);
-+ atomic_set(&my_hist->hist_mode, 1);
-+ my_hist->min_lat = LONG_MAX;
-+
-+ sprintf(name, cpufmt_maxlatproc, i);
-+ mp = &per_cpu(missed_timer_offsets_maxlatproc, i);
-+ entry = debugfs_create_file(name, 0444, dentry, mp,
-+ &maxlatproc_fops);
-+ clear_maxlatprocdata(mp);
-+ }
-+ entry = debugfs_create_file("pid", 0644, dentry,
-+ (void *)&missed_timer_offsets_pid, &pid_fops);
-+ entry = debugfs_create_file("reset", 0644, dentry,
-+ (void *)MISSED_TIMER_OFFSETS, &latency_hist_reset_fops);
-+ entry = debugfs_create_file("missed_timer_offsets", 0644,
-+ enable_root, (void *)&missed_timer_offsets_enabled_data,
-+ &enable_fops);
-+#endif
-+
-+#if defined(CONFIG_WAKEUP_LATENCY_HIST) && \
-+ defined(CONFIG_MISSED_TIMER_OFFSETS_HIST)
-+ dentry = debugfs_create_dir(timerandwakeup_latency_hist_dir,
-+ latency_hist_root);
-+ for_each_possible_cpu(i) {
-+ sprintf(name, cpufmt, i);
-+ entry = debugfs_create_file(name, 0444, dentry,
-+ &per_cpu(timerandwakeup_latency_hist, i),
-+ &latency_hist_fops);
-+ my_hist = &per_cpu(timerandwakeup_latency_hist, i);
-+ atomic_set(&my_hist->hist_mode, 1);
-+ my_hist->min_lat = LONG_MAX;
-+
-+ sprintf(name, cpufmt_maxlatproc, i);
-+ mp = &per_cpu(timerandwakeup_maxlatproc, i);
-+ entry = debugfs_create_file(name, 0444, dentry, mp,
-+ &maxlatproc_fops);
-+ clear_maxlatprocdata(mp);
-+ }
-+ entry = debugfs_create_file("reset", 0644, dentry,
-+ (void *)TIMERANDWAKEUP_LATENCY, &latency_hist_reset_fops);
-+ entry = debugfs_create_file("timerandwakeup", 0644,
-+ enable_root, (void *)&timerandwakeup_enabled_data,
-+ &enable_fops);
-+#endif
-+ return 0;
-+}
-+
-+device_initcall(latency_hist_init);
-diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
-index 7bc5676..8c0b960 100644
---- a/kernel/trace/trace.c
-+++ b/kernel/trace/trace.c
-@@ -1897,6 +1897,7 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags,
- struct task_struct *tsk = current;
-
- entry->preempt_count = pc & 0xff;
-+ entry->preempt_lazy_count = preempt_lazy_count();
- entry->pid = (tsk) ? tsk->pid : 0;
- entry->flags =
- #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
-@@ -1907,8 +1908,11 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags,
- ((pc & NMI_MASK ) ? TRACE_FLAG_NMI : 0) |
- ((pc & HARDIRQ_MASK) ? TRACE_FLAG_HARDIRQ : 0) |
- ((pc & SOFTIRQ_MASK) ? TRACE_FLAG_SOFTIRQ : 0) |
-- (tif_need_resched() ? TRACE_FLAG_NEED_RESCHED : 0) |
-+ (tif_need_resched_now() ? TRACE_FLAG_NEED_RESCHED : 0) |
-+ (need_resched_lazy() ? TRACE_FLAG_NEED_RESCHED_LAZY : 0) |
- (test_preempt_need_resched() ? TRACE_FLAG_PREEMPT_RESCHED : 0);
-+
-+ entry->migrate_disable = (tsk) ? __migrate_disabled(tsk) & 0xFF : 0;
- }
- EXPORT_SYMBOL_GPL(tracing_generic_entry_update);
-
-@@ -2892,14 +2896,17 @@ get_total_entries(struct trace_buffer *buf,
-
- static void print_lat_help_header(struct seq_file *m)
- {
-- seq_puts(m, "# _------=> CPU# \n"
-- "# / _-----=> irqs-off \n"
-- "# | / _----=> need-resched \n"
-- "# || / _---=> hardirq/softirq \n"
-- "# ||| / _--=> preempt-depth \n"
-- "# |||| / delay \n"
-- "# cmd pid ||||| time | caller \n"
-- "# \\ / ||||| \\ | / \n");
-+ seq_puts(m, "# _--------=> CPU# \n"
-+ "# / _-------=> irqs-off \n"
-+ "# | / _------=> need-resched \n"
-+ "# || / _-----=> need-resched_lazy \n"
-+ "# ||| / _----=> hardirq/softirq \n"
-+ "# |||| / _---=> preempt-depth \n"
-+ "# ||||| / _--=> preempt-lazy-depth\n"
-+ "# |||||| / _-=> migrate-disable \n"
-+ "# ||||||| / delay \n"
-+ "# cmd pid |||||||| time | caller \n"
-+ "# \\ / |||||||| \\ | / \n");
- }
-
- static void print_event_info(struct trace_buffer *buf, struct seq_file *m)
-@@ -2925,11 +2932,14 @@ static void print_func_help_header_irq(struct trace_buffer *buf, struct seq_file
- print_event_info(buf, m);
- seq_puts(m, "# _-----=> irqs-off\n"
- "# / _----=> need-resched\n"
-- "# | / _---=> hardirq/softirq\n"
-- "# || / _--=> preempt-depth\n"
-- "# ||| / delay\n"
-- "# TASK-PID CPU# |||| TIMESTAMP FUNCTION\n"
-- "# | | | |||| | |\n");
-+ "# |/ _-----=> need-resched_lazy\n"
-+ "# || / _---=> hardirq/softirq\n"
-+ "# ||| / _--=> preempt-depth\n"
-+ "# |||| /_--=> preempt-lazy-depth\n"
-+ "# ||||| _-=> migrate-disable \n"
-+ "# ||||| / delay\n"
-+ "# TASK-PID CPU# |||||| TIMESTAMP FUNCTION\n"
-+ "# | | | |||||| | |\n");
- }
-
- void
-diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
-index f783df4..6f2d0fa 100644
---- a/kernel/trace/trace.h
-+++ b/kernel/trace/trace.h
-@@ -123,6 +123,7 @@ struct kretprobe_trace_entry_head {
- * NEED_RESCHED - reschedule is requested
- * HARDIRQ - inside an interrupt handler
- * SOFTIRQ - inside a softirq handler
-+ * NEED_RESCHED_LAZY - lazy reschedule is requested
- */
- enum trace_flag_type {
- TRACE_FLAG_IRQS_OFF = 0x01,
-@@ -132,6 +133,7 @@ enum trace_flag_type {
- TRACE_FLAG_SOFTIRQ = 0x10,
- TRACE_FLAG_PREEMPT_RESCHED = 0x20,
- TRACE_FLAG_NMI = 0x40,
-+ TRACE_FLAG_NEED_RESCHED_LAZY = 0x80,
- };
-
- #define TRACE_BUF_SIZE 1024
-diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
-index 03c0a48..0b85d51 100644
---- a/kernel/trace/trace_events.c
-+++ b/kernel/trace/trace_events.c
-@@ -187,6 +187,8 @@ static int trace_define_common_fields(void)
- __common_field(unsigned char, flags);
- __common_field(unsigned char, preempt_count);
- __common_field(int, pid);
-+ __common_field(unsigned short, migrate_disable);
-+ __common_field(unsigned short, padding);
-
- return ret;
- }
-diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c
-index 03cdff8..940bd10 100644
---- a/kernel/trace/trace_irqsoff.c
-+++ b/kernel/trace/trace_irqsoff.c
-@@ -13,6 +13,7 @@
- #include <linux/uaccess.h>
- #include <linux/module.h>
- #include <linux/ftrace.h>
-+#include <trace/events/hist.h>
-
- #include "trace.h"
-
-@@ -424,11 +425,13 @@ void start_critical_timings(void)
- {
- if (preempt_trace() || irq_trace())
- start_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
-+ trace_preemptirqsoff_hist_rcuidle(TRACE_START, 1);
- }
- EXPORT_SYMBOL_GPL(start_critical_timings);
-
- void stop_critical_timings(void)
- {
-+ trace_preemptirqsoff_hist_rcuidle(TRACE_STOP, 0);
- if (preempt_trace() || irq_trace())
- stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
- }
-@@ -438,6 +441,7 @@ EXPORT_SYMBOL_GPL(stop_critical_timings);
- #ifdef CONFIG_PROVE_LOCKING
- void time_hardirqs_on(unsigned long a0, unsigned long a1)
- {
-+ trace_preemptirqsoff_hist_rcuidle(IRQS_ON, 0);
- if (!preempt_trace() && irq_trace())
- stop_critical_timing(a0, a1);
- }
-@@ -446,6 +450,7 @@ void time_hardirqs_off(unsigned long a0, unsigned long a1)
- {
- if (!preempt_trace() && irq_trace())
- start_critical_timing(a0, a1);
-+ trace_preemptirqsoff_hist_rcuidle(IRQS_OFF, 1);
- }
-
- #else /* !CONFIG_PROVE_LOCKING */
-@@ -471,6 +476,7 @@ inline void print_irqtrace_events(struct task_struct *curr)
- */
- void trace_hardirqs_on(void)
- {
-+ trace_preemptirqsoff_hist(IRQS_ON, 0);
- if (!preempt_trace() && irq_trace())
- stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
- }
-@@ -480,11 +486,13 @@ void trace_hardirqs_off(void)
- {
- if (!preempt_trace() && irq_trace())
- start_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
-+ trace_preemptirqsoff_hist(IRQS_OFF, 1);
- }
- EXPORT_SYMBOL(trace_hardirqs_off);
-
- __visible void trace_hardirqs_on_caller(unsigned long caller_addr)
- {
-+ trace_preemptirqsoff_hist(IRQS_ON, 0);
- if (!preempt_trace() && irq_trace())
- stop_critical_timing(CALLER_ADDR0, caller_addr);
- }
-@@ -494,6 +502,7 @@ __visible void trace_hardirqs_off_caller(unsigned long caller_addr)
- {
- if (!preempt_trace() && irq_trace())
- start_critical_timing(CALLER_ADDR0, caller_addr);
-+ trace_preemptirqsoff_hist(IRQS_OFF, 1);
- }
- EXPORT_SYMBOL(trace_hardirqs_off_caller);
-
-@@ -503,12 +512,14 @@ EXPORT_SYMBOL(trace_hardirqs_off_caller);
- #ifdef CONFIG_PREEMPT_TRACER
- void trace_preempt_on(unsigned long a0, unsigned long a1)
- {
-+ trace_preemptirqsoff_hist(PREEMPT_ON, 0);
- if (preempt_trace() && !irq_trace())
- stop_critical_timing(a0, a1);
- }
-
- void trace_preempt_off(unsigned long a0, unsigned long a1)
- {
-+ trace_preemptirqsoff_hist(PREEMPT_ON, 1);
- if (preempt_trace() && !irq_trace())
- start_critical_timing(a0, a1);
- }
-diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
-index 0bb9cf2..455a746 100644
---- a/kernel/trace/trace_output.c
-+++ b/kernel/trace/trace_output.c
-@@ -386,6 +386,7 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
- {
- char hardsoft_irq;
- char need_resched;
-+ char need_resched_lazy;
- char irqs_off;
- int hardirq;
- int softirq;
-@@ -416,6 +417,9 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
- break;
- }
-
-+ need_resched_lazy =
-+ (entry->flags & TRACE_FLAG_NEED_RESCHED_LAZY) ? 'L' : '.';
-+
- hardsoft_irq =
- (nmi && hardirq) ? 'Z' :
- nmi ? 'z' :
-@@ -424,14 +428,25 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
- softirq ? 's' :
- '.' ;
-
-- trace_seq_printf(s, "%c%c%c",
-- irqs_off, need_resched, hardsoft_irq);
-+ trace_seq_printf(s, "%c%c%c%c",
-+ irqs_off, need_resched, need_resched_lazy,
-+ hardsoft_irq);
-
- if (entry->preempt_count)
- trace_seq_printf(s, "%x", entry->preempt_count);
- else
- trace_seq_putc(s, '.');
-
-+ if (entry->preempt_lazy_count)
-+ trace_seq_printf(s, "%x", entry->preempt_lazy_count);
-+ else
-+ trace_seq_putc(s, '.');
-+
-+ if (entry->migrate_disable)
-+ trace_seq_printf(s, "%x", entry->migrate_disable);
-+ else
-+ trace_seq_putc(s, '.');
-+
- return !trace_seq_has_overflowed(s);
- }
-
-diff --git a/kernel/user.c b/kernel/user.c
-index b069ccb..1a2e88e 100644
---- a/kernel/user.c
-+++ b/kernel/user.c
-@@ -161,11 +161,11 @@ void free_uid(struct user_struct *up)
- if (!up)
- return;
-
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- if (atomic_dec_and_lock(&up->__count, &uidhash_lock))
- free_user(up, flags);
- else
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- }
-
- struct user_struct *alloc_uid(kuid_t uid)
-diff --git a/kernel/watchdog.c b/kernel/watchdog.c
-index 9acb29f..caba620 100644
---- a/kernel/watchdog.c
-+++ b/kernel/watchdog.c
-@@ -315,6 +315,8 @@ static int is_softlockup(unsigned long touch_ts)
-
- #ifdef CONFIG_HARDLOCKUP_DETECTOR
-
-+static DEFINE_RAW_SPINLOCK(watchdog_output_lock);
-+
- static struct perf_event_attr wd_hw_attr = {
- .type = PERF_TYPE_HARDWARE,
- .config = PERF_COUNT_HW_CPU_CYCLES,
-@@ -349,6 +351,13 @@ static void watchdog_overflow_callback(struct perf_event *event,
- /* only print hardlockups once */
- if (__this_cpu_read(hard_watchdog_warn) == true)
- return;
-+ /*
-+ * If early-printk is enabled then make sure we do not
-+ * lock up in printk() and kill console logging:
-+ */
-+ printk_kill();
-+
-+ raw_spin_lock(&watchdog_output_lock);
-
- pr_emerg("Watchdog detected hard LOCKUP on cpu %d", this_cpu);
- print_modules();
-@@ -366,6 +375,7 @@ static void watchdog_overflow_callback(struct perf_event *event,
- !test_and_set_bit(0, &hardlockup_allcpu_dumped))
- trigger_allbutself_cpu_backtrace();
-
-+ raw_spin_unlock(&watchdog_output_lock);
- if (hardlockup_panic)
- nmi_panic(regs, "Hard LOCKUP");
-
-@@ -513,6 +523,7 @@ static void watchdog_enable(unsigned int cpu)
- /* kick off the timer for the hardlockup detector */
- hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
- hrtimer->function = watchdog_timer_fn;
-+ hrtimer->irqsafe = 1;
-
- /* Enable the perf event */
- watchdog_nmi_enable(cpu);
-diff --git a/kernel/workqueue.c b/kernel/workqueue.c
-index ef071ca..479775f 100644
---- a/kernel/workqueue.c
-+++ b/kernel/workqueue.c
-@@ -48,6 +48,8 @@
- #include <linux/nodemask.h>
- #include <linux/moduleparam.h>
- #include <linux/uaccess.h>
-+#include <linux/locallock.h>
-+#include <linux/delay.h>
-
- #include "workqueue_internal.h"
-
-@@ -121,11 +123,16 @@ enum {
- * cpu or grabbing pool->lock is enough for read access. If
- * POOL_DISASSOCIATED is set, it's identical to L.
- *
-+ * On RT we need the extra protection via rt_lock_idle_list() for
-+ * the list manipulations against read access from
-+ * wq_worker_sleeping(). All other places are nicely serialized via
-+ * pool->lock.
-+ *
- * A: pool->attach_mutex protected.
- *
- * PL: wq_pool_mutex protected.
- *
-- * PR: wq_pool_mutex protected for writes. Sched-RCU protected for reads.
-+ * PR: wq_pool_mutex protected for writes. RCU protected for reads.
- *
- * PW: wq_pool_mutex and wq->mutex protected for writes. Either for reads.
- *
-@@ -134,7 +141,7 @@ enum {
- *
- * WQ: wq->mutex protected.
- *
-- * WR: wq->mutex protected for writes. Sched-RCU protected for reads.
-+ * WR: wq->mutex protected for writes. RCU protected for reads.
- *
- * MD: wq_mayday_lock protected.
- */
-@@ -185,7 +192,7 @@ struct worker_pool {
- atomic_t nr_running ____cacheline_aligned_in_smp;
-
- /*
-- * Destruction of pool is sched-RCU protected to allow dereferences
-+ * Destruction of pool is RCU protected to allow dereferences
- * from get_work_pool().
- */
- struct rcu_head rcu;
-@@ -214,7 +221,7 @@ struct pool_workqueue {
- /*
- * Release of unbound pwq is punted to system_wq. See put_pwq()
- * and pwq_unbound_release_workfn() for details. pool_workqueue
-- * itself is also sched-RCU protected so that the first pwq can be
-+ * itself is also RCU protected so that the first pwq can be
- * determined without grabbing wq->mutex.
- */
- struct work_struct unbound_release_work;
-@@ -348,6 +355,8 @@ EXPORT_SYMBOL_GPL(system_power_efficient_wq);
- struct workqueue_struct *system_freezable_power_efficient_wq __read_mostly;
- EXPORT_SYMBOL_GPL(system_freezable_power_efficient_wq);
-
-+static DEFINE_LOCAL_IRQ_LOCK(pendingb_lock);
-+
- static int worker_thread(void *__worker);
- static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
-
-@@ -355,20 +364,20 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
- #include <trace/events/workqueue.h>
-
- #define assert_rcu_or_pool_mutex() \
-- RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held() && \
-+ RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \
- !lockdep_is_held(&wq_pool_mutex), \
-- "sched RCU or wq_pool_mutex should be held")
-+ "RCU or wq_pool_mutex should be held")
-
- #define assert_rcu_or_wq_mutex(wq) \
-- RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held() && \
-+ RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \
- !lockdep_is_held(&wq->mutex), \
-- "sched RCU or wq->mutex should be held")
-+ "RCU or wq->mutex should be held")
-
- #define assert_rcu_or_wq_mutex_or_pool_mutex(wq) \
-- RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held() && \
-+ RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \
- !lockdep_is_held(&wq->mutex) && \
- !lockdep_is_held(&wq_pool_mutex), \
-- "sched RCU, wq->mutex or wq_pool_mutex should be held")
-+ "RCU, wq->mutex or wq_pool_mutex should be held")
-
- #define for_each_cpu_worker_pool(pool, cpu) \
- for ((pool) = &per_cpu(cpu_worker_pools, cpu)[0]; \
-@@ -380,7 +389,7 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
- * @pool: iteration cursor
- * @pi: integer used for iteration
- *
-- * This must be called either with wq_pool_mutex held or sched RCU read
-+ * This must be called either with wq_pool_mutex held or RCU read
- * locked. If the pool needs to be used beyond the locking in effect, the
- * caller is responsible for guaranteeing that the pool stays online.
- *
-@@ -412,7 +421,7 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
- * @pwq: iteration cursor
- * @wq: the target workqueue
- *
-- * This must be called either with wq->mutex held or sched RCU read locked.
-+ * This must be called either with wq->mutex held or RCU read locked.
- * If the pwq needs to be used beyond the locking in effect, the caller is
- * responsible for guaranteeing that the pwq stays online.
- *
-@@ -424,6 +433,31 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
- if (({ assert_rcu_or_wq_mutex(wq); false; })) { } \
- else
-
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+static inline void rt_lock_idle_list(struct worker_pool *pool)
-+{
-+ preempt_disable();
-+}
-+static inline void rt_unlock_idle_list(struct worker_pool *pool)
-+{
-+ preempt_enable();
-+}
-+static inline void sched_lock_idle_list(struct worker_pool *pool) { }
-+static inline void sched_unlock_idle_list(struct worker_pool *pool) { }
-+#else
-+static inline void rt_lock_idle_list(struct worker_pool *pool) { }
-+static inline void rt_unlock_idle_list(struct worker_pool *pool) { }
-+static inline void sched_lock_idle_list(struct worker_pool *pool)
-+{
-+ spin_lock_irq(&pool->lock);
-+}
-+static inline void sched_unlock_idle_list(struct worker_pool *pool)
-+{
-+ spin_unlock_irq(&pool->lock);
-+}
-+#endif
-+
-+
- #ifdef CONFIG_DEBUG_OBJECTS_WORK
-
- static struct debug_obj_descr work_debug_descr;
-@@ -548,7 +582,7 @@ static int worker_pool_assign_id(struct worker_pool *pool)
- * @wq: the target workqueue
- * @node: the node ID
- *
-- * This must be called with any of wq_pool_mutex, wq->mutex or sched RCU
-+ * This must be called with any of wq_pool_mutex, wq->mutex or RCU
- * read locked.
- * If the pwq needs to be used beyond the locking in effect, the caller is
- * responsible for guaranteeing that the pwq stays online.
-@@ -692,8 +726,8 @@ static struct pool_workqueue *get_work_pwq(struct work_struct *work)
- * @work: the work item of interest
- *
- * Pools are created and destroyed under wq_pool_mutex, and allows read
-- * access under sched-RCU read lock. As such, this function should be
-- * called under wq_pool_mutex or with preemption disabled.
-+ * access under RCU read lock. As such, this function should be
-+ * called under wq_pool_mutex or inside of a rcu_read_lock() region.
- *
- * All fields of the returned pool are accessible as long as the above
- * mentioned locking is in effect. If the returned pool needs to be used
-@@ -830,50 +864,45 @@ static struct worker *first_idle_worker(struct worker_pool *pool)
- */
- static void wake_up_worker(struct worker_pool *pool)
- {
-- struct worker *worker = first_idle_worker(pool);
-+ struct worker *worker;
-+
-+ rt_lock_idle_list(pool);
-+
-+ worker = first_idle_worker(pool);
-
- if (likely(worker))
- wake_up_process(worker->task);
-+
-+ rt_unlock_idle_list(pool);
- }
-
- /**
-- * wq_worker_waking_up - a worker is waking up
-- * @task: task waking up
-+ * wq_worker_running - a worker is running again
- * @cpu: CPU @task is waking up to
- *
-- * This function is called during try_to_wake_up() when a worker is
-- * being awoken.
-- *
-- * CONTEXT:
-- * spin_lock_irq(rq->lock)
-+ * This function is called when a worker returns from schedule()
- */
--void wq_worker_waking_up(struct task_struct *task, int cpu)
-+void wq_worker_running(struct task_struct *task)
- {
- struct worker *worker = kthread_data(task);
-
-- if (!(worker->flags & WORKER_NOT_RUNNING)) {
-- WARN_ON_ONCE(worker->pool->cpu != cpu);
-+ if (!worker->sleeping)
-+ return;
-+ if (!(worker->flags & WORKER_NOT_RUNNING))
- atomic_inc(&worker->pool->nr_running);
-- }
-+ worker->sleeping = 0;
- }
-
- /**
- * wq_worker_sleeping - a worker is going to sleep
- * @task: task going to sleep
- *
-- * This function is called during schedule() when a busy worker is
-- * going to sleep. Worker on the same cpu can be woken up by
-- * returning pointer to its task.
-- *
-- * CONTEXT:
-- * spin_lock_irq(rq->lock)
-- *
-- * Return:
-- * Worker task on @cpu to wake up, %NULL if none.
-+ * This function is called from schedule() when a busy worker is
-+ * going to sleep.
- */
--struct task_struct *wq_worker_sleeping(struct task_struct *task)
-+void wq_worker_sleeping(struct task_struct *task)
- {
-- struct worker *worker = kthread_data(task), *to_wakeup = NULL;
-+ struct worker *worker = kthread_data(task);
- struct worker_pool *pool;
-
- /*
-@@ -882,29 +911,26 @@ struct task_struct *wq_worker_sleeping(struct task_struct *task)
- * checking NOT_RUNNING.
- */
- if (worker->flags & WORKER_NOT_RUNNING)
-- return NULL;
-+ return;
-
- pool = worker->pool;
-
-- /* this can only happen on the local cpu */
-- if (WARN_ON_ONCE(pool->cpu != raw_smp_processor_id()))
-- return NULL;
-+ if (WARN_ON_ONCE(worker->sleeping))
-+ return;
-+
-+ worker->sleeping = 1;
-
- /*
- * The counterpart of the following dec_and_test, implied mb,
- * worklist not empty test sequence is in insert_work().
- * Please read comment there.
-- *
-- * NOT_RUNNING is clear. This means that we're bound to and
-- * running on the local cpu w/ rq lock held and preemption
-- * disabled, which in turn means that none else could be
-- * manipulating idle_list, so dereferencing idle_list without pool
-- * lock is safe.
- */
- if (atomic_dec_and_test(&pool->nr_running) &&
-- !list_empty(&pool->worklist))
-- to_wakeup = first_idle_worker(pool);
-- return to_wakeup ? to_wakeup->task : NULL;
-+ !list_empty(&pool->worklist)) {
-+ sched_lock_idle_list(pool);
-+ wake_up_worker(pool);
-+ sched_unlock_idle_list(pool);
-+ }
- }
-
- /**
-@@ -1098,12 +1124,12 @@ static void put_pwq_unlocked(struct pool_workqueue *pwq)
- {
- if (pwq) {
- /*
-- * As both pwqs and pools are sched-RCU protected, the
-+ * As both pwqs and pools are RCU protected, the
- * following lock operations are safe.
- */
-- spin_lock_irq(&pwq->pool->lock);
-+ local_spin_lock_irq(pendingb_lock, &pwq->pool->lock);
- put_pwq(pwq);
-- spin_unlock_irq(&pwq->pool->lock);
-+ local_spin_unlock_irq(pendingb_lock, &pwq->pool->lock);
- }
- }
-
-@@ -1207,7 +1233,7 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork,
- struct worker_pool *pool;
- struct pool_workqueue *pwq;
-
-- local_irq_save(*flags);
-+ local_lock_irqsave(pendingb_lock, *flags);
-
- /* try to steal the timer if it exists */
- if (is_dwork) {
-@@ -1226,6 +1252,7 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork,
- if (!test_and_set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(work)))
- return 0;
-
-+ rcu_read_lock();
- /*
- * The queueing is in progress, or it is already queued. Try to
- * steal it from ->worklist without clearing WORK_STRUCT_PENDING.
-@@ -1264,14 +1291,16 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork,
- set_work_pool_and_keep_pending(work, pool->id);
-
- spin_unlock(&pool->lock);
-+ rcu_read_unlock();
- return 1;
- }
- spin_unlock(&pool->lock);
- fail:
-- local_irq_restore(*flags);
-+ rcu_read_unlock();
-+ local_unlock_irqrestore(pendingb_lock, *flags);
- if (work_is_canceling(work))
- return -ENOENT;
-- cpu_relax();
-+ cpu_chill();
- return -EAGAIN;
- }
-
-@@ -1373,7 +1402,7 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
- * queued or lose PENDING. Grabbing PENDING and queueing should
- * happen with IRQ disabled.
- */
-- WARN_ON_ONCE(!irqs_disabled());
-+ WARN_ON_ONCE_NONRT(!irqs_disabled());
-
- debug_work_activate(work);
-
-@@ -1381,6 +1410,7 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
- if (unlikely(wq->flags & __WQ_DRAINING) &&
- WARN_ON_ONCE(!is_chained_work(wq)))
- return;
-+ rcu_read_lock();
- retry:
- if (req_cpu == WORK_CPU_UNBOUND)
- cpu = wq_select_unbound_cpu(raw_smp_processor_id());
-@@ -1437,10 +1467,8 @@ retry:
- /* pwq determined, queue */
- trace_workqueue_queue_work(req_cpu, pwq, work);
-
-- if (WARN_ON(!list_empty(&work->entry))) {
-- spin_unlock(&pwq->pool->lock);
-- return;
-- }
-+ if (WARN_ON(!list_empty(&work->entry)))
-+ goto out;
-
- pwq->nr_in_flight[pwq->work_color]++;
- work_flags = work_color_to_flags(pwq->work_color);
-@@ -1458,7 +1486,9 @@ retry:
-
- insert_work(pwq, work, worklist, work_flags);
-
-+out:
- spin_unlock(&pwq->pool->lock);
-+ rcu_read_unlock();
- }
-
- /**
-@@ -1478,14 +1508,14 @@ bool queue_work_on(int cpu, struct workqueue_struct *wq,
- bool ret = false;
- unsigned long flags;
-
-- local_irq_save(flags);
-+ local_lock_irqsave(pendingb_lock,flags);
-
- if (!test_and_set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(work))) {
- __queue_work(cpu, wq, work);
- ret = true;
- }
-
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(pendingb_lock, flags);
- return ret;
- }
- EXPORT_SYMBOL(queue_work_on);
-@@ -1552,14 +1582,14 @@ bool queue_delayed_work_on(int cpu, struct workqueue_struct *wq,
- unsigned long flags;
-
- /* read the comment in __queue_work() */
-- local_irq_save(flags);
-+ local_lock_irqsave(pendingb_lock, flags);
-
- if (!test_and_set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(work))) {
- __queue_delayed_work(cpu, wq, dwork, delay);
- ret = true;
- }
-
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(pendingb_lock, flags);
- return ret;
- }
- EXPORT_SYMBOL(queue_delayed_work_on);
-@@ -1594,7 +1624,7 @@ bool mod_delayed_work_on(int cpu, struct workqueue_struct *wq,
-
- if (likely(ret >= 0)) {
- __queue_delayed_work(cpu, wq, dwork, delay);
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(pendingb_lock, flags);
- }
-
- /* -ENOENT from try_to_grab_pending() becomes %true */
-@@ -1627,7 +1657,9 @@ static void worker_enter_idle(struct worker *worker)
- worker->last_active = jiffies;
-
- /* idle_list is LIFO */
-+ rt_lock_idle_list(pool);
- list_add(&worker->entry, &pool->idle_list);
-+ rt_unlock_idle_list(pool);
-
- if (too_many_workers(pool) && !timer_pending(&pool->idle_timer))
- mod_timer(&pool->idle_timer, jiffies + IDLE_WORKER_TIMEOUT);
-@@ -1660,7 +1692,9 @@ static void worker_leave_idle(struct worker *worker)
- return;
- worker_clr_flags(worker, WORKER_IDLE);
- pool->nr_idle--;
-+ rt_lock_idle_list(pool);
- list_del_init(&worker->entry);
-+ rt_unlock_idle_list(pool);
- }
-
- static struct worker *alloc_worker(int node)
-@@ -1826,7 +1860,9 @@ static void destroy_worker(struct worker *worker)
- pool->nr_workers--;
- pool->nr_idle--;
-
-+ rt_lock_idle_list(pool);
- list_del_init(&worker->entry);
-+ rt_unlock_idle_list(pool);
- worker->flags |= WORKER_DIE;
- wake_up_process(worker->task);
- }
-@@ -2785,14 +2821,14 @@ static bool start_flush_work(struct work_struct *work, struct wq_barrier *barr)
-
- might_sleep();
-
-- local_irq_disable();
-+ rcu_read_lock();
- pool = get_work_pool(work);
- if (!pool) {
-- local_irq_enable();
-+ rcu_read_unlock();
- return false;
- }
-
-- spin_lock(&pool->lock);
-+ spin_lock_irq(&pool->lock);
- /* see the comment in try_to_grab_pending() with the same code */
- pwq = get_work_pwq(work);
- if (pwq) {
-@@ -2821,10 +2857,11 @@ static bool start_flush_work(struct work_struct *work, struct wq_barrier *barr)
- else
- lock_map_acquire_read(&pwq->wq->lockdep_map);
- lock_map_release(&pwq->wq->lockdep_map);
--
-+ rcu_read_unlock();
- return true;
- already_gone:
- spin_unlock_irq(&pool->lock);
-+ rcu_read_unlock();
- return false;
- }
-
-@@ -2911,7 +2948,7 @@ static bool __cancel_work_timer(struct work_struct *work, bool is_dwork)
-
- /* tell other tasks trying to grab @work to back off */
- mark_work_canceling(work);
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(pendingb_lock, flags);
-
- flush_work(work);
- clear_work_data(work);
-@@ -2966,10 +3003,10 @@ EXPORT_SYMBOL_GPL(cancel_work_sync);
- */
- bool flush_delayed_work(struct delayed_work *dwork)
- {
-- local_irq_disable();
-+ local_lock_irq(pendingb_lock);
- if (del_timer_sync(&dwork->timer))
- __queue_work(dwork->cpu, dwork->wq, &dwork->work);
-- local_irq_enable();
-+ local_unlock_irq(pendingb_lock);
- return flush_work(&dwork->work);
- }
- EXPORT_SYMBOL(flush_delayed_work);
-@@ -3004,7 +3041,7 @@ bool cancel_delayed_work(struct delayed_work *dwork)
-
- set_work_pool_and_clear_pending(&dwork->work,
- get_work_pool_id(&dwork->work));
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(pendingb_lock, flags);
- return ret;
- }
- EXPORT_SYMBOL(cancel_delayed_work);
-@@ -3233,7 +3270,7 @@ static void rcu_free_pool(struct rcu_head *rcu)
- * put_unbound_pool - put a worker_pool
- * @pool: worker_pool to put
- *
-- * Put @pool. If its refcnt reaches zero, it gets destroyed in sched-RCU
-+ * Put @pool. If its refcnt reaches zero, it gets destroyed in RCU
- * safe manner. get_unbound_pool() calls this function on its failure path
- * and this function should be able to release pools which went through,
- * successfully or not, init_worker_pool().
-@@ -3287,8 +3324,8 @@ static void put_unbound_pool(struct worker_pool *pool)
- del_timer_sync(&pool->idle_timer);
- del_timer_sync(&pool->mayday_timer);
-
-- /* sched-RCU protected to allow dereferences from get_work_pool() */
-- call_rcu_sched(&pool->rcu, rcu_free_pool);
-+ /* RCU protected to allow dereferences from get_work_pool() */
-+ call_rcu(&pool->rcu, rcu_free_pool);
- }
-
- /**
-@@ -3395,14 +3432,14 @@ static void pwq_unbound_release_workfn(struct work_struct *work)
- put_unbound_pool(pool);
- mutex_unlock(&wq_pool_mutex);
-
-- call_rcu_sched(&pwq->rcu, rcu_free_pwq);
-+ call_rcu(&pwq->rcu, rcu_free_pwq);
-
- /*
- * If we're the last pwq going away, @wq is already dead and no one
- * is gonna access it anymore. Schedule RCU free.
- */
- if (is_last)
-- call_rcu_sched(&wq->rcu, rcu_free_wq);
-+ call_rcu(&wq->rcu, rcu_free_wq);
- }
-
- /**
-@@ -4052,7 +4089,7 @@ void destroy_workqueue(struct workqueue_struct *wq)
- * The base ref is never dropped on per-cpu pwqs. Directly
- * schedule RCU free.
- */
-- call_rcu_sched(&wq->rcu, rcu_free_wq);
-+ call_rcu(&wq->rcu, rcu_free_wq);
- } else {
- /*
- * We're the sole accessor of @wq at this point. Directly
-@@ -4145,7 +4182,8 @@ bool workqueue_congested(int cpu, struct workqueue_struct *wq)
- struct pool_workqueue *pwq;
- bool ret;
-
-- rcu_read_lock_sched();
-+ rcu_read_lock();
-+ preempt_disable();
-
- if (cpu == WORK_CPU_UNBOUND)
- cpu = smp_processor_id();
-@@ -4156,7 +4194,8 @@ bool workqueue_congested(int cpu, struct workqueue_struct *wq)
- pwq = unbound_pwq_by_node(wq, cpu_to_node(cpu));
-
- ret = !list_empty(&pwq->delayed_works);
-- rcu_read_unlock_sched();
-+ preempt_enable();
-+ rcu_read_unlock();
-
- return ret;
- }
-@@ -4182,15 +4221,15 @@ unsigned int work_busy(struct work_struct *work)
- if (work_pending(work))
- ret |= WORK_BUSY_PENDING;
-
-- local_irq_save(flags);
-+ rcu_read_lock();
- pool = get_work_pool(work);
- if (pool) {
-- spin_lock(&pool->lock);
-+ spin_lock_irqsave(&pool->lock, flags);
- if (find_worker_executing_work(pool, work))
- ret |= WORK_BUSY_RUNNING;
-- spin_unlock(&pool->lock);
-+ spin_unlock_irqrestore(&pool->lock, flags);
- }
-- local_irq_restore(flags);
-+ rcu_read_unlock();
-
- return ret;
- }
-@@ -4379,7 +4418,7 @@ void show_workqueue_state(void)
- unsigned long flags;
- int pi;
-
-- rcu_read_lock_sched();
-+ rcu_read_lock();
-
- pr_info("Showing busy workqueues and worker pools:\n");
-
-@@ -4432,7 +4471,7 @@ void show_workqueue_state(void)
- spin_unlock_irqrestore(&pool->lock, flags);
- }
-
-- rcu_read_unlock_sched();
-+ rcu_read_unlock();
- }
-
- /*
-@@ -4770,16 +4809,16 @@ bool freeze_workqueues_busy(void)
- * nr_active is monotonically decreasing. It's safe
- * to peek without lock.
- */
-- rcu_read_lock_sched();
-+ rcu_read_lock();
- for_each_pwq(pwq, wq) {
- WARN_ON_ONCE(pwq->nr_active < 0);
- if (pwq->nr_active) {
- busy = true;
-- rcu_read_unlock_sched();
-+ rcu_read_unlock();
- goto out_unlock;
- }
- }
-- rcu_read_unlock_sched();
-+ rcu_read_unlock();
- }
- out_unlock:
- mutex_unlock(&wq_pool_mutex);
-@@ -4969,7 +5008,8 @@ static ssize_t wq_pool_ids_show(struct device *dev,
- const char *delim = "";
- int node, written = 0;
-
-- rcu_read_lock_sched();
-+ get_online_cpus();
-+ rcu_read_lock();
- for_each_node(node) {
- written += scnprintf(buf + written, PAGE_SIZE - written,
- "%s%d:%d", delim, node,
-@@ -4977,7 +5017,8 @@ static ssize_t wq_pool_ids_show(struct device *dev,
- delim = " ";
- }
- written += scnprintf(buf + written, PAGE_SIZE - written, "\n");
-- rcu_read_unlock_sched();
-+ rcu_read_unlock();
-+ put_online_cpus();
-
- return written;
- }
-diff --git a/kernel/workqueue_internal.h b/kernel/workqueue_internal.h
-index 8635417..f000c4d 100644
---- a/kernel/workqueue_internal.h
-+++ b/kernel/workqueue_internal.h
-@@ -43,6 +43,7 @@ struct worker {
- unsigned long last_active; /* L: last active timestamp */
- unsigned int flags; /* X: flags */
- int id; /* I: worker id */
-+ int sleeping; /* None */
-
- /*
- * Opaque string set with work_set_desc(). Printed out with task
-@@ -68,7 +69,7 @@ static inline struct worker *current_wq_worker(void)
- * Scheduler hooks for concurrency managed workqueue. Only to be used from
- * sched/core.c and workqueue.c.
- */
--void wq_worker_waking_up(struct task_struct *task, int cpu);
--struct task_struct *wq_worker_sleeping(struct task_struct *task);
-+void wq_worker_running(struct task_struct *task);
-+void wq_worker_sleeping(struct task_struct *task);
-
- #endif /* _KERNEL_WORKQUEUE_INTERNAL_H */
-diff --git a/lib/Kconfig b/lib/Kconfig
-index d79909d..fd2accb 100644
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -400,6 +400,7 @@ config CHECK_SIGNATURE
-
- config CPUMASK_OFFSTACK
- bool "Force CPU masks off stack" if DEBUG_PER_CPU_MAPS
-+ depends on !PREEMPT_RT_FULL
- help
- Use dynamic allocation for cpumask_var_t, instead of putting
- them on the stack. This is a bit more expensive, but avoids
-diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index cab7405..dbc49c4 100644
---- a/lib/Kconfig.debug
-+++ b/lib/Kconfig.debug
-@@ -977,6 +977,7 @@ config TIMER_STATS
- config DEBUG_PREEMPT
- bool "Debug preemptible kernel"
- depends on DEBUG_KERNEL && PREEMPT && TRACE_IRQFLAGS_SUPPORT
-+ select USING_GET_LOCK_PARENT_IP
- default y
- help
- If you say Y here then the kernel will use a debug variant of the
-@@ -1159,8 +1160,17 @@ config LOCK_TORTURE_TEST
-
- endmenu # lock debugging
-
-+config USING_GET_LOCK_PARENT_IP
-+ bool
-+ help
-+ Enables the use of the function get_lock_parent_ip() that
-+ will use __builtin_return_address(n) with n > 0 causing
-+ some gcc warnings. When this is selected, those warnings
-+ will be suppressed.
-+
- config TRACE_IRQFLAGS
- bool
-+ select USING_GET_LOCK_PARENT_IP
- help
- Enables hooks to interrupt enabling and disabling for
- either tracing or lock debugging.
-diff --git a/lib/debugobjects.c b/lib/debugobjects.c
-index a8e1260..c76d5f0 100644
---- a/lib/debugobjects.c
-+++ b/lib/debugobjects.c
-@@ -308,7 +308,10 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack)
- struct debug_obj *obj;
- unsigned long flags;
-
-- fill_pool();
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ if (preempt_count() == 0 && !irqs_disabled())
-+#endif
-+ fill_pool();
-
- db = get_bucket((unsigned long) addr);
-
-diff --git a/lib/idr.c b/lib/idr.c
-index 6098336..9decbe9 100644
---- a/lib/idr.c
-+++ b/lib/idr.c
-@@ -30,6 +30,7 @@
- #include <linux/idr.h>
- #include <linux/spinlock.h>
- #include <linux/percpu.h>
-+#include <linux/locallock.h>
-
- #define MAX_IDR_SHIFT (sizeof(int) * 8 - 1)
- #define MAX_IDR_BIT (1U << MAX_IDR_SHIFT)
-@@ -45,6 +46,37 @@ static DEFINE_PER_CPU(struct idr_layer *, idr_preload_head);
- static DEFINE_PER_CPU(int, idr_preload_cnt);
- static DEFINE_SPINLOCK(simple_ida_lock);
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+static DEFINE_LOCAL_IRQ_LOCK(idr_lock);
-+
-+static inline void idr_preload_lock(void)
-+{
-+ local_lock(idr_lock);
-+}
-+
-+static inline void idr_preload_unlock(void)
-+{
-+ local_unlock(idr_lock);
-+}
-+
-+void idr_preload_end(void)
-+{
-+ idr_preload_unlock();
-+}
-+EXPORT_SYMBOL(idr_preload_end);
-+#else
-+static inline void idr_preload_lock(void)
-+{
-+ preempt_disable();
-+}
-+
-+static inline void idr_preload_unlock(void)
-+{
-+ preempt_enable();
-+}
-+#endif
-+
-+
- /* the maximum ID which can be allocated given idr->layers */
- static int idr_max(int layers)
- {
-@@ -115,14 +147,14 @@ static struct idr_layer *idr_layer_alloc(gfp_t gfp_mask, struct idr *layer_idr)
- * context. See idr_preload() for details.
- */
- if (!in_interrupt()) {
-- preempt_disable();
-+ idr_preload_lock();
- new = __this_cpu_read(idr_preload_head);
- if (new) {
- __this_cpu_write(idr_preload_head, new->ary[0]);
- __this_cpu_dec(idr_preload_cnt);
- new->ary[0] = NULL;
- }
-- preempt_enable();
-+ idr_preload_unlock();
- if (new)
- return new;
- }
-@@ -366,7 +398,6 @@ static void idr_fill_slot(struct idr *idr, void *ptr, int id,
- idr_mark_full(pa, id);
- }
-
--
- /**
- * idr_preload - preload for idr_alloc()
- * @gfp_mask: allocation mask to use for preloading
-@@ -401,7 +432,7 @@ void idr_preload(gfp_t gfp_mask)
- WARN_ON_ONCE(in_interrupt());
- might_sleep_if(gfpflags_allow_blocking(gfp_mask));
-
-- preempt_disable();
-+ idr_preload_lock();
-
- /*
- * idr_alloc() is likely to succeed w/o full idr_layer buffer and
-@@ -413,9 +444,9 @@ void idr_preload(gfp_t gfp_mask)
- while (__this_cpu_read(idr_preload_cnt) < MAX_IDR_FREE) {
- struct idr_layer *new;
-
-- preempt_enable();
-+ idr_preload_unlock();
- new = kmem_cache_zalloc(idr_layer_cache, gfp_mask);
-- preempt_disable();
-+ idr_preload_lock();
- if (!new)
- break;
-
-diff --git a/lib/irq_poll.c b/lib/irq_poll.c
-index 836f7db..709d4ee 100644
---- a/lib/irq_poll.c
-+++ b/lib/irq_poll.c
-@@ -36,6 +36,7 @@ void irq_poll_sched(struct irq_poll *iop)
- list_add_tail(&iop->list, this_cpu_ptr(&blk_cpu_iopoll));
- __raise_softirq_irqoff(IRQ_POLL_SOFTIRQ);
- local_irq_restore(flags);
-+ preempt_check_resched_rt();
- }
- EXPORT_SYMBOL(irq_poll_sched);
-
-@@ -71,6 +72,7 @@ void irq_poll_complete(struct irq_poll *iop)
- local_irq_save(flags);
- __irq_poll_complete(iop);
- local_irq_restore(flags);
-+ preempt_check_resched_rt();
- }
- EXPORT_SYMBOL(irq_poll_complete);
-
-@@ -95,6 +97,7 @@ static void irq_poll_softirq(struct softirq_action *h)
- }
-
- local_irq_enable();
-+ preempt_check_resched_rt();
-
- /* Even though interrupts have been re-enabled, this
- * access is safe because interrupts can only add new
-@@ -132,6 +135,7 @@ static void irq_poll_softirq(struct softirq_action *h)
- __raise_softirq_irqoff(IRQ_POLL_SOFTIRQ);
-
- local_irq_enable();
-+ preempt_check_resched_rt();
- }
-
- /**
-@@ -199,6 +203,7 @@ static int irq_poll_cpu_notify(struct notifier_block *self,
- this_cpu_ptr(&blk_cpu_iopoll));
- __raise_softirq_irqoff(IRQ_POLL_SOFTIRQ);
- local_irq_enable();
-+ preempt_check_resched_rt();
- }
-
- return NOTIFY_OK;
-diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
-index 872a15a..b93a610 100644
---- a/lib/locking-selftest.c
-+++ b/lib/locking-selftest.c
-@@ -590,6 +590,8 @@ GENERATE_TESTCASE(init_held_rsem)
- #include "locking-selftest-spin-hardirq.h"
- GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_hard_spin)
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+
- #include "locking-selftest-rlock-hardirq.h"
- GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_hard_rlock)
-
-@@ -605,9 +607,12 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_soft_rlock)
- #include "locking-selftest-wlock-softirq.h"
- GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_soft_wlock)
-
-+#endif
-+
- #undef E1
- #undef E2
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- /*
- * Enabling hardirqs with a softirq-safe lock held:
- */
-@@ -640,6 +645,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2A_rlock)
- #undef E1
- #undef E2
-
-+#endif
-+
- /*
- * Enabling irqs with an irq-safe lock held:
- */
-@@ -663,6 +670,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2A_rlock)
- #include "locking-selftest-spin-hardirq.h"
- GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_hard_spin)
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+
- #include "locking-selftest-rlock-hardirq.h"
- GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_hard_rlock)
-
-@@ -678,6 +687,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_soft_rlock)
- #include "locking-selftest-wlock-softirq.h"
- GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_soft_wlock)
-
-+#endif
-+
- #undef E1
- #undef E2
-
-@@ -709,6 +720,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_soft_wlock)
- #include "locking-selftest-spin-hardirq.h"
- GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_hard_spin)
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+
- #include "locking-selftest-rlock-hardirq.h"
- GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_hard_rlock)
-
-@@ -724,6 +737,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_soft_rlock)
- #include "locking-selftest-wlock-softirq.h"
- GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_soft_wlock)
-
-+#endif
-+
- #undef E1
- #undef E2
- #undef E3
-@@ -757,6 +772,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_soft_wlock)
- #include "locking-selftest-spin-hardirq.h"
- GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_hard_spin)
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+
- #include "locking-selftest-rlock-hardirq.h"
- GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_hard_rlock)
-
-@@ -772,10 +789,14 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_soft_rlock)
- #include "locking-selftest-wlock-softirq.h"
- GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_soft_wlock)
-
-+#endif
-+
- #undef E1
- #undef E2
- #undef E3
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+
- /*
- * read-lock / write-lock irq inversion.
- *
-@@ -838,6 +859,10 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_inversion_soft_wlock)
- #undef E2
- #undef E3
-
-+#endif
-+
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+
- /*
- * read-lock / write-lock recursion that is actually safe.
- */
-@@ -876,6 +901,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion_soft)
- #undef E2
- #undef E3
-
-+#endif
-+
- /*
- * read-lock / write-lock recursion that is unsafe.
- */
-@@ -1858,6 +1885,7 @@ void locking_selftest(void)
-
- printk(" --------------------------------------------------------------------------\n");
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- /*
- * irq-context testcases:
- */
-@@ -1870,6 +1898,28 @@ void locking_selftest(void)
-
- DO_TESTCASE_6x2("irq read-recursion", irq_read_recursion);
- // DO_TESTCASE_6x2B("irq read-recursion #2", irq_read_recursion2);
-+#else
-+ /* On -rt, we only do hardirq context test for raw spinlock */
-+ DO_TESTCASE_1B("hard-irqs-on + irq-safe-A", irqsafe1_hard_spin, 12);
-+ DO_TESTCASE_1B("hard-irqs-on + irq-safe-A", irqsafe1_hard_spin, 21);
-+
-+ DO_TESTCASE_1B("hard-safe-A + irqs-on", irqsafe2B_hard_spin, 12);
-+ DO_TESTCASE_1B("hard-safe-A + irqs-on", irqsafe2B_hard_spin, 21);
-+
-+ DO_TESTCASE_1B("hard-safe-A + unsafe-B #1", irqsafe3_hard_spin, 123);
-+ DO_TESTCASE_1B("hard-safe-A + unsafe-B #1", irqsafe3_hard_spin, 132);
-+ DO_TESTCASE_1B("hard-safe-A + unsafe-B #1", irqsafe3_hard_spin, 213);
-+ DO_TESTCASE_1B("hard-safe-A + unsafe-B #1", irqsafe3_hard_spin, 231);
-+ DO_TESTCASE_1B("hard-safe-A + unsafe-B #1", irqsafe3_hard_spin, 312);
-+ DO_TESTCASE_1B("hard-safe-A + unsafe-B #1", irqsafe3_hard_spin, 321);
-+
-+ DO_TESTCASE_1B("hard-safe-A + unsafe-B #2", irqsafe4_hard_spin, 123);
-+ DO_TESTCASE_1B("hard-safe-A + unsafe-B #2", irqsafe4_hard_spin, 132);
-+ DO_TESTCASE_1B("hard-safe-A + unsafe-B #2", irqsafe4_hard_spin, 213);
-+ DO_TESTCASE_1B("hard-safe-A + unsafe-B #2", irqsafe4_hard_spin, 231);
-+ DO_TESTCASE_1B("hard-safe-A + unsafe-B #2", irqsafe4_hard_spin, 312);
-+ DO_TESTCASE_1B("hard-safe-A + unsafe-B #2", irqsafe4_hard_spin, 321);
-+#endif
-
- ww_tests();
-
-diff --git a/lib/percpu_ida.c b/lib/percpu_ida.c
-index 6d40944..822a2c0 100644
---- a/lib/percpu_ida.c
-+++ b/lib/percpu_ida.c
-@@ -26,6 +26,9 @@
- #include <linux/string.h>
- #include <linux/spinlock.h>
- #include <linux/percpu_ida.h>
-+#include <linux/locallock.h>
-+
-+static DEFINE_LOCAL_IRQ_LOCK(irq_off_lock);
-
- struct percpu_ida_cpu {
- /*
-@@ -148,13 +151,13 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state)
- unsigned long flags;
- int tag;
-
-- local_irq_save(flags);
-+ local_lock_irqsave(irq_off_lock, flags);
- tags = this_cpu_ptr(pool->tag_cpu);
-
- /* Fastpath */
- tag = alloc_local_tag(tags);
- if (likely(tag >= 0)) {
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(irq_off_lock, flags);
- return tag;
- }
-
-@@ -173,6 +176,7 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state)
-
- if (!tags->nr_free)
- alloc_global_tags(pool, tags);
-+
- if (!tags->nr_free)
- steal_tags(pool, tags);
-
-@@ -184,7 +188,7 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state)
- }
-
- spin_unlock(&pool->lock);
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(irq_off_lock, flags);
-
- if (tag >= 0 || state == TASK_RUNNING)
- break;
-@@ -196,7 +200,7 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state)
-
- schedule();
-
-- local_irq_save(flags);
-+ local_lock_irqsave(irq_off_lock, flags);
- tags = this_cpu_ptr(pool->tag_cpu);
- }
- if (state != TASK_RUNNING)
-@@ -221,7 +225,7 @@ void percpu_ida_free(struct percpu_ida *pool, unsigned tag)
-
- BUG_ON(tag >= pool->nr_tags);
-
-- local_irq_save(flags);
-+ local_lock_irqsave(irq_off_lock, flags);
- tags = this_cpu_ptr(pool->tag_cpu);
-
- spin_lock(&tags->lock);
-@@ -253,7 +257,7 @@ void percpu_ida_free(struct percpu_ida *pool, unsigned tag)
- spin_unlock(&pool->lock);
- }
-
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(irq_off_lock, flags);
- }
- EXPORT_SYMBOL_GPL(percpu_ida_free);
-
-@@ -345,7 +349,7 @@ int percpu_ida_for_each_free(struct percpu_ida *pool, percpu_ida_cb fn,
- struct percpu_ida_cpu *remote;
- unsigned cpu, i, err = 0;
-
-- local_irq_save(flags);
-+ local_lock_irqsave(irq_off_lock, flags);
- for_each_possible_cpu(cpu) {
- remote = per_cpu_ptr(pool->tag_cpu, cpu);
- spin_lock(&remote->lock);
-@@ -367,7 +371,7 @@ int percpu_ida_for_each_free(struct percpu_ida *pool, percpu_ida_cb fn,
- }
- spin_unlock(&pool->lock);
- out:
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(irq_off_lock, flags);
- return err;
- }
- EXPORT_SYMBOL_GPL(percpu_ida_for_each_free);
-diff --git a/lib/radix-tree.c b/lib/radix-tree.c
-index 91f0727..881cc19 100644
---- a/lib/radix-tree.c
-+++ b/lib/radix-tree.c
-@@ -290,13 +290,14 @@ radix_tree_node_alloc(struct radix_tree_root *root)
- * succeed in getting a node here (and never reach
- * kmem_cache_alloc)
- */
-- rtp = this_cpu_ptr(&radix_tree_preloads);
-+ rtp = &get_cpu_var(radix_tree_preloads);
- if (rtp->nr) {
- ret = rtp->nodes;
- rtp->nodes = ret->private_data;
- ret->private_data = NULL;
- rtp->nr--;
- }
-+ put_cpu_var(radix_tree_preloads);
- /*
- * Update the allocation stack trace as this is more useful
- * for debugging.
-@@ -336,6 +337,7 @@ radix_tree_node_free(struct radix_tree_node *node)
- call_rcu(&node->rcu_head, radix_tree_node_rcu_free);
- }
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- /*
- * Load up this CPU's radix_tree_node buffer with sufficient objects to
- * ensure that the addition of a single element in the tree cannot fail. On
-@@ -455,6 +457,7 @@ int radix_tree_maybe_preload_order(gfp_t gfp_mask, int order)
-
- return __radix_tree_preload(gfp_mask, nr_nodes);
- }
-+#endif
-
- /*
- * The maximum index which can be stored in a radix tree
-@@ -1583,15 +1586,10 @@ void *radix_tree_delete(struct radix_tree_root *root, unsigned long index)
- }
- EXPORT_SYMBOL(radix_tree_delete);
-
--struct radix_tree_node *radix_tree_replace_clear_tags(
-- struct radix_tree_root *root,
-- unsigned long index, void *entry)
-+void radix_tree_clear_tags(struct radix_tree_root *root,
-+ struct radix_tree_node *node,
-+ void **slot)
- {
-- struct radix_tree_node *node;
-- void **slot;
--
-- __radix_tree_lookup(root, index, &node, &slot);
--
- if (node) {
- unsigned int tag, offset = get_slot_offset(node, slot);
- for (tag = 0; tag < RADIX_TREE_MAX_TAGS; tag++)
-@@ -1600,9 +1598,6 @@ struct radix_tree_node *radix_tree_replace_clear_tags(
- /* Clear root node tags */
- root->gfp_mask &= __GFP_BITS_MASK;
- }
--
-- radix_tree_replace_slot(slot, entry);
-- return node;
- }
-
- /**
-diff --git a/lib/scatterlist.c b/lib/scatterlist.c
-index 004fc70..ccc4699 100644
---- a/lib/scatterlist.c
-+++ b/lib/scatterlist.c
-@@ -620,7 +620,7 @@ void sg_miter_stop(struct sg_mapping_iter *miter)
- flush_kernel_dcache_page(miter->page);
-
- if (miter->__flags & SG_MITER_ATOMIC) {
-- WARN_ON_ONCE(preemptible());
-+ WARN_ON_ONCE(!pagefault_disabled());
- kunmap_atomic(miter->addr);
- } else
- kunmap(miter->page);
-@@ -664,7 +664,7 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,
- if (!sg_miter_skip(&miter, skip))
- return false;
-
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
-
- while (sg_miter_next(&miter) && offset < buflen) {
- unsigned int len;
-@@ -681,7 +681,7 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,
-
- sg_miter_stop(&miter);
-
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- return offset;
- }
- EXPORT_SYMBOL(sg_copy_buffer);
-diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c
-index 1afec32..11fa431 100644
---- a/lib/smp_processor_id.c
-+++ b/lib/smp_processor_id.c
-@@ -39,8 +39,9 @@ notrace static unsigned int check_preemption_disabled(const char *what1,
- if (!printk_ratelimit())
- goto out_enable;
-
-- printk(KERN_ERR "BUG: using %s%s() in preemptible [%08x] code: %s/%d\n",
-- what1, what2, preempt_count() - 1, current->comm, current->pid);
-+ printk(KERN_ERR "BUG: using %s%s() in preemptible [%08x %08x] code: %s/%d\n",
-+ what1, what2, preempt_count() - 1, __migrate_disabled(current),
-+ current->comm, current->pid);
-
- print_symbol("caller is %s\n", (long)__builtin_return_address(0));
- dump_stack();
-diff --git a/mm/Kconfig b/mm/Kconfig
-index be0ee11..fe2857d 100644
---- a/mm/Kconfig
-+++ b/mm/Kconfig
-@@ -410,7 +410,7 @@ config NOMMU_INITIAL_TRIM_EXCESS
-
- config TRANSPARENT_HUGEPAGE
- bool "Transparent Hugepage Support"
-- depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE
-+ depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE && !PREEMPT_RT_FULL
- select COMPACTION
- select RADIX_TREE_MULTIORDER
- help
-diff --git a/mm/backing-dev.c b/mm/backing-dev.c
-index 8fde443..d7a863b 100644
---- a/mm/backing-dev.c
-+++ b/mm/backing-dev.c
-@@ -457,9 +457,9 @@ void wb_congested_put(struct bdi_writeback_congested *congested)
- {
- unsigned long flags;
-
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- if (!atomic_dec_and_lock(&congested->refcnt, &cgwb_lock)) {
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- return;
- }
-
-diff --git a/mm/compaction.c b/mm/compaction.c
-index 9affb29..d5eb0e5 100644
---- a/mm/compaction.c
-+++ b/mm/compaction.c
-@@ -1585,10 +1585,12 @@ check_drain:
- block_start_pfn(cc->migrate_pfn, cc->order);
-
- if (cc->last_migrated_pfn < current_block_start) {
-- cpu = get_cpu();
-+ cpu = get_cpu_light();
-+ local_lock_irq(swapvec_lock);
- lru_add_drain_cpu(cpu);
-+ local_unlock_irq(swapvec_lock);
- drain_local_pages(zone);
-- put_cpu();
-+ put_cpu_light();
- /* No more flushing until we migrate again */
- cc->last_migrated_pfn = 0;
- }
-diff --git a/mm/filemap.c b/mm/filemap.c
-index 2d0986a..c30aefb 100644
---- a/mm/filemap.c
-+++ b/mm/filemap.c
-@@ -159,9 +159,12 @@ static int page_cache_tree_insert(struct address_space *mapping,
- * node->private_list is protected by
- * mapping->tree_lock.
- */
-- if (!list_empty(&node->private_list))
-- list_lru_del(&workingset_shadow_nodes,
-+ if (!list_empty(&node->private_list)) {
-+ local_lock(workingset_shadow_lock);
-+ list_lru_del(&__workingset_shadow_nodes,
- &node->private_list);
-+ local_unlock(workingset_shadow_lock);
-+ }
- }
- return 0;
- }
-@@ -169,33 +172,35 @@ static int page_cache_tree_insert(struct address_space *mapping,
- static void page_cache_tree_delete(struct address_space *mapping,
- struct page *page, void *shadow)
- {
-- struct radix_tree_node *node;
- int i, nr = PageHuge(page) ? 1 : hpage_nr_pages(page);
-
- VM_BUG_ON_PAGE(!PageLocked(page), page);
- VM_BUG_ON_PAGE(PageTail(page), page);
- VM_BUG_ON_PAGE(nr != 1 && shadow, page);
-
-- if (shadow) {
-- mapping->nrexceptional += nr;
-- /*
-- * Make sure the nrexceptional update is committed before
-- * the nrpages update so that final truncate racing
-- * with reclaim does not see both counters 0 at the
-- * same time and miss a shadow entry.
-- */
-- smp_wmb();
-- }
-- mapping->nrpages -= nr;
--
- for (i = 0; i < nr; i++) {
-- node = radix_tree_replace_clear_tags(&mapping->page_tree,
-- page->index + i, shadow);
-+ struct radix_tree_node *node;
-+ void **slot;
-+
-+ __radix_tree_lookup(&mapping->page_tree, page->index + i,
-+ &node, &slot);
-+
-+ radix_tree_clear_tags(&mapping->page_tree, node, slot);
-+
- if (!node) {
- VM_BUG_ON_PAGE(nr != 1, page);
-- return;
-+ /*
-+ * We need a node to properly account shadow
-+ * entries. Don't plant any without. XXX
-+ */
-+ shadow = NULL;
- }
-
-+ radix_tree_replace_slot(slot, shadow);
-+
-+ if (!node)
-+ break;
-+
- workingset_node_pages_dec(node);
- if (shadow)
- workingset_node_shadows_inc(node);
-@@ -215,10 +220,24 @@ static void page_cache_tree_delete(struct address_space *mapping,
- if (!dax_mapping(mapping) && !workingset_node_pages(node) &&
- list_empty(&node->private_list)) {
- node->private_data = mapping;
-- list_lru_add(&workingset_shadow_nodes,
-- &node->private_list);
-+ local_lock(workingset_shadow_lock);
-+ list_lru_add(&__workingset_shadow_nodes,
-+ &node->private_list);
-+ local_unlock(workingset_shadow_lock);
- }
- }
-+
-+ if (shadow) {
-+ mapping->nrexceptional += nr;
-+ /*
-+ * Make sure the nrexceptional update is committed before
-+ * the nrpages update so that final truncate racing
-+ * with reclaim does not see both counters 0 at the
-+ * same time and miss a shadow entry.
-+ */
-+ smp_wmb();
-+ }
-+ mapping->nrpages -= nr;
- }
-
- /*
-@@ -619,7 +638,6 @@ int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask)
- __delete_from_page_cache(old, NULL);
- error = page_cache_tree_insert(mapping, new, NULL);
- BUG_ON(error);
-- mapping->nrpages++;
-
- /*
- * hugetlb pages do not participate in page cache accounting.
-diff --git a/mm/highmem.c b/mm/highmem.c
-index 50b4ca6..77518a3 100644
---- a/mm/highmem.c
-+++ b/mm/highmem.c
-@@ -29,10 +29,11 @@
- #include <linux/kgdb.h>
- #include <asm/tlbflush.h>
-
--
-+#ifndef CONFIG_PREEMPT_RT_FULL
- #if defined(CONFIG_HIGHMEM) || defined(CONFIG_X86_32)
- DEFINE_PER_CPU(int, __kmap_atomic_idx);
- #endif
-+#endif
-
- /*
- * Virtual_count is not a pure "count".
-@@ -107,8 +108,9 @@ static inline wait_queue_head_t *get_pkmap_wait_queue_head(unsigned int color)
- unsigned long totalhigh_pages __read_mostly;
- EXPORT_SYMBOL(totalhigh_pages);
-
--
-+#ifndef CONFIG_PREEMPT_RT_FULL
- EXPORT_PER_CPU_SYMBOL(__kmap_atomic_idx);
-+#endif
-
- unsigned int nr_free_highpages (void)
- {
-diff --git a/mm/memcontrol.c b/mm/memcontrol.c
-index 4be518d..724240c 100644
---- a/mm/memcontrol.c
-+++ b/mm/memcontrol.c
-@@ -67,6 +67,7 @@
- #include <net/sock.h>
- #include <net/ip.h>
- #include "slab.h"
-+#include <linux/locallock.h>
-
- #include <asm/uaccess.h>
-
-@@ -92,6 +93,8 @@ int do_swap_account __read_mostly;
- #define do_swap_account 0
- #endif
-
-+static DEFINE_LOCAL_IRQ_LOCK(event_lock);
-+
- /* Whether legacy memory+swap accounting is active */
- static bool do_memsw_account(void)
- {
-@@ -1724,6 +1727,7 @@ struct memcg_stock_pcp {
- #define FLUSHING_CACHED_CHARGE 0
- };
- static DEFINE_PER_CPU(struct memcg_stock_pcp, memcg_stock);
-+static DEFINE_LOCAL_IRQ_LOCK(memcg_stock_ll);
- static DEFINE_MUTEX(percpu_charge_mutex);
-
- /**
-@@ -1746,7 +1750,7 @@ static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
- if (nr_pages > CHARGE_BATCH)
- return ret;
-
-- local_irq_save(flags);
-+ local_lock_irqsave(memcg_stock_ll, flags);
-
- stock = this_cpu_ptr(&memcg_stock);
- if (memcg == stock->cached && stock->nr_pages >= nr_pages) {
-@@ -1754,7 +1758,7 @@ static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
- ret = true;
- }
-
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(memcg_stock_ll, flags);
-
- return ret;
- }
-@@ -1781,13 +1785,13 @@ static void drain_local_stock(struct work_struct *dummy)
- struct memcg_stock_pcp *stock;
- unsigned long flags;
-
-- local_irq_save(flags);
-+ local_lock_irqsave(memcg_stock_ll, flags);
-
- stock = this_cpu_ptr(&memcg_stock);
- drain_stock(stock);
- clear_bit(FLUSHING_CACHED_CHARGE, &stock->flags);
-
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(memcg_stock_ll, flags);
- }
-
- /*
-@@ -1799,7 +1803,7 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
- struct memcg_stock_pcp *stock;
- unsigned long flags;
-
-- local_irq_save(flags);
-+ local_lock_irqsave(memcg_stock_ll, flags);
-
- stock = this_cpu_ptr(&memcg_stock);
- if (stock->cached != memcg) { /* reset if necessary */
-@@ -1808,7 +1812,7 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
- }
- stock->nr_pages += nr_pages;
-
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(memcg_stock_ll, flags);
- }
-
- /*
-@@ -1824,7 +1828,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg)
- return;
- /* Notify other cpus that system-wide "drain" is running */
- get_online_cpus();
-- curcpu = get_cpu();
-+ curcpu = get_cpu_light();
- for_each_online_cpu(cpu) {
- struct memcg_stock_pcp *stock = &per_cpu(memcg_stock, cpu);
- struct mem_cgroup *memcg;
-@@ -1841,7 +1845,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg)
- schedule_work_on(cpu, &stock->work);
- }
- }
-- put_cpu();
-+ put_cpu_light();
- put_online_cpus();
- mutex_unlock(&percpu_charge_mutex);
- }
-@@ -4566,12 +4570,12 @@ static int mem_cgroup_move_account(struct page *page,
-
- ret = 0;
-
-- local_irq_disable();
-+ local_lock_irq(event_lock);
- mem_cgroup_charge_statistics(to, page, compound, nr_pages);
- memcg_check_events(to, page);
- mem_cgroup_charge_statistics(from, page, compound, -nr_pages);
- memcg_check_events(from, page);
-- local_irq_enable();
-+ local_unlock_irq(event_lock);
- out_unlock:
- unlock_page(page);
- out:
-@@ -5444,10 +5448,10 @@ void mem_cgroup_commit_charge(struct page *page, struct mem_cgroup *memcg,
-
- commit_charge(page, memcg, lrucare);
-
-- local_irq_disable();
-+ local_lock_irq(event_lock);
- mem_cgroup_charge_statistics(memcg, page, compound, nr_pages);
- memcg_check_events(memcg, page);
-- local_irq_enable();
-+ local_unlock_irq(event_lock);
-
- if (do_memsw_account() && PageSwapCache(page)) {
- swp_entry_t entry = { .val = page_private(page) };
-@@ -5503,14 +5507,14 @@ static void uncharge_batch(struct mem_cgroup *memcg, unsigned long pgpgout,
- memcg_oom_recover(memcg);
- }
-
-- local_irq_save(flags);
-+ local_lock_irqsave(event_lock, flags);
- __this_cpu_sub(memcg->stat->count[MEM_CGROUP_STAT_RSS], nr_anon);
- __this_cpu_sub(memcg->stat->count[MEM_CGROUP_STAT_CACHE], nr_file);
- __this_cpu_sub(memcg->stat->count[MEM_CGROUP_STAT_RSS_HUGE], nr_huge);
- __this_cpu_add(memcg->stat->events[MEM_CGROUP_EVENTS_PGPGOUT], pgpgout);
- __this_cpu_add(memcg->stat->nr_page_events, nr_pages);
- memcg_check_events(memcg, dummy_page);
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(event_lock, flags);
-
- if (!mem_cgroup_is_root(memcg))
- css_put_many(&memcg->css, nr_pages);
-@@ -5665,10 +5669,10 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage)
-
- commit_charge(newpage, memcg, false);
-
-- local_irq_save(flags);
-+ local_lock_irqsave(event_lock, flags);
- mem_cgroup_charge_statistics(memcg, newpage, compound, nr_pages);
- memcg_check_events(memcg, newpage);
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(event_lock, flags);
- }
-
- DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key);
-@@ -5845,6 +5849,7 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
- {
- struct mem_cgroup *memcg, *swap_memcg;
- unsigned short oldid;
-+ unsigned long flags;
-
- VM_BUG_ON_PAGE(PageLRU(page), page);
- VM_BUG_ON_PAGE(page_count(page), page);
-@@ -5885,12 +5890,16 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
- * important here to have the interrupts disabled because it is the
- * only synchronisation we have for udpating the per-CPU variables.
- */
-+ local_lock_irqsave(event_lock, flags);
-+#ifndef CONFIG_PREEMPT_RT_BASE
- VM_BUG_ON(!irqs_disabled());
-+#endif
- mem_cgroup_charge_statistics(memcg, page, false, -1);
- memcg_check_events(memcg, page);
-
- if (!mem_cgroup_is_root(memcg))
- css_put(&memcg->css);
-+ local_unlock_irqrestore(event_lock, flags);
- }
-
- /*
-diff --git a/mm/mmu_context.c b/mm/mmu_context.c
-index 6f4d27c..5cd25c7 100644
---- a/mm/mmu_context.c
-+++ b/mm/mmu_context.c
-@@ -23,6 +23,7 @@ void use_mm(struct mm_struct *mm)
- struct task_struct *tsk = current;
-
- task_lock(tsk);
-+ preempt_disable_rt();
- active_mm = tsk->active_mm;
- if (active_mm != mm) {
- atomic_inc(&mm->mm_count);
-@@ -30,6 +31,7 @@ void use_mm(struct mm_struct *mm)
- }
- tsk->mm = mm;
- switch_mm(active_mm, mm, tsk);
-+ preempt_enable_rt();
- task_unlock(tsk);
- #ifdef finish_arch_post_lock_switch
- finish_arch_post_lock_switch();
-diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index a2214c6..4be4d5d 100644
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -61,6 +61,7 @@
- #include <linux/page_ext.h>
- #include <linux/hugetlb.h>
- #include <linux/sched/rt.h>
-+#include <linux/locallock.h>
- #include <linux/page_owner.h>
- #include <linux/kthread.h>
- #include <linux/memcontrol.h>
-@@ -276,6 +277,18 @@ EXPORT_SYMBOL(nr_node_ids);
- EXPORT_SYMBOL(nr_online_nodes);
- #endif
-
-+static DEFINE_LOCAL_IRQ_LOCK(pa_lock);
-+
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+# define cpu_lock_irqsave(cpu, flags) \
-+ local_lock_irqsave_on(pa_lock, flags, cpu)
-+# define cpu_unlock_irqrestore(cpu, flags) \
-+ local_unlock_irqrestore_on(pa_lock, flags, cpu)
-+#else
-+# define cpu_lock_irqsave(cpu, flags) local_irq_save(flags)
-+# define cpu_unlock_irqrestore(cpu, flags) local_irq_restore(flags)
-+#endif
-+
- int page_group_by_mobility_disabled __read_mostly;
-
- #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
-@@ -1056,7 +1069,7 @@ static bool bulkfree_pcp_prepare(struct page *page)
- #endif /* CONFIG_DEBUG_VM */
-
- /*
-- * Frees a number of pages from the PCP lists
-+ * Frees a number of pages which have been collected from the pcp lists.
- * Assumes all pages on list are in same zone, and of same order.
- * count is the number of pages to free.
- *
-@@ -1067,19 +1080,58 @@ static bool bulkfree_pcp_prepare(struct page *page)
- * pinned" detection logic.
- */
- static void free_pcppages_bulk(struct zone *zone, int count,
-- struct per_cpu_pages *pcp)
-+ struct list_head *list)
- {
-- int migratetype = 0;
-- int batch_free = 0;
- unsigned long nr_scanned;
- bool isolated_pageblocks;
-+ unsigned long flags;
-+
-+ spin_lock_irqsave(&zone->lock, flags);
-
-- spin_lock(&zone->lock);
- isolated_pageblocks = has_isolate_pageblock(zone);
- nr_scanned = node_page_state(zone->zone_pgdat, NR_PAGES_SCANNED);
- if (nr_scanned)
- __mod_node_page_state(zone->zone_pgdat, NR_PAGES_SCANNED, -nr_scanned);
-
-+ while (!list_empty(list)) {
-+ struct page *page;
-+ int mt; /* migratetype of the to-be-freed page */
-+
-+ page = list_first_entry(list, struct page, lru);
-+ /* must delete as __free_one_page list manipulates */
-+ list_del(&page->lru);
-+
-+ mt = get_pcppage_migratetype(page);
-+ /* MIGRATE_ISOLATE page should not go to pcplists */
-+ VM_BUG_ON_PAGE(is_migrate_isolate(mt), page);
-+ /* Pageblock could have been isolated meanwhile */
-+ if (unlikely(isolated_pageblocks))
-+ mt = get_pageblock_migratetype(page);
-+
-+ if (bulkfree_pcp_prepare(page))
-+ continue;
-+
-+ __free_one_page(page, page_to_pfn(page), zone, 0, mt);
-+ trace_mm_page_pcpu_drain(page, 0, mt);
-+ count--;
-+ }
-+ WARN_ON(count != 0);
-+ spin_unlock_irqrestore(&zone->lock, flags);
-+}
-+
-+/*
-+ * Moves a number of pages from the PCP lists to free list which
-+ * is freed outside of the locked region.
-+ *
-+ * Assumes all pages on list are in same zone, and of same order.
-+ * count is the number of pages to free.
-+ */
-+static void isolate_pcp_pages(int count, struct per_cpu_pages *src,
-+ struct list_head *dst)
-+{
-+ int migratetype = 0;
-+ int batch_free = 0;
-+
- while (count) {
- struct page *page;
- struct list_head *list;
-@@ -1095,7 +1147,7 @@ static void free_pcppages_bulk(struct zone *zone, int count,
- batch_free++;
- if (++migratetype == MIGRATE_PCPTYPES)
- migratetype = 0;
-- list = &pcp->lists[migratetype];
-+ list = &src->lists[migratetype];
- } while (list_empty(list));
-
- /* This is the only non-empty list. Free them all. */
-@@ -1103,27 +1155,12 @@ static void free_pcppages_bulk(struct zone *zone, int count,
- batch_free = count;
-
- do {
-- int mt; /* migratetype of the to-be-freed page */
--
- page = list_last_entry(list, struct page, lru);
-- /* must delete as __free_one_page list manipulates */
- list_del(&page->lru);
-
-- mt = get_pcppage_migratetype(page);
-- /* MIGRATE_ISOLATE page should not go to pcplists */
-- VM_BUG_ON_PAGE(is_migrate_isolate(mt), page);
-- /* Pageblock could have been isolated meanwhile */
-- if (unlikely(isolated_pageblocks))
-- mt = get_pageblock_migratetype(page);
--
-- if (bulkfree_pcp_prepare(page))
-- continue;
--
-- __free_one_page(page, page_to_pfn(page), zone, 0, mt);
-- trace_mm_page_pcpu_drain(page, 0, mt);
-+ list_add(&page->lru, dst);
- } while (--count && --batch_free && !list_empty(list));
- }
-- spin_unlock(&zone->lock);
- }
-
- static void free_one_page(struct zone *zone,
-@@ -1132,7 +1169,9 @@ static void free_one_page(struct zone *zone,
- int migratetype)
- {
- unsigned long nr_scanned;
-- spin_lock(&zone->lock);
-+ unsigned long flags;
-+
-+ spin_lock_irqsave(&zone->lock, flags);
- nr_scanned = node_page_state(zone->zone_pgdat, NR_PAGES_SCANNED);
- if (nr_scanned)
- __mod_node_page_state(zone->zone_pgdat, NR_PAGES_SCANNED, -nr_scanned);
-@@ -1142,7 +1181,7 @@ static void free_one_page(struct zone *zone,
- migratetype = get_pfnblock_migratetype(page, pfn);
- }
- __free_one_page(page, pfn, zone, order, migratetype);
-- spin_unlock(&zone->lock);
-+ spin_unlock_irqrestore(&zone->lock, flags);
- }
-
- static void __meminit __init_single_page(struct page *page, unsigned long pfn,
-@@ -1228,10 +1267,10 @@ static void __free_pages_ok(struct page *page, unsigned int order)
- return;
-
- migratetype = get_pfnblock_migratetype(page, pfn);
-- local_irq_save(flags);
-+ local_lock_irqsave(pa_lock, flags);
- __count_vm_events(PGFREE, 1 << order);
- free_one_page(page_zone(page), page, pfn, order, migratetype);
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(pa_lock, flags);
- }
-
- static void __init __free_pages_boot_core(struct page *page, unsigned int order)
-@@ -2219,16 +2258,18 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order,
- void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp)
- {
- unsigned long flags;
-+ LIST_HEAD(dst);
- int to_drain, batch;
-
-- local_irq_save(flags);
-+ local_lock_irqsave(pa_lock, flags);
- batch = READ_ONCE(pcp->batch);
- to_drain = min(pcp->count, batch);
- if (to_drain > 0) {
-- free_pcppages_bulk(zone, to_drain, pcp);
-+ isolate_pcp_pages(to_drain, pcp, &dst);
- pcp->count -= to_drain;
- }
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(pa_lock, flags);
-+ free_pcppages_bulk(zone, to_drain, &dst);
- }
- #endif
-
-@@ -2244,16 +2285,21 @@ static void drain_pages_zone(unsigned int cpu, struct zone *zone)
- unsigned long flags;
- struct per_cpu_pageset *pset;
- struct per_cpu_pages *pcp;
-+ LIST_HEAD(dst);
-+ int count;
-
-- local_irq_save(flags);
-+ cpu_lock_irqsave(cpu, flags);
- pset = per_cpu_ptr(zone->pageset, cpu);
-
- pcp = &pset->pcp;
-- if (pcp->count) {
-- free_pcppages_bulk(zone, pcp->count, pcp);
-+ count = pcp->count;
-+ if (count) {
-+ isolate_pcp_pages(count, pcp, &dst);
- pcp->count = 0;
- }
-- local_irq_restore(flags);
-+ cpu_unlock_irqrestore(cpu, flags);
-+ if (count)
-+ free_pcppages_bulk(zone, count, &dst);
- }
-
- /*
-@@ -2339,8 +2385,17 @@ void drain_all_pages(struct zone *zone)
- else
- cpumask_clear_cpu(cpu, &cpus_with_pcps);
- }
-+#ifndef CONFIG_PREEMPT_RT_BASE
- on_each_cpu_mask(&cpus_with_pcps, (smp_call_func_t) drain_local_pages,
- zone, 1);
-+#else
-+ for_each_cpu(cpu, &cpus_with_pcps) {
-+ if (zone)
-+ drain_pages_zone(cpu, zone);
-+ else
-+ drain_pages(cpu);
-+ }
-+#endif
- }
-
- #ifdef CONFIG_HIBERNATION
-@@ -2400,7 +2455,7 @@ void free_hot_cold_page(struct page *page, bool cold)
-
- migratetype = get_pfnblock_migratetype(page, pfn);
- set_pcppage_migratetype(page, migratetype);
-- local_irq_save(flags);
-+ local_lock_irqsave(pa_lock, flags);
- __count_vm_event(PGFREE);
-
- /*
-@@ -2426,12 +2481,17 @@ void free_hot_cold_page(struct page *page, bool cold)
- pcp->count++;
- if (pcp->count >= pcp->high) {
- unsigned long batch = READ_ONCE(pcp->batch);
-- free_pcppages_bulk(zone, batch, pcp);
-+ LIST_HEAD(dst);
-+
-+ isolate_pcp_pages(batch, pcp, &dst);
- pcp->count -= batch;
-+ local_unlock_irqrestore(pa_lock, flags);
-+ free_pcppages_bulk(zone, batch, &dst);
-+ return;
- }
-
- out:
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(pa_lock, flags);
- }
-
- /*
-@@ -2568,7 +2628,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
- struct per_cpu_pages *pcp;
- struct list_head *list;
-
-- local_irq_save(flags);
-+ local_lock_irqsave(pa_lock, flags);
- do {
- pcp = &this_cpu_ptr(zone->pageset)->pcp;
- list = &pcp->lists[migratetype];
-@@ -2595,7 +2655,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
- * allocate greater than order-1 page units with __GFP_NOFAIL.
- */
- WARN_ON_ONCE((gfp_flags & __GFP_NOFAIL) && (order > 1));
-- spin_lock_irqsave(&zone->lock, flags);
-+ local_spin_lock_irqsave(pa_lock, &zone->lock, flags);
-
- do {
- page = NULL;
-@@ -2607,22 +2667,24 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
- if (!page)
- page = __rmqueue(zone, order, migratetype);
- } while (page && check_new_pages(page, order));
-- spin_unlock(&zone->lock);
-- if (!page)
-+ if (!page) {
-+ spin_unlock(&zone->lock);
- goto failed;
-+ }
- __mod_zone_freepage_state(zone, -(1 << order),
- get_pcppage_migratetype(page));
-+ spin_unlock(&zone->lock);
- }
-
- __count_zid_vm_events(PGALLOC, page_zonenum(page), 1 << order);
- zone_statistics(preferred_zone, zone, gfp_flags);
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(pa_lock, flags);
-
- VM_BUG_ON_PAGE(bad_range(zone, page), page);
- return page;
-
- failed:
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(pa_lock, flags);
- return NULL;
- }
-
-@@ -6528,7 +6590,9 @@ static int page_alloc_cpu_notify(struct notifier_block *self,
- int cpu = (unsigned long)hcpu;
-
- if (action == CPU_DEAD || action == CPU_DEAD_FROZEN) {
-+ local_lock_irq_on(swapvec_lock, cpu);
- lru_add_drain_cpu(cpu);
-+ local_unlock_irq_on(swapvec_lock, cpu);
- drain_pages(cpu);
-
- /*
-@@ -6554,6 +6618,7 @@ static int page_alloc_cpu_notify(struct notifier_block *self,
- void __init page_alloc_init(void)
- {
- hotcpu_notifier(page_alloc_cpu_notify, 0);
-+ local_irq_lock_init(pa_lock);
- }
-
- /*
-@@ -7370,7 +7435,7 @@ void zone_pcp_reset(struct zone *zone)
- struct per_cpu_pageset *pset;
-
- /* avoid races with drain_pages() */
-- local_irq_save(flags);
-+ local_lock_irqsave(pa_lock, flags);
- if (zone->pageset != &boot_pageset) {
- for_each_online_cpu(cpu) {
- pset = per_cpu_ptr(zone->pageset, cpu);
-@@ -7379,7 +7444,7 @@ void zone_pcp_reset(struct zone *zone)
- free_percpu(zone->pageset);
- zone->pageset = &boot_pageset;
- }
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(pa_lock, flags);
- }
-
- #ifdef CONFIG_MEMORY_HOTREMOVE
-diff --git a/mm/slab.h b/mm/slab.h
-index 9653f2e..b7371e0 100644
---- a/mm/slab.h
-+++ b/mm/slab.h
-@@ -426,7 +426,11 @@ static inline void slab_post_alloc_hook(struct kmem_cache *s, gfp_t flags,
- * The slab lists for all objects.
- */
- struct kmem_cache_node {
-+#ifdef CONFIG_SLUB
-+ raw_spinlock_t list_lock;
-+#else
- spinlock_t list_lock;
-+#endif
-
- #ifdef CONFIG_SLAB
- struct list_head slabs_partial; /* partial list first, better asm code */
-diff --git a/mm/slub.c b/mm/slub.c
-index 9adae58..4b38674 100644
---- a/mm/slub.c
-+++ b/mm/slub.c
-@@ -1145,7 +1145,7 @@ static noinline int free_debug_processing(
- unsigned long uninitialized_var(flags);
- int ret = 0;
-
-- spin_lock_irqsave(&n->list_lock, flags);
-+ raw_spin_lock_irqsave(&n->list_lock, flags);
- slab_lock(page);
-
- if (s->flags & SLAB_CONSISTENCY_CHECKS) {
-@@ -1180,7 +1180,7 @@ out:
- bulk_cnt, cnt);
-
- slab_unlock(page);
-- spin_unlock_irqrestore(&n->list_lock, flags);
-+ raw_spin_unlock_irqrestore(&n->list_lock, flags);
- if (!ret)
- slab_fix(s, "Object at 0x%p not freed", object);
- return ret;
-@@ -1308,6 +1308,12 @@ static inline void dec_slabs_node(struct kmem_cache *s, int node,
-
- #endif /* CONFIG_SLUB_DEBUG */
-
-+struct slub_free_list {
-+ raw_spinlock_t lock;
-+ struct list_head list;
-+};
-+static DEFINE_PER_CPU(struct slub_free_list, slub_free_list);
-+
- /*
- * Hooks for other subsystems that check memory allocations. In a typical
- * production configuration these hooks all should produce no code at all.
-@@ -1527,10 +1533,17 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
- void *start, *p;
- int idx, order;
- bool shuffle;
-+ bool enableirqs = false;
-
- flags &= gfp_allowed_mask;
-
- if (gfpflags_allow_blocking(flags))
-+ enableirqs = true;
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ if (system_state == SYSTEM_RUNNING)
-+ enableirqs = true;
-+#endif
-+ if (enableirqs)
- local_irq_enable();
-
- flags |= s->allocflags;
-@@ -1605,7 +1618,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
- page->frozen = 1;
-
- out:
-- if (gfpflags_allow_blocking(flags))
-+ if (enableirqs)
- local_irq_disable();
- if (!page)
- return NULL;
-@@ -1664,6 +1677,16 @@ static void __free_slab(struct kmem_cache *s, struct page *page)
- __free_pages(page, order);
- }
-
-+static void free_delayed(struct list_head *h)
-+{
-+ while(!list_empty(h)) {
-+ struct page *page = list_first_entry(h, struct page, lru);
-+
-+ list_del(&page->lru);
-+ __free_slab(page->slab_cache, page);
-+ }
-+}
-+
- #define need_reserve_slab_rcu \
- (sizeof(((struct page *)NULL)->lru) < sizeof(struct rcu_head))
-
-@@ -1695,6 +1718,12 @@ static void free_slab(struct kmem_cache *s, struct page *page)
- }
-
- call_rcu(head, rcu_free_slab);
-+ } else if (irqs_disabled()) {
-+ struct slub_free_list *f = this_cpu_ptr(&slub_free_list);
-+
-+ raw_spin_lock(&f->lock);
-+ list_add(&page->lru, &f->list);
-+ raw_spin_unlock(&f->lock);
- } else
- __free_slab(s, page);
- }
-@@ -1802,7 +1831,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n,
- if (!n || !n->nr_partial)
- return NULL;
-
-- spin_lock(&n->list_lock);
-+ raw_spin_lock(&n->list_lock);
- list_for_each_entry_safe(page, page2, &n->partial, lru) {
- void *t;
-
-@@ -1827,7 +1856,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n,
- break;
-
- }
-- spin_unlock(&n->list_lock);
-+ raw_spin_unlock(&n->list_lock);
- return object;
- }
-
-@@ -2073,7 +2102,7 @@ redo:
- * that acquire_slab() will see a slab page that
- * is frozen
- */
-- spin_lock(&n->list_lock);
-+ raw_spin_lock(&n->list_lock);
- }
- } else {
- m = M_FULL;
-@@ -2084,7 +2113,7 @@ redo:
- * slabs from diagnostic functions will not see
- * any frozen slabs.
- */
-- spin_lock(&n->list_lock);
-+ raw_spin_lock(&n->list_lock);
- }
- }
-
-@@ -2119,7 +2148,7 @@ redo:
- goto redo;
-
- if (lock)
-- spin_unlock(&n->list_lock);
-+ raw_spin_unlock(&n->list_lock);
-
- if (m == M_FREE) {
- stat(s, DEACTIVATE_EMPTY);
-@@ -2151,10 +2180,10 @@ static void unfreeze_partials(struct kmem_cache *s,
- n2 = get_node(s, page_to_nid(page));
- if (n != n2) {
- if (n)
-- spin_unlock(&n->list_lock);
-+ raw_spin_unlock(&n->list_lock);
-
- n = n2;
-- spin_lock(&n->list_lock);
-+ raw_spin_lock(&n->list_lock);
- }
-
- do {
-@@ -2183,7 +2212,7 @@ static void unfreeze_partials(struct kmem_cache *s,
- }
-
- if (n)
-- spin_unlock(&n->list_lock);
-+ raw_spin_unlock(&n->list_lock);
-
- while (discard_page) {
- page = discard_page;
-@@ -2222,14 +2251,21 @@ static void put_cpu_partial(struct kmem_cache *s, struct page *page, int drain)
- pobjects = oldpage->pobjects;
- pages = oldpage->pages;
- if (drain && pobjects > s->cpu_partial) {
-+ struct slub_free_list *f;
- unsigned long flags;
-+ LIST_HEAD(tofree);
- /*
- * partial array is full. Move the existing
- * set to the per node partial list.
- */
- local_irq_save(flags);
- unfreeze_partials(s, this_cpu_ptr(s->cpu_slab));
-+ f = this_cpu_ptr(&slub_free_list);
-+ raw_spin_lock(&f->lock);
-+ list_splice_init(&f->list, &tofree);
-+ raw_spin_unlock(&f->lock);
- local_irq_restore(flags);
-+ free_delayed(&tofree);
- oldpage = NULL;
- pobjects = 0;
- pages = 0;
-@@ -2301,7 +2337,22 @@ static bool has_cpu_slab(int cpu, void *info)
-
- static void flush_all(struct kmem_cache *s)
- {
-+ LIST_HEAD(tofree);
-+ int cpu;
-+
- on_each_cpu_cond(has_cpu_slab, flush_cpu_slab, s, 1, GFP_ATOMIC);
-+ for_each_online_cpu(cpu) {
-+ struct slub_free_list *f;
-+
-+ if (!has_cpu_slab(cpu, s))
-+ continue;
-+
-+ f = &per_cpu(slub_free_list, cpu);
-+ raw_spin_lock_irq(&f->lock);
-+ list_splice_init(&f->list, &tofree);
-+ raw_spin_unlock_irq(&f->lock);
-+ free_delayed(&tofree);
-+ }
- }
-
- /*
-@@ -2337,10 +2388,10 @@ static unsigned long count_partial(struct kmem_cache_node *n,
- unsigned long x = 0;
- struct page *page;
-
-- spin_lock_irqsave(&n->list_lock, flags);
-+ raw_spin_lock_irqsave(&n->list_lock, flags);
- list_for_each_entry(page, &n->partial, lru)
- x += get_count(page);
-- spin_unlock_irqrestore(&n->list_lock, flags);
-+ raw_spin_unlock_irqrestore(&n->list_lock, flags);
- return x;
- }
- #endif /* CONFIG_SLUB_DEBUG || CONFIG_SYSFS */
-@@ -2478,8 +2529,10 @@ static inline void *get_freelist(struct kmem_cache *s, struct page *page)
- * already disabled (which is the case for bulk allocation).
- */
- static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
-- unsigned long addr, struct kmem_cache_cpu *c)
-+ unsigned long addr, struct kmem_cache_cpu *c,
-+ struct list_head *to_free)
- {
-+ struct slub_free_list *f;
- void *freelist;
- struct page *page;
-
-@@ -2539,6 +2592,13 @@ load_freelist:
- VM_BUG_ON(!c->page->frozen);
- c->freelist = get_freepointer(s, freelist);
- c->tid = next_tid(c->tid);
-+
-+out:
-+ f = this_cpu_ptr(&slub_free_list);
-+ raw_spin_lock(&f->lock);
-+ list_splice_init(&f->list, to_free);
-+ raw_spin_unlock(&f->lock);
-+
- return freelist;
-
- new_slab:
-@@ -2570,7 +2630,7 @@ new_slab:
- deactivate_slab(s, page, get_freepointer(s, freelist));
- c->page = NULL;
- c->freelist = NULL;
-- return freelist;
-+ goto out;
- }
-
- /*
-@@ -2582,6 +2642,7 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
- {
- void *p;
- unsigned long flags;
-+ LIST_HEAD(tofree);
-
- local_irq_save(flags);
- #ifdef CONFIG_PREEMPT
-@@ -2593,8 +2654,9 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
- c = this_cpu_ptr(s->cpu_slab);
- #endif
-
-- p = ___slab_alloc(s, gfpflags, node, addr, c);
-+ p = ___slab_alloc(s, gfpflags, node, addr, c, &tofree);
- local_irq_restore(flags);
-+ free_delayed(&tofree);
- return p;
- }
-
-@@ -2780,7 +2842,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
-
- do {
- if (unlikely(n)) {
-- spin_unlock_irqrestore(&n->list_lock, flags);
-+ raw_spin_unlock_irqrestore(&n->list_lock, flags);
- n = NULL;
- }
- prior = page->freelist;
-@@ -2812,7 +2874,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
- * Otherwise the list_lock will synchronize with
- * other processors updating the list of slabs.
- */
-- spin_lock_irqsave(&n->list_lock, flags);
-+ raw_spin_lock_irqsave(&n->list_lock, flags);
-
- }
- }
-@@ -2854,7 +2916,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
- add_partial(n, page, DEACTIVATE_TO_TAIL);
- stat(s, FREE_ADD_PARTIAL);
- }
-- spin_unlock_irqrestore(&n->list_lock, flags);
-+ raw_spin_unlock_irqrestore(&n->list_lock, flags);
- return;
-
- slab_empty:
-@@ -2869,7 +2931,7 @@ slab_empty:
- remove_full(s, n, page);
- }
-
-- spin_unlock_irqrestore(&n->list_lock, flags);
-+ raw_spin_unlock_irqrestore(&n->list_lock, flags);
- stat(s, FREE_SLAB);
- discard_slab(s, page);
- }
-@@ -3074,6 +3136,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
- void **p)
- {
- struct kmem_cache_cpu *c;
-+ LIST_HEAD(to_free);
- int i;
-
- /* memcg and kmem_cache debug support */
-@@ -3097,7 +3160,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
- * of re-populating per CPU c->freelist
- */
- p[i] = ___slab_alloc(s, flags, NUMA_NO_NODE,
-- _RET_IP_, c);
-+ _RET_IP_, c, &to_free);
- if (unlikely(!p[i]))
- goto error;
-
-@@ -3109,6 +3172,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
- }
- c->tid = next_tid(c->tid);
- local_irq_enable();
-+ free_delayed(&to_free);
-
- /* Clear memory outside IRQ disabled fastpath loop */
- if (unlikely(flags & __GFP_ZERO)) {
-@@ -3256,7 +3320,7 @@ static void
- init_kmem_cache_node(struct kmem_cache_node *n)
- {
- n->nr_partial = 0;
-- spin_lock_init(&n->list_lock);
-+ raw_spin_lock_init(&n->list_lock);
- INIT_LIST_HEAD(&n->partial);
- #ifdef CONFIG_SLUB_DEBUG
- atomic_long_set(&n->nr_slabs, 0);
-@@ -3600,6 +3664,10 @@ static void list_slab_objects(struct kmem_cache *s, struct page *page,
- const char *text)
- {
- #ifdef CONFIG_SLUB_DEBUG
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ /* XXX move out of irq-off section */
-+ slab_err(s, page, text, s->name);
-+#else
- void *addr = page_address(page);
- void *p;
- unsigned long *map = kzalloc(BITS_TO_LONGS(page->objects) *
-@@ -3620,6 +3688,7 @@ static void list_slab_objects(struct kmem_cache *s, struct page *page,
- slab_unlock(page);
- kfree(map);
- #endif
-+#endif
- }
-
- /*
-@@ -3633,7 +3702,7 @@ static void free_partial(struct kmem_cache *s, struct kmem_cache_node *n)
- struct page *page, *h;
-
- BUG_ON(irqs_disabled());
-- spin_lock_irq(&n->list_lock);
-+ raw_spin_lock_irq(&n->list_lock);
- list_for_each_entry_safe(page, h, &n->partial, lru) {
- if (!page->inuse) {
- remove_partial(n, page);
-@@ -3643,7 +3712,7 @@ static void free_partial(struct kmem_cache *s, struct kmem_cache_node *n)
- "Objects remaining in %s on __kmem_cache_shutdown()");
- }
- }
-- spin_unlock_irq(&n->list_lock);
-+ raw_spin_unlock_irq(&n->list_lock);
-
- list_for_each_entry_safe(page, h, &discard, lru)
- discard_slab(s, page);
-@@ -3901,7 +3970,7 @@ int __kmem_cache_shrink(struct kmem_cache *s, bool deactivate)
- for (i = 0; i < SHRINK_PROMOTE_MAX; i++)
- INIT_LIST_HEAD(promote + i);
-
-- spin_lock_irqsave(&n->list_lock, flags);
-+ raw_spin_lock_irqsave(&n->list_lock, flags);
-
- /*
- * Build lists of slabs to discard or promote.
-@@ -3932,7 +4001,7 @@ int __kmem_cache_shrink(struct kmem_cache *s, bool deactivate)
- for (i = SHRINK_PROMOTE_MAX - 1; i >= 0; i--)
- list_splice(promote + i, &n->partial);
-
-- spin_unlock_irqrestore(&n->list_lock, flags);
-+ raw_spin_unlock_irqrestore(&n->list_lock, flags);
-
- /* Release empty slabs */
- list_for_each_entry_safe(page, t, &discard, lru)
-@@ -4108,6 +4177,12 @@ void __init kmem_cache_init(void)
- {
- static __initdata struct kmem_cache boot_kmem_cache,
- boot_kmem_cache_node;
-+ int cpu;
-+
-+ for_each_possible_cpu(cpu) {
-+ raw_spin_lock_init(&per_cpu(slub_free_list, cpu).lock);
-+ INIT_LIST_HEAD(&per_cpu(slub_free_list, cpu).list);
-+ }
-
- if (debug_guardpage_minorder())
- slub_max_order = 0;
-@@ -4354,7 +4429,7 @@ static int validate_slab_node(struct kmem_cache *s,
- struct page *page;
- unsigned long flags;
-
-- spin_lock_irqsave(&n->list_lock, flags);
-+ raw_spin_lock_irqsave(&n->list_lock, flags);
-
- list_for_each_entry(page, &n->partial, lru) {
- validate_slab_slab(s, page, map);
-@@ -4376,7 +4451,7 @@ static int validate_slab_node(struct kmem_cache *s,
- s->name, count, atomic_long_read(&n->nr_slabs));
-
- out:
-- spin_unlock_irqrestore(&n->list_lock, flags);
-+ raw_spin_unlock_irqrestore(&n->list_lock, flags);
- return count;
- }
-
-@@ -4564,12 +4639,12 @@ static int list_locations(struct kmem_cache *s, char *buf,
- if (!atomic_long_read(&n->nr_slabs))
- continue;
-
-- spin_lock_irqsave(&n->list_lock, flags);
-+ raw_spin_lock_irqsave(&n->list_lock, flags);
- list_for_each_entry(page, &n->partial, lru)
- process_slab(&t, s, page, alloc, map);
- list_for_each_entry(page, &n->full, lru)
- process_slab(&t, s, page, alloc, map);
-- spin_unlock_irqrestore(&n->list_lock, flags);
-+ raw_spin_unlock_irqrestore(&n->list_lock, flags);
- }
-
- for (i = 0; i < t.count; i++) {
-diff --git a/mm/swap.c b/mm/swap.c
-index 75c63bb..93fe549 100644
---- a/mm/swap.c
-+++ b/mm/swap.c
-@@ -32,6 +32,7 @@
- #include <linux/memcontrol.h>
- #include <linux/gfp.h>
- #include <linux/uio.h>
-+#include <linux/locallock.h>
- #include <linux/hugetlb.h>
- #include <linux/page_idle.h>
-
-@@ -50,6 +51,8 @@ static DEFINE_PER_CPU(struct pagevec, lru_deactivate_pvecs);
- #ifdef CONFIG_SMP
- static DEFINE_PER_CPU(struct pagevec, activate_page_pvecs);
- #endif
-+static DEFINE_LOCAL_IRQ_LOCK(rotate_lock);
-+DEFINE_LOCAL_IRQ_LOCK(swapvec_lock);
-
- /*
- * This path almost never happens for VM activity - pages are normally
-@@ -240,11 +243,11 @@ void rotate_reclaimable_page(struct page *page)
- unsigned long flags;
-
- get_page(page);
-- local_irq_save(flags);
-+ local_lock_irqsave(rotate_lock, flags);
- pvec = this_cpu_ptr(&lru_rotate_pvecs);
- if (!pagevec_add(pvec, page) || PageCompound(page))
- pagevec_move_tail(pvec);
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(rotate_lock, flags);
- }
- }
-
-@@ -294,12 +297,13 @@ void activate_page(struct page *page)
- {
- page = compound_head(page);
- if (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) {
-- struct pagevec *pvec = &get_cpu_var(activate_page_pvecs);
-+ struct pagevec *pvec = &get_locked_var(swapvec_lock,
-+ activate_page_pvecs);
-
- get_page(page);
- if (!pagevec_add(pvec, page) || PageCompound(page))
- pagevec_lru_move_fn(pvec, __activate_page, NULL);
-- put_cpu_var(activate_page_pvecs);
-+ put_locked_var(swapvec_lock, activate_page_pvecs);
- }
- }
-
-@@ -326,7 +330,7 @@ void activate_page(struct page *page)
-
- static void __lru_cache_activate_page(struct page *page)
- {
-- struct pagevec *pvec = &get_cpu_var(lru_add_pvec);
-+ struct pagevec *pvec = &get_locked_var(swapvec_lock, lru_add_pvec);
- int i;
-
- /*
-@@ -348,7 +352,7 @@ static void __lru_cache_activate_page(struct page *page)
- }
- }
-
-- put_cpu_var(lru_add_pvec);
-+ put_locked_var(swapvec_lock, lru_add_pvec);
- }
-
- /*
-@@ -390,12 +394,12 @@ EXPORT_SYMBOL(mark_page_accessed);
-
- static void __lru_cache_add(struct page *page)
- {
-- struct pagevec *pvec = &get_cpu_var(lru_add_pvec);
-+ struct pagevec *pvec = &get_locked_var(swapvec_lock, lru_add_pvec);
-
- get_page(page);
- if (!pagevec_add(pvec, page) || PageCompound(page))
- __pagevec_lru_add(pvec);
-- put_cpu_var(lru_add_pvec);
-+ put_locked_var(swapvec_lock, lru_add_pvec);
- }
-
- /**
-@@ -593,9 +597,15 @@ void lru_add_drain_cpu(int cpu)
- unsigned long flags;
-
- /* No harm done if a racing interrupt already did this */
-- local_irq_save(flags);
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ local_lock_irqsave_on(rotate_lock, flags, cpu);
- pagevec_move_tail(pvec);
-- local_irq_restore(flags);
-+ local_unlock_irqrestore_on(rotate_lock, flags, cpu);
-+#else
-+ local_lock_irqsave(rotate_lock, flags);
-+ pagevec_move_tail(pvec);
-+ local_unlock_irqrestore(rotate_lock, flags);
-+#endif
- }
-
- pvec = &per_cpu(lru_deactivate_file_pvecs, cpu);
-@@ -627,11 +637,12 @@ void deactivate_file_page(struct page *page)
- return;
-
- if (likely(get_page_unless_zero(page))) {
-- struct pagevec *pvec = &get_cpu_var(lru_deactivate_file_pvecs);
-+ struct pagevec *pvec = &get_locked_var(swapvec_lock,
-+ lru_deactivate_file_pvecs);
-
- if (!pagevec_add(pvec, page) || PageCompound(page))
- pagevec_lru_move_fn(pvec, lru_deactivate_file_fn, NULL);
-- put_cpu_var(lru_deactivate_file_pvecs);
-+ put_locked_var(swapvec_lock, lru_deactivate_file_pvecs);
- }
- }
-
-@@ -646,27 +657,31 @@ void deactivate_file_page(struct page *page)
- void deactivate_page(struct page *page)
- {
- if (PageLRU(page) && PageActive(page) && !PageUnevictable(page)) {
-- struct pagevec *pvec = &get_cpu_var(lru_deactivate_pvecs);
-+ struct pagevec *pvec = &get_locked_var(swapvec_lock,
-+ lru_deactivate_pvecs);
-
- get_page(page);
- if (!pagevec_add(pvec, page) || PageCompound(page))
- pagevec_lru_move_fn(pvec, lru_deactivate_fn, NULL);
-- put_cpu_var(lru_deactivate_pvecs);
-+ put_locked_var(swapvec_lock, lru_deactivate_pvecs);
- }
- }
-
- void lru_add_drain(void)
- {
-- lru_add_drain_cpu(get_cpu());
-- put_cpu();
-+ lru_add_drain_cpu(local_lock_cpu(swapvec_lock));
-+ local_unlock_cpu(swapvec_lock);
- }
-
--static void lru_add_drain_per_cpu(struct work_struct *dummy)
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+static inline void remote_lru_add_drain(int cpu, struct cpumask *has_work)
- {
-- lru_add_drain();
-+ local_lock_on(swapvec_lock, cpu);
-+ lru_add_drain_cpu(cpu);
-+ local_unlock_on(swapvec_lock, cpu);
- }
-
--static DEFINE_PER_CPU(struct work_struct, lru_add_drain_work);
-+#else
-
- /*
- * lru_add_drain_wq is used to do lru_add_drain_all() from a WQ_MEM_RECLAIM
-@@ -686,6 +701,22 @@ static int __init lru_init(void)
- }
- early_initcall(lru_init);
-
-+static void lru_add_drain_per_cpu(struct work_struct *dummy)
-+{
-+ lru_add_drain();
-+}
-+
-+static DEFINE_PER_CPU(struct work_struct, lru_add_drain_work);
-+static inline void remote_lru_add_drain(int cpu, struct cpumask *has_work)
-+{
-+ struct work_struct *work = &per_cpu(lru_add_drain_work, cpu);
-+
-+ INIT_WORK(work, lru_add_drain_per_cpu);
-+ queue_work_on(cpu, lru_add_drain_wq, work);
-+ cpumask_set_cpu(cpu, has_work);
-+}
-+#endif
-+
- void lru_add_drain_all(void)
- {
- static DEFINE_MUTEX(lock);
-@@ -697,21 +728,18 @@ void lru_add_drain_all(void)
- cpumask_clear(&has_work);
-
- for_each_online_cpu(cpu) {
-- struct work_struct *work = &per_cpu(lru_add_drain_work, cpu);
--
- if (pagevec_count(&per_cpu(lru_add_pvec, cpu)) ||
- pagevec_count(&per_cpu(lru_rotate_pvecs, cpu)) ||
- pagevec_count(&per_cpu(lru_deactivate_file_pvecs, cpu)) ||
- pagevec_count(&per_cpu(lru_deactivate_pvecs, cpu)) ||
-- need_activate_page_drain(cpu)) {
-- INIT_WORK(work, lru_add_drain_per_cpu);
-- queue_work_on(cpu, lru_add_drain_wq, work);
-- cpumask_set_cpu(cpu, &has_work);
-- }
-+ need_activate_page_drain(cpu))
-+ remote_lru_add_drain(cpu, &has_work);
- }
-
-+#ifndef CONFIG_PREEMPT_RT_BASE
- for_each_cpu(cpu, &has_work)
- flush_work(&per_cpu(lru_add_drain_work, cpu));
-+#endif
-
- put_online_cpus();
- mutex_unlock(&lock);
-diff --git a/mm/truncate.c b/mm/truncate.c
-index a01cce4..4bda376 100644
---- a/mm/truncate.c
-+++ b/mm/truncate.c
-@@ -62,9 +62,12 @@ static void clear_exceptional_entry(struct address_space *mapping,
- * protected by mapping->tree_lock.
- */
- if (!workingset_node_shadows(node) &&
-- !list_empty(&node->private_list))
-- list_lru_del(&workingset_shadow_nodes,
-+ !list_empty(&node->private_list)) {
-+ local_lock(workingset_shadow_lock);
-+ list_lru_del(&__workingset_shadow_nodes,
- &node->private_list);
-+ local_unlock(workingset_shadow_lock);
-+ }
- __radix_tree_delete_node(&mapping->page_tree, node);
- unlock:
- spin_unlock_irq(&mapping->tree_lock);
-diff --git a/mm/vmalloc.c b/mm/vmalloc.c
-index 91f44e7..06ec393 100644
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
-@@ -845,7 +845,7 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)
- struct vmap_block *vb;
- struct vmap_area *va;
- unsigned long vb_idx;
-- int node, err;
-+ int node, err, cpu;
- void *vaddr;
-
- node = numa_node_id();
-@@ -888,11 +888,12 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)
- BUG_ON(err);
- radix_tree_preload_end();
-
-- vbq = &get_cpu_var(vmap_block_queue);
-+ cpu = get_cpu_light();
-+ vbq = this_cpu_ptr(&vmap_block_queue);
- spin_lock(&vbq->lock);
- list_add_tail_rcu(&vb->free_list, &vbq->free);
- spin_unlock(&vbq->lock);
-- put_cpu_var(vmap_block_queue);
-+ put_cpu_light();
-
- return vaddr;
- }
-@@ -961,6 +962,7 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
- struct vmap_block *vb;
- void *vaddr = NULL;
- unsigned int order;
-+ int cpu;
-
- BUG_ON(offset_in_page(size));
- BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC);
-@@ -975,7 +977,8 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
- order = get_order(size);
-
- rcu_read_lock();
-- vbq = &get_cpu_var(vmap_block_queue);
-+ cpu = get_cpu_light();
-+ vbq = this_cpu_ptr(&vmap_block_queue);
- list_for_each_entry_rcu(vb, &vbq->free, free_list) {
- unsigned long pages_off;
-
-@@ -998,7 +1001,7 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
- break;
- }
-
-- put_cpu_var(vmap_block_queue);
-+ put_cpu_light();
- rcu_read_unlock();
-
- /* Allocate new block if nothing was found */
-diff --git a/mm/vmstat.c b/mm/vmstat.c
-index 89cec42..fb73631 100644
---- a/mm/vmstat.c
-+++ b/mm/vmstat.c
-@@ -245,6 +245,7 @@ void __mod_zone_page_state(struct zone *zone, enum zone_stat_item item,
- long x;
- long t;
-
-+ preempt_disable_rt();
- x = delta + __this_cpu_read(*p);
-
- t = __this_cpu_read(pcp->stat_threshold);
-@@ -254,6 +255,7 @@ void __mod_zone_page_state(struct zone *zone, enum zone_stat_item item,
- x = 0;
- }
- __this_cpu_write(*p, x);
-+ preempt_enable_rt();
- }
- EXPORT_SYMBOL(__mod_zone_page_state);
-
-@@ -265,6 +267,7 @@ void __mod_node_page_state(struct pglist_data *pgdat, enum node_stat_item item,
- long x;
- long t;
-
-+ preempt_disable_rt();
- x = delta + __this_cpu_read(*p);
-
- t = __this_cpu_read(pcp->stat_threshold);
-@@ -274,6 +277,7 @@ void __mod_node_page_state(struct pglist_data *pgdat, enum node_stat_item item,
- x = 0;
- }
- __this_cpu_write(*p, x);
-+ preempt_enable_rt();
- }
- EXPORT_SYMBOL(__mod_node_page_state);
-
-@@ -306,6 +310,7 @@ void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
- s8 __percpu *p = pcp->vm_stat_diff + item;
- s8 v, t;
-
-+ preempt_disable_rt();
- v = __this_cpu_inc_return(*p);
- t = __this_cpu_read(pcp->stat_threshold);
- if (unlikely(v > t)) {
-@@ -314,6 +319,7 @@ void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
- zone_page_state_add(v + overstep, zone, item);
- __this_cpu_write(*p, -overstep);
- }
-+ preempt_enable_rt();
- }
-
- void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)
-@@ -322,6 +328,7 @@ void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)
- s8 __percpu *p = pcp->vm_node_stat_diff + item;
- s8 v, t;
-
-+ preempt_disable_rt();
- v = __this_cpu_inc_return(*p);
- t = __this_cpu_read(pcp->stat_threshold);
- if (unlikely(v > t)) {
-@@ -330,6 +337,7 @@ void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)
- node_page_state_add(v + overstep, pgdat, item);
- __this_cpu_write(*p, -overstep);
- }
-+ preempt_enable_rt();
- }
-
- void __inc_zone_page_state(struct page *page, enum zone_stat_item item)
-@@ -350,6 +358,7 @@ void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
- s8 __percpu *p = pcp->vm_stat_diff + item;
- s8 v, t;
-
-+ preempt_disable_rt();
- v = __this_cpu_dec_return(*p);
- t = __this_cpu_read(pcp->stat_threshold);
- if (unlikely(v < - t)) {
-@@ -358,6 +367,7 @@ void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
- zone_page_state_add(v - overstep, zone, item);
- __this_cpu_write(*p, overstep);
- }
-+ preempt_enable_rt();
- }
-
- void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)
-@@ -366,6 +376,7 @@ void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)
- s8 __percpu *p = pcp->vm_node_stat_diff + item;
- s8 v, t;
-
-+ preempt_disable_rt();
- v = __this_cpu_dec_return(*p);
- t = __this_cpu_read(pcp->stat_threshold);
- if (unlikely(v < - t)) {
-@@ -374,6 +385,7 @@ void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)
- node_page_state_add(v - overstep, pgdat, item);
- __this_cpu_write(*p, overstep);
- }
-+ preempt_enable_rt();
- }
-
- void __dec_zone_page_state(struct page *page, enum zone_stat_item item)
-diff --git a/mm/workingset.c b/mm/workingset.c
-index 617475f..48674bf 100644
---- a/mm/workingset.c
-+++ b/mm/workingset.c
-@@ -334,7 +334,8 @@ out:
- * point where they would still be useful.
- */
-
--struct list_lru workingset_shadow_nodes;
-+struct list_lru __workingset_shadow_nodes;
-+DEFINE_LOCAL_IRQ_LOCK(workingset_shadow_lock);
-
- static unsigned long count_shadow_nodes(struct shrinker *shrinker,
- struct shrink_control *sc)
-@@ -344,9 +345,9 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker,
- unsigned long pages;
-
- /* list_lru lock nests inside IRQ-safe mapping->tree_lock */
-- local_irq_disable();
-- shadow_nodes = list_lru_shrink_count(&workingset_shadow_nodes, sc);
-- local_irq_enable();
-+ local_lock_irq(workingset_shadow_lock);
-+ shadow_nodes = list_lru_shrink_count(&__workingset_shadow_nodes, sc);
-+ local_unlock_irq(workingset_shadow_lock);
-
- if (memcg_kmem_enabled()) {
- pages = mem_cgroup_node_nr_lru_pages(sc->memcg, sc->nid,
-@@ -438,9 +439,9 @@ static enum lru_status shadow_lru_isolate(struct list_head *item,
- spin_unlock(&mapping->tree_lock);
- ret = LRU_REMOVED_RETRY;
- out:
-- local_irq_enable();
-+ local_unlock_irq(workingset_shadow_lock);
- cond_resched();
-- local_irq_disable();
-+ local_lock_irq(workingset_shadow_lock);
- spin_lock(lru_lock);
- return ret;
- }
-@@ -451,10 +452,10 @@ static unsigned long scan_shadow_nodes(struct shrinker *shrinker,
- unsigned long ret;
-
- /* list_lru lock nests inside IRQ-safe mapping->tree_lock */
-- local_irq_disable();
-- ret = list_lru_shrink_walk(&workingset_shadow_nodes, sc,
-+ local_lock_irq(workingset_shadow_lock);
-+ ret = list_lru_shrink_walk(&__workingset_shadow_nodes, sc,
- shadow_lru_isolate, NULL);
-- local_irq_enable();
-+ local_unlock_irq(workingset_shadow_lock);
- return ret;
- }
-
-@@ -492,7 +493,7 @@ static int __init workingset_init(void)
- pr_info("workingset: timestamp_bits=%d max_order=%d bucket_order=%u\n",
- timestamp_bits, max_order, bucket_order);
-
-- ret = list_lru_init_key(&workingset_shadow_nodes, &shadow_nodes_key);
-+ ret = list_lru_init_key(&__workingset_shadow_nodes, &shadow_nodes_key);
- if (ret)
- goto err;
- ret = register_shrinker(&workingset_shadow_shrinker);
-@@ -500,7 +501,7 @@ static int __init workingset_init(void)
- goto err_list_lru;
- return 0;
- err_list_lru:
-- list_lru_destroy(&workingset_shadow_nodes);
-+ list_lru_destroy(&__workingset_shadow_nodes);
- err:
- return ret;
- }
-diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
-index b0bc023..f264d38 100644
---- a/mm/zsmalloc.c
-+++ b/mm/zsmalloc.c
-@@ -71,7 +71,19 @@
- #define ZS_MAX_ZSPAGE_ORDER 2
- #define ZS_MAX_PAGES_PER_ZSPAGE (_AC(1, UL) << ZS_MAX_ZSPAGE_ORDER)
-
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+
-+struct zsmalloc_handle {
-+ unsigned long addr;
-+ struct mutex lock;
-+};
-+
-+#define ZS_HANDLE_SIZE (sizeof(struct zsmalloc_handle))
-+
-+#else
-+
- #define ZS_HANDLE_SIZE (sizeof(unsigned long))
-+#endif
-
- /*
- * Object location (<PFN>, <obj_idx>) is encoded as
-@@ -351,9 +363,26 @@ static void destroy_cache(struct zs_pool *pool)
-
- static unsigned long cache_alloc_handle(struct zs_pool *pool, gfp_t gfp)
- {
-- return (unsigned long)kmem_cache_alloc(pool->handle_cachep,
-- gfp & ~(__GFP_HIGHMEM|__GFP_MOVABLE));
-+ void *p;
-+
-+ p = kmem_cache_alloc(pool->handle_cachep,
-+ gfp & ~(__GFP_HIGHMEM|__GFP_MOVABLE));
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ if (p) {
-+ struct zsmalloc_handle *zh = p;
-+
-+ mutex_init(&zh->lock);
-+ }
-+#endif
-+ return (unsigned long)p;
-+}
-+
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+static struct zsmalloc_handle *zs_get_pure_handle(unsigned long handle)
-+{
-+ return (void *)(handle &~((1 << OBJ_TAG_BITS) - 1));
- }
-+#endif
-
- static void cache_free_handle(struct zs_pool *pool, unsigned long handle)
- {
-@@ -373,12 +402,18 @@ static void cache_free_zspage(struct zs_pool *pool, struct zspage *zspage)
-
- static void record_obj(unsigned long handle, unsigned long obj)
- {
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ struct zsmalloc_handle *zh = zs_get_pure_handle(handle);
-+
-+ WRITE_ONCE(zh->addr, obj);
-+#else
- /*
- * lsb of @obj represents handle lock while other bits
- * represent object value the handle is pointing so
- * updating shouldn't do store tearing.
- */
- WRITE_ONCE(*(unsigned long *)handle, obj);
-+#endif
- }
-
- /* zpool driver */
-@@ -902,7 +937,13 @@ static unsigned long location_to_obj(struct page *page, unsigned int obj_idx)
-
- static unsigned long handle_to_obj(unsigned long handle)
- {
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ struct zsmalloc_handle *zh = zs_get_pure_handle(handle);
-+
-+ return zh->addr;
-+#else
- return *(unsigned long *)handle;
-+#endif
- }
-
- static unsigned long obj_to_head(struct page *page, void *obj)
-@@ -916,22 +957,46 @@ static unsigned long obj_to_head(struct page *page, void *obj)
-
- static inline int testpin_tag(unsigned long handle)
- {
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ struct zsmalloc_handle *zh = zs_get_pure_handle(handle);
-+
-+ return mutex_is_locked(&zh->lock);
-+#else
- return bit_spin_is_locked(HANDLE_PIN_BIT, (unsigned long *)handle);
-+#endif
- }
-
- static inline int trypin_tag(unsigned long handle)
- {
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ struct zsmalloc_handle *zh = zs_get_pure_handle(handle);
-+
-+ return mutex_trylock(&zh->lock);
-+#else
- return bit_spin_trylock(HANDLE_PIN_BIT, (unsigned long *)handle);
-+#endif
- }
-
- static void pin_tag(unsigned long handle)
- {
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ struct zsmalloc_handle *zh = zs_get_pure_handle(handle);
-+
-+ return mutex_lock(&zh->lock);
-+#else
- bit_spin_lock(HANDLE_PIN_BIT, (unsigned long *)handle);
-+#endif
- }
-
- static void unpin_tag(unsigned long handle)
- {
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ struct zsmalloc_handle *zh = zs_get_pure_handle(handle);
-+
-+ return mutex_unlock(&zh->lock);
-+#else
- bit_spin_unlock(HANDLE_PIN_BIT, (unsigned long *)handle);
-+#endif
- }
-
- static void reset_page(struct page *page)
-@@ -1423,7 +1488,7 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle,
- class = pool->size_class[class_idx];
- off = (class->size * obj_idx) & ~PAGE_MASK;
-
-- area = &get_cpu_var(zs_map_area);
-+ area = per_cpu_ptr(&zs_map_area, get_cpu_light());
- area->vm_mm = mm;
- if (off + class->size <= PAGE_SIZE) {
- /* this object is contained entirely within a page */
-@@ -1477,7 +1542,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle)
-
- __zs_unmap_object(area, pages, off, class->size);
- }
-- put_cpu_var(zs_map_area);
-+ put_cpu_light();
-
- migrate_read_unlock(zspage);
- unpin_tag(handle);
-diff --git a/net/core/dev.c b/net/core/dev.c
-index ea63120..d114a46 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -190,6 +190,7 @@ static unsigned int napi_gen_id = NR_CPUS;
- static DEFINE_READ_MOSTLY_HASHTABLE(napi_hash, 8);
-
- static seqcount_t devnet_rename_seq;
-+static DEFINE_MUTEX(devnet_rename_mutex);
-
- static inline void dev_base_seq_inc(struct net *net)
- {
-@@ -211,14 +212,14 @@ static inline struct hlist_head *dev_index_hash(struct net *net, int ifindex)
- static inline void rps_lock(struct softnet_data *sd)
- {
- #ifdef CONFIG_RPS
-- spin_lock(&sd->input_pkt_queue.lock);
-+ raw_spin_lock(&sd->input_pkt_queue.raw_lock);
- #endif
- }
-
- static inline void rps_unlock(struct softnet_data *sd)
- {
- #ifdef CONFIG_RPS
-- spin_unlock(&sd->input_pkt_queue.lock);
-+ raw_spin_unlock(&sd->input_pkt_queue.raw_lock);
- #endif
- }
-
-@@ -888,7 +889,8 @@ retry:
- strcpy(name, dev->name);
- rcu_read_unlock();
- if (read_seqcount_retry(&devnet_rename_seq, seq)) {
-- cond_resched();
-+ mutex_lock(&devnet_rename_mutex);
-+ mutex_unlock(&devnet_rename_mutex);
- goto retry;
- }
-
-@@ -1157,20 +1159,17 @@ int dev_change_name(struct net_device *dev, const char *newname)
- if (dev->flags & IFF_UP)
- return -EBUSY;
-
-- write_seqcount_begin(&devnet_rename_seq);
-+ mutex_lock(&devnet_rename_mutex);
-+ __raw_write_seqcount_begin(&devnet_rename_seq);
-
-- if (strncmp(newname, dev->name, IFNAMSIZ) == 0) {
-- write_seqcount_end(&devnet_rename_seq);
-- return 0;
-- }
-+ if (strncmp(newname, dev->name, IFNAMSIZ) == 0)
-+ goto outunlock;
-
- memcpy(oldname, dev->name, IFNAMSIZ);
-
- err = dev_get_valid_name(net, dev, newname);
-- if (err < 0) {
-- write_seqcount_end(&devnet_rename_seq);
-- return err;
-- }
-+ if (err < 0)
-+ goto outunlock;
-
- if (oldname[0] && !strchr(oldname, '%'))
- netdev_info(dev, "renamed from %s\n", oldname);
-@@ -1183,11 +1182,12 @@ rollback:
- if (ret) {
- memcpy(dev->name, oldname, IFNAMSIZ);
- dev->name_assign_type = old_assign_type;
-- write_seqcount_end(&devnet_rename_seq);
-- return ret;
-+ err = ret;
-+ goto outunlock;
- }
-
-- write_seqcount_end(&devnet_rename_seq);
-+ __raw_write_seqcount_end(&devnet_rename_seq);
-+ mutex_unlock(&devnet_rename_mutex);
-
- netdev_adjacent_rename_links(dev, oldname);
-
-@@ -1208,7 +1208,8 @@ rollback:
- /* err >= 0 after dev_alloc_name() or stores the first errno */
- if (err >= 0) {
- err = ret;
-- write_seqcount_begin(&devnet_rename_seq);
-+ mutex_lock(&devnet_rename_mutex);
-+ __raw_write_seqcount_begin(&devnet_rename_seq);
- memcpy(dev->name, oldname, IFNAMSIZ);
- memcpy(oldname, newname, IFNAMSIZ);
- dev->name_assign_type = old_assign_type;
-@@ -1221,6 +1222,11 @@ rollback:
- }
-
- return err;
-+
-+outunlock:
-+ __raw_write_seqcount_end(&devnet_rename_seq);
-+ mutex_unlock(&devnet_rename_mutex);
-+ return err;
- }
-
- /**
-@@ -2268,6 +2274,7 @@ static void __netif_reschedule(struct Qdisc *q)
- sd->output_queue_tailp = &q->next_sched;
- raise_softirq_irqoff(NET_TX_SOFTIRQ);
- local_irq_restore(flags);
-+ preempt_check_resched_rt();
- }
-
- void __netif_schedule(struct Qdisc *q)
-@@ -2349,6 +2356,7 @@ void __dev_kfree_skb_irq(struct sk_buff *skb, enum skb_free_reason reason)
- __this_cpu_write(softnet_data.completion_queue, skb);
- raise_softirq_irqoff(NET_TX_SOFTIRQ);
- local_irq_restore(flags);
-+ preempt_check_resched_rt();
- }
- EXPORT_SYMBOL(__dev_kfree_skb_irq);
-
-@@ -3082,7 +3090,11 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
- * This permits qdisc->running owner to get the lock more
- * often and dequeue packets faster.
- */
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ contended = true;
-+#else
- contended = qdisc_is_running(q);
-+#endif
- if (unlikely(contended))
- spin_lock(&q->busylock);
-
-@@ -3145,8 +3157,10 @@ static void skb_update_prio(struct sk_buff *skb)
- #define skb_update_prio(skb)
- #endif
-
-+#ifndef CONFIG_PREEMPT_RT_FULL
- DEFINE_PER_CPU(int, xmit_recursion);
- EXPORT_SYMBOL(xmit_recursion);
-+#endif
-
- /**
- * dev_loopback_xmit - loop back @skb
-@@ -3390,8 +3404,7 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv)
- int cpu = smp_processor_id(); /* ok because BHs are off */
-
- if (txq->xmit_lock_owner != cpu) {
-- if (unlikely(__this_cpu_read(xmit_recursion) >
-- XMIT_RECURSION_LIMIT))
-+ if (unlikely(xmit_rec_read() > XMIT_RECURSION_LIMIT))
- goto recursion_alert;
-
- skb = validate_xmit_skb(skb, dev);
-@@ -3401,9 +3414,9 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv)
- HARD_TX_LOCK(dev, txq, cpu);
-
- if (!netif_xmit_stopped(txq)) {
-- __this_cpu_inc(xmit_recursion);
-+ xmit_rec_inc();
- skb = dev_hard_start_xmit(skb, dev, txq, &rc);
-- __this_cpu_dec(xmit_recursion);
-+ xmit_rec_dec();
- if (dev_xmit_complete(rc)) {
- HARD_TX_UNLOCK(dev, txq);
- goto out;
-@@ -3777,6 +3790,7 @@ drop:
- rps_unlock(sd);
-
- local_irq_restore(flags);
-+ preempt_check_resched_rt();
-
- atomic_long_inc(&skb->dev->rx_dropped);
- kfree_skb(skb);
-@@ -3795,7 +3809,7 @@ static int netif_rx_internal(struct sk_buff *skb)
- struct rps_dev_flow voidflow, *rflow = &voidflow;
- int cpu;
-
-- preempt_disable();
-+ migrate_disable();
- rcu_read_lock();
-
- cpu = get_rps_cpu(skb->dev, skb, &rflow);
-@@ -3805,13 +3819,13 @@ static int netif_rx_internal(struct sk_buff *skb)
- ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail);
-
- rcu_read_unlock();
-- preempt_enable();
-+ migrate_enable();
- } else
- #endif
- {
- unsigned int qtail;
-- ret = enqueue_to_backlog(skb, get_cpu(), &qtail);
-- put_cpu();
-+ ret = enqueue_to_backlog(skb, get_cpu_light(), &qtail);
-+ put_cpu_light();
- }
- return ret;
- }
-@@ -3845,11 +3859,9 @@ int netif_rx_ni(struct sk_buff *skb)
-
- trace_netif_rx_ni_entry(skb);
-
-- preempt_disable();
-+ local_bh_disable();
- err = netif_rx_internal(skb);
-- if (local_softirq_pending())
-- do_softirq();
-- preempt_enable();
-+ local_bh_enable();
-
- return err;
- }
-@@ -4321,7 +4333,7 @@ static void flush_backlog(void *arg)
- skb_queue_walk_safe(&sd->input_pkt_queue, skb, tmp) {
- if (skb->dev == dev) {
- __skb_unlink(skb, &sd->input_pkt_queue);
-- kfree_skb(skb);
-+ __skb_queue_tail(&sd->tofree_queue, skb);
- input_queue_head_incr(sd);
- }
- }
-@@ -4330,10 +4342,13 @@ static void flush_backlog(void *arg)
- skb_queue_walk_safe(&sd->process_queue, skb, tmp) {
- if (skb->dev == dev) {
- __skb_unlink(skb, &sd->process_queue);
-- kfree_skb(skb);
-+ __skb_queue_tail(&sd->tofree_queue, skb);
- input_queue_head_incr(sd);
- }
- }
-+
-+ if (!skb_queue_empty(&sd->tofree_queue))
-+ raise_softirq_irqoff(NET_RX_SOFTIRQ);
- }
-
- static int napi_gro_complete(struct sk_buff *skb)
-@@ -4795,6 +4810,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd)
- sd->rps_ipi_list = NULL;
-
- local_irq_enable();
-+ preempt_check_resched_rt();
-
- /* Send pending IPI's to kick RPS processing on remote cpus. */
- while (remsd) {
-@@ -4808,6 +4824,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd)
- } else
- #endif
- local_irq_enable();
-+ preempt_check_resched_rt();
- }
-
- static bool sd_has_rps_ipi_waiting(struct softnet_data *sd)
-@@ -4889,6 +4906,7 @@ void __napi_schedule(struct napi_struct *n)
- local_irq_save(flags);
- ____napi_schedule(this_cpu_ptr(&softnet_data), n);
- local_irq_restore(flags);
-+ preempt_check_resched_rt();
- }
- EXPORT_SYMBOL(__napi_schedule);
-
-@@ -5229,7 +5247,7 @@ static void net_rx_action(struct softirq_action *h)
- list_splice_tail(&repoll, &list);
- list_splice(&list, &sd->poll_list);
- if (!list_empty(&sd->poll_list))
-- __raise_softirq_irqoff(NET_RX_SOFTIRQ);
-+ __raise_softirq_irqoff_ksoft(NET_RX_SOFTIRQ);
-
- net_rps_action_and_irq_enable(sd);
- }
-@@ -7736,7 +7754,7 @@ EXPORT_SYMBOL(free_netdev);
- void synchronize_net(void)
- {
- might_sleep();
-- if (rtnl_is_locked())
-+ if (rtnl_is_locked() && !IS_ENABLED(CONFIG_PREEMPT_RT_FULL))
- synchronize_rcu_expedited();
- else
- synchronize_rcu();
-@@ -7977,16 +7995,20 @@ static int dev_cpu_callback(struct notifier_block *nfb,
-
- raise_softirq_irqoff(NET_TX_SOFTIRQ);
- local_irq_enable();
-+ preempt_check_resched_rt();
-
- /* Process offline CPU's input_pkt_queue */
- while ((skb = __skb_dequeue(&oldsd->process_queue))) {
- netif_rx_ni(skb);
- input_queue_head_incr(oldsd);
- }
-- while ((skb = skb_dequeue(&oldsd->input_pkt_queue))) {
-+ while ((skb = __skb_dequeue(&oldsd->input_pkt_queue))) {
- netif_rx_ni(skb);
- input_queue_head_incr(oldsd);
- }
-+ while ((skb = __skb_dequeue(&oldsd->tofree_queue))) {
-+ kfree_skb(skb);
-+ }
-
- return NOTIFY_OK;
- }
-@@ -8288,8 +8310,9 @@ static int __init net_dev_init(void)
- for_each_possible_cpu(i) {
- struct softnet_data *sd = &per_cpu(softnet_data, i);
-
-- skb_queue_head_init(&sd->input_pkt_queue);
-- skb_queue_head_init(&sd->process_queue);
-+ skb_queue_head_init_raw(&sd->input_pkt_queue);
-+ skb_queue_head_init_raw(&sd->process_queue);
-+ skb_queue_head_init_raw(&sd->tofree_queue);
- INIT_LIST_HEAD(&sd->poll_list);
- sd->output_queue_tailp = &sd->output_queue;
- #ifdef CONFIG_RPS
-diff --git a/net/core/filter.c b/net/core/filter.c
-index cb06ace..3585a89 100644
---- a/net/core/filter.c
-+++ b/net/core/filter.c
-@@ -1592,7 +1592,7 @@ static inline int __bpf_tx_skb(struct net_device *dev, struct sk_buff *skb)
- {
- int ret;
-
-- if (unlikely(__this_cpu_read(xmit_recursion) > XMIT_RECURSION_LIMIT)) {
-+ if (unlikely(xmit_rec_read() > XMIT_RECURSION_LIMIT)) {
- net_crit_ratelimited("bpf: recursion limit reached on datapath, buggy bpf program?\n");
- kfree_skb(skb);
- return -ENETDOWN;
-@@ -1600,9 +1600,9 @@ static inline int __bpf_tx_skb(struct net_device *dev, struct sk_buff *skb)
-
- skb->dev = dev;
-
-- __this_cpu_inc(xmit_recursion);
-+ xmit_rec_inc();
- ret = dev_queue_xmit(skb);
-- __this_cpu_dec(xmit_recursion);
-+ xmit_rec_dec();
-
- return ret;
- }
-diff --git a/net/core/gen_estimator.c b/net/core/gen_estimator.c
-index cad8e79..2a9364f 100644
---- a/net/core/gen_estimator.c
-+++ b/net/core/gen_estimator.c
-@@ -84,7 +84,7 @@ struct gen_estimator
- struct gnet_stats_basic_packed *bstats;
- struct gnet_stats_rate_est64 *rate_est;
- spinlock_t *stats_lock;
-- seqcount_t *running;
-+ net_seqlock_t *running;
- int ewma_log;
- u32 last_packets;
- unsigned long avpps;
-@@ -213,7 +213,7 @@ int gen_new_estimator(struct gnet_stats_basic_packed *bstats,
- struct gnet_stats_basic_cpu __percpu *cpu_bstats,
- struct gnet_stats_rate_est64 *rate_est,
- spinlock_t *stats_lock,
-- seqcount_t *running,
-+ net_seqlock_t *running,
- struct nlattr *opt)
- {
- struct gen_estimator *est;
-@@ -309,7 +309,7 @@ int gen_replace_estimator(struct gnet_stats_basic_packed *bstats,
- struct gnet_stats_basic_cpu __percpu *cpu_bstats,
- struct gnet_stats_rate_est64 *rate_est,
- spinlock_t *stats_lock,
-- seqcount_t *running, struct nlattr *opt)
-+ net_seqlock_t *running, struct nlattr *opt)
- {
- gen_kill_estimator(bstats, rate_est);
- return gen_new_estimator(bstats, cpu_bstats, rate_est, stats_lock, running, opt);
-diff --git a/net/core/gen_stats.c b/net/core/gen_stats.c
-index 508e051..bc3b17b 100644
---- a/net/core/gen_stats.c
-+++ b/net/core/gen_stats.c
-@@ -130,7 +130,7 @@ __gnet_stats_copy_basic_cpu(struct gnet_stats_basic_packed *bstats,
- }
-
- void
--__gnet_stats_copy_basic(const seqcount_t *running,
-+__gnet_stats_copy_basic(net_seqlock_t *running,
- struct gnet_stats_basic_packed *bstats,
- struct gnet_stats_basic_cpu __percpu *cpu,
- struct gnet_stats_basic_packed *b)
-@@ -143,10 +143,10 @@ __gnet_stats_copy_basic(const seqcount_t *running,
- }
- do {
- if (running)
-- seq = read_seqcount_begin(running);
-+ seq = net_seq_begin(running);
- bstats->bytes = b->bytes;
- bstats->packets = b->packets;
-- } while (running && read_seqcount_retry(running, seq));
-+ } while (running && net_seq_retry(running, seq));
- }
- EXPORT_SYMBOL(__gnet_stats_copy_basic);
-
-@@ -164,7 +164,7 @@ EXPORT_SYMBOL(__gnet_stats_copy_basic);
- * if the room in the socket buffer was not sufficient.
- */
- int
--gnet_stats_copy_basic(const seqcount_t *running,
-+gnet_stats_copy_basic(net_seqlock_t *running,
- struct gnet_dump *d,
- struct gnet_stats_basic_cpu __percpu *cpu,
- struct gnet_stats_basic_packed *b)
-diff --git a/net/core/skbuff.c b/net/core/skbuff.c
-index 3864b4b6..55c73ad 100644
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -64,6 +64,7 @@
- #include <linux/errqueue.h>
- #include <linux/prefetch.h>
- #include <linux/if_vlan.h>
-+#include <linux/locallock.h>
-
- #include <net/protocol.h>
- #include <net/dst.h>
-@@ -360,6 +361,8 @@ struct napi_alloc_cache {
-
- static DEFINE_PER_CPU(struct page_frag_cache, netdev_alloc_cache);
- static DEFINE_PER_CPU(struct napi_alloc_cache, napi_alloc_cache);
-+static DEFINE_LOCAL_IRQ_LOCK(netdev_alloc_lock);
-+static DEFINE_LOCAL_IRQ_LOCK(napi_alloc_cache_lock);
-
- static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
- {
-@@ -367,10 +370,10 @@ static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
- unsigned long flags;
- void *data;
-
-- local_irq_save(flags);
-+ local_lock_irqsave(netdev_alloc_lock, flags);
- nc = this_cpu_ptr(&netdev_alloc_cache);
- data = __alloc_page_frag(nc, fragsz, gfp_mask);
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(netdev_alloc_lock, flags);
- return data;
- }
-
-@@ -389,9 +392,13 @@ EXPORT_SYMBOL(netdev_alloc_frag);
-
- static void *__napi_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
- {
-- struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache);
-+ struct napi_alloc_cache *nc;
-+ void *data;
-
-- return __alloc_page_frag(&nc->page, fragsz, gfp_mask);
-+ nc = &get_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
-+ data = __alloc_page_frag(&nc->page, fragsz, gfp_mask);
-+ put_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
-+ return data;
- }
-
- void *napi_alloc_frag(unsigned int fragsz)
-@@ -438,13 +445,13 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len,
- if (sk_memalloc_socks())
- gfp_mask |= __GFP_MEMALLOC;
-
-- local_irq_save(flags);
-+ local_lock_irqsave(netdev_alloc_lock, flags);
-
- nc = this_cpu_ptr(&netdev_alloc_cache);
- data = __alloc_page_frag(nc, len, gfp_mask);
- pfmemalloc = nc->pfmemalloc;
-
-- local_irq_restore(flags);
-+ local_unlock_irqrestore(netdev_alloc_lock, flags);
-
- if (unlikely(!data))
- return NULL;
-@@ -485,9 +492,10 @@ EXPORT_SYMBOL(__netdev_alloc_skb);
- struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,
- gfp_t gfp_mask)
- {
-- struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache);
-+ struct napi_alloc_cache *nc;
- struct sk_buff *skb;
- void *data;
-+ bool pfmemalloc;
-
- len += NET_SKB_PAD + NET_IP_ALIGN;
-
-@@ -505,7 +513,10 @@ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,
- if (sk_memalloc_socks())
- gfp_mask |= __GFP_MEMALLOC;
-
-+ nc = &get_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
- data = __alloc_page_frag(&nc->page, len, gfp_mask);
-+ pfmemalloc = nc->page.pfmemalloc;
-+ put_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
- if (unlikely(!data))
- return NULL;
-
-@@ -516,7 +527,7 @@ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,
- }
-
- /* use OR instead of assignment to avoid clearing of bits in mask */
-- if (nc->page.pfmemalloc)
-+ if (pfmemalloc)
- skb->pfmemalloc = 1;
- skb->head_frag = 1;
-
-@@ -760,23 +771,26 @@ EXPORT_SYMBOL(consume_skb);
-
- void __kfree_skb_flush(void)
- {
-- struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache);
-+ struct napi_alloc_cache *nc;
-
-+ nc = &get_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
- /* flush skb_cache if containing objects */
- if (nc->skb_count) {
- kmem_cache_free_bulk(skbuff_head_cache, nc->skb_count,
- nc->skb_cache);
- nc->skb_count = 0;
- }
-+ put_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
- }
-
- static inline void _kfree_skb_defer(struct sk_buff *skb)
- {
-- struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache);
-+ struct napi_alloc_cache *nc;
-
- /* drop skb->head and call any destructors for packet */
- skb_release_all(skb);
-
-+ nc = &get_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
- /* record skb to CPU local list */
- nc->skb_cache[nc->skb_count++] = skb;
-
-@@ -791,6 +805,7 @@ static inline void _kfree_skb_defer(struct sk_buff *skb)
- nc->skb_cache);
- nc->skb_count = 0;
- }
-+ put_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
- }
- void __kfree_skb_defer(struct sk_buff *skb)
- {
-diff --git a/net/core/sock.c b/net/core/sock.c
-index fd7b41e..e425d25 100644
---- a/net/core/sock.c
-+++ b/net/core/sock.c
-@@ -2508,12 +2508,11 @@ void lock_sock_nested(struct sock *sk, int subclass)
- if (sk->sk_lock.owned)
- __lock_sock(sk);
- sk->sk_lock.owned = 1;
-- spin_unlock(&sk->sk_lock.slock);
-+ spin_unlock_bh(&sk->sk_lock.slock);
- /*
- * The sk_lock has mutex_lock() semantics here:
- */
- mutex_acquire(&sk->sk_lock.dep_map, subclass, 0, _RET_IP_);
-- local_bh_enable();
- }
- EXPORT_SYMBOL(lock_sock_nested);
-
-diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
-index 38abe70..443259a 100644
---- a/net/ipv4/icmp.c
-+++ b/net/ipv4/icmp.c
-@@ -69,6 +69,7 @@
- #include <linux/jiffies.h>
- #include <linux/kernel.h>
- #include <linux/fcntl.h>
-+#include <linux/sysrq.h>
- #include <linux/socket.h>
- #include <linux/in.h>
- #include <linux/inet.h>
-@@ -77,6 +78,7 @@
- #include <linux/string.h>
- #include <linux/netfilter_ipv4.h>
- #include <linux/slab.h>
-+#include <linux/locallock.h>
- #include <net/snmp.h>
- #include <net/ip.h>
- #include <net/route.h>
-@@ -204,6 +206,8 @@ static const struct icmp_control icmp_pointers[NR_ICMP_TYPES+1];
- *
- * On SMP we have one ICMP socket per-cpu.
- */
-+static DEFINE_LOCAL_IRQ_LOCK(icmp_sk_lock);
-+
- static struct sock *icmp_sk(struct net *net)
- {
- return *this_cpu_ptr(net->ipv4.icmp_sk);
-@@ -215,12 +219,14 @@ static inline struct sock *icmp_xmit_lock(struct net *net)
-
- local_bh_disable();
-
-+ local_lock(icmp_sk_lock);
- sk = icmp_sk(net);
-
- if (unlikely(!spin_trylock(&sk->sk_lock.slock))) {
- /* This can happen if the output path signals a
- * dst_link_failure() for an outgoing ICMP packet.
- */
-+ local_unlock(icmp_sk_lock);
- local_bh_enable();
- return NULL;
- }
-@@ -230,6 +236,7 @@ static inline struct sock *icmp_xmit_lock(struct net *net)
- static inline void icmp_xmit_unlock(struct sock *sk)
- {
- spin_unlock_bh(&sk->sk_lock.slock);
-+ local_unlock(icmp_sk_lock);
- }
-
- int sysctl_icmp_msgs_per_sec __read_mostly = 1000;
-@@ -358,6 +365,7 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param,
- struct sock *sk;
- struct sk_buff *skb;
-
-+ local_lock(icmp_sk_lock);
- sk = icmp_sk(dev_net((*rt)->dst.dev));
- if (ip_append_data(sk, fl4, icmp_glue_bits, icmp_param,
- icmp_param->data_len+icmp_param->head_len,
-@@ -380,6 +388,7 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param,
- skb->ip_summed = CHECKSUM_NONE;
- ip_push_pending_frames(sk, fl4);
- }
-+ local_unlock(icmp_sk_lock);
- }
-
- /*
-@@ -891,6 +900,30 @@ static bool icmp_redirect(struct sk_buff *skb)
- }
-
- /*
-+ * 32bit and 64bit have different timestamp length, so we check for
-+ * the cookie at offset 20 and verify it is repeated at offset 50
-+ */
-+#define CO_POS0 20
-+#define CO_POS1 50
-+#define CO_SIZE sizeof(int)
-+#define ICMP_SYSRQ_SIZE 57
-+
-+/*
-+ * We got a ICMP_SYSRQ_SIZE sized ping request. Check for the cookie
-+ * pattern and if it matches send the next byte as a trigger to sysrq.
-+ */
-+static void icmp_check_sysrq(struct net *net, struct sk_buff *skb)
-+{
-+ int cookie = htonl(net->ipv4.sysctl_icmp_echo_sysrq);
-+ char *p = skb->data;
-+
-+ if (!memcmp(&cookie, p + CO_POS0, CO_SIZE) &&
-+ !memcmp(&cookie, p + CO_POS1, CO_SIZE) &&
-+ p[CO_POS0 + CO_SIZE] == p[CO_POS1 + CO_SIZE])
-+ handle_sysrq(p[CO_POS0 + CO_SIZE]);
-+}
-+
-+/*
- * Handle ICMP_ECHO ("ping") requests.
- *
- * RFC 1122: 3.2.2.6 MUST have an echo server that answers ICMP echo
-@@ -917,6 +950,11 @@ static bool icmp_echo(struct sk_buff *skb)
- icmp_param.data_len = skb->len;
- icmp_param.head_len = sizeof(struct icmphdr);
- icmp_reply(&icmp_param, skb);
-+
-+ if (skb->len == ICMP_SYSRQ_SIZE &&
-+ net->ipv4.sysctl_icmp_echo_sysrq) {
-+ icmp_check_sysrq(net, skb);
-+ }
- }
- /* should there be an ICMP stat for ignored echos? */
- return true;
-diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
-index 1cb67de..332a485 100644
---- a/net/ipv4/sysctl_net_ipv4.c
-+++ b/net/ipv4/sysctl_net_ipv4.c
-@@ -681,6 +681,13 @@ static struct ctl_table ipv4_net_table[] = {
- .proc_handler = proc_dointvec
- },
- {
-+ .procname = "icmp_echo_sysrq",
-+ .data = &init_net.ipv4.sysctl_icmp_echo_sysrq,
-+ .maxlen = sizeof(int),
-+ .mode = 0644,
-+ .proc_handler = proc_dointvec
-+ },
-+ {
- .procname = "icmp_ignore_bogus_error_responses",
- .data = &init_net.ipv4.sysctl_icmp_ignore_bogus_error_responses,
- .maxlen = sizeof(int),
-diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
-index 7158d4f..0dc007f 100644
---- a/net/ipv4/tcp_ipv4.c
-+++ b/net/ipv4/tcp_ipv4.c
-@@ -62,6 +62,7 @@
- #include <linux/init.h>
- #include <linux/times.h>
- #include <linux/slab.h>
-+#include <linux/locallock.h>
-
- #include <net/net_namespace.h>
- #include <net/icmp.h>
-@@ -565,6 +566,7 @@ void tcp_v4_send_check(struct sock *sk, struct sk_buff *skb)
- }
- EXPORT_SYMBOL(tcp_v4_send_check);
-
-+static DEFINE_LOCAL_IRQ_LOCK(tcp_sk_lock);
- /*
- * This routine will send an RST to the other tcp.
- *
-@@ -692,6 +694,8 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb)
- offsetof(struct inet_timewait_sock, tw_bound_dev_if));
-
- arg.tos = ip_hdr(skb)->tos;
-+
-+ local_lock(tcp_sk_lock);
- local_bh_disable();
- ip_send_unicast_reply(*this_cpu_ptr(net->ipv4.tcp_sk),
- skb, &TCP_SKB_CB(skb)->header.h4.opt,
-@@ -701,6 +705,7 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb)
- __TCP_INC_STATS(net, TCP_MIB_OUTSEGS);
- __TCP_INC_STATS(net, TCP_MIB_OUTRSTS);
- local_bh_enable();
-+ local_unlock(tcp_sk_lock);
-
- #ifdef CONFIG_TCP_MD5SIG
- out:
-@@ -776,6 +781,7 @@ static void tcp_v4_send_ack(struct net *net,
- if (oif)
- arg.bound_dev_if = oif;
- arg.tos = tos;
-+ local_lock(tcp_sk_lock);
- local_bh_disable();
- ip_send_unicast_reply(*this_cpu_ptr(net->ipv4.tcp_sk),
- skb, &TCP_SKB_CB(skb)->header.h4.opt,
-@@ -784,6 +790,7 @@ static void tcp_v4_send_ack(struct net *net,
-
- __TCP_INC_STATS(net, TCP_MIB_OUTSEGS);
- local_bh_enable();
-+ local_unlock(tcp_sk_lock);
- }
-
- static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb)
-diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
-index 9dce3b1..525efa5 100644
---- a/net/mac80211/rx.c
-+++ b/net/mac80211/rx.c
-@@ -4064,7 +4064,7 @@ void ieee80211_rx_napi(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta,
- struct ieee80211_supported_band *sband;
- struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
-
-- WARN_ON_ONCE(softirq_count() == 0);
-+ WARN_ON_ONCE_NONRT(softirq_count() == 0);
-
- if (WARN_ON(status->band >= NUM_NL80211_BANDS))
- goto drop;
-diff --git a/net/netfilter/core.c b/net/netfilter/core.c
-index f39276d..10880c8 100644
---- a/net/netfilter/core.c
-+++ b/net/netfilter/core.c
-@@ -22,11 +22,17 @@
- #include <linux/proc_fs.h>
- #include <linux/mutex.h>
- #include <linux/slab.h>
-+#include <linux/locallock.h>
- #include <net/net_namespace.h>
- #include <net/sock.h>
-
- #include "nf_internals.h"
-
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+DEFINE_LOCAL_IRQ_LOCK(xt_write_lock);
-+EXPORT_PER_CPU_SYMBOL(xt_write_lock);
-+#endif
-+
- static DEFINE_MUTEX(afinfo_mutex);
-
- const struct nf_afinfo __rcu *nf_afinfo[NFPROTO_NUMPROTO] __read_mostly;
-diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
-index 33a4697..475cb74 100644
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -63,6 +63,7 @@
- #include <linux/if_packet.h>
- #include <linux/wireless.h>
- #include <linux/kernel.h>
-+#include <linux/delay.h>
- #include <linux/kmod.h>
- #include <linux/slab.h>
- #include <linux/vmalloc.h>
-@@ -695,7 +696,7 @@ static void prb_retire_rx_blk_timer_expired(unsigned long data)
- if (BLOCK_NUM_PKTS(pbd)) {
- while (atomic_read(&pkc->blk_fill_in_prog)) {
- /* Waiting for skb_copy_bits to finish... */
-- cpu_relax();
-+ cpu_chill();
- }
- }
-
-@@ -957,7 +958,7 @@ static void prb_retire_current_block(struct tpacket_kbdq_core *pkc,
- if (!(status & TP_STATUS_BLK_TMO)) {
- while (atomic_read(&pkc->blk_fill_in_prog)) {
- /* Waiting for skb_copy_bits to finish... */
-- cpu_relax();
-+ cpu_chill();
- }
- }
- prb_close_block(pkc, pbd, po, status);
-diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c
-index 977f698..f3e7a36 100644
---- a/net/rds/ib_rdma.c
-+++ b/net/rds/ib_rdma.c
-@@ -34,6 +34,7 @@
- #include <linux/slab.h>
- #include <linux/rculist.h>
- #include <linux/llist.h>
-+#include <linux/delay.h>
-
- #include "rds_single_path.h"
- #include "ib_mr.h"
-@@ -210,7 +211,7 @@ static inline void wait_clean_list_grace(void)
- for_each_online_cpu(cpu) {
- flag = &per_cpu(clean_list_grace, cpu);
- while (test_bit(CLEAN_LIST_BUSY_BIT, flag))
-- cpu_relax();
-+ cpu_chill();
- }
- }
-
-diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
-index 12ebde8..99f3ce5 100644
---- a/net/sched/sch_api.c
-+++ b/net/sched/sch_api.c
-@@ -975,7 +975,7 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue,
- rcu_assign_pointer(sch->stab, stab);
- }
- if (tca[TCA_RATE]) {
-- seqcount_t *running;
-+ net_seqlock_t *running;
-
- err = -EOPNOTSUPP;
- if (sch->flags & TCQ_F_MQROOT)
-diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
-index 657c133..cbab8d4 100644
---- a/net/sched/sch_generic.c
-+++ b/net/sched/sch_generic.c
-@@ -426,7 +426,11 @@ struct Qdisc noop_qdisc = {
- .list = LIST_HEAD_INIT(noop_qdisc.list),
- .q.lock = __SPIN_LOCK_UNLOCKED(noop_qdisc.q.lock),
- .dev_queue = &noop_netdev_queue,
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ .running = __SEQLOCK_UNLOCKED(noop_qdisc.running),
-+#else
- .running = SEQCNT_ZERO(noop_qdisc.running),
-+#endif
- .busylock = __SPIN_LOCK_UNLOCKED(noop_qdisc.busylock),
- };
- EXPORT_SYMBOL(noop_qdisc);
-@@ -620,9 +624,17 @@ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
- lockdep_set_class(&sch->busylock,
- dev->qdisc_tx_busylock ?: &qdisc_tx_busylock);
-
-+#ifdef CONFIG_PREEMPT_RT_BASE
-+ seqlock_init(&sch->running);
-+ lockdep_set_class(&sch->running.seqcount,
-+ dev->qdisc_running_key ?: &qdisc_running_key);
-+ lockdep_set_class(&sch->running.lock,
-+ dev->qdisc_running_key ?: &qdisc_running_key);
-+#else
- seqcount_init(&sch->running);
- lockdep_set_class(&sch->running,
- dev->qdisc_running_key ?: &qdisc_running_key);
-+#endif
-
- sch->ops = ops;
- sch->enqueue = ops->enqueue;
-@@ -917,7 +929,7 @@ void dev_deactivate_many(struct list_head *head)
- /* Wait for outstanding qdisc_run calls. */
- list_for_each_entry(dev, head, close_list)
- while (some_qdisc_is_busy(dev))
-- yield();
-+ msleep(1);
- }
-
- void dev_deactivate(struct net_device *dev)
-diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
-index c3f6523..2dd8449 100644
---- a/net/sunrpc/svc_xprt.c
-+++ b/net/sunrpc/svc_xprt.c
-@@ -396,7 +396,7 @@ void svc_xprt_do_enqueue(struct svc_xprt *xprt)
- goto out;
- }
-
-- cpu = get_cpu();
-+ cpu = get_cpu_light();
- pool = svc_pool_for_cpu(xprt->xpt_server, cpu);
-
- atomic_long_inc(&pool->sp_stats.packets);
-@@ -432,7 +432,7 @@ redo_search:
-
- atomic_long_inc(&pool->sp_stats.threads_woken);
- wake_up_process(rqstp->rq_task);
-- put_cpu();
-+ put_cpu_light();
- goto out;
- }
- rcu_read_unlock();
-@@ -453,7 +453,7 @@ redo_search:
- goto redo_search;
- }
- rqstp = NULL;
-- put_cpu();
-+ put_cpu_light();
- out:
- trace_svc_xprt_do_enqueue(xprt, rqstp);
- }
-diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
-index 6fdc97e..523e042 100755
---- a/scripts/mkcompile_h
-+++ b/scripts/mkcompile_h
-@@ -4,7 +4,8 @@ TARGET=$1
- ARCH=$2
- SMP=$3
- PREEMPT=$4
--CC=$5
-+RT=$5
-+CC=$6
-
- vecho() { [ "${quiet}" = "silent_" ] || echo "$@" ; }
-
-@@ -57,6 +58,7 @@ UTS_VERSION="#$VERSION"
- CONFIG_FLAGS=""
- if [ -n "$SMP" ] ; then CONFIG_FLAGS="SMP"; fi
- if [ -n "$PREEMPT" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS PREEMPT"; fi
-+if [ -n "$RT" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS RT"; fi
- UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS $TIMESTAMP"
-
- # Truncate to maximum length
-diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
-index c61fd50..1583de4 100644
---- a/sound/core/pcm_native.c
-+++ b/sound/core/pcm_native.c
-@@ -135,7 +135,7 @@ EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock);
- void snd_pcm_stream_lock_irq(struct snd_pcm_substream *substream)
- {
- if (!substream->pcm->nonatomic)
-- local_irq_disable();
-+ local_irq_disable_nort();
- snd_pcm_stream_lock(substream);
- }
- EXPORT_SYMBOL_GPL(snd_pcm_stream_lock_irq);
-@@ -150,7 +150,7 @@ void snd_pcm_stream_unlock_irq(struct snd_pcm_substream *substream)
- {
- snd_pcm_stream_unlock(substream);
- if (!substream->pcm->nonatomic)
-- local_irq_enable();
-+ local_irq_enable_nort();
- }
- EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock_irq);
-
-@@ -158,7 +158,7 @@ unsigned long _snd_pcm_stream_lock_irqsave(struct snd_pcm_substream *substream)
- {
- unsigned long flags = 0;
- if (!substream->pcm->nonatomic)
-- local_irq_save(flags);
-+ local_irq_save_nort(flags);
- snd_pcm_stream_lock(substream);
- return flags;
- }
-@@ -176,7 +176,7 @@ void snd_pcm_stream_unlock_irqrestore(struct snd_pcm_substream *substream,
- {
- snd_pcm_stream_unlock(substream);
- if (!substream->pcm->nonatomic)
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- }
- EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock_irqrestore);
-
---
-2.9.3
-
diff --git a/patches/soc/imx/0002-imx6-wl1835-base-boards.patch b/patches/soc/imx/0002-imx6-wl1835-base-boards.patch
index cee9308ed30c75a5723fd1b8556a720e89d98513..c7b40b574cc763d92084f4a75d78518d23e7b3af 100644
--- a/patches/soc/imx/0002-imx6-wl1835-base-boards.patch
+++ b/patches/soc/imx/0002-imx6-wl1835-base-boards.patch
@@ -1,6 +1,6 @@
-From 5c53169825f35a2cf9ba61c4f4b2f5346420a364 Mon Sep 17 00:00:00 2001
+From 4ab33b13a56bde732e16712176ae3afb23129334 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Wed, 18 May 2016 15:56:50 -0500
+Date: Sat, 8 Oct 2016 11:12:05 -0500
Subject: [PATCH 2/5] imx6: wl1835 base boards
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
@@ -17,26 +17,26 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
create mode 100644 arch/arm/boot/dts/imx6sl-evk-wl1835.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 9e20754..09c1e63 100644
+index 7cb670a..efe3b09 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
-@@ -340,6 +340,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
+@@ -355,6 +355,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6dl-sabreauto.dtb \
imx6dl-sabrelite.dtb \
imx6dl-sabresd.dtb \
+ imx6dl-sabresd-wl1835.dtb \
+ imx6dl-ts4900.dtb \
imx6dl-tx6dl-comtft.dtb \
imx6dl-tx6s-8034.dtb \
- imx6dl-tx6s-8035.dtb \
-@@ -382,6 +383,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
+@@ -399,6 +400,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6q-sabreauto.dtb \
imx6q-sabrelite.dtb \
imx6q-sabresd.dtb \
+ imx6q-sabresd-wl1835.dtb \
imx6q-sbc6x.dtb \
imx6q-tbs2910.dtb \
- imx6q-tx6q-1010.dtb \
-@@ -400,6 +402,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
+ imx6q-ts4900.dtb \
+@@ -418,6 +420,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6qp-sabresd.dtb
dtb-$(CONFIG_SOC_IMX6SL) += \
imx6sl-evk.dtb \
diff --git a/patches/soc/imx/0005-mcimx6ul-bb-and-ism43362-b81-evb.patch b/patches/soc/imx/0005-mcimx6ul-bb-and-ism43362-b81-evb.patch
index 6c085ed4fff7f2e22977b731a758513366878a8a..4f08ce090a4227c7429ec348a565db5f7d77db9d 100644
--- a/patches/soc/imx/0005-mcimx6ul-bb-and-ism43362-b81-evb.patch
+++ b/patches/soc/imx/0005-mcimx6ul-bb-and-ism43362-b81-evb.patch
@@ -1,33 +1,33 @@
-From 6c8e65ffa1aaf28b78ee91a8680637ee135ac754 Mon Sep 17 00:00:00 2001
+From 6c0ddb7ab02d761d8a91b307aa4ab1d7ec345e81 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Wed, 18 May 2016 16:00:19 -0500
+Date: Sat, 8 Oct 2016 11:19:36 -0500
Subject: [PATCH 5/5] mcimx6ul-bb and ism43362-b81-evb
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
arch/arm/boot/dts/Makefile | 1 +
- .../boot/dts/imx6ul-14x14-evk-ism43362-b81-evb.dts | 455 +++++++++++++++++++++
- 2 files changed, 456 insertions(+)
+ .../boot/dts/imx6ul-14x14-evk-ism43362-b81-evb.dts | 516 +++++++++++++++++++++
+ 2 files changed, 517 insertions(+)
create mode 100644 arch/arm/boot/dts/imx6ul-14x14-evk-ism43362-b81-evb.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 09c1e63..00a357c 100644
+index 7cb670a..15e0807 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
-@@ -412,6 +412,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
+@@ -427,6 +427,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
imx6sx-sdb.dtb
dtb-$(CONFIG_SOC_IMX6UL) += \
imx6ul-14x14-evk.dtb \
+ imx6ul-14x14-evk-ism43362-b81-evb.dtb \
+ imx6ul-geam-kit.dtb \
imx6ul-pico-hobbit.dtb \
imx6ul-tx6ul-0010.dtb \
- imx6ul-tx6ul-0011.dtb \
diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk-ism43362-b81-evb.dts b/arch/arm/boot/dts/imx6ul-14x14-evk-ism43362-b81-evb.dts
new file mode 100644
-index 0000000..ffcbc73
+index 0000000..9ba86b8
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ul-14x14-evk-ism43362-b81-evb.dts
-@@ -0,0 +1,455 @@
+@@ -0,0 +1,516 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
@@ -52,6 +52,14 @@ index 0000000..ffcbc73
+ reg = <0x80000000 0x20000000>;
+ };
+
++ backlight {
++ compatible = "pwm-backlight";
++ pwms = <&pwm1 0 5000000>;
++ brightness-levels = <0 4 8 16 32 64 128 255>;
++ default-brightness-level = <6>;
++ status = "okay";
++ };
++
+ regulators {
+ compatible = "simple-bus";
+ #address-cells = <1>;
@@ -165,6 +173,46 @@ index 0000000..ffcbc73
+ };
+};
+
++
++&lcdif {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_lcdif_dat
++ &pinctrl_lcdif_ctrl>;
++ display = <&display0>;
++ status = "okay";
++
++ display0: display {
++ bits-per-pixel = <16>;
++ bus-width = <24>;
++
++ display-timings {
++ native-mode = <&timing0>;
++
++ timing0: timing0 {
++ clock-frequency = <9200000>;
++ hactive = <480>;
++ vactive = <272>;
++ hfront-porch = <8>;
++ hback-porch = <4>;
++ hsync-len = <41>;
++ vback-porch = <2>;
++ vfront-porch = <4>;
++ vsync-len = <10>;
++ hsync-active = <0>;
++ vsync-active = <0>;
++ de-active = <1>;
++ pixelclk-active = <0>;
++ };
++ };
++ };
++};
++
++&pwm1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_pwm1>;
++ status = "okay";
++};
++
+&qspi {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_qspi>;
@@ -186,6 +234,7 @@ index 0000000..ffcbc73
+ <&clks IMX6UL_CLK_SAI2>;
+ assigned-clock-parents = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
+ assigned-clock-rates = <0>, <12288000>;
++ fsl,sai-mclk-direction-output;
+ status = "okay";
+};
+
@@ -211,7 +260,7 @@ index 0000000..ffcbc73
+&uart2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart2>;
-+ fsl,uart-has-rtscts;
++ uart-has-rtscts;
+ status = "okay";
+};
+
@@ -252,6 +301,12 @@ index 0000000..ffcbc73
+ status = "okay";
+};
+
++&wdog1 {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_wdog>;
++ fsl,ext-reset-output;
++};
++
+&iomuxc {
+ pinctrl-names = "default";
+
@@ -482,6 +537,12 @@ index 0000000..ffcbc73
+ MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059
+ >;
+ };
++
++ pinctrl_wdog: wdoggrp {
++ fsl,pins = <
++ MX6UL_PAD_LCD_RESET__WDOG1_WDOG_ANY 0x30b0
++ >;
++ };
+};
--
2.9.3
diff --git a/patches/soc/imx/udoo/0002-power-add-power-sequence-library.patch b/patches/soc/imx/udoo/0002-power-add-power-sequence-library.patch
index 8dc82b61800ead3beedf053ef80176a803fed86a..81a23978b563f9e2d1ec0ad0e497b2810aa27a18 100644
--- a/patches/soc/imx/udoo/0002-power-add-power-sequence-library.patch
+++ b/patches/soc/imx/udoo/0002-power-add-power-sequence-library.patch
@@ -42,10 +42,10 @@ Tested-by: Matthias Kaehlcke <mka@chromium.org>
create mode 100644 include/linux/power/pwrseq.h
diff --git a/MAINTAINERS b/MAINTAINERS
-index e99626e..757ca24 100644
+index 768db96..9bd94b3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -9361,6 +9361,15 @@ F: include/linux/pm_*
+@@ -9496,6 +9496,15 @@ F: include/linux/pm_*
F: include/linux/powercap.h
F: drivers/powercap/
@@ -60,29 +60,25 @@ index e99626e..757ca24 100644
+
POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
M: Sebastian Reichel <sre@kernel.org>
- M: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+ L: linux-pm@vger.kernel.org
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
-index acd4a15..8e2f764 100644
+index 63454b5..b8beb87 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
-@@ -513,5 +513,6 @@ config AXP20X_POWER
-
- endif # POWER_SUPPLY
-
+@@ -1,3 +1,4 @@
+ source "drivers/power/avs/Kconfig"
+source "drivers/power/pwrseq/Kconfig"
source "drivers/power/reset/Kconfig"
- source "drivers/power/avs/Kconfig"
+ source "drivers/power/supply/Kconfig"
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
-index e46b75d..1b2a146 100644
+index ff35c71..7404732 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
-@@ -72,5 +72,6 @@ obj-$(CONFIG_CHARGER_SMB347) += smb347-charger.o
- obj-$(CONFIG_CHARGER_TPS65090) += tps65090-charger.o
- obj-$(CONFIG_CHARGER_TPS65217) += tps65217_charger.o
+@@ -1,3 +1,4 @@
+ obj-$(CONFIG_POWER_AVS) += avs/
obj-$(CONFIG_POWER_RESET) += reset/
+obj-$(CONFIG_POWER_SEQUENCE) += pwrseq/
- obj-$(CONFIG_AXP288_FUEL_GAUGE) += axp288_fuel_gauge.o
- obj-$(CONFIG_AXP288_CHARGER) += axp288_charger.o
+ obj-$(CONFIG_POWER_SUPPLY) += supply/
diff --git a/drivers/power/pwrseq/Kconfig b/drivers/power/pwrseq/Kconfig
new file mode 100644
index 0000000..dff5e35
diff --git a/patches/soc/sunxi/0004-ARM-dts-sun8i-h3-add-sun8i-emac-ethernet-driver.patch b/patches/soc/sunxi/0004-ARM-dts-sun8i-h3-add-sun8i-emac-ethernet-driver.patch
index 5ca4c9396b17e0cb16370c89ca3a0fd14e0e9c33..f4ac1916287fb59172dfd09d648faddc44170909 100644
--- a/patches/soc/sunxi/0004-ARM-dts-sun8i-h3-add-sun8i-emac-ethernet-driver.patch
+++ b/patches/soc/sunxi/0004-ARM-dts-sun8i-h3-add-sun8i-emac-ethernet-driver.patch
@@ -15,11 +15,11 @@ Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com>
1 file changed, 14 insertions(+)
diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi
-index fdf9fdb..aa56cec 100644
+index 75a8654..e367ac6 100644
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
-@@ -441,6 +441,20 @@
- status = "disabled";
+@@ -530,6 +530,20 @@
+ #size-cells = <0>;
};
+ emac: ethernet@1c30000 {
@@ -40,5 +40,5 @@ index fdf9fdb..aa56cec 100644
compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";
reg = <0x01c81000 0x1000>,
--
-2.8.1
+2.9.3
diff --git a/patches/soc/ti/bbbw/0001-ARM-dts-add-am335x-boneblack-wireless.dtb.patch b/patches/soc/ti/bbbw/0001-ARM-dts-add-am335x-boneblack-wireless.dtb.patch
index 0d633c97a1d7c7bb910dd0bd9d5e80a565239fbe..1e7ff0c9810edb60661b504b8b062e4e638c4e4f 100644
--- a/patches/soc/ti/bbbw/0001-ARM-dts-add-am335x-boneblack-wireless.dtb.patch
+++ b/patches/soc/ti/bbbw/0001-ARM-dts-add-am335x-boneblack-wireless.dtb.patch
@@ -1,22 +1,24 @@
-From b3678f712def56fc1776975e7dedacffa9570bec Mon Sep 17 00:00:00 2001
+From 239c3589bae220d75f5466bf98e72bf0284307fd Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Wed, 5 Oct 2016 14:29:18 -0500
+Date: Wed, 12 Oct 2016 09:16:12 -0500
Subject: [PATCH] ARM: dts: add am335x-boneblack-wireless.dtb
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
- arch/arm/boot/dts/am335x-boneblack-wireless.dts | 127 ++++++++++++++++++++++++
- arch/arm/boot/dts/am335x-boneblack-wl1835.dtsi | 117 ++++++++++++++++++++++
- 2 files changed, 244 insertions(+)
+ .../dts/am335x-boneblack-wireless-emmc-overlay.dts | 45 ++++++
+ arch/arm/boot/dts/am335x-boneblack-wireless.dts | 165 +++++++++++++++++++++
+ arch/arm/boot/dts/am335x-boneblack-wl1835.dtsi | 117 +++++++++++++++
+ 3 files changed, 327 insertions(+)
+ create mode 100644 arch/arm/boot/dts/am335x-boneblack-wireless-emmc-overlay.dts
create mode 100644 arch/arm/boot/dts/am335x-boneblack-wireless.dts
create mode 100644 arch/arm/boot/dts/am335x-boneblack-wl1835.dtsi
-diff --git a/arch/arm/boot/dts/am335x-boneblack-wireless.dts b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
+diff --git a/arch/arm/boot/dts/am335x-boneblack-wireless-emmc-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-wireless-emmc-overlay.dts
new file mode 100644
-index 0000000..42bbbde
+index 0000000..78f63bf
--- /dev/null
-+++ b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
-@@ -0,0 +1,127 @@
++++ b/arch/arm/boot/dts/am335x-boneblack-wireless-emmc-overlay.dts
+@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
@@ -28,9 +30,9 @@ index 0000000..42bbbde
+
+#include "am33xx.dtsi"
+#include "am335x-bone-common.dtsi"
-+/* #include "am33xx-overlay-edma-fix.dtsi" */
-+/* #include "am335x-bone-jtag.dtsi" */
++/* #include <dt-bindings/display/tda998x.h> */
+#include "am335x-boneblack-wl1835.dtsi"
++/* #include "am335x-bone-jtag.dtsi" */
+
+/ {
+ model = "TI AM335x BeagleBone Black Wireless";
@@ -62,11 +64,56 @@ index 0000000..42bbbde
+&mmc3 {
+ status = "okay";
+};
+diff --git a/arch/arm/boot/dts/am335x-boneblack-wireless.dts b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
+new file mode 100644
+index 0000000..9b39648
+--- /dev/null
++++ b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
+@@ -0,0 +1,165 @@
++/*
++ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
++ *
++ * 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.
++ */
++/dts-v1/;
+
-+&cpu0_opp_table {
-+ opp50@300000000 {
-+ status = "disabled";
-+ };
++#include "am33xx.dtsi"
++#include "am335x-bone-common.dtsi"
++#include <dt-bindings/display/tda998x.h>
++#include "am335x-boneblack-wl1835.dtsi"
++/* #include "am335x-bone-jtag.dtsi" */
++
++/ {
++ model = "TI AM335x BeagleBone Black Wireless";
++ compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
++};
++
++&ldo3_reg {
++ regulator-min-microvolt = <1800000>;
++ regulator-max-microvolt = <1800000>;
++ regulator-always-on;
++};
++
++&mmc1 {
++ vmmc-supply = <&vmmcsd_fixed>;
++};
++
++&mmc2 {
++ vmmc-supply = <&vmmcsd_fixed>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&emmc_pins>;
++ bus-width = <8>;
++ status = "okay";
++};
++
++&mac {
++ status = "disabled";
++};
++
++&mmc3 {
++ status = "okay";
+};
+
+&am33xx_pinmux {
@@ -114,14 +161,6 @@ index 0000000..42bbbde
+
+&lcdc {
+ status = "okay";
-+
-+ /* If you want to get 24 bit RGB and 16 BGR mode instead of
-+ * current 16 bit RGB and 24 BGR modes, set the propety
-+ * below to "crossed" and uncomment the video-ports -property
-+ * in tda19988 node.
-+ */
-+ blue-and-red-wiring = "straight";
-+
+ port {
+ lcdc_0: endpoint@0 {
+ remote-endpoint = <&hdmi_0>;
@@ -130,20 +169,72 @@ index 0000000..42bbbde
+};
+
+&i2c0 {
-+ tda19988 {
++ tda19988: tda19988 {
+ compatible = "nxp,tda998x";
+ reg = <0x70>;
++
+ pinctrl-names = "default", "off";
+ pinctrl-0 = <&nxp_hdmi_bonelt_pins>;
+ pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>;
+
-+ port {
-+ hdmi_0: endpoint@0 {
-+ remote-endpoint = <&lcdc_0>;
++ #sound-dai-cells = <0>;
++ audio-ports = < TDA998x_I2S 0x03>;
++
++ ports {
++ port@0 {
++ hdmi_0: endpoint@0 {
++ remote-endpoint = <&lcdc_0>;
++ };
+ };
+ };
+ };
+};
++
++&mcasp0 {
++ #sound-dai-cells = <0>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&mcasp0_pins>;
++ status = "okay";
++ op-mode = <0>; /* MCASP_IIS_MODE */
++ tdm-slots = <2>;
++ serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */
++ 0 0 1 0
++ >;
++ tx-num-evt = <32>;
++ rx-num-evt = <32>;
++};
++
++/ {
++ clk_mcasp0_fixed: clk_mcasp0_fixed {
++ #clock-cells = <0>;
++ compatible = "fixed-clock";
++ clock-frequency = <24576000>;
++ };
++
++ clk_mcasp0: clk_mcasp0 {
++ #clock-cells = <0>;
++ compatible = "gpio-gate-clock";
++ clocks = <&clk_mcasp0_fixed>;
++ enable-gpios = <&gpio1 27 0>; /* BeagleBone Black Clk enable on GPIO1_27 */
++ };
++
++ sound {
++ compatible = "simple-audio-card";
++ simple-audio-card,name = "TI BeagleBone Black";
++ simple-audio-card,format = "i2s";
++ simple-audio-card,bitclock-master = <&dailink0_master>;
++ simple-audio-card,frame-master = <&dailink0_master>;
++
++ dailink0_master: simple-audio-card,cpu {
++ sound-dai = <&mcasp0>;
++ clocks = <&clk_mcasp0>;
++ };
++
++ simple-audio-card,codec {
++ sound-dai = <&tda19988>;
++ };
++ };
++};
diff --git a/arch/arm/boot/dts/am335x-boneblack-wl1835.dtsi b/arch/arm/boot/dts/am335x-boneblack-wl1835.dtsi
new file mode 100644
index 0000000..82da276
diff --git a/patches/soc/ti/bbg/0001-NFM-ARM-dts-am335x-bonegreen.dts-disable-usart-for-o.patch b/patches/soc/ti/bbg/0001-NFM-ARM-dts-am335x-bonegreen.dts-disable-usart-for-o.patch
index 851e9810ef47c28b380c006afe72cc6868cb82d6..a7175cfb98867cb24cb724f7bb6790d5a822dc56 100644
--- a/patches/soc/ti/bbg/0001-NFM-ARM-dts-am335x-bonegreen.dts-disable-usart-for-o.patch
+++ b/patches/soc/ti/bbg/0001-NFM-ARM-dts-am335x-bonegreen.dts-disable-usart-for-o.patch
@@ -1,19 +1,19 @@
-From 9fb8e27f3c19680261b874d82d816896180c384a Mon Sep 17 00:00:00 2001
+From 31d4bf9bf51bb20c7a0dee2bd56dbb9430e904a9 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Wed, 5 Oct 2016 14:17:03 -0500
+Date: Wed, 12 Oct 2016 09:00:44 -0500
Subject: [PATCH] NFM: ARM: dts: am335x-bonegreen.dts disable usart, for
overlays
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
- arch/arm/boot/dts/am335x-bonegreen.dts | 19 -------------------
- 1 file changed, 19 deletions(-)
+ arch/arm/boot/dts/am335x-bonegreen.dts | 15 ---------------
+ 1 file changed, 15 deletions(-)
diff --git a/arch/arm/boot/dts/am335x-bonegreen.dts b/arch/arm/boot/dts/am335x-bonegreen.dts
-index c93b7a4..fe86cca 100644
+index bc075be..647d4bf 100644
--- a/arch/arm/boot/dts/am335x-bonegreen.dts
+++ b/arch/arm/boot/dts/am335x-bonegreen.dts
-@@ -34,22 +34,3 @@
+@@ -33,18 +33,3 @@
bus-width = <8>;
status = "okay";
};
@@ -32,10 +32,6 @@ index c93b7a4..fe86cca 100644
- pinctrl-0 = <&uart2_pins>;
- status = "okay";
-};
--
--&rtc {
-- system-power-controller;
--};
--
2.9.3
diff --git a/patches/soc/ti/bbgw/0001-ARM-dts-add-am335x-bonegreen-wireless.dtb.patch b/patches/soc/ti/bbgw/0001-ARM-dts-add-am335x-bonegreen-wireless.dtb.patch
index f331437c3f30d5205a49435961d04ad7349c7b6e..e7f706d72db9e84f02885e9c3d29785204628554 100644
--- a/patches/soc/ti/bbgw/0001-ARM-dts-add-am335x-bonegreen-wireless.dtb.patch
+++ b/patches/soc/ti/bbgw/0001-ARM-dts-add-am335x-bonegreen-wireless.dtb.patch
@@ -1,15 +1,15 @@
-From e16b16254ce3f74706c390c7b676a0fb844c53cc Mon Sep 17 00:00:00 2001
+From c61056d84ac57d4c7805490492fe35683cf46bce Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Wed, 5 Oct 2016 14:24:32 -0500
+Date: Wed, 12 Oct 2016 09:11:37 -0500
Subject: [PATCH] ARM: dts: add am335x-bonegreen-wireless.dtb
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
- .../dts/am335x-bonegreen-wireless-led-hack.dts | 47 +++++++
- arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 47 +++++++
+ .../dts/am335x-bonegreen-wireless-led-hack.dts | 48 +++++++
+ arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 48 +++++++
.../boot/dts/am335x-bonegreen-wl1835-led-hack.dtsi | 151 +++++++++++++++++++++
arch/arm/boot/dts/am335x-bonegreen-wl1835.dtsi | 145 ++++++++++++++++++++
- 4 files changed, 390 insertions(+)
+ 4 files changed, 392 insertions(+)
create mode 100644 arch/arm/boot/dts/am335x-bonegreen-wireless-led-hack.dts
create mode 100644 arch/arm/boot/dts/am335x-bonegreen-wireless.dts
create mode 100644 arch/arm/boot/dts/am335x-bonegreen-wl1835-led-hack.dtsi
@@ -17,10 +17,10 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
diff --git a/arch/arm/boot/dts/am335x-bonegreen-wireless-led-hack.dts b/arch/arm/boot/dts/am335x-bonegreen-wireless-led-hack.dts
new file mode 100644
-index 0000000..c2a62e2
+index 0000000..09ae795
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bonegreen-wireless-led-hack.dts
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
@@ -33,6 +33,7 @@ index 0000000..c2a62e2
+#include "am33xx.dtsi"
+#include "am335x-bone-common.dtsi"
+#include "am335x-bonegreen-wl1835-led-hack.dtsi"
++/* #include "am335x-bone-jtag.dtsi" */
+
+/ {
+ model = "TI AM335x BeagleBone Green Wireless";
@@ -70,10 +71,10 @@ index 0000000..c2a62e2
+};
diff --git a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
new file mode 100644
-index 0000000..b4fabfe
+index 0000000..f37f39e
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
-@@ -0,0 +1,47 @@
+@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
@@ -86,6 +87,7 @@ index 0000000..b4fabfe
+#include "am33xx.dtsi"
+#include "am335x-bone-common.dtsi"
+#include "am335x-bonegreen-wl1835.dtsi"
++/* #include "am335x-bone-jtag.dtsi" */
+
+/ {
+ model = "TI AM335x BeagleBone Green Wireless";
diff --git a/patches/soc/ti/blue/0001-ARM-dts-add-am335x-boneblue.dtb.patch b/patches/soc/ti/blue/0001-ARM-dts-add-am335x-boneblue.dtb.patch
index 82f3afd8d50854e96df32c2ebdfe4edc2a1b6688..5025327e1429eb8d4a89cc5c54bbeece4a7e6561 100644
--- a/patches/soc/ti/blue/0001-ARM-dts-add-am335x-boneblue.dtb.patch
+++ b/patches/soc/ti/blue/0001-ARM-dts-add-am335x-boneblue.dtb.patch
@@ -1,14 +1,14 @@
-From 9dc39210ce19a50c2efb31c0a5d9bf205705deb8 Mon Sep 17 00:00:00 2001
+From 6e9c6c9c6e0de9d752771133a912e6dd31594136 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Wed, 5 Oct 2016 14:34:33 -0500
+Date: Wed, 12 Oct 2016 09:18:49 -0500
Subject: [PATCH] ARM: dts: add am335x-boneblue.dtb
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
.../dts/am335x-bone-common-universal-pins.dtsi | 941 +++++++++++++++++++++
arch/arm/boot/dts/am335x-boneblue-wl1835.dtsi | 117 +++
- arch/arm/boot/dts/am335x-boneblue.dts | 324 +++++++
- 3 files changed, 1382 insertions(+)
+ arch/arm/boot/dts/am335x-boneblue.dts | 316 +++++++
+ 3 files changed, 1374 insertions(+)
create mode 100644 arch/arm/boot/dts/am335x-bone-common-universal-pins.dtsi
create mode 100644 arch/arm/boot/dts/am335x-boneblue-wl1835.dtsi
create mode 100644 arch/arm/boot/dts/am335x-boneblue.dts
@@ -1085,10 +1085,10 @@ index 0000000..6687bf7
+};
diff --git a/arch/arm/boot/dts/am335x-boneblue.dts b/arch/arm/boot/dts/am335x-boneblue.dts
new file mode 100644
-index 0000000..36b5676
+index 0000000..10db73a
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-boneblue.dts
-@@ -0,0 +1,324 @@
+@@ -0,0 +1,316 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
@@ -1101,9 +1101,8 @@ index 0000000..36b5676
+#include "am33xx.dtsi"
+#include "am335x-bone-common-no-capemgr.dtsi"
+#include "am335x-bone-common-universal-pins.dtsi"
-+/* #include "am33xx-overlay-edma-fix.dtsi" */
-+/* #include "am335x-bone-jtag.dtsi" */
+#include "am335x-boneblue-wl1835.dtsi"
++/* #include "am335x-bone-jtag.dtsi" */
+
+#define BLUE_IO(x, y) AM33XX_IOPAD((x)*4+0x800, (y))
+
@@ -1134,13 +1133,6 @@ index 0000000..36b5676
+ status = "disabled";
+};
+
-+&cpu0_opp_table {
-+ opp50@300000000 {
-+ status = "disabled";
-+ };
-+};
-+
-+
+/****************************************
+* Pin Muxing
+****************************************/
diff --git a/patches/soc/ti/bone_common/0001-ARM-dts-am335x-bone-common-update-leds-to-match-3.8..patch b/patches/soc/ti/bone_common/0001-ARM-dts-am335x-bone-common-update-leds-to-match-3.8..patch
index 6488cd27a8d56012eb1fd6faadf60d891824d76a..4f74bc689ba0f364efec0a0e4b5c83df84a97899 100644
--- a/patches/soc/ti/bone_common/0001-ARM-dts-am335x-bone-common-update-leds-to-match-3.8..patch
+++ b/patches/soc/ti/bone_common/0001-ARM-dts-am335x-bone-common-update-leds-to-match-3.8..patch
@@ -1,7 +1,7 @@
-From bc6301b68e3b60bcf4b7608d6902de4758a7cfd2 Mon Sep 17 00:00:00 2001
+From 963ad734f4af8e9db5df939b57f5ff8b7873423c Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Wed, 27 Aug 2014 13:56:37 -0500
-Subject: [PATCH 1/4] ARM: dts: am335x-bone-common: update leds to match 3.8.13
+Subject: [PATCH 1/5] ARM: dts: am335x-bone-common: update leds to match 3.8.13
kernel
https://groups.google.com/d/msg/beagleboard/634Xm1m3XA8/B028x1FzAyAJ
@@ -13,13 +13,13 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index 5ff40c8..3e6d52e 100644
+index c42bfd3..24841d1 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -29,14 +29,14 @@
compatible = "gpio-leds";
- led@2 {
+ led2 {
- label = "beaglebone:green:heartbeat";
+ label = "beaglebone:green:usr0";
gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
@@ -27,7 +27,7 @@ index 5ff40c8..3e6d52e 100644
default-state = "off";
};
- led@3 {
+ led3 {
- label = "beaglebone:green:mmc0";
+ label = "beaglebone:green:usr1";
gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
diff --git a/patches/soc/ti/bone_common/0002-ARM-dts-am335x-bone-common-add-collision-and-carrier.patch b/patches/soc/ti/bone_common/0002-ARM-dts-am335x-bone-common-add-collision-and-carrier.patch
index 5b1f6b31bbb5adedf88372e7df905fd9806703f1..4026dfe1891d633eb91294121363301a225fdfe0 100644
--- a/patches/soc/ti/bone_common/0002-ARM-dts-am335x-bone-common-add-collision-and-carrier.patch
+++ b/patches/soc/ti/bone_common/0002-ARM-dts-am335x-bone-common-add-collision-and-carrier.patch
@@ -1,7 +1,7 @@
-From 97098415160ed377ef149411a1e8d515ecb402a5 Mon Sep 17 00:00:00 2001
+From 33ba322456e316b4aa5ff8179163c690dd5afd22 Mon Sep 17 00:00:00 2001
From: Schuyler Patton <spatton@ti.com>
Date: Mon, 5 Jan 2015 15:44:14 -0600
-Subject: [PATCH 2/4] ARM: dts: am335x-bone-common: add collision and carrier
+Subject: [PATCH 2/5] ARM: dts: am335x-bone-common: add collision and carrier
sense pinmux
Added pin mux definitions for collision and carrier sense errors coming
@@ -21,7 +21,7 @@ Signed-off-by: Felipe Balbi <balbi@ti.com>
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index 3e6d52e..e3d28b6 100644
+index f84f07c..e96af3f 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -108,6 +108,8 @@
diff --git a/patches/soc/ti/bone_common/0003-ARM-dts-am335x-bone-common-disable-running-JTAG.patch b/patches/soc/ti/bone_common/0003-ARM-dts-am335x-bone-common-disable-running-JTAG.patch
index b63ea5872eb38e911190faff7858519dbc91eeba..ada4f6f321460e5b5c64ad64e209b8babebfdedd 100644
--- a/patches/soc/ti/bone_common/0003-ARM-dts-am335x-bone-common-disable-running-JTAG.patch
+++ b/patches/soc/ti/bone_common/0003-ARM-dts-am335x-bone-common-disable-running-JTAG.patch
@@ -1,7 +1,7 @@
-From 153835364d8666b33afdd85ce7522797882e1126 Mon Sep 17 00:00:00 2001
+From 0061362369bd437b21b8e50a5c417dd87b18c8bd Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 12 Feb 2016 14:52:52 -0600
-Subject: [PATCH 3/4] ARM: dts: am335x-bone-common: disable running JTAG
+Date: Wed, 12 Oct 2016 08:41:04 -0500
+Subject: [PATCH 3/5] ARM: dts: am335x-bone-common: disable running JTAG
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
@@ -14,7 +14,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
create mode 100644 arch/arm/boot/dts/am335x-bone-jtag.dtsi
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
-index e3d28b6..56e2120 100644
+index 74663ba..cdda427 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -66,9 +66,6 @@
@@ -79,13 +79,13 @@ index 6b849372..3688fff 100644
/ {
model = "TI AM335x BeagleBone";
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
-index ca72167..42cffd0 100644
+index 6bbb1fe..ff771c6 100644
--- a/arch/arm/boot/dts/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
-@@ -9,6 +9,7 @@
-
+@@ -10,6 +10,7 @@
#include "am33xx.dtsi"
#include "am335x-bone-common.dtsi"
+ #include <dt-bindings/display/tda998x.h>
+/* #include "am335x-bone-jtag.dtsi" */
/ {
diff --git a/patches/soc/ti/bone_common/0004-ARM-dts-am335x-bone-common-overlays.patch b/patches/soc/ti/bone_common/0004-ARM-dts-am335x-bone-common-overlays.patch
index 3f93a391259e1c94e4f2e7672176fbbe45352da2..6afe67b8af5ee3ec59cc9ade591934c301bee90a 100644
--- a/patches/soc/ti/bone_common/0004-ARM-dts-am335x-bone-common-overlays.patch
+++ b/patches/soc/ti/bone_common/0004-ARM-dts-am335x-bone-common-overlays.patch
@@ -1,37 +1,32 @@
-From 498da3ea9a5466f476e9534e12eec592c6fdd726 Mon Sep 17 00:00:00 2001
+From 660ad6711c89bb2ff0a856ffc59e6029566d15e7 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Wed, 5 Oct 2016 13:37:10 -0500
-Subject: [PATCH 4/4] ARM: dts: am335x-bone-common: overlays
+Date: Wed, 12 Oct 2016 08:48:39 -0500
+Subject: [PATCH 4/5] ARM: dts: am335x-bone-common: overlays
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
- .../boot/dts/am335x-bone-common-no-capemgr.dtsi | 348 +++++++++++++++++++++
- arch/arm/boot/dts/am335x-bone.dts | 1 +
- .../arm/boot/dts/am335x-boneblack-emmc-overlay.dts | 39 +++
- .../arm/boot/dts/am335x-boneblack-hdmi-overlay.dts | 99 ++++++
- .../boot/dts/am335x-boneblack-nhdmi-overlay.dts | 99 ++++++
- arch/arm/boot/dts/am335x-boneblack-overlay.dts | 41 +++
- arch/arm/boot/dts/am335x-boneblack.dts | 1 +
- arch/arm/boot/dts/am335x-bonegreen-overlay.dts | 41 +++
- arch/arm/boot/dts/am335x-bonegreen.dts | 1 +
- arch/arm/boot/dts/am33xx-overlay-edma-fix.dtsi | 25 ++
+ .../boot/dts/am335x-bone-common-no-capemgr.dtsi | 345 +++++++++++++++++++++
+ .../arm/boot/dts/am335x-boneblack-emmc-overlay.dts | 40 +++
+ .../arm/boot/dts/am335x-boneblack-hdmi-overlay.dts | 162 ++++++++++
+ .../boot/dts/am335x-boneblack-nhdmi-overlay.dts | 103 ++++++
+ arch/arm/boot/dts/am335x-boneblack-overlay.dts | 42 +++
+ arch/arm/boot/dts/am335x-bonegreen-overlay.dts | 40 +++
include/dt-bindings/board/am335x-bbw-bbb-base.h | 103 ++++++
- 11 files changed, 798 insertions(+)
+ 7 files changed, 835 insertions(+)
create mode 100644 arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
create mode 100644 arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts
create mode 100644 arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts
create mode 100644 arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts
create mode 100644 arch/arm/boot/dts/am335x-boneblack-overlay.dts
create mode 100644 arch/arm/boot/dts/am335x-bonegreen-overlay.dts
- create mode 100644 arch/arm/boot/dts/am33xx-overlay-edma-fix.dtsi
create mode 100644 include/dt-bindings/board/am335x-bbw-bbb-base.h
diff --git a/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi b/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
new file mode 100644
-index 0000000..cfb17df
+index 0000000..d35961b
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
-@@ -0,0 +1,348 @@
+@@ -0,0 +1,345 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
@@ -47,7 +42,7 @@ index 0000000..cfb17df
+ };
+ };
+
-+ memory {
++ memory@80000000 {
+ device_type = "memory";
+ reg = <0x80000000 0x10000000>; /* 256 MB */
+ };
@@ -62,28 +57,28 @@ index 0000000..cfb17df
+
+ compatible = "gpio-leds";
+
-+ led@2 {
++ led2 {
+ label = "beaglebone:green:usr0";
+ gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "heartbeat";
+ default-state = "off";
+ };
+
-+ led@3 {
++ led3 {
+ label = "beaglebone:green:usr1";
+ gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "mmc0";
+ default-state = "off";
+ };
+
-+ led@4 {
++ led4 {
+ label = "beaglebone:green:usr2";
+ gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "cpu0";
+ default-state = "off";
+ };
+
-+ led@5 {
++ led5 {
+ label = "beaglebone:green:usr3";
+ gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "mmc1";
@@ -91,7 +86,7 @@ index 0000000..cfb17df
+ };
+ };
+
-+ vmmcsd_fixed: fixedregulator@0 {
++ vmmcsd_fixed: fixedregulator0 {
+ compatible = "regulator-fixed";
+ regulator-name = "vmmcsd_fixed";
+ regulator-min-microvolt = <3300000>;
@@ -292,9 +287,6 @@ index 0000000..cfb17df
+ */
+ ti,pmic-shutdown-controller;
+
-+ interrupt-parent = <&intc>;
-+ interrupts = <7>; /* NNMI */
-+
+ regulators {
+ dcdc1_reg: regulator@0 {
+ regulator-name = "vdds_dpr";
@@ -380,24 +372,12 @@ index 0000000..cfb17df
+&rtc {
+ system-power-controller;
+};
-diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
-index 3688fff..8b6256d 100644
---- a/arch/arm/boot/dts/am335x-bone.dts
-+++ b/arch/arm/boot/dts/am335x-bone.dts
-@@ -9,6 +9,7 @@
-
- #include "am33xx.dtsi"
- #include "am335x-bone-common.dtsi"
-+/* #include "am33xx-overlay-edma-fix.dtsi" */
- /* #include "am335x-bone-jtag.dtsi" */
-
- / {
diff --git a/arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts
new file mode 100644
-index 0000000..5946a7e
+index 0000000..49c6ad7
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
@@ -409,7 +389,8 @@ index 0000000..5946a7e
+
+#include "am33xx.dtsi"
+#include "am335x-bone-common.dtsi"
-+#include "am33xx-overlay-edma-fix.dtsi"
++/* #include <dt-bindings/display/tda998x.h> */
++/* #include "am335x-bone-jtag.dtsi" */
+
+/ {
+ model = "TI AM335x BeagleBone Black";
@@ -439,10 +420,10 @@ index 0000000..5946a7e
+};
diff --git a/arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts
new file mode 100644
-index 0000000..9b0a7ba
+index 0000000..0eb974f
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts
-@@ -0,0 +1,99 @@
+@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
@@ -454,7 +435,8 @@ index 0000000..9b0a7ba
+
+#include "am33xx.dtsi"
+#include "am335x-bone-common.dtsi"
-+#include "am33xx-overlay-edma-fix.dtsi"
++#include <dt-bindings/display/tda998x.h>
++/* #include "am335x-bone-jtag.dtsi" */
+
+/ {
+ model = "TI AM335x BeagleBone Black";
@@ -512,6 +494,16 @@ index 0000000..9b0a7ba
+ AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr0 */
+ >;
+ };
++
++ mcasp0_pins: mcasp0_pins {
++ pinctrl-single,pins = <
++ AM33XX_IOPAD(0x9ac, PIN_INPUT_PULLUP | MUX_MODE0) /* mcasp0_ahcklx.mcasp0_ahclkx */
++ AM33XX_IOPAD(0x99c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2*/
++ AM33XX_IOPAD(0x994, PIN_OUTPUT_PULLUP | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */
++ AM33XX_IOPAD(0x990, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_aclkx.mcasp0_aclkx */
++ AM33XX_IOPAD(0x86c, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a11.GPIO1_27 */
++ >;
++ };
+};
+
+&lcdc {
@@ -524,16 +516,22 @@ index 0000000..9b0a7ba
+};
+
+&i2c0 {
-+ tda19988 {
++ tda19988: tda19988 {
+ compatible = "nxp,tda998x";
+ reg = <0x70>;
++
+ pinctrl-names = "default", "off";
+ pinctrl-0 = <&nxp_hdmi_bonelt_pins>;
+ pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>;
+
-+ port {
-+ hdmi_0: endpoint@0 {
-+ remote-endpoint = <&lcdc_0>;
++ #sound-dai-cells = <0>;
++ audio-ports = < TDA998x_I2S 0x03>;
++
++ ports {
++ port@0 {
++ hdmi_0: endpoint@0 {
++ remote-endpoint = <&lcdc_0>;
++ };
+ };
+ };
+ };
@@ -542,12 +540,58 @@ index 0000000..9b0a7ba
+&rtc {
+ system-power-controller;
+};
++
++&mcasp0 {
++ #sound-dai-cells = <0>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&mcasp0_pins>;
++ status = "okay";
++ op-mode = <0>; /* MCASP_IIS_MODE */
++ tdm-slots = <2>;
++ serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */
++ 0 0 1 0
++ >;
++ tx-num-evt = <32>;
++ rx-num-evt = <32>;
++};
++
++/ {
++ clk_mcasp0_fixed: clk_mcasp0_fixed {
++ #clock-cells = <0>;
++ compatible = "fixed-clock";
++ clock-frequency = <24576000>;
++ };
++
++ clk_mcasp0: clk_mcasp0 {
++ #clock-cells = <0>;
++ compatible = "gpio-gate-clock";
++ clocks = <&clk_mcasp0_fixed>;
++ enable-gpios = <&gpio1 27 0>; /* BeagleBone Black Clk enable on GPIO1_27 */
++ };
++
++ sound {
++ compatible = "simple-audio-card";
++ simple-audio-card,name = "TI BeagleBone Black";
++ simple-audio-card,format = "i2s";
++ simple-audio-card,bitclock-master = <&dailink0_master>;
++ simple-audio-card,frame-master = <&dailink0_master>;
++
++ dailink0_master: simple-audio-card,cpu {
++ sound-dai = <&mcasp0>;
++ clocks = <&clk_mcasp0>;
++ };
++
++ simple-audio-card,codec {
++ sound-dai = <&tda19988>;
++ };
++ };
++};
diff --git a/arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts
new file mode 100644
-index 0000000..9b0a7ba
+index 0000000..1f21174
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts
-@@ -0,0 +1,99 @@
+@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
@@ -559,7 +603,8 @@ index 0000000..9b0a7ba
+
+#include "am33xx.dtsi"
+#include "am335x-bone-common.dtsi"
-+#include "am33xx-overlay-edma-fix.dtsi"
++#include <dt-bindings/display/tda998x.h>
++/* #include "am335x-bone-jtag.dtsi" */
+
+/ {
+ model = "TI AM335x BeagleBone Black";
@@ -629,16 +674,19 @@ index 0000000..9b0a7ba
+};
+
+&i2c0 {
-+ tda19988 {
++ tda19988: tda19988 {
+ compatible = "nxp,tda998x";
+ reg = <0x70>;
++
+ pinctrl-names = "default", "off";
+ pinctrl-0 = <&nxp_hdmi_bonelt_pins>;
+ pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>;
+
-+ port {
-+ hdmi_0: endpoint@0 {
-+ remote-endpoint = <&lcdc_0>;
++ ports {
++ port@0 {
++ hdmi_0: endpoint@0 {
++ remote-endpoint = <&lcdc_0>;
++ };
+ };
+ };
+ };
@@ -649,10 +697,10 @@ index 0000000..9b0a7ba
+};
diff --git a/arch/arm/boot/dts/am335x-boneblack-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-overlay.dts
new file mode 100644
-index 0000000..880629c
+index 0000000..f4f0c10
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-boneblack-overlay.dts
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
@@ -664,7 +712,8 @@ index 0000000..880629c
+
+#include "am33xx.dtsi"
+#include "am335x-bone-common.dtsi"
-+#include "am33xx-overlay-edma-fix.dtsi"
++/* #include <dt-bindings/display/tda998x.h> */
++/* #include "am335x-bone-jtag.dtsi" */
+
+/ {
+ model = "TI AM335x BeagleBone Black";
@@ -694,24 +743,12 @@ index 0000000..880629c
+&rtc {
+ system-power-controller;
+};
-diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
-index 42cffd0..3def91b 100644
---- a/arch/arm/boot/dts/am335x-boneblack.dts
-+++ b/arch/arm/boot/dts/am335x-boneblack.dts
-@@ -9,6 +9,7 @@
-
- #include "am33xx.dtsi"
- #include "am335x-bone-common.dtsi"
-+/* #include "am33xx-overlay-edma-fix.dtsi" */
- /* #include "am335x-bone-jtag.dtsi" */
-
- / {
diff --git a/arch/arm/boot/dts/am335x-bonegreen-overlay.dts b/arch/arm/boot/dts/am335x-bonegreen-overlay.dts
new file mode 100644
-index 0000000..b87a606
+index 0000000..964c8f7
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bonegreen-overlay.dts
-@@ -0,0 +1,41 @@
+@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
@@ -723,7 +760,6 @@ index 0000000..b87a606
+
+#include "am33xx.dtsi"
+#include "am335x-bone-common.dtsi"
-+#include "am33xx-overlay-edma-fix.dtsi"
+
+/ {
+ model = "TI AM335x BeagleBone Green";
@@ -753,49 +789,6 @@ index 0000000..b87a606
+&rtc {
+ system-power-controller;
+};
-diff --git a/arch/arm/boot/dts/am335x-bonegreen.dts b/arch/arm/boot/dts/am335x-bonegreen.dts
-index 9144810..c93b7a4 100644
---- a/arch/arm/boot/dts/am335x-bonegreen.dts
-+++ b/arch/arm/boot/dts/am335x-bonegreen.dts
-@@ -9,6 +9,7 @@
-
- #include "am33xx.dtsi"
- #include "am335x-bone-common.dtsi"
-+/* #include "am33xx-overlay-edma-fix.dtsi" */
- /* #include "am335x-bone-jtag.dtsi" */
-
- / {
-diff --git a/arch/arm/boot/dts/am33xx-overlay-edma-fix.dtsi b/arch/arm/boot/dts/am33xx-overlay-edma-fix.dtsi
-new file mode 100644
-index 0000000..88c8d04
---- /dev/null
-+++ b/arch/arm/boot/dts/am33xx-overlay-edma-fix.dtsi
-@@ -0,0 +1,25 @@
-+/*
-+ * Device Tree Source for AM33xx Overlay EDMA fixes
-+ *
-+ * Copyright (C) 2015 Robert Nelson <robertcnelson@gmail.com>
-+ *
-+ * 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.
-+ */
-+
-+&spi0 {
-+ status = "okay";
-+};
-+
-+&spi1 {
-+ status = "okay";
-+};
-+
-+&mcasp0 {
-+ status = "okay";
-+};
-+
-+&mcasp1 {
-+ status = "okay";
-+};
diff --git a/include/dt-bindings/board/am335x-bbw-bbb-base.h b/include/dt-bindings/board/am335x-bbw-bbb-base.h
new file mode 100644
index 0000000..35f6d57
diff --git a/patches/soc/ti/bone_common/0005-HACK-am335x-bone-common.dtsi-pwr-button.patch b/patches/soc/ti/bone_common/0005-HACK-am335x-bone-common.dtsi-pwr-button.patch
new file mode 100644
index 0000000000000000000000000000000000000000..4a5c2b8543788d04d258be90e92628b7cec61a89
--- /dev/null
+++ b/patches/soc/ti/bone_common/0005-HACK-am335x-bone-common.dtsi-pwr-button.patch
@@ -0,0 +1,112 @@
+From 7dc378ccfba7f5be9d28b55b9ac8cdec8e4a2e08 Mon Sep 17 00:00:00 2001
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Fri, 7 Oct 2016 14:56:10 -0500
+Subject: [PATCH 5/5] HACK: am335x-bone-common.dtsi: pwr button
+
+new
+/dev/input/event0: tps65217_pwr_but
+Select the device event number [0-0]: 0
+Input driver version is 1.0.1
+Input device ID: bus 0x18 vendor 0x0 product 0x0 version 0x0
+Input device name: "tps65217_pwr_but"
+Supported events:
+ Event type 0 (EV_SYN)
+ Event type 1 (EV_KEY)
+ Event code 116 (KEY_POWER)
+Properties:
+Testing ... (interrupt to exit)
+
+old
+/dev/input/event0: tps65217_pwr_but
+Select the device event number [0-0]: 0
+Input driver version is 1.0.1
+Input device ID: bus 0x0 vendor 0x0 product 0x0 version 0x0
+Input device name: "tps65217_pwr_but"
+Supported events:
+ Event type 0 (EV_SYN)
+ Event type 1 (EV_KEY)
+ Event code 116 (KEY_POWER)
+Properties:
+Testing ... (interrupt to exit)
+Event: time 1475870099.434203, type 1 (EV_KEY), code 116 (KEY_POWER), value 1
+Event: time 1475870099.434203, -------------- EV_SYN ------------
+Event: time 1475870099.660284, type 1 (EV_KEY), code 116 (KEY_POWER), value 0
+Event: time 1475870099.660284, -------------- EV_SYN ------------
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi | 9 +++++++++
+ arch/arm/boot/dts/am335x-bone-common.dtsi | 9 +++++++++
+ drivers/input/misc/tps65218-pwrbutton.c | 2 +-
+ 3 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi b/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
+index d35961b..9dd36a6 100644
+--- a/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
++++ b/arch/arm/boot/dts/am335x-bone-common-no-capemgr.dtsi
+@@ -239,6 +239,11 @@
+ /include/ "tps65217.dtsi"
+
+ &tps {
++ //interrupts = <GIC_SPI 7 IRQ_TYPE_NONE>; /* NMIn */
++ interrupts = <0 7 0>; /* NMIn */
++ interrupt-controller;
++ #interrupt-cells = <2>;
++
+ /*
+ * Configure pmic to enter OFF-state instead of SLEEP-state ("RTC-only
+ * mode") at poweroff. Most BeagleBone versions do not support RTC-only
+@@ -302,6 +307,10 @@
+ regulator-always-on;
+ };
+ };
++
++ tps65217-pwrbutton {
++ compatible = "ti,tps65217-pwrbutton";
++ };
+ };
+
+ &cpsw_emac0 {
+diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
+index cdda427..635a6e3 100644
+--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
++++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
+@@ -288,6 +288,11 @@
+ /include/ "tps65217.dtsi"
+
+ &tps {
++ //interrupts = <GIC_SPI 7 IRQ_TYPE_NONE>; /* NMIn */
++ interrupts = <0 7 0>; /* NMIn */
++ interrupt-controller;
++ #interrupt-cells = <2>;
++
+ /*
+ * Configure pmic to enter OFF-state instead of SLEEP-state ("RTC-only
+ * mode") at poweroff. Most BeagleBone versions do not support RTC-only
+@@ -351,6 +356,10 @@
+ regulator-always-on;
+ };
+ };
++
++ tps65217-pwrbutton {
++ compatible = "ti,tps65217-pwrbutton";
++ };
+ };
+
+ &cpsw_emac0 {
+diff --git a/drivers/input/misc/tps65218-pwrbutton.c b/drivers/input/misc/tps65218-pwrbutton.c
+index 3273217..6f26022 100644
+--- a/drivers/input/misc/tps65218-pwrbutton.c
++++ b/drivers/input/misc/tps65218-pwrbutton.c
+@@ -36,7 +36,7 @@ struct tps6521x_data {
+ static const struct tps6521x_data tps65217_data = {
+ .reg_status = TPS65217_REG_STATUS,
+ .pb_mask = TPS65217_STATUS_PB,
+- .name = "tps65217_pwrbutton",
++ .name = "tps65217_pwr_but",
+ };
+
+ static const struct tps6521x_data tps65218_data = {
+--
+2.9.3
+
diff --git a/patches/soc/ti/bone_common/0006-ARM-dts-am335x-bone-common-rtc-defined-in-common.patch b/patches/soc/ti/bone_common/0006-ARM-dts-am335x-bone-common-rtc-defined-in-common.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8ff81cc8225cf55651cb901d2fd08b5f08637f56
--- /dev/null
+++ b/patches/soc/ti/bone_common/0006-ARM-dts-am335x-bone-common-rtc-defined-in-common.patch
@@ -0,0 +1,96 @@
+From a57e2fb59d927c4c1a2dfe232494a0b51b518325 Mon Sep 17 00:00:00 2001
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Wed, 12 Oct 2016 08:58:09 -0500
+Subject: [PATCH 6/6] ARM: dts: am335x-bone-common rtc defined in common
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts | 4 ----
+ arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts | 4 ----
+ arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts | 4 ----
+ arch/arm/boot/dts/am335x-boneblack.dts | 4 ----
+ arch/arm/boot/dts/am335x-bonegreen-overlay.dts | 4 ----
+ arch/arm/boot/dts/am335x-bonegreen.dts | 4 ----
+ 6 files changed, 24 deletions(-)
+
+diff --git a/arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts
+index 49c6ad7..f3eeb88 100644
+--- a/arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts
++++ b/arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts
+@@ -34,7 +34,3 @@
+ bus-width = <8>;
+ status = "okay";
+ };
+-
+-&rtc {
+- system-power-controller;
+-};
+diff --git a/arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts
+index 0eb974f..4875da9 100644
+--- a/arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts
++++ b/arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts
+@@ -111,10 +111,6 @@
+ };
+ };
+
+-&rtc {
+- system-power-controller;
+-};
+-
+ &mcasp0 {
+ #sound-dai-cells = <0>;
+ pinctrl-names = "default";
+diff --git a/arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts b/arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts
+index 1f21174..361b78b 100644
+--- a/arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts
++++ b/arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts
+@@ -97,7 +97,3 @@
+ };
+ };
+ };
+-
+-&rtc {
+- system-power-controller;
+-};
+diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
+index ff771c6..cc06b08 100644
+--- a/arch/arm/boot/dts/am335x-boneblack.dts
++++ b/arch/arm/boot/dts/am335x-boneblack.dts
+@@ -109,10 +109,6 @@
+ };
+ };
+
+-&rtc {
+- system-power-controller;
+-};
+-
+ &mcasp0 {
+ #sound-dai-cells = <0>;
+ pinctrl-names = "default";
+diff --git a/arch/arm/boot/dts/am335x-bonegreen-overlay.dts b/arch/arm/boot/dts/am335x-bonegreen-overlay.dts
+index 964c8f7..a703fcd 100644
+--- a/arch/arm/boot/dts/am335x-bonegreen-overlay.dts
++++ b/arch/arm/boot/dts/am335x-bonegreen-overlay.dts
+@@ -34,7 +34,3 @@
+ line-name = "EMMC ResetN";
+ };
+ };
+-
+-&rtc {
+- system-power-controller;
+-};
+diff --git a/arch/arm/boot/dts/am335x-bonegreen.dts b/arch/arm/boot/dts/am335x-bonegreen.dts
+index 9144810..bc075be 100644
+--- a/arch/arm/boot/dts/am335x-bonegreen.dts
++++ b/arch/arm/boot/dts/am335x-bonegreen.dts
+@@ -48,7 +48,3 @@
+ pinctrl-0 = <&uart2_pins>;
+ status = "okay";
+ };
+-
+-&rtc {
+- system-power-controller;
+-};
+--
+2.9.3
+
diff --git a/patches/soc/ti/sancloud/0001-add-am335x-sancloud-bbe.patch b/patches/soc/ti/sancloud/0001-add-am335x-sancloud-bbe.patch
index 72e27f572f32f04caa2ec01c1dc3ceba34bfe0f6..fd2b1f4ddfb0371f49b918ae26630014413b0393 100644
--- a/patches/soc/ti/sancloud/0001-add-am335x-sancloud-bbe.patch
+++ b/patches/soc/ti/sancloud/0001-add-am335x-sancloud-bbe.patch
@@ -1,20 +1,20 @@
-From 6f7ec4a9c3b6596a63d8f5a4522a696ecd62a68f Mon Sep 17 00:00:00 2001
+From 99c1e95127169d7521c1ed986ca442c71d080046 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
-Date: Wed, 9 Mar 2016 15:00:11 -0600
+Date: Wed, 12 Oct 2016 11:30:31 -0500
Subject: [PATCH 1/2] add: am335x-sancloud-bbe
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
- arch/arm/boot/dts/am335x-sancloud-bbe.dts | 201 ++++++++++++++++++++++++++++++
- 1 file changed, 201 insertions(+)
+ arch/arm/boot/dts/am335x-sancloud-bbe.dts | 264 ++++++++++++++++++++++++++++++
+ 1 file changed, 264 insertions(+)
create mode 100644 arch/arm/boot/dts/am335x-sancloud-bbe.dts
diff --git a/arch/arm/boot/dts/am335x-sancloud-bbe.dts b/arch/arm/boot/dts/am335x-sancloud-bbe.dts
new file mode 100644
-index 0000000..2447d14
+index 0000000..a36b04b
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-sancloud-bbe.dts
-@@ -0,0 +1,201 @@
+@@ -0,0 +1,264 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
@@ -26,7 +26,9 @@ index 0000000..2447d14
+
+#include "am33xx.dtsi"
+#include "am335x-bone-common.dtsi"
-+#include "am33xx-overlay-edma-fix.dtsi"
++#include <dt-bindings/interrupt-controller/irq.h>
++#include <dt-bindings/display/tda998x.h>
++/* #include "am335x-bone-jtag.dtsi" */
+
+/ {
+ model = "SanCloud BeagleBone Enhanced";
@@ -58,32 +60,32 @@ index 0000000..2447d14
+
+ nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {
+ pinctrl-single,pins = <
-+ 0x1b0 0x03 /* xdma_event_intr0, OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */
-+ 0xa0 0x08 /* lcd_data0.lcd_data0, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */
-+ 0xa4 0x08 /* lcd_data1.lcd_data1, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */
-+ 0xa8 0x08 /* lcd_data2.lcd_data2, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */
-+ 0xac 0x08 /* lcd_data3.lcd_data3, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */
-+ 0xb0 0x08 /* lcd_data4.lcd_data4, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */
-+ 0xb4 0x08 /* lcd_data5.lcd_data5, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */
-+ 0xb8 0x08 /* lcd_data6.lcd_data6, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */
-+ 0xbc 0x08 /* lcd_data7.lcd_data7, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */
-+ 0xc0 0x08 /* lcd_data8.lcd_data8, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */
-+ 0xc4 0x08 /* lcd_data9.lcd_data9, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */
-+ 0xc8 0x08 /* lcd_data10.lcd_data10, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */
-+ 0xcc 0x08 /* lcd_data11.lcd_data11, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */
-+ 0xd0 0x08 /* lcd_data12.lcd_data12, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */
-+ 0xd4 0x08 /* lcd_data13.lcd_data13, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */
-+ 0xd8 0x08 /* lcd_data14.lcd_data14, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */
-+ 0xdc 0x08 /* lcd_data15.lcd_data15, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */
-+ 0xe0 0x00 /* lcd_vsync.lcd_vsync, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */
-+ 0xe4 0x00 /* lcd_hsync.lcd_hsync, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */
-+ 0xe8 0x00 /* lcd_pclk.lcd_pclk, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */
-+ 0xec 0x00 /* lcd_ac_bias_en.lcd_ac_bias_en, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */
++ AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr0 */
++ AM33XX_IOPAD(0x8a0, PIN_OUTPUT | MUX_MODE0) /* lcd_data0.lcd_data0 */
++ AM33XX_IOPAD(0x8a4, PIN_OUTPUT | MUX_MODE0) /* lcd_data1.lcd_data1 */
++ AM33XX_IOPAD(0x8a8, PIN_OUTPUT | MUX_MODE0) /* lcd_data2.lcd_data2 */
++ AM33XX_IOPAD(0x8ac, PIN_OUTPUT | MUX_MODE0) /* lcd_data3.lcd_data3 */
++ AM33XX_IOPAD(0x8b0, PIN_OUTPUT | MUX_MODE0) /* lcd_data4.lcd_data4 */
++ AM33XX_IOPAD(0x8b4, PIN_OUTPUT | MUX_MODE0) /* lcd_data5.lcd_data5 */
++ AM33XX_IOPAD(0x8b8, PIN_OUTPUT | MUX_MODE0) /* lcd_data6.lcd_data6 */
++ AM33XX_IOPAD(0x8bc, PIN_OUTPUT | MUX_MODE0) /* lcd_data7.lcd_data7 */
++ AM33XX_IOPAD(0x8c0, PIN_OUTPUT | MUX_MODE0) /* lcd_data8.lcd_data8 */
++ AM33XX_IOPAD(0x8c4, PIN_OUTPUT | MUX_MODE0) /* lcd_data9.lcd_data9 */
++ AM33XX_IOPAD(0x8c8, PIN_OUTPUT | MUX_MODE0) /* lcd_data10.lcd_data10 */
++ AM33XX_IOPAD(0x8cc, PIN_OUTPUT | MUX_MODE0) /* lcd_data11.lcd_data11 */
++ AM33XX_IOPAD(0x8d0, PIN_OUTPUT | MUX_MODE0) /* lcd_data12.lcd_data12 */
++ AM33XX_IOPAD(0x8d4, PIN_OUTPUT | MUX_MODE0) /* lcd_data13.lcd_data13 */
++ AM33XX_IOPAD(0x8d8, PIN_OUTPUT | MUX_MODE0) /* lcd_data14.lcd_data14 */
++ AM33XX_IOPAD(0x8dc, PIN_OUTPUT | MUX_MODE0) /* lcd_data15.lcd_data15 */
++ AM33XX_IOPAD(0x8e0, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_vsync.lcd_vsync */
++ AM33XX_IOPAD(0x8e4, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_hsync.lcd_hsync */
++ AM33XX_IOPAD(0x8e8, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_pclk.lcd_pclk */
++ AM33XX_IOPAD(0x8ec, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* lcd_ac_bias_en.lcd_ac_bias_en */
+ >;
+ };
+ nxp_hdmi_bonelt_off_pins: nxp_hdmi_bonelt_off_pins {
+ pinctrl-single,pins = <
-+ 0x1b0 0x03 /* xdma_event_intr0, OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */
++ AM33XX_IOPAD(0x9b0, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr0 */
+ >;
+ };
+
@@ -156,6 +158,16 @@ index 0000000..2447d14
+ 0x6C (PIN_INPUT | MUX_MODE7) /* conf_gpmc_a11.gpio1_27 */
+ >;
+ };
++
++ mcasp0_pins: mcasp0_pins {
++ pinctrl-single,pins = <
++ AM33XX_IOPAD(0x9ac, PIN_INPUT_PULLUP | MUX_MODE0) /* mcasp0_ahcklx.mcasp0_ahclkx */
++ AM33XX_IOPAD(0x99c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2*/
++ AM33XX_IOPAD(0x994, PIN_OUTPUT_PULLUP | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */
++ AM33XX_IOPAD(0x990, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_aclkx.mcasp0_aclkx */
++ AM33XX_IOPAD(0x86c, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a11.GPIO1_27 */
++ >;
++ };
+};
+
+&lcdc {
@@ -185,36 +197,87 @@ index 0000000..2447d14
+};
+
+&i2c0 {
-+ tda19988 {
++ tda19988: tda19988 {
+ compatible = "nxp,tda998x";
+ reg = <0x70>;
++
+ pinctrl-names = "default", "off";
+ pinctrl-0 = <&nxp_hdmi_bonelt_pins>;
+ pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>;
+
-+ port {
-+ hdmi_0: endpoint@0 {
-+ remote-endpoint = <&lcdc_0>;
++ #sound-dai-cells = <0>;
++ audio-ports = < TDA998x_I2S 0x03>;
++
++ ports {
++ port@0 {
++ hdmi_0: endpoint@0 {
++ remote-endpoint = <&lcdc_0>;
++ };
+ };
+ };
+ };
+
+ lps331ap: lps331ap@5C {
+ compatible = "st,lps331ap";
++ st,drdy-int-pin = <1>;
+ reg = <0x5C>;
-+ interrupts = <0>, <1>;
++ interrupt-parent = <&gpio1>;
++ interrupts = <27 IRQ_TYPE_EDGE_RISING>;
+ };
+
+ mpu6050: mpu6050@68 {
-+ compatible = "inv,mpu6050";
++ compatible = "invensense,mpu6050";
+ reg = <0x68>;
-+ orientation = <0xff 0 0 0 1 0 0 0 0xff>;
-+ interrupts = <2 1>;
++ interrupt-parent = <&gpio0>;
++ interrupts = <2 IRQ_TYPE_EDGE_RISING>;
++ //orientation = <0xff 0 0 0 1 0 0 0 0xff>;
+ };
+};
+
-+&rtc {
-+ system-power-controller;
++&mcasp0 {
++ #sound-dai-cells = <0>;
++ pinctrl-names = "default";
++ pinctrl-0 = <&mcasp0_pins>;
++ status = "okay";
++ op-mode = <0>; /* MCASP_IIS_MODE */
++ tdm-slots = <2>;
++ serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */
++ 0 0 1 0
++ >;
++ tx-num-evt = <32>;
++ rx-num-evt = <32>;
++};
++
++/ {
++ clk_mcasp0_fixed: clk_mcasp0_fixed {
++ #clock-cells = <0>;
++ compatible = "fixed-clock";
++ clock-frequency = <24576000>;
++ };
++
++ clk_mcasp0: clk_mcasp0 {
++ #clock-cells = <0>;
++ compatible = "gpio-gate-clock";
++ clocks = <&clk_mcasp0_fixed>;
++ enable-gpios = <&gpio1 27 0>; /* BeagleBone Black Clk enable on GPIO1_27 */
++ };
++
++ sound {
++ compatible = "simple-audio-card";
++ simple-audio-card,name = "TI BeagleBone Black";
++ simple-audio-card,format = "i2s";
++ simple-audio-card,bitclock-master = <&dailink0_master>;
++ simple-audio-card,frame-master = <&dailink0_master>;
++
++ dailink0_master: simple-audio-card,cpu {
++ sound-dai = <&mcasp0>;
++ clocks = <&clk_mcasp0>;
++ };
++
++ simple-audio-card,codec {
++ sound-dai = <&tda19988>;
++ };
++ };
+};
--
2.9.3
diff --git a/patches/soc/ti/sancloud/0002-am335x-sancloud-bbe-update-lps331ap-mpu6050-irq-pins.patch b/patches/soc/ti/sancloud/0002-am335x-sancloud-bbe-update-lps331ap-mpu6050-irq-pins.patch
deleted file mode 100644
index 6713f95ceb8cabfa12248c77379d14c43804df47..0000000000000000000000000000000000000000
--- a/patches/soc/ti/sancloud/0002-am335x-sancloud-bbe-update-lps331ap-mpu6050-irq-pins.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f560d4ebf3cc990a857995ca796fea8f66d88889 Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Wed, 30 Mar 2016 12:59:04 -0500
-Subject: [PATCH 2/2] am335x-sancloud-bbe: update lps331ap/mpu6050 irq pins
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- arch/arm/boot/dts/am335x-sancloud-bbe.dts | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/boot/dts/am335x-sancloud-bbe.dts b/arch/arm/boot/dts/am335x-sancloud-bbe.dts
-index 2447d14..561f98a 100644
---- a/arch/arm/boot/dts/am335x-sancloud-bbe.dts
-+++ b/arch/arm/boot/dts/am335x-sancloud-bbe.dts
-@@ -10,6 +10,7 @@
- #include "am33xx.dtsi"
- #include "am335x-bone-common.dtsi"
- #include "am33xx-overlay-edma-fix.dtsi"
-+#include <dt-bindings/interrupt-controller/irq.h>
-
- / {
- model = "SanCloud BeagleBone Enhanced";
-@@ -184,15 +185,18 @@
-
- lps331ap: lps331ap@5C {
- compatible = "st,lps331ap";
-+ st,drdy-int-pin = <1>;
- reg = <0x5C>;
-- interrupts = <0>, <1>;
-+ interrupt-parent = <&gpio1>;
-+ interrupts = <27 IRQ_TYPE_EDGE_RISING>;
- };
-
- mpu6050: mpu6050@68 {
-- compatible = "inv,mpu6050";
-+ compatible = "invensense,mpu6050";
- reg = <0x68>;
-- orientation = <0xff 0 0 0 1 0 0 0 0xff>;
-- interrupts = <2 1>;
-+ interrupt-parent = <&gpio0>;
-+ interrupts = <2 IRQ_TYPE_EDGE_RISING>;
-+ //orientation = <0xff 0 0 0 1 0 0 0 0xff>;
- };
- };
-
---
-2.9.3
-
diff --git a/version.sh b/version.sh
index 43c1facd3315b4a686c5a91e5ff7d390c8f47dfd..fc4055ee369cf5ffc11842b94844057664a4d469 100644
--- a/version.sh
+++ b/version.sh
@@ -26,10 +26,10 @@ toolchain="gcc_linaro_gnueabihf_6"
#toolchain="gcc_linaro_aarch64_gnu_6"
#Kernel/Build
-KERNEL_REL=4.8
-KERNEL_TAG=${KERNEL_REL}.1
-BUILD=${build_prefix}1
-kernel_rt="-rt1"
+KERNEL_REL=4.9
+KERNEL_TAG=${KERNEL_REL}-rc1
+BUILD=${build_prefix}0
+kernel_rt=".X-rtY"
#v4.X-rcX + upto SHA
#prev_KERNEL_SHA=""