Change in coreboot[master]: soc/intel/xeon_sp/skx: Simplify pci_domain_read_resource

[Marc Jones (Code Review)]

Marc Jones has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46308 )

Change subject: soc/intel/xeon_sp/skx: Simplify pci_domain_read_resource
......................................................................

soc/intel/xeon_sp/skx: Simplify pci_domain_read_resource

Use the simpler pci_domain_read_resource for the stacks. This
makes it the same as the cpx function and easire to merge later.

Change-Id: I0130ce671fe9ff04e48021a0c5841551210aa827
Signed-off-by: Marc Jones 
---
M src/soc/intel/xeon_sp/skx/chip.c
1 file changed, 14 insertions(+), 49 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/46308/1

diff --git a/src/soc/intel/xeon_sp/skx/chip.c b/src/soc/intel/xeon_sp/skx/chip.c
index 529e07a..a19a364 100644
--- a/src/soc/intel/xeon_sp/skx/chip.c
+++ b/src/soc/intel/xeon_sp/skx/chip.c
@@ -404,44 +404,6 @@
    }
 }

-static void xeonsp_constrain_pci_resources(struct device *dev, struct resource *res, void *data)
-{
-	STACK_RES *stack = (STACK_RES *) data;
-	if (!(res->flags & IORESOURCE_FIXED))
-		return;
-
-	uint64_t base, limit;
-	if (res->flags & IORESOURCE_IO) {
-		base = stack->PciResourceIoBase;
-		limit = stack->PciResourceIoLimit;
-	} else if ((res->flags & IORESOURCE_MEM) && (res->flags & IORESOURCE_PCI64)) {
-		base = stack->PciResourceMem64Base;
-		limit = stack->PciResourceMem64Limit;
-	} else {
-		base = stack->PciResourceMem32Base;
-		limit = stack->PciResourceMem32Limit;
-	}
-
-	if (((res->base + res->size - 1) < base) || (res->base > limit)) /* outside window */
-		return;
-
-	if (res->limit > limit) /* resource end is out of limit */
-		limit = res->base - 1;
-	else
-		base = res->base + res->size;
-
-	if (res->flags & IORESOURCE_IO) {
-		stack->PciResourceIoBase = base;
-		stack->PciResourceIoLimit = limit;
-	} else if ((res->flags & IORESOURCE_MEM) && (res->flags & IORESOURCE_PCI64)) {
-		stack->PciResourceMem64Base = base;
-		stack->PciResourceMem64Limit = limit;
-	} else {
-		stack->PciResourceMem32Base = base;
-		stack->PciResourceMem32Limit = limit;
-	}
-}
-
 static void xeonsp_pci_domain_read_resources(struct device *dev)
 {
    struct bus *link;
@@ -463,18 +425,21 @@
    for (link = dev->link_list; link; link = link->next)
    	xeonsp_pci_dev_iterator(link, xeonsp_reset_pci_op, NULL, NULL);

-	/*
-	 * 1. group devices, resources for each stack
-	 * 2. order resources in descending order of requested resource allocation sizes
-	 */
    struct iiostack_resource stack_info = {0};
-	get_iiostack_info(&stack_info);
-
-	/* constrain stack window */
-	for (link = dev->link_list; link; link = link->next) {
-		STACK_RES *stack = find_stack_for_bus(&stack_info, link->secondary);
-		assert(stack != 0);
-		xeonsp_pci_dev_iterator(link, NULL, xeonsp_constrain_pci_resources, stack);
+	uint8_t pci64bit_alloc_flag = get_iiostack_info(&stack_info);
+	if (!pci64bit_alloc_flag) {
+		/*
+		 * Split 32 bit address space between prefetchable and
+		 * non-prefetchable windows
+		 */
+		for (int s = 0; s < stack_info.no_of_stacks; ++s) {
+			STACK_RES *res = &stack_info.res[s];
+			uint64_t length = (res->PciResourceMem32Limit -
+				res->PciResourceMem32Base + 1)/2;
+			res->PciResourceMem64Limit = res->PciResourceMem32Limit;
+			res->PciResourceMem32Limit = (res->PciResourceMem32Base + length - 1);
+			res->PciResourceMem64Base = res->PciResourceMem32Limit + 1;
+		}
    }

/* assign resources */

[Jay Talbott (Code Review)]

Jay Talbott has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46308 )

Change subject: soc/intel/xeon_sp/skx: Simplify pci_domain_read_resource
......................................................................

Patch Set 2: Code-Review+1

[Marc Jones (Code Review)]

Hello build bot (Jenkins), Jonathan Zhang, Jay Talbott, Stefan Reinauer, Angel Pons, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/46308

to look at the new patch set (#4).

Change subject: soc/intel/xeon_sp/skx: Simplify pci_domain_read_resource
......................................................................

soc/intel/xeon_sp/skx: Simplify pci_domain_read_resource

Use the simpler pci_domain_read_resource for the stacks. This
makes it the same as the cpx function and easier to merge later.

Change-Id: I0130ce671fe9ff04e48021a0c5841551210aa827
Signed-off-by: Marc Jones 
---
M src/soc/intel/xeon_sp/skx/chip.c
1 file changed, 14 insertions(+), 49 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/46308/4

[Stefan Reinauer (Code Review)]

Stefan Reinauer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46308 )

Change subject: soc/intel/xeon_sp/skx: Simplify pci_domain_read_resource
......................................................................

Patch Set 4: Code-Review+1

(2 comments)

https://review.coreboot.org/c/coreboot/+/46308/4//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/46308/4//COMMIT_MSG@9 
PS4, Line 9: the
a?

https://review.coreboot.org/c/coreboot/+/46308/4//COMMIT_MSG@10 
PS4, Line 10: cpx function and easier to merge later
Why is it equivalent?

[Jay Talbott (Code Review)]

Jay Talbott has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46308 )

