mbox series

[v8,00/17] RISC-V: ACPI: Add external interrupt controller support

Message ID 20240812005929.113499-1-sunilvl@ventanamicro.com (mailing list archive)
Headers show
Series RISC-V: ACPI: Add external interrupt controller support | expand

Message

Sunil V L Aug. 12, 2024, 12:59 a.m. UTC 
This series adds support for the below ECR approved by ASWG.
1) MADT - https://drive.google.com/file/d/1oMGPyOD58JaPgMl1pKasT-VKsIKia7zR/view?usp=sharing

The series primarily enables irqchip drivers for RISC-V ACPI based
platforms.

The series can be broadly categorized like below. 

1) PCI ACPI related functions are migrated from arm64 to common file so
that we don't need to duplicate them for RISC-V.

2) Added support for re-ordering the probe of interrupt controllers when
IRQCHIP_ACPI_DECLARE is used.

3) To ensure probe order between interrupt controllers and devices,
implicit dependency is created similar to when _DEP is present.

4) ACPI support added in RISC-V interrupt controller drivers.

Changes since v7:
	1) Updated commit messages as per feedback from Bjorn on patches 2, 3 and 8.
	2) Addressed Anup Patel's comments.
	3) Added Tested-by tag from Björn Töpe which I missed to add in previous version.
	4) Rebased to 6.11-rc3 and updated the RB tags from Anup.

Changes since v6:
	1) Update to commit message/code comments as per feedback from Bjorn.
	2) Rebased to 6.11-rc1.

Changes since v5:
	1) Addressed feedback from Thomas.
	2) Created separate patch for refactoring DT code in IMSIC
	3) Separated a fix in riscv-intc irqchip driver and sent
	   separately. This series depends on that patch [1].
	4) Dropped serial driver patch since it depends on Andy's
	   refactoring series [2]. RISC-V patches will be sent
	   separately later once Andy series get accepted.
	5) Rebased to v6.10-rc1 which has AIA DT patches.
	6) Updated tags.

Changes since RFC v4:
	1) Removed RFC tag as the RFCv4 design looked reasonable.
	2) Dropped PCI patch needed to avoid warning when there is no MSI
	   controller. This will be sent later separately after the
	   current series.
	3) Dropped PNP handling of _DEP since there is new ACPI ID for
	   generic 16550 UART. Added the serial driver patch instead.
	4) Rebased to latest linux-next.
	5) Reordered/squashed patches in the series

Changes since RFC v3:
	1) Moved to _DEP method instead of fw_devlink.
	2) PLIC/APLIC driver probe using namespace devices.
	3) Handling PNP devices as part of clearing dependency.
	4) Rebased to latest linux-next to get AIA DT drivers.

Changes since RFC v2:
	1) Introduced fw_devlink for ACPI nodes for IRQ dependency.
	2) Dropped patches in drivers which are not required due to
	   fw_devlink support.
	3) Dropped pci_set_msi() patch and added a patch in
	   pci_create_root_bus().
	4) Updated pnp_irq() patch so that none of the actual PNP
	   drivers need to change.

Changes since RFC v1:
	1) Abandoned swnode approach as per Marc's feedback.
	2) To cope up with AIA series changes which changed irqchip driver
	   probe from core_initcall() to platform_driver, added patches
	   to support deferred probing.
	3) Rebased on top of Anup's AIA v11 and added tags.

To test the series,

1) qemu should be built using the latest master branch.

2) EDK2 should be built using the instructions at:
https://github.com/tianocore/edk2/blob/master/OvmfPkg/RiscVVirt/README.md

NOTE: One should be able to use u-boot as well as per instructions from Björn.
https://lore.kernel.org/lkml/87a5lqsrvh.fsf@all.your.base.are.belong.to.us/

3) Build Linux using this series (+ serial driver patches which are already in linux-next).
aia_b2_v8 branch in https://github.com/vlsunil/linux.git all these patches.

