* [PATCH] net/mlx4_core: pass pci_dev_data to __mlx4_init_one
@ 2014-03-24 4:42 Wei Yang
2014-03-24 6:40 ` Or Gerlitz
0 siblings, 1 reply; 4+ messages in thread
From: Wei Yang @ 2014-03-24 4:42 UTC (permalink / raw)
To: amirv, jackm, ogerlitz; +Cc: davem, netdev, Wei Yang
The second parameter of __mlx4_init_one() is used to identify whether the
pci_dev is a PF or VF. Currently, when it is invoked in mlx4_pci_slot_reset()
this information is missed.
This patch passes the pci_dev_data to __mlx4_init_one().
Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
---
drivers/net/ethernet/mellanox/mlx4/main.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index d711158..9ffce06 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -2670,7 +2670,13 @@ static pci_ers_result_t mlx4_pci_err_detected(struct pci_dev *pdev,
static pci_ers_result_t mlx4_pci_slot_reset(struct pci_dev *pdev)
{
- int ret = __mlx4_init_one(pdev, 0);
+ int ret;
+ struct mlx4_dev *dev = pci_get_drvdata(pdev);
+ struct mlx4_priv *priv = mlx4_priv(dev);
+ int pci_dev_data;
+
+ pci_dev_data = priv->pci_dev_data;
+ ret = __mlx4_init_one(pdev, pci_dev_data);
return ret ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] net/mlx4_core: pass pci_dev_data to __mlx4_init_one
2014-03-24 4:42 [PATCH] net/mlx4_core: pass pci_dev_data to __mlx4_init_one Wei Yang
@ 2014-03-24 6:40 ` Or Gerlitz
2014-03-24 9:41 ` Wei Yang
2014-03-25 14:06 ` Wei Yang
0 siblings, 2 replies; 4+ messages in thread
From: Or Gerlitz @ 2014-03-24 6:40 UTC (permalink / raw)
To: Wei Yang
Cc: Amir Vadai, Jack Morgenstein, Or Gerlitz, David Miller,
netdev@vger.kernel.org
On Mon, Mar 24, 2014 at 6:42 AM, Wei Yang <weiyang@linux.vnet.ibm.com> wrote:
>
> The second parameter of __mlx4_init_one() is used to identify whether the
> pci_dev is a PF or VF. Currently, when it is invoked in mlx4_pci_slot_reset()
> this information is missed.
This patch isn't fixing something in 3.14, right? if this is the case
I assume it's for net-next, please put a "net" or "net-next"
indication (next-time)
Or.
>
>
> This patch passes the pci_dev_data to __mlx4_init_one().
>
> Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
> ---
> drivers/net/ethernet/mellanox/mlx4/main.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
> index d711158..9ffce06 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/main.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/main.c
> @@ -2670,7 +2670,13 @@ static pci_ers_result_t mlx4_pci_err_detected(struct pci_dev *pdev,
>
> static pci_ers_result_t mlx4_pci_slot_reset(struct pci_dev *pdev)
> {
> - int ret = __mlx4_init_one(pdev, 0);
> + int ret;
> + struct mlx4_dev *dev = pci_get_drvdata(pdev);
> + struct mlx4_priv *priv = mlx4_priv(dev);
> + int pci_dev_data;
> +
> + pci_dev_data = priv->pci_dev_data;
> + ret = __mlx4_init_one(pdev, pci_dev_data);
>
> return ret ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED;
> }
> --
> 1.7.9.5
>
> --
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net/mlx4_core: pass pci_dev_data to __mlx4_init_one
2014-03-24 6:40 ` Or Gerlitz
@ 2014-03-24 9:41 ` Wei Yang
2014-03-25 14:06 ` Wei Yang
1 sibling, 0 replies; 4+ messages in thread
From: Wei Yang @ 2014-03-24 9:41 UTC (permalink / raw)
To: Or Gerlitz
Cc: Wei Yang, Amir Vadai, Jack Morgenstein, Or Gerlitz, David Miller,
netdev@vger.kernel.org
On Mon, Mar 24, 2014 at 08:40:42AM +0200, Or Gerlitz wrote:
>On Mon, Mar 24, 2014 at 6:42 AM, Wei Yang <weiyang@linux.vnet.ibm.com> wrote:
>>
>> The second parameter of __mlx4_init_one() is used to identify whether the
>> pci_dev is a PF or VF. Currently, when it is invoked in mlx4_pci_slot_reset()
>> this information is missed.
>
>
>This patch isn't fixing something in 3.14, right? if this is the case
>I assume it's for net-next, please put a "net" or "net-next"
>indication (next-time)
>
>Or.
>
Or,
Thanks for your suggestion. I will pay attention next time. :-)
BTW, do you like the fix?
--
Richard Yang
Help you, Help me
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] net/mlx4_core: pass pci_dev_data to __mlx4_init_one
2014-03-24 6:40 ` Or Gerlitz
2014-03-24 9:41 ` Wei Yang
@ 2014-03-25 14:06 ` Wei Yang
1 sibling, 0 replies; 4+ messages in thread
From: Wei Yang @ 2014-03-25 14:06 UTC (permalink / raw)
To: Or Gerlitz
Cc: Wei Yang, Amir Vadai, Jack Morgenstein, Or Gerlitz, David Miller,
netdev@vger.kernel.org
On Mon, Mar 24, 2014 at 08:40:42AM +0200, Or Gerlitz wrote:
>On Mon, Mar 24, 2014 at 6:42 AM, Wei Yang <weiyang@linux.vnet.ibm.com> wrote:
>>
>> The second parameter of __mlx4_init_one() is used to identify whether the
>> pci_dev is a PF or VF. Currently, when it is invoked in mlx4_pci_slot_reset()
>> this information is missed.
>
>
>This patch isn't fixing something in 3.14, right? if this is the case
>I assume it's for net-next, please put a "net" or "net-next"
>indication (next-time)
>
>Or.
This one is deprecated, will send an updated version.
>
>>
>>
>> This patch passes the pci_dev_data to __mlx4_init_one().
>>
>> Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
>> ---
>> drivers/net/ethernet/mellanox/mlx4/main.c | 8 +++++++-
>> 1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
>> index d711158..9ffce06 100644
>> --- a/drivers/net/ethernet/mellanox/mlx4/main.c
>> +++ b/drivers/net/ethernet/mellanox/mlx4/main.c
>> @@ -2670,7 +2670,13 @@ static pci_ers_result_t mlx4_pci_err_detected(struct pci_dev *pdev,
>>
>> static pci_ers_result_t mlx4_pci_slot_reset(struct pci_dev *pdev)
>> {
>> - int ret = __mlx4_init_one(pdev, 0);
>> + int ret;
>> + struct mlx4_dev *dev = pci_get_drvdata(pdev);
>> + struct mlx4_priv *priv = mlx4_priv(dev);
>> + int pci_dev_data;
>> +
>> + pci_dev_data = priv->pci_dev_data;
>> + ret = __mlx4_init_one(pdev, pci_dev_data);
>>
>> return ret ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED;
>> }
>> --
>> 1.7.9.5
>>
>> --
>> 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
--
Richard Yang
Help you, Help me
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-25 14:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-24 4:42 [PATCH] net/mlx4_core: pass pci_dev_data to __mlx4_init_one Wei Yang
2014-03-24 6:40 ` Or Gerlitz
2014-03-24 9:41 ` Wei Yang
2014-03-25 14:06 ` Wei Yang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).