drm/amdgpu/powerplay: fix missing break in switch statements

Colin Ian King · gregkh · commit 17a5d018f68b · 2018-11-21T09:19:09.000+01:00
[ Upstream commit 14b2848 ] There are several switch statements that are missing break statements. Add missing breaks to handle any fall-throughs corner cases. Detected by CoverityScan, CID#1457175 ("Missing break in switch") Fixes: 18aafc5 ("drm/amd/powerplay: implement fw related smu interface for iceland.") Acked-by: Huang Rui <ray.huang@amd.com> Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c
@@ -2268,11 +2268,13 @@ static uint32_t ci_get_offsetof(uint32_t type, uint32_t member)
 		case DRAM_LOG_BUFF_SIZE:
 			return offsetof(SMU7_SoftRegisters, DRAM_LOG_BUFF_SIZE);
 		}
+		break;
 	case SMU_Discrete_DpmTable:
 		switch (member) {
 		case LowSclkInterruptThreshold:
 			return offsetof(SMU7_Discrete_DpmTable, LowSclkInterruptT);
 		}
+		break;
 	}
 	pr_debug("can't get the offset of type %x member %x\n", type, member);
 	return 0;
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
@@ -2330,6 +2330,7 @@ static uint32_t fiji_get_offsetof(uint32_t type, uint32_t member)
 		case DRAM_LOG_BUFF_SIZE:
 			return offsetof(SMU73_SoftRegisters, DRAM_LOG_BUFF_SIZE);
 		}
+		break;
 	case SMU_Discrete_DpmTable:
 		switch (member) {
 		case UvdBootLevel:
@@ -2339,6 +2340,7 @@ static uint32_t fiji_get_offsetof(uint32_t type, uint32_t member)
 		case LowSclkInterruptThreshold:
 			return offsetof(SMU73_Discrete_DpmTable, LowSclkInterruptThreshold);
 		}
+		break;
 	}
 	pr_warn("can't get the offset of type %x member %x\n", type, member);
 	return 0;
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c
@@ -2236,11 +2236,13 @@ static uint32_t iceland_get_offsetof(uint32_t type, uint32_t member)
 		case DRAM_LOG_BUFF_SIZE:
 			return offsetof(SMU71_SoftRegisters, DRAM_LOG_BUFF_SIZE);
 		}
+		break;
 	case SMU_Discrete_DpmTable:
 		switch (member) {
 		case LowSclkInterruptThreshold:
 			return offsetof(SMU71_Discrete_DpmTable, LowSclkInterruptThreshold);
 		}
+		break;
 	}
 	pr_warn("can't get the offset of type %x member %x\n", type, member);
 	return 0;
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c
@@ -2618,6 +2618,7 @@ static uint32_t tonga_get_offsetof(uint32_t type, uint32_t member)
 		case DRAM_LOG_BUFF_SIZE:
 			return offsetof(SMU72_SoftRegisters, DRAM_LOG_BUFF_SIZE);
 		}
+		break;
 	case SMU_Discrete_DpmTable:
 		switch (member) {
 		case UvdBootLevel:
@@ -2627,6 +2628,7 @@ static uint32_t tonga_get_offsetof(uint32_t type, uint32_t member)
 		case LowSclkInterruptThreshold:
 			return offsetof(SMU72_Discrete_DpmTable, LowSclkInterruptThreshold);
 		}
+		break;
 	}
 	pr_warn("can't get the offset of type %x member %x\n", type, member);
 	return 0;
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c
@@ -2184,6 +2184,7 @@ static uint32_t vegam_get_offsetof(uint32_t type, uint32_t member)
 		case DRAM_LOG_BUFF_SIZE:
 			return offsetof(SMU75_SoftRegisters, DRAM_LOG_BUFF_SIZE);
 		}
+		break;
 	case SMU_Discrete_DpmTable:
 		switch (member) {
 		case UvdBootLevel:
@@ -2193,6 +2194,7 @@ static uint32_t vegam_get_offsetof(uint32_t type, uint32_t member)
 		case LowSclkInterruptThreshold:
 			return offsetof(SMU75_Discrete_DpmTable, LowSclkInterruptThreshold);
 		}
