GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sb/intel/i82801gx: Use PCI bitwise ops 

While we are at it, also reflow a few lines that fit in 96 characters.

Tested with BUILD_TIMELESS=1, Getac P470 does not change.

Change-Id: I2cc3e71723e9b6898e6ec29f0f38b1b3b7446f09
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42191
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Angel Pons 2020-06-08 12:32:54 +02:00
parent 302a1437cd
commit d19332ca3a
8 changed files with 45 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/southbridge/intel/i82801gx/azalia.c
View File

@ -194,37 +194,21 @@ static void azalia_init(struct device *dev)
struct resource *res; struct resource *res;
u32 codec_mask; u32 codec_mask;
u8 reg8; u8 reg8;
u32 reg32;
// ESD // ESD
reg32 = pci_read_config32(dev, 0x134); pci_update_config32(dev, 0x134, ~(0xff << 16), 2 << 16);
reg32 &= 0xff00ffff;
reg32 |= (2 << 16);
pci_write_config32(dev, 0x134, reg32);
// Link1 description // Link1 description
reg32 = pci_read_config32(dev, 0x140); pci_update_config32(dev, 0x140, ~(0xff << 16), 2 << 16);
reg32 &= 0xff00ffff;
reg32 |= (2 << 16);
pci_write_config32(dev, 0x140, reg32);
// Port VC0 Resource Control Register // Port VC0 Resource Control Register
reg32 = pci_read_config32(dev, 0x114); pci_update_config32(dev, 0x114, ~(0xff << 0), 1);
reg32 &= 0xffffff00;
reg32 |= 1;
pci_write_config32(dev, 0x114, reg32);
// VCi traffic class // VCi traffic class
reg8 = pci_read_config8(dev, 0x44); pci_or_config8(dev, 0x44, 7 << 0); // TC7
reg8 |= (7 << 0); // TC7
pci_write_config8(dev, 0x44, reg8);
// VCi Resource Control // VCi Resource Control
reg32 = pci_read_config32(dev, 0x120); pci_or_config32(dev, 0x120, (1 << 31) | (1 << 24) | (0x80 << 0)); /* VCi ID and map */
reg32 |= (1 << 31);
reg32 |= (1 << 24); // VCi ID
reg32 |= (0x80 << 0); // VCi map
pci_write_config32(dev, 0x120, reg32);
/* Set Bus Master */ /* Set Bus Master */
pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER); pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER);
@ -244,14 +228,11 @@ static void azalia_init(struct device *dev)
reg8 = pci_read_config8(dev, 0x40); reg8 = pci_read_config8(dev, 0x40);
printk(BIOS_DEBUG, "Azalia: codec type: %s\n", (reg8 & (1 << 1))?"Azalia":"AC97"); printk(BIOS_DEBUG, "Azalia: codec type: %s\n", (reg8 & (1 << 1))?"Azalia":"AC97");
// // Select Azalia mode. This needs to be controlled via devicetree.cb
reg8 = pci_read_config8(dev, 0x40); // Audio Control pci_or_config8(dev, 0x40, 1); // Audio Control
reg8 |= 1; // Select Azalia mode. This needs to be controlled via devicetree.cb
pci_write_config8(dev, 0x40, reg8);
reg8 = pci_read_config8(dev, 0x4d); // Docking Status // Docking not supported
reg8 &= ~(1 << 7); // Docking not supported pci_and_config8(dev, 0x4d, (u8)~(1 << 7)); // Docking Status
pci_write_config8(dev, 0x4d, reg8);
res = find_resource(dev, 0x10); res = find_resource(dev, 0x10);
if (!res) if (!res)

19
src/southbridge/intel/i82801gx/early_init.c
View File

