From: Tomas Winkler <tomas.winkler@intel.com>
To: gregkh@linuxfoundation.org
Cc: arnd@arndb.de, linux-kernel@vger.kernel.org,
Tomas Winkler <tomas.winkler@intel.com>
Subject: [char-misc-next 14/17] mei: bus: blacklist clients by number of connections and nfc info client
Date: Sat, 13 Jun 2015 22:11:46 +0300 [thread overview]
Message-ID: <1434222709-10966-15-git-send-email-tomas.winkler@intel.com> (raw)
In-Reply-To: <1434222709-10966-1-git-send-email-tomas.winkler@intel.com>
Currently we support only clients with single connection
and fixed address clients so all other clients are blacklisted
Blacklist nfc info client which is only used for retrieval
of the NFC radio version
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
drivers/misc/mei/bus-fixup.c | 42 ++++++++++++++++++++++++++++++++++++++----
1 file changed, 38 insertions(+), 4 deletions(-)
diff --git a/drivers/misc/mei/bus-fixup.c b/drivers/misc/mei/bus-fixup.c
index 2c02a338f63b..d4b1cccb5bc1 100644
--- a/drivers/misc/mei/bus-fixup.c
+++ b/drivers/misc/mei/bus-fixup.c
@@ -27,8 +27,41 @@
#include "mei_dev.h"
#include "client.h"
+#define MEI_UUID_NFC_INFO UUID_LE(0xd2de1625, 0x382d, 0x417d, \
+ 0x48, 0xa4, 0xef, 0xab, 0xba, 0x8a, 0x12, 0x06)
+
#define MEI_UUID_ANY NULL_UUID_LE
+/**
+ * number_of_connections - determine whether an client be on the bus
+ * according number of connections
+ * We support only clients:
+ * 1. with single connection
+ * 2. and fixed clients (max_number_of_connections == 0)
+ *
+ * @cldev: me clients device
+ */
+static void number_of_connections(struct mei_cl_device *cldev)
+{
+ dev_dbg(&cldev->dev, "running hook %s on %pUl\n",
+ __func__, mei_me_cl_uuid(cldev->me_cl));
+
+ if (cldev->me_cl->props.max_number_of_connections > 1)
+ cldev->do_match = 0;
+}
+
+/**
+ * blacklist - blacklist a client from the bus
+ *
+ * @cldev: me clients device
+ */
+static void blacklist(struct mei_cl_device *cldev)
+{
+ dev_dbg(&cldev->dev, "running hook %s on %pUl\n",
+ __func__, mei_me_cl_uuid(cldev->me_cl));
+ cldev->do_match = 0;
+}
+
struct mei_nfc_cmd {
u8 command;
u8 status;
@@ -120,9 +153,7 @@ const uuid_le mei_nfc_guid = UUID_LE(0x0bb17a78, 0x2a8e, 0x4c50,
0x94, 0xd4, 0x50, 0x26,
0x67, 0x23, 0x77, 0x5c);
-static const uuid_le mei_nfc_info_guid = UUID_LE(0xd2de1625, 0x382d, 0x417d,
- 0x48, 0xa4, 0xef, 0xab,
- 0xba, 0x8a, 0x12, 0x06);
+static const uuid_le mei_nfc_info_guid = MEI_UUID_NFC_INFO;
/* Vendors */
#define MEI_NFC_VENDOR_INSIDE 0x00
@@ -420,7 +451,10 @@ static struct mei_fixup {
const uuid_le uuid;
void (*hook)(struct mei_cl_device *cldev);
-} mei_fixups[] = {};
+} mei_fixups[] = {
+ MEI_FIXUP(MEI_UUID_ANY, number_of_connections),
+ MEI_FIXUP(MEI_UUID_NFC_INFO, blacklist),
+};
/**
* mei_cl_dev_fixup - run fixup handlers
--
2.4.2
next prev parent reply other threads:[~2015-06-13 19:15 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-13 19:11 [char-misc-next 00/17] revamp mei bus Tomas Winkler
2015-06-13 19:11 ` [char-misc-next 01/17] MAINTAINERS: mei: add mei_cl_bus.h to maintained file list Tomas Winkler
2015-06-13 19:11 ` [char-misc-next 02/17] mei: bus: fix drivers and devices names confusion Tomas Winkler
2015-06-13 21:21 ` Greg KH
2015-06-14 6:30 ` Winkler, Tomas
2015-06-13 19:11 ` [char-misc-next 03/17] mei: bus: rename device_list to simple devices Tomas Winkler
2015-06-13 21:21 ` Greg KH
2015-06-13 19:11 ` [char-misc-next 04/17] mei: bus: rename nfc.c to bus-fixup.c Tomas Winkler
2015-06-13 21:22 ` Greg KH
2015-06-13 19:11 ` [char-misc-next 05/17] mei: bus: move driver api functions at the start of the file Tomas Winkler
2015-06-13 21:22 ` Greg KH
2015-06-13 19:11 ` [char-misc-next 06/17] mei: bus: add kdoc for device attribute functions Tomas Winkler
2015-06-13 21:23 ` Greg KH
2015-06-13 19:11 ` [char-misc-next 07/17] mei: bus: don't enable events implicitly in device enable Tomas Winkler
2015-06-13 21:24 ` Greg KH
2015-06-13 19:11 ` [char-misc-next 08/17] mei: bus: report if event registration failed Tomas Winkler
2015-06-13 19:11 ` [char-misc-next 09/17] mei: bus: simplify device matching Tomas Winkler
2015-06-13 19:11 ` [char-misc-next 10/17] mei: bus: revamp probe and remove functions Tomas Winkler
2015-06-13 19:11 ` [char-misc-next 11/17] mei: bus: add reference to bus device in struct mei_cl_client Tomas Winkler
2015-06-13 19:11 ` [char-misc-next 12/17] mei: bus: add me client device list infrastructure Tomas Winkler
2015-06-13 19:11 ` [char-misc-next 13/17] mei: bus: enable running fixup routines before device registration Tomas Winkler
2015-06-13 19:11 ` Tomas Winkler [this message]
2015-06-13 19:11 ` [char-misc-next 15/17] mei: bus: simplify how we build nfc bus name Tomas Winkler
2015-06-13 19:11 ` [char-misc-next 16/17] mei: bus: also unregister the driver when removing the device Tomas Winkler
2015-06-13 19:11 ` [char-misc-next 17/17] mei: bus: link client devices instead of host clients Tomas Winkler
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=1434222709-10966-15-git-send-email-tomas.winkler@intel.com \
--to=tomas.winkler@intel.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®