Commit d28b0977 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'mhi-for-v6.16' of... 

Merge tag 'mhi-for-v6.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mani/mhi into char-misc-next

Manivannan writes:

MHI Host
========

- Fix conflict between MHI power up and SYSERR state transitions by issuing MHI
  reset only if the device is in SYSERR state while in SBL/PBL EEs. The device
  won't respond to reset if it is not in SYSERR state in SBL/PBL EEs.

- Remove redundant call to pci_assign_resource() since PCI core calls this API
  internally.

- Add Telit FN920C04 modem which is based on Qcom SDX35 chipset.

* tag 'mhi-for-v6.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mani/mhi:
  bus: mhi: host: pci_generic: Add Telit FN920C04 modem support
  bus: mhi: host: pci_generic: Remove redundant assign resource usage
  bus: mhi: host: Fix conflict between power_up and SYSERR
parents 2b0634cc 6348f62e

drivers/bus/mhi/host/pci_generic.c

+39 −4
Original line number Diff line number Diff line
@@ -782,6 +782,42 @@ static const struct mhi_pci_dev_info mhi_telit_fe990a_info = { 
	.mru_default = 32768,

};



static const struct mhi_channel_config mhi_telit_fn920c04_channels[] = {

	MHI_CHANNEL_CONFIG_UL_SBL(2, "SAHARA", 32, 0),

	MHI_CHANNEL_CONFIG_DL_SBL(3, "SAHARA", 32, 0),

	MHI_CHANNEL_CONFIG_UL(4, "DIAG", 64, 1),

	MHI_CHANNEL_CONFIG_DL(5, "DIAG", 64, 1),

	MHI_CHANNEL_CONFIG_UL(14, "QMI", 32, 0),

	MHI_CHANNEL_CONFIG_DL(15, "QMI", 32, 0),

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

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

	MHI_CHANNEL_CONFIG_UL_FP(34, "FIREHOSE", 32, 0),

	MHI_CHANNEL_CONFIG_DL_FP(35, "FIREHOSE", 32, 0),

	MHI_CHANNEL_CONFIG_UL(92, "DUN2", 32, 1),

	MHI_CHANNEL_CONFIG_DL(93, "DUN2", 32, 1),

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

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

};



static const struct mhi_controller_config modem_telit_fn920c04_config = {

	.max_channels = 128,

	.timeout_ms = 50000,

	.num_channels = ARRAY_SIZE(mhi_telit_fn920c04_channels),

	.ch_cfg = mhi_telit_fn920c04_channels,

	.num_events = ARRAY_SIZE(mhi_telit_fn990_events),

	.event_cfg = mhi_telit_fn990_events,

};



static const struct mhi_pci_dev_info mhi_telit_fn920c04_info = {

	.name = "telit-fn920c04",

	.config = &modem_telit_fn920c04_config,

	.bar_num = MHI_PCI_DEFAULT_BAR_NUM,

	.dma_data_width = 32,

	.sideband_wake = false,

	.mru_default = 32768,

	.edl_trigger = true,

};



static const struct mhi_pci_dev_info mhi_netprisma_lcur57_info = {

	.name = "netprisma-lcur57",

	.edl = "qcom/prog_firehose_sdx24.mbn",
@@ -806,6 +842,9 @@ static const struct mhi_pci_dev_info mhi_netprisma_fcun69_info = { 
static const struct pci_device_id mhi_pci_id_table[] = {

	{PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0116),

		.driver_data = (kernel_ulong_t) &mhi_qcom_sa8775p_info },

	/* Telit FN920C04 (sdx35) */

	{PCI_DEVICE_SUB(PCI_VENDOR_ID_QCOM, 0x011a, 0x1c5d, 0x2020),

		.driver_data = (kernel_ulong_t) &mhi_telit_fn920c04_info },

	{ PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0304),

		.driver_data = (kernel_ulong_t) &mhi_qcom_sdx24_info },

	{ PCI_DEVICE_SUB(PCI_VENDOR_ID_QCOM, 0x0306, PCI_VENDOR_ID_QCOM, 0x010c),
@@ -996,10 +1035,6 @@ static int mhi_pci_claim(struct mhi_controller *mhi_cntrl, 
	struct pci_dev *pdev = to_pci_dev(mhi_cntrl->cntrl_dev);

	int err;



	err = pci_assign_resource(pdev, bar_num);

	if (err)

		return err;



	err = pcim_enable_device(pdev);

	if (err) {

		dev_err(&pdev->dev, "failed to enable pci device: %d\n", err);

drivers/bus/mhi/host/pm.c

+17 −1
Original line number Diff line number Diff line
@@ -602,6 +602,7 @@ static void mhi_pm_sys_error_transition(struct mhi_controller *mhi_cntrl) 
	struct mhi_cmd *mhi_cmd;

	struct mhi_event_ctxt *er_ctxt;

	struct device *dev = &mhi_cntrl->mhi_dev->dev;

	bool reset_device = false;

	int ret, i;



	dev_dbg(dev, "Transitioning from PM state: %s to: %s\n",
@@ -630,8 +631,23 @@ static void mhi_pm_sys_error_transition(struct mhi_controller *mhi_cntrl) 
	/* Wake up threads waiting for state transition */

	wake_up_all(&mhi_cntrl->state_event);



	/* Trigger MHI RESET so that the device will not access host memory */

	if (MHI_REG_ACCESS_VALID(prev_state)) {

		/*

		 * If the device is in PBL or SBL, it will only respond to

		 * RESET if the device is in SYSERR state. SYSERR might

		 * already be cleared at this point.

		 */

		enum mhi_state cur_state = mhi_get_mhi_state(mhi_cntrl);

		enum mhi_ee_type cur_ee = mhi_get_exec_env(mhi_cntrl);



		if (cur_state == MHI_STATE_SYS_ERR)

			reset_device = true;

		else if (cur_ee != MHI_EE_PBL && cur_ee != MHI_EE_SBL)

			reset_device = true;

	}



	/* Trigger MHI RESET so that the device will not access host memory */

	if (reset_device) {

		u32 in_reset = -1;

		unsigned long timeout = msecs_to_jiffies(mhi_cntrl->timeout_ms);