| 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
| ||
|
Date: Tue, 18 Jun 2024 19:46:20 +0200
From: Thorsten Scherer <T.Scherer@...elmann.de>
To: Uwe Kleine-König <u.kleine-koenig@...libre.com>
Cc: Fabrice Gasnier <fabrice.gasnier@...s.st.com>,
William Breathitt Gray <wbg@...nel.org>, Maxime Coquelin <mcoquelin.stm32@...il.com>,
Alexandre Torgue <alexandre.torgue@...s.st.com>, Lee Jones <lee@...nel.org>, linux-iio@...r.kernel.org,
linux-pwm@...r.kernel.org, linux-stm32@...md-mailman.stormreply.com,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/4] mfd: stm32-timers: Unify alignment of register
definition
Hi Uwe,
On Fri, Jun 14, 2024 at 10:10:11AM +0200, Uwe Kleine-König wrote:
> Ust tabs consistently for indention and properly align register names,
Litte typo here.
s/Ust/Use/
> values and comments. This improves readability (at least for my eyes).
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@...libre.com>
> ---
> include/linux/mfd/stm32-timers.h | 170 +++++++++++++++----------------
> 1 file changed, 85 insertions(+), 85 deletions(-)
>
> diff --git a/include/linux/mfd/stm32-timers.h b/include/linux/mfd/stm32-timers.h
> index 9eb17481b07f..5794110b2b28 100644
> --- a/include/linux/mfd/stm32-timers.h
> +++ b/include/linux/mfd/stm32-timers.h
> @@ -12,97 +12,97 @@
> #include <linux/dma-mapping.h>
> #include <linux/regmap.h>
>
> -#define TIM_CR1 0x00 /* Control Register 1 */
> -#define TIM_CR2 0x04 /* Control Register 2 */
> -#define TIM_SMCR 0x08 /* Slave mode control reg */
> -#define TIM_DIER 0x0C /* DMA/interrupt register */
> -#define TIM_SR 0x10 /* Status register */
> -#define TIM_EGR 0x14 /* Event Generation Reg */
> -#define TIM_CCMR1 0x18 /* Capt/Comp 1 Mode Reg */
> -#define TIM_CCMR2 0x1C /* Capt/Comp 2 Mode Reg */
> -#define TIM_CCER 0x20 /* Capt/Comp Enable Reg */
> -#define TIM_CNT 0x24 /* Counter */
> -#define TIM_PSC 0x28 /* Prescaler */
> -#define TIM_ARR 0x2c /* Auto-Reload Register */
> -#define TIM_CCR1 0x34 /* Capt/Comp Register 1 */
> -#define TIM_CCR2 0x38 /* Capt/Comp Register 2 */
> -#define TIM_CCR3 0x3C /* Capt/Comp Register 3 */
> -#define TIM_CCR4 0x40 /* Capt/Comp Register 4 */
> -#define TIM_BDTR 0x44 /* Break and Dead-Time Reg */
> -#define TIM_DCR 0x48 /* DMA control register */
> -#define TIM_DMAR 0x4C /* DMA register for transfer */
> -#define TIM_TISEL 0x68 /* Input Selection */
> +#define TIM_CR1 0x00 /* Control Register 1 */
> +#define TIM_CR2 0x04 /* Control Register 2 */
> +#define TIM_SMCR 0x08 /* Slave mode control reg */
> +#define TIM_DIER 0x0C /* DMA/interrupt register */
> +#define TIM_SR 0x10 /* Status register */
> +#define TIM_EGR 0x14 /* Event Generation Reg */
> +#define TIM_CCMR1 0x18 /* Capt/Comp 1 Mode Reg */
> +#define TIM_CCMR2 0x1C /* Capt/Comp 2 Mode Reg */
> +#define TIM_CCER 0x20 /* Capt/Comp Enable Reg */
> +#define TIM_CNT 0x24 /* Counter */
> +#define TIM_PSC 0x28 /* Prescaler */
> +#define TIM_ARR 0x2c /* Auto-Reload Register */
> +#define TIM_CCR1 0x34 /* Capt/Comp Register 1 */
> +#define TIM_CCR2 0x38 /* Capt/Comp Register 2 */
> +#define TIM_CCR3 0x3C /* Capt/Comp Register 3 */
> +#define TIM_CCR4 0x40 /* Capt/Comp Register 4 */
> +#define TIM_BDTR 0x44 /* Break and Dead-Time Reg */
> +#define TIM_DCR 0x48 /* DMA control register */
> +#define TIM_DMAR 0x4C /* DMA register for transfer */
> +#define TIM_TISEL 0x68 /* Input Selection */
>
> -#define TIM_CR1_CEN BIT(0) /* Counter Enable */
> -#define TIM_CR1_DIR BIT(4) /* Counter Direction */
> -#define TIM_CR1_ARPE BIT(7) /* Auto-reload Preload Ena */
> -#define TIM_CR2_MMS (BIT(4) | BIT(5) | BIT(6)) /* Master mode selection */
> -#define TIM_CR2_MMS2 GENMASK(23, 20) /* Master mode selection 2 */
> -#define TIM_SMCR_SMS (BIT(0) | BIT(1) | BIT(2)) /* Slave mode selection */
> -#define TIM_SMCR_TS (BIT(4) | BIT(5) | BIT(6)) /* Trigger selection */
> -#define TIM_DIER_UIE BIT(0) /* Update interrupt */
> -#define TIM_DIER_CC1IE BIT(1) /* CC1 Interrupt Enable */
> -#define TIM_DIER_CC2IE BIT(2) /* CC2 Interrupt Enable */
> -#define TIM_DIER_CC3IE BIT(3) /* CC3 Interrupt Enable */
> -#define TIM_DIER_CC4IE BIT(4) /* CC4 Interrupt Enable */
> -#define TIM_DIER_CC_IE(x) BIT((x) + 1) /* CC1, CC2, CC3, CC4 interrupt enable */
> -#define TIM_DIER_UDE BIT(8) /* Update DMA request Enable */
> -#define TIM_DIER_CC1DE BIT(9) /* CC1 DMA request Enable */
> -#define TIM_DIER_CC2DE BIT(10) /* CC2 DMA request Enable */
> -#define TIM_DIER_CC3DE BIT(11) /* CC3 DMA request Enable */
> -#define TIM_DIER_CC4DE BIT(12) /* CC4 DMA request Enable */
> -#define TIM_DIER_COMDE BIT(13) /* COM DMA request Enable */
> -#define TIM_DIER_TDE BIT(14) /* Trigger DMA request Enable */
> -#define TIM_SR_UIF BIT(0) /* Update interrupt flag */
> -#define TIM_SR_CC_IF(x) BIT((x) + 1) /* CC1, CC2, CC3, CC4 interrupt flag */
> -#define TIM_EGR_UG BIT(0) /* Update Generation */
> -#define TIM_CCMR_PE BIT(3) /* Channel Preload Enable */
> -#define TIM_CCMR_M1 (BIT(6) | BIT(5)) /* Channel PWM Mode 1 */
> -#define TIM_CCMR_CC1S (BIT(0) | BIT(1)) /* Capture/compare 1 sel */
> -#define TIM_CCMR_IC1PSC GENMASK(3, 2) /* Input capture 1 prescaler */
> -#define TIM_CCMR_CC2S (BIT(8) | BIT(9)) /* Capture/compare 2 sel */
> -#define TIM_CCMR_IC2PSC GENMASK(11, 10) /* Input capture 2 prescaler */
> -#define TIM_CCMR_CC1S_TI1 BIT(0) /* IC1/IC3 selects TI1/TI3 */
> -#define TIM_CCMR_CC1S_TI2 BIT(1) /* IC1/IC3 selects TI2/TI4 */
> -#define TIM_CCMR_CC2S_TI2 BIT(8) /* IC2/IC4 selects TI2/TI4 */
> -#define TIM_CCMR_CC2S_TI1 BIT(9) /* IC2/IC4 selects TI1/TI3 */
> -#define TIM_CCMR_CC3S (BIT(0) | BIT(1)) /* Capture/compare 3 sel */
> -#define TIM_CCMR_CC4S (BIT(8) | BIT(9)) /* Capture/compare 4 sel */
> -#define TIM_CCMR_CC3S_TI3 BIT(0) /* IC3 selects TI3 */
> -#define TIM_CCMR_CC4S_TI4 BIT(8) /* IC4 selects TI4 */
> -#define TIM_CCER_CC1E BIT(0) /* Capt/Comp 1 out Ena */
> -#define TIM_CCER_CC1P BIT(1) /* Capt/Comp 1 Polarity */
> -#define TIM_CCER_CC1NE BIT(2) /* Capt/Comp 1N out Ena */
> -#define TIM_CCER_CC1NP BIT(3) /* Capt/Comp 1N Polarity */
> -#define TIM_CCER_CC2E BIT(4) /* Capt/Comp 2 out Ena */
> -#define TIM_CCER_CC2P BIT(5) /* Capt/Comp 2 Polarity */
> -#define TIM_CCER_CC2NP BIT(7) /* Capt/Comp 2N Polarity */
> -#define TIM_CCER_CC3E BIT(8) /* Capt/Comp 3 out Ena */
> -#define TIM_CCER_CC3P BIT(9) /* Capt/Comp 3 Polarity */
> -#define TIM_CCER_CC3NP BIT(11) /* Capt/Comp 3N Polarity */
> -#define TIM_CCER_CC4E BIT(12) /* Capt/Comp 4 out Ena */
> -#define TIM_CCER_CC4P BIT(13) /* Capt/Comp 4 Polarity */
> -#define TIM_CCER_CC4NP BIT(15) /* Capt/Comp 4N Polarity */
> -#define TIM_CCER_CCXE (BIT(0) | BIT(4) | BIT(8) | BIT(12))
> -#define TIM_BDTR_BKE(x) BIT(12 + (x) * 12) /* Break input enable */
> -#define TIM_BDTR_BKP(x) BIT(13 + (x) * 12) /* Break input polarity */
> -#define TIM_BDTR_AOE BIT(14) /* Automatic Output Enable */
> -#define TIM_BDTR_MOE BIT(15) /* Main Output Enable */
> -#define TIM_BDTR_BKF(x) (0xf << (16 + (x) * 4))
> -#define TIM_DCR_DBA GENMASK(4, 0) /* DMA base addr */
> -#define TIM_DCR_DBL GENMASK(12, 8) /* DMA burst len */
> +#define TIM_CR1_CEN BIT(0) /* Counter Enable */
> +#define TIM_CR1_DIR BIT(4) /* Counter Direction */
> +#define TIM_CR1_ARPE BIT(7) /* Auto-reload Preload Ena */
> +#define TIM_CR2_MMS (BIT(4) | BIT(5) | BIT(6)) /* Master mode selection */
> +#define TIM_CR2_MMS2 GENMASK(23, 20) /* Master mode selection 2 */
> +#define TIM_SMCR_SMS (BIT(0) | BIT(1) | BIT(2)) /* Slave mode selection */
> +#define TIM_SMCR_TS (BIT(4) | BIT(5) | BIT(6)) /* Trigger selection */
> +#define TIM_DIER_UIE BIT(0) /* Update interrupt */
> +#define TIM_DIER_CC1IE BIT(1) /* CC1 Interrupt Enable */
> +#define TIM_DIER_CC2IE BIT(2) /* CC2 Interrupt Enable */
> +#define TIM_DIER_CC3IE BIT(3) /* CC3 Interrupt Enable */
> +#define TIM_DIER_CC4IE BIT(4) /* CC4 Interrupt Enable */
> +#define TIM_DIER_CC_IE(x) BIT((x) + 1) /* CC1, CC2, CC3, CC4 interrupt enable */
> +#define TIM_DIER_UDE BIT(8) /* Update DMA request Enable */
> +#define TIM_DIER_CC1DE BIT(9) /* CC1 DMA request Enable */
> +#define TIM_DIER_CC2DE BIT(10) /* CC2 DMA request Enable */
> +#define TIM_DIER_CC3DE BIT(11) /* CC3 DMA request Enable */
> +#define TIM_DIER_CC4DE BIT(12) /* CC4 DMA request Enable */
> +#define TIM_DIER_COMDE BIT(13) /* COM DMA request Enable */
> +#define TIM_DIER_TDE BIT(14) /* Trigger DMA request Enable */
> +#define TIM_SR_UIF BIT(0) /* Update interrupt flag */
> +#define TIM_SR_CC_IF(x) BIT((x) + 1) /* CC1, CC2, CC3, CC4 interrupt flag */
> +#define TIM_EGR_UG BIT(0) /* Update Generation */
> +#define TIM_CCMR_PE BIT(3) /* Channel Preload Enable */
> +#define TIM_CCMR_M1 (BIT(6) | BIT(5)) /* Channel PWM Mode 1 */
> +#define TIM_CCMR_CC1S (BIT(0) | BIT(1)) /* Capture/compare 1 sel */
> +#define TIM_CCMR_IC1PSC GENMASK(3, 2) /* Input capture 1 prescaler */
> +#define TIM_CCMR_CC2S (BIT(8) | BIT(9)) /* Capture/compare 2 sel */
> +#define TIM_CCMR_IC2PSC GENMASK(11, 10) /* Input capture 2 prescaler */
> +#define TIM_CCMR_CC1S_TI1 BIT(0) /* IC1/IC3 selects TI1/TI3 */
> +#define TIM_CCMR_CC1S_TI2 BIT(1) /* IC1/IC3 selects TI2/TI4 */
> +#define TIM_CCMR_CC2S_TI2 BIT(8) /* IC2/IC4 selects TI2/TI4 */
> +#define TIM_CCMR_CC2S_TI1 BIT(9) /* IC2/IC4 selects TI1/TI3 */
> +#define TIM_CCMR_CC3S (BIT(0) | BIT(1)) /* Capture/compare 3 sel */
> +#define TIM_CCMR_CC4S (BIT(8) | BIT(9)) /* Capture/compare 4 sel */
> +#define TIM_CCMR_CC3S_TI3 BIT(0) /* IC3 selects TI3 */
> +#define TIM_CCMR_CC4S_TI4 BIT(8) /* IC4 selects TI4 */
> +#define TIM_CCER_CC1E BIT(0) /* Capt/Comp 1 out Ena */
> +#define TIM_CCER_CC1P BIT(1) /* Capt/Comp 1 Polarity */
> +#define TIM_CCER_CC1NE BIT(2) /* Capt/Comp 1N out Ena */
> +#define TIM_CCER_CC1NP BIT(3) /* Capt/Comp 1N Polarity */
> +#define TIM_CCER_CC2E BIT(4) /* Capt/Comp 2 out Ena */
> +#define TIM_CCER_CC2P BIT(5) /* Capt/Comp 2 Polarity */
> +#define TIM_CCER_CC2NP BIT(7) /* Capt/Comp 2N Polarity */
> +#define TIM_CCER_CC3E BIT(8) /* Capt/Comp 3 out Ena */
> +#define TIM_CCER_CC3P BIT(9) /* Capt/Comp 3 Polarity */
> +#define TIM_CCER_CC3NP BIT(11) /* Capt/Comp 3N Polarity */
> +#define TIM_CCER_CC4E BIT(12) /* Capt/Comp 4 out Ena */
> +#define TIM_CCER_CC4P BIT(13) /* Capt/Comp 4 Polarity */
> +#define TIM_CCER_CC4NP BIT(15) /* Capt/Comp 4N Polarity */
> +#define TIM_CCER_CCXE (BIT(0) | BIT(4) | BIT(8) | BIT(12))
> +#define TIM_BDTR_BKE(x) BIT(12 + (x) * 12) /* Break input enable */
> +#define TIM_BDTR_BKP(x) BIT(13 + (x) * 12) /* Break input polarity */
> +#define TIM_BDTR_AOE BIT(14) /* Automatic Output Enable */
> +#define TIM_BDTR_MOE BIT(15) /* Main Output Enable */
> +#define TIM_BDTR_BKF(x) (0xf << (16 + (x) * 4))
> +#define TIM_DCR_DBA GENMASK(4, 0) /* DMA base addr */
> +#define TIM_DCR_DBL GENMASK(12, 8) /* DMA burst len */
>
> -#define MAX_TIM_PSC 0xFFFF
> -#define MAX_TIM_ICPSC 0x3
> -#define TIM_CR2_MMS_SHIFT 4
> -#define TIM_CR2_MMS2_SHIFT 20
> +#define MAX_TIM_PSC 0xFFFF
> +#define MAX_TIM_ICPSC 0x3
> +#define TIM_CR2_MMS_SHIFT 4
> +#define TIM_CR2_MMS2_SHIFT 20
> #define TIM_SMCR_SMS_SLAVE_MODE_DISABLED 0 /* counts on internal clock when CEN=1 */
> #define TIM_SMCR_SMS_ENCODER_MODE_1 1 /* counts TI1FP1 edges, depending on TI2FP2 level */
> #define TIM_SMCR_SMS_ENCODER_MODE_2 2 /* counts TI2FP2 edges, depending on TI1FP1 level */
> #define TIM_SMCR_SMS_ENCODER_MODE_3 3 /* counts on both TI1FP1 and TI2FP2 edges */
> -#define TIM_SMCR_TS_SHIFT 4
> -#define TIM_BDTR_BKF_MASK 0xF
> -#define TIM_BDTR_BKF_SHIFT(x) (16 + (x) * 4)
> +#define TIM_SMCR_TS_SHIFT 4
> +#define TIM_BDTR_BKF_MASK 0xF
> +#define TIM_BDTR_BKF_SHIFT(x) (16 + (x) * 4)
>
> enum stm32_timers_dmas {
> STM32_TIMERS_DMA_CH1,
> --
> 2.43.0
>
>
Best regards
Thorsten
Powered by blists - more mailing lists