10 files changed, 23 insertions, 11 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index f94cd8d28dfa..6426db5198f0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -17172,7 +17172,6 @@ F:	drivers/vme/
 F:      include/linux/vme*
 
 VMWARE BALLOON DRIVER
-M:      Julien Freche <jfreche@vmware.com>
 M:      Nadav Amit <namit@vmware.com>
 M:      "VMware, Inc." <pv-drivers@vmware.com>
 L:      linux-kernel@vger.kernel.org
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 38a59a630cd4..dc1c83eafc22 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -2988,7 +2988,7 @@ static void binder_transaction(struct binder_proc *proc,
                         else
                                 return_error = BR_DEAD_REPLY;
                         mutex_unlock(&context->context_mgr_node_lock);
-                        if (target_node && target_proc == proc) {
+                        if (target_node && target_proc->pid == proc->pid) {
                                 binder_user_error("%d:%d got transaction to context manager from process owning it\n",
                                                   proc->pid, thread->pid);
                                 return_error = BR_FAILED_REPLY;
@@ -3239,7 +3239,8 @@ static void binder_transaction(struct binder_proc *proc,
         buffer_offset = off_start_offset;
         off_end_offset = off_start_offset + tr->offsets_size;
         sg_buf_offset = ALIGN(off_end_offset, sizeof(void *));
-        sg_buf_end_offset = sg_buf_offset + extra_buffers_size;
+        sg_buf_end_offset = sg_buf_offset + extra_buffers_size -
+                ALIGN(secctx_sz, sizeof(u64));
         off_min = 0;
         for (buffer_offset = off_start_offset; buffer_offset < off_end_offset;
              buffer_offset += sizeof(binder_size_t)) {
diff --git a/drivers/base/firmware_loader/firmware.h b/drivers/base/firmware_loader/firmware.h
index 7048a41973ed..7ecd590e67fe 100644
--- a/drivers/base/firmware_loader/firmware.h
+++ b/drivers/base/firmware_loader/firmware.h
@@ -141,8 +141,8 @@ int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed);
 int fw_map_paged_buf(struct fw_priv *fw_priv);
 #else
 static inline void fw_free_paged_buf(struct fw_priv *fw_priv) {}
-int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed) { return -ENXIO; }
-int fw_map_paged_buf(struct fw_priv *fw_priv) { return -ENXIO; }
+static inline int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed) { return -ENXIO; }
+static inline int fw_map_paged_buf(struct fw_priv *fw_priv) { return -ENXIO; }
 #endif
 
 #endif /* __FIRMWARE_LOADER_H */
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 5c39f20378b8..9ac6671bb514 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -567,8 +567,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
         unsigned long long m;
 
         m = hpets->hp_tick_freq + (dis >> 1);
-        do_div(m, dis);
-        return (unsigned long)m;
+        return div64_ul(m, dis);
 }
 
 static int
diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig
index 474f304ec109..cdd4f73b4869 100644
--- a/drivers/fpga/Kconfig
+++ b/drivers/fpga/Kconfig
@@ -40,6 +40,7 @@ config ALTERA_PR_IP_CORE_PLAT
 config FPGA_MGR_ALTERA_PS_SPI
         tristate "Altera FPGA Passive Serial over SPI"
         depends on SPI
+        select BITREVERSE
         help
           FPGA manager driver support for Altera Arria/Cyclone/Stratix
           using the passive serial interface over SPI.
diff --git a/drivers/misc/eeprom/Kconfig b/drivers/misc/eeprom/Kconfig
index f88094719552..f2abe27010ef 100644
--- a/drivers/misc/eeprom/Kconfig
+++ b/drivers/misc/eeprom/Kconfig
@@ -5,6 +5,7 @@ config EEPROM_AT24
         tristate "I2C EEPROMs / RAMs / ROMs from most vendors"
         depends on I2C && SYSFS
         select NVMEM
+        select NVMEM_SYSFS
         select REGMAP_I2C
         help
           Enable this driver to get read/write support to most I2C EEPROMs
@@ -34,6 +35,7 @@ config EEPROM_AT25
         tristate "SPI EEPROMs from most vendors"
         depends on SPI && SYSFS
         select NVMEM
+        select NVMEM_SYSFS
         help
           Enable this driver to get read/write support to most SPI EEPROMs,
           after you configure the board init code to know about each eeprom
@@ -80,6 +82,7 @@ config EEPROM_93XX46
         depends on SPI && SYSFS
         select REGMAP
         select NVMEM
+        select NVMEM_SYSFS
         help
           Driver for the microwire EEPROM chipsets 93xx46x. The driver
           supports both read and write commands and also the command to
diff --git a/drivers/misc/habanalabs/goya/goya.c b/drivers/misc/habanalabs/goya/goya.c
index 75294ec65257..1a2c062a57d4 100644
--- a/drivers/misc/habanalabs/goya/goya.c
+++ b/drivers/misc/habanalabs/goya/goya.c
@@ -695,8 +695,8 @@ static int goya_sw_init(struct hl_device *hdev)
                 goto free_dma_pool;
         }
 
