| 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: <20251128003634.247529-4-rafael.v.volkmer@gmail.com> Date: Thu, 27 Nov 2025 21:36:28 -0300 From: "Rafael V. Volkmer" <rafael.v.volkmer@...il.com> To: ukleinek@...nel.org Cc: linux-kernel@...r.kernel.org, linux-pwm@...r.kernel.org, rafael.v.volkmer@...il.com Subject: [PATCH v7 3/9] pwm: tiehrpwm: use GENMASK() and FIELD_PREP() for register fields Convert the TIEHRPWM TBCTL, AQCTL, AQSFRC and AQCSFRC field definitions to use GENMASK() and FIELD_PREP() instead of open-coded bit masks and shifted literals. This makes the eHRPWM register layout more explicit, reduces hand-rolled bit arithmetic and aligns the driver with common kernel bitfield patterns. No functional change intended. Signed-off-by: Rafael V. Volkmer <rafael.v.volkmer@...il.com> --- drivers/pwm/pwm-tiehrpwm.c | 88 ++++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 41 deletions(-) diff --git a/drivers/pwm/pwm-tiehrpwm.c b/drivers/pwm/pwm-tiehrpwm.c index f8625394c056..0802f0553587 100644 --- a/drivers/pwm/pwm-tiehrpwm.c +++ b/drivers/pwm/pwm-tiehrpwm.c @@ -13,6 +13,7 @@ #include <linux/clk.h> #include <linux/pm_runtime.h> #include <linux/of.h> +#include <linux/bitfield.h> /* EHRPWM registers and bits definitions */ @@ -21,15 +22,16 @@ #define TIEHRPWM_TBPRD 0x0A #define TIEHRPWM_TBCTL_PRDLD BIT(3) -#define TIEHRPWM_TBCTL_PRDLD_SHDW 0 -#define TIEHRPWM_TBCTL_PRDLD_IMDT BIT(3) -#define TIEHRPWM_TBCTL_CLKDIV_MASK (BIT(12) | BIT(11) | BIT(10) | BIT(9) | \ - BIT(8) | BIT(7)) -#define TIEHRPWM_TBCTL_CTRMODE_MASK (BIT(1) | BIT(0)) -#define TIEHRPWM_TBCTL_CTRMODE_UP 0 -#define TIEHRPWM_TBCTL_CTRMODE_DOWN BIT(0) -#define TIEHRPWM_TBCTL_CTRMODE_UPDOWN BIT(1) -#define TIEHRPWM_TBCTL_CTRMODE_FREEZE (BIT(1) | BIT(0)) +#define TIEHRPWM_TBCTL_PRDLD_SHDW FIELD_PREP(TIEHRPWM_TBCTL_PRDLD, 0) +#define TIEHRPWM_TBCTL_PRDLD_IMDT FIELD_PREP(TIEHRPWM_TBCTL_PRDLD, 1) + +#define TIEHRPWM_TBCTL_CLKDIV_MASK GENMASK(12, 7) + +#define TIEHRPWM_TBCTL_CTRMODE_MASK GENMASK(1, 0) +#define TIEHRPWM_TBCTL_CTRMODE_UP FIELD_PREP(TIEHRPWM_TBCTL_CTRMODE_MASK, 0) +#define TIEHRPWM_TBCTL_CTRMODE_DOWN FIELD_PREP(TIEHRPWM_TBCTL_CTRMODE_MASK, 1) +#define TIEHRPWM_TBCTL_CTRMODE_UPDOWN FIELD_PREP(TIEHRPWM_TBCTL_CTRMODE_MASK, 2) +#define TIEHRPWM_TBCTL_CTRMODE_FREEZE FIELD_PREP(TIEHRPWM_TBCTL_CTRMODE_MASK, 3) #define TIEHRPWM_TBCTL_HSPCLKDIV_SHIFT 7 #define TIEHRPWM_TBCTL_CLKDIV_SHIFT 10 @@ -48,22 +50,25 @@ #define TIEHRPWM_AQSFRC 0x1A #define TIEHRPWM_AQCSFRC 0x1C -#define TIEHRPWM_AQCTL_CBU_MASK (BIT(9) | BIT(8)) -#define TIEHRPWM_AQCTL_CBU_FRCLOW BIT(8) -#define TIEHRPWM_AQCTL_CBU_FRCHIGH BIT(9) -#define TIEHRPWM_AQCTL_CBU_FRCTOGGLE (BIT(9) | BIT(8)) -#define TIEHRPWM_AQCTL_CAU_MASK (BIT(5) | BIT(4)) -#define TIEHRPWM_AQCTL_CAU_FRCLOW BIT(4) -#define TIEHRPWM_AQCTL_CAU_FRCHIGH BIT(5) -#define TIEHRPWM_AQCTL_CAU_FRCTOGGLE (BIT(5) | BIT(4)) -#define TIEHRPWM_AQCTL_PRD_MASK (BIT(3) | BIT(2)) -#define TIEHRPWM_AQCTL_PRD_FRCLOW BIT(2) -#define TIEHRPWM_AQCTL_PRD_FRCHIGH BIT(3) -#define TIEHRPWM_AQCTL_PRD_FRCTOGGLE (BIT(3) | BIT(2)) -#define TIEHRPWM_AQCTL_ZRO_MASK (BIT(1) | BIT(0)) -#define TIEHRPWM_AQCTL_ZRO_FRCLOW BIT(0) -#define TIEHRPWM_AQCTL_ZRO_FRCHIGH BIT(1) -#define TIEHRPWM_AQCTL_ZRO_FRCTOGGLE (BIT(1) | BIT(0)) +#define TIEHRPWM_AQCTL_CBU_MASK GENMASK(9, 8) +#define TIEHRPWM_AQCTL_CBU_FRCLOW FIELD_PREP(TIEHRPWM_AQCTL_CBU_MASK, 1) +#define TIEHRPWM_AQCTL_CBU_FRCHIGH FIELD_PREP(TIEHRPWM_AQCTL_CBU_MASK, 2) +#define TIEHRPWM_AQCTL_CBU_FRCTOGGLE FIELD_PREP(TIEHRPWM_AQCTL_CBU_MASK, 3) + +#define TIEHRPWM_AQCTL_CAU_MASK GENMASK(5, 4) +#define TIEHRPWM_AQCTL_CAU_FRCLOW FIELD_PREP(TIEHRPWM_AQCTL_CAU_MASK, 1) +#define TIEHRPWM_AQCTL_CAU_FRCHIGH FIELD_PREP(TIEHRPWM_AQCTL_CAU_MASK, 2) +#define TIEHRPWM_AQCTL_CAU_FRCTOGGLE FIELD_PREP(TIEHRPWM_AQCTL_CAU_MASK, 3) + +#define TIEHRPWM_AQCTL_PRD_MASK GENMASK(3, 2) +#define TIEHRPWM_AQCTL_PRD_FRCLOW FIELD_PREP(TIEHRPWM_AQCTL_PRD_MASK, 1) +#define TIEHRPWM_AQCTL_PRD_FRCHIGH FIELD_PREP(TIEHRPWM_AQCTL_PRD_MASK, 2) +#define TIEHRPWM_AQCTL_PRD_FRCTOGGLE FIELD_PREP(TIEHRPWM_AQCTL_PRD_MASK, 3) + +#define TIEHRPWM_AQCTL_ZRO_MASK GENMASK(1, 0) +#define TIEHRPWM_AQCTL_ZRO_FRCLOW FIELD_PREP(TIEHRPWM_AQCTL_ZRO_MASK, 1) +#define TIEHRPWM_AQCTL_ZRO_FRCHIGH FIELD_PREP(TIEHRPWM_AQCTL_ZRO_MASK, 2) +#define TIEHRPWM_AQCTL_ZRO_FRCTOGGLE FIELD_PREP(TIEHRPWM_AQCTL_ZRO_MASK, 3) #define TIEHRPWM_AQCTL_CHANA_POLNORMAL (TIEHRPWM_AQCTL_CAU_FRCLOW | \ TIEHRPWM_AQCTL_ZRO_FRCHIGH) @@ -74,22 +79,23 @@ #define TIEHRPWM_AQCTL_CHANB_POLINVERSED (TIEHRPWM_AQCTL_CBU_FRCHIGH | \ TIEHRPWM_AQCTL_ZRO_FRCLOW) -#define TIEHRPWM_AQSFRC_RLDCSF_MASK (BIT(7) | BIT(6)) -#define TIEHRPWM_AQSFRC_RLDCSF_ZRO 0 -#define TIEHRPWM_AQSFRC_RLDCSF_PRD BIT(6) -#define TIEHRPWM_AQSFRC_RLDCSF_ZROPRD BIT(7) -#define TIEHRPWM_AQSFRC_RLDCSF_IMDT (BIT(7) | BIT(6)) - -#define TIEHRPWM_AQCSFRC_CSFB_MASK (BIT(3) | BIT(2)) -#define TIEHRPWM_AQCSFRC_CSFB_FRCDIS 0 -#define TIEHRPWM_AQCSFRC_CSFB_FRCLOW BIT(2) -#define TIEHRPWM_AQCSFRC_CSFB_FRCHIGH BIT(3) -#define TIEHRPWM_AQCSFRC_CSFB_DISSWFRC (BIT(3) | BIT(2)) -#define TIEHRPWM_AQCSFRC_CSFA_MASK (BIT(1) | BIT(0)) -#define TIEHRPWM_AQCSFRC_CSFA_FRCDIS 0 -#define TIEHRPWM_AQCSFRC_CSFA_FRCLOW BIT(0) -#define TIEHRPWM_AQCSFRC_CSFA_FRCHIGH BIT(1) -#define TIEHRPWM_AQCSFRC_CSFA_DISSWFRC (BIT(1) | BIT(0)) +#define TIEHRPWM_AQSFRC_RLDCSF_MASK GENMASK(7, 6) +#define TIEHRPWM_AQSFRC_RLDCSF_ZRO FIELD_PREP(TIEHRPWM_AQSFRC_RLDCSF_MASK, 0) +#define TIEHRPWM_AQSFRC_RLDCSF_PRD FIELD_PREP(TIEHRPWM_AQSFRC_RLDCSF_MASK, 1) +#define TIEHRPWM_AQSFRC_RLDCSF_ZROPRD FIELD_PREP(TIEHRPWM_AQSFRC_RLDCSF_MASK, 2) +#define TIEHRPWM_AQSFRC_RLDCSF_IMDT FIELD_PREP(TIEHRPWM_AQSFRC_RLDCSF_MASK, 3) + +#define TIEHRPWM_AQCSFRC_CSFB_MASK GENMASK(3, 2) +#define TIEHRPWM_AQCSFRC_CSFB_FRCDIS FIELD_PREP(TIEHRPWM_AQCSFRC_CSFB_MASK, 0) +#define TIEHRPWM_AQCSFRC_CSFB_FRCLOW FIELD_PREP(TIEHRPWM_AQCSFRC_CSFB_MASK, 1) +#define TIEHRPWM_AQCSFRC_CSFB_FRCHIGH FIELD_PREP(TIEHRPWM_AQCSFRC_CSFB_MASK, 2) +#define TIEHRPWM_AQCSFRC_CSFB_DISSWFRC FIELD_PREP(TIEHRPWM_AQCSFRC_CSFB_MASK, 3) + +#define TIEHRPWM_AQCSFRC_CSFA_MASK GENMASK(1, 0) +#define TIEHRPWM_AQCSFRC_CSFA_FRCDIS FIELD_PREP(TIEHRPWM_AQCSFRC_CSFA_MASK, 0) +#define TIEHRPWM_AQCSFRC_CSFA_FRCLOW FIELD_PREP(TIEHRPWM_AQCSFRC_CSFA_MASK, 1) +#define TIEHRPWM_AQCSFRC_CSFA_FRCHIGH FIELD_PREP(TIEHRPWM_AQCSFRC_CSFA_MASK, 2) +#define TIEHRPWM_AQCSFRC_CSFA_DISSWFRC FIELD_PREP(TIEHRPWM_AQCSFRC_CSFA_MASK, 3) #define TIEHRPWM_NUM_PWM_CHANNEL 2 /* EHRPWM channels */ -- 2.43.0
Powered by blists - more mailing lists