Run Qemu:
qemu-system-riscv64 \
 -M virt,pflash0=pflash0,pflash1=pflash1,aia=aplic-imsic \
 -m 2G -smp 8 \
 -serial mon:stdio \
 -device virtio-gpu-pci -full-screen \
 -device qemu-xhci \
 -device usb-kbd \
 -blockdev node-name=pflash0,driver=file,read-only=on,filename=RISCV_VIRT_CODE.fd \
 -blockdev node-name=pflash1,driver=file,filename=RISCV_VIRT_VARS.fd \
 -netdev user,id=net0 -device virtio-net-pci,netdev=net0 \
 -kernel arch/riscv/boot/Image \
 -initrd rootfs.cpio \
 -append "root=/dev/ram ro console=ttyS0 rootwait earlycon=sbi"

To boot with APLIC only, use aia=aplic.
To boot with PLIC, remove aia= option.

Sunil V L (17):
  arm64: PCI: Migrate ACPI related functions to pci-acpi.c
  ACPI: scan: Add a weak arch_sort_irqchip_probe() to order the IRQCHIP
    probe
  ACPI: bus: Add acpi_riscv_init() function
  ACPI: scan: Refactor dependency creation
  ACPI: scan: Add RISC-V interrupt controllers to honor list
  ACPI: scan: Define weak function to populate dependencies
  ACPI: bus: Add RINTC IRQ model for RISC-V
  ACPI: pci_link: Clear the dependencies after probe
  ACPI: RISC-V: Implement PCI related functionality
  ACPI: RISC-V: Implement function to reorder irqchip probe entries
  ACPI: RISC-V: Initialize GSI mapping structures
  ACPI: RISC-V: Implement function to add implicit dependencies
  irqchip/riscv-intc: Add ACPI support for AIA
  irqchip/riscv-imsic-state: Create separate function for DT
  irqchip/riscv-imsic: Add ACPI support
  irqchip/riscv-aplic: Add ACPI support
  irqchip/sifive-plic: Add ACPI support

 arch/arm64/kernel/pci.c                    | 191 ------------
 arch/riscv/Kconfig                         |   2 +
 arch/riscv/include/asm/irq.h               |  55 ++++
 arch/riscv/kernel/acpi.c                   |  33 +-
 drivers/acpi/bus.c                         |   4 +
 drivers/acpi/pci_link.c                    |   2 +
 drivers/acpi/riscv/Makefile                |   2 +-
 drivers/acpi/riscv/init.c                  |  13 +
 drivers/acpi/riscv/init.h                  |   4 +
 drivers/acpi/riscv/irq.c                   | 335 +++++++++++++++++++++
 drivers/acpi/scan.c                        | 103 ++++---
 drivers/irqchip/irq-riscv-aplic-direct.c   |  22 +-
 drivers/irqchip/irq-riscv-aplic-main.c     |  69 +++--
 drivers/irqchip/irq-riscv-aplic-main.h     |   1 +
 drivers/irqchip/irq-riscv-aplic-msi.c      |   9 +-
 drivers/irqchip/irq-riscv-imsic-early.c    |  64 +++-
 drivers/irqchip/irq-riscv-imsic-platform.c |  32 +-
 drivers/irqchip/irq-riscv-imsic-state.c    | 160 +++++-----
 drivers/irqchip/irq-riscv-imsic-state.h    |   2 +-
 drivers/irqchip/irq-riscv-intc.c           |  90 ++++++
 drivers/irqchip/irq-sifive-plic.c          |  95 ++++--
 drivers/pci/pci-acpi.c                     | 182 +++++++++++
 include/acpi/acpi_bus.h                    |   2 +
 include/linux/acpi.h                       |   9 +
 include/linux/irqchip/riscv-imsic.h        |   9 +
 25 files changed, 1113 insertions(+), 377 deletions(-)
 create mode 100644 drivers/acpi/riscv/init.c
 create mode 100644 drivers/acpi/riscv/init.h
 create mode 100644 drivers/acpi/riscv/irq.c

Comments