@ -61,9 +61,6 @@ void i82801gx_setup_bars(void)
#if ENV_ROMSTAGE #if ENV_ROMSTAGE
void i82801gx_early_init(void) void i82801gx_early_init(void)
{ {
uint8_t reg8;
uint32_t reg32;
enable_smbus(); enable_smbus();
printk(BIOS_DEBUG, "Setting up static southbridge registers..."); printk(BIOS_DEBUG, "Setting up static southbridge registers...");
@ -83,22 +80,14 @@ void i82801gx_early_init(void)
pci_write_config8(PCI_DEV(0, 0x1e, 0), SMLT, 0x20); pci_write_config8(PCI_DEV(0, 0x1e, 0), SMLT, 0x20);
/* reset rtc power status */ /* reset rtc power status */
reg8 = pci_read_config8(PCI_DEV(0, 0x1f, 0), GEN_PMCON_3); pci_and_config8(PCI_DEV(0, 0x1f, 0), GEN_PMCON_3, ~RTC_BATTERY_DEAD);
reg8 &= ~RTC_BATTERY_DEAD;
pci_write_config8(PCI_DEV(0, 0x1f, 0), GEN_PMCON_3, reg8);
/* USB transient disconnect */ /* USB transient disconnect */
reg8 = pci_read_config8(PCI_DEV(0, 0x1f, 0), 0xad); pci_or_config8(PCI_DEV(0, 0x1f, 0), 0xad, 3 << 0);
reg8 |= (3 << 0);
pci_write_config8(PCI_DEV(0, 0x1f, 0), 0xad, reg8);
reg32 = pci_read_config32(PCI_DEV(0, 0x1d, 7), 0xfc); pci_or_config32(PCI_DEV(0, 0x1d, 7), 0xfc, (1 << 29) | (1 << 17));
reg32 |= (1 << 29) | (1 << 17);
pci_write_config32(PCI_DEV(0, 0x1d, 7), 0xfc, reg32);
reg32 = pci_read_config32(PCI_DEV(0, 0x1d, 7), 0xdc); pci_or_config32(PCI_DEV(0, 0x1d, 7), 0xdc, (1 << 31) | (1 << 27));
reg32 |= (1 << 31) | (1 << 27);
pci_write_config32(PCI_DEV(0, 0x1d, 7), 0xdc, reg32);
/* Enable IOAPIC */ /* Enable IOAPIC */
RCBA8(OIC) = 0x03; RCBA8(OIC) = 0x03;

15
src/southbridge/intel/i82801gx/lpc.c
View File

@ -247,18 +247,13 @@ static void i82801gx_power_options(struct device *dev)
static void i82801gx_configure_cstates(struct device *dev) static void i82801gx_configure_cstates(struct device *dev)
{ {
u8 reg8; // Enable Popup & Popdown
pci_or_config8(dev, 0xa9, (1 << 4) | (1 << 3) | (1 << 2));
reg8 = pci_read_config8(dev, 0xa9); // Cx state configuration
reg8 |= (1 << 4) | (1 << 3) | (1 << 2); // Enable Popup & Popdown
pci_write_config8(dev, 0xa9, reg8);
// Set Deeper Sleep configuration to recommended values // Set Deeper Sleep configuration to recommended values
reg8 = pci_read_config8(dev, 0xaa); // Deeper Sleep to Stop CPU: 34-40us
reg8 &= 0xf0; // Deeper Sleep to Sleep: 15us
reg8 |= (2 << 2); // Deeper Sleep to Stop CPU: 34-40us pci_update_config8(dev, 0xaa, 0xf0, (2 << 2) | (2 << 0));
reg8 |= (2 << 0); // Deeper Sleep to Sleep: 15us
pci_write_config8(dev, 0xaa, reg8);
} }
static void i82801gx_rtc_init(struct device *dev) static void i82801gx_rtc_init(struct device *dev)

20
src/southbridge/intel/i82801gx/pci.c
View File

@ -10,29 +10,21 @@
static void pci_init(struct device *dev) static void pci_init(struct device *dev)
{ {
u16 reg16; u16 reg16;
u8 reg8;
/* Enable Bus Master */ /* Enable Bus Master */
reg16 = pci_read_config16(dev, PCI_COMMAND); pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER);
reg16 |= PCI_COMMAND_MASTER;
pci_write_config16(dev, PCI_COMMAND, reg16);
/* This device has no interrupt */ /* This device has no interrupt */
pci_write_config8(dev, INTR, 0xff); pci_write_config8(dev, INTR, 0xff);
/* disable parity error response and SERR */ /* Disable parity error response and SERR */
reg16 = pci_read_config16(dev, PCI_BRIDGE_CONTROL); pci_and_config16(dev, PCI_BRIDGE_CONTROL,
reg16 &= ~PCI_BRIDGE_CTL_PARITY; ~(PCI_BRIDGE_CTL_PARITY | PCI_BRIDGE_CTL_SERR));
reg16 &= ~PCI_BRIDGE_CTL_SERR;
pci_write_config16(dev, PCI_BRIDGE_CONTROL, reg16);
/* Master Latency Count must be set to 0x04! */ /* Master Latency Count must be set to 0x04! */
reg8 = pci_read_config8(dev, SMLT); pci_update_config8(dev, SMLT, 0x07, 0x04 << 3);
reg8 &= 0x07;
reg8 |= (0x04 << 3);
pci_write_config8(dev, SMLT, reg8);
/* Clear errors in status registers */ /* Clear errors in status registers. FIXME: Do something? */
reg16 = pci_read_config16(dev, PSTS); reg16 = pci_read_config16(dev, PSTS);
//reg16 |= 0xf900; //reg16 |= 0xf900;
pci_write_config16(dev, PSTS, reg16); pci_write_config16(dev, PSTS, reg16);

28
src/southbridge/intel/i82801gx/pcie.c
View File

@ -41,7 +41,6 @@ static inline int root_port_number(struct device *dev)
static void pci_init(struct device *dev) static void pci_init(struct device *dev)
{ {
u16 reg16; u16 reg16;
u32 reg32;
printk(BIOS_DEBUG, "Initializing ICH7 PCIe bridge.\n"); printk(BIOS_DEBUG, "Initializing ICH7 PCIe bridge.\n");
@ -52,38 +51,25 @@ static void pci_init(struct device *dev)
// This has no effect but the OS might expect it // This has no effect but the OS might expect it
pci_write_config8(dev, PCI_CACHE_LINE_SIZE, 0x10); pci_write_config8(dev, PCI_CACHE_LINE_SIZE, 0x10);
reg16 = pci_read_config16(dev, PCI_BRIDGE_CONTROL); pci_and_config16(dev, PCI_BRIDGE_CONTROL, ~PCI_BRIDGE_CTL_PARITY);
reg16 &= ~PCI_BRIDGE_CTL_PARITY;
pci_write_config16(dev, PCI_BRIDGE_CONTROL, reg16);
/* Enable IO xAPIC on this PCIe port */ /* Enable IO xAPIC on this PCIe port */
reg32 = pci_read_config32(dev, 0xd8); pci_or_config32(dev, 0xd8, 1 << 7);
reg32 |= (1 << 7);
pci_write_config32(dev, 0xd8, reg32);
/* Enable Backbone Clock Gating */ /* Enable Backbone Clock Gating */
reg32 = pci_read_config32(dev, 0xe1); pci_or_config32(dev, 0xe1, (1 << 3) | (1 << 2) | (1 << 1) | (1 << 0));
reg32 |= (1 << 3) | (1 << 2) | (1 << 1) | (1 << 0);
pci_write_config32(dev, 0xe1, reg32);
/* Set VC0 transaction class */ /* Set VC0 transaction class */
reg32 = pci_read_config32(dev, 0x114); pci_update_config32(dev, 0x114, ~0x000000ff, 1);
reg32 &= 0xffffff00;
reg32 |= 1;
pci_write_config32(dev, 0x114, reg32);
/* Mask completion timeouts */ /* Mask completion timeouts */
reg32 = pci_read_config32(dev, 0x148); pci_or_config32(dev, 0x148, 1 << 14);
reg32 |= (1 << 14);
pci_write_config32(dev, 0x148, reg32);
/* Enable common clock configuration */ /* Enable common clock configuration */
// Are there cases when we don't want that? // Are there cases when we don't want that?
reg16 = pci_read_config16(dev, 0x50); pci_or_config16(dev, 0x50, 1 << 6);
reg16 |= (1 << 6);
pci_write_config16(dev, 0x50, reg16);
/* Clear errors in status registers */ /* Clear errors in status registers. FIXME: Do something? */
reg16 = pci_read_config16(dev, 0x06); reg16 = pci_read_config16(dev, 0x06);
//reg16 |= 0xf900; //reg16 |= 0xf900;
pci_write_config16(dev, 0x06, reg16); pci_write_config16(dev, 0x06, reg16);

33
src/southbridge/intel/i82801gx/sata.c
View File

@ -59,11 +59,10 @@ void sata_enable(struct device *dev)
if (config->sata_mode == SATA_MODE_AHCI) { if (config->sata_mode == SATA_MODE_AHCI) {
/* Set map to ahci */ /* Set map to ahci */
pci_write_config8(dev, SATA_MAP, pci_update_config8(dev, SATA_MAP, (u8)~0xc3, 0x40);
(pci_read_config8(dev, SATA_MAP) & ~0xc3) | 0x40);
} else { } else {
/* Set map to ide */ /* Set map to ide */
pci_write_config8(dev, SATA_MAP, pci_read_config8(dev, SATA_MAP) & ~0xc3); pci_and_config8(dev, SATA_MAP, (u8)~0xc3);
} }
/* At this point, the new pci id will appear on the bus */ /* At this point, the new pci id will appear on the bus */
} }
@ -71,7 +70,6 @@ void sata_enable(struct device *dev)
static void sata_init(struct device *dev) static void sata_init(struct device *dev)
{ {
u32 reg32; u32 reg32;
u16 reg16;
u8 ports; u8 ports;
/* Get the chip configuration */ /* Get the chip configuration */
@ -95,11 +93,10 @@ static void sata_init(struct device *dev)
case SATA_MODE_IDE_LEGACY_COMBINED: case SATA_MODE_IDE_LEGACY_COMBINED:
printk(BIOS_DEBUG, "SATA controller in combined mode.\n"); printk(BIOS_DEBUG, "SATA controller in combined mode.\n");
/* No AHCI: clear AHCI base */ /* No AHCI: clear AHCI base */
pci_write_config32(dev, PCI_BASE_ADDRESS_5, 0x00000000); pci_write_config32(dev, PCI_BASE_ADDRESS_5, 0);
/* And without AHCI BAR no memory decoding */ /* And without AHCI BAR no memory decoding */
reg16 = pci_read_config16(dev, PCI_COMMAND); pci_and_config16(dev, PCI_COMMAND, ~PCI_COMMAND_MEMORY);
reg16 &= ~PCI_COMMAND_MEMORY;
pci_write_config16(dev, PCI_COMMAND, reg16);
pci_write_config8(dev, 0x09, 0x80); pci_write_config8(dev, 0x09, 0x80);
@ -148,9 +145,7 @@ static void sata_init(struct device *dev)
pci_write_config32(dev, PCI_BASE_ADDRESS_5, 0x00000000); pci_write_config32(dev, PCI_BASE_ADDRESS_5, 0x00000000);
/* And without AHCI BAR no memory decoding */ /* And without AHCI BAR no memory decoding */
reg16 = pci_read_config16(dev, PCI_COMMAND); pci_and_config16(dev, PCI_COMMAND, ~PCI_COMMAND_MEMORY);
reg16 &= ~PCI_COMMAND_MEMORY;
pci_write_config16(dev, PCI_COMMAND, reg16);
/* Native mode capable on both primary and secondary (0xa) /* Native mode capable on both primary and secondary (0xa)
* or'ed with enabled (0x50) = 0xf * or'ed with enabled (0x50) = 0xf
@ -191,23 +186,15 @@ static void sata_init(struct device *dev)
pci_write_config8(dev, 0xa0, 0x78); pci_write_config8(dev, 0xa0, 0x78);
pci_write_config8(dev, 0xa6, 0x22); pci_write_config8(dev, 0xa6, 0x22);
pci_write_config8(dev, 0xa0, 0x88); pci_write_config8(dev, 0xa0, 0x88);
reg32 = pci_read_config32(dev, 0xa4); pci_update_config32(dev, 0xa4, 0xc0c0c0c0, 0x1b1b1212);
reg32 &= 0xc0c0c0c0;
reg32 |= 0x1b1b1212;
pci_write_config32(dev, 0xa4, reg32);
pci_write_config8(dev, 0xa0, 0x8c); pci_write_config8(dev, 0xa0, 0x8c);
reg32 = pci_read_config32(dev, 0xa4); pci_update_config32(dev, 0xa4, 0xc0c0ff00, 0x121200aa);
reg32 &= 0xc0c0ff00;
reg32 |= 0x121200aa;
pci_write_config32(dev, 0xa4, reg32);
pci_write_config8(dev, 0xa0, 0x00); pci_write_config8(dev, 0xa0, 0x00);
pci_write_config8(dev, PCI_INTERRUPT_LINE, 0); pci_write_config8(dev, PCI_INTERRUPT_LINE, 0);
/* Sata Initialization Register */ /* Sata Initialization Register */
reg32 = pci_read_config32(dev, SATA_IR); pci_or_config32(dev, SATA_IR, SCRD); // due to some bug
reg32 |= SCRD; // due to some bug
pci_write_config32(dev, SATA_IR, reg32);
} }
static struct device_operations sata_ops = { static struct device_operations sata_ops = {

6
src/southbridge/intel/i82801gx/usb.c
View File

@ -9,8 +9,6 @@
static void usb_init(struct device *dev) static void usb_init(struct device *dev)
{ {
u8 reg8;
/* USB Specification says the device must be Bus Master */ /* USB Specification says the device must be Bus Master */
printk(BIOS_DEBUG, "UHCI: Setting up controller.. "); printk(BIOS_DEBUG, "UHCI: Setting up controller.. ");
@ -20,9 +18,7 @@ static void usb_init(struct device *dev)
pci_write_config8(dev, 0xca, 0x00); pci_write_config8(dev, 0xca, 0x00);
// Yes. Another Erratum // Yes. Another Erratum
reg8 = pci_read_config8(dev, 0xca); pci_or_config8(dev, 0xca, 1 << 0);
reg8 |= (1 << 0);
pci_write_config8(dev, 0xca, reg8);
printk(BIOS_DEBUG, "done.\n"); printk(BIOS_DEBUG, "done.\n");
} }

14
src/southbridge/intel/i82801gx/usb_ehci.c
View File

@ -14,19 +14,13 @@ static void usb_ehci_init(struct device *dev)
struct resource *res; struct resource *res;
u8 *base; u8 *base;
u32 reg32; u32 reg32;
u8 reg8;
printk(BIOS_DEBUG, "EHCI: Setting up controller.. "); printk(BIOS_DEBUG, "EHCI: Setting up controller.. ");
pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER | PCI_COMMAND_SERR); pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER | PCI_COMMAND_SERR);
reg32 = pci_read_config32(dev, 0xdc); pci_or_config32(dev, 0xdc, (1 << 31) | (1 << 27));
reg32 |= (1 << 31) | (1 << 27);
pci_write_config32(dev, 0xdc, reg32);
reg32 = pci_read_config32(dev, 0xfc); pci_update_config32(dev, 0xfc, ~(3 << 2), (2 << 2) | (1 << 29) | (1 << 17));
reg32 &= ~(3 << 2);
reg32 |= (2 << 2) | (1 << 29) | (1 << 17);
pci_write_config32(dev, 0xfc, reg32);
/* Clear any pending port changes */ /* Clear any pending port changes */
res = find_resource(dev, 0x10); res = find_resource(dev, 0x10);
@ -35,9 +29,7 @@ static void usb_ehci_init(struct device *dev)
write32(base + 0x24, reg32); write32(base + 0x24, reg32);
/* workaround */ /* workaround */
reg8 = pci_read_config8(dev, 0x84); pci_or_config8(dev, 0x84, 1 << 4);
reg8 |= (1 << 4);
pci_write_config8(dev, 0x84, reg8);
printk(BIOS_DEBUG, "done.\n"); printk(BIOS_DEBUG, "done.\n");
} }