From: "Christian König" <christian.koenig@amd.com>
To: David Miller <davem@davemloft.net>, alexander.deucher@amd.com
Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] radeon: Do not directly dereference pointers to BIOS area.
Date: Thu, 19 Mar 2015 09:50:58 +0100 [thread overview]
Message-ID: <550A8DF2.1010104@amd.com> (raw)
In-Reply-To: <20150318.231840.1263267500500914630.davem@davemloft.net>
In general I would say yes, but for this particular hardware it's a bit
questionable to do so.
For radeon hardware to work correctly the CPU access to the PCIE BARs
should work even without using the specialized IO macros/functions,
otherwise mapping VRAM CPU accessible isn't really possible.
What's the background of the change? Some problems on a certain CPU
platform? or just general cleanups?
Regards,
Christian.
On 19.03.2015 04:18, David Miller wrote:
> Use readb() and memcpy_fromio() accessors instead.
>
> Signed-off-by: David S. Miller <davem@davemloft.net>
>
> diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c
> index 63ccb8f..d27e4cc 100644
> --- a/drivers/gpu/drm/radeon/radeon_bios.c
> +++ b/drivers/gpu/drm/radeon/radeon_bios.c
> @@ -76,7 +76,7 @@ static bool igp_read_bios_from_vram(struct radeon_device *rdev)
>
> static bool radeon_read_bios(struct radeon_device *rdev)
> {
> - uint8_t __iomem *bios;
> + uint8_t __iomem *bios, val1, val2;
> size_t size;
>
> rdev->bios = NULL;
> @@ -86,15 +86,19 @@ static bool radeon_read_bios(struct radeon_device *rdev)
> return false;
> }
>
> - if (size == 0 || bios[0] != 0x55 || bios[1] != 0xaa) {
> + val1 = readb(&bios[0]);
> + val2 = readb(&bios[1]);
> +
> + if (size == 0 || val1 != 0x55 || val2 != 0xaa) {
> pci_unmap_rom(rdev->pdev, bios);
> return false;
> }
> - rdev->bios = kmemdup(bios, size, GFP_KERNEL);
> + rdev->bios = kzalloc(size, GFP_KERNEL);
> if (rdev->bios == NULL) {
> pci_unmap_rom(rdev->pdev, bios);
> return false;
> }
> + memcpy_fromio(rdev->bios, bios, size);
> pci_unmap_rom(rdev->pdev, bios);
> return true;
> }
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: "Christian König" <christian.koenig@amd.com>
To: David Miller <davem@davemloft.net>, <alexander.deucher@amd.com>
Cc: <dri-devel@lists.freedesktop.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] radeon: Do not directly dereference pointers to BIOS area.
Date: Thu, 19 Mar 2015 09:50:58 +0100 [thread overview]
Message-ID: <550A8DF2.1010104@amd.com> (raw)
In-Reply-To: <20150318.231840.1263267500500914630.davem@davemloft.net>
In general I would say yes, but for this particular hardware it's a bit
questionable to do so.
For radeon hardware to work correctly the CPU access to the PCIE BARs
should work even without using the specialized IO macros/functions,
otherwise mapping VRAM CPU accessible isn't really possible.
What's the background of the change? Some problems on a certain CPU
platform? or just general cleanups?
Regards,
Christian.
On 19.03.2015 04:18, David Miller wrote:
> Use readb() and memcpy_fromio() accessors instead.
>
> Signed-off-by: David S. Miller <davem@davemloft.net>
>
> diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c
> index 63ccb8f..d27e4cc 100644
> --- a/drivers/gpu/drm/radeon/radeon_bios.c
> +++ b/drivers/gpu/drm/radeon/radeon_bios.c
> @@ -76,7 +76,7 @@ static bool igp_read_bios_from_vram(struct radeon_device *rdev)
>
> static bool radeon_read_bios(struct radeon_device *rdev)
> {
> - uint8_t __iomem *bios;
> + uint8_t __iomem *bios, val1, val2;
> size_t size;
>
> rdev->bios = NULL;
> @@ -86,15 +86,19 @@ static bool radeon_read_bios(struct radeon_device *rdev)
> return false;
> }
>
> - if (size == 0 || bios[0] != 0x55 || bios[1] != 0xaa) {
> + val1 = readb(&bios[0]);
> + val2 = readb(&bios[1]);
> +
> + if (size == 0 || val1 != 0x55 || val2 != 0xaa) {
> pci_unmap_rom(rdev->pdev, bios);
> return false;
> }
> - rdev->bios = kmemdup(bios, size, GFP_KERNEL);
> + rdev->bios = kzalloc(size, GFP_KERNEL);
> if (rdev->bios == NULL) {
> pci_unmap_rom(rdev->pdev, bios);
> return false;
> }
> + memcpy_fromio(rdev->bios, bios, size);
> pci_unmap_rom(rdev->pdev, bios);
> return true;
> }
next prev parent reply other threads:[~2015-03-19 9:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-19 3:18 [PATCH] radeon: Do not directly dereference pointers to BIOS area David Miller
2015-03-19 8:50 ` Christian König [this message]
2015-03-19 8:50 ` Christian König
2015-03-19 16:29 ` David Miller
2015-03-20 9:38 ` Christian König
2015-03-20 9:38 ` Christian König
2015-03-20 13:50 ` Alex Deucher
2015-03-20 17:24 ` David Miller
2015-03-20 17:39 ` Deucher, Alexander
2015-03-20 17:39 ` Deucher, Alexander
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=550A8DF2.1010104@amd.com \
--to=christian.koenig@amd.com \
--cc=alexander.deucher@amd.com \
--cc=davem@davemloft.net \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.