Commit 34739a28 authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Thomas Gleixner
Browse files

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: default avatarMaciej W. Rozycki <macro@orcam.me.uk>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/alpine.DEB.2.21.2107200251080.9461@angie.orcam.me.uk
parent d2531661

arch/x86/kernel/acpi/boot.c

+3 −3
Original line number Diff line number Diff line
@@ -558,10 +558,10 @@ acpi_parse_nmi_src(union acpi_subtable_headers * header, const unsigned long end 
 * If a PIC-mode SCI is not recognized or gives spurious IRQ7's

 * it may require Edge Trigger -- use "acpi_sci=edge"

 *

 * Port 0x4d0-4d1 are ECLR1 and ECLR2, the Edge/Level Control Registers

 * Port 0x4d0-4d1 are ELCR1 and ELCR2, the Edge/Level Control Registers

 * for the 8259 PIC.  bit[n] = 1 means irq[n] is Level, otherwise Edge.

 * ECLR1 is IRQs 0-7 (IRQ 0, 1, 2 must be 0)

 * ECLR2 is IRQs 8-15 (IRQ 8, 13 must be 0)

 * ELCR1 is IRQs 0-7 (IRQ 0, 1, 2 must be 0)

 * ELCR2 is IRQs 8-15 (IRQ 8, 13 must be 0)

 */



void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger)

arch/x86/kvm/i8259.c

+10 −10
Original line number Diff line number Diff line
@@ -541,17 +541,17 @@ static int picdev_slave_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev, 
			    addr, len, val);

}



static int picdev_eclr_write(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,

static int picdev_elcr_write(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,

			     gpa_t addr, int len, const void *val)

{

	return picdev_write(container_of(dev, struct kvm_pic, dev_eclr),

	return picdev_write(container_of(dev, struct kvm_pic, dev_elcr),

			    addr, len, val);

}



static int picdev_eclr_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,

static int picdev_elcr_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,

			    gpa_t addr, int len, void *val)

{

	return picdev_read(container_of(dev, struct kvm_pic, dev_eclr),

	return picdev_read(container_of(dev, struct kvm_pic, dev_elcr),

			    addr, len, val);

}
@@ -577,9 +577,9 @@ static const struct kvm_io_device_ops picdev_slave_ops = { 
	.write    = picdev_slave_write,

};



static const struct kvm_io_device_ops picdev_eclr_ops = {

	.read     = picdev_eclr_read,

	.write    = picdev_eclr_write,

static const struct kvm_io_device_ops picdev_elcr_ops = {

	.read     = picdev_elcr_read,

	.write    = picdev_elcr_write,

};



int kvm_pic_init(struct kvm *kvm)
@@ -602,7 +602,7 @@ int kvm_pic_init(struct kvm *kvm) 
	 */

	kvm_iodevice_init(&s->dev_master, &picdev_master_ops);

	kvm_iodevice_init(&s->dev_slave, &picdev_slave_ops);

	kvm_iodevice_init(&s->dev_eclr, &picdev_eclr_ops);

	kvm_iodevice_init(&s->dev_elcr, &picdev_elcr_ops);

	mutex_lock(&kvm->slots_lock);

	ret = kvm_io_bus_register_dev(kvm, KVM_PIO_BUS, 0x20, 2,

				      &s->dev_master);
@@ -613,7 +613,7 @@ int kvm_pic_init(struct kvm *kvm) 
	if (ret < 0)

		goto fail_unreg_2;



	ret = kvm_io_bus_register_dev(kvm, KVM_PIO_BUS, 0x4d0, 2, &s->dev_eclr);

	ret = kvm_io_bus_register_dev(kvm, KVM_PIO_BUS, 0x4d0, 2, &s->dev_elcr);

	if (ret < 0)

		goto fail_unreg_1;
@@ -647,7 +647,7 @@ void kvm_pic_destroy(struct kvm *kvm) 
	mutex_lock(&kvm->slots_lock);

	kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_master);

	kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_slave);

	kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_eclr);

	kvm_io_bus_unregister_dev(vpic->kvm, KVM_PIO_BUS, &vpic->dev_elcr);

	mutex_unlock(&kvm->slots_lock);



	kvm->arch.vpic = NULL;

arch/x86/kvm/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ struct kvm_pic { 
	int output;		/* intr from master PIC */

	struct kvm_io_device dev_master;

	struct kvm_io_device dev_slave;

	struct kvm_io_device dev_eclr;

	struct kvm_io_device dev_elcr;

	void (*ack_notifier)(void *opaque, int irq);

	unsigned long irq_states[PIC_NUM_PINS];

};