linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] fpga: altera-cvp: Fix registration for CvP incapable devices
@ 2018-10-29  7:26 Anatolij Gustschin
  2018-10-29 16:59 ` Moritz Fischer
  0 siblings, 1 reply; 3+ messages in thread
From: Anatolij Gustschin @ 2018-10-29  7:26 UTC (permalink / raw)
  To: atull, mdf; +Cc: linux-fpga, linux-kernel, Andreas Puhm

From: Andreas Puhm <puhm@oregano.at>

The probe function needs to verify the CvP enable bit in order to
properly determine if FPGA Manager functionality can be safely
enabled.

Fixes: 34d1dc17ce97 ("fpga manager: Add Altera CvP driver")
Signed-off-by: Andreas Puhm <puhm@oregano.at>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
Changes in v2:
 - improve Fixes tag
 - wrap lines in commit description

 drivers/fpga/altera-cvp.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/fpga/altera-cvp.c b/drivers/fpga/altera-cvp.c
index 3998d4f0e5e7..196d52558990 100644
--- a/drivers/fpga/altera-cvp.c
+++ b/drivers/fpga/altera-cvp.c
@@ -403,6 +403,7 @@ static int altera_cvp_probe(struct pci_dev *pdev,
 	struct altera_cvp_conf *conf;
 	struct fpga_manager *mgr;
 	u16 cmd, val;
+	u32 regval;
 	int ret;
 
 	/*
@@ -419,6 +420,14 @@ static int altera_cvp_probe(struct pci_dev *pdev,
 		return -ENODEV;
 	}
 
+	pci_read_config_dword(pdev, VSE_CVP_STATUS, &regval);
+	if (!(regval & VSE_CVP_STATUS_CVP_EN)) {
+		dev_err(&pdev->dev,
+			"CVP is disabled for this device: CVP_STATUS Reg 0x%x\n",
+			regval);
+		return -ENODEV;
+	}
+
 	conf = devm_kzalloc(&pdev->dev, sizeof(*conf), GFP_KERNEL);
 	if (!conf)
 		return -ENOMEM;
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] fpga: altera-cvp: Fix registration for CvP incapable devices
  2018-10-29  7:26 [PATCH v2] fpga: altera-cvp: Fix registration for CvP incapable devices Anatolij Gustschin
@ 2018-10-29 16:59 ` Moritz Fischer
  2018-11-01 18:39   ` Alan Tull
  0 siblings, 1 reply; 3+ messages in thread
From: Moritz Fischer @ 2018-10-29 16:59 UTC (permalink / raw)
  To: Anatolij Gustschin; +Cc: atull, mdf, linux-fpga, linux-kernel, Andreas Puhm

Hi Anatolij, Andreas,

On Mon, Oct 29, 2018 at 08:26:30AM +0100, Anatolij Gustschin wrote:
> From: Andreas Puhm <puhm@oregano.at>
> 
> The probe function needs to verify the CvP enable bit in order to
> properly determine if FPGA Manager functionality can be safely
> enabled.
> 
> Fixes: 34d1dc17ce97 ("fpga manager: Add Altera CvP driver")
> Signed-off-by: Andreas Puhm <puhm@oregano.at>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>

Reviewed-by: Moritz Fischer <mdf@kernel.org>
> ---
> Changes in v2:
>  - improve Fixes tag
>  - wrap lines in commit description
> 
>  drivers/fpga/altera-cvp.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/drivers/fpga/altera-cvp.c b/drivers/fpga/altera-cvp.c
> index 3998d4f0e5e7..196d52558990 100644
> --- a/drivers/fpga/altera-cvp.c
> +++ b/drivers/fpga/altera-cvp.c
> @@ -403,6 +403,7 @@ static int altera_cvp_probe(struct pci_dev *pdev,
>  	struct altera_cvp_conf *conf;
>  	struct fpga_manager *mgr;
>  	u16 cmd, val;
> +	u32 regval;
>  	int ret;
>  
>  	/*
> @@ -419,6 +420,14 @@ static int altera_cvp_probe(struct pci_dev *pdev,
>  		return -ENODEV;
>  	}
>  
> +	pci_read_config_dword(pdev, VSE_CVP_STATUS, &regval);
> +	if (!(regval & VSE_CVP_STATUS_CVP_EN)) {
> +		dev_err(&pdev->dev,
> +			"CVP is disabled for this device: CVP_STATUS Reg 0x%x\n",
> +			regval);
> +		return -ENODEV;
> +	}
> +
>  	conf = devm_kzalloc(&pdev->dev, sizeof(*conf), GFP_KERNEL);
>  	if (!conf)
>  		return -ENOMEM;
> -- 
> 2.17.1
> 

Thanks,
Moritz

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] fpga: altera-cvp: Fix registration for CvP incapable devices
  2018-10-29 16:59 ` Moritz Fischer
