Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix rainier backend device tree to use different port mapping for rainier and everest #86

Merged
merged 2 commits into from
Feb 6, 2024
Merged

fix rainier backend device tree to use different port mapping for rainier and everest #86

merged 2 commits into from
Feb 6, 2024

Conversation

devenrao
Copy link
Contributor

@devenrao devenrao commented Feb 3, 2024

  1. Everest and rainier systems with odyssey support has different device path mappings so creating different backend device tree files

  2. Reverting the changes done to existing sbefifo and kernel backend device trees to its pre odyssey state.

  3. DDR4 odyssey mapping of fapi position to port is different for rainier and everest.

Change-Id: I7e733758ddea8e7ae06b124f8e630ff2795e4985

@devenrao
add separate backend device tree files for rainier and everest
af70acd 
1) Everest and rainier systems with odyssey support has different
device path mappings so creating different backend device tree files

2) Reverting the changes done to existing sbefifo and kernel backend
device trees to its pre odyssey state.

3) DDR4 odyssey mapping of fapi position to port is different for
rainier and everest.

Signed-off-by: Marri Devender Rao <[email protected]>
Change-Id: I7e733758ddea8e7ae06b124f8e630ff2795e4985
@devenrao devenrao changed the title add separate backend device tree files for rainier and everest fix rainier backend device tree to use different port mapping for rainier and everest Feb 4, 2024
@devenrao devenrao force-pushed the defect branch 2 times, most recently from c6610e4 to 02410f1 Compare February 5, 2024 05:40
@deepakala-k
Copy link
Contributor

Please check if bonnell can support odyssey.

Swarnendu-R-C
Swarnendu-R-C suggested changes Feb 5, 2024
View reviewed changes
Copy link
Contributor

@Swarnendu-R-C Swarnendu-R-C left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall looks good but I have only one major request apart from few queries and minor observations. Replace the hard coded machine names in multiple places by variables declared and defined in one place for easy maintenance and debugging

libpdbg/dtb.c Show resolved Hide resolved
libpdbg/dtb.c Show resolved Hide resolved
libpdbg/dtb.c Outdated Show resolved Hide resolved
libpdbg/dtb.c Show resolved Hide resolved
libpdbg/dtb.c Outdated Show resolved Hide resolved
libpdbg/dtb.c Outdated Show resolved Hide resolved
libpdbg/dtb.c Outdated Show resolved Hide resolved
libpdbg/dtb.c Outdated Show resolved Hide resolved
libpdbg/dtb.c Outdated Show resolved Hide resolved
libpdbg/dtb.c Outdated Show resolved Hide resolved
@devenrao devenrao force-pushed the defect branch 2 times, most recently from 0157337 to a91dd08 Compare February 5, 2024 09:29
@devenrao
modify to use different device tree for rainier and everest
ad3b174 
1) Rainier and everest uses different port mapping so modified
to use different device trees for everest and rainier

2) Modified to use fapi_pos over ocmb index for determining the
backend sbefifo target

Tested:
----rainxx test result---
      odyssey
        p[3]
          mp[0]
          perv[8]
        p[26]
          mp[0]
          perv[8]
        p[27]
          mp[0]
          perv[8]
root@xxxx:/tmp# getscom odyssey 08012400 -all
pdbg_default_dtb PDBG_BACKEND_SBEFIFO
***sbefifo_target system type returned is Rainier 4U
****sbefifo_target - loading bmc sbefifo rainier target
sbefifo_ocmb_getscom
odyssey	k0:n0:s0:p03       0x0008000000000000
sbefifo_ocmb_getscom
odyssey	k0:n0:s0:p26       0x0008000000000000
sbefifo_ocmb_getscom
odyssey	k0:n0:s0:p27       0x0008000000000000
/usr/bin/edbg getscom odyssey 08012400 -all

---rainxx test result-----
ecmdquery chips -dc
      odyssey
        p[4]
          mp[0,1]
          perv[8]
        p[5]
          mp[0,1]
          perv[8]

root@xxx:/tmp#  getscom odyssey 08012400 -all
system type returned is Rainier 2U
loading bmc sbefifo rainier target
sbefifo_ocmb_getscom
odyssey	k0:n0:s0:p04       0x0008000000000000
sbefifo_ocmb_getscom
odyssey	k0:n0:s0:p05       0x0008000000000000
/usr/bin/edbg getscom odyssey 08012400 -all

------everest----------------
      odyssey
        p[2]
          mp[0,1]
          perv[8]
        p[3]
          mp[0,1]
          perv[8]
        p[34]
          mp[0,1]
          perv[8]
        p[35]
          mp[0,1]
          perv[8]
root@xxxx:~# getscom odyssey 08012400 -all
pdbg_default_dtb PDBG_BACKEND_SBEFIFO
***sbefifo_target system type returned is Everest
**** sbefifo_target - loading bmc sbefifo everest target
sbefifo_ocmb_getscom
odyssey	k0:n0:s0:p02       0x0008000000000000
sbefifo_ocmb_getscom
odyssey	k0:n0:s0:p03       0x0008000000000000
sbefifo_ocmb_getscom
odyssey	k0:n0:s0:p34       0x0008000000000000
sbefifo_ocmb_getscom
odyssey	k0:n0:s0:p35       0x0008000000000000
/usr/bin/edbg getscom odyssey 08012400 -all

Signed-off-by: Marri Devender Rao <[email protected]>
Change-Id: I832b5b71351a5d34a9c9223753ef211caf51731c
Swarnendu-R-C
Swarnendu-R-C approved these changes Feb 5, 2024
View reviewed changes
Copy link
Contributor

@Swarnendu-R-C Swarnendu-R-C left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved from my side.

dhruvibm
dhruvibm approved these changes Feb 5, 2024
View reviewed changes
Copy link
Collaborator

@dhruvibm dhruvibm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alignments are still an issue

@aravynd aravynd merged commit f53a937 into open-power:master Feb 6, 2024
1 check passed
@devenrao devenrao deleted the defect branch March 1, 2024 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dhruvibm dhruvibm dhruvibm approved these changes

@deepakala-k deepakala-k deepakala-k approved these changes

@Swarnendu-R-C Swarnendu-R-C Swarnendu-R-C approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@devenrao @deepakala-k @dhruvibm @Swarnendu-R-C @aravynd