| Message ID | 1533214282-9977-2-git-send-email-manish.narani@xilinx.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | EDAC: Enhancements to Synopsys EDAC driver | expand |
On Thu, Aug 02, 2018 at 06:21:19PM +0530, Manish Narani wrote: > This patch adds platform specific structures, so that we can add "This patch" in a commit message is tautologically redundant. > different IP support later using quirks. > > Signed-off-by: Manish Narani <manish.narani@xilinx.com> > --- > drivers/edac/synopsys_edac.c | 64 ++++++++++++++++++++++++++++++++++++-------- > 1 file changed, 53 insertions(+), 11 deletions(-) > > diff --git a/drivers/edac/synopsys_edac.c b/drivers/edac/synopsys_edac.c > index 0c9c59e..d4798e8 100644 > --- a/drivers/edac/synopsys_edac.c > +++ b/drivers/edac/synopsys_edac.c > @@ -22,6 +22,7 @@ > #include <linux/edac.h> > #include <linux/module.h> > #include <linux/platform_device.h> > +#include <linux/of.h> > > #include "edac_module.h" > > @@ -130,6 +131,7 @@ struct synps_ecc_status { > * @baseaddr: Base address of the DDR controller > * @message: Buffer for framing the event specific info > * @stat: ECC status information > + * @p_data: Pointer to platform data > * @ce_cnt: Correctable Error count > * @ue_cnt: Uncorrectable Error count > */ > @@ -137,11 +139,29 @@ struct synps_edac_priv { > void __iomem *baseaddr; > char message[SYNPS_EDAC_MSG_SIZE]; > struct synps_ecc_status stat; > + const struct synps_platform_data *p_data; > u32 ce_cnt; > u32 ue_cnt; > }; > > /** > + * struct synps_platform_data - synps platform data structure > + * @synps_edac_geterror_info: function pointer to synps edac error info > + * @synps_edac_get_mtype: function pointer to synps edac mtype > + * @synps_edac_get_dtype: function pointer to synps edac dtype > + * @synps_edac_get_eccstate: function pointer to synps edac eccstate > + * @quirks: to differentiate IPs > + */ > +struct synps_platform_data { > + int (*synps_edac_geterror_info)(void __iomem *base, > + struct synps_ecc_status *p); > + enum mem_type (*synps_edac_get_mtype)(const void __iomem *base); > + enum dev_type (*synps_edac_get_dtype)(const void __iomem *base); > + bool (*synps_edac_get_eccstate)(void __iomem *base); > + int quirks; > +}; > + > +/** > * synps_edac_geterror_info - Get the current ecc error info > * @base: Pointer to the base address of the ddr memory controller > * @p: Pointer to the synopsys ecc status structure > @@ -242,7 +262,8 @@ static void synps_edac_check(struct mem_ctl_info *mci) > struct synps_edac_priv *priv = mci->pvt_info; > int status; > > - status = synps_edac_geterror_info(priv->baseaddr, &priv->stat); > + status = priv->p_data->synps_edac_geterror_info(priv->baseaddr, > + &priv->stat); Unnecessarily long line - shortening by renaming might help. > if (status) > return; > > @@ -372,10 +393,12 @@ static int synps_edac_init_csrows(struct mem_ctl_info *mci) > for (j = 0; j < csi->nr_channels; j++) { > dimm = csi->channels[j]->dimm; > dimm->edac_mode = EDAC_FLAG_SECDED; > - dimm->mtype = synps_edac_get_mtype(priv->baseaddr); > + dimm->mtype = priv->p_data->synps_edac_get_mtype( > + priv->baseaddr); Ditto - that trailing opening brace at the end is just yucky. Shorten it and let is stick out even if it longer than 80 cols. > dimm->nr_pages = (size >> PAGE_SHIFT) / csi->nr_channels; > dimm->grain = SYNPS_EDAC_ERR_GRAIN; > - dimm->dtype = synps_edac_get_dtype(priv->baseaddr); > + dimm->dtype = priv->p_data->synps_edac_get_dtype( > + priv->baseaddr); > } > } > > @@ -423,6 +446,21 @@ static int synps_edac_mc_init(struct mem_ctl_info *mci, > return status; > } > > +static const struct synps_platform_data zynq_edac_def = { > + .synps_edac_geterror_info = synps_edac_geterror_info, > + .synps_edac_get_mtype = synps_edac_get_mtype, > + .synps_edac_get_dtype = synps_edac_get_dtype, > + .synps_edac_get_eccstate = synps_edac_get_eccstate, > + .quirks = 0, Drop the "synps_" prefix from the function pointer names and leave them in the actual function names so that when one looks at the code, knows what is what.
Hi Boris, > -----Original Message----- > From: Borislav Petkov [mailto:bp@alien8.de] > Sent: Saturday, August 4, 2018 10:49 AM > Subject: Re: [PATCH v3 1/4] edac: synps: Add platform specific structures for > ddrc controller > > On Thu, Aug 02, 2018 at 06:21:19PM +0530, Manish Narani wrote: > > This patch adds platform specific structures, so that we can add > > "This patch" in a commit message is tautologically redundant. Okay. I will update this in v4. > > > different IP support later using quirks. > > > > Signed-off-by: Manish Narani <manish.narani@xilinx.com> > > --- > > drivers/edac/synopsys_edac.c | 64 > > ++++++++++++++++++++++++++++++++++++-------- > > 1 file changed, 53 insertions(+), 11 deletions(-) > > > > diff --git a/drivers/edac/synopsys_edac.c > > b/drivers/edac/synopsys_edac.c index 0c9c59e..d4798e8 100644 > > --- a/drivers/edac/synopsys_edac.c > > +++ b/drivers/edac/synopsys_edac.c > > @@ -22,6 +22,7 @@ > > #include <linux/edac.h> > > #include <linux/module.h> > > #include <linux/platform_device.h> > > +#include <linux/of.h> > > > > #include "edac_module.h" > > > > @@ -130,6 +131,7 @@ struct synps_ecc_status { > > * @baseaddr: Base address of the DDR controller > > * @message: Buffer for framing the event specific info > > * @stat: ECC status information > > + * @p_data: Pointer to platform data > > * @ce_cnt: Correctable Error count > > * @ue_cnt: Uncorrectable Error count > > */ > > @@ -137,11 +139,29 @@ struct synps_edac_priv { > > void __iomem *baseaddr; > > char message[SYNPS_EDAC_MSG_SIZE]; > > struct synps_ecc_status stat; > > + const struct synps_platform_data *p_data; > > u32 ce_cnt; > > u32 ue_cnt; > > }; > > > > /** > > + * struct synps_platform_data - synps platform data structure > > + * @synps_edac_geterror_info: function pointer to synps edac error > info > > + * @synps_edac_get_mtype: function pointer to synps edac mtype > > + * @synps_edac_get_dtype: function pointer to synps edac dtype > > + * @synps_edac_get_eccstate: function pointer to synps edac eccstate > > + * @quirks: to differentiate IPs > > + */ > > +struct synps_platform_data { > > + int (*synps_edac_geterror_info)(void __iomem *base, > > + struct synps_ecc_status *p); > > + enum mem_type (*synps_edac_get_mtype)(const void __iomem > *base); > > + enum dev_type (*synps_edac_get_dtype)(const void __iomem *base); > > + bool (*synps_edac_get_eccstate)(void __iomem *base); > > + int quirks; > > +}; > > + > > +/** > > * synps_edac_geterror_info - Get the current ecc error info > > * @base: Pointer to the base address of the ddr memory controller > > * @p: Pointer to the synopsys ecc status structure > > @@ -242,7 +262,8 @@ static void synps_edac_check(struct mem_ctl_info > *mci) > > struct synps_edac_priv *priv = mci->pvt_info; > > int status; > > > > - status = synps_edac_geterror_info(priv->baseaddr, &priv->stat); > > + status = priv->p_data->synps_edac_geterror_info(priv->baseaddr, > > + &priv->stat); > > Unnecessarily long line - shortening by renaming might help. Fair One. I will look to change the name. Also, May be I could use only 'priv' as argument and extract/use 'baseaddr' and 'stat' in the function definition itself. > > > @@ -372,10 +393,12 @@ static int synps_edac_init_csrows(struct > mem_ctl_info *mci) > > for (j = 0; j < csi->nr_channels; j++) { > > dimm = csi->channels[j]->dimm; > > dimm->edac_mode = EDAC_FLAG_SECDED; > > - dimm->mtype = synps_edac_get_mtype(priv- > >baseaddr); > > + dimm->mtype = priv->p_data- > >synps_edac_get_mtype( > > + priv->baseaddr); > > Ditto - that trailing opening brace at the end is just yucky. Shorten it and let is > stick out even if it longer than 80 cols. Okay. Will modify it. > > > > > +static const struct synps_platform_data zynq_edac_def = { > > + .synps_edac_geterror_info = synps_edac_geterror_info, > > + .synps_edac_get_mtype = synps_edac_get_mtype, > > + .synps_edac_get_dtype = synps_edac_get_dtype, > > + .synps_edac_get_eccstate = synps_edac_get_eccstate, > > + .quirks = 0, > > Drop the "synps_" prefix from the function pointer names and leave them in > the actual function names so that when one looks at the code, knows what is > what. Okay. I will correct it in v4. Thanks, Manish Narani
diff --git a/drivers/edac/synopsys_edac.c b/drivers/edac/synopsys_edac.c index 0c9c59e..d4798e8 100644 --- a/drivers/edac/synopsys_edac.c +++ b/drivers/edac/synopsys_edac.c @@ -22,6 +22,7 @@ #include <linux/edac.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/of.h> #include "edac_module.h" @@ -130,6 +131,7 @@ struct synps_ecc_status { * @baseaddr: Base address of the DDR controller * @message: Buffer for framing the event specific info * @stat: ECC status information + * @p_data: Pointer to platform data * @ce_cnt: Correctable Error count * @ue_cnt: Uncorrectable Error count */ @@ -137,11 +139,29 @@ struct synps_edac_priv { void __iomem *baseaddr; char message[SYNPS_EDAC_MSG_SIZE]; struct synps_ecc_status stat; + const struct synps_platform_data *p_data; u32 ce_cnt; u32 ue_cnt; }; /** + * struct synps_platform_data - synps platform data structure + * @synps_edac_geterror_info: function pointer to synps edac error info + * @synps_edac_get_mtype: function pointer to synps edac mtype + * @synps_edac_get_dtype: function pointer to synps edac dtype + * @synps_edac_get_eccstate: function pointer to synps edac eccstate + * @quirks: to differentiate IPs + */ +struct synps_platform_data { + int (*synps_edac_geterror_info)(void __iomem *base, + struct synps_ecc_status *p); + enum mem_type (*synps_edac_get_mtype)(const void __iomem *base); + enum dev_type (*synps_edac_get_dtype)(const void __iomem *base); + bool (*synps_edac_get_eccstate)(void __iomem *base); + int quirks; +}; + +/** * synps_edac_geterror_info - Get the current ecc error info * @base: Pointer to the base address of the ddr memory controller * @p: Pointer to the synopsys ecc status structure @@ -242,7 +262,8 @@ static void synps_edac_check(struct mem_ctl_info *mci) struct synps_edac_priv *priv = mci->pvt_info; int status; - status = synps_edac_geterror_info(priv->baseaddr, &priv->stat); + status = priv->p_data->synps_edac_geterror_info(priv->baseaddr, + &priv->stat); if (status) return; @@ -372,10 +393,12 @@ static int synps_edac_init_csrows(struct mem_ctl_info *mci) for (j = 0; j < csi->nr_channels; j++) { dimm = csi->channels[j]->dimm; dimm->edac_mode = EDAC_FLAG_SECDED; - dimm->mtype = synps_edac_get_mtype(priv->baseaddr); + dimm->mtype = priv->p_data->synps_edac_get_mtype( + priv->baseaddr); dimm->nr_pages = (size >> PAGE_SHIFT) / csi->nr_channels; dimm->grain = SYNPS_EDAC_ERR_GRAIN; - dimm->dtype = synps_edac_get_dtype(priv->baseaddr); + dimm->dtype = priv->p_data->synps_edac_get_dtype( + priv->baseaddr); } } @@ -423,6 +446,21 @@ static int synps_edac_mc_init(struct mem_ctl_info *mci, return status; } +static const struct synps_platform_data zynq_edac_def = { + .synps_edac_geterror_info = synps_edac_geterror_info, + .synps_edac_get_mtype = synps_edac_get_mtype, + .synps_edac_get_dtype = synps_edac_get_dtype, + .synps_edac_get_eccstate = synps_edac_get_eccstate, + .quirks = 0, +}; + +static const struct of_device_id synps_edac_match[] = { + { .compatible = "xlnx,zynq-ddrc-a05", .data = (void *)&zynq_edac_def }, + { /* end of table */ } +}; + +MODULE_DEVICE_TABLE(of, synps_edac_match); + /** * synps_edac_mc_probe - Check controller and bind driver * @pdev: Pointer to the platform_device struct @@ -440,13 +478,22 @@ static int synps_edac_mc_probe(struct platform_device *pdev) int rc; struct resource *res; void __iomem *baseaddr; + const struct of_device_id *match; + const struct synps_platform_data *p_data; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); baseaddr = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(baseaddr)) return PTR_ERR(baseaddr); - if (!synps_edac_get_eccstate(baseaddr)) { + match = of_match_node(synps_edac_match, pdev->dev.of_node); + if (!match && !match->data) { + dev_err(&pdev->dev, "of_match_node() failed\n"); + return -EINVAL; + } + + p_data = (struct synps_platform_data *)match->data; + if (!(p_data->synps_edac_get_eccstate(baseaddr))) { edac_printk(KERN_INFO, EDAC_MC, "ECC not enabled\n"); return -ENXIO; } @@ -468,6 +515,8 @@ static int synps_edac_mc_probe(struct platform_device *pdev) priv = mci->pvt_info; priv->baseaddr = baseaddr; + priv->p_data = match->data; + rc = synps_edac_mc_init(mci, pdev); if (rc) { edac_printk(KERN_ERR, EDAC_MC, @@ -511,13 +560,6 @@ static int synps_edac_mc_remove(struct platform_device *pdev) return 0; } -static const struct of_device_id synps_edac_match[] = { - { .compatible = "xlnx,zynq-ddrc-a05", }, - { /* end of table */ } -}; - -MODULE_DEVICE_TABLE(of, synps_edac_match); - static struct platform_driver synps_edac_mc_driver = { .driver = { .name = "synopsys-edac",
This patch adds platform specific structures, so that we can add different IP support later using quirks. Signed-off-by: Manish Narani <manish.narani@xilinx.com> --- drivers/edac/synopsys_edac.c | 64 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 11 deletions(-)