From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, linux-can@vger.kernel.org,
kernel@pengutronix.de, Marek Vasut <marex@denx.de>,
Heiko Schocher <hs@denx.de>, Markus Marb <markus@marb.org>,
Marc Kleine-Budde <mkl@pengutronix.de>,
linux-stable <stable@vger.kernel.org>
Subject: [PATCH 2/6] can: ifi: Check core revision upon probe
Date: Mon, 12 Mar 2018 11:04:06 +0100 [thread overview]
Message-ID: <20180312100410.10404-3-mkl@pengutronix.de> (raw)
In-Reply-To: <20180312100410.10404-1-mkl@pengutronix.de>
From: Marek Vasut <marex@denx.de>
Older versions of the core are not compatible with the driver due
to various intrusive fixes of the core. Read out the VER register,
check the core revision bitfield and verify if the core in use is
new enough (rev 2.1 or newer) to work correctly with this driver.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Markus Marb <markus@marb.org>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/ifi_canfd/ifi_canfd.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/net/can/ifi_canfd/ifi_canfd.c b/drivers/net/can/ifi_canfd/ifi_canfd.c
index 2772d05ff11c..9fd396c3569a 100644
--- a/drivers/net/can/ifi_canfd/ifi_canfd.c
+++ b/drivers/net/can/ifi_canfd/ifi_canfd.c
@@ -136,6 +136,8 @@
#define IFI_CANFD_SYSCLOCK 0x50
#define IFI_CANFD_VER 0x54
+#define IFI_CANFD_VER_REV_MASK 0xff
+#define IFI_CANFD_VER_REV_MIN_SUPPORTED 0x15
#define IFI_CANFD_IP_ID 0x58
#define IFI_CANFD_IP_ID_VALUE 0xD073CAFD
@@ -933,7 +935,7 @@ static int ifi_canfd_plat_probe(struct platform_device *pdev)
struct resource *res;
void __iomem *addr;
int irq, ret;
- u32 id;
+ u32 id, rev;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
addr = devm_ioremap_resource(dev, res);
@@ -947,6 +949,13 @@ static int ifi_canfd_plat_probe(struct platform_device *pdev)
return -EINVAL;
}
+ rev = readl(addr + IFI_CANFD_VER) & IFI_CANFD_VER_REV_MASK;
+ if (rev < IFI_CANFD_VER_REV_MIN_SUPPORTED) {
+ dev_err(dev, "This block is too old (rev %i), minimum supported is rev %i\n",
+ rev, IFI_CANFD_VER_REV_MIN_SUPPORTED);
+ return -EINVAL;
+ }
+
ndev = alloc_candev(sizeof(*priv), 1);
if (!ndev)
return -ENOMEM;
--
2.16.1
next prev parent reply other threads:[~2018-03-12 10:04 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-12 10:04 pull-request: can 2018-03-12 Marc Kleine-Budde
2018-03-12 10:04 ` [PATCH 1/6] can: m_can: change comparison to bitshift when dealing with a mask Marc Kleine-Budde
2018-03-12 10:04 ` Marc Kleine-Budde [this message]
2018-03-12 10:04 ` [PATCH 3/6] can: ifi: Repair the error handling Marc Kleine-Budde
2018-03-12 10:04 ` [PATCH 4/6] can: peak/pcie_fd: fix echo_skb is occupied! bug Marc Kleine-Budde
2018-03-12 10:04 ` [PATCH 5/6] can: peak/pcie_fd: remove useless code when interface starts Marc Kleine-Budde
2018-03-12 10:04 ` [PATCH 6/6] can: m_can: select pinctrl state in each suspend/resume function Marc Kleine-Budde
2018-03-12 10:30 ` Bich HEMON
2018-03-12 15:17 ` pull-request: can 2018-03-12 David Miller
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=20180312100410.10404-3-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=davem@davemloft.net \
--cc=hs@denx.de \
--cc=kernel@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=marex@denx.de \
--cc=markus@marb.org \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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).