| Message ID | 1428504685-8945-8-git-send-email-amirv@mellanox.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 04/08/2015 05:51 PM, Amir Vadai wrote: > From: Rana Shahout <ranas@mellanox.com> > Signed-off-by: Rana Shahout <ranas@mellanox.com> > Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> > Signed-off-by: Amir Vadai <amirv@mellanox.com> > --- > drivers/net/ethernet/mellanox/mlx5/core/port.c | 34 ++++++++++++++++++++++++++ > include/linux/mlx5/driver.h | 8 ++++++ > 2 files changed, 42 insertions(+) > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/port.c b/drivers/net/ethernet/mellanox/mlx5/core/port.c > index 6e2d99c..7c394c0 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/port.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/port.c > @@ -179,3 +179,37 @@ int mlx5_set_port_proto(struct mlx5_core_dev *dev, u32 proto_admin, > return err; > } > EXPORT_SYMBOL_GPL(mlx5_set_port_proto); > + > +int mlx5_set_port_status(struct mlx5_core_dev *dev, > + enum mlx5_port_status status) > +{ > + u32 in[MLX5_ST_SZ_DW(paos_reg)]; > + u32 out[MLX5_ST_SZ_DW(paos_reg)]; > + int err; > + > + memset(in, 0, sizeof(in)); > + > + MLX5_SET(paos_reg, in, admin_status, status); > + MLX5_SET(paos_reg, in, ase, 1); > + > + err = mlx5_core_access_reg(dev, in, sizeof(in), out, > + sizeof(out), MLX5_REG_PAOS, 0, 1); > + return err; Why not just direct return of the function's result? [...] WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Apr 8, 2015 at 9:26 PM, Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> wrote: > Hello. Hi, > > > On 04/08/2015 05:51 PM, Amir Vadai wrote: > >> From: Rana Shahout <ranas@mellanox.com> > > >> Signed-off-by: Rana Shahout <ranas@mellanox.com> >> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> >> Signed-off-by: Amir Vadai <amirv@mellanox.com> >> --- >> drivers/net/ethernet/mellanox/mlx5/core/port.c | 34 >> ++++++++++++++++++++++++++ >> include/linux/mlx5/driver.h | 8 ++++++ >> 2 files changed, 42 insertions(+) > > >> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/port.c >> b/drivers/net/ethernet/mellanox/mlx5/core/port.c >> index 6e2d99c..7c394c0 100644 >> --- a/drivers/net/ethernet/mellanox/mlx5/core/port.c >> +++ b/drivers/net/ethernet/mellanox/mlx5/core/port.c >> @@ -179,3 +179,37 @@ int mlx5_set_port_proto(struct mlx5_core_dev *dev, >> u32 proto_admin, >> return err; >> } >> EXPORT_SYMBOL_GPL(mlx5_set_port_proto); >> + >> +int mlx5_set_port_status(struct mlx5_core_dev *dev, >> + enum mlx5_port_status status) >> +{ >> + u32 in[MLX5_ST_SZ_DW(paos_reg)]; >> + u32 out[MLX5_ST_SZ_DW(paos_reg)]; >> + int err; >> + >> + memset(in, 0, sizeof(in)); >> + >> + MLX5_SET(paos_reg, in, admin_status, status); >> + MLX5_SET(paos_reg, in, ase, 1); >> + >> + err = mlx5_core_access_reg(dev, in, sizeof(in), out, >> + sizeof(out), MLX5_REG_PAOS, 0, 1); >> + return err; > > > Why not just direct return of the function's result? Right - will be fixed in V1. Amir > > [...] > > WBR, Sergei > > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/port.c b/drivers/net/ethernet/mellanox/mlx5/core/port.c index 6e2d99c..7c394c0 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/port.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/port.c @@ -179,3 +179,37 @@ int mlx5_set_port_proto(struct mlx5_core_dev *dev, u32 proto_admin, return err; } EXPORT_SYMBOL_GPL(mlx5_set_port_proto); + +int mlx5_set_port_status(struct mlx5_core_dev *dev, + enum mlx5_port_status status) +{ + u32 in[MLX5_ST_SZ_DW(paos_reg)]; + u32 out[MLX5_ST_SZ_DW(paos_reg)]; + int err; + + memset(in, 0, sizeof(in)); + + MLX5_SET(paos_reg, in, admin_status, status); + MLX5_SET(paos_reg, in, ase, 1); + + err = mlx5_core_access_reg(dev, in, sizeof(in), out, + sizeof(out), MLX5_REG_PAOS, 0, 1); + return err; +} + +int mlx5_query_port_status(struct mlx5_core_dev *dev, u8 *status) +{ + u32 in[MLX5_ST_SZ_DW(paos_reg)]; + u32 out[MLX5_ST_SZ_DW(paos_reg)]; + int err; + + memset(in, 0, sizeof(in)); + + err = mlx5_core_access_reg(dev, in, sizeof(in), out, + sizeof(out), MLX5_REG_PAOS, 0, 0); + if (err) + return err; + + *status = MLX5_GET(paos_reg, out, oper_status); + return err; +} diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h index 6cd8896..2c71aad 100644 --- a/include/linux/mlx5/driver.h +++ b/include/linux/mlx5/driver.h @@ -149,6 +149,11 @@ enum mlx5_dev_event { MLX5_DEV_EVENT_CLIENT_REREG, }; +enum mlx5_port_status { + MLX5_PORT_UP = 1 << 1, + MLX5_PORT_DOWN = 1 << 2, +}; + struct mlx5_uuar_info { struct mlx5_uar *uars; int num_uars; @@ -710,6 +715,9 @@ int mlx5_query_port_proto_admin(struct mlx5_core_dev *dev, u32 *proto_admin, int proto_mask); int mlx5_set_port_proto(struct mlx5_core_dev *dev, u32 proto_admin, int proto_mask); +int mlx5_set_port_status(struct mlx5_core_dev *dev, + enum mlx5_port_status status); +int mlx5_query_port_status(struct mlx5_core_dev *dev, u8 *status); int mlx5_debug_eq_add(struct mlx5_core_dev *dev, struct mlx5_eq *eq); void mlx5_debug_eq_remove(struct mlx5_core_dev *dev, struct mlx5_eq *eq);