coreboot October 2010

coreboot@coreboot.org

55 participants
316 discussions

Start a nNew thread

[patch] mcp55 subsystem setting
by Jonathan A. Kollasch 29 Oct '10

29 Oct '10

Use common code to set PCI subsystem in mcp55. Signed-off-by: Jonathan Kollasch <jakllsch(a)kollasch.net> ---

2 2

[commit] r6003 - trunk/src/southbridge/nvidia/mcp55
by repository service 29 Oct '10

29 Oct '10

Author: jakllsch Date: Fri Oct 29 22:40:06 2010 New Revision: 6003 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6003 Log: Use common code to set PCI subsystem in mcp55. Signed-off-by: Jonathan Kollasch <jakllsch(a)kollasch.net> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/src/southbridge/nvidia/mcp55/mcp55.c trunk/src/southbridge/nvidia/mcp55/mcp55.h trunk/src/southbridge/nvidia/mcp55/mcp55_ht.c trunk/src/southbridge/nvidia/mcp55/mcp55_ide.c trunk/src/southbridge/nvidia/mcp55/mcp55_lpc.c trunk/src/southbridge/nvidia/mcp55/mcp55_nic.c trunk/src/southbridge/nvidia/mcp55/mcp55_pci.c trunk/src/southbridge/nvidia/mcp55/mcp55_pcie.c trunk/src/southbridge/nvidia/mcp55/mcp55_sata.c trunk/src/southbridge/nvidia/mcp55/mcp55_smbus.c trunk/src/southbridge/nvidia/mcp55/mcp55_usb.c trunk/src/southbridge/nvidia/mcp55/mcp55_usb2.c Modified: trunk/src/southbridge/nvidia/mcp55/mcp55.c ============================================================================== --- trunk/src/southbridge/nvidia/mcp55/mcp55.c Fri Oct 29 17:56:04 2010 (r6002) +++ trunk/src/southbridge/nvidia/mcp55/mcp55.c Fri Oct 29 22:40:06 2010 (r6003) @@ -242,6 +242,16 @@ } +static void mcp55_set_subsystem(device_t dev, unsigned vendor, unsigned device) +{ + pci_write_config32(dev, 0x40, + ((device & 0xffff) << 16) | (vendor & 0xffff)); +} + +struct pci_operations mcp55_pci_ops = { + .set_subsystem = mcp55_set_subsystem, +}; + struct chip_operations southbridge_nvidia_mcp55_ops = { CHIP_NAME("NVIDIA MCP55 Southbridge") .enable_dev = mcp55_enable, Modified: trunk/src/southbridge/nvidia/mcp55/mcp55.h ============================================================================== --- trunk/src/southbridge/nvidia/mcp55/mcp55.h Fri Oct 29 17:56:04 2010 (r6002) +++ trunk/src/southbridge/nvidia/mcp55/mcp55.h Fri Oct 29 22:40:06 2010 (r6003) @@ -26,6 +26,7 @@ #ifndef __PRE_RAM__ void mcp55_enable(device_t dev); +extern struct pci_operations mcp55_pci_ops; #else void enable_fid_change_on_sb(unsigned sbbusn, unsigned sbdn); #endif Modified: trunk/src/southbridge/nvidia/mcp55/mcp55_ht.c ============================================================================== --- trunk/src/southbridge/nvidia/mcp55/mcp55_ht.c Fri Oct 29 17:56:04 2010 (r6002) +++ trunk/src/southbridge/nvidia/mcp55/mcp55_ht.c Fri Oct 29 22:40:06 2010 (r6003) @@ -28,22 +28,13 @@ #include <device/pci_ops.h> #include "mcp55.h" -static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) -{ - pci_write_config32(dev, 0x40, - ((device & 0xffff) << 16) | (vendor & 0xffff)); -} -static struct pci_operations lops_pci = { - .set_subsystem = lpci_set_subsystem, -}; - static struct device_operations ht_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, .enable_resources = pci_dev_enable_resources, .init = 0, .scan_bus = 0, - .ops_pci = &lops_pci, + .ops_pci = &mcp55_pci_ops, }; static const struct pci_driver ht_driver __pci_driver = { Modified: trunk/src/southbridge/nvidia/mcp55/mcp55_ide.c ============================================================================== --- trunk/src/southbridge/nvidia/mcp55/mcp55_ide.c Fri Oct 29 17:56:04 2010 (r6002) +++ trunk/src/southbridge/nvidia/mcp55/mcp55_ide.c Fri Oct 29 22:40:06 2010 (r6003) @@ -69,15 +69,6 @@ } -static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) -{ - pci_write_config32(dev, 0x40, - ((device & 0xffff) << 16) | (vendor & 0xffff)); -} -static struct pci_operations lops_pci = { - .set_subsystem = lpci_set_subsystem, -}; - static struct device_operations ide_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, @@ -85,7 +76,7 @@ .init = ide_init, .scan_bus = 0, // .enable = mcp55_enable, - .ops_pci = &lops_pci, + .ops_pci = &mcp55_pci_ops, }; static const struct pci_driver ide_driver __pci_driver = { Modified: trunk/src/southbridge/nvidia/mcp55/mcp55_lpc.c ============================================================================== --- trunk/src/southbridge/nvidia/mcp55/mcp55_lpc.c Fri Oct 29 17:56:04 2010 (r6002) +++ trunk/src/southbridge/nvidia/mcp55/mcp55_lpc.c Fri Oct 29 22:40:06 2010 (r6003) @@ -253,16 +253,6 @@ mcp55_lpc_enable_childrens_resources(dev); } -static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) -{ - pci_write_config32(dev, 0x40, - ((device & 0xffff) << 16) | (vendor & 0xffff)); -} - -static struct pci_operations lops_pci = { - .set_subsystem = lpci_set_subsystem, -}; - static struct device_operations lpc_ops = { .read_resources = mcp55_lpc_read_resources, .set_resources = pci_dev_set_resources, @@ -270,7 +260,7 @@ .init = lpc_init, .scan_bus = scan_static_bus, // .enable = mcp55_enable, - .ops_pci = &lops_pci, + .ops_pci = &mcp55_pci_ops, }; static const struct pci_driver lpc_driver __pci_driver = { .ops = &lpc_ops, @@ -316,7 +306,7 @@ .enable_resources = pci_dev_enable_resources, .init = lpc_slave_init, // .enable = mcp55_enable, - .ops_pci = &lops_pci, + .ops_pci = &mcp55_pci_ops, }; static const struct pci_driver lpc_driver_slave __pci_driver = { Modified: trunk/src/southbridge/nvidia/mcp55/mcp55_nic.c ============================================================================== --- trunk/src/southbridge/nvidia/mcp55/mcp55_nic.c Fri Oct 29 17:56:04 2010 (r6002) +++ trunk/src/southbridge/nvidia/mcp55/mcp55_nic.c Fri Oct 29 22:40:06 2010 (r6003) @@ -180,16 +180,6 @@ } -static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) -{ - pci_write_config32(dev, 0x40, - ((device & 0xffff) << 16) | (vendor & 0xffff)); -} - -static struct pci_operations lops_pci = { - .set_subsystem = lpci_set_subsystem, -}; - static struct device_operations nic_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, @@ -197,7 +187,7 @@ .init = nic_init, .scan_bus = 0, // .enable = mcp55_enable, - .ops_pci = &lops_pci, + .ops_pci = &mcp55_pci_ops, }; static const struct pci_driver nic_driver __pci_driver = { .ops = &nic_ops, Modified: trunk/src/southbridge/nvidia/mcp55/mcp55_pci.c ============================================================================== --- trunk/src/southbridge/nvidia/mcp55/mcp55_pci.c Fri Oct 29 17:56:04 2010 (r6002) +++ trunk/src/southbridge/nvidia/mcp55/mcp55_pci.c Fri Oct 29 22:40:06 2010 (r6003) @@ -85,10 +85,6 @@ pci_write_config32(dev, 0x50, dword); /* TOM */ } -static struct pci_operations lops_pci = { - .set_subsystem = 0, -}; - static struct device_operations pci_ops = { .read_resources = pci_bus_read_resources, .set_resources = pci_dev_set_resources, @@ -97,7 +93,6 @@ .scan_bus = pci_scan_bridge, // .enable = mcp55_enable, .reset_bus = pci_bus_reset, - .ops_pci = &lops_pci, }; static const struct pci_driver pci_driver __pci_driver = { Modified: trunk/src/southbridge/nvidia/mcp55/mcp55_pcie.c ============================================================================== --- trunk/src/southbridge/nvidia/mcp55/mcp55_pcie.c Fri Oct 29 17:56:04 2010 (r6002) +++ trunk/src/southbridge/nvidia/mcp55/mcp55_pcie.c Fri Oct 29 22:40:06 2010 (r6003) @@ -42,10 +42,6 @@ } -static struct pci_operations lops_pci = { - .set_subsystem = 0, -}; - static struct device_operations pcie_ops = { .read_resources = pci_bus_read_resources, .set_resources = pci_dev_set_resources, @@ -53,7 +49,6 @@ .init = pcie_init, .scan_bus = pci_scan_bridge, // .enable = mcp55_enable, - .ops_pci = &lops_pci, }; static const struct pci_driver pciebc_driver __pci_driver = { Modified: trunk/src/southbridge/nvidia/mcp55/mcp55_sata.c ============================================================================== --- trunk/src/southbridge/nvidia/mcp55/mcp55_sata.c Fri Oct 29 17:56:04 2010 (r6002) +++ trunk/src/southbridge/nvidia/mcp55/mcp55_sata.c Fri Oct 29 22:40:06 2010 (r6003) @@ -69,15 +69,6 @@ } -static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) -{ - pci_write_config32(dev, 0x40, - ((device & 0xffff) << 16) | (vendor & 0xffff)); -} -static struct pci_operations lops_pci = { - .set_subsystem = lpci_set_subsystem, -}; - static struct device_operations sata_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, @@ -85,7 +76,7 @@ // .enable = mcp55_enable, .init = sata_init, .scan_bus = 0, - .ops_pci = &lops_pci, + .ops_pci = &mcp55_pci_ops, }; static const struct pci_driver sata0_driver __pci_driver = { Modified: trunk/src/southbridge/nvidia/mcp55/mcp55_smbus.c ============================================================================== --- trunk/src/southbridge/nvidia/mcp55/mcp55_smbus.c Fri Oct 29 17:56:04 2010 (r6002) +++ trunk/src/southbridge/nvidia/mcp55/mcp55_smbus.c Fri Oct 29 22:40:06 2010 (r6003) @@ -123,15 +123,6 @@ #endif } -static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) -{ - pci_write_config32(dev, 0x40, - ((device & 0xffff) << 16) | (vendor & 0xffff)); -} - -static struct pci_operations lops_pci = { - .set_subsystem = lpci_set_subsystem, -}; static struct device_operations smbus_ops = { .read_resources = mcp55_sm_read_resources, .set_resources = pci_dev_set_resources, @@ -139,7 +130,7 @@ .init = mcp55_sm_init, .scan_bus = scan_static_bus, // .enable = mcp55_enable, - .ops_pci = &lops_pci, + .ops_pci = &mcp55_pci_ops, .ops_smbus_bus = &lops_smbus_bus, }; static const struct pci_driver smbus_driver __pci_driver = { Modified: trunk/src/southbridge/nvidia/mcp55/mcp55_usb.c ============================================================================== --- trunk/src/southbridge/nvidia/mcp55/mcp55_usb.c Fri Oct 29 17:56:04 2010 (r6002) +++ trunk/src/southbridge/nvidia/mcp55/mcp55_usb.c Fri Oct 29 22:40:06 2010 (r6003) @@ -28,15 +28,6 @@ #include <device/pci_ops.h> #include "mcp55.h" -static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) -{ - pci_write_config32(dev, 0x40, - ((device & 0xffff) << 16) | (vendor & 0xffff)); -} -static struct pci_operations lops_pci = { - .set_subsystem = lpci_set_subsystem, -}; - static struct device_operations usb_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, @@ -44,7 +35,7 @@ .init = 0, // .enable = mcp55_enable, .scan_bus = 0, - .ops_pci = &lops_pci, + .ops_pci = &mcp55_pci_ops, }; static const struct pci_driver usb_driver __pci_driver = { Modified: trunk/src/southbridge/nvidia/mcp55/mcp55_usb2.c ============================================================================== --- trunk/src/southbridge/nvidia/mcp55/mcp55_usb2.c Fri Oct 29 17:56:04 2010 (r6002) +++ trunk/src/southbridge/nvidia/mcp55/mcp55_usb2.c Fri Oct 29 22:40:06 2010 (r6003) @@ -62,15 +62,6 @@ } -static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) -{ - pci_write_config32(dev, 0x40, - ((device & 0xffff) << 16) | (vendor & 0xffff)); -} -static struct pci_operations lops_pci = { - .set_subsystem = lpci_set_subsystem, -}; - static struct device_operations usb2_ops = { .read_resources = pci_dev_read_resources, .set_resources = usb2_set_resources, @@ -78,7 +69,7 @@ .init = usb2_init, // .enable = mcp55_enable, .scan_bus = 0, - .ops_pci = &lops_pci, + .ops_pci = &mcp55_pci_ops, }; static const struct pci_driver usb2_driver __pci_driver = {

1 0

[patch] deduplicate ck804 subsystem-setting functionality
by Jonathan A. Kollasch 29 Oct '10

29 Oct '10

Deduplicate ck804 subsystem-setting functionality. Signed-off-by: Jonathan Kollasch <jakllsch(a)kollasch.net> ---

2 2

[commit] r6002 - trunk/src/southbridge/nvidia/ck804
by repository service 29 Oct '10

29 Oct '10

Author: jakllsch Date: Fri Oct 29 17:56:04 2010 New Revision: 6002 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6002 Log: Deduplicate ck804 subsystem-setting functionality. Signed-off-by: Jonathan Kollasch <jakllsch(a)kollasch.net> Acked-by: Peter Stuge <peter(a)stuge.se> Modified: trunk/src/southbridge/nvidia/ck804/ck804.c trunk/src/southbridge/nvidia/ck804/ck804.h trunk/src/southbridge/nvidia/ck804/ck804_ac97.c trunk/src/southbridge/nvidia/ck804/ck804_ht.c trunk/src/southbridge/nvidia/ck804/ck804_ide.c trunk/src/southbridge/nvidia/ck804/ck804_lpc.c trunk/src/southbridge/nvidia/ck804/ck804_nic.c trunk/src/southbridge/nvidia/ck804/ck804_sata.c trunk/src/southbridge/nvidia/ck804/ck804_smbus.c trunk/src/southbridge/nvidia/ck804/ck804_usb.c trunk/src/southbridge/nvidia/ck804/ck804_usb2.c Modified: trunk/src/southbridge/nvidia/ck804/ck804.c ============================================================================== --- trunk/src/southbridge/nvidia/ck804/ck804.c Fri Oct 29 16:26:27 2010 (r6001) +++ trunk/src/southbridge/nvidia/ck804/ck804.c Fri Oct 29 17:56:04 2010 (r6002) @@ -188,6 +188,16 @@ } } +static void ck804_set_subsystem(device_t dev, unsigned vendor, unsigned device) +{ + pci_write_config32(dev, 0x40, + ((device & 0xffff) << 16) | (vendor & 0xffff)); +} + +struct pci_operations ck804_pci_ops = { + .set_subsystem = ck804_set_subsystem, +}; + struct chip_operations southbridge_nvidia_ck804_ops = { CHIP_NAME("NVIDIA CK804 Southbridge") .enable_dev = ck804_enable, Modified: trunk/src/southbridge/nvidia/ck804/ck804.h ============================================================================== --- trunk/src/southbridge/nvidia/ck804/ck804.h Fri Oct 29 16:26:27 2010 (r6001) +++ trunk/src/southbridge/nvidia/ck804/ck804.h Fri Oct 29 17:56:04 2010 (r6002) @@ -26,4 +26,6 @@ void ck804_enable(device_t dev); void ck804_enable_usbdebug(unsigned int port); +extern struct pci_operations ck804_pci_ops; + #endif Modified: trunk/src/southbridge/nvidia/ck804/ck804_ac97.c ============================================================================== --- trunk/src/southbridge/nvidia/ck804/ck804_ac97.c Fri Oct 29 16:26:27 2010 (r6001) +++ trunk/src/southbridge/nvidia/ck804/ck804_ac97.c Fri Oct 29 17:56:04 2010 (r6002) @@ -25,16 +25,6 @@ #include <device/pci_ops.h> #include "ck804.h" -static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) -{ - pci_write_config32(dev, 0x40, - ((device & 0xffff) << 16) | (vendor & 0xffff)); -} - -static struct pci_operations lops_pci = { - .set_subsystem = lpci_set_subsystem, -}; - static struct device_operations ac97audio_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, @@ -42,7 +32,7 @@ // .enable = ck804_enable, .init = 0, .scan_bus = 0, - .ops_pci = &lops_pci, + .ops_pci = &ck804_pci_ops, }; static const struct pci_driver ac97audio_driver __pci_driver = { @@ -58,7 +48,7 @@ // .enable = ck804_enable, .init = 0, .scan_bus = 0, - .ops_pci = &lops_pci, + .ops_pci = &ck804_pci_ops, }; static const struct pci_driver ac97modem_driver __pci_driver = { Modified: trunk/src/southbridge/nvidia/ck804/ck804_ht.c ============================================================================== --- trunk/src/southbridge/nvidia/ck804/ck804_ht.c Fri Oct 29 16:26:27 2010 (r6001) +++ trunk/src/southbridge/nvidia/ck804/ck804_ht.c Fri Oct 29 17:56:04 2010 (r6002) @@ -25,23 +25,13 @@ #include <device/pci_ops.h> #include "ck804.h" -static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) -{ - pci_write_config32(dev, 0x40, - ((device & 0xffff) << 16) | (vendor & 0xffff)); -} - -static struct pci_operations lops_pci = { - .set_subsystem = lpci_set_subsystem, -}; - static struct device_operations ht_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, .enable_resources = pci_dev_enable_resources, .init = 0, .scan_bus = 0, - .ops_pci = &lops_pci, + .ops_pci = &ck804_pci_ops, }; static const struct pci_driver ht_driver __pci_driver = { Modified: trunk/src/southbridge/nvidia/ck804/ck804_ide.c ============================================================================== --- trunk/src/southbridge/nvidia/ck804/ck804_ide.c Fri Oct 29 16:26:27 2010 (r6001) +++ trunk/src/southbridge/nvidia/ck804/ck804_ide.c Fri Oct 29 17:56:04 2010 (r6002) @@ -65,16 +65,6 @@ #endif } -static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) -{ - pci_write_config32(dev, 0x40, - ((device & 0xffff) << 16) | (vendor & 0xffff)); -} - -static struct pci_operations lops_pci = { - .set_subsystem = lpci_set_subsystem, -}; - static struct device_operations ide_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, @@ -82,7 +72,7 @@ .init = ide_init, .scan_bus = 0, // .enable = ck804_enable, - .ops_pci = &lops_pci, + .ops_pci = &ck804_pci_ops, }; static const struct pci_driver ide_driver __pci_driver = { Modified: trunk/src/southbridge/nvidia/ck804/ck804_lpc.c ============================================================================== --- trunk/src/southbridge/nvidia/ck804/ck804_lpc.c Fri Oct 29 16:26:27 2010 (r6001) +++ trunk/src/southbridge/nvidia/ck804/ck804_lpc.c Fri Oct 29 17:56:04 2010 (r6002) @@ -299,16 +299,6 @@ ck804_lpc_enable_childrens_resources(dev); } -static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) -{ - pci_write_config32(dev, 0x40, - ((device & 0xffff) << 16) | (vendor & 0xffff)); -} - -static struct pci_operations lops_pci = { - .set_subsystem = lpci_set_subsystem, -}; - static struct device_operations lpc_ops = { .read_resources = ck804_lpc_read_resources, .set_resources = pci_dev_set_resources, @@ -316,7 +306,7 @@ .init = lpc_init, .scan_bus = scan_static_bus, // .enable = ck804_enable, - .ops_pci = &lops_pci, + .ops_pci = &ck804_pci_ops, }; static const struct pci_driver lpc_driver __pci_driver = { @@ -344,7 +334,7 @@ .enable_resources = pci_dev_enable_resources, .init = lpc_slave_init, // .enable = ck804_enable, - .ops_pci = &lops_pci, + .ops_pci = &ck804_pci_ops, }; static const struct pci_driver lpc_driver_slave __pci_driver = { Modified: trunk/src/southbridge/nvidia/ck804/ck804_nic.c ============================================================================== --- trunk/src/southbridge/nvidia/ck804/ck804_nic.c Fri Oct 29 16:26:27 2010 (r6001) +++ trunk/src/southbridge/nvidia/ck804/ck804_nic.c Fri Oct 29 17:56:04 2010 (r6002) @@ -113,16 +113,6 @@ #endif } -static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) -{ - pci_write_config32(dev, 0x40, - ((device & 0xffff) << 16) | (vendor & 0xffff)); -} - -static struct pci_operations lops_pci = { - .set_subsystem = lpci_set_subsystem, -}; - static struct device_operations nic_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, @@ -130,7 +120,7 @@ .init = nic_init, .scan_bus = 0, // .enable = ck804_enable, - .ops_pci = &lops_pci, + .ops_pci = &ck804_pci_ops, }; static const struct pci_driver nic_driver __pci_driver = { Modified: trunk/src/southbridge/nvidia/ck804/ck804_sata.c ============================================================================== --- trunk/src/southbridge/nvidia/ck804/ck804_sata.c Fri Oct 29 16:26:27 2010 (r6001) +++ trunk/src/southbridge/nvidia/ck804/ck804_sata.c Fri Oct 29 17:56:04 2010 (r6002) @@ -164,16 +164,6 @@ } -static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) -{ - pci_write_config32(dev, 0x40, - ((device & 0xffff) << 16) | (vendor & 0xffff)); -} - -static struct pci_operations lops_pci = { - .set_subsystem = lpci_set_subsystem, -}; - static struct device_operations sata_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, @@ -181,7 +171,7 @@ // .enable = ck804_enable, .init = sata_init, .scan_bus = 0, - .ops_pci = &lops_pci, + .ops_pci = &ck804_pci_ops, }; static const struct pci_driver sata0_driver __pci_driver = { Modified: trunk/src/southbridge/nvidia/ck804/ck804_smbus.c ============================================================================== --- trunk/src/southbridge/nvidia/ck804/ck804_smbus.c Fri Oct 29 16:26:27 2010 (r6001) +++ trunk/src/southbridge/nvidia/ck804/ck804_smbus.c Fri Oct 29 17:56:04 2010 (r6002) @@ -92,16 +92,6 @@ .write_byte = lsmbus_write_byte, }; -static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) -{ - pci_write_config32(dev, 0x40, - ((device & 0xffff) << 16) | (vendor & 0xffff)); -} - -static struct pci_operations lops_pci = { - .set_subsystem = lpci_set_subsystem, -}; - static struct device_operations smbus_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, @@ -109,7 +99,7 @@ .init = 0, .scan_bus = scan_static_bus, // .enable = ck804_enable, - .ops_pci = &lops_pci, + .ops_pci = &ck804_pci_ops, .ops_smbus_bus = &lops_smbus_bus, }; Modified: trunk/src/southbridge/nvidia/ck804/ck804_usb.c ============================================================================== --- trunk/src/southbridge/nvidia/ck804/ck804_usb.c Fri Oct 29 16:26:27 2010 (r6001) +++ trunk/src/southbridge/nvidia/ck804/ck804_usb.c Fri Oct 29 17:56:04 2010 (r6002) @@ -44,16 +44,6 @@ } } -static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) -{ - pci_write_config32(dev, 0x40, - ((device & 0xffff) << 16) | (vendor & 0xffff)); -} - -static struct pci_operations lops_pci = { - .set_subsystem = lpci_set_subsystem, -}; - static struct device_operations usb_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, @@ -61,7 +51,7 @@ .init = usb1_init, // .enable = ck804_enable, .scan_bus = 0, - .ops_pci = &lops_pci, + .ops_pci = &ck804_pci_ops, }; static const struct pci_driver usb_driver __pci_driver = { Modified: trunk/src/southbridge/nvidia/ck804/ck804_usb2.c ============================================================================== --- trunk/src/southbridge/nvidia/ck804/ck804_usb2.c Fri Oct 29 16:26:27 2010 (r6001) +++ trunk/src/southbridge/nvidia/ck804/ck804_usb2.c Fri Oct 29 17:56:04 2010 (r6002) @@ -33,16 +33,6 @@ pci_write_config32(dev, 0xf8, dword); } -static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) -{ - pci_write_config32(dev, 0x40, - ((device & 0xffff) << 16) | (vendor & 0xffff)); -} - -static struct pci_operations lops_pci = { - .set_subsystem = lpci_set_subsystem, -}; - static struct device_operations usb2_ops = { .read_resources = pci_dev_read_resources, .set_resources = pci_dev_set_resources, @@ -50,7 +40,7 @@ .init = usb2_init, // .enable = ck804_enable, .scan_bus = 0, - .ops_pci = &lops_pci, + .ops_pci = &ck804_pci_ops, }; static const struct pci_driver usb2_driver __pci_driver = {

1 0

[commit] r6001 - trunk/src/mainboard/intel/d945gclf
by repository service 29 Oct '10

29 Oct '10

Author: uwe Date: Fri Oct 29 16:26:27 2010 New Revision: 6001 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6001 Log: Drop duplicate HAVE_ACPI_TABLES (trivial). Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/src/mainboard/intel/d945gclf/Kconfig Modified: trunk/src/mainboard/intel/d945gclf/Kconfig ============================================================================== --- trunk/src/mainboard/intel/d945gclf/Kconfig Thu Oct 28 21:57:52 2010 (r6000) +++ trunk/src/mainboard/intel/d945gclf/Kconfig Fri Oct 29 16:26:27 2010 (r6001) @@ -35,7 +35,6 @@ select HAVE_ACPI_TABLES select HAVE_ACPI_RESUME select MMCONF_SUPPORT - select HAVE_ACPI_TABLES select HAVE_SMI_HANDLER select BOARD_ROMSIZE_KB_512 select GFXUMA

1 0

[commit] r6000 - trunk/src/southbridge/nvidia/ck804
by repository service 28 Oct '10

28 Oct '10

Author: jakllsch Date: Thu Oct 28 21:57:52 2010 New Revision: 6000 URL: https://tracker.coreboot.org/trac/coreboot/changeset/6000 Log: The no point in having a non-NULL ops_pci pointer when the set_subsystem operation within is NULL anyway. Signed-off-by: Jonathan Kollasch <jakllsch(a)kollasch.net> Acked-by: Jonathan Kollasch <jakllsch(a)kollasch.net> Modified: trunk/src/southbridge/nvidia/ck804/ck804_pci.c trunk/src/southbridge/nvidia/ck804/ck804_pcie.c Modified: trunk/src/southbridge/nvidia/ck804/ck804_pci.c ============================================================================== --- trunk/src/southbridge/nvidia/ck804/ck804_pci.c Thu Oct 28 16:22:20 2010 (r5999) +++ trunk/src/southbridge/nvidia/ck804/ck804_pci.c Thu Oct 28 21:57:52 2010 (r6000) @@ -78,10 +78,6 @@ pci_write_config32(dev, 0x50, dword); /* TOM */ } -static struct pci_operations lops_pci = { - .set_subsystem = 0, -}; - static struct device_operations pci_ops = { .read_resources = pci_bus_read_resources, .set_resources = pci_dev_set_resources, @@ -89,7 +85,6 @@ .init = pci_init, .scan_bus = pci_scan_bridge, // .enable = ck804_enable, - .ops_pci = &lops_pci, }; static const struct pci_driver pci_driver __pci_driver = { Modified: trunk/src/southbridge/nvidia/ck804/ck804_pcie.c ============================================================================== --- trunk/src/southbridge/nvidia/ck804/ck804_pcie.c Thu Oct 28 16:22:20 2010 (r5999) +++ trunk/src/southbridge/nvidia/ck804/ck804_pcie.c Thu Oct 28 21:57:52 2010 (r6000) @@ -36,10 +36,6 @@ pci_write_config32(dev, 0x04, dword); } -static struct pci_operations lops_pci = { - .set_subsystem = 0, -}; - static struct device_operations pcie_ops = { .read_resources = pci_bus_read_resources, .set_resources = pci_dev_set_resources, @@ -47,7 +43,6 @@ .init = pcie_init, .scan_bus = pci_scan_bridge, // .enable = ck804_enable, - .ops_pci = &lops_pci, }; static const struct pci_driver pcie_driver __pci_driver = {

1 0

build service results for r5999
by repository service 28 Oct '10

28 Oct '10

Dear coreboot readers! This is the automatic build system of coreboot. The developer "uwe" checked in revision 5999 to the coreboot repository. This caused the following changes: Change Log: Fix broken build due to missing #if CONFIG_IOAPIC. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Build Log: Compilation of a-trend:atc-6220 has been fixed Compilation of a-trend:atc-6240 has been fixed Compilation of abit:be6-ii_v2_0 has been fixed Compilation of asus:p2b has been fixed Compilation of asus:p2b-ds has been fixed Compilation of asus:p2b-f has been fixed Compilation of asus:p2b-ls has been fixed Compilation of asus:p3b-f has been fixed Compilation of azza:pt-6ibd has been fixed Compilation of biostar:m6tba has been fixed Compilation of compaq:deskpro_en_sff_p600 has been fixed Compilation of emulation:qemu-x86 has been fixed Compilation of gigabyte:ga-6bxc has been fixed Compilation of gigabyte:ga-6bxe has been fixed Compilation of msi:ms6119 has been fixed Compilation of msi:ms6147 has been fixed Compilation of msi:ms6156 has been fixed Compilation of nokia:ip530 has been fixed Compilation of soyo:sy-6ba-plus-iii has been fixed Compilation of tyan:s1846 has been fixed If something broke during this checkin please be a pain in uwe's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

[commit] r5999 - trunk/src/southbridge/intel/i82371eb
by repository service 28 Oct '10

28 Oct '10

Author: uwe Date: Thu Oct 28 16:22:20 2010 New Revision: 5999 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5999 Log: Fix broken build due to missing #if CONFIG_IOAPIC. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/src/southbridge/intel/i82371eb/i82371eb_isa.c Modified: trunk/src/southbridge/intel/i82371eb/i82371eb_isa.c ============================================================================== --- trunk/src/southbridge/intel/i82371eb/i82371eb_isa.c Thu Oct 28 10:19:22 2010 (r5998) +++ trunk/src/southbridge/intel/i82371eb/i82371eb_isa.c Thu Oct 28 16:22:20 2010 (r5999) @@ -28,6 +28,7 @@ #include <arch/ioapic.h> #include "i82371eb.h" +#if CONFIG_IOAPIC static void enable_intel_82093aa_ioapic(void) { u16 reg16; @@ -56,6 +57,7 @@ if (reg32 != ioapic_id) die("IOAPIC error!\n"); } +#endif static void isa_init(struct device *dev) {

1 0

build service results for r5998
by repository service 28 Oct '10

28 Oct '10

Dear coreboot readers! This is the automatic build system of coreboot. The developer "uwe" checked in revision 5998 to the coreboot repository. This caused the following changes: Change Log: Add IOAPIC support for Intel 82371EB and fixup SMP on ASUS P2B-D. - Add enable_intel_82093aa_ioapic() which enables IOAPIC usage in the Intel 82371EB southbridge (sets the proper chip-select) and sets an IOAPIC ID. - We only call enable_intel_82093aa_ioapic() if a board does "select IOAPIC" as on 82371EB-based boards the IOAPIC is an external chip (not integrated in the southbridge) and it's only populated on multi-CPU boards. That is, we cannot unconditionally enable it, only on SMP-capable boards. - Due to the reason explained above, remove "select IOAPIC" from src/southbridge/intel/i82371eb/Kconfig, and add it to src/mainboard/asus/p2b-d/Kconfig. - Also set CONFIG_MAX_PHYSICAL_CPUS to 2 on ASUS P2B-D. There are two CPU sockets (Slot 1) and each CPU can only have one core, multi-core CPUs didn't exist in that era (CONFIG_MAX_CPUS was set to 2 already). - Drop useless/duplicated enable_lapic() call from ASUS P2B-D's romstage.c, that function is always called if either CONFIG_SMP and/or CONFIG_IOAPIC are set. - Rework ASUS P2B-D mptable.c to fix a number of things: - Convert it to use mptable_write_buses() as all mptable.c files should do. - Fix incorrect IOAPICID (it's 0x11 for the external 82093AA IOAPIC). - Fix a bunch of hardcoded bus IDs, remove incorrect entries, etc. This is build-tested on ASUS P2B-D, and also boot-tested successfully there. On Linux I now get two entries in /proc/cpuinfo (where only one appeared before this patch), i.e. both populated CPUs are found. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Build Log: Compilation of a-trend:atc-6220 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=atc-6220&vendo… Compilation of a-trend:atc-6240 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=atc-6240&vendo… Compilation of abit:be6-ii_v2_0 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=be6-ii_v2_0&ve… Compilation of asus:p2b has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=p2b&vendor=asu… Compilation of asus:p2b-ds has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=p2b-ds&vendor=… Compilation of asus:p2b-f has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=p2b-f&vendor=a… Compilation of asus:p2b-ls has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=p2b-ls&vendor=… Compilation of asus:p3b-f has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=p3b-f&vendor=a… Compilation of azza:pt-6ibd has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=pt-6ibd&vendor… Compilation of biostar:m6tba has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=m6tba&vendor=b… Compilation of compaq:deskpro_en_sff_p600 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=deskpro_en_sff… Compilation of emulation:qemu-x86 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=qemu-x86&vendo… Compilation of gigabyte:ga-6bxc has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=ga-6bxc&vendor… Compilation of gigabyte:ga-6bxe has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=ga-6bxe&vendor… Compilation of msi:ms6119 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=ms6119&vendor=… Compilation of msi:ms6147 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=ms6147&vendor=… Compilation of msi:ms6156 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=ms6156&vendor=… Compilation of nokia:ip530 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=ip530&vendor=n… Compilation of soyo:sy-6ba-plus-iii has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=sy-6ba-plus-ii… Compilation of tyan:s1846 has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5998&device=s1846&vendor=t… If something broke during this checkin please be a pain in uwe's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

[PATCH] Add IOAPIC support for Intel 82371EB and fixup SMP on ASUS P2B-D
by Uwe Hermann 28 Oct '10

28 Oct '10

See patch. As soon as this patch is merged, I'll send follow-up patches to convert/fix the other 440BX/82371EB-based SMP-capable boards. Uwe. -- http://hermann-uwe.de | http://sigrok.org http://randomprojects.org | http://unmaintained-free-software.org

2 2

← Newer
1
2
3
4
5
6
7
8
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot October 2010