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

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

Merge "mhi: dev: uci: exit immediately if MHI channel is in disabled state"

parents ee690bb3 5fa6ccab

arch/arm64/boot/dts/qcom/sm8150-mhi.dtsi

+5 −49
Original line number Diff line number Diff line
@@ -324,33 +324,10 @@ 
				mhi,ee = <2>;

			};



			mhi_chan@100 {

				reg = <100>;

				label = "IP_HW0";

				mhi,num-elements = <512>;

				mhi,event-ring = <4>;

				mhi,chan-dir = <1>;

				mhi,data-type = <1>;

				mhi,doorbell-mode = <3>;

				mhi,ee = <2>;

				mhi,db-mode-switch;

			};



			mhi_chan@101 {

				reg = <101>;

				label = "IP_HW0";

				mhi,num-elements = <512>;

				mhi,event-ring = <5>;

				mhi,chan-dir = <2>;

				mhi,data-type = <1>;

				mhi,doorbell-mode = <3>;

				mhi,ee = <2>;

			};



			mhi_chan@104 {

				reg = <104>;

				label = "IP_HW_OFFLOAD_0";

				mhi,event-ring = <6>;

				mhi,event-ring = <4>;

				mhi,chan-dir = <1>;

				mhi,data-type = <3>;

				mhi,ee = <2>;
@@ -360,7 +337,7 @@ 
			mhi_chan@105 {

				reg = <105>;

				label = "IP_HW_OFFLOAD_0";

				mhi,event-ring = <7>;

				mhi,event-ring = <5>;

				mhi,chan-dir = <2>;

				mhi,data-type = <3>;

				mhi,ee = <2>;
@@ -402,30 +379,9 @@ 
			};



			mhi_event@4 {

				mhi,num-elements = <1024>;

				mhi,intmod = <5>;

				mhi,msi = <5>;

				mhi,chan = <100>;

				mhi,priority = <1>;

				mhi,brstmode = <3>;

				mhi,hw-ev;

			};



			mhi_event@5 {

				mhi,num-elements = <1024>;

				mhi,intmod = <5>;

				mhi,msi = <6>;

				mhi,chan = <101>;

				mhi,priority = <1>;

				mhi,brstmode = <3>;

				mhi,hw-ev;

				mhi,client-manage;

			};



			mhi_event@6 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <7>;

				mhi,msi = <5>;

				mhi,chan = <104>;

				mhi,priority = <1>;

				mhi,brstmode = <3>;
@@ -434,10 +390,10 @@ 
				mhi,offload;

			};



			mhi_event@7 {

			mhi_event@5 {

				mhi,num-elements = <0>;

				mhi,intmod = <0>;

				mhi,msi = <8>;

				mhi,msi = <6>;

				mhi,chan = <105>;

				mhi,priority = <1>;

				mhi,brstmode = <3>;

drivers/bus/mhi/core/mhi_pm.c

+3 −0
Original line number Diff line number Diff line
@@ -777,6 +777,9 @@ void mhi_pm_st_worker(struct work_struct *work) 
		case MHI_ST_TRANSITION_AMSS:

			mhi_pm_amss_transition(mhi_cntrl);

			break;

		case MHI_ST_TRANSITION_READY:

			mhi_ready_state_transition(mhi_cntrl);

			break;

		default:

			break;

		}

drivers/bus/mhi/devices/mhi_uci.c

+2 −2
Original line number Diff line number Diff line
@@ -278,8 +278,8 @@ static ssize_t mhi_uci_write(struct file *file, 
			(nr_avail = mhi_get_no_free_descriptors(mhi_dev,

							DMA_TO_DEVICE)) > 0);



		if (ret == -ERESTARTSYS) {

			MSG_LOG("Exit signal caught for node\n");

		if (ret == -ERESTARTSYS || !uci_dev->enabled) {

			MSG_LOG("Exit signal caught for node or not enabled\n");

			return -ERESTARTSYS;

		}