Verma, Vishal L wrote: > On Sun, 2022-11-06 at 15:48 -0800, Dan Williams wrote: > > A recent extension of cxl_test adds 2 memory devices attached through a > > switch to a single ported host-bridge to reproduce a bug report. > > > > Reported-by: Jonathan Cameron <jonathan.came...@huawei.com> > > Link: http://lore.kernel.org/r/20221010172057.00001...@huawei.com > > Signed-off-by: Dan Williams <dan.j.willi...@intel.com> > > --- > > test/cxl-topology.sh | 48 > > +++++++++++++++++++++++++++++------------------- > > 1 file changed, 29 insertions(+), 19 deletions(-) > > This looks good, just a minor nit below. > > > > > diff --git a/test/cxl-topology.sh b/test/cxl-topology.sh > > index 1f15d29f0600..f1e0a2b01e98 100644 > > --- a/test/cxl-topology.sh > > +++ b/test/cxl-topology.sh > > @@ -29,27 +29,30 @@ count=$(jq "length" <<< $json) > > root=$(jq -r ".[] | .bus" <<< $json) > > > > > > -# validate 2 host bridges under a root port > > +# validate 2 or 3 host bridges under a root port > > port_sort="sort_by(.port | .[4:] | tonumber)" > > json=$($CXL list -b cxl_test -BP) > > count=$(jq ".[] | .[\"ports:$root\"] | length" <<< $json) > > -((count == 2)) || err "$LINENO" > > +((count == 2)) || ((count == 3)) || err "$LINENO" > > +bridges=$count > > > > bridge[0]=$(jq -r ".[] | .[\"ports:$root\"] | $port_sort | .[0].port" <<< > > $json) > > bridge[1]=$(jq -r ".[] | .[\"ports:$root\"] | $port_sort | .[1].port" <<< > > $json) > > +((bridges > 2)) && bridge[2]=$(jq -r ".[] | .[\"ports:$root\"] | > > $port_sort | .[2].port" <<< $json) > > > > +# validate root ports per host bridge > > +check_host_bridge() > > +{ > > + json=$($CXL list -b cxl_test -T -p $1) > > + count=$(jq ".[] | .dports | length" <<< $json) > > + ((count == $2)) || err "$3" > > +} > > > > -# validate 2 root ports per host bridge > > -json=$($CXL list -b cxl_test -T -p ${bridge[0]}) > > -count=$(jq ".[] | .dports | length" <<< $json) > > -((count == 2)) || err "$LINENO" > > - > > -json=$($CXL list -b cxl_test -T -p ${bridge[1]}) > > -count=$(jq ".[] | .dports | length" <<< $json) > > -((count == 2)) || err "$LINENO" > > +check_host_bridge ${bridge[0]} 2 $LINENO > > +check_host_bridge ${bridge[1]} 2 $LINENO > > +((bridges > 2)) && check_host_bridge ${bridge[2]} 1 $LINENO > > > > - > > -# validate 2 switches per-root port > > +# validate 2 switches per root-port > > json=$($CXL list -b cxl_test -P -p ${bridge[0]}) > > count=$(jq ".[] | .[\"ports:${bridge[0]}\"] | length" <<< $json) > > ((count == 2)) || err "$LINENO" > > @@ -65,9 +68,9 @@ switch[2]=$(jq -r ".[] | .[\"ports:${bridge[1]}\"] | > > $port_sort | .[0].host" <<< > > switch[3]=$(jq -r ".[] | .[\"ports:${bridge[1]}\"] | $port_sort | > > .[1].host" <<< $json) > > > > > > -# validate the expected properties of the 4 root decoders > > -# use the size of the first decoder to determine the cxl_test version / > > -# properties > > +# validate the expected properties of the 4 or 5 root decoders > > +# use the size of the first decoder to determine the > > +# cxl_test version / properties > > json=$($CXL list -b cxl_test -D -d root) > > port_id=${root:4} > > port_id_len=${#port_id} > > @@ -103,12 +106,19 @@ count=$(jq "[ $decoder_sort | .[3] | > > select(.nr_targets == 2) ] | length" <<< $json) > > ((count == 1)) || err "$LINENO" > > > > +if [ $bridges -eq 3 ]; then > > The $bridges should be quoted if using the posix sh style [ ], > or use the bash style without quoting: if [[ $bridges == "3" ]] > or use a 'math' context: if (( bridges == 3 ))
Ah, got it.
