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.19-rc3-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver fixes for real from Greg KH:
"Let's tag the proper branch this time...

Here are some small char/misc driver fixes for 5.19-rc3 that resolve
some reported issues.

They include:

- mei driver fixes

- comedi driver fix

- rtsx build warning fix

- fsl-mc-bus driver fix

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

This is what the merge in commit f0ec9c65a8d6 _should_ have merged, but
Greg fat-fingered the pull request and I got some small changes from
linux-next instead there. Credit to Nathan Chancellor for eagle-eyes.

Link: https://lore.kernel.org/all/Yqywy+Md2AfGDu8v@dev-arch.thelio-3990X/

* tag 'char-misc-5.19-rc3-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
bus: fsl-mc-bus: fix KASAN use-after-free in fsl_mc_bus_remove()
mei: me: add raptor lake point S DID
mei: hbm: drop capability response on early shutdown
mei: me: set internal pg flag to off on hardware reset
misc: rtsx: Fix clang -Wsometimes-uninitialized in rts5261_init_from_hw()
comedi: vmk80xx: fix expression for tx buffer size

Linus Torvalds bc94632c ee4eb6ee

+14 -5
+3 -3
drivers/bus/fsl-mc/fsl-mc-bus.c
··· 1239 1239 static int fsl_mc_bus_remove(struct platform_device *pdev) 1240 1240 { 1241 1241 struct fsl_mc *mc = platform_get_drvdata(pdev); 1242 + struct fsl_mc_io *mc_io; 1242 1243 1243 1244 if (!fsl_mc_is_root_dprc(&mc->root_mc_bus_dev->dev)) 1244 1245 return -EINVAL; 1245 1246 1247 + mc_io = mc->root_mc_bus_dev->mc_io; 1246 1248 fsl_mc_device_remove(mc->root_mc_bus_dev); 1247 - 1248 - fsl_destroy_mc_io(mc->root_mc_bus_dev->mc_io); 1249 - mc->root_mc_bus_dev->mc_io = NULL; 1249 + fsl_destroy_mc_io(mc_io); 1250 1250 1251 1251 bus_unregister_notifier(&fsl_mc_bus_type, &fsl_mc_nb); 1252 1252
+1 -1
drivers/comedi/drivers/vmk80xx.c
··· 684 684 if (!devpriv->usb_rx_buf) 685 685 return -ENOMEM; 686 686 687 - size = max(usb_endpoint_maxp(devpriv->ep_rx), MIN_BUF_SIZE); 687 + size = max(usb_endpoint_maxp(devpriv->ep_tx), MIN_BUF_SIZE); 688 688 devpriv->usb_tx_buf = kzalloc(size, GFP_KERNEL); 689 689 if (!devpriv->usb_tx_buf) 690 690 return -ENOMEM;
+2
drivers/misc/cardreader/rts5261.c
··· 407 407 // default 408 408 setting_reg1 = PCR_SETTING_REG1; 409 409 setting_reg2 = PCR_SETTING_REG2; 410 + } else { 411 + return; 410 412 } 411 413 412 414 pci_read_config_dword(pdev, setting_reg2, &lval2);
+2 -1
drivers/misc/mei/hbm.c
··· 1351 1351 1352 1352 if (dev->dev_state != MEI_DEV_INIT_CLIENTS || 1353 1353 dev->hbm_state != MEI_HBM_CAP_SETUP) { 1354 - if (dev->dev_state == MEI_DEV_POWER_DOWN) { 1354 + if (dev->dev_state == MEI_DEV_POWER_DOWN || 1355 + dev->dev_state == MEI_DEV_POWERING_DOWN) { 1355 1356 dev_dbg(dev->dev, "hbm: capabilities response: on shutdown, ignoring\n"); 1356 1357 return 0; 1357 1358 }
+2
drivers/misc/mei/hw-me-regs.h
··· 109 109 #define MEI_DEV_ID_ADP_P 0x51E0 /* Alder Lake Point P */ 110 110 #define MEI_DEV_ID_ADP_N 0x54E0 /* Alder Lake Point N */ 111 111 112 + #define MEI_DEV_ID_RPL_S 0x7A68 /* Raptor Lake Point S */ 113 + 112 114 /* 113 115 * MEI HW Section 114 116 */
+2
drivers/misc/mei/hw-me.c
··· 1154 1154 ret = mei_me_d0i3_exit_sync(dev); 1155 1155 if (ret) 1156 1156 return ret; 1157 + } else { 1158 + hw->pg_state = MEI_PG_OFF; 1157 1159 } 1158 1160 } 1159 1161
+2
drivers/misc/mei/pci-me.c
··· 116 116 {MEI_PCI_DEVICE(MEI_DEV_ID_ADP_P, MEI_ME_PCH15_CFG)}, 117 117 {MEI_PCI_DEVICE(MEI_DEV_ID_ADP_N, MEI_ME_PCH15_CFG)}, 118 118 119 + {MEI_PCI_DEVICE(MEI_DEV_ID_RPL_S, MEI_ME_PCH15_CFG)}, 120 + 119 121 /* required last entry */ 120 122 {0, } 121 123 };