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")
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c
index d131cca999dd2c7f6361b9c784c4aef26c292ed7..10f2aa9f29a401ace7bc2ea34cfd74e3e99ec6d1 100644 (file)
--- 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 49ef7e57aad419e66328bed9e6f3f05806f370da..7f1adab21a5f57ee18da72311a171b7f184ccb6f 100644 (file)
--- 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 ad707ff176cc757d0aa46a7114dbbeec3d1c30c9..93493b335d7611046f16a07a583f6fc5534c21a1 100644 (file)
--- 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 8c7ba32763c42e702d8e9d753851dd37b087755a..47c16821c37f69e5450f6c85cca588430bb0f3fc 100644 (file)
--- 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 c3068358f695ba5be8705004551bb96d3e4c813a..7112992e0e388cf4ac5113eb878382af9f2ba858 100644 (file)
--- 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 e6e804cee2bc8d40b0bdd3a829fbb95b67222677..bda6cc9a7aafbd28395db0c1165dd9167e1ee4f8 100644 (file)
--- 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 ba6a868d4c9564eca89609da597b4dc1cae66b41..40e564524b7a90d6c6eb212f56c0f2c88fd0b47f 100644 (file)
--- 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 1c21b8b53b78b3c407a3e88db713075d724790bb..4f000237796fd026c359cc18618c81e26197a744 100644 (file)
--- 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 2b12e388f47aa3d130689583f6dd16311f31074f..5f4c287d79431beec2c26ad1a397e7c9e61af203 100644 (file)
--- 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 844971e5e8746f469b7dee5bdedead8e254f5393..2a6150ab5611da2431232e559aac3c62373d12ac 100644 (file)
--- 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;