From 2e68d82f52fef6baeb5b7ab39381d8acaa0adfa8 Mon Sep 17 00:00:00 2001 From: Prakhar Srivastava Date: Mon, 3 Mar 2025 06:48:28 +0000 Subject: [PATCH] PCI: tegra264: Remove private-soc directory Move files from private-soc to parent controller directory. Bug 5054840 Change-Id: I8ec5e5b34f2226bbbd051f4313033153a096e5c1 Signed-off-by: Prakhar Srivastava Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3312461 Reviewed-by: Bibek Basu GVS: buildbot_gerritrpt Reviewed-by: Manikanta Maddireddy --- BUILD.bazel | 6 ++--- .../nvidia,tegra264-pcie-ep.yaml | 4 ++-- .../nvidia,tegra264-pcie.yaml | 5 ++-- drivers/pci/controller/Makefile | 24 +++++++++++++++++-- .../{private-soc => }/pcie-tegra-calib-info.h | 0 .../{private-soc => }/pcie-tegra264-ep.c | 0 .../{private-soc => }/pcie-tegra264-ep.h | 0 .../{private-soc => }/pcie-tegra264.c | 0 drivers/pci/controller/private-soc/Makefile | 10 -------- .../{private-soc => }/tegra-pcie-dma-irq.h | 0 .../{private-soc => }/tegra-pcie-dma.c | 0 .../tegra234-pcie-edma-osi.h | 0 .../{private-soc => }/tegra234-pcie-edma.c | 0 .../tegra264-pcie-xdma-osi.h | 0 .../{private-soc => }/tegra264-pcie-xdma.c | 0 15 files changed, 29 insertions(+), 20 deletions(-) rename Documentation/devicetree/bindings/pci/controller/{private-soc => }/nvidia,tegra264-pcie-ep.yaml (97%) rename Documentation/devicetree/bindings/pci/controller/{private-soc => }/nvidia,tegra264-pcie.yaml (96%) rename drivers/pci/controller/{private-soc => }/pcie-tegra-calib-info.h (100%) rename drivers/pci/controller/{private-soc => }/pcie-tegra264-ep.c (100%) rename drivers/pci/controller/{private-soc => }/pcie-tegra264-ep.h (100%) rename drivers/pci/controller/{private-soc => }/pcie-tegra264.c (100%) delete mode 100644 drivers/pci/controller/private-soc/Makefile rename drivers/pci/controller/{private-soc => }/tegra-pcie-dma-irq.h (100%) rename drivers/pci/controller/{private-soc => }/tegra-pcie-dma.c (100%) rename drivers/pci/controller/{private-soc => }/tegra234-pcie-edma-osi.h (100%) rename drivers/pci/controller/{private-soc => }/tegra234-pcie-edma.c (100%) rename drivers/pci/controller/{private-soc => }/tegra264-pcie-xdma-osi.h (100%) rename drivers/pci/controller/{private-soc => }/tegra264-pcie-xdma.c (100%) diff --git a/BUILD.bazel b/BUILD.bazel index 77714464..777e2801 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -118,9 +118,9 @@ kernel_module( "drivers/nvtzvault/nvtzvault.ko", "drivers/nv-virtio/nv-virtio-console-poc.ko", "drivers/pci/controller/pcie-tegra-vf.ko", - "drivers/pci/controller/private-soc/pcie-tegra264.ko", - "drivers/pci/controller/private-soc/pcie-tegra264-ep.ko", - "drivers/pci/controller/private-soc/tegra-pcie-dma-lib.ko", + "drivers/pci/controller/pcie-tegra264.ko", + "drivers/pci/controller/pcie-tegra264-ep.ko", + "drivers/pci/controller/tegra-pcie-dma-lib.ko", "drivers/pci/controller/tegra-pcie-edma.ko", "drivers/pci/endpoint/functions/pci-epf-dma-test.ko", "drivers/pci/endpoint/functions/pci-epf-tegra-vnet.ko", diff --git a/Documentation/devicetree/bindings/pci/controller/private-soc/nvidia,tegra264-pcie-ep.yaml b/Documentation/devicetree/bindings/pci/controller/nvidia,tegra264-pcie-ep.yaml similarity index 97% rename from Documentation/devicetree/bindings/pci/controller/private-soc/nvidia,tegra264-pcie-ep.yaml rename to Documentation/devicetree/bindings/pci/controller/nvidia,tegra264-pcie-ep.yaml index 0d7d3662..5322ec9c 100644 --- a/Documentation/devicetree/bindings/pci/controller/private-soc/nvidia,tegra264-pcie-ep.yaml +++ b/Documentation/devicetree/bindings/pci/controller/nvidia,tegra264-pcie-ep.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# Copyright (c) 2024-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved. # # This program is free software; you can redistribute it and/or modify it # under the terms and conditions of the GNU General Public License, @@ -21,7 +21,7 @@ maintainers: description: | the compatability = nvidia,tegra264-pcie-ep is mentioned in the following drivers - - /kernel/nvidia-oot/drivers/pci/controller/private-soc/pcie-tegra264-ep.c + - /kernel/nvidia-oot/drivers/pci/controller/pcie-tegra264-ep.c select: properties: diff --git a/Documentation/devicetree/bindings/pci/controller/private-soc/nvidia,tegra264-pcie.yaml b/Documentation/devicetree/bindings/pci/controller/nvidia,tegra264-pcie.yaml similarity index 96% rename from Documentation/devicetree/bindings/pci/controller/private-soc/nvidia,tegra264-pcie.yaml rename to Documentation/devicetree/bindings/pci/controller/nvidia,tegra264-pcie.yaml index 90198fe3..4e64a7e2 100644 --- a/Documentation/devicetree/bindings/pci/controller/private-soc/nvidia,tegra264-pcie.yaml +++ b/Documentation/devicetree/bindings/pci/controller/nvidia,tegra264-pcie.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# Copyright (c) 2024-2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved. # # This program is free software; you can redistribute it and/or modify it # under the terms and conditions of the GNU General Public License, @@ -21,8 +21,7 @@ maintainers: description: | the compatability = nvidia,tegra264-pcie is mentioned in the following drivers - - /kernel/nvidia-oot/drivers/pci/controller/private-soc/pcie-tegra264-ep.c - - /kernel/nvidia-oot/drivers/pci/controller/private-soc/pcie-tegra264.c + - /kernel/nvidia-oot/drivers/pci/controller/pcie-tegra264.c select: properties: diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile index 7c60f10c..e8dba138 100644 --- a/drivers/pci/controller/Makefile +++ b/drivers/pci/controller/Makefile @@ -1,7 +1,27 @@ # SPDX-License-Identifier: GPL-2.0 -# Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved. +# Copyright (c) 2022-2025, NVIDIA CORPORATION. All rights reserved. obj-m += tegra-pcie-edma.o obj-m += pcie-tegra-vf.o -obj-m += private-soc/ +# Set config when build as OOT module. +ifneq ($(NV_OOT_PCIE_T264_SOC_SKIP_BUILD),y) +ifeq ($(CONFIG_TEGRA_OOT_MODULE),m) +CONFIG_PCIE_TEGRA264 := m +CONFIG_PCIE_TEGRA264_EP := m +endif + +obj-$(CONFIG_PCIE_TEGRA264) += pcie-tegra264.o +obj-$(CONFIG_PCIE_TEGRA264_EP) += pcie-tegra264-ep.o + +ifeq ($(CONFIG_TEGRA_OOT_MODULE),m) +obj-m += tegra-pcie-dma-lib.o + +tegra-pcie-dma-lib-objs:= tegra-pcie-dma.o \ + tegra234-pcie-edma.o \ + tegra264-pcie-xdma.o +endif +else +obj-m += pcie-tegra264.o +pcie-tegra264-objs := pcie-tegra-soc-dummy.o +endif diff --git a/drivers/pci/controller/private-soc/pcie-tegra-calib-info.h b/drivers/pci/controller/pcie-tegra-calib-info.h similarity index 100% rename from drivers/pci/controller/private-soc/pcie-tegra-calib-info.h rename to drivers/pci/controller/pcie-tegra-calib-info.h diff --git a/drivers/pci/controller/private-soc/pcie-tegra264-ep.c b/drivers/pci/controller/pcie-tegra264-ep.c similarity index 100% rename from drivers/pci/controller/private-soc/pcie-tegra264-ep.c rename to drivers/pci/controller/pcie-tegra264-ep.c diff --git a/drivers/pci/controller/private-soc/pcie-tegra264-ep.h b/drivers/pci/controller/pcie-tegra264-ep.h similarity index 100% rename from drivers/pci/controller/private-soc/pcie-tegra264-ep.h rename to drivers/pci/controller/pcie-tegra264-ep.h diff --git a/drivers/pci/controller/private-soc/pcie-tegra264.c b/drivers/pci/controller/pcie-tegra264.c similarity index 100% rename from drivers/pci/controller/private-soc/pcie-tegra264.c rename to drivers/pci/controller/pcie-tegra264.c diff --git a/drivers/pci/controller/private-soc/Makefile b/drivers/pci/controller/private-soc/Makefile deleted file mode 100644 index d20ebd06..00000000 --- a/drivers/pci/controller/private-soc/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved. - -obj-m += pcie-tegra264.o -obj-m += pcie-tegra264-ep.o -obj-m += tegra-pcie-dma-lib.o - -tegra-pcie-dma-lib-objs:= tegra-pcie-dma.o \ - tegra234-pcie-edma.o \ - tegra264-pcie-xdma.o diff --git a/drivers/pci/controller/private-soc/tegra-pcie-dma-irq.h b/drivers/pci/controller/tegra-pcie-dma-irq.h similarity index 100% rename from drivers/pci/controller/private-soc/tegra-pcie-dma-irq.h rename to drivers/pci/controller/tegra-pcie-dma-irq.h diff --git a/drivers/pci/controller/private-soc/tegra-pcie-dma.c b/drivers/pci/controller/tegra-pcie-dma.c similarity index 100% rename from drivers/pci/controller/private-soc/tegra-pcie-dma.c rename to drivers/pci/controller/tegra-pcie-dma.c diff --git a/drivers/pci/controller/private-soc/tegra234-pcie-edma-osi.h b/drivers/pci/controller/tegra234-pcie-edma-osi.h similarity index 100% rename from drivers/pci/controller/private-soc/tegra234-pcie-edma-osi.h rename to drivers/pci/controller/tegra234-pcie-edma-osi.h diff --git a/drivers/pci/controller/private-soc/tegra234-pcie-edma.c b/drivers/pci/controller/tegra234-pcie-edma.c similarity index 100% rename from drivers/pci/controller/private-soc/tegra234-pcie-edma.c rename to drivers/pci/controller/tegra234-pcie-edma.c diff --git a/drivers/pci/controller/private-soc/tegra264-pcie-xdma-osi.h b/drivers/pci/controller/tegra264-pcie-xdma-osi.h similarity index 100% rename from drivers/pci/controller/private-soc/tegra264-pcie-xdma-osi.h rename to drivers/pci/controller/tegra264-pcie-xdma-osi.h diff --git a/drivers/pci/controller/private-soc/tegra264-pcie-xdma.c b/drivers/pci/controller/tegra264-pcie-xdma.c similarity index 100% rename from drivers/pci/controller/private-soc/tegra264-pcie-xdma.c rename to drivers/pci/controller/tegra264-pcie-xdma.c