Sunil V L Aug. 12, 2024, 1:07 a.m. UTC | #1 
On Mon, Aug 12, 2024 at 06:29:12AM +0530, Sunil V L wrote:
> This series adds support for the below ECR approved by ASWG.
> 1) MADT - https://drive.google.com/file/d/1oMGPyOD58JaPgMl1pKasT-VKsIKia7zR/view?usp=sharing
> 
> The series primarily enables irqchip drivers for RISC-V ACPI based
> platforms.
> 
> The series can be broadly categorized like below. 
> 
> 1) PCI ACPI related functions are migrated from arm64 to common file so
> that we don't need to duplicate them for RISC-V.
> 
> 2) Added support for re-ordering the probe of interrupt controllers when
> IRQCHIP_ACPI_DECLARE is used.
> 
> 3) To ensure probe order between interrupt controllers and devices,
> implicit dependency is created similar to when _DEP is present.
> 
> 4) ACPI support added in RISC-V interrupt controller drivers.
> 
> Changes since v7:
> 	1) Updated commit messages as per feedback from Bjorn on patches 2, 3 and 8.
> 	2) Addressed Anup Patel's comments.
> 	3) Added Tested-by tag from Björn Töpe which I missed to add in previous version.
> 	4) Rebased to 6.11-rc3 and updated the RB tags from Anup.
> 
> Changes since v6:
> 	1) Update to commit message/code comments as per feedback from Bjorn.
> 	2) Rebased to 6.11-rc1.
> 
> Changes since v5:
> 	1) Addressed feedback from Thomas.
> 	2) Created separate patch for refactoring DT code in IMSIC
> 	3) Separated a fix in riscv-intc irqchip driver and sent
> 	   separately. This series depends on that patch [1].
> 	4) Dropped serial driver patch since it depends on Andy's
> 	   refactoring series [2]. RISC-V patches will be sent
> 	   separately later once Andy series get accepted.
> 	5) Rebased to v6.10-rc1 which has AIA DT patches.
> 	6) Updated tags.
> 
> Changes since RFC v4:
> 	1) Removed RFC tag as the RFCv4 design looked reasonable.
> 	2) Dropped PCI patch needed to avoid warning when there is no MSI
> 	   controller. This will be sent later separately after the
> 	   current series.
> 	3) Dropped PNP handling of _DEP since there is new ACPI ID for
> 	   generic 16550 UART. Added the serial driver patch instead.
> 	4) Rebased to latest linux-next.
> 	5) Reordered/squashed patches in the series
> 
> Changes since RFC v3:
> 	1) Moved to _DEP method instead of fw_devlink.
> 	2) PLIC/APLIC driver probe using namespace devices.
> 	3) Handling PNP devices as part of clearing dependency.
> 	4) Rebased to latest linux-next to get AIA DT drivers.
> 
> Changes since RFC v2:
> 	1) Introduced fw_devlink for ACPI nodes for IRQ dependency.
> 	2) Dropped patches in drivers which are not required due to
> 	   fw_devlink support.
> 	3) Dropped pci_set_msi() patch and added a patch in
> 	   pci_create_root_bus().
> 	4) Updated pnp_irq() patch so that none of the actual PNP
> 	   drivers need to change.
> 
> Changes since RFC v1:
> 	1) Abandoned swnode approach as per Marc's feedback.
> 	2) To cope up with AIA series changes which changed irqchip driver
> 	   probe from core_initcall() to platform_driver, added patches
> 	   to support deferred probing.
> 	3) Rebased on top of Anup's AIA v11 and added tags.
> 
Hi Rafael,

Hope you are back this week!.

This series has spent quite a bit of time now on the list. As you are
aware, few clarifications like _PIC codes are also done now. There is
no major change after you had agreed for the design. So, can this be
considered for the next release please?

Thanks!
Sunil
Thomas Gleixner Aug. 26, 2024, 3:25 p.m. UTC | #2 
On Mon, Aug 12 2024 at 06:37, Sunil V. L. wrote:
> On Mon, Aug 12, 2024 at 06:29:12AM +0530, Sunil V L wrote:
>> This series adds support for the below ECR approved by ASWG.
>> 1) MADT - https://drive.google.com/file/d/1oMGPyOD58JaPgMl1pKasT-VKsIKia7zR/view?usp=sharing
>> 
>> The series primarily enables irqchip drivers for RISC-V ACPI based
>> platforms.
>
> This series has spent quite a bit of time now on the list. As you are
> aware, few clarifications like _PIC codes are also done now. There is
> no major change after you had agreed for the design. So, can this be
> considered for the next release please?

