]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/blobdiff - drivers/thunderbolt/icm.c
powerpc: sys_pkey_alloc() and sys_pkey_free() system calls
[mirror_ubuntu-bionic-kernel.git] / drivers / thunderbolt / icm.c
index 5d3cd740b71f077ace329e4cba54c2e1c8c60f38..47f00752a3c26d61cc1b55f06ef52760103994c9 100644 (file)
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/mutex.h>
 #include <linux/pci.h>
+#include <linux/pm_runtime.h>
 #include <linux/platform_data/x86/apple.h>
 #include <linux/sizes.h>
 #include <linux/slab.h>
  * @vnd_cap: Vendor defined capability where PCIe2CIO mailbox resides
  *          (only set when @upstream_port is not %NULL)
  * @safe_mode: ICM is in safe mode
+ * @max_boot_acl: Maximum number of preboot ACL entries (%0 if not supported)
+ * @rpm: Does the controller support runtime PM (RTD3)
  * @is_supported: Checks if we can support ICM on this controller
  * @get_mode: Read and return the ICM firmware mode (optional)
  * @get_route: Find a route string for given switch
+ * @save_devices: Ask ICM to save devices to ACL when suspending (optional)
  * @driver_ready: Send driver ready message to ICM
  * @device_connected: Handle device connected ICM message
  * @device_disconnected: Handle device disconnected ICM message
