Add acpi device resource enumeration support #62694

najumon1980 · 2023-09-15T11:25:00Z

Add acpi device resource enumeration interface and updated uart driver with the new acpi interface

dcpleung

I haven't looked in details. But took a quick look over the UART driver, and it seems you are replacing PCIe with ACPI in several places. That is not right.

dcpleung · 2023-09-18T16:12:45Z

drivers/serial/uart_ns16550.c

+ }
+
+#define UART_NS16550_IRQ_CONFIG_PCIE0(n) \
+ _CONCAT(UART_NS16550_IRQ_CONFIG_ACPI, DT_INST_ON_BUS(n, acpi))(n)


What if there are no ACPI instances but purely PCIe instances?

The design change takecare UART instances on both ACPI and PCI or DTS and ACPI at the same time. (For example: UART0 on ACPI node, UART1 on PCI or UART0 on DTS and UART1 on PCI. But doesn't support ACPI and DTS at the same time.

dcpleung · 2023-09-18T16:13:35Z

drivers/serial/uart_ns16550.c

+#define UART_NS16550_IRQ_CONFIG_ACPI1(n) \
+ static void irq_config_func##n(const struct device *dev) \
+ { \
+ }


Why is this empty for ACPI1?

For instances on ACPI node, both IRQ and MMIO config as part of init routine. So ACPI irq config is add as stub function.

updated the code

najumon1980 · 2023-09-19T05:21:50Z

I haven't looked in details. But took a quick look over the UART driver, and it seems you are replacing PCIe with ACPI in several places. That is not right.

The design change takecare UART instances on both ACPI and PCI or DTS and ACPI at the same time. (For example: UART0 on ACPI node, UART1 on PCI or UART0 on DTS and UART1 on PCI. But doesn't support ACPI and DTS at the same time. You can go through existing code and changes to get full picture.

dcpleung · 2023-09-19T21:19:56Z

This is getting overly complicated. Could you find another way of doing this? Might want to use COND_CODE_1() instead of macro trampolines.

najumon1980 · 2023-09-22T16:05:53Z

This is getting overly complicated. Could you find another way of doing this? Might want to use COND_CODE_1() instead of macro trampolines.

I totally agree that it will complicate drivers if we need to support on multiple bus topologies and for this I just created a draft PR (WIP): #62993 to abstract such complexity and is given currently just for analyzes purpose.

dts/bindings/acpi/acpi-vbus.yaml

tbursztyka

still an issue in dts side.

tbursztyka · 2024-01-31T09:15:57Z

dts/bindings/acpi/acpi-device.yaml

+# Copyright (c) 2023 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+# Common fields for PCIe devices


"Common fields for ACPI informed based devices"

tbursztyka · 2024-01-31T09:16:59Z

dts/bindings/acpi/acpi-device.yaml

@@ -0,0 +1,23 @@
+# Copyright (c) 2023 Intel Corporation


Rename the file to acpi.yaml

add device resource enumaration support such as irq and mmio. Signed-off-by: Najumon B.A <najumon.ba@intel.com>

add acpi pnp/hw id for pcie node to enable support for retreive interrupt routing information for pci legacy interrupt via acpi Signed-off-by: Najumon B.A <najumon.ba@intel.com>

update prt retrieve based on acpi pnp id instead of acpi device path/name Signed-off-by: Najumon B.A <najumon.ba@intel.com>

add resource enumeration and acpi method shell commands such as retrieve mmio and interrupt resources. Signed-off-by: Najumon B.A <najumon.ba@intel.com>

add acpi hid support for mc146818 yaml file. Currently this added for acpi test case support. Signed-off-by: Najumon B.A <najumon.ba@intel.com>

remove pci bus compatible id dependency from qemu platforms overlay files for disk and ivshmem test apps. This already provided as part of respecitve board dts files and hence no need to duplicate here. Signed-off-by: Najumon B.A <najumon.ba@intel.com>

update acpi test cases with device enumeration, mmio and irq resources enumeration. Signed-off-by: Najumon B.A <najumon.ba@intel.com>

rename intel,pcie compatible id referance to pcie-controller in header file comments and rst files Signed-off-by: Najumon B.A <najumon.ba@intel.com>

add fake x86 acpi function and config macros for acpi unit test Signed-off-by: Najumon B.A <najumon.ba@intel.com>

Align with changes at `boards/x86/intel_adl` done by zephyrproject-rtos#62694 and zephyrproject-rtos#67452 while the `up_squared_pro_700` board was in migration to HWMv2 at `collab-hwm' branch. Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>

Align with changes at `boards/x86/intel_adl` done by #62694 and #67452 while the `up_squared_pro_700` board was in migration to HWMv2 at `collab-hwm' branch. Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>

Align with changes at `boards/x86/intel_adl` done by zephyrproject-rtos#62694 and zephyrproject-rtos#67452 while the `up_squared_pro_700` board was in migration to HWMv2 at `collab-hwm' branch. Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>

Align with changes at `boards/x86/intel_adl` done by #62694 and #67452 while the `up_squared_pro_700` board was in migration to HWMv2 at `collab-hwm' branch. Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>

Align with changes at `boards/x86/intel_adl` done by zephyrproject-rtos#62694 and zephyrproject-rtos#67452 while the `up_squared_pro_700` board was in migration to HWMv2 at `collab-hwm' branch. Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>

najumon1980 force-pushed the acpi_dev_enum branch 4 times, most recently from 30ccc57 to 53c187b Compare September 18, 2023 05:40

najumon1980 marked this pull request as ready for review September 18, 2023 07:02

najumon1980 requested review from jhedberg, dcpleung, nashif, carlescufi, galak and MaureenHelm as code owners September 18, 2023 07:02

zephyrbot added platform: X86 x86 and x86-64 area: X86 x86 Architecture (32-bit) area: Devicetree Binding PR modifies or adds a Device Tree binding area: UART Universal Asynchronous Receiver-Transmitter labels Sep 18, 2023

zephyrbot requested review from andyross, ceolin, laurenmurphyx64 and tbursztyka September 18, 2023 07:03

zephyrbot assigned jhedberg Sep 18, 2023

dcpleung requested changes Sep 18, 2023

View reviewed changes

najumon1980 mentioned this pull request Sep 22, 2023

kernel: provide Platform abstract interface for device drivers which are designed to works seamlessly on PCI bus, ACPI and DTS #62993

Closed

najumon1980 force-pushed the acpi_dev_enum branch 3 times, most recently from d2b9ad2 to 8f550df Compare September 25, 2023 14:31

tbursztyka requested changes Sep 29, 2023

View reviewed changes

dts/bindings/acpi/acpi-vbus.yaml Outdated Show resolved Hide resolved

najumon1980 force-pushed the acpi_dev_enum branch from 8f550df to c9ac74b Compare October 4, 2023 02:16

jhedberg requested review from tbursztyka and dcpleung January 29, 2024 08:41

finikorg previously approved these changes Jan 29, 2024

View reviewed changes

dcpleung previously approved these changes Jan 30, 2024

View reviewed changes

tbursztyka requested changes Jan 31, 2024

View reviewed changes

najumon1980 added 9 commits January 31, 2024 15:02

lib: acpi: add device resource enum support

a5e52de

add device resource enumaration support such as irq and mmio. Signed-off-by: Najumon B.A <najumon.ba@intel.com>

boards: x86: add pci controller node with acpi pnp id

f73a6a9

add acpi pnp/hw id for pcie node to enable support for retreive interrupt routing information for pci legacy interrupt via acpi Signed-off-by: Najumon B.A <najumon.ba@intel.com>

drivers: pci: update prt retrieve based on pnp id

122af4c

update prt retrieve based on acpi pnp id instead of acpi device path/name Signed-off-by: Najumon B.A <najumon.ba@intel.com>

lib: acpi: add resource enumeration shell command

eb83021

add resource enumeration and acpi method shell commands such as retrieve mmio and interrupt resources. Signed-off-by: Najumon B.A <najumon.ba@intel.com>

dts: rtc: mc146818: add acpi hid support in yaml file

1a3fbd5

add acpi hid support for mc146818 yaml file. Currently this added for acpi test case support. Signed-off-by: Najumon B.A <najumon.ba@intel.com>

tests: lib: acpi: update test cases for dev and resource enum

c58b8e4

update acpi test cases with device enumeration, mmio and irq resources enumeration. Signed-off-by: Najumon B.A <najumon.ba@intel.com>

docs: rename intel,pcie compatible id to pcie-controller

142cfaf

rename intel,pcie compatible id referance to pcie-controller in header file comments and rst files Signed-off-by: Najumon B.A <najumon.ba@intel.com>

tests: lib: acpi: add fake x86 acpi function

08ecb14

add fake x86 acpi function and config macros for acpi unit test Signed-off-by: Najumon B.A <najumon.ba@intel.com>

najumon1980 dismissed stale reviews from dcpleung, finikorg, and jhedberg via 08ecb14 January 31, 2024 09:58

najumon1980 force-pushed the acpi_dev_enum branch from 046f4dd to 08ecb14 Compare January 31, 2024 09:58

jhedberg approved these changes Jan 31, 2024

View reviewed changes

finikorg approved these changes Jan 31, 2024

View reviewed changes

tbursztyka approved these changes Jan 31, 2024

View reviewed changes

carlescufi merged commit 62b2af7 into zephyrproject-rtos:main Jan 31, 2024
35 checks passed

golowanow mentioned this pull request Feb 9, 2024

hwmv2: qemu_x86: acrn: Port to HWMv2 #68078

Merged

golowanow mentioned this pull request Feb 9, 2024

hwmv2: boards: up_squared_pro_700: Add missed intel_adl changes #68814

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add acpi device resource enumeration support #62694

Add acpi device resource enumeration support #62694

najumon1980 commented Sep 15, 2023 •

edited

Loading

dcpleung left a comment

dcpleung Sep 18, 2023

najumon1980 Sep 19, 2023

dcpleung Sep 18, 2023

najumon1980 Sep 19, 2023

najumon1980 Oct 4, 2023

najumon1980 commented Sep 19, 2023

dcpleung commented Sep 19, 2023

najumon1980 commented Sep 22, 2023 •

edited

Loading

tbursztyka left a comment

tbursztyka Jan 31, 2024

najumon1980 Jan 31, 2024

tbursztyka Jan 31, 2024

najumon1980 Jan 31, 2024

Add acpi device resource enumeration support #62694

Add acpi device resource enumeration support #62694

Conversation

najumon1980 commented Sep 15, 2023 • edited Loading

dcpleung left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

najumon1980 commented Sep 19, 2023

dcpleung commented Sep 19, 2023

najumon1980 commented Sep 22, 2023 • edited Loading

tbursztyka left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

najumon1980 commented Sep 15, 2023 •

edited

Loading

najumon1980 commented Sep 22, 2023 •

edited

Loading