@ 2018-11-01 18:39   ` Alan Tull
  0 siblings, 0 replies; 3+ messages in thread
From: Alan Tull @ 2018-11-01 18:39 UTC (permalink / raw)
  To: Moritz Fischer; +Cc: Anatolij Gustschin, linux-fpga, linux-kernel, puhm

On Mon, Oct 29, 2018 at 11:59 AM Moritz Fischer <mdf@kernel.org> wrote:
>
> Hi Anatolij, Andreas,
>
> On Mon, Oct 29, 2018 at 08:26:30AM +0100, Anatolij Gustschin wrote:
> > From: Andreas Puhm <puhm@oregano.at>
> >
> > The probe function needs to verify the CvP enable bit in order to
> > properly determine if FPGA Manager functionality can be safely
> > enabled.
> >
> > Fixes: 34d1dc17ce97 ("fpga manager: Add Altera CvP driver")
> > Signed-off-by: Andreas Puhm <puhm@oregano.at>
> > Signed-off-by: Anatolij Gustschin <agust@denx.de>
>
> Reviewed-by: Moritz Fischer <mdf@kernel.org>
Acked-by: Alan Tull <atull@kernel.org>

Thanks!

Alan

> > ---
> > Changes in v2:
> >  - improve Fixes tag
> >  - wrap lines in commit description
> >
> >  drivers/fpga/altera-cvp.c | 9 +++++++++
> >  1 file changed, 9 insertions(+)
> >
> > diff --git a/drivers/fpga/altera-cvp.c b/drivers/fpga/altera-cvp.c
> > index 3998d4f0e5e7..196d52558990 100644
> > --- a/drivers/fpga/altera-cvp.c
> > +++ b/drivers/fpga/altera-cvp.c
> > @@ -403,6 +403,7 @@ static int altera_cvp_probe(struct pci_dev *pdev,
> >       struct altera_cvp_conf *conf;
> >       struct fpga_manager *mgr;
> >       u16 cmd, val;
> > +     u32 regval;
> >       int ret;
> >
> >       /*
> > @@ -419,6 +420,14 @@ static int altera_cvp_probe(struct pci_dev *pdev,
> >               return -ENODEV;
> >       }
> >
> > +     pci_read_config_dword(pdev, VSE_CVP_STATUS, &regval);
> > +     if (!(regval & VSE_CVP_STATUS_CVP_EN)) {
> > +             dev_err(&pdev->dev,
> > +                     "CVP is disabled for this device: CVP_STATUS Reg 0x%x\n",
> > +                     regval);
> > +             return -ENODEV;
> > +     }
> > +
> >       conf = devm_kzalloc(&pdev->dev, sizeof(*conf), GFP_KERNEL);
> >       if (!conf)
> >               return -ENOMEM;
> > --
> > 2.17.1
> >
>
> Thanks,
> Moritz

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-11-01 18:40 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-29  7:26 [PATCH v2] fpga: altera-cvp: Fix registration for CvP incapable devices Anatolij Gustschin
2018-10-29 16:59 ` Moritz Fischer
2018-11-01 18:39   ` Alan Tull

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).