Merge tag 'char-misc-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-block.git] / drivers / misc / mei / hdcp / mei_hdcp.c

diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c
index 45e3d4d277974cc10b9f2ac025cf072b18cea9f7..85cbfc3413ee2f040fcb3206d3c4aebbb7c805c2 100644 (file)
--- a/drivers/misc/mei/hdcp/mei_hdcp.c
+++ b/drivers/misc/mei/hdcp/mei_hdcp.c
@@ -23,7 +23,7 @@
 #include <linux/component.h>
 #include <drm/drm_connector.h>
 #include <drm/i915_component.h>
-#include <drm/i915_mei_hdcp_interface.h>
+#include <drm/i915_hdcp_interface.h>
 
 #include "mei_hdcp.h"
 
@@ -52,13 +52,13 @@ mei_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data,
 
        session_init_in.header.api_version = HDCP_API_VERSION;
        session_init_in.header.command_id = WIRED_INITIATE_HDCP2_SESSION;
-       session_init_in.header.status = ME_HDCP_STATUS_SUCCESS;
+       session_init_in.header.status = FW_HDCP_STATUS_SUCCESS;
        session_init_in.header.buffer_len =
                                WIRED_CMD_BUF_LEN_INITIATE_HDCP2_SESSION_IN;
 
        session_init_in.port.integrated_port_type = data->port_type;
