Commit e54ad1e0 authored by Stefan Chulski's avatar Stefan Chulski Committed by David S. Miller
Browse files

net: mvpp2: add CM3 SRAM memory map 



This patch adds CM3 memory map.

Signed-off-by: default avatarStefan Chulski <stefanc@marvell.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Acked-by: default avatarMarcin Wojtas <mw@semihalf.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 60523583

drivers/net/ethernet/marvell/mvpp2/mvpp2.h

+1 −0
Original line number Diff line number Diff line
@@ -925,6 +925,7 @@ struct mvpp2 { 
	/* Shared registers' base addresses */

	void __iomem *lms_base;

	void __iomem *iface_base;

	void __iomem *cm3_base;



	/* On PPv2.2, each "software thread" can access the base

	 * register through a separate address space, each 64 KB apart

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

+26 −0
Original line number Diff line number Diff line
@@ -6854,6 +6854,27 @@ static int mvpp2_init(struct platform_device *pdev, struct mvpp2 *priv) 
	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)

{

	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);

		if (IS_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)) {