| Message ID | 20220829062202.3287-4-zong.li@sifive.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Rename sifive L2 cache to sifive CCACHE | expand |
On Sun, 28 Aug 2022 23:22:02 PDT (-0700), zong.li@sifive.com wrote: > The sifive L2 has been renamed to sifive CCACHE, EDAC driver needs to > apply the change as well That means the build would be broken before this patch, which we generally try to avoid as it breaks things like bisecting. > > Signed-off-by: Zong Li <zong.li@sifive.com> > --- > drivers/edac/Kconfig | 2 +- > drivers/edac/sifive_edac.c | 12 ++++++------ > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig > index 17562cf1fe97..456602d373b7 100644 > --- a/drivers/edac/Kconfig > +++ b/drivers/edac/Kconfig > @@ -473,7 +473,7 @@ config EDAC_ALTERA_SDMMC > > config EDAC_SIFIVE > bool "Sifive platform EDAC driver" > - depends on EDAC=y && SIFIVE_L2 > + depends on EDAC=y && SIFIVE_CCACHE > help > Support for error detection and correction on the SiFive SoCs. > > diff --git a/drivers/edac/sifive_edac.c b/drivers/edac/sifive_edac.c > index ee800aec7d47..b844e2626fd5 100644 > --- a/drivers/edac/sifive_edac.c > +++ b/drivers/edac/sifive_edac.c > @@ -2,7 +2,7 @@ > /* > * SiFive Platform EDAC Driver > * > - * Copyright (C) 2018-2019 SiFive, Inc. > + * Copyright (C) 2018-2022 SiFive, Inc. > * > * This driver is partially based on octeon_edac-pc.c > * > @@ -10,7 +10,7 @@ > #include <linux/edac.h> > #include <linux/platform_device.h> > #include "edac_module.h" > -#include <soc/sifive/sifive_l2_cache.h> > +#include <soc/sifive/sifive_ccache.h> > > #define DRVNAME "sifive_edac" > > @@ -32,9 +32,9 @@ int ecc_err_event(struct notifier_block *this, unsigned long event, void *ptr) > > p = container_of(this, struct sifive_edac_priv, notifier); > > - if (event == SIFIVE_L2_ERR_TYPE_UE) > + if (event == SIFIVE_CCACHE_ERR_TYPE_UE) > edac_device_handle_ue(p->dci, 0, 0, msg); > - else if (event == SIFIVE_L2_ERR_TYPE_CE) > + else if (event == SIFIVE_CCACHE_ERR_TYPE_CE) > edac_device_handle_ce(p->dci, 0, 0, msg); > > return NOTIFY_OK; > @@ -67,7 +67,7 @@ static int ecc_register(struct platform_device *pdev) > goto err; > } > > - register_sifive_l2_error_notifier(&p->notifier); > + register_sifive_ccache_error_notifier(&p->notifier); > > return 0; > > @@ -81,7 +81,7 @@ static int ecc_unregister(struct platform_device *pdev) > { > struct sifive_edac_priv *p = platform_get_drvdata(pdev); > > - unregister_sifive_l2_error_notifier(&p->notifier); > + unregister_sifive_ccache_error_notifier(&p->notifier); > edac_device_del_device(&pdev->dev); > edac_device_free_ctl_info(p->dci);
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index 17562cf1fe97..456602d373b7 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig @@ -473,7 +473,7 @@ config EDAC_ALTERA_SDMMC config EDAC_SIFIVE bool "Sifive platform EDAC driver" - depends on EDAC=y && SIFIVE_L2 + depends on EDAC=y && SIFIVE_CCACHE help Support for error detection and correction on the SiFive SoCs. diff --git a/drivers/edac/sifive_edac.c b/drivers/edac/sifive_edac.c index ee800aec7d47..b844e2626fd5 100644 --- a/drivers/edac/sifive_edac.c +++ b/drivers/edac/sifive_edac.c @@ -2,7 +2,7 @@ /* * SiFive Platform EDAC Driver * - * Copyright (C) 2018-2019 SiFive, Inc. + * Copyright (C) 2018-2022 SiFive, Inc. * * This driver is partially based on octeon_edac-pc.c * @@ -10,7 +10,7 @@ #include <linux/edac.h> #include <linux/platform_device.h> #include "edac_module.h" -#include <soc/sifive/sifive_l2_cache.h> +#include <soc/sifive/sifive_ccache.h> #define DRVNAME "sifive_edac" @@ -32,9 +32,9 @@ int ecc_err_event(struct notifier_block *this, unsigned long event, void *ptr) p = container_of(this, struct sifive_edac_priv, notifier); - if (event == SIFIVE_L2_ERR_TYPE_UE) + if (event == SIFIVE_CCACHE_ERR_TYPE_UE) edac_device_handle_ue(p->dci, 0, 0, msg); - else if (event == SIFIVE_L2_ERR_TYPE_CE) + else if (event == SIFIVE_CCACHE_ERR_TYPE_CE) edac_device_handle_ce(p->dci, 0, 0, msg); return NOTIFY_OK; @@ -67,7 +67,7 @@ static int ecc_register(struct platform_device *pdev) goto err; } - register_sifive_l2_error_notifier(&p->notifier); + register_sifive_ccache_error_notifier(&p->notifier); return 0; @@ -81,7 +81,7 @@ static int ecc_unregister(struct platform_device *pdev) { struct sifive_edac_priv *p = platform_get_drvdata(pdev); - unregister_sifive_l2_error_notifier(&p->notifier); + unregister_sifive_ccache_error_notifier(&p->notifier); edac_device_del_device(&pdev->dev); edac_device_free_ctl_info(p->dci);
The sifive L2 has been renamed to sifive CCACHE, EDAC driver needs to apply the change as well Signed-off-by: Zong Li <zong.li@sifive.com> --- drivers/edac/Kconfig | 2 +- drivers/edac/sifive_edac.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)