drm/nouveau/nvkm: mark expected switch fall-throughs
Subsystems (3)
PATCH 1/1 drm/nouveau/nvkm: mark expected switch fall-throughs
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")
--- 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(+)
drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c +17 -0
@@ -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 ; }
drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c +1 -0
@@ -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 ;
drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c +2 -0
@@ -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)
drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c +1 -0
@@ -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 :
drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c +1 -0
@@ -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 );
drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c +1 -0
@@ -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 ; }
drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c +1 -0
@@ -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;
drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c +1 -0
@@ -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); }
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c +2 -0
@@ -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);
drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c +1 -0
@@ -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;
Signature · 1 line
2.7.4
Hi,
Friendly ping:
Who can take this?
Thanks
--
Gustavo
Quoted 205 lines · Gustavo A. R. Silva
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 <[email protected]>--- 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(+)drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c +17
-0@@ -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 ; }drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c +1
-0@@ -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 ;drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c +2
-0@@ -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)drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c +1
-0@@ -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 :drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c +1
-0@@ -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 );drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c +1
-0@@ -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 ; }drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c +1
-0@@ -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;drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c +1
-0@@ -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); }drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c +2
-0@@ -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);drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c +1
-0@@ -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;
Hello,
Friendly ping (second one):
Who can take this, please?
Thanks
--
Gustavo
Quoted 216 lines · Gustavo A. R. Silva
Hi,
Friendly ping:
Who can take this?
Thanks
Signature · 1 line
GustavoQuoted 198 lines · Gustavo A. R. Silva
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 <[email protected]>---
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(+)drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c +0
-0@@ -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;
}drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c +0
-0@@ -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 */
caseNV_MEM_ACCESS_RW:
dmaobj->flags2|=0x00000002;
break;drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c +0
-0@@ -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 */
case0x0180...0x01fc: /* handle -> instance */ data =nvkm_rd32(device, 0x003258)&0x0000ffff; + /* fall through */
case0x0100...0x017c:
case0x0200...0x1ffc: /* pass method down to sw */ if (!(engine & mask) && sw)drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c +0
-0@@ -81,6 +81,7 @@ nv40_fifo_init(struct nvkm_fifo *base)case
0x49:
case0x4b:
nvkm_wr32(device, 0x002230, 0x00000001); + /* fall through */
case0x40:
case0x41:
case0x42:drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c +0
-0@@ -135,6 +135,7 @@ nvbios_perfEp(struct nvkm_bios *bios, int idx, break;case
0x30:
info->script =nvbios_rd16(bios, perf + 0x02); + /* fall through */
case0x35:
info->fanspeed=nvbios_rd08(bios, perf + 0x06); info->voltage =nvbios_rd08(bios, perf + 0x07);drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c +0
-0@@ -134,6 +134,7 @@ pll_map(struct nvkm_bios *bios)
device->chipset==0xaa||
device->chipset==0xac)
returng84_pll_mapping;
+ /* fall through */
default:
return NULL;
}drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c +0
-0@@ -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 */
caseNVKM_CLK_BOOST_BIOS:
if (clk->boost_khz&& freq >clk->boost_khz) return false;drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c +0
-0@@ -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);
}drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c +1
-0@@ -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:
case0x49:
case0x4b:
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);drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c +0
-0@@ -159,6 +159,7 @@ mxm_dcb_sanitise_entry(struct nvkm_bios *bios, void *data, int idx, u16 pdcb) break;Quoted 7 lines
case
0x0e: /* eDP, falls through to DPint */ ctx.outp[1] |=0x00010000;
+ /* fall through */
case0x07: /* DP internal, wtf is this?? HP8670w */ ctx.outp[1] |=0x00000004; /*use_power_scripts? */ type =DCB_CONNECTOR_eDP;
_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau