tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'char-misc-5.3-rc2' 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 5.3-rc2 to resolve
some reported issues.

Nothing major at all, some binder bugfixes for issues found, some new
mei device ids, firmware building warning fixes, habanalabs fixes, a
few other build fixes, and a MAINTAINERS update.

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

* tag 'char-misc-5.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
test_firmware: fix a memory leak bug
hpet: Fix division by zero in hpet_time_div()
eeprom: make older eeprom drivers select NVMEM_SYSFS
vmw_balloon: Remove Julien from the maintainers list
fpga-manager: altera-ps-spi: Fix build error
mei: me: add mule creek canyon (EHL) device ids
binder: prevent transactions to context manager from its own process.
binder: Set end of SG buffer area properly.
firmware: Fix missing inline
firmware: fix build errors in paged buffer handling code
habanalabs: don't reset device when getting VRHOT
habanalabs: use %pad for printing a dma_addr_t

Linus Torvalds 04ce9318 572782b2

+23 -11
-1
MAINTAINERS
··· 17172 17172 F: include/linux/vme* 17173 17173 17174 17174 VMWARE BALLOON DRIVER 17175 - M: Julien Freche <jfreche@vmware.com> 17176 17175 M: Nadav Amit <namit@vmware.com> 17177 17176 M: "VMware, Inc." <pv-drivers@vmware.com> 17178 17177 L: linux-kernel@vger.kernel.org
+3 -2
drivers/android/binder.c
··· 2988 2988 else 2989 2989 return_error = BR_DEAD_REPLY; 2990 2990 mutex_unlock(&context->context_mgr_node_lock); 2991 - if (target_node && target_proc == proc) { 2991 + if (target_node && target_proc->pid == proc->pid) { 2992 2992 binder_user_error("%d:%d got transaction to context manager from process owning it\n", 2993 2993 proc->pid, thread->pid); 2994 2994 return_error = BR_FAILED_REPLY; ··· 3239 3239 buffer_offset = off_start_offset; 3240 3240 off_end_offset = off_start_offset + tr->offsets_size; 3241 3241 sg_buf_offset = ALIGN(off_end_offset, sizeof(void *)); 3242 - sg_buf_end_offset = sg_buf_offset + extra_buffers_size; 3242 + sg_buf_end_offset = sg_buf_offset + extra_buffers_size - 3243 + ALIGN(secctx_sz, sizeof(u64)); 3243 3244 off_min = 0; 3244 3245 for (buffer_offset = off_start_offset; buffer_offset < off_end_offset; 3245 3246 buffer_offset += sizeof(binder_size_t)) {
+2 -2
drivers/base/firmware_loader/firmware.h
··· 141 141 int fw_map_paged_buf(struct fw_priv *fw_priv); 142 142 #else 143 143 static inline void fw_free_paged_buf(struct fw_priv *fw_priv) {} 144 - int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed) { return -ENXIO; } 145 - int fw_map_paged_buf(struct fw_priv *fw_priv) { return -ENXIO; } 144 + static inline int fw_grow_paged_buf(struct fw_priv *fw_priv, int pages_needed) { return -ENXIO; } 145 + static inline int fw_map_paged_buf(struct fw_priv *fw_priv) { return -ENXIO; } 146 146 #endif 147 147 148 148 #endif /* __FIRMWARE_LOADER_H */
+1 -2
drivers/char/hpet.c
··· 567 567 unsigned long long m; 568 568 569 569 m = hpets->hp_tick_freq + (dis >> 1); 570 - do_div(m, dis); 571 - return (unsigned long)m; 570 + return div64_ul(m, dis); 572 571 } 573 572 574 573 static int
+1
drivers/fpga/Kconfig
··· 40 40 config FPGA_MGR_ALTERA_PS_SPI 41 41 tristate "Altera FPGA Passive Serial over SPI" 42 42 depends on SPI 43 + select BITREVERSE 43 44 help 44 45 FPGA manager driver support for Altera Arria/Cyclone/Stratix 45 46 using the passive serial interface over SPI.
+3
drivers/misc/eeprom/Kconfig
··· 5 5 tristate "I2C EEPROMs / RAMs / ROMs from most vendors" 6 6 depends on I2C && SYSFS 7 7 select NVMEM 8 + select NVMEM_SYSFS 8 9 select REGMAP_I2C 9 10 help 10 11 Enable this driver to get read/write support to most I2C EEPROMs ··· 35 34 tristate "SPI EEPROMs from most vendors" 36 35 depends on SPI && SYSFS 37 36 select NVMEM 37 + select NVMEM_SYSFS 38 38 help 39 39 Enable this driver to get read/write support to most SPI EEPROMs, 40 40 after you configure the board init code to know about each eeprom ··· 82 80 depends on SPI && SYSFS 83 81 select REGMAP 84 82 select NVMEM 83 + select NVMEM_SYSFS 85 84 help 86 85 Driver for the microwire EEPROM chipsets 93xx46x. The driver 87 86 supports both read and write commands and also the command to
+3 -3
drivers/misc/habanalabs/goya/goya.c
··· 695 695 goto free_dma_pool; 696 696 } 697 697 698 - dev_dbg(hdev->dev, "cpu accessible memory at bus address 0x%llx\n", 699 - hdev->cpu_accessible_dma_address); 698 + dev_dbg(hdev->dev, "cpu accessible memory at bus address %pad\n", 699 + &hdev->cpu_accessible_dma_address); 700 700 701 701 hdev->cpu_accessible_dma_pool = gen_pool_create(ilog2(32), -1); 702 702 if (!hdev->cpu_accessible_dma_pool) { ··· 4449 4449 case GOYA_ASYNC_EVENT_ID_AXI_ECC: 4450 4450 case GOYA_ASYNC_EVENT_ID_L2_RAM_ECC: 4451 4451 case GOYA_ASYNC_EVENT_ID_PSOC_GPIO_05_SW_RESET: 4452 - case GOYA_ASYNC_EVENT_ID_PSOC_GPIO_10_VRHOT_ICRIT: 4453 4452 goya_print_irq_info(hdev, event_type, false); 4454 4453 hl_device_reset(hdev, true, false); 4455 4454 break; ··· 4484 4485 goya_unmask_irq(hdev, event_type); 4485 4486 break; 4486 4487 4488 + case GOYA_ASYNC_EVENT_ID_PSOC_GPIO_10_VRHOT_ICRIT: 4487 4489 case GOYA_ASYNC_EVENT_ID_TPC0_BMON_SPMU: 4488 4490 case GOYA_ASYNC_EVENT_ID_TPC1_BMON_SPMU: 4489 4491 case GOYA_ASYNC_EVENT_ID_TPC2_BMON_SPMU:
+3
drivers/misc/mei/hw-me-regs.h
··· 81 81 82 82 #define MEI_DEV_ID_ICP_LP 0x34E0 /* Ice Lake Point LP */ 83 83 84 + #define MEI_DEV_ID_MCC 0x4B70 /* Mule Creek Canyon (EHL) */ 85 + #define MEI_DEV_ID_MCC_4 0x4B75 /* Mule Creek Canyon 4 (EHL) */ 86 + 84 87 /* 85 88 * MEI HW Section 86 89 */
+3
drivers/misc/mei/pci-me.c
··· 98 98 99 99 {MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)}, 100 100 101 + {MEI_PCI_DEVICE(MEI_DEV_ID_MCC, MEI_ME_PCH12_CFG)}, 102 + {MEI_PCI_DEVICE(MEI_DEV_ID_MCC_4, MEI_ME_PCH8_CFG)}, 103 + 101 104 /* required last entry */ 102 105 {0, } 103 106 };
+4 -1
lib/test_firmware.c
··· 886 886 return -ENOMEM; 887 887 888 888 rc = __test_firmware_config_init(); 889 - if (rc) 889 + if (rc) { 890 + kfree(test_fw_config); 891 + pr_err("could not init firmware test config: %d\n", rc); 890 892 return rc; 893 + } 891 894 892 895 rc = misc_register(&test_fw_misc_device); 893 896 if (rc) {