Change CME BCE reads to always use VG scope

DD2.1 parts are now being run with the MCD disabled in enterprise FW

Change-Id: Ia2fdcf72023ec353688d1db3decec65161f0d745
CQ: SW455429
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/71940
Reviewed-by: Brian T. Vanderpool <vanderp@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>

import/chips/p9/procedures/ppe_closed/lib/p9_hcd_block_copy.h

@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HCODE Project                                                */
 /*                                                                        */
-/* COPYRIGHT 2015,2018                                                    */
+/* COPYRIGHT 2015,2019                                                    */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -32,7 +32,7 @@ typedef enum
     ENABLE_WR_SCOPE         = 0x0000000000000010,
 
 // Due to HW423589, need to enable vector scope to all targets
-#if NIMBUS_DD_LEVEL == 20 || NIMBUS_DD_LEVEL >= 22
+#if NIMBUS_DD_LEVEL >= 20
     ENABLE_RD_SCOPE         = 0x0000000000000020,
     VG_TARGET_1S            = 0x0000000000000008,
 #else