Change in ...coreboot[master]: nb/intel/x4x: Remove spurious pcidev_on_root() usage

[Nico Huber (Code Review)]

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30880

Change subject: nb/intel/x4x: Remove spurious pcidev_on_root() usage
......................................................................

nb/intel/x4x: Remove spurious pcidev_on_root() usage

It's supposed to be the same device that is passed to the executing
function.

Change-Id: I6cf994390c16e0393c96a2b2e04a36305be88e68
Signed-off-by: Nico Huber 
---
M src/northbridge/intel/x4x/gma.c
1 file changed, 1 insertion(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/30880/1

diff --git a/src/northbridge/intel/x4x/gma.c b/src/northbridge/intel/x4x/gma.c
index 680b836..efb17a6 100644
--- a/src/northbridge/intel/x4x/gma.c
+++ b/src/northbridge/intel/x4x/gma.c
@@ -69,10 +69,7 @@
    pci_write_config32(dev, PCI_COMMAND, reg32);

/* configure GMBUSFREQ */
-	reg16 = pci_read_config16(pcidev_on_root(0x2, 0), 0xcc);
-	reg16 &= ~0x1ff;
-	reg16 |= 0xbc;
-	pci_write_config16(pcidev_on_root(0x2, 0), 0xcc, reg16);
+	reg16 = pci_update_config16(dev, 0xcc, ~0x1ff, 0xbc);

int vga_disable = (pci_read_config16(dev, D0F0_GGC) & 2) >> 1;

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/30880 )

Change subject: nb/intel/x4x: Remove spurious pcidev_on_root() usage
......................................................................

Patch Set 1: Code-Review+2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/30880 )

Change subject: nb/intel/x4x: Remove spurious pcidev_on_root() usage
......................................................................

Patch Set 2: Code-Review+1

Rebased this to see if it works.

[Nico Huber (Code Review)]

Hello Kyösti Mälkki, Patrick Rudolph, Angel Pons, build bot (Jenkins), Damien Zammit,

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

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

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

Change subject: nb/intel/x4x: Remove spurious pcidev_on_root() usage
......................................................................

nb/intel/x4x: Remove spurious pcidev_on_root() usage

It's supposed to be the same device that is passed to the executing
function.

Change-Id: I6cf994390c16e0393c96a2b2e04a36305be88e68
Signed-off-by: Nico Huber 
---
M src/northbridge/intel/x4x/gma.c
1 file changed, 1 insertion(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/80/30880/3

[Nico Huber (Code Review)]

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/30880 )

Change subject: nb/intel/x4x: Remove spurious pcidev_on_root() usage
......................................................................

Patch Set 3:

ahem, probably should run that compiler thingy more often

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/30880 )

Change subject: nb/intel/x4x: Remove spurious pcidev_on_root() usage
......................................................................

Patch Set 3: Code-Review+2

[Nico Huber (Code Review)]

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/30880 )

Change subject: nb/intel/x4x: Remove spurious pcidev_on_root() usage
......................................................................

nb/intel/x4x: Remove spurious pcidev_on_root() usage

It's supposed to be the same device that is passed to the executing
function.

Change-Id: I6cf994390c16e0393c96a2b2e04a36305be88e68
Signed-off-by: Nico Huber 
Reviewed-on: https://review.coreboot.org/c/30880
Tested-by: build bot (Jenkins) 
Reviewed-by: Kyösti Mälkki 
---
M src/northbridge/intel/x4x/gma.c
1 file changed, 1 insertion(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Kyösti Mälkki: Looks good to me, approved

diff --git a/src/northbridge/intel/x4x/gma.c b/src/northbridge/intel/x4x/gma.c
index 680b836..4c27634 100644
--- a/src/northbridge/intel/x4x/gma.c
+++ b/src/northbridge/intel/x4x/gma.c
@@ -60,7 +60,6 @@

static void gma_func0_init(struct device *dev)
 {
-	u16 reg16;
    u32 reg32;

/* IGD needs to be Bus Master */
@@ -69,10 +68,7 @@
    pci_write_config32(dev, PCI_COMMAND, reg32);

/* configure GMBUSFREQ */
-	reg16 = pci_read_config16(pcidev_on_root(0x2, 0), 0xcc);
-	reg16 &= ~0x1ff;
-	reg16 |= 0xbc;
-	pci_write_config16(pcidev_on_root(0x2, 0), 0xcc, reg16);
+	pci_update_config16(dev, 0xcc, ~0x1ff, 0xbc);

int vga_disable = (pci_read_config16(dev, D0F0_GGC) & 2) >> 1;