ACK/Cmnt: [SRU v2][F:linux-bluefield][Pull Request] Sync up gpio interrupt handling with upstreamed version

Fri Apr 1 14:30:00 UTC 2022

Hi Stefan,

Thanks for pushing this and fixing the issue with my pull request.

I usually request a pull request from you as follows:
1) I issue a git push to my forked repo: git push git+ssh://asmaam@git.launchpad.net/~asmaam/ubuntu/+source/linux-bluefield <my new branch>asmaa at farm-0002:~/workspace/canonical/latest/focal$ git push git+ssh://asmaam@git.launchpad.net/~asmaam/ubuntu/+source/linux-bluefield <your branch>
X11 forwarding request failed on channel 0
Enumerating objects: 21, done.
Counting objects: 100% (21/21), done.
Delta compression using up to 8 threads
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 3.47 KiB | 5.00 KiB/s, done.
Total 11 (delta 10), reused 0 (delta 0), pack-reused 0
remote: Checking connectivity: 11, done.
remote:
remote: Create a merge proposal for 'master-next' on Launchpad by visiting:
remote: https://code.launchpad.net/~asmaam/ubuntu/+source/linux-bluefield/+git/version-seeds/+ref/master-next/+register-merge
remote:

2) And then I open a pull request using the CLI above:
https://code.launchpad.net/~asmaam/ubuntu/+source/linux-bluefield/+git/version-seeds/+ref/master-next/+register-merge
3) I just would like to make sure I understand your comment for future reference. Are you saying that I need to fill out the above pull request form properly?
I filled out the following fields:

Target Git branch:
Repository: ~canonical-kernel/ubuntu/+source/linux-bluefield/+git/focal
Branch: master-next

Prerequisite Git branch:
Repository: ~asmaam/ubuntu/+source/linux-bluefield/+git/version-seeds
Branch: master-next-2

I didn’t see fields for : pull up to <sha1> ? 

Thanks.
Asmaa

-----Original Message-----
From: Stefan Bader <stefan.bader at canonical.com> 
Sent: Friday, April 1, 2022 5:32 AM
To: Asmaa Mnebhi <asmaa at nvidia.com>; kernel-team at lists.ubuntu.com
Subject: ACK/Cmnt: [SRU v2][F:linux-bluefield][Pull Request] Sync up gpio interrupt handling with upstreamed version

On 28.03.22 20:35, Asmaa Mnebhi wrote:
> This pull request (20 commits) includes reverting 6 gpio-mlxbf2 
> commits in linux-bluefield. Then it cherry-picks the commits made to 
> gpio-mlxbf2 in the linux master branch. commit 
> c8382b7415913d30f22cdfc28badc5e5de812f45
> introduces proper IRQ handling in the gpio-mlxbf2 driver.
> On top of the above, there are 3 commits:
> add the gpio-mlxbf2 driver version, remove a flag in i2c-mlxbf.c to 
> remain in sync with the interrupt handling in other drivers, and 
> create the pwr-mlxbf driver responsible for handling the low power 
> mode and reset interrupts.
> 
> BugLink: https://bugs.launchpad.net/bugs/1965017
> 
> This pull request page can be found at:
> 
> https://code.launchpad.net/~asmaam/ubuntu/+source/linux-bluefield/+git
> /version-seeds/+merge/417771
> 
> Git repo can be found at:
> 
> git+ssh://asmaam@git.launchpad.net/~asmaam/ubuntu/+source/linux-bluefi
> git+eld master-next-v2
> 
> for you to fetch changes starting from commit 
> 11fb12829f1a0dce8825f6ac86f78c043438e1ba
> 
>    Revert "UBUNTU: SAUCE: gpio-mlxbf2.c: Fix setting the gpio direction
>      to output"
> 
> Signed-off-by: Asmaa Mnebhi <asmaa at nvidia.com>

I realized the problem is that you did the pull request slightly incorrect. 
Normally I would expect to see something like: pull up to <sha1> from <repo> ... 
starting from <sha1>. There is no "up to" but maybe that is just related to git versions and where the branch ends. The real problem is the starting from sha1. 
This should be the last commit which should NOT be included. You have the first commit which HAS to be picked. But when I use that for either cherry-pick or format-patch it is not. And that patch changes the code section for which then the later revert fails.

So the request has to be adjusted to

fetch changes starting from commit bb4d82f9392e4ef6f6208548b11c9812a49d36bf

     UBUNTU: Ubuntu-bluefield-5.4.0-1031.34

> 
> Andy Shevchenko (4):
>    gpio: mlxbf2: Convert to device PM ops
>    gpio: mlxbf2: Drop wrong use of ACPI_PTR()
>    gpio: mlxbf2: Use devm_platform_ioremap_resource()
>    gpio: mlxbf2: Use DEFINE_RES_MEM_NAMED() helper macro
> 
> Asmaa Mnebhi (11):
>    Revert "UBUNTU: SAUCE: gpio-mlxbf2.c: Fix setting the gpio direction
>      to output"
>    Revert "UBUNTU: SAUCE: gpio-mlxbf2.c: remove phy interrupt"
>    Revert "UBUNTU: SAUCE: gpio-mlxbf2: Cleanup and use generic
>      gpio_irq_chip struct"
>    Revert "UBUNTU: SAUCE: gpio-mlxbf2.c: Support soft reset gpio
>      interrupt"
>    Revert "UBUNTU: SAUCE: gpio-mlxbf2.c: fix spinlock bug and using
>      uninitialized work"
>    Revert "UBUNTU: SAUCE: gpio: Add irq support for gpio-mlxbf2"
>    gpio: mlxbf2.c: Add check for bgpio_init failure
>    gpio: mlxbf2: Introduce IRQ support
>    UBUNTU: SAUCE: gpio-mlxbf2.c: Add version and fix
>      SPDX-License_Identifier
>    UBUNTU: SAUCE: i2c-mlxbf.c: remove IRQF_ONESHOT flag
>    UBUNTU: SAUCE: Add power driver to handle reset interrupt and low
>      power mode interrupt
> 
> Axel Lin (1):
>    gpio: mlxbf2: Fix sleeping while holding spinlock
> 
> Lee Jones (2):
>    gpio: gpio-mlxbf2: Tell the compiler that ACPI functions may not be
>      use
>    gpio: gpio-mlxbf2.c: Provide __releases() annotation to stop confusing
>      Sparse
> 
> Wei Yongjun (1):
>    gpio: mlxbf2: fix return value check in mlxbf2_gpio_get_lock_res()
> 
> YueHaibing (1):
>    gpio: mlxbf2: remove unused including <linux/version.h>
> 
>   drivers/gpio/gpio-mlxbf2.c      | 380 ++++++++------------------------
>   drivers/i2c/busses/i2c-mlxbf.c  |   2 +-
>   drivers/power/reset/Kconfig     |   6 +
>   drivers/power/reset/Makefile    |   1 +
>   drivers/power/reset/pwr-mlxbf.c | 102 +++++++++
>   5 files changed, 208 insertions(+), 283 deletions(-)
>   create mode 100644 drivers/power/reset/pwr-mlxbf.c
> 

With the adjusted start:

Acked-by: Stefan Bader <stefan.bader at canonical.com>