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

Commit 106feb2f authored by Denis Efremov's avatar Denis Efremov Committed by Bjorn Helgaas
Browse files

PCI: pciehp: Remove pciehp_set_attention_status() 

Remove pciehp_set_attention_status() and use pciehp_set_indicators()
instead, since the code is mostly the same.

Link: https://lore.kernel.org/r/20190903111021.1559-4-efremov@linux.com


Signed-off-by: default avatarDenis Efremov <efremov@linux.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
parent 94719ba0

drivers/pci/hotplug/pciehp.h

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ void pciehp_get_power_status(struct controller *ctrl, u8 *status); 
#define INDICATOR_NOOP -1	/* Leave indicator unchanged */

void pciehp_set_indicators(struct controller *ctrl, int pwr, int attn);



void pciehp_set_attention_status(struct controller *ctrl, u8 status);

void pciehp_get_latch_status(struct controller *ctrl, u8 *status);

int pciehp_query_power_fault(struct controller *ctrl);

void pciehp_green_led_on(struct controller *ctrl);

drivers/pci/hotplug/pciehp_core.c

+7 −2
Original line number Diff line number Diff line
@@ -95,15 +95,20 @@ static void cleanup_slot(struct controller *ctrl) 
}



/*

 * set_attention_status - Turns the Amber LED for a slot on, off or blink

 * set_attention_status - Turns the Attention Indicator on, off or blinking

 */

static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)

{

	struct controller *ctrl = to_ctrl(hotplug_slot);

	struct pci_dev *pdev = ctrl->pcie->port;



	if (status)

		status <<= PCI_EXP_SLTCTL_ATTN_IND_SHIFT;

	else

		status = PCI_EXP_SLTCTL_ATTN_IND_OFF;



	pci_config_pm_runtime_get(pdev);

	pciehp_set_attention_status(ctrl, status);

	pciehp_set_indicators(ctrl, INDICATOR_NOOP, status);

	pci_config_pm_runtime_put(pdev);

	return 0;

}

drivers/pci/hotplug/pciehp_hpc.c

+0 −25
Original line number Diff line number Diff line
@@ -418,31 +418,6 @@ int pciehp_set_raw_indicator_status(struct hotplug_slot *hotplug_slot, 
	return 0;

}



void pciehp_set_attention_status(struct controller *ctrl, u8 value)

{

	u16 slot_cmd;



	if (!ATTN_LED(ctrl))

		return;



	switch (value) {

	case 0:		/* turn off */

		slot_cmd = PCI_EXP_SLTCTL_ATTN_IND_OFF;

		break;

	case 1:		/* turn on */

		slot_cmd = PCI_EXP_SLTCTL_ATTN_IND_ON;

		break;

	case 2:		/* turn blink */

		slot_cmd = PCI_EXP_SLTCTL_ATTN_IND_BLINK;

		break;

	default:

		return;

	}

	pcie_write_cmd_nowait(ctrl, slot_cmd, PCI_EXP_SLTCTL_AIC);

	ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n", __func__,

		 pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL, slot_cmd);

}



/**

 * pciehp_set_indicators() - set attention indicator, power indicator, or both

 * @ctrl: PCIe hotplug controller

include/uapi/linux/pci_regs.h

+1 −0
Original line number Diff line number Diff line
@@ -591,6 +591,7 @@ 
#define  PCI_EXP_SLTCTL_CCIE	0x0010	/* Command Completed Interrupt Enable */

#define  PCI_EXP_SLTCTL_HPIE	0x0020	/* Hot-Plug Interrupt Enable */

#define  PCI_EXP_SLTCTL_AIC	0x00c0	/* Attention Indicator Control */

#define  PCI_EXP_SLTCTL_ATTN_IND_SHIFT 6      /* Attention Indicator shift */

#define  PCI_EXP_SLTCTL_ATTN_IND_ON    0x0040 /* Attention Indicator on */

#define  PCI_EXP_SLTCTL_ATTN_IND_BLINK 0x0080 /* Attention Indicator blinking */

#define  PCI_EXP_SLTCTL_ATTN_IND_OFF   0x00c0 /* Attention Indicator off */