<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoPlainText, li.MsoPlainText, div.MsoPlainText
{mso-style-priority:99;
mso-style-link:"Plain Text Char";
margin:0in;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
span.PlainTextChar
{mso-style-name:"Plain Text Char";
mso-style-priority:99;
mso-style-link:"Plain Text";
font-family:"Calibri",sans-serif;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri",sans-serif;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 129.75pt 1.0in 129.7pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-US" link="#0563C1" vlink="#954F72" style="word-wrap:break-word">
<div class="WordSection1">
<p class="MsoPlainText">++<a id="OWAAMA6663617EF3846DDA25B7B8CD8CA226F" href="mailto:vlad@nvidia.com"><span style="font-family:"Calibri",sans-serif;text-decoration:none">@Vladimir Sokolovsky</span></a>
<a id="OWAAM52FB3F6779E14202AD65E5B716715F80" href="mailto:karinf@nvidia.com"><span style="font-family:"Calibri",sans-serif;text-decoration:none">@Karin Feldman</span></a>
<a id="OWAAMFE6EE160CFFD4D8D9FBDF958A0EE2018" href="mailto:pkjersgard@nvidia.com">
<span style="font-family:"Calibri",sans-serif;text-decoration:none">@Peter Kjersgard</span></a>
<a id="OWAAM16D1E2765B6140A69F7044A2C1328C72" href="mailto:davthompson@nvidia.com">
<span style="font-family:"Calibri",sans-serif;text-decoration:none">@David Thompson</span></a><o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">> -----Original Message-----</p>
<p class="MsoPlainText">> From: Asmaa Mnebhi <asmaa@nvidia.com></p>
<p class="MsoPlainText">> Sent: Tuesday, February 28, 2023 6:04 PM</p>
<p class="MsoPlainText">> To: kernel-team@lists.ubuntu.com</p>
<p class="MsoPlainText">> Cc: Asmaa Mnebhi <asmaa@nvidia.com></p>
<p class="MsoPlainText">> Subject: [SRU][J:linux-bluefield][PATCH v1 1/1] UBUNTU: SAUCE: mlxbf-gige:</p>
<p class="MsoPlainText">> Fix intermittent no ip issue</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> BugLink: <a href="https://bugs.launchpad.net/bugs/2008833">
<span style="color:windowtext;text-decoration:none">https://bugs.launchpad.net/bugs/2008833</span></a></p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> During the reboot test, the OOB might not get an ip assigned.</p>
<p class="MsoPlainText">> This is due to a race condition between phy_startcall and the RX DMA being</p>
<p class="MsoPlainText">> enabled and depends on the amount of background traffic received by the</p>
<p class="MsoPlainText">> OOB. Enable the RX DMA after teh phy is started.</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> Signed-off-by: Asmaa Mnebhi <<a href="mailto:asmaa@nvidia.com"><span style="color:windowtext;text-decoration:none">asmaa@nvidia.com</span></a>></p>
<p class="MsoPlainText">> ---</p>
<p class="MsoPlainText">> .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 14 +++++++-------</p>
<p class="MsoPlainText">> .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c | 6 +++---</p>
<p class="MsoPlainText">> 2 files changed, 10 insertions(+), 10 deletions(-)</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c</p>
<p class="MsoPlainText">> b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c</p>
<p class="MsoPlainText">> index 4cf058cdbba0..5e929867bd6c 100644</p>
<p class="MsoPlainText">> --- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c</p>
<p class="MsoPlainText">> +++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c</p>
<p class="MsoPlainText">> @@ -166,14 +166,14 @@ static int mlxbf_gige_open(struct net_device</p>
<p class="MsoPlainText">> *netdev)</p>
<p class="MsoPlainText">> */</p>
<p class="MsoPlainText">> priv->valid_polarity = 0;</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> - err = mlxbf_gige_rx_init(priv);</p>
<p class="MsoPlainText">> + phy_start(phydev);</p>
<p class="MsoPlainText">> +</p>
<p class="MsoPlainText">> + err = mlxbf_gige_tx_init(priv);</p>
<p class="MsoPlainText">> if (err)</p>
<p class="MsoPlainText">> goto free_irqs;</p>
<p class="MsoPlainText">> - err = mlxbf_gige_tx_init(priv);</p>
<p class="MsoPlainText">> + err = mlxbf_gige_rx_init(priv);</p>
<p class="MsoPlainText">> if (err)</p>
<p class="MsoPlainText">> - goto rx_deinit;</p>
<p class="MsoPlainText">> -</p>
<p class="MsoPlainText">> - phy_start(phydev);</p>
<p class="MsoPlainText">> + goto tx_deinit;</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> netif_napi_add(netdev, &priv->napi, mlxbf_gige_poll,</p>
<p class="MsoPlainText">> NAPI_POLL_WEIGHT);</p>
<p class="MsoPlainText">> napi_enable(&priv->napi);</p>
<p class="MsoPlainText">> @@ -195,8 +195,8 @@ static int mlxbf_gige_open(struct net_device</p>
<p class="MsoPlainText">> *netdev)</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> return 0;</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> -rx_deinit:</p>
<p class="MsoPlainText">> - mlxbf_gige_rx_deinit(priv);</p>
<p class="MsoPlainText">> +tx_deinit:</p>
<p class="MsoPlainText">> + mlxbf_gige_tx_deinit(priv);</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> free_irqs:</p>
<p class="MsoPlainText">> mlxbf_gige_free_irqs(priv);</p>
<p class="MsoPlainText">> diff --git a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c</p>
<p class="MsoPlainText">> b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c</p>
<p class="MsoPlainText">> index 96230763cf6c..f21dafde490b 100644</p>
<p class="MsoPlainText">> --- a/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c</p>
<p class="MsoPlainText">> +++ b/drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_rx.c</p>
<p class="MsoPlainText">> @@ -142,6 +142,9 @@ int mlxbf_gige_rx_init(struct mlxbf_gige *priv)</p>
<p class="MsoPlainText">> writeq(MLXBF_GIGE_RX_MAC_FILTER_COUNT_PASS_EN,</p>
<p class="MsoPlainText">> priv->base + MLXBF_GIGE_RX_MAC_FILTER_COUNT_PASS);</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> + writeq(ilog2(priv->rx_q_entries),</p>
<p class="MsoPlainText">> + priv->base + MLXBF_GIGE_RX_WQE_SIZE_LOG2);</p>
<p class="MsoPlainText">> +</p>
<p class="MsoPlainText">> /* Clear MLXBF_GIGE_INT_MASK 'receive pkt' bit to</p>
<p class="MsoPlainText">> * indicate readiness to receive interrupts</p>
<p class="MsoPlainText">> */</p>
<p class="MsoPlainText">> @@ -154,9 +157,6 @@ int mlxbf_gige_rx_init(struct mlxbf_gige *priv)</p>
<p class="MsoPlainText">> data |= MLXBF_GIGE_RX_DMA_EN;</p>
<p class="MsoPlainText">> writeq(data, priv->base + MLXBF_GIGE_RX_DMA);</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> - writeq(ilog2(priv->rx_q_entries),</p>
<p class="MsoPlainText">> - priv->base + MLXBF_GIGE_RX_WQE_SIZE_LOG2);</p>
<p class="MsoPlainText">> -</p>
<p class="MsoPlainText">> return 0;</p>
<p class="MsoPlainText">> </p>
<p class="MsoPlainText">> free_wqe_and_skb:</p>
<p class="MsoPlainText">> --</p>
<p class="MsoPlainText">> 2.30.1</p>
<p class="MsoPlainText"><o:p> </o:p></p>
</div>
</body>
</html>