| Message ID | 1553483264-5379-11-git-send-email-hao.wu@intel.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | add new features for FPGA DFL drivers | expand |
On Mon, Mar 25, 2019 at 11:07:37AM +0800, Wu Hao wrote: > As these two functions are used by other private features. e.g. > in error reporting private feature, it requires to check port status > and reset port for error clearing. > > Signed-off-by: Xu Yilun <yilun.xu@intel.com> > Signed-off-by: Wu Hao <hao.wu@intel.com> Acked-by: Moritz Fischer <mdf@kernel.org> > --- > drivers/fpga/dfl-afu-main.c | 25 ++++++++++++++----------- > drivers/fpga/dfl-afu.h | 3 +++ > 2 files changed, 17 insertions(+), 11 deletions(-) > > diff --git a/drivers/fpga/dfl-afu-main.c b/drivers/fpga/dfl-afu-main.c > index 2916876..e727d9b 100644 > --- a/drivers/fpga/dfl-afu-main.c > +++ b/drivers/fpga/dfl-afu-main.c > @@ -24,14 +24,16 @@ > #define DRV_VERSION "0.8" > > /** > - * port_enable - enable a port > + * __port_enable - enable a port > * @pdev: port platform device. > * > * Enable Port by clear the port soft reset bit, which is set by default. > * The AFU is unable to respond to any MMIO access while in reset. > - * port_enable function should only be used after port_disable function. > + * __port_enable function should only be used after __port_disable function. > + * > + * The caller needs to hold lock for protection. > */ > -static void port_enable(struct platform_device *pdev) > +void __port_enable(struct platform_device *pdev) > { > struct dfl_feature_platform_data *pdata = dev_get_platdata(&pdev->dev); > void __iomem *base; > @@ -54,13 +56,14 @@ static void port_enable(struct platform_device *pdev) > #define RST_POLL_TIMEOUT 1000 /* us */ > > /** > - * port_disable - disable a port > + * __port_disable - disable a port > * @pdev: port platform device. > * > - * Disable Port by setting the port soft reset bit, it puts the port into > - * reset. > + * Disable Port by setting the port soft reset bit, it puts the port into reset. > + * > + * The caller needs to hold lock for protection. > */ > -static int port_disable(struct platform_device *pdev) > +int __port_disable(struct platform_device *pdev) > { > struct dfl_feature_platform_data *pdata = dev_get_platdata(&pdev->dev); > void __iomem *base; > @@ -106,9 +109,9 @@ static int __port_reset(struct platform_device *pdev) > { > int ret; > > - ret = port_disable(pdev); > + ret = __port_disable(pdev); > if (!ret) > - port_enable(pdev); > + __port_enable(pdev); > > return ret; > } > @@ -810,9 +813,9 @@ static int port_enable_set(struct platform_device *pdev, bool enable) > > mutex_lock(&pdata->lock); > if (enable) > - port_enable(pdev); > + __port_enable(pdev); > else > - ret = port_disable(pdev); > + ret = __port_disable(pdev); > mutex_unlock(&pdata->lock); > > return ret; > diff --git a/drivers/fpga/dfl-afu.h b/drivers/fpga/dfl-afu.h > index 0c7630a..35e60c5 100644 > --- a/drivers/fpga/dfl-afu.h > +++ b/drivers/fpga/dfl-afu.h > @@ -79,6 +79,9 @@ struct dfl_afu { > struct dfl_feature_platform_data *pdata; > }; > > +void __port_enable(struct platform_device *pdev); > +int __port_disable(struct platform_device *pdev); > + > void afu_mmio_region_init(struct dfl_feature_platform_data *pdata); > int afu_mmio_region_add(struct dfl_feature_platform_data *pdata, > u32 region_index, u64 region_size, u64 phys, u32 flags); > -- > 2.7.4 >
On Tue, Apr 2, 2019 at 10:50 AM Moritz Fischer <mdf@kernel.org> wrote: Hi Hao, > > On Mon, Mar 25, 2019 at 11:07:37AM +0800, Wu Hao wrote: > > As these two functions are used by other private features. e.g. > > in error reporting private feature, it requires to check port status > > and reset port for error clearing. > > > > Signed-off-by: Xu Yilun <yilun.xu@intel.com> > > Signed-off-by: Wu Hao <hao.wu@intel.com> > Acked-by: Moritz Fischer <mdf@kernel.org> Acked-by: Alan Tull <atull@kernel.org> Thanks, Alan
diff --git a/drivers/fpga/dfl-afu-main.c b/drivers/fpga/dfl-afu-main.c index 2916876..e727d9b 100644 --- a/drivers/fpga/dfl-afu-main.c +++ b/drivers/fpga/dfl-afu-main.c @@ -24,14 +24,16 @@ #define DRV_VERSION "0.8" /** - * port_enable - enable a port + * __port_enable - enable a port * @pdev: port platform device. * * Enable Port by clear the port soft reset bit, which is set by default. * The AFU is unable to respond to any MMIO access while in reset. - * port_enable function should only be used after port_disable function. + * __port_enable function should only be used after __port_disable function. + * + * The caller needs to hold lock for protection. */ -static void port_enable(struct platform_device *pdev) +void __port_enable(struct platform_device *pdev) { struct dfl_feature_platform_data *pdata = dev_get_platdata(&pdev->dev); void __iomem *base; @@ -54,13 +56,14 @@ static void port_enable(struct platform_device *pdev) #define RST_POLL_TIMEOUT 1000 /* us */ /** - * port_disable - disable a port + * __port_disable - disable a port * @pdev: port platform device. * - * Disable Port by setting the port soft reset bit, it puts the port into - * reset. + * Disable Port by setting the port soft reset bit, it puts the port into reset. + * + * The caller needs to hold lock for protection. */ -static int port_disable(struct platform_device *pdev) +int __port_disable(struct platform_device *pdev) { struct dfl_feature_platform_data *pdata = dev_get_platdata(&pdev->dev); void __iomem *base; @@ -106,9 +109,9 @@ static int __port_reset(struct platform_device *pdev) { int ret; - ret = port_disable(pdev); + ret = __port_disable(pdev); if (!ret) - port_enable(pdev); + __port_enable(pdev); return ret; } @@ -810,9 +813,9 @@ static int port_enable_set(struct platform_device *pdev, bool enable) mutex_lock(&pdata->lock); if (enable) - port_enable(pdev); + __port_enable(pdev); else - ret = port_disable(pdev); + ret = __port_disable(pdev); mutex_unlock(&pdata->lock); return ret; diff --git a/drivers/fpga/dfl-afu.h b/drivers/fpga/dfl-afu.h index 0c7630a..35e60c5 100644 --- a/drivers/fpga/dfl-afu.h +++ b/drivers/fpga/dfl-afu.h @@ -79,6 +79,9 @@ struct dfl_afu { struct dfl_feature_platform_data *pdata; }; +void __port_enable(struct platform_device *pdev); +int __port_disable(struct platform_device *pdev); + void afu_mmio_region_init(struct dfl_feature_platform_data *pdata); int afu_mmio_region_add(struct dfl_feature_platform_data *pdata, u32 region_index, u64 region_size, u64 phys, u32 flags);