|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH v1 1/2] pci/rcar: Rename PCI host rcar4 to rcar
Gen5 mostly reuses the same DesignWare integration and register layout
as Gen4, so one driver covers both. Drop the generation number from the
file and symbol names.
Signed-off-by: Mykyta Poturai <mykyta_poturai@xxxxxxxx>
---
MAINTAINERS | 2 +-
xen/arch/arm/pci/Makefile | 2 +-
.../pci/{pci-host-rcar4.c => pci-host-rcar.c} | 32 +++++++++----------
.../pci/{pci-host-rcar4.h => pci-host-rcar.h} | 6 ++--
xen/drivers/passthrough/arm/ipmmu-vmsa.c | 2 +-
5 files changed, 22 insertions(+), 22 deletions(-)
rename xen/arch/arm/pci/{pci-host-rcar4.c => pci-host-rcar.c} (88%)
rename xen/arch/arm/pci/{pci-host-rcar4.h => pci-host-rcar.h} (88%)
diff --git a/MAINTAINERS b/MAINTAINERS
index b804434d52..68b47adf81 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -504,7 +504,7 @@ T: git https://xenbits.xenproject.org/git-http/qemu-xen.git
RCAR PCI
M: Mykyta Poturai <mykyta_poturai@xxxxxxxx>
S: Supported
-F: xen/arch/arm/pci/pci-host-rcar4.c
+F: xen/arch/arm/pci/pci-host-rcar.c
REMUS
S: Orphan
diff --git a/xen/arch/arm/pci/Makefile b/xen/arch/arm/pci/Makefile
index ca6135e282..431a91c46d 100644
--- a/xen/arch/arm/pci/Makefile
+++ b/xen/arch/arm/pci/Makefile
@@ -5,4 +5,4 @@ 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
+obj-y += pci-host-rcar.o
diff --git a/xen/arch/arm/pci/pci-host-rcar4.c
b/xen/arch/arm/pci/pci-host-rcar.c
similarity index 88%
rename from xen/arch/arm/pci/pci-host-rcar4.c
rename to xen/arch/arm/pci/pci-host-rcar.c
index e1e8eb0ee1..5f184d5ebc 100644
--- a/xen/arch/arm/pci/pci-host-rcar4.c
+++ b/xen/arch/arm/pci/pci-host-rcar.c
@@ -13,9 +13,9 @@
#include <asm/pci.h>
#include "pci-designware.h"
-#include "pci-host-rcar4.h"
+#include "pci-host-rcar.h"
-#define RCAR4_DWC_VERSION 0x520A
+#define RCAR_DWC_VERSION 0x520A
/* PCIE BDF-OSID assignment */
#define CNVID(n) (0x700 + ((n) * 4))
@@ -51,20 +51,20 @@ struct rcar4_pcie_priv {
* "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)
+static int __init rcar_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)
+static int __init rcar_child_cfg_reg_index(struct dt_device_node *np)
{
return dt_property_match_string(np, "reg-names", "config");
}
/* ECAM ops */
-static const struct pci_ecam_ops rcar4_pcie_ops = {
+static const struct pci_ecam_ops rcar_pcie_ops = {
.bus_shift = 20,
- .cfg_reg_index = rcar4_cfg_reg_index,
+ .cfg_reg_index = rcar_cfg_reg_index,
.pci_ops = {
.map_bus = pci_ecam_map_bus,
.read = pci_generic_config_read,
@@ -74,9 +74,9 @@ static const struct pci_ecam_ops rcar4_pcie_ops = {
}
};
-static const struct pci_ecam_ops rcar4_pcie_child_ops = {
+static const struct pci_ecam_ops rcar_pcie_child_ops = {
.bus_shift = 20,
- .cfg_reg_index = rcar4_child_cfg_reg_index,
+ .cfg_reg_index = rcar_child_cfg_reg_index,
.pci_ops = {
.map_bus = dw_pcie_child_map_bus,
.read = dw_pcie_child_config_read,
@@ -86,7 +86,7 @@ static const struct pci_ecam_ops rcar4_pcie_child_ops = {
}
};
-static const struct dt_device_match __initconstrel rcar4_pcie_dt_match[] = {
+static const struct dt_device_match __initconstrel rcar_pcie_dt_match[] = {
{ .compatible = "renesas,r8a779f0-pcie" },
{ .compatible = "renesas,r8a779g0-pcie" },
{},
@@ -179,8 +179,8 @@ void rcar4_pcie_bdf_msk_set(struct pci_host_bridge *bridge,
unsigned int reg_id,
rcar4_pcie_writel_app(priv, CNVIDMSK(reg_id), val);
}
-static int __init pci_host_rcar4_probe(struct dt_device_node *dev,
- const void *data)
+static int __init pci_host_rcar_probe(struct dt_device_node *dev,
+ const void *data)
{
struct pci_host_bridge *bridge;
paddr_t app_phys_addr;
@@ -191,8 +191,8 @@ static int __init pci_host_rcar4_probe(struct
dt_device_node *dev,
if ( !priv )
return -ENOMEM;
- bridge = dw_pcie_host_probe(dev, data, &rcar4_pcie_ops,
- &rcar4_pcie_child_ops);
+ bridge = dw_pcie_host_probe(dev, data, &rcar_pcie_ops,
+ &rcar_pcie_child_ops);
app_idx = dt_property_match_string(dev, "reg-names", "app");
if ( app_idx < 0 )
@@ -219,7 +219,7 @@ static int __init pci_host_rcar4_probe(struct
dt_device_node *dev,
app_phys_addr + app_size - 1);
dw_pcie_set_priv(bridge, priv);
- dw_pcie_set_version(bridge, RCAR4_DWC_VERSION);
+ dw_pcie_set_version(bridge, RCAR_DWC_VERSION);
return 0;
err:
@@ -228,8 +228,8 @@ err:
}
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_match = rcar_pcie_dt_match,
+.init = pci_host_rcar_probe,
DT_DEVICE_END
/*
diff --git a/xen/arch/arm/pci/pci-host-rcar4.h
b/xen/arch/arm/pci/pci-host-rcar.h
similarity index 88%
rename from xen/arch/arm/pci/pci-host-rcar4.h
rename to xen/arch/arm/pci/pci-host-rcar.h
index 31ef9d2d40..ffd49e3c1c 100644
--- a/xen/arch/arm/pci/pci-host-rcar4.h
+++ b/xen/arch/arm/pci/pci-host-rcar.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __PCI_HOST_RCAR4_H__
-#define __PCI_HOST_RCAR4_H__
+#ifndef __PCI_HOST_RCAR_H__
+#define __PCI_HOST_RCAR_H__
#include <asm/pci.h>
@@ -17,4 +17,4 @@ void rcar4_pcie_osid_reg_free(struct pci_host_bridge *bridge,
int rcar4_pcie_osid_regs_init(struct pci_host_bridge *bridge);
#endif
-#endif /* __PCI_HOST_RCAR4_H__ */
+#endif /* __PCI_HOST_RCAR_H__ */
diff --git a/xen/drivers/passthrough/arm/ipmmu-vmsa.c
b/xen/drivers/passthrough/arm/ipmmu-vmsa.c
index 0648f9b407..bfb9df238a 100644
--- a/xen/drivers/passthrough/arm/ipmmu-vmsa.c
+++ b/xen/drivers/passthrough/arm/ipmmu-vmsa.c
@@ -51,7 +51,7 @@
#include <asm/device.h>
#include <asm/io.h>
#include <asm/iommu_fwspec.h>
-#include "../arch/arm/pci/pci-host-rcar4.h"
+#include "../arch/arm/pci/pci-host-rcar.h"
#define dev_name(dev) dt_node_full_name(dev_to_dt(dev))
--
2.56.1
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |