mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-12 03:26:26 +00:00
033d9959ed
Pull workqueue changes from Tejun Heo:
"This is workqueue updates for v3.7-rc1. A lot of activities this
round including considerable API and behavior cleanups.
* delayed_work combines a timer and a work item. The handling of the
timer part has always been a bit clunky leading to confusing
cancelation API with weird corner-case behaviors. delayed_work is
updated to use new IRQ safe timer and cancelation now works as
expected.
* Another deficiency of delayed_work was lack of the counterpart of
mod_timer() which led to cancel+queue combinations or open-coded
timer+work usages. mod_delayed_work[_on]() are added.
These two delayed_work changes make delayed_work provide interface
and behave like timer which is executed with process context.
* A work item could be executed concurrently on multiple CPUs, which
is rather unintuitive and made flush_work() behavior confusing and
half-broken under certain circumstances. This problem doesn't
exist for non-reentrant workqueues. While non-reentrancy check
isn't free, the overhead is incurred only when a work item bounces
across different CPUs and even in simulated pathological scenario
the overhead isn't too high.
All workqueues are made non-reentrant. This removes the
distinction between flush_[delayed_]work() and
flush_[delayed_]_work_sync(). The former is now as strong as the
latter and the specified work item is guaranteed to have finished
execution of any previous queueing on return.
* In addition to the various bug fixes, Lai redid and simplified CPU
hotplug handling significantly.
* Joonsoo introduced system_highpri_wq and used it during CPU
hotplug.
There are two merge commits - one to pull in IRQ safe timer from
tip/timers/core and the other to pull in CPU hotplug fixes from
wq/for-3.6-fixes as Lai's hotplug restructuring depended on them."
Fixed a number of trivial conflicts, but the more interesting conflicts
were silent ones where the deprecated interfaces had been used by new
code in the merge window, and thus didn't cause any real data conflicts.
Tejun pointed out a few of them, I fixed a couple more.
* 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (46 commits)
workqueue: remove spurious WARN_ON_ONCE(in_irq()) from try_to_grab_pending()
workqueue: use cwq_set_max_active() helper for workqueue_set_max_active()
workqueue: introduce cwq_set_max_active() helper for thaw_workqueues()
workqueue: remove @delayed from cwq_dec_nr_in_flight()
workqueue: fix possible stall on try_to_grab_pending() of a delayed work item
workqueue: use hotcpu_notifier() for workqueue_cpu_down_callback()
workqueue: use __cpuinit instead of __devinit for cpu callbacks
workqueue: rename manager_mutex to assoc_mutex
workqueue: WORKER_REBIND is no longer necessary for idle rebinding
workqueue: WORKER_REBIND is no longer necessary for busy rebinding
workqueue: reimplement idle worker rebinding
workqueue: deprecate __cancel_delayed_work()
workqueue: reimplement cancel_delayed_work() using try_to_grab_pending()
workqueue: use mod_delayed_work() instead of __cancel + queue
workqueue: use irqsafe timer for delayed_work
workqueue: clean up delayed_work initializers and add missing one
workqueue: make deferrable delayed_work initializer names consistent
workqueue: cosmetic whitespace updates for macro definitions
workqueue: deprecate system_nrt[_freezable]_wq
workqueue: deprecate flush[_delayed]_work_sync()
...
143 lines
4 KiB
C
143 lines
4 KiB
C
/*
|
|
* Copyright (c) 2007 Mellanox Technologies. All rights reserved.
|
|
*
|
|
* This software is available to you under a choice of one of two
|
|
* licenses. You may choose to be licensed under the terms of the GNU
|
|
* General Public License (GPL) Version 2, available from the file
|
|
* COPYING in the main directory of this source tree, or the
|
|
* OpenIB.org BSD license below:
|
|
*
|
|
* Redistribution and use in source and binary forms, with or
|
|
* without modification, are permitted provided that the following
|
|
* conditions are met:
|
|
*
|
|
* - Redistributions of source code must retain the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer.
|
|
*
|
|
* - Redistributions in binary form must reproduce the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer in the documentation and/or other materials
|
|
* provided with the distribution.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*
|
|
*/
|
|
|
|
#include <linux/errno.h>
|
|
#include <linux/if_ether.h>
|
|
|
|
#include <linux/mlx4/cmd.h>
|
|
|
|
#include "mlx4.h"
|
|
|
|
int mlx4_SENSE_PORT(struct mlx4_dev *dev, int port,
|
|
enum mlx4_port_type *type)
|
|
{
|
|
u64 out_param;
|
|
int err = 0;
|
|
|
|
err = mlx4_cmd_imm(dev, 0, &out_param, port, 0,
|
|
MLX4_CMD_SENSE_PORT, MLX4_CMD_TIME_CLASS_B,
|
|
MLX4_CMD_WRAPPED);
|
|
if (err) {
|
|
mlx4_err(dev, "Sense command failed for port: %d\n", port);
|
|
return err;
|
|
}
|
|
|
|
if (out_param > 2) {
|
|
mlx4_err(dev, "Sense returned illegal value: 0x%llx\n", out_param);
|
|
return -EINVAL;
|
|
}
|
|
|
|
*type = out_param;
|
|
return 0;
|
|
}
|
|
|
|
void mlx4_do_sense_ports(struct mlx4_dev *dev,
|
|
enum mlx4_port_type *stype,
|
|
enum mlx4_port_type *defaults)
|
|
{
|
|
struct mlx4_sense *sense = &mlx4_priv(dev)->sense;
|
|
int err;
|
|
int i;
|
|
|
|
for (i = 1; i <= dev->caps.num_ports; i++) {
|
|
stype[i - 1] = 0;
|
|
if (sense->do_sense_port[i] && sense->sense_allowed[i] &&
|
|
dev->caps.possible_type[i] == MLX4_PORT_TYPE_AUTO) {
|
|
err = mlx4_SENSE_PORT(dev, i, &stype[i - 1]);
|
|
if (err)
|
|
stype[i - 1] = defaults[i - 1];
|
|
} else
|
|
stype[i - 1] = defaults[i - 1];
|
|
}
|
|
|
|
/*
|
|
* If sensed nothing, remain in current configuration.
|
|
*/
|
|
for (i = 0; i < dev->caps.num_ports; i++)
|
|
stype[i] = stype[i] ? stype[i] : defaults[i];
|
|
|
|
}
|
|
|
|
static void mlx4_sense_port(struct work_struct *work)
|
|
{
|
|
struct delayed_work *delay = to_delayed_work(work);
|
|
struct mlx4_sense *sense = container_of(delay, struct mlx4_sense,
|
|
sense_poll);
|
|
struct mlx4_dev *dev = sense->dev;
|
|
struct mlx4_priv *priv = mlx4_priv(dev);
|
|
enum mlx4_port_type stype[MLX4_MAX_PORTS];
|
|
|
|
mutex_lock(&priv->port_mutex);
|
|
mlx4_do_sense_ports(dev, stype, &dev->caps.port_type[1]);
|
|
|
|
if (mlx4_check_port_params(dev, stype))
|
|
goto sense_again;
|
|
|
|
if (mlx4_change_port_types(dev, stype))
|
|
mlx4_err(dev, "Failed to change port_types\n");
|
|
|
|
sense_again:
|
|
mutex_unlock(&priv->port_mutex);
|
|
queue_delayed_work(mlx4_wq , &sense->sense_poll,
|
|
round_jiffies_relative(MLX4_SENSE_RANGE));
|
|
}
|
|
|
|
void mlx4_start_sense(struct mlx4_dev *dev)
|
|
{
|
|
struct mlx4_priv *priv = mlx4_priv(dev);
|
|
struct mlx4_sense *sense = &priv->sense;
|
|
|
|
if (!(dev->caps.flags & MLX4_DEV_CAP_FLAG_DPDP))
|
|
return;
|
|
|
|
queue_delayed_work(mlx4_wq , &sense->sense_poll,
|
|
round_jiffies_relative(MLX4_SENSE_RANGE));
|
|
}
|
|
|
|
void mlx4_stop_sense(struct mlx4_dev *dev)
|
|
{
|
|
cancel_delayed_work_sync(&mlx4_priv(dev)->sense.sense_poll);
|
|
}
|
|
|
|
void mlx4_sense_init(struct mlx4_dev *dev)
|
|
{
|
|
struct mlx4_priv *priv = mlx4_priv(dev);
|
|
struct mlx4_sense *sense = &priv->sense;
|
|
int port;
|
|
|
|
sense->dev = dev;
|
|
for (port = 1; port <= dev->caps.num_ports; port++)
|
|
sense->do_sense_port[port] = 1;
|
|
|
|
INIT_DEFERRABLE_WORK(&sense->sense_poll, mlx4_sense_port);
|
|
}
|