Add support for R-Car Gen4 PCI host controller
Subsystems (2)
v5 cover Add support for R-Car Gen4 PCI host controller
This series adds support for R-Car Gen4 PCI host controller.
To fully support the controller, the following changes were made:
- Generic mechanism to support PCI child buses is added.
- Private data for PCI host bridge and means to access it are added.
The series was tested as a part of the pci-passthrough patches[1] and build-tested standalone with enabled HAS_PCI and HAS_VPCI. CI pipeline results: [2]
[1]: https://github.com/Deedone/xen/tree/pci_passthrough_wip
[2]: https://gitlab.com/xen-project/people/mpoturai/xen/-/pipelines/1828720661
v4->v5:
* see individual patches
v3->v4:
* rebase
* see individual patches
v2->v3:
* dropped patches related to ATU programming delay
* improved formatting
v1->v2:
* see individual patches
Oleksandr Andrushchenko (4):
xen/arm: allow PCI host bridge to have private data xen/arm: make pci_host_common_probe return the bridge xen/arm: add support for PCI child bus xen/arm: add support for R-Car Gen4 PCI host controller
MAINTAINERS | 6 + xen/arch/arm/include/asm/pci.h | 22 +- xen/arch/arm/pci/Makefile | 2 + xen/arch/arm/pci/ecam.c | 1 + xen/arch/arm/pci/pci-access.c | 37 ++- xen/arch/arm/pci/pci-designware.c | 416 ++++++++++++++++++++++++++++ xen/arch/arm/pci/pci-designware.h | 90 ++++++ xen/arch/arm/pci/pci-host-common.c | 92 ++++-- xen/arch/arm/pci/pci-host-generic.c | 2 +- xen/arch/arm/pci/pci-host-rcar4.c | 94 +++++++ xen/arch/arm/pci/pci-host-zynqmp.c | 3 +- xen/arch/arm/vpci.c | 91 ++++-- 12 files changed, 808 insertions(+), 48 deletions(-) create mode 100644 xen/arch/arm/pci/pci-designware.c create mode 100644 xen/arch/arm/pci/pci-designware.h create mode 100644 xen/arch/arm/pci/pci-host-rcar4.c
Signature · 1 line
2.34.1
PATCH v5 1/4 xen/arm: allow PCI host bridge to have private data
From: Oleksandr Andrushchenko <[email protected]>
Some of the PCI host bridges require private data. Add priv field to struct pci_host_bridge, so such bridges may populate it with their private data.
---v4->v5:
* no change
v3->v4:
* Added Stefano's RB
v2->v3:
* removed priv allocation from common code
v1->v2:
* no change
--- xen/arch/arm/include/asm/pci.h | 1 + 1 file changed, 1 insertion(+)
xen/arch/arm/include/asm/pci.h +1 -0
@@ -66,6 +66,7 @@ struct pci_host_bridge {uint16_t segment;/* Segment number */ struct pci_config_window * cfg;/* Pointer to the bridge config window */ const struct pci_ops *ops; +void *priv;/* Private data of the bridge. */ };struct pci_ops {
Signature · 1 line
2.34.1
PATCH v5 2/4 xen/arm: make pci_host_common_probe return the bridge
In reply to Mykyta PoturaiFrom: Oleksandr Andrushchenko <[email protected]>
Some of the PCI host bridges require additional processing during the probe phase. For that they need to access struct bridge of the probed host, so return pointer to the new bridge from pci_host_common_probe.
---v4->v5:
* added Stefano's RB
v3->v4:
* change return 0 to return NULL
v2->v3:
* no change
v1->v2:
* no change
--- xen/arch/arm/include/asm/pci.h | 5 +++-- xen/arch/arm/pci/pci-host-common.c | 12 ++++++------ xen/arch/arm/pci/pci-host-generic.c | 2 +- xen/arch/arm/pci/pci-host-zynqmp.c | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-)
xen/arch/arm/include/asm/pci.h +3 -2
@@ -18,6 +18,7 @@#ifdef CONFIG_HAS_PCI #include <asm/p2m.h> +#include <xen/err.h> #define pci_to_dev (pcidev) (&(pcidev)->arch.dev)
@@ -95,8 +96,8 @@ struct pci_ecam_ops {/* Default ECAM ops */ extern const struct pci_ecam_ops pci_generic_ecam_ops; -int pci_host_common_probe (struct dt_device_node *dev, -const struct pci_ecam_ops *ops); +struct pci_host_bridge *pci_host_common_probe (struct dt_device_node *dev, +const struct pci_ecam_ops *ops);int pci_generic_config_read (struct pci_host_bridge *bridge,pci_sbdf_t sbdf,uint32_t reg,uint32_t len,uint32_t *value); int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf,
xen/arch/arm/pci/pci-host-common.c +6 -6
@@ -208,8 +208,8 @@ static int pci_bus_find_domain_nr(struct dt_device_node *dev)return domain; } -int pci_host_common_probe (struct dt_device_node *dev, -const struct pci_ecam_ops *ops) +struct pci_host_bridge *pci_host_common_probe (struct dt_device_node *dev, +const struct pci_ecam_ops *ops) {struct pci_host_bridge *bridge;struct pci_config_window *cfg;
@@ -217,11 +217,11 @@ int pci_host_common_probe(struct dt_device_node *dev,int domain;if (dt_device_for_passthrough (dev) ) -return 0 ; +return NULL ; bridge =pci_alloc_host_bridge ();if ( !bridge ) -return -ENOMEM ; +return ERR_PTR (-ENOMEM );/* Parse and map our Configuration Space windows */ cfg =gen_pci_init (dev, ops);
@@ -244,12 +244,12 @@ int pci_host_common_probe(struct dt_device_node *dev, bridge->segment = domain;pci_add_host_bridge (bridge); -return 0 ; +return bridge; err_exit:xfree (bridge); -return err; +return ERR_PTR (err); }/*
xen/arch/arm/pci/pci-host-generic.c +1 -1
@@ -29,7 +29,7 @@ static const struct dt_device_match __initconstrel gen_pci_dt_match[] =static int __init pci_host_generic_probe (struct dt_device_node *dev,const void *data) { -return pci_host_common_probe (dev, &pci_generic_ecam_ops); +return PTR_RET (pci_host_common_probe (dev, &pci_generic_ecam_ops)); }DT_DEVICE_START (pci_gen,"PCI HOST GENERIC" ,DEVICE_PCI_HOSTBRIDGE )
xen/arch/arm/pci/pci-host-zynqmp.c +1 -1
@@ -47,7 +47,7 @@ static const struct dt_device_match __initconstrel nwl_pcie_dt_match[] =static int __init pci_host_generic_probe (struct dt_device_node *dev,const void *data) { -return pci_host_common_probe (dev, &nwl_pcie_ops); +return PTR_RET (pci_host_common_probe (dev, &nwl_pcie_ops)); }DT_DEVICE_START (pci_gen,"PCI HOST ZYNQMP" ,DEVICE_PCI_HOSTBRIDGE )
Signature · 1 line
2.34.1
PATCH v5 3/4 xen/arm: add support for PCI child bus
In reply to Mykyta PoturaiFrom: Oleksandr Andrushchenko <[email protected]>
PCI host bridges often have different ways to access the root and child bus configuration spaces. One of the examples is Designware's host bridge and its multiple clones [1].
Linux kernel implements this by instantiating a child bus when device drivers provide not only the usual pci_ops to access ECAM space (this is the case for the generic host bridge), but also means to access the child bus which has a dedicated configuration space and own implementation for accessing the bus, e.g. child_ops.
For Xen it is not feasible to fully implement PCI bus infrastructure as Linux kernel does, but still child bus can be supported.
Add support for the PCI child bus which includes the following changes:
- introduce bus mapping functions depending on SBDF
- assign bus start and end for the child bus and re-configure the same for the parent (root) bus
- make pci_find_host_bridge be aware of multiple busses behind the same bridge
- update pci_host_bridge_mappings, so it also doesn't map to guest the memory spaces belonging to the child bus
- make pci_host_common_probe accept one more pci_ops structure for the child bus
- install MMIO handlers for the child bus for hardware domain
- re-work vpci_mmio_{write|read} with parent and child approach in mind
[1] https://elixir.bootlin.com/linux/v5.15/source/drivers/pci/controller/dwc
---v4->v5:
* fix formatting
* move init_bus_range inside pci_ops
* fix logic error in pci_host_bridge_mappings again
v3->v4:
* remove changes to pci_ecam_map_bus
* make map_bus inline
* fix logic error in pci_host_bridge_mappings
v2->v3:
* no change
v1->v2:
* fixed compilation issues
--- xen/arch/arm/include/asm/pci.h | 20 ++++++- xen/arch/arm/pci/ecam.c | 1 + xen/arch/arm/pci/pci-access.c | 37 ++++++++++-- xen/arch/arm/pci/pci-host-common.c | 84 +++++++++++++++++++++----- xen/arch/arm/pci/pci-host-generic.c | 2 +- xen/arch/arm/pci/pci-host-zynqmp.c | 3 +- xen/arch/arm/vpci.c | 91 +++++++++++++++++++++++------ 7 files changed, 194 insertions(+), 44 deletions(-)
xen/arch/arm/include/asm/pci.h +18 -2
@@ -67,6 +67,9 @@ struct pci_host_bridge {uint16_t segment;/* Segment number */ struct pci_config_window * cfg;/* Pointer to the bridge config window */ const struct pci_ops *ops; +/* Child bus */ +struct pci_config_window *child_cfg; +const struct pci_ops *child_ops;void *priv;/* Private data of the bridge. */ };
@@ -80,6 +83,9 @@ struct pci_ops {bool (*need_p2m_hwdom_mapping)(struct domain *d,struct pci_host_bridge *bridge,uint64_t addr); +void (*init_bus_range)(struct dt_device_node *dev, +struct pci_host_bridge *bridge, +struct pci_config_window *cfg); };/*
@@ -96,8 +102,10 @@ struct pci_ecam_ops {/* Default ECAM ops */ extern const struct pci_ecam_ops pci_generic_ecam_ops; -struct pci_host_bridge *pci_host_common_probe (struct dt_device_node *dev, -const struct pci_ecam_ops *ops); +struct pci_host_bridge * +pci_host_common_probe (struct dt_device_node *dev, +const struct pci_ecam_ops *ops, +const struct pci_ecam_ops *child_ops);int pci_generic_config_read (struct pci_host_bridge *bridge,pci_sbdf_t sbdf,uint32_t reg,uint32_t len,uint32_t *value); int pci_generic_config_write(struct pci_host_bridge *bridge, pci_sbdf_t sbdf,
@@ -130,6 +138,14 @@ int pci_host_bridge_mappings(struct domain *d);bool pci_check_bar (const struct pci_dev *pdev,mfn_t start,mfn_t end); +void pci_generic_init_bus_range (struct dt_device_node *dev, +struct pci_host_bridge *bridge, +struct pci_config_window *cfg); + +void pci_generic_init_bus_range_child (struct dt_device_node *dev, +struct pci_host_bridge *bridge, +struct pci_config_window *cfg); +#else /*!CONFIG_HAS_PCI*/ struct pci_dev ;
xen/arch/arm/pci/ecam.c +1 -0
@@ -60,6 +60,7 @@ const struct pci_ecam_ops pci_generic_ecam_ops = { .read = pci_generic_config_read, .write = pci_generic_config_write, .need_p2m_hwdom_mapping = pci_ecam_need_p2m_hwdom_mapping, + .init_bus_range = pci_generic_init_bus_range, } };
xen/arch/arm/pci/pci-access.c +31 -6
@@ -18,10 +18,31 @@#define INVALID_VALUE (~0U)#define PCI_ERR_VALUE (len) GENMASK(0, len * 8) +static const struct pci_ops *get_ops (struct pci_host_bridge *bridge, +pci_sbdf_t sbdf) +{ +if ( bridge->child_ops ) + { +struct pci_config_window *cfg = bridge->child_cfg; + +if ( (sbdf.bus >= cfg->busn_start) && (sbdf.bus <= cfg->busn_end) ) +return bridge->child_ops; + } +return bridge->ops; +} + +static inline void __iomem *map_bus (struct pci_host_bridge *bridge, +pci_sbdf_t sbdf,uint32_t reg) +{ +const struct pci_ops *ops =get_ops (bridge, sbdf); + +return ops->map_bus (bridge, sbdf, reg); +} +int pci_generic_config_read (struct pci_host_bridge *bridge,pci_sbdf_t sbdf,uint32_t reg,uint32_t len,uint32_t *value) { -void __iomem *addr = bridge->ops->map_bus (bridge, sbdf, reg); +void __iomem *addr =map_bus (bridge, sbdf, reg);if ( !addr ) {
@@ -50,7 +71,7 @@ int pci_generic_config_read(struct pci_host_bridge *bridge, pci_sbdf_t sbdf,int pci_generic_config_write (struct pci_host_bridge *bridge,pci_sbdf_t sbdf,uint32_t reg,uint32_t len,uint32_t value) { -void __iomem *addr = bridge->ops->map_bus (bridge, sbdf, reg); +void __iomem *addr =map_bus (bridge, sbdf, reg);if ( !addr )return -ENODEV ;
@@ -78,14 +99,16 @@ static uint32_t pci_config_read(pci_sbdf_t sbdf, unsigned int reg, {uint32_t val =PCI_ERR_VALUE (len);struct pci_host_bridge *bridge =pci_find_host_bridge (sbdf.seg, sbdf.bus); +const struct pci_ops *ops;if (unlikely (!bridge) )return val; -if (unlikely (!bridge->ops->read) ) + ops =get_ops (bridge, sbdf); +if (unlikely (!ops->read) )return val; - bridge->ops->read (bridge, sbdf, reg, len, &val); + ops->read (bridge, sbdf, reg, len, &val);return val; }
@@ -94,14 +117,16 @@ static void pci_config_write(pci_sbdf_t sbdf, unsigned int reg, unsigned int len, uint32_t val) {struct pci_host_bridge *bridge =pci_find_host_bridge (sbdf.seg, sbdf.bus); +const struct pci_ops *ops;if (unlikely (!bridge) )return ; -if (unlikely (!bridge->ops->write) ) + ops =get_ops (bridge, sbdf); +if (unlikely (!ops->write) )return ; - bridge->ops->write (bridge, sbdf, reg, len, val); + ops->write (bridge, sbdf, reg, len, val); }/*
xen/arch/arm/pci/pci-host-common.c +68 -16
138 lines not on this page · raw message
xen/arch/arm/pci/pci-host-generic.c +1 -1
@@ -29,7 +29,7 @@ static const struct dt_device_match __initconstrel gen_pci_dt_match[] =static int __init pci_host_generic_probe (struct dt_device_node *dev,const void *data) { -return PTR_RET (pci_host_common_probe (dev, &pci_generic_ecam_ops)); +return PTR_RET (pci_host_common_probe (dev, &pci_generic_ecam_ops,NULL )); }DT_DEVICE_START (pci_gen,"PCI HOST GENERIC" ,DEVICE_PCI_HOSTBRIDGE )
xen/arch/arm/pci/pci-host-zynqmp.c +2 -1
@@ -35,6 +35,7 @@ const struct pci_ecam_ops nwl_pcie_ops = { .read = pci_generic_config_read, .write = pci_generic_config_write, .need_p2m_hwdom_mapping = pci_ecam_need_p2m_hwdom_mapping, + .init_bus_range = pci_generic_init_bus_range, } };
@@ -47,7 +48,7 @@ static const struct dt_device_match __initconstrel nwl_pcie_dt_match[] =static int __init pci_host_generic_probe (struct dt_device_node *dev,const void *data) { -return PTR_RET (pci_host_common_probe (dev, &nwl_pcie_ops)); +return PTR_RET (pci_host_common_probe (dev, &nwl_pcie_ops,NULL )); }DT_DEVICE_START (pci_gen,"PCI HOST ZYNQMP" ,DEVICE_PCI_HOSTBRIDGE )
xen/arch/arm/vpci.c +73 -18
147 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v5 4/4 xen/arm: add support for R-Car Gen4 PCI host controller
In reply to Mykyta PoturaiFrom: Oleksandr Andrushchenko <[email protected]>
Add support for Renesas R-Car Gen4 PCI host controller, specifically targeting the S4 and V4H SoCs. The implementation includes configuration read/write operations for both root and child buses. For accessing the child bus, iATU is used for address translation.
The host controller needs to be initialized by Dom0 first to be properly handled by Xen. Xen itself only handles the runtime configuration of the iATU for accessing different child devices.
iATU programming is done similarly to Linux, where only window 0 is used for dynamic configuration, and it is reconfigured for every config space read/write.
Code common to all DesignWare PCI host controllers is located in a separate file to allow for easy reuse in other DesignWare-based PCI host controllers.
---v4->v5:
* update license identifiers
* improve error checking
* use XENLOG_G_* where needed
* make macro defs more robust and minor style fixes
* add MAINTANERS entry
v3->v4:
* no changes
v2->v3:
* move priv allocation to dw_pcie_host_probe
v1->v2:
* move designware code in a separate file
--- MAINTAINERS | 6 + xen/arch/arm/pci/Makefile | 2 + xen/arch/arm/pci/pci-designware.c | 416 ++++++++++++++++++++++++++++++ xen/arch/arm/pci/pci-designware.h | 90 +++++++ xen/arch/arm/pci/pci-host-rcar4.c | 94 +++++++ 5 files changed, 608 insertions(+) create mode 100644 xen/arch/arm/pci/pci-designware.c create mode 100644 xen/arch/arm/pci/pci-designware.h create mode 100644 xen/arch/arm/pci/pci-host-rcar4.c
MAINTAINERS +6 -0
@@ -476,6 +476,12 @@ M: Anthony Perard <[email protected]> S: Supported T: git https://xenbits.xenproject.org/git-http/qemu-xen.git +RCAR PCI +M: Mykyta Poturai <[email protected]> +S: Supported +F: xen/arch/arm/pci/pci-host-rcar4.c +F: xen/arch/arm/pci/pci-designware* + REMUS S: Orphan F: docs/README.remus
xen/arch/arm/pci/Makefile +2 -0
@@ -4,3 +4,5 @@ obj-y += pci-host-generic.o obj-y += pci-host-common.o obj-y += ecam.o obj-y += pci-host-zynqmp.o +obj-y += pci-designware.o +obj-y += pci-host-rcar4.o
xen/arch/arm/pci/pci-designware.c new file +416 -0
416 lines not on this page · raw message
xen/arch/arm/pci/pci-designware.h new file +90 -0
90 lines not on this page · raw message
xen/arch/arm/pci/pci-host-rcar4.c new file +94 -0
94 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v5 4/4] xen/arm: add support for R-Car Gen4 PCI host controller
Quoted 15 lines · Mykyta Poturai
From: Oleksandr Andrushchenko <[email protected]>
Add support for Renesas R-Car Gen4 PCI host controller, specifically targeting the S4 and V4H SoCs. The implementation includes configuration read/write operations for both root and child buses. For accessing the child bus, iATU is used for address translation.
The host controller needs to be initialized by Dom0 first to be properly handled by Xen. Xen itself only handles the runtime configuration of the iATU for accessing different child devices.
iATU programming is done similarly to Linux, where only window 0 is used for dynamic configuration, and it is reconfigured for every config space read/write.
Quoted 6 lines
Code common to all DesignWare PCI host controllers is located in a separate file to allow for easy reuse in other DesignWare-based PCI host controllers.
Signed-off-by Oleksandr Andrushchenko <[email protected]>Signed-off-by Mykyta Poturai <[email protected]>
Quoted 675 lines
---
v4->v5:
* update license identifiers
* improve error checking
* use XENLOG_G_* where needed
* make macro defs more robust and minor style fixes
* add MAINTANERS entry
v3->v4:
* no changes
v2->v3:
* move priv allocation todw_pcie_host_probe
v1->v2:
* move designware code in a separate file--- MAINTAINERS | 6 + xen/arch/arm/pci/Makefile | 2 + xen/arch/arm/pci/pci-designware.c | 416 ++++++++++++++++++++++++++++++ xen/arch/arm/pci/pci-designware.h | 90 +++++++ xen/arch/arm/pci/pci-host-rcar4.c | 94 +++++++ 5 files changed, 608 insertions(+) create mode 100644 xen/arch/arm/pci/pci-designware.c create mode 100644 xen/arch/arm/pci/pci-designware.h create mode 100644 xen/arch/arm/pci/pci-host-rcar4.cMAINTAINERS +6
-0@@ -476,6 +476,12 @@ M: Anthony Perard <[email protected]> S: Supported T: git https://xenbits.xenproject.org/git-http/qemu-xen.git +RCAR PCI +M: Mykyta Poturai <[email protected]> +S: Supported +F: xen/arch/arm/pci/pci-host-rcar4.c +F: xen/arch/arm/pci/pci-designware* + REMUS S: Orphan F: docs/README.remusxen/arch/arm/pci/Makefile +2
-0@@ -4,3 +4,5 @@ obj-y += pci-host-generic.o obj-y += pci-host-common.o obj-y += ecam.o obj-y += pci-host-zynqmp.o +obj-y += pci-designware.o +obj-y += pci-host-rcar4.oxen/arch/arm/pci/pci-designware.c new file +416
-0@@ -0,0 +1,416 @@ +/* SPDX-License-Identifier: GPL-2.0-only +* +* Based on Linux drivers/pci/controller/pci-host-common.c +* Based on Linux drivers/pci/controller/pci-host-generic.c +* Based on Linux drivers/pci/controller/dwc/pcie-designware.c +* Based on xen/arch/arm/pci/pci-host-generic.c +* +*/ + +#include <xen/delay.h> +#include <asm/io.h> + +#include "pci-designware.h" +/** +* upper_32_bits - return bits 32-63 of a number +* @n: the number we're accessing +* +* A basic shift-right of a 64- or 32-bit quantity. Use this to suppress +* the "right shift count >= width of type" warning when that quantity is +* 32-bits. +*/ +#define upper_32_bits (n) ((uint32_t)(((n) >> 16) >> 16)) + +/** +* lower_32_bits - return bits 0-31 of a number +* @n: the number we're accessing +*/ +#define lower_32_bits (n) ((uint32_t)((n) & 0xffffffffU)) + +static int dw_pcie_read (void __iomem *addr,int len,uint32_t *val) +{ +if ( !IS_ALIGNED ((uintptr_t )addr, len) ) + { + *val =0 ; +return -EFAULT ; + } + +switch ( len ) + { +case 1 : + *val =readb (addr); +break ; +case 2 : + *val =readw (addr); +break ; +case 4 : + *val =readl (addr); +break ; +default : +ASSERT_UNREACHABLE (); + } + +return 0 ; +} + +static int dw_pcie_write (void __iomem *addr,int len,uint32_t val) +{ +if ( !IS_ALIGNED ((uintptr_t )addr, len) ) +return -EFAULT ; + +switch ( len ) + { +case 1 : +writeb (val, addr); +break ; +case 2 : +writew (val, addr); +break ; +case 4 : +writel (val, addr); +break ; +default : +ASSERT_UNREACHABLE (); + } + +return 0 ; +} + +static uint32_t dw_pcie_read_dbi (struct pci_host_bridge *bridge,uint32_t reg, +size_t size) +{ +void __iomem *addr = bridge->cfg->win + reg; +uint32_t val; +int ret; + + ret =dw_pcie_read (addr, size, &val); +if ( ret ) +printk (XENLOG_G_ERR "Read DBI address failed\n" ); + +return val; +} + +static void dw_pcie_write_dbi (struct pci_host_bridge *bridge,uint32_t reg, +size_t size,uint32_t val) +{ +void __iomem *addr = bridge->cfg->win + reg; +int ret; + + ret =dw_pcie_write (addr, size, val); +if ( ret ) +printk (XENLOG_G_ERR "Write DBI address failed\n" ); +} + +static uint32_t dw_pcie_readl_dbi (struct pci_host_bridge *bridge,uint32_t reg) +{ +return dw_pcie_read_dbi (bridge, reg,sizeof (uint32_t )); +} + +static void dw_pcie_writel_dbi (struct pci_host_bridge *pci,uint32_t reg, +uint32_t val) +{ +dw_pcie_write_dbi (pci, reg,sizeof (uint32_t ), val); +} + +static void dw_pcie_read_iatu_unroll_enabled (struct pci_host_bridge *bridge) +{ +struct dw_pcie_priv *priv = bridge->priv; +uint32_t val; + + val =dw_pcie_readl_dbi (bridge,PCIE_ATU_VIEWPORT ); +if ( val ==0xffffffffU ) + priv->iatu_unroll_enabled = true; + +printk (XENLOG_G_DEBUG "%s iATU unroll: %sabled\n" , +dt_node_full_name (bridge->dt_node), + priv->iatu_unroll_enabled ?"en" :"dis" ); +} + +static uint32_t dw_pcie_readl_atu (struct pci_host_bridge *pci,uint32_t reg) +{ +struct dw_pcie_priv *priv = pci->priv; +int ret; +uint32_t val; + + ret =dw_pcie_read (priv->atu_base + reg,4 , &val); +if ( ret ) +printk (XENLOG_G_ERR "Read ATU address failed\n" ); + +return val; +} + +static void dw_pcie_writel_atu (struct pci_host_bridge *pci,uint32_t reg, +uint32_t val) +{ +struct dw_pcie_priv *priv = pci->priv; +int ret; + + ret =dw_pcie_write (priv->atu_base + reg,4 , val); +if ( ret ) +printk (XENLOG_G_ERR "Write ATU address failed\n" ); +} + +static uint32_t dw_pcie_readl_ob_unroll (struct pci_host_bridge *pci, +uint32_t index,uint32_t reg) +{ +uint32_t offset =PCIE_GET_ATU_OUTB_UNR_REG_OFFSET (index); + +return dw_pcie_readl_atu (pci, offset + reg); +} + +static void dw_pcie_writel_ob_unroll (struct pci_host_bridge *pci, +uint32_t index,uint32_t reg,uint32_t val) +{ +uint32_t offset =PCIE_GET_ATU_OUTB_UNR_REG_OFFSET (index); + +dw_pcie_writel_atu (pci, offset + reg, val); +} + +static uint32_t dw_pcie_enable_ecrc (uint32_t val) +{ +ASSERT_UNREACHABLE (); +return 0 ; +} + +static int dw_pcie_prog_outbound_atu_unroll (struct pci_host_bridge *pci, +uint8_t func_no,int index, +int type,uint64_t cpu_addr, +uint64_t pci_addr,uint64_t size) +{ +struct dw_pcie_priv *priv = pci->priv; +uint32_t retries, val; +uint64_t limit_addr = cpu_addr + size -1 ; + +dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_LOWER_BASE , +lower_32_bits (cpu_addr)); +dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_UPPER_BASE , +upper_32_bits (cpu_addr)); +dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_LOWER_LIMIT , +lower_32_bits (limit_addr)); +dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_UPPER_LIMIT , +upper_32_bits (limit_addr)); +dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_LOWER_TARGET , +lower_32_bits (pci_addr)); +dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_UPPER_TARGET , +upper_32_bits (pci_addr)); + val = type |PCIE_ATU_FUNC_NUM (func_no); + val =upper_32_bits (size -1 ) ? val |PCIE_ATU_INCREASE_REGION_SIZE : val; +if ( priv->version ==0x490A ) + val =dw_pcie_enable_ecrc (val); +dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_REGION_CTRL1 , val); +dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_REGION_CTRL2 , +PCIE_ATU_ENABLE ); + +/* +* Make sure ATU enable takes effect before any subsequent config +* and I/O accesses. +*/ +for ( retries =0 ; retries <LINK_WAIT_MAX_IATU_RETRIES ; retries++ ) + { + val =dw_pcie_readl_ob_unroll (pci, index,PCIE_ATU_UNR_REGION_CTRL2 ); +if ( val &PCIE_ATU_ENABLE ) +return 0 ; + +mdelay (LINK_WAIT_IATU ); + } +printk (XENLOG_G_ERR "Outbound iATU is not being enabled\n" ); + +return -ENXIO ; +} + +static int __dw_pcie_prog_outbound_atu (struct pci_host_bridge *pci, +uint8_t func_no,int index,int type, +uint64_t cpu_addr,uint64_t pci_addr, +uint64_t size) +{ +struct dw_pcie_priv *priv = pci->priv; +uint32_t retries, val; + +if ( priv->iatu_unroll_enabled ) +return dw_pcie_prog_outbound_atu_unroll (pci, func_no, index, type, + cpu_addr, pci_addr, size); + +dw_pcie_writel_dbi (pci,PCIE_ATU_VIEWPORT , +PCIE_ATU_REGION_OUTBOUND | index); +dw_pcie_writel_dbi (pci,PCIE_ATU_LOWER_BASE ,lower_32_bits (cpu_addr)); +dw_pcie_writel_dbi (pci,PCIE_ATU_UPPER_BASE ,upper_32_bits (cpu_addr)); +dw_pcie_writel_dbi (pci,PCIE_ATU_LIMIT ,lower_32_bits (cpu_addr + size -1 )); +if ( priv->version >=0x460A ) +dw_pcie_writel_dbi (pci,PCIE_ATU_UPPER_LIMIT , +upper_32_bits (cpu_addr + size -1 )); +dw_pcie_writel_dbi (pci,PCIE_ATU_LOWER_TARGET ,lower_32_bits (pci_addr)); +dw_pcie_writel_dbi (pci,PCIE_ATU_UPPER_TARGET ,upper_32_bits (pci_addr)); + val = type |PCIE_ATU_FUNC_NUM (func_no); + val = ((upper_32_bits (size -1 )) && (priv->version >=0x460A )) + ? val |PCIE_ATU_INCREASE_REGION_SIZE + : val; +if ( priv->version ==0x490A ) + val =dw_pcie_enable_ecrc (val); +dw_pcie_writel_dbi (pci,PCIE_ATU_CR1 , val); +dw_pcie_writel_dbi (pci,PCIE_ATU_CR2 ,PCIE_ATU_ENABLE ); + +/* +* Make sure ATU enable takes effect before any subsequent config +* and I/O accesses. +*/ +for ( retries =0 ; retries <LINK_WAIT_MAX_IATU_RETRIES ; retries++ ) + { + val =dw_pcie_readl_dbi (pci,PCIE_ATU_CR2 ); +if ( val &PCIE_ATU_ENABLE ) +return 0 ; + +mdelay (LINK_WAIT_IATU ); + } +printk (XENLOG_G_ERR "Outbound iATU is not being enabled\n" ); + +return -ENXIO ; +} + +static int dw_pcie_prog_outbound_atu (struct pci_host_bridge *pci,int index, +int type,uint64_t cpu_addr, +uint64_t pci_addr,uint64_t size) +{ +return __dw_pcie_prog_outbound_atu (pci,0 , index, type, cpu_addr, pci_addr, + size); +} + +void dw_pcie_set_version (struct pci_host_bridge *bridge,unsigned int version) +{ +struct dw_pcie_priv *priv = bridge->priv; + + priv->version = version; +} + +void __iomem *dw_pcie_child_map_bus (struct pci_host_bridge *bridge, +pci_sbdf_t sbdf,uint32_t where) +{ +uint32_t busdev; +int ret; + + busdev =PCIE_ATU_BUS (sbdf.bus) |PCIE_ATU_DEV (PCI_SLOT (sbdf.devfn)) | +PCIE_ATU_FUNC (PCI_FUNC (sbdf.devfn)); + +/* FIXME: Parent is the root bus, so use PCIE_ATU_TYPE_CFG0. */ + ret =dw_pcie_prog_outbound_atu (bridge,PCIE_ATU_REGION_INDEX1 , +PCIE_ATU_TYPE_CFG0 , + bridge->child_cfg->phys_addr, busdev, + bridge->child_cfg->size); +if ( ret ) +return 0 ; + +return bridge->child_cfg->win + where; +} + +int dw_pcie_child_config_read (struct pci_host_bridge *bridge,pci_sbdf_t sbdf, +uint32_t reg,uint32_t len,uint32_t *value) +{ +struct dw_pcie_priv *priv = bridge->priv; +int ret; + +/* +* FIXME: we cannot read iATU settings at the early initialization +* (probe) as the host's HW is not yet initialized at that phase. +* This read operation is the very first thing Domain-0 will do +* during its initialization, so take this opportunity and read +* iATU setting now. +*/ +if (unlikely (!priv->iatu_unroll_initilized) ) + { +dw_pcie_read_iatu_unroll_enabled (bridge); + priv->iatu_unroll_initilized = true; + } + + ret =pci_generic_config_read (bridge, sbdf, reg, len, value); +if ( !ret && (priv->num_viewport <=2 ) ) + ret =dw_pcie_prog_outbound_atu (bridge,PCIE_ATU_REGION_INDEX1 , +PCIE_ATU_TYPE_IO , + bridge->child_cfg->phys_addr,0 , + bridge->child_cfg->size); + +return ret; +} + +int dw_pcie_child_config_write (struct pci_host_bridge *bridge,pci_sbdf_t sbdf, +uint32_t reg,uint32_t len,uint32_t value) +{ +struct dw_pcie_priv *priv = bridge->priv; +int ret; + + ret =pci_generic_config_write (bridge, sbdf, reg, len, value); +if ( !ret && (priv->num_viewport <=2 ) ) + ret =dw_pcie_prog_outbound_atu (bridge,PCIE_ATU_REGION_INDEX1 , +PCIE_ATU_TYPE_IO , + bridge->child_cfg->phys_addr,0 , + bridge->child_cfg->size); +return ret; +} + +bool __init dw_pcie_child_need_p2m_hwdom_mapping (struct domain *d, +struct pci_host_bridge *bridge, +uint64_t addr) +{ +struct pci_config_window *cfg = bridge->child_cfg; + +/* +* We do not want ECAM address space to be mapped in Domain-0's p2m, +* so we can trap access to it. +*/ +return cfg->phys_addr != addr; +} + +struct pci_host_bridge *__init +dw_pcie_host_probe (struct dt_device_node *dev,const void *data, +const struct pci_ecam_ops *ops, +const struct pci_ecam_ops *child_ops) +{ +struct pci_host_bridge *bridge; +struct dw_pcie_priv *priv; + +paddr_t atu_phys_addr; +paddr_t atu_size; +int atu_idx, ret; + + bridge =pci_host_common_probe (dev, ops, child_ops); +if (IS_ERR (bridge) ) +return bridge; + + priv = xzalloc(struct dw_pcie_priv); +if ( !priv ) +return ERR_PTR (-ENOMEM ); + + bridge->priv = priv; + + atu_idx =dt_property_match_string (dev,"reg-names" ,"atu" ); +if ( atu_idx <0 ) + { +printk (XENLOG_ERR "Cannot find \"atu\" range index in device tree\n" ); +return ERR_PTR (atu_idx); + } + ret =dt_device_get_address (dev, atu_idx, &atu_phys_addr, &atu_size); +if ( ret ) + { +printk (XENLOG_ERR "Cannot find \"atu\" range in device tree\n" ); +return ERR_PTR (ret); + } +printk ("iATU at [mem 0x%" PRIpaddr"-0x%" PRIpaddr"]\n" , atu_phys_addr, + atu_phys_addr + atu_size -1 ); + priv->atu_base =ioremap_nocache (atu_phys_addr, atu_size); +if ( !priv->atu_base ) + { +printk (XENLOG_ERR "iATU ioremap failed\n" ); +return ERR_PTR (ENXIO ); + } + +if ( !dt_property_read_u32 (dev,"num-viewport" , &priv->num_viewport) ) + priv->num_viewport =2 ; + +/* +* FIXME: we cannot read iATU unroll enable now as the host bridge's +* HW is not yet initialized by Domain-0: leave it for later. +*/ + +printk (XENLOG_INFO "%s number of view ports: %d\n" ,dt_node_full_name (dev), + priv->num_viewport); + +return bridge; +}xen/arch/arm/pci/pci-designware.h new file +90
-0@@ -0,0 +1,90 @@ +/* SPDX-License-Identifier: GPL-2.0-only +* +* Based on Linux drivers/pci/controller/pci-host-common.c +* Based on Linux drivers/pci/controller/pci-host-generic.c +* Based on Linux drivers/pci/controller/dwc/pcie-designware.c +* Based on xen/arch/arm/pci/pci-host-generic.c +*/ + +#include <xen/pci.h> +#include <xen/init.h> + +#ifndef __PCI_DESIGNWARE_H__ +#define __PCI_DESIGNWARE_H__ + + +#define PCIE_ATU_VIEWPORT 0x900 +#define PCIE_ATU_REGION_OUTBOUND 0 +#define PCIE_ATU_CR1 0x904 +#define PCIE_ATU_INCREASE_REGION_SIZE BIT(13, UL) +#define PCIE_ATU_CR2 0x908 +#define PCIE_ATU_ENABLE BIT(31, UL) +#define PCIE_ATU_LOWER_BASE 0x90C +#define PCIE_ATU_UPPER_BASE 0x910 +#define PCIE_ATU_LIMIT 0x914 +#define PCIE_ATU_LOWER_TARGET 0x918 +#define PCIE_ATU_UPPER_TARGET 0x91C +#define PCIE_ATU_UPPER_LIMIT 0x924 + +#define PCIE_ATU_REGION_INDEX1 0x1 +#define PCIE_ATU_TYPE_IO 0x2 +#define PCIE_ATU_TYPE_CFG0 0x4 + +#define FIELD_PREP (_mask, _val) \ + (((typeof(_mask))(_val) << (ffs64(_mask) - 1)) & (_mask)) + +#define PCIE_ATU_BUS (x) FIELD_PREP(GENMASK(31, 24), (x)) +#define PCIE_ATU_DEV (x) FIELD_PREP(GENMASK(23, 19), (x)) +#define PCIE_ATU_FUNC (x) FIELD_PREP(GENMASK(18, 16), (x)) + +/* Register address builder */ +#define PCIE_GET_ATU_OUTB_UNR_REG_OFFSET (region) \ + ((region) << 9) + +/* +* iATU Unroll-specific register definitions +* From 4.80 core version the address translation will be made by unroll +*/ +#define PCIE_ATU_UNR_REGION_CTRL1 0x00 +#define PCIE_ATU_UNR_REGION_CTRL2 0x04 +#define PCIE_ATU_UNR_LOWER_BASE 0x08 +#define PCIE_ATU_UNR_UPPER_BASE 0x0C +#define PCIE_ATU_UNR_LOWER_LIMIT 0x10 +#define PCIE_ATU_UNR_LOWER_TARGET 0x14 +#define PCIE_ATU_UNR_UPPER_TARGET 0x18 +#define PCIE_ATU_UNR_UPPER_LIMIT 0x20 + +#define PCIE_ATU_FUNC_NUM (pf) ((pf) << 20) + +/* Parameters for the waiting for iATU enabled routine */ +#define LINK_WAIT_MAX_IATU_RETRIES 5 +#define LINK_WAIT_IATU 9 + +struct dw_pcie_priv { +uint32_t num_viewport; +bool iatu_unroll_initilized; +bool iatu_unroll_enabled; +void __iomem *atu_base; +unsigned int version; +}; + +void dw_pcie_set_version (struct pci_host_bridge *bridge,unsigned int version); + +void __iomem *dw_pcie_child_map_bus (struct pci_host_bridge *bridge, +pci_sbdf_t sbdf,uint32_t where); + +int dw_pcie_child_config_read (struct pci_host_bridge *bridge,pci_sbdf_t sbdf, +uint32_t reg,uint32_t len,uint32_t *value); + +int dw_pcie_child_config_write (struct pci_host_bridge *bridge,pci_sbdf_t sbdf, +uint32_t reg,uint32_t len,uint32_t value); + +bool __init dw_pcie_child_need_p2m_hwdom_mapping (struct domain *d, +struct pci_host_bridge *bridge, +uint64_t addr); + +struct pci_host_bridge *__init +dw_pcie_host_probe (struct dt_device_node *dev,const void *data, +const struct pci_ecam_ops *ops, +const struct pci_ecam_ops *child_ops); +#endif /* __PCI_DESIGNWARE_H__ */ xen/arch/arm/pci/pci-host-rcar4.c new file +94
-0@@ -0,0 +1,94 @@ +/* SPDX-License-Identifier: GPL-2.0-only +* +* Based on Linux drivers/pci/controller/pci-host-common.c +* Based on Linux drivers/pci/controller/pci-host-generic.c +* Based on xen/arch/arm/pci/pci-host-generic.c +*/ + +#include <xen/init.h> +#include <xen/pci.h> + +#include <asm/device.h> +#include <asm/io.h> +#include <asm/pci.h> + +#include "pci-designware.h" + +#define RCAR4_DWC_VERSION 0x520A + +/* +* PCI host bridges often have different ways to access the root and child +* bus config spaces: +* "dbi" : the aperture where root port's own configuration registers +* are available. +* "config": child's configuration space +* "atu" : iATU registers for DWC version 4.80 or later +*/ +static int __init rcar4_cfg_reg_index (struct dt_device_node *np) +{ +return dt_property_match_string (np,"reg-names" ,"dbi" ); +} + +static int __init rcar4_child_cfg_reg_index (struct dt_device_node *np) +{ +return dt_property_match_string (np,"reg-names" ,"config" ); +} + +/* ECAM ops */ +const struct pci_ecam_ops rcar4_pcie_ops = { + .bus_shift =20 , + .cfg_reg_index = rcar4_cfg_reg_index, + .pci_ops = { + .map_bus = pci_ecam_map_bus, + .read = pci_generic_config_read, + .write = pci_generic_config_write, + .need_p2m_hwdom_mapping = pci_ecam_need_p2m_hwdom_mapping, + .init_bus_range = pci_generic_init_bus_range, + } +}; + +const struct pci_ecam_ops rcar4_pcie_child_ops = { + .bus_shift =20 , + .cfg_reg_index = rcar4_child_cfg_reg_index, + .pci_ops = { + .map_bus = dw_pcie_child_map_bus, + .read = dw_pcie_child_config_read, + .write = dw_pcie_child_config_write, + .need_p2m_hwdom_mapping = dw_pcie_child_need_p2m_hwdom_mapping, + .init_bus_range = pci_generic_init_bus_range_child, + } +}; + +static const struct dt_device_match __initconstrel rcar4_pcie_dt_match[] = { + { .compatible ="renesas,r8a779f0-pcie" }, + { .compatible ="renesas,r8a779g0-pcie" }, + {}, +}; + +static int __init pci_host_rcar4_probe (struct dt_device_node *dev, +const void *data) +{ +struct pci_host_bridge *bridge; + + bridge =dw_pcie_host_probe (dev, data, &rcar4_pcie_ops, + &rcar4_pcie_child_ops); + +dw_pcie_set_version (bridge,RCAR4_DWC_VERSION ); + +return 0 ; +} + +DT_DEVICE_START (pci_gen,"PCI HOST R-CAR GEN4" ,DEVICE_PCI_HOSTBRIDGE ) +.dt_match = rcar4_pcie_dt_match, +.init = pci_host_rcar4_probe, +DT_DEVICE_END + +/* +* Local variables: +* mode: C +* c-file-style: "BSD" +* c-basic-offset: 4 +* tab-width: 4 +* indent-tabs-mode: nil +* End: +*/ Signature · 1 line
2.34.1
Re: [PATCH v5 4/4] xen/arm: add support for R-Car Gen4 PCI host controller
In reply to Mykyta PoturaiHi,
Quoted 11 lines · Mykyta Poturai
From: Oleksandr Andrushchenko <[email protected]>
Add support for Renesas R-Car Gen4 PCI host controller, specifically targeting the S4 and V4H SoCs. The implementation includes configuration read/write operations for both root and child buses. For accessing the child bus, iATU is used for address translation.
The host controller needs to be initialized by Dom0 first to be properly handled by Xen. Xen itself only handles the runtime configuration of the iATU for accessing different child devices.
Quoted 7 lines
iATU programming is done similarly to Linux, where only window 0 is used for dynamic configuration, and it is reconfigured for every config space read/write.
Code common to all DesignWare PCI host controllers is located in a separate file to allow for easy reuse in other DesignWare-based PCI host controllers.
Given this...
Quoted 35 lines
Signed-off-by Oleksandr Andrushchenko <[email protected]>Signed-off-by Mykyta Poturai <[email protected]>---
v4->v5:
* update license identifiers
* improve error checking
* use XENLOG_G_* where needed
* make macro defs more robust and minor style fixes
* add MAINTANERS entry
v3->v4:
* no changes
v2->v3:
* move priv allocation todw_pcie_host_probe
v1->v2:
* move designware code in a separate file--- MAINTAINERS | 6 + xen/arch/arm/pci/Makefile | 2 + xen/arch/arm/pci/pci-designware.c | 416 ++++++++++++++++++++++++++++++ xen/arch/arm/pci/pci-designware.h | 90 +++++++ xen/arch/arm/pci/pci-host-rcar4.c | 94 +++++++ 5 files changed, 608 insertions(+)create mode 100644
xen/arch/arm/pci/pci-designware.ccreate mode 100644xen/arch/arm/pci/pci-designware.hcreate mode 100644xen/arch/arm/pci/pci-host-rcar4.cMAINTAINERS +0
-0
MAINTAINERS M: Anthony Perard <[email protected]> · line 483
Quoted 8 lines
MAINTAINERS +5
-0@@ -476,6 +476,12 @@ M: Anthony Perard <[email protected]> S: Supported T: git https://xenbits.xenproject.org/git-http/qemu-xen.git +RCAR PCI +M: Mykyta Poturai <[email protected]> +S: Supported +F: xen/arch/arm/pci/pci-host-rcar4.c +F: xen/arch/arm/pci/pci-designware*
... I don't think pci-designware should be under the category "RCAR PCI". It should go under ARM.
Quoted 40 lines
MAINTAINERS +1
-0+ REMUS S: Orphan F: docs/README.remusxen/arch/arm/pci/Makefile +2
-0@@ -4,3 +4,5 @@ obj-y += pci-host-generic.o obj-y += pci-host-common.o obj-y += ecam.o obj-y += pci-host-zynqmp.o +obj-y += pci-designware.o +obj-y += pci-host-rcar4.oxen/arch/arm/pci/pci-designware.c new file +20
-0@@ -0,0 +1,416 @@ +/* SPDX-License-Identifier: GPL-2.0-only +* +* Based on Linux drivers/pci/controller/pci-host-common.c +* Based on Linux drivers/pci/controller/pci-host-generic.c +* Based on Linux drivers/pci/controller/dwc/pcie-designware.c +* Based on xen/arch/arm/pci/pci-host-generic.c +* +*/ + +#include <xen/delay.h> +#include <asm/io.h> + +#include "pci-designware.h" +/** +* upper_32_bits - return bits 32-63 of a number +* @n: the number we're accessing +* +* A basic shift-right of a 64- or 32-bit quantity. Use this to suppress +* the "right shift count >= width of type" warning when that quantity is +* 32-bits.
xen/arch/arm/pci/pci-designware.c line 30
Quoted 10 lines
xen/arch/arm/pci/pci-designware.c new file +10
-0+*/ +#define upper_32_bits (n) ((uint32_t)(((n) >> 16) >> 16)) + +/** +* lower_32_bits - return bits 0-31 of a number +* @n: the number we're accessing +*/ +#define lower_32_bits (n) ((uint32_t)((n) & 0xffffffffU)) + +static int dw_pcie_read (void __iomem *addr,int len,uint32_t *val)
As you switched to Xen coding style below: unlike Linux, we prefer using "unsigned int" when a value is not be signed.
Quoted 96 lines
xen/arch/arm/pci/pci-designware.c new file +96
-0+{> + if ( !IS_ALIGNED((uintptr_t)addr, len) ) + { + *val =0 ; +return -EFAULT ; + } + +switch ( len ) + { +case 1 : + *val =readb (addr); +break ; +case 2 : + *val =readw (addr); +break ; +case 4 : + *val =readl (addr); +break ; +default : +ASSERT_UNREACHABLE (); + } + +return 0 ; +} + +static int dw_pcie_write (void __iomem *addr,int len,uint32_t val) +{ +if ( !IS_ALIGNED ((uintptr_t )addr, len) ) +return -EFAULT ; + +switch ( len ) + { +case 1 : +writeb (val, addr); +break ; +case 2 : +writew (val, addr); +break ; +case 4 : +writel (val, addr); +break ; +default : +ASSERT_UNREACHABLE (); + } + +return 0 ; +} + +static uint32_t dw_pcie_read_dbi (struct pci_host_bridge *bridge,uint32_t reg, +size_t size) +{ +void __iomem *addr = bridge->cfg->win + reg; +uint32_t val; +int ret; + + ret =dw_pcie_read (addr, size, &val); +if ( ret ) +printk (XENLOG_G_ERR "Read DBI address failed\n" ); + +return val; +} + +static void dw_pcie_write_dbi (struct pci_host_bridge *bridge,uint32_t reg, +size_t size,uint32_t val) +{ +void __iomem *addr = bridge->cfg->win + reg; +int ret; + + ret =dw_pcie_write (addr, size, val); +if ( ret ) +printk (XENLOG_G_ERR "Write DBI address failed\n" ); +} + +static uint32_t dw_pcie_readl_dbi (struct pci_host_bridge *bridge,uint32_t reg) +{ +return dw_pcie_read_dbi (bridge, reg,sizeof (uint32_t )); +} + +static void dw_pcie_writel_dbi (struct pci_host_bridge *pci,uint32_t reg, +uint32_t val) +{ +dw_pcie_write_dbi (pci, reg,sizeof (uint32_t ), val); +} + +static void dw_pcie_read_iatu_unroll_enabled (struct pci_host_bridge *bridge) +{ +struct dw_pcie_priv *priv = bridge->priv; +uint32_t val; + + val =dw_pcie_readl_dbi (bridge,PCIE_ATU_VIEWPORT ); +if ( val ==0xffffffffU ) + priv->iatu_unroll_enabled = true; + +printk (XENLOG_G_DEBUG "%s iATU unroll: %sabled\n" , +dt_node_full_name (bridge->dt_node), + priv->iatu_unroll_enabled ?"en" :"dis" ); +}
xen/arch/arm/pci/pci-designware.c line 137
Quoted 10 lines
xen/arch/arm/pci/pci-designware.c new file +10
-0+ +static uint32_t dw_pcie_readl_atu (struct pci_host_bridge *pci,uint32_t reg) +{ +struct dw_pcie_priv *priv = pci->priv; +int ret; +uint32_t val; + + ret =dw_pcie_read (priv->atu_base + reg,4 , &val); +if ( ret ) +printk (XENLOG_G_ERR "Read ATU address failed\n" );
I think it would be helpful to print the register. Same ...
xen/arch/arm/pci/pci-designware.c line 150
Quoted 13 lines
xen/arch/arm/pci/pci-designware.c new file +13
-0+ +return val; +} + +static void dw_pcie_writel_atu (struct pci_host_bridge *pci,uint32_t reg, +uint32_t val) +{ +struct dw_pcie_priv *priv = pci->priv; +int ret; + + ret =dw_pcie_write (priv->atu_base + reg,4 , val); +if ( ret ) +printk (XENLOG_G_ERR "Write ATU address failed\n" );
... here.
Quoted 11 lines
xen/arch/arm/pci/pci-designware.c new file +11
-0+} + +static uint32_t dw_pcie_readl_ob_unroll (struct pci_host_bridge *pci, +uint32_t index,uint32_t reg) +{ +uint32_t offset =PCIE_GET_ATU_OUTB_UNR_REG_OFFSET (index); + +return dw_pcie_readl_atu (pci, offset + reg); +} + +static void dw_pcie_writel_ob_unroll(struct pci_host_bridge *pci,
xen/arch/arm/pci/pci-designware.c line 171
Quoted 10 lines
xen/arch/arm/pci/pci-designware.c new file +10
-0+ uint32_t index, uint32_t reg, uint32_t val) +{ + uint32_t offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index); + +dw_pcie_writel_atu (pci, offset + reg, val); +} + +static uint32_t dw_pcie_enable_ecrc (uint32_t val) +{ +ASSERT_UNREACHABLE ();
Can you add a comment explaning why this function is not supposed to be called? And if we trigger it, then what does it mean?
Quoted 301 lines
xen/arch/arm/pci/pci-designware.c new file +244
-0+return 0 ; +} +> +static int dw_pcie_prog_outbound_atu_unroll(struct pci_host_bridge *pci, +uint8_t func_no,int index, +int type,uint64_t cpu_addr, +uint64_t pci_addr,uint64_t size) +{ +struct dw_pcie_priv *priv = pci->priv; +uint32_t retries, val; +uint64_t limit_addr = cpu_addr + size -1 ; + +dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_LOWER_BASE , +lower_32_bits (cpu_addr)); +dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_UPPER_BASE , +upper_32_bits (cpu_addr)); +dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_LOWER_LIMIT , +lower_32_bits (limit_addr)); +dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_UPPER_LIMIT , +upper_32_bits (limit_addr)); +dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_LOWER_TARGET , +lower_32_bits (pci_addr)); +dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_UPPER_TARGET , +upper_32_bits (pci_addr)); + val = type |PCIE_ATU_FUNC_NUM (func_no); + val =upper_32_bits (size -1 ) ? val |PCIE_ATU_INCREASE_REGION_SIZE : val; +if ( priv->version ==0x490A ) + val =dw_pcie_enable_ecrc (val); +dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_REGION_CTRL1 , val); +dw_pcie_writel_ob_unroll (pci, index,PCIE_ATU_UNR_REGION_CTRL2 , +PCIE_ATU_ENABLE ); + +/* +* Make sure ATU enable takes effect before any subsequent config +* and I/O accesses. +*/ +for ( retries =0 ; retries <LINK_WAIT_MAX_IATU_RETRIES ; retries++ ) + { + val =dw_pcie_readl_ob_unroll (pci, index,PCIE_ATU_UNR_REGION_CTRL2 ); +if ( val &PCIE_ATU_ENABLE ) +return 0 ; + +mdelay (LINK_WAIT_IATU ); + } +printk (XENLOG_G_ERR "Outbound iATU is not being enabled\n" ); + +return -ENXIO ; +} + +static int __dw_pcie_prog_outbound_atu (struct pci_host_bridge *pci, +uint8_t func_no,int index,int type, +uint64_t cpu_addr,uint64_t pci_addr, +uint64_t size) +{ +struct dw_pcie_priv *priv = pci->priv; +uint32_t retries, val; + +if ( priv->iatu_unroll_enabled ) +return dw_pcie_prog_outbound_atu_unroll (pci, func_no, index, type, + cpu_addr, pci_addr, size); + +dw_pcie_writel_dbi (pci,PCIE_ATU_VIEWPORT , +PCIE_ATU_REGION_OUTBOUND | index); +dw_pcie_writel_dbi (pci,PCIE_ATU_LOWER_BASE ,lower_32_bits (cpu_addr)); +dw_pcie_writel_dbi (pci,PCIE_ATU_UPPER_BASE ,upper_32_bits (cpu_addr)); +dw_pcie_writel_dbi (pci,PCIE_ATU_LIMIT ,lower_32_bits (cpu_addr + size -1 )); +if ( priv->version >=0x460A ) +dw_pcie_writel_dbi (pci,PCIE_ATU_UPPER_LIMIT , +upper_32_bits (cpu_addr + size -1 )); +dw_pcie_writel_dbi (pci,PCIE_ATU_LOWER_TARGET ,lower_32_bits (pci_addr)); +dw_pcie_writel_dbi (pci,PCIE_ATU_UPPER_TARGET ,upper_32_bits (pci_addr)); + val = type |PCIE_ATU_FUNC_NUM (func_no); + val = ((upper_32_bits (size -1 )) && (priv->version >=0x460A )) + ? val |PCIE_ATU_INCREASE_REGION_SIZE + : val; +if ( priv->version ==0x490A ) + val =dw_pcie_enable_ecrc (val); +dw_pcie_writel_dbi (pci,PCIE_ATU_CR1 , val); +dw_pcie_writel_dbi (pci,PCIE_ATU_CR2 ,PCIE_ATU_ENABLE ); + +/* +* Make sure ATU enable takes effect before any subsequent config +* and I/O accesses. +*/ +for ( retries =0 ; retries <LINK_WAIT_MAX_IATU_RETRIES ; retries++ ) + { + val =dw_pcie_readl_dbi (pci,PCIE_ATU_CR2 ); +if ( val &PCIE_ATU_ENABLE ) +return 0 ; + +mdelay (LINK_WAIT_IATU ); + } +printk (XENLOG_G_ERR "Outbound iATU is not being enabled\n" ); + +return -ENXIO ; +} + +static int dw_pcie_prog_outbound_atu (struct pci_host_bridge *pci,int index, +int type,uint64_t cpu_addr, +uint64_t pci_addr,uint64_t size) +{ +return __dw_pcie_prog_outbound_atu (pci,0 , index, type, cpu_addr, pci_addr, + size); +} + +void dw_pcie_set_version (struct pci_host_bridge *bridge,unsigned int version) +{ +struct dw_pcie_priv *priv = bridge->priv; + + priv->version = version; +} + +void __iomem *dw_pcie_child_map_bus (struct pci_host_bridge *bridge, +pci_sbdf_t sbdf,uint32_t where) +{ +uint32_t busdev; +int ret; + + busdev =PCIE_ATU_BUS (sbdf.bus) |PCIE_ATU_DEV (PCI_SLOT (sbdf.devfn)) | +PCIE_ATU_FUNC (PCI_FUNC (sbdf.devfn)); + +/* FIXME: Parent is the root bus, so use PCIE_ATU_TYPE_CFG0. */ + ret =dw_pcie_prog_outbound_atu (bridge,PCIE_ATU_REGION_INDEX1 , +PCIE_ATU_TYPE_CFG0 , + bridge->child_cfg->phys_addr, busdev, + bridge->child_cfg->size); +if ( ret ) +return 0 ; + +return bridge->child_cfg->win + where; +} + +int dw_pcie_child_config_read (struct pci_host_bridge *bridge,pci_sbdf_t sbdf, +uint32_t reg,uint32_t len,uint32_t *value) +{ +struct dw_pcie_priv *priv = bridge->priv; +int ret; + +/* +* FIXME: we cannot read iATU settings at the early initialization +* (probe) as the host's HW is not yet initialized at that phase. +* This read operation is the very first thing Domain-0 will do +* during its initialization, so take this opportunity and read +* iATU setting now. +*/ +if (unlikely (!priv->iatu_unroll_initilized) ) + { +dw_pcie_read_iatu_unroll_enabled (bridge); + priv->iatu_unroll_initilized = true; + } + + ret =pci_generic_config_read (bridge, sbdf, reg, len, value); +if ( !ret && (priv->num_viewport <=2 ) ) + ret =dw_pcie_prog_outbound_atu (bridge,PCIE_ATU_REGION_INDEX1 , +PCIE_ATU_TYPE_IO , + bridge->child_cfg->phys_addr,0 , + bridge->child_cfg->size); + +return ret; +} + +int dw_pcie_child_config_write (struct pci_host_bridge *bridge,pci_sbdf_t sbdf, +uint32_t reg,uint32_t len,uint32_t value) +{ +struct dw_pcie_priv *priv = bridge->priv; +int ret; + + ret =pci_generic_config_write (bridge, sbdf, reg, len, value); +if ( !ret && (priv->num_viewport <=2 ) ) + ret =dw_pcie_prog_outbound_atu (bridge,PCIE_ATU_REGION_INDEX1 , +PCIE_ATU_TYPE_IO , + bridge->child_cfg->phys_addr,0 , + bridge->child_cfg->size); +return ret; +} + +bool __init dw_pcie_child_need_p2m_hwdom_mapping (struct domain *d, +struct pci_host_bridge *bridge, +uint64_t addr) +{ +struct pci_config_window *cfg = bridge->child_cfg; + +/* +* We do not want ECAM address space to be mapped in Domain-0's p2m, +* so we can trap access to it. +*/ +return cfg->phys_addr != addr; +} + +struct pci_host_bridge *__init +dw_pcie_host_probe (struct dt_device_node *dev,const void *data, +const struct pci_ecam_ops *ops, +const struct pci_ecam_ops *child_ops) +{ +struct pci_host_bridge *bridge; +struct dw_pcie_priv *priv; + +paddr_t atu_phys_addr; +paddr_t atu_size; +int atu_idx, ret; + + bridge =pci_host_common_probe (dev, ops, child_ops); +if (IS_ERR (bridge) ) +return bridge; + + priv = xzalloc(struct dw_pcie_priv); +if ( !priv ) +return ERR_PTR (-ENOMEM ); + + bridge->priv = priv; + + atu_idx =dt_property_match_string (dev,"reg-names" ,"atu" ); +if ( atu_idx <0 ) + { +printk (XENLOG_ERR "Cannot find \"atu\" range index in device tree\n" ); +return ERR_PTR (atu_idx); + } + ret =dt_device_get_address (dev, atu_idx, &atu_phys_addr, &atu_size); +if ( ret ) + { +printk (XENLOG_ERR "Cannot find \"atu\" range in device tree\n" ); +return ERR_PTR (ret); + } +printk ("iATU at [mem 0x%" PRIpaddr"-0x%" PRIpaddr"]\n" , atu_phys_addr, + atu_phys_addr + atu_size -1 ); + priv->atu_base =ioremap_nocache (atu_phys_addr, atu_size); +if ( !priv->atu_base ) + { +printk (XENLOG_ERR "iATU ioremap failed\n" ); +return ERR_PTR (ENXIO ); + } + +if ( !dt_property_read_u32 (dev,"num-viewport" , &priv->num_viewport) ) + priv->num_viewport =2 ; + +/* +* FIXME: we cannot read iATU unroll enable now as the host bridge's +* HW is not yet initialized by Domain-0: leave it for later. +*/ + +printk (XENLOG_INFO "%s number of view ports: %d\n" ,dt_node_full_name (dev), + priv->num_viewport); + +return bridge; +}xen/arch/arm/pci/pci-designware.h new file +51
-0@@ -0,0 +1,90 @@ +/* SPDX-License-Identifier: GPL-2.0-only +* +* Based on Linux drivers/pci/controller/pci-host-common.c +* Based on Linux drivers/pci/controller/pci-host-generic.c +* Based on Linux drivers/pci/controller/dwc/pcie-designware.c +* Based on xen/arch/arm/pci/pci-host-generic.c +*/ + +#include <xen/pci.h> +#include <xen/init.h> + +#ifndef __PCI_DESIGNWARE_H__ +#define __PCI_DESIGNWARE_H__ + + +#define PCIE_ATU_VIEWPORT 0x900 +#define PCIE_ATU_REGION_OUTBOUND 0 +#define PCIE_ATU_CR1 0x904 +#define PCIE_ATU_INCREASE_REGION_SIZE BIT(13, UL) +#define PCIE_ATU_CR2 0x908 +#define PCIE_ATU_ENABLE BIT(31, UL) +#define PCIE_ATU_LOWER_BASE 0x90C +#define PCIE_ATU_UPPER_BASE 0x910 +#define PCIE_ATU_LIMIT 0x914 +#define PCIE_ATU_LOWER_TARGET 0x918 +#define PCIE_ATU_UPPER_TARGET 0x91C +#define PCIE_ATU_UPPER_LIMIT 0x924 + +#define PCIE_ATU_REGION_INDEX1 0x1 +#define PCIE_ATU_TYPE_IO 0x2 +#define PCIE_ATU_TYPE_CFG0 0x4 + +#define FIELD_PREP (_mask, _val) \ + (((typeof(_mask))(_val) << (ffs64(_mask) - 1)) & (_mask)) + +#define PCIE_ATU_BUS (x) FIELD_PREP(GENMASK(31, 24), (x)) +#define PCIE_ATU_DEV (x) FIELD_PREP(GENMASK(23, 19), (x)) +#define PCIE_ATU_FUNC (x) FIELD_PREP(GENMASK(18, 16), (x)) + +/* Register address builder */ +#define PCIE_GET_ATU_OUTB_UNR_REG_OFFSET (region) \ + ((region) << 9) + +/* +* iATU Unroll-specific register definitions +* From 4.80 core version the address translation will be made by unroll +*/ +#define PCIE_ATU_UNR_REGION_CTRL1 0x00 +#define PCIE_ATU_UNR_REGION_CTRL2 0x04 +#define PCIE_ATU_UNR_LOWER_BASE 0x08 +#define PCIE_ATU_UNR_UPPER_BASE 0x0C
xen/arch/arm/pci/pci-designware.h line 61
Quoted 10 lines
xen/arch/arm/pci/pci-designware.h new file +10
-0+#define PCIE_ATU_UNR_LOWER_LIMIT 0x10 +#define PCIE_ATU_UNR_LOWER_TARGET 0x14 +#define PCIE_ATU_UNR_UPPER_TARGET 0x18 +#define PCIE_ATU_UNR_UPPER_LIMIT 0x20 + +#define PCIE_ATU_FUNC_NUM (pf) ((pf) << 20) + +/* Parameters for the waiting for iATU enabled routine */ +#define LINK_WAIT_MAX_IATU_RETRIES 5 +#define LINK_WAIT_IATU 9
It would be helpful to either rename or add a comment explaining the unit. I also noticed, that Linux wait up to 10ms. Can you explain why Xen only need 9?
Quoted 129 lines
xen/arch/arm/pci/pci-designware.h new file +29
-0+ +struct dw_pcie_priv { +uint32_t num_viewport; +bool iatu_unroll_initilized; +bool iatu_unroll_enabled; +void __iomem *atu_base; +unsigned int version; +}; + +void dw_pcie_set_version (struct pci_host_bridge *bridge,unsigned int version); + +void __iomem *dw_pcie_child_map_bus (struct pci_host_bridge *bridge, +pci_sbdf_t sbdf,uint32_t where); + +int dw_pcie_child_config_read (struct pci_host_bridge *bridge,pci_sbdf_t sbdf, +uint32_t reg,uint32_t len,uint32_t *value); + +int dw_pcie_child_config_write (struct pci_host_bridge *bridge,pci_sbdf_t sbdf, +uint32_t reg,uint32_t len,uint32_t value); + +bool __init dw_pcie_child_need_p2m_hwdom_mapping (struct domain *d, +struct pci_host_bridge *bridge, +uint64_t addr); + +struct pci_host_bridge *__init +dw_pcie_host_probe (struct dt_device_node *dev,const void *data, +const struct pci_ecam_ops *ops, +const struct pci_ecam_ops *child_ops); +#endif /* __PCI_DESIGNWARE_H__ */ xen/arch/arm/pci/pci-host-rcar4.c new file +94
-0@@ -0,0 +1,94 @@ +/* SPDX-License-Identifier: GPL-2.0-only +* +* Based on Linux drivers/pci/controller/pci-host-common.c +* Based on Linux drivers/pci/controller/pci-host-generic.c +* Based on xen/arch/arm/pci/pci-host-generic.c +*/ + +#include <xen/init.h> +#include <xen/pci.h> + +#include <asm/device.h> +#include <asm/io.h> +#include <asm/pci.h> + +#include "pci-designware.h" + +#define RCAR4_DWC_VERSION 0x520A + +/* +* PCI host bridges often have different ways to access the root and child +* bus config spaces: +* "dbi" : the aperture where root port's own configuration registers +* are available. +* "config": child's configuration space +* "atu" : iATU registers for DWC version 4.80 or later +*/ +static int __init rcar4_cfg_reg_index (struct dt_device_node *np) +{ +return dt_property_match_string (np,"reg-names" ,"dbi" ); +} + +static int __init rcar4_child_cfg_reg_index (struct dt_device_node *np) +{ +return dt_property_match_string (np,"reg-names" ,"config" ); +} + +/* ECAM ops */ +const struct pci_ecam_ops rcar4_pcie_ops = { + .bus_shift =20 , + .cfg_reg_index = rcar4_cfg_reg_index, + .pci_ops = { + .map_bus = pci_ecam_map_bus, + .read = pci_generic_config_read, + .write = pci_generic_config_write, + .need_p2m_hwdom_mapping = pci_ecam_need_p2m_hwdom_mapping, + .init_bus_range = pci_generic_init_bus_range, + } +}; + +const struct pci_ecam_ops rcar4_pcie_child_ops = { + .bus_shift =20 , + .cfg_reg_index = rcar4_child_cfg_reg_index, + .pci_ops = { + .map_bus = dw_pcie_child_map_bus, + .read = dw_pcie_child_config_read, + .write = dw_pcie_child_config_write, + .need_p2m_hwdom_mapping = dw_pcie_child_need_p2m_hwdom_mapping, + .init_bus_range = pci_generic_init_bus_range_child, + } +}; + +static const struct dt_device_match __initconstrel rcar4_pcie_dt_match[] = { + { .compatible ="renesas,r8a779f0-pcie" }, + { .compatible ="renesas,r8a779g0-pcie" }, + {}, +}; + +static int __init pci_host_rcar4_probe (struct dt_device_node *dev, +const void *data) +{ +struct pci_host_bridge *bridge; + + bridge =dw_pcie_host_probe (dev, data, &rcar4_pcie_ops, + &rcar4_pcie_child_ops); + +dw_pcie_set_version (bridge,RCAR4_DWC_VERSION ); + +return 0 ; +} + +DT_DEVICE_START (pci_gen,"PCI HOST R-CAR GEN4" ,DEVICE_PCI_HOSTBRIDGE ) +.dt_match = rcar4_pcie_dt_match, +.init = pci_host_rcar4_probe, +DT_DEVICE_END + +/* +* Local variables: +* mode: C +* c-file-style: "BSD" +* c-basic-offset: 4 +* tab-width: 4 +* indent-tabs-mode: nil +* End: +*/
Signature · 1 line
Julien Grall