Change subject: soc/intel/xeon_sp/skx: Simplify pci_domain_read_resource
......................................................................

Patch Set 4: Code-Review+1

[Marc Jones (Code Review)]

Marc Jones has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46308 )

Change subject: soc/intel/xeon_sp/skx: Simplify pci_domain_read_resource
......................................................................

Patch Set 4:

(2 comments)

https://review.coreboot.org/c/coreboot/+/46308/4//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/46308/4//COMMIT_MSG@9 
PS4, Line 9: the
> a?

Done

https://review.coreboot.org/c/coreboot/+/46308/4//COMMIT_MSG@10 
PS4, Line 10: cpx function and easier to merge later
> Why is it equivalent?

Ack

[Marc Jones (Code Review)]

Hello build bot (Jenkins), Jonathan Zhang, Jay Talbott, Stefan Reinauer, Angel Pons, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/46308

to look at the new patch set (#5).

Change subject: soc/intel/xeon_sp/skx: Simplify pci_domain_read_resource
......................................................................

soc/intel/xeon_sp/skx: Simplify pci_domain_read_resource

Use a simpler pci_domain_read_resource for the stacks. This
makes it the same as the cpx function, since both get the stack
information from the FSP.

This will be merged with common xeon cpx/skx in a later patch.

Change-Id: I0130ce671fe9ff04e48021a0c5841551210aa827
Signed-off-by: Marc Jones 
---
M src/soc/intel/xeon_sp/skx/chip.c
1 file changed, 14 insertions(+), 49 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/46308/5

[Jonathan Zhang (Code Review)]

Jonathan Zhang has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46308 )

Change subject: soc/intel/xeon_sp/skx: Simplify pci_domain_read_resource
......................................................................

Patch Set 5: Code-Review+1

[Jay Talbott (Code Review)]

Jay Talbott has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46308 )

Change subject: soc/intel/xeon_sp/skx: Simplify pci_domain_read_resource
......................................................................

Patch Set 5: Code-Review+1

[Stefan Reinauer (Code Review)]

Stefan Reinauer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46308 )

Change subject: soc/intel/xeon_sp/skx: Simplify pci_domain_read_resource
......................................................................

Patch Set 6: Code-Review+2

[Marc Jones (Code Review)]