-       session_init_in.port.physical_port = (u8)data->fw_ddi;
-       session_init_in.port.attached_transcoder = (u8)data->fw_tc;
+       session_init_in.port.physical_port = (u8)data->hdcp_ddi;
+       session_init_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
        session_init_in.protocol = data->protocol;
 
        byte = mei_cldev_send(cldev, (u8 *)&session_init_in,
@@ -75,7 +75,7 @@ mei_hdcp_initiate_session(struct device *dev, struct hdcp_port_data *data,
                return byte;
        }
 
-       if (session_init_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+       if (session_init_out.header.status != FW_HDCP_STATUS_SUCCESS) {
                dev_dbg(dev, "ME cmd 0x%08X Failed. Status: 0x%X\n",
                        WIRED_INITIATE_HDCP2_SESSION,
                        session_init_out.header.status);
@@ -122,13 +122,13 @@ mei_hdcp_verify_receiver_cert_prepare_km(struct device *dev,
 
        verify_rxcert_in.header.api_version = HDCP_API_VERSION;
        verify_rxcert_in.header.command_id = WIRED_VERIFY_RECEIVER_CERT;
-       verify_rxcert_in.header.status = ME_HDCP_STATUS_SUCCESS;
+       verify_rxcert_in.header.status = FW_HDCP_STATUS_SUCCESS;
        verify_rxcert_in.header.buffer_len =
                                WIRED_CMD_BUF_LEN_VERIFY_RECEIVER_CERT_IN;
 
        verify_rxcert_in.port.integrated_port_type = data->port_type;
-       verify_rxcert_in.port.physical_port = (u8)data->fw_ddi;
-       verify_rxcert_in.port.attached_transcoder = (u8)data->fw_tc;
+       verify_rxcert_in.port.physical_port = (u8)data->hdcp_ddi;
+       verify_rxcert_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
 
        verify_rxcert_in.cert_rx = rx_cert->cert_rx;
        memcpy(verify_rxcert_in.r_rx, &rx_cert->r_rx, HDCP_2_2_RRX_LEN);
@@ -148,7 +148,7 @@ mei_hdcp_verify_receiver_cert_prepare_km(struct device *dev,
                return byte;
        }
 
-       if (verify_rxcert_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+       if (verify_rxcert_out.header.status != FW_HDCP_STATUS_SUCCESS) {
                dev_dbg(dev, "ME cmd 0x%08X Failed. Status: 0x%X\n",
                        WIRED_VERIFY_RECEIVER_CERT,
                        verify_rxcert_out.header.status);
@@ -194,12 +194,12 @@ mei_hdcp_verify_hprime(struct device *dev, struct hdcp_port_data *data,
 
        send_hprime_in.header.api_version = HDCP_API_VERSION;
        send_hprime_in.header.command_id = WIRED_AKE_SEND_HPRIME;
-       send_hprime_in.header.status = ME_HDCP_STATUS_SUCCESS;
+       send_hprime_in.header.status = FW_HDCP_STATUS_SUCCESS;
        send_hprime_in.header.buffer_len = WIRED_CMD_BUF_LEN_AKE_SEND_HPRIME_IN;
 
        send_hprime_in.port.integrated_port_type = data->port_type;
-       send_hprime_in.port.physical_port = (u8)data->fw_ddi;
-       send_hprime_in.port.attached_transcoder = (u8)data->fw_tc;
+       send_hprime_in.port.physical_port = (u8)data->hdcp_ddi;
+       send_hprime_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
 
        memcpy(send_hprime_in.h_prime, rx_hprime->h_prime,
               HDCP_2_2_H_PRIME_LEN);
@@ -218,7 +218,7 @@ mei_hdcp_verify_hprime(struct device *dev, struct hdcp_port_data *data,
                return byte;
        }
 
-       if (send_hprime_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+       if (send_hprime_out.header.status != FW_HDCP_STATUS_SUCCESS) {
                dev_dbg(dev, "ME cmd 0x%08X Failed. Status: 0x%X\n",
                        WIRED_AKE_SEND_HPRIME, send_hprime_out.header.status);
                return -EIO;
@@ -251,13 +251,13 @@ mei_hdcp_store_pairing_info(struct device *dev, struct hdcp_port_data *data,
 
        pairing_info_in.header.api_version = HDCP_API_VERSION;
        pairing_info_in.header.command_id = WIRED_AKE_SEND_PAIRING_INFO;
-       pairing_info_in.header.status = ME_HDCP_STATUS_SUCCESS;
+       pairing_info_in.header.status = FW_HDCP_STATUS_SUCCESS;
        pairing_info_in.header.buffer_len =
                                        WIRED_CMD_BUF_LEN_SEND_PAIRING_INFO_IN;
 
        pairing_info_in.port.integrated_port_type = data->port_type;
-       pairing_info_in.port.physical_port = (u8)data->fw_ddi;
-       pairing_info_in.port.attached_transcoder = (u8)data->fw_tc;
+       pairing_info_in.port.physical_port = (u8)data->hdcp_ddi;
+       pairing_info_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
 
        memcpy(pairing_info_in.e_kh_km, pairing_info->e_kh_km,
               HDCP_2_2_E_KH_KM_LEN);
@@ -276,7 +276,7 @@ mei_hdcp_store_pairing_info(struct device *dev, struct hdcp_port_data *data,
                return byte;
        }
 
-       if (pairing_info_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+       if (pairing_info_out.header.status != FW_HDCP_STATUS_SUCCESS) {
                dev_dbg(dev, "ME cmd 0x%08X failed. Status: 0x%X\n",
                        WIRED_AKE_SEND_PAIRING_INFO,
                        pairing_info_out.header.status);
@@ -311,12 +311,12 @@ mei_hdcp_initiate_locality_check(struct device *dev,
 
        lc_init_in.header.api_version = HDCP_API_VERSION;
        lc_init_in.header.command_id = WIRED_INIT_LOCALITY_CHECK;
-       lc_init_in.header.status = ME_HDCP_STATUS_SUCCESS;
+       lc_init_in.header.status = FW_HDCP_STATUS_SUCCESS;
        lc_init_in.header.buffer_len = WIRED_CMD_BUF_LEN_INIT_LOCALITY_CHECK_IN;
 
        lc_init_in.port.integrated_port_type = data->port_type;
-       lc_init_in.port.physical_port = (u8)data->fw_ddi;
-       lc_init_in.port.attached_transcoder = (u8)data->fw_tc;
+       lc_init_in.port.physical_port = (u8)data->hdcp_ddi;
+       lc_init_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
 
        byte = mei_cldev_send(cldev, (u8 *)&lc_init_in, sizeof(lc_init_in));
        if (byte < 0) {
@@ -330,7 +330,7 @@ mei_hdcp_initiate_locality_check(struct device *dev,
                return byte;
        }
 
-       if (lc_init_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+       if (lc_init_out.header.status != FW_HDCP_STATUS_SUCCESS) {
                dev_dbg(dev, "ME cmd 0x%08X Failed. status: 0x%X\n",
                        WIRED_INIT_LOCALITY_CHECK, lc_init_out.header.status);
                return -EIO;
@@ -366,13 +366,13 @@ mei_hdcp_verify_lprime(struct device *dev, struct hdcp_port_data *data,
 
        verify_lprime_in.header.api_version = HDCP_API_VERSION;
        verify_lprime_in.header.command_id = WIRED_VALIDATE_LOCALITY;
-       verify_lprime_in.header.status = ME_HDCP_STATUS_SUCCESS;
+       verify_lprime_in.header.status = FW_HDCP_STATUS_SUCCESS;
        verify_lprime_in.header.buffer_len =
                                        WIRED_CMD_BUF_LEN_VALIDATE_LOCALITY_IN;
 
        verify_lprime_in.port.integrated_port_type = data->port_type;
-       verify_lprime_in.port.physical_port = (u8)data->fw_ddi;
-       verify_lprime_in.port.attached_transcoder = (u8)data->fw_tc;
+       verify_lprime_in.port.physical_port = (u8)data->hdcp_ddi;
+       verify_lprime_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
 
        memcpy(verify_lprime_in.l_prime, rx_lprime->l_prime,
               HDCP_2_2_L_PRIME_LEN);
@@ -391,7 +391,7 @@ mei_hdcp_verify_lprime(struct device *dev, struct hdcp_port_data *data,
                return byte;
        }
 
-       if (verify_lprime_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+       if (verify_lprime_out.header.status != FW_HDCP_STATUS_SUCCESS) {
                dev_dbg(dev, "ME cmd 0x%08X failed. status: 0x%X\n",
                        WIRED_VALIDATE_LOCALITY,
                        verify_lprime_out.header.status);
@@ -425,12 +425,12 @@ static int mei_hdcp_get_session_key(struct device *dev,
 
        get_skey_in.header.api_version = HDCP_API_VERSION;
        get_skey_in.header.command_id = WIRED_GET_SESSION_KEY;
-       get_skey_in.header.status = ME_HDCP_STATUS_SUCCESS;
+       get_skey_in.header.status = FW_HDCP_STATUS_SUCCESS;
        get_skey_in.header.buffer_len = WIRED_CMD_BUF_LEN_GET_SESSION_KEY_IN;
 
        get_skey_in.port.integrated_port_type = data->port_type;
-       get_skey_in.port.physical_port = (u8)data->fw_ddi;
-       get_skey_in.port.attached_transcoder = (u8)data->fw_tc;
+       get_skey_in.port.physical_port = (u8)data->hdcp_ddi;
+       get_skey_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
 
        byte = mei_cldev_send(cldev, (u8 *)&get_skey_in, sizeof(get_skey_in));
        if (byte < 0) {
@@ -445,7 +445,7 @@ static int mei_hdcp_get_session_key(struct device *dev,
                return byte;
        }
 
-       if (get_skey_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+       if (get_skey_out.header.status != FW_HDCP_STATUS_SUCCESS) {
                dev_dbg(dev, "ME cmd 0x%08X failed. status: 0x%X\n",
                        WIRED_GET_SESSION_KEY, get_skey_out.header.status);
                return -EIO;
@@ -489,13 +489,13 @@ mei_hdcp_repeater_check_flow_prepare_ack(struct device *dev,
 
        verify_repeater_in.header.api_version = HDCP_API_VERSION;
        verify_repeater_in.header.command_id = WIRED_VERIFY_REPEATER;
-       verify_repeater_in.header.status = ME_HDCP_STATUS_SUCCESS;
+       verify_repeater_in.header.status = FW_HDCP_STATUS_SUCCESS;
        verify_repeater_in.header.buffer_len =
                                        WIRED_CMD_BUF_LEN_VERIFY_REPEATER_IN;
 
        verify_repeater_in.port.integrated_port_type = data->port_type;
-       verify_repeater_in.port.physical_port = (u8)data->fw_ddi;
-       verify_repeater_in.port.attached_transcoder = (u8)data->fw_tc;
+       verify_repeater_in.port.physical_port = (u8)data->hdcp_ddi;
+       verify_repeater_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
 
        memcpy(verify_repeater_in.rx_info, rep_topology->rx_info,
               HDCP_2_2_RXINFO_LEN);
@@ -520,7 +520,7 @@ mei_hdcp_repeater_check_flow_prepare_ack(struct device *dev,
                return byte;
        }
 
-       if (verify_repeater_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+       if (verify_repeater_out.header.status != FW_HDCP_STATUS_SUCCESS) {
                dev_dbg(dev, "ME cmd 0x%08X failed. status: 0x%X\n",
                        WIRED_VERIFY_REPEATER,
                        verify_repeater_out.header.status);
@@ -568,12 +568,12 @@ static int mei_hdcp_verify_mprime(struct device *dev,
 
        verify_mprime_in->header.api_version = HDCP_API_VERSION;
        verify_mprime_in->header.command_id = WIRED_REPEATER_AUTH_STREAM_REQ;
-       verify_mprime_in->header.status = ME_HDCP_STATUS_SUCCESS;
+       verify_mprime_in->header.status = FW_HDCP_STATUS_SUCCESS;
        verify_mprime_in->header.buffer_len = cmd_size  - sizeof(verify_mprime_in->header);
 
        verify_mprime_in->port.integrated_port_type = data->port_type;
-       verify_mprime_in->port.physical_port = (u8)data->fw_ddi;
-       verify_mprime_in->port.attached_transcoder = (u8)data->fw_tc;
+       verify_mprime_in->port.physical_port = (u8)data->hdcp_ddi;
+       verify_mprime_in->port.attached_transcoder = (u8)data->hdcp_transcoder;
 
        memcpy(verify_mprime_in->m_prime, stream_ready->m_prime, HDCP_2_2_MPRIME_LEN);
        drm_hdcp_cpu_to_be24(verify_mprime_in->seq_num_m, data->seq_num_m);
@@ -597,7 +597,7 @@ static int mei_hdcp_verify_mprime(struct device *dev,
                return byte;
        }
 
-       if (verify_mprime_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+       if (verify_mprime_out.header.status != FW_HDCP_STATUS_SUCCESS) {
                dev_dbg(dev, "ME cmd 0x%08X failed. status: 0x%X\n",
                        WIRED_REPEATER_AUTH_STREAM_REQ,
                        verify_mprime_out.header.status);
@@ -630,12 +630,12 @@ static int mei_hdcp_enable_authentication(struct device *dev,
 
        enable_auth_in.header.api_version = HDCP_API_VERSION;
        enable_auth_in.header.command_id = WIRED_ENABLE_AUTH;
-       enable_auth_in.header.status = ME_HDCP_STATUS_SUCCESS;
+       enable_auth_in.header.status = FW_HDCP_STATUS_SUCCESS;
        enable_auth_in.header.buffer_len = WIRED_CMD_BUF_LEN_ENABLE_AUTH_IN;
 
        enable_auth_in.port.integrated_port_type = data->port_type;
-       enable_auth_in.port.physical_port = (u8)data->fw_ddi;
-       enable_auth_in.port.attached_transcoder = (u8)data->fw_tc;
+       enable_auth_in.port.physical_port = (u8)data->hdcp_ddi;
+       enable_auth_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
        enable_auth_in.stream_type = data->streams[0].stream_type;
 
        byte = mei_cldev_send(cldev, (u8 *)&enable_auth_in,
@@ -652,7 +652,7 @@ static int mei_hdcp_enable_authentication(struct device *dev,
                return byte;
        }
 
-       if (enable_auth_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+       if (enable_auth_out.header.status != FW_HDCP_STATUS_SUCCESS) {
                dev_dbg(dev, "ME cmd 0x%08X failed. status: 0x%X\n",
                        WIRED_ENABLE_AUTH, enable_auth_out.header.status);
                return -EIO;
@@ -684,13 +684,13 @@ mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)
 
        session_close_in.header.api_version = HDCP_API_VERSION;
        session_close_in.header.command_id = WIRED_CLOSE_SESSION;
-       session_close_in.header.status = ME_HDCP_STATUS_SUCCESS;
+       session_close_in.header.status = FW_HDCP_STATUS_SUCCESS;
        session_close_in.header.buffer_len =
                                WIRED_CMD_BUF_LEN_CLOSE_SESSION_IN;
 
        session_close_in.port.integrated_port_type = data->port_type;
-       session_close_in.port.physical_port = (u8)data->fw_ddi;
-       session_close_in.port.attached_transcoder = (u8)data->fw_tc;
+       session_close_in.port.physical_port = (u8)data->hdcp_ddi;
+       session_close_in.port.attached_transcoder = (u8)data->hdcp_transcoder;
 
        byte = mei_cldev_send(cldev, (u8 *)&session_close_in,
                              sizeof(session_close_in));
@@ -706,7 +706,7 @@ mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)
                return byte;
        }
 
-       if (session_close_out.header.status != ME_HDCP_STATUS_SUCCESS) {
+       if (session_close_out.header.status != FW_HDCP_STATUS_SUCCESS) {
                dev_dbg(dev, "Session Close Failed. status: 0x%X\n",
                        session_close_out.header.status);
                return -EIO;
@@ -715,7 +715,7 @@ mei_hdcp_close_session(struct device *dev, struct hdcp_port_data *data)
        return 0;
 }
 
-static const struct i915_hdcp_component_ops mei_hdcp_ops = {
+static const struct i915_hdcp_ops mei_hdcp_ops = {
        .owner = THIS_MODULE,
        .initiate_hdcp2_session = mei_hdcp_initiate_session,
        .verify_receiver_cert_prepare_km =
@@ -735,13 +735,12 @@ static const struct i915_hdcp_component_ops mei_hdcp_ops = {
 static int mei_component_master_bind(struct device *dev)
 {
        struct mei_cl_device *cldev = to_mei_cl_device(dev);
-       struct i915_hdcp_comp_master *comp_master =
-                                               mei_cldev_get_drvdata(cldev);
+       struct i915_hdcp_master *comp_master = mei_cldev_get_drvdata(cldev);
        int ret;
 
        dev_dbg(dev, "%s\n", __func__);
        comp_master->ops = &mei_hdcp_ops;
-       comp_master->mei_dev = dev;
+       comp_master->hdcp_dev = dev;
        ret = component_bind_all(dev, comp_master);
        if (ret < 0)
                return ret;
@@ -752,8 +751,7 @@ static int mei_component_master_bind(struct device *dev)
 static void mei_component_master_unbind(struct device *dev)
 {
        struct mei_cl_device *cldev = to_mei_cl_device(dev);
-       struct i915_hdcp_comp_master *comp_master =
-                                               mei_cldev_get_drvdata(cldev);
+       struct i915_hdcp_master *comp_master = mei_cldev_get_drvdata(cldev);
 
        dev_dbg(dev, "%s\n", __func__);
        component_unbind_all(dev, comp_master);
@@ -801,7 +799,7 @@ static int mei_hdcp_component_match(struct device *dev, int subcomponent,
 static int mei_hdcp_probe(struct mei_cl_device *cldev,
                          const struct mei_cl_device_id *id)
 {
-       struct i915_hdcp_comp_master *comp_master;
+       struct i915_hdcp_master *comp_master;
        struct component_match *master_match;
        int ret;
 
@@ -846,8 +844,7 @@ enable_err_exit:
 
 static void mei_hdcp_remove(struct mei_cl_device *cldev)
 {
-       struct i915_hdcp_comp_master *comp_master =
-                                               mei_cldev_get_drvdata(cldev);
+       struct i915_hdcp_master *comp_master = mei_cldev_get_drvdata(cldev);
        int ret;
 
        component_master_del(&cldev->dev, &mei_component_master_ops);