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

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

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

Manivannan writes:

MHI Host
========

- Remove unused mhi_device_get() and mhi_queue_dma() APIs.

- Add support for SA8775p MHI endpoint device with IP_SW0 channel.

- Fix the race between mhi_unprepare_from_transfer() and mhi_queue_buf().

* tag 'mhi-for-v6.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mani/mhi:
  bus: mhi: host: Fix race between unprepare and queue_buf
  bus: mhi: host: pci_generic: Add support for SA8775P endpoint
  bus: mhi: host: Remove unused functions
parents a425990f 0686a818

drivers/bus/mhi/host/main.c

+10 −25
Original line number Diff line number Diff line
@@ -1181,25 +1181,6 @@ int mhi_queue_skb(struct mhi_device *mhi_dev, enum dma_data_direction dir, 
}

EXPORT_SYMBOL_GPL(mhi_queue_skb);



int mhi_queue_dma(struct mhi_device *mhi_dev, enum dma_data_direction dir,

		  struct mhi_buf *mhi_buf, size_t len, enum mhi_flags mflags)

{

	struct mhi_chan *mhi_chan = (dir == DMA_TO_DEVICE) ? mhi_dev->ul_chan :

							     mhi_dev->dl_chan;

	struct mhi_buf_info buf_info = { };



	buf_info.p_addr = mhi_buf->dma_addr;

	buf_info.cb_buf = mhi_buf;

	buf_info.pre_mapped = true;

	buf_info.len = len;



	if (unlikely(mhi_chan->pre_alloc))

		return -EINVAL;



	return mhi_queue(mhi_dev, &buf_info, dir, mflags);

}

EXPORT_SYMBOL_GPL(mhi_queue_dma);



int mhi_gen_tre(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan,

			struct mhi_buf_info *info, enum mhi_flags flags)

