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

Asmaa Mnebhi asmaa at nvidia.com
Thu Mar 24 17:59:09 UTC 2022


HI Stefan,

I did a clean clone to make sure I am not missing any changes:

git clone https://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-bluefield/+git/focal
<default branch was master>

git checkout remotes/origin/master-next -b master-next

git remote add master-next-gpio-interrupts https://git.launchpad.net/~asmaam/ubuntu/+source/linux-bluefield

git fetch master-next-gpio-interrupts

git rebase -i remotes/master-next-gpio-interrupts/master-next-gpio-interrupts

asmaa at farm-0002:~/workspace/canonical/latest1/focal$ git log remotes/origin/master-next..master-next --oneline --no-merges
64fbcef2fa10 (HEAD -> master-next, master-next-gpio-interrupts/master-next-gpio-interrupts) UBUNTU: SAUCE: Add power driver to handle reset interrupt and low power mode interrupt
88b0ea2d2f37 UBUNTU: SAUCE: Add driver version and fix SPDX-License_Identifier
c8382b741591 gpio: mlxbf2: Introduce IRQ support
80d7ddca3e61 gpio: mlxbf2.c: Add check for bgpio_init failure
ac642a2f05a8 gpio: mlxbf2: Use DEFINE_RES_MEM_NAMED() helper macro
6650a4b255d3 gpio: mlxbf2: Use devm_platform_ioremap_resource()
bdd9661d0ccc gpio: mlxbf2: Drop wrong use of ACPI_PTR()
56165dfd0cd3 gpio: mlxbf2: Convert to device PM ops
63754453b434 gpio: gpio-mlxbf2.c: Provide __releases() annotation to stop confusing Sparse
bdb331c1934d gpio: gpio-mlxbf2: Tell the compiler that ACPI functions may not be use
adb638298e7e gpio: mlxbf2: Fix sleeping while holding spinlock
7cd267a3f862 gpio: mlxbf2: fix return value check in mlxbf2_gpio_get_lock_res()
7b3633a62138 gpio: mlxbf2: remove unused including <linux/version.h>
ddf49e28998c Revert "UBUNTU: SAUCE: gpio: Add irq support for gpio-mlxbf2"
19a074034cb1 Revert "UBUNTU: SAUCE: gpio-mlxbf2.c: fix spinlock bug and using uninitialized work"
062deb64f000 Revert "UBUNTU: SAUCE: gpio-mlxbf2.c: Support soft reset gpio interrupt"
10247e0f3bf1 Revert "UBUNTU: SAUCE: gpio-mlxbf2: Cleanup and use generic gpio_irq_chip struct"
cd7772353ba0 Revert "UBUNTU: SAUCE: gpio-mlxbf2.c: remove phy interrupt"
281a55483e50 Revert "UBUNTU: SAUCE: gpio-mlxbf2.c: Fix setting the gpio direction to output"

I didn’t see any conflicts or issues when I did the rebase above. Could you tell me how you reproduced the issue?

Anyways, I will do everything from scratch: i.e. git clone, the reverts and the cherry-pick and new patches. Then will send a clean pull request since I am not able to reproduce the issue you mentioned.

Thanks.
Asmaa
-----Original Message-----
From: Stefan Bader <stefan.bader at canonical.com> 
Sent: Wednesday, March 23, 2022 4:16 AM
To: Asmaa Mnebhi <asmaa at nvidia.com>; kernel-team at lists.ubuntu.com
Subject: Re: NACK/Cmnt: [SRU v1][F:linux-bluefield][Pull Request] Sync up gpio interrupt handling with upstreamed version

On 22.03.22 15:54, Asmaa Mnebhi wrote:
> Hi Stefan,
> 
> I will fix the bug reference in my next commit.
> Regarding your first comment, I found this commit in your master-next:
> 
> commit 8eb4697b64968f1bfa714a9c0505ba734eb81c12
> Author: Shravan Kumar Ramani <sramani at mellanox.com>
> Date:   Wed Jun 24 11:53:15 2020 -0400
> 
>      UBUNTU: SAUCE: gpio: Add irq support for gpio-mlxbf2
>      
>      ARM GPIO 16 bit 0 is used to indicate switch to AUX power
>      mode on OCP 3.0. Enable an interrupt when this bit is
>      changed, and use the interrupt handler to send a netlink
>      message to the ACPI daemon which puts the chip in a low
>      power state.
>      
>      Change-Id: I77fa676e693f1e1a171279836aef81d1d300a20b
>      Signed-off-by: Shravan Kumar Ramani <sramani at mellanox.com>
>      Signed-off-by: Wen-chien Jesse Sung <jesse.sung at canonical.com>
> 
> So I am a bit confused?

The commit might be there but there can be changes between it being applied and now which modify the same regions of code. Depending where you base off this might be visible or not. When I pulled the changes and tried to apply them on top of current HEAD I got a failure for hunk #2.

-Stefan

> 
> Thanks.
> Asmaa
> -----Original Message-----
> From: Stefan Bader <stefan.bader at canonical.com>
> Sent: Tuesday, March 22, 2022 3:46 AM
> To: Asmaa Mnebhi <asmaa at nvidia.com>; kernel-team at lists.ubuntu.com
> Subject: NACK/Cmnt: [SRU v1][F:linux-bluefield][Pull Request] Sync up 
> gpio interrupt handling with upstreamed version
> 
> On 16.03.22 15:32, Asmaa Mnebhi wrote:
>> This pull request (19 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 2 commits:
>> one which adds the gpio-mlxbf2 driver version and the second one 
>> creates the pwr-mlxbf driver which is responsible of handling the low 
>> power mode and reset interrupts.
>>
>> BugLink: https://bugs.launchpad.net/bugs/1922393
>>
>> This pull request page can be found at:
>>
>> https://code.launchpad.net/~asmaam/ubuntu/+source/linux-bluefield/+gi
>> t
>> /version-seeds/+merge/416960
>>
>> Git repo can be found at:
>>
>> git+ssh://asmaam@git.launchpad.net/~asmaam/ubuntu/+source/linux-bluef
>> git+i
>> git+eld master-next-gpio-interrupts
>>
>> for you to fetch changes starting from commit
>> 281a55483e5033dd5f6a55580bdee24e4c264758
>>
>>     Revert "UBUNTU: SAUCE: gpio-mlxbf2.c: Fix setting the gpio direction
>>       to output"
>>
>> Signed-off-by: Asmaa Mnebhi <asmaa at nvidia.com>
>>
>> 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 (10):
>>     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: Add driver version and fix SPDX-License_Identifier
>>     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/power/reset/Kconfig     |   6 +
>>    drivers/power/reset/Makefile    |   1 +
>>    drivers/power/reset/pwr-mlxbf.c | 101 +++++++++
>>    4 files changed, 206 insertions(+), 282 deletions(-)
>>    create mode 100644 drivers/power/reset/pwr-mlxbf.c
>>
> 
> Patch #5 (Revert "UBUNTU: SAUCE: gpio: Add irq support for gpio-mlxbf2") does not apply to current master-next (also can not be cherry-picked).
> Also for v2 you should fix the bug reference in the cover email to be https://bugs.launchpad.net/bugs/1965017.
> 
> -Stefan



More information about the kernel-team mailing list