UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: mvpp2: add CM3 SRAM memory map 

This patch adds CM3 memory map.

Signed-off-by: Stefan Chulski <stefanc@marvell.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Marcin Wojtas <mw@semihalf.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stefan Chulski 2021-02-11 12:48:50 +02:00 committed by David S. Miller
parent 60523583b0
commit e54ad1e01c
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/marvell/mvpp2/mvpp2.h
View File

@ -925,6 +925,7 @@ struct mvpp2 {
/* Shared registers' base addresses */ /* Shared registers' base addresses */
void __iomem *lms_base; void __iomem *lms_base;
void __iomem *iface_base; void __iomem *iface_base;
void __iomem *cm3_base;
/* On PPv2.2, each "software thread" can access the base /* On PPv2.2, each "software thread" can access the base
* register through a separate address space, each 64 KB apart * register through a separate address space, each 64 KB apart

26
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
View File

@ -6854,6 +6854,27 @@ static int mvpp2_init(struct platform_device *pdev, struct mvpp2 *priv)
return 0; return 0;
} }
static int mvpp2_get_sram(struct platform_device *pdev,
struct mvpp2 *priv)
{
struct resource *res;
res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
if (!res) {
if (has_acpi_companion(&pdev->dev))
dev_warn(&pdev->dev, "ACPI is too old, Flow control not supported\n");
else
dev_warn(&pdev->dev, "DT is too old, Flow control not supported\n");
return 0;
}
priv->cm3_base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(priv->cm3_base))
return PTR_ERR(priv->cm3_base);
return 0;
}
static int mvpp2_probe(struct platform_device *pdev) static int mvpp2_probe(struct platform_device *pdev)
{ {
const struct acpi_device_id *acpi_id; const struct acpi_device_id *acpi_id;
@ -6910,6 +6931,11 @@ static int mvpp2_probe(struct platform_device *pdev)
priv->iface_base = devm_ioremap_resource(&pdev->dev, res); priv->iface_base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(priv->iface_base)) if (IS_ERR(priv->iface_base))
return PTR_ERR(priv->iface_base); return PTR_ERR(priv->iface_base);
/* Map CM3 SRAM */
err = mvpp2_get_sram(pdev, priv);
if (err)
dev_warn(&pdev->dev, "Fail to alloc CM3 SRAM\n");
} }
if (priv->hw_version == MVPP22 && dev_of_node(&pdev->dev)) { if (priv->hw_version == MVPP22 && dev_of_node(&pdev->dev)) {