Merge tag 'char-misc-4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver fixes from Greg KH:
 "Here are a number of small driver fixes for 4.8-rc5.

  The largest thing here is deleting an obsolete driver,
  drivers/misc/bh1780gli.c, as the functionality of it was replaced by
  an iio driver a while ago.

  The other fixes are things that have been reported, or reverts of
  broken stuff (the binder change).  All of these changes have been in
  linux-next for a while with no reported issues"

* tag 'char-misc-4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  thunderbolt: Don't declare Falcon Ridge unsupported
  thunderbolt: Add support for INTEL_FALCON_RIDGE_2C controller.
  thunderbolt: Fix resume quirk for Falcon Ridge 4C.
  lkdtm: Mark lkdtm_rodata_do_nothing() notrace
  mei: me: disable driver on SPT SPS firmware
  Revert "android: binder: fix dangling pointer comparison"
  drivers/iio/light/Kconfig: SENSORS_BH1780 cleanup
  android: binder: fix dangling pointer comparison
  misc: delete bh1780 driver

10 files changed, 25 insertions, 279 deletions

diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig
index 12ceb11bc7c5..3574945183fe 100644
--- a/drivers/iio/light/Kconfig
+++ b/drivers/iio/light/Kconfig
@@ -76,7 +76,6 @@ config BH1750
 config BH1780
         tristate "ROHM BH1780 ambient light sensor"
         depends on I2C
-        depends on !SENSORS_BH1780
         help
          Say Y here to build support for the ROHM BH1780GLI ambient
          light sensor.
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index a216b4667742..d00252828966 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -345,16 +345,6 @@ config SENSORS_TSL2550
           This driver can also be built as a module.  If so, the module
           will be called tsl2550.
 
-config SENSORS_BH1780
-        tristate "ROHM BH1780GLI ambient light sensor"
-        depends on I2C && SYSFS
-        help
-          If you say yes here you get support for the ROHM BH1780GLI
-          ambient light sensor.
-
-          This driver can also be built as a module.  If so, the module
-          will be called bh1780gli.
-
 config SENSORS_BH1770
          tristate "BH1770GLC / SFH7770 combined ALS - Proximity sensor"
          depends on I2C
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 7410c6d9a34d..fb32516ddfe2 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -19,7 +19,6 @@ obj-$(CONFIG_TIFM_CORE)       	+= tifm_core.o
 obj-$(CONFIG_TIFM_7XX1)         += tifm_7xx1.o
 obj-$(CONFIG_PHANTOM)           += phantom.o
 obj-$(CONFIG_QCOM_COINCELL)     += qcom-coincell.o
-obj-$(CONFIG_SENSORS_BH1780)    += bh1780gli.o
 obj-$(CONFIG_SENSORS_BH1770)    += bh1770glc.o
 obj-$(CONFIG_SENSORS_APDS990X)  += apds990x.o
 obj-$(CONFIG_SGI_IOC4)          += ioc4.o
