From patchwork Sat Jun 1 15:03:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sunil V L X-Patchwork-Id: 13682489 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C504FC25B76 for ; Sat, 1 Jun 2024 15:04:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=P2vq38/fjGoTAwKdPCYIf4eQRJjL/CohQzPCMgXRvV4=; b=ljoqBbfPSoe1Sm /xJXNpHXGAaN6iWsDpeGX8gvkPW/hBuyNCm04pT+2Nv5jFkHjKFunBXF7a6csDXm6LJtIeWbRgUsr Ijv737OHfQopMRY17NT8lTAvV5VvdSdUlvjKF+ga+u9TOievjNb0jiQ2ynsOnFPqypYXoKmtToHTR 5zBnT/RX+kefqpb0f28Dmp4/tsfO8ag5Zjrzq+JFNvFRuXwQNiCrWWSUDTF5aUx4p15jBdOpUrb6G ywsFXgaum/2A1O7VmfVoat2yMzvbJn4cdeFQKIH6k2IJ4A/rhkzDOJOYp48omkYY77K+ryyfOktSR Hn1xp6MqS1wbKayoAgaw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sDQHU-0000000CoSE-1ids; Sat, 01 Jun 2024 15:04:28 +0000 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sDQHR-0000000CoQs-1lO5 for linux-riscv@lists.infradead.org; Sat, 01 Jun 2024 15:04:27 +0000 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-70257104b4dso442111b3a.1 for ; Sat, 01 Jun 2024 08:04:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1717254262; x=1717859062; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=dgxwxnWOjHGJRULZg5HYqL5pz8PSgbwJm/88zI1CoMY=; b=hmkUmHukUnrdRXxZ/l+ev80W5SyqWLm5XkneXAC0+In0C2JgaIE9SQaeT7aezv4R0F Zs4pz02uY6OjuNcAWI1p15haFUe15UbqAQvqiTS9EXUdCobTQS1fpbiwN8eQtlmTtgll LCLrvvCzLGWlu3Y8QcHUDMk7D4BJQAFaBruQ8bxnKwOyfztccR86/tLYBUmqq1iO65HV rc0+jFkmnPhMycMw2KvgRemiGiEy+qThkXy4DMDYxVTT8HjHu5P9fwKVfjTLSbBdcxtB tGPHnQSJS+J9DyUF5jnnwGSwPp+cxqe+PEeKfqO52wrx/aSWKhiXSIblJTircPqNNKOk 8x8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717254262; x=1717859062; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dgxwxnWOjHGJRULZg5HYqL5pz8PSgbwJm/88zI1CoMY=; b=KPt5DCa9mUJ4wl/2bnLKvpfBfe/2Snb0KjDwk7WNM/QTnM7J80JFLzktCYUGP/Dkt8 inh8W/+w6nACGCXgCPTCd6W3IaGaMMcbypPKQbB/nOXrX7FS0lrTxLu+Jg1mDyGbSrSD +/sVyJEjMTaAqGCET43S1AVVncZhcaTUDI9aHRaFvgghC5wtVSw5p2D8F2fdpm9axjyB Tvv1raKYDdJPPjAKXM+pDkAKDLfzKm7+bwgDpFRncOMl2r3Lu4U0OtPiBRRwxruLanCf 30FqfAGAoGfVVXrin6QrzCmPVawmh2zzifiwNPm7xtWJDt88i1ynrUR7+8NWFSq3y0BK vNNQ== X-Forwarded-Encrypted: i=1; AJvYcCVKXSCYq3EiWNV4G34dvTkQgHiI81zQlOxCN1cWkQgovDYxjNXo+Q/vanRMujEnE8/nmFH+3bQ+Yx+sg8Nr+g/Zt55CS083mgCzee7xVNtp X-Gm-Message-State: AOJu0Yy8gWXRxBfIymJCQns1MCIP0PI6eA42tBstxdaYj0Xt+SzLiJfY dEKYwUxleZJAF/A4fuFxYqBQhB0FHTKP1iG2FiAzM9MrThJRu/jZHH0uBGjrWVM= X-Google-Smtp-Source: AGHT+IENZYZ6pmncsatWg7wAXsx4MuGnUG/pExhK7JqrpVwMEVVkLjFulSLz0B0y6o7X8oXFutrZkw== X-Received: by 2002:a05:6a21:78a1:b0:1b2:67d1:228c with SMTP id adf61e73a8af0-1b26f2cd637mr5593792637.48.1717254261549; Sat, 01 Jun 2024 08:04:21 -0700 (PDT) Received: from sunil-pc.Dlink ([106.51.187.237]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-6c35a4ba741sm2559410a12.85.2024.06.01.08.04.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 08:04:20 -0700 (PDT) From: Sunil V L To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org, acpica-devel@lists.linux.dev Subject: [PATCH v6 00/17] RISC-V: ACPI: Add external interrupt controller support Date: Sat, 1 Jun 2024 20:33:54 +0530 Message-Id: <20240601150411.1929783-1-sunilvl@ventanamicro.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240601_080425_499450_4E8E459C X-CRM114-Status: GOOD ( 21.27 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marc Zyngier , Albert Ou , Haibo1 Xu , "Rafael J . Wysocki" , Catalin Marinas , Anup Patel , Atish Kumar Patra , Robert Moore , Andy Shevchenko , Samuel Holland , Conor Dooley , Palmer Dabbelt , Paul Walmsley , Bjorn Helgaas , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Thomas Gleixner , Andrew Jones , Will Deacon , Len Brown Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org 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 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 riscv_acpi_namespace_v2 branch at https://github.com/vlsunil/qemu.git 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 along with the riscv-intc fix patch [1]. Since serial driver patch is dropped, SBI_HVC console needs to be used. Enable below configs while building the linux. CONFIG_NONPORTABLE=y CONFIG_HVC_RISCV_SBI=y 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=hvc0 rootwait earlycon=sbi" To boot with APLIC only, use aia=aplic. To boot with PLIC, remove aia= option. This series is also available in acpi_b2_v6 branch at https://github.com/vlsunil/linux.git [1] - https://lore.kernel.org/lkml/20240527081113.616189-1-sunilvl@ventanamicro.com/ [2] - https://lore.kernel.org/lkml/20240506140308.4040735-1-andriy.shevchenko@linux.intel.com/ Sunil V L (17): arm64: PCI: Migrate ACPI related functions to pci-acpi.c ACPI: scan: Add a weak function to reorder 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 | 14 + drivers/acpi/riscv/init.h | 4 + drivers/acpi/riscv/irq.c | 329 +++++++++++++++++++++ drivers/acpi/scan.c | 103 ++++--- drivers/irqchip/irq-riscv-aplic-direct.c | 22 +- drivers/irqchip/irq-riscv-aplic-main.c | 68 +++-- 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 | 94 ++++-- 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, 1106 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