From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226CUO76C3eik0t1QgDqawuWskw6RgDZQWRvzodMymrn67WmoOKdRJCqx8u33m2ycGqHnaI9 ARC-Seal: i=1; a=rsa-sha256; t=1516844486; cv=none; d=google.com; s=arc-20160816; b=ynVyLg8dbKfnlHHJF1LTpxLswS7xNidXYefZ1B4VhdwyEcnsEkU3boOTUe/KN+HnYc Mnmj4MprJyO3aLRVfSdTvrXEeZLIgCIkrOxED0Z6cKr1ZQAj5+yS8bLn/HNzo80JITco 1tgYEk1CNU5HRTuZCa3my127F3awQad+v/4pAxII7bjusEazhqN4IsWdsA3aE1JNhyZM sCj9m8skF6VsBdiY4EFp7v25YNRnJLCbYgnnV16JlxwXGs7+89MLK23/KT6Cc1cnEIti tdjKp3Ceid4PBAL6DriCjPT6cFREsCGIljTPYNOM9sJlpi2ZTvlINR5CRX5aIyLFhtJE NIjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature:arc-authentication-results; bh=A/9B0N7b4hgQWz+ONgai9G9cWUtnRIxwidB86QFNzek=; b=kf2X4xcspUjBl47g/QLCGtWIy/qyKXXrSYWAlYIqoa879Nq2tEbw8xViWyJikjr0cw /O4sxpb/Ikx3pZ9wlUgijPpcuM32Czuje+MtGKaC6mQ3GVnOHctdz/klq4Oc5x+eymZA 47XReAirtWDMv7kosUHONskxHR5PfukYpyORgHIfXzj1M5s67lBO7tLmZvF1xqQtVGh1 n39mDDNQ5Hde7yslTTTpGUesYQu6Dim2H3Jiq8Q4f/270s/bqmE2F8+vDS4VkHQWJn2U yX+Hfb3SmvO8deW3IfhovQONxmBsHm3WxmUgpwvRJnrgYPfhC854Czcot68ziVEwYI7E l8fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sholland.org header.s=fm1 header.b=SOIOrPr8; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=E0ll01bo; spf=pass (google.com: domain of samuel@sholland.org designates 66.111.4.27 as permitted sender) smtp.mailfrom=samuel@sholland.org Authentication-Results: mx.google.com; dkim=pass header.i=@sholland.org header.s=fm1 header.b=SOIOrPr8; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=E0ll01bo; spf=pass (google.com: domain of samuel@sholland.org designates 66.111.4.27 as permitted sender) smtp.mailfrom=samuel@sholland.org X-ME-Sender: From: Samuel Holland To: linux-kernel@vger.kernel.org, Greg Kroah-Hartman Cc: coreboot@coreboot.org, Thierry Escande , Wei-Ning Huang , Julius Werner , Dmitry Torokhov , Guenter Roeck , Samuel Holland Subject: [PATCH 2/5] firmware: memconsole: Probe via coreboot bus Date: Wed, 24 Jan 2018 19:41:17 -0600 Message-Id: <20180125014120.20851-3-samuel@sholland.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180125014120.20851-1-samuel@sholland.org> References: <20180125014120.20851-1-samuel@sholland.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590526724500695169?= X-GMAIL-MSGID: =?utf-8?q?1590526724500695169?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Remove the ad-hoc coreboot table search. Now the driver will only be probed when the necessary coreboot table entry has already been found. Signed-off-by: Samuel Holland --- drivers/firmware/google/memconsole-coreboot.c | 49 ++++++++++----------------- 1 file changed, 17 insertions(+), 32 deletions(-) diff --git a/drivers/firmware/google/memconsole-coreboot.c b/drivers/firmware/google/memconsole-coreboot.c index 52738887735c..b29e10757bfb 100644 --- a/drivers/firmware/google/memconsole-coreboot.c +++ b/drivers/firmware/google/memconsole-coreboot.c @@ -15,9 +15,9 @@ * GNU General Public License for more details. */ +#include #include #include -#include #include "memconsole.h" #include "coreboot_table.h" @@ -73,18 +73,19 @@ static ssize_t memconsole_coreboot_read(char *buf, loff_t pos, size_t count) return done; } -static int memconsole_coreboot_init(phys_addr_t physaddr) +static int memconsole_probe(struct coreboot_device *dev) { struct cbmem_cons __iomem *tmp_cbmc; - tmp_cbmc = memremap(physaddr, sizeof(*tmp_cbmc), MEMREMAP_WB); + tmp_cbmc = memremap(dev->cbmem_ref.cbmem_addr, + sizeof(*tmp_cbmc), MEMREMAP_WB); if (!tmp_cbmc) return -ENOMEM; /* Read size only once to prevent overrun attack through /dev/mem. */ cbmem_console_size = tmp_cbmc->size_dont_access_after_boot; - cbmem_console = memremap(physaddr, + cbmem_console = memremap(dev->cbmem_ref.cbmem_addr, cbmem_console_size + sizeof(*cbmem_console), MEMREMAP_WB); memunmap(tmp_cbmc); @@ -93,26 +94,11 @@ static int memconsole_coreboot_init(phys_addr_t physaddr) return -ENOMEM; memconsole_setup(memconsole_coreboot_read); - return 0; -} - -static int memconsole_probe(struct platform_device *pdev) -{ - int ret; - struct lb_cbmem_ref entry; - - ret = coreboot_table_find(CB_TAG_CBMEM_CONSOLE, &entry, sizeof(entry)); - if (ret) - return ret; - - ret = memconsole_coreboot_init(entry.cbmem_addr); - if (ret) - return ret; return memconsole_sysfs_init(); } -static int memconsole_remove(struct platform_device *pdev) +static int memconsole_remove(struct coreboot_device *dev) { memconsole_exit(); @@ -122,28 +108,27 @@ static int memconsole_remove(struct platform_device *pdev) return 0; } -static struct platform_driver memconsole_driver = { +static struct coreboot_driver memconsole_driver = { .probe = memconsole_probe, .remove = memconsole_remove, - .driver = { + .drv = { .name = "memconsole", }, + .tag = CB_TAG_CBMEM_CONSOLE, }; -static int __init platform_memconsole_init(void) +static void coreboot_memconsole_exit(void) { - struct platform_device *pdev; - - pdev = platform_device_register_simple("memconsole", -1, NULL, 0); - if (IS_ERR(pdev)) - return PTR_ERR(pdev); - - platform_driver_register(&memconsole_driver); + coreboot_driver_unregister(&memconsole_driver); +} - return 0; +static int __init coreboot_memconsole_init(void) +{ + return coreboot_driver_register(&memconsole_driver); } -module_init(platform_memconsole_init); +module_exit(coreboot_memconsole_exit); +module_init(coreboot_memconsole_init); MODULE_AUTHOR("Google, Inc."); MODULE_LICENSE("GPL"); -- 2.13.6