Commit 0b31c978 authored by Sven Peter's avatar Sven Peter Committed by Greg Kroah-Hartman
Browse files

usb: typec: tipd: Read USB4, Thunderbolt and DisplayPort status for cd321x 



CD321x supports various alternate modes and stores information once
these are entered into separate status registers. Read those when they
are active when reading TPS_DATA_STATUS to prepare supporting these.

Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: default avatarNeal Gompa <neal@gompa.dev>
Signed-off-by: default avatarSven Peter <sven@kernel.org>
Link: https://lore.kernel.org/r/20250914-apple-usb3-tipd-v1-6-4e99c8649024@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9f36fdfc

drivers/usb/typec/tipd/core.c

+76 −4
Original line number Diff line number Diff line
@@ -35,14 +35,18 @@ 
#define TPS_REG_INT_MASK2		0x17

#define TPS_REG_INT_CLEAR1		0x18

#define TPS_REG_INT_CLEAR2		0x19

#define TPS_REG_SYSTEM_POWER_STATE	0x20

#define TPS_REG_STATUS			0x1a

#define TPS_REG_SYSTEM_POWER_STATE	0x20

#define TPS_REG_USB4_STATUS		0x24

#define TPS_REG_SYSTEM_CONF		0x28

#define TPS_REG_CTRL_CONF		0x29

#define TPS_REG_BOOT_STATUS		0x2D

#define TPS_REG_POWER_STATUS		0x3f

#define TPS_REG_PD_STATUS		0x40

#define TPS_REG_RX_IDENTITY_SOP		0x48

#define TPS_REG_CF_VID_STATUS		0x5e

#define TPS_REG_DP_SID_STATUS		0x58

#define TPS_REG_INTEL_VID_STATUS	0x59

#define TPS_REG_DATA_STATUS		0x5f

#define TPS_REG_SLEEP_CONF		0x70
@@ -85,6 +89,31 @@ struct tps6598x_rx_identity_reg { 
	struct usb_pd_identity identity;

} __packed;



/* TPS_REG_USB4_STATUS */

struct tps6598x_usb4_status_reg {

	u8 mode_status;

	__le32 eudo;

	__le32 unknown;

} __packed;



/* TPS_REG_DP_SID_STATUS */

struct tps6598x_dp_sid_status_reg {

	u8 mode_status;

	__le32 status_tx;

	__le32 status_rx;

	__le32 configure;

	__le32 mode_data;

} __packed;



/* TPS_REG_INTEL_VID_STATUS */

struct tps6598x_intel_vid_status_reg {

	u8 mode_status;

	__le32 attention_vdo;

	__le16 enter_vdo;

	__le16 device_mode;

	__le16 cable_mode;

} __packed;



/* Standard Task return codes */

#define TPS_TASK_TIMEOUT		1

#define TPS_TASK_REJECTED		3
@@ -121,6 +150,7 @@ struct tipd_data { 
	int (*apply_patch)(struct tps6598x *tps);

	int (*init)(struct tps6598x *tps);

	int (*switch_power_state)(struct tps6598x *tps, u8 target_state);

	bool (*read_data_status)(struct tps6598x *tps);

	int (*reset)(struct tps6598x *tps);

};
@@ -151,6 +181,10 @@ struct tps6598x { 


struct cd321x {

	struct tps6598x tps;



	struct tps6598x_dp_sid_status_reg dp_sid_status;

	struct tps6598x_intel_vid_status_reg intel_vid_status;

	struct tps6598x_usb4_status_reg usb4_status;

};



static enum power_supply_property tps6598x_psy_props[] = {
@@ -505,6 +539,41 @@ static bool tps6598x_read_data_status(struct tps6598x *tps) 
	return true;

}



static bool cd321x_read_data_status(struct tps6598x *tps)

{

	struct cd321x *cd321x = container_of(tps, struct cd321x, tps);

	int ret;



	ret = tps6598x_read_data_status(tps);

	if (ret < 0)

		return false;



	if (tps->data_status & TPS_DATA_STATUS_DP_CONNECTION) {

		ret = tps6598x_block_read(tps, TPS_REG_DP_SID_STATUS,

				&cd321x->dp_sid_status, sizeof(cd321x->dp_sid_status));

		if (ret)

			dev_err(tps->dev, "Failed to read DP SID Status: %d\n",

				ret);

	}



	if (tps->data_status & TPS_DATA_STATUS_TBT_CONNECTION) {

		ret = tps6598x_block_read(tps, TPS_REG_INTEL_VID_STATUS,

				&cd321x->intel_vid_status, sizeof(cd321x->intel_vid_status));

		if (ret)

			dev_err(tps->dev, "Failed to read Intel VID Status: %d\n", ret);

	}



	if (tps->data_status & CD321X_DATA_STATUS_USB4_CONNECTION) {

		ret = tps6598x_block_read(tps, TPS_REG_USB4_STATUS,

				&cd321x->usb4_status, sizeof(cd321x->usb4_status));

		if (ret)

			dev_err(tps->dev,

				"Failed to read USB4 Status: %d\n", ret);

	}



	return true;

}



static bool tps6598x_read_power_status(struct tps6598x *tps)

{

	u16 pwr_status;
@@ -565,7 +634,7 @@ static irqreturn_t cd321x_interrupt(int irq, void *data) 
			goto err_unlock;



	if (event & APPLE_CD_REG_INT_DATA_STATUS_UPDATE)

		if (!tps6598x_read_data_status(tps))

		if (!tps->data->read_data_status(tps))

			goto err_unlock;



	/* Handle plug insert or removal */
@@ -614,7 +683,7 @@ static irqreturn_t tps25750_interrupt(int irq, void *data) 
			goto err_clear_ints;



	if (event[0] & TPS_REG_INT_DATA_STATUS_UPDATE)

		if (!tps6598x_read_data_status(tps))

		if (!tps->data->read_data_status(tps))

			goto err_clear_ints;



	/*
@@ -688,7 +757,7 @@ static irqreturn_t tps6598x_interrupt(int irq, void *data) 
			goto err_unlock;



	if ((event1[0] | event2[0]) & TPS_REG_INT_DATA_STATUS_UPDATE)

		if (!tps6598x_read_data_status(tps))

		if (!tps->data->read_data_status(tps))

			goto err_unlock;



	/* Handle plug insert or removal */
@@ -1534,6 +1603,7 @@ static const struct tipd_data cd321x_data = { 
	.trace_power_status = trace_tps6598x_power_status,

	.trace_status = trace_tps6598x_status,

	.init = cd321x_init,

	.read_data_status = cd321x_read_data_status,

	.reset = cd321x_reset,

	.switch_power_state = cd321x_switch_power_state,

};
@@ -1550,6 +1620,7 @@ static const struct tipd_data tps6598x_data = { 
	.trace_status = trace_tps6598x_status,

	.apply_patch = tps6598x_apply_patch,

	.init = tps6598x_init,

	.read_data_status = tps6598x_read_data_status,

	.reset = tps6598x_reset,

};
@@ -1565,6 +1636,7 @@ static const struct tipd_data tps25750_data = { 
	.trace_status = trace_tps25750_status,

	.apply_patch = tps25750_apply_patch,

	.init = tps25750_init,

	.read_data_status = tps6598x_read_data_status,

	.reset = tps25750_reset,

};