rockchip: Fix PCIe and NVMe support on RK3568
Subsystems (4)
v4 cover rockchip: Fix PCIe and NVMe support on RK3568
This series fixes and enables PCIe and NVMe support on RK3568.
Patch 1 adds a dev_read_addr_size_index_ptr function.
Patch 2-3 fixes main issue in the driver to be usable on RK3568. Patch 4 fixes a long wait time during probe when no device is attached. Patch 5 disable BARs of the root complex that could claim the entire memory region during PCI autoconfig.
Patch 6 adds support for the gpios prop to the fixed regulators driver. Patch 7 adds a missing clock to the clock driver.
Patch 8 enables PCIe and NVMe support on rk3568-rock-3a. Patch 9 updates the device tree with new reg and ranges values.
I have tested that a Samsung 970 EVO NVMe is detected on a ROCK 3A,
BusDevFun VendorId DeviceId Device Class Sub-Class 01.00.00 0x1d87 0x3566 Bridge device 0x04 02.00.00 0x144d 0xa808 Mass storage controller 0x08
and I have also verified that the network controller continues to be detected on a ROCK 5B.
BusDevFun VendorId DeviceId Device Class Sub-Class 00.00.00 0x1d87 0x3588 Bridge device 0x04 01.00.00 0x10ec 0x8125 Network controller 0x00
Changes in v4:
- Replace "Hide BARs of the root complex" with "Disable unused BARs of the root complex" patch, based on vendor commit 1f4523203c2a ("driver:
pci: rockchip: Disable RC BAR0 and BAR1")
Changed in v3:
- Rebased on master branch, all dependencies has been merged.
- Remove rk3568-rock-3a pcie2x1 workaround added in v2, basic reference counting of gpio regulators series has been merged.
- Enable options for AHCI/SCSI on rk3568-rock-3a.
- Collect r-b tags.
Changes in v2:
- Rebased on custodians/u-boot-rockchip master branch and the defconfig and spi v2 series at [1].
- Drop dependency on basic reference counting of gpio regulators series, pcie2x1 is disabled for rk3568-rock-3a to avoid a system freeze due to disable of a shared vpcie3v3-supply regulator while in use by pcie3x2.
- Add and use dev_read_addr_size_index_ptr function.
- Update commit messages.
- Collect r-b tags.
This series can also be found at [2].
[1] https://patchwork.ozlabs.org/project/uboot/cover/[email protected]/
[2] https://github.com/Kwiboo/u-boot-rockchip/commits/rk3568-pcie-v4
Jon Lin (1):
pci: pcie_dw_rockchip: Disable unused BARs of the root complex
Jonas Karlman (8):
core: read: add dev_read_addr_size_index_ptr function
pci: pcie_dw_rockchip: Get config region from reg prop
pci: pcie_dw_rockchip: Use regulator_set_enable_if_allowed
pci: pcie_dw_rockchip: Speed up link probe
regulator: fixed: Add support for gpios prop
rockchip: clk: clk_rk3568: Add CLK_PCIEPHY2_REF support
rockchip: rk3568-rock-3a: Enable PCIe and NVMe support
rockchip: rk356x: Update PCIe config, IO and memory regions
arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 14 ++++ arch/arm/dts/rk3568.dtsi | 14 ++-- arch/arm/dts/rk356x.dtsi | 7 +- configs/rock-3a-rk3568_defconfig | 9 +++ drivers/clk/rockchip/clk_rk3568.c | 1 + drivers/core/read.c | 11 +++ drivers/pci/pcie_dw_common.c | 10 ++- drivers/pci/pcie_dw_rockchip.c | 98 +++++++++++++++---------- drivers/power/regulator/fixed.c | 4 +- include/dm/read.h | 21 ++++++ 10 files changed, 135 insertions(+), 54 deletions(-)
Signature · 1 line
2.41.0
PATCH v4 1/9 core: read: add dev_read_addr_size_index_ptr function
Add dev_read_addr_size_index_ptr function with the same functionality as dev_read_addr_size_index, but instead a return pointer is given. Use map_sysmem() function as cast for the return.
---
v4:
- No change
v3:
- Collect r-b tag
v2:
- New patch
drivers/core/read.c | 11 +++++++++++ include/dm/read.h | 21 +++++++++++++++++++++ 2 files changed, 32 insertions(+)
drivers/core/read.c +11 -0
@@ -150,6 +150,17 @@ fdt_addr_t dev_read_addr_size_index(const struct udevice *dev, int index,return devfdt_get_addr_size_index (dev, index, size); } +void *dev_read_addr_size_index_ptr (const struct udevice *dev,int index, +fdt_size_t *size) +{ +fdt_addr_t addr =dev_read_addr_size_index (dev, index, size); + +if (addr ==FDT_ADDR_T_NONE ) +return NULL ; + +return map_sysmem (addr,0 ); +} +void *dev_remap_addr_index (const struct udevice *dev,int index) {fdt_addr_t addr =dev_read_addr_index (dev, index);
include/dm/read.h +21 -0
@@ -246,6 +246,20 @@ void *dev_read_addr_index_ptr(const struct udevice *dev, int index);fdt_addr_t dev_read_addr_size_index (const struct udevice *dev,int index,fdt_size_t *size); +/** +* dev_read_addr_size_index_ptr() - Get the indexed reg property of a device +* as a pointer +* +* @dev: Device to read from +* @index: the 'reg' property can hold a list of <addr, size> pairs +* and @index is used to select which one is required +* @size: place to put size value (on success) +* +* Return: pointer or NULL if not found +*/ +void *dev_read_addr_size_index_ptr (const struct udevice *dev,int index, +fdt_size_t *size); +/** * dev_remap_addr_index() - Get the indexed reg property of a device * as a memory-mapped I/O pointer
@@ -952,6 +966,13 @@ static inline fdt_addr_t dev_read_addr_size_index(const struct udevice *dev,return devfdt_get_addr_size_index (dev, index, size); } +static inline void *dev_read_addr_size_index_ptr (const struct udevice *dev, +int index, +fdt_size_t *size) +{ +return devfdt_get_addr_size_index_ptr (dev, index, size); +} +static inline fdt_addr_t dev_read_addr_name (const struct udevice *dev,const char *name) {
Signature · 1 line
2.41.0
Re: [PATCH v4 1/9] core: read: add dev_read_addr_size_index_ptr function
Hi Jonas,
Quoted 14 lines · Jonas Karlman
Add
dev_read_addr_size_index_ptrfunction with the same functionality asdev_read_addr_size_index, but instead a return pointer is given. Usemap_sysmem()function as cast for the return.Signed-off-by Jonas Karlman <[email protected]>Reviewed-by Kever Yang <[email protected]>---
v4:
- No changev3:
- Collect r-b tag
Quoted 7 lines
v2:
- New patchdrivers/core/read.c | 11 +++++++++++ include/dm/read.h | 21 +++++++++++++++++++++ 2 files changed, 32 insertions(+)
So how about a test in test/dm/read.c ?
Quoted 62 lines
drivers/core/read.c +11
-0@@ -150,6 +150,17 @@ fdt_addr_t dev_read_addr_size_index(const struct udevice *dev, int index,return devfdt_get_addr_size_index (dev, index, size); } +void *dev_read_addr_size_index_ptr (const struct udevice *dev,int index, +fdt_size_t *size) +{ +fdt_addr_t addr =dev_read_addr_size_index (dev, index, size); + +if (addr ==FDT_ADDR_T_NONE ) +return NULL ; + +return map_sysmem (addr,0 ); +} +void *dev_remap_addr_index (const struct udevice *dev,int index) {fdt_addr_t addr =dev_read_addr_index (dev, index);include/dm/read.h +21
-1@@ -246,6 +246,20 @@ void *dev_read_addr_index_ptr(const struct udevice *dev, int index);fdt_addr_t dev_read_addr_size_index (const struct udevice *dev,int index,fdt_size_t *size); +/** +* dev_read_addr_size_index_ptr() - Get the indexed reg property of a device +* as a pointer +* +* @dev: Device to read from +* @index: the 'reg' property can hold a list of <addr, size> pairs +* and @index is used to select which one is required +* @size: place to put size value (on success) +* +* Return: pointer or NULL if not found +*/ +void *dev_read_addr_size_index_ptr (const struct udevice *dev,int index, +fdt_size_t *size); +/** * dev_remap_addr_index() - Get the indexed reg property of a device * as a memory-mapped I/O pointer @@ -952,6 +966,13 @@ static inline fdt_addr_t dev_read_addr_size_index(const struct udevice *dev,return devfdt_get_addr_size_index (dev, index, size); } +static inline void *dev_read_addr_size_index_ptr (const struct udevice *dev, +int index, +fdt_size_t *size) +{ +return devfdt_get_addr_size_index_ptr (dev, index, size); +} +static inline fdt_addr_t dev_read_addr_name (const struct udevice *dev,const char *name) { --
Quoted 2 lines
2.41.0
Regards,
Simon
Re: [PATCH v4 1/9] core: read: add dev_read_addr_size_index_ptr function
Hi Simon,
Quoted 20 lines · Simon Glass
Hi Jonas,
Quoted 17 lines · Jonas Karlman
Add
dev_read_addr_size_index_ptrfunction with the same functionality asdev_read_addr_size_index, but instead a return pointer is given. Usemap_sysmem()function as cast for the return.Signed-off-by Jonas Karlman <[email protected]>Reviewed-by Kever Yang <[email protected]>---
v4:
- No changev3:
- Collect r-b tagv2:
- New patch
Quoted 6 lines
Quoted 4 lines
drivers/core/read.c | 11 +++++++++++ include/dm/read.h | 21 +++++++++++++++++++++ 2 files changed, 32 insertions(+)So how about a test in
test/dm/read.c?
I can take a look at adding tests for the three dev_read_addr ptr related functions in a separate series/patch.
Would really not like to delay this 3 month old fixes series, and this 2 month old patch more than what is absolutely necessary ;-)
Regards,
Jonas
Quoted 1 line
[...]
Quoted 3 lines
Regards,
Simon
PATCH v4 2/9 pci: pcie_dw_rockchip: Get config region from reg prop
In reply to Jonas KarlmanGet the config region to use from the reg prop. Also update the referenced region index used in comment.
---
v4:
- No change
v3:
- No change
v2:
- Use dev_read_addr_size_index_ptr
- Collect r-b tag
drivers/pci/pcie_dw_common.c | 10 ++++++---- drivers/pci/pcie_dw_rockchip.c | 7 +++++++ 2 files changed, 13 insertions(+), 4 deletions(-)
drivers/pci/pcie_dw_common.c +6 -4
@@ -141,9 +141,9 @@ static uintptr_t set_cfg_address(struct pcie_dw *pcie,/* * Not accessing root port configuration space? -* Region #0 is used for Outbound CFG space access. +* Region #1 is used for Outbound CFG space access. * Direction = Outbound -* Region Index = 0 +* Region Index = 1 */ d =PCI_MASK_BUS (d); d =PCI_ADD_BUS (bus, d);
@@ -328,8 +328,10 @@ void pcie_dw_setup_host(struct pcie_dw *pci) pci->prefetch.bus_start = hose->regions[ret].bus_start;/* PREFETCH_bus_addr */ pci->prefetch.size = hose->regions[ret].size;/* PREFETCH size */ }else if (hose->regions[ret].flags ==PCI_REGION_SYS_MEMORY ) { - pci->cfg_base = (void *)(pci->io.phys_start - pci->io.size); - pci->cfg_size = pci->io.size; +if (!pci->cfg_base) { + pci->cfg_base = (void *)(pci->io.phys_start - pci->io.size); + pci->cfg_size = pci->io.size; + } }else {dev_err (pci->dev,"invalid flags type!\n" ); }
drivers/pci/pcie_dw_rockchip.c +7 -0
@@ -366,6 +366,13 @@ static int rockchip_pcie_parse_dt(struct udevice *dev)dev_dbg (dev,"APB address is 0x%p\n" , priv->apb_base); + priv->dw.cfg_base =dev_read_addr_size_index_ptr (dev,2 , + &priv->dw.cfg_size); +if (!priv->dw.cfg_base) +return -EINVAL ; + +dev_dbg (dev,"CFG address is 0x%p\n" , priv->dw.cfg_base); + ret =gpio_request_by_name (dev,"reset-gpios" ,0 , &priv->rst_gpio,GPIOD_IS_OUT );if (ret) {
Signature · 1 line
2.41.0
PATCH v4 3/9 pci: pcie_dw_rockchip: Use regulator_set_enable_if_allowed
In reply to Jonas KarlmanThe vpcie3v3 regulator is typically a fixed regulator controlled using gpio. Change to use enable and disable calls on the regulator instead of trying to set a voltage value.
Also remove the delay to match linux driver, for a fixed regulator the startup-delay-us prop can be used in case a startup delay is needed. Limited testing on ROCK 3A, ROCK 5B, Quartz64, Odroid-M1 has shown that this delay was not needed.
---
v4:
- No change
v3:
- Collect r-b tag
v2:
- Update commit message
drivers/pci/pcie_dw_rockchip.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
drivers/pci/pcie_dw_rockchip.c +7 -10
@@ -288,21 +288,16 @@ static int rockchip_pcie_init_port(struct udevice *dev)struct rk_pcie *priv =dev_get_priv (dev);/* Set power and maybe external ref clk input */ -if (priv->vpcie3v3) { - ret =regulator_set_value (priv->vpcie3v3,3300000 ); -if (ret) { -dev_err (priv->dw.dev,"failed to enable vpcie3v3 (ret=%d)\n" , - ret); -return ret; - } + ret =regulator_set_enable_if_allowed (priv->vpcie3v3, true); +if (ret && ret != -ENOSYS ) { +dev_err (dev,"failed to enable vpcie3v3 (ret=%d)\n" , ret); +return ret; } -udelay (MACRO_US *1000 ); - ret =generic_phy_init (&priv->phy);if (ret) {dev_err (dev,"failed to init phy (ret=%d)\n" , ret); -return ret; + goto err_disable_regulator; } ret =generic_phy_power_on (&priv->phy);
@@ -345,6 +340,8 @@ err_power_off_phy:generic_phy_power_off (&priv->phy); err_exit_phy:generic_phy_exit (&priv->phy); +err_disable_regulator: +regulator_set_enable_if_allowed (priv->vpcie3v3, false);return ret; }
Signature · 1 line
2.41.0
PATCH v4 4/9 pci: pcie_dw_rockchip: Speed up link probe
In reply to Jonas KarlmanUse a similar pattern and delay values as the linux mainline driver to speed up failing when nothing is connected.
Reduce fail speed from around 5+ seconds down to around one second on a Radxa ROCK 3 Model A, where pcie2x1 is probed before pcie3x2 M2 slot.
---
v4:
- No change
v3:
- Collect r-b tag
v2:
- No change
drivers/pci/pcie_dw_rockchip.c | 68 ++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 31 deletions(-)
drivers/pci/pcie_dw_rockchip.c +37 -31
@@ -61,9 +61,6 @@ struct rk_pcie {#define PCIE_CLIENT_DBG_TRANSITION_DATA 0xffff0000#define PCIE_CLIENT_DBF_EN 0xffff0003 -/* Parameters for the waiting for #perst signal */ -#define MACRO_US 1000 -static int rk_pcie_read (void __iomem *addr,int size,u32 *val) {if ((uintptr_t )addr & (size -1 )) {
@@ -242,43 +239,46 @@ static int rk_pcie_link_up(struct rk_pcie *priv, u32 cap_speed)/* DW pre link configurations */ rk_pcie_configure (priv, cap_speed); -/* Rest the device */ -if (dm_gpio_is_valid (&priv->rst_gpio)) { -dm_gpio_set_value (&priv->rst_gpio,0 ); -/* -* Minimal is 100ms from spec but we see -* some wired devices need much more, such as 600ms. -* Add a enough delay to cover all cases. -*/ -udelay (MACRO_US *1000 ); -dm_gpio_set_value (&priv->rst_gpio,1 ); - } -rk_pcie_disable_ltssm (priv);rk_pcie_link_status_clear (priv);rk_pcie_enable_debug (priv); +/* Reset the device */ +if (dm_gpio_is_valid (&priv->rst_gpio)) +dm_gpio_set_value (&priv->rst_gpio,0 ); +/* Enable LTSSM */ rk_pcie_enable_ltssm (priv); -for (retries =0 ; retries <5 ; retries++) { -if (is_link_up (priv)) { -dev_info (priv->dw.dev,"PCIe Link up, LTSSM is 0x%x\n" , -rk_pcie_readl_apb (priv,PCIE_CLIENT_LTSSM_STATUS )); -rk_pcie_debug_dump (priv); -return 0 ; - } - -dev_info (priv->dw.dev,"PCIe Linking... LTSSM is 0x%x\n" , -rk_pcie_readl_apb (priv,PCIE_CLIENT_LTSSM_STATUS )); -rk_pcie_debug_dump (priv); -udelay (MACRO_US *1000 ); +/* +* PCIe requires the refclk to be stable for 100ms prior to releasing +* PERST. See table 2-4 in section 2.6.2 AC Specifications of the PCI +* Express Card Electromechanical Specification, 1.1. However, we don't +* know if the refclk is coming from RC's PHY or external OSC. If it's +* from RC, so enabling LTSSM is the just right place to release #PERST. +*/ +mdelay (100 ); +if (dm_gpio_is_valid (&priv->rst_gpio)) +dm_gpio_set_value (&priv->rst_gpio,1 ); + +/* Check if the link is up or not */ +for (retries =0 ; retries <10 ; retries++) { +if (is_link_up (priv)) +break ; + +mdelay (100 ); + } + +if (retries >=10 ) { +dev_err (priv->dw.dev,"PCIe-%d Link Fail\n" , +dev_seq (priv->dw.dev)); +return -EIO ; } -dev_err (priv->dw.dev,"PCIe-%d Link Fail\n" ,dev_seq (priv->dw.dev)); -/* Link maybe in Gen switch recovery but we need to wait more 1s */ -udelay (MACRO_US *1000 ); -return -EIO ; +dev_info (priv->dw.dev,"PCIe Link up, LTSSM is 0x%x\n" , +rk_pcie_readl_apb (priv,PCIE_CLIENT_LTSSM_STATUS )); +rk_pcie_debug_dump (priv); +return 0 ; }static int rockchip_pcie_init_port (struct udevice *dev)
@@ -287,6 +287,12 @@ static int rockchip_pcie_init_port(struct udevice *dev)u32 val;struct rk_pcie *priv =dev_get_priv (dev); + ret =reset_assert_bulk (&priv->rsts); +if (ret) { +dev_err (dev,"failed to assert resets (ret=%d)\n" , ret); +return ret; + } +/* Set power and maybe external ref clk input */ ret =regulator_set_enable_if_allowed (priv->vpcie3v3, true);if (ret && ret != -ENOSYS ) {
Signature · 1 line
2.41.0
PATCH v4 5/9 pci: pcie_dw_rockchip: Disable unused BARs of the root complex
In reply to Jonas KarlmanFrom: Jon Lin <[email protected]>
The Root Complex BARs default to claim the full 1 GiB memory region on RK3568, leaving no space for any attached device.
Fix this by disable the unused BAR 0 and BAR 1 of the RC.
---
v4:
- New patch, based on vendor commit 1f4523203c2a ("driver: pci: rockchip:
Disable RC BAR0 and BAR1")
drivers/pci/pcie_dw_rockchip.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/pci/pcie_dw_rockchip.c +8 -0
@@ -61,6 +61,8 @@ struct rk_pcie {#define PCIE_CLIENT_DBG_TRANSITION_DATA 0xffff0000#define PCIE_CLIENT_DBF_EN 0xffff0003 +#define PCIE_TYPE0_HDR_DBI2_OFFSET 0x100000 +static int rk_pcie_read (void __iomem *addr,int size,u32 *val) {if ((uintptr_t )addr & (size -1 )) {
@@ -158,6 +160,12 @@ static void rk_pcie_configure(struct rk_pcie *pci, u32 cap_speed) {dw_pcie_dbi_write_enable (&pci->dw, true); +/* Disable BAR 0 and BAR 1 */ +writel (0 , pci->dw.dbi_base +PCIE_TYPE0_HDR_DBI2_OFFSET + +PCI_BASE_ADDRESS_0 ); +writel (0 , pci->dw.dbi_base +PCIE_TYPE0_HDR_DBI2_OFFSET + +PCI_BASE_ADDRESS_1 ); +clrsetbits_le32 (pci->dw.dbi_base +PCIE_LINK_CAPABILITY ,TARGET_LINK_SPEED_MASK , cap_speed);
Signature · 1 line
2.41.0
Re: [PATCH v4 5/9] pci: pcie_dw_rockchip: Disable unused BARs of the root complex
Quoted 10 lines · Jonas Karlman
From: Jon Lin <[email protected]>
The Root Complex BARs default to claim the full 1 GiB memory region on RK3568, leaving no space for any attached device.
Fix this by disable the unused BAR 0 and BAR 1 of the RC.
Signed-off-by Jon Lin <[email protected]>[[email protected]: Move to rk_pcie_configure and use PCI_BASE_ADDRESS_0/1 const]Signed-off-by Jonas Karlman <[email protected]>
Thanks,
- Kever
Quoted 34 lines
---
v4:
- New patch, based on vendor commit1f4523203c2a("driver: pci: rockchip:
Disable RC BAR0 and BAR1")drivers/pci/pcie_dw_rockchip.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/pci/pcie_dw_rockchip.c +8
-0@@ -61,6 +61,8 @@ struct rk_pcie {#define PCIE_CLIENT_DBG_TRANSITION_DATA 0xffff0000#define PCIE_CLIENT_DBF_EN 0xffff0003 +#define PCIE_TYPE0_HDR_DBI2_OFFSET 0x100000 +static int rk_pcie_read (void __iomem *addr,int size,u32 *val) {if ((uintptr_t )addr & (size -1 )) {@@ -158,6 +160,12 @@ static void rk_pcie_configure(struct rk_pcie *pci, u32 cap_speed) {dw_pcie_dbi_write_enable (&pci->dw, true); +/* Disable BAR 0 and BAR 1 */ +writel (0 , pci->dw.dbi_base +PCIE_TYPE0_HDR_DBI2_OFFSET + +PCI_BASE_ADDRESS_0 ); +writel (0 , pci->dw.dbi_base +PCIE_TYPE0_HDR_DBI2_OFFSET + +PCI_BASE_ADDRESS_1 ); +clrsetbits_le32 (pci->dw.dbi_base +PCIE_LINK_CAPABILITY ,TARGET_LINK_SPEED_MASK , cap_speed);
PATCH v4 6/9 regulator: fixed: Add support for gpios prop
In reply to Jonas KarlmanThe commit 12df2c182ccb ("regulator: dt-bindings: fixed-regulator: allow gpios property") in linux v6.3-rc1 added support for use of either a gpios or gpio prop with a fixed-regulator.
This adds support for the new gpios prop to the fixed-regulator driver. gpios prop is used by vcc3v3-pcie-regulator on Radxa ROCK 3 Model A.
---
v4:
- No change
v3:
- Rebased on master
v2:
- Update commit message
- Collect r-b tag
drivers/power/regulator/fixed.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/power/regulator/fixed.c +3 -1
@@ -25,6 +25,7 @@ static int fixed_regulator_of_to_plat(struct udevice *dev) {struct dm_regulator_uclass_plat *uc_pdata;struct regulator_common_plat *plat; +bool gpios; plat =dev_get_plat (dev); uc_pdata =dev_get_uclass_plat (dev);
@@ -33,7 +34,8 @@ static int fixed_regulator_of_to_plat(struct udevice *dev) uc_pdata->type =REGULATOR_TYPE_FIXED ; -return regulator_common_of_to_plat (dev, plat,"gpio" ); + gpios =dev_read_bool (dev,"gpios" ); +return regulator_common_of_to_plat (dev, plat, gpios ?"gpios" :"gpio" ); }static int fixed_regulator_get_value (struct udevice *dev)
Signature · 1 line
2.41.0
PATCH v4 7/9 rockchip: clk: clk_rk3568: Add CLK_PCIEPHY2_REF support
In reply to Jonas KarlmanAdd dummy support for the CLK_PCIEPHY2_REF clock.
---
v4:
- No change
v3:
- No change
v2:
- Collect r-b tag
drivers/clk/rockchip/clk_rk3568.c | 1 + 1 file changed, 1 insertion(+)
drivers/clk/rockchip/clk_rk3568.c +1 -0
@@ -427,6 +427,7 @@ static ulong rk3568_pmuclk_set_rate(struct clk *clk, ulong rate)break ;case CLK_PCIEPHY0_REF :case CLK_PCIEPHY1_REF : +case CLK_PCIEPHY2_REF :return 0 ;default :return -ENOENT ;
Signature · 1 line
2.41.0
PATCH v4 8/9 rockchip: rk3568-rock-3a: Enable PCIe and NVMe support
In reply to Jonas KarlmanAdd missing pinctrl and defconfig options to enable PCIe and NVMe support on Radxa ROCK 3 Model A.
Use of pcie20m1_pins and pcie30x2m1_pins ensure IO mux selection M1. The following pcie_reset_h and pcie3x2_reset_h ensure GPIO func is restored to the perstn pin, a workaround to avoid having to define a new rockchip,pins.
---
v4:
- No change
v3:
- Drop now unneeded sys freeze workaround
- Enable options for AHCI/SCSI
v2:
- Update commit message
- Disable pcie2x1 to work around a possible sys freeze issue
arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 14 ++++++++++++++ configs/rock-3a-rk3568_defconfig | 9 +++++++++ 2 files changed, 23 insertions(+)
arch/arm/dts/rk3568-rock-3a-u-boot.dtsi +14 -0
@@ -36,8 +36,22 @@ bootph-all; }; +&pcie2x1 { + pinctrl-0 = <&pcie20m1_pins &pcie_reset_h>; +}; + +&pcie3x2 { + pinctrl-0 = <&pcie30x2m1_pins &pcie3x2_reset_h>; +}; + &pinctrl { bootph-all; + + pcie { + pcie3x2_reset_h: pcie3x2-reset-h { + rockchip,pins = <2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; }; &pcfg_pull_none {
configs/rock-3a-rk3568_defconfig +9 -0
@@ -22,7 +22,9 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_SYS_LOAD_ADDR=0xc00800 +CONFIG_PCI=y CONFIG_DEBUG_UART=y +CONFIG_AHCI=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_FIT_SIGNATURE=y
@@ -46,6 +48,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_PCI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_PMIC=y
@@ -56,6 +59,8 @@ CONFIG_OF_LIVE=y CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_SPL_REGMAP=y CONFIG_SPL_SYSCON=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y
@@ -70,6 +75,8 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_XTX=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_NVME_PCI=y +CONFIG_PCIE_DW_ROCKCHIP=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y CONFIG_SPL_PINCTRL=y
@@ -78,6 +85,8 @@ CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y CONFIG_SPL_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SCSI=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550_MEM32=y
Signature · 1 line
2.41.0
Re: [PATCH v4 8/9] rockchip: rk3568-rock-3a: Enable PCIe and NVMe support
Quoted 9 lines · Jonas Karlman
Add missing pinctrl and defconfig options to enable PCIe and NVMe support on Radxa ROCK 3 Model A.
Use of
pcie20m1_pinsandpcie30x2m1_pinsensure IO mux selection M1. The followingpcie_reset_handpcie3x2_reset_hensure GPIO func is restored to the perstn pin, a workaround to avoid having to define a new rockchip,pins.Signed-off-by Jonas Karlman <[email protected]>
Thanks,
- Kever
Quoted 92 lines
---
v4:
- No changev3:
- Drop now unneeded sys freeze workaround
- Enable options for AHCI/SCSIv2:
- Update commit message
- Disable pcie2x1 to work around a possible sys freeze issuearch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 14 ++++++++++++++ configs/rock-3a-rk3568_defconfig | 9 +++++++++ 2 files changed, 23 insertions(+)arch/arm/dts/rk3568-rock-3a-u-boot.dtsi +14
-0@@ -36,8 +36,22 @@ bootph-all; }; +&pcie2x1 { + pinctrl-0 = <&pcie20m1_pins &pcie_reset_h>; +}; + +&pcie3x2 { + pinctrl-0 = <&pcie30x2m1_pins &pcie3x2_reset_h>; +}; + &pinctrl { bootph-all; + + pcie { + pcie3x2_reset_h: pcie3x2-reset-h { + rockchip,pins = <2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; }; &pcfg_pull_none {configs/rock-3a-rk3568_defconfig +9
-0@@ -22,7 +22,9 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_SYS_LOAD_ADDR=0xc00800 +CONFIG_PCI=y CONFIG_DEBUG_UART=y +CONFIG_AHCI=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_FIT_SIGNATURE=y@@ -46,6 +48,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y +CONFIG_CMD_PCI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_PMIC=y@@ -56,6 +59,8 @@ CONFIG_OF_LIVE=y CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_SPL_REGMAP=y CONFIG_SPL_SYSCON=y +CONFIG_SCSI_AHCI=y +CONFIG_AHCI_PCI=y CONFIG_SPL_CLK=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y@@ -70,6 +75,8 @@ CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_XTX=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y +CONFIG_NVME_PCI=y +CONFIG_PCIE_DW_ROCKCHIP=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y CONFIG_SPL_PINCTRL=y@@ -78,6 +85,8 @@ CONFIG_PMIC_RK8XX=y CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y CONFIG_SPL_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SCSI=y CONFIG_BAUDRATE=1500000 CONFIG_DEBUG_UART_SHIFT=2 CONFIG_SYS_NS16550_MEM32=y
PATCH v4 9/9 rockchip: rk356x: Update PCIe config, IO and memory regions
In reply to Jonas KarlmanUpdate config, IO and memory regions used based on [1] with pcie3x2 config reg address and reg size corrected.
Before this change:
PCI Autoconfig: Bus Memory region: [0-3eefffff], PCI Autoconfig: Bus I/O region: [3ef00000-3effffff],
After this change:
PCI Autoconfig: Bus Memory region: [40000000-7fffffff], PCI Autoconfig: Bus I/O region: [f0100000-f01fffff],
[1] https://lore.kernel.org/lkml/[email protected]/
---
v4:
- No change
v3:
- No change
v2:
- Update commit message
- Collect r-b tag
arch/arm/dts/rk3568.dtsi | 14 ++++++++------ arch/arm/dts/rk356x.dtsi | 7 ++++--- 2 files changed, 12 insertions(+), 9 deletions(-)
arch/arm/dts/rk3568.dtsi +8 -6
@@ -94,9 +94,10 @@ power-domains = <&power RK3568_PD_PIPE>; reg = <0x3 0xc0400000 0x0 0x00400000>, <0x0 0xfe270000 0x0 0x00010000>, - <0x3 0x7f000000 0x0 0x01000000>; - ranges = <0x01000000 0x0 0x3ef00000 0x3 0x7ef00000 0x0 0x00100000>, - <0x02000000 0x0 0x00000000 0x3 0x40000000 0x0 0x3ef00000>; + <0x0 0xf2000000 0x0 0x00100000>; + ranges = <0x01000000 0x0 0xf2100000 0x0 0xf2100000 0x0 0x00100000>, + <0x02000000 0x0 0xf2200000 0x0 0xf2200000 0x0 0x01e00000>, + <0x03000000 0x0 0x40000000 0x3 0x40000000 0x0 0x40000000>; reg-names = "dbi", "apb", "config"; resets = <&cru SRST_PCIE30X1_POWERUP>; reset-names = "pipe";
@@ -146,9 +147,10 @@ power-domains = <&power RK3568_PD_PIPE>; reg = <0x3 0xc0800000 0x0 0x00400000>, <0x0 0xfe280000 0x0 0x00010000>, - <0x3 0xbf000000 0x0 0x01000000>; - ranges = <0x01000000 0x0 0x3ef00000 0x3 0xbef00000 0x0 0x00100000>, - <0x02000000 0x0 0x00000000 0x3 0x80000000 0x0 0x3ef00000>; + <0x0 0xf0000000 0x0 0x00100000>; + ranges = <0x01000000 0x0 0xf0100000 0x0 0xf0100000 0x0 0x00100000>, + <0x02000000 0x0 0xf0200000 0x0 0xf0200000 0x0 0x01e00000>, + <0x03000000 0x0 0x40000000 0x3 0x80000000 0x0 0x40000000>; reg-names = "dbi", "apb", "config"; resets = <&cru SRST_PCIE30X2_POWERUP>; reset-names = "pipe";
arch/arm/dts/rk356x.dtsi +4 -3
@@ -951,7 +951,7 @@ compatible = "rockchip,rk3568-pcie"; reg = <0x3 0xc0000000 0x0 0x00400000>, <0x0 0xfe260000 0x0 0x00010000>, - <0x3 0x3f000000 0x0 0x01000000>; + <0x0 0xf4000000 0x0 0x00100000>; reg-names = "dbi", "apb", "config"; interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,
@@ -980,8 +980,9 @@ phys = <&combphy2 PHY_TYPE_PCIE>; phy-names = "pcie-phy"; power-domains = <&power RK3568_PD_PIPE>; - ranges = <0x01000000 0x0 0x3ef00000 0x3 0x3ef00000 0x0 0x00100000 - 0x02000000 0x0 0x00000000 0x3 0x00000000 0x0 0x3ef00000>; + ranges = <0x01000000 0x0 0xf4100000 0x0 0xf4100000 0x0 0x00100000>, + <0x02000000 0x0 0xf4200000 0x0 0xf4200000 0x0 0x01e00000>, + <0x03000000 0x0 0x40000000 0x3 0x00000000 0x0 0x40000000>; resets = <&cru SRST_PCIE20_POWERUP>; reset-names = "pipe"; #address-cells = <3>;
Signature · 1 line
2.41.0