Commit 1dfa2e77 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-5.13-rc6' 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 misc driver fixes for 5.13-rc6 that fix some
  reported problems:

   - Tiny phy driver fixes for reported issues

   - rtsx regression for when the device suspended

   - mhi driver fix for a use-after-free

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

* tag 'char-misc-5.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  misc: rtsx: separate aspm mode into MODE_REG and MODE_CFG
  bus: mhi: pci-generic: Fix hibernation
  bus: mhi: pci_generic: Fix possible use-after-free in mhi_pci_remove()
  bus: mhi: pci_generic: T99W175: update channel name from AT to DUN
  phy: Sparx5 Eth SerDes: check return value after calling platform_get_resource()
  phy: ralink: phy-mt7621-pci: drop 'of_match_ptr' to fix -Wunused-const-variable
  phy: ti: Fix an error code in wiz_probe()
  phy: phy-mtk-tphy: Fix some resource leaks in mtk_phy_init()
  phy: cadence: Sierra: Fix error return code in cdns_sierra_phy_probe()
  phy: usb: Fix misuse of IS_ENABLED
parents 141415d7 3df4fce7

drivers/bus/mhi/pci_generic.c

+38 −4
Original line number Diff line number Diff line
@@ -311,8 +311,8 @@ static const struct mhi_channel_config mhi_foxconn_sdx55_channels[] = { 
	MHI_CHANNEL_CONFIG_DL(5, "DIAG", 32, 1),

	MHI_CHANNEL_CONFIG_UL(12, "MBIM", 32, 0),

	MHI_CHANNEL_CONFIG_DL(13, "MBIM", 32, 0),

	MHI_CHANNEL_CONFIG_UL(32, "AT", 32, 0),

	MHI_CHANNEL_CONFIG_DL(33, "AT", 32, 0),

	MHI_CHANNEL_CONFIG_UL(32, "DUN", 32, 0),

	MHI_CHANNEL_CONFIG_DL(33, "DUN", 32, 0),

	MHI_CHANNEL_CONFIG_HW_UL(100, "IP_HW0_MBIM", 128, 2),

	MHI_CHANNEL_CONFIG_HW_DL(101, "IP_HW0_MBIM", 128, 3),

};
@@ -708,7 +708,7 @@ static void mhi_pci_remove(struct pci_dev *pdev) 
	struct mhi_pci_device *mhi_pdev = pci_get_drvdata(pdev);

	struct mhi_controller *mhi_cntrl = &mhi_pdev->mhi_cntrl;



	del_timer(&mhi_pdev->health_check_timer);

	del_timer_sync(&mhi_pdev->health_check_timer);

	cancel_work_sync(&mhi_pdev->recovery_work);



	if (test_and_clear_bit(MHI_PCI_DEV_STARTED, &mhi_pdev->status)) {
@@ -935,9 +935,43 @@ static int __maybe_unused mhi_pci_resume(struct device *dev) 
	return ret;

}



static int __maybe_unused mhi_pci_freeze(struct device *dev)

{

	struct mhi_pci_device *mhi_pdev = dev_get_drvdata(dev);

	struct mhi_controller *mhi_cntrl = &mhi_pdev->mhi_cntrl;



	/* We want to stop all operations, hibernation does not guarantee that

	 * device will be in the same state as before freezing, especially if

	 * the intermediate restore kernel reinitializes MHI device with new

	 * context.

	 */

	if (test_and_clear_bit(MHI_PCI_DEV_STARTED, &mhi_pdev->status)) {

		mhi_power_down(mhi_cntrl, false);

		mhi_unprepare_after_power_down(mhi_cntrl);

	}



	return 0;

}



static int __maybe_unused mhi_pci_restore(struct device *dev)

{

	struct mhi_pci_device *mhi_pdev = dev_get_drvdata(dev);



	/* Reinitialize the device */

	queue_work(system_long_wq, &mhi_pdev->recovery_work);



	return 0;

}



static const struct dev_pm_ops mhi_pci_pm_ops = {

	SET_RUNTIME_PM_OPS(mhi_pci_runtime_suspend, mhi_pci_runtime_resume, NULL)

	SET_SYSTEM_SLEEP_PM_OPS(mhi_pci_suspend, mhi_pci_resume)

#ifdef CONFIG_PM_SLEEP

	.suspend = mhi_pci_suspend,

	.resume = mhi_pci_resume,

	.freeze = mhi_pci_freeze,

	.thaw = mhi_pci_restore,

	.restore = mhi_pci_restore,

#endif

};



static struct pci_driver mhi_pci_driver = {

drivers/misc/cardreader/rtl8411.c

+1 −0
Original line number Diff line number Diff line
@@ -468,6 +468,7 @@ static void rtl8411_init_common_params(struct rtsx_pcr *pcr) 
	pcr->sd30_drive_sel_1v8 = DRIVER_TYPE_B;

	pcr->sd30_drive_sel_3v3 = DRIVER_TYPE_D;

	pcr->aspm_en = ASPM_L1_EN;

	pcr->aspm_mode = ASPM_MODE_CFG;

	pcr->tx_initial_phase = SET_CLOCK_PHASE(23, 7, 14);

	pcr->rx_initial_phase = SET_CLOCK_PHASE(4, 3, 10);

	pcr->ic_version = rtl8411_get_ic_version(pcr);

drivers/misc/cardreader/rts5209.c

+1 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ void rts5209_init_params(struct rtsx_pcr *pcr) 
	pcr->sd30_drive_sel_1v8 = DRIVER_TYPE_B;

	pcr->sd30_drive_sel_3v3 = DRIVER_TYPE_D;

	pcr->aspm_en = ASPM_L1_EN;

	pcr->aspm_mode = ASPM_MODE_CFG;

	pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 27, 16);

	pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5);

drivers/misc/cardreader/rts5227.c

+2 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ void rts5227_init_params(struct rtsx_pcr *pcr) 
	pcr->sd30_drive_sel_1v8 = CFG_DRIVER_TYPE_B;

	pcr->sd30_drive_sel_3v3 = CFG_DRIVER_TYPE_B;

	pcr->aspm_en = ASPM_L1_EN;

	pcr->aspm_mode = ASPM_MODE_CFG;

	pcr->tx_initial_phase = SET_CLOCK_PHASE(27, 27, 15);

	pcr->rx_initial_phase = SET_CLOCK_PHASE(30, 7, 7);
@@ -483,6 +484,7 @@ void rts522a_init_params(struct rtsx_pcr *pcr) 


	rts5227_init_params(pcr);

	pcr->ops = &rts522a_pcr_ops;

	pcr->aspm_mode = ASPM_MODE_REG;

	pcr->tx_initial_phase = SET_CLOCK_PHASE(20, 20, 11);

	pcr->reg_pm_ctrl3 = RTS522A_PM_CTRL3;

drivers/misc/cardreader/rts5228.c

+1 −0
Original line number Diff line number Diff line
@@ -718,6 +718,7 @@ void rts5228_init_params(struct rtsx_pcr *pcr) 
	pcr->sd30_drive_sel_1v8 = CFG_DRIVER_TYPE_B;

	pcr->sd30_drive_sel_3v3 = CFG_DRIVER_TYPE_B;

	pcr->aspm_en = ASPM_L1_EN;

	pcr->aspm_mode = ASPM_MODE_REG;

	pcr->tx_initial_phase = SET_CLOCK_PHASE(28, 27, 11);

	pcr->rx_initial_phase = SET_CLOCK_PHASE(24, 6, 5);