From patchwork Wed Mar 20 18:14:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 160700 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp592082jan; Wed, 20 Mar 2019 11:14:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqyjtwUB7SL4R+z5RBFNTixzOEfmEqKfYD+ylwcG4pSWKwxGsrAyXIJ2IzYq3QzDapYP8u8j X-Received: by 2002:aa7:8849:: with SMTP id k9mr31592397pfo.149.1553105688473; Wed, 20 Mar 2019 11:14:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553105688; cv=none; d=google.com; s=arc-20160816; b=z5oIAIaQDxmBD9Pf9xPUiL5sDUJrbt6s0r58UoyYK+asJzTSfaE2OsIZ30S0gh0YmM mvl1vcaS1wEV+e2Heqnjirw/OHkKy03lRXrui5TIvq12BnDKdL+HsxaxGrLz8i3t6upZ tvMXeOkFZcM5kzs85CaoB5HX5XuNEK0xV21Rq6Lg/edGYpMUq6nTZnKwOJ2J5C9Q7XY+ jgFQrEMs38BjKgIRuvFps42vedsstoGUYWxkXwsHfrY3K2lkzPR13J7LJt7peX8gGg1k f4mEuYsIUVXiLPhKY1BAaYPWkEX4FtC3fzdLnrhm3f88UXt4XJAXsyRbGomZQWLenq1h gLvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=wDgXjcUHx1cWuZwCc2eBbTUyNAEJ1n6O/1WOt8TBATU=; b=mKgo/3XFKYqoRTWDr0gG9AdB7BowcWBY2GFRHUEuvEialhbwmIv8vCZty5cNdHdN/w pbA2chrUt2xQ4UzTnG471b5LfVQQlS9BG160gWL4+jzgKZDsssQJ9sAkxhwm0V8XsZIA srG4ipoD+Ufid8z0d+cFcSfxEGhtsXxRhV5YZGjubQm3fFpCht6oEND9FwSSl1pvYPrG 1zmFOysSr/sgFrNCbvRGlCuNZF/GYmlYC6QQglzYJj7rjeLZD/ddQ8JbHm+TiDqdMb6r GLXmIdH4gNC/E7qF60Hx5CFDr1QZUKhQBU337XgJMDWMqPubVnLtH6Xi1j2nAkkt/grV +gmw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t7si2311146plr.291.2019.03.20.11.14.48; Wed, 20 Mar 2019 11:14:48 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727462AbfCTSOq (ORCPT + 31 others); Wed, 20 Mar 2019 14:14:46 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:5721 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727159AbfCTSOZ (ORCPT ); Wed, 20 Mar 2019 14:14:25 -0400 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 9832C85813C0A12AD8F8; Thu, 21 Mar 2019 02:14:22 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.408.0; Thu, 21 Mar 2019 02:14:13 +0800 From: John Garry To: , , , , CC: , , , , , , , "John Garry" Subject: [RFC PATCH v2 1/3] resource: Request IO port regions from children of ioport_resource Date: Thu, 21 Mar 2019 02:14:08 +0800 Message-ID: <1553105650-28012-2-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1553105650-28012-1-git-send-email-john.garry@huawei.com> References: <1553105650-28012-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently when we request an IO port region, the request is made directly to the top resource, ioport_resource. There is an issue here, in that drivers may successfully request an IO port region even if the IO port region has not even been mapped in (in pci_remap_iospace()). This may lead to crashes when the system has no PCI host, or, has a host but it has failed enumeration, while drivers still attempt to access PCI IO ports, as below: root@(none)$root@(none)$ insmod f71882fg.ko [ 152.215377] Unable to handle kernel paging request at virtual address ffff7dfffee0002e [ 152.231299] Mem abort info: [ 152.236898] ESR = 0x96000046 [ 152.243019] Exception class = DABT (current EL), IL = 32 bits [ 152.254905] SET = 0, FnV = 0 [ 152.261024] EA = 0, S1PTW = 0 [ 152.267320] Data abort info: [ 152.273091] ISV = 0, ISS = 0x00000046 [ 152.280784] CM = 0, WnR = 1 [ 152.286730] swapper pgtable: 4k pages, 48-bit VAs, pgdp = (____ptrval____) [ 152.300537] [ffff7dfffee0002e] pgd=000000000141c003, pud=000000000141d003, pmd=0000000000000000 [ 152.318016] Internal error: Oops: 96000046 [#1] PREEMPT SMP [ 152.329199] Modules linked in: f71882fg(+) [ 152.337415] CPU: 8 PID: 2732 Comm: insmod Not tainted 5.1.0-rc1-00002-gab1a0e9200b8-dirty #102 [ 152.354712] Hardware name: Huawei Taishan 2280 /D05, BIOS Hisilicon D05 IT21 Nemo 2.0 RC0 04/18/2018 [ 152.373058] pstate: 80000005 (Nzcv daif -PAN -UAO) [ 152.382675] pc : logic_outb+0x54/0xb8 [ 152.390017] lr : f71882fg_find+0x64/0x390 [f71882fg] [ 152.399977] sp : ffff000013393aa0 [ 152.406618] x29: ffff000013393aa0 x28: ffff000008b98b10 [ 152.417278] x27: ffff000013393df0 x26: 0000000000000100 [ 152.427938] x25: ffff801f8c872d30 x24: ffff000011420000 [ 152.438598] x23: ffff801fb49d2940 x22: ffff000011291000 [ 152.449257] x21: 000000000000002e x20: 0000000000000087 [ 152.459917] x19: ffff000013393b44 x18: ffffffffffffffff [ 152.470577] x17: 0000000000000000 x16: 0000000000000000 [ 152.481236] x15: ffff00001127d6c8 x14: ffff801f8cfd691c [ 152.491896] x13: 0000000000000000 x12: 0000000000000000 [ 152.502555] x11: 0000000000000003 x10: 0000801feace2000 [ 152.513215] x9 : 0000000000000000 x8 : ffff841fa654f280 [ 152.523874] x7 : 0000000000000000 x6 : 0000000000ffc0e3 [ 152.534534] x5 : ffff000011291360 x4 : ffff801fb4949f00 [ 152.545194] x3 : 0000000000ffbffe x2 : 76e767a63713d500 [ 152.555853] x1 : ffff7dfffee0002e x0 : ffff7dfffee00000 [ 152.566514] Process insmod (pid: 2732, stack limit = 0x(____ptrval____)) [ 152.579968] Call trace: [ 152.584863] logic_outb+0x54/0xb8 [ 152.591506] f71882fg_find+0x64/0x390 [f71882fg] [ 152.600768] f71882fg_init+0x38/0xc70 [f71882fg] [ 152.610031] do_one_initcall+0x5c/0x198 [ 152.617723] do_init_module+0x54/0x1b0 [ 152.625237] load_module+0x1dc4/0x2158 [ 152.632752] __se_sys_init_module+0x14c/0x1e8 [ 152.641490] __arm64_sys_init_module+0x18/0x20 [ 152.650404] el0_svc_common+0x5c/0x100 [ 152.657919] el0_svc_handler+0x2c/0x80 [ 152.665433] el0_svc+0x8/0xc [ 152.671202] Code: d2bfdc00 f2cfbfe0 f2ffffe0 8b000021 (39000034) [ 152.683434] ---[ end trace fd4f35b610829a48 ]--- Segmentation fault root@(none)$ Note that the f71882fg driver correctly calls request_muxed_region(). This issue was originally reported in [1]. This patch changes the functionality of request{muxed_}_region() to request a region from a direct child descendent of the top ioport_resource. In this, if the IO port region has not been mapped for a particular IO region, the PCI IO resource would also not have been inserted, and so a suitable child region will not exist. As such, request_{muxed_}region() calls will fail. A side note: there are many drivers in the kernel which fail to even call request_{muxed_}region() prior to IO port accesses, and they also need to be fixed (to call request_{muxed_}region(), as appropriate) separately. [1] https://www.spinics.net/lists/linux-pci/msg49821.html Signed-off-by: John Garry --- include/linux/ioport.h | 12 +++++++++--- kernel/resource.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/include/linux/ioport.h b/include/linux/ioport.h index da0ebaec25f0..d7b7e1e08291 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h @@ -217,19 +217,25 @@ static inline bool resource_contains(struct resource *r1, struct resource *r2) /* Convenience shorthand with allocation */ -#define request_region(start,n,name) __request_region(&ioport_resource, (start), (n), (name), 0) -#define request_muxed_region(start,n,name) __request_region(&ioport_resource, (start), (n), (name), IORESOURCE_MUXED) +#define request_region(start,n,name) __request_region_from_children(&ioport_resource, (start), (n), (name), 0) +#define request_muxed_region(start,n,name) __request_region_from_children(&ioport_resource, (start), (n), (name), IORESOURCE_MUXED) #define __request_mem_region(start,n,name, excl) __request_region(&iomem_resource, (start), (n), (name), excl) #define request_mem_region(start,n,name) __request_region(&iomem_resource, (start), (n), (name), 0) #define request_mem_region_exclusive(start,n,name) \ __request_region(&iomem_resource, (start), (n), (name), IORESOURCE_EXCLUSIVE) #define rename_region(region, newname) do { (region)->name = (newname); } while (0) -extern struct resource * __request_region(struct resource *, +extern struct resource *__request_region(struct resource *, resource_size_t start, resource_size_t n, const char *name, int flags); +extern struct resource *__request_region_from_children(struct resource *, + resource_size_t start, + resource_size_t n, + const char *name, int flags); + + /* Compatibility cruft */ #define release_region(start,n) __release_region(&ioport_resource, (start), (n)) #define release_mem_region(start,n) __release_region(&iomem_resource, (start), (n)) diff --git a/kernel/resource.c b/kernel/resource.c index 92190f62ebc5..87ed200eda8b 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -1097,6 +1097,34 @@ resource_size_t resource_alignment(struct resource *res) static DECLARE_WAIT_QUEUE_HEAD(muxed_resource_wait); +/** + * __request_region_from_children - create a new busy region from a child + * @parent: parent resource descriptor + * @start: resource start address + * @n: resource region size + * @name: reserving caller's ID string + * @flags: IO resource flags + */ +struct resource *__request_region_from_children(struct resource *parent, + resource_size_t start, + resource_size_t n, + const char *name, int flags) +{ + struct resource *res = __request_region(parent, start, n, name, flags); + + if (res && res->parent == parent) { + /* + * This is a direct descendent of the parent, which is + * what we didn't want. + */ + __release_region(parent, start, n); + res = NULL; + } + + return res; +} +EXPORT_SYMBOL(__request_region_from_children); + /** * __request_region - create a new busy resource region * @parent: parent resource descriptor From patchwork Wed Mar 20 18:14:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 160699 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp591860jan; Wed, 20 Mar 2019 11:14:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqwexPYcmcmVNUNCaa6AWdKlISGA+1WI3XXCAlWj7DrFpNnpUKWT0GtbZLbtoTbOoUsFDt+d X-Received: by 2002:aa7:8589:: with SMTP id w9mr9109657pfn.97.1553105677245; Wed, 20 Mar 2019 11:14:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553105677; cv=none; d=google.com; s=arc-20160816; b=T87zkB28tFEKmCxh1qR9jV3UjeNh3GkPsvDzGuDTRoft9cvoNAup/0q97Bh9B0AiJa aQ09DU+oDp77oF7uOGrmoS/tmat+O/WwSehvN0PL1x/YUWmKWi0mFHOujCNEUxGu0K6c 4MHIdDUUUR2ZeikdMIaHSkQZYGJ1D4+IuKd/HLpDxuiWg+4IYz/MHqGIkAwbiSVvpEO3 2dw/4O7AFtd29+cT1wtfhbxpBsCQ9uqF9JTDRd1s+tu8QkU/Z9lsEuR9PdkzNc4z3ZTp QGf13oRUbBbN4HRdbWruP8CKy3JYXAbI7NvYCCkrni8cFHCN01lGVdeE8HMRNb1KVUmi 0ykw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=ReILIKU2rOaciT17WqgyiyTt2Zhz6YaJKW17mKKRZLQ=; b=fjK0ItMeeGTqxUTHNy/A/FxTLq2eRTPYEvXSpOOH93Il35jqIYe/GKYNZZpl7HTZ3A H5Om/gQwm26dDQOGt4LQE8cugOpuNpni2tSJkzCzysWov4KOvKLEeCBVP0p6u1wnNvg3 cHsKducezh82ajnRvu0dhyrm5gVHeHH6OiWrpw69Ssgtn/gJ5NM1Qi0jyI+wade3SkUX NhewaIEJ8eqwoKnDJ8k9fb+GKzwn/YgmvIorGLTNsa1kvECLxP5bNYZc3OjjRgVa/d0r kxQsBTeozx9eW5dMMTjkuM66SnDQYLXW2f8nRaTwyQM6hc7hHGQcHVmC9koJG1wwDay2 So2Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id co9si2459365plb.324.2019.03.20.11.14.36; Wed, 20 Mar 2019 11:14:37 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727417AbfCTSOf (ORCPT + 31 others); Wed, 20 Mar 2019 14:14:35 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:5723 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727062AbfCTSOZ (ORCPT ); Wed, 20 Mar 2019 14:14:25 -0400 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id A4F62995DDD7CC8A41BE; Thu, 21 Mar 2019 02:14:22 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.408.0; Thu, 21 Mar 2019 02:14:14 +0800 From: John Garry To: , , , , CC: , , , , , , , "John Garry" Subject: [PATCH v2 2/3] lib: logic_pio: Reject access to unregistered CPU MMIO regions Date: Thu, 21 Mar 2019 02:14:09 +0800 Message-ID: <1553105650-28012-3-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1553105650-28012-1-git-send-email-john.garry@huawei.com> References: <1553105650-28012-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently when accessing logical indirect PIO addresses in logic_{in, out}{,s}, we first ensure that the region is registered. However, no such check exists for CPU MMIO regions. The CPU MMIO regions would be registered by the PCI host (when PCI_IOBASE is defined) in pci_register_io_range(). We have seen scenarios when systems which don't have a PCI host or, they do, and the PCI host probe fails, that certain devices attempts to still attempt to access PCI IO ports; examples are in [1] and [2]. And even though we would protect against this by ensuring the driver call request_{muxed_}region(), some don't do this: root@(none)$ insmod hwmon/f71805f.ko [ 98.623872] Unable to handle kernel paging request at virtual address ffff7dfffee0002e [ 98.639804] Mem abort info: [ 98.645404] ESR = 0x96000046 [ 98.651525] Exception class = DABT (current EL), IL = 32 bits [ 98.663410] SET = 0, FnV = 0 [ 98.669530] EA = 0, S1PTW = 0 [ 98.675826] Data abort info: [ 98.681597] ISV = 0, ISS = 0x00000046 [ 98.689290] CM = 0, WnR = 1 [ 98.695237] swapper pgtable: 4k pages, 48-bit VAs, pgdp = (____ptrval____) [ 98.709044] [ffff7dfffee0002e] pgd=000000000141c003, pud=000000000141d003, pmd=0000000000000000 [ 98.726523] Internal error: Oops: 96000046 [#1] PREEMPT SMP [ 98.737706] Modules linked in: f71805f(+) [ 98.745748] CPU: 20 PID: 2736 Comm: insmod Not tainted 5.1.0-rc1-00003-g6f1bfec2a620-dirty #99 [ 98.763045] Hardware name: Huawei Taishan 2280 /D05, BIOS Hisilicon D05 IT21 Nemo 2.0 RC0 04/18/2018 [ 98.781390] pstate: 80000005 (Nzcv daif -PAN -UAO) [ 98.791008] pc : logic_outb+0x54/0xb8 [ 98.798351] lr : f71805f_find+0x2c/0x1b8 [f71805f] [ 98.807962] sp : ffff000025fbba90 [ 98.814603] x29: ffff000025fbba90 x28: ffff000008b944d0 [ 98.825263] x27: ffff000025fbbdf0 x26: 0000000000000100 [ 98.835922] x25: ffff801f8c270580 x24: ffff000011420000 [ 98.846582] x23: ffff000025fbbb3e x22: ffff000025fbbb40 [ 98.857242] x21: ffff000008b991b8 x20: 0000000000000087 [ 98.867901] x19: 000000000000002e x18: ffffffffffffffff [ 98.878561] x17: 0000000000000000 x16: 0000000000000000 [ 98.889220] x15: ffff00001127d6c8 x14: 0000000000000000 [ 98.899880] x13: 0000000000000000 x12: 0000000000000000 [ 98.910539] x11: 0000000000010820 x10: 0000841fdac40000 [ 98.921199] x9 : 0000000000000001 x8 : 0000000040000000 [ 98.931858] x7 : 0000000000210d00 x6 : 0000000000000000 [ 98.942517] x5 : ffff801fb6a46040 x4 : ffff841febeaeda0 [ 98.953177] x3 : 0000000000ffbffe x2 : ffff000025fbbb40 [ 98.963837] x1 : ffff7dfffee0002e x0 : ffff7dfffee00000 [ 98.974497] Process insmod (pid: 2736, stack limit = 0x(____ptrval____)) [ 98.987950] Call trace: [ 98.992846] logic_outb+0x54/0xb8 [ 98.999489] f71805f_find+0x2c/0x1b8 [f71805f] [ 99.008403] f71805f_init+0x38/0xe48 [f71805f] [ 99.017317] do_one_initcall+0x5c/0x198 [ 99.025008] do_init_module+0x54/0x1b0 [ 99.032522] load_module+0x1dc4/0x2158 [ 99.040037] __se_sys_init_module+0x14c/0x1e8 [ 99.048774] __arm64_sys_init_module+0x18/0x20 [ 99.057688] el0_svc_common+0x5c/0x100 [ 99.065203] el0_svc_handler+0x2c/0x80 [ 99.072717] el0_svc+0x8/0xc [ 99.078486] Code: d2bfdc00 f2cfbfe0 f2ffffe0 8b000021 (39000034) [ 99.090719] ---[ end trace 10ea80bde051bbfc ]--- root@(none)$ Driver f71805f does not call request_{muxed_}region(), as it should do. This patch adds a check to ensure that the CPU MMIO region is registered prior to accessing the PCI IO ports. [1] https://lkml.org/lkml/2019/3/14/630 [2] https://www.spinics.net/lists/arm-kernel/msg694702.html Signed-off-by: John Garry --- lib/logic_pio.c | 70 ++++++++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 30 deletions(-) -- 2.17.1 diff --git a/lib/logic_pio.c b/lib/logic_pio.c index feea48fd1a0d..026a4fb4b944 100644 --- a/lib/logic_pio.c +++ b/lib/logic_pio.c @@ -192,70 +192,80 @@ unsigned long logic_pio_trans_cpuaddr(resource_size_t addr) } #if defined(CONFIG_INDIRECT_PIO) && defined(PCI_IOBASE) +#define INVALID_RANGE(range) (!range || \ + (range->flags == LOGIC_PIO_CPU_MMIO && !range->ops)) + #define BUILD_LOGIC_IO(bw, type) \ type logic_in##bw(unsigned long addr) \ { \ type ret = (type)~0; \ + struct logic_pio_hwaddr *range = find_io_range(addr); \ + \ + if (INVALID_RANGE(range)) { \ + WARN_ON_ONCE(1); \ + return ret; \ + } \ \ if (addr < MMIO_UPPER_LIMIT) { \ ret = read##bw(PCI_IOBASE + addr); \ } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \ - struct logic_pio_hwaddr *entry = find_io_range(addr); \ - \ - if (entry && entry->ops) \ - ret = entry->ops->in(entry->hostdata, \ - addr, sizeof(type)); \ - else \ - WARN_ON_ONCE(1); \ + ret = range->ops->in(range->hostdata, \ + addr, sizeof(type)); \ } \ return ret; \ } \ \ void logic_out##bw(type value, unsigned long addr) \ { \ + struct logic_pio_hwaddr *range = find_io_range(addr); \ + \ + if (INVALID_RANGE(range)) { \ + WARN_ON_ONCE(1); \ + return; \ + } \ + \ if (addr < MMIO_UPPER_LIMIT) { \ write##bw(value, PCI_IOBASE + addr); \ } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \ - struct logic_pio_hwaddr *entry = find_io_range(addr); \ - \ - if (entry && entry->ops) \ - entry->ops->out(entry->hostdata, \ - addr, value, sizeof(type)); \ - else \ - WARN_ON_ONCE(1); \ + if (range->ops && range->ops->out) \ + range->ops->out(range->hostdata, addr, \ + value, sizeof(type)); \ } \ } \ \ -void logic_ins##bw(unsigned long addr, void *buffer, \ +void logic_ins##bw(unsigned long addr, void *buffer, \ unsigned int count) \ { \ + struct logic_pio_hwaddr *range = find_io_range(addr); \ + \ + if (INVALID_RANGE(range)) { \ + WARN_ON_ONCE(1); \ + return; \ + } \ + \ if (addr < MMIO_UPPER_LIMIT) { \ reads##bw(PCI_IOBASE + addr, buffer, count); \ } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \ - struct logic_pio_hwaddr *entry = find_io_range(addr); \ - \ - if (entry && entry->ops) \ - entry->ops->ins(entry->hostdata, \ - addr, buffer, sizeof(type), count); \ - else \ - WARN_ON_ONCE(1); \ + range->ops->ins(range->hostdata, addr, buffer, \ + sizeof(type), count); \ } \ - \ } \ \ void logic_outs##bw(unsigned long addr, const void *buffer, \ unsigned int count) \ { \ + struct logic_pio_hwaddr *range = find_io_range(addr); \ + \ + if (INVALID_RANGE(range)) { \ + WARN_ON_ONCE(1); \ + return; \ + } \ + \ if (addr < MMIO_UPPER_LIMIT) { \ writes##bw(PCI_IOBASE + addr, buffer, count); \ } else if (addr >= MMIO_UPPER_LIMIT && addr < IO_SPACE_LIMIT) { \ - struct logic_pio_hwaddr *entry = find_io_range(addr); \ - \ - if (entry && entry->ops) \ - entry->ops->outs(entry->hostdata, \ - addr, buffer, sizeof(type), count); \ - else \ - WARN_ON_ONCE(1); \ + range->ops->outs(range->hostdata, addr, buffer, \ + sizeof(type), count); \ } \ } From patchwork Wed Mar 20 18:14:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 160697 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp591723jan; Wed, 20 Mar 2019 11:14:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqzVyH87WfJdJv6E3p2v1nwdKC4lstroW7/8SfpftHzB6GKtZfC78WjQwWbfdiWkWVAsPozR X-Received: by 2002:a17:902:8bc6:: with SMTP id r6mr9511722plo.235.1553105668539; Wed, 20 Mar 2019 11:14:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553105668; cv=none; d=google.com; s=arc-20160816; b=S/C0pZMhhvKfSGk1LF8nxps1af+V1yg2E6NVrBXzzR5diosCJZENq1MfK2FI/5nWvw v/GnuH4i3XBaDA1TBvuIMPQYwxy4p+IN6Mx0gCTzYG1I0x1mXZyrJpfwqrzDI+zyn0xH pG6pBR0cbNP5rBBHD2NaB1+ME1liXyf8ayF8Qf8Pho4aKRmYf1eFSMMwSlNKSHwo1cjF TtOwY4osz3zVca9sJWRpdlNW3kxtoY07TRiyhHuEEJ1vA+81NUkm+ioGuafGrjfZPcIT HF6jVLxn3djgO8yVymapEH28NK2nLUArS85lZyrLr1Q4ahscYxSL4Sw6WoycHrIy6ZpN U/3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=9VHMD4Qe14mbHXpDj7OHq710JGUrt/hcAf54t126njo=; b=TJQoSX8y5erru1pEqWsbqx9sGfu6rcW36Z38xCj8SvkvwjzqpOsv5Bk81wwV/NenaI WHpUUhSlJbUBy6du/pxDcCLZhzb5sMk1At4tohOh0d5DplQ4ICReNSB3A5clzZFNBETV Vfl/3XKy4qTpb2LE+luw6gtlnAeT2d4V2r/iuuX/0SGMAQyAzEcE1PThmcXSznxKwoYG 7QDEMDVigjt9H70i+8UEV5K2Sr8E1s/k65A2Y0XGJaEkklbEezTLvCMe0eHcpUe0IyEV jdvZWOZHv1Aw+/lcre1Pu2uHFRqK65OdnjNasl8wr3udI1tqxXPpMCJhc1zgqKjQjYnH Tn2g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a21si2111497pgw.395.2019.03.20.11.14.28; Wed, 20 Mar 2019 11:14:28 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727399AbfCTSO0 (ORCPT + 31 others); Wed, 20 Mar 2019 14:14:26 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:5724 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727103AbfCTSOZ (ORCPT ); Wed, 20 Mar 2019 14:14:25 -0400 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id C98EF94934574973E31D; Thu, 21 Mar 2019 02:14:22 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.408.0; Thu, 21 Mar 2019 02:14:14 +0800 From: John Garry To: , , , , CC: , , , , , , , "John Garry" Subject: [PATCH v2 3/3] lib: logic_pio: Make some prints explicitly hex Date: Thu, 21 Mar 2019 02:14:10 +0800 Message-ID: <1553105650-28012-4-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1553105650-28012-1-git-send-email-john.garry@huawei.com> References: <1553105650-28012-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some prints in the code are for a hex number, but don't prefix "0x". Add the prefix, as is the norm. Signed-off-by: John Garry --- lib/logic_pio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/lib/logic_pio.c b/lib/logic_pio.c index 026a4fb4b944..6b37cc79a0bf 100644 --- a/lib/logic_pio.c +++ b/lib/logic_pio.c @@ -126,7 +126,7 @@ static struct logic_pio_hwaddr *find_io_range(unsigned long pio) if (in_range(pio, range->io_start, range->size)) return range; } - pr_err("PIO entry token %lx invalid\n", pio); + pr_err("PIO entry token 0x%lx invalid\n", pio); return NULL; } @@ -186,7 +186,7 @@ unsigned long logic_pio_trans_cpuaddr(resource_size_t addr) if (in_range(addr, range->hw_start, range->size)) return addr - range->hw_start + range->io_start; } - pr_err("addr %llx not registered in io_range_list\n", + pr_err("addr 0x%llx not registered in io_range_list\n", (unsigned long long) addr); return ~0UL; }