-        dev_dbg(hdev->dev, "cpu accessible memory at bus address 0x%llx\n",
-                hdev->cpu_accessible_dma_address);
+        dev_dbg(hdev->dev, "cpu accessible memory at bus address %pad\n",
+                &hdev->cpu_accessible_dma_address);
 
         hdev->cpu_accessible_dma_pool = gen_pool_create(ilog2(32), -1);
         if (!hdev->cpu_accessible_dma_pool) {
@@ -4449,7 +4449,6 @@ void goya_handle_eqe(struct hl_device *hdev, struct hl_eq_entry *eq_entry)
         case GOYA_ASYNC_EVENT_ID_AXI_ECC:
         case GOYA_ASYNC_EVENT_ID_L2_RAM_ECC:
         case GOYA_ASYNC_EVENT_ID_PSOC_GPIO_05_SW_RESET:
-        case GOYA_ASYNC_EVENT_ID_PSOC_GPIO_10_VRHOT_ICRIT:
                 goya_print_irq_info(hdev, event_type, false);
                 hl_device_reset(hdev, true, false);
                 break;
@@ -4485,6 +4484,7 @@ void goya_handle_eqe(struct hl_device *hdev, struct hl_eq_entry *eq_entry)
                 goya_unmask_irq(hdev, event_type);
                 break;
 
+        case GOYA_ASYNC_EVENT_ID_PSOC_GPIO_10_VRHOT_ICRIT:
         case GOYA_ASYNC_EVENT_ID_TPC0_BMON_SPMU:
         case GOYA_ASYNC_EVENT_ID_TPC1_BMON_SPMU:
         case GOYA_ASYNC_EVENT_ID_TPC2_BMON_SPMU:
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
index d74b182e19f3..6c0173772162 100644
--- a/drivers/misc/mei/hw-me-regs.h
+++ b/drivers/misc/mei/hw-me-regs.h
@@ -81,6 +81,9 @@
 
 #define MEI_DEV_ID_ICP_LP     0x34E0  /* Ice 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) */
+
 /*
  * MEI HW Section
  */
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 7a2b3545a7f9..57cb68f5cc64 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -98,6 +98,9 @@ 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_MCC, MEI_ME_PCH12_CFG)},
+        {MEI_PCI_DEVICE(MEI_DEV_ID_MCC_4, MEI_ME_PCH8_CFG)},
+
         /* required last entry */
         {0, }
 };
diff --git a/lib/test_firmware.c b/lib/test_firmware.c
index 83ea6c4e623c..6ca97a63b3d6 100644
--- a/lib/test_firmware.c
+++ b/lib/test_firmware.c
@@ -886,8 +886,11 @@ static int __init test_firmware_init(void)
                 return -ENOMEM;
 
         rc = __test_firmware_config_init();
-        if (rc)
+        if (rc) {
+                kfree(test_fw_config);
+                pr_err("could not init firmware test config: %d\n", rc);
                 return rc;
+        }
 
         rc = misc_register(&test_fw_misc_device);
         if (rc) {