Rafael, if you want to take it through the ACPI tree, then for the
irqchip parts please add:

  Acked-by: Thomas Gleixner <tglx@linutronix.de>

Thanks,

        tglx
Rafael J. Wysocki Aug. 26, 2024, 4:15 p.m. UTC | #3 
On Mon, Aug 26, 2024 at 5:25 PM Thomas Gleixner <tglx@linutronix.de> wrote:
>
> On Mon, Aug 12 2024 at 06:37, Sunil V. L. wrote:
> > On Mon, Aug 12, 2024 at 06:29:12AM +0530, Sunil V L wrote:
> >> This series adds support for the below ECR approved by ASWG.
> >> 1) MADT - https://drive.google.com/file/d/1oMGPyOD58JaPgMl1pKasT-VKsIKia7zR/view?usp=sharing
> >>
> >> The series primarily enables irqchip drivers for RISC-V ACPI based
> >> platforms.
> >
> > This series has spent quite a bit of time now on the list. As you are
> > aware, few clarifications like _PIC codes are also done now. There is
> > no major change after you had agreed for the design. So, can this be
> > considered for the next release please?
>
> Rafael, if you want to take it through the ACPI tree, then for the
> irqchip parts please add:
>
>   Acked-by: Thomas Gleixner <tglx@linutronix.de>

Yes, I'm going ro do this.

Thank you!
Sunil V L Aug. 26, 2024, 5:13 p.m. UTC | #4 
On Mon, Aug 26, 2024 at 06:15:18PM +0200, Rafael J. Wysocki wrote:
> On Mon, Aug 26, 2024 at 5:25 PM Thomas Gleixner <tglx@linutronix.de> wrote:
> >
> > On Mon, Aug 12 2024 at 06:37, Sunil V. L. wrote:
> > > On Mon, Aug 12, 2024 at 06:29:12AM +0530, Sunil V L wrote:
> > >> This series adds support for the below ECR approved by ASWG.
> > >> 1) MADT - https://drive.google.com/file/d/1oMGPyOD58JaPgMl1pKasT-VKsIKia7zR/view?usp=sharing
> > >>
> > >> The series primarily enables irqchip drivers for RISC-V ACPI based
> > >> platforms.
> > >
> > > This series has spent quite a bit of time now on the list. As you are
> > > aware, few clarifications like _PIC codes are also done now. There is
> > > no major change after you had agreed for the design. So, can this be
> > > considered for the next release please?
> >
> > Rafael, if you want to take it through the ACPI tree, then for the
> > irqchip parts please add:
> >
> >   Acked-by: Thomas Gleixner <tglx@linutronix.de>
> 
> Yes, I'm going ro do this.
> 
> Thank you!
Thanks!

There will be a conflict in PLIC irqchip driver due to a recent patch [1].
This patch is not in latest RC5 release but in linux-next. I usually base the
series on latest RC release. Should I rebase to linux-next in this case
and send the next revision of the series resolving the conflict?

[1] - https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=4d936f10ff80274841537a26d1fbfe9984de0ef9

Thanks,
Sunil
Rafael J. Wysocki Aug. 26, 2024, 5:27 p.m. UTC | #5 
On Mon, Aug 26, 2024 at 7:22 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
>
> On Mon, Aug 26, 2024 at 06:15:18PM +0200, Rafael J. Wysocki wrote:
> > On Mon, Aug 26, 2024 at 5:25 PM Thomas Gleixner <tglx@linutronix.de> wrote:
> > >
> > > On Mon, Aug 12 2024 at 06:37, Sunil V. L. wrote:
> > > > On Mon, Aug 12, 2024 at 06:29:12AM +0530, Sunil V L wrote:
> > > >> This series adds support for the below ECR approved by ASWG.
> > > >> 1) MADT - https://drive.google.com/file/d/1oMGPyOD58JaPgMl1pKasT-VKsIKia7zR/view?usp=sharing
> > > >>
> > > >> The series primarily enables irqchip drivers for RISC-V ACPI based
> > > >> platforms.
> > > >
> > > > This series has spent quite a bit of time now on the list. As you are
> > > > aware, few clarifications like _PIC codes are also done now. There is
> > > > no major change after you had agreed for the design. So, can this be
> > > > considered for the next release please?
> > >
> > > Rafael, if you want to take it through the ACPI tree, then for the
> > > irqchip parts please add:
> > >
> > >   Acked-by: Thomas Gleixner <tglx@linutronix.de>
> >
> > Yes, I'm going ro do this.
> >
> > Thank you!
> Thanks!
>
> There will be a conflict in PLIC irqchip driver due to a recent patch [1].
> This patch is not in latest RC5 release but in linux-next. I usually base the
> series on latest RC release. Should I rebase to linux-next in this case
> and send the next revision of the series resolving the conflict?

