| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20250619-smb2-smb5-support-v1-8-ac5dec51b6e1@linaro.org> Date: Thu, 19 Jun 2025 16:55:16 +0200 From: Casey Connolly <casey.connolly@...aro.org> To: Sebastian Reichel <sre@...nel.org>, Rob Herring <robh@...nel.org>, Krzysztof Kozlowski <krzk+dt@...nel.org>, Conor Dooley <conor+dt@...nel.org>, Bjorn Andersson <andersson@...nel.org>, Konrad Dybcio <konradybcio@...nel.org>, Kees Cook <kees@...nel.org>, "Gustavo A. R. Silva" <gustavoars@...nel.org> Cc: linux-arm-msm@...r.kernel.org, linux-pm@...r.kernel.org, devicetree@...r.kernel.org, linux-kernel@...r.kernel.org, Sebastian Reichel <sebastian.reichel@...labora.com>, linux-hardening@...r.kernel.org, Casey Connolly <casey.connolly@...aro.org> Subject: [PATCH 08/11] power: supply: qcom_smbx: remove unused registers Remove registers and bits that aren't used to make things a bit more readable. Signed-off-by: Casey Connolly <casey.connolly@...aro.org> --- drivers/power/supply/qcom_smbx.c | 211 +-------------------------------------- 1 file changed, 4 insertions(+), 207 deletions(-) diff --git a/drivers/power/supply/qcom_smbx.c b/drivers/power/supply/qcom_smbx.c index d1607674d291d6ef5762d35acd3330e2116f41a3..10ddd33a09599decb23c0f1ccd02fa9b56602543 100644 --- a/drivers/power/supply/qcom_smbx.c +++ b/drivers/power/supply/qcom_smbx.c @@ -24,39 +24,17 @@ #include <linux/workqueue.h> /* clang-format off */ #define BATTERY_CHARGER_STATUS_1 0x06 -#define BVR_INITIAL_RAMP_BIT BIT(7) -#define CC_SOFT_TERMINATE_BIT BIT(6) -#define STEP_CHARGING_STATUS_SHIFT 3 -#define STEP_CHARGING_STATUS_MASK GENMASK(5, 3) #define BATTERY_CHARGER_STATUS_MASK GENMASK(2, 0) #define BATTERY_CHARGER_STATUS_2 0x07 -#define INPUT_CURRENT_LIMITED_BIT BIT(7) -#define CHARGER_ERROR_STATUS_SFT_EXPIRE_BIT BIT(6) #define CHARGER_ERROR_STATUS_BAT_OV_BIT BIT(5) -#define CHARGER_ERROR_STATUS_BAT_TERM_MISSING_BIT BIT(4) -#define BAT_TEMP_STATUS_MASK GENMASK(3, 0) -#define BAT_TEMP_STATUS_SOFT_LIMIT_MASK GENMASK(3, 2) #define BAT_TEMP_STATUS_HOT_SOFT_LIMIT_BIT BIT(3) #define BAT_TEMP_STATUS_COLD_SOFT_LIMIT_BIT BIT(2) #define BAT_TEMP_STATUS_TOO_HOT_BIT BIT(1) #define BAT_TEMP_STATUS_TOO_COLD_BIT BIT(0) -#define BATTERY_CHARGER_STATUS_4 0x0A -#define CHARGE_CURRENT_POST_JEITA_MASK GENMASK(7, 0) - -#define BATTERY_CHARGER_STATUS_7 0x0D -#define ENABLE_TRICKLE_BIT BIT(7) -#define ENABLE_PRE_CHARGING_BIT BIT(6) -#define ENABLE_FAST_CHARGING_BIT BIT(5) -#define ENABLE_FULLON_MODE_BIT BIT(4) -#define TOO_COLD_ADC_BIT BIT(3) -#define TOO_HOT_ADC_BIT BIT(2) -#define HOT_SL_ADC_BIT BIT(1) -#define COLD_SL_ADC_BIT BIT(0) - #define CHARGING_ENABLE_CMD 0x42 #define CHARGING_ENABLE_CMD_BIT BIT(0) #define CHGR_CFG2 0x51 @@ -78,270 +56,89 @@ #define FLOAT_VOLTAGE_CFG 0x70 #define FLOAT_VOLTAGE_SETTING_MASK GENMASK(7, 0) #define FG_UPDATE_CFG_2_SEL 0x7D -#define SOC_LT_OTG_THRESH_SEL_BIT BIT(3) #define SOC_LT_CHG_RECHARGE_THRESH_SEL_BIT BIT(2) #define VBT_LT_CHG_RECHARGE_THRESH_SEL_BIT BIT(1) -#define IBT_LT_CHG_TERM_THRESH_SEL_BIT BIT(0) - -#define JEITA_EN_CFG 0x90 -#define JEITA_EN_HARDLIMIT_BIT BIT(4) -#define JEITA_EN_HOT_SL_FCV_BIT BIT(3) -#define JEITA_EN_COLD_SL_FCV_BIT BIT(2) -#define JEITA_EN_HOT_SL_CCC_BIT BIT(1) -#define JEITA_EN_COLD_SL_CCC_BIT BIT(0) - -#define INT_RT_STS 0x310 -#define TYPE_C_CHANGE_RT_STS_BIT BIT(7) -#define USBIN_ICL_CHANGE_RT_STS_BIT BIT(6) -#define USBIN_SOURCE_CHANGE_RT_STS_BIT BIT(5) -#define USBIN_PLUGIN_RT_STS_BIT BIT(4) -#define USBIN_OV_RT_STS_BIT BIT(3) -#define USBIN_UV_RT_STS_BIT BIT(2) -#define USBIN_LT_3P6V_RT_STS_BIT BIT(1) -#define USBIN_COLLAPSE_RT_STS_BIT BIT(0) #define OTG_CFG 0x153 -#define OTG_RESERVED_MASK GENMASK(7, 6) -#define DIS_OTG_ON_TLIM_BIT BIT(5) -#define QUICKSTART_OTG_FASTROLESWAP_BIT BIT(4) -#define INCREASE_DFP_TIME_BIT BIT(3) -#define ENABLE_OTG_IN_DEBUG_MODE_BIT BIT(2) #define OTG_EN_SRC_CFG_BIT BIT(1) -#define CONCURRENT_MODE_CFG_BIT BIT(0) - -#define OTG_ENG_OTG_CFG 0x1C0 -#define ENG_BUCKBOOST_HALT1_8_MODE_BIT BIT(0) #define APSD_STATUS 0x307 -#define APSD_STATUS_7_BIT BIT(7) -#define HVDCP_CHECK_TIMEOUT_BIT BIT(6) -#define SLOW_PLUGIN_TIMEOUT_BIT BIT(5) -#define ENUMERATION_DONE_BIT BIT(4) -#define VADP_CHANGE_DONE_AFTER_AUTH_BIT BIT(3) -#define QC_AUTH_DONE_STATUS_BIT BIT(2) -#define QC_CHARGER_BIT BIT(1) #define APSD_DTC_STATUS_DONE_BIT BIT(0) #define APSD_RESULT_STATUS 0x308 -#define ICL_OVERRIDE_LATCH_BIT BIT(7) #define APSD_RESULT_STATUS_MASK GENMASK(6, 0) -#define QC_3P0_BIT BIT(6) -#define QC_2P0_BIT BIT(5) #define FLOAT_CHARGER_BIT BIT(4) #define DCP_CHARGER_BIT BIT(3) #define CDP_CHARGER_BIT BIT(2) #define OCP_CHARGER_BIT BIT(1) #define SDP_CHARGER_BIT BIT(0) -#define TYPE_C_STATUS_1 0x30B -#define UFP_TYPEC_MASK GENMASK(7, 5) -#define UFP_TYPEC_RDSTD_BIT BIT(7) -#define UFP_TYPEC_RD1P5_BIT BIT(6) -#define UFP_TYPEC_RD3P0_BIT BIT(5) -#define UFP_TYPEC_FMB_255K_BIT BIT(4) -#define UFP_TYPEC_FMB_301K_BIT BIT(3) -#define UFP_TYPEC_FMB_523K_BIT BIT(2) -#define UFP_TYPEC_FMB_619K_BIT BIT(1) -#define UFP_TYPEC_OPEN_OPEN_BIT BIT(0) - -#define TYPE_C_STATUS_2 0x30C -#define DFP_RA_OPEN_BIT BIT(7) -#define TIMER_STAGE_BIT BIT(6) -#define EXIT_UFP_MODE_BIT BIT(5) -#define EXIT_DFP_MODE_BIT BIT(4) -#define DFP_TYPEC_MASK GENMASK(3, 0) -#define DFP_RD_OPEN_BIT BIT(3) -#define DFP_RD_RA_VCONN_BIT BIT(2) -#define DFP_RD_RD_BIT BIT(1) -#define DFP_RA_RA_BIT BIT(0) - -#define TYPE_C_STATUS_3 0x30D -#define ENABLE_BANDGAP_BIT BIT(7) -#define U_USB_GND_NOVBUS_BIT BIT(6) -#define U_USB_FLOAT_NOVBUS_BIT BIT(5) -#define U_USB_GND_BIT BIT(4) -#define U_USB_FMB1_BIT BIT(3) -#define U_USB_FLOAT1_BIT BIT(2) -#define U_USB_FMB2_BIT BIT(1) -#define U_USB_FLOAT2_BIT BIT(0) - -#define TYPE_C_STATUS_4 0x30E -#define UFP_DFP_MODE_STATUS_BIT BIT(7) -#define TYPEC_VBUS_STATUS_BIT BIT(6) -#define TYPEC_VBUS_ERROR_STATUS_BIT BIT(5) -#define TYPEC_DEBOUNCE_DONE_STATUS_BIT BIT(4) -#define TYPEC_UFP_AUDIO_ADAPT_STATUS_BIT BIT(3) -#define TYPEC_VCONN_OVERCURR_STATUS_BIT BIT(2) -#define CC_ORIENTATION_BIT BIT(1) -#define CC_ATTACHED_BIT BIT(0) - -#define TYPE_C_STATUS_5 0x30F -#define TRY_SOURCE_FAILED_BIT BIT(6) -#define TRY_SINK_FAILED_BIT BIT(5) -#define TIMER_STAGE_2_BIT BIT(4) -#define TYPEC_LEGACY_CABLE_STATUS_BIT BIT(3) -#define TYPEC_NONCOMP_LEGACY_CABLE_STATUS_BIT BIT(2) -#define TYPEC_TRYSOURCE_DETECT_STATUS_BIT BIT(1) -#define TYPEC_TRYSINK_DETECT_STATUS_BIT BIT(0) - #define CMD_APSD 0x341 -#define ICL_OVERRIDE_BIT BIT(1) #define APSD_RERUN_BIT BIT(0) #define TYPE_C_CFG 0x358 -#define APSD_START_ON_CC_BIT BIT(7) -#define WAIT_FOR_APSD_BIT BIT(6) #define FACTORY_MODE_DETECTION_EN_BIT BIT(5) -#define FACTORY_MODE_ICL_3A_4A_BIT BIT(4) -#define FACTORY_MODE_DIS_CHGING_CFG_BIT BIT(3) -#define SUSPEND_NON_COMPLIANT_CFG_BIT BIT(2) #define VCONN_OC_CFG_BIT BIT(1) -#define TYPE_C_OR_U_USB_BIT BIT(0) - -#define TYPE_C_CFG_2 0x359 -#define TYPE_C_DFP_CURRSRC_MODE_BIT BIT(7) -#define DFP_CC_1P4V_OR_1P6V_BIT BIT(6) -#define VCONN_SOFTSTART_CFG_MASK GENMASK(5, 4) -#define EN_TRY_SOURCE_MODE_BIT BIT(3) -#define USB_FACTORY_MODE_ENABLE_BIT BIT(2) -#define TYPE_C_UFP_MODE_BIT BIT(1) -#define EN_80UA_180UA_CUR_SOURCE_BIT BIT(0) - -#define TYPE_C_CFG_3 0x35A -#define TVBUS_DEBOUNCE_BIT BIT(7) -#define TYPEC_LEGACY_CABLE_INT_EN_BIT BIT(6) -#define TYPEC_NONCOMPLIANT_LEGACY_CABLE_INT_EN_B BIT(5) -#define TYPEC_TRYSOURCE_DETECT_INT_EN_BIT BIT(4) -#define TYPEC_TRYSINK_DETECT_INT_EN_BIT BIT(3) -#define EN_TRYSINK_MODE_BIT BIT(2) -#define EN_LEGACY_CABLE_DETECTION_BIT BIT(1) -#define ALLOW_PD_DRING_UFP_TCCDB_BIT BIT(0) #define USBIN_OPTIONS_1_CFG 0x362 -#define CABLE_R_SEL_BIT BIT(7) -#define HVDCP_AUTH_ALG_EN_CFG_BIT BIT(6) -#define HVDCP_AUTONOMOUS_MODE_EN_CFG_BIT BIT(5) -#define INPUT_PRIORITY_BIT BIT(4) -#define AUTO_SRC_DETECT_BIT BIT(3) #define HVDCP_EN_BIT BIT(2) -#define VADP_INCREMENT_VOLTAGE_LIMIT_BIT BIT(1) -#define VADP_TAPER_TIMER_EN_BIT BIT(0) - -#define USBIN_OPTIONS_2_CFG 0x363 -#define WIPWR_RST_EUD_CFG_BIT BIT(7) -#define SWITCHER_START_CFG_BIT BIT(6) -#define DCD_TIMEOUT_SEL_BIT BIT(5) -#define OCD_CURRENT_SEL_BIT BIT(4) -#define SLOW_PLUGIN_TIMER_EN_CFG_BIT BIT(3) -#define FLOAT_OPTIONS_MASK GENMASK(2, 0) -#define FLOAT_DIS_CHGING_CFG_BIT BIT(2) -#define SUSPEND_FLOAT_CFG_BIT BIT(1) -#define FORCE_FLOAT_SDP_CFG_BIT BIT(0) - -#define TAPER_TIMER_SEL_CFG 0x364 -#define TYPEC_SPARE_CFG_BIT BIT(7) -#define TYPEC_DRP_DFP_TIME_CFG_BIT BIT(5) -#define TAPER_TIMER_SEL_MASK GENMASK(1, 0) - -#define USBIN_LOAD_CFG 0x365 -#define USBIN_OV_CH_LOAD_OPTION_BIT BIT(7) -#define ICL_OVERRIDE_AFTER_APSD_BIT BIT(4) #define USBIN_ICL_OPTIONS 0x366 -#define CFG_USB3P0_SEL_BIT BIT(2) #define USB51_MODE_BIT BIT(1) #define USBIN_MODE_CHG_BIT BIT(0) +/* PMI8998 only */ #define TYPE_C_INTRPT_ENB_SOFTWARE_CTRL 0x368 -#define EXIT_SNK_BASED_ON_CC_BIT BIT(7) -#define VCONN_EN_ORIENTATION_BIT BIT(6) -#define TYPEC_VCONN_OVERCURR_INT_EN_BIT BIT(5) #define VCONN_EN_SRC_BIT BIT(4) #define VCONN_EN_VALUE_BIT BIT(3) #define TYPEC_POWER_ROLE_CMD_MASK GENMASK(2, 0) #define UFP_EN_CMD_BIT BIT(2) #define DFP_EN_CMD_BIT BIT(1) #define TYPEC_DISABLE_CMD_BIT BIT(0) #define USBIN_CURRENT_LIMIT_CFG 0x370 -#define USBIN_CURRENT_LIMIT_MASK GENMASK(7, 0) #define USBIN_AICL_OPTIONS_CFG 0x380 #define SUSPEND_ON_COLLAPSE_USBIN_BIT BIT(7) -#define USBIN_AICL_HDC_EN_BIT BIT(6) #define USBIN_AICL_START_AT_MAX_BIT BIT(5) -#define USBIN_AICL_RERUN_EN_BIT BIT(4) #define USBIN_AICL_ADC_EN_BIT BIT(3) #define USBIN_AICL_EN_BIT BIT(2) #define USBIN_HV_COLLAPSE_RESPONSE_BIT BIT(1) #define USBIN_LV_COLLAPSE_RESPONSE_BIT BIT(0) +// FIXME: drop these and their programming, no need to set min to 4.3v #define USBIN_5V_AICL_THRESHOLD_CFG 0x381 #define USBIN_5V_AICL_THRESHOLD_CFG_MASK GENMASK(2, 0) #define USBIN_CONT_AICL_THRESHOLD_CFG 0x384 #define USBIN_CONT_AICL_THRESHOLD_CFG_MASK GENMASK(5, 0) -#define DC_ENG_SSUPPLY_CFG2 0x4C1 -#define ENG_SSUPPLY_IVREF_OTG_SS_MASK GENMASK(2, 0) -#define OTG_SS_SLOW 0x3 - -#define DCIN_AICL_REF_SEL_CFG 0x481 -#define DCIN_CONT_AICL_THRESHOLD_CFG_MASK GENMASK(5, 0) - -#define WI_PWR_OPTIONS 0x495 -#define CHG_OK_BIT BIT(7) -#define WIPWR_UVLO_IRQ_OPT_BIT BIT(6) -#define BUCK_HOLDOFF_ENABLE_BIT BIT(5) -#define CHG_OK_HW_SW_SELECT_BIT BIT(4) -#define WIPWR_RST_ENABLE_BIT BIT(3) -#define DCIN_WIPWR_IRQ_SELECT_BIT BIT(2) -#define AICL_SWITCH_ENABLE_BIT BIT(1) -#define ZIN_ICL_ENABLE_BIT BIT(0) - #define ICL_STATUS 0x607 #define INPUT_CURRENT_LIMIT_MASK GENMASK(7, 0) #define POWER_PATH_STATUS 0x60B -#define P_PATH_INPUT_SS_DONE_BIT BIT(7) -#define P_PATH_USBIN_SUSPEND_STS_BIT BIT(6) -#define P_PATH_DCIN_SUSPEND_STS_BIT BIT(5) #define P_PATH_USE_USBIN_BIT BIT(4) -#define P_PATH_USE_DCIN_BIT BIT(3) -#define P_PATH_POWER_PATH_MASK GENMASK(2, 1) #define P_PATH_VALID_INPUT_POWER_SOURCE_STS_BIT BIT(0) #define BARK_BITE_WDOG_PET 0x643 #define BARK_BITE_WDOG_PET_BIT BIT(0) #define WD_CFG 0x651 #define WATCHDOG_TRIGGER_AFP_EN_BIT BIT(7) #define BARK_WDOG_INT_EN_BIT BIT(6) -#define BITE_WDOG_INT_EN_BIT BIT(5) -#define SFT_AFTER_WDOG_IRQ_MASK GENMASK(4, 3) -#define WDOG_IRQ_SFT_BIT BIT(2) #define WDOG_TIMER_EN_ON_PLUGIN_BIT BIT(1) -#define WDOG_TIMER_EN_BIT BIT(0) #define SNARL_BARK_BITE_WD_CFG 0x653 -#define BITE_WDOG_DISABLE_CHARGING_CFG_BIT BIT(7) -#define SNARL_WDOG_TIMEOUT_MASK GENMASK(6, 4) -#define BARK_WDOG_TIMEOUT_MASK GENMASK(3, 2) -#define BITE_WDOG_TIMEOUT_MASK GENMASK(1, 0) #define AICL_RERUN_TIME_CFG 0x661 #define AICL_RERUN_TIME_MASK GENMASK(1, 0) +#define AIC_RERUN_TIME_3_SECS 0x0 +/* FIXME: probably remove this so we get parallel charging? */ #define STAT_CFG 0x690 -#define STAT_SW_OVERRIDE_VALUE_BIT BIT(7) #define STAT_SW_OVERRIDE_CFG_BIT BIT(6) -#define STAT_PARALLEL_OFF_DG_CFG_MASK GENMASK(5, 4) -#define STAT_POLARITY_CFG_BIT BIT(3) -#define STAT_PARALLEL_CFG_BIT BIT(2) -#define STAT_FUNCTION_CFG_BIT BIT(1) -#define STAT_IRQ_PULSING_EN_BIT BIT(0) #define SDP_CURRENT_UA 500000 #define CDP_CURRENT_UA 1500000 #define DCP_CURRENT_UA 1500000 -- 2.49.0
Powered by blists - more mailing lists