<div dir="ltr"><div>Hi Asmaa, </div><div> </div><div>Yes, we saw that the build was breaking after we already applied the commit so instead of going back and NACKing it we just SRU'd the upstream fix commit. But now we are all good to go. </div><div> </div><div>Thanks, </div><div>- Luke </div> <div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Apr 19, 2022 at 12:09 PM Asmaa Mnebhi <<a href="mailto:asmaa@nvidia.com">asmaa@nvidia.com</a>> wrote: </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> <div style="overflow-wrap: break-word;" lang="EN-US"> <div class="gmail-m_1562795360120182161WordSection1"> Hi Luke, <a id="gmail-m_1562795360120182161OWAAMDFFBDD35CE0D456F902B96D17924989B" href="mailto:vlad@nvidia.com" target="_blank">@Vladimir Sokolovsky</a> and <a id="gmail-m_1562795360120182161OWAAM4F05413417854D8C9399F5ED772ACA27" href="mailto:oawwad@nvidia.com" target="_blank">@Orsan Awwad</a> informed me that this pull request broke the build because acpi_dev_gpio_irq_get_by is not supported on kernel 5.4.60 and older. But I see that Zachary Tahenakos pushed a change today which adds support to acpi_dev_gpio_irq_get_by in master-next as shown below: <a href="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-bluefield/+git/focal/log/?h=master-next" target="_blank">https://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-bluefield/+git/focal/log/?h=master-next</a> <table summary="commit info" style="background:white none repeat scroll 0% 0%;border-collapse:collapse" cellspacing="0" cellpadding="0" border="0"> <tbody> <tr> <td style="padding:1.2pt 12pt 1.2pt 1.2pt" valign="top"> commit </td> <td style="padding:1.2pt 12pt 1.2pt 1.2pt"> <a href="https://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-bluefield/+git/focal/commit/?h=master-next&id=b2be125b1a973468c1e28bb0e076f05cd8fb13a3" target="_blank">b2be125b1a973468c1e28bb0e076f05cd8fb13a3</a> </td> </tr> </tbody> </table> So I think we should be all set then? Thanks. Asmaa <div style="border-color:rgb(225,225,225) currentcolor currentcolor;border-style:solid none none;border-width:1pt medium medium;padding:3pt 0in 0in"> From: Luke Nowakowski-Krijger <<a href="mailto:luke.nowakowskikrijger@canonical.com" target="_blank">luke.nowakowskikrijger@canonical.com</a>> Sent: Friday, April 15, 2022 5:21 PM To: Asmaa Mnebhi <<a href="mailto:asmaa@nvidia.com" target="_blank">asmaa@nvidia.com</a>> Cc: Ubuntu Kernel Team <<a href="mailto:kernel-team@lists.ubuntu.com" target="_blank">kernel-team@lists.ubuntu.com</a>> Subject: ACK+CMT: [SRU v1][F:linux-bluefield][Pull Request] mlxbf-gige: sync up with upstreamed version </div> <div> <div> The only thing I would say needs to be added is UBUNTU: SAUCE to the Revert patches, but I can add that when applying. </div> <div> </div> <div> This patchset comes just in time as our certification team is finding issues with oob_net0 interface not appearing. We will respin with these fixes. </div> <div> </div> <div> Acked by: Luke Nowakowski-Krijger <<a href="mailto:luke.nowakowskikrijger@canonical.com" target="_blank">luke.nowakowskikrijger@canonical.com</a>> </div> <div> <div> On Fri, Apr 15, 2022 at 11:46 AM Asmaa Mnebhi <<a href="mailto:asmaa@nvidia.com" target="_blank">asmaa@nvidia.com</a>> wrote: </div> <blockquote style="border-color:currentcolor currentcolor currentcolor rgb(204,204,204);border-style:none none none solid;border-width:medium medium medium 1pt;padding:0in 0in 0in 6pt;margin-left:4.8pt;margin-right:0in"> BugLink: <a href="https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugs.launchpad.net%2Fbugs%2F1969233&data=04%7C01%7Casmaa%40nvidia.com%7Ce29e0fe5b2624cb0da0e08da1f25ee63%7C43083d15727340c1b7db39efd9ccc17a%7C0%7C0%7C637856545020002118%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=sxDGNOX0xNL7eBRjqHZavo%2B27mNvD1dvh8LEjtUsliA%3D&reserved=0" target="_blank"> https://bugs.launchpad.net/bugs/1969233</a> The mlxbf-gige driver is currently broken in the latest SRU kernel due to this pull request: <a href="https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fcode.launchpad.net%2F~asmaam%2Fubuntu%2F%2Bsource%2Flinux-bluefield%2F%2Bgit%2Fversion-seeds%2F%2Bmerge%2F417771&data=04%7C01%7Casmaa%40nvidia.com%7Ce29e0fe5b2624cb0da0e08da1f25ee63%7C43083d15727340c1b7db39efd9ccc17a%7C0%7C0%7C637856545020002118%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=co2dFJFuo1egiKoWsB%2FuI%2Fd7NgRHr2mUGr4DTb0a9f4%3D&reserved=0" target="_blank">https://code.launchpad.net/~asmaam/ubuntu/+source/linux-bluefield/+git/version-seeds/+merge/417771</a> The mlxbf-gige driver is dependent and hence needs to be in sync with the gpio-mlxbf.c driver. So we need to cherry-pick the corresponding changes from upstream. This pull request (12 commits) includes reverting 6 mlxbf-gige commits in linux-bluefield. Then it cherry-picks the following 2 commits: 6c2a6ddca763271fa583e22bce10c2805c1ea9f6 ee8a9600b5391f434905c46bec7f77d34505083e This pull request page can be found at: <a href="https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fcode.launchpad.net%2F~asmaam%2Fubuntu%2F%2Bsource%2Flinux-bluefield%2F%2Bgit%2Fversion-seeds%2F%2Bmerge%2F419560&data=04%7C01%7Casmaa%40nvidia.com%7Ce29e0fe5b2624cb0da0e08da1f25ee63%7C43083d15727340c1b7db39efd9ccc17a%7C0%7C0%7C637856545020002118%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=3poJhFxbUF5G%2Fxu5bUYarXfJfMK0th4S9Gc9fm8kTh8%3D&reserved=0" target="_blank">https://code.launchpad.net/~asmaam/ubuntu/+source/linux-bluefield/+git/version-seeds/+merge/419560</a> Git repo can be found at: git+ssh://<a href="https://nam11.safelinks.protection.outlook.com/?url=http%3A%2F%2Fasmaam%40git.launchpad.net%2F~asmaam%2Fubuntu%2F%2Bsource%2Flinux-bluefield%3Amaster-next-oob-upstream&data=04%7C01%7Casmaa%40nvidia.com%7Ce29e0fe5b2624cb0da0e08da1f25ee63%7C43083d15727340c1b7db39efd9ccc17a%7C0%7C0%7C637856545020002118%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=PwJhvqVXXIBsBE5EM%2FfbnTtnaTqlJBMi%2BHGYnL6D4wc%3D&reserved=0" target="_blank">asmaam@git.launchpad.net/~asmaam/ubuntu/+source/linux-bluefield:master-next-oob-upstream</a> The following changes since commit 2d4b3a849f7ffbd96e7a158740f56d5bae6bbda0: UBUNTU: Ubuntu-bluefield-5.4.0-1034.37 (2022-04-12 13:57:07 -0700) are available in the Git repository at: <a href="https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fcode.launchpad.net%2F~asmaam%2Fubuntu%2F%2Bsource%2Flinux-bluefield%2F%2Bgit%2Fversion-seeds%2F%2Bref%2Fmaster-next-oob-upstream%2F%2Bregister-merge&data=04%7C01%7Casmaa%40nvidia.com%7Ce29e0fe5b2624cb0da0e08da1f25ee63%7C43083d15727340c1b7db39efd9ccc17a%7C0%7C0%7C637856545020002118%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=BrwRn8AFyZrqcAZcTzoQUn%2B6TFiofWs6t7bI05xQRos%3D&reserved=0" target="_blank"> https://code.launchpad.net/~asmaam/ubuntu/+source/linux-bluefield/+git/version-seeds/+ref/master-next-oob-upstream/+register-merge</a> 0a6f2617d0c98b2ef042da4ca98f765c9a163bdd for you to fetch changes up to 0a6f2617d0c98b2ef042da4ca98f765c9a163bdd: UBUNTU: SAUCE: Fix OOB handling RX packets in heavy traffic (2022-04-15 13:43:25 -0400) Signed-off-by: Asmaa Mnebhi <<a href="mailto:asmaa@nvidia.com" target="_blank">asmaa@nvidia.com</a>> Asmaa Mnebhi (11): Revert "UBUNTU: SAUCE: Fix OOB handling RX packets in heavy traffic" Revert "UBUNTU: SAUCE: mlxbf_gige: update driver version to 1.25" Revert "UBUNTU: SAUCE: mlxbf_gige: clear valid_polarity upon open" Revert "UBUNTU: SAUCE: mlxbf_gige: add interrupt counts to "ethtool -S"" Revert "UBUNTU: SAUCE: mlxbf-gige: add ethtool mlxbf_gige_set_ringparam" Revert "UBUNTU: SAUCE: mlxbf-gige: add driver version" net: mellanox: mlxbf_gige: Replace non-standard interrupt handling UBUNTU: SAUCE: mlxbf-gige: add driver version UBUNTU: SAUCE: mlxbf_gige: add interrupt counts to "ethtool -S" UBUNTU: SAUCE: mlxbf-gige: add ethtool mlxbf_gige_set_ringparam UBUNTU: SAUCE: Fix OOB handling RX packets in heavy traffic David Thompson (1): mlxbf_gige: clear valid_polarity upon open .../net/ethernet/mellanox/mlxbf_gige/Makefile | 1 - .../ethernet/mellanox/mlxbf_gige/mlxbf_gige.h | 12 - .../mellanox/mlxbf_gige/mlxbf_gige_gpio.c | 212 ------------------ .../mellanox/mlxbf_gige/mlxbf_gige_main.c | 24 +- 4 files changed, 10 insertions(+), 239 deletions(-) delete mode 100644 drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_gpio.c -- 2.30.1 -- kernel-team mailing list <a href="mailto:kernel-team@lists.ubuntu.com" target="_blank">kernel-team@lists.ubuntu.com</a> <a href="https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.ubuntu.com%2Fmailman%2Flistinfo%2Fkernel-team&data=04%7C01%7Casmaa%40nvidia.com%7Ce29e0fe5b2624cb0da0e08da1f25ee63%7C43083d15727340c1b7db39efd9ccc17a%7C0%7C0%7C637856545020002118%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=I0jasUGsYLQHf4hYG%2BjOeN4nwFKlI37kRtpyi8dmJwU%3D&reserved=0" target="_blank">https://lists.ubuntu.com/mailman/listinfo/kernel-team</a> </blockquote> </div> </div> </div> </div> </blockquote></div></div>