Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/83358?usp=email )
Change subject: autoport: Drop ioapic, ioapic_irq, and lapic handling for devicetree ......................................................................
autoport: Drop ioapic, ioapic_irq, and lapic handling for devicetree
The ioapic and ioapic_irq keywords are no longer valid tokens as of commit e84b095d3a23 (util/sconfig: Remove unused ioapic and irq keywords), and the associated driver had previously been removed in commit ca5a793ec31c (drivers/generic/ioapic: Drop poor implementation). Thus, drop them from autoport. Also, the IOAPICIRQs map that this code relied on to generate ioapic_irq entries never seems to have been populated by any code in any previous commit, so this appears to have been dead code since autoport was created.
The lapic keyword was removed from sconfig in commit 15d5183e4af7 (util/sconfig: Remove lapic devices from devicetree parsers) so remove autoport handling for it as well.
Change-Id: Icf2582594b244cf5f726c722eb3a3c12573a2662 Signed-off-by: Nicholas Chin nic.c3.14@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/83358 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Felix Singer service+coreboot-gerrit@felixsinger.de --- M util/autoport/main.go 1 file changed, 1 insertion(+), 17 deletions(-)
Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved
diff --git a/util/autoport/main.go b/util/autoport/main.go index 18fb694..21dbbf0 100644 --- a/util/autoport/main.go +++ b/util/autoport/main.go @@ -96,12 +96,6 @@ SaneVendor string }
-type IOAPICIRQ struct { - APICID int - IRQNO [4]int -} - -var IOAPICIRQs map[PCIAddr]IOAPICIRQ = map[PCIAddr]IOAPICIRQ{} var KconfigBool map[string]bool = map[string]bool{} var KconfigComment map[string]string = map[string]string{} var KconfigString map[string]string = map[string]string{} @@ -366,7 +360,7 @@ func WriteDev(dt *os.File, offset int, alias string, dev DevTreeNode) { Offset(dt, offset) switch dev.Chip { - case "cpu_cluster", "lapic", "domain", "ioapic": + case "cpu_cluster", "domain": fmt.Fprintf(dt, "device %s 0x%x ", dev.Chip, dev.Dev) writeOn(dt, dev) case "pci", "pnp": @@ -391,16 +385,6 @@ fmt.Fprintf(dt, "subsystemid 0x%04x 0x%04x\n", dev.SubVendor, dev.SubSystem) }
- ioapic, ok := IOAPICIRQs[PCIAddr{Bus: dev.Bus, Dev: dev.Dev, Func: dev.Func}] - if dev.Chip == "pci" && ok { - for pin, irq := range ioapic.IRQNO { - if irq != 0 { - Offset(dt, offset+1) - fmt.Fprintf(dt, "ioapic_irq %d INT%c 0x%x\n", ioapic.APICID, 'A'+pin, irq) - } - } - } - keys := []string{} for reg, _ := range dev.Registers { keys = append(keys, reg)