Commit 7af9da8c authored by Sanjay R Mehta's avatar Sanjay R Mehta Committed by Mika Westerberg
Browse files

thunderbolt: Add quirk to disable CLx 



Add QUIRK_NO_CLX to disable the CLx state for hardware which
doesn't supports it.

AMD Yellow Carp and Pink Sardine don't support CLx state,
hence disabling it using QUIRK_NO_CLX.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarSanjay R Mehta <sanju.mehta@amd.com>
Signed-off-by: default avatarBasavaraj Natikar <Basavaraj.Natikar@amd.com>
[mw: added debug log when the quirk is run]
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent fe15c26e

drivers/thunderbolt/quirks.c

+13 −0
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ static void quirk_dp_credit_allocation(struct tb_switch *sw) 
	}

}



static void quirk_clx_disable(struct tb_switch *sw)

{

	sw->quirks |= QUIRK_NO_CLX;

	tb_sw_dbg(sw, "disabling CL states\n");

}



struct tb_quirk {

	u16 hw_vendor_id;

	u16 hw_device_id;
@@ -37,6 +43,13 @@ static const struct tb_quirk tb_quirks[] = { 
	 * DP buffers.

	 */

	{ 0x8087, 0x0b26, 0x0000, 0x0000, quirk_dp_credit_allocation },

	/*

	 * CLx is not supported on AMD USB4 Yellow Carp and Pink Sardine platforms.

	 */

	{ 0x0438, 0x0208, 0x0000, 0x0000, quirk_clx_disable },

	{ 0x0438, 0x0209, 0x0000, 0x0000, quirk_clx_disable },

	{ 0x0438, 0x020a, 0x0000, 0x0000, quirk_clx_disable },

	{ 0x0438, 0x020b, 0x0000, 0x0000, quirk_clx_disable },

};



/**

drivers/thunderbolt/tb.h

+8 −3
Original line number Diff line number Diff line
@@ -23,6 +23,11 @@ 
#define NVM_MAX_SIZE		SZ_512K

#define NVM_DATA_DWORDS		16



/* Keep link controller awake during update */

#define QUIRK_FORCE_POWER_LINK_CONTROLLER		BIT(0)

/* Disable CLx if not supported */

#define QUIRK_NO_CLX					BIT(1)



/**

 * struct tb_nvm - Structure holding NVM information

 * @dev: Owner of the NVM
@@ -1019,6 +1024,9 @@ static inline bool tb_switch_is_clx_enabled(const struct tb_switch *sw, 
 */

static inline bool tb_switch_is_clx_supported(const struct tb_switch *sw)

{

	if (sw->quirks & QUIRK_NO_CLX)

		return false;



	return tb_switch_is_usb4(sw) || tb_switch_is_titan_ridge(sw);

}
@@ -1291,9 +1299,6 @@ struct usb4_port *usb4_port_device_add(struct tb_port *port); 
void usb4_port_device_remove(struct usb4_port *usb4);

int usb4_port_device_resume(struct usb4_port *usb4);



/* Keep link controller awake during update */

#define QUIRK_FORCE_POWER_LINK_CONTROLLER		BIT(0)



void tb_check_quirks(struct tb_switch *sw);



#ifdef CONFIG_ACPI