No, please don't.

That will be resolved at the merge time.

> [1] - https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=4d936f10ff80274841537a26d1fbfe9984de0ef9

Thanks!
Thomas Gleixner Aug. 26, 2024, 9:17 p.m. UTC | #6 
On Mon, Aug 26 2024 at 19:27, Rafael J. Wysocki wrote:
> On Mon, Aug 26, 2024 at 7:22 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
>> There will be a conflict in PLIC irqchip driver due to a recent patch [1].
>> This patch is not in latest RC5 release but in linux-next. I usually base the
>> series on latest RC release. Should I rebase to linux-next in this case
>> and send the next revision of the series resolving the conflict?
>
> No, please don't.
>
> That will be resolved at the merge time.

Alternatively you can pull

  git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-2024-08-25

which I'm about to send to Linus latest tomorrow morning. That contains
the conflicting change.

Thanks,

        tglx
Rafael J. Wysocki Aug. 27, 2024, 4:20 p.m. UTC | #7 
On Mon, Aug 26, 2024 at 11:22 PM Thomas Gleixner <tglx@linutronix.de> wrote:
>
> On Mon, Aug 26 2024 at 19:27, Rafael J. Wysocki wrote:
> > On Mon, Aug 26, 2024 at 7:22 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
> >> There will be a conflict in PLIC irqchip driver due to a recent patch [1].
> >> This patch is not in latest RC5 release but in linux-next. I usually base the
> >> series on latest RC release. Should I rebase to linux-next in this case
> >> and send the next revision of the series resolving the conflict?
> >
> > No, please don't.
> >
> > That will be resolved at the merge time.
>
> Alternatively you can pull
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-2024-08-25
>
> which I'm about to send to Linus latest tomorrow morning. That contains
> the conflicting change.

So I've applied the series on top of the above.

This included a full-swing rebase of the last patch, which I hope I've
done correctly, but Sunil please see

https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git/commit/?h=bleeding-edge&id=5d1b549883c1bba331c419e491fda9bb934ea202

and let me know.

Thanks!
Sunil V L Aug. 27, 2024, 5:04 p.m. UTC | #8 
On Tue, Aug 27, 2024 at 06:20:24PM +0200, Rafael J. Wysocki wrote:
> On Mon, Aug 26, 2024 at 11:22 PM Thomas Gleixner <tglx@linutronix.de> wrote:
> >
> > On Mon, Aug 26 2024 at 19:27, Rafael J. Wysocki wrote:
> > > On Mon, Aug 26, 2024 at 7:22 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
> > >> There will be a conflict in PLIC irqchip driver due to a recent patch [1].
> > >> This patch is not in latest RC5 release but in linux-next. I usually base the
> > >> series on latest RC release. Should I rebase to linux-next in this case
> > >> and send the next revision of the series resolving the conflict?
> > >
> > > No, please don't.
> > >
> > > That will be resolved at the merge time.
> >
> > Alternatively you can pull
> >
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-2024-08-25
> >
> > which I'm about to send to Linus latest tomorrow morning. That contains
> > the conflicting change.
> 
> So I've applied the series on top of the above.
> 
Thanks!

> This included a full-swing rebase of the last patch, which I hope I've
> done correctly, but Sunil please see
>
Yeah, sorry about that. You have resolved most of the conflicts but few
are missing (which were not obvious anyway). Could you please take below
commit and squash?

https://github.com/vlsunil/linux/commit/c85f9d0dc31c0e77916ecdbb457748c05cf4e75a

