History

Merge branch 'net-wwan-iosm-improvements'

M Chetan Kumar says: ==================== net: wwan: iosm: improvements This patch series brings in IOSM driver improvments. PATCH1: Set tx queue len. PATCH2: Release data channel if there is no active IP session. PATCH3: Removes dead code. PATCH4: Correct open parenthesis alignment. ====================

Jakub Kicinski committed 4 years ago

Commit 1868d992 parents 840ece1 dd464f17 files · +30 −33Browse files

Unified · Split

7 files
  1. drivers/net/wwan/iosm/iosm_ipc_imem.c +0 −1
  2. drivers/net/wwan/iosm/iosm_ipc_mmio.c +1 −1
  3. drivers/net/wwan/iosm/iosm_ipc_mux.c +18 −10
  4. drivers/net/wwan/iosm/iosm_ipc_mux.h +0 −1
  5. drivers/net/wwan/iosm/iosm_ipc_mux_codec.c +9 −9
  6. drivers/net/wwan/iosm/iosm_ipc_wwan.c +2 −1
  7. drivers/net/wwan/iosm/iosm_ipc_wwan.h +0 −10
drivers/net/wwan/iosm/iosm_ipc_imem.c+0−1
@@ -134,7 +134,6 @@ static int ipc_imem_setup_cp_mux_cap_init(struct iosm_imem *ipc_imem, · 133 unmodified lines
134134 * for channel alloc function.
135135 */
136136 cfg->instance_id = IPC_MEM_MUX_IP_CH_IF_ID;
137− cfg->nr_sessions = IPC_MEM_MUX_IP_SESSION_ENTRIES;
138137
139138 return 0;
140139 }
drivers/net/wwan/iosm/iosm_ipc_mmio.c+1−1
@@ -192,7 +192,7 @@ void ipc_mmio_config(struct iosm_mmio *ipc_mmio) · 191 unmodified lines
192192 iowrite64(0, ipc_mmio->base + ipc_mmio->offset.ap_win_end);
193193
194194 iowrite64(ipc_mmio->context_info_addr,
195− ipc_mmio->base + ipc_mmio->offset.context_info);
195+ ipc_mmio->base + ipc_mmio->offset.context_info);
196196 }
197197
198198 void ipc_mmio_set_psi_addr_and_size(struct iosm_mmio *ipc_mmio, dma_addr_t addr,
drivers/net/wwan/iosm/iosm_ipc_mux.c+18−10
@@ -97,7 +97,7 @@ static bool ipc_mux_session_open(struct iosm_mux *ipc_mux, · 96 unmodified lines
9797
9898 /* Search for a free session interface id. */
9999 if_id = le32_to_cpu(session_open->if_id);
100− if (if_id < 0 || if_id >= ipc_mux->nr_sessions) {
100+ if (if_id < 0 || if_id >= IPC_MEM_MUX_IP_SESSION_ENTRIES) {
101101 dev_err(ipc_mux->dev, "invalid interface id=%d", if_id);
102102 return false;
103103 }
@@ -129,6 +129,7 @@ static bool ipc_mux_session_open(struct iosm_mux *ipc_mux, · 25 unmodified lines
129129
130130 /* Save and return the assigned if id. */
131131 session_open->if_id = cpu_to_le32(if_id);
132+ ipc_mux->nr_sessions++;
132133
133134 return true;
134135 }
@@ -151,7 +152,7 @@ static void ipc_mux_session_close(struct iosm_mux *ipc_mux, · 16 unmodified lines
151152 /* Copy the session interface id. */
152153 if_id = le32_to_cpu(msg->if_id);
153154
154− if (if_id < 0 || if_id >= ipc_mux->nr_sessions) {
155+ if (if_id < 0 || if_id >= IPC_MEM_MUX_IP_SESSION_ENTRIES) {
155156 dev_err(ipc_mux->dev, "invalid session id %d", if_id);
156157 return;
157158 }
@@ -170,6 +171,7 @@ static void ipc_mux_session_close(struct iosm_mux *ipc_mux, · 12 unmodified lines
170171 ipc_mux->session[if_id].flow_ctl_mask = 0;
171172
172173 ipc_mux_session_reset(ipc_mux, if_id);
174+ ipc_mux->nr_sessions--;
173175 }
174176
175177 static void ipc_mux_channel_close(struct iosm_mux *ipc_mux,
@@ -178,7 +180,7 @@ static void ipc_mux_channel_close(struct iosm_mux *ipc_mux, · 2 unmodified lines
178180 int i;
179181
180182 /* Free pending session UL packet. */
181− for (i = 0; i < ipc_mux->nr_sessions; i++)
183+ for (i = 0; i < IPC_MEM_MUX_IP_SESSION_ENTRIES; i++)
182184 if (ipc_mux->session[i].wwan)
183185 ipc_mux_session_reset(ipc_mux, i);
184186
@@ -244,6 +246,11 @@ static int ipc_mux_schedule(struct iosm_mux *ipc_mux, union mux_msg *msg) · 59 unmodified lines
244246 /* Release an IP session. */
245247 ipc_mux->event = MUX_E_MUX_SESSION_CLOSE;
246248 ipc_mux_session_close(ipc_mux, &msg->session_close);
249+ if (!ipc_mux->nr_sessions) {
250+ ipc_mux->event = MUX_E_MUX_CHANNEL_CLOSE;
251+ ipc_mux_channel_close(ipc_mux,
252+ &msg->channel_close);
253+ }
247254 ret = ipc_mux->channel_id;
248255 goto out;
249256
@@ -281,7 +288,6 @@ struct iosm_mux *ipc_mux_init(struct ipc_mux_config *mux_cfg, · 31 unmodified lines
281288
282289 ipc_mux->protocol = mux_cfg->protocol;
283290 ipc_mux->ul_flow = mux_cfg->ul_flow;
284− ipc_mux->nr_sessions = mux_cfg->nr_sessions;
285291 ipc_mux->instance_id = mux_cfg->instance_id;
286292 ipc_mux->wwan_q_offset = 0;
287293
@@ -340,7 +346,7 @@ static void ipc_mux_restart_tx_for_all_sessions(struct iosm_mux *ipc_mux) · 52 unmodified lines
340346 struct mux_session *session;
341347 int idx;
342348
343− for (idx = 0; idx < ipc_mux->nr_sessions; idx++) {
349+ for (idx = 0; idx < IPC_MEM_MUX_IP_SESSION_ENTRIES; idx++) {
344350 session = &ipc_mux->session[idx];
345351
346352 if (!session->wwan)
@@ -365,7 +371,7 @@ static void ipc_mux_stop_netif_for_all_sessions(struct iosm_mux *ipc_mux) · 18 unmodified lines
365371 struct mux_session *session;
366372 int idx;
367373
368− for (idx = 0; idx < ipc_mux->nr_sessions; idx++) {
374+ for (idx = 0; idx < IPC_MEM_MUX_IP_SESSION_ENTRIES; idx++) {
369375 session = &ipc_mux->session[idx];
370376
371377 if (!session->wwan)
@@ -387,7 +393,7 @@ void ipc_mux_check_n_restart_tx(struct iosm_mux *ipc_mux) · 15 unmodified lines
387393
388394 int ipc_mux_get_max_sessions(struct iosm_mux *ipc_mux)
389395 {
390− return ipc_mux ? ipc_mux->nr_sessions : -EFAULT;
396+ return ipc_mux ? IPC_MEM_MUX_IP_SESSION_ENTRIES : -EFAULT;
391397 }
392398
393399 enum ipc_mux_protocol ipc_mux_get_active_protocol(struct iosm_mux *ipc_mux)
@@ -435,9 +441,11 @@ void ipc_mux_deinit(struct iosm_mux *ipc_mux) · 41 unmodified lines
435441 return;
436442 ipc_mux_stop_netif_for_all_sessions(ipc_mux);
437443
438− channel_close = &mux_msg.channel_close;
439− channel_close->event = MUX_E_MUX_CHANNEL_CLOSE;
440− ipc_mux_schedule(ipc_mux, &mux_msg);
444+ if (ipc_mux->state == MUX_S_ACTIVE) {
445+ channel_close = &mux_msg.channel_close;
446+ channel_close->event = MUX_E_MUX_CHANNEL_CLOSE;
447+ ipc_mux_schedule(ipc_mux, &mux_msg);
448+ }
441449
442450 /* Empty the ADB free list. */
443451 free_list = &ipc_mux->ul_adb.free_list;
drivers/net/wwan/iosm/iosm_ipc_mux.h+0−1
@@ -278,7 +278,6 @@ struct iosm_mux { · 277 unmodified lines
278278 struct ipc_mux_config {
279279 enum ipc_mux_protocol protocol;
280280 enum ipc_mux_ul_flow ul_flow;
281− int nr_sessions;
282281 int instance_id;
283282 };
284283
drivers/net/wwan/iosm/iosm_ipc_mux_codec.c+9−9
@@ -175,7 +175,7 @@ static int ipc_mux_dl_dlcmds_decode_process(struct iosm_mux *ipc_mux, · 174 unmodified lines
175175 switch (le32_to_cpu(cmdh->command_type)) {
176176 case MUX_LITE_CMD_FLOW_CTL:
177177
178− if (cmdh->if_id >= ipc_mux->nr_sessions) {
178+ if (cmdh->if_id >= IPC_MEM_MUX_IP_SESSION_ENTRIES) {
179179 dev_err(ipc_mux->dev, "if_id [%d] not valid",
180180 cmdh->if_id);
181181 return -EINVAL; /* No session interface id. */
@@ -307,13 +307,13 @@ static void ipc_mux_dl_fcth_decode(struct iosm_mux *ipc_mux, · 125 unmodified lines
307307 }
308308
309309 if_id = fct->if_id;
310− if (if_id >= ipc_mux->nr_sessions) {
310+ if (if_id >= IPC_MEM_MUX_IP_SESSION_ENTRIES) {
311311 dev_err(ipc_mux->dev, "not supported if_id: %d", if_id);
312312 return;
313313 }
314314
315315 /* Is the session active ? */
316− if_id = array_index_nospec(if_id, ipc_mux->nr_sessions);
316+ if_id = array_index_nospec(if_id, IPC_MEM_MUX_IP_SESSION_ENTRIES);
317317 wwan = ipc_mux->session[if_id].wwan;
318318 if (!wwan) {
319319 dev_err(ipc_mux->dev, "session Net ID is NULL");
@@ -355,13 +355,13 @@ static void ipc_mux_dl_adgh_decode(struct iosm_mux *ipc_mux, · 35 unmodified lines
355355 }
356356
357357 if_id = adgh->if_id;
358− if (if_id >= ipc_mux->nr_sessions) {
358+ if (if_id >= IPC_MEM_MUX_IP_SESSION_ENTRIES) {
359359 dev_err(ipc_mux->dev, "invalid if_id while decoding %d", if_id);
360360 return;
361361 }
362362
363363 /* Is the session active ? */
364− if_id = array_index_nospec(if_id, ipc_mux->nr_sessions);
364+ if_id = array_index_nospec(if_id, IPC_MEM_MUX_IP_SESSION_ENTRIES);
365365 wwan = ipc_mux->session[if_id].wwan;
366366 if (!wwan) {
367367 dev_err(ipc_mux->dev, "session Net ID is NULL");
@@ -538,7 +538,7 @@ static void ipc_mux_stop_tx_for_all_sessions(struct iosm_mux *ipc_mux) · 170 unmodified lines
538538 struct mux_session *session;
539539 int idx;
540540
541− for (idx = 0; idx < ipc_mux->nr_sessions; idx++) {
541+ for (idx = 0; idx < IPC_MEM_MUX_IP_SESSION_ENTRIES; idx++) {
542542 session = &ipc_mux->session[idx];
543543
544544 if (!session->wwan)
@@ -563,7 +563,7 @@ static bool ipc_mux_lite_send_qlt(struct iosm_mux *ipc_mux) · 18 unmodified lines
563563 qlt_size = offsetof(struct ipc_mem_lite_gen_tbl, vfl) +
564564 MUX_QUEUE_LEVEL * sizeof(struct mux_lite_vfl);
565565
566− for (i = 0; i < ipc_mux->nr_sessions; i++) {
566+ for (i = 0; i < IPC_MEM_MUX_IP_SESSION_ENTRIES; i++) {
567567 session = &ipc_mux->session[i];
568568
569569 if (!session->wwan || session->flow_ctl_mask)
@@ -777,13 +777,13 @@ bool ipc_mux_ul_data_encode(struct iosm_mux *ipc_mux) · 207 unmodified lines
777777
778778 ipc_mux->adb_prep_ongoing = true;
779779
780− for (i = 0; i < ipc_mux->nr_sessions; i++) {
780+ for (i = 0; i < IPC_MEM_MUX_IP_SESSION_ENTRIES; i++) {
781781 session_id = ipc_mux->rr_next_session;
782782 session = &ipc_mux->session[session_id];
783783
784784 /* Go to next handle rr_next_session overflow */
785785 ipc_mux->rr_next_session++;
786− if (ipc_mux->rr_next_session >= ipc_mux->nr_sessions)
786+ if (ipc_mux->rr_next_session >= IPC_MEM_MUX_IP_SESSION_ENTRIES)
787787 ipc_mux->rr_next_session = 0;
788788
789789 if (!session->wwan || session->flow_ctl_mask ||
drivers/net/wwan/iosm/iosm_ipc_wwan.c+2−1
@@ -8,6 +8,7 @@ · 7 unmodified lines
88 #include <linux/if_link.h>
99 #include <linux/rtnetlink.h>
1010 #include <linux/wwan.h>
11+#include <net/pkt_sched.h>
1112
1213 #include "iosm_ipc_chnl_cfg.h"
1314 #include "iosm_ipc_imem_ops.h"
@@ -159,7 +160,7 @@ static void ipc_wwan_setup(struct net_device *iosm_dev) · 145 unmodified lines
159160 {
160161 iosm_dev->header_ops = NULL;
161162 iosm_dev->hard_header_len = 0;
162− iosm_dev->priv_flags |= IFF_NO_QUEUE;
163+ iosm_dev->tx_queue_len = DEFAULT_TX_QUEUE_LEN;
163164
164165 iosm_dev->type = ARPHRD_NONE;
165166 iosm_dev->mtu = ETH_DATA_LEN;
drivers/net/wwan/iosm/iosm_ipc_wwan.h+0−10
@@ -42,14 +42,4 @@ int ipc_wwan_receive(struct iosm_wwan *ipc_wwan, struct sk_buff *skb_arg, · 41 unmodified lines
4242 *
4343 */
4444 void ipc_wwan_tx_flowctrl(struct iosm_wwan *ipc_wwan, int id, bool on);
45−
46−/**
47− * ipc_wwan_is_tx_stopped - Checks if Tx stopped for a Interface id.
48− * @ipc_wwan: Pointer to wwan instance
49− * @id: Ipc mux channel session id
50− *
51− * Return: true if stopped, false otherwise
52− */
53−bool ipc_wwan_is_tx_stopped(struct iosm_wwan *ipc_wwan, int id);
54−
5545 #endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t