Skip to content

Enableddr access #19

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.

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

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/intel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
dtb-$(CONFIG_ARCH_INTEL_SOCFPGA) += socfpga_agilex_n6000.dtb \
socfpga_agilex_socdk.dtb \
socfpga_agilex_socdk_nand.dtb \
socfpga_agilex_bittware.dtb \
socfpga_agilex5_socdk.dtb \
socfpga_agilex_n6010.dtb \
socfpga_agilex5_socdk.dtb \
Expand Down
6 changes: 6 additions & 0 deletions arch/arm64/boot/dts/intel/socfpga_agilex.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
alignment = <0x1000>;
no-map;
};
service_reserved1: svcbuffer@1 {
compatible = "shared-dma-pool";
reg = <0x0 0x7F000000 0x0 0x7FFFFFFF>;
alignment = <0x1000>;
no-map;
};
};

cpus {
Expand Down
191 changes: 191 additions & 0 deletions arch/arm64/boot/dts/intel/socfpga_agilex_bittware.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2019, Intel Corporation
*/
#include "socfpga_agilex.dtsi"
#include "socfpga_agilex_pcie_root_port.dtsi"
/ {
model = "SoCFPGA Agilex BittWare";

aliases {
serial0 = &uart0;
ethernet0 = &gmac0;
ethernet1 = &gmac1;
ethernet2 = &gmac2;
};

chosen {
stdout-path = "serial0:115200n8";
};

leds {
compatible = "gpio-leds";
led0 {
label = "hps_led0";
gpios = <&portb 20 GPIO_ACTIVE_HIGH>;
};

led1 {
label = "hps_led1";
gpios = <&portb 19 GPIO_ACTIVE_HIGH>;
};

led2 {
label = "hps_led2";
gpios = <&portb 21 GPIO_ACTIVE_HIGH>;
};
};

memory {
device_type = "memory";
/* We expect the bootloader to fill in the reg */
reg = <0 0 0 0>;
};
};

&gpio1 {
status = "okay";
};

&gmac2 {
status = "disabled";
phy-mode = "rgmii";
phy-handle = <&phy0>;

max-frame-size = <9000>;

mdio0 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "snps,dwmac-mdio";
phy0: ethernet-phy@0 {
reg = <4>;

txd0-skew-ps = <0>; /* -420ps */
txd1-skew-ps = <0>; /* -420ps */
txd2-skew-ps = <0>; /* -420ps */
txd3-skew-ps = <0>; /* -420ps */
rxd0-skew-ps = <420>; /* 0ps */
rxd1-skew-ps = <420>; /* 0ps */
rxd2-skew-ps = <420>; /* 0ps */
rxd3-skew-ps = <420>; /* 0ps */
txen-skew-ps = <0>; /* -420ps */
txc-skew-ps = <900>; /* 0ps */
rxdv-skew-ps = <420>; /* 0ps */
rxc-skew-ps = <1680>; /* 780ps */
};
};
};

&nand {
status = "okay";
nand-bus-width = <8>;

flash@0 {
#address-cells = <1>;
#size-cells = <1>;
reg = <0>;
nand-bus-width = <8>;

partition@0 {
label = "u-boot";
reg = <0 0x200000>;
};
partition@200000 {
label = "root";
reg = <0x200000 0x1fe00000>;
};
};
};

&osc1 {
clock-frequency = <25000000>;
};

&uart0 {
status = "okay";
};

&usb0 {
status = "okay";
disable-over-current;
};

&watchdog0 {
status = "okay";
};

&temp_volt {
voltage {
#address-cells = <1>;
#size-cells = <0>;
input@2 {
label = "0.8V VCC";
reg = <2>;
};

input@3 {
label = "1.8V VCCIO_SDM";
reg = <3>;
};

input@4 {
label = "1.8V VCCPT";
reg = <4>;
};

input@5 {
label = "1.2V VCCCRCORE";
reg = <5>;
};

input@6 {
label = "0.9V VCCH";
reg = <6>;
};

input@7 {
label = "0.8V VCCL";
reg = <7>;
};
};

temperature {
#address-cells = <1>;
#size-cells = <0>;

input@0 {
label = "Main Die SDM";
reg = <0x0>;
};

input@10000 {
label = "Main Die corner bottom left max";
reg = <0x10000>;
};

input@20000 {
label = "Main Die corner top left max";
reg = <0x20000>;
};

input@30000 {
label = "Main Die corner bottom right max";
reg = <0x30000>;
};

input@40000 {
label = "Main Die corner top right max";
reg = <0x40000>;
};
};
};

&pcie_0_pcie_aglx {
status = "okay";
compatible = "altr,pcie-root-port-3.0-f-tile";
/* interrupts = <0 0 0>; */
/* interrupts = <32 IRQ_TYPE_LEVEL_HIGH>;
interupt_parent = <&intc>; */
};

9 changes: 9 additions & 0 deletions arch/arm64/configs/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1595,3 +1595,12 @@ CONFIG_CORESIGHT_STM=m
CONFIG_CORESIGHT_CPU_DEBUG=m
CONFIG_CORESIGHT_CTI=m
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
2 changes: 1 addition & 1 deletion drivers/nvme/host/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2320,7 +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");
(timeout + 1) / 2, "initialisation");
}
EXPORT_SYMBOL_GPL(nvme_enable_ctrl);

Expand Down