+		break;
 	}
 	pr_warn("can't get the offset of type %x member %x\n", type, member);
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -2268,11 +2268,13 @@ static uint32_t ci_get_offsetof(uint32_t type, uint32_t member)`
`2268`	`2268`	`case DRAM_LOG_BUFF_SIZE:`
`2269`	`2269`	`return offsetof(SMU7_SoftRegisters, DRAM_LOG_BUFF_SIZE);`
`2270`	`2270`	`}`
	`2271`	`+ break;`
`2271`	`2272`	`case SMU_Discrete_DpmTable:`
`2272`	`2273`	`switch (member) {`
`2273`	`2274`	`case LowSclkInterruptThreshold:`
`2274`	`2275`	`return offsetof(SMU7_Discrete_DpmTable, LowSclkInterruptT);`
`2275`	`2276`	`}`
	`2277`	`+ break;`
`2276`	`2278`	`}`
`2277`	`2279`	`pr_debug("can't get the offset of type %x member %x\n", type, member);`
`2278`	`2280`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -2330,6 +2330,7 @@ static uint32_t fiji_get_offsetof(uint32_t type, uint32_t member)`
`2330`	`2330`	`case DRAM_LOG_BUFF_SIZE:`
`2331`	`2331`	`return offsetof(SMU73_SoftRegisters, DRAM_LOG_BUFF_SIZE);`
`2332`	`2332`	`}`
	`2333`	`+ break;`
`2333`	`2334`	`case SMU_Discrete_DpmTable:`
`2334`	`2335`	`switch (member) {`
`2335`	`2336`	`case UvdBootLevel:`
`@@ -2339,6 +2340,7 @@ static uint32_t fiji_get_offsetof(uint32_t type, uint32_t member)`
`2339`	`2340`	`case LowSclkInterruptThreshold:`
`2340`	`2341`	`return offsetof(SMU73_Discrete_DpmTable, LowSclkInterruptThreshold);`
`2341`	`2342`	`}`
	`2343`	`+ break;`
`2342`	`2344`	`}`
`2343`	`2345`	`pr_warn("can't get the offset of type %x member %x\n", type, member);`
`2344`	`2346`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -2236,11 +2236,13 @@ static uint32_t iceland_get_offsetof(uint32_t type, uint32_t member)`
`2236`	`2236`	`case DRAM_LOG_BUFF_SIZE:`
`2237`	`2237`	`return offsetof(SMU71_SoftRegisters, DRAM_LOG_BUFF_SIZE);`
`2238`	`2238`	`}`
	`2239`	`+ break;`
`2239`	`2240`	`case SMU_Discrete_DpmTable:`
`2240`	`2241`	`switch (member) {`
`2241`	`2242`	`case LowSclkInterruptThreshold:`
`2242`	`2243`	`return offsetof(SMU71_Discrete_DpmTable, LowSclkInterruptThreshold);`
`2243`	`2244`	`}`
	`2245`	`+ break;`
`2244`	`2246`	`}`
`2245`	`2247`	`pr_warn("can't get the offset of type %x member %x\n", type, member);`
`2246`	`2248`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -2618,6 +2618,7 @@ static uint32_t tonga_get_offsetof(uint32_t type, uint32_t member)`
`2618`	`2618`	`case DRAM_LOG_BUFF_SIZE:`
`2619`	`2619`	`return offsetof(SMU72_SoftRegisters, DRAM_LOG_BUFF_SIZE);`
`2620`	`2620`	`}`
	`2621`	`+ break;`
`2621`	`2622`	`case SMU_Discrete_DpmTable:`
`2622`	`2623`	`switch (member) {`
`2623`	`2624`	`case UvdBootLevel:`
`@@ -2627,6 +2628,7 @@ static uint32_t tonga_get_offsetof(uint32_t type, uint32_t member)`
`2627`	`2628`	`case LowSclkInterruptThreshold:`
`2628`	`2629`	`return offsetof(SMU72_Discrete_DpmTable, LowSclkInterruptThreshold);`
`2629`	`2630`	`}`
	`2631`	`+ break;`
`2630`	`2632`	`}`
`2631`	`2633`	`pr_warn("can't get the offset of type %x member %x\n", type, member);`
`2632`	`2634`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -2184,6 +2184,7 @@ static uint32_t vegam_get_offsetof(uint32_t type, uint32_t member)`
`2184`	`2184`	`case DRAM_LOG_BUFF_SIZE:`
`2185`	`2185`	`return offsetof(SMU75_SoftRegisters, DRAM_LOG_BUFF_SIZE);`
`2186`	`2186`	`}`
	`2187`	`+ break;`
`2187`	`2188`	`case SMU_Discrete_DpmTable:`
`2188`	`2189`	`switch (member) {`
`2189`	`2190`	`case UvdBootLevel:`
`@@ -2193,6 +2194,7 @@ static uint32_t vegam_get_offsetof(uint32_t type, uint32_t member)`
`2193`	`2194`	`case LowSclkInterruptThreshold:`
`2194`	`2195`	`return offsetof(SMU75_Discrete_DpmTable, LowSclkInterruptThreshold);`
`2195`	`2196`	`}`
	`2197`	`+ break;`
`2196`	`2198`	`}`
`2197`	`2199`	`pr_warn("can't get the offset of type %x member %x\n", type, member);`
`2198`	`2200`	`return 0;`