All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
To: Dan Streetman <ddstreet@us.ibm.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
	"David S. Miller" <davem@davemloft.net>,
	linux-crypto@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
	gustavold@linux.vnet.ibm.com
Subject: [PATCH 4/6] crypto/nx-842-{powerpc,pseries}: only load on the appropriate machine type
Date: Thu, 2 Jul 2015 15:40:49 -0700	[thread overview]
Message-ID: <20150702224049.GE1712@linux.vnet.ibm.com> (raw)
In-Reply-To: <20150702223800.GA1712@linux.vnet.ibm.com>

While we never would successfully load on the wrong machine type, there
is extra output by default regardless of machine type.

For instance, on a PowerVM LPAR, we see the following:

nx_compress_powernv: loading
nx_compress_powernv: no coprocessors found

even though those coprocessors could never be found. Similar pseries
messages are printed on powernv.

Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>

---
 drivers/crypto/nx/nx-842-powernv.c | 6 ++++++
 drivers/crypto/nx/nx-842-pseries.c | 6 ++++++
 drivers/crypto/nx/nx-842.h         | 1 +
 3 files changed, 13 insertions(+)

diff --git a/drivers/crypto/nx/nx-842-powernv.c b/drivers/crypto/nx/nx-842-powernv.c
index 33b3b0abf4ae..6b5e5143c95b 100644
--- a/drivers/crypto/nx/nx-842-powernv.c
+++ b/drivers/crypto/nx/nx-842-powernv.c
@@ -594,6 +594,9 @@ static __init int nx842_powernv_init(void)
 	BUILD_BUG_ON(DDE_BUFFER_ALIGN % DDE_BUFFER_SIZE_MULT);
 	BUILD_BUG_ON(DDE_BUFFER_SIZE_MULT % DDE_BUFFER_LAST_MULT);
 
+	if (!machine_is(powernv))
+		return -ENODEV;
+
 	pr_info("loading\n");
 
 	for_each_compatible_node(dn, NULL, "ibm,power-nx")
@@ -625,6 +628,9 @@ static void __exit nx842_powernv_exit(void)
 {
 	struct nx842_coproc *coproc, *n;
 
+	if (!machine_is(powernv))
+		return;
+
 	nx842_platform_driver_unset(&nx842_powernv_driver);
 
 	list_for_each_entry_safe(coproc, n, &nx842_coprocs, list) {
diff --git a/drivers/crypto/nx/nx-842-pseries.c b/drivers/crypto/nx/nx-842-pseries.c
index b84b0ceeb46e..75a7bfdc160e 100644
--- a/drivers/crypto/nx/nx-842-pseries.c
+++ b/drivers/crypto/nx/nx-842-pseries.c
@@ -1091,6 +1091,9 @@ static int __init nx842_pseries_init(void)
 	struct nx842_devdata *new_devdata;
 	int ret;
 
+	if (!machine_is(pseries))
+		return -ENODEV;
+
 	pr_info("Registering IBM Power 842 compression driver\n");
 
 	if (!of_find_compatible_node(NULL, NULL, "ibm,compression"))
@@ -1129,6 +1132,9 @@ static void __exit nx842_pseries_exit(void)
 	struct nx842_devdata *old_devdata;
 	unsigned long flags;
 
+	if (!machine_is(pseries))
+		return;
+
 	pr_info("Exiting IBM Power 842 compression driver\n");
 	nx842_platform_driver_unset(&nx842_pseries_driver);
 	spin_lock_irqsave(&devdata_mutex, flags);
diff --git a/drivers/crypto/nx/nx-842.h b/drivers/crypto/nx/nx-842.h
index ac0ea79d0f8b..ea89c661e476 100644
--- a/drivers/crypto/nx/nx-842.h
+++ b/drivers/crypto/nx/nx-842.h
@@ -10,6 +10,7 @@
 #include <linux/io.h>
 #include <linux/mm.h>
 #include <linux/ratelimit.h>
+#include <asm/machdep.h>
 
 /* Restrictions on Data Descriptor List (DDL) and Entry (DDE) buffers
  *
-- 
2.1.4

  parent reply	other threads:[~2015-07-02 22:40 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-02 22:38 [PATCH 0/6] drivers/nx-842: reduce verbosity of logging Nishanth Aravamudan
2015-07-02 22:38 ` [PATCH 1/6] crypto/nx-842-pseries: nx842_OF_upd_status should return ENODEV if device is not 'okay' Nishanth Aravamudan
2015-07-02 22:39 ` [PATCH 2/6] nx-842-pseries: rename nx842_{init,exit} to nx842_pseries_{init,exit} Nishanth Aravamudan
2015-07-02 22:40 ` [PATCH 3/6] nx-842-pseries: do not emit extra output if status is disabled Nishanth Aravamudan
2015-07-02 22:40 ` Nishanth Aravamudan [this message]
2015-07-03  1:30   ` [PATCH 4/6] crypto/nx-842-{powerpc,pseries}: only load on the appropriate machine type Michael Ellerman
2015-07-06 17:06     ` [PATCH v2] crypto/nx-842-{powerpc,pseries}: reduce chattiness of platform drivers Nishanth Aravamudan
2015-07-07  9:36       ` Michael Ellerman
2015-07-07 14:01       ` Herbert Xu
2015-07-07 14:01         ` [PATCH v2] crypto/nx-842-{powerpc, pseries}: " Herbert Xu
2015-07-02 22:41 ` [PATCH 5/6] [RFC] crypto/testmgr: add null test for 842 algorithm Nishanth Aravamudan
2015-07-03  6:26   ` Stephan Mueller
2015-07-04  7:24   ` Herbert Xu
2015-07-04  7:24     ` Herbert Xu
2015-07-14  0:05     ` Nishanth Aravamudan
2015-07-14  0:05       ` Nishanth Aravamudan
2015-07-15 14:25         ` Dan Streetman
2015-07-02 22:42 ` [PATCH 6/6] nx-842-platform: if NX842 platform drivers are not modules, don't try to load them Nishanth Aravamudan
2015-07-06  8:13   ` Herbert Xu
2015-07-06 17:07     ` Nishanth Aravamudan
2015-07-15 14:33       ` Dan Streetman
2015-07-06  8:34 ` [PATCH 0/6] drivers/nx-842: reduce verbosity of logging Herbert Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150702224049.GE1712@linux.vnet.ibm.com \
    --to=nacc@linux.vnet.ibm.com \
    --cc=davem@davemloft.net \
    --cc=ddstreet@us.ibm.com \
    --cc=gustavold@linux.vnet.ibm.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.