* [PATCH] drm/i915: Fix CSR MMIO address check
@ 2015-09-09 14:52 Takashi Iwai
2015-09-09 15:30 ` Daniel Vetter
0 siblings, 1 reply; 4+ messages in thread
From: Takashi Iwai @ 2015-09-09 14:52 UTC (permalink / raw)
To: Daniel Vetter; +Cc: intel-gfx
Fix a wrong logical AND (&&) used for the range check of CSR MMIO.
Spotted nicely by gcc -Wlogical-op flag:
drivers/gpu/drm/i915/intel_csr.c: In function ‘finish_csr_load’:
drivers/gpu/drm/i915/intel_csr.c:353:41: warning: logical ‘and’ of mutually exclusive tests is always false [-Wlogical-op]
Fixes: eb805623d8b1 ('drm/i915/skl: Add support to load SKL CSR firmware.')
Cc: <stable@vger.kernel.org> # v4.2
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
drivers/gpu/drm/i915/intel_csr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index ba1ae031e6fd..d0f1b8d833cd 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -350,7 +350,7 @@ static void finish_csr_load(const struct firmware *fw, void *context)
}
csr->mmio_count = dmc_header->mmio_count;
for (i = 0; i < dmc_header->mmio_count; i++) {
- if (dmc_header->mmioaddr[i] < CSR_MMIO_START_RANGE &&
+ if (dmc_header->mmioaddr[i] < CSR_MMIO_START_RANGE ||
dmc_header->mmioaddr[i] > CSR_MMIO_END_RANGE) {
DRM_ERROR(" Firmware has wrong mmio address 0x%x\n",
dmc_header->mmioaddr[i]);
--
2.5.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915: Fix CSR MMIO address check
2015-09-09 14:52 [PATCH] drm/i915: Fix CSR MMIO address check Takashi Iwai
@ 2015-09-09 15:30 ` Daniel Vetter
2015-09-09 19:57 ` Animesh Manna
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Vetter @ 2015-09-09 15:30 UTC (permalink / raw)
To: Takashi Iwai; +Cc: intel-gfx
On Wed, Sep 09, 2015 at 04:52:09PM +0200, Takashi Iwai wrote:
> Fix a wrong logical AND (&&) used for the range check of CSR MMIO.
>
> Spotted nicely by gcc -Wlogical-op flag:
> drivers/gpu/drm/i915/intel_csr.c: In function ‘finish_csr_load’:
> drivers/gpu/drm/i915/intel_csr.c:353:41: warning: logical ‘and’ of mutually exclusive tests is always false [-Wlogical-op]
>
> Fixes: eb805623d8b1 ('drm/i915/skl: Add support to load SKL CSR firmware.')
> Cc: <stable@vger.kernel.org> # v4.2
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Oops. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> and for Jani.
-Daniel
> ---
> drivers/gpu/drm/i915/intel_csr.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
> index ba1ae031e6fd..d0f1b8d833cd 100644
> --- a/drivers/gpu/drm/i915/intel_csr.c
> +++ b/drivers/gpu/drm/i915/intel_csr.c
> @@ -350,7 +350,7 @@ static void finish_csr_load(const struct firmware *fw, void *context)
> }
> csr->mmio_count = dmc_header->mmio_count;
> for (i = 0; i < dmc_header->mmio_count; i++) {
> - if (dmc_header->mmioaddr[i] < CSR_MMIO_START_RANGE &&
> + if (dmc_header->mmioaddr[i] < CSR_MMIO_START_RANGE ||
> dmc_header->mmioaddr[i] > CSR_MMIO_END_RANGE) {
> DRM_ERROR(" Firmware has wrong mmio address 0x%x\n",
> dmc_header->mmioaddr[i]);
> --
> 2.5.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915: Fix CSR MMIO address check
2015-09-09 15:30 ` Daniel Vetter
@ 2015-09-09 19:57 ` Animesh Manna
2015-09-10 9:13 ` Jani Nikula
0 siblings, 1 reply; 4+ messages in thread
From: Animesh Manna @ 2015-09-09 19:57 UTC (permalink / raw)
To: Daniel Vetter, Takashi Iwai; +Cc: intel-gfx
On 9/9/2015 9:00 PM, Daniel Vetter wrote:
> On Wed, Sep 09, 2015 at 04:52:09PM +0200, Takashi Iwai wrote:
>> Fix a wrong logical AND (&&) used for the range check of CSR MMIO.
>>
>> Spotted nicely by gcc -Wlogical-op flag:
>> drivers/gpu/drm/i915/intel_csr.c: In function ‘finish_csr_load’:
>> drivers/gpu/drm/i915/intel_csr.c:353:41: warning: logical ‘and’ of mutually exclusive tests is always false [-Wlogical-op]
>>
>> Fixes: eb805623d8b1 ('drm/i915/skl: Add support to load SKL CSR firmware.')
>> Cc: <stable@vger.kernel.org> # v4.2
>> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> Oops. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> and for Jani.
> -Daniel
The same change is submitted part of dmc-redesign patch series.
http://lists.freedesktop.org/archives/intel-gfx/2015-August/074447.html
-Animesh
>
>> ---
>> drivers/gpu/drm/i915/intel_csr.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
>> index ba1ae031e6fd..d0f1b8d833cd 100644
>> --- a/drivers/gpu/drm/i915/intel_csr.c
>> +++ b/drivers/gpu/drm/i915/intel_csr.c
>> @@ -350,7 +350,7 @@ static void finish_csr_load(const struct firmware *fw, void *context)
>> }
>> csr->mmio_count = dmc_header->mmio_count;
>> for (i = 0; i < dmc_header->mmio_count; i++) {
>> - if (dmc_header->mmioaddr[i] < CSR_MMIO_START_RANGE &&
>> + if (dmc_header->mmioaddr[i] < CSR_MMIO_START_RANGE ||
>> dmc_header->mmioaddr[i] > CSR_MMIO_END_RANGE) {
>> DRM_ERROR(" Firmware has wrong mmio address 0x%x\n",
>> dmc_header->mmioaddr[i]);
>> --
>> 2.5.1
>>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915: Fix CSR MMIO address check
2015-09-09 19:57 ` Animesh Manna
@ 2015-09-10 9:13 ` Jani Nikula
0 siblings, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2015-09-10 9:13 UTC (permalink / raw)
To: Animesh Manna, Daniel Vetter, Takashi Iwai; +Cc: intel-gfx
On Wed, 09 Sep 2015, Animesh Manna <animesh.manna@intel.com> wrote:
> On 9/9/2015 9:00 PM, Daniel Vetter wrote:
>> On Wed, Sep 09, 2015 at 04:52:09PM +0200, Takashi Iwai wrote:
>>> Fix a wrong logical AND (&&) used for the range check of CSR MMIO.
>>>
>>> Spotted nicely by gcc -Wlogical-op flag:
>>> drivers/gpu/drm/i915/intel_csr.c: In function ‘finish_csr_load’:
>>> drivers/gpu/drm/i915/intel_csr.c:353:41: warning: logical ‘and’ of mutually exclusive tests is always false [-Wlogical-op]
>>>
>>> Fixes: eb805623d8b1 ('drm/i915/skl: Add support to load SKL CSR firmware.')
>>> Cc: <stable@vger.kernel.org> # v4.2
>>> Signed-off-by: Takashi Iwai <tiwai@suse.de>
>> Oops. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> and for Jani.
>> -Daniel
> The same change is submitted part of dmc-redesign patch series.
> http://lists.freedesktop.org/archives/intel-gfx/2015-August/074447.html
Pushed Takashi's patch to drm-intel-next-fixes, thanks for the patch and
review.
When there are multiple patches doing the same thing, I usually pick the
earliest submitted. However Animesh's patch did not apply because it is
at the end of a long series. Indeed you should always prefer doing fixes
first, especially if they need to be backported to stable kernels. I
took the liberty of adding Animesh's contribution as Reviewed-by.
BR,
Jani.
>
> -Animesh
>>
>>> ---
>>> drivers/gpu/drm/i915/intel_csr.c | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
>>> index ba1ae031e6fd..d0f1b8d833cd 100644
>>> --- a/drivers/gpu/drm/i915/intel_csr.c
>>> +++ b/drivers/gpu/drm/i915/intel_csr.c
>>> @@ -350,7 +350,7 @@ static void finish_csr_load(const struct firmware *fw, void *context)
>>> }
>>> csr->mmio_count = dmc_header->mmio_count;
>>> for (i = 0; i < dmc_header->mmio_count; i++) {
>>> - if (dmc_header->mmioaddr[i] < CSR_MMIO_START_RANGE &&
>>> + if (dmc_header->mmioaddr[i] < CSR_MMIO_START_RANGE ||
>>> dmc_header->mmioaddr[i] > CSR_MMIO_END_RANGE) {
>>> DRM_ERROR(" Firmware has wrong mmio address 0x%x\n",
>>> dmc_header->mmioaddr[i]);
>>> --
>>> 2.5.1
>>>
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-09-10 9:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-09 14:52 [PATCH] drm/i915: Fix CSR MMIO address check Takashi Iwai
2015-09-09 15:30 ` Daniel Vetter
2015-09-09 19:57 ` Animesh Manna
2015-09-10 9:13 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox