Skip to content

Ssd patch #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 11, 2024
Merged

Ssd patch #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6f057a
@FIR-204: Fix NVME changes and pushed into a repo
Oct 11, 2024
0b1f7dc
@FIR-204: Remove print debug statements before main branch push
Oct 11, 2024
ee379ce
@FIR-204: Added changes to remove drivers/pci/controller/pcie-altera.c
Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions arch/arm64/boot/dts/intel/socfpga_agilex_bittware.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,9 @@

/*&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>; */
/*};*/

1 change: 1 addition & 0 deletions arch/arm64/boot/dts/intel/socfpga_agilex_pcie_root_port.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
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>;
Expand Down
6 changes: 6 additions & 0 deletions arch/arm64/configs/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1598,3 +1598,9 @@ CONFIG_MEMTEST=y
CONFIG_STRICT_DEVMEM=n
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_HWMON=y
#CONFIG_NVME_FC=y
3 changes: 2 additions & 1 deletion drivers/nvme/host/core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2320,7 +2320,8 @@ 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");
(timeout + 1) * 2, "initialisation");
/*MM : PATCH (timeout + 1) / 2, "initialisation"); */
}
EXPORT_SYMBOL_GPL(nvme_enable_ctrl);

Expand Down
1 change: 1 addition & 0 deletions drivers/nvme/host/pci.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2270,6 +2270,7 @@ 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;
Expand Down