Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 675562dd authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: misc: diag_bridge: Add support for 90F3 PID"

parents d8dd0622 77601443

arch/arm64/configs/vendor/sdmsteppe-auto-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -441,6 +441,7 @@ CONFIG_USB_ISP1760=y 
CONFIG_USB_ISP1760_HOST_ROLE=y

CONFIG_USB_EHSET_TEST_FIXTURE=y

CONFIG_USB_LINK_LAYER_TEST=y

CONFIG_USB_QCOM_DIAG_BRIDGE=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_USB_QCOM_EMU_PHY=y

CONFIG_USB_MSM_SSPHY_QMP=y

arch/arm64/configs/vendor/sdmsteppe-auto_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -457,6 +457,7 @@ CONFIG_USB_ISP1760=y 
CONFIG_USB_ISP1760_HOST_ROLE=y

CONFIG_USB_EHSET_TEST_FIXTURE=y

CONFIG_USB_LINK_LAYER_TEST=y

CONFIG_USB_QCOM_DIAG_BRIDGE=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_USB_QCOM_EMU_PHY=y

CONFIG_USB_MSM_SSPHY_QMP=y

drivers/char/diag/diagchar_core.c

+10 −14
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "diag_ipc_logging.h"

#include "diagfwd_peripheral.h"

#include "diagfwd_mhi.h"

#include "diagfwd_hsic.h"



#include <linux/coresight-stm.h>

#include <linux/kernel.h>
@@ -1136,15 +1137,6 @@ void diag_remote_exit(void) 
{

}



int diagfwd_bridge_init(void)

{

	return 0;

}



void diagfwd_bridge_exit(void)

{

}



uint16_t diag_get_remote_device_mask(void)

{

	return 0;
@@ -4233,7 +4225,9 @@ static int __init diagchar_init(void) 
	INIT_LIST_HEAD(&driver->diag_id_list);

	diag_add_diag_id_to_list(DIAG_ID_APPS, "APPS", APPS_DATA, APPS_DATA);

	pr_debug("diagchar initialized now");

	#ifdef CONFIG_DIAGFWD_BRIDGE_CODE

#if defined(CONFIG_USB_QCOM_DIAG_BRIDGE)

	diag_register_with_hsic();

#elif defined(CONFIG_MHI_BUS)

	diag_register_with_mhi();

#endif

	return 0;
@@ -4244,12 +4238,10 @@ static int __init diagchar_init(void) 
	diagchar_cleanup();

	diag_mux_exit();

	diagfwd_peripheral_exit();

	diagfwd_bridge_exit();

	diagfwd_exit();

	diagfwd_cntl_exit();

	diag_dci_exit();

	diag_masks_exit();

	diag_remote_exit();

	return ret;



}
@@ -4265,7 +4257,11 @@ static void diagchar_exit(void) 
	diag_dci_exit();

	diag_masks_exit();

	diag_md_session_exit();

	diag_remote_exit();

#if defined(CONFIG_USB_QCOM_DIAG_BRIDGE)

	diag_unregister_hsic();

#elif defined(CONFIG_MHI_BUS)

	diag_unregister_mhi();

#endif

	diag_debugfs_cleanup();

	diagchar_cleanup();

	pr_info("done diagchar exit\n");

drivers/char/diag/diagfwd_bridge.c

+1 −28
Original line number Diff line number Diff line
@@ -20,19 +20,13 @@ 
#include <linux/platform_device.h>

#include "diag_mux.h"

#include "diagfwd_bridge.h"

#ifdef USB_QCOM_DIAG_BRIDGE

#ifdef CONFIG_USB_QCOM_DIAG_BRIDGE

#include "diagfwd_hsic.h"

#endif

#include "diagfwd_mhi.h"

#include "diag_dci.h"

#include "diag_ipc_logging.h"



#ifdef CONFIG_MHI_BUS

#define diag_mdm_init		diag_mhi_init

#else

#define diag_mdm_init		diag_hsic_init

#endif



#define BRIDGE_TO_MUX(x)	(x + DIAG_MUX_BRIDGE_BASE)



struct diagfwd_bridge_info bridge_info[NUM_REMOTE_DEV] = {
@@ -237,27 +231,6 @@ int diag_remote_dev_write_done(int id, unsigned char *buf, int len, int ctxt) 
	return err;

}



int diagfwd_bridge_init(void)

{

	int err = 0;



	err = diag_mdm_init();

	if (err)

		goto fail;

	return 0;



fail:

	pr_err("diag: Unable to initialze diagfwd bridge, err: %d\n", err);

	return err;

}



void diagfwd_bridge_exit(void)

{

	#ifdef USB_QCOM_DIAG_BRIDGE

	diag_hsic_exit();

	#endif

}



int diagfwd_bridge_close(int id)

{

	if (id < 0 || id >= NUM_REMOTE_DEV)

drivers/char/diag/diagfwd_bridge.h

+1 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2014, 2017-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, 2017-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -51,8 +51,6 @@ struct diagfwd_bridge_info { 
};



extern struct diagfwd_bridge_info bridge_info[NUM_REMOTE_DEV];

int diagfwd_bridge_init(void);

void diagfwd_bridge_exit(void);

int diagfwd_bridge_close(int id);

int diagfwd_bridge_write(int id, unsigned char *buf, int len);

uint16_t diag_get_remote_device_mask(void);