| Message ID | bcb81f910f03eef4ed964d39883df0d33c762f9f.1681727493.git.geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: Add common header file with JPEG marker definitions | expand |
Hi, W dniu 17.04.2023 o 12:31, Geert Uytterhoeven pisze: > When compile-testing on mips/RB532 with W=1: > > arch/mips/include/asm/mach-rc32434/rb.h:13: note: this is the location of the previous definition > 13 | #define RST (1 << 15) > | > drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:15: warning: "RST" redefined > 15 | #define RST 0xd0 > | > drivers/media/platform/renesas/rcar_jpu.c:77: warning: "RST" redefined > 77 | #define RST 0xd0 > | > > "RST" is indeed a name too short to be conflict-free. > > Fix this by creating a common <media/jpeg.h> header file, containing > definitions for all JPEG markers used, prefixed by "JPEG_MARKER_", based > on the existing private definitions in the Samsung S5P JPEG driver, and > convert all affected drivers. > > Reported-by: kernel test robot <lkp@intel.com> > Link: https://lore.kernel.org/oe-kbuild-all/202304152346.hJOPxPRh-lkp@intel.com/ > Link: https://lore.kernel.org/oe-kbuild-all/202304150059.bHUyuriy-lkp@intel.com/ > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> for the s5p-jpeg part: Acked-by: Andrzej Pietrasiewicz <andrzejtp2010@gmail.com> > --- > No change in generated code before/after. > --- > .../mediatek/jpeg/mtk_jpeg_dec_parse.c | 17 ++---- > drivers/media/platform/renesas/rcar_jpu.c | 55 +++++++++---------- > .../platform/samsung/s5p-jpeg/jpeg-core.h | 12 +--- > include/media/jpeg.h | 20 +++++++ > 4 files changed, 52 insertions(+), 52 deletions(-) > create mode 100644 include/media/jpeg.h > > diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c > index b95c45791c29edc5..bb9cdc9e0e90912b 100644 > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c > @@ -7,15 +7,10 @@ > > #include <linux/kernel.h> > #include <linux/videodev2.h> > +#include <media/jpeg.h> > > #include "mtk_jpeg_dec_parse.h" > > -#define TEM 0x01 > -#define SOF0 0xc0 > -#define RST 0xd0 > -#define SOI 0xd8 > -#define EOI 0xd9 > - > struct mtk_jpeg_stream { > u8 *addr; > u32 size; > @@ -83,7 +78,7 @@ static bool mtk_jpeg_do_parse(struct mtk_jpeg_dec_param *param, u8 *src_addr_va, > > length = 0; > switch (byte) { > - case SOF0: > + case JPEG_MARKER_SOF0: > /* length */ > if (read_word_be(&stream, &word)) > break; > @@ -123,10 +118,10 @@ static bool mtk_jpeg_do_parse(struct mtk_jpeg_dec_param *param, u8 *src_addr_va, > > notfound = !(i == param->comp_num); > break; > - case RST ... RST + 7: > - case SOI: > - case EOI: > - case TEM: > + case JPEG_MARKER_RST ... JPEG_MARKER_RST + 7: > + case JPEG_MARKER_SOI: > + case JPEG_MARKER_EOI: > + case JPEG_MARKER_TEM: > break; > default: > if (read_word_be(&stream, &word)) > diff --git a/drivers/media/platform/renesas/rcar_jpu.c b/drivers/media/platform/renesas/rcar_jpu.c > index d1dda68bfb5e2087..25d3f0376d6709ba 100644 > --- a/drivers/media/platform/renesas/rcar_jpu.c > +++ b/drivers/media/platform/renesas/rcar_jpu.c > @@ -28,6 +28,7 @@ > #include <linux/spinlock.h> > #include <linux/string.h> > #include <linux/videodev2.h> > +#include <media/jpeg.h> > #include <media/v4l2-ctrls.h> > #include <media/v4l2-device.h> > #include <media/v4l2-event.h> > @@ -71,19 +72,6 @@ > #define JPU_JPEG_DEFAULT_422_PIX_FMT V4L2_PIX_FMT_NV16M > #define JPU_JPEG_DEFAULT_420_PIX_FMT V4L2_PIX_FMT_NV12M > > -/* JPEG markers */ > -#define TEM 0x01 > -#define SOF0 0xc0 > -#define RST 0xd0 > -#define SOI 0xd8 > -#define EOI 0xd9 > -#define DHP 0xde > -#define DHT 0xc4 > -#define COM 0xfe > -#define DQT 0xdb > -#define DRI 0xdd > -#define APP0 0xe0 > - > #define JPU_RESET_TIMEOUT 100 /* ms */ > #define JPU_JOB_TIMEOUT 300 /* ms */ > #define JPU_MAX_QUALITY 4 > @@ -330,26 +318,32 @@ static const u8 zigzag[] = { > * Huffman tables; Padding with 0xff (33.3.27 R01UH0501EJ0100 Rev.1.00) > */ > #define JPU_JPEG_HDR_BLOB { \ > - 0xff, SOI, 0xff, DQT, 0x00, JPU_JPEG_QTBL_SIZE + 0x3, JPU_JPEG_LUM, \ > - [JPU_JPEG_QTBL_LUM_OFFSET ... \ > + 0xff, JPEG_MARKER_SOI, 0xff, JPEG_MARKER_DQT, 0x00, \ > + JPU_JPEG_QTBL_SIZE + 0x3, JPU_JPEG_LUM, \ > + [JPU_JPEG_QTBL_LUM_OFFSET ... \ > JPU_JPEG_QTBL_LUM_OFFSET + JPU_JPEG_QTBL_SIZE - 1] = 0x00, \ > - 0xff, DQT, 0x00, JPU_JPEG_QTBL_SIZE + 0x3, JPU_JPEG_CHR, \ > + 0xff, JPEG_MARKER_DQT, 0x00, JPU_JPEG_QTBL_SIZE + 0x3, JPU_JPEG_CHR, \ > [JPU_JPEG_QTBL_CHR_OFFSET ... JPU_JPEG_QTBL_CHR_OFFSET + \ > - JPU_JPEG_QTBL_SIZE - 1] = 0x00, 0xff, SOF0, 0x00, 0x11, 0x08, \ > + JPU_JPEG_QTBL_SIZE - 1] = 0x00, \ > + 0xff, JPEG_MARKER_SOF0, 0x00, 0x11, 0x08, \ > [JPU_JPEG_HEIGHT_OFFSET ... JPU_JPEG_HEIGHT_OFFSET + 1] = 0x00, \ > [JPU_JPEG_WIDTH_OFFSET ... JPU_JPEG_WIDTH_OFFSET + 1] = 0x00, \ > 0x03, 0x01, [JPU_JPEG_SUBS_OFFSET] = 0x00, JPU_JPEG_LUM, \ > 0x02, 0x11, JPU_JPEG_CHR, 0x03, 0x11, JPU_JPEG_CHR, \ > - 0xff, DHT, 0x00, JPU_JPEG_HDCTBL_SIZE + 0x3, JPU_JPEG_LUM|JPU_JPEG_DC, \ > + 0xff, JPEG_MARKER_DHT, 0x00, JPU_JPEG_HDCTBL_SIZE + 0x3, \ > + JPU_JPEG_LUM | JPU_JPEG_DC, \ > [JPU_JPEG_HDCTBL_LUM_OFFSET ... \ > JPU_JPEG_HDCTBL_LUM_OFFSET + JPU_JPEG_HDCTBL_SIZE - 1] = 0x00, \ > - 0xff, DHT, 0x00, JPU_JPEG_HACTBL_SIZE + 0x3, JPU_JPEG_LUM|JPU_JPEG_AC, \ > + 0xff, JPEG_MARKER_DHT, 0x00, JPU_JPEG_HACTBL_SIZE + 0x3, \ > + JPU_JPEG_LUM | JPU_JPEG_AC, \ > [JPU_JPEG_HACTBL_LUM_OFFSET ... \ > JPU_JPEG_HACTBL_LUM_OFFSET + JPU_JPEG_HACTBL_SIZE - 1] = 0x00, \ > - 0xff, DHT, 0x00, JPU_JPEG_HDCTBL_SIZE + 0x3, JPU_JPEG_CHR|JPU_JPEG_DC, \ > + 0xff, JPEG_MARKER_DHT, 0x00, JPU_JPEG_HDCTBL_SIZE + 0x3, \ > + JPU_JPEG_CHR | JPU_JPEG_DC, \ > [JPU_JPEG_HDCTBL_CHR_OFFSET ... \ > JPU_JPEG_HDCTBL_CHR_OFFSET + JPU_JPEG_HDCTBL_SIZE - 1] = 0x00, \ > - 0xff, DHT, 0x00, JPU_JPEG_HACTBL_SIZE + 0x3, JPU_JPEG_CHR|JPU_JPEG_AC, \ > + 0xff, JPEG_MARKER_DHT, 0x00, JPU_JPEG_HACTBL_SIZE + 0x3, \ > + JPU_JPEG_CHR | JPU_JPEG_AC, \ > [JPU_JPEG_HACTBL_CHR_OFFSET ... \ > JPU_JPEG_HACTBL_CHR_OFFSET + JPU_JPEG_HACTBL_SIZE - 1] = 0x00, \ > [JPU_JPEG_PADDING_OFFSET ... JPU_JPEG_HDR_SIZE - 1] = 0xff \ > @@ -613,7 +607,8 @@ static u8 jpu_parse_hdr(void *buffer, unsigned long size, unsigned int *width, > * basic size check and EOI - we don't want to let JPU cross > * buffer bounds in any case. Hope it's stopping by EOI. > */ > - if (size < JPU_JPEG_MIN_SIZE || *(u8 *)(buffer + size - 1) != EOI) > + if (size < JPU_JPEG_MIN_SIZE || > + *(u8 *)(buffer + size - 1) != JPEG_MARKER_EOI) > return 0; > > for (;;) { > @@ -624,14 +619,14 @@ static u8 jpu_parse_hdr(void *buffer, unsigned long size, unsigned int *width, > c = get_byte(&jpeg_buffer); > while (c == 0xff || c == 0); > > - if (!soi && c == SOI) { > + if (!soi && c == JPEG_MARKER_SOI) { > soi = true; > continue; > - } else if (soi != (c != SOI)) > + } else if (soi != (c != JPEG_MARKER_SOI)) > return 0; > > switch (c) { > - case SOF0: /* SOF0: baseline JPEG */ > + case JPEG_MARKER_SOF0: /* SOF0: baseline JPEG */ > skip(&jpeg_buffer, 3); /* segment length and bpp */ > if (get_word_be(&jpeg_buffer, height) || > get_word_be(&jpeg_buffer, width) || > @@ -640,11 +635,11 @@ static u8 jpu_parse_hdr(void *buffer, unsigned long size, unsigned int *width, > > skip(&jpeg_buffer, 1); > return get_byte(&jpeg_buffer); > - case DHT: > - case DQT: > - case COM: > - case DRI: > - case APP0 ... APP0 + 0x0f: > + case JPEG_MARKER_DHT: > + case JPEG_MARKER_DQT: > + case JPEG_MARKER_COM: > + case JPEG_MARKER_DRI: > + case JPEG_MARKER_APP0 ... JPEG_MARKER_APP0 + 0x0f: > if (get_word_be(&jpeg_buffer, &word)) > return 0; > skip(&jpeg_buffer, (long)word - 2); > diff --git a/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h > index 5570c79f122f5a09..4b665a3b630f8bf9 100644 > --- a/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h > +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h > @@ -11,6 +11,7 @@ > #define JPEG_CORE_H_ > > #include <linux/interrupt.h> > +#include <media/jpeg.h> > #include <media/v4l2-device.h> > #include <media/v4l2-fh.h> > #include <media/v4l2-ctrls.h> > @@ -36,17 +37,6 @@ > > #define EXYNOS3250_IRQ_TIMEOUT 0x10000000 > > -/* a selection of JPEG markers */ > -#define JPEG_MARKER_TEM 0x01 > -#define JPEG_MARKER_SOF0 0xc0 > -#define JPEG_MARKER_DHT 0xc4 > -#define JPEG_MARKER_RST 0xd0 > -#define JPEG_MARKER_SOI 0xd8 > -#define JPEG_MARKER_EOI 0xd9 > -#define JPEG_MARKER_SOS 0xda > -#define JPEG_MARKER_DQT 0xdb > -#define JPEG_MARKER_DHP 0xde > - > /* Flags that indicate a format can be used for capture/output */ > #define SJPEG_FMT_FLAG_ENC_CAPTURE (1 << 0) > #define SJPEG_FMT_FLAG_ENC_OUTPUT (1 << 1) > diff --git a/include/media/jpeg.h b/include/media/jpeg.h > new file mode 100644 > index 0000000000000000..a01e142e99a7d001 > --- /dev/null > +++ b/include/media/jpeg.h > @@ -0,0 +1,20 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > + > +#ifndef _MEDIA_JPEG_H_ > +#define _MEDIA_JPEG_H_ > + > +/* JPEG markers */ > +#define JPEG_MARKER_TEM 0x01 > +#define JPEG_MARKER_SOF0 0xc0 > +#define JPEG_MARKER_DHT 0xc4 > +#define JPEG_MARKER_RST 0xd0 > +#define JPEG_MARKER_SOI 0xd8 > +#define JPEG_MARKER_EOI 0xd9 > +#define JPEG_MARKER_SOS 0xda > +#define JPEG_MARKER_DQT 0xdb > +#define JPEG_MARKER_DRI 0xdd > +#define JPEG_MARKER_DHP 0xde > +#define JPEG_MARKER_APP0 0xe0 > +#define JPEG_MARKER_COM 0xfe > + > +#endif /* _MEDIA_JPEG_H_ */
Hi Geert, Thank you for the patch. On Mon, Apr 17, 2023 at 12:31:35PM +0200, Geert Uytterhoeven wrote: > When compile-testing on mips/RB532 with W=1: > > arch/mips/include/asm/mach-rc32434/rb.h:13: note: this is the location of the previous definition > 13 | #define RST (1 << 15) > | > drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:15: warning: "RST" redefined > 15 | #define RST 0xd0 > | > drivers/media/platform/renesas/rcar_jpu.c:77: warning: "RST" redefined > 77 | #define RST 0xd0 > | > > "RST" is indeed a name too short to be conflict-free. > > Fix this by creating a common <media/jpeg.h> header file, containing > definitions for all JPEG markers used, prefixed by "JPEG_MARKER_", based > on the existing private definitions in the Samsung S5P JPEG driver, and > convert all affected drivers. > > Reported-by: kernel test robot <lkp@intel.com> > Link: https://lore.kernel.org/oe-kbuild-all/202304152346.hJOPxPRh-lkp@intel.com/ > Link: https://lore.kernel.org/oe-kbuild-all/202304150059.bHUyuriy-lkp@intel.com/ > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > No change in generated code before/after. > --- > .../mediatek/jpeg/mtk_jpeg_dec_parse.c | 17 ++---- > drivers/media/platform/renesas/rcar_jpu.c | 55 +++++++++---------- > .../platform/samsung/s5p-jpeg/jpeg-core.h | 12 +--- > include/media/jpeg.h | 20 +++++++ > 4 files changed, 52 insertions(+), 52 deletions(-) > create mode 100644 include/media/jpeg.h > > diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c > index b95c45791c29edc5..bb9cdc9e0e90912b 100644 > --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c > +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c > @@ -7,15 +7,10 @@ > > #include <linux/kernel.h> > #include <linux/videodev2.h> > +#include <media/jpeg.h> > > #include "mtk_jpeg_dec_parse.h" > > -#define TEM 0x01 > -#define SOF0 0xc0 > -#define RST 0xd0 > -#define SOI 0xd8 > -#define EOI 0xd9 > - > struct mtk_jpeg_stream { > u8 *addr; > u32 size; > @@ -83,7 +78,7 @@ static bool mtk_jpeg_do_parse(struct mtk_jpeg_dec_param *param, u8 *src_addr_va, > > length = 0; > switch (byte) { > - case SOF0: > + case JPEG_MARKER_SOF0: > /* length */ > if (read_word_be(&stream, &word)) > break; > @@ -123,10 +118,10 @@ static bool mtk_jpeg_do_parse(struct mtk_jpeg_dec_param *param, u8 *src_addr_va, > > notfound = !(i == param->comp_num); > break; > - case RST ... RST + 7: > - case SOI: > - case EOI: > - case TEM: > + case JPEG_MARKER_RST ... JPEG_MARKER_RST + 7: > + case JPEG_MARKER_SOI: > + case JPEG_MARKER_EOI: > + case JPEG_MARKER_TEM: > break; > default: > if (read_word_be(&stream, &word)) > diff --git a/drivers/media/platform/renesas/rcar_jpu.c b/drivers/media/platform/renesas/rcar_jpu.c > index d1dda68bfb5e2087..25d3f0376d6709ba 100644 > --- a/drivers/media/platform/renesas/rcar_jpu.c > +++ b/drivers/media/platform/renesas/rcar_jpu.c > @@ -28,6 +28,7 @@ > #include <linux/spinlock.h> > #include <linux/string.h> > #include <linux/videodev2.h> > +#include <media/jpeg.h> > #include <media/v4l2-ctrls.h> > #include <media/v4l2-device.h> > #include <media/v4l2-event.h> > @@ -71,19 +72,6 @@ > #define JPU_JPEG_DEFAULT_422_PIX_FMT V4L2_PIX_FMT_NV16M > #define JPU_JPEG_DEFAULT_420_PIX_FMT V4L2_PIX_FMT_NV12M > > -/* JPEG markers */ > -#define TEM 0x01 > -#define SOF0 0xc0 > -#define RST 0xd0 > -#define SOI 0xd8 > -#define EOI 0xd9 > -#define DHP 0xde > -#define DHT 0xc4 > -#define COM 0xfe > -#define DQT 0xdb > -#define DRI 0xdd > -#define APP0 0xe0 > - > #define JPU_RESET_TIMEOUT 100 /* ms */ > #define JPU_JOB_TIMEOUT 300 /* ms */ > #define JPU_MAX_QUALITY 4 > @@ -330,26 +318,32 @@ static const u8 zigzag[] = { > * Huffman tables; Padding with 0xff (33.3.27 R01UH0501EJ0100 Rev.1.00) > */ > #define JPU_JPEG_HDR_BLOB { \ > - 0xff, SOI, 0xff, DQT, 0x00, JPU_JPEG_QTBL_SIZE + 0x3, JPU_JPEG_LUM, \ > - [JPU_JPEG_QTBL_LUM_OFFSET ... \ > + 0xff, JPEG_MARKER_SOI, 0xff, JPEG_MARKER_DQT, 0x00, \ > + JPU_JPEG_QTBL_SIZE + 0x3, JPU_JPEG_LUM, \ > + [JPU_JPEG_QTBL_LUM_OFFSET ... \ > JPU_JPEG_QTBL_LUM_OFFSET + JPU_JPEG_QTBL_SIZE - 1] = 0x00, \ > - 0xff, DQT, 0x00, JPU_JPEG_QTBL_SIZE + 0x3, JPU_JPEG_CHR, \ > + 0xff, JPEG_MARKER_DQT, 0x00, JPU_JPEG_QTBL_SIZE + 0x3, JPU_JPEG_CHR, \ > [JPU_JPEG_QTBL_CHR_OFFSET ... JPU_JPEG_QTBL_CHR_OFFSET + \ > - JPU_JPEG_QTBL_SIZE - 1] = 0x00, 0xff, SOF0, 0x00, 0x11, 0x08, \ > + JPU_JPEG_QTBL_SIZE - 1] = 0x00, \ > + 0xff, JPEG_MARKER_SOF0, 0x00, 0x11, 0x08, \ > [JPU_JPEG_HEIGHT_OFFSET ... JPU_JPEG_HEIGHT_OFFSET + 1] = 0x00, \ > [JPU_JPEG_WIDTH_OFFSET ... JPU_JPEG_WIDTH_OFFSET + 1] = 0x00, \ > 0x03, 0x01, [JPU_JPEG_SUBS_OFFSET] = 0x00, JPU_JPEG_LUM, \ > 0x02, 0x11, JPU_JPEG_CHR, 0x03, 0x11, JPU_JPEG_CHR, \ > - 0xff, DHT, 0x00, JPU_JPEG_HDCTBL_SIZE + 0x3, JPU_JPEG_LUM|JPU_JPEG_DC, \ > + 0xff, JPEG_MARKER_DHT, 0x00, JPU_JPEG_HDCTBL_SIZE + 0x3, \ > + JPU_JPEG_LUM | JPU_JPEG_DC, \ > [JPU_JPEG_HDCTBL_LUM_OFFSET ... \ > JPU_JPEG_HDCTBL_LUM_OFFSET + JPU_JPEG_HDCTBL_SIZE - 1] = 0x00, \ > - 0xff, DHT, 0x00, JPU_JPEG_HACTBL_SIZE + 0x3, JPU_JPEG_LUM|JPU_JPEG_AC, \ > + 0xff, JPEG_MARKER_DHT, 0x00, JPU_JPEG_HACTBL_SIZE + 0x3, \ > + JPU_JPEG_LUM | JPU_JPEG_AC, \ > [JPU_JPEG_HACTBL_LUM_OFFSET ... \ > JPU_JPEG_HACTBL_LUM_OFFSET + JPU_JPEG_HACTBL_SIZE - 1] = 0x00, \ > - 0xff, DHT, 0x00, JPU_JPEG_HDCTBL_SIZE + 0x3, JPU_JPEG_CHR|JPU_JPEG_DC, \ > + 0xff, JPEG_MARKER_DHT, 0x00, JPU_JPEG_HDCTBL_SIZE + 0x3, \ > + JPU_JPEG_CHR | JPU_JPEG_DC, \ > [JPU_JPEG_HDCTBL_CHR_OFFSET ... \ > JPU_JPEG_HDCTBL_CHR_OFFSET + JPU_JPEG_HDCTBL_SIZE - 1] = 0x00, \ > - 0xff, DHT, 0x00, JPU_JPEG_HACTBL_SIZE + 0x3, JPU_JPEG_CHR|JPU_JPEG_AC, \ > + 0xff, JPEG_MARKER_DHT, 0x00, JPU_JPEG_HACTBL_SIZE + 0x3, \ > + JPU_JPEG_CHR | JPU_JPEG_AC, \ > [JPU_JPEG_HACTBL_CHR_OFFSET ... \ > JPU_JPEG_HACTBL_CHR_OFFSET + JPU_JPEG_HACTBL_SIZE - 1] = 0x00, \ > [JPU_JPEG_PADDING_OFFSET ... JPU_JPEG_HDR_SIZE - 1] = 0xff \ > @@ -613,7 +607,8 @@ static u8 jpu_parse_hdr(void *buffer, unsigned long size, unsigned int *width, > * basic size check and EOI - we don't want to let JPU cross > * buffer bounds in any case. Hope it's stopping by EOI. > */ > - if (size < JPU_JPEG_MIN_SIZE || *(u8 *)(buffer + size - 1) != EOI) > + if (size < JPU_JPEG_MIN_SIZE || > + *(u8 *)(buffer + size - 1) != JPEG_MARKER_EOI) > return 0; > > for (;;) { > @@ -624,14 +619,14 @@ static u8 jpu_parse_hdr(void *buffer, unsigned long size, unsigned int *width, > c = get_byte(&jpeg_buffer); > while (c == 0xff || c == 0); > > - if (!soi && c == SOI) { > + if (!soi && c == JPEG_MARKER_SOI) { > soi = true; > continue; > - } else if (soi != (c != SOI)) > + } else if (soi != (c != JPEG_MARKER_SOI)) > return 0; > > switch (c) { > - case SOF0: /* SOF0: baseline JPEG */ > + case JPEG_MARKER_SOF0: /* SOF0: baseline JPEG */ > skip(&jpeg_buffer, 3); /* segment length and bpp */ > if (get_word_be(&jpeg_buffer, height) || > get_word_be(&jpeg_buffer, width) || > @@ -640,11 +635,11 @@ static u8 jpu_parse_hdr(void *buffer, unsigned long size, unsigned int *width, > > skip(&jpeg_buffer, 1); > return get_byte(&jpeg_buffer); > - case DHT: > - case DQT: > - case COM: > - case DRI: > - case APP0 ... APP0 + 0x0f: > + case JPEG_MARKER_DHT: > + case JPEG_MARKER_DQT: > + case JPEG_MARKER_COM: > + case JPEG_MARKER_DRI: > + case JPEG_MARKER_APP0 ... JPEG_MARKER_APP0 + 0x0f: > if (get_word_be(&jpeg_buffer, &word)) > return 0; > skip(&jpeg_buffer, (long)word - 2); > diff --git a/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h > index 5570c79f122f5a09..4b665a3b630f8bf9 100644 > --- a/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h > +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h > @@ -11,6 +11,7 @@ > #define JPEG_CORE_H_ > > #include <linux/interrupt.h> > +#include <media/jpeg.h> > #include <media/v4l2-device.h> > #include <media/v4l2-fh.h> > #include <media/v4l2-ctrls.h> > @@ -36,17 +37,6 @@ > > #define EXYNOS3250_IRQ_TIMEOUT 0x10000000 > > -/* a selection of JPEG markers */ > -#define JPEG_MARKER_TEM 0x01 > -#define JPEG_MARKER_SOF0 0xc0 > -#define JPEG_MARKER_DHT 0xc4 > -#define JPEG_MARKER_RST 0xd0 > -#define JPEG_MARKER_SOI 0xd8 > -#define JPEG_MARKER_EOI 0xd9 > -#define JPEG_MARKER_SOS 0xda > -#define JPEG_MARKER_DQT 0xdb > -#define JPEG_MARKER_DHP 0xde > - > /* Flags that indicate a format can be used for capture/output */ > #define SJPEG_FMT_FLAG_ENC_CAPTURE (1 << 0) > #define SJPEG_FMT_FLAG_ENC_OUTPUT (1 << 1) > diff --git a/include/media/jpeg.h b/include/media/jpeg.h > new file mode 100644 > index 0000000000000000..a01e142e99a7d001 > --- /dev/null > +++ b/include/media/jpeg.h > @@ -0,0 +1,20 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > + > +#ifndef _MEDIA_JPEG_H_ > +#define _MEDIA_JPEG_H_ > + > +/* JPEG markers */ > +#define JPEG_MARKER_TEM 0x01 > +#define JPEG_MARKER_SOF0 0xc0 > +#define JPEG_MARKER_DHT 0xc4 > +#define JPEG_MARKER_RST 0xd0 > +#define JPEG_MARKER_SOI 0xd8 > +#define JPEG_MARKER_EOI 0xd9 > +#define JPEG_MARKER_SOS 0xda > +#define JPEG_MARKER_DQT 0xdb > +#define JPEG_MARKER_DRI 0xdd > +#define JPEG_MARKER_DHP 0xde > +#define JPEG_MARKER_APP0 0xe0 > +#define JPEG_MARKER_COM 0xfe > + > +#endif /* _MEDIA_JPEG_H_ */
diff --git a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c index b95c45791c29edc5..bb9cdc9e0e90912b 100644 --- a/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c +++ b/drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c @@ -7,15 +7,10 @@ #include <linux/kernel.h> #include <linux/videodev2.h> +#include <media/jpeg.h> #include "mtk_jpeg_dec_parse.h" -#define TEM 0x01 -#define SOF0 0xc0 -#define RST 0xd0 -#define SOI 0xd8 -#define EOI 0xd9 - struct mtk_jpeg_stream { u8 *addr; u32 size; @@ -83,7 +78,7 @@ static bool mtk_jpeg_do_parse(struct mtk_jpeg_dec_param *param, u8 *src_addr_va, length = 0; switch (byte) { - case SOF0: + case JPEG_MARKER_SOF0: /* length */ if (read_word_be(&stream, &word)) break; @@ -123,10 +118,10 @@ static bool mtk_jpeg_do_parse(struct mtk_jpeg_dec_param *param, u8 *src_addr_va, notfound = !(i == param->comp_num); break; - case RST ... RST + 7: - case SOI: - case EOI: - case TEM: + case JPEG_MARKER_RST ... JPEG_MARKER_RST + 7: + case JPEG_MARKER_SOI: + case JPEG_MARKER_EOI: + case JPEG_MARKER_TEM: break; default: if (read_word_be(&stream, &word)) diff --git a/drivers/media/platform/renesas/rcar_jpu.c b/drivers/media/platform/renesas/rcar_jpu.c index d1dda68bfb5e2087..25d3f0376d6709ba 100644 --- a/drivers/media/platform/renesas/rcar_jpu.c +++ b/drivers/media/platform/renesas/rcar_jpu.c @@ -28,6 +28,7 @@ #include <linux/spinlock.h> #include <linux/string.h> #include <linux/videodev2.h> +#include <media/jpeg.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-device.h> #include <media/v4l2-event.h> @@ -71,19 +72,6 @@ #define JPU_JPEG_DEFAULT_422_PIX_FMT V4L2_PIX_FMT_NV16M #define JPU_JPEG_DEFAULT_420_PIX_FMT V4L2_PIX_FMT_NV12M -/* JPEG markers */ -#define TEM 0x01 -#define SOF0 0xc0 -#define RST 0xd0 -#define SOI 0xd8 -#define EOI 0xd9 -#define DHP 0xde -#define DHT 0xc4 -#define COM 0xfe -#define DQT 0xdb -#define DRI 0xdd -#define APP0 0xe0 - #define JPU_RESET_TIMEOUT 100 /* ms */ #define JPU_JOB_TIMEOUT 300 /* ms */ #define JPU_MAX_QUALITY 4 @@ -330,26 +318,32 @@ static const u8 zigzag[] = { * Huffman tables; Padding with 0xff (33.3.27 R01UH0501EJ0100 Rev.1.00) */ #define JPU_JPEG_HDR_BLOB { \ - 0xff, SOI, 0xff, DQT, 0x00, JPU_JPEG_QTBL_SIZE + 0x3, JPU_JPEG_LUM, \ - [JPU_JPEG_QTBL_LUM_OFFSET ... \ + 0xff, JPEG_MARKER_SOI, 0xff, JPEG_MARKER_DQT, 0x00, \ + JPU_JPEG_QTBL_SIZE + 0x3, JPU_JPEG_LUM, \ + [JPU_JPEG_QTBL_LUM_OFFSET ... \ JPU_JPEG_QTBL_LUM_OFFSET + JPU_JPEG_QTBL_SIZE - 1] = 0x00, \ - 0xff, DQT, 0x00, JPU_JPEG_QTBL_SIZE + 0x3, JPU_JPEG_CHR, \ + 0xff, JPEG_MARKER_DQT, 0x00, JPU_JPEG_QTBL_SIZE + 0x3, JPU_JPEG_CHR, \ [JPU_JPEG_QTBL_CHR_OFFSET ... JPU_JPEG_QTBL_CHR_OFFSET + \ - JPU_JPEG_QTBL_SIZE - 1] = 0x00, 0xff, SOF0, 0x00, 0x11, 0x08, \ + JPU_JPEG_QTBL_SIZE - 1] = 0x00, \ + 0xff, JPEG_MARKER_SOF0, 0x00, 0x11, 0x08, \ [JPU_JPEG_HEIGHT_OFFSET ... JPU_JPEG_HEIGHT_OFFSET + 1] = 0x00, \ [JPU_JPEG_WIDTH_OFFSET ... JPU_JPEG_WIDTH_OFFSET + 1] = 0x00, \ 0x03, 0x01, [JPU_JPEG_SUBS_OFFSET] = 0x00, JPU_JPEG_LUM, \ 0x02, 0x11, JPU_JPEG_CHR, 0x03, 0x11, JPU_JPEG_CHR, \ - 0xff, DHT, 0x00, JPU_JPEG_HDCTBL_SIZE + 0x3, JPU_JPEG_LUM|JPU_JPEG_DC, \ + 0xff, JPEG_MARKER_DHT, 0x00, JPU_JPEG_HDCTBL_SIZE + 0x3, \ + JPU_JPEG_LUM | JPU_JPEG_DC, \ [JPU_JPEG_HDCTBL_LUM_OFFSET ... \ JPU_JPEG_HDCTBL_LUM_OFFSET + JPU_JPEG_HDCTBL_SIZE - 1] = 0x00, \ - 0xff, DHT, 0x00, JPU_JPEG_HACTBL_SIZE + 0x3, JPU_JPEG_LUM|JPU_JPEG_AC, \ + 0xff, JPEG_MARKER_DHT, 0x00, JPU_JPEG_HACTBL_SIZE + 0x3, \ + JPU_JPEG_LUM | JPU_JPEG_AC, \ [JPU_JPEG_HACTBL_LUM_OFFSET ... \ JPU_JPEG_HACTBL_LUM_OFFSET + JPU_JPEG_HACTBL_SIZE - 1] = 0x00, \ - 0xff, DHT, 0x00, JPU_JPEG_HDCTBL_SIZE + 0x3, JPU_JPEG_CHR|JPU_JPEG_DC, \ + 0xff, JPEG_MARKER_DHT, 0x00, JPU_JPEG_HDCTBL_SIZE + 0x3, \ + JPU_JPEG_CHR | JPU_JPEG_DC, \ [JPU_JPEG_HDCTBL_CHR_OFFSET ... \ JPU_JPEG_HDCTBL_CHR_OFFSET + JPU_JPEG_HDCTBL_SIZE - 1] = 0x00, \ - 0xff, DHT, 0x00, JPU_JPEG_HACTBL_SIZE + 0x3, JPU_JPEG_CHR|JPU_JPEG_AC, \ + 0xff, JPEG_MARKER_DHT, 0x00, JPU_JPEG_HACTBL_SIZE + 0x3, \ + JPU_JPEG_CHR | JPU_JPEG_AC, \ [JPU_JPEG_HACTBL_CHR_OFFSET ... \ JPU_JPEG_HACTBL_CHR_OFFSET + JPU_JPEG_HACTBL_SIZE - 1] = 0x00, \ [JPU_JPEG_PADDING_OFFSET ... JPU_JPEG_HDR_SIZE - 1] = 0xff \ @@ -613,7 +607,8 @@ static u8 jpu_parse_hdr(void *buffer, unsigned long size, unsigned int *width, * basic size check and EOI - we don't want to let JPU cross * buffer bounds in any case. Hope it's stopping by EOI. */ - if (size < JPU_JPEG_MIN_SIZE || *(u8 *)(buffer + size - 1) != EOI) + if (size < JPU_JPEG_MIN_SIZE || + *(u8 *)(buffer + size - 1) != JPEG_MARKER_EOI) return 0; for (;;) { @@ -624,14 +619,14 @@ static u8 jpu_parse_hdr(void *buffer, unsigned long size, unsigned int *width, c = get_byte(&jpeg_buffer); while (c == 0xff || c == 0); - if (!soi && c == SOI) { + if (!soi && c == JPEG_MARKER_SOI) { soi = true; continue; - } else if (soi != (c != SOI)) + } else if (soi != (c != JPEG_MARKER_SOI)) return 0; switch (c) { - case SOF0: /* SOF0: baseline JPEG */ + case JPEG_MARKER_SOF0: /* SOF0: baseline JPEG */ skip(&jpeg_buffer, 3); /* segment length and bpp */ if (get_word_be(&jpeg_buffer, height) || get_word_be(&jpeg_buffer, width) || @@ -640,11 +635,11 @@ static u8 jpu_parse_hdr(void *buffer, unsigned long size, unsigned int *width, skip(&jpeg_buffer, 1); return get_byte(&jpeg_buffer); - case DHT: - case DQT: - case COM: - case DRI: - case APP0 ... APP0 + 0x0f: + case JPEG_MARKER_DHT: + case JPEG_MARKER_DQT: + case JPEG_MARKER_COM: + case JPEG_MARKER_DRI: + case JPEG_MARKER_APP0 ... JPEG_MARKER_APP0 + 0x0f: if (get_word_be(&jpeg_buffer, &word)) return 0; skip(&jpeg_buffer, (long)word - 2); diff --git a/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h index 5570c79f122f5a09..4b665a3b630f8bf9 100644 --- a/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h @@ -11,6 +11,7 @@ #define JPEG_CORE_H_ #include <linux/interrupt.h> +#include <media/jpeg.h> #include <media/v4l2-device.h> #include <media/v4l2-fh.h> #include <media/v4l2-ctrls.h> @@ -36,17 +37,6 @@ #define EXYNOS3250_IRQ_TIMEOUT 0x10000000 -/* a selection of JPEG markers */ -#define JPEG_MARKER_TEM 0x01 -#define JPEG_MARKER_SOF0 0xc0 -#define JPEG_MARKER_DHT 0xc4 -#define JPEG_MARKER_RST 0xd0 -#define JPEG_MARKER_SOI 0xd8 -#define JPEG_MARKER_EOI 0xd9 -#define JPEG_MARKER_SOS 0xda -#define JPEG_MARKER_DQT 0xdb -#define JPEG_MARKER_DHP 0xde - /* Flags that indicate a format can be used for capture/output */ #define SJPEG_FMT_FLAG_ENC_CAPTURE (1 << 0) #define SJPEG_FMT_FLAG_ENC_OUTPUT (1 << 1) diff --git a/include/media/jpeg.h b/include/media/jpeg.h new file mode 100644 index 0000000000000000..a01e142e99a7d001 --- /dev/null +++ b/include/media/jpeg.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#ifndef _MEDIA_JPEG_H_ +#define _MEDIA_JPEG_H_ + +/* JPEG markers */ +#define JPEG_MARKER_TEM 0x01 +#define JPEG_MARKER_SOF0 0xc0 +#define JPEG_MARKER_DHT 0xc4 +#define JPEG_MARKER_RST 0xd0 +#define JPEG_MARKER_SOI 0xd8 +#define JPEG_MARKER_EOI 0xd9 +#define JPEG_MARKER_SOS 0xda +#define JPEG_MARKER_DQT 0xdb +#define JPEG_MARKER_DRI 0xdd +#define JPEG_MARKER_DHP 0xde +#define JPEG_MARKER_APP0 0xe0 +#define JPEG_MARKER_COM 0xfe + +#endif /* _MEDIA_JPEG_H_ */
When compile-testing on mips/RB532 with W=1: arch/mips/include/asm/mach-rc32434/rb.h:13: note: this is the location of the previous definition 13 | #define RST (1 << 15) | drivers/media/platform/mediatek/jpeg/mtk_jpeg_dec_parse.c:15: warning: "RST" redefined 15 | #define RST 0xd0 | drivers/media/platform/renesas/rcar_jpu.c:77: warning: "RST" redefined 77 | #define RST 0xd0 | "RST" is indeed a name too short to be conflict-free. Fix this by creating a common <media/jpeg.h> header file, containing definitions for all JPEG markers used, prefixed by "JPEG_MARKER_", based on the existing private definitions in the Samsung S5P JPEG driver, and convert all affected drivers. Reported-by: kernel test robot <lkp@intel.com> Link: https://lore.kernel.org/oe-kbuild-all/202304152346.hJOPxPRh-lkp@intel.com/ Link: https://lore.kernel.org/oe-kbuild-all/202304150059.bHUyuriy-lkp@intel.com/ Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- No change in generated code before/after. --- .../mediatek/jpeg/mtk_jpeg_dec_parse.c | 17 ++---- drivers/media/platform/renesas/rcar_jpu.c | 55 +++++++++---------- .../platform/samsung/s5p-jpeg/jpeg-core.h | 12 +--- include/media/jpeg.h | 20 +++++++ 4 files changed, 52 insertions(+), 52 deletions(-) create mode 100644 include/media/jpeg.h