Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

x86: Fix typo s/ECLR/ELCR/ for the PIC register

The proper spelling for the acronym referring to the Edge/Level Control
Register is ELCR rather than ECLR. Adjust references accordingly. No
functional change.

Signed-off-by: Maciej W. Rozycki <macro@orcam.me.uk>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/alpine.DEB.2.21.2107200251080.9461@angie.orcam.me.uk

authored by

Maciej W. Rozycki and committed by
Thomas Gleixner
34739a28 d2531661

+14 -14
+3 -3
arch/x86/kernel/acpi/boot.c
··· 558 558 * If a PIC-mode SCI is not recognized or gives spurious IRQ7's 559 559 * it may require Edge Trigger -- use "acpi_sci=edge" 560 560 * 561 - * Port 0x4d0-4d1 are ECLR1 and ECLR2, the Edge/Level Control Registers 561 + * Port 0x4d0-4d1 are ELCR1 and ELCR2, the Edge/Level Control Registers 562 562 * for the 8259 PIC. bit[n] = 1 means irq[n] is Level, otherwise Edge. 563 - * ECLR1 is IRQs 0-7 (IRQ 0, 1, 2 must be 0) 564 - * ECLR2 is IRQs 8-15 (IRQ 8, 13 must be 0) 563 + * ELCR1 is IRQs 0-7 (IRQ 0, 1, 2 must be 0) 564 + * ELCR2 is IRQs 8-15 (IRQ 8, 13 must be 0) 565 565 */ 566 566 567 567 void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger)
+10 -10
arch/x86/kvm/i8259.c
··· 541 541 addr, len, val); 542 542 } 543 543 544 - static int picdev_eclr_write(struct kvm_vcpu *vcpu, struct kvm_io_device *dev, 544 + static int picdev_elcr_write(struct kvm_vcpu *vcpu, struct kvm_io_device *dev, 545 545 gpa_t addr, int len, const void *val) 546 546 { 547 - return picdev_write(container_of(dev, struct kvm_pic, dev_eclr), 547 + return picdev_write(container_of(dev, struct kvm_pic, dev_elcr), 548 548 addr, len, val); 549 549 } 550 550 551 - static int picdev_eclr_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev, 551 + static int picdev_elcr_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev, 552 552 gpa_t addr, int len, void *val) 553 553 { 554 - return picdev_read(container_of(dev, struct kvm_pic, dev_eclr), 554 + return picdev_read(container_of(dev, struct kvm_pic, dev_elcr), 555 555 addr, len, val); 556 556 } 557 557 ··· 577 577 .write = picdev_slave_write, 578 578 }; 579 579 580 - static const struct kvm_io_device_ops picdev_eclr_ops = { 581 - .read = picdev_eclr_read, 582 - .write = picdev_eclr_write, 580 + static const struct kvm_io_device_ops picdev_elcr_ops = { 581 + .read = picdev_elcr_read, 582 + .write = picdev_elcr_write, 583 583 }; 584 584 585 585 int kvm_pic_init(struct kvm *kvm) ··· 602 602 */ 603 603 kvm_iodevice_init(&s->dev_master, &picdev_master_ops); 604 604 kvm_iodevice_init(&s->dev_slave, &picdev_slave_ops); 605 - kvm_iodevice_init(&s->dev_eclr, &picdev_eclr_ops); 605 + kvm_iodevice_init(&s->dev_elcr, &picdev_elcr_ops); 606 606 mutex_lock(&kvm->slots_lock); 607 607 ret = kvm_io_bus_register_dev(kvm, KVM_PIO_BUS, 0x20, 2, 608 608 &s->dev_master); ··· 613 613 if (ret < 0) 614 614 goto fail_unreg_2; 615 615 616 - ret = kvm_io_bus_register_dev(kvm, KVM_PIO_BUS, 0x4d0, 2, &s->dev_eclr); 616 + ret = kvm_io_bus_register_dev(kvm, KVM_PIO_BUS, 0x4d0, 2, &s->dev_elcr); 617 617 if (ret < 0) 618 618 goto fail_unreg_1; 619 619 ··· 647 647 mutex_lock(&kvm->slots_lock); 648 648 kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_master); 649 649 kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_slave); 650 - kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_eclr); 650 + kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_elcr); 651 651 mutex_unlock(&kvm->slots_lock); 652 652 653 653 kvm->arch.vpic = NULL;
+1 -1
arch/x86/kvm/irq.h
··· 55 55 int output; /* intr from master PIC */ 56 56 struct kvm_io_device dev_master; 57 57 struct kvm_io_device dev_slave; 58 - struct kvm_io_device dev_eclr; 58 + struct kvm_io_device dev_elcr; 59 59 void (*ack_notifier)(void *opaque, int irq); 60 60 unsigned long irq_states[PIC_NUM_PINS]; 61 61 };