Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
In-Reply-To: <20190510180151.115254-3-swboyd@chromium.org>
References: <20190510180151.115254-1-swboyd@chromium.org> <20190510180151.115254-3-swboyd@chromium.org>
From:   Stephen Boyd <swboyd@chromium.org>
Subject: [PATCH v2 2/5] firmware: google: memconsole: Use devm_memremap()
Cc:     linux-kernel@vger.kernel.org,
        Wei-Ning Huang <wnhuang@chromium.org>,
        Julius Werner <jwerner@chromium.org>,
        Brian Norris <briannorris@chromium.org>,
        Samuel Holland <samuel@sholland.org>,
        Guenter Roeck <groeck@chromium.org>
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Message-ID: <155752349303.14659.3560946140992031740@swboyd.mtv.corp.google.com>
User-Agent: alot/0.8
Date:   Fri, 10 May 2019 14:24:53 -0700
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Use the devm version of memremap so that we can delete the unmapping
code in driver remove, but more importantly so that we can unmap this
memory region if memconsole_sysfs_init() errors out for some reason.

Cc: Wei-Ning Huang <wnhuang@chromium.org>
Cc: Julius Werner <jwerner@chromium.org>
Cc: Brian Norris <briannorris@chromium.org>
Cc: Samuel Holland <samuel@sholland.org>
Cc: Guenter Roeck <groeck@chromium.org>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---

Quoting Stephen Boyd (2019-05-10 11:01:48)
> diff --git a/drivers/firmware/google/memconsole-coreboot.c b/drivers/firm=
ware/google/memconsole-coreboot.c
> index 86331807f1d5..0b29b27b86f5 100644
> --- a/drivers/firmware/google/memconsole-coreboot.c
> +++ b/drivers/firmware/google/memconsole-coreboot.c
> @@ -85,7 +85,7 @@ static int memconsole_probe(struct coreboot_device *dev)
> =20
>         /* Read size only once to prevent overrun attack through /dev/mem=
. */
>         cbmem_console_size =3D tmp_cbmc->size_dont_access_after_boot;
> -       cbmem_console =3D memremap(dev->cbmem_ref.cbmem_addr,
> +       cbmem_console =3D devm_memremap(&dev->dev, dev->cbmem_ref.cbmem_a=
ddr,

Whoops, this returns an error pointer now. Here's an updated patch.

 drivers/firmware/google/memconsole-coreboot.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/firmware/google/memconsole-coreboot.c b/drivers/firmwa=
re/google/memconsole-coreboot.c
index 86331807f1d5..cc3797f1ba85 100644
--- a/drivers/firmware/google/memconsole-coreboot.c
+++ b/drivers/firmware/google/memconsole-coreboot.c
@@ -85,13 +85,13 @@ static int memconsole_probe(struct coreboot_device *dev)
=20
 	/* Read size only once to prevent overrun attack through /dev/mem. */
 	cbmem_console_size =3D tmp_cbmc->size_dont_access_after_boot;
-	cbmem_console =3D memremap(dev->cbmem_ref.cbmem_addr,
+	cbmem_console =3D devm_memremap(&dev->dev, dev->cbmem_ref.cbmem_addr,
 				 cbmem_console_size + sizeof(*cbmem_console),
 				 MEMREMAP_WB);
 	memunmap(tmp_cbmc);
=20
-	if (!cbmem_console)
-		return -ENOMEM;
+	if (IS_ERR(cbmem_console))
+		return PTR_ERR(cbmem_console);
=20
 	memconsole_setup(memconsole_coreboot_read);
=20
@@ -102,9 +102,6 @@ static int memconsole_remove(struct coreboot_device *de=
v)
 {
 	memconsole_exit();
=20
-	if (cbmem_console)
-		memunmap(cbmem_console);
-
 	return 0;
 }
=20

base-commit: e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd
prerequisite-patch-id: b7c2a1e21fb108364f0e8cfaf1970cbc7903c750
--=20
Sent by a computer through tubes