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

Enable RAM local to the second CPU #90

Merged
merged 30 commits into from
Mar 4, 2022
Merged

Enable RAM local to the second CPU #90

merged 30 commits into from
Mar 4, 2022

Conversation

SergiiDmytruk
Copy link
Member

@SergiiDmytruk SergiiDmytruk commented Feb 9, 2022 •
edited
Loading

This updates both MCs and DRAM training isteps and whatever else was necessary to make all memory available. The code base didn't lend itself to splitting this in two PRs because of common functions. Debian started with these changes sees all installed RAM.

Maybe pay attention to 4f43da5 in review, I've made the changes thinking that something is wrong there while another part was causing issues, but everything worked without these changes as well.

@SergiiDmytruk
soc/power9: extract chip unit limits to proc.h
8a32fde 
Change-Id: I7b3c315977491dc4990ce0557cda382ec870480d
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9: remove unused "fsi.h" includes
71d346a 
Left from PPC_INSERT() being implemented in that header.

Change-Id: I2d514f2e3d3bba799f41b1cbf75ef86b574a7b82
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/istep_13_6.c: get MCS PG data from MVPD
d106352 
Change-Id: Id5bcd2b74bbf3f74e04c34eb3e92a197871927fd
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/istep_13_2.c: extract mem_pll_reset()
addca0c 
Change-Id: I4b0c597553d99808835dc39e6304ab26cc4ab37f
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/istep_13_2.c: update for second CPU
74debe6 
Change-Id: I52b2ee0e4fdf9f842c5a2df90c96d745d6770b0f
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/istep_13_3.c: extract mem_pll_initf()
d44016b 
Change-Id: Id67d536a884c5aed65383d64e5da976cdcea89b0
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/istep_13_3.c: update for second CPU
6c92bc2 
Change-Id: Ie2bd4d69be094324c0bd56c4cc4ee7412e138a1c
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/istep_13_4.c: extract mem_pll_setup()
a53e9a7 
Change-Id: Ie147bfac3365df2cf92b7973fe5d60be3d45598b
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/istep_13_4.c: update for second CPU
a4992b9 
Change-Id: I5a5275475c32db6541c702c710f49b6ce3737cbb
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/istep_13_6.c: extract mem_startclocks()
a5ecffc 
Change-Id: I97cc2ab069e66989dfc1c177edd522c6de19ca86
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/istep_13_6.c: update for second CPU
3e01081 
Change-Id: I01834226dd559ef39a2d687cdf4334077cc0326f
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/istep_13_8.c: extract mss_scominit()
b6cb258 
Change-Id: I30572d7503dded5981bbabce1179c2b33ae18458
Signed-off-by: Sergii Dmytruk <[email protected]>
@krystian-hebel
Copy link
Contributor

Of course those dp functions were wrong, nice catch.

krystian-hebel
krystian-hebel requested changes Feb 14, 2022
View reviewed changes
Copy link
Contributor

@krystian-hebel krystian-hebel left a comment

Choose a reason for hiding this comment

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

Some of suggested changes are to remove obsolete TODOs. One delay was unintentionally (I hope) removed and should be restored.

src/include/cpu/power/mvpd.h Show resolved Hide resolved
src/include/cpu/power/istep_13.h Outdated Show resolved Hide resolved
src/soc/ibm/power9/chip.c Show resolved Hide resolved
src/soc/ibm/power9/fsi.c Outdated Show resolved Hide resolved
src/soc/ibm/power9/i2c.c Outdated Show resolved Hide resolved
src/soc/ibm/power9/istep_13_10.c Outdated Show resolved Hide resolved
src/soc/ibm/power9/istep_13_8.c Outdated Show resolved Hide resolved
src/soc/ibm/power9/istep_13_8.c Outdated Show resolved Hide resolved
src/soc/ibm/power9/mvpd.c Show resolved Hide resolved
src/soc/ibm/power9/i2c.c Outdated Show resolved Hide resolved
@SergiiDmytruk
soc/power9/istep_13_8.c: update for second CPU
d8cca26 
Other isteps are updated because they use the same functions:
 * `css_*`
 * `mca_*`
 * `dp_mca_*`