Marc Jones has submitted this change. ( https://review.coreboot.org/c/coreboot/+/46308 )

Change subject: soc/intel/xeon_sp/skx: Simplify pci_domain_read_resource
......................................................................

soc/intel/xeon_sp/skx: Simplify pci_domain_read_resource

Use a simpler pci_domain_read_resource for the stacks. This
makes it the same as the cpx function, since both get the stack
information from the FSP.

This will be merged with common xeon cpx/skx in a later patch.

Change-Id: I0130ce671fe9ff04e48021a0c5841551210aa827
Signed-off-by: Marc Jones 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46308
Reviewed-by: Stefan Reinauer 
Reviewed-by: Jonathan Zhang 
Reviewed-by: Jay Talbott 
Tested-by: build bot (Jenkins) 
---
M src/soc/intel/xeon_sp/skx/chip.c
1 file changed, 14 insertions(+), 49 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Stefan Reinauer: Looks good to me, approved
  Jay Talbott: Looks good to me, but someone else must approve
  Jonathan Zhang: Looks good to me, but someone else must approve

diff --git a/src/soc/intel/xeon_sp/skx/chip.c b/src/soc/intel/xeon_sp/skx/chip.c
index 7471814..a2c8f0e 100644
--- a/src/soc/intel/xeon_sp/skx/chip.c
+++ b/src/soc/intel/xeon_sp/skx/chip.c
@@ -405,44 +405,6 @@
    }
 }

-static void xeonsp_constrain_pci_resources(struct device *dev, struct resource *res, void *data)
-{
-	STACK_RES *stack = (STACK_RES *) data;
-	if (!(res->flags & IORESOURCE_FIXED))
-		return;
-
-	uint64_t base, limit;
-	if (res->flags & IORESOURCE_IO) {
-		base = stack->PciResourceIoBase;
-		limit = stack->PciResourceIoLimit;
-	} else if ((res->flags & IORESOURCE_MEM) && (res->flags & IORESOURCE_PCI64)) {
-		base = stack->PciResourceMem64Base;
-		limit = stack->PciResourceMem64Limit;
-	} else {
-		base = stack->PciResourceMem32Base;
-		limit = stack->PciResourceMem32Limit;
-	}
-
-	if (((res->base + res->size - 1) < base) || (res->base > limit)) /* outside window */
-		return;
-
-	if (res->limit > limit) /* resource end is out of limit */
-		limit = res->base - 1;
-	else
-		base = res->base + res->size;
-
-	if (res->flags & IORESOURCE_IO) {
-		stack->PciResourceIoBase = base;
-		stack->PciResourceIoLimit = limit;
-	} else if ((res->flags & IORESOURCE_MEM) && (res->flags & IORESOURCE_PCI64)) {
-		stack->PciResourceMem64Base = base;
-		stack->PciResourceMem64Limit = limit;
-	} else {
-		stack->PciResourceMem32Base = base;
-		stack->PciResourceMem32Limit = limit;
-	}
-}
-
 static void xeonsp_pci_domain_read_resources(struct device *dev)
 {
    struct bus *link;
@@ -464,18 +426,21 @@
    for (link = dev->link_list; link; link = link->next)
    	xeonsp_pci_dev_iterator(link, xeonsp_reset_pci_op, NULL, NULL);

-	/*
-	 * 1. group devices, resources for each stack
-	 * 2. order resources in descending order of requested resource allocation sizes
-	 */
    struct iiostack_resource stack_info = {0};
-	get_iiostack_info(&stack_info);
-
-	/* constrain stack window */
-	for (link = dev->link_list; link; link = link->next) {
-		STACK_RES *stack = find_stack_for_bus(&stack_info, link->secondary);
-		assert(stack != 0);
-		xeonsp_pci_dev_iterator(link, NULL, xeonsp_constrain_pci_resources, stack);
+	uint8_t pci64bit_alloc_flag = get_iiostack_info(&stack_info);
+	if (!pci64bit_alloc_flag) {
+		/*
+		 * Split 32 bit address space between prefetchable and
+		 * non-prefetchable windows
+		 */
+		for (int s = 0; s < stack_info.no_of_stacks; ++s) {
+			STACK_RES *res = &stack_info.res[s];
+			uint64_t length = (res->PciResourceMem32Limit -
+				res->PciResourceMem32Base + 1)/2;
+			res->PciResourceMem64Limit = res->PciResourceMem32Limit;
+			res->PciResourceMem32Limit = (res->PciResourceMem32Base + length - 1);
+			res->PciResourceMem64Base = res->PciResourceMem32Limit + 1;
+		}
    }

/* assign resources */