Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d32a9ae authored by Kenji Kaneshige's avatar Kenji Kaneshige Committed by Jesse Barnes
Browse files

pciehp: Add missing memory barrier 



Fix the possible race condition between pcie_isr() and pciehp_write_cmd()
because of the lack of memory barrier.

Signed-off-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent c6b069e9

drivers/pci/hotplug/pciehp_hpc.c

+2 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ static int pcie_write_cmd(struct slot *slot, u16 cmd, u16 mask) 
	slot_ctrl |= ((cmd & mask) | CMD_CMPL_INTR_ENABLE);



	ctrl->cmd_busy = 1;

	smp_mb();

	retval = pciehp_writew(ctrl, SLOTCTRL, slot_ctrl);

	if (retval)

		err("%s: Cannot write to SLOTCTRL register\n", __func__);
@@ -759,6 +760,7 @@ static irqreturn_t pcie_isr(int irq, void *dev_id) 
	/* Check Command Complete Interrupt Pending */

	if (intr_loc & CMD_COMPLETED) {

		ctrl->cmd_busy = 0;

		smp_mb();

		wake_up_interruptible(&ctrl->queue);

	}