Change-Id: I3a1301dea8224e674e2fa8b5ae0f1f7bd0cc6b9c
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/istep_13_9.c: update for second CPU
c6125bd 
Change-Id: Id097740fa73b7a8209e9598f594caaf61b3cd24f
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/istep_13_10.c: update for second CPU
f2dcb87 
Change-Id: I025edcee50bcbca3906c5a76f051e950865c08f0
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/istep_13_11.c: update for second CPU
cb71740 
Change-Id: I7e8a29a24bd34775bc852feeb6d4c396eb221b62
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/istep_13_13.c: update for second CPU
a46f2b5 
Change-Id: I88c5e144f8390aa59238fedba6c34a7f3e18890e
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/istep_14_1.c: update for second CPU
ce2359c 
Change-Id: I558939dbc05fa3103310799f7a0bf89393085e6e
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/mcbist.c: update for second CPU
951797e 
Change-Id: I3580a3a853a5046d6b630e50958bc7783e5fbf02
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/istep_14_2.c: update for second CPU
a1dbfec 
Also fix naming/formatting while at it.

Change-Id: Ie0fa480eb06faafa68d8b7da99fd7337665aab3e
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk SergiiDmytruk force-pushed the raptor-cs_talos-2/mcs_2nd_cpu branch from 022a46e to da95ae2 Compare February 14, 2022 22:46
krystian-hebel
krystian-hebel reviewed Feb 28, 2022
View reviewed changes
src/soc/ibm/power9/istep_14_5.c Show resolved Hide resolved
src/soc/ibm/power9/romstage.c Outdated Show resolved Hide resolved
@SergiiDmytruk
soc/power9/istep_14_5.c: extract proc_setup_bars()
11557bd 
Change-Id: I43b178c65e385c2c82d147a34b5fa42935846ff2
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/istep_14_5.c: update for second CPU
aa82b44 
Change-Id: Id68915c454f01a27bae682c2f963a1b77c47866d
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/i2c.c: add host I2C for second CPU
6957b61 
Change-Id: I2d9796e0286501005cef6e777827b9449346d015
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/i2c.c: introduce get_spd_i2c()
8cde865 
get_spd_smbus() prototype is too limiting, it doesn't allow specifying
bus number which we need to be able to work with multiple CPUs.

Change-Id: I445edc7d3fb02857b437ca0d5fa4596bdb4e607b
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9: collect DIMM data for two CPUs
f2be52f 
Change-Id: I5c60a361b2007fc320bdc1621e21bc76dccbaf51
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/istep_13_8.c: fix differences with Hostboot
456603e 
Change-Id: I6a10a2f1178df9d77f3284465e1b5d53783b9065
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/fsi.c: extract returning present chips into a function
35810fa 
This is to avoid passing result of fsi_init() from romstage to ramstage.

Change-Id: I308aa73e27071f3068f5914b8e5ae6623cc3c8a9
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9: extract PROC_BASE_ADDR() macro
5bd5252 
Used in three places already with at least one more coming.

Change-Id: Ibe075f02a8c17061e55cf1851aed8c9f483e3caa
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9/chip.c: account for memory on the second CPU
52d17f8 
Change-Id: Ifeda279ab8ba5ccd20f5b5c0e2843d3704d42b8f
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk
soc/power9: define istep_14_{1,5} in istep_14.h
736da32 
Change-Id: I7a389d973612b9bfd61d535f93445d086e630f7b
Signed-off-by: Sergii Dmytruk <[email protected]>
@SergiiDmytruk SergiiDmytruk force-pushed the raptor-cs_talos-2/mcs_2nd_cpu branch from da95ae2 to 736da32 Compare February 28, 2022 16:50
krystian-hebel
krystian-hebel approved these changes Mar 4, 2022
View reviewed changes
Copy link
Contributor

@krystian-hebel krystian-hebel left a comment

Choose a reason for hiding this comment

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

Just one small issue left. I will merge it and add one commit to fix it so we won't have to go through another round of review.

src/soc/ibm/power9/i2c.c Show resolved Hide resolved
@krystian-hebel krystian-hebel merged commit 736da32 into raptor-cs_talos-2/develop Mar 4, 2022
@SergiiDmytruk SergiiDmytruk deleted the raptor-cs_talos-2/mcs_2nd_cpu branch March 4, 2022 12:20
@tlaurion tlaurion mentioned this pull request Jul 22, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@krystian-hebel krystian-hebel krystian-hebel approved these changes

Assignees
No one assigned
Labels
raptor-cs_talos-2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@SergiiDmytruk @krystian-hebel