Thanks!
Sunil
Rafael J. Wysocki Aug. 27, 2024, 5:12 p.m. UTC | #9 
On Tue, Aug 27, 2024 at 7:04 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
>
> On Tue, Aug 27, 2024 at 06:20:24PM +0200, Rafael J. Wysocki wrote:
> > On Mon, Aug 26, 2024 at 11:22 PM Thomas Gleixner <tglx@linutronix.de> wrote:
> > >
> > > On Mon, Aug 26 2024 at 19:27, Rafael J. Wysocki wrote:
> > > > On Mon, Aug 26, 2024 at 7:22 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
> > > >> There will be a conflict in PLIC irqchip driver due to a recent patch [1].
> > > >> This patch is not in latest RC5 release but in linux-next. I usually base the
> > > >> series on latest RC release. Should I rebase to linux-next in this case
> > > >> and send the next revision of the series resolving the conflict?
> > > >
> > > > No, please don't.
> > > >
> > > > That will be resolved at the merge time.
> > >
> > > Alternatively you can pull
> > >
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-2024-08-25
> > >
> > > which I'm about to send to Linus latest tomorrow morning. That contains
> > > the conflicting change.
> >
> > So I've applied the series on top of the above.
> >
> Thanks!
>
> > This included a full-swing rebase of the last patch, which I hope I've
> > done correctly, but Sunil please see
> >
> Yeah, sorry about that. You have resolved most of the conflicts but few
> are missing (which were not obvious anyway). Could you please take below
> commit and squash?
>
> https://github.com/vlsunil/linux/commit/c85f9d0dc31c0e77916ecdbb457748c05cf4e75a

Can you please send me a diff?
Sunil V L Aug. 27, 2024, 5:31 p.m. UTC | #10 
On Tue, Aug 27, 2024 at 07:12:11PM +0200, Rafael J. Wysocki wrote:
> On Tue, Aug 27, 2024 at 7:04 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
> >
> > On Tue, Aug 27, 2024 at 06:20:24PM +0200, Rafael J. Wysocki wrote:
> > > On Mon, Aug 26, 2024 at 11:22 PM Thomas Gleixner <tglx@linutronix.de> wrote:
> > > >
> > > > On Mon, Aug 26 2024 at 19:27, Rafael J. Wysocki wrote:
> > > > > On Mon, Aug 26, 2024 at 7:22 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
> > > > >> There will be a conflict in PLIC irqchip driver due to a recent patch [1].
> > > > >> This patch is not in latest RC5 release but in linux-next. I usually base the
> > > > >> series on latest RC release. Should I rebase to linux-next in this case
> > > > >> and send the next revision of the series resolving the conflict?
> > > > >
> > > > > No, please don't.
> > > > >
> > > > > That will be resolved at the merge time.
> > > >
> > > > Alternatively you can pull
> > > >
> > > >   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-2024-08-25
> > > >
> > > > which I'm about to send to Linus latest tomorrow morning. That contains
> > > > the conflicting change.
> > >
> > > So I've applied the series on top of the above.
> > >
> > Thanks!
> >
> > > This included a full-swing rebase of the last patch, which I hope I've
> > > done correctly, but Sunil please see
> > >
> > Yeah, sorry about that. You have resolved most of the conflicts but few
> > are missing (which were not obvious anyway). Could you please take below
> > commit and squash?
> >
> > https://github.com/vlsunil/linux/commit/c85f9d0dc31c0e77916ecdbb457748c05cf4e75a
> 
> Can you please send me a diff?
> 
Hi Rafael,

I have sent the diff to you. Hope that is fine.

