CSIT-1196: Add hsw/skx and 2n/3n to the report structure