diff --git a/drivers/misc/bh1780gli.c b/drivers/misc/bh1780gli.c
deleted file mode 100644
index 7f90ce5a569a..000000000000
--- a/drivers/misc/bh1780gli.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * bh1780gli.c
- * ROHM Ambient Light Sensor Driver
- *
- * Copyright (C) 2010 Texas Instruments
- * Author: Hemanth V <hemanthv@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.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include <linux/i2c.h>
-#include <linux/slab.h>
-#include <linux/mutex.h>
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/module.h>
-#include <linux/of.h>
-
-#define BH1780_REG_CONTROL      0x80
-#define BH1780_REG_PARTID       0x8A
-#define BH1780_REG_MANFID       0x8B
-#define BH1780_REG_DLOW 0x8C
-#define BH1780_REG_DHIGH        0x8D
-
-#define BH1780_REVMASK          (0xf)
-#define BH1780_POWMASK          (0x3)
-#define BH1780_POFF             (0x0)
-#define BH1780_PON              (0x3)
-
-/* power on settling time in ms */
-#define BH1780_PON_DELAY        2
-
-struct bh1780_data {
-        struct i2c_client *client;
-        int power_state;
-        /* lock for sysfs operations */
-        struct mutex lock;
-};
-
-static int bh1780_write(struct bh1780_data *ddata, u8 reg, u8 val, char *msg)
-{
-        int ret = i2c_smbus_write_byte_data(ddata->client, reg, val);
-        if (ret < 0)
-                dev_err(&ddata->client->dev,
-                        "i2c_smbus_write_byte_data failed error %d Register (%s)\n",
-                        ret, msg);
-        return ret;
-}
-
-static int bh1780_read(struct bh1780_data *ddata, u8 reg, char *msg)
-{
-        int ret = i2c_smbus_read_byte_data(ddata->client, reg);
-        if (ret < 0)
-                dev_err(&ddata->client->dev,
-                        "i2c_smbus_read_byte_data failed error %d Register (%s)\n",
-                        ret, msg);
-        return ret;
-}
-
-static ssize_t bh1780_show_lux(struct device *dev,
-                                struct device_attribute *attr, char *buf)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-        struct bh1780_data *ddata = platform_get_drvdata(pdev);
-        int lsb, msb;
-
-        lsb = bh1780_read(ddata, BH1780_REG_DLOW, "DLOW");
-        if (lsb < 0)
-                return lsb;
-
-        msb = bh1780_read(ddata, BH1780_REG_DHIGH, "DHIGH");
-        if (msb < 0)
-                return msb;
-
-        return sprintf(buf, "%d\n", (msb << 8) | lsb);
-}
-
-static ssize_t bh1780_show_power_state(struct device *dev,
-                                        struct device_attribute *attr,
-                                        char *buf)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-        struct bh1780_data *ddata = platform_get_drvdata(pdev);
-        int state;
-
-        state = bh1780_read(ddata, BH1780_REG_CONTROL, "CONTROL");
-        if (state < 0)
-                return state;
-
-        return sprintf(buf, "%d\n", state & BH1780_POWMASK);
-}
-
-static ssize_t bh1780_store_power_state(struct device *dev,
-                                        struct device_attribute *attr,
-                                        const char *buf, size_t count)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-        struct bh1780_data *ddata = platform_get_drvdata(pdev);
-        unsigned long val;
-        int error;
-
-        error = kstrtoul(buf, 0, &val);
-        if (error)
-                return error;
-
-        if (val < BH1780_POFF || val > BH1780_PON)
-                return -EINVAL;
-
-        mutex_lock(&ddata->lock);
-
-        error = bh1780_write(ddata, BH1780_REG_CONTROL, val, "CONTROL");
-        if (error < 0) {
-                mutex_unlock(&ddata->lock);
-                return error;
-        }
-
-        msleep(BH1780_PON_DELAY);
-        ddata->power_state = val;
-        mutex_unlock(&ddata->lock);
-
-        return count;
-}
-
-static DEVICE_ATTR(lux, S_IRUGO, bh1780_show_lux, NULL);
-
-static DEVICE_ATTR(power_state, S_IWUSR | S_IRUGO,
-                bh1780_show_power_state, bh1780_store_power_state);
-
-static struct attribute *bh1780_attributes[] = {
-        &dev_attr_power_state.attr,
-        &dev_attr_lux.attr,
-        NULL
-};
-
-static const struct attribute_group bh1780_attr_group = {
-        .attrs = bh1780_attributes,
-};
-
-static int bh1780_probe(struct i2c_client *client,
-                                                const struct i2c_device_id *id)
-{
-        int ret;
-        struct bh1780_data *ddata;
-        struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
-
-        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE))
-                return -EIO;
-
-        ddata = devm_kzalloc(&client->dev, sizeof(struct bh1780_data),
-                             GFP_KERNEL);
-        if (ddata == NULL)
-                return -ENOMEM;
-
-        ddata->client = client;
-        i2c_set_clientdata(client, ddata);
-
-        ret = bh1780_read(ddata, BH1780_REG_PARTID, "PART ID");
-        if (ret < 0)
-                return ret;
-
-        dev_info(&client->dev, "Ambient Light Sensor, Rev : %d\n",
-                        (ret & BH1780_REVMASK));
-
-        mutex_init(&ddata->lock);
-
-        return sysfs_create_group(&client->dev.kobj, &bh1780_attr_group);
-}
-
-static int bh1780_remove(struct i2c_client *client)
-{
-        sysfs_remove_group(&client->dev.kobj, &bh1780_attr_group);
-
-        return 0;
-}
-
-#ifdef CONFIG_PM_SLEEP
-static int bh1780_suspend(struct device *dev)
-{
-        struct bh1780_data *ddata;
-        int state, ret;
-        struct i2c_client *client = to_i2c_client(dev);
-
-        ddata = i2c_get_clientdata(client);
-        state = bh1780_read(ddata, BH1780_REG_CONTROL, "CONTROL");
-        if (state < 0)
-                return state;
-
-        ddata->power_state = state & BH1780_POWMASK;
-
-        ret = bh1780_write(ddata, BH1780_REG_CONTROL, BH1780_POFF,
-                                "CONTROL");
-
-        if (ret < 0)
-                return ret;
-
-        return 0;
-}
-
-static int bh1780_resume(struct device *dev)
-{
-        struct bh1780_data *ddata;
-        int state, ret;
-        struct i2c_client *client = to_i2c_client(dev);
-
-        ddata = i2c_get_clientdata(client);
-        state = ddata->power_state;
-        ret = bh1780_write(ddata, BH1780_REG_CONTROL, state,
-                                "CONTROL");
-
-        if (ret < 0)
-                return ret;
-
-        return 0;
-}
-#endif /* CONFIG_PM_SLEEP */
-
-static SIMPLE_DEV_PM_OPS(bh1780_pm, bh1780_suspend, bh1780_resume);
-
-static const struct i2c_device_id bh1780_id[] = {
-        { "bh1780", 0 },
-        { },
-};
-
-MODULE_DEVICE_TABLE(i2c, bh1780_id);
-
-#ifdef CONFIG_OF
-static const struct of_device_id of_bh1780_match[] = {
-        { .compatible = "rohm,bh1780gli", },
-        {},
-};
-
-MODULE_DEVICE_TABLE(of, of_bh1780_match);
-#endif
-
-static struct i2c_driver bh1780_driver = {
-        .probe          = bh1780_probe,
-        .remove         = bh1780_remove,
-        .id_table       = bh1780_id,
-        .driver = {
-                .name = "bh1780",
-                .pm     = &bh1780_pm,
-                .of_match_table = of_match_ptr(of_bh1780_match),
-        },
-};
-
-module_i2c_driver(bh1780_driver);
-
-MODULE_DESCRIPTION("BH1780GLI Ambient Light Sensor Driver");
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Hemanth V <hemanthv@ti.com>");
diff --git a/drivers/misc/lkdtm_rodata.c b/drivers/misc/lkdtm_rodata.c
index 166b1db3969f..3564477b8c2d 100644
--- a/drivers/misc/lkdtm_rodata.c
+++ b/drivers/misc/lkdtm_rodata.c
@@ -4,7 +4,7 @@
  */
 #include "lkdtm.h"
 
