Merge tag 'platform-drivers-x86-v4.2-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform driver fixes from Darren Hart:
 "Fix SMBIOS call handling and hwswitch state coherency in the
  dell-laptop driver.  Cleanups for intel_*_ipc drivers.  Details:

  dell-laptop:
   - Do not cache hwswitch state
   - Check return value of each SMBIOS call
   - Clear buffer before each SMBIOS call

  intel_scu_ipc:
   - Move local memory initialization out of a mutex

  intel_pmc_ipc:
   - Update kerneldoc formatting
   - Fix compiler casting warnings"

* tag 'platform-drivers-x86-v4.2-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  intel_scu_ipc: move local memory initialization out of a mutex
  intel_pmc_ipc: Update kerneldoc formatting
  dell-laptop: Do not cache hwswitch state
  dell-laptop: Check return value of each SMBIOS call
  dell-laptop: Clear buffer before each SMBIOS call
  intel_pmc_ipc: Fix compiler casting warnings

4 files changed, 176 insertions, 111 deletions

diff --git a/arch/x86/include/asm/intel_pmc_ipc.h b/arch/x86/include/asm/intel_pmc_ipc.h
index 200ec2e7821d..cd0310e186f4 100644
--- a/arch/x86/include/asm/intel_pmc_ipc.h
+++ b/arch/x86/include/asm/intel_pmc_ipc.h
@@ -25,36 +25,9 @@
 
 #if IS_ENABLED(CONFIG_INTEL_PMC_IPC)
 
-/*
- * intel_pmc_ipc_simple_command
- * @cmd: command
- * @sub: sub type
- */
 int intel_pmc_ipc_simple_command(int cmd, int sub);
-
-/*
- * intel_pmc_ipc_raw_cmd
- * @cmd: command
- * @sub: sub type
- * @in: input data
- * @inlen: input length in bytes
- * @out: output data
- * @outlen: output length in dwords
- * @sptr: data writing to SPTR register
- * @dptr: data writing to DPTR register
- */
 int intel_pmc_ipc_raw_cmd(u32 cmd, u32 sub, u8 *in, u32 inlen,
                 u32 *out, u32 outlen, u32 dptr, u32 sptr);
-
-/*
- * intel_pmc_ipc_command
- * @cmd: command
- * @sub: sub type
- * @in: input data
- * @inlen: input length in bytes
- * @out: output data
- * @outlen: output length in dwords
- */
 int intel_pmc_ipc_command(u32 cmd, u32 sub, u8 *in, u32 inlen,
                 u32 *out, u32 outlen);
 
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
index ed317ccac4a2..aaeeae81e3a9 100644
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
@@ -309,12 +309,15 @@ static const struct dmi_system_id dell_quirks[] __initconst = {
 static struct calling_interface_buffer *buffer;
 static DEFINE_MUTEX(buffer_mutex);
 
-static int hwswitch_state;
+static void clear_buffer(void)
+{
+        memset(buffer, 0, sizeof(struct calling_interface_buffer));
+}
 
 static void get_buffer(void)
 {
         mutex_lock(&buffer_mutex);
-        memset(buffer, 0, sizeof(struct calling_interface_buffer));
+        clear_buffer();
 }
 
 static void release_buffer(void)
@@ -548,21 +551,41 @@ static int dell_rfkill_set(void *data, bool blocked)
         int disable = blocked ? 1 : 0;
         unsigned long radio = (unsigned long)data;
         int hwswitch_bit = (unsigned long)data - 1;
+        int hwswitch;
+        int status;
+        int ret;
 
         get_buffer();
+
+        dell_send_request(buffer, 17, 11);
+        ret = buffer->output[0];
+        status = buffer->output[1];
+
+        if (ret != 0)
+                goto out;
+
+        clear_buffer();
+
+        buffer->input[0] = 0x2;
         dell_send_request(buffer, 17, 11);
+        ret = buffer->output[0];
+        hwswitch = buffer->output[1];
 
         /* If the hardware switch controls this radio, and the hardware
            switch is disabled, always disable the radio */
-        if ((hwswitch_state & BIT(hwswitch_bit)) &&
-            !(buffer->output[1] & BIT(16)))
+        if (ret == 0 && (hwswitch & BIT(hwswitch_bit)) &&
+            (status & BIT(0)) && !(status & BIT(16)))
                 disable = 1;
 
+        clear_buffer();
+
         buffer->input[0] = (1 | (radio<<8) | (disable << 16));
         dell_send_request(buffer, 17, 11);
+        ret = buffer->output[0];
 
+ out:
         release_buffer();
-        return 0;
+        return dell_smi_error(ret);
 }
 
 /* Must be called with the buffer held */
