From patchwork Thu Nov 4 12:54:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1550928 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=EpzwXRCc; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HlNvh2V5Pz9sPf for ; Thu, 4 Nov 2021 23:57:20 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1micIo-00009M-UL; Thu, 04 Nov 2021 12:57:10 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1micHS-0004vl-Dp for kernel-team@lists.ubuntu.com; Thu, 04 Nov 2021 12:55:46 +0000 Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 65CB93F1C2 for ; Thu, 4 Nov 2021 12:55:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1636030541; bh=8iIK2G9Ngs36K8LuURTXzb8y/Xyv71iK+OjkB6rO/BQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=EpzwXRCc2FUrPYtWMk9xsh6udQaMSru3Vq6D9Pi5TzVAeO7kNzOd6tF8gOUJ1E6cc bO7dPFh05LvkJ0pcEs791zOMwKB3iZayYtsULz/e8Vp9pieVgsZM5CpI+9XbzGuz/Q uMQVtkUdO1OhRLltBa3d/ihfVHVoScZh0H3pO9hpY5JtTizEtVfTExMTAJ+IMNGQHT H2TBzqD0P3K6eHKx8QaTwp5QFtPRyWirq0PdZ0OCJs8RKAAbdg2kE3XnMjvdxhffV2 D1VesPpA+O2UY9NH9qnfdRNSembzs+mHiE4gAWfytFOvr5sk8jsz0edQC+TaLUhFQb wrdU1BBwNSDkQ== Received: by mail-pg1-f199.google.com with SMTP id v63-20020a632f42000000b002cc65837088so3693805pgv.1 for ; Thu, 04 Nov 2021 05:55:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8iIK2G9Ngs36K8LuURTXzb8y/Xyv71iK+OjkB6rO/BQ=; b=cEmf4fBK+UY4PjYSsh+PfL6ITDTWx/udfF/Q94tYY0bs4Ppja1yTlcqk5z/r7QFT1s xcr63FifFLpMJKlJ13iSgNqeFqkxL/qb8mwJDaXQX74T3K6sUBNYeIX4OmjXy1GdVabN kNqSwjO29iTahofKua2fPWOyiGJatOu0ckmIHQC8NgrDwISkQ7RbvzUb0sip3DS2ea3q Zs04l2wJRdHLwaENOGNG0l6FxUs0ht8I5xye0K+BNhq1q26bJtZtYN/EZJMcXNYV+K7D 8uopKjHD4EdueCG7qmg4uKXLK+lbX/FL2o/648aigKXzmazzAAjSYpW6v5c7KLS60ry/ 9Vcw== X-Gm-Message-State: AOAM532K479TV+/LR9i3AV0lBHfUkFqjKHQmYTaC23S45lSqwRmfFRy0 ZItmrokfch0LM1+2daCUgKidAtU0O9Qsbas453DzVh/ty9HZ3ZA3ERWv/1KkZoi/NV3CPtqZkOB 8veuBg9y1CTPLf/NOneznw2+653g747q5twbQDyS65w== X-Received: by 2002:a17:902:aa02:b0:13a:6c8f:407f with SMTP id be2-20020a170902aa0200b0013a6c8f407fmr43838624plb.59.1636030539642; Thu, 04 Nov 2021 05:55:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytCND9lKxaOzDpFUdUK6+3A0pOfnVE16iL8lIAhZorYmcyVZLFHj1wCU/FjDT3upBBqwXwKQ== X-Received: by 2002:a17:902:aa02:b0:13a:6c8f:407f with SMTP id be2-20020a170902aa0200b0013a6c8f407fmr43838606plb.59.1636030539372; Thu, 04 Nov 2021 05:55:39 -0700 (PDT) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id y4sm5283859pfi.178.2021.11.04.05.55.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Nov 2021 05:55:38 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 33/41] arm64: PCI: Restructure pcibios_root_bridge_prepare() Date: Thu, 4 Nov 2021 06:54:41 -0600 Message-Id: <20211104125449.16540-34-tim.gardner@canonical.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211104125449.16540-1-tim.gardner@canonical.com> References: <20211104125449.16540-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Boqun Feng BugLink: https://bugs.launchpad.net/bugs/1949770 Restructure the pcibios_root_bridge_prepare() as the preparation for supporting cases when no real ACPI device is related to the PCI host bridge. No functional change. Link: https://lore.kernel.org/r/20210726180657.142727-4-boqun.feng@gmail.com Signed-off-by: Boqun Feng Signed-off-by: Lorenzo Pieralisi Acked-by: Catalin Marinas (cherry picked from commit b424d4d4263200459615c87ad8dddaf4bb571a9d) Signed-off-by: Tim Gardner --- arch/arm64/kernel/pci.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c index 1006ed2d7c60..5148ae242780 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c @@ -82,14 +82,19 @@ int acpi_pci_bus_find_domain_nr(struct pci_bus *bus) int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) { - if (!acpi_disabled) { - struct pci_config_window *cfg = bridge->bus->sysdata; - struct acpi_device *adev = to_acpi_device(cfg->parent); - struct device *bus_dev = &bridge->bus->dev; + struct pci_config_window *cfg; + struct acpi_device *adev; + struct device *bus_dev; - ACPI_COMPANION_SET(&bridge->dev, adev); - set_dev_node(bus_dev, acpi_get_node(acpi_device_handle(adev))); - } + if (acpi_disabled) + return 0; + + cfg = bridge->bus->sysdata; + adev = to_acpi_device(cfg->parent); + bus_dev = &bridge->bus->dev; + + ACPI_COMPANION_SET(&bridge->dev, adev); + set_dev_node(bus_dev, acpi_get_node(acpi_device_handle(adev))); return 0; }