Linaro-mm-sig

linaro-mm-sig@lists.linaro.org

8 participants
2915 discussions

Re: [Linaro-mm-sig] [PATCH 07/20] drm/radeon/radeon_display: Remove unused variable 'mod'

by Alex Deucher

On Mon, Nov 9, 2020 at 4:19 PM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/radeon/radeon_display.c: In function ‘radeon_div’: > drivers/gpu/drm/radeon/radeon_display.c:1094:11: warning: variable ‘mod’ set but not used [-Wunused-but-set-variable] > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: report to <xorg-driver-ati(a)lists.x.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/radeon/radeon_display.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c > index bd60f16fd0d78..78fceedfd9255 100644 > --- a/drivers/gpu/drm/radeon/radeon_display.c > +++ b/drivers/gpu/drm/radeon/radeon_display.c > @@ -1091,11 +1091,9 @@ void radeon_compute_pll_avivo(struct radeon_pll *pll, > /* pre-avivo */ > static inline uint32_t radeon_div(uint64_t n, uint32_t d) > { > - uint64_t mod; > - > n += d / 2; > > - mod = do_div(n, d); > + do_div(n, d); > return n; > } > > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 7 months

Re: [Linaro-mm-sig] [PATCH 03/20] drm/radeon/radeon_fence: Demote some non-conformant kernel-doc headers and fix another

by Alex Deucher

On Mon, Nov 9, 2020 at 4:19 PM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/radeon/radeon_fence.c:168: warning: Function parameter or member 'wait' not described in 'radeon_fence_check_signaled' > drivers/gpu/drm/radeon/radeon_fence.c:168: warning: Function parameter or member 'mode' not described in 'radeon_fence_check_signaled' > drivers/gpu/drm/radeon/radeon_fence.c:168: warning: Function parameter or member 'flags' not described in 'radeon_fence_check_signaled' > drivers/gpu/drm/radeon/radeon_fence.c:168: warning: Function parameter or member 'key' not described in 'radeon_fence_check_signaled' > drivers/gpu/drm/radeon/radeon_fence.c:393: warning: Function parameter or member 'f' not described in 'radeon_fence_enable_signaling' > drivers/gpu/drm/radeon/radeon_fence.c:393: warning: Excess function parameter 'fence' description in 'radeon_fence_enable_signaling' > drivers/gpu/drm/radeon/radeon_fence.c:1010: warning: Function parameter or member 'm' not described in 'radeon_debugfs_gpu_reset' > drivers/gpu/drm/radeon/radeon_fence.c:1010: warning: Function parameter or member 'data' not described in 'radeon_debugfs_gpu_reset' > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: Jerome Glisse <glisse(a)freedesktop.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks. Alex > --- > drivers/gpu/drm/radeon/radeon_fence.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c > index 8735bf2bb8b5c..9ee6e599ef83b 100644 > --- a/drivers/gpu/drm/radeon/radeon_fence.c > +++ b/drivers/gpu/drm/radeon/radeon_fence.c > @@ -157,7 +157,7 @@ int radeon_fence_emit(struct radeon_device *rdev, > return 0; > } > > -/** > +/* > * radeon_fence_check_signaled - callback from fence_queue > * > * this function is called with fence_queue lock held, which is also used > @@ -383,7 +383,7 @@ static bool radeon_fence_is_signaled(struct dma_fence *f) > > /** > * radeon_fence_enable_signaling - enable signalling on fence > - * @fence: fence > + * @f: fence > * > * This function is called with fence_queue lock held, and adds a callback > * to fence_queue that checks if this fence is signaled, and if so it > @@ -1001,7 +1001,7 @@ static int radeon_debugfs_fence_info(struct seq_file *m, void *data) > return 0; > } > > -/** > +/* > * radeon_debugfs_gpu_reset - manually trigger a gpu reset > * > * Manually trigger a gpu reset at the next fence wait. > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 7 months

Re: [Linaro-mm-sig] [PATCH 15/19] drm/radeon: Move prototypes to shared header

by Alex Deucher

On Fri, Nov 6, 2020 at 4:50 PM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/radeon/radeon_kms.c:756:5: warning: no previous prototype for ‘radeon_get_vblank_counter_kms’ [-Wmissing-prototypes] > 756 | u32 radeon_get_vblank_counter_kms(struct drm_crtc *crtc) > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/radeon_kms.c:826:5: warning: no previous prototype for ‘radeon_enable_vblank_kms’ [-Wmissing-prototypes] > 826 | int radeon_enable_vblank_kms(struct drm_crtc *crtc) > | ^~~~~~~~~~~~~~~~~~~~~~~~ > drivers/gpu/drm/radeon/radeon_kms.c:853:6: warning: no previous prototype for ‘radeon_disable_vblank_kms’ [-Wmissing-prototypes] > 853 | void radeon_disable_vblank_kms(struct drm_crtc *crtc) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/radeon/radeon.h | 6 ++++++ > drivers/gpu/drm/radeon/radeon_display.c | 4 ---- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h > index e1132d86d2507..961a31b8805c2 100644 > --- a/drivers/gpu/drm/radeon/radeon.h > +++ b/drivers/gpu/drm/radeon/radeon.h > @@ -2832,6 +2832,12 @@ extern void radeon_program_register_sequence(struct radeon_device *rdev, > const u32 array_size); > struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev); > > +/* KMS */ > + > +u32 radeon_get_vblank_counter_kms(struct drm_crtc *crtc); > +int radeon_enable_vblank_kms(struct drm_crtc *crtc); > +void radeon_disable_vblank_kms(struct drm_crtc *crtc); > + > /* > * vm > */ > diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c > index b79686cf8bdbd..bd60f16fd0d78 100644 > --- a/drivers/gpu/drm/radeon/radeon_display.c > +++ b/drivers/gpu/drm/radeon/radeon_display.c > @@ -45,10 +45,6 @@ > #include "atom.h" > #include "radeon.h" > > -u32 radeon_get_vblank_counter_kms(struct drm_crtc *crtc); > -int radeon_enable_vblank_kms(struct drm_crtc *crtc); > -void radeon_disable_vblank_kms(struct drm_crtc *crtc); > - > static void avivo_crtc_load_lut(struct drm_crtc *crtc) > { > struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 7 months

Re: [Linaro-mm-sig] [PATCH 18/19] gpu: drm: amd: amdgpu: amdgpu: Mark global variables as __maybe_unused

by Alex Deucher

On Thu, Nov 5, 2020 at 9:52 AM Lee Jones <lee.jones(a)linaro.org> wrote: > > These 3 variables are used in *some* sourcefiles which include > amdgpu.h, but not *all*. This leads to a flurry of build warnings. > > Fixes the following W=1 kernel build warning(s): > > from drivers/gpu/drm/amd/amdgpu/amdgpu.h:67, > drivers/gpu/drm/amd/amdgpu/amdgpu.h:198:19: warning: ‘no_system_mem_limit’ defined but not used [-Wunused-const-variable=] > drivers/gpu/drm/amd/amdgpu/amdgpu.h:197:19: warning: ‘debug_evictions’ defined but not used [-Wunused-const-variable=] > drivers/gpu/drm/amd/amdgpu/amdgpu.h:196:18: warning: ‘sched_policy’ defined but not used [-Wunused-const-variable=] > > NB: Repeats ~650 times - snipped for brevity. > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > index 183b09d71b64a..5939753080056 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h > @@ -193,9 +193,9 @@ extern int sched_policy; > extern bool debug_evictions; > extern bool no_system_mem_limit; > #else > -static const int sched_policy = KFD_SCHED_POLICY_HWS; > -static const bool debug_evictions; /* = false */ > -static const bool no_system_mem_limit; > +static const int __maybe_unused sched_policy = KFD_SCHED_POLICY_HWS; > +static const bool __maybe_unused debug_evictions; /* = false */ > +static const bool __maybe_unused no_system_mem_limit; > #endif > > extern int amdgpu_tmz; > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 7 months

Re: [Linaro-mm-sig] [PATCH 07/19] gpu: drm: scheduler: sched_entity: Demote non-conformant kernel-doc headers

by Alex Deucher

On Thu, Nov 5, 2020 at 9:52 AM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/scheduler/sched_entity.c:316: warning: Function parameter or member 'f' not described in 'drm_sched_entity_clear_dep' > drivers/gpu/drm/scheduler/sched_entity.c:316: warning: Function parameter or member 'cb' not described in 'drm_sched_entity_clear_dep' > drivers/gpu/drm/scheduler/sched_entity.c:330: warning: Function parameter or member 'f' not described in 'drm_sched_entity_wakeup' > drivers/gpu/drm/scheduler/sched_entity.c:330: warning: Function parameter or member 'cb' not described in 'drm_sched_entity_wakeup' > > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: Nirmoy Das <nirmoy.aiemd(a)gmail.com> > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/scheduler/sched_entity.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c > index f8ec277a6aa85..c1ac3e4003c6f 100644 > --- a/drivers/gpu/drm/scheduler/sched_entity.c > +++ b/drivers/gpu/drm/scheduler/sched_entity.c > @@ -308,7 +308,7 @@ void drm_sched_entity_destroy(struct drm_sched_entity *entity) > } > EXPORT_SYMBOL(drm_sched_entity_destroy); > > -/** > +/* > * drm_sched_entity_clear_dep - callback to clear the entities dependency > */ > static void drm_sched_entity_clear_dep(struct dma_fence *f, > @@ -321,7 +321,7 @@ static void drm_sched_entity_clear_dep(struct dma_fence *f, > dma_fence_put(f); > } > > -/** > +/* > * drm_sched_entity_clear_dep - callback to clear the entities dependency and > * wake up scheduler > */ > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 7 months

Re: [Linaro-mm-sig] [PATCH 06/19] gpu: drm: scheduler: sched_main: Provide missing description for 'sched' paramter

by Alex Deucher

On Thu, Nov 5, 2020 at 9:52 AM Lee Jones <lee.jones(a)linaro.org> wrote: > > Fixes the following W=1 kernel build warning(s): > > drivers/gpu/drm/scheduler/sched_main.c:74: warning: Function parameter or member 'sched' not described in 'drm_sched_rq_init' > > Cc: David Airlie <airlied(a)linux.ie> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: dri-devel(a)lists.freedesktop.org > Cc: linux-media(a)vger.kernel.org > Cc: linaro-mm-sig(a)lists.linaro.org > Signed-off-by: Lee Jones <lee.jones(a)linaro.org> Applied. Thanks! Alex > --- > drivers/gpu/drm/scheduler/sched_main.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c > index 9a0d77a680180..da24c4e8b9fb3 100644 > --- a/drivers/gpu/drm/scheduler/sched_main.c > +++ b/drivers/gpu/drm/scheduler/sched_main.c > @@ -65,6 +65,7 @@ static void drm_sched_process_job(struct dma_fence *f, struct dma_fence_cb *cb); > /** > * drm_sched_rq_init - initialize a given run queue struct > * > + * @sched: scheduler instance to associate with this run queue > * @rq: scheduler run queue > * > * Initializes a scheduler runqueue. > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 7 months

Re: [Linaro-mm-sig] [PATCH] drivers: amdgpu: amdgpu_display: Fixed the spelling of falg to flag

by Christian König

Am 09.11.20 um 22:07 schrieb Bhaskar Chowdhury: > s/falg/flag/p > > Signed-off-by: Bhaskar Chowdhury <unixbhaskar(a)gmail.com> Reviewed-by: Christian König <christian.koenig(a)amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > index 2e8a8b57639f..9223502c1e5b 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > @@ -509,7 +509,7 @@ uint32_t amdgpu_display_supported_domains(struct amdgpu_device *adev, > * to avoid hang caused by placement of scanout BO in GTT on certain > * APUs. So force the BO placement to VRAM in case this architecture > * will not allow USWC mappings. > - * Also, don't allow GTT domain if the BO doens't have USWC falg set. > + * Also, don't allow GTT domain if the BO doens't have USWC flag set. > */ > if ((bo_flags & AMDGPU_GEM_CREATE_CPU_GTT_USWC) && > amdgpu_bo_support_uswc(bo_flags) && > -- > 2.26.2 >

4 years, 7 months

[PATCH AUTOSEL 5.4 39/42] i2c: sh_mobile: implement atomic transfers

by Sasha Levin

From: Ulrich Hecht <uli+renesas(a)fpond.eu> [ Upstream commit a49cc1fe9d64a2dc4e19b599204f403e5d25f44b ] Implements atomic transfers to fix reboot/shutdown on r8a7790 Lager and similar boards. Signed-off-by: Ulrich Hecht <uli+renesas(a)fpond.eu> Tested-by: Wolfram Sang <wsa+renesas(a)sang-engineering.com> Tested-by: Geert Uytterhoeven <geert+renesas(a)glider.be> [wsa: some whitespace fixing] Signed-off-by: Wolfram Sang <wsa(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/i2c/busses/i2c-sh_mobile.c | 86 +++++++++++++++++++++++------- 1 file changed, 66 insertions(+), 20 deletions(-) diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c index 8777af4c695e9..d5dd58c27ce5f 100644 --- a/drivers/i2c/busses/i2c-sh_mobile.c +++ b/drivers/i2c/busses/i2c-sh_mobile.c @@ -129,6 +129,7 @@ struct sh_mobile_i2c_data { int sr; bool send_stop; bool stop_after_dma; + bool atomic_xfer; struct resource *res; struct dma_chan *dma_tx; @@ -333,13 +334,15 @@ static unsigned char i2c_op(struct sh_mobile_i2c_data *pd, enum sh_mobile_i2c_op ret = iic_rd(pd, ICDR); break; case OP_RX_STOP: /* enable DTE interrupt, issue stop */ - iic_wr(pd, ICIC, - ICIC_DTEE | ICIC_WAITE | ICIC_ALE | ICIC_TACKE); + if (!pd->atomic_xfer) + iic_wr(pd, ICIC, + ICIC_DTEE | ICIC_WAITE | ICIC_ALE | ICIC_TACKE); iic_wr(pd, ICCR, ICCR_ICE | ICCR_RACK); break; case OP_RX_STOP_DATA: /* enable DTE interrupt, read data, issue stop */ - iic_wr(pd, ICIC, - ICIC_DTEE | ICIC_WAITE | ICIC_ALE | ICIC_TACKE); + if (!pd->atomic_xfer) + iic_wr(pd, ICIC, + ICIC_DTEE | ICIC_WAITE | ICIC_ALE | ICIC_TACKE); ret = iic_rd(pd, ICDR); iic_wr(pd, ICCR, ICCR_ICE | ICCR_RACK); break; @@ -435,7 +438,8 @@ static irqreturn_t sh_mobile_i2c_isr(int irq, void *dev_id) if (wakeup) { pd->sr |= SW_DONE; - wake_up(&pd->wait); + if (!pd->atomic_xfer) + wake_up(&pd->wait); } /* defeat write posting to avoid spurious WAIT interrupts */ @@ -587,6 +591,9 @@ static void start_ch(struct sh_mobile_i2c_data *pd, struct i2c_msg *usr_msg, pd->pos = -1; pd->sr = 0; + if (pd->atomic_xfer) + return; + pd->dma_buf = i2c_get_dma_safe_msg_buf(pd->msg, 8); if (pd->dma_buf) sh_mobile_i2c_xfer_dma(pd); @@ -643,15 +650,13 @@ static int poll_busy(struct sh_mobile_i2c_data *pd) return i ? 0 : -ETIMEDOUT; } -static int sh_mobile_i2c_xfer(struct i2c_adapter *adapter, - struct i2c_msg *msgs, - int num) +static int sh_mobile_xfer(struct sh_mobile_i2c_data *pd, + struct i2c_msg *msgs, int num) { - struct sh_mobile_i2c_data *pd = i2c_get_adapdata(adapter); struct i2c_msg *msg; int err = 0; int i; - long timeout; + long time_left; /* Wake up device and enable clock */ pm_runtime_get_sync(pd->dev); @@ -668,15 +673,35 @@ static int sh_mobile_i2c_xfer(struct i2c_adapter *adapter, if (do_start) i2c_op(pd, OP_START); - /* The interrupt handler takes care of the rest... */ - timeout = wait_event_timeout(pd->wait, - pd->sr & (ICSR_TACK | SW_DONE), - adapter->timeout); - - /* 'stop_after_dma' tells if DMA transfer was complete */ - i2c_put_dma_safe_msg_buf(pd->dma_buf, pd->msg, pd->stop_after_dma); + if (pd->atomic_xfer) { + unsigned long j = jiffies + pd->adap.timeout; + + time_left = time_before_eq(jiffies, j); + while (time_left && + !(pd->sr & (ICSR_TACK | SW_DONE))) { + unsigned char sr = iic_rd(pd, ICSR); + + if (sr & (ICSR_AL | ICSR_TACK | + ICSR_WAIT | ICSR_DTE)) { + sh_mobile_i2c_isr(0, pd); + udelay(150); + } else { + cpu_relax(); + } + time_left = time_before_eq(jiffies, j); + } + } else { + /* The interrupt handler takes care of the rest... */ + time_left = wait_event_timeout(pd->wait, + pd->sr & (ICSR_TACK | SW_DONE), + pd->adap.timeout); + + /* 'stop_after_dma' tells if DMA xfer was complete */ + i2c_put_dma_safe_msg_buf(pd->dma_buf, pd->msg, + pd->stop_after_dma); + } - if (!timeout) { + if (!time_left) { dev_err(pd->dev, "Transfer request timed out\n"); if (pd->dma_direction != DMA_NONE) sh_mobile_i2c_cleanup_dma(pd); @@ -702,14 +727,35 @@ static int sh_mobile_i2c_xfer(struct i2c_adapter *adapter, return err ?: num; } +static int sh_mobile_i2c_xfer(struct i2c_adapter *adapter, + struct i2c_msg *msgs, + int num) +{ + struct sh_mobile_i2c_data *pd = i2c_get_adapdata(adapter); + + pd->atomic_xfer = false; + return sh_mobile_xfer(pd, msgs, num); +} + +static int sh_mobile_i2c_xfer_atomic(struct i2c_adapter *adapter, + struct i2c_msg *msgs, + int num) +{ + struct sh_mobile_i2c_data *pd = i2c_get_adapdata(adapter); + + pd->atomic_xfer = true; + return sh_mobile_xfer(pd, msgs, num); +} + static u32 sh_mobile_i2c_func(struct i2c_adapter *adapter) { return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_PROTOCOL_MANGLING; } static const struct i2c_algorithm sh_mobile_i2c_algorithm = { - .functionality = sh_mobile_i2c_func, - .master_xfer = sh_mobile_i2c_xfer, + .functionality = sh_mobile_i2c_func, + .master_xfer = sh_mobile_i2c_xfer, + .master_xfer_atomic = sh_mobile_i2c_xfer_atomic, }; static const struct i2c_adapter_quirks sh_mobile_i2c_quirks = { -- 2.27.0

4 years, 7 months

[PATCH AUTOSEL 5.9 49/55] i2c: sh_mobile: implement atomic transfers

by Sasha Levin

From: Ulrich Hecht <uli+renesas(a)fpond.eu> [ Upstream commit a49cc1fe9d64a2dc4e19b599204f403e5d25f44b ] Implements atomic transfers to fix reboot/shutdown on r8a7790 Lager and similar boards. Signed-off-by: Ulrich Hecht <uli+renesas(a)fpond.eu> Tested-by: Wolfram Sang <wsa+renesas(a)sang-engineering.com> Tested-by: Geert Uytterhoeven <geert+renesas(a)glider.be> [wsa: some whitespace fixing] Signed-off-by: Wolfram Sang <wsa(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/i2c/busses/i2c-sh_mobile.c | 86 +++++++++++++++++++++++------- 1 file changed, 66 insertions(+), 20 deletions(-) diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c index cab7255599991..bdd60770779ad 100644 --- a/drivers/i2c/busses/i2c-sh_mobile.c +++ b/drivers/i2c/busses/i2c-sh_mobile.c @@ -129,6 +129,7 @@ struct sh_mobile_i2c_data { int sr; bool send_stop; bool stop_after_dma; + bool atomic_xfer; struct resource *res; struct dma_chan *dma_tx; @@ -330,13 +331,15 @@ static unsigned char i2c_op(struct sh_mobile_i2c_data *pd, enum sh_mobile_i2c_op ret = iic_rd(pd, ICDR); break; case OP_RX_STOP: /* enable DTE interrupt, issue stop */ - iic_wr(pd, ICIC, - ICIC_DTEE | ICIC_WAITE | ICIC_ALE | ICIC_TACKE); + if (!pd->atomic_xfer) + iic_wr(pd, ICIC, + ICIC_DTEE | ICIC_WAITE | ICIC_ALE | ICIC_TACKE); iic_wr(pd, ICCR, ICCR_ICE | ICCR_RACK); break; case OP_RX_STOP_DATA: /* enable DTE interrupt, read data, issue stop */ - iic_wr(pd, ICIC, - ICIC_DTEE | ICIC_WAITE | ICIC_ALE | ICIC_TACKE); + if (!pd->atomic_xfer) + iic_wr(pd, ICIC, + ICIC_DTEE | ICIC_WAITE | ICIC_ALE | ICIC_TACKE); ret = iic_rd(pd, ICDR); iic_wr(pd, ICCR, ICCR_ICE | ICCR_RACK); break; @@ -429,7 +432,8 @@ static irqreturn_t sh_mobile_i2c_isr(int irq, void *dev_id) if (wakeup) { pd->sr |= SW_DONE; - wake_up(&pd->wait); + if (!pd->atomic_xfer) + wake_up(&pd->wait); } /* defeat write posting to avoid spurious WAIT interrupts */ @@ -581,6 +585,9 @@ static void start_ch(struct sh_mobile_i2c_data *pd, struct i2c_msg *usr_msg, pd->pos = -1; pd->sr = 0; + if (pd->atomic_xfer) + return; + pd->dma_buf = i2c_get_dma_safe_msg_buf(pd->msg, 8); if (pd->dma_buf) sh_mobile_i2c_xfer_dma(pd); @@ -637,15 +644,13 @@ static int poll_busy(struct sh_mobile_i2c_data *pd) return i ? 0 : -ETIMEDOUT; } -static int sh_mobile_i2c_xfer(struct i2c_adapter *adapter, - struct i2c_msg *msgs, - int num) +static int sh_mobile_xfer(struct sh_mobile_i2c_data *pd, + struct i2c_msg *msgs, int num) { - struct sh_mobile_i2c_data *pd = i2c_get_adapdata(adapter); struct i2c_msg *msg; int err = 0; int i; - long timeout; + long time_left; /* Wake up device and enable clock */ pm_runtime_get_sync(pd->dev); @@ -662,15 +667,35 @@ static int sh_mobile_i2c_xfer(struct i2c_adapter *adapter, if (do_start) i2c_op(pd, OP_START); - /* The interrupt handler takes care of the rest... */ - timeout = wait_event_timeout(pd->wait, - pd->sr & (ICSR_TACK | SW_DONE), - adapter->timeout); - - /* 'stop_after_dma' tells if DMA transfer was complete */ - i2c_put_dma_safe_msg_buf(pd->dma_buf, pd->msg, pd->stop_after_dma); + if (pd->atomic_xfer) { + unsigned long j = jiffies + pd->adap.timeout; + + time_left = time_before_eq(jiffies, j); + while (time_left && + !(pd->sr & (ICSR_TACK | SW_DONE))) { + unsigned char sr = iic_rd(pd, ICSR); + + if (sr & (ICSR_AL | ICSR_TACK | + ICSR_WAIT | ICSR_DTE)) { + sh_mobile_i2c_isr(0, pd); + udelay(150); + } else { + cpu_relax(); + } + time_left = time_before_eq(jiffies, j); + } + } else { + /* The interrupt handler takes care of the rest... */ + time_left = wait_event_timeout(pd->wait, + pd->sr & (ICSR_TACK | SW_DONE), + pd->adap.timeout); + + /* 'stop_after_dma' tells if DMA xfer was complete */ + i2c_put_dma_safe_msg_buf(pd->dma_buf, pd->msg, + pd->stop_after_dma); + } - if (!timeout) { + if (!time_left) { dev_err(pd->dev, "Transfer request timed out\n"); if (pd->dma_direction != DMA_NONE) sh_mobile_i2c_cleanup_dma(pd); @@ -696,14 +721,35 @@ static int sh_mobile_i2c_xfer(struct i2c_adapter *adapter, return err ?: num; } +static int sh_mobile_i2c_xfer(struct i2c_adapter *adapter, + struct i2c_msg *msgs, + int num) +{ + struct sh_mobile_i2c_data *pd = i2c_get_adapdata(adapter); + + pd->atomic_xfer = false; + return sh_mobile_xfer(pd, msgs, num); +} + +static int sh_mobile_i2c_xfer_atomic(struct i2c_adapter *adapter, + struct i2c_msg *msgs, + int num) +{ + struct sh_mobile_i2c_data *pd = i2c_get_adapdata(adapter); + + pd->atomic_xfer = true; + return sh_mobile_xfer(pd, msgs, num); +} + static u32 sh_mobile_i2c_func(struct i2c_adapter *adapter) { return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_PROTOCOL_MANGLING; } static const struct i2c_algorithm sh_mobile_i2c_algorithm = { - .functionality = sh_mobile_i2c_func, - .master_xfer = sh_mobile_i2c_xfer, + .functionality = sh_mobile_i2c_func, + .master_xfer = sh_mobile_i2c_xfer, + .master_xfer_atomic = sh_mobile_i2c_xfer_atomic, }; static const struct i2c_adapter_quirks sh_mobile_i2c_quirks = { -- 2.27.0

4 years, 7 months

Re: [Linaro-mm-sig] [PATCH 00/20] [Set 3] Rid W=1 warnings from GPU

by Alex Deucher

On Mon, Nov 9, 2020 at 4:19 PM Lee Jones <lee.jones(a)linaro.org> wrote: > > This set is part of a larger effort attempting to clean-up W=1 > kernel builds, which are currently overwhelmingly riddled with > niggly little warnings. > > This set takes the running (decreasing) total from 5000 before > [Set 1] down to 2300. > > Lee Jones (20): > drm/radeon/radeon_ttm: Place declaration of 'rdev' in same clause as > its use > drm/radeon: Move radeon_ttm{init,fini} to shared location > drm/radeon/radeon_fence: Demote some non-conformant kernel-doc headers > and fix another > drm/radeon: Move 'radeon_add_legacy_encoder' prototype to shared > header > drm/radeon: Move 'radeon_add_legacy_encoder's prototype to shared > location > drm/radeon/radeon_connectors: Strip out set but unused variable 'ret' > drm/radeon/radeon_display: Remove unused variable 'mod' > drm/radeon/radeon_i2c: Remove pointless function header > drm/radeon/radeon_irq_kms: Demote non-conformant kernel-doc fix > another > drm/radeon/radeon_ring: Add missing function parameters 'rdev' and > 'data' > drm/radeon/r600: Strip out set but unused 'tmp' variables > drm/radeon/radeon_cs: Fix a bunch of doc-rot issues > drm/radeon/evergreen: Move 'rv770_set_clk_bypass_mode' prototype to > shared location > drm/radeon: Move 'radeon_pm_acpi_event_handler' prototype into shared > header > drm/radeon/r600d: Move 'rc600_*' prototypes into shared header > drm/radeon/radeon_audio: Move 'dce3_2_*' prototypes to shared location > drm/radeon/evergreend: Move 'evergreen_*' and 'sumo_*' prototypes out > to shared location > drm/radeon/radeon_display: Fix function doc formatting and missing > param issues > drm/radeon/r600: Fix a misnamed parameter description and a formatting > issue > drm/radeon/cik: Fix a bunch of function parameter descriptions > > drivers/gpu/drm/radeon/cik.c | 10 +++---- > drivers/gpu/drm/radeon/evergreen.c | 1 - > drivers/gpu/drm/radeon/ni.c | 16 ---------- > drivers/gpu/drm/radeon/r600.c | 11 +++---- > drivers/gpu/drm/radeon/r600d.h | 14 +++++++++ > drivers/gpu/drm/radeon/radeon.h | 34 ++++++++++++++++++++++ > drivers/gpu/drm/radeon/radeon_acpi.c | 2 -- > drivers/gpu/drm/radeon/radeon_atombios.c | 5 ---- > drivers/gpu/drm/radeon/radeon_audio.c | 23 +-------------- > drivers/gpu/drm/radeon/radeon_audio.h | 12 ++++++++ > drivers/gpu/drm/radeon/radeon_combios.c | 5 ---- > drivers/gpu/drm/radeon/radeon_connectors.c | 4 +-- > drivers/gpu/drm/radeon/radeon_cs.c | 12 ++++---- > drivers/gpu/drm/radeon/radeon_display.c | 17 +++++------ > drivers/gpu/drm/radeon/radeon_encoders.c | 3 -- > drivers/gpu/drm/radeon/radeon_fence.c | 6 ++-- > drivers/gpu/drm/radeon/radeon_i2c.c | 4 --- > drivers/gpu/drm/radeon/radeon_irq_kms.c | 6 ++-- > drivers/gpu/drm/radeon/radeon_object.c | 2 -- > drivers/gpu/drm/radeon/radeon_ring.c | 3 ++ > drivers/gpu/drm/radeon/radeon_ttm.c | 8 ++--- > drivers/gpu/drm/radeon/si.c | 6 ---- > 22 files changed, 96 insertions(+), 108 deletions(-) Instead of just dumping everything in radeon.h, I think it would be cleaner to add new headers that match the .c files that define them. E.g., add evergreen.h and put all the stuff from evergreen.c in there. Add rv770.h and add all the stuff defined in rv770.c, etc. Alex > > Cc: Alex Deucher <alexander.deucher(a)amd.com> > Cc: amd-gfx(a)lists.freedesktop.org > Cc: "Christian König" <christian.koenig(a)amd.com> > Cc: Daniel Vetter <daniel(a)ffwll.ch> > Cc: David Airlie <airlied(a)linux.ie> > Cc: dri-devel(a)lists.freedesktop.org > Cc: Jerome Glisse <glisse(a)freedesktop.org> > Cc: linaro-mm-sig(a)lists.linaro.org > Cc: linux-media(a)vger.kernel.org > Cc: report to <xorg-driver-ati(a)lists.x.org> > Cc: Slava Grigorev <slava.grigorev(a)amd.com> > Cc: Sumit Semwal <sumit.semwal(a)linaro.org> > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > dri-devel(a)lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel

4 years, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Linaro-mm-sig