@@ -572,6 +595,7 @@ static void dell_rfkill_update_sw_state(struct rfkill *rfkill, int radio,
         if (status & BIT(0)) {
                 /* Has hw-switch, sync sw_state to BIOS */
                 int block = rfkill_blocked(rfkill);
+                clear_buffer();
                 buffer->input[0] = (1 | (radio << 8) | (block << 16));
                 dell_send_request(buffer, 17, 11);
         } else {
@@ -581,23 +605,43 @@ static void dell_rfkill_update_sw_state(struct rfkill *rfkill, int radio,
 }
 
 static void dell_rfkill_update_hw_state(struct rfkill *rfkill, int radio,
-                                        int status)
+                                        int status, int hwswitch)
 {
-        if (hwswitch_state & (BIT(radio - 1)))
+        if (hwswitch & (BIT(radio - 1)))
                 rfkill_set_hw_state(rfkill, !(status & BIT(16)));
 }
 
 static void dell_rfkill_query(struct rfkill *rfkill, void *data)
 {
+        int radio = ((unsigned long)data & 0xF);
+        int hwswitch;
         int status;
+        int ret;
 
         get_buffer();
+
         dell_send_request(buffer, 17, 11);
+        ret = buffer->output[0];
         status = buffer->output[1];
 
-        dell_rfkill_update_hw_state(rfkill, (unsigned long)data, status);
+        if (ret != 0 || !(status & BIT(0))) {
+                release_buffer();
+                return;
+        }
+
+        clear_buffer();
+
+        buffer->input[0] = 0x2;
+        dell_send_request(buffer, 17, 11);
+        ret = buffer->output[0];
+        hwswitch = buffer->output[1];
 
         release_buffer();
+
+        if (ret != 0)
+                return;
+
+        dell_rfkill_update_hw_state(rfkill, radio, status, hwswitch);
 }
 
 static const struct rfkill_ops dell_rfkill_ops = {
@@ -609,13 +653,27 @@ static struct dentry *dell_laptop_dir;
 
 static int dell_debugfs_show(struct seq_file *s, void *data)
 {
+        int hwswitch_state;
+        int hwswitch_ret;
         int status;
+        int ret;
 
         get_buffer();
+
         dell_send_request(buffer, 17, 11);
+        ret = buffer->output[0];
         status = buffer->output[1];
+
+        clear_buffer();
+
+        buffer->input[0] = 0x2;
+        dell_send_request(buffer, 17, 11);
+        hwswitch_ret = buffer->output[0];
+        hwswitch_state = buffer->output[1];
+
         release_buffer();
 
+        seq_printf(s, "return:\t%d\n", ret);
         seq_printf(s, "status:\t0x%X\n", status);
         seq_printf(s, "Bit 0 : Hardware switch supported:   %lu\n",
                    status & BIT(0));
@@ -657,7 +715,8 @@ static int dell_debugfs_show(struct seq_file *s, void *data)
         seq_printf(s, "Bit 21: WiGig is blocked:            %lu\n",
                   (status & BIT(21)) >> 21);
 
-        seq_printf(s, "\nhwswitch_state:\t0x%X\n", hwswitch_state);
+        seq_printf(s, "\nhwswitch_return:\t%d\n", hwswitch_ret);
+        seq_printf(s, "hwswitch_state:\t0x%X\n", hwswitch_state);
         seq_printf(s, "Bit 0 : Wifi controlled by switch:      %lu\n",
                    hwswitch_state & BIT(0));
         seq_printf(s, "Bit 1 : Bluetooth controlled by switch: %lu\n",
@@ -693,25 +752,43 @@ static const struct file_operations dell_debugfs_fops = {
 
 static void dell_update_rfkill(struct work_struct *ignored)
 {
+        int hwswitch = 0;
         int status;
+        int ret;
 
         get_buffer();
+
         dell_send_request(buffer, 17, 11);
+        ret = buffer->output[0];
         status = buffer->output[1];
 
+        if (ret != 0)
+                goto out;
+
+        clear_buffer();
+
+        buffer->input[0] = 0x2;
+        dell_send_request(buffer, 17, 11);
+        ret = buffer->output[0];
+
+        if (ret == 0 && (status & BIT(0)))
+                hwswitch = buffer->output[1];
+
         if (wifi_rfkill) {
-                dell_rfkill_update_hw_state(wifi_rfkill, 1, status);
+                dell_rfkill_update_hw_state(wifi_rfkill, 1, status, hwswitch);
                 dell_rfkill_update_sw_state(wifi_rfkill, 1, status);
         }
         if (bluetooth_rfkill) {
-                dell_rfkill_update_hw_state(bluetooth_rfkill, 2, status);
+                dell_rfkill_update_hw_state(bluetooth_rfkill, 2, status,
+                                            hwswitch);
                 dell_rfkill_update_sw_state(bluetooth_rfkill, 2, status);
         }
         if (wwan_rfkill) {
-                dell_rfkill_update_hw_state(wwan_rfkill, 3, status);
+                dell_rfkill_update_hw_state(wwan_rfkill, 3, status, hwswitch);
                 dell_rfkill_update_sw_state(wwan_rfkill, 3, status);
         }
 
+ out:
         release_buffer();
 }
 static DECLARE_DELAYED_WORK(dell_rfkill_work, dell_update_rfkill);
@@ -773,21 +850,17 @@ static int __init dell_setup_rfkill(void)
 
         get_buffer();
         dell_send_request(buffer, 17, 11);
+        ret = buffer->output[0];
         status = buffer->output[1];
-        buffer->input[0] = 0x2;
-        dell_send_request(buffer, 17, 11);
-        hwswitch_state = buffer->output[1];
         release_buffer();
 
-        if (!(status & BIT(0))) {
-                if (force_rfkill) {
-                        /* No hwsitch, clear all hw-controlled bits */
-                        hwswitch_state &= ~7;
-                } else {
-                        /* rfkill is only tested on laptops with a hwswitch */
-                        return 0;
-                }
-        }
+        /* dell wireless info smbios call is not supported */
+        if (ret != 0)
+                return 0;
+
+        /* rfkill is only tested on laptops with a hwswitch */
+        if (!(status & BIT(0)) && !force_rfkill)
+                return 0;
 
         if ((status & (1<<2|1<<8)) == (1<<2|1<<8)) {
                 wifi_rfkill = rfkill_alloc("dell-wifi", &platform_device->dev,
@@ -932,47 +1005,50 @@ static void dell_cleanup_rfkill(void)
 
 static int dell_send_intensity(struct backlight_device *bd)
 {
-        int ret = 0;
+        int token;
+        int ret;
+
+        token = find_token_location(BRIGHTNESS_TOKEN);
+        if (token == -1)
+                return -ENODEV;
 
         get_buffer();
-        buffer->input[0] = find_token_location(BRIGHTNESS_TOKEN);
+        buffer->input[0] = token;
         buffer->input[1] = bd->props.brightness;
 
-        if (buffer->input[0] == -1) {
-                ret = -ENODEV;
-                goto out;
-        }
-
         if (power_supply_is_system_supplied() > 0)
                 dell_send_request(buffer, 1, 2);
         else
                 dell_send_request(buffer, 1, 1);
 
- out:
+        ret = dell_smi_error(buffer->output[0]);
+
         release_buffer();
         return ret;
 }
 
 static int dell_get_intensity(struct backlight_device *bd)
 {
-        int ret = 0;
+        int token;
+        int ret;
 
-        get_buffer();
-        buffer->input[0] = find_token_location(BRIGHTNESS_TOKEN);
+        token = find_token_location(BRIGHTNESS_TOKEN);
+        if (token == -1)
+                return -ENODEV;
 
-        if (buffer->input[0] == -1) {
-                ret = -ENODEV;
-                goto out;
-        }
+        get_buffer();
+        buffer->input[0] = token;
 
         if (power_supply_is_system_supplied() > 0)
                 dell_send_request(buffer, 0, 2);
         else
                 dell_send_request(buffer, 0, 1);
 
-        ret = buffer->output[1];
+        if (buffer->output[0])
+                ret = dell_smi_error(buffer->output[0]);
+        else
+                ret = buffer->output[1];
 
- out:
         release_buffer();
         return ret;
 }
@@ -2036,6 +2112,7 @@ static void kbd_led_exit(void)
 static int __init dell_init(void)
 {
         int max_intensity = 0;
+        int token;
         int ret;
 
         if (!dmi_check_system(dell_device_table))
@@ -2094,13 +2171,15 @@ static int __init dell_init(void)
         if (acpi_video_get_backlight_type() != acpi_backlight_vendor)
                 return 0;
 
-        get_buffer();
-        buffer->input[0] = find_token_location(BRIGHTNESS_TOKEN);
-        if (buffer->input[0] != -1) {
+        token = find_token_location(BRIGHTNESS_TOKEN);
+        if (token != -1) {
+                get_buffer();
+                buffer->input[0] = token;
                 dell_send_request(buffer, 0, 2);
-                max_intensity = buffer->output[3];
+                if (buffer->output[0] == 0)
+                        max_intensity = buffer->output[3];
+                release_buffer();
         }
-        release_buffer();
 
         if (max_intensity) {
                 struct backlight_properties props;
diff --git a/drivers/platform/x86/intel_pmc_ipc.c b/drivers/platform/x86/intel_pmc_ipc.c
index d734763dab69..105cfffe82c6 100644
--- a/drivers/platform/x86/intel_pmc_ipc.c
+++ b/drivers/platform/x86/intel_pmc_ipc.c
@@ -96,18 +96,18 @@ static struct intel_pmc_ipc_dev {
         struct completion cmd_complete;
 
         /* The following PMC BARs share the same ACPI device with the IPC */
-        void *acpi_io_base;
+        resource_size_t acpi_io_base;
         int acpi_io_size;
         struct platform_device *tco_dev;
 
         /* gcr */
-        void *gcr_base;
+        resource_size_t gcr_base;
         int gcr_size;
 
         /* punit */
-        void *punit_base;
+        resource_size_t punit_base;
         int punit_size;
-        void *punit_base2;
+        resource_size_t punit_base2;
         int punit_size2;
         struct platform_device *punit_dev;
 } ipcdev;
@@ -210,10 +210,15 @@ static int intel_pmc_ipc_check_status(void)
         return ret;
 }
 
-/*
- * intel_pmc_ipc_simple_command
- * @cmd: command
- * @sub: sub type
+/**
+ * intel_pmc_ipc_simple_command() - Simple IPC command
+ * @cmd:        IPC command code.
+ * @sub:        IPC command sub type.
+ *
+ * Send a simple IPC command to PMC when don't need to specify
+ * input/output data and source/dest pointers.
+ *
+ * Return:      an IPC error code or 0 on success.
  */
 int intel_pmc_ipc_simple_command(int cmd, int sub)
 {
@@ -232,16 +237,20 @@ int intel_pmc_ipc_simple_command(int cmd, int sub)
 }
 EXPORT_SYMBOL_GPL(intel_pmc_ipc_simple_command);
 
-/*
- * intel_pmc_ipc_raw_cmd
- * @cmd: command
- * @sub: sub type
- * @in: input data
- * @inlen: input length in bytes
- * @out: output data
- * @outlen: output length in dwords
- * @sptr: data writing to SPTR register
- * @dptr: data writing to DPTR register
+/**
+ * intel_pmc_ipc_raw_cmd() - IPC command with data and pointers
+ * @cmd:        IPC command code.
+ * @sub:        IPC command sub type.
+ * @in:         input data of this IPC command.
+ * @inlen:      input data length in bytes.
+ * @out:        output data of this IPC command.
+ * @outlen:     output data length in dwords.
+ * @sptr:       data writing to SPTR register.
+ * @dptr:       data writing to DPTR register.
+ *
+ * Send an IPC command to PMC with input/output data and source/dest pointers.
+ *
+ * Return:      an IPC error code or 0 on success.
  */
 int intel_pmc_ipc_raw_cmd(u32 cmd, u32 sub, u8 *in, u32 inlen, u32 *out,
                           u32 outlen, u32 dptr, u32 sptr)
@@ -278,14 +287,18 @@ int intel_pmc_ipc_raw_cmd(u32 cmd, u32 sub, u8 *in, u32 inlen, u32 *out,
 }
 EXPORT_SYMBOL_GPL(intel_pmc_ipc_raw_cmd);
 
-/*
- * intel_pmc_ipc_command
- * @cmd: command
- * @sub: sub type
- * @in: input data
- * @inlen: input length in bytes
- * @out: output data
- * @outlen: output length in dwords
+/**
+ * intel_pmc_ipc_command() -  IPC command with input/output data
+ * @cmd:        IPC command code.
+ * @sub:        IPC command sub type.
+ * @in:         input data of this IPC command.
+ * @inlen:      input data length in bytes.
+ * @out:        output data of this IPC command.
+ * @outlen:     output data length in dwords.
+ *
+ * Send an IPC command to PMC with input/output data.
+ *
+ * Return:      an IPC error code or 0 on success.
  */
 int intel_pmc_ipc_command(u32 cmd, u32 sub, u8 *in, u32 inlen,
                           u32 *out, u32 outlen)
@@ -480,11 +493,11 @@ static int ipc_create_punit_device(void)
         pdev->dev.parent = ipcdev.dev;
 
         res = punit_res;
-        res->start = (resource_size_t)ipcdev.punit_base;
+        res->start = ipcdev.punit_base;
         res->end = res->start + ipcdev.punit_size - 1;
 
         res = punit_res + PUNIT_RESOURCE_INTER;
-        res->start = (resource_size_t)ipcdev.punit_base2;
+        res->start = ipcdev.punit_base2;
         res->end = res->start + ipcdev.punit_size2 - 1;
 
         ret = platform_device_add_resources(pdev, punit_res,
@@ -522,15 +535,15 @@ static int ipc_create_tco_device(void)
         pdev->dev.parent = ipcdev.dev;
 
         res = tco_res + TCO_RESOURCE_ACPI_IO;
-        res->start = (resource_size_t)ipcdev.acpi_io_base + TCO_BASE_OFFSET;
+        res->start = ipcdev.acpi_io_base + TCO_BASE_OFFSET;
         res->end = res->start + TCO_REGS_SIZE - 1;
 
         res = tco_res + TCO_RESOURCE_SMI_EN_IO;
-        res->start = (resource_size_t)ipcdev.acpi_io_base + SMI_EN_OFFSET;
+        res->start = ipcdev.acpi_io_base + SMI_EN_OFFSET;
         res->end = res->start + SMI_EN_SIZE - 1;
 
         res = tco_res + TCO_RESOURCE_GCR_MEM;
-        res->start = (resource_size_t)ipcdev.gcr_base;
+        res->start = ipcdev.gcr_base;
         res->end = res->start + ipcdev.gcr_size - 1;
 
         ret = platform_device_add_resources(pdev, tco_res, ARRAY_SIZE(tco_res));
@@ -589,7 +602,7 @@ static int ipc_plat_get_res(struct platform_device *pdev)
                 return -ENXIO;
         }
         size = resource_size(res);
-        ipcdev.acpi_io_base = (void *)res->start;
+        ipcdev.acpi_io_base = res->start;
         ipcdev.acpi_io_size = size;
         dev_info(&pdev->dev, "io res: %llx %x\n",
                  (long long)res->start, (int)resource_size(res));
@@ -601,7 +614,7 @@ static int ipc_plat_get_res(struct platform_device *pdev)
                 return -ENXIO;
         }
         size = resource_size(res);
-        ipcdev.punit_base = (void *)res->start;
+        ipcdev.punit_base = res->start;
         ipcdev.punit_size = size;
         dev_info(&pdev->dev, "punit data res: %llx %x\n",
                  (long long)res->start, (int)resource_size(res));
@@ -613,7 +626,7 @@ static int ipc_plat_get_res(struct platform_device *pdev)
                 return -ENXIO;
         }
         size = resource_size(res);
-        ipcdev.punit_base2 = (void *)res->start;
+        ipcdev.punit_base2 = res->start;
         ipcdev.punit_size2 = size;
         dev_info(&pdev->dev, "punit interface res: %llx %x\n",
                  (long long)res->start, (int)resource_size(res));
@@ -637,7 +650,7 @@ static int ipc_plat_get_res(struct platform_device *pdev)
         }
         ipcdev.ipc_base = addr;
 
-        ipcdev.gcr_base = (void *)(res->start + size);
+        ipcdev.gcr_base = res->start + size;
         ipcdev.gcr_size = PLAT_RESOURCE_GCR_SIZE;
         dev_info(&pdev->dev, "ipc res: %llx %x\n",
                  (long long)res->start, (int)resource_size(res));
diff --git a/drivers/platform/x86/intel_scu_ipc.c b/drivers/platform/x86/intel_scu_ipc.c
index 001b199a8c33..187d1086d15c 100644
--- a/drivers/platform/x86/intel_scu_ipc.c
+++ b/drivers/platform/x86/intel_scu_ipc.c
@@ -216,13 +216,13 @@ static int pwr_reg_rdwr(u16 *addr, u8 *data, u32 count, u32 op, u32 id)
         int nc;
         u32 offset = 0;
         int err;
-        u8 cbuf[IPC_WWBUF_SIZE] = { };
+        u8 cbuf[IPC_WWBUF_SIZE];
         u32 *wbuf = (u32 *)&cbuf;
 
-        mutex_lock(&ipclock);
-
         memset(cbuf, 0, sizeof(cbuf));
 
+        mutex_lock(&ipclock);
+
         if (ipcdev.pdev == NULL) {
                 mutex_unlock(&ipclock);
                 return -ENODEV;