-void lkdtm_rodata_do_nothing(void)
+void notrace lkdtm_rodata_do_nothing(void)
 {
         /* Does nothing. We just want an architecture agnostic "return". */
 }
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
index e2fb44cc5c37..dc3a854e02d3 100644
--- a/drivers/misc/mei/hw-me.c
+++ b/drivers/misc/mei/hw-me.c
@@ -1263,8 +1263,14 @@ static bool mei_me_fw_type_nm(struct pci_dev *pdev)
 static bool mei_me_fw_type_sps(struct pci_dev *pdev)
 {
         u32 reg;
-        /* Read ME FW Status check for SPS Firmware */
-        pci_read_config_dword(pdev, PCI_CFG_HFS_1, &reg);
+        unsigned int devfn;
+
+        /*
+         * Read ME FW Status register to check for SPS Firmware
+         * The SPS FW is only signaled in pci function 0
+         */
+        devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0);
+        pci_bus_read_config_dword(pdev->bus, devfn, PCI_CFG_HFS_1, &reg);
         trace_mei_pci_cfg_read(&pdev->dev, "PCI_CFG_HFS_1", PCI_CFG_HFS_1, reg);
         /* if bits [19:16] = 15, running SPS Firmware */
         return (reg & 0xf0000) == 0xf0000;
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 64e64da6da44..71cea9b296b2 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -85,8 +85,8 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
 
         {MEI_PCI_DEVICE(MEI_DEV_ID_SPT, mei_me_pch8_cfg)},
         {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_2, mei_me_pch8_cfg)},
