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

Commit c931ceeb authored by Inaky Perez-Gonzalez's avatar Inaky Perez-Gonzalez
Browse files

wimax/i2400m: introduce i2400m_reset(), stopping TX and carrier 



Currently the i2400m driver was resetting by just calling
i2400m->bus_reset(). However, this was missing stopping the TX queue
and downing the carrier. This was causing, for the corner case of the
driver reseting a device that refuses to go out of idle mode, that a
few packets would be queued and more than one reset would go through,
making the recovery a wee bit messy.

To avoid introducing the same cleanup in all the bus-specific driver,
introduced a i2400m_reset() function that takes care of house cleaning
and then calling the bus-level reset implementation.

The bulk of the changes in all files are just to rename the call from
i2400m->bus_reset() to i2400m_reset().

Signed-off-by: default avatarInaky Perez-Gonzalez <inaky@linux.intel.com>
parent 55a662d6

drivers/net/wimax/i2400m/control.c

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
 *   i2400m_set_init_config()

 *   i2400m_cmd_get_state()

 * i2400m_dev_shutdown()        Called by i2400m_dev_stop()

 *   i2400m->bus_reset()

 *   i2400m_reset()

 *

 * i2400m_{cmd,get,set}_*()

 *   i2400m_msg_to_dev()
@@ -343,7 +343,7 @@ void i2400m_report_tlv_system_state(struct i2400m *i2400m, 
		/* Huh? just in case, shut it down */

		dev_err(dev, "HW BUG? unknown state %u: shutting down\n",

			i2400m_state);

		i2400m->bus_reset(i2400m, I2400M_RT_WARM);

		i2400m_reset(i2400m, I2400M_RT_WARM);

		break;

	};

	d_fnend(3, dev, "(i2400m %p ss %p [%u]) = void\n",

drivers/net/wimax/i2400m/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ int debugfs_i2400m_reset_set(void *data, u64 val) 
	case I2400M_RT_WARM:

	case I2400M_RT_COLD:

	case I2400M_RT_BUS:

		result = i2400m->bus_reset(i2400m, rt);

		result = i2400m_reset(i2400m, rt);

		if (result >= 0)

			result = 0;

	default:

drivers/net/wimax/i2400m/driver.c

+20 −2
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ int i2400m_op_reset(struct wimax_dev *wimax_dev) 
	mutex_lock(&i2400m->init_mutex);

	i2400m->reset_ctx = &ctx;

	mutex_unlock(&i2400m->init_mutex);

	result = i2400m->bus_reset(i2400m, I2400M_RT_WARM);

	result = i2400m_reset(i2400m, I2400M_RT_WARM);

	if (result < 0)

		goto out;

	result = wait_for_completion_timeout(&ctx.completion, 4*HZ);
@@ -710,7 +710,7 @@ out_unlock: 
	mutex_unlock(&i2400m->init_mutex);

	if (result == -EUCLEAN) {

		/* ops, need to clean up [w/ init_mutex not held] */

		result = i2400m->bus_reset(i2400m, I2400M_RT_BUS);

		result = i2400m_reset(i2400m, I2400M_RT_BUS);

		if (result >= 0)

			result = -ENODEV;

	}
@@ -815,6 +815,24 @@ void i2400m_init(struct i2400m *i2400m) 
EXPORT_SYMBOL_GPL(i2400m_init);





int i2400m_reset(struct i2400m *i2400m, enum i2400m_reset_type rt)

{

	struct net_device *net_dev = i2400m->wimax_dev.net_dev;



	/*

	 * Make sure we stop TXs and down the carrier before

	 * resetting; this is needed to avoid things like

	 * i2400m_wake_tx() scheduling stuff in parallel.

	 */

	if (net_dev->reg_state == NETREG_REGISTERED) {

		netif_tx_disable(net_dev);

		netif_carrier_off(net_dev);

	}

	return i2400m->bus_reset(i2400m, rt);

}

EXPORT_SYMBOL_GPL(i2400m_reset);





/**

 * i2400m_setup - bus-generic setup function for the i2400m device

 *

drivers/net/wimax/i2400m/fw.c

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ 
 * i2400m_fw_dnload

 *   i2400m_bootrom_init

 *     i2400m_bm_cmd

 *     i2400m->bus_reset

 *     i2400m_reset

 *   i2400m_dnload_init

 *     i2400m_dnload_init_signed

 *     i2400m_dnload_init_nonsigned
@@ -902,7 +902,7 @@ do_reboot: 
	d_printf(4, dev, "device reboot: reboot command [%d # left]\n",

		 count);

	if ((flags & I2400M_BRI_NO_REBOOT) == 0)

		i2400m->bus_reset(i2400m, I2400M_RT_WARM);

		i2400m_reset(i2400m, I2400M_RT_WARM);

	result = i2400m_bm_cmd(i2400m, NULL, 0, &ack, sizeof(ack),

			       I2400M_BM_CMD_RAW);

	flags &= ~I2400M_BRI_NO_REBOOT;

drivers/net/wimax/i2400m/i2400m.h

+1 −0
Original line number Diff line number Diff line
@@ -717,6 +717,7 @@ unsigned i2400m_brh_get_signature(const struct i2400m_bootrom_header *hdr) 
 * Driver / device setup and internal functions

 */

extern void i2400m_init(struct i2400m *);

extern int i2400m_reset(struct i2400m *, enum i2400m_reset_type);

extern void i2400m_netdev_setup(struct net_device *net_dev);

extern int i2400m_sysfs_setup(struct device_driver *);

extern void i2400m_sysfs_release(struct device_driver *);