Re: [PATCH] drm/nouveau/nvkm: mark expected switch fall-throughs

From: Gustavo A. R. Silva
Date: Fri Feb 15 2019 - 10:54:05 EST


Hello,

Friendly ping (second one):

Who can take this, please?

Thanks
--
Gustavo

On 1/10/19 1:33 PM, Gustavo A. R. Silva wrote:
> Hi,
>
> Friendly ping:
>
> Who can take this?
>
> Thanks
> --
> Gustavo
>
> On 10/17/18 9:28 AM, Gustavo A. R. Silva wrote:
>> In preparation to enabling -Wimplicit-fallthrough, mark switch cases
>> where we are expecting to fall through.
>>
>> This patch aims to suppress 29 missing-break-in-switch false positives.
>>
>> Addresses-Coverity-ID: 1456891 ("Missing break in switch")
>> Addresses-Coverity-ID: 1324063 ("Missing break in switch")
>> Addresses-Coverity-ID: 1324063 ("Missing break in switch")
>> Addresses-Coverity-ID: 141432 ("Missing break in switch")
>> Addresses-Coverity-ID: 141433 ("Missing break in switch")
>> Addresses-Coverity-ID: 141434 ("Missing break in switch")
>> Addresses-Coverity-ID: 141435 ("Missing break in switch")
>> Addresses-Coverity-ID: 141436 ("Missing break in switch")
>> Signed-off-by: Gustavo A. R. Silva <gustavo@xxxxxxxxxxxxxx>
>> ---
>> Â drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.cÂÂÂ | 17 +++++++++++++++++
>> Â drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c |Â 1 +
>> Â drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.cÂÂÂ |Â 2 ++
>> Â drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.cÂÂÂ |Â 1 +
>> Â drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.cÂÂÂ |Â 1 +
>> Â drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.cÂÂÂÂ |Â 1 +
>> Â drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.cÂÂÂÂ |Â 1 +
>> Â drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.cÂÂÂ |Â 1 +
>> Â drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.cÂÂ |Â 2 ++
>> Â drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.cÂÂÂÂ |Â 1 +
>> Â 10 files changed, 28 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c
>> index d131cca..10f2aa9 100644
>> --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c
>> +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c
>> @@ -23,38 +23,55 @@ void pack_hdmi_infoframe(struct packed_hdmi_infoframe *packed_frame,
>> ÂÂÂÂÂÂÂÂÂÂ */
>> ÂÂÂÂÂ case 17:
>> ÂÂÂÂÂÂÂÂÂ subpack1_high = (raw_frame[16] << 16);
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 16:
>> ÂÂÂÂÂÂÂÂÂ subpack1_high |= (raw_frame[15] << 8);
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 15:
>> ÂÂÂÂÂÂÂÂÂ subpack1_high |= raw_frame[14];
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 14:
>> ÂÂÂÂÂÂÂÂÂ subpack1_low = (raw_frame[13] << 24);
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 13:
>> ÂÂÂÂÂÂÂÂÂ subpack1_low |= (raw_frame[12] << 16);
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 12:
>> ÂÂÂÂÂÂÂÂÂ subpack1_low |= (raw_frame[11] << 8);
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 11:
>> ÂÂÂÂÂÂÂÂÂ subpack1_low |= raw_frame[10];
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 10:
>> ÂÂÂÂÂÂÂÂÂ subpack0_high = (raw_frame[9] << 16);
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 9:
>> ÂÂÂÂÂÂÂÂÂ subpack0_high |= (raw_frame[8] << 8);
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 8:
>> ÂÂÂÂÂÂÂÂÂ subpack0_high |= raw_frame[7];
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 7:
>> ÂÂÂÂÂÂÂÂÂ subpack0_low = (raw_frame[6] << 24);
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 6:
>> ÂÂÂÂÂÂÂÂÂ subpack0_low |= (raw_frame[5] << 16);
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 5:
>> ÂÂÂÂÂÂÂÂÂ subpack0_low |= (raw_frame[4] << 8);
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 4:
>> ÂÂÂÂÂÂÂÂÂ subpack0_low |= raw_frame[3];
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 3:
>> ÂÂÂÂÂÂÂÂÂ header = (raw_frame[2] << 16);
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 2:
>> ÂÂÂÂÂÂÂÂÂ header |= (raw_frame[1] << 8);
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 1:
>> ÂÂÂÂÂÂÂÂÂ header |= raw_frame[0];
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 0:
>> ÂÂÂÂÂÂÂÂÂ break;
>> ÂÂÂÂÂ }
>> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c
>> index 49ef7e5..7f1adab 100644
>> --- a/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c
>> +++ b/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c
>> @@ -122,6 +122,7 @@ nv04_dmaobj_new(struct nvkm_dma *dma, const struct nvkm_oclass *oclass,
>> ÂÂÂÂÂÂÂÂÂ break;
>> ÂÂÂÂÂ case NV_MEM_ACCESS_WO:
>> ÂÂÂÂÂÂÂÂÂ dmaobj->flags0 |= 0x00008000;
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case NV_MEM_ACCESS_RW:
>> ÂÂÂÂÂÂÂÂÂ dmaobj->flags2 |= 0x00000002;
>> ÂÂÂÂÂÂÂÂÂ break;
>> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c
>> index ad707ff..93493b3 100644
>> --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c
>> +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c
>> @@ -117,8 +117,10 @@ nv04_fifo_swmthd(struct nvkm_device *device, u32 chid, u32 addr, u32 data)
>> ÂÂÂÂÂ switch (mthd) {
>> ÂÂÂÂÂ case 0x0000 ... 0x0000: /* subchannel's engine -> software */
>> ÂÂÂÂÂÂÂÂÂ nvkm_wr32(device, 0x003280, (engine &= ~mask));
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 0x0180 ... 0x01fc: /* handle -> instance */
>> ÂÂÂÂÂÂÂÂÂ data = nvkm_rd32(device, 0x003258) & 0x0000ffff;
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 0x0100 ... 0x017c:
>> ÂÂÂÂÂ case 0x0200 ... 0x1ffc: /* pass method down to sw */
>> ÂÂÂÂÂÂÂÂÂ if (!(engine & mask) && sw)
>> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c
>> index 8c7ba32..47c1682 100644
>> --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c
>> +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c
>> @@ -81,6 +81,7 @@ nv40_fifo_init(struct nvkm_fifo *base)
>> ÂÂÂÂÂ case 0x49:
>> ÂÂÂÂÂ case 0x4b:
>> ÂÂÂÂÂÂÂÂÂ nvkm_wr32(device, 0x002230, 0x00000001);
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 0x40:
>> ÂÂÂÂÂ case 0x41:
>> ÂÂÂÂÂ case 0x42:
>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c
>> index c306835..7112992 100644
>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c
>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c
>> @@ -135,6 +135,7 @@ nvbios_perfEp(struct nvkm_bios *bios, int idx,
>> ÂÂÂÂÂÂÂÂÂ break;
>> ÂÂÂÂÂ case 0x30:
>> ÂÂÂÂÂÂÂÂÂ info->scriptÂÂ = nvbios_rd16(bios, perf + 0x02);
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 0x35:
>> ÂÂÂÂÂÂÂÂÂ info->fanspeed = nvbios_rd08(bios, perf + 0x06);
>>  info->voltage = nvbios_rd08(bios, perf + 0x07);
>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c
>> index e6e804c..bda6cc9 100644
>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c
>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c
>> @@ -134,6 +134,7 @@ pll_map(struct nvkm_bios *bios)
>> ÂÂÂÂÂÂÂÂÂÂÂÂÂ device->chipset == 0xaa ||
>> ÂÂÂÂÂÂÂÂÂÂÂÂÂ device->chipset == 0xac)
>> ÂÂÂÂÂÂÂÂÂÂÂÂÂ return g84_pll_mapping;
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ default:
>> ÂÂÂÂÂÂÂÂÂ return NULL;
>> ÂÂÂÂÂ }
>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c
>> index ba6a868d..40e5645 100644
>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c
>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c
>> @@ -90,6 +90,7 @@ nvkm_cstate_valid(struct nvkm_clk *clk, struct nvkm_cstate *cstate,
>> ÂÂÂÂÂÂÂÂÂÂÂÂÂ case NVKM_CLK_BOOST_NONE:
>> ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ if (clk->base_khz && freq > clk->base_khz)
>> ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ return false;
>> +ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂÂÂÂÂÂÂÂÂ case NVKM_CLK_BOOST_BIOS:
>> ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ if (clk->boost_khz && freq > clk->boost_khz)
>> ÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂÂ return false;
>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c
>> index 1c21b8b..4f00023 100644
>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c
>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c
>> @@ -363,6 +363,7 @@ mcp77_clk_prog(struct nvkm_clk *base)
>> ÂÂÂÂÂ switch (clk->vsrc) {
>> ÂÂÂÂÂ case nv_clk_src_cclk:
>> ÂÂÂÂÂÂÂÂÂ mast |= 0x00400000;
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ default:
>> ÂÂÂÂÂÂÂÂÂ nvkm_wr32(device, 0x4600, clk->vdiv);
>> ÂÂÂÂÂ }
>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c
>> index 2b12e38..5f4c287 100644
>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c
>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c
>> @@ -131,11 +131,13 @@ nv40_ram_prog(struct nvkm_ram *base)
>> ÂÂÂÂÂÂÂÂÂ nvkm_mask(device, 0x00402c, 0xc0771100, ram->ctrl);
>> ÂÂÂÂÂÂÂÂÂ nvkm_wr32(device, 0x004048, ram->coef);
>> ÂÂÂÂÂÂÂÂÂ nvkm_wr32(device, 0x004030, ram->coef);
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 0x43:
>> ÂÂÂÂÂ case 0x49:
>> ÂÂÂÂÂ case 0x4b:
>> ÂÂÂÂÂÂÂÂÂ nvkm_mask(device, 0x004038, 0xc0771100, ram->ctrl);
>> ÂÂÂÂÂÂÂÂÂ nvkm_wr32(device, 0x00403c, ram->coef);
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ default:
>> ÂÂÂÂÂÂÂÂÂ nvkm_mask(device, 0x004020, 0xc0771100, ram->ctrl);
>> ÂÂÂÂÂÂÂÂÂ nvkm_wr32(device, 0x004024, ram->coef);
>> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c
>> index 844971e..2a6150a 100644
>> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c
>> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c
>> @@ -159,6 +159,7 @@ mxm_dcb_sanitise_entry(struct nvkm_bios *bios, void *data, int idx, u16 pdcb)
>> ÂÂÂÂÂÂÂÂÂ break;
>> ÂÂÂÂÂ case 0x0e: /* eDP, falls through to DPint */
>> ÂÂÂÂÂÂÂÂÂ ctx.outp[1] |= 0x00010000;
>> +ÂÂÂÂÂÂÂ /* fall through */
>> ÂÂÂÂÂ case 0x07: /* DP internal, wtf is this?? HP8670w */
>> ÂÂÂÂÂÂÂÂÂ ctx.outp[1] |= 0x00000004; /* use_power_scripts? */
>> ÂÂÂÂÂÂÂÂÂ type = DCB_CONNECTOR_eDP;
>>