* [PATCH net-next resend] net/mlx4_core: pass pci_device_id.driver_data to __mlx4_init_one during reset
@ 2014-03-26 10:15 Wei Yang
2014-03-26 14:02 ` Sergei Shtylyov
0 siblings, 1 reply; 3+ messages in thread
From: Wei Yang @ 2014-03-26 10:15 UTC (permalink / raw)
To: jackm, ogerlitz, davem, netdev; +Cc: Wei Yang
[Note: seems my network/mail system got some problem yesterday. Resend it in
case it is lost. If you have already got one, please ignore it.]
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 match the pci_dev with mlx4_pci_table and passes the
pci_device_id.driver_data to __mlx4_init_one() in mlx4_pci_slot_reset().
Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
---
drivers/net/ethernet/mellanox/mlx4/main.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index d711158..b083808 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -2670,7 +2670,11 @@ 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);
+ const struct pci_device_id* id;
+ int ret;
+
+ id = pci_match_id(mlx4_pci_table, pdev);
+ ret = __mlx4_init_one(pdev, id->driver_data);
return ret ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next resend] net/mlx4_core: pass pci_device_id.driver_data to __mlx4_init_one during reset
2014-03-26 10:15 [PATCH net-next resend] net/mlx4_core: pass pci_device_id.driver_data to __mlx4_init_one during reset Wei Yang
@ 2014-03-26 14:02 ` Sergei Shtylyov
2014-03-27 1:18 ` Wei Yang
0 siblings, 1 reply; 3+ messages in thread
From: Sergei Shtylyov @ 2014-03-26 14:02 UTC (permalink / raw)
To: Wei Yang, jackm, ogerlitz, davem, netdev
Hello.
On 26-03-2014 14:15, Wei Yang wrote:
> [Note: seems my network/mail system got some problem yesterday. Resend it in
> case it is lost. If you have already got one, please ignore it.]
Put such remarks under --- tear line in the future, so that David don't
have to edit them out when applying.
> 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 match the pci_dev with mlx4_pci_table and passes the
> pci_device_id.driver_data to __mlx4_init_one() in mlx4_pci_slot_reset().
> Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
> ---
> drivers/net/ethernet/mellanox/mlx4/main.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
> diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
> index d711158..b083808 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/main.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/main.c
> @@ -2670,7 +2670,11 @@ 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);
> + const struct pci_device_id* id;
* should be close to 'id' and one space is enough. I guess you haven't run
your patch thru scripts/checkpatch.pl?
WBR, Sergei
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next resend] net/mlx4_core: pass pci_device_id.driver_data to __mlx4_init_one during reset
2014-03-26 14:02 ` Sergei Shtylyov
@ 2014-03-27 1:18 ` Wei Yang
0 siblings, 0 replies; 3+ messages in thread
From: Wei Yang @ 2014-03-27 1:18 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: Wei Yang, jackm, ogerlitz, davem, netdev
On Wed, Mar 26, 2014 at 06:02:27PM +0400, Sergei Shtylyov wrote:
>Hello.
>
>On 26-03-2014 14:15, Wei Yang wrote:
>
>>[Note: seems my network/mail system got some problem yesterday. Resend it in
>>case it is lost. If you have already got one, please ignore it.]
>
> Put such remarks under --- tear line in the future, so that David
>don't have to edit them out when applying.
Thanks, first time I got this tip. Will do this next time :-)
>
>>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 match the pci_dev with mlx4_pci_table and passes the
>>pci_device_id.driver_data to __mlx4_init_one() in mlx4_pci_slot_reset().
>
>>Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
>>---
>> drivers/net/ethernet/mellanox/mlx4/main.c | 6 +++++-
>> 1 file changed, 5 insertions(+), 1 deletion(-)
>
>>diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
>>index d711158..b083808 100644
>>--- a/drivers/net/ethernet/mellanox/mlx4/main.c
>>+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
>>@@ -2670,7 +2670,11 @@ 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);
>>+ const struct pci_device_id* id;
>
> * should be close to 'id' and one space is enough. I guess you
>haven't run your patch thru scripts/checkpatch.pl?
Oops, my bad. Will fix it.
>
>WBR, Sergei
--
Richard Yang
Help you, Help me
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-03-27 1:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-26 10:15 [PATCH net-next resend] net/mlx4_core: pass pci_device_id.driver_data to __mlx4_init_one during reset Wei Yang
2014-03-26 14:02 ` Sergei Shtylyov
2014-03-27 1:18 ` 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).