{
@@ -1207,11 +1188,16 @@ int mhi_gen_tre(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan, 
	struct mhi_ring_element *mhi_tre;

	struct mhi_buf_info *buf_info;

	int eot, eob, chain, bei;

	int ret;

	int ret = 0;



	/* Protect accesses for reading and incrementing WP */

	write_lock_bh(&mhi_chan->lock);



	if (mhi_chan->ch_state != MHI_CH_STATE_ENABLED) {

		ret = -ENODEV;

		goto out;

	}



	buf_ring = &mhi_chan->buf_ring;

	tre_ring = &mhi_chan->tre_ring;
@@ -1229,10 +1215,8 @@ int mhi_gen_tre(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan, 


	if (!info->pre_mapped) {

		ret = mhi_cntrl->map_single(mhi_cntrl, buf_info);

		if (ret) {

			write_unlock_bh(&mhi_chan->lock);

			return ret;

		}

		if (ret)

			goto out;

	}



	eob = !!(flags & MHI_EOB);
@@ -1250,9 +1234,10 @@ int mhi_gen_tre(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan, 
	mhi_add_ring_element(mhi_cntrl, tre_ring);

	mhi_add_ring_element(mhi_cntrl, buf_ring);



out:

	write_unlock_bh(&mhi_chan->lock);



	return 0;

	return ret;

}



int mhi_queue_buf(struct mhi_device *mhi_dev, enum dma_data_direction dir,

drivers/bus/mhi/host/pci_generic.c

+34 −0
Original line number Diff line number Diff line
@@ -297,6 +297,19 @@ static const struct mhi_pci_dev_info mhi_qcom_qdu100_info = { 
	.sideband_wake = false,

};



static const struct mhi_channel_config mhi_qcom_sa8775p_channels[] = {

	MHI_CHANNEL_CONFIG_UL(46, "IP_SW0", 2048, 1),

	MHI_CHANNEL_CONFIG_DL(47, "IP_SW0", 2048, 2),

};



static struct mhi_event_config mhi_qcom_sa8775p_events[] = {

	/* first ring is control+data ring */

	MHI_EVENT_CONFIG_CTRL(0, 64),

	/* Software channels dedicated event ring */

	MHI_EVENT_CONFIG_SW_DATA(1, 64),

	MHI_EVENT_CONFIG_SW_DATA(2, 64),

};



static const struct mhi_channel_config modem_qcom_v1_mhi_channels[] = {

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

	MHI_CHANNEL_CONFIG_DL(5, "DIAG", 16, 1),
@@ -327,6 +340,15 @@ static struct mhi_event_config modem_qcom_v1_mhi_events[] = { 
	MHI_EVENT_CONFIG_HW_DATA(5, 2048, 101)

};



static const struct mhi_controller_config mhi_qcom_sa8775p_config = {

	.max_channels = 128,

	.timeout_ms = 8000,

	.num_channels = ARRAY_SIZE(mhi_qcom_sa8775p_channels),

	.ch_cfg = mhi_qcom_sa8775p_channels,

	.num_events = ARRAY_SIZE(mhi_qcom_sa8775p_events),

	.event_cfg = mhi_qcom_sa8775p_events,

};



static const struct mhi_controller_config modem_qcom_v2_mhiv_config = {

	.max_channels = 128,

	.timeout_ms = 8000,
@@ -346,6 +368,16 @@ static const struct mhi_controller_config modem_qcom_v1_mhiv_config = { 
	.event_cfg = modem_qcom_v1_mhi_events,

};



static const struct mhi_pci_dev_info mhi_qcom_sa8775p_info = {

	.name = "qcom-sa8775p",

	.edl_trigger = false,

	.config = &mhi_qcom_sa8775p_config,

	.bar_num = MHI_PCI_DEFAULT_BAR_NUM,

	.dma_data_width = 32,

	.mru_default = 32768,

	.sideband_wake = false,

};



static const struct mhi_pci_dev_info mhi_qcom_sdx75_info = {

	.name = "qcom-sdx75m",

	.fw = "qcom/sdx75m/xbl.elf",
@@ -772,6 +804,8 @@ static const struct mhi_pci_dev_info mhi_netprisma_fcun69_info = { 


/* Keep the list sorted based on the PID. New VID should be added as the last entry */

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 },

	{ 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),

drivers/bus/mhi/host/pm.c

+0 −14
Original line number Diff line number Diff line
@@ -1296,20 +1296,6 @@ int mhi_force_rddm_mode(struct mhi_controller *mhi_cntrl) 
}

EXPORT_SYMBOL_GPL(mhi_force_rddm_mode);



void mhi_device_get(struct mhi_device *mhi_dev)

{

	struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl;



	mhi_dev->dev_wake++;

	read_lock_bh(&mhi_cntrl->pm_lock);

	if (MHI_PM_IN_SUSPEND_STATE(mhi_cntrl->pm_state))

		mhi_trigger_resume(mhi_cntrl);



	mhi_cntrl->wake_get(mhi_cntrl, true);

	read_unlock_bh(&mhi_cntrl->pm_lock);

}

EXPORT_SYMBOL_GPL(mhi_device_get);



int mhi_device_get_sync(struct mhi_device *mhi_dev)

{

	struct mhi_controller *mhi_cntrl = mhi_dev->mhi_cntrl;

include/linux/mhi.h

+0 −18
Original line number Diff line number Diff line
@@ -720,12 +720,6 @@ enum mhi_state mhi_get_mhi_state(struct mhi_controller *mhi_cntrl); 
 */

void mhi_soc_reset(struct mhi_controller *mhi_cntrl);



/**

 * mhi_device_get - Disable device low power mode

 * @mhi_dev: Device associated with the channel

 */

void mhi_device_get(struct mhi_device *mhi_dev);



/**

 * mhi_device_get_sync - Disable device low power mode. Synchronously

 *                       take the controller out of suspended state
@@ -776,18 +770,6 @@ int mhi_prepare_for_transfer_autoqueue(struct mhi_device *mhi_dev); 
 */

void mhi_unprepare_from_transfer(struct mhi_device *mhi_dev);



/**

 * mhi_queue_dma - Send or receive DMA mapped buffers from client device

 *                 over MHI channel

 * @mhi_dev: Device associated with the channels

 * @dir: DMA direction for the channel

 * @mhi_buf: Buffer for holding the DMA mapped data

 * @len: Buffer length

 * @mflags: MHI transfer flags used for the transfer

 */

int mhi_queue_dma(struct mhi_device *mhi_dev, enum dma_data_direction dir,

		  struct mhi_buf *mhi_buf, size_t len, enum mhi_flags mflags);



/**

 * mhi_queue_buf - Send or receive raw buffers from client device over MHI

 *                 channel