From: <stefanc@marvell.com>
To: <netdev@vger.kernel.org>
Cc: <thomas.petazzoni@bootlin.com>, <davem@davemloft.net>,
<nadavh@marvell.com>, <ymarkman@marvell.com>,
<linux-kernel@vger.kernel.org>, <stefanc@marvell.com>,
<kuba@kernel.org>, <linux@armlinux.org.uk>, <mw@semihalf.com>,
<andrew@lunn.ch>, <rmk+kernel@armlinux.org.uk>,
<atenart@kernel.org>, <devicetree@vger.kernel.org>,
<robh+dt@kernel.org>, <sebastian.hesselbarth@gmail.com>,
<gregory.clement@bootlin.com>,
<linux-arm-kernel@lists.infradead.org>
Subject: [PATCH v12 net-next 03/15] net: mvpp2: add CM3 SRAM memory map
Date: Wed, 10 Feb 2021 11:48:08 +0200 [thread overview]
Message-ID: <1612950500-9682-4-git-send-email-stefanc@marvell.com> (raw)
In-Reply-To: <1612950500-9682-1-git-send-email-stefanc@marvell.com>
From: Stefan Chulski <stefanc@marvell.com>
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>
---
drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 1 +
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 26 ++++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
index 6bd7e40..56e90ab 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
@@ -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
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index a07cf60..eec3796 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -6846,6 +6846,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;
@@ -6902,6 +6923,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)) {
--
1.9.1
next prev parent reply other threads:[~2021-02-10 9:52 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-10 9:48 [PATCH v12 net-next 00/15] net: mvpp2: Add TX Flow Control support stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 01/15] doc: marvell: add CM3 address space and PPv2.3 description stefanc
2021-02-10 17:24 ` Rob Herring
2021-02-10 9:48 ` [PATCH v12 net-next 02/15] dts: marvell: add CM3 SRAM memory to cp11x ethernet device tree stefanc
2021-02-10 9:48 ` stefanc [this message]
2021-02-10 9:48 ` [PATCH v12 net-next 04/15] net: mvpp2: always compare hw-version vs MVPP21 stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 05/15] net: mvpp2: add PPv23 version definition stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 06/15] net: mvpp2: increase BM pool and RXQ size stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 07/15] net: mvpp2: add FCA periodic timer configurations stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 08/15] net: mvpp2: add FCA RXQ non occupied descriptor threshold stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 09/15] net: mvpp2: enable global flow control stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 10/15] net: mvpp2: add RXQ flow control configurations stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 11/15] net: mvpp2: add ethtool flow control configuration support stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 12/15] net: mvpp2: add BM protection underrun feature support stefanc
2021-02-10 23:29 ` David Miller
2021-02-11 8:22 ` [EXT] " Stefan Chulski
2021-02-11 14:19 ` Andrew Lunn
2021-02-11 19:13 ` Marcin Wojtas
2021-02-12 13:52 ` Andrew Lunn
2021-02-14 9:20 ` Stefan Chulski
2021-02-15 0:38 ` Andrew Lunn
2021-02-10 9:48 ` [PATCH v12 net-next 13/15] net: mvpp2: add PPv23 RX FIFO flow control stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 14/15] net: mvpp2: set 802.3x GoP Flow Control mode stefanc
2021-02-10 9:48 ` [PATCH v12 net-next 15/15] net: mvpp2: add TX FC firmware check stefanc
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1612950500-9682-4-git-send-email-stefanc@marvell.com \
--to=stefanc@marvell.com \
--cc=andrew@lunn.ch \
--cc=atenart@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=gregory.clement@bootlin.com \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mw@semihalf.com \
--cc=nadavh@marvell.com \
--cc=netdev@vger.kernel.org \
--cc=rmk+kernel@armlinux.org.uk \
--cc=robh+dt@kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=ymarkman@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).