tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'mhi-ath11k-immutable' into mhi-next

Manivannan Sadhasivam 7b7e4cee 6cc17161

+6 -16
-9
drivers/bus/mhi/core/init.c
··· 758 758 mhi_chan->offload_ch = ch_cfg->offload_channel; 759 759 mhi_chan->db_cfg.reset_req = ch_cfg->doorbell_mode_switch; 760 760 mhi_chan->pre_alloc = ch_cfg->auto_queue; 761 - mhi_chan->auto_start = ch_cfg->auto_start; 762 761 763 762 /* 764 763 * If MHI host allocates buffers, then the channel direction ··· 1168 1169 goto exit_probe; 1169 1170 1170 1171 ul_chan->xfer_cb = mhi_drv->ul_xfer_cb; 1171 - if (ul_chan->auto_start) { 1172 - ret = mhi_prepare_channel(mhi_cntrl, ul_chan); 1173 - if (ret) 1174 - goto exit_probe; 1175 - } 1176 1172 } 1177 1173 1178 1174 ret = -EINVAL; ··· 1200 1206 ret = mhi_drv->probe(mhi_dev, mhi_dev->id); 1201 1207 if (ret) 1202 1208 goto exit_probe; 1203 - 1204 - if (dl_chan && dl_chan->auto_start) 1205 - mhi_prepare_channel(mhi_cntrl, dl_chan); 1206 1209 1207 1210 mhi_device_put(mhi_dev); 1208 1211
-1
drivers/bus/mhi/core/internal.h
··· 563 563 bool configured; 564 564 bool offload_ch; 565 565 bool pre_alloc; 566 - bool auto_start; 567 566 bool wake_capable; 568 567 }; 569 568
-4
drivers/net/wireless/ath/ath11k/mhi.c
··· 24 24 .offload_channel = false, 25 25 .doorbell_mode_switch = false, 26 26 .auto_queue = false, 27 - .auto_start = false, 28 27 }, 29 28 { 30 29 .num = 1, ··· 38 39 .offload_channel = false, 39 40 .doorbell_mode_switch = false, 40 41 .auto_queue = false, 41 - .auto_start = false, 42 42 }, 43 43 { 44 44 .num = 20, ··· 52 54 .offload_channel = false, 53 55 .doorbell_mode_switch = false, 54 56 .auto_queue = false, 55 - .auto_start = true, 56 57 }, 57 58 { 58 59 .num = 21, ··· 66 69 .offload_channel = false, 67 70 .doorbell_mode_switch = false, 68 71 .auto_queue = true, 69 - .auto_start = true, 70 72 }, 71 73 }; 72 74
-2
include/linux/mhi.h
··· 214 214 * @offload_channel: The client manages the channel completely 215 215 * @doorbell_mode_switch: Channel switches to doorbell mode on M0 transition 216 216 * @auto_queue: Framework will automatically queue buffers for DL traffic 217 - * @auto_start: Automatically start (open) this channel 218 217 * @wake-capable: Channel capable of waking up the system 219 218 */ 220 219 struct mhi_channel_config { ··· 231 232 bool offload_channel; 232 233 bool doorbell_mode_switch; 233 234 bool auto_queue; 234 - bool auto_start; 235 235 bool wake_capable; 236 236 }; 237 237
+6
net/qrtr/mhi.c
··· 76 76 struct qrtr_mhi_dev *qdev; 77 77 int rc; 78 78 79 + /* start channels */ 80 + rc = mhi_prepare_for_transfer(mhi_dev); 81 + if (rc) 82 + return rc; 83 + 79 84 qdev = devm_kzalloc(&mhi_dev->dev, sizeof(*qdev), GFP_KERNEL); 80 85 if (!qdev) 81 86 return -ENOMEM; ··· 104 99 struct qrtr_mhi_dev *qdev = dev_get_drvdata(&mhi_dev->dev); 105 100 106 101 qrtr_endpoint_unregister(&qdev->ep); 102 + mhi_unprepare_from_transfer(mhi_dev); 107 103 dev_set_drvdata(&mhi_dev->dev, NULL); 108 104 } 109 105