src: Make implicit fall throughs explicit

Implicit fall throughs are a perpetual source of bugs and Coverity Scan
issues, so let's squash them once and for all. GCC can flag implicit fall
throughs using the -Wimplicit-fallthrough warning, and this should
ensure no more enter the code base. However, many fall throughs are
intentional, and we can use the following comment style to have GCC
suppress the warning.

    switch (x) {
    case 1:
            y += 1;
	    /* fall through */
    case 2:
            y += 2;
	    /* fall through - but this time with an explanation */
    default:
            y += 3;
    }

This patch adds comments for all remaining intentional fall throughs,
and tweaks some existing fall through comments to fit the syntax that
GCC expects.

Change-Id: I1d75637a434a955a58d166ad203e49620d7395ed
Signed-off-by: Jacob Garber <jgarber1@ualberta.ca>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34297
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>

24 files changed, 107 insertions, 113 deletions

diff --git a/src/console/vtxprintf.c b/src/console/vtxprintf.c
index 848ad501ced0..f34c91bb5ff0 100644
--- a/src/console/vtxprintf.c
+++ b/src/console/vtxprintf.c
@@ -271,6 +271,7 @@ repeat:
 
 		case 'X':
 			flags |= LARGE;
+			/* fall through */
 		case 'x':
 			base = 16;
 			break;
diff --git a/src/lib/edid.c b/src/lib/edid.c
index e2f213c5b0c3..3b81b5c30ab4 100644
--- a/src/lib/edid.c
+++ b/src/lib/edid.c
@@ -1207,14 +1207,16 @@ int decode_edid(unsigned char *edid, int size, struct edid *out)
 		switch (edid[0x13]) {
 		case 4:
 			c.claims_one_point_four = 1;
+			/* fall through */
 		case 3:
 			c.claims_one_point_three = 1;
+			/* fall through */
 		case 2:
 			c.claims_one_point_two = 1;
+			/* fall through */
 		default:
-			break;
+			c.claims_one_point_oh = 1;
 		}
-		c.claims_one_point_oh = 1;
 	}
 
 	/* display section */