-        {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, mei_me_pch8_cfg)},
-        {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_2, mei_me_pch8_cfg)},
+        {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, mei_me_pch8_sps_cfg)},
+        {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_2, mei_me_pch8_sps_cfg)},
 
         {MEI_PCI_DEVICE(MEI_DEV_ID_BXT_M, mei_me_pch8_cfg)},
         {MEI_PCI_DEVICE(MEI_DEV_ID_APL_I, mei_me_pch8_cfg)},
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 37ff0158e45f..44e0ff37480b 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -3327,9 +3327,9 @@ static void quirk_apple_wait_for_thunderbolt(struct pci_dev *dev)
         if (nhi->vendor != PCI_VENDOR_ID_INTEL
                     || (nhi->device != PCI_DEVICE_ID_INTEL_LIGHT_RIDGE &&
                         nhi->device != PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C &&
+                        nhi->device != PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_NHI &&
                         nhi->device != PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_NHI)
-                    || nhi->subsystem_vendor != 0x2222
-                    || nhi->subsystem_device != 0x1111)
+                    || nhi->class != PCI_CLASS_SYSTEM_OTHER << 8)
                 goto out;
         dev_info(&dev->dev, "quirk: waiting for thunderbolt to reestablish PCI tunnels...\n");
         device_pm_wait_for_dev(&dev->dev, &nhi->dev);
@@ -3344,6 +3344,9 @@ DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,
                                PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C,
                                quirk_apple_wait_for_thunderbolt);
 DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,
+                               PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_BRIDGE,
+                               quirk_apple_wait_for_thunderbolt);
+DECLARE_PCI_FIXUP_RESUME_EARLY(PCI_VENDOR_ID_INTEL,
                                PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_BRIDGE,
                                quirk_apple_wait_for_thunderbolt);
 #endif
diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c
index 9c15344b657a..a8c20413dbda 100644
--- a/drivers/thunderbolt/nhi.c
+++ b/drivers/thunderbolt/nhi.c
@@ -651,6 +651,12 @@ static struct pci_device_id nhi_ids[] = {
         {
                 .class = PCI_CLASS_SYSTEM_OTHER << 8, .class_mask = ~0,
                 .vendor = PCI_VENDOR_ID_INTEL,
+                .device = PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_NHI,
+                .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID,
+        },
+        {
+                .class = PCI_CLASS_SYSTEM_OTHER << 8, .class_mask = ~0,
+                .vendor = PCI_VENDOR_ID_INTEL,
                 .device = PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_NHI,
                 .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID,
         },
diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c
index 1e116f53d6dd..9840fdecb73b 100644
--- a/drivers/thunderbolt/switch.c
+++ b/drivers/thunderbolt/switch.c
@@ -372,7 +372,9 @@ struct tb_switch *tb_switch_alloc(struct tb *tb, u64 route)
 
         if (sw->config.device_id != PCI_DEVICE_ID_INTEL_LIGHT_RIDGE &&
             sw->config.device_id != PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C &&
-            sw->config.device_id != PCI_DEVICE_ID_INTEL_PORT_RIDGE)
+            sw->config.device_id != PCI_DEVICE_ID_INTEL_PORT_RIDGE &&
+            sw->config.device_id != PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_BRIDGE &&
+            sw->config.device_id != PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_BRIDGE)
                 tb_sw_warn(sw, "unsupported switch device id %#x\n",
                            sw->config.device_id);