Revert "TCPMv2: Handle tSenderResponse override consistently" This reverts commit 95ea9b2fd7082ac926937ace09d02630bfb52965. This reverts the earlier change that set PD3_T_SENDER_RESPONSE to 28ms to reduce latency in the error recovery path. The override is no longer required as 28ms is now the default value. BUG=b:442730096 TEST=Pass TEST.PD.FRS.SNK3.4 Change-Id: I47c00cb1895e1d56f5261a40084ffd8450a4a96f Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/7703237 Auto-Submit: Smit Patel <smit.patel@7rays.corp-partner.google.com> Reviewed-by: Abe Levkoy <alevkoy@chromium.org> Commit-Queue: Smit Patel <smit.patel@7rays.corp-partner.google.com> Tested-by: Smit Patel <smit.patel@7rays.corp-partner.google.com> Reviewed-by: Pranava Y N <pranavayn@google.com>
diff --git a/include/config.h b/include/config.h index 39be68b..f73564f 100644 --- a/include/config.h +++ b/include/config.h
@@ -5533,7 +5533,7 @@ /* Support VCONN swap */ #undef CONFIG_USBC_VCONN_SWAP -#undef CONFIG_USBC_PD3_T_SENDER_RESPONSE_OVERRIDE +#undef CONFIG_USBC_PD3_SENDER_RESPONSE_OVERRIDE #undef CONFIG_USBC_PD3_T_SENDER_RESPONSE_MS /*
diff --git a/include/usb_pd.h b/include/usb_pd.h index b107b47..eaf32e6 100644 --- a/include/usb_pd.h +++ b/include/usb_pd.h
@@ -275,8 +275,8 @@ */ /* TODO(b/442730096):Debug pujjoga ErrorRecovery latency and remove this config */ -#ifdef CONFIG_USBC_PD3_T_SENDER_RESPONSE_OVERRIDE -#define PD3_T_SENDER_RESPONSE CONFIG_USBC_PD3_T_SENDER_RESPONSE_MS +#ifdef CONFIG_PLATFORM_EC_USBC_PD3_SENDER_RESPONSE_OVERRIDE +#define PD3_T_SENDER_RESPONSE CONFIG_PLATFORM_EC_USBC_PD3_T_SENDER_RESPONSE_MS #else #define PD3_T_SENDER_RESPONSE (28 * MSEC) #endif
diff --git a/zephyr/Kconfig.pd b/zephyr/Kconfig.pd index 3226612..55b5847 100644 --- a/zephyr/Kconfig.pd +++ b/zephyr/Kconfig.pd
@@ -473,7 +473,7 @@ help enable PD3_T_SENDER_RESPONSE value override. -config PLATFORM_EC_USBC_PD3_T_SENDER_RESPONSE_MS +config PLATFORM_EC_USBC_PD3_SENDER_RESPONSE_MS int "Value for PD3_T_SENDER_RESPONSE" depends on PLATFORM_EC_USBC_PD3_T_SENDER_RESPONSE_OVERRIDE default 29000
diff --git a/zephyr/program/nissa/pujjoga/project.conf b/zephyr/program/nissa/pujjoga/project.conf index e3ebb7d..12d6e18 100644 --- a/zephyr/program/nissa/pujjoga/project.conf +++ b/zephyr/program/nissa/pujjoga/project.conf
@@ -67,4 +67,4 @@ #Modifying PD3_T_SENDER_RESPONSE for pujjoga CONFIG_PLATFORM_EC_USBC_PD3_T_SENDER_RESPONSE_OVERRIDE=y -CONFIG_PLATFORM_EC_USBC_PD3_T_SENDER_RESPONSE_MS=28000 +CONFIG_PLATFORM_EC_USBC_PD3_SENDER_RESPONSE_MS=28000
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index a08b0f8..33bd11f 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h
@@ -3846,15 +3846,15 @@ #define CONFIG_USB_PD_EVENT_DRIVEN_CC_STATE #endif -#undef CONFIG_USBC_PD3_T_SENDER_RESPONSE_OVERRIDE -#ifdef CONFIG_PLATFORM_EC_USBC_PD3_T_SENDER_RESPONSE_OVERRIDE -#define CONFIG_USBC_PD3_T_SENDER_RESPONSE_OVERRIDE +#undef CONFIG_USBC_PD3_SENDER_RESPONSE_OVERRIDE +#ifdef CONFIG_PLATFORM_EC_USBC_PD3_SENDER_RESPONSE_OVERRIDE +#define CONFIG_USBC_PD3_SENDER_RESPONSE_OVERRIDE #endif -#undef CONFIG_USBC_PD3_T_SENDER_RESPONSE_MS -#ifdef CONFIG_PLATFORM_EC_USBC_PD3_T_SENDER_RESPONSE_MS -#define CONFIG_USBC_PD3_T_SENDER_RESPONSE_MS \ - CONFIG_PLATFORM_EC_USBC_PD3_T_SENDER_RESPONSE_MS +#undef CONFIG_USBC_PD3_SENDER_RESPONSE_MS +#ifdef CONFIG_PLATFORM_EC_USBC_PD3_SENDER_RESPONSE_MS +#define CONFIG_USBC_PD3_SENDER_RESPONSE_MS \ + CONFIG_PLATFORM_EC_USBC_PD3_SENDER_RESPONSE_MS #endif #ifdef __cplusplus