diff mbox series

p9dsu: Fix p9dsu slot tables

Message ID 1548980795-27198-1-git-send-email-debmc@linux.ibm.com
State Accepted
Headers show
Series p9dsu: Fix p9dsu slot tables | expand

Checks

Context Check Description
snowpatch_ozlabs/apply_patch success master/apply_patch Successfully applied
snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot success Test snowpatch/job/snowpatch-skiboot on branch master

Commit Message

Deb McLemore Feb. 1, 2019, 12:26 a.m. UTC 
Set the attributes on the slot tables to account for
builtin or pluggable etypes, this will allow pci
enumeration to calculate subordinate buses.

Update some slot label strings.

Add WIO Slot5 which is standard on the ESS config.

Signed-off-by: Deb McLemore <debmc@linux.ibm.com>
---
 platforms/astbmc/p9dsu.c | 45 ++++++++++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 15 deletions(-)

Comments

Vasant Hegde Feb. 4, 2019, 5:56 a.m. UTC | #1 
On 02/01/2019 05:56 AM, Deb McLemore wrote:
> Set the attributes on the slot tables to account for
> builtin or pluggable etypes, this will allow pci
> enumeration to calculate subordinate buses.
> 
> Update some slot label strings.
> 
> Add WIO Slot5 which is standard on the ESS config.
> 
> Signed-off-by: Deb McLemore <debmc@linux.ibm.com>

Looks ok to me.

@Stewart,
   We should grab this for Stable tree. # v6.0.x

-Vasant
Stewart Smith Feb. 5, 2019, 5:30 a.m. UTC | #2 
Deb McLemore <debmc@linux.ibm.com> writes:
> Set the attributes on the slot tables to account for
> builtin or pluggable etypes, this will allow pci
> enumeration to calculate subordinate buses.
>
> Update some slot label strings.
>
> Add WIO Slot5 which is standard on the ESS config.

In never ceases to amaze me how wrong we can get the simple things...
anyway, merged to master as of 87517c8737b9b868596e93432a51e283c22c6fb1
and cherry-picking back into stable.
diff mbox series

Patch

diff --git a/platforms/astbmc/p9dsu.c b/platforms/astbmc/p9dsu.c
index 0fec04e..2700416 100644
--- a/platforms/astbmc/p9dsu.c
+++ b/platforms/astbmc/p9dsu.c
@@ -355,25 +355,25 @@  static const struct slot_table_entry p9dsu2uess_uio_plx_down[] = {
 		.power_limit = 75,
 	},
 	{
-		.etype = st_builtin_dev,
+		.etype = st_pluggable_slot,
 		.location = ST_LOC_DEVFN(0x8,0),
-		.name = "PLX switch UIO Slot2",
+		.name = "PLX SWITCH UIO Slot2",
 		.power_limit = 75,
 	},
 	{
-		.etype = st_builtin_dev,
+		.etype = st_pluggable_slot,
 		.location = ST_LOC_DEVFN(0x9,0),
-		.name = "PLX Down Onboard LAN UIO Slot2",
+		.name = "PLX DOWN LAN UIO Slot2",
 	},
 	{ .etype = st_end },
 };
 
 static const struct slot_table_entry p9dsu2uess_uio_plx_up[] = {
 	{
-		.etype = st_builtin_dev,
+		.etype = st_pluggable_slot,
 		.location = ST_LOC_DEVFN(0,0),
 		.children = p9dsu2uess_uio_plx_down,
-		.name = "PLX up UIO Slot2",
+		.name = "PLX UP UIO Slot2",
 		.power_limit = 75,
 	},
 	{ .etype = st_end },
@@ -387,9 +387,9 @@  static const struct slot_table_entry p9dsu2uess_wio_plx_down[] = {
 		.power_limit = 75,
 	},
     	{
-		.etype = st_builtin_dev,
+		.etype = st_pluggable_slot,
 		.location = ST_LOC_DEVFN(0x8,0),
-		.name = "PLX switch WIO Slot3",
+		.name = "PLX SWITCH WIO Slot3",
 		.power_limit = 75,
 	},
 	{
@@ -403,10 +403,10 @@  static const struct slot_table_entry p9dsu2uess_wio_plx_down[] = {
 
 static const struct slot_table_entry p9dsu2uess_wio_plx_up[] = {
 	{
-		.etype = st_builtin_dev,
+		.etype = st_pluggable_slot,
 		.location = ST_LOC_DEVFN(0,0),
 		.children = p9dsu2uess_wio_plx_down,
-		.name = "PLX up WIO Slot3",
+		.name = "PLX UP WIO Slot3",
 		.power_limit = 75,
 	},
 	{ .etype = st_end },
@@ -424,8 +424,8 @@  static const struct slot_table_entry p9dsu2uess_phb0_0_slot[] = {
 
 static const struct slot_table_entry p9dsu2uess_phb0_1_slot[] = {
 	{
-		.etype = st_builtin_dev,
-		.location = ST_LOC_DEVFN(0x1,0),
+		.etype = st_pluggable_slot,
+		.location = ST_LOC_DEVFN(0,0),
 		.children = p9dsu2uess_uio_plx_up,
 		.name = "PLX UIO Slot2",
 		.power_limit = 75,
@@ -435,7 +435,7 @@  static const struct slot_table_entry p9dsu2uess_phb0_1_slot[] = {
 
 static const struct slot_table_entry p9dsu2uess_phb0_2_slot[] = {
 	{
-		.etype = st_builtin_dev,
+		.etype = st_pluggable_slot,
 		.location = ST_LOC_DEVFN(0,0),
 		.name = "UIO Slot3",
 		.power_limit = 75,
@@ -492,7 +492,7 @@  static const struct slot_table_entry p9dsu2uess_phb8_1_slot[] = {
 
 static const struct slot_table_entry p9dsu2uess_phb8_2_slot[] = {
 	{
-		.etype = st_builtin_dev,
+		.etype = st_pluggable_slot,
 		.location = ST_LOC_DEVFN(0,0),
 		.children = p9dsu2uess_wio_plx_up,
 		.name = "PLX WIO Slot3",
@@ -511,6 +511,16 @@  static const struct slot_table_entry p9dsu2uess_phb8_3_slot[] = {
 	{ .etype = st_end },
 };
 
+static const struct slot_table_entry p9dsu2uess_phb8_4_slot[] = {
+	{
+		.etype = st_pluggable_slot,
+		.location = ST_LOC_DEVFN(0,0),
+		.name = "WIO Slot5",
+		.power_limit = 75,
+	},
+	{ .etype = st_end },
+};
+
 static const struct slot_table_entry p9dsu2uess_phb_table[] = {
 	{
 		.etype = st_phb,
@@ -557,11 +567,16 @@  static const struct slot_table_entry p9dsu2uess_phb_table[] = {
 		.location = ST_LOC_PHB(8,2),
 		.children = p9dsu2uess_phb8_2_slot,
 	},
-		{
+	{
 		.etype = st_phb,
 		.location = ST_LOC_PHB(8,3),
 		.children = p9dsu2uess_phb8_3_slot,
 	},
+	{
+		.etype = st_phb,
+		.location = ST_LOC_PHB(8,4),
+		.children = p9dsu2uess_phb8_4_slot,
+	},
 	{ .etype = st_end },
 };