* [PATCH] staging: media: atomisp: Use BIT macro instead of left shifting
@ 2022-01-29 11:38 Moses Christopher Bollavarapu
2022-01-29 16:35 ` Andy Shevchenko
2022-01-29 16:36 ` [PATCH] " Joe Perches
0 siblings, 2 replies; 9+ messages in thread
From: Moses Christopher Bollavarapu @ 2022-01-29 11:38 UTC (permalink / raw)
To: linux-media, linux-staging, linux-kernel
Cc: Moses Christopher Bollavarapu, Mauro Carvalho Chehab,
Sakari Ailus, Greg Kroah-Hartman, Hans Verkuil, Yizhuo,
Laurent Pinchart, Tomi Valkeinen, Colin Ian King, Kaixu Xia,
Baokun Li, Andy Shevchenko, Aditya Srivastava,
Aline Santana Cordeiro, Tsuchiya Yuto, Yang Yingliang, Alan,
Souptick Joarder, Dan Carpenter, Masahiro Yamada,
Alexey Dobriyan, Ard Biesheuvel, Rafael J. Wysocki
There is a BIT(nr) macro available in Linux Kernel,
which does the same thing.
Example: BIT(7) = (1UL << 7)
Signed-off-by: Moses Christopher Bollavarapu <mosescb.dev@gmail.com>
---
.../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 2 +-
.../media/atomisp/pci/atomisp_compat_css20.c | 6 +-
.../staging/media/atomisp/pci/atomisp_v4l2.c | 20 ++---
.../staging/media/atomisp/pci/hmm/hmm_bo.c | 2 +-
.../media/atomisp/pci/ia_css_acc_types.h | 4 +-
.../staging/media/atomisp/pci/ia_css_env.h | 8 +-
.../media/atomisp/pci/ia_css_event_public.h | 32 ++++----
.../staging/media/atomisp/pci/ia_css_irq.h | 76 +++++++++----------
.../runtime/debug/interface/ia_css_debug.h | 30 ++++----
9 files changed, 90 insertions(+), 90 deletions(-)
diff --git a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
index 6c95f57a52e9..f04683eb3061 100644
--- a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
+++ b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
@@ -548,7 +548,7 @@ static long __ov5693_set_exposure(struct v4l2_subdev *sd, int coarse_itg,
* The way is to write coarse_itg/2 to the reg, meanwhile write 2*hts
* to the reg.
*/
- if (coarse_itg > (1 << 15)) {
+ if (coarse_itg > BIT(15)) {
hts = hts * 2;
coarse_itg = (int)coarse_itg / 2;
}
diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
index 1173be0e72b0..9e1e8ea61e32 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
@@ -1913,11 +1913,11 @@ void atomisp_css_input_set_mode(struct atomisp_sub_device *asd,
&asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL].stream_config;
s_config->mode = IA_CSS_INPUT_MODE_TPG;
s_config->source.tpg.mode = IA_CSS_TPG_MODE_CHECKERBOARD;
- s_config->source.tpg.x_mask = (1 << 4) - 1;
+ s_config->source.tpg.x_mask = BIT(4) - 1;
s_config->source.tpg.x_delta = -2;
- s_config->source.tpg.y_mask = (1 << 4) - 1;
+ s_config->source.tpg.y_mask = BIT(4) - 1;
s_config->source.tpg.y_delta = 3;
- s_config->source.tpg.xy_mask = (1 << 8) - 1;
+ s_config->source.tpg.xy_mask = BIT(8) - 1;
return;
}
diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
index 1b240891a6e2..9f0063eb6e3a 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
@@ -626,11 +626,11 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)
* IRQ, if so, waiting for it to be served
*/
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- irq = irq & 1 << INTR_IIR;
+ irq = irq & BIT(INTR_IIR);
pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- if (!(irq & (1 << INTR_IIR)))
+ if (!(irq & BIT(INTR_IIR)))
goto done;
atomisp_css2_hw_store_32(MRFLD_INTR_CLEAR_REG, 0xFFFFFFFF);
@@ -643,11 +643,11 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)
return -EAGAIN;
} else {
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- irq = irq & 1 << INTR_IIR;
+ irq = irq & BIT(INTR_IIR);
pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- if (!(irq & (1 << INTR_IIR))) {
+ if (!(irq & BIT(INTR_IIR))) {
atomisp_css2_hw_store_32(MRFLD_INTR_ENABLE_REG, 0x0);
goto done;
}
@@ -666,7 +666,7 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)
* HW sighting:4568410.
*/
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- irq &= ~(1 << INTR_IER);
+ irq &= ~BIT(INTR_IER);
pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
atomisp_msi_irq_uninit(isp);
@@ -682,7 +682,7 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)
*/
static void punit_ddr_dvfs_enable(bool enable)
{
- int door_bell = 1 << 8;
+ int door_bell = BIT(8);
int max_wait = 30;
int reg;
@@ -1549,7 +1549,7 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
start = pci_resource_start(pdev, ATOM_ISP_PCI_BAR);
dev_dbg(&pdev->dev, "start: 0x%x\n", start);
- err = pcim_iomap_regions(pdev, 1 << ATOM_ISP_PCI_BAR, pci_name(pdev));
+ err = pcim_iomap_regions(pdev, BIT(ATOM_ISP_PCI_BAR), pci_name(pdev));
if (err) {
dev_err(&pdev->dev, "Failed to I/O memory remapping (%d)\n", err);
goto ioremap_fail;
@@ -1838,11 +1838,11 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
*/
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- irq = irq & 1 << INTR_IIR;
+ irq = irq & BIT(INTR_IIR);
pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- irq &= ~(1 << INTR_IER);
+ irq &= ~BIT(INTR_IER);
pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
atomisp_msi_irq_uninit(isp);
@@ -1854,7 +1854,7 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
dev_err(&pdev->dev, "Failed to switch off ISP\n");
atomisp_dev_alloc_fail:
- pcim_iounmap_regions(pdev, 1 << ATOM_ISP_PCI_BAR);
+ pcim_iounmap_regions(pdev, BIT(ATOM_ISP_PCI_BAR));
ioremap_fail:
return err;
diff --git a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
index 0168f9839c90..1028ce5a72e9 100644
--- a/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
+++ b/drivers/staging/media/atomisp/pci/hmm/hmm_bo.c
@@ -1116,7 +1116,7 @@ int hmm_bo_bind(struct hmm_buffer_object *bo)
page_to_phys(bo->page_obj[i].page), 1);
if (ret)
goto map_err;
- virt += (1 << PAGE_SHIFT);
+ virt += BIT(PAGE_SHIFT);
}
/*
diff --git a/drivers/staging/media/atomisp/pci/ia_css_acc_types.h b/drivers/staging/media/atomisp/pci/ia_css_acc_types.h
index d0ce2f8ba653..032cd368ca86 100644
--- a/drivers/staging/media/atomisp/pci/ia_css_acc_types.h
+++ b/drivers/staging/media/atomisp/pci/ia_css_acc_types.h
@@ -466,7 +466,7 @@ struct ia_css_acc_fw {
enum ia_css_sp_sleep_mode {
SP_DISABLE_SLEEP_MODE = 0,
- SP_SLEEP_AFTER_FRAME = 1 << 0,
- SP_SLEEP_AFTER_IRQ = 1 << 1
+ SP_SLEEP_AFTER_FRAME = BIT(0),
+ SP_SLEEP_AFTER_IRQ = BIT(1)
};
#endif /* _IA_CSS_ACC_TYPES_H */
diff --git a/drivers/staging/media/atomisp/pci/ia_css_env.h b/drivers/staging/media/atomisp/pci/ia_css_env.h
index 3b89bbd837a0..9decec3a8e1d 100644
--- a/drivers/staging/media/atomisp/pci/ia_css_env.h
+++ b/drivers/staging/media/atomisp/pci/ia_css_env.h
@@ -28,10 +28,10 @@
/* Memory allocation attributes, for use in ia_css_css_mem_env. */
enum ia_css_mem_attr {
- IA_CSS_MEM_ATTR_CACHED = 1 << 0,
- IA_CSS_MEM_ATTR_ZEROED = 1 << 1,
- IA_CSS_MEM_ATTR_PAGEALIGN = 1 << 2,
- IA_CSS_MEM_ATTR_CONTIGUOUS = 1 << 3,
+ IA_CSS_MEM_ATTR_CACHED = BIT(0),
+ IA_CSS_MEM_ATTR_ZEROED = BIT(1),
+ IA_CSS_MEM_ATTR_PAGEALIGN = BIT(2),
+ IA_CSS_MEM_ATTR_CONTIGUOUS = BIT(3),
};
/* Environment with function pointers for local IA memory allocation.
diff --git a/drivers/staging/media/atomisp/pci/ia_css_event_public.h b/drivers/staging/media/atomisp/pci/ia_css_event_public.h
index 76219d741d2e..5d812c695d7d 100644
--- a/drivers/staging/media/atomisp/pci/ia_css_event_public.h
+++ b/drivers/staging/media/atomisp/pci/ia_css_event_public.h
@@ -35,38 +35,38 @@
* 4) "enum ia_css_event_type convert_event_sp_to_host_domain" (sh_css.c)
*/
enum ia_css_event_type {
- IA_CSS_EVENT_TYPE_OUTPUT_FRAME_DONE = 1 << 0,
+ IA_CSS_EVENT_TYPE_OUTPUT_FRAME_DONE = BIT(0),
/** Output frame ready. */
- IA_CSS_EVENT_TYPE_SECOND_OUTPUT_FRAME_DONE = 1 << 1,
+ IA_CSS_EVENT_TYPE_SECOND_OUTPUT_FRAME_DONE = BIT(1),
/** Second output frame ready. */
- IA_CSS_EVENT_TYPE_VF_OUTPUT_FRAME_DONE = 1 << 2,
+ IA_CSS_EVENT_TYPE_VF_OUTPUT_FRAME_DONE = BIT(2),
/** Viewfinder Output frame ready. */
- IA_CSS_EVENT_TYPE_SECOND_VF_OUTPUT_FRAME_DONE = 1 << 3,
+ IA_CSS_EVENT_TYPE_SECOND_VF_OUTPUT_FRAME_DONE = BIT(3),
/** Second viewfinder Output frame ready. */
- IA_CSS_EVENT_TYPE_3A_STATISTICS_DONE = 1 << 4,
+ IA_CSS_EVENT_TYPE_3A_STATISTICS_DONE = BIT(4),
/** Indication that 3A statistics are available. */
- IA_CSS_EVENT_TYPE_DIS_STATISTICS_DONE = 1 << 5,
+ IA_CSS_EVENT_TYPE_DIS_STATISTICS_DONE = BIT(5),
/** Indication that DIS statistics are available. */
- IA_CSS_EVENT_TYPE_PIPELINE_DONE = 1 << 6,
+ IA_CSS_EVENT_TYPE_PIPELINE_DONE = BIT(6),
/** Pipeline Done event, sent after last pipeline stage. */
- IA_CSS_EVENT_TYPE_FRAME_TAGGED = 1 << 7,
+ IA_CSS_EVENT_TYPE_FRAME_TAGGED = BIT(7),
/** Frame tagged. */
- IA_CSS_EVENT_TYPE_INPUT_FRAME_DONE = 1 << 8,
+ IA_CSS_EVENT_TYPE_INPUT_FRAME_DONE = BIT(8),
/** Input frame ready. */
- IA_CSS_EVENT_TYPE_METADATA_DONE = 1 << 9,
+ IA_CSS_EVENT_TYPE_METADATA_DONE = BIT(9),
/** Metadata ready. */
- IA_CSS_EVENT_TYPE_LACE_STATISTICS_DONE = 1 << 10,
+ IA_CSS_EVENT_TYPE_LACE_STATISTICS_DONE = BIT(10),
/** Indication that LACE statistics are available. */
- IA_CSS_EVENT_TYPE_ACC_STAGE_COMPLETE = 1 << 11,
+ IA_CSS_EVENT_TYPE_ACC_STAGE_COMPLETE = BIT(11),
/** Extension stage complete. */
- IA_CSS_EVENT_TYPE_TIMER = 1 << 12,
+ IA_CSS_EVENT_TYPE_TIMER = BIT(12),
/** Timer event for measuring the SP side latencies. It contains the
32-bit timer value from the SP */
- IA_CSS_EVENT_TYPE_PORT_EOF = 1 << 13,
+ IA_CSS_EVENT_TYPE_PORT_EOF = BIT(13),
/** End Of Frame event, sent when in buffered sensor mode. */
- IA_CSS_EVENT_TYPE_FW_WARNING = 1 << 14,
+ IA_CSS_EVENT_TYPE_FW_WARNING = BIT(14),
/** Performance warning encounter by FW */
- IA_CSS_EVENT_TYPE_FW_ASSERT = 1 << 15,
+ IA_CSS_EVENT_TYPE_FW_ASSERT = BIT(15),
/** Assertion hit by FW */
};
diff --git a/drivers/staging/media/atomisp/pci/ia_css_irq.h b/drivers/staging/media/atomisp/pci/ia_css_irq.h
index 3b81a39cfe97..3c52c7a1ed2a 100644
--- a/drivers/staging/media/atomisp/pci/ia_css_irq.h
+++ b/drivers/staging/media/atomisp/pci/ia_css_irq.h
@@ -46,49 +46,49 @@ enum ia_css_irq_type {
* (SW) interrupts
*/
enum ia_css_irq_info {
- IA_CSS_IRQ_INFO_CSS_RECEIVER_ERROR = 1 << 0,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_ERROR = BIT(0),
/** the css receiver has encountered an error */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_FIFO_OVERFLOW = 1 << 1,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_FIFO_OVERFLOW = BIT(1),
/** the FIFO in the csi receiver has overflown */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_SOF = 1 << 2,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_SOF = BIT(2),
/** the css receiver received the start of frame */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_EOF = 1 << 3,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_EOF = BIT(3),
/** the css receiver received the end of frame */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_SOL = 1 << 4,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_SOL = BIT(4),
/** the css receiver received the start of line */
- IA_CSS_IRQ_INFO_EVENTS_READY = 1 << 5,
+ IA_CSS_IRQ_INFO_EVENTS_READY = BIT(5),
/** One or more events are available in the PSYS event queue */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_EOL = 1 << 6,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_EOL = BIT(6),
/** the css receiver received the end of line */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_SIDEBAND_CHANGED = 1 << 7,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_SIDEBAND_CHANGED = BIT(7),
/** the css receiver received a change in side band signals */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_GEN_SHORT_0 = 1 << 8,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_GEN_SHORT_0 = BIT(8),
/** generic short packets (0) */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_GEN_SHORT_1 = 1 << 9,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_GEN_SHORT_1 = BIT(9),
/** generic short packets (1) */
- IA_CSS_IRQ_INFO_IF_PRIM_ERROR = 1 << 10,
+ IA_CSS_IRQ_INFO_IF_PRIM_ERROR = BIT(10),
/** the primary input formatter (A) has encountered an error */
- IA_CSS_IRQ_INFO_IF_PRIM_B_ERROR = 1 << 11,
+ IA_CSS_IRQ_INFO_IF_PRIM_B_ERROR = BIT(11),
/** the primary input formatter (B) has encountered an error */
- IA_CSS_IRQ_INFO_IF_SEC_ERROR = 1 << 12,
+ IA_CSS_IRQ_INFO_IF_SEC_ERROR = BIT(12),
/** the secondary input formatter has encountered an error */
- IA_CSS_IRQ_INFO_STREAM_TO_MEM_ERROR = 1 << 13,
+ IA_CSS_IRQ_INFO_STREAM_TO_MEM_ERROR = BIT(13),
/** the stream-to-memory device has encountered an error */
- IA_CSS_IRQ_INFO_SW_0 = 1 << 14,
+ IA_CSS_IRQ_INFO_SW_0 = BIT(14),
/** software interrupt 0 */
- IA_CSS_IRQ_INFO_SW_1 = 1 << 15,
+ IA_CSS_IRQ_INFO_SW_1 = BIT(15),
/** software interrupt 1 */
- IA_CSS_IRQ_INFO_SW_2 = 1 << 16,
+ IA_CSS_IRQ_INFO_SW_2 = BIT(16),
/** software interrupt 2 */
- IA_CSS_IRQ_INFO_ISP_BINARY_STATISTICS_READY = 1 << 17,
+ IA_CSS_IRQ_INFO_ISP_BINARY_STATISTICS_READY = BIT(17),
/** ISP binary statistics are ready */
- IA_CSS_IRQ_INFO_INPUT_SYSTEM_ERROR = 1 << 18,
+ IA_CSS_IRQ_INFO_INPUT_SYSTEM_ERROR = BIT(18),
/** the input system in in error */
- IA_CSS_IRQ_INFO_IF_ERROR = 1 << 19,
+ IA_CSS_IRQ_INFO_IF_ERROR = BIT(19),
/** the input formatter in in error */
- IA_CSS_IRQ_INFO_DMA_ERROR = 1 << 20,
+ IA_CSS_IRQ_INFO_DMA_ERROR = BIT(20),
/** the dma in in error */
- IA_CSS_IRQ_INFO_ISYS_EVENTS_READY = 1 << 21,
+ IA_CSS_IRQ_INFO_ISYS_EVENTS_READY = BIT(21),
/** end-of-frame events are ready in the isys_event queue */
};
@@ -103,23 +103,23 @@ enum ia_css_irq_info {
* different receiver types, or possibly none in case of tests systems.
*/
enum ia_css_rx_irq_info {
- IA_CSS_RX_IRQ_INFO_BUFFER_OVERRUN = 1U << 0, /** buffer overrun */
- IA_CSS_RX_IRQ_INFO_ENTER_SLEEP_MODE = 1U << 1, /** entering sleep mode */
- IA_CSS_RX_IRQ_INFO_EXIT_SLEEP_MODE = 1U << 2, /** exited sleep mode */
- IA_CSS_RX_IRQ_INFO_ECC_CORRECTED = 1U << 3, /** ECC corrected */
- IA_CSS_RX_IRQ_INFO_ERR_SOT = 1U << 4,
+ IA_CSS_RX_IRQ_INFO_BUFFER_OVERRUN = BIT(0), /** buffer overrun */
+ IA_CSS_RX_IRQ_INFO_ENTER_SLEEP_MODE = BIT(1), /** entering sleep mode */
+ IA_CSS_RX_IRQ_INFO_EXIT_SLEEP_MODE = BIT(2), /** exited sleep mode */
+ IA_CSS_RX_IRQ_INFO_ECC_CORRECTED = BIT(3), /** ECC corrected */
+ IA_CSS_RX_IRQ_INFO_ERR_SOT = BIT(4),
/** Start of transmission */
- IA_CSS_RX_IRQ_INFO_ERR_SOT_SYNC = 1U << 5, /** SOT sync (??) */
- IA_CSS_RX_IRQ_INFO_ERR_CONTROL = 1U << 6, /** Control (??) */
- IA_CSS_RX_IRQ_INFO_ERR_ECC_DOUBLE = 1U << 7, /** Double ECC */
- IA_CSS_RX_IRQ_INFO_ERR_CRC = 1U << 8, /** CRC error */
- IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ID = 1U << 9, /** Unknown ID */
- IA_CSS_RX_IRQ_INFO_ERR_FRAME_SYNC = 1U << 10,/** Frame sync error */
- IA_CSS_RX_IRQ_INFO_ERR_FRAME_DATA = 1U << 11,/** Frame data error */
- IA_CSS_RX_IRQ_INFO_ERR_DATA_TIMEOUT = 1U << 12,/** Timeout occurred */
- IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ESC = 1U << 13,/** Unknown escape seq. */
- IA_CSS_RX_IRQ_INFO_ERR_LINE_SYNC = 1U << 14,/** Line Sync error */
- IA_CSS_RX_IRQ_INFO_INIT_TIMEOUT = 1U << 15,
+ IA_CSS_RX_IRQ_INFO_ERR_SOT_SYNC = BIT(5), /** SOT sync (??) */
+ IA_CSS_RX_IRQ_INFO_ERR_CONTROL = BIT(6), /** Control (??) */
+ IA_CSS_RX_IRQ_INFO_ERR_ECC_DOUBLE = BIT(7), /** Double ECC */
+ IA_CSS_RX_IRQ_INFO_ERR_CRC = BIT(8), /** CRC error */
+ IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ID = BIT(9), /** Unknown ID */
+ IA_CSS_RX_IRQ_INFO_ERR_FRAME_SYNC = BIT(10),/** Frame sync error */
+ IA_CSS_RX_IRQ_INFO_ERR_FRAME_DATA = BIT(11),/** Frame data error */
+ IA_CSS_RX_IRQ_INFO_ERR_DATA_TIMEOUT = BIT(12),/** Timeout occurred */
+ IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ESC = BIT(13),/** Unknown escape seq. */
+ IA_CSS_RX_IRQ_INFO_ERR_LINE_SYNC = BIT(14),/** Line Sync error */
+ IA_CSS_RX_IRQ_INFO_INIT_TIMEOUT = BIT(15),
};
/* Interrupt info structure. This structure contains information about an
diff --git a/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h b/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h
index e37ef4232c55..2477032d9f54 100644
--- a/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h
+++ b/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h
@@ -53,21 +53,21 @@ extern int dbg_level;
* Values can be combined to dump a combination of sets.
*/
enum ia_css_debug_enable_param_dump {
- IA_CSS_DEBUG_DUMP_FPN = 1 << 0, /** FPN table */
- IA_CSS_DEBUG_DUMP_OB = 1 << 1, /** OB table */
- IA_CSS_DEBUG_DUMP_SC = 1 << 2, /** Shading table */
- IA_CSS_DEBUG_DUMP_WB = 1 << 3, /** White balance */
- IA_CSS_DEBUG_DUMP_DP = 1 << 4, /** Defect Pixel */
- IA_CSS_DEBUG_DUMP_BNR = 1 << 5, /** Bayer Noise Reductions */
- IA_CSS_DEBUG_DUMP_S3A = 1 << 6, /** 3A Statistics */
- IA_CSS_DEBUG_DUMP_DE = 1 << 7, /** De Mosaicing */
- IA_CSS_DEBUG_DUMP_YNR = 1 << 8, /** Luma Noise Reduction */
- IA_CSS_DEBUG_DUMP_CSC = 1 << 9, /** Color Space Conversion */
- IA_CSS_DEBUG_DUMP_GC = 1 << 10, /** Gamma Correction */
- IA_CSS_DEBUG_DUMP_TNR = 1 << 11, /** Temporal Noise Reduction */
- IA_CSS_DEBUG_DUMP_ANR = 1 << 12, /** Advanced Noise Reduction */
- IA_CSS_DEBUG_DUMP_CE = 1 << 13, /** Chroma Enhancement */
- IA_CSS_DEBUG_DUMP_ALL = 1 << 14 /** Dump all device parameters */
+ IA_CSS_DEBUG_DUMP_FPN = BIT(0), /** FPN table */
+ IA_CSS_DEBUG_DUMP_OB = BIT(1), /** OB table */
+ IA_CSS_DEBUG_DUMP_SC = BIT(2), /** Shading table */
+ IA_CSS_DEBUG_DUMP_WB = BIT(3), /** White balance */
+ IA_CSS_DEBUG_DUMP_DP = BIT(4), /** Defect Pixel */
+ IA_CSS_DEBUG_DUMP_BNR = BIT(5), /** Bayer Noise Reductions */
+ IA_CSS_DEBUG_DUMP_S3A = BIT(6), /** 3A Statistics */
+ IA_CSS_DEBUG_DUMP_DE = BIT(7), /** De Mosaicing */
+ IA_CSS_DEBUG_DUMP_YNR = BIT(8), /** Luma Noise Reduction */
+ IA_CSS_DEBUG_DUMP_CSC = BIT(9), /** Color Space Conversion */
+ IA_CSS_DEBUG_DUMP_GC = BIT(10), /** Gamma Correction */
+ IA_CSS_DEBUG_DUMP_TNR = BIT(11), /** Temporal Noise Reduction */
+ IA_CSS_DEBUG_DUMP_ANR = BIT(12), /** Advanced Noise Reduction */
+ IA_CSS_DEBUG_DUMP_CE = BIT(13), /** Chroma Enhancement */
+ IA_CSS_DEBUG_DUMP_ALL = BIT(14) /** Dump all device parameters */
};
#define IA_CSS_ERROR(fmt, ...) \
--
2.30.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] staging: media: atomisp: Use BIT macro instead of left shifting
2022-01-29 11:38 [PATCH] staging: media: atomisp: Use BIT macro instead of left shifting Moses Christopher Bollavarapu
@ 2022-01-29 16:35 ` Andy Shevchenko
2022-01-30 18:06 ` [PATCH v2] " Moses Christopher Bollavarapu
2022-01-29 16:36 ` [PATCH] " Joe Perches
1 sibling, 1 reply; 9+ messages in thread
From: Andy Shevchenko @ 2022-01-29 16:35 UTC (permalink / raw)
To: Moses Christopher Bollavarapu
Cc: linux-media, linux-staging, linux-kernel, Mauro Carvalho Chehab,
Sakari Ailus, Greg Kroah-Hartman, Laurent Pinchart,
Tomi Valkeinen, Tsuchiya Yuto
On Sat, Jan 29, 2022 at 12:38:04PM +0100, Moses Christopher Bollavarapu wrote:
It's a bit too many people in Cc list (I dropped more than a half in this reply).
I would suggest to use my script [1] or look into it for a hint how to reduce it.
[1]: https://github.com/andy-shev/home-bin-tools/blob/master/ge2maintainer.sh
> There is a BIT(nr) macro available in Linux Kernel,
> which does the same thing.
In some cases it might fix a (theoretical) UB issue.
> Example: BIT(7) = (1UL << 7)
...
> + s_config->source.tpg.x_mask = BIT(4) - 1;
> + s_config->source.tpg.y_mask = BIT(4) - 1;
> + s_config->source.tpg.xy_mask = BIT(8) - 1;
For masks you may use GENMASK().
...
> - irq = irq & 1 << INTR_IIR;
> + irq = irq & BIT(INTR_IIR);
It may be:
irq &= BIT(...);
...
> - irq = irq & 1 << INTR_IIR;
> + irq = irq & BIT(INTR_IIR);
Ditto.
...
> - virt += (1 << PAGE_SHIFT);
> + virt += BIT(PAGE_SHIFT);
This is weird. Shouldn't be as simple as
virt += PAGE_SIZE;
?
...
> enum ia_css_sp_sleep_mode {
> SP_DISABLE_SLEEP_MODE = 0,
> - SP_SLEEP_AFTER_FRAME = 1 << 0,
> - SP_SLEEP_AFTER_IRQ = 1 << 1
> + SP_SLEEP_AFTER_FRAME = BIT(0),
> + SP_SLEEP_AFTER_IRQ = BIT(1)
While at it, add a comma here.
> };
...
> + IA_CSS_DEBUG_DUMP_ALL = BIT(14) /** Dump all device parameters */
Ditto.
...
On top of this don't forget to add
#include <linux/bits.h>
to the modified header files.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v2] staging: media: atomisp: Use BIT macro instead of left shifting
2022-01-29 16:35 ` Andy Shevchenko
@ 2022-01-30 18:06 ` Moses Christopher Bollavarapu
2022-01-31 7:36 ` Dan Carpenter
2022-02-06 18:52 ` [PATCH v3] " Moses Christopher Bollavarapu
0 siblings, 2 replies; 9+ messages in thread
From: Moses Christopher Bollavarapu @ 2022-01-30 18:06 UTC (permalink / raw)
To: andriy.shevchenko
Cc: gregkh, kitakar, laurent.pinchart, linux-kernel, linux-media,
linux-staging, mchehab, mosescb.dev, sakari.ailus,
tomi.valkeinen, joe
There is a BIT(nr) macro available in Linux Kernel,
which does the same thing.
Example: BIT(7) = (1UL << 7)
Also use GENMASK for masking
Example: GENMASK(3, 0) = 0b00001111 (same as (1 << 4) - 1)
Signed-off-by: Moses Christopher Bollavarapu <mosescb.dev@gmail.com>
---
V1 -> V2: - Use GENMASK where-ever applicable
- Add linux/bits.h header to modified files
.../media/atomisp/pci/atomisp_compat_css20.c | 7 +-
.../staging/media/atomisp/pci/atomisp_v4l2.c | 21 ++---
.../media/atomisp/pci/ia_css_acc_types.h | 7 +-
.../staging/media/atomisp/pci/ia_css_env.h | 9 ++-
.../media/atomisp/pci/ia_css_event_public.h | 33 ++++----
.../staging/media/atomisp/pci/ia_css_irq.h | 77 ++++++++++---------
.../runtime/debug/interface/ia_css_debug.h | 31 ++++----
7 files changed, 96 insertions(+), 89 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
index 1173be0e72b0..a345fa1d7de9 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
@@ -40,6 +40,7 @@
#include <linux/io.h>
#include <linux/pm_runtime.h>
+#include <linux/bits.h>
/* Assume max number of ACC stages */
#define MAX_ACC_STAGES 20
@@ -1913,11 +1914,11 @@ void atomisp_css_input_set_mode(struct atomisp_sub_device *asd,
&asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL].stream_config;
s_config->mode = IA_CSS_INPUT_MODE_TPG;
s_config->source.tpg.mode = IA_CSS_TPG_MODE_CHECKERBOARD;
- s_config->source.tpg.x_mask = (1 << 4) - 1;
+ s_config->source.tpg.x_mask = GENMASK(3, 0);
s_config->source.tpg.x_delta = -2;
- s_config->source.tpg.y_mask = (1 << 4) - 1;
+ s_config->source.tpg.y_mask = GENMASK(3, 0);
s_config->source.tpg.y_delta = 3;
- s_config->source.tpg.xy_mask = (1 << 8) - 1;
+ s_config->source.tpg.xy_mask = GENMASK(7, 0);
return;
}
diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
index 1b240891a6e2..803ed63daef8 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
@@ -25,6 +25,7 @@
#include <linux/delay.h>
#include <linux/dmi.h>
#include <linux/interrupt.h>
+#include <linux/bits.h>
#include <asm/iosf_mbi.h>
@@ -626,11 +627,11 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)
* IRQ, if so, waiting for it to be served
*/
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- irq = irq & 1 << INTR_IIR;
+ irq &= BIT(INTR_IIR);
pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- if (!(irq & (1 << INTR_IIR)))
+ if (!(irq & BIT(INTR_IIR)))
goto done;
atomisp_css2_hw_store_32(MRFLD_INTR_CLEAR_REG, 0xFFFFFFFF);
@@ -643,11 +644,11 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)
return -EAGAIN;
} else {
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- irq = irq & 1 << INTR_IIR;
+ irq &= BIT(INTR_IIR);
pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- if (!(irq & (1 << INTR_IIR))) {
+ if (!(irq & BIT(INTR_IIR))) {
atomisp_css2_hw_store_32(MRFLD_INTR_ENABLE_REG, 0x0);
goto done;
}
@@ -666,7 +667,7 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)
* HW sighting:4568410.
*/
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- irq &= ~(1 << INTR_IER);
+ irq &= ~BIT(INTR_IER);
pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
atomisp_msi_irq_uninit(isp);
@@ -682,7 +683,7 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)
*/
static void punit_ddr_dvfs_enable(bool enable)
{
- int door_bell = 1 << 8;
+ int door_bell = BIT(8);
int max_wait = 30;
int reg;
@@ -1549,7 +1550,7 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
start = pci_resource_start(pdev, ATOM_ISP_PCI_BAR);
dev_dbg(&pdev->dev, "start: 0x%x\n", start);
- err = pcim_iomap_regions(pdev, 1 << ATOM_ISP_PCI_BAR, pci_name(pdev));
+ err = pcim_iomap_regions(pdev, BIT(ATOM_ISP_PCI_BAR), pci_name(pdev));
if (err) {
dev_err(&pdev->dev, "Failed to I/O memory remapping (%d)\n", err);
goto ioremap_fail;
@@ -1838,11 +1839,11 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
*/
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- irq = irq & 1 << INTR_IIR;
+ irq &= BIT(INTR_IIR);
pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- irq &= ~(1 << INTR_IER);
+ irq &= ~BIT(INTR_IER);
pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
atomisp_msi_irq_uninit(isp);
@@ -1854,7 +1855,7 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
dev_err(&pdev->dev, "Failed to switch off ISP\n");
atomisp_dev_alloc_fail:
- pcim_iounmap_regions(pdev, 1 << ATOM_ISP_PCI_BAR);
+ pcim_iounmap_regions(pdev, BIT(ATOM_ISP_PCI_BAR));
ioremap_fail:
return err;
diff --git a/drivers/staging/media/atomisp/pci/ia_css_acc_types.h b/drivers/staging/media/atomisp/pci/ia_css_acc_types.h
index d0ce2f8ba653..14628da924e3 100644
--- a/drivers/staging/media/atomisp/pci/ia_css_acc_types.h
+++ b/drivers/staging/media/atomisp/pci/ia_css_acc_types.h
@@ -24,6 +24,7 @@
#include <type_support.h>
#include <platform_support.h>
#include <debug_global.h>
+#include <linux/bits.h>
#include "ia_css_types.h"
#include "ia_css_frame_format.h"
@@ -65,7 +66,7 @@ enum ia_css_fw_type {
ia_css_sp_firmware, /** Firmware for the SP */
ia_css_isp_firmware, /** Firmware for the ISP */
ia_css_bootloader_firmware, /** Firmware for the BootLoader */
- ia_css_acc_firmware /** Firmware for accelrations */
+ ia_css_acc_firmware, /** Firmware for accelrations */
};
struct ia_css_blob_descr;
@@ -466,7 +467,7 @@ struct ia_css_acc_fw {
enum ia_css_sp_sleep_mode {
SP_DISABLE_SLEEP_MODE = 0,
- SP_SLEEP_AFTER_FRAME = 1 << 0,
- SP_SLEEP_AFTER_IRQ = 1 << 1
+ SP_SLEEP_AFTER_FRAME = BIT(0),
+ SP_SLEEP_AFTER_IRQ = BIT(1),
};
#endif /* _IA_CSS_ACC_TYPES_H */
diff --git a/drivers/staging/media/atomisp/pci/ia_css_env.h b/drivers/staging/media/atomisp/pci/ia_css_env.h
index 3b89bbd837a0..b9ebc14441a1 100644
--- a/drivers/staging/media/atomisp/pci/ia_css_env.h
+++ b/drivers/staging/media/atomisp/pci/ia_css_env.h
@@ -18,6 +18,7 @@
#include <type_support.h>
#include <linux/stdarg.h> /* va_list */
+#include <linux/bits.h> /* BIT(nr) */
#include "ia_css_types.h"
#include "ia_css_acc_types.h"
@@ -28,10 +29,10 @@
/* Memory allocation attributes, for use in ia_css_css_mem_env. */
enum ia_css_mem_attr {
- IA_CSS_MEM_ATTR_CACHED = 1 << 0,
- IA_CSS_MEM_ATTR_ZEROED = 1 << 1,
- IA_CSS_MEM_ATTR_PAGEALIGN = 1 << 2,
- IA_CSS_MEM_ATTR_CONTIGUOUS = 1 << 3,
+ IA_CSS_MEM_ATTR_CACHED = BIT(0),
+ IA_CSS_MEM_ATTR_ZEROED = BIT(1),
+ IA_CSS_MEM_ATTR_PAGEALIGN = BIT(2),
+ IA_CSS_MEM_ATTR_CONTIGUOUS = BIT(3),
};
/* Environment with function pointers for local IA memory allocation.
diff --git a/drivers/staging/media/atomisp/pci/ia_css_event_public.h b/drivers/staging/media/atomisp/pci/ia_css_event_public.h
index 76219d741d2e..1f1d735a7034 100644
--- a/drivers/staging/media/atomisp/pci/ia_css_event_public.h
+++ b/drivers/staging/media/atomisp/pci/ia_css_event_public.h
@@ -24,6 +24,7 @@
#include <ia_css_err.h> /* ia_css_err */
#include <ia_css_types.h> /* ia_css_pipe */
#include <ia_css_timer.h> /* ia_css_timer */
+#include <linux/bits.h> /* BIT(nr) */
/* The event type, distinguishes the kind of events that
* can are generated by the CSS system.
@@ -35,38 +36,38 @@
* 4) "enum ia_css_event_type convert_event_sp_to_host_domain" (sh_css.c)
*/
enum ia_css_event_type {
- IA_CSS_EVENT_TYPE_OUTPUT_FRAME_DONE = 1 << 0,
+ IA_CSS_EVENT_TYPE_OUTPUT_FRAME_DONE = BIT(0),
/** Output frame ready. */
- IA_CSS_EVENT_TYPE_SECOND_OUTPUT_FRAME_DONE = 1 << 1,
+ IA_CSS_EVENT_TYPE_SECOND_OUTPUT_FRAME_DONE = BIT(1),
/** Second output frame ready. */
- IA_CSS_EVENT_TYPE_VF_OUTPUT_FRAME_DONE = 1 << 2,
+ IA_CSS_EVENT_TYPE_VF_OUTPUT_FRAME_DONE = BIT(2),
/** Viewfinder Output frame ready. */
- IA_CSS_EVENT_TYPE_SECOND_VF_OUTPUT_FRAME_DONE = 1 << 3,
+ IA_CSS_EVENT_TYPE_SECOND_VF_OUTPUT_FRAME_DONE = BIT(3),
/** Second viewfinder Output frame ready. */
- IA_CSS_EVENT_TYPE_3A_STATISTICS_DONE = 1 << 4,
+ IA_CSS_EVENT_TYPE_3A_STATISTICS_DONE = BIT(4),
/** Indication that 3A statistics are available. */
- IA_CSS_EVENT_TYPE_DIS_STATISTICS_DONE = 1 << 5,
+ IA_CSS_EVENT_TYPE_DIS_STATISTICS_DONE = BIT(5),
/** Indication that DIS statistics are available. */
- IA_CSS_EVENT_TYPE_PIPELINE_DONE = 1 << 6,
+ IA_CSS_EVENT_TYPE_PIPELINE_DONE = BIT(6),
/** Pipeline Done event, sent after last pipeline stage. */
- IA_CSS_EVENT_TYPE_FRAME_TAGGED = 1 << 7,
+ IA_CSS_EVENT_TYPE_FRAME_TAGGED = BIT(7),
/** Frame tagged. */
- IA_CSS_EVENT_TYPE_INPUT_FRAME_DONE = 1 << 8,
+ IA_CSS_EVENT_TYPE_INPUT_FRAME_DONE = BIT(8),
/** Input frame ready. */
- IA_CSS_EVENT_TYPE_METADATA_DONE = 1 << 9,
+ IA_CSS_EVENT_TYPE_METADATA_DONE = BIT(9),
/** Metadata ready. */
- IA_CSS_EVENT_TYPE_LACE_STATISTICS_DONE = 1 << 10,
+ IA_CSS_EVENT_TYPE_LACE_STATISTICS_DONE = BIT(10),
/** Indication that LACE statistics are available. */
- IA_CSS_EVENT_TYPE_ACC_STAGE_COMPLETE = 1 << 11,
+ IA_CSS_EVENT_TYPE_ACC_STAGE_COMPLETE = BIT(11),
/** Extension stage complete. */
- IA_CSS_EVENT_TYPE_TIMER = 1 << 12,
+ IA_CSS_EVENT_TYPE_TIMER = BIT(12),
/** Timer event for measuring the SP side latencies. It contains the
32-bit timer value from the SP */
- IA_CSS_EVENT_TYPE_PORT_EOF = 1 << 13,
+ IA_CSS_EVENT_TYPE_PORT_EOF = BIT(13),
/** End Of Frame event, sent when in buffered sensor mode. */
- IA_CSS_EVENT_TYPE_FW_WARNING = 1 << 14,
+ IA_CSS_EVENT_TYPE_FW_WARNING = BIT(14),
/** Performance warning encounter by FW */
- IA_CSS_EVENT_TYPE_FW_ASSERT = 1 << 15,
+ IA_CSS_EVENT_TYPE_FW_ASSERT = BIT(15),
/** Assertion hit by FW */
};
diff --git a/drivers/staging/media/atomisp/pci/ia_css_irq.h b/drivers/staging/media/atomisp/pci/ia_css_irq.h
index 3b81a39cfe97..50a7939898ea 100644
--- a/drivers/staging/media/atomisp/pci/ia_css_irq.h
+++ b/drivers/staging/media/atomisp/pci/ia_css_irq.h
@@ -23,6 +23,7 @@
#include "ia_css_err.h"
#include "ia_css_pipe_public.h"
#include "ia_css_input_port.h"
+#include <linux/bits.h>
/* Interrupt types, these enumerate all supported interrupt types.
*/
@@ -46,49 +47,49 @@ enum ia_css_irq_type {
* (SW) interrupts
*/
enum ia_css_irq_info {
- IA_CSS_IRQ_INFO_CSS_RECEIVER_ERROR = 1 << 0,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_ERROR = BIT(0),
/** the css receiver has encountered an error */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_FIFO_OVERFLOW = 1 << 1,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_FIFO_OVERFLOW = BIT(1),
/** the FIFO in the csi receiver has overflown */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_SOF = 1 << 2,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_SOF = BIT(2),
/** the css receiver received the start of frame */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_EOF = 1 << 3,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_EOF = BIT(3),
/** the css receiver received the end of frame */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_SOL = 1 << 4,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_SOL = BIT(4),
/** the css receiver received the start of line */
- IA_CSS_IRQ_INFO_EVENTS_READY = 1 << 5,
+ IA_CSS_IRQ_INFO_EVENTS_READY = BIT(5),
/** One or more events are available in the PSYS event queue */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_EOL = 1 << 6,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_EOL = BIT(6),
/** the css receiver received the end of line */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_SIDEBAND_CHANGED = 1 << 7,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_SIDEBAND_CHANGED = BIT(7),
/** the css receiver received a change in side band signals */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_GEN_SHORT_0 = 1 << 8,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_GEN_SHORT_0 = BIT(8),
/** generic short packets (0) */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_GEN_SHORT_1 = 1 << 9,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_GEN_SHORT_1 = BIT(9),
/** generic short packets (1) */
- IA_CSS_IRQ_INFO_IF_PRIM_ERROR = 1 << 10,
+ IA_CSS_IRQ_INFO_IF_PRIM_ERROR = BIT(10),
/** the primary input formatter (A) has encountered an error */
- IA_CSS_IRQ_INFO_IF_PRIM_B_ERROR = 1 << 11,
+ IA_CSS_IRQ_INFO_IF_PRIM_B_ERROR = BIT(11),
/** the primary input formatter (B) has encountered an error */
- IA_CSS_IRQ_INFO_IF_SEC_ERROR = 1 << 12,
+ IA_CSS_IRQ_INFO_IF_SEC_ERROR = BIT(12),
/** the secondary input formatter has encountered an error */
- IA_CSS_IRQ_INFO_STREAM_TO_MEM_ERROR = 1 << 13,
+ IA_CSS_IRQ_INFO_STREAM_TO_MEM_ERROR = BIT(13),
/** the stream-to-memory device has encountered an error */
- IA_CSS_IRQ_INFO_SW_0 = 1 << 14,
+ IA_CSS_IRQ_INFO_SW_0 = BIT(14),
/** software interrupt 0 */
- IA_CSS_IRQ_INFO_SW_1 = 1 << 15,
+ IA_CSS_IRQ_INFO_SW_1 = BIT(15),
/** software interrupt 1 */
- IA_CSS_IRQ_INFO_SW_2 = 1 << 16,
+ IA_CSS_IRQ_INFO_SW_2 = BIT(16),
/** software interrupt 2 */
- IA_CSS_IRQ_INFO_ISP_BINARY_STATISTICS_READY = 1 << 17,
+ IA_CSS_IRQ_INFO_ISP_BINARY_STATISTICS_READY = BIT(17),
/** ISP binary statistics are ready */
- IA_CSS_IRQ_INFO_INPUT_SYSTEM_ERROR = 1 << 18,
+ IA_CSS_IRQ_INFO_INPUT_SYSTEM_ERROR = BIT(18),
/** the input system in in error */
- IA_CSS_IRQ_INFO_IF_ERROR = 1 << 19,
+ IA_CSS_IRQ_INFO_IF_ERROR = BIT(19),
/** the input formatter in in error */
- IA_CSS_IRQ_INFO_DMA_ERROR = 1 << 20,
+ IA_CSS_IRQ_INFO_DMA_ERROR = BIT(20),
/** the dma in in error */
- IA_CSS_IRQ_INFO_ISYS_EVENTS_READY = 1 << 21,
+ IA_CSS_IRQ_INFO_ISYS_EVENTS_READY = BIT(21),
/** end-of-frame events are ready in the isys_event queue */
};
@@ -103,23 +104,23 @@ enum ia_css_irq_info {
* different receiver types, or possibly none in case of tests systems.
*/
enum ia_css_rx_irq_info {
- IA_CSS_RX_IRQ_INFO_BUFFER_OVERRUN = 1U << 0, /** buffer overrun */
- IA_CSS_RX_IRQ_INFO_ENTER_SLEEP_MODE = 1U << 1, /** entering sleep mode */
- IA_CSS_RX_IRQ_INFO_EXIT_SLEEP_MODE = 1U << 2, /** exited sleep mode */
- IA_CSS_RX_IRQ_INFO_ECC_CORRECTED = 1U << 3, /** ECC corrected */
- IA_CSS_RX_IRQ_INFO_ERR_SOT = 1U << 4,
+ IA_CSS_RX_IRQ_INFO_BUFFER_OVERRUN = BIT(0), /** buffer overrun */
+ IA_CSS_RX_IRQ_INFO_ENTER_SLEEP_MODE = BIT(1), /** entering sleep mode */
+ IA_CSS_RX_IRQ_INFO_EXIT_SLEEP_MODE = BIT(2), /** exited sleep mode */
+ IA_CSS_RX_IRQ_INFO_ECC_CORRECTED = BIT(3), /** ECC corrected */
+ IA_CSS_RX_IRQ_INFO_ERR_SOT = BIT(4),
/** Start of transmission */
- IA_CSS_RX_IRQ_INFO_ERR_SOT_SYNC = 1U << 5, /** SOT sync (??) */
- IA_CSS_RX_IRQ_INFO_ERR_CONTROL = 1U << 6, /** Control (??) */
- IA_CSS_RX_IRQ_INFO_ERR_ECC_DOUBLE = 1U << 7, /** Double ECC */
- IA_CSS_RX_IRQ_INFO_ERR_CRC = 1U << 8, /** CRC error */
- IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ID = 1U << 9, /** Unknown ID */
- IA_CSS_RX_IRQ_INFO_ERR_FRAME_SYNC = 1U << 10,/** Frame sync error */
- IA_CSS_RX_IRQ_INFO_ERR_FRAME_DATA = 1U << 11,/** Frame data error */
- IA_CSS_RX_IRQ_INFO_ERR_DATA_TIMEOUT = 1U << 12,/** Timeout occurred */
- IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ESC = 1U << 13,/** Unknown escape seq. */
- IA_CSS_RX_IRQ_INFO_ERR_LINE_SYNC = 1U << 14,/** Line Sync error */
- IA_CSS_RX_IRQ_INFO_INIT_TIMEOUT = 1U << 15,
+ IA_CSS_RX_IRQ_INFO_ERR_SOT_SYNC = BIT(5), /** SOT sync (??) */
+ IA_CSS_RX_IRQ_INFO_ERR_CONTROL = BIT(6), /** Control (??) */
+ IA_CSS_RX_IRQ_INFO_ERR_ECC_DOUBLE = BIT(7), /** Double ECC */
+ IA_CSS_RX_IRQ_INFO_ERR_CRC = BIT(8), /** CRC error */
+ IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ID = BIT(9), /** Unknown ID */
+ IA_CSS_RX_IRQ_INFO_ERR_FRAME_SYNC = BIT(10),/** Frame sync error */
+ IA_CSS_RX_IRQ_INFO_ERR_FRAME_DATA = BIT(11),/** Frame data error */
+ IA_CSS_RX_IRQ_INFO_ERR_DATA_TIMEOUT = BIT(12),/** Timeout occurred */
+ IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ESC = BIT(13),/** Unknown escape seq. */
+ IA_CSS_RX_IRQ_INFO_ERR_LINE_SYNC = BIT(14),/** Line Sync error */
+ IA_CSS_RX_IRQ_INFO_INIT_TIMEOUT = BIT(15),
};
/* Interrupt info structure. This structure contains information about an
diff --git a/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h b/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h
index e37ef4232c55..fff89e9b4b01 100644
--- a/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h
+++ b/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h
@@ -20,6 +20,7 @@
#include <type_support.h>
#include <linux/stdarg.h>
+#include <linux/bits.h>
#include "ia_css_types.h"
#include "ia_css_binary.h"
#include "ia_css_frame_public.h"
@@ -53,21 +54,21 @@ extern int dbg_level;
* Values can be combined to dump a combination of sets.
*/
enum ia_css_debug_enable_param_dump {
- IA_CSS_DEBUG_DUMP_FPN = 1 << 0, /** FPN table */
- IA_CSS_DEBUG_DUMP_OB = 1 << 1, /** OB table */
- IA_CSS_DEBUG_DUMP_SC = 1 << 2, /** Shading table */
- IA_CSS_DEBUG_DUMP_WB = 1 << 3, /** White balance */
- IA_CSS_DEBUG_DUMP_DP = 1 << 4, /** Defect Pixel */
- IA_CSS_DEBUG_DUMP_BNR = 1 << 5, /** Bayer Noise Reductions */
- IA_CSS_DEBUG_DUMP_S3A = 1 << 6, /** 3A Statistics */
- IA_CSS_DEBUG_DUMP_DE = 1 << 7, /** De Mosaicing */
- IA_CSS_DEBUG_DUMP_YNR = 1 << 8, /** Luma Noise Reduction */
- IA_CSS_DEBUG_DUMP_CSC = 1 << 9, /** Color Space Conversion */
- IA_CSS_DEBUG_DUMP_GC = 1 << 10, /** Gamma Correction */
- IA_CSS_DEBUG_DUMP_TNR = 1 << 11, /** Temporal Noise Reduction */
- IA_CSS_DEBUG_DUMP_ANR = 1 << 12, /** Advanced Noise Reduction */
- IA_CSS_DEBUG_DUMP_CE = 1 << 13, /** Chroma Enhancement */
- IA_CSS_DEBUG_DUMP_ALL = 1 << 14 /** Dump all device parameters */
+ IA_CSS_DEBUG_DUMP_FPN = BIT(0), /** FPN table */
+ IA_CSS_DEBUG_DUMP_OB = BIT(1), /** OB table */
+ IA_CSS_DEBUG_DUMP_SC = BIT(2), /** Shading table */
+ IA_CSS_DEBUG_DUMP_WB = BIT(3), /** White balance */
+ IA_CSS_DEBUG_DUMP_DP = BIT(4), /** Defect Pixel */
+ IA_CSS_DEBUG_DUMP_BNR = BIT(5), /** Bayer Noise Reductions */
+ IA_CSS_DEBUG_DUMP_S3A = BIT(6), /** 3A Statistics */
+ IA_CSS_DEBUG_DUMP_DE = BIT(7), /** De Mosaicing */
+ IA_CSS_DEBUG_DUMP_YNR = BIT(8), /** Luma Noise Reduction */
+ IA_CSS_DEBUG_DUMP_CSC = BIT(9), /** Color Space Conversion */
+ IA_CSS_DEBUG_DUMP_GC = BIT(10), /** Gamma Correction */
+ IA_CSS_DEBUG_DUMP_TNR = BIT(11), /** Temporal Noise Reduction */
+ IA_CSS_DEBUG_DUMP_ANR = BIT(12), /** Advanced Noise Reduction */
+ IA_CSS_DEBUG_DUMP_CE = BIT(13), /** Chroma Enhancement */
+ IA_CSS_DEBUG_DUMP_ALL = BIT(14), /** Dump all device parameters */
};
#define IA_CSS_ERROR(fmt, ...) \
--
2.30.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2] staging: media: atomisp: Use BIT macro instead of left shifting
2022-01-30 18:06 ` [PATCH v2] " Moses Christopher Bollavarapu
@ 2022-01-31 7:36 ` Dan Carpenter
2022-01-31 13:24 ` Randy Dunlap
2022-01-31 13:33 ` Joe Perches
2022-02-06 18:52 ` [PATCH v3] " Moses Christopher Bollavarapu
1 sibling, 2 replies; 9+ messages in thread
From: Dan Carpenter @ 2022-01-31 7:36 UTC (permalink / raw)
To: Moses Christopher Bollavarapu
Cc: andriy.shevchenko, gregkh, kitakar, laurent.pinchart,
linux-kernel, linux-media, linux-staging, mchehab, sakari.ailus,
tomi.valkeinen, joe
On Sun, Jan 30, 2022 at 07:06:55PM +0100, Moses Christopher Bollavarapu wrote:
> There is a BIT(nr) macro available in Linux Kernel,
> which does the same thing.
> Example: BIT(7) = (1UL << 7)
>
> Also use GENMASK for masking
> Example: GENMASK(3, 0) = 0b00001111 (same as (1 << 4) - 1)
>
> Signed-off-by: Moses Christopher Bollavarapu <mosescb.dev@gmail.com>
This patch does a couple unrelated things. Break out the GENMASK()
change into its own patch.
> @@ -65,7 +66,7 @@ enum ia_css_fw_type {
> ia_css_sp_firmware, /** Firmware for the SP */
> ia_css_isp_firmware, /** Firmware for the ISP */
> ia_css_bootloader_firmware, /** Firmware for the BootLoader */
> - ia_css_acc_firmware /** Firmware for accelrations */
> + ia_css_acc_firmware, /** Firmware for accelrations */
> };
This change needs to be in its own patch.
> diff --git a/drivers/staging/media/atomisp/pci/ia_css_env.h b/drivers/staging/media/atomisp/pci/ia_css_env.h
> index 3b89bbd837a0..b9ebc14441a1 100644
> --- a/drivers/staging/media/atomisp/pci/ia_css_env.h
> +++ b/drivers/staging/media/atomisp/pci/ia_css_env.h
> @@ -18,6 +18,7 @@
>
> #include <type_support.h>
> #include <linux/stdarg.h> /* va_list */
> +#include <linux/bits.h> /* BIT(nr) */
This comment is not required.
> enum ia_css_rx_irq_info {
> - IA_CSS_RX_IRQ_INFO_BUFFER_OVERRUN = 1U << 0, /** buffer overrun */
> - IA_CSS_RX_IRQ_INFO_ENTER_SLEEP_MODE = 1U << 1, /** entering sleep mode */
> - IA_CSS_RX_IRQ_INFO_EXIT_SLEEP_MODE = 1U << 2, /** exited sleep mode */
> - IA_CSS_RX_IRQ_INFO_ECC_CORRECTED = 1U << 3, /** ECC corrected */
> - IA_CSS_RX_IRQ_INFO_ERR_SOT = 1U << 4,
> + IA_CSS_RX_IRQ_INFO_BUFFER_OVERRUN = BIT(0), /** buffer overrun */
> + IA_CSS_RX_IRQ_INFO_ENTER_SLEEP_MODE = BIT(1), /** entering sleep mode */
> + IA_CSS_RX_IRQ_INFO_EXIT_SLEEP_MODE = BIT(2), /** exited sleep mode */
> + IA_CSS_RX_IRQ_INFO_ECC_CORRECTED = BIT(3), /** ECC corrected */
> + IA_CSS_RX_IRQ_INFO_ERR_SOT = BIT(4),
> /** Start of transmission */
> - IA_CSS_RX_IRQ_INFO_ERR_SOT_SYNC = 1U << 5, /** SOT sync (??) */
> - IA_CSS_RX_IRQ_INFO_ERR_CONTROL = 1U << 6, /** Control (??) */
> - IA_CSS_RX_IRQ_INFO_ERR_ECC_DOUBLE = 1U << 7, /** Double ECC */
> - IA_CSS_RX_IRQ_INFO_ERR_CRC = 1U << 8, /** CRC error */
> - IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ID = 1U << 9, /** Unknown ID */
> - IA_CSS_RX_IRQ_INFO_ERR_FRAME_SYNC = 1U << 10,/** Frame sync error */
> - IA_CSS_RX_IRQ_INFO_ERR_FRAME_DATA = 1U << 11,/** Frame data error */
> - IA_CSS_RX_IRQ_INFO_ERR_DATA_TIMEOUT = 1U << 12,/** Timeout occurred */
> - IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ESC = 1U << 13,/** Unknown escape seq. */
> - IA_CSS_RX_IRQ_INFO_ERR_LINE_SYNC = 1U << 14,/** Line Sync error */
> - IA_CSS_RX_IRQ_INFO_INIT_TIMEOUT = 1U << 15,
> + IA_CSS_RX_IRQ_INFO_ERR_SOT_SYNC = BIT(5), /** SOT sync (??) */
> + IA_CSS_RX_IRQ_INFO_ERR_CONTROL = BIT(6), /** Control (??) */
> + IA_CSS_RX_IRQ_INFO_ERR_ECC_DOUBLE = BIT(7), /** Double ECC */
> + IA_CSS_RX_IRQ_INFO_ERR_CRC = BIT(8), /** CRC error */
> + IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ID = BIT(9), /** Unknown ID */
> + IA_CSS_RX_IRQ_INFO_ERR_FRAME_SYNC = BIT(10),/** Frame sync error */
> + IA_CSS_RX_IRQ_INFO_ERR_FRAME_DATA = BIT(11),/** Frame data error */
> + IA_CSS_RX_IRQ_INFO_ERR_DATA_TIMEOUT = BIT(12),/** Timeout occurred */
> + IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ESC = BIT(13),/** Unknown escape seq. */
> + IA_CSS_RX_IRQ_INFO_ERR_LINE_SYNC = BIT(14),/** Line Sync error */
The comment is kind of messed up. There should be a space after the
comma and just /* Line Sync error */
> + IA_CSS_RX_IRQ_INFO_INIT_TIMEOUT = BIT(15),
> };
regards,
dan carpenter
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2] staging: media: atomisp: Use BIT macro instead of left shifting
2022-01-31 7:36 ` Dan Carpenter
@ 2022-01-31 13:24 ` Randy Dunlap
2022-01-31 13:33 ` Joe Perches
1 sibling, 0 replies; 9+ messages in thread
From: Randy Dunlap @ 2022-01-31 13:24 UTC (permalink / raw)
To: Dan Carpenter, Moses Christopher Bollavarapu
Cc: andriy.shevchenko, gregkh, kitakar, laurent.pinchart,
linux-kernel, linux-media, linux-staging, mchehab, sakari.ailus,
tomi.valkeinen, joe
On 1/30/22 23:36, Dan Carpenter wrote:
> On Sun, Jan 30, 2022 at 07:06:55PM +0100, Moses Christopher Bollavarapu wrote:
>> There is a BIT(nr) macro available in Linux Kernel,
>> which does the same thing.
>> Example: BIT(7) = (1UL << 7)
>>
>> Also use GENMASK for masking
>> Example: GENMASK(3, 0) = 0b00001111 (same as (1 << 4) - 1)
>>
>> Signed-off-by: Moses Christopher Bollavarapu <mosescb.dev@gmail.com>
>
>> diff --git a/drivers/staging/media/atomisp/pci/ia_css_env.h b/drivers/staging/media/atomisp/pci/ia_css_env.h
>> index 3b89bbd837a0..b9ebc14441a1 100644
>> --- a/drivers/staging/media/atomisp/pci/ia_css_env.h
>> +++ b/drivers/staging/media/atomisp/pci/ia_css_env.h
>> @@ -18,6 +18,7 @@
>>
>> #include <type_support.h>
>> #include <linux/stdarg.h> /* va_list */
>> +#include <linux/bits.h> /* BIT(nr) */
>
> This comment is not required.
>
>> enum ia_css_rx_irq_info {
>> - IA_CSS_RX_IRQ_INFO_BUFFER_OVERRUN = 1U << 0, /** buffer overrun */
>> - IA_CSS_RX_IRQ_INFO_ENTER_SLEEP_MODE = 1U << 1, /** entering sleep mode */
>> - IA_CSS_RX_IRQ_INFO_EXIT_SLEEP_MODE = 1U << 2, /** exited sleep mode */
>> - IA_CSS_RX_IRQ_INFO_ECC_CORRECTED = 1U << 3, /** ECC corrected */
>> - IA_CSS_RX_IRQ_INFO_ERR_SOT = 1U << 4,
>> + IA_CSS_RX_IRQ_INFO_BUFFER_OVERRUN = BIT(0), /** buffer overrun */
>> + IA_CSS_RX_IRQ_INFO_ENTER_SLEEP_MODE = BIT(1), /** entering sleep mode */
>> + IA_CSS_RX_IRQ_INFO_EXIT_SLEEP_MODE = BIT(2), /** exited sleep mode */
>> + IA_CSS_RX_IRQ_INFO_ECC_CORRECTED = BIT(3), /** ECC corrected */
>> + IA_CSS_RX_IRQ_INFO_ERR_SOT = BIT(4),
>> /** Start of transmission */
>> - IA_CSS_RX_IRQ_INFO_ERR_SOT_SYNC = 1U << 5, /** SOT sync (??) */
>> - IA_CSS_RX_IRQ_INFO_ERR_CONTROL = 1U << 6, /** Control (??) */
>> - IA_CSS_RX_IRQ_INFO_ERR_ECC_DOUBLE = 1U << 7, /** Double ECC */
>> - IA_CSS_RX_IRQ_INFO_ERR_CRC = 1U << 8, /** CRC error */
>> - IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ID = 1U << 9, /** Unknown ID */
>> - IA_CSS_RX_IRQ_INFO_ERR_FRAME_SYNC = 1U << 10,/** Frame sync error */
>> - IA_CSS_RX_IRQ_INFO_ERR_FRAME_DATA = 1U << 11,/** Frame data error */
>> - IA_CSS_RX_IRQ_INFO_ERR_DATA_TIMEOUT = 1U << 12,/** Timeout occurred */
>> - IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ESC = 1U << 13,/** Unknown escape seq. */
>> - IA_CSS_RX_IRQ_INFO_ERR_LINE_SYNC = 1U << 14,/** Line Sync error */
>> - IA_CSS_RX_IRQ_INFO_INIT_TIMEOUT = 1U << 15,
>> + IA_CSS_RX_IRQ_INFO_ERR_SOT_SYNC = BIT(5), /** SOT sync (??) */
>> + IA_CSS_RX_IRQ_INFO_ERR_CONTROL = BIT(6), /** Control (??) */
>> + IA_CSS_RX_IRQ_INFO_ERR_ECC_DOUBLE = BIT(7), /** Double ECC */
>> + IA_CSS_RX_IRQ_INFO_ERR_CRC = BIT(8), /** CRC error */
>> + IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ID = BIT(9), /** Unknown ID */
>> + IA_CSS_RX_IRQ_INFO_ERR_FRAME_SYNC = BIT(10),/** Frame sync error */
>> + IA_CSS_RX_IRQ_INFO_ERR_FRAME_DATA = BIT(11),/** Frame data error */
>> + IA_CSS_RX_IRQ_INFO_ERR_DATA_TIMEOUT = BIT(12),/** Timeout occurred */
>> + IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ESC = BIT(13),/** Unknown escape seq. */
>> + IA_CSS_RX_IRQ_INFO_ERR_LINE_SYNC = BIT(14),/** Line Sync error */
>
> The comment is kind of messed up. There should be a space after the
> comma and just /* Line Sync error */
Yeah, all of those /** should just be /*
thanks.
--
~Randy
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2] staging: media: atomisp: Use BIT macro instead of left shifting
2022-01-31 7:36 ` Dan Carpenter
2022-01-31 13:24 ` Randy Dunlap
@ 2022-01-31 13:33 ` Joe Perches
1 sibling, 0 replies; 9+ messages in thread
From: Joe Perches @ 2022-01-31 13:33 UTC (permalink / raw)
To: Dan Carpenter, Moses Christopher Bollavarapu
Cc: andriy.shevchenko, gregkh, kitakar, laurent.pinchart,
linux-kernel, linux-media, linux-staging, mchehab, sakari.ailus,
tomi.valkeinen
On Mon, 2022-01-31 at 10:36 +0300, Dan Carpenter wrote:
> On Sun, Jan 30, 2022 at 07:06:55PM +0100, Moses Christopher Bollavarapu wrote:
> > There is a BIT(nr) macro available in Linux Kernel,
> > which does the same thing.
> > Example: BIT(7) = (1UL << 7)
> >
> > Also use GENMASK for masking
> > Example: GENMASK(3, 0) = 0b00001111 (same as (1 << 4) - 1)
> >
> > Signed-off-by: Moses Christopher Bollavarapu <mosescb.dev@gmail.com>
>
> This patch does a couple unrelated things. Break out the GENMASK()
> change into its own patch.
>
> > @@ -65,7 +66,7 @@ enum ia_css_fw_type {
> > ia_css_sp_firmware, /** Firmware for the SP */
> > ia_css_isp_firmware, /** Firmware for the ISP */
> > ia_css_bootloader_firmware, /** Firmware for the BootLoader */
> > - ia_css_acc_firmware /** Firmware for accelrations */
> > + ia_css_acc_firmware, /** Firmware for accelrations */
> > };
>
> This change needs to be in its own patch.
Because it's unrelated. As is the repetitive use of 'Firmware for'
and the typo/misspelling of accelerations.
Another possibility would be to change the /** to /* or maybe
change to // and remove the ' */' trailing comment termination
also in a separate patch.
> > diff --git a/drivers/staging/media/atomisp/pci/ia_css_env.h b/drivers/staging/media/atomisp/pci/ia_css_env.h
[]
> > enum ia_css_rx_irq_info {
> > - IA_CSS_RX_IRQ_INFO_BUFFER_OVERRUN = 1U << 0, /** buffer overrun */
> > - IA_CSS_RX_IRQ_INFO_ENTER_SLEEP_MODE = 1U << 1, /** entering sleep mode */
> > - IA_CSS_RX_IRQ_INFO_EXIT_SLEEP_MODE = 1U << 2, /** exited sleep mode */
> > - IA_CSS_RX_IRQ_INFO_ECC_CORRECTED = 1U << 3, /** ECC corrected */
> > - IA_CSS_RX_IRQ_INFO_ERR_SOT = 1U << 4,
> > + IA_CSS_RX_IRQ_INFO_BUFFER_OVERRUN = BIT(0), /** buffer overrun */
> > + IA_CSS_RX_IRQ_INFO_ENTER_SLEEP_MODE = BIT(1), /** entering sleep mode */
> > + IA_CSS_RX_IRQ_INFO_EXIT_SLEEP_MODE = BIT(2), /** exited sleep mode */
> > + IA_CSS_RX_IRQ_INFO_ECC_CORRECTED = BIT(3), /** ECC corrected */
> > + IA_CSS_RX_IRQ_INFO_ERR_SOT = BIT(4),
> > /** Start of transmission */
> > - IA_CSS_RX_IRQ_INFO_ERR_SOT_SYNC = 1U << 5, /** SOT sync (??) */
> > - IA_CSS_RX_IRQ_INFO_ERR_CONTROL = 1U << 6, /** Control (??) */
> > - IA_CSS_RX_IRQ_INFO_ERR_ECC_DOUBLE = 1U << 7, /** Double ECC */
> > - IA_CSS_RX_IRQ_INFO_ERR_CRC = 1U << 8, /** CRC error */
> > - IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ID = 1U << 9, /** Unknown ID */
> > - IA_CSS_RX_IRQ_INFO_ERR_FRAME_SYNC = 1U << 10,/** Frame sync error */
> > - IA_CSS_RX_IRQ_INFO_ERR_FRAME_DATA = 1U << 11,/** Frame data error */
> > - IA_CSS_RX_IRQ_INFO_ERR_DATA_TIMEOUT = 1U << 12,/** Timeout occurred */
> > - IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ESC = 1U << 13,/** Unknown escape seq. */
> > - IA_CSS_RX_IRQ_INFO_ERR_LINE_SYNC = 1U << 14,/** Line Sync error */
> > - IA_CSS_RX_IRQ_INFO_INIT_TIMEOUT = 1U << 15,
> > + IA_CSS_RX_IRQ_INFO_ERR_SOT_SYNC = BIT(5), /** SOT sync (??) */
> > + IA_CSS_RX_IRQ_INFO_ERR_CONTROL = BIT(6), /** Control (??) */
> > + IA_CSS_RX_IRQ_INFO_ERR_ECC_DOUBLE = BIT(7), /** Double ECC */
> > + IA_CSS_RX_IRQ_INFO_ERR_CRC = BIT(8), /** CRC error */
> > + IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ID = BIT(9), /** Unknown ID */
> > + IA_CSS_RX_IRQ_INFO_ERR_FRAME_SYNC = BIT(10),/** Frame sync error */
> > + IA_CSS_RX_IRQ_INFO_ERR_FRAME_DATA = BIT(11),/** Frame data error */
> > + IA_CSS_RX_IRQ_INFO_ERR_DATA_TIMEOUT = BIT(12),/** Timeout occurred */
> > + IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ESC = BIT(13),/** Unknown escape seq. */
> > + IA_CSS_RX_IRQ_INFO_ERR_LINE_SYNC = BIT(14),/** Line Sync error */
>
> The comment is kind of messed up. There should be a space after the
> comma and just /* Line Sync error */
or just a tab before all of the comments
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3] staging: media: atomisp: Use BIT macro instead of left shifting
2022-01-30 18:06 ` [PATCH v2] " Moses Christopher Bollavarapu
2022-01-31 7:36 ` Dan Carpenter
@ 2022-02-06 18:52 ` Moses Christopher Bollavarapu
2022-02-07 12:30 ` Andy Shevchenko
1 sibling, 1 reply; 9+ messages in thread
From: Moses Christopher Bollavarapu @ 2022-02-06 18:52 UTC (permalink / raw)
To: mosescb.dev
Cc: andriy.shevchenko, gregkh, joe, kitakar, laurent.pinchart,
linux-kernel, linux-media, linux-staging, mchehab, sakari.ailus,
tomi.valkeinen
There is a BIT(nr) macro available in Linux Kernel,
which does the same thing.
Example: BIT(7) = (1UL << 7)
Signed-off-by: Moses Christopher Bollavarapu <mosescb.dev@gmail.com>
---
V2 -> V3: - Remove GENMASK changes from this patch
- Minor style changes
V1 -> V2: - Use GENMASK where-ever applicable
- Add linux/bits.h header to modified files
.../staging/media/atomisp/pci/atomisp_v4l2.c | 19 ++---
.../media/atomisp/pci/ia_css_acc_types.h | 5 +-
.../staging/media/atomisp/pci/ia_css_env.h | 9 ++-
.../media/atomisp/pci/ia_css_event_public.h | 33 ++++----
.../staging/media/atomisp/pci/ia_css_irq.h | 77 ++++++++++---------
.../runtime/debug/interface/ia_css_debug.h | 31 ++++----
6 files changed, 90 insertions(+), 84 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
index 1b240891a6e2..ce44c880fb8b 100644
--- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
@@ -25,6 +25,7 @@
#include <linux/delay.h>
#include <linux/dmi.h>
#include <linux/interrupt.h>
+#include <linux/bits.h>
#include <asm/iosf_mbi.h>
@@ -626,11 +627,11 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)
* IRQ, if so, waiting for it to be served
*/
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- irq = irq & 1 << INTR_IIR;
+ irq &= BIT(INTR_IIR);
pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- if (!(irq & (1 << INTR_IIR)))
+ if (!(irq & BIT(INTR_IIR)))
goto done;
atomisp_css2_hw_store_32(MRFLD_INTR_CLEAR_REG, 0xFFFFFFFF);
@@ -643,11 +644,11 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)
return -EAGAIN;
} else {
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- irq = irq & 1 << INTR_IIR;
+ irq &= BIT(INTR_IIR);
pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- if (!(irq & (1 << INTR_IIR))) {
+ if (!(irq & BIT(INTR_IIR))) {
atomisp_css2_hw_store_32(MRFLD_INTR_ENABLE_REG, 0x0);
goto done;
}
@@ -666,7 +667,7 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)
* HW sighting:4568410.
*/
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- irq &= ~(1 << INTR_IER);
+ irq &= ~BIT(INTR_IER);
pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
atomisp_msi_irq_uninit(isp);
@@ -1549,7 +1550,7 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
start = pci_resource_start(pdev, ATOM_ISP_PCI_BAR);
dev_dbg(&pdev->dev, "start: 0x%x\n", start);
- err = pcim_iomap_regions(pdev, 1 << ATOM_ISP_PCI_BAR, pci_name(pdev));
+ err = pcim_iomap_regions(pdev, BIT(ATOM_ISP_PCI_BAR), pci_name(pdev));
if (err) {
dev_err(&pdev->dev, "Failed to I/O memory remapping (%d)\n", err);
goto ioremap_fail;
@@ -1838,11 +1839,11 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
*/
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- irq = irq & 1 << INTR_IIR;
+ irq &= BIT(INTR_IIR);
pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
- irq &= ~(1 << INTR_IER);
+ irq &= ~BIT(INTR_IER);
pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
atomisp_msi_irq_uninit(isp);
@@ -1854,7 +1855,7 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
dev_err(&pdev->dev, "Failed to switch off ISP\n");
atomisp_dev_alloc_fail:
- pcim_iounmap_regions(pdev, 1 << ATOM_ISP_PCI_BAR);
+ pcim_iounmap_regions(pdev, BIT(ATOM_ISP_PCI_BAR));
ioremap_fail:
return err;
diff --git a/drivers/staging/media/atomisp/pci/ia_css_acc_types.h b/drivers/staging/media/atomisp/pci/ia_css_acc_types.h
index d0ce2f8ba653..a20879aedef6 100644
--- a/drivers/staging/media/atomisp/pci/ia_css_acc_types.h
+++ b/drivers/staging/media/atomisp/pci/ia_css_acc_types.h
@@ -24,6 +24,7 @@
#include <type_support.h>
#include <platform_support.h>
#include <debug_global.h>
+#include <linux/bits.h>
#include "ia_css_types.h"
#include "ia_css_frame_format.h"
@@ -466,7 +467,7 @@ struct ia_css_acc_fw {
enum ia_css_sp_sleep_mode {
SP_DISABLE_SLEEP_MODE = 0,
- SP_SLEEP_AFTER_FRAME = 1 << 0,
- SP_SLEEP_AFTER_IRQ = 1 << 1
+ SP_SLEEP_AFTER_FRAME = BIT(0),
+ SP_SLEEP_AFTER_IRQ = BIT(1),
};
#endif /* _IA_CSS_ACC_TYPES_H */
diff --git a/drivers/staging/media/atomisp/pci/ia_css_env.h b/drivers/staging/media/atomisp/pci/ia_css_env.h
index 3b89bbd837a0..42bb1ec1c22d 100644
--- a/drivers/staging/media/atomisp/pci/ia_css_env.h
+++ b/drivers/staging/media/atomisp/pci/ia_css_env.h
@@ -18,6 +18,7 @@
#include <type_support.h>
#include <linux/stdarg.h> /* va_list */
+#include <linux/bits.h>
#include "ia_css_types.h"
#include "ia_css_acc_types.h"
@@ -28,10 +29,10 @@
/* Memory allocation attributes, for use in ia_css_css_mem_env. */
enum ia_css_mem_attr {
- IA_CSS_MEM_ATTR_CACHED = 1 << 0,
- IA_CSS_MEM_ATTR_ZEROED = 1 << 1,
- IA_CSS_MEM_ATTR_PAGEALIGN = 1 << 2,
- IA_CSS_MEM_ATTR_CONTIGUOUS = 1 << 3,
+ IA_CSS_MEM_ATTR_CACHED = BIT(0),
+ IA_CSS_MEM_ATTR_ZEROED = BIT(1),
+ IA_CSS_MEM_ATTR_PAGEALIGN = BIT(2),
+ IA_CSS_MEM_ATTR_CONTIGUOUS = BIT(3),
};
/* Environment with function pointers for local IA memory allocation.
diff --git a/drivers/staging/media/atomisp/pci/ia_css_event_public.h b/drivers/staging/media/atomisp/pci/ia_css_event_public.h
index 76219d741d2e..b052648d4fc2 100644
--- a/drivers/staging/media/atomisp/pci/ia_css_event_public.h
+++ b/drivers/staging/media/atomisp/pci/ia_css_event_public.h
@@ -24,6 +24,7 @@
#include <ia_css_err.h> /* ia_css_err */
#include <ia_css_types.h> /* ia_css_pipe */
#include <ia_css_timer.h> /* ia_css_timer */
+#include <linux/bits.h>
/* The event type, distinguishes the kind of events that
* can are generated by the CSS system.
@@ -35,38 +36,38 @@
* 4) "enum ia_css_event_type convert_event_sp_to_host_domain" (sh_css.c)
*/
enum ia_css_event_type {
- IA_CSS_EVENT_TYPE_OUTPUT_FRAME_DONE = 1 << 0,
+ IA_CSS_EVENT_TYPE_OUTPUT_FRAME_DONE = BIT(0),
/** Output frame ready. */
- IA_CSS_EVENT_TYPE_SECOND_OUTPUT_FRAME_DONE = 1 << 1,
+ IA_CSS_EVENT_TYPE_SECOND_OUTPUT_FRAME_DONE = BIT(1),
/** Second output frame ready. */
- IA_CSS_EVENT_TYPE_VF_OUTPUT_FRAME_DONE = 1 << 2,
+ IA_CSS_EVENT_TYPE_VF_OUTPUT_FRAME_DONE = BIT(2),
/** Viewfinder Output frame ready. */
- IA_CSS_EVENT_TYPE_SECOND_VF_OUTPUT_FRAME_DONE = 1 << 3,
+ IA_CSS_EVENT_TYPE_SECOND_VF_OUTPUT_FRAME_DONE = BIT(3),
/** Second viewfinder Output frame ready. */
- IA_CSS_EVENT_TYPE_3A_STATISTICS_DONE = 1 << 4,
+ IA_CSS_EVENT_TYPE_3A_STATISTICS_DONE = BIT(4),
/** Indication that 3A statistics are available. */
- IA_CSS_EVENT_TYPE_DIS_STATISTICS_DONE = 1 << 5,
+ IA_CSS_EVENT_TYPE_DIS_STATISTICS_DONE = BIT(5),
/** Indication that DIS statistics are available. */
- IA_CSS_EVENT_TYPE_PIPELINE_DONE = 1 << 6,
+ IA_CSS_EVENT_TYPE_PIPELINE_DONE = BIT(6),
/** Pipeline Done event, sent after last pipeline stage. */
- IA_CSS_EVENT_TYPE_FRAME_TAGGED = 1 << 7,
+ IA_CSS_EVENT_TYPE_FRAME_TAGGED = BIT(7),
/** Frame tagged. */
- IA_CSS_EVENT_TYPE_INPUT_FRAME_DONE = 1 << 8,
+ IA_CSS_EVENT_TYPE_INPUT_FRAME_DONE = BIT(8),
/** Input frame ready. */
- IA_CSS_EVENT_TYPE_METADATA_DONE = 1 << 9,
+ IA_CSS_EVENT_TYPE_METADATA_DONE = BIT(9),
/** Metadata ready. */
- IA_CSS_EVENT_TYPE_LACE_STATISTICS_DONE = 1 << 10,
+ IA_CSS_EVENT_TYPE_LACE_STATISTICS_DONE = BIT(10),
/** Indication that LACE statistics are available. */
- IA_CSS_EVENT_TYPE_ACC_STAGE_COMPLETE = 1 << 11,
+ IA_CSS_EVENT_TYPE_ACC_STAGE_COMPLETE = BIT(11),
/** Extension stage complete. */
- IA_CSS_EVENT_TYPE_TIMER = 1 << 12,
+ IA_CSS_EVENT_TYPE_TIMER = BIT(12),
/** Timer event for measuring the SP side latencies. It contains the
32-bit timer value from the SP */
- IA_CSS_EVENT_TYPE_PORT_EOF = 1 << 13,
+ IA_CSS_EVENT_TYPE_PORT_EOF = BIT(13),
/** End Of Frame event, sent when in buffered sensor mode. */
- IA_CSS_EVENT_TYPE_FW_WARNING = 1 << 14,
+ IA_CSS_EVENT_TYPE_FW_WARNING = BIT(14),
/** Performance warning encounter by FW */
- IA_CSS_EVENT_TYPE_FW_ASSERT = 1 << 15,
+ IA_CSS_EVENT_TYPE_FW_ASSERT = BIT(15),
/** Assertion hit by FW */
};
diff --git a/drivers/staging/media/atomisp/pci/ia_css_irq.h b/drivers/staging/media/atomisp/pci/ia_css_irq.h
index 3b81a39cfe97..26b1b3c8ba62 100644
--- a/drivers/staging/media/atomisp/pci/ia_css_irq.h
+++ b/drivers/staging/media/atomisp/pci/ia_css_irq.h
@@ -23,6 +23,7 @@
#include "ia_css_err.h"
#include "ia_css_pipe_public.h"
#include "ia_css_input_port.h"
+#include <linux/bits.h>
/* Interrupt types, these enumerate all supported interrupt types.
*/
@@ -46,49 +47,49 @@ enum ia_css_irq_type {
* (SW) interrupts
*/
enum ia_css_irq_info {
- IA_CSS_IRQ_INFO_CSS_RECEIVER_ERROR = 1 << 0,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_ERROR = BIT(0),
/** the css receiver has encountered an error */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_FIFO_OVERFLOW = 1 << 1,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_FIFO_OVERFLOW = BIT(1),
/** the FIFO in the csi receiver has overflown */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_SOF = 1 << 2,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_SOF = BIT(2),
/** the css receiver received the start of frame */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_EOF = 1 << 3,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_EOF = BIT(3),
/** the css receiver received the end of frame */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_SOL = 1 << 4,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_SOL = BIT(4),
/** the css receiver received the start of line */
- IA_CSS_IRQ_INFO_EVENTS_READY = 1 << 5,
+ IA_CSS_IRQ_INFO_EVENTS_READY = BIT(5),
/** One or more events are available in the PSYS event queue */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_EOL = 1 << 6,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_EOL = BIT(6),
/** the css receiver received the end of line */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_SIDEBAND_CHANGED = 1 << 7,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_SIDEBAND_CHANGED = BIT(7),
/** the css receiver received a change in side band signals */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_GEN_SHORT_0 = 1 << 8,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_GEN_SHORT_0 = BIT(8),
/** generic short packets (0) */
- IA_CSS_IRQ_INFO_CSS_RECEIVER_GEN_SHORT_1 = 1 << 9,
+ IA_CSS_IRQ_INFO_CSS_RECEIVER_GEN_SHORT_1 = BIT(9),
/** generic short packets (1) */
- IA_CSS_IRQ_INFO_IF_PRIM_ERROR = 1 << 10,
+ IA_CSS_IRQ_INFO_IF_PRIM_ERROR = BIT(10),
/** the primary input formatter (A) has encountered an error */
- IA_CSS_IRQ_INFO_IF_PRIM_B_ERROR = 1 << 11,
+ IA_CSS_IRQ_INFO_IF_PRIM_B_ERROR = BIT(11),
/** the primary input formatter (B) has encountered an error */
- IA_CSS_IRQ_INFO_IF_SEC_ERROR = 1 << 12,
+ IA_CSS_IRQ_INFO_IF_SEC_ERROR = BIT(12),
/** the secondary input formatter has encountered an error */
- IA_CSS_IRQ_INFO_STREAM_TO_MEM_ERROR = 1 << 13,
+ IA_CSS_IRQ_INFO_STREAM_TO_MEM_ERROR = BIT(13),
/** the stream-to-memory device has encountered an error */
- IA_CSS_IRQ_INFO_SW_0 = 1 << 14,
+ IA_CSS_IRQ_INFO_SW_0 = BIT(14),
/** software interrupt 0 */
- IA_CSS_IRQ_INFO_SW_1 = 1 << 15,
+ IA_CSS_IRQ_INFO_SW_1 = BIT(15),
/** software interrupt 1 */
- IA_CSS_IRQ_INFO_SW_2 = 1 << 16,
+ IA_CSS_IRQ_INFO_SW_2 = BIT(16),
/** software interrupt 2 */
- IA_CSS_IRQ_INFO_ISP_BINARY_STATISTICS_READY = 1 << 17,
+ IA_CSS_IRQ_INFO_ISP_BINARY_STATISTICS_READY = BIT(17),
/** ISP binary statistics are ready */
- IA_CSS_IRQ_INFO_INPUT_SYSTEM_ERROR = 1 << 18,
+ IA_CSS_IRQ_INFO_INPUT_SYSTEM_ERROR = BIT(18),
/** the input system in in error */
- IA_CSS_IRQ_INFO_IF_ERROR = 1 << 19,
+ IA_CSS_IRQ_INFO_IF_ERROR = BIT(19),
/** the input formatter in in error */
- IA_CSS_IRQ_INFO_DMA_ERROR = 1 << 20,
+ IA_CSS_IRQ_INFO_DMA_ERROR = BIT(20),
/** the dma in in error */
- IA_CSS_IRQ_INFO_ISYS_EVENTS_READY = 1 << 21,
+ IA_CSS_IRQ_INFO_ISYS_EVENTS_READY = BIT(21),
/** end-of-frame events are ready in the isys_event queue */
};
@@ -103,23 +104,23 @@ enum ia_css_irq_info {
* different receiver types, or possibly none in case of tests systems.
*/
enum ia_css_rx_irq_info {
- IA_CSS_RX_IRQ_INFO_BUFFER_OVERRUN = 1U << 0, /** buffer overrun */
- IA_CSS_RX_IRQ_INFO_ENTER_SLEEP_MODE = 1U << 1, /** entering sleep mode */
- IA_CSS_RX_IRQ_INFO_EXIT_SLEEP_MODE = 1U << 2, /** exited sleep mode */
- IA_CSS_RX_IRQ_INFO_ECC_CORRECTED = 1U << 3, /** ECC corrected */
- IA_CSS_RX_IRQ_INFO_ERR_SOT = 1U << 4,
+ IA_CSS_RX_IRQ_INFO_BUFFER_OVERRUN = BIT(0), /** buffer overrun */
+ IA_CSS_RX_IRQ_INFO_ENTER_SLEEP_MODE = BIT(1), /** entering sleep mode */
+ IA_CSS_RX_IRQ_INFO_EXIT_SLEEP_MODE = BIT(2), /** exited sleep mode */
+ IA_CSS_RX_IRQ_INFO_ECC_CORRECTED = BIT(3), /** ECC corrected */
+ IA_CSS_RX_IRQ_INFO_ERR_SOT = BIT(4),
/** Start of transmission */
- IA_CSS_RX_IRQ_INFO_ERR_SOT_SYNC = 1U << 5, /** SOT sync (??) */
- IA_CSS_RX_IRQ_INFO_ERR_CONTROL = 1U << 6, /** Control (??) */
- IA_CSS_RX_IRQ_INFO_ERR_ECC_DOUBLE = 1U << 7, /** Double ECC */
- IA_CSS_RX_IRQ_INFO_ERR_CRC = 1U << 8, /** CRC error */
- IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ID = 1U << 9, /** Unknown ID */
- IA_CSS_RX_IRQ_INFO_ERR_FRAME_SYNC = 1U << 10,/** Frame sync error */
- IA_CSS_RX_IRQ_INFO_ERR_FRAME_DATA = 1U << 11,/** Frame data error */
- IA_CSS_RX_IRQ_INFO_ERR_DATA_TIMEOUT = 1U << 12,/** Timeout occurred */
- IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ESC = 1U << 13,/** Unknown escape seq. */
- IA_CSS_RX_IRQ_INFO_ERR_LINE_SYNC = 1U << 14,/** Line Sync error */
- IA_CSS_RX_IRQ_INFO_INIT_TIMEOUT = 1U << 15,
+ IA_CSS_RX_IRQ_INFO_ERR_SOT_SYNC = BIT(5), /** SOT sync (??) */
+ IA_CSS_RX_IRQ_INFO_ERR_CONTROL = BIT(6), /** Control (??) */
+ IA_CSS_RX_IRQ_INFO_ERR_ECC_DOUBLE = BIT(7), /** Double ECC */
+ IA_CSS_RX_IRQ_INFO_ERR_CRC = BIT(8), /** CRC error */
+ IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ID = BIT(9), /** Unknown ID */
+ IA_CSS_RX_IRQ_INFO_ERR_FRAME_SYNC = BIT(10), /** Frame sync error */
+ IA_CSS_RX_IRQ_INFO_ERR_FRAME_DATA = BIT(11), /** Frame data error */
+ IA_CSS_RX_IRQ_INFO_ERR_DATA_TIMEOUT = BIT(12), /** Timeout occurred */
+ IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ESC = BIT(13), /** Unknown escape seq. */
+ IA_CSS_RX_IRQ_INFO_ERR_LINE_SYNC = BIT(14), /** Line Sync error */
+ IA_CSS_RX_IRQ_INFO_INIT_TIMEOUT = BIT(15),
};
/* Interrupt info structure. This structure contains information about an
diff --git a/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h b/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h
index e37ef4232c55..fff89e9b4b01 100644
--- a/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h
+++ b/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h
@@ -20,6 +20,7 @@
#include <type_support.h>
#include <linux/stdarg.h>
+#include <linux/bits.h>
#include "ia_css_types.h"
#include "ia_css_binary.h"
#include "ia_css_frame_public.h"
@@ -53,21 +54,21 @@ extern int dbg_level;
* Values can be combined to dump a combination of sets.
*/
enum ia_css_debug_enable_param_dump {
- IA_CSS_DEBUG_DUMP_FPN = 1 << 0, /** FPN table */
- IA_CSS_DEBUG_DUMP_OB = 1 << 1, /** OB table */
- IA_CSS_DEBUG_DUMP_SC = 1 << 2, /** Shading table */
- IA_CSS_DEBUG_DUMP_WB = 1 << 3, /** White balance */
- IA_CSS_DEBUG_DUMP_DP = 1 << 4, /** Defect Pixel */
- IA_CSS_DEBUG_DUMP_BNR = 1 << 5, /** Bayer Noise Reductions */
- IA_CSS_DEBUG_DUMP_S3A = 1 << 6, /** 3A Statistics */
- IA_CSS_DEBUG_DUMP_DE = 1 << 7, /** De Mosaicing */
- IA_CSS_DEBUG_DUMP_YNR = 1 << 8, /** Luma Noise Reduction */
- IA_CSS_DEBUG_DUMP_CSC = 1 << 9, /** Color Space Conversion */
- IA_CSS_DEBUG_DUMP_GC = 1 << 10, /** Gamma Correction */
- IA_CSS_DEBUG_DUMP_TNR = 1 << 11, /** Temporal Noise Reduction */
- IA_CSS_DEBUG_DUMP_ANR = 1 << 12, /** Advanced Noise Reduction */
- IA_CSS_DEBUG_DUMP_CE = 1 << 13, /** Chroma Enhancement */
- IA_CSS_DEBUG_DUMP_ALL = 1 << 14 /** Dump all device parameters */
+ IA_CSS_DEBUG_DUMP_FPN = BIT(0), /** FPN table */
+ IA_CSS_DEBUG_DUMP_OB = BIT(1), /** OB table */
+ IA_CSS_DEBUG_DUMP_SC = BIT(2), /** Shading table */
+ IA_CSS_DEBUG_DUMP_WB = BIT(3), /** White balance */
+ IA_CSS_DEBUG_DUMP_DP = BIT(4), /** Defect Pixel */
+ IA_CSS_DEBUG_DUMP_BNR = BIT(5), /** Bayer Noise Reductions */
+ IA_CSS_DEBUG_DUMP_S3A = BIT(6), /** 3A Statistics */
+ IA_CSS_DEBUG_DUMP_DE = BIT(7), /** De Mosaicing */
+ IA_CSS_DEBUG_DUMP_YNR = BIT(8), /** Luma Noise Reduction */
+ IA_CSS_DEBUG_DUMP_CSC = BIT(9), /** Color Space Conversion */
+ IA_CSS_DEBUG_DUMP_GC = BIT(10), /** Gamma Correction */
+ IA_CSS_DEBUG_DUMP_TNR = BIT(11), /** Temporal Noise Reduction */
+ IA_CSS_DEBUG_DUMP_ANR = BIT(12), /** Advanced Noise Reduction */
+ IA_CSS_DEBUG_DUMP_CE = BIT(13), /** Chroma Enhancement */
+ IA_CSS_DEBUG_DUMP_ALL = BIT(14), /** Dump all device parameters */
};
#define IA_CSS_ERROR(fmt, ...) \
--
2.30.2
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v3] staging: media: atomisp: Use BIT macro instead of left shifting
2022-02-06 18:52 ` [PATCH v3] " Moses Christopher Bollavarapu
@ 2022-02-07 12:30 ` Andy Shevchenko
0 siblings, 0 replies; 9+ messages in thread
From: Andy Shevchenko @ 2022-02-07 12:30 UTC (permalink / raw)
To: Moses Christopher Bollavarapu
Cc: gregkh, joe, kitakar, laurent.pinchart, linux-kernel,
linux-media, linux-staging, mchehab, sakari.ailus,
tomi.valkeinen
On Sun, Feb 06, 2022 at 07:52:32PM +0100, Moses Christopher Bollavarapu wrote:
> There is a BIT(nr) macro available in Linux Kernel,
> which does the same thing.
> Example: BIT(7) = (1UL << 7)
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Signed-off-by: Moses Christopher Bollavarapu <mosescb.dev@gmail.com>
> ---
> V2 -> V3: - Remove GENMASK changes from this patch
> - Minor style changes
> V1 -> V2: - Use GENMASK where-ever applicable
> - Add linux/bits.h header to modified files
>
> .../staging/media/atomisp/pci/atomisp_v4l2.c | 19 ++---
> .../media/atomisp/pci/ia_css_acc_types.h | 5 +-
> .../staging/media/atomisp/pci/ia_css_env.h | 9 ++-
> .../media/atomisp/pci/ia_css_event_public.h | 33 ++++----
> .../staging/media/atomisp/pci/ia_css_irq.h | 77 ++++++++++---------
> .../runtime/debug/interface/ia_css_debug.h | 31 ++++----
> 6 files changed, 90 insertions(+), 84 deletions(-)
>
> diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
> index 1b240891a6e2..ce44c880fb8b 100644
> --- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
> +++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
> @@ -25,6 +25,7 @@
> #include <linux/delay.h>
> #include <linux/dmi.h>
> #include <linux/interrupt.h>
> +#include <linux/bits.h>
Probably this can be still ordered.
> #include <asm/iosf_mbi.h>
>
> @@ -626,11 +627,11 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)
> * IRQ, if so, waiting for it to be served
> */
> pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
> - irq = irq & 1 << INTR_IIR;
> + irq &= BIT(INTR_IIR);
> pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
>
> pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
> - if (!(irq & (1 << INTR_IIR)))
> + if (!(irq & BIT(INTR_IIR)))
> goto done;
>
> atomisp_css2_hw_store_32(MRFLD_INTR_CLEAR_REG, 0xFFFFFFFF);
> @@ -643,11 +644,11 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)
> return -EAGAIN;
> } else {
> pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
> - irq = irq & 1 << INTR_IIR;
> + irq &= BIT(INTR_IIR);
> pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
>
> pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
> - if (!(irq & (1 << INTR_IIR))) {
> + if (!(irq & BIT(INTR_IIR))) {
> atomisp_css2_hw_store_32(MRFLD_INTR_ENABLE_REG, 0x0);
> goto done;
> }
> @@ -666,7 +667,7 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)
> * HW sighting:4568410.
> */
> pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
> - irq &= ~(1 << INTR_IER);
> + irq &= ~BIT(INTR_IER);
> pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
>
> atomisp_msi_irq_uninit(isp);
> @@ -1549,7 +1550,7 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
> start = pci_resource_start(pdev, ATOM_ISP_PCI_BAR);
> dev_dbg(&pdev->dev, "start: 0x%x\n", start);
>
> - err = pcim_iomap_regions(pdev, 1 << ATOM_ISP_PCI_BAR, pci_name(pdev));
> + err = pcim_iomap_regions(pdev, BIT(ATOM_ISP_PCI_BAR), pci_name(pdev));
> if (err) {
> dev_err(&pdev->dev, "Failed to I/O memory remapping (%d)\n", err);
> goto ioremap_fail;
> @@ -1838,11 +1839,11 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
> */
>
> pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
> - irq = irq & 1 << INTR_IIR;
> + irq &= BIT(INTR_IIR);
> pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
>
> pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
> - irq &= ~(1 << INTR_IER);
> + irq &= ~BIT(INTR_IER);
> pci_write_config_dword(pdev, PCI_INTERRUPT_CTRL, irq);
>
> atomisp_msi_irq_uninit(isp);
> @@ -1854,7 +1855,7 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i
> dev_err(&pdev->dev, "Failed to switch off ISP\n");
>
> atomisp_dev_alloc_fail:
> - pcim_iounmap_regions(pdev, 1 << ATOM_ISP_PCI_BAR);
> + pcim_iounmap_regions(pdev, BIT(ATOM_ISP_PCI_BAR));
>
> ioremap_fail:
> return err;
> diff --git a/drivers/staging/media/atomisp/pci/ia_css_acc_types.h b/drivers/staging/media/atomisp/pci/ia_css_acc_types.h
> index d0ce2f8ba653..a20879aedef6 100644
> --- a/drivers/staging/media/atomisp/pci/ia_css_acc_types.h
> +++ b/drivers/staging/media/atomisp/pci/ia_css_acc_types.h
> @@ -24,6 +24,7 @@
> #include <type_support.h>
> #include <platform_support.h>
> #include <debug_global.h>
> +#include <linux/bits.h>
Ditto.
> #include "ia_css_types.h"
> #include "ia_css_frame_format.h"
> @@ -466,7 +467,7 @@ struct ia_css_acc_fw {
>
> enum ia_css_sp_sleep_mode {
> SP_DISABLE_SLEEP_MODE = 0,
> - SP_SLEEP_AFTER_FRAME = 1 << 0,
> - SP_SLEEP_AFTER_IRQ = 1 << 1
> + SP_SLEEP_AFTER_FRAME = BIT(0),
> + SP_SLEEP_AFTER_IRQ = BIT(1),
> };
> #endif /* _IA_CSS_ACC_TYPES_H */
> diff --git a/drivers/staging/media/atomisp/pci/ia_css_env.h b/drivers/staging/media/atomisp/pci/ia_css_env.h
> index 3b89bbd837a0..42bb1ec1c22d 100644
> --- a/drivers/staging/media/atomisp/pci/ia_css_env.h
> +++ b/drivers/staging/media/atomisp/pci/ia_css_env.h
> @@ -18,6 +18,7 @@
>
> #include <type_support.h>
> #include <linux/stdarg.h> /* va_list */
> +#include <linux/bits.h>
Ditto.
> #include "ia_css_types.h"
> #include "ia_css_acc_types.h"
>
> @@ -28,10 +29,10 @@
>
> /* Memory allocation attributes, for use in ia_css_css_mem_env. */
> enum ia_css_mem_attr {
> - IA_CSS_MEM_ATTR_CACHED = 1 << 0,
> - IA_CSS_MEM_ATTR_ZEROED = 1 << 1,
> - IA_CSS_MEM_ATTR_PAGEALIGN = 1 << 2,
> - IA_CSS_MEM_ATTR_CONTIGUOUS = 1 << 3,
> + IA_CSS_MEM_ATTR_CACHED = BIT(0),
> + IA_CSS_MEM_ATTR_ZEROED = BIT(1),
> + IA_CSS_MEM_ATTR_PAGEALIGN = BIT(2),
> + IA_CSS_MEM_ATTR_CONTIGUOUS = BIT(3),
> };
>
> /* Environment with function pointers for local IA memory allocation.
> diff --git a/drivers/staging/media/atomisp/pci/ia_css_event_public.h b/drivers/staging/media/atomisp/pci/ia_css_event_public.h
> index 76219d741d2e..b052648d4fc2 100644
> --- a/drivers/staging/media/atomisp/pci/ia_css_event_public.h
> +++ b/drivers/staging/media/atomisp/pci/ia_css_event_public.h
> @@ -24,6 +24,7 @@
> #include <ia_css_err.h> /* ia_css_err */
> #include <ia_css_types.h> /* ia_css_pipe */
> #include <ia_css_timer.h> /* ia_css_timer */
> +#include <linux/bits.h>
Ditto.
> /* The event type, distinguishes the kind of events that
> * can are generated by the CSS system.
> @@ -35,38 +36,38 @@
> * 4) "enum ia_css_event_type convert_event_sp_to_host_domain" (sh_css.c)
> */
> enum ia_css_event_type {
> - IA_CSS_EVENT_TYPE_OUTPUT_FRAME_DONE = 1 << 0,
> + IA_CSS_EVENT_TYPE_OUTPUT_FRAME_DONE = BIT(0),
> /** Output frame ready. */
> - IA_CSS_EVENT_TYPE_SECOND_OUTPUT_FRAME_DONE = 1 << 1,
> + IA_CSS_EVENT_TYPE_SECOND_OUTPUT_FRAME_DONE = BIT(1),
> /** Second output frame ready. */
> - IA_CSS_EVENT_TYPE_VF_OUTPUT_FRAME_DONE = 1 << 2,
> + IA_CSS_EVENT_TYPE_VF_OUTPUT_FRAME_DONE = BIT(2),
> /** Viewfinder Output frame ready. */
> - IA_CSS_EVENT_TYPE_SECOND_VF_OUTPUT_FRAME_DONE = 1 << 3,
> + IA_CSS_EVENT_TYPE_SECOND_VF_OUTPUT_FRAME_DONE = BIT(3),
> /** Second viewfinder Output frame ready. */
> - IA_CSS_EVENT_TYPE_3A_STATISTICS_DONE = 1 << 4,
> + IA_CSS_EVENT_TYPE_3A_STATISTICS_DONE = BIT(4),
> /** Indication that 3A statistics are available. */
> - IA_CSS_EVENT_TYPE_DIS_STATISTICS_DONE = 1 << 5,
> + IA_CSS_EVENT_TYPE_DIS_STATISTICS_DONE = BIT(5),
> /** Indication that DIS statistics are available. */
> - IA_CSS_EVENT_TYPE_PIPELINE_DONE = 1 << 6,
> + IA_CSS_EVENT_TYPE_PIPELINE_DONE = BIT(6),
> /** Pipeline Done event, sent after last pipeline stage. */
> - IA_CSS_EVENT_TYPE_FRAME_TAGGED = 1 << 7,
> + IA_CSS_EVENT_TYPE_FRAME_TAGGED = BIT(7),
> /** Frame tagged. */
> - IA_CSS_EVENT_TYPE_INPUT_FRAME_DONE = 1 << 8,
> + IA_CSS_EVENT_TYPE_INPUT_FRAME_DONE = BIT(8),
> /** Input frame ready. */
> - IA_CSS_EVENT_TYPE_METADATA_DONE = 1 << 9,
> + IA_CSS_EVENT_TYPE_METADATA_DONE = BIT(9),
> /** Metadata ready. */
> - IA_CSS_EVENT_TYPE_LACE_STATISTICS_DONE = 1 << 10,
> + IA_CSS_EVENT_TYPE_LACE_STATISTICS_DONE = BIT(10),
> /** Indication that LACE statistics are available. */
> - IA_CSS_EVENT_TYPE_ACC_STAGE_COMPLETE = 1 << 11,
> + IA_CSS_EVENT_TYPE_ACC_STAGE_COMPLETE = BIT(11),
> /** Extension stage complete. */
> - IA_CSS_EVENT_TYPE_TIMER = 1 << 12,
> + IA_CSS_EVENT_TYPE_TIMER = BIT(12),
> /** Timer event for measuring the SP side latencies. It contains the
> 32-bit timer value from the SP */
> - IA_CSS_EVENT_TYPE_PORT_EOF = 1 << 13,
> + IA_CSS_EVENT_TYPE_PORT_EOF = BIT(13),
> /** End Of Frame event, sent when in buffered sensor mode. */
> - IA_CSS_EVENT_TYPE_FW_WARNING = 1 << 14,
> + IA_CSS_EVENT_TYPE_FW_WARNING = BIT(14),
> /** Performance warning encounter by FW */
> - IA_CSS_EVENT_TYPE_FW_ASSERT = 1 << 15,
> + IA_CSS_EVENT_TYPE_FW_ASSERT = BIT(15),
> /** Assertion hit by FW */
> };
>
> diff --git a/drivers/staging/media/atomisp/pci/ia_css_irq.h b/drivers/staging/media/atomisp/pci/ia_css_irq.h
> index 3b81a39cfe97..26b1b3c8ba62 100644
> --- a/drivers/staging/media/atomisp/pci/ia_css_irq.h
> +++ b/drivers/staging/media/atomisp/pci/ia_css_irq.h
> @@ -23,6 +23,7 @@
> #include "ia_css_err.h"
> #include "ia_css_pipe_public.h"
> #include "ia_css_input_port.h"
> +#include <linux/bits.h>
Ditto.
> /* Interrupt types, these enumerate all supported interrupt types.
> */
> @@ -46,49 +47,49 @@ enum ia_css_irq_type {
> * (SW) interrupts
> */
> enum ia_css_irq_info {
> - IA_CSS_IRQ_INFO_CSS_RECEIVER_ERROR = 1 << 0,
> + IA_CSS_IRQ_INFO_CSS_RECEIVER_ERROR = BIT(0),
> /** the css receiver has encountered an error */
> - IA_CSS_IRQ_INFO_CSS_RECEIVER_FIFO_OVERFLOW = 1 << 1,
> + IA_CSS_IRQ_INFO_CSS_RECEIVER_FIFO_OVERFLOW = BIT(1),
> /** the FIFO in the csi receiver has overflown */
> - IA_CSS_IRQ_INFO_CSS_RECEIVER_SOF = 1 << 2,
> + IA_CSS_IRQ_INFO_CSS_RECEIVER_SOF = BIT(2),
> /** the css receiver received the start of frame */
> - IA_CSS_IRQ_INFO_CSS_RECEIVER_EOF = 1 << 3,
> + IA_CSS_IRQ_INFO_CSS_RECEIVER_EOF = BIT(3),
> /** the css receiver received the end of frame */
> - IA_CSS_IRQ_INFO_CSS_RECEIVER_SOL = 1 << 4,
> + IA_CSS_IRQ_INFO_CSS_RECEIVER_SOL = BIT(4),
> /** the css receiver received the start of line */
> - IA_CSS_IRQ_INFO_EVENTS_READY = 1 << 5,
> + IA_CSS_IRQ_INFO_EVENTS_READY = BIT(5),
> /** One or more events are available in the PSYS event queue */
> - IA_CSS_IRQ_INFO_CSS_RECEIVER_EOL = 1 << 6,
> + IA_CSS_IRQ_INFO_CSS_RECEIVER_EOL = BIT(6),
> /** the css receiver received the end of line */
> - IA_CSS_IRQ_INFO_CSS_RECEIVER_SIDEBAND_CHANGED = 1 << 7,
> + IA_CSS_IRQ_INFO_CSS_RECEIVER_SIDEBAND_CHANGED = BIT(7),
> /** the css receiver received a change in side band signals */
> - IA_CSS_IRQ_INFO_CSS_RECEIVER_GEN_SHORT_0 = 1 << 8,
> + IA_CSS_IRQ_INFO_CSS_RECEIVER_GEN_SHORT_0 = BIT(8),
> /** generic short packets (0) */
> - IA_CSS_IRQ_INFO_CSS_RECEIVER_GEN_SHORT_1 = 1 << 9,
> + IA_CSS_IRQ_INFO_CSS_RECEIVER_GEN_SHORT_1 = BIT(9),
> /** generic short packets (1) */
> - IA_CSS_IRQ_INFO_IF_PRIM_ERROR = 1 << 10,
> + IA_CSS_IRQ_INFO_IF_PRIM_ERROR = BIT(10),
> /** the primary input formatter (A) has encountered an error */
> - IA_CSS_IRQ_INFO_IF_PRIM_B_ERROR = 1 << 11,
> + IA_CSS_IRQ_INFO_IF_PRIM_B_ERROR = BIT(11),
> /** the primary input formatter (B) has encountered an error */
> - IA_CSS_IRQ_INFO_IF_SEC_ERROR = 1 << 12,
> + IA_CSS_IRQ_INFO_IF_SEC_ERROR = BIT(12),
> /** the secondary input formatter has encountered an error */
> - IA_CSS_IRQ_INFO_STREAM_TO_MEM_ERROR = 1 << 13,
> + IA_CSS_IRQ_INFO_STREAM_TO_MEM_ERROR = BIT(13),
> /** the stream-to-memory device has encountered an error */
> - IA_CSS_IRQ_INFO_SW_0 = 1 << 14,
> + IA_CSS_IRQ_INFO_SW_0 = BIT(14),
> /** software interrupt 0 */
> - IA_CSS_IRQ_INFO_SW_1 = 1 << 15,
> + IA_CSS_IRQ_INFO_SW_1 = BIT(15),
> /** software interrupt 1 */
> - IA_CSS_IRQ_INFO_SW_2 = 1 << 16,
> + IA_CSS_IRQ_INFO_SW_2 = BIT(16),
> /** software interrupt 2 */
> - IA_CSS_IRQ_INFO_ISP_BINARY_STATISTICS_READY = 1 << 17,
> + IA_CSS_IRQ_INFO_ISP_BINARY_STATISTICS_READY = BIT(17),
> /** ISP binary statistics are ready */
> - IA_CSS_IRQ_INFO_INPUT_SYSTEM_ERROR = 1 << 18,
> + IA_CSS_IRQ_INFO_INPUT_SYSTEM_ERROR = BIT(18),
> /** the input system in in error */
> - IA_CSS_IRQ_INFO_IF_ERROR = 1 << 19,
> + IA_CSS_IRQ_INFO_IF_ERROR = BIT(19),
> /** the input formatter in in error */
> - IA_CSS_IRQ_INFO_DMA_ERROR = 1 << 20,
> + IA_CSS_IRQ_INFO_DMA_ERROR = BIT(20),
> /** the dma in in error */
> - IA_CSS_IRQ_INFO_ISYS_EVENTS_READY = 1 << 21,
> + IA_CSS_IRQ_INFO_ISYS_EVENTS_READY = BIT(21),
> /** end-of-frame events are ready in the isys_event queue */
> };
>
> @@ -103,23 +104,23 @@ enum ia_css_irq_info {
> * different receiver types, or possibly none in case of tests systems.
> */
> enum ia_css_rx_irq_info {
> - IA_CSS_RX_IRQ_INFO_BUFFER_OVERRUN = 1U << 0, /** buffer overrun */
> - IA_CSS_RX_IRQ_INFO_ENTER_SLEEP_MODE = 1U << 1, /** entering sleep mode */
> - IA_CSS_RX_IRQ_INFO_EXIT_SLEEP_MODE = 1U << 2, /** exited sleep mode */
> - IA_CSS_RX_IRQ_INFO_ECC_CORRECTED = 1U << 3, /** ECC corrected */
> - IA_CSS_RX_IRQ_INFO_ERR_SOT = 1U << 4,
> + IA_CSS_RX_IRQ_INFO_BUFFER_OVERRUN = BIT(0), /** buffer overrun */
> + IA_CSS_RX_IRQ_INFO_ENTER_SLEEP_MODE = BIT(1), /** entering sleep mode */
> + IA_CSS_RX_IRQ_INFO_EXIT_SLEEP_MODE = BIT(2), /** exited sleep mode */
> + IA_CSS_RX_IRQ_INFO_ECC_CORRECTED = BIT(3), /** ECC corrected */
> + IA_CSS_RX_IRQ_INFO_ERR_SOT = BIT(4),
> /** Start of transmission */
> - IA_CSS_RX_IRQ_INFO_ERR_SOT_SYNC = 1U << 5, /** SOT sync (??) */
> - IA_CSS_RX_IRQ_INFO_ERR_CONTROL = 1U << 6, /** Control (??) */
> - IA_CSS_RX_IRQ_INFO_ERR_ECC_DOUBLE = 1U << 7, /** Double ECC */
> - IA_CSS_RX_IRQ_INFO_ERR_CRC = 1U << 8, /** CRC error */
> - IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ID = 1U << 9, /** Unknown ID */
> - IA_CSS_RX_IRQ_INFO_ERR_FRAME_SYNC = 1U << 10,/** Frame sync error */
> - IA_CSS_RX_IRQ_INFO_ERR_FRAME_DATA = 1U << 11,/** Frame data error */
> - IA_CSS_RX_IRQ_INFO_ERR_DATA_TIMEOUT = 1U << 12,/** Timeout occurred */
> - IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ESC = 1U << 13,/** Unknown escape seq. */
> - IA_CSS_RX_IRQ_INFO_ERR_LINE_SYNC = 1U << 14,/** Line Sync error */
> - IA_CSS_RX_IRQ_INFO_INIT_TIMEOUT = 1U << 15,
> + IA_CSS_RX_IRQ_INFO_ERR_SOT_SYNC = BIT(5), /** SOT sync (??) */
> + IA_CSS_RX_IRQ_INFO_ERR_CONTROL = BIT(6), /** Control (??) */
> + IA_CSS_RX_IRQ_INFO_ERR_ECC_DOUBLE = BIT(7), /** Double ECC */
> + IA_CSS_RX_IRQ_INFO_ERR_CRC = BIT(8), /** CRC error */
> + IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ID = BIT(9), /** Unknown ID */
> + IA_CSS_RX_IRQ_INFO_ERR_FRAME_SYNC = BIT(10), /** Frame sync error */
> + IA_CSS_RX_IRQ_INFO_ERR_FRAME_DATA = BIT(11), /** Frame data error */
> + IA_CSS_RX_IRQ_INFO_ERR_DATA_TIMEOUT = BIT(12), /** Timeout occurred */
> + IA_CSS_RX_IRQ_INFO_ERR_UNKNOWN_ESC = BIT(13), /** Unknown escape seq. */
> + IA_CSS_RX_IRQ_INFO_ERR_LINE_SYNC = BIT(14), /** Line Sync error */
> + IA_CSS_RX_IRQ_INFO_INIT_TIMEOUT = BIT(15),
> };
>
> /* Interrupt info structure. This structure contains information about an
> diff --git a/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h b/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h
> index e37ef4232c55..fff89e9b4b01 100644
> --- a/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h
> +++ b/drivers/staging/media/atomisp/pci/runtime/debug/interface/ia_css_debug.h
> @@ -20,6 +20,7 @@
>
> #include <type_support.h>
> #include <linux/stdarg.h>
> +#include <linux/bits.h>
Ditto.
> #include "ia_css_types.h"
> #include "ia_css_binary.h"
> #include "ia_css_frame_public.h"
> @@ -53,21 +54,21 @@ extern int dbg_level;
> * Values can be combined to dump a combination of sets.
> */
> enum ia_css_debug_enable_param_dump {
> - IA_CSS_DEBUG_DUMP_FPN = 1 << 0, /** FPN table */
> - IA_CSS_DEBUG_DUMP_OB = 1 << 1, /** OB table */
> - IA_CSS_DEBUG_DUMP_SC = 1 << 2, /** Shading table */
> - IA_CSS_DEBUG_DUMP_WB = 1 << 3, /** White balance */
> - IA_CSS_DEBUG_DUMP_DP = 1 << 4, /** Defect Pixel */
> - IA_CSS_DEBUG_DUMP_BNR = 1 << 5, /** Bayer Noise Reductions */
> - IA_CSS_DEBUG_DUMP_S3A = 1 << 6, /** 3A Statistics */
> - IA_CSS_DEBUG_DUMP_DE = 1 << 7, /** De Mosaicing */
> - IA_CSS_DEBUG_DUMP_YNR = 1 << 8, /** Luma Noise Reduction */
> - IA_CSS_DEBUG_DUMP_CSC = 1 << 9, /** Color Space Conversion */
> - IA_CSS_DEBUG_DUMP_GC = 1 << 10, /** Gamma Correction */
> - IA_CSS_DEBUG_DUMP_TNR = 1 << 11, /** Temporal Noise Reduction */
> - IA_CSS_DEBUG_DUMP_ANR = 1 << 12, /** Advanced Noise Reduction */
> - IA_CSS_DEBUG_DUMP_CE = 1 << 13, /** Chroma Enhancement */
> - IA_CSS_DEBUG_DUMP_ALL = 1 << 14 /** Dump all device parameters */
> + IA_CSS_DEBUG_DUMP_FPN = BIT(0), /** FPN table */
> + IA_CSS_DEBUG_DUMP_OB = BIT(1), /** OB table */
> + IA_CSS_DEBUG_DUMP_SC = BIT(2), /** Shading table */
> + IA_CSS_DEBUG_DUMP_WB = BIT(3), /** White balance */
> + IA_CSS_DEBUG_DUMP_DP = BIT(4), /** Defect Pixel */
> + IA_CSS_DEBUG_DUMP_BNR = BIT(5), /** Bayer Noise Reductions */
> + IA_CSS_DEBUG_DUMP_S3A = BIT(6), /** 3A Statistics */
> + IA_CSS_DEBUG_DUMP_DE = BIT(7), /** De Mosaicing */
> + IA_CSS_DEBUG_DUMP_YNR = BIT(8), /** Luma Noise Reduction */
> + IA_CSS_DEBUG_DUMP_CSC = BIT(9), /** Color Space Conversion */
> + IA_CSS_DEBUG_DUMP_GC = BIT(10), /** Gamma Correction */
> + IA_CSS_DEBUG_DUMP_TNR = BIT(11), /** Temporal Noise Reduction */
> + IA_CSS_DEBUG_DUMP_ANR = BIT(12), /** Advanced Noise Reduction */
> + IA_CSS_DEBUG_DUMP_CE = BIT(13), /** Chroma Enhancement */
> + IA_CSS_DEBUG_DUMP_ALL = BIT(14), /** Dump all device parameters */
> };
>
> #define IA_CSS_ERROR(fmt, ...) \
> --
> 2.30.2
>
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] staging: media: atomisp: Use BIT macro instead of left shifting
2022-01-29 11:38 [PATCH] staging: media: atomisp: Use BIT macro instead of left shifting Moses Christopher Bollavarapu
2022-01-29 16:35 ` Andy Shevchenko
@ 2022-01-29 16:36 ` Joe Perches
1 sibling, 0 replies; 9+ messages in thread
From: Joe Perches @ 2022-01-29 16:36 UTC (permalink / raw)
To: Moses Christopher Bollavarapu, linux-media, linux-staging, linux-kernel
Cc: Mauro Carvalho Chehab, Sakari Ailus, Greg Kroah-Hartman,
Hans Verkuil, Yizhuo, Laurent Pinchart, Tomi Valkeinen,
Colin Ian King, Kaixu Xia, Baokun Li, Andy Shevchenko,
Aditya Srivastava, Aline Santana Cordeiro, Tsuchiya Yuto,
Yang Yingliang, Alan, Souptick Joarder, Dan Carpenter,
Masahiro Yamada, Alexey Dobriyan, Ard Biesheuvel,
Rafael J. Wysocki
On Sat, 2022-01-29 at 12:38 +0100, Moses Christopher Bollavarapu wrote:
> There is a BIT(nr) macro available in Linux Kernel,
> which does the same thing.
>
> Example: BIT(7) = (1UL << 7)
[]
> diff --git a/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c b/drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c
[]
> @@ -548,7 +548,7 @@ static long __ov5693_set_exposure(struct v4l2_subdev *sd, int coarse_itg,
> * The way is to write coarse_itg/2 to the reg, meanwhile write 2*hts
> * to the reg.
> */
> - if (coarse_itg > (1 << 15)) {
> + if (coarse_itg > BIT(15)) {
Not all uses of 1 left shift should be converted to BIT
Especially when used with a non-bit value comparison test.
This is a size and not a bit position so this is likely not appropriate.
It'd probably be better as
if (coarse_itg > 0x8000)
or
if (coarse_itg > 32768)
or
if (coarse_itg > SOME_CONSTANT_DEFINE)
> diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
[]
> @@ -1913,11 +1913,11 @@ void atomisp_css_input_set_mode(struct atomisp_sub_device *asd,
> &asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL].stream_config;
> s_config->mode = IA_CSS_INPUT_MODE_TPG;
> s_config->source.tpg.mode = IA_CSS_TPG_MODE_CHECKERBOARD;
> - s_config->source.tpg.x_mask = (1 << 4) - 1;
> + s_config->source.tpg.x_mask = BIT(4) - 1;
These should probably use GENMASK
> diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c
[]
> @@ -626,11 +626,11 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)
> * IRQ, if so, waiting for it to be served
> */
> pci_read_config_dword(pdev, PCI_INTERRUPT_CTRL, &irq);
> - irq = irq & 1 << INTR_IIR;
> + irq = irq & BIT(INTR_IIR);
The rest seems sensible.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-02-07 12:50 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-29 11:38 [PATCH] staging: media: atomisp: Use BIT macro instead of left shifting Moses Christopher Bollavarapu
2022-01-29 16:35 ` Andy Shevchenko
2022-01-30 18:06 ` [PATCH v2] " Moses Christopher Bollavarapu
2022-01-31 7:36 ` Dan Carpenter
2022-01-31 13:24 ` Randy Dunlap
2022-01-31 13:33 ` Joe Perches
2022-02-06 18:52 ` [PATCH v3] " Moses Christopher Bollavarapu
2022-02-07 12:30 ` Andy Shevchenko
2022-01-29 16:36 ` [PATCH] " Joe Perches
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).