| Message ID | 20210412113457.328012-14-tomi.valkeinen@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: ti-vpe: cal: prepare for multistream support | expand |
Hi Tomi, Thank you for the patch. On Mon, Apr 12, 2021 at 02:34:42PM +0300, Tomi Valkeinen wrote: > The macros related to CAL_CSI2_VC_IRQ can be handled better by having > the VC number as a macro parameter. > > Note that the macros are not used anywhere yet, so no other changes are > needed. > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> > --- > drivers/media/platform/ti-vpe/cal_regs.h | 30 +++++------------------- > 1 file changed, 6 insertions(+), 24 deletions(-) > > diff --git a/drivers/media/platform/ti-vpe/cal_regs.h b/drivers/media/platform/ti-vpe/cal_regs.h > index 93d9bf1f3c00..ed658175a444 100644 > --- a/drivers/media/platform/ti-vpe/cal_regs.h > +++ b/drivers/media/platform/ti-vpe/cal_regs.h > @@ -406,30 +406,12 @@ > #define CAL_CSI2_TIMING_STOP_STATE_X16_IO1_MASK BIT(14) > #define CAL_CSI2_TIMING_FORCE_RX_MODE_IO1_MASK BIT(15) > > -#define CAL_CSI2_VC_IRQ_FS_IRQ_0_MASK BIT(0) > -#define CAL_CSI2_VC_IRQ_FE_IRQ_0_MASK BIT(1) > -#define CAL_CSI2_VC_IRQ_LS_IRQ_0_MASK BIT(2) > -#define CAL_CSI2_VC_IRQ_LE_IRQ_0_MASK BIT(3) > -#define CAL_CSI2_VC_IRQ_CS_IRQ_0_MASK BIT(4) > -#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_0_MASK BIT(5) > -#define CAL_CSI2_VC_IRQ_FS_IRQ_1_MASK BIT(8) > -#define CAL_CSI2_VC_IRQ_FE_IRQ_1_MASK BIT(9) > -#define CAL_CSI2_VC_IRQ_LS_IRQ_1_MASK BIT(10) > -#define CAL_CSI2_VC_IRQ_LE_IRQ_1_MASK BIT(11) > -#define CAL_CSI2_VC_IRQ_CS_IRQ_1_MASK BIT(12) > -#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_1_MASK BIT(13) > -#define CAL_CSI2_VC_IRQ_FS_IRQ_2_MASK BIT(16) > -#define CAL_CSI2_VC_IRQ_FE_IRQ_2_MASK BIT(17) > -#define CAL_CSI2_VC_IRQ_LS_IRQ_2_MASK BIT(18) > -#define CAL_CSI2_VC_IRQ_LE_IRQ_2_MASK BIT(19) > -#define CAL_CSI2_VC_IRQ_CS_IRQ_2_MASK BIT(20) > -#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_2_MASK BIT(21) > -#define CAL_CSI2_VC_IRQ_FS_IRQ_3_MASK BIT(24) > -#define CAL_CSI2_VC_IRQ_FE_IRQ_3_MASK BIT(25) > -#define CAL_CSI2_VC_IRQ_LS_IRQ_3_MASK BIT(26) > -#define CAL_CSI2_VC_IRQ_LE_IRQ_3_MASK BIT(27) > -#define CAL_CSI2_VC_IRQ_CS_IRQ_3_MASK BIT(28) > -#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_3_MASK BIT(29) > +#define CAL_CSI2_VC_IRQ_FS_IRQ_MASK(n) BIT(0 + (n * 8)) This should be BIT(0 + (n) * 8). Same below. As they're single bits, I would have dropped the _MASK suffix. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > +#define CAL_CSI2_VC_IRQ_FE_IRQ_MASK(n) BIT(1 + (n * 8)) > +#define CAL_CSI2_VC_IRQ_LS_IRQ_MASK(n) BIT(2 + (n * 8)) > +#define CAL_CSI2_VC_IRQ_LE_IRQ_MASK(n) BIT(3 + (n * 8)) > +#define CAL_CSI2_VC_IRQ_CS_IRQ_MASK(n) BIT(4 + (n * 8)) > +#define CAL_CSI2_VC_IRQ_ECC_CORRECTION_IRQ_MASK(n) BIT(5 + (n * 8)) > > #define CAL_CSI2_CTX_DT_MASK GENMASK(5, 0) > #define CAL_CSI2_CTX_VC_MASK GENMASK(7, 6)
On 18/04/2021 15:32, Laurent Pinchart wrote: > Hi Tomi, > > Thank you for the patch. > > On Mon, Apr 12, 2021 at 02:34:42PM +0300, Tomi Valkeinen wrote: >> The macros related to CAL_CSI2_VC_IRQ can be handled better by having >> the VC number as a macro parameter. >> >> Note that the macros are not used anywhere yet, so no other changes are >> needed. >> >> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> >> --- >> drivers/media/platform/ti-vpe/cal_regs.h | 30 +++++------------------- >> 1 file changed, 6 insertions(+), 24 deletions(-) >> >> diff --git a/drivers/media/platform/ti-vpe/cal_regs.h b/drivers/media/platform/ti-vpe/cal_regs.h >> index 93d9bf1f3c00..ed658175a444 100644 >> --- a/drivers/media/platform/ti-vpe/cal_regs.h >> +++ b/drivers/media/platform/ti-vpe/cal_regs.h >> @@ -406,30 +406,12 @@ >> #define CAL_CSI2_TIMING_STOP_STATE_X16_IO1_MASK BIT(14) >> #define CAL_CSI2_TIMING_FORCE_RX_MODE_IO1_MASK BIT(15) >> >> -#define CAL_CSI2_VC_IRQ_FS_IRQ_0_MASK BIT(0) >> -#define CAL_CSI2_VC_IRQ_FE_IRQ_0_MASK BIT(1) >> -#define CAL_CSI2_VC_IRQ_LS_IRQ_0_MASK BIT(2) >> -#define CAL_CSI2_VC_IRQ_LE_IRQ_0_MASK BIT(3) >> -#define CAL_CSI2_VC_IRQ_CS_IRQ_0_MASK BIT(4) >> -#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_0_MASK BIT(5) >> -#define CAL_CSI2_VC_IRQ_FS_IRQ_1_MASK BIT(8) >> -#define CAL_CSI2_VC_IRQ_FE_IRQ_1_MASK BIT(9) >> -#define CAL_CSI2_VC_IRQ_LS_IRQ_1_MASK BIT(10) >> -#define CAL_CSI2_VC_IRQ_LE_IRQ_1_MASK BIT(11) >> -#define CAL_CSI2_VC_IRQ_CS_IRQ_1_MASK BIT(12) >> -#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_1_MASK BIT(13) >> -#define CAL_CSI2_VC_IRQ_FS_IRQ_2_MASK BIT(16) >> -#define CAL_CSI2_VC_IRQ_FE_IRQ_2_MASK BIT(17) >> -#define CAL_CSI2_VC_IRQ_LS_IRQ_2_MASK BIT(18) >> -#define CAL_CSI2_VC_IRQ_LE_IRQ_2_MASK BIT(19) >> -#define CAL_CSI2_VC_IRQ_CS_IRQ_2_MASK BIT(20) >> -#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_2_MASK BIT(21) >> -#define CAL_CSI2_VC_IRQ_FS_IRQ_3_MASK BIT(24) >> -#define CAL_CSI2_VC_IRQ_FE_IRQ_3_MASK BIT(25) >> -#define CAL_CSI2_VC_IRQ_LS_IRQ_3_MASK BIT(26) >> -#define CAL_CSI2_VC_IRQ_LE_IRQ_3_MASK BIT(27) >> -#define CAL_CSI2_VC_IRQ_CS_IRQ_3_MASK BIT(28) >> -#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_3_MASK BIT(29) >> +#define CAL_CSI2_VC_IRQ_FS_IRQ_MASK(n) BIT(0 + (n * 8)) > > This should be BIT(0 + (n) * 8). Same below. > > As they're single bits, I would have dropped the _MASK suffix. All the BIT(x) macros use _MASK suffix in the driver. Tomi
diff --git a/drivers/media/platform/ti-vpe/cal_regs.h b/drivers/media/platform/ti-vpe/cal_regs.h index 93d9bf1f3c00..ed658175a444 100644 --- a/drivers/media/platform/ti-vpe/cal_regs.h +++ b/drivers/media/platform/ti-vpe/cal_regs.h @@ -406,30 +406,12 @@ #define CAL_CSI2_TIMING_STOP_STATE_X16_IO1_MASK BIT(14) #define CAL_CSI2_TIMING_FORCE_RX_MODE_IO1_MASK BIT(15) -#define CAL_CSI2_VC_IRQ_FS_IRQ_0_MASK BIT(0) -#define CAL_CSI2_VC_IRQ_FE_IRQ_0_MASK BIT(1) -#define CAL_CSI2_VC_IRQ_LS_IRQ_0_MASK BIT(2) -#define CAL_CSI2_VC_IRQ_LE_IRQ_0_MASK BIT(3) -#define CAL_CSI2_VC_IRQ_CS_IRQ_0_MASK BIT(4) -#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_0_MASK BIT(5) -#define CAL_CSI2_VC_IRQ_FS_IRQ_1_MASK BIT(8) -#define CAL_CSI2_VC_IRQ_FE_IRQ_1_MASK BIT(9) -#define CAL_CSI2_VC_IRQ_LS_IRQ_1_MASK BIT(10) -#define CAL_CSI2_VC_IRQ_LE_IRQ_1_MASK BIT(11) -#define CAL_CSI2_VC_IRQ_CS_IRQ_1_MASK BIT(12) -#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_1_MASK BIT(13) -#define CAL_CSI2_VC_IRQ_FS_IRQ_2_MASK BIT(16) -#define CAL_CSI2_VC_IRQ_FE_IRQ_2_MASK BIT(17) -#define CAL_CSI2_VC_IRQ_LS_IRQ_2_MASK BIT(18) -#define CAL_CSI2_VC_IRQ_LE_IRQ_2_MASK BIT(19) -#define CAL_CSI2_VC_IRQ_CS_IRQ_2_MASK BIT(20) -#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_2_MASK BIT(21) -#define CAL_CSI2_VC_IRQ_FS_IRQ_3_MASK BIT(24) -#define CAL_CSI2_VC_IRQ_FE_IRQ_3_MASK BIT(25) -#define CAL_CSI2_VC_IRQ_LS_IRQ_3_MASK BIT(26) -#define CAL_CSI2_VC_IRQ_LE_IRQ_3_MASK BIT(27) -#define CAL_CSI2_VC_IRQ_CS_IRQ_3_MASK BIT(28) -#define CAL_CSI2_VC_IRQ_ECC_CORRECTION0_IRQ_3_MASK BIT(29) +#define CAL_CSI2_VC_IRQ_FS_IRQ_MASK(n) BIT(0 + (n * 8)) +#define CAL_CSI2_VC_IRQ_FE_IRQ_MASK(n) BIT(1 + (n * 8)) +#define CAL_CSI2_VC_IRQ_LS_IRQ_MASK(n) BIT(2 + (n * 8)) +#define CAL_CSI2_VC_IRQ_LE_IRQ_MASK(n) BIT(3 + (n * 8)) +#define CAL_CSI2_VC_IRQ_CS_IRQ_MASK(n) BIT(4 + (n * 8)) +#define CAL_CSI2_VC_IRQ_ECC_CORRECTION_IRQ_MASK(n) BIT(5 + (n * 8)) #define CAL_CSI2_CTX_DT_MASK GENMASK(5, 0) #define CAL_CSI2_CTX_VC_MASK GENMASK(7, 6)
The macros related to CAL_CSI2_VC_IRQ can be handled better by having the VC number as a macro parameter. Note that the macros are not used anywhere yet, so no other changes are needed. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> --- drivers/media/platform/ti-vpe/cal_regs.h | 30 +++++------------------- 1 file changed, 6 insertions(+), 24 deletions(-)