Skip to content

Commit

Permalink
Ignore OMIC connections for OCMB_CHIP MRW processing
Browse files Browse the repository at this point in the history
  - The current MRW processing was treating OMI bus
    connections to the OMIC the same as to the OMI
    target causing for incorrect attribute settings.
    For now just ignore the OMIC connections for
    ocmb_chip, pmic, and lcard-dimm target types

Change-Id: I0767b4dba0d828db524d734e9669a3af66c8fbf1
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/81390
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R Geddes <crgeddes@us.ibm.com>
Reviewed-by: Chen Du <duchen@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
  • Loading branch information
wghoffa authored and dcrowell77 committed Aug 7, 2019
1 parent 7cfa513 commit 05007fa
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions src/usr/targeting/common/Targets.pm
Expand Up @@ -906,6 +906,10 @@ sub buildAffinity
foreach my $conn (@{$conn->{CONN}})
{
my $source = $conn->{SOURCE};
if ($source =~ /omic/i)
{
next;
}
my @targets = split(/\//, $source);
# Split the source into proc#, mc#, mi#, mcc#, omi#
# Source example:
Expand Down Expand Up @@ -1043,6 +1047,12 @@ sub buildAffinity
{
my $source = $conn->{SOURCE};
my @targets = split(/\//, $source);

if ($source =~ /omic/i)
{
next;
}

# Split the source into proc#, mc#, mi#, mcc#, omi#
# Source example:
# /sys-#/node-#/Pallid-#/proc_socket-#/Hopper-#/p9_axone/mc#/mi#/mcc#/omi#
Expand Down Expand Up @@ -1154,6 +1164,11 @@ sub buildAffinity
# Split the source into proc#, mc#, mi#, mcc#, omi#
# Source example:
# /sys-#/node-#/Pallid-#/proc_socket-#/Hopper-#/p9_axone/mc#/mi#/mcc#/omi#
if ($source =~ /omic/i)
{
next;
}

foreach my $target (@targets)
{
$target =~ s/\D//g;
Expand Down

0 comments on commit 05007fa

Please sign in to comment.