2017-08-08 12:46:27

by Pan Bian

Subject: firmware: vpd: use memunmap instead of iounmap

In functions vpd_sections_init() and vpd_section_init(), iounmap() is
used to unmap memory. However, in these cases, memunmap() is better.

Signed-off-by: Pan Bian <[email protected]>
---
drivers/firmware/google/vpd.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/google/vpd.c
index 7894572..ac6400f 100644
--- a/drivers/firmware/google/vpd.c
+++ b/drivers/firmware/google/vpd.c
@@ -234,7 +234,7 @@ static int vpd_section_init(const char *name, struct vpd_section *sec,
err_free_raw_name:
kfree(sec->raw_name);
err_iounmap:
- iounmap(sec->baseaddr);
+ memunmap(sec->baseaddr);
return err;
}

@@ -245,7 +245,7 @@ static int vpd_section_destroy(struct vpd_section *sec)
kobject_put(sec->kobj);
sysfs_remove_bin_file(vpd_kobj, &sec->bin_attr);
kfree(sec->raw_name);
- iounmap(sec->baseaddr);
+ memunmap(sec->baseaddr);
}

return 0;
@@ -262,7 +262,7 @@ static int vpd_sections_init(phys_addr_t physaddr)
return -ENOMEM;

memcpy_fromio(&header, temp, sizeof(struct vpd_cbmem));
- iounmap(temp);
+ memunmap(temp);

if (header.magic != VPD_CBMEM_MAGIC)
return -ENODEV;
--
1.9.1

2017-08-08 14:38:38

by Guenter Roeck

Subject: Re: firmware: vpd: use memunmap instead of iounmap

On Tue, Aug 8, 2017 at 5:45 AM, Pan Bian <[email protected]> wrote:
> In functions vpd_sections_init() and vpd_section_init(), iounmap() is
> used to unmap memory. However, in these cases, memunmap() is better.
>
> Signed-off-by: Pan Bian <[email protected]>

The code uses memremap(), so that seems reasonable.

Reviewed-by: Guenter Roeck <[email protected]>

> ---
> drivers/firmware/google/vpd.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/google/vpd.c
> index 7894572..ac6400f 100644
> --- a/drivers/firmware/google/vpd.c
> +++ b/drivers/firmware/google/vpd.c
> @@ -234,7 +234,7 @@ static int vpd_section_init(const char *name, struct vpd_section *sec,
> err_free_raw_name:
> kfree(sec->raw_name);
> err_iounmap:
> - iounmap(sec->baseaddr);
> + memunmap(sec->baseaddr);
> return err;
> }
>
> @@ -245,7 +245,7 @@ static int vpd_section_destroy(struct vpd_section *sec)
> kobject_put(sec->kobj);
> sysfs_remove_bin_file(vpd_kobj, &sec->bin_attr);
> kfree(sec->raw_name);
> - iounmap(sec->baseaddr);
> + memunmap(sec->baseaddr);
> }
>
> return 0;
> @@ -262,7 +262,7 @@ static int vpd_sections_init(phys_addr_t physaddr)
> return -ENOMEM;
>
> memcpy_fromio(&header, temp, sizeof(struct vpd_cbmem));
> - iounmap(temp);
> + memunmap(temp);
>
> if (header.magic != VPD_CBMEM_MAGIC)
> return -ENODEV;
> --
> 1.9.1
>
>

2017-08-08 16:27:01

by Dmitry Torokhov

Subject: Re: firmware: vpd: use memunmap instead of iounmap

Hi Pan,

On Tue, Aug 8, 2017 at 5:45 AM, Pan Bian <[email protected]> wrote:
> In functions vpd_sections_init() and vpd_section_init(), iounmap() is
> used to unmap memory. However, in these cases, memunmap() is better.
>
> Signed-off-by: Pan Bian <[email protected]>
> ---
> drivers/firmware/google/vpd.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/google/vpd.c
> index 7894572..ac6400f 100644
> --- a/drivers/firmware/google/vpd.c
> +++ b/drivers/firmware/google/vpd.c
> @@ -234,7 +234,7 @@ static int vpd_section_init(const char *name, struct vpd_section *sec,
> err_free_raw_name:
> kfree(sec->raw_name);
> err_iounmap:
> - iounmap(sec->baseaddr);
> + memunmap(sec->baseaddr);

It would be great if you also adjusted the name of the error label.

> return err;
> }
>
> @@ -245,7 +245,7 @@ static int vpd_section_destroy(struct vpd_section *sec)
> kobject_put(sec->kobj);
> sysfs_remove_bin_file(vpd_kobj, &sec->bin_attr);
> kfree(sec->raw_name);
> - iounmap(sec->baseaddr);
> + memunmap(sec->baseaddr);
> }
>
> return 0;
> @@ -262,7 +262,7 @@ static int vpd_sections_init(phys_addr_t physaddr)
> return -ENOMEM;
>
> memcpy_fromio(&header, temp, sizeof(struct vpd_cbmem));
> - iounmap(temp);
> + memunmap(temp);
>
> if (header.magic != VPD_CBMEM_MAGIC)
> return -ENODEV;

I think there is more confusion with memremap/iounmap and type of the
header data structure. I think I need to refresh
https://lkml.org/lkml/2017/5/23/1445

Thanks.

--
Dmitry