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

Commit 1e330995 authored by Madalin Bucur's avatar Madalin Bucur Committed by David S. Miller
Browse files

fsl/fman: A007273 only applies to PPC SoCs 



Signed-off-by: default avatarMadalin Bucur <madalin.bucur@nxp.com>
Reviewed-by: default avatarCamelia Groza <camelia.groza@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ae6021d4

drivers/net/ethernet/freescale/fman/fman.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -1890,6 +1890,7 @@ static int fman_reset(struct fman *fman) 




		goto _return;

		goto _return;

	} else {

	} else {

#ifdef CONFIG_PPC

		struct device_node *guts_node;

		struct device_node *guts_node;

		struct ccsr_guts __iomem *guts_regs;

		struct ccsr_guts __iomem *guts_regs;

		u32 devdisr2, reg;

		u32 devdisr2, reg;
@@ -1921,6 +1922,7 @@ static int fman_reset(struct fman *fman) 




		/* Enable all MACs */

		/* Enable all MACs */

		iowrite32be(reg, &guts_regs->devdisr2);

		iowrite32be(reg, &guts_regs->devdisr2);

#endif





		/* Perform FMan reset */

		/* Perform FMan reset */

		iowrite32be(FPM_RSTC_FM_RESET, &fman->fpm_regs->fm_rstc);

		iowrite32be(FPM_RSTC_FM_RESET, &fman->fpm_regs->fm_rstc);
@@ -1932,25 +1934,31 @@ static int fman_reset(struct fman *fman) 
		} while (((ioread32be(&fman->fpm_regs->fm_rstc)) &

		} while (((ioread32be(&fman->fpm_regs->fm_rstc)) &

			 FPM_RSTC_FM_RESET) && --count);

			 FPM_RSTC_FM_RESET) && --count);

		if (count == 0) {

		if (count == 0) {

#ifdef CONFIG_PPC

			iounmap(guts_regs);

			iounmap(guts_regs);

			of_node_put(guts_node);

			of_node_put(guts_node);

#endif

			err = -EBUSY;

			err = -EBUSY;

			goto _return;

			goto _return;

		}

		}

#ifdef CONFIG_PPC





		/* Restore devdisr2 value */

		/* Restore devdisr2 value */

		iowrite32be(devdisr2, &guts_regs->devdisr2);

		iowrite32be(devdisr2, &guts_regs->devdisr2);





		iounmap(guts_regs);

		iounmap(guts_regs);

		of_node_put(guts_node);

		of_node_put(guts_node);

#endif





		goto _return;

		goto _return;





#ifdef CONFIG_PPC

guts_regs:

guts_regs:

		of_node_put(guts_node);

		of_node_put(guts_node);

guts_node:

guts_node:

		dev_dbg(fman->dev, "%s: Didn't perform FManV3 reset due to Errata A007273!\n",

		dev_dbg(fman->dev, "%s: Didn't perform FManV3 reset due to Errata A007273!\n",

			__func__);

			__func__);

#endif

	}

	}

_return:

_return:

	return err;

	return err;