From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELtCQeNpxdQ6umfBjaMl5j223RoyOrajhaVbyaduuabsorjTC/vJU3Jp7cXK6J/YJT7h9wn7 ARC-Seal: i=1; a=rsa-sha256; t=1521208178; cv=none; d=google.com; s=arc-20160816; b=uW4MIYl76ljP1VMoVQSZsfv7UPXqcVSYZfulodXpSLbXhmAjtDL4IbyzQvE4idlgfg j3eAeJxltl05uH+MhsYF9K5rnqEGEymKdMGcQtw+NXwsLt0BjsJ2gocr6UGsCqQzRloG SGgn9PvoKWs6YIy0skB1R9+mA5nCvLRfseSLOFQ559l8y2/on77UfoBU8ggr26ThoVPT CEkoTdBSW3qlvkiHZqDFH/kkDUxZQIte2UREx+MdWavW7wDh4xYQWIyB1FZ0fUNKQHCT biFhiDgaw/mkfZUBzJOr2WJCZPU22BWctqnpYJJJ9QaLYXyxRFTbwPWmBDcJ17MsQlr7 8rFg== 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 :arc-authentication-results; bh=nur7l6MnTbCFa2GACFTXwPaBZpJAoP46VYAO/MyzMZ0=; b=I/l6IAFDq9Y0HVn9NQ4BpSAv1pwGFSyF/srAGEGS05ojr1RtryW1rudwFiLH95iURX bGV+H3sjMLTozsoU1F3ylD2VO+Dx8Epa9U7fxlLVX9xHZ1Nx6Sq60qvYLrxWUGOMkkqm 9uUjU73hJDusR/H6R/ZgDaUeleTnE1YX3V4Aac7NQBzS2+u2K+6ltJ2p3nEiJzsCJF6Z rHOxWKdtK6dL53repZpVIaHIVXQJ0DKaUwfreS/r/DK6oDrnpanX779KfvvLXxlXdb7r WdExUASaZW6pZnWcUKXk9aLMSoEB1bQ4FhU+af4Mrx5hYfroW/tPXIzVx6ZXGpOGgzpz Pd7Q== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 2a02:1800:120:4::f00:13 is neither permitted nor denied by best guess record for domain of geert@linux-m68k.org) smtp.mailfrom=geert@linux-m68k.org Authentication-Results: mx.google.com; spf=neutral (google.com: 2a02:1800:120:4::f00:13 is neither permitted nor denied by best guess record for domain of geert@linux-m68k.org) smtp.mailfrom=geert@linux-m68k.org From: Geert Uytterhoeven To: Christoph Hellwig , Marek Szyprowski , Robin Murphy , Felipe Balbi , Greg Kroah-Hartman , "James E . J . Bottomley" , "Martin K . Petersen" , Andrew Morton Cc: iommu@lists.linux-foundation.org, linux-usb@vger.kernel.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 4/5] mm: Add NO_DMA dummies for DMA pool API Date: Fri, 16 Mar 2018 14:25:43 +0100 Message-Id: <1521206744-1504-5-git-send-email-geert@linux-m68k.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521206744-1504-1-git-send-email-geert@linux-m68k.org> References: <1521206744-1504-1-git-send-email-geert@linux-m68k.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1595102386187325334?= X-GMAIL-MSGID: =?utf-8?q?1595102386187325334?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Add dummies for dma{,m}_pool_{create,destroy,alloc,free}(), to allow compile-testing if NO_DMA=y. This prevents the following from showing up later: ERROR: "dma_pool_destroy" [drivers/usb/mtu3/mtu3.ko] undefined! ERROR: "dma_pool_free" [drivers/usb/mtu3/mtu3.ko] undefined! ERROR: "dma_pool_alloc" [drivers/usb/mtu3/mtu3.ko] undefined! ERROR: "dma_pool_create" [drivers/usb/mtu3/mtu3.ko] undefined! ERROR: "dma_pool_destroy" [drivers/scsi/hisi_sas/hisi_sas_main.ko] undefined! ERROR: "dma_pool_free" [drivers/scsi/hisi_sas/hisi_sas_main.ko] undefined! ERROR: "dma_pool_alloc" [drivers/scsi/hisi_sas/hisi_sas_main.ko] undefined! ERROR: "dma_pool_create" [drivers/scsi/hisi_sas/hisi_sas_main.ko] undefined! ERROR: "dma_pool_alloc" [drivers/mailbox/bcm-pdc-mailbox.ko] undefined! ERROR: "dma_pool_free" [drivers/mailbox/bcm-pdc-mailbox.ko] undefined! ERROR: "dma_pool_create" [drivers/mailbox/bcm-pdc-mailbox.ko] undefined! ERROR: "dma_pool_destroy" [drivers/mailbox/bcm-pdc-mailbox.ko] undefined! Signed-off-by: Geert Uytterhoeven Reviewed-by: Mark Brown Acked-by: Robin Murphy --- v2: - Add Reviewed-by, Acked-by, - Drop RFC state, - Group NO_DMA-stubs under a single #ifdef, - Move dma_pool_zalloc() definition down. --- include/linux/dmapool.h | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/include/linux/dmapool.h b/include/linux/dmapool.h index 53ba737505df31c7..f632ecfb4238404e 100644 --- a/include/linux/dmapool.h +++ b/include/linux/dmapool.h @@ -16,6 +16,8 @@ struct device; +#ifdef CONFIG_HAS_DMA + struct dma_pool *dma_pool_create(const char *name, struct device *dev, size_t size, size_t align, size_t allocation); @@ -23,13 +25,6 @@ void dma_pool_destroy(struct dma_pool *pool); void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags, dma_addr_t *handle); - -static inline void *dma_pool_zalloc(struct dma_pool *pool, gfp_t mem_flags, - dma_addr_t *handle) -{ - return dma_pool_alloc(pool, mem_flags | __GFP_ZERO, handle); -} - void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t addr); /* @@ -39,5 +34,26 @@ struct dma_pool *dmam_pool_create(const char *name, struct device *dev, size_t size, size_t align, size_t allocation); void dmam_pool_destroy(struct dma_pool *pool); +#else /* !CONFIG_HAS_DMA */ +static inline struct dma_pool *dma_pool_create(const char *name, + struct device *dev, size_t size, size_t align, size_t allocation) +{ return NULL; } +static inline void dma_pool_destroy(struct dma_pool *pool) { } +static inline void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags, + dma_addr_t *handle) { return NULL; } +static inline void dma_pool_free(struct dma_pool *pool, void *vaddr, + dma_addr_t addr) { } +static inline struct dma_pool *dmam_pool_create(const char *name, + struct device *dev, size_t size, size_t align, size_t allocation) +{ return NULL; } +static inline void dmam_pool_destroy(struct dma_pool *pool) { } +#endif /* !CONFIG_HAS_DMA */ + +static inline void *dma_pool_zalloc(struct dma_pool *pool, gfp_t mem_flags, + dma_addr_t *handle) +{ + return dma_pool_alloc(pool, mem_flags | __GFP_ZERO, handle); +} + #endif -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v2,4/5] mm: Add NO_DMA dummies for DMA pool API From: Geert Uytterhoeven Message-Id: <1521206744-1504-5-git-send-email-geert@linux-m68k.org> Date: Fri, 16 Mar 2018 14:25:43 +0100 To: Christoph Hellwig , Marek Szyprowski , Robin Murphy , Felipe Balbi , Greg Kroah-Hartman , "James E . J . Bottomley" , "Martin K . Petersen" , Andrew Morton Cc: iommu@lists.linux-foundation.org, linux-usb@vger.kernel.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven List-ID: QWRkIGR1bW1pZXMgZm9yIGRtYXssbX1fcG9vbF97Y3JlYXRlLGRlc3Ryb3ksYWxsb2MsZnJlZX0o KSwgdG8gYWxsb3cKY29tcGlsZS10ZXN0aW5nIGlmIE5PX0RNQT15LgoKVGhpcyBwcmV2ZW50cyB0 aGUgZm9sbG93aW5nIGZyb20gc2hvd2luZyB1cCBsYXRlcjoKCiAgICBFUlJPUjogImRtYV9wb29s X2Rlc3Ryb3kiIFtkcml2ZXJzL3VzYi9tdHUzL210dTMua29dIHVuZGVmaW5lZCEKICAgIEVSUk9S OiAiZG1hX3Bvb2xfZnJlZSIgW2RyaXZlcnMvdXNiL210dTMvbXR1My5rb10gdW5kZWZpbmVkIQog ICAgRVJST1I6ICJkbWFfcG9vbF9hbGxvYyIgW2RyaXZlcnMvdXNiL210dTMvbXR1My5rb10gdW5k ZWZpbmVkIQogICAgRVJST1I6ICJkbWFfcG9vbF9jcmVhdGUiIFtkcml2ZXJzL3VzYi9tdHUzL210 dTMua29dIHVuZGVmaW5lZCEKICAgIEVSUk9SOiAiZG1hX3Bvb2xfZGVzdHJveSIgW2RyaXZlcnMv c2NzaS9oaXNpX3Nhcy9oaXNpX3Nhc19tYWluLmtvXSB1bmRlZmluZWQhCiAgICBFUlJPUjogImRt YV9wb29sX2ZyZWUiIFtkcml2ZXJzL3Njc2kvaGlzaV9zYXMvaGlzaV9zYXNfbWFpbi5rb10gdW5k ZWZpbmVkIQogICAgRVJST1I6ICJkbWFfcG9vbF9hbGxvYyIgW2RyaXZlcnMvc2NzaS9oaXNpX3Nh cy9oaXNpX3Nhc19tYWluLmtvXSB1bmRlZmluZWQhCiAgICBFUlJPUjogImRtYV9wb29sX2NyZWF0 ZSIgW2RyaXZlcnMvc2NzaS9oaXNpX3Nhcy9oaXNpX3Nhc19tYWluLmtvXSB1bmRlZmluZWQhCiAg ICBFUlJPUjogImRtYV9wb29sX2FsbG9jIiBbZHJpdmVycy9tYWlsYm94L2JjbS1wZGMtbWFpbGJv eC5rb10gdW5kZWZpbmVkIQogICAgRVJST1I6ICJkbWFfcG9vbF9mcmVlIiBbZHJpdmVycy9tYWls Ym94L2JjbS1wZGMtbWFpbGJveC5rb10gdW5kZWZpbmVkIQogICAgRVJST1I6ICJkbWFfcG9vbF9j cmVhdGUiIFtkcml2ZXJzL21haWxib3gvYmNtLXBkYy1tYWlsYm94LmtvXSB1bmRlZmluZWQhCiAg ICBFUlJPUjogImRtYV9wb29sX2Rlc3Ryb3kiIFtkcml2ZXJzL21haWxib3gvYmNtLXBkYy1tYWls Ym94LmtvXSB1bmRlZmluZWQhCgpTaWduZWQtb2ZmLWJ5OiBHZWVydCBVeXR0ZXJob2V2ZW4gPGdl ZXJ0QGxpbnV4LW02OGsub3JnPgpSZXZpZXdlZC1ieTogTWFyayBCcm93biA8YnJvb25pZUBrZXJu ZWwub3JnPgpBY2tlZC1ieTogUm9iaW4gTXVycGh5IDxyb2Jpbi5tdXJwaHlAYXJtLmNvbT4KLS0t CnYyOgogIC0gQWRkIFJldmlld2VkLWJ5LCBBY2tlZC1ieSwKICAtIERyb3AgUkZDIHN0YXRlLAog IC0gR3JvdXAgTk9fRE1BLXN0dWJzIHVuZGVyIGEgc2luZ2xlICNpZmRlZiwKICAtIE1vdmUgZG1h X3Bvb2xfemFsbG9jKCkgZGVmaW5pdGlvbiBkb3duLgotLS0KIGluY2x1ZGUvbGludXgvZG1hcG9v bC5oIHwgMzAgKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwg MjMgaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9pbmNsdWRlL2xp bnV4L2RtYXBvb2wuaCBiL2luY2x1ZGUvbGludXgvZG1hcG9vbC5oCmluZGV4IDUzYmE3Mzc1MDVk ZjMxYzcuLmY2MzJlY2ZiNDIzODQwNGUgMTAwNjQ0Ci0tLSBhL2luY2x1ZGUvbGludXgvZG1hcG9v bC5oCisrKyBiL2luY2x1ZGUvbGludXgvZG1hcG9vbC5oCkBAIC0xNiw2ICsxNiw4IEBACiAKIHN0 cnVjdCBkZXZpY2U7CiAKKyNpZmRlZiBDT05GSUdfSEFTX0RNQQorCiBzdHJ1Y3QgZG1hX3Bvb2wg KmRtYV9wb29sX2NyZWF0ZShjb25zdCBjaGFyICpuYW1lLCBzdHJ1Y3QgZGV2aWNlICpkZXYsIAog CQkJc2l6ZV90IHNpemUsIHNpemVfdCBhbGlnbiwgc2l6ZV90IGFsbG9jYXRpb24pOwogCkBAIC0y MywxMyArMjUsNiBAQCB2b2lkIGRtYV9wb29sX2Rlc3Ryb3koc3RydWN0IGRtYV9wb29sICpwb29s KTsKIAogdm9pZCAqZG1hX3Bvb2xfYWxsb2Moc3RydWN0IGRtYV9wb29sICpwb29sLCBnZnBfdCBt ZW1fZmxhZ3MsCiAJCSAgICAgZG1hX2FkZHJfdCAqaGFuZGxlKTsKLQotc3RhdGljIGlubGluZSB2 b2lkICpkbWFfcG9vbF96YWxsb2Moc3RydWN0IGRtYV9wb29sICpwb29sLCBnZnBfdCBtZW1fZmxh Z3MsCi0JCQkJICAgIGRtYV9hZGRyX3QgKmhhbmRsZSkKLXsKLQlyZXR1cm4gZG1hX3Bvb2xfYWxs b2MocG9vbCwgbWVtX2ZsYWdzIHwgX19HRlBfWkVSTywgaGFuZGxlKTsKLX0KLQogdm9pZCBkbWFf cG9vbF9mcmVlKHN0cnVjdCBkbWFfcG9vbCAqcG9vbCwgdm9pZCAqdmFkZHIsIGRtYV9hZGRyX3Qg YWRkcik7CiAKIC8qCkBAIC0zOSw1ICszNCwyNiBAQCBzdHJ1Y3QgZG1hX3Bvb2wgKmRtYW1fcG9v bF9jcmVhdGUoY29uc3QgY2hhciAqbmFtZSwgc3RydWN0IGRldmljZSAqZGV2LAogCQkJCSAgc2l6 ZV90IHNpemUsIHNpemVfdCBhbGlnbiwgc2l6ZV90IGFsbG9jYXRpb24pOwogdm9pZCBkbWFtX3Bv b2xfZGVzdHJveShzdHJ1Y3QgZG1hX3Bvb2wgKnBvb2wpOwogCisjZWxzZSAvKiAhQ09ORklHX0hB U19ETUEgKi8KK3N0YXRpYyBpbmxpbmUgc3RydWN0IGRtYV9wb29sICpkbWFfcG9vbF9jcmVhdGUo Y29uc3QgY2hhciAqbmFtZSwKKwlzdHJ1Y3QgZGV2aWNlICpkZXYsIHNpemVfdCBzaXplLCBzaXpl X3QgYWxpZ24sIHNpemVfdCBhbGxvY2F0aW9uKQoreyByZXR1cm4gTlVMTDsgfQorc3RhdGljIGlu bGluZSB2b2lkIGRtYV9wb29sX2Rlc3Ryb3koc3RydWN0IGRtYV9wb29sICpwb29sKSB7IH0KK3N0 YXRpYyBpbmxpbmUgdm9pZCAqZG1hX3Bvb2xfYWxsb2Moc3RydWN0IGRtYV9wb29sICpwb29sLCBn ZnBfdCBtZW1fZmxhZ3MsCisJCQkJICAgZG1hX2FkZHJfdCAqaGFuZGxlKSB7IHJldHVybiBOVUxM OyB9CitzdGF0aWMgaW5saW5lIHZvaWQgZG1hX3Bvb2xfZnJlZShzdHJ1Y3QgZG1hX3Bvb2wgKnBv b2wsIHZvaWQgKnZhZGRyLAorCQkJCSBkbWFfYWRkcl90IGFkZHIpIHsgfQorc3RhdGljIGlubGlu ZSBzdHJ1Y3QgZG1hX3Bvb2wgKmRtYW1fcG9vbF9jcmVhdGUoY29uc3QgY2hhciAqbmFtZSwKKwlz dHJ1Y3QgZGV2aWNlICpkZXYsIHNpemVfdCBzaXplLCBzaXplX3QgYWxpZ24sIHNpemVfdCBhbGxv Y2F0aW9uKQoreyByZXR1cm4gTlVMTDsgfQorc3RhdGljIGlubGluZSB2b2lkIGRtYW1fcG9vbF9k ZXN0cm95KHN0cnVjdCBkbWFfcG9vbCAqcG9vbCkgeyB9CisjZW5kaWYgLyogIUNPTkZJR19IQVNf RE1BICovCisKK3N0YXRpYyBpbmxpbmUgdm9pZCAqZG1hX3Bvb2xfemFsbG9jKHN0cnVjdCBkbWFf cG9vbCAqcG9vbCwgZ2ZwX3QgbWVtX2ZsYWdzLAorCQkJCSAgICBkbWFfYWRkcl90ICpoYW5kbGUp Cit7CisJcmV0dXJuIGRtYV9wb29sX2FsbG9jKHBvb2wsIG1lbV9mbGFncyB8IF9fR0ZQX1pFUk8s IGhhbmRsZSk7Cit9CisKICNlbmRpZgogCg==