Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7beb599 authored by Andrei Danaila's avatar Andrei Danaila Committed by Matt Wagantall
Browse files

mhi: core: Necessary changes for 64 bit 



Necessary changes for 64 bit compilation on the 3.18
kernel.

Signed-off-by: default avatarAndrei Danaila <adanaila@codeaurora.org>
parent 30c6a704

drivers/platform/msm/mhi/mhi.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/cdev.h>

#include <linux/msm_pcie.h>

#include <linux/sched.h>

#include <linux/irqreturn.h>



extern struct mhi_pcie_devices mhi_devices;

drivers/platform/msm/mhi/mhi_iface.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ int mhi_ctxt_init(struct mhi_pcie_dev_info *mhi_pcie_dev) 
	}



	device_disable_async_suspend(&pcie_device->dev);

	ret_val = pci_enable_msi_block(pcie_device, msi_number);

	ret_val = pci_enable_msi_range(pcie_device, 0, msi_number);

	if (0 != ret_val) {

		mhi_log(MHI_MSG_ERROR,

			"Failed to enable MSIs for pcie dev ret_val %d.\n",

drivers/platform/msm/mhi/mhi_init.c

+3 −2
Original line number Diff line number Diff line
@@ -285,13 +285,14 @@ static enum MHI_STATUS mhi_init_wakelock(struct mhi_device_ctxt *mhi_dev_ctxt) 
static enum MHI_STATUS mhi_init_contexts(struct mhi_device_ctxt *mhi_dev_ctxt)

{

	int r = 0;

	u64 phy_cmd_trb_addr;



	struct mhi_control_seg *mhi_ctrl = mhi_dev_ctxt->mhi_ctrl_seg;



	r = init_event_ctxt_array(mhi_dev_ctxt);

	if (r)

		return MHI_STATUS_ERROR;



	u64 phy_cmd_trb_addr;

	init_ecabap(mhi_dev_ctxt);

	/* Init Command Ring */

	phy_cmd_trb_addr =

	((uintptr_t)mhi_dev_ctxt->mhi_ctrl_seg->cmd_trb_list[PRIMARY_CMD_RING] -

drivers/platform/msm/mhi/mhi_isr.c

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 * GNU General Public License for more details.

 */

#include <linux/interrupt.h>

#include <linux/irqreturn.h>



#include "mhi_sys.h"

#include "mhi_trace.h"

drivers/platform/msm/mhi/mhi_main.c

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static void mhi_update_ctxt(struct mhi_device_ctxt *mhi_dev_ctxt, 
int mhi_init_pcie_device(struct mhi_pcie_dev_info *mhi_pcie_dev)

{

	int ret_val = 0;

	long int sleep_time = 100000;

	long int sleep_time = 100;

	struct pci_dev *pcie_device =

			(struct pci_dev *)mhi_pcie_dev->pcie_device;

	do {
@@ -74,7 +74,7 @@ int mhi_init_pcie_device(struct mhi_pcie_dev_info *mhi_pcie_dev) 
			mhi_log(MHI_MSG_ERROR,

				"Sleeping for ~ %li uS, and retrying.\n",

				sleep_time);

			usleep(sleep_time);

			msleep(sleep_time);

		}

	} while (ret_val != 0);