usb: typec: Add driver for NVIDIA Alt Modes

Latest NVIDIA GPUs support VirtualLink device. Since USBIF
has not assigned a Standard ID (SID) for VirtualLink
so using NVIDA VID 0x955 as SVID.

Signed-off-by: Ajay Gupta <ajayg@nvidia.com>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/altmodes/Kconfig b/drivers/usb/typec/altmodes/Kconfig
index ef2226eb7a3340cbeaef2f9fb84fca65c3e4315f..187690fd1a5bd35b53e7db3969f64e5e38aabf25 100644 (file)
--- a/drivers/usb/typec/altmodes/Kconfig
+++ b/drivers/usb/typec/altmodes/Kconfig
@@ -12,4 +12,14 @@ config TYPEC_DP_ALTMODE
          To compile this driver as a module, choose M here: the
          module will be called typec_displayport.
 
+config TYPEC_NVIDIA_ALTMODE
+       tristate "NVIDIA Alternate Mode driver"
+       depends on TYPEC_DP_ALTMODE
+       help
+         Latest NVIDIA GPUs support VirtualLink devices. Select this
+         to enable support for VirtualLink devices with NVIDIA GPUs.
+
+         To compile this driver as a module, choose M here: the
+         module will be called typec_displayport.
+
 endmenu

diff --git a/drivers/usb/typec/altmodes/Makefile b/drivers/usb/typec/altmodes/Makefile
index eda8456f1c92c63725895ef8190080e7b0532c1f..45717548b396074ddc8a752837f81f9b37a15b46 100644 (file)
--- a/drivers/usb/typec/altmodes/Makefile
+++ b/drivers/usb/typec/altmodes/Makefile
@@ -2,3 +2,5 @@
 
 obj-$(CONFIG_TYPEC_DP_ALTMODE)         += typec_displayport.o
 typec_displayport-y                    := displayport.o
+obj-$(CONFIG_TYPEC_NVIDIA_ALTMODE)     += typec_nvidia.o
+typec_nvidia-y                         := nvidia.o

diff --git a/drivers/usb/typec/altmodes/nvidia.c b/drivers/usb/typec/altmodes/nvidia.c
new file mode 100644 (file)
index 0000000..c367697
--- /dev/null
+++ b/drivers/usb/typec/altmodes/nvidia.c
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2019 NVIDIA Corporation. All rights reserved.
+ *
+ * NVIDIA USB Type-C Alt Mode Driver
+ */
+#include <linux/module.h>
+#include <linux/usb/typec_altmode.h>
+#include <linux/usb/typec_dp.h>
+#include "displayport.h"
+
+static int nvidia_altmode_probe(struct typec_altmode *alt)
+{
+       if (alt->svid == USB_TYPEC_NVIDIA_VLINK_SID)
+               return dp_altmode_probe(alt);
+       else
+               return -ENOTSUPP;
+}
+
+static void nvidia_altmode_remove(struct typec_altmode *alt)
+{
+       if (alt->svid == USB_TYPEC_NVIDIA_VLINK_SID)
+               dp_altmode_remove(alt);
+}
+
+static const struct typec_device_id nvidia_typec_id[] = {
+       { USB_TYPEC_NVIDIA_VLINK_SID, TYPEC_ANY_MODE },
+       { },
+};
+MODULE_DEVICE_TABLE(typec, nvidia_typec_id);
+
+static struct typec_altmode_driver nvidia_altmode_driver = {
+       .id_table = nvidia_typec_id,
+       .probe = nvidia_altmode_probe,
+       .remove = nvidia_altmode_remove,
+       .driver = {
+               .name = "typec_nvidia",
+               .owner = THIS_MODULE,
+       },
+};
+module_typec_altmode_driver(nvidia_altmode_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("NVIDIA USB Type-C Alt Mode Driver");

diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index b4fb2e05d2e58d77dede1e8721b8944706123f50..7850b851cecd87806815269c381ebcf2f017ea72 100644 (file)
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -283,6 +283,7 @@ static int ucsi_register_altmode(struct ucsi_connector *con,
 
                switch (desc->svid) {
                case USB_TYPEC_DP_SID:
+               case USB_TYPEC_NVIDIA_VLINK_SID:
                        alt = ucsi_register_displayport(con, override, i, desc);
                        break;
                default:
@@ -404,7 +405,8 @@ static void ucsi_unregister_altmodes(struct ucsi_connector *con, u8 recipient)
 
        while (adev[i]) {
                if (recipient == UCSI_RECIPIENT_SOP &&
-                   adev[i]->svid == USB_TYPEC_DP_SID) {
+                   (adev[i]->svid == USB_TYPEC_DP_SID ||
+                       adev[i]->svid == USB_TYPEC_NVIDIA_VLINK_SID)) {
                        pdev = typec_altmode_get_partner(adev[i]);
                        ucsi_displayport_remove_partner((void *)pdev);
                }

diff --git a/include/linux/usb/typec_dp.h b/include/linux/usb/typec_dp.h
index 7fa12ef8d09a45bfa1534d7edbe74a0f4d60a4f1..fc4c7edb2e8a44dd6f91f07076e0882d044538d3 100644 (file)
--- a/include/linux/usb/typec_dp.h
+++ b/include/linux/usb/typec_dp.h
@@ -5,6 +5,11 @@
 #include <linux/usb/typec_altmode.h>
 
 #define USB_TYPEC_DP_SID       0xff01
+/* USB IF has not assigned a Standard ID (SID) for VirtualLink,
+ * so the manufacturers of VirtualLink adapters use their Vendor
+ * IDs as the SVID.
+ */
+#define USB_TYPEC_NVIDIA_VLINK_SID     0x955   /* NVIDIA VirtualLink */
 #define USB_TYPEC_DP_MODE      1
 
 /*