summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElyes Haouas <ehaouas@noos.fr>2022-02-17 18:14:08 +0100
committerFelix Held <felix-coreboot@felixheld.de>2022-02-18 23:23:07 +0000
commita1f5ad084966a400b7c2df33b2de857afdcbfc51 (patch)
tree6c22662bdddd58a9c8e647e665bd9cd4fd184cce
parente284ca26bf57c9a0c660c77f1b1ba906afef9952 (diff)
downloadcoreboot-a1f5ad084966a400b7c2df33b2de857afdcbfc51.tar.gz
coreboot-a1f5ad084966a400b7c2df33b2de857afdcbfc51.tar.bz2
coreboot-a1f5ad084966a400b7c2df33b2de857afdcbfc51.zip
nb/amd/pi/00730F01/northbridge.c: Use 'pci_{and,or}_config'
Change-Id: Ifd77c90fe82e20df91562fccea8b5d89dd4a193d Signed-off-by: Elyes Haouas <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/c/coreboot/+/62134 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Michał Żygowski <michal.zygowski@3mdeb.com>
-rw-r--r--src/northbridge/amd/pi/00730F01/northbridge.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c
index 42505abd0303..c6614404a922 100644
--- a/src/northbridge/amd/pi/00730F01/northbridge.c
+++ b/src/northbridge/amd/pi/00730F01/northbridge.c
@@ -682,8 +682,8 @@ static const struct pci_driver family10_northbridge __pci_driver = {
static void fam16_finalize(void *chip_info)
{
struct device *dev;
- u32 value;
dev = pcidev_on_root(0, 0); /* clear IoapicSbFeatureEn */
+
pci_write_config32(dev, 0xF8, 0);
pci_write_config32(dev, 0xFC, 5); /* TODO: move it to dsdt.asl */
@@ -698,30 +698,24 @@ static void fam16_finalize(void *chip_info)
/* Select GPP link core IO Link Strap Control register 0xB0 */
pci_write_config32(dev, 0xE0, 0x014000B0);
- value = pci_read_config32(dev, 0xE4);
/* Enable AER (bit 5) and ACS (bit 6 undocumented) */
- value |= PCIE_CAP_AER | PCIE_CAP_ACS;
- pci_write_config32(dev, 0xE4, value);
+ pci_or_config32(dev, 0xE4, PCIE_CAP_AER | PCIE_CAP_ACS);
/* Select GPP link core Wrapper register 0x00 (undocumented) */
pci_write_config32(dev, 0xE0, 0x01300000);
- value = pci_read_config32(dev, 0xE4);
/*
* Enable ACS capabilities straps including sub-items. From lspci it
* looks like these bits enable: Source Validation and Translation
* Blocking
*/
- value |= (BIT(24) | BIT(25) | BIT(26));
- pci_write_config32(dev, 0xE4, value);
+ pci_or_config32(dev, 0xE4, (BIT(24) | BIT(25) | BIT(26)));
/* disable No Snoop */
dev = pcidev_on_root(1, 1);
if (dev != NULL) {
- value = pci_read_config32(dev, 0x60);
- value &= ~(1 << 11);
- pci_write_config32(dev, 0x60, value);
+ pci_and_config32(dev, 0x60, ~(1 << 11));
}
}