@@ -69,13 +73,17 @@ struct icm {
        struct mutex request_lock;
        struct delayed_work rescan_work;
        struct pci_dev *upstream_port;
+       size_t max_boot_acl;
        int vnd_cap;
        bool safe_mode;
+       bool rpm;
        bool (*is_supported)(struct tb *tb);
        int (*get_mode)(struct tb *tb);
        int (*get_route)(struct tb *tb, u8 link, u8 depth, u64 *route);
+       void (*save_devices)(struct tb *tb);
        int (*driver_ready)(struct tb *tb,
-                           enum tb_security_level *security_level);
+                           enum tb_security_level *security_level,
+                           size_t *nboot_acl, bool *rpm);
        void (*device_connected)(struct tb *tb,
                                 const struct icm_pkg_header *hdr);
        void (*device_disconnected)(struct tb *tb,
@@ -92,6 +100,47 @@ struct icm_notification {
        struct tb *tb;
 };
 
+struct ep_name_entry {
+       u8 len;
+       u8 type;
+       u8 data[0];
+};
+
+#define EP_NAME_INTEL_VSS      0x10
+
+/* Intel Vendor specific structure */
+struct intel_vss {
+       u16 vendor;
+       u16 model;
+       u8 mc;
+       u8 flags;
+       u16 pci_devid;
+       u32 nvm_version;
+};
+
+#define INTEL_VSS_FLAGS_RTD3   BIT(0)
+
+static const struct intel_vss *parse_intel_vss(const void *ep_name, size_t size)
+{
+       const void *end = ep_name + size;
+
+       while (ep_name < end) {
+               const struct ep_name_entry *ep = ep_name;
+
+               if (!ep->len)
+                       break;
+               if (ep_name + ep->len > end)
+                       break;
+
+               if (ep->type == EP_NAME_INTEL_VSS)
+                       return (const struct intel_vss *)ep->data;
+
+               ep_name += ep->len;
+       }
+
+       return NULL;
+}
+
 static inline struct tb *icm_to_tb(struct icm *icm)
 {
        return ((void *)icm - sizeof(struct tb));
@@ -115,6 +164,12 @@ static inline u64 get_route(u32 route_hi, u32 route_lo)
        return (u64)route_hi << 32 | route_lo;
 }
 
+static inline u64 get_parent_route(u64 route)
+{
+       int depth = tb_route_length(route);
+       return depth ? route & ~(0xffULL << (depth - 1) * TB_ROUTE_SHIFT) : 0;
+}
+
 static bool icm_match(const struct tb_cfg_request *req,
                      const struct ctl_pkg *pkg)
 {
@@ -249,8 +304,14 @@ err_free:
        return ret;
 }
 
+static void icm_fr_save_devices(struct tb *tb)
+{
+       nhi_mailbox_cmd(tb->nhi, NHI_MAILBOX_SAVE_DEVS, 0);
+}
+
 static int
-icm_fr_driver_ready(struct tb *tb, enum tb_security_level *security_level)
+icm_fr_driver_ready(struct tb *tb, enum tb_security_level *security_level,
+                   size_t *nboot_acl, bool *rpm)
 {
        struct icm_fr_pkg_driver_ready_response reply;
        struct icm_pkg_driver_ready request = {
@@ -400,15 +461,19 @@ static int icm_fr_disconnect_xdomain_paths(struct tb *tb, struct tb_xdomain *xd)
 }
 
 static void add_switch(struct tb_switch *parent_sw, u64 route,
-                      const uuid_t *uuid, u8 connection_id, u8 connection_key,
+                      const uuid_t *uuid, const u8 *ep_name,
+                      size_t ep_name_size, u8 connection_id, u8 connection_key,
                       u8 link, u8 depth, enum tb_security_level security_level,
-                      bool authorized)
+                      bool authorized, bool boot)
 {
+       const struct intel_vss *vss;
        struct tb_switch *sw;
 
+       pm_runtime_get_sync(&parent_sw->dev);
+
        sw = tb_switch_alloc(parent_sw->tb, &parent_sw->dev, route);
        if (!sw)
-               return;
+               goto out;
 
        sw->uuid = kmemdup(uuid, sizeof(*uuid), GFP_KERNEL);
        sw->connection_id = connection_id;
@@ -417,6 +482,11 @@ static void add_switch(struct tb_switch *parent_sw, u64 route,
        sw->depth = depth;
        sw->authorized = authorized;
        sw->security_level = security_level;
+       sw->boot = boot;
+
+       vss = parse_intel_vss(ep_name, ep_name_size);
+       if (vss)
+               sw->rpm = !!(vss->flags & INTEL_VSS_FLAGS_RTD3);
 
        /* Link the two switches now */
        tb_port_at(route, parent_sw)->remote = tb_upstream_port(sw);
@@ -425,13 +495,16 @@ static void add_switch(struct tb_switch *parent_sw, u64 route,
        if (tb_switch_add(sw)) {
                tb_port_at(tb_route(sw), parent_sw)->remote = NULL;
                tb_switch_put(sw);
-               return;
        }
+
+out:
+       pm_runtime_mark_last_busy(&parent_sw->dev);
+       pm_runtime_put_autosuspend(&parent_sw->dev);
 }
 
 static void update_switch(struct tb_switch *parent_sw, struct tb_switch *sw,
                          u64 route, u8 connection_id, u8 connection_key,
-                         u8 link, u8 depth)
+                         u8 link, u8 depth, bool boot)
 {
        /* Disconnect from parent */
        tb_port_at(tb_route(sw), parent_sw)->remote = NULL;
@@ -445,6 +518,7 @@ static void update_switch(struct tb_switch *parent_sw, struct tb_switch *sw,
        sw->connection_key = connection_key;
        sw->link = link;
        sw->depth = depth;
+       sw->boot = boot;
 
        /* This switch still exists */
        sw->is_unplugged = false;
@@ -465,9 +539,11 @@ static void add_xdomain(struct tb_switch *sw, u64 route,
 {
        struct tb_xdomain *xd;
 
+       pm_runtime_get_sync(&sw->dev);
+
        xd = tb_xdomain_alloc(sw->tb, &sw->dev, route, local_uuid, remote_uuid);
        if (!xd)
-               return;
+               goto out;
 
        xd->link = link;
        xd->depth = depth;
@@ -475,6 +551,10 @@ static void add_xdomain(struct tb_switch *sw, u64 route,
        tb_port_at(route, sw)->xdomain = xd;
 
        tb_xdomain_add(xd);
+
+out:
+       pm_runtime_mark_last_busy(&sw->dev);
+       pm_runtime_put_autosuspend(&sw->dev);
 }
 
 static void update_xdomain(struct tb_xdomain *xd, u64 route, u8 link)
@@ -504,6 +584,7 @@ icm_fr_device_connected(struct tb *tb, const struct icm_pkg_header *hdr)
        bool authorized = false;
        struct tb_xdomain *xd;
        u8 link, depth;
+       bool boot;
        u64 route;
        int ret;
 
@@ -513,6 +594,7 @@ icm_fr_device_connected(struct tb *tb, const struct icm_pkg_header *hdr)
        authorized = pkg->link_info & ICM_LINK_INFO_APPROVED;
        security_level = (pkg->hdr.flags & ICM_FLAGS_SLEVEL_MASK) >>
                         ICM_FLAGS_SLEVEL_SHIFT;
+       boot = pkg->link_info & ICM_LINK_INFO_BOOT;
 
        if (pkg->link_info & ICM_LINK_INFO_REJECTED) {
                tb_info(tb, "switch at %u.%u was rejected by ICM firmware because topology limit exceeded\n",
@@ -520,20 +602,13 @@ icm_fr_device_connected(struct tb *tb, const struct icm_pkg_header *hdr)
                return;
        }
 
-       ret = icm->get_route(tb, link, depth, &route);
-       if (ret) {
-               tb_err(tb, "failed to find route string for switch at %u.%u\n",
-                      link, depth);
-               return;
-       }
-
        sw = tb_switch_find_by_uuid(tb, &pkg->ep_uuid);
        if (sw) {
                u8 phy_port, sw_phy_port;
 
                parent_sw = tb_to_switch(sw->dev.parent);
-               sw_phy_port = phy_port_from_route(tb_route(sw), sw->depth);
-               phy_port = phy_port_from_route(route, depth);
+               sw_phy_port = tb_phy_port_from_link(sw->link);
+               phy_port = tb_phy_port_from_link(link);
 
                /*
                 * On resume ICM will send us connected events for the
@@ -545,8 +620,24 @@ icm_fr_device_connected(struct tb *tb, const struct icm_pkg_header *hdr)
                 */
                if (sw->depth == depth && sw_phy_port == phy_port &&
                    !!sw->authorized == authorized) {
+                       /*
+                        * It was enumerated through another link so update
+                        * route string accordingly.
+                        */
+                       if (sw->link != link) {
+                               ret = icm->get_route(tb, link, depth, &route);
+                               if (ret) {
+                                       tb_err(tb, "failed to update route string for switch at %u.%u\n",
+                                              link, depth);
+                                       tb_switch_put(sw);
+                                       return;
+                               }
+                       } else {
+                               route = tb_route(sw);
+                       }
+
                        update_switch(parent_sw, sw, route, pkg->connection_id,
-                                     pkg->connection_key, link, depth);
+                                     pkg->connection_key, link, depth, boot);
                        tb_switch_put(sw);
                        return;
                }
@@ -593,9 +684,18 @@ icm_fr_device_connected(struct tb *tb, const struct icm_pkg_header *hdr)
                return;
        }
 
-       add_switch(parent_sw, route, &pkg->ep_uuid, pkg->connection_id,
+       ret = icm->get_route(tb, link, depth, &route);
+       if (ret) {
+               tb_err(tb, "failed to find route string for switch at %u.%u\n",
+                      link, depth);
+               tb_switch_put(parent_sw);
+               return;
+       }
+
+       add_switch(parent_sw, route, &pkg->ep_uuid, (const u8 *)pkg->ep_name,
+                  sizeof(pkg->ep_name), pkg->connection_id,
                   pkg->connection_key, link, depth, security_level,
-                  authorized);
+                  authorized, boot);
 
        tb_switch_put(parent_sw);
 }
@@ -741,6 +841,355 @@ icm_fr_xdomain_disconnected(struct tb *tb, const struct icm_pkg_header *hdr)
        }
 }
 
+static int
+icm_tr_driver_ready(struct tb *tb, enum tb_security_level *security_level,
+                   size_t *nboot_acl, bool *rpm)
+{
+       struct icm_tr_pkg_driver_ready_response reply;
+       struct icm_pkg_driver_ready request = {
+               .hdr.code = ICM_DRIVER_READY,
+       };
+       int ret;
+
+       memset(&reply, 0, sizeof(reply));
+       ret = icm_request(tb, &request, sizeof(request), &reply, sizeof(reply),
+                         1, 20000);
+       if (ret)
+               return ret;
+
+       if (security_level)
+               *security_level = reply.info & ICM_TR_INFO_SLEVEL_MASK;
+       if (nboot_acl)
+               *nboot_acl = (reply.info & ICM_TR_INFO_BOOT_ACL_MASK) >>
+                               ICM_TR_INFO_BOOT_ACL_SHIFT;
+       if (rpm)
+               *rpm = !!(reply.hdr.flags & ICM_TR_FLAGS_RTD3);
+
+       return 0;
+}
+
+static int icm_tr_approve_switch(struct tb *tb, struct tb_switch *sw)
+{
+       struct icm_tr_pkg_approve_device request;
+       struct icm_tr_pkg_approve_device reply;
+       int ret;
+
+       memset(&request, 0, sizeof(request));
+       memcpy(&request.ep_uuid, sw->uuid, sizeof(request.ep_uuid));
+       request.hdr.code = ICM_APPROVE_DEVICE;
+       request.route_lo = sw->config.route_lo;
+       request.route_hi = sw->config.route_hi;
+       request.connection_id = sw->connection_id;
+
+       memset(&reply, 0, sizeof(reply));
+       ret = icm_request(tb, &request, sizeof(request), &reply, sizeof(reply),
+                         1, ICM_APPROVE_TIMEOUT);
+       if (ret)
+               return ret;
+
+       if (reply.hdr.flags & ICM_FLAGS_ERROR) {
+               tb_warn(tb, "PCIe tunnel creation failed\n");
+               return -EIO;
+       }
+
+       return 0;
+}
+
+static int icm_tr_add_switch_key(struct tb *tb, struct tb_switch *sw)
+{
+       struct icm_tr_pkg_add_device_key_response reply;
+       struct icm_tr_pkg_add_device_key request;
+       int ret;
+
+       memset(&request, 0, sizeof(request));
+       memcpy(&request.ep_uuid, sw->uuid, sizeof(request.ep_uuid));
+       request.hdr.code = ICM_ADD_DEVICE_KEY;
+       request.route_lo = sw->config.route_lo;
+       request.route_hi = sw->config.route_hi;
+       request.connection_id = sw->connection_id;
+       memcpy(request.key, sw->key, TB_SWITCH_KEY_SIZE);
+
+       memset(&reply, 0, sizeof(reply));
+       ret = icm_request(tb, &request, sizeof(request), &reply, sizeof(reply),
+                         1, ICM_TIMEOUT);
+       if (ret)
+               return ret;
+
+       if (reply.hdr.flags & ICM_FLAGS_ERROR) {
+               tb_warn(tb, "Adding key to switch failed\n");
+               return -EIO;
+       }
+
+       return 0;
+}
+
+static int icm_tr_challenge_switch_key(struct tb *tb, struct tb_switch *sw,
+                                      const u8 *challenge, u8 *response)
+{
+       struct icm_tr_pkg_challenge_device_response reply;
+       struct icm_tr_pkg_challenge_device request;
+       int ret;
+
+       memset(&request, 0, sizeof(request));
+       memcpy(&request.ep_uuid, sw->uuid, sizeof(request.ep_uuid));
+       request.hdr.code = ICM_CHALLENGE_DEVICE;
+       request.route_lo = sw->config.route_lo;
+       request.route_hi = sw->config.route_hi;
+       request.connection_id = sw->connection_id;
+       memcpy(request.challenge, challenge, TB_SWITCH_KEY_SIZE);
+
+       memset(&reply, 0, sizeof(reply));
+       ret = icm_request(tb, &request, sizeof(request), &reply, sizeof(reply),
+                         1, ICM_TIMEOUT);
+       if (ret)
+               return ret;
+
+       if (reply.hdr.flags & ICM_FLAGS_ERROR)
+               return -EKEYREJECTED;
+       if (reply.hdr.flags & ICM_FLAGS_NO_KEY)
+               return -ENOKEY;
+
+       memcpy(response, reply.response, TB_SWITCH_KEY_SIZE);
+
+       return 0;
+}
+
+static int icm_tr_approve_xdomain_paths(struct tb *tb, struct tb_xdomain *xd)
+{
+       struct icm_tr_pkg_approve_xdomain_response reply;
+       struct icm_tr_pkg_approve_xdomain request;
+       int ret;
+
+       memset(&request, 0, sizeof(request));
+       request.hdr.code = ICM_APPROVE_XDOMAIN;
+       request.route_hi = upper_32_bits(xd->route);
+       request.route_lo = lower_32_bits(xd->route);
+       request.transmit_path = xd->transmit_path;
+       request.transmit_ring = xd->transmit_ring;
+       request.receive_path = xd->receive_path;
+       request.receive_ring = xd->receive_ring;
+       memcpy(&request.remote_uuid, xd->remote_uuid, sizeof(*xd->remote_uuid));
+
+       memset(&reply, 0, sizeof(reply));
+       ret = icm_request(tb, &request, sizeof(request), &reply, sizeof(reply),
+                         1, ICM_TIMEOUT);
+       if (ret)
+               return ret;
+
+       if (reply.hdr.flags & ICM_FLAGS_ERROR)
+               return -EIO;
+
+       return 0;
+}
+
+static int icm_tr_xdomain_tear_down(struct tb *tb, struct tb_xdomain *xd,
+                                   int stage)
+{
+       struct icm_tr_pkg_disconnect_xdomain_response reply;
+       struct icm_tr_pkg_disconnect_xdomain request;
+       int ret;
+
+       memset(&request, 0, sizeof(request));
+       request.hdr.code = ICM_DISCONNECT_XDOMAIN;
+       request.stage = stage;
+       request.route_hi = upper_32_bits(xd->route);
+       request.route_lo = lower_32_bits(xd->route);
+       memcpy(&request.remote_uuid, xd->remote_uuid, sizeof(*xd->remote_uuid));
+
+       memset(&reply, 0, sizeof(reply));
+       ret = icm_request(tb, &request, sizeof(request), &reply, sizeof(reply),
+                         1, ICM_TIMEOUT);
+       if (ret)
+               return ret;
+
+       if (reply.hdr.flags & ICM_FLAGS_ERROR)
+               return -EIO;
+
+       return 0;
+}
+
+static int icm_tr_disconnect_xdomain_paths(struct tb *tb, struct tb_xdomain *xd)
+{
+       int ret;
+
+       ret = icm_tr_xdomain_tear_down(tb, xd, 1);
+       if (ret)
+               return ret;
+
+       usleep_range(10, 50);
+       return icm_tr_xdomain_tear_down(tb, xd, 2);
+}
+
+static void
+icm_tr_device_connected(struct tb *tb, const struct icm_pkg_header *hdr)
+{
+       const struct icm_tr_event_device_connected *pkg =
+               (const struct icm_tr_event_device_connected *)hdr;
+       enum tb_security_level security_level;
+       struct tb_switch *sw, *parent_sw;
+       struct tb_xdomain *xd;
+       bool authorized, boot;
+       u64 route;
+
+       /*
+        * Currently we don't use the QoS information coming with the
+        * device connected message so simply just ignore that extra
+        * packet for now.
+        */
+       if (pkg->hdr.packet_id)
+               return;
+
+       /*
+        * After NVM upgrade adding root switch device fails because we
+        * initiated reset. During that time ICM might still send device
+        * connected message which we ignore here.
+        */
+       if (!tb->root_switch)
+               return;
+
+       route = get_route(pkg->route_hi, pkg->route_lo);
+       authorized = pkg->link_info & ICM_LINK_INFO_APPROVED;
+       security_level = (pkg->hdr.flags & ICM_FLAGS_SLEVEL_MASK) >>
+                        ICM_FLAGS_SLEVEL_SHIFT;
+       boot = pkg->link_info & ICM_LINK_INFO_BOOT;
+
+       if (pkg->link_info & ICM_LINK_INFO_REJECTED) {
+               tb_info(tb, "switch at %llx was rejected by ICM firmware because topology limit exceeded\n",
+                       route);
+               return;
+       }
+
+       sw = tb_switch_find_by_uuid(tb, &pkg->ep_uuid);
+       if (sw) {
+               /* Update the switch if it is still in the same place */
+               if (tb_route(sw) == route && !!sw->authorized == authorized) {
+                       parent_sw = tb_to_switch(sw->dev.parent);
+                       update_switch(parent_sw, sw, route, pkg->connection_id,
+                                     0, 0, 0, boot);
+                       tb_switch_put(sw);
+                       return;
+               }
+
+               remove_switch(sw);
+               tb_switch_put(sw);
+       }
+
+       /* Another switch with the same address */
+       sw = tb_switch_find_by_route(tb, route);
+       if (sw) {
+               remove_switch(sw);
+               tb_switch_put(sw);
+       }
+
+       /* XDomain connection with the same address */
+       xd = tb_xdomain_find_by_route(tb, route);
+       if (xd) {
+               remove_xdomain(xd);
+               tb_xdomain_put(xd);
+       }
+
+       parent_sw = tb_switch_find_by_route(tb, get_parent_route(route));
+       if (!parent_sw) {
+               tb_err(tb, "failed to find parent switch for %llx\n", route);
+               return;
+       }
+
+       add_switch(parent_sw, route, &pkg->ep_uuid, (const u8 *)pkg->ep_name,
+                  sizeof(pkg->ep_name), pkg->connection_id,
+                  0, 0, 0, security_level, authorized, boot);
+
+       tb_switch_put(parent_sw);
+}
+
+static void
+icm_tr_device_disconnected(struct tb *tb, const struct icm_pkg_header *hdr)
+{
+       const struct icm_tr_event_device_disconnected *pkg =
+               (const struct icm_tr_event_device_disconnected *)hdr;
+       struct tb_switch *sw;
+       u64 route;
+
+       route = get_route(pkg->route_hi, pkg->route_lo);
+
+       sw = tb_switch_find_by_route(tb, route);
+       if (!sw) {
+               tb_warn(tb, "no switch exists at %llx, ignoring\n", route);
+               return;
+       }
+
+       remove_switch(sw);
+       tb_switch_put(sw);
+}
+
+static void
+icm_tr_xdomain_connected(struct tb *tb, const struct icm_pkg_header *hdr)
+{
+       const struct icm_tr_event_xdomain_connected *pkg =
+               (const struct icm_tr_event_xdomain_connected *)hdr;
+       struct tb_xdomain *xd;
+       struct tb_switch *sw;
+       u64 route;
+
+       if (!tb->root_switch)
+               return;
+
+       route = get_route(pkg->local_route_hi, pkg->local_route_lo);
+
+       xd = tb_xdomain_find_by_uuid(tb, &pkg->remote_uuid);
+       if (xd) {
+               if (xd->route == route) {
+                       update_xdomain(xd, route, 0);
+                       tb_xdomain_put(xd);
+                       return;
+               }
+
+               remove_xdomain(xd);
+               tb_xdomain_put(xd);
+       }
+
+       /* An existing xdomain with the same address */
+       xd = tb_xdomain_find_by_route(tb, route);
+       if (xd) {
+               remove_xdomain(xd);
+               tb_xdomain_put(xd);
+       }
+
+       /*
+        * If the user disconnected a switch during suspend and
+        * connected another host to the same port, remove the switch
+        * first.
+        */
+       sw = get_switch_at_route(tb->root_switch, route);
+       if (sw)
+               remove_switch(sw);
+
+       sw = tb_switch_find_by_route(tb, get_parent_route(route));
+       if (!sw) {
+               tb_warn(tb, "no switch exists at %llx, ignoring\n", route);
+               return;
+       }
+
+       add_xdomain(sw, route, &pkg->local_uuid, &pkg->remote_uuid, 0, 0);
+       tb_switch_put(sw);
+}
+
+static void
+icm_tr_xdomain_disconnected(struct tb *tb, const struct icm_pkg_header *hdr)
+{
+       const struct icm_tr_event_xdomain_disconnected *pkg =
+               (const struct icm_tr_event_xdomain_disconnected *)hdr;
+       struct tb_xdomain *xd;
+       u64 route;
+
+       route = get_route(pkg->route_hi, pkg->route_lo);
+
+       xd = tb_xdomain_find_by_route(tb, route);
+       if (xd) {
+               remove_xdomain(xd);
+               tb_xdomain_put(xd);
+       }
+}
+
 static struct pci_dev *get_upstream_port(struct pci_dev *pdev)
 {
        struct pci_dev *parent;
@@ -823,6 +1272,33 @@ static int icm_ar_get_mode(struct tb *tb)
        return nhi_mailbox_mode(nhi);
 }
 
+static int
+icm_ar_driver_ready(struct tb *tb, enum tb_security_level *security_level,
+                   size_t *nboot_acl, bool *rpm)
+{
+       struct icm_ar_pkg_driver_ready_response reply;
+       struct icm_pkg_driver_ready request = {
+               .hdr.code = ICM_DRIVER_READY,
+       };
+       int ret;
+
+       memset(&reply, 0, sizeof(reply));
+       ret = icm_request(tb, &request, sizeof(request), &reply, sizeof(reply),
+                         1, ICM_TIMEOUT);
+       if (ret)
+               return ret;
+
+       if (security_level)
+               *security_level = reply.info & ICM_AR_INFO_SLEVEL_MASK;
+       if (nboot_acl && (reply.info & ICM_AR_INFO_BOOT_ACL_SUPPORTED))
+               *nboot_acl = (reply.info & ICM_AR_INFO_BOOT_ACL_MASK) >>
+                               ICM_AR_INFO_BOOT_ACL_SHIFT;
+       if (rpm)
+               *rpm = !!(reply.hdr.flags & ICM_AR_FLAGS_RTD3);
+
+       return 0;
+}
+
 static int icm_ar_get_route(struct tb *tb, u8 link, u8 depth, u64 *route)
 {
        struct icm_ar_pkg_get_route_response reply;
@@ -845,6 +1321,87 @@ static int icm_ar_get_route(struct tb *tb, u8 link, u8 depth, u64 *route)
        return 0;
 }
 
+static int icm_ar_get_boot_acl(struct tb *tb, uuid_t *uuids, size_t nuuids)
+{
+       struct icm_ar_pkg_preboot_acl_response reply;
+       struct icm_ar_pkg_preboot_acl request = {
+               .hdr = { .code = ICM_PREBOOT_ACL },
+       };
+       int ret, i;
+
+       memset(&reply, 0, sizeof(reply));
+       ret = icm_request(tb, &request, sizeof(request), &reply, sizeof(reply),
+                         1, ICM_TIMEOUT);
+       if (ret)
+               return ret;
+
+       if (reply.hdr.flags & ICM_FLAGS_ERROR)
+               return -EIO;
+
+       for (i = 0; i < nuuids; i++) {
+               u32 *uuid = (u32 *)&uuids[i];
+
+               uuid[0] = reply.acl[i].uuid_lo;
+               uuid[1] = reply.acl[i].uuid_hi;
+
+               if (uuid[0] == 0xffffffff && uuid[1] == 0xffffffff) {
+                       /* Map empty entries to null UUID */
+                       uuid[0] = 0;
+                       uuid[1] = 0;
+               } else if (uuid[0] != 0 || uuid[1] != 0) {
+                       /* Upper two DWs are always one's */
+                       uuid[2] = 0xffffffff;
+                       uuid[3] = 0xffffffff;
+               }
+       }
+
+       return ret;
+}
+
+static int icm_ar_set_boot_acl(struct tb *tb, const uuid_t *uuids,
+                              size_t nuuids)
+{
+       struct icm_ar_pkg_preboot_acl_response reply;
+       struct icm_ar_pkg_preboot_acl request = {
+               .hdr = {
+                       .code = ICM_PREBOOT_ACL,
+                       .flags = ICM_FLAGS_WRITE,
+               },
+       };
+       int ret, i;
+
+       for (i = 0; i < nuuids; i++) {
+               const u32 *uuid = (const u32 *)&uuids[i];
+
+               if (uuid_is_null(&uuids[i])) {
+                       /*
+                        * Map null UUID to the empty (all one) entries
+                        * for ICM.
+                        */
+                       request.acl[i].uuid_lo = 0xffffffff;
+                       request.acl[i].uuid_hi = 0xffffffff;
+               } else {
+                       /* Two high DWs need to be set to all one */
+                       if (uuid[2] != 0xffffffff || uuid[3] != 0xffffffff)
+                               return -EINVAL;
+
+                       request.acl[i].uuid_lo = uuid[0];
+                       request.acl[i].uuid_hi = uuid[1];
+               }
+       }
+
+       memset(&reply, 0, sizeof(reply));
+       ret = icm_request(tb, &request, sizeof(request), &reply, sizeof(reply),
+                         1, ICM_TIMEOUT);
+       if (ret)
+               return ret;
+
+       if (reply.hdr.flags & ICM_FLAGS_ERROR)
+               return -EIO;
+
+       return 0;
+}
+
 static void icm_handle_notification(struct work_struct *work)
 {
        struct icm_notification *n = container_of(work, typeof(*n), work);
@@ -891,13 +1448,14 @@ static void icm_handle_event(struct tb *tb, enum tb_cfg_pkg_type type,
 }
 
 static int
-__icm_driver_ready(struct tb *tb, enum tb_security_level *security_level)
+__icm_driver_ready(struct tb *tb, enum tb_security_level *security_level,
+                  size_t *nboot_acl, bool *rpm)
 {
        struct icm *icm = tb_priv(tb);
        unsigned int retries = 50;
        int ret;
 
-       ret = icm->driver_ready(tb, security_level);
+       ret = icm->driver_ready(tb, security_level, nboot_acl, rpm);
        if (ret) {
                tb_err(tb, "failed to send driver ready to ICM\n");
                return ret;
@@ -987,6 +1545,9 @@ static int icm_firmware_reset(struct tb *tb, struct tb_nhi *nhi)
        struct icm *icm = tb_priv(tb);
        u32 val;
 
+       if (!icm->upstream_port)
+               return -ENODEV;
+
        /* Put ARC to wait for CIO reset event to happen */
        val = ioread32(nhi->iobase + REG_FW_STS);
        val |= REG_FW_STS_CIO_RESET_REQ;
@@ -1164,18 +1725,29 @@ static int icm_driver_ready(struct tb *tb)
                return 0;
        }
 
-       return __icm_driver_ready(tb, &tb->security_level);
+       ret = __icm_driver_ready(tb, &tb->security_level, &tb->nboot_acl,
+                                &icm->rpm);
+       if (ret)
+               return ret;
+
+       /*
+        * Make sure the number of supported preboot ACL matches what we
+        * expect or disable the whole feature.
+        */
+       if (tb->nboot_acl > icm->max_boot_acl)
+               tb->nboot_acl = 0;
+
+       return 0;
 }
 
 static int icm_suspend(struct tb *tb)
 {
-       int ret;
+       struct icm *icm = tb_priv(tb);
 
-       ret = nhi_mailbox_cmd(tb->nhi, NHI_MAILBOX_SAVE_DEVS, 0);
-       if (ret)
-               tb_info(tb, "Ignoring mailbox command error (%d) in %s\n",
-                       ret, __func__);
+       if (icm->save_devices)
+               icm->save_devices(tb);
 
+       nhi_mailbox_cmd(tb->nhi, NHI_MAILBOX_DRV_UNLOADS, 0);
        return 0;
 }
 
@@ -1260,7 +1832,7 @@ static void icm_complete(struct tb *tb)
         * Now all existing children should be resumed, start events
         * from ICM to get updated status.
         */
-       __icm_driver_ready(tb, NULL);
+       __icm_driver_ready(tb, NULL, NULL, NULL);
 
        /*
         * We do not get notifications of devices that have been
@@ -1270,6 +1842,22 @@ static void icm_complete(struct tb *tb)
        queue_delayed_work(tb->wq, &icm->rescan_work, msecs_to_jiffies(500));
 }
 
+static int icm_runtime_suspend(struct tb *tb)
+{
+       nhi_mailbox_cmd(tb->nhi, NHI_MAILBOX_DRV_UNLOADS, 0);
+       return 0;
+}
+
+static int icm_runtime_resume(struct tb *tb)
+{
+       /*
+        * We can reuse the same resume functionality than with system
+        * suspend.
+        */
+       icm_complete(tb);
+       return 0;
+}
+
 static int icm_start(struct tb *tb)
 {
        struct icm *icm = tb_priv(tb);
@@ -1288,6 +1876,7 @@ static int icm_start(struct tb *tb)
         * prevent root switch NVM upgrade on Macs for now.
         */
        tb->root_switch->no_nvm_upgrade = x86_apple_machine;
+       tb->root_switch->rpm = icm->rpm;
 
        ret = tb_switch_add(tb->root_switch);
        if (ret) {
@@ -1313,7 +1902,7 @@ static int icm_disconnect_pcie_paths(struct tb *tb)
        return nhi_mailbox_cmd(tb->nhi, NHI_MAILBOX_DISCONNECT_PCIE_PATHS, 0);
 }
 
-/* Falcon Ridge and Alpine Ridge */
+/* Falcon Ridge */
 static const struct tb_cm_ops icm_fr_ops = {
        .driver_ready = icm_driver_ready,
        .start = icm_start,
@@ -1329,6 +1918,46 @@ static const struct tb_cm_ops icm_fr_ops = {
        .disconnect_xdomain_paths = icm_fr_disconnect_xdomain_paths,
 };
 
+/* Alpine Ridge */
+static const struct tb_cm_ops icm_ar_ops = {
+       .driver_ready = icm_driver_ready,
+       .start = icm_start,
+       .stop = icm_stop,
+       .suspend = icm_suspend,
+       .complete = icm_complete,
+       .runtime_suspend = icm_runtime_suspend,
+       .runtime_resume = icm_runtime_resume,
+       .handle_event = icm_handle_event,
+       .get_boot_acl = icm_ar_get_boot_acl,
+       .set_boot_acl = icm_ar_set_boot_acl,
+       .approve_switch = icm_fr_approve_switch,
+       .add_switch_key = icm_fr_add_switch_key,
+       .challenge_switch_key = icm_fr_challenge_switch_key,
+       .disconnect_pcie_paths = icm_disconnect_pcie_paths,
+       .approve_xdomain_paths = icm_fr_approve_xdomain_paths,
+       .disconnect_xdomain_paths = icm_fr_disconnect_xdomain_paths,
+};
+
+/* Titan Ridge */
+static const struct tb_cm_ops icm_tr_ops = {
+       .driver_ready = icm_driver_ready,
+       .start = icm_start,
+       .stop = icm_stop,
+       .suspend = icm_suspend,
+       .complete = icm_complete,
+       .runtime_suspend = icm_runtime_suspend,
+       .runtime_resume = icm_runtime_resume,
+       .handle_event = icm_handle_event,
+       .get_boot_acl = icm_ar_get_boot_acl,
+       .set_boot_acl = icm_ar_set_boot_acl,
+       .approve_switch = icm_tr_approve_switch,
+       .add_switch_key = icm_tr_add_switch_key,
+       .challenge_switch_key = icm_tr_challenge_switch_key,
+       .disconnect_pcie_paths = icm_disconnect_pcie_paths,
+       .approve_xdomain_paths = icm_tr_approve_xdomain_paths,
+       .disconnect_xdomain_paths = icm_tr_disconnect_xdomain_paths,
+};
+
 struct tb *icm_probe(struct tb_nhi *nhi)
 {
        struct icm *icm;
@@ -1347,6 +1976,7 @@ struct tb *icm_probe(struct tb_nhi *nhi)
        case PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_NHI:
                icm->is_supported = icm_fr_is_supported;
                icm->get_route = icm_fr_get_route;
+               icm->save_devices = icm_fr_save_devices;
                icm->driver_ready = icm_fr_driver_ready;
                icm->device_connected = icm_fr_device_connected;
                icm->device_disconnected = icm_fr_device_disconnected;
@@ -1360,15 +1990,30 @@ struct tb *icm_probe(struct tb_nhi *nhi)
        case PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_LP_NHI:
        case PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_4C_NHI:
        case PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_2C_NHI:
+               icm->max_boot_acl = ICM_AR_PREBOOT_ACL_ENTRIES;
                icm->is_supported = icm_ar_is_supported;
                icm->get_mode = icm_ar_get_mode;
                icm->get_route = icm_ar_get_route;
-               icm->driver_ready = icm_fr_driver_ready;
+               icm->save_devices = icm_fr_save_devices;
+               icm->driver_ready = icm_ar_driver_ready;
                icm->device_connected = icm_fr_device_connected;
                icm->device_disconnected = icm_fr_device_disconnected;
                icm->xdomain_connected = icm_fr_xdomain_connected;
                icm->xdomain_disconnected = icm_fr_xdomain_disconnected;
-               tb->cm_ops = &icm_fr_ops;
+               tb->cm_ops = &icm_ar_ops;
+               break;
+
+       case PCI_DEVICE_ID_INTEL_TITAN_RIDGE_2C_NHI:
+       case PCI_DEVICE_ID_INTEL_TITAN_RIDGE_4C_NHI:
+               icm->max_boot_acl = ICM_AR_PREBOOT_ACL_ENTRIES;
+               icm->is_supported = icm_ar_is_supported;
+               icm->get_mode = icm_ar_get_mode;
+               icm->driver_ready = icm_tr_driver_ready;
+               icm->device_connected = icm_tr_device_connected;
+               icm->device_disconnected = icm_tr_device_disconnected;
+               icm->xdomain_connected = icm_tr_xdomain_connected;
+               icm->xdomain_disconnected = icm_tr_xdomain_disconnected;
+               tb->cm_ops = &icm_tr_ops;
                break;
        }