diff --git a/src/soc/nvidia/tegra124/sor.c b/src/soc/nvidia/tegra124/sor.c
index 3bc50e813ea6..52b909e29d92 100644
--- a/src/soc/nvidia/tegra124/sor.c
+++ b/src/soc/nvidia/tegra124/sor.c
@@ -237,6 +237,7 @@ static int tegra_dc_sor_power_dplanes(struct tegra_dc_sor_data *sor,
 			/* fall through */
 		case 2:
 			reg_val |= NV_SOR_DP_PADCTL_PD_TXD_1_NO;
+			/* fall through */
 		case 1:
 			reg_val |= NV_SOR_DP_PADCTL_PD_TXD_0_NO;
 			break;
diff --git a/src/soc/rockchip/rk3288/sdram.c b/src/soc/rockchip/rk3288/sdram.c
index 53c594a4b352..74038b078ebd 100644
--- a/src/soc/rockchip/rk3288/sdram.c
+++ b/src/soc/rockchip/rk3288/sdram.c
@@ -751,10 +751,8 @@ static void move_to_config_state(struct rk3288_ddr_publ_regs *ddr_publ_regs,
 			while ((read32(&ddr_publ_regs->pgsr) & PGSR_DLDONE)
 				!= PGSR_DLDONE)
 				;
-			/* if at low power state,need wakeup first,
-			 * and then enter the config
-			 * so here no break.
-			 */
+			/* if at low power state, need wakeup first, then enter the config */
+			/* fall through */
 		case ACCESS:
 		case INIT_MEM:
 			write32(&ddr_pctl_regs->sctl, CFG_STATE);
diff --git a/src/southbridge/amd/agesa/hudson/hudson.c b/src/southbridge/amd/agesa/hudson/hudson.c
index 25997d2e9d6f..4c06e87281bf 100644
--- a/src/southbridge/amd/agesa/hudson/hudson.c
+++ b/src/southbridge/amd/agesa/hudson/hudson.c
@@ -117,21 +117,24 @@ void hudson_enable(struct device *dev)
 	case PCI_DEVFN(0x12, 0):
 		if (dev->enabled == 0)
 			hudson_disable_usb(USB_EN_DEVFN_12_0);
-	case PCI_DEVFN(0x12, 2):	/* Fall through */
+		/* fall through */
+	case PCI_DEVFN(0x12, 2):
 		if (dev->enabled == 0)
 			hudson_disable_usb(USB_EN_DEVFN_12_2);
 		break;
 	case PCI_DEVFN(0x13, 0):
 		if (dev->enabled == 0)
 			hudson_disable_usb(USB_EN_DEVFN_13_0);
-	case PCI_DEVFN(0x13, 2):	/* Fall through */
+		/* fall through */
+	case PCI_DEVFN(0x13, 2):
 		if (dev->enabled == 0)
 			hudson_disable_usb(USB_EN_DEVFN_13_2);
 		break;
 	case PCI_DEVFN(0x16, 0):
 		if (dev->enabled == 0)
 			hudson_disable_usb(USB_EN_DEVFN_16_0);
-	case PCI_DEVFN(0x16, 2):	/* Fall through */
+		/* fall through */
+	case PCI_DEVFN(0x16, 2):
 		if (dev->enabled == 0)
 			hudson_disable_usb(USB_EN_DEVFN_16_2);
 		break;
diff --git a/src/southbridge/amd/cimx/sb800/lpc.c b/src/southbridge/amd/cimx/sb800/lpc.c
index 483d185e32bb..79f402993fc4 100644
--- a/src/southbridge/amd/cimx/sb800/lpc.c
+++ b/src/southbridge/amd/cimx/sb800/lpc.c
@@ -172,8 +172,10 @@ void lpc_enable_childrens_resources(struct device *dev)
 	switch (var_num) {
 	case 3:
 		pci_write_config16(dev, 0x90, reg_var[2]);
+		/* fall through */
 	case 2:
 		pci_write_config16(dev, 0x66, reg_var[1]);
+		/* fall through */
 	case 1:
 		//pci_write_config16(dev, 0x64, reg_var[0]); //cause filo can not find sata
 		break;
diff --git a/src/southbridge/amd/cimx/sb900/lpc.c b/src/southbridge/amd/cimx/sb900/lpc.c
index 8fcb947eb6c1..8e7c1cc67f36 100644
--- a/src/southbridge/amd/cimx/sb900/lpc.c
+++ b/src/southbridge/amd/cimx/sb900/lpc.c
@@ -170,8 +170,10 @@ void lpc_enable_childrens_resources(struct device *dev)
 	switch (var_num) {
 	case 3:
 		pci_write_config16(dev, 0x90, reg_var[2]);
+		/* fall through */
 	case 2:
 		pci_write_config16(dev, 0x66, reg_var[1]);
+		/* fall through */
 	case 1:
 		//pci_write_config16(dev, 0x64, reg_var[0]); //cause filo can not find sata
 		break;
diff --git a/src/southbridge/amd/sb700/lpc.c b/src/southbridge/amd/sb700/lpc.c
index b7f0dc3bbf17..eb171e605a3b 100644
--- a/src/southbridge/amd/sb700/lpc.c
+++ b/src/southbridge/amd/sb700/lpc.c
@@ -230,8 +230,10 @@ static void sb700_lpc_enable_childrens_resources(struct device *dev)
 	switch (var_num) {
 	case 3:
 		pci_write_config16(dev, 0x90, reg_var[2]);
+		/* fall through */
 	case 2:
 		pci_write_config16(dev, 0x66, reg_var[1]);
+		/* fall through */
 	case 1:
 		pci_write_config16(dev, 0x64, reg_var[0]);
 		break;
diff --git a/src/southbridge/amd/sb800/lpc.c b/src/southbridge/amd/sb800/lpc.c
index 74b63741a555..580138a47073 100644
--- a/src/southbridge/amd/sb800/lpc.c
+++ b/src/southbridge/amd/sb800/lpc.c
@@ -222,8 +222,10 @@ static void sb800_lpc_enable_childrens_resources(struct device *dev)
 	switch (var_num) {
 	case 3:
 		pci_write_config16(dev, 0x90, reg_var[2]);
+		/* fall through */
 	case 2:
 		pci_write_config16(dev, 0x66, reg_var[1]);
+		/* fall through */
 	case 1:
 		pci_write_config16(dev, 0x64, reg_var[0]);
 		break;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/CPU/S3.c b/src/vendorcode/amd/agesa/f12/Proc/CPU/S3.c
index caf817ef33bc..0897123aa2ba 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/CPU/S3.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/CPU/S3.c
@@ -225,25 +225,25 @@ SaveDeviceContext (
     switch (Device.CommonDeviceHeader->Type) {
     case DEV_TYPE_PCI_PRE_ESR:
       SavePciDevice (StdHeader, Device.PciDevice, CallPoint, &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_PCI:
       Device.PciDevice++;
       break;
     case DEV_TYPE_CPCI_PRE_ESR:
       SaveConditionalPciDevice (StdHeader, Device.CPciDevice, CallPoint, &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_CPCI:
       Device.CPciDevice++;
       break;
     case DEV_TYPE_MSR_PRE_ESR:
       SaveMsrDevice (StdHeader, Device.MsrDevice, CallPoint, (UINT64 **) &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_MSR:
       Device.MsrDevice++;
       break;
     case DEV_TYPE_CMSR_PRE_ESR:
       SaveConditionalMsrDevice (StdHeader, Device.CMsrDevice, CallPoint, (UINT64 **) &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_CMSR:
       Device.CMsrDevice++;
       break;
@@ -256,25 +256,25 @@ SaveDeviceContext (
     switch (Device.CommonDeviceHeader->Type) {
     case DEV_TYPE_PCI:
       SavePciDevice (StdHeader, Device.PciDevice, CallPoint, &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_PCI_PRE_ESR:
       Device.PciDevice++;
       break;
     case DEV_TYPE_CPCI:
       SaveConditionalPciDevice (StdHeader, Device.CPciDevice, CallPoint, &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_CPCI_PRE_ESR:
       Device.CPciDevice++;
       break;
     case DEV_TYPE_MSR:
       SaveMsrDevice (StdHeader, Device.MsrDevice, CallPoint, (UINT64 **) &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_MSR_PRE_ESR:
       Device.MsrDevice++;
       break;
     case DEV_TYPE_CMSR:
       SaveConditionalMsrDevice (StdHeader, Device.CMsrDevice, CallPoint, (UINT64 **) &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_CMSR_PRE_ESR:
       Device.CMsrDevice++;
       break;
@@ -679,25 +679,25 @@ RestorePreESRContext (
     switch (Device.CommonDeviceHeader->Type) {
     case DEV_TYPE_PCI_PRE_ESR:
       RestorePciDevice (StdHeader, Device.PciDevice, CallPoint, OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_PCI:
       Device.PciDevice++;
       break;
     case DEV_TYPE_CPCI_PRE_ESR:
       RestoreConditionalPciDevice (StdHeader, Device.CPciDevice, CallPoint, OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_CPCI:
       Device.CPciDevice++;
       break;
     case DEV_TYPE_MSR_PRE_ESR:
       RestoreMsrDevice (StdHeader, Device.MsrDevice, CallPoint, (UINT64 **) OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_MSR:
       Device.MsrDevice++;
       break;
     case DEV_TYPE_CMSR_PRE_ESR:
       RestoreConditionalMsrDevice (StdHeader, Device.CMsrDevice, CallPoint, (UINT64 **) OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_CMSR:
       Device.CMsrDevice++;
       break;
@@ -739,25 +739,25 @@ RestorePostESRContext (
     switch (Device.CommonDeviceHeader->Type) {
     case DEV_TYPE_PCI:
       RestorePciDevice (StdHeader, Device.PciDevice, CallPoint, &OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_PCI_PRE_ESR:
       Device.PciDevice++;
       break;
     case DEV_TYPE_CPCI:
       RestoreConditionalPciDevice (StdHeader, Device.CPciDevice, CallPoint, &OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_CPCI_PRE_ESR:
       Device.CPciDevice++;
       break;
     case DEV_TYPE_MSR:
       RestoreMsrDevice (StdHeader, Device.MsrDevice, CallPoint, (UINT64 **) &OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_MSR_PRE_ESR:
       Device.MsrDevice++;
       break;
     case DEV_TYPE_CMSR:
       RestoreConditionalMsrDevice (StdHeader, Device.CMsrDevice, CallPoint, (UINT64 **) &OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_CMSR_PRE_ESR:
       Device.CMsrDevice++;
       break;
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Mem/Main/muc.c b/src/vendorcode/amd/agesa/f12/Proc/Mem/Main/muc.c
index c76d2283827f..a6d7bb1affeb 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Mem/Main/muc.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Mem/Main/muc.c
@@ -212,8 +212,7 @@ MemUFillTrainPattern (
       break;
     case TestPatternJD256B:
       k >>= 1;
-      // break is not being used here because TestPatternJD256B also need
-      // to run TestPatternJD256A sequence.
+      // fall through - TestPatternJD256B also need to run TestPatternJD256A sequence
     case TestPatternJD256A:
       k >>= 3;
       ASSERT (k < sizeof (PatternJD_256));
@@ -221,8 +220,7 @@ MemUFillTrainPattern (
       break;
     case TestPatternJD1B:
       k >>= 1;
-      // break is not being used here because TestPatternJD1B also need
-      // to run TestPatternJD1A sequence.
+      // fall through - TestPatternJD1B also need to run TestPatternJD1A sequence
     case TestPatternJD1A:
       k >>= 3;
       i = (UINT8) (k >> 3);
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/mnphy.c b/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/mnphy.c
index 08b3a66625d2..d84e4172ff7a 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/mnphy.c
+++ b/src/vendorcode/amd/agesa/f12/Proc/Mem/NB/mnphy.c
@@ -691,8 +691,7 @@ MemNcmnGetSetTrainDlyNb (
     } else if (Rank) {
       Index += 0x60;
     }
-    // break is not being used here because AccessRdDqsDly and AccessWrDatDly also need
-    // to run AccessPhRecDly sequence.
+    // fall through - AccessRdDqsDly and AccessWrDatDly also need to run AccessPhRecDly sequence
   case AccessPhRecDly:
     Index += (Byte / 4);
     Offset = 8 * (Byte % 4);
@@ -818,8 +817,7 @@ MemNcmnGetSetTrainDlyClientNb (
   case AccessRdDqsDly:
   case AccessWrDatDly:
     Index += (Dimm * 0x100);
-    // break is not being used here because AccessRdDqsDly and AccessWrDatDly also need
-    // to run AccessPhRecDly sequence.
+    // fall through - AccessRdDqsDly and AccessWrDatDly also need to run AccessPhRecDly sequence
   case AccessPhRecDly:
     Index += (Byte / 4);
     Offset = 8 * (Byte % 4);
@@ -967,8 +965,7 @@ MemNcmnGetSetTrainDlyUnb (
     } else if (Rank) {
       Index += 0x60;
     }
-    // break is not being used here because AccessRdDqsDly and AccessWrDatDly also need
-    // to run AccessPhRecDly sequence.
+    // fall through - AccessRdDqsDly and AccessWrDatDly also need to run AccessPhRecDly sequence
   case AccessPhRecDly:
     Index += (Byte / 4);
     Offset = 8 * (Byte % 4);
diff --git a/src/vendorcode/amd/agesa/f14/Proc/CPU/S3.c b/src/vendorcode/amd/agesa/f14/Proc/CPU/S3.c
index a1393bebe532..6d12752b2656 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/CPU/S3.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/CPU/S3.c
@@ -227,25 +227,25 @@ SaveDeviceContext (
     switch (Device.CommonDeviceHeader->Type) {
     case DEV_TYPE_PCI_PRE_ESR:
       SavePciDevice (StdHeader, Device.PciDevice, CallPoint, &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_PCI:
       Device.PciDevice++;
       break;
     case DEV_TYPE_CPCI_PRE_ESR:
       SaveConditionalPciDevice (StdHeader, Device.CPciDevice, CallPoint, &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_CPCI:
       Device.CPciDevice++;
       break;
     case DEV_TYPE_MSR_PRE_ESR:
       SaveMsrDevice (StdHeader, Device.MsrDevice, CallPoint, (UINT64 **) &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_MSR:
       Device.MsrDevice++;
       break;
     case DEV_TYPE_CMSR_PRE_ESR:
       SaveConditionalMsrDevice (StdHeader, Device.CMsrDevice, CallPoint, (UINT64 **) &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_CMSR:
       Device.CMsrDevice++;
       break;
@@ -258,25 +258,25 @@ SaveDeviceContext (
     switch (Device.CommonDeviceHeader->Type) {
     case DEV_TYPE_PCI:
       SavePciDevice (StdHeader, Device.PciDevice, CallPoint, &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_PCI_PRE_ESR:
       Device.PciDevice++;
       break;
     case DEV_TYPE_CPCI:
       SaveConditionalPciDevice (StdHeader, Device.CPciDevice, CallPoint, &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_CPCI_PRE_ESR:
       Device.CPciDevice++;
       break;
     case DEV_TYPE_MSR:
       SaveMsrDevice (StdHeader, Device.MsrDevice, CallPoint, (UINT64 **) &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_MSR_PRE_ESR:
       Device.MsrDevice++;
       break;
     case DEV_TYPE_CMSR:
       SaveConditionalMsrDevice (StdHeader, Device.CMsrDevice, CallPoint, (UINT64 **) &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_CMSR_PRE_ESR:
       Device.CMsrDevice++;
       break;
@@ -673,25 +673,25 @@ RestorePreESRContext (
     switch (Device.CommonDeviceHeader->Type) {
     case DEV_TYPE_PCI_PRE_ESR:
       RestorePciDevice (StdHeader, Device.PciDevice, CallPoint, OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_PCI:
       Device.PciDevice++;
       break;
     case DEV_TYPE_CPCI_PRE_ESR:
       RestoreConditionalPciDevice (StdHeader, Device.CPciDevice, CallPoint, OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_CPCI:
       Device.CPciDevice++;
       break;
     case DEV_TYPE_MSR_PRE_ESR:
       RestoreMsrDevice (StdHeader, Device.MsrDevice, CallPoint, (UINT64 **) OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_MSR:
       Device.MsrDevice++;
       break;
     case DEV_TYPE_CMSR_PRE_ESR:
       RestoreConditionalMsrDevice (StdHeader, Device.CMsrDevice, CallPoint, (UINT64 **) OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_CMSR:
       Device.CMsrDevice++;
       break;
@@ -733,25 +733,25 @@ RestorePostESRContext (
     switch (Device.CommonDeviceHeader->Type) {
     case DEV_TYPE_PCI:
       RestorePciDevice (StdHeader, Device.PciDevice, CallPoint, &OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_PCI_PRE_ESR:
       Device.PciDevice++;
       break;
     case DEV_TYPE_CPCI:
       RestoreConditionalPciDevice (StdHeader, Device.CPciDevice, CallPoint, &OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_CPCI_PRE_ESR:
       Device.CPciDevice++;
       break;
     case DEV_TYPE_MSR:
       RestoreMsrDevice (StdHeader, Device.MsrDevice, CallPoint, (UINT64 **) &OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_MSR_PRE_ESR:
       Device.MsrDevice++;
       break;
     case DEV_TYPE_CMSR:
       RestoreConditionalMsrDevice (StdHeader, Device.CMsrDevice, CallPoint, (UINT64 **) &OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_CMSR_PRE_ESR:
       Device.CMsrDevice++;
       break;
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/muc.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/muc.c
index 88b85df7ac89..da0eb95cf345 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/muc.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/Main/muc.c
@@ -213,8 +213,7 @@ MemUFillTrainPattern (
       break;
     case TestPatternJD256B:
       k >>= 1;
-      // break is not being used here because TestPatternJD256B also need
-      // to run TestPatternJD256A sequence.
+      // fall through - TestPatternJD256B also need to run TestPatternJD256A sequence
     case TestPatternJD256A:
       k >>= 3;
       ASSERT (k < sizeof (PatternJD_256));
@@ -222,8 +221,7 @@ MemUFillTrainPattern (
       break;
     case TestPatternJD1B:
       k >>= 1;
-      // break is not being used here because TestPatternJD1B also need
-      // to run TestPatternJD1A sequence.
+      // fall through - TestPatternJD1B also need to run TestPatternJD1A sequence
     case TestPatternJD1A:
       k >>= 3;
       i = (UINT8) (k >> 3);
diff --git a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnphy.c b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnphy.c
index 4045289a1822..a312687cf8c2 100644
--- a/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnphy.c
+++ b/src/vendorcode/amd/agesa/f14/Proc/Mem/NB/mnphy.c
@@ -695,8 +695,7 @@ MemNcmnGetSetTrainDlyNb (
     } else if (Rank) {
       Index += 0x60;
     }
-    // break is not being used here because AccessRdDqsDly and AccessWrDatDly also need
-    // to run AccessPhRecDly sequence.
+    // fall through - AccessRdDqsDly and AccessWrDatDly also need to run AccessPhRecDly sequence
   case AccessPhRecDly:
     Index += (Byte / 4);
     Offset = 8 * (Byte % 4);
@@ -822,8 +821,7 @@ MemNcmnGetSetTrainDlyClientNb (
   case AccessRdDqsDly:
   case AccessWrDatDly:
     Index += (Dimm * 0x100);
-    // break is not being used here because AccessRdDqsDly and AccessWrDatDly also need
-    // to run AccessPhRecDly sequence.
+    // fall through - AccessRdDqsDly and AccessWrDatDly also need to run AccessPhRecDly sequence
   case AccessPhRecDly:
     Index += (Byte / 4);
     Offset = 8 * (Byte % 4);
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/S3.c b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/S3.c
index 95579cbef43c..9152beedf1e9 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/CPU/S3.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/CPU/S3.c
@@ -224,25 +224,25 @@ SaveDeviceContext (
     switch (Device.CommonDeviceHeader->Type) {
     case DEV_TYPE_PCI_PRE_ESR:
       SavePciDevice (StdHeader, Device.PciDevice, CallPoint, &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_PCI:
       Device.PciDevice++;
       break;
     case DEV_TYPE_CPCI_PRE_ESR:
       SaveConditionalPciDevice (StdHeader, Device.CPciDevice, CallPoint, &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_CPCI:
       Device.CPciDevice++;
       break;
     case DEV_TYPE_MSR_PRE_ESR:
       SaveMsrDevice (StdHeader, Device.MsrDevice, CallPoint, (UINT64 **) &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_MSR:
       Device.MsrDevice++;
       break;
     case DEV_TYPE_CMSR_PRE_ESR:
       SaveConditionalMsrDevice (StdHeader, Device.CMsrDevice, CallPoint, (UINT64 **) &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_CMSR:
       Device.CMsrDevice++;
       break;
@@ -255,25 +255,25 @@ SaveDeviceContext (
     switch (Device.CommonDeviceHeader->Type) {
     case DEV_TYPE_PCI:
       SavePciDevice (StdHeader, Device.PciDevice, CallPoint, &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_PCI_PRE_ESR:
       Device.PciDevice++;
       break;
     case DEV_TYPE_CPCI:
       SaveConditionalPciDevice (StdHeader, Device.CPciDevice, CallPoint, &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_CPCI_PRE_ESR:
       Device.CPciDevice++;
       break;
     case DEV_TYPE_MSR:
       SaveMsrDevice (StdHeader, Device.MsrDevice, CallPoint, (UINT64 **) &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_MSR_PRE_ESR:
       Device.MsrDevice++;
       break;
     case DEV_TYPE_CMSR:
       SaveConditionalMsrDevice (StdHeader, Device.CMsrDevice, CallPoint, (UINT64 **) &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_CMSR_PRE_ESR:
       Device.CMsrDevice++;
       break;
@@ -678,25 +678,25 @@ RestorePreESRContext (
     switch (Device.CommonDeviceHeader->Type) {
     case DEV_TYPE_PCI_PRE_ESR:
       RestorePciDevice (StdHeader, Device.PciDevice, CallPoint, OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_PCI:
       Device.PciDevice++;
       break;
     case DEV_TYPE_CPCI_PRE_ESR:
       RestoreConditionalPciDevice (StdHeader, Device.CPciDevice, CallPoint, OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_CPCI:
       Device.CPciDevice++;
       break;
     case DEV_TYPE_MSR_PRE_ESR:
       RestoreMsrDevice (StdHeader, Device.MsrDevice, CallPoint, (UINT64 **) OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_MSR:
       Device.MsrDevice++;
       break;
     case DEV_TYPE_CMSR_PRE_ESR:
       RestoreConditionalMsrDevice (StdHeader, Device.CMsrDevice, CallPoint, (UINT64 **) OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_CMSR:
       Device.CMsrDevice++;
       break;
@@ -738,25 +738,25 @@ RestorePostESRContext (
     switch (Device.CommonDeviceHeader->Type) {
     case DEV_TYPE_PCI:
       RestorePciDevice (StdHeader, Device.PciDevice, CallPoint, &OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_PCI_PRE_ESR:
       Device.PciDevice++;
       break;
     case DEV_TYPE_CPCI:
       RestoreConditionalPciDevice (StdHeader, Device.CPciDevice, CallPoint, &OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_CPCI_PRE_ESR:
       Device.CPciDevice++;
       break;
     case DEV_TYPE_MSR:
       RestoreMsrDevice (StdHeader, Device.MsrDevice, CallPoint, (UINT64 **) &OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_MSR_PRE_ESR:
       Device.MsrDevice++;
       break;
     case DEV_TYPE_CMSR:
       RestoreConditionalMsrDevice (StdHeader, Device.CMsrDevice, CallPoint, (UINT64 **) &OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_CMSR_PRE_ESR:
       Device.CMsrDevice++;
       break;
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/IDS/Debug/IdsDebugPrint.c b/src/vendorcode/amd/agesa/f15tn/Proc/IDS/Debug/IdsDebugPrint.c
index 322339d4a3da..5c3e312158a1 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/IDS/Debug/IdsDebugPrint.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/IDS/Debug/IdsDebugPrint.c
@@ -372,9 +372,7 @@ AmdIdsDebugPrintWorker (
       case 'X':
         Flags |= PREFIX_ZERO;
         Width = sizeof (UINT64) * 2;
-        //
-        // break skipped on purpose
-        //
+	// fall through
       case 'x':
         if ((Flags & LONG_TYPE) == LONG_TYPE) {
           Value = VA_ARG (Marker, UINT64);
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Mem/Main/muc.c b/src/vendorcode/amd/agesa/f15tn/Proc/Mem/Main/muc.c
index 41ba55c652e1..a9aa5ca6f359 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Mem/Main/muc.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Mem/Main/muc.c
@@ -211,8 +211,7 @@ MemUFillTrainPattern (
       break;
     case TestPatternJD256B:
       k >>= 1;
-      // break is not being used here because TestPatternJD256B also need
-      // to run TestPatternJD256A sequence.
+      // fall through - TestPatternJD256B also need to run TestPatternJD256A sequence
     case TestPatternJD256A:
       k >>= 3;
       ASSERT (k < sizeof (PatternJD_256));
@@ -220,8 +219,7 @@ MemUFillTrainPattern (
       break;
     case TestPatternJD1B:
       k >>= 1;
-      // break is not being used here because TestPatternJD1B also need
-      // to run TestPatternJD1A sequence.
+      // fall through - TestPatternJD1B also need to run TestPatternJD1A sequence
     case TestPatternJD1A:
       k >>= 3;
       i = (UINT8) (k >> 3);
diff --git a/src/vendorcode/amd/agesa/f15tn/Proc/Mem/NB/mnphy.c b/src/vendorcode/amd/agesa/f15tn/Proc/Mem/NB/mnphy.c
index 060269e12903..076f44387605 100644
--- a/src/vendorcode/amd/agesa/f15tn/Proc/Mem/NB/mnphy.c
+++ b/src/vendorcode/amd/agesa/f15tn/Proc/Mem/NB/mnphy.c
@@ -693,8 +693,7 @@ MemNcmnGetSetTrainDlyNb (
     } else if (Rank) {
       Index += 0x60;
     }
-    // break is not being used here because AccessRdDqsDly and AccessWrDatDly also need
-    // to run AccessPhRecDly sequence.
+    // fall through - AccessRdDqsDly and AccessWrDatDly also need to run AccessPhRecDly sequence
   case AccessPhRecDly:
     Index += (Byte / 4);
     Offset = 8 * (Byte % 4);
@@ -820,8 +819,7 @@ MemNcmnGetSetTrainDlyClientNb (
   case AccessRdDqsDly:
   case AccessWrDatDly:
     Index += (Dimm * 0x100);
-    // break is not being used here because AccessRdDqsDly and AccessWrDatDly also need
-    // to run AccessPhRecDly sequence.
+    // fall through - AccessRdDqsDly and AccessWrDatDly also need to run AccessPhRecDly sequence
   case AccessPhRecDly:
     Index += (Byte / 4);
     Offset = 8 * (Byte % 4);
@@ -975,8 +973,7 @@ MemNcmnGetSetTrainDlyUnb (
     } else if (Rank) {
       Index += 0x60;
     }
-    // break is not being used here because AccessRdDqsDly and AccessWrDatDly also need
-    // to run AccessPhRecDly sequence.
+    // fall through - AccessRdDqsDly and AccessWrDatDly also need to run AccessPhRecDly sequence
   case AccessPhRecDly:
     Index += (Byte / 4);
     Offset = 8 * (Byte % 4);
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbUtilities.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbUtilities.c
index ed94e79f7803..ccc7343d1b12 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbUtilities.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/Family/0x16/KB/F16KbUtilities.c
@@ -242,9 +242,11 @@ F16KbSetDownCoreRegister (
   case CORE_LEVEL_COMPUTE_UNIT_THREE:
     TempVar32_a = TempVar32_a << 1;
     CoresPerComputeUnit++;
+    // fall through
   case CORE_LEVEL_COMPUTE_UNIT_TWO:
     TempVar32_a = TempVar32_a << 1;
     CoresPerComputeUnit++;
+    // fall through
   case CORE_LEVEL_COMPUTE_UNIT:
     TempVar32_a = (TempVar32_a << 1) - 1;
     TempVar32_a = FOUR_CORE_COMPUTE_UNIT_BITMAP & (~TempVar32_a);
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/S3.c b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/S3.c
index 4b6128e24568..42aebb67d1f1 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/CPU/S3.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/CPU/S3.c
@@ -224,25 +224,25 @@ SaveDeviceContext (
     switch (Device.CommonDeviceHeader->Type) {
     case DEV_TYPE_PCI_PRE_ESR:
       SavePciDevice (StdHeader, Device.PciDevice, CallPoint, &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_PCI:
       Device.PciDevice++;
       break;
     case DEV_TYPE_CPCI_PRE_ESR:
       SaveConditionalPciDevice (StdHeader, Device.CPciDevice, CallPoint, &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_CPCI:
       Device.CPciDevice++;
       break;
     case DEV_TYPE_MSR_PRE_ESR:
       SaveMsrDevice (StdHeader, Device.MsrDevice, CallPoint, (UINT64 **) &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_MSR:
       Device.MsrDevice++;
       break;
     case DEV_TYPE_CMSR_PRE_ESR:
       SaveConditionalMsrDevice (StdHeader, Device.CMsrDevice, CallPoint, (UINT64 **) &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_CMSR:
       Device.CMsrDevice++;
       break;
@@ -255,25 +255,25 @@ SaveDeviceContext (
     switch (Device.CommonDeviceHeader->Type) {
     case DEV_TYPE_PCI:
       SavePciDevice (StdHeader, Device.PciDevice, CallPoint, &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_PCI_PRE_ESR:
       Device.PciDevice++;
       break;
     case DEV_TYPE_CPCI:
       SaveConditionalPciDevice (StdHeader, Device.CPciDevice, CallPoint, &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_CPCI_PRE_ESR:
       Device.CPciDevice++;
       break;
     case DEV_TYPE_MSR:
       SaveMsrDevice (StdHeader, Device.MsrDevice, CallPoint, (UINT64 **) &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_MSR_PRE_ESR:
       Device.MsrDevice++;
       break;
     case DEV_TYPE_CMSR:
       SaveConditionalMsrDevice (StdHeader, Device.CMsrDevice, CallPoint, (UINT64 **) &OrMask);
-      // Fall through to advance the pointer after saving context
+      // fall through - advance the pointer after saving context
     case DEV_TYPE_CMSR_PRE_ESR:
       Device.CMsrDevice++;
       break;
@@ -678,25 +678,25 @@ RestorePreESRContext (
     switch (Device.CommonDeviceHeader->Type) {
     case DEV_TYPE_PCI_PRE_ESR:
       RestorePciDevice (StdHeader, Device.PciDevice, CallPoint, OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_PCI:
       Device.PciDevice++;
       break;
     case DEV_TYPE_CPCI_PRE_ESR:
       RestoreConditionalPciDevice (StdHeader, Device.CPciDevice, CallPoint, OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_CPCI:
       Device.CPciDevice++;
       break;
     case DEV_TYPE_MSR_PRE_ESR:
       RestoreMsrDevice (StdHeader, Device.MsrDevice, CallPoint, (UINT64 **) OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_MSR:
       Device.MsrDevice++;
       break;
     case DEV_TYPE_CMSR_PRE_ESR:
       RestoreConditionalMsrDevice (StdHeader, Device.CMsrDevice, CallPoint, (UINT64 **) OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_CMSR:
       Device.CMsrDevice++;
       break;
@@ -738,25 +738,25 @@ RestorePostESRContext (
     switch (Device.CommonDeviceHeader->Type) {
     case DEV_TYPE_PCI:
       RestorePciDevice (StdHeader, Device.PciDevice, CallPoint, &OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_PCI_PRE_ESR:
       Device.PciDevice++;
       break;
     case DEV_TYPE_CPCI:
       RestoreConditionalPciDevice (StdHeader, Device.CPciDevice, CallPoint, &OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_CPCI_PRE_ESR:
       Device.CPciDevice++;
       break;
     case DEV_TYPE_MSR:
       RestoreMsrDevice (StdHeader, Device.MsrDevice, CallPoint, (UINT64 **) &OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_MSR_PRE_ESR:
       Device.MsrDevice++;
       break;
     case DEV_TYPE_CMSR:
       RestoreConditionalMsrDevice (StdHeader, Device.CMsrDevice, CallPoint, (UINT64 **) &OrMaskPtr);
-      // Fall through to advance the pointer after restoring context
+      // fall through - advance the pointer after restoring context
     case DEV_TYPE_CMSR_PRE_ESR:
       Device.CMsrDevice++;
       break;
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/IDS/Debug/IdsDebugPrint.c b/src/vendorcode/amd/agesa/f16kb/Proc/IDS/Debug/IdsDebugPrint.c
index 4163d828deb0..c3e4ade14be6 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/IDS/Debug/IdsDebugPrint.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/IDS/Debug/IdsDebugPrint.c
@@ -375,9 +375,7 @@ AmdIdsDebugPrintWorker (
       case 'X':
         Flags |= PREFIX_ZERO;
         Width = sizeof (UINT64) * 2;
-        //
-        // break skipped on purpose
-        //
+	// fall through
       case 'x':
         if ((Flags & LONG_TYPE) == LONG_TYPE) {
           Value = VA_ARG (Marker, UINT64);
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Main/muc.c b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Main/muc.c
index 8d8177325e2e..980cd3366690 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Main/muc.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/Main/muc.c
@@ -211,8 +211,7 @@ MemUFillTrainPattern (
       break;
     case TestPatternJD256B:
       k >>= 1;
-      // break is not being used here because TestPatternJD256B also need
-      // to run TestPatternJD256A sequence.
+      // fall through - TestPatternJD256B also need to run TestPatternJD256A sequence
     case TestPatternJD256A:
       k >>= 3;
       ASSERT (k < sizeof (PatternJD_256));
@@ -220,8 +219,7 @@ MemUFillTrainPattern (
       break;
     case TestPatternJD1B:
       k >>= 1;
-      // break is not being used here because TestPatternJD1B also need
-      // to run TestPatternJD1A sequence.
+      // fall through - TestPatternJD1B also need to run TestPatternJD1A sequence
     case TestPatternJD1A:
       k >>= 3;
       i = (UINT8) (k >> 3);
diff --git a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/NB/mnphy.c b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/NB/mnphy.c
index 356d4e391878..c20d5a2fd0cd 100644
--- a/src/vendorcode/amd/agesa/f16kb/Proc/Mem/NB/mnphy.c
+++ b/src/vendorcode/amd/agesa/f16kb/Proc/Mem/NB/mnphy.c
@@ -487,8 +487,7 @@ MemNcmnGetSetTrainDlyUnb (
     } else if (Rank) {
       Index += 0x60;
     }
-    // break is not being used here because AccessRdDqsDly and AccessWrDatDly also need
-    // to run AccessPhRecDly sequence.
+    // fall through - AccessRdDqsDly and AccessWrDatDly also need to run AccessPhRecDly sequence
   case AccessPhRecDly:
     Index += (Byte / 4);
     Offset = 8 * (Byte % 4);