Thanks!
Sunil
Rafael J. Wysocki Aug. 27, 2024, 5:56 p.m. UTC | #11 
On Tue, Aug 27, 2024 at 7:31 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
>
> On Tue, Aug 27, 2024 at 07:12:11PM +0200, Rafael J. Wysocki wrote:
> > On Tue, Aug 27, 2024 at 7:04 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
> > >
> > > On Tue, Aug 27, 2024 at 06:20:24PM +0200, Rafael J. Wysocki wrote:
> > > > On Mon, Aug 26, 2024 at 11:22 PM Thomas Gleixner <tglx@linutronix.de> wrote:
> > > > >
> > > > > On Mon, Aug 26 2024 at 19:27, Rafael J. Wysocki wrote:
> > > > > > On Mon, Aug 26, 2024 at 7:22 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
> > > > > >> There will be a conflict in PLIC irqchip driver due to a recent patch [1].
> > > > > >> This patch is not in latest RC5 release but in linux-next. I usually base the
> > > > > >> series on latest RC release. Should I rebase to linux-next in this case
> > > > > >> and send the next revision of the series resolving the conflict?
> > > > > >
> > > > > > No, please don't.
> > > > > >
> > > > > > That will be resolved at the merge time.
> > > > >
> > > > > Alternatively you can pull
> > > > >
> > > > >   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-2024-08-25
> > > > >
> > > > > which I'm about to send to Linus latest tomorrow morning. That contains
> > > > > the conflicting change.
> > > >
> > > > So I've applied the series on top of the above.
> > > >
> > > Thanks!
> > >
> > > > This included a full-swing rebase of the last patch, which I hope I've
> > > > done correctly, but Sunil please see
> > > >
> > > Yeah, sorry about that. You have resolved most of the conflicts but few
> > > are missing (which were not obvious anyway). Could you please take below
> > > commit and squash?
> > >
> > > https://github.com/vlsunil/linux/commit/c85f9d0dc31c0e77916ecdbb457748c05cf4e75a
> >
> > Can you please send me a diff?
> >
> Hi Rafael,
>
> I have sent the diff to you. Hope that is fine.

Squashed and pushed out, please see

https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git/commit/?h=bleeding-edge&id=9153fdae30867fe5d71f6a15b8a1974d7e801f39

Thanks!
Sunil V L Aug. 27, 2024, 6:12 p.m. UTC | #12 
On Tue, Aug 27, 2024 at 07:56:52PM +0200, Rafael J. Wysocki wrote:
> On Tue, Aug 27, 2024 at 7:31 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
> >
> > On Tue, Aug 27, 2024 at 07:12:11PM +0200, Rafael J. Wysocki wrote:
> > > On Tue, Aug 27, 2024 at 7:04 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
> > > >
> > > > On Tue, Aug 27, 2024 at 06:20:24PM +0200, Rafael J. Wysocki wrote:
> > > > > On Mon, Aug 26, 2024 at 11:22 PM Thomas Gleixner <tglx@linutronix.de> wrote:
> > > > > >
> > > > > > On Mon, Aug 26 2024 at 19:27, Rafael J. Wysocki wrote:
> > > > > > > On Mon, Aug 26, 2024 at 7:22 PM Sunil V L <sunilvl@ventanamicro.com> wrote:
> > > > > > >> There will be a conflict in PLIC irqchip driver due to a recent patch [1].
> > > > > > >> This patch is not in latest RC5 release but in linux-next. I usually base the
> > > > > > >> series on latest RC release. Should I rebase to linux-next in this case
> > > > > > >> and send the next revision of the series resolving the conflict?
> > > > > > >
> > > > > > > No, please don't.
> > > > > > >
> > > > > > > That will be resolved at the merge time.
> > > > > >
> > > > > > Alternatively you can pull
> > > > > >
> > > > > >   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-2024-08-25
> > > > > >
> > > > > > which I'm about to send to Linus latest tomorrow morning. That contains
> > > > > > the conflicting change.
> > > > >
> > > > > So I've applied the series on top of the above.
> > > > >
> > > > Thanks!
> > > >
> > > > > This included a full-swing rebase of the last patch, which I hope I've
> > > > > done correctly, but Sunil please see
> > > > >
> > > > Yeah, sorry about that. You have resolved most of the conflicts but few
> > > > are missing (which were not obvious anyway). Could you please take below
> > > > commit and squash?
> > > >
> > > > https://github.com/vlsunil/linux/commit/c85f9d0dc31c0e77916ecdbb457748c05cf4e75a
> > >
> > > Can you please send me a diff?
> > >
> > Hi Rafael,
> >
> > I have sent the diff to you. Hope that is fine.
> 
> Squashed and pushed out, please see
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git/commit/?h=bleeding-edge&id=9153fdae30867fe5d71f6a15b8a1974d7e801f39
> 
LGTM. Thanks!