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

Commit edb9c6ed authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: qrtr: Loop on mhi_dev_read_channel until it returns 0"

parents ace36422 1a79f258

arch/arm/configs/vendor/sdxprairie-perf_defconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -156,8 +156,10 @@ CONFIG_VLAN_8021Q=y 
CONFIG_NET_SCHED=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_PRIO=y

CONFIG_NET_SCH_PRIO=y

CONFIG_QRTR=y

CONFIG_QRTR=y

CONFIG_QRTR_NODE_ID=2

CONFIG_QRTR_SMD=y

CONFIG_QRTR_SMD=y

CONFIG_QRTR_MHI=y

CONFIG_QRTR_MHI=y

CONFIG_QRTR_MHI_DEV=y

CONFIG_BT=y

CONFIG_BT=y

# CONFIG_BT_BREDR is not set

# CONFIG_BT_BREDR is not set

# CONFIG_BT_LE is not set

# CONFIG_BT_LE is not set

arch/arm/configs/vendor/sdxprairie_defconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -156,8 +156,10 @@ CONFIG_VLAN_8021Q=y 
CONFIG_NET_SCHED=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_PRIO=y

CONFIG_NET_SCH_PRIO=y

CONFIG_QRTR=y

CONFIG_QRTR=y

CONFIG_QRTR_NODE_ID=2

CONFIG_QRTR_SMD=y

CONFIG_QRTR_SMD=y

CONFIG_QRTR_MHI=y

CONFIG_QRTR_MHI=y

CONFIG_QRTR_MHI_DEV=y

CONFIG_BT=y

CONFIG_BT=y

# CONFIG_BT_BREDR is not set

# CONFIG_BT_BREDR is not set

# CONFIG_BT_LE is not set

# CONFIG_BT_LE is not set

arch/arm64/boot/dts/qcom/sdxprairie.dtsi

+5 −0
Original line number Original line Diff line number Diff line
@@ -691,6 +691,11 @@ 
		};

		};

	};

	};





	qcom,mhi_dev_qrtr {

		compatible = "qcom,qrtr-mhi-dev";

		qcom,net-id = <3>;

	};



	qcom,glinkpkt {

	qcom,glinkpkt {

		compatible = "qcom,glinkpkt";

		compatible = "qcom,glinkpkt";

net/qrtr/Kconfig

+20 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,17 @@ config QRTR 




if QRTR

if QRTR





config QRTR_NODE_ID

	int "QRTR Local Node ID"

	default 1

	---help---

	  This option is used to configure the QRTR Node ID for the local

	  processor. The node ID published to other nodes within the system.

	  This value can be overridden by the name service application. This

	  option is for configurations where Node ID needs to be customized

	  but the name service application is not priveleged enough to use

	  netlink sockets.



config QRTR_SMD

config QRTR_SMD

	tristate "SMD IPC Router channels"

	tristate "SMD IPC Router channels"

	depends on RPMSG || (COMPILE_TEST && RPMSG=n)

	depends on RPMSG || (COMPILE_TEST && RPMSG=n)
@@ -40,4 +51,13 @@ config QRTR_FIFO 
	Say Y here to support FIFO based ipcrouter channels. FIFO Transport

	Say Y here to support FIFO based ipcrouter channels. FIFO Transport

	Layer enables IPC Router communication between two virtual machines.

	Layer enables IPC Router communication between two virtual machines.





config QRTR_MHI_DEV

	tristate "MHI Device IPC Router channels"

	depends on MSM_MHI_DEV || (COMPILE_TEST && MSM_MHI_DEV=n)

	---help---

	  Say Y here to support MHI base ipcrouter channels for device

	  endpoint mode.  MHI is the transport used for external modem

	  connections.  This driver enables QRTR to run on the modem device

	  side.



endif # QRTR
 
endif # QRTR

net/qrtr/Makefile

+3 −0
Original line number Original line Diff line number Diff line
@@ -11,3 +11,6 @@ qrtr-usb-y := usb.o 




obj-$(CONFIG_QRTR_FIFO) += qrtr-fifo.o

obj-$(CONFIG_QRTR_FIFO) += qrtr-fifo.o

qrtr-fifo-y	:= fifo.o

qrtr-fifo-y	:= fifo.o



obj-$(CONFIG_QRTR_MHI_DEV) += qrtr-mhi-dev.o

qrtr-mhi-dev-y	:= mhi_dev.o