Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-22 12:54:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pci: mediatek: add support for upstream split PCIe node

Browse source 
Add support for upstream linux split PCIe node.

Upstream linux have an alternative way to declare PCIe nodes that splits
them in dedicated nodes for each line instead of putting them all in one
node.

Detect this by checking if the mediatek,generic-pciecfg node is passed
as it's used to reference the common address for all the PCIe lines.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2024-08-12 14:31:48 +02:00 • committed by Tom Rini
parent 6dd95456f7
commit a60c20bda8
1 changed files with 100 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
drivers/pci/pcie_mediatek.c
View file

@ -524,7 +524,7 @@ exit:
mtk_pcie_port_free(port);
}
static int mtk_pcie_parse_port(struct udevice *dev, u32 slot)
static int mtk_pcie_parse_port(struct udevice *dev, u32 slot, int index)
{
struct mtk_pcie *pcie = dev_get_priv(dev);
struct mtk_pcie_port *port;
@ -545,11 +545,11 @@ static int mtk_pcie_parse_port(struct udevice *dev, u32 slot)
if (err)
return err;
err = reset_get_by_index(dev, slot, &port->reset);
err = reset_get_by_index(dev, index, &port->reset);
if (err)
return err;
err = generic_phy_get_by_index(dev, slot, &port->phy);
err = generic_phy_get_by_index(dev, index, &port->phy);
if (err)
return err;
@ -631,18 +631,58 @@ static int mtk_pcie_parse_port_v2(struct udevice *dev, u32 slot)
return 0;
}
static int mtk_pcie_subsys_get(struct udevice *dev)
{
struct mtk_pcie *pcie = dev_get_priv(dev);
ofnode cfg_node;
fdt_addr_t addr;
cfg_node = ofnode_by_compatible(ofnode_null(),
"mediatek,generic-pciecfg");
if (!ofnode_valid(cfg_node))
return -ENOENT;
addr = ofnode_get_addr(cfg_node);
if (addr == FDT_ADDR_T_NONE)
return -ENODEV;
pcie->base = map_physmem(addr, 0, MAP_NOCACHE);
if (!pcie->base)
return -ENOENT;
return 0;
}
static int mtk_pcie_probe(struct udevice *dev)
{
struct mtk_pcie *pcie = dev_get_priv(dev);
struct mtk_pcie_port *port, *tmp;
bool split_pcie_node = false;
ofnode subnode;
unsigned int slot;
int err;
INIT_LIST_HEAD(&pcie->ports);
/* Check if upstream implementation is used */
err = mtk_pcie_subsys_get(dev);
if (!err) {
/*
* Assume split port node implementation with "mediatek,generic-pciecfg"
* found. We check reg-names and check if the node is for port0 or port1.
*/
split_pcie_node = true;
if (!strcmp(dev_read_string(dev, "reg-names"), "port0"))
slot = 0;
else if (!strcmp(dev_read_string(dev, "reg-names"), "port1"))
slot = 1;
else
return -EINVAL;
} else {
pcie->base = dev_remap_addr_name(dev, "subsys");
if (!pcie->base)
return -ENOENT;
}
err = clk_get_by_name(dev, "free_ck", &pcie->free_ck);
if (err)
@ -653,9 +693,11 @@ static int mtk_pcie_probe(struct udevice *dev)
if (err)
return err;
if (!split_pcie_node) {
dev_for_each_subnode(subnode, dev) {
struct fdt_pci_addr addr;
u32 slot = 0;
slot = 0;
if (!ofnode_is_enabled(subnode))
continue;
@ -666,7 +708,12 @@ static int mtk_pcie_probe(struct udevice *dev)
slot = PCI_DEV(addr.phys_hi);
err = mtk_pcie_parse_port(dev, slot);
err = mtk_pcie_parse_port(dev, slot, slot);
if (err)
return err;
}
} else {
err = mtk_pcie_parse_port(dev, slot, 0);
if (err)
return err;
}
@ -682,20 +729,41 @@ static int mtk_pcie_probe_v2(struct udevice *dev)
{
struct mtk_pcie *pcie = dev_get_priv(dev);
struct mtk_pcie_port *port, *tmp;
struct fdt_pci_addr addr;
bool split_pcie_node = false;
ofnode subnode;
unsigned int slot;
int err;
INIT_LIST_HEAD(&pcie->ports);
/* Check if upstream implementation is used */
err = mtk_pcie_subsys_get(dev);
if (!err) {
/*
* Assume split port node implementation with "mediatek,generic-pciecfg"
* found. We check reg-names and check if the node is for port0 or port1.
*/
split_pcie_node = true;
if (!strcmp(dev_read_string(dev, "reg-names"), "port0"))
slot = 0;
else if (!strcmp(dev_read_string(dev, "reg-names"), "port1"))
slot = 1;
else
return -EINVAL;
} else {
pcie->base = dev_remap_addr_name(dev, "subsys");
if (!pcie->base)
return -ENOENT;
}
pcie->priv = dev;
if (!split_pcie_node) {
dev_for_each_subnode(subnode, dev) {
struct fdt_pci_addr addr;
slot = 0;
if (!ofnode_is_enabled(subnode))
continue;
@ -708,6 +776,11 @@ static int mtk_pcie_probe_v2(struct udevice *dev)
if (err)
return err;
}
} else {
err = mtk_pcie_parse_port_v2(dev, slot);
if (err)
return err;
}
/* enable each port, and then check link status */
list_for_each_entry_safe(port, tmp, &pcie->ports, list)