From cc2bbeac49eaab05692c22f11049735b5de84425 Mon Sep 17 00:00:00 2001 From: Ashish Trivedi Date: Fri, 11 Oct 2024 22:53:12 -0700 Subject: [PATCH 1/2] @FIR-204: Remove not needed changes from SSD Removed following changes from patch 1. Enable PCI-E root port in DTS 2. Remove forcing of Gen 2 in DTS 3. Remove forcing of 4 io queues 4. Remove increased timeouts in nvme code --- arch/arm64/boot/dts/intel/socfpga_agilex_bittware.dts | 6 +++--- .../arm64/boot/dts/intel/socfpga_agilex_pcie_root_port.dtsi | 1 - drivers/nvme/host/core.c | 3 +-- drivers/nvme/host/pci.c | 1 - 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex_bittware.dts b/arch/arm64/boot/dts/intel/socfpga_agilex_bittware.dts index 6757577c5c425..c221d31f2eb13 100644 --- a/arch/arm64/boot/dts/intel/socfpga_agilex_bittware.dts +++ b/arch/arm64/boot/dts/intel/socfpga_agilex_bittware.dts @@ -181,11 +181,11 @@ }; }; -/*&pcie_0_pcie_aglx { +&pcie_0_pcie_aglx { status = "okay"; - compatible = "altr,pcie-root-port-3.0-f-tile";*/ + compatible = "altr,pcie-root-port-3.0-f-tile"; /* interrupts = <0 0 0>; */ /* interrupts = <32 IRQ_TYPE_LEVEL_HIGH>; interupt_parent = <&intc>; */ -/*};*/ +}; diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex_pcie_root_port.dtsi b/arch/arm64/boot/dts/intel/socfpga_agilex_pcie_root_port.dtsi index 5ffcef255b5c4..d8ed797d08bb6 100644 --- a/arch/arm64/boot/dts/intel/socfpga_agilex_pcie_root_port.dtsi +++ b/arch/arm64/boot/dts/intel/socfpga_agilex_pcie_root_port.dtsi @@ -27,7 +27,6 @@ interrupt-controller; #interrupt-cells = <0x1>; device_type = "pci"; - max-link-speed = <2>; /* MM addded */ bus-range = <0x0000000 0x000000ff>; ranges = <0x82000000 0x00000000 0x00100000 0x00000000 0x10000000 0x00000000 0x0ff00000>; msi-parent = <&pcie_0_msi_irq>; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index d5331eee139d6..89ff5934458dc 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2320,8 +2320,7 @@ int nvme_enable_ctrl(struct nvme_ctrl *ctrl) if (ret) return ret; return nvme_wait_ready(ctrl, NVME_CSTS_RDY, NVME_CSTS_RDY, - (timeout + 1) * 2, "initialisation"); -/*MM : PATCH (timeout + 1) / 2, "initialisation"); */ + (timeout + 1) / 2, "initialisation"); } EXPORT_SYMBOL_GPL(nvme_enable_ctrl); diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 17fbf4e95cfb6..f8e92404a6591 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2270,7 +2270,6 @@ static int nvme_setup_io_queues(struct nvme_dev *dev) dev->nr_poll_queues = poll_queues; nr_io_queues = dev->nr_allocated_queues - 1; - nr_io_queues = 4; result = nvme_set_queue_count(&dev->ctrl, &nr_io_queues); if (result < 0) return result; From 2e5b926ac4f934e17c8e67b25797aed95a9694eb Mon Sep 17 00:00:00 2001 From: Ashish Trivedi Date: Sun, 13 Oct 2024 09:47:10 -0700 Subject: [PATCH 2/2] @FIR-204: Removed the config flags which are not needed Removed config flags which are not needed The NVME Multipath and the NVME Debug Errors are not needed --- arch/arm64/configs/defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index b7c8611c38756..efbae2191b96e 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -1600,7 +1600,7 @@ CONFIG_IO_STRICT_DEVMEM=n CONFIG_HUGETLB_PAGE=y ##MM includes CONFIG_BLK_DEV_NVME=y -CONFIG_NVME_MULTIPATH=y -CONFIG_NVME_VERBOSE_ERRORS=y +#CONFIG_NVME_MULTIPATH=y +#CONFIG_NVME_VERBOSE_ERRORS=y #CONFIG_NVME_HWMON=y #CONFIG_NVME_FC=y