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

Pull char/misc driver fixes from Greg KH:
 "Here are some small char and misc driver fixes for reported issues for
  5.3-rc7

  Also included in here is the documentation for how we are handling
  hardware issues under embargo that everyone has finally agreed on, as
  well as a MAINTAINERS update for the suckers who agreed to handle the
  LICENSES/ files.

  All of these have been in linux-next last week with no reported
  issues"

* tag 'char-misc-5.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  fsi: scom: Don't abort operations for minor errors
  vmw_balloon: Fix offline page marking with compaction
  VMCI: Release resource if the work is already queued
  Documentation/process: Embargoed hardware security issues
  lkdtm/bugs: fix build error in lkdtm_EXHAUST_STACK
  mei: me: add Tiger Lake point LP device ID
  intel_th: pci: Add Tiger Lake support
  intel_th: pci: Add support for another Lewisburg PCH
  stm class: Fix a double free of stm_source_device
  MAINTAINERS: add entry for LICENSES and SPDX stuff
  fpga: altera-ps-spi: Fix getting of optional confd gpio

9 files changed, 36 insertions, 18 deletions

diff --git a/drivers/fpga/altera-ps-spi.c b/drivers/fpga/altera-ps-spi.c
index a13f224303c6..0221dee8dd4c 100644
--- a/drivers/fpga/altera-ps-spi.c
+++ b/drivers/fpga/altera-ps-spi.c
@@ -210,7 +210,7 @@ static int altera_ps_write_complete(struct fpga_manager *mgr,
                 return -EIO;
         }
 
-        if (!IS_ERR(conf->confd)) {
+        if (conf->confd) {
                 if (!gpiod_get_raw_value_cansleep(conf->confd)) {
                         dev_err(&mgr->dev, "CONF_DONE is inactive!\n");
                         return -EIO;
@@ -289,10 +289,13 @@ static int altera_ps_probe(struct spi_device *spi)
                 return PTR_ERR(conf->status);
         }
 
-        conf->confd = devm_gpiod_get(&spi->dev, "confd", GPIOD_IN);
+        conf->confd = devm_gpiod_get_optional(&spi->dev, "confd", GPIOD_IN);
         if (IS_ERR(conf->confd)) {
-                dev_warn(&spi->dev, "Not using confd gpio: %ld\n",
-                         PTR_ERR(conf->confd));
+                dev_err(&spi->dev, "Failed to get confd gpio: %ld\n",
+                        PTR_ERR(conf->confd));
+                return PTR_ERR(conf->confd);
+        } else if (!conf->confd) {
+                dev_warn(&spi->dev, "Not using confd gpio");
         }
 
         /* Register manager with unique name */
diff --git a/drivers/fsi/fsi-scom.c b/drivers/fsi/fsi-scom.c
index 343153d47e5b..004dc03ccf09 100644
--- a/drivers/fsi/fsi-scom.c
+++ b/drivers/fsi/fsi-scom.c
@@ -38,8 +38,7 @@
 #define SCOM_STATUS_PIB_RESP_MASK       0x00007000
 #define SCOM_STATUS_PIB_RESP_SHIFT      12
 
-#define SCOM_STATUS_ANY_ERR             (SCOM_STATUS_ERR_SUMMARY | \
-                                         SCOM_STATUS_PROTECTION | \
+#define SCOM_STATUS_ANY_ERR             (SCOM_STATUS_PROTECTION | \
                                          SCOM_STATUS_PARITY |     \
                                          SCOM_STATUS_PIB_ABORT | \
                                          SCOM_STATUS_PIB_RESP_MASK)
@@ -251,11 +250,6 @@ static int handle_fsi2pib_status(struct scom_device *scom, uint32_t status)
         /* Return -EBUSY on PIB abort to force a retry */
         if (status & SCOM_STATUS_PIB_ABORT)
                 return -EBUSY;
-        if (status & SCOM_STATUS_ERR_SUMMARY) {
-                fsi_device_write(scom->fsi_dev, SCOM_FSI2PIB_RESET_REG, &dummy,
-                                 sizeof(uint32_t));
-                return -EIO;
-        }
         return 0;
 }
 
diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c
index c0378c3de9a4..91dfeba62485 100644
--- a/drivers/hwtracing/intel_th/pci.c
+++ b/drivers/hwtracing/intel_th/pci.c
@@ -165,6 +165,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = {
                 .driver_data = (kernel_ulong_t)0,
         },
         {
+                /* Lewisburg PCH */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa226),
+                .driver_data = (kernel_ulong_t)0,
+        },
+        {
                 /* Gemini Lake */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x318e),
                 .driver_data = (kernel_ulong_t)&intel_th_2x,
@@ -199,6 +204,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = {
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x45c5),
                 .driver_data = (kernel_ulong_t)&intel_th_2x,
         },
+        {
+                /* Tiger Lake PCH */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa0a6),
+                .driver_data = (kernel_ulong_t)&intel_th_2x,
+        },
         { 0 },
 };
 
diff --git a/drivers/hwtracing/stm/core.c b/drivers/hwtracing/stm/core.c
index e55b902560de..181e7ff1ec4f 100644
--- a/drivers/hwtracing/stm/core.c
+++ b/drivers/hwtracing/stm/core.c
@@ -1276,7 +1276,6 @@ int stm_source_register_device(struct device *parent,
 
 err:
         put_device(&src->dev);
-        kfree(src);
 
         return err;
 }
diff --git a/drivers/misc/lkdtm/bugs.c b/drivers/misc/lkdtm/bugs.c
index 1606658b9b7e..24245ccdba72 100644
--- a/drivers/misc/lkdtm/bugs.c
+++ b/drivers/misc/lkdtm/bugs.c
@@ -22,7 +22,7 @@ struct lkdtm_list {
  * recurse past the end of THREAD_SIZE by default.
  */
 #if defined(CONFIG_FRAME_WARN) && (CONFIG_FRAME_WARN > 0)
-#define REC_STACK_SIZE (CONFIG_FRAME_WARN / 2)
+#define REC_STACK_SIZE (_AC(CONFIG_FRAME_WARN, UL) / 2)
 #else
 #define REC_STACK_SIZE (THREAD_SIZE / 8)
 #endif
@@ -91,7 +91,7 @@ void lkdtm_LOOP(void)
 
 void lkdtm_EXHAUST_STACK(void)
 {
-        pr_info("Calling function with %d frame size to depth %d ...\n",
+        pr_info("Calling function with %lu frame size to depth %d ...\n",
                 REC_STACK_SIZE, recur_count);
         recursive_loop(recur_count);
         pr_info("FAIL: survived without exhausting stack?!\n");
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
index 6c0173772162..77f7dff7098d 100644
--- a/drivers/misc/mei/hw-me-regs.h
+++ b/drivers/misc/mei/hw-me-regs.h
@@ -81,6 +81,8 @@
 
 #define MEI_DEV_ID_ICP_LP     0x34E0  /* Ice Lake Point LP */
 
+#define MEI_DEV_ID_TGP_LP     0xA0E0  /* Tiger Lake Point LP */
+
 #define MEI_DEV_ID_MCC        0x4B70  /* Mule Creek Canyon (EHL) */
 #define MEI_DEV_ID_MCC_4      0x4B75  /* Mule Creek Canyon 4 (EHL) */
 
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 57cb68f5cc64..541538eff8b1 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -98,6 +98,8 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
 
         {MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)},
 
+        {MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH12_CFG)},
+
         {MEI_PCI_DEVICE(MEI_DEV_ID_MCC, MEI_ME_PCH12_CFG)},
         {MEI_PCI_DEVICE(MEI_DEV_ID_MCC_4, MEI_ME_PCH8_CFG)},
 
diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c
index 8840299420e0..5e6be1527571 100644
--- a/drivers/misc/vmw_balloon.c
+++ b/drivers/misc/vmw_balloon.c
@@ -691,7 +691,6 @@ static int vmballoon_alloc_page_list(struct vmballoon *b,
                 }
 
                 if (page) {
-                        vmballoon_mark_page_offline(page, ctl->page_size);
                         /* Success. Add the page to the list and continue. */
                         list_add(&page->lru, &ctl->pages);
                         continue;
@@ -930,7 +929,6 @@ static void vmballoon_release_page_list(struct list_head *page_list,
 
         list_for_each_entry_safe(page, tmp, page_list, lru) {
                 list_del(&page->lru);
-                vmballoon_mark_page_online(page, page_size);
                 __free_pages(page, vmballoon_page_order(page_size));
         }
 
@@ -1005,6 +1003,7 @@ static void vmballoon_enqueue_page_list(struct vmballoon *b,
                                         enum vmballoon_page_size_type page_size)
 {
         unsigned long flags;
+        struct page *page;
 
         if (page_size == VMW_BALLOON_4K_PAGE) {
                 balloon_page_list_enqueue(&b->b_dev_info, pages);
@@ -1014,6 +1013,11 @@ static void vmballoon_enqueue_page_list(struct vmballoon *b,
                  * for the balloon compaction mechanism.
                  */
                 spin_lock_irqsave(&b->b_dev_info.pages_lock, flags);
+
+                list_for_each_entry(page, pages, lru) {
+                        vmballoon_mark_page_offline(page, VMW_BALLOON_2M_PAGE);
+                }
+
                 list_splice_init(pages, &b->huge_pages);
                 __count_vm_events(BALLOON_INFLATE, *n_pages *
                                   vmballoon_page_in_frames(VMW_BALLOON_2M_PAGE));
@@ -1056,6 +1060,8 @@ static void vmballoon_dequeue_page_list(struct vmballoon *b,
         /* 2MB pages */
         spin_lock_irqsave(&b->b_dev_info.pages_lock, flags);
         list_for_each_entry_safe(page, tmp, &b->huge_pages, lru) {
+                vmballoon_mark_page_online(page, VMW_BALLOON_2M_PAGE);
+
                 list_move(&page->lru, pages);
                 if (++i == n_req_pages)
                         break;
diff --git a/drivers/misc/vmw_vmci/vmci_doorbell.c b/drivers/misc/vmw_vmci/vmci_doorbell.c
index bad89b6e0802..345addd9306d 100644
--- a/drivers/misc/vmw_vmci/vmci_doorbell.c
+++ b/drivers/misc/vmw_vmci/vmci_doorbell.c
@@ -310,7 +310,8 @@ int vmci_dbell_host_context_notify(u32 src_cid, struct vmci_handle handle)
 
         entry = container_of(resource, struct dbell_entry, resource);
         if (entry->run_delayed) {
-                schedule_work(&entry->work);
+                if (!schedule_work(&entry->work))
+                        vmci_resource_put(resource);
         } else {
                 entry->notify_cb(entry->client_data);
                 vmci_resource_put(resource);
@@ -361,7 +362,8 @@ static void dbell_fire_entries(u32 notify_idx)
                     atomic_read(&dbell->active) == 1) {
                         if (dbell->run_delayed) {
                                 vmci_resource_get(&dbell->resource);
-                                schedule_work(&dbell->work);
+                                if (!schedule_work(&dbell->work))
+                                        vmci_resource_put(&dbell->resource);
                         } else {
                                 dbell->notify_cb(dbell->client_data);
                         }