@@ -887,7 +887,7 @@ static void nfit_test0_setup(struct nfit_test *t)
887887 memdev -> range_index = 0 + 1 ;
888888 memdev -> region_index = 4 + 1 ;
889889 memdev -> region_size = SPA0_SIZE /2 ;
890- memdev -> region_offset = t -> spa_set_dma [ 0 ] ;
890+ memdev -> region_offset = 1 ;
891891 memdev -> address = 0 ;
892892 memdev -> interleave_index = 0 ;
893893 memdev -> interleave_ways = 2 ;
@@ -902,7 +902,7 @@ static void nfit_test0_setup(struct nfit_test *t)
902902 memdev -> range_index = 0 + 1 ;
903903 memdev -> region_index = 5 + 1 ;
904904 memdev -> region_size = SPA0_SIZE /2 ;
905- memdev -> region_offset = t -> spa_set_dma [ 0 ] + SPA0_SIZE / 2 ;
905+ memdev -> region_offset = ( 1 << 8 ) ;
906906 memdev -> address = 0 ;
907907 memdev -> interleave_index = 0 ;
908908 memdev -> interleave_ways = 2 ;
@@ -917,7 +917,7 @@ static void nfit_test0_setup(struct nfit_test *t)
917917 memdev -> range_index = 1 + 1 ;
918918 memdev -> region_index = 4 + 1 ;
919919 memdev -> region_size = SPA1_SIZE /4 ;
920- memdev -> region_offset = t -> spa_set_dma [ 1 ] ;
920+ memdev -> region_offset = ( 1 << 16 ) ;
921921 memdev -> address = SPA0_SIZE /2 ;
922922 memdev -> interleave_index = 0 ;
923923 memdev -> interleave_ways = 4 ;
@@ -932,7 +932,7 @@ static void nfit_test0_setup(struct nfit_test *t)
932932 memdev -> range_index = 1 + 1 ;
933933 memdev -> region_index = 5 + 1 ;
934934 memdev -> region_size = SPA1_SIZE /4 ;
935- memdev -> region_offset = t -> spa_set_dma [ 1 ] + SPA1_SIZE / 4 ;
935+ memdev -> region_offset = ( 1 << 24 ) ;
936936 memdev -> address = SPA0_SIZE /2 ;
937937 memdev -> interleave_index = 0 ;
938938 memdev -> interleave_ways = 4 ;
@@ -947,7 +947,7 @@ static void nfit_test0_setup(struct nfit_test *t)
947947 memdev -> range_index = 1 + 1 ;
948948 memdev -> region_index = 6 + 1 ;
949949 memdev -> region_size = SPA1_SIZE /4 ;
950- memdev -> region_offset = t -> spa_set_dma [ 1 ] + 2 * SPA1_SIZE / 4 ;
950+ memdev -> region_offset = ( 1ULL << 32 ) ;
951951 memdev -> address = SPA0_SIZE /2 ;
952952 memdev -> interleave_index = 0 ;
953953 memdev -> interleave_ways = 4 ;
@@ -962,7 +962,7 @@ static void nfit_test0_setup(struct nfit_test *t)
962962 memdev -> range_index = 1 + 1 ;
963963 memdev -> region_index = 7 + 1 ;
964964 memdev -> region_size = SPA1_SIZE /4 ;
965- memdev -> region_offset = t -> spa_set_dma [ 1 ] + 3 * SPA1_SIZE / 4 ;
965+ memdev -> region_offset = ( 1ULL << 40 ) ;
966966 memdev -> address = SPA0_SIZE /2 ;
967967 memdev -> interleave_index = 0 ;
968968 memdev -> interleave_ways = 4 ;
@@ -1380,7 +1380,7 @@ static void nfit_test0_setup(struct nfit_test *t)
13801380 memdev -> range_index = 11 + 1 ;
13811381 memdev -> region_index = 9 + 1 ;
13821382 memdev -> region_size = SPA0_SIZE ;
1383- memdev -> region_offset = t -> spa_set_dma [ 2 ] ;
1383+ memdev -> region_offset = ( 1ULL << 48 ) ;
13841384 memdev -> address = 0 ;
13851385 memdev -> interleave_index = 0 ;
13861386 memdev -> interleave_ways = 1 ;
0 commit comments