Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e400b46 authored by Marek Vasut's avatar Marek Vasut Committed by Greg Kroah-Hartman
Browse files

can: ifi: Check core revision upon probe 



commit 591d65d5b15496af8d05e252bc1da611c66c0b79 upstream.

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: default avatarMarek 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: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a452b356

drivers/net/can/ifi_canfd/ifi_canfd.c

+10 −1
Original line number Diff line number Diff line
@@ -144,6 +144,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
@@ -943,7 +945,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);
@@ -957,6 +959,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;