Re: [PATCH] PCI: apple: Set only available ports up

From: Bjorn Helgaas
Date: Tue Mar 07 2023 - 19:20:28 EST


Thanks for your patch.

On Tue, Mar 07, 2023 at 11:59:50PM +0100, Janne Grunau wrote:
> Fixes "interrupt-map" parsing in of_irq_parse_raw() which takes the
> node's availability into account.

I don't really know what this means. The patch looks like a fix to
apple_pcie_init(), not to of_irq_parse_raw(). I assume maybe this is
to do with the irq_of_parse_and_map() in apple_pcie_port_setup_irq()?

> This became apparent after disabling unused PCIe ports in the Apple
> silicon device trees instead of disabling them.

"... disabling unused PCIe ports ... instead of disabling them"
doesn't read quite right. Maybe it should read "instead of *deleting*
them"? Not sure because I don't know the background here.

> Link: https://lore.kernel.org/asahi/20230214-apple_dts_pcie_disable_unused-v1-0-5ea0d3ddcde3@xxxxxxxxxx/
> Link: https://lore.kernel.org/asahi/1ea2107a-bb86-8c22-0bbc-82c453ab08ce@xxxxxxxxxx/
> Fixes: 1e33888fbe44 ("PCI: apple: Add initial hardware bring-up")
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Janne Grunau <j@xxxxxxxxxx>
> ---
> drivers/pci/controller/pcie-apple.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pci/controller/pcie-apple.c b/drivers/pci/controller/pcie-apple.c
> index 66f37e403a09..f8670a032f7a 100644
> --- a/drivers/pci/controller/pcie-apple.c
> +++ b/drivers/pci/controller/pcie-apple.c
> @@ -783,7 +783,7 @@ static int apple_pcie_init(struct pci_config_window *cfg)
> cfg->priv = pcie;
> INIT_LIST_HEAD(&pcie->ports);
>
> - for_each_child_of_node(dev->of_node, of_port) {
> + for_each_available_child_of_node(dev->of_node, of_port) {
> ret = apple_pcie_setup_port(pcie, of_port);
> if (ret) {
> dev_err(pcie->dev, "Port %pOF setup fail: %d\n", of_port, ret);
>
> ---
> base-commit: c9c3395d5e3dcc6daee66c6908354d47bf98cb0c
> change-id: 20230307-apple_pcie_disabled_ports-0c17fb7a4738
>
> Best regards,
> --
> Janne Grunau <j@xxxxxxxxxx>
>