Re: [PATCHv3 1/2] pciehp: Let user control LED status

2016-09-13 Thread Keith Busch 
On Tue, Sep 13, 2016 at 09:05:39AM -0600, Keith Busch wrote:
> +int pciehp_get_raw_attention_status(struct hotplug_slot *hotplug_slot,
> + u8 *value)
> +{
> + struct slot *slot = hotplug_slot->private;
> + struct pci_dev *pdev = ctrl_dev(slot->ctrl);
> + u16 slot_ctrl;
> +
> + pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, _ctrl);
> + *status = (slot_ctrl & (PCI_EXP_SLTCTL_AIC | PCI_EXP_SLTCTL_PIC)) >> 6;

Sorry, I generated this patch from a wrong branch. Won't compile, will
send the correct series. Apologies for the churn.

Re: [PATCHv3 1/2] pciehp: Let user control LED status

2016-09-13 Thread Keith Busch 
On Tue, Sep 13, 2016 at 09:05:39AM -0600, Keith Busch wrote:
> +int pciehp_get_raw_attention_status(struct hotplug_slot *hotplug_slot,
> + u8 *value)
> +{
> + struct slot *slot = hotplug_slot->private;
> + struct pci_dev *pdev = ctrl_dev(slot->ctrl);
> + u16 slot_ctrl;
> +
> + pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, _ctrl);
> + *status = (slot_ctrl & (PCI_EXP_SLTCTL_AIC | PCI_EXP_SLTCTL_PIC)) >> 6;

Sorry, I generated this patch from a wrong branch. Won't compile, will
send the correct series. Apologies for the churn.

Re: [PATCHv3 1/2] pciehp: Let user control LED status

2016-09-13 Thread kbuild test robot 
Hi Keith,

[auto build test ERROR on pci/next]
[also build test ERROR on v4.8-rc6 next-20160913]
[if your patch is applied to the wrong git tree, please drop us a note to help 
improve the system]
[Suggest to use git(>=2.9.0) format-patch --base= (or --base=auto for 
convenience) to record what (public, well-known) commit your patch series was 
built on]
[Check https://git-scm.com/docs/git-format-patch for more information]

url:
https://github.com/0day-ci/linux/commits/Keith-Busch/pciehp-Let-user-control-LED-status/20160913-231123
base:   https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git next
config: x86_64-randconfig-x010-201637 (attached as .config)
compiler: gcc-6 (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64 

All errors (new ones prefixed by >>):

   drivers/pci/hotplug/pciehp_hpc.c: In function 
'pciehp_get_raw_attention_status':
>> drivers/pci/hotplug/pciehp_hpc.c:366:3: error: 'status' undeclared (first 
>> use in this function)
 *status = (slot_ctrl & (PCI_EXP_SLTCTL_AIC | PCI_EXP_SLTCTL_PIC)) >> 6;
  ^~
   drivers/pci/hotplug/pciehp_hpc.c:366:3: note: each undeclared identifier is 
reported only once for each function it appears in
   drivers/pci/hotplug/pciehp_hpc.c: In function 
'pciehp_set_raw_attention_status':
>> drivers/pci/hotplug/pciehp_hpc.c:452:30: error: 'value' undeclared (first 
>> use in this function)
 pcie_write_cmd_nowait(ctrl, value << 6,
 ^

vim +/status +366 drivers/pci/hotplug/pciehp_hpc.c

   360  {
   361  struct slot *slot = hotplug_slot->private;
   362  struct pci_dev *pdev = ctrl_dev(slot->ctrl);
   363  u16 slot_ctrl;
   364  
   365  pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, _ctrl);
 > 366  *status = (slot_ctrl & (PCI_EXP_SLTCTL_AIC | 
 > PCI_EXP_SLTCTL_PIC)) >> 6;
   367  return 0;
   368  }
   369  
   370  void pciehp_get_attention_status(struct slot *slot, u8 *status)
   371  {
   372  struct controller *ctrl = slot->ctrl;
   373  struct pci_dev *pdev = ctrl_dev(ctrl);
   374  u16 slot_ctrl;
   375  
   376  pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, _ctrl);
   377  ctrl_dbg(ctrl, "%s: SLOTCTRL %x, value read %x\n", __func__,
   378   pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL, 
slot_ctrl);
   379  
   380  switch (slot_ctrl & PCI_EXP_SLTCTL_AIC) {
   381  case PCI_EXP_SLTCTL_ATTN_IND_ON:
   382  *status = 1;/* On */
   383  break;
   384  case PCI_EXP_SLTCTL_ATTN_IND_BLINK:
   385  *status = 2;/* Blink */
   386  break;
   387  case PCI_EXP_SLTCTL_ATTN_IND_OFF:
   388  *status = 0;/* Off */
   389  break;
   390  default:
   391  *status = 0xFF;
   392  break;
   393  }
   394  }
   395  
   396  void pciehp_get_power_status(struct slot *slot, u8 *status)
   397  {
   398  struct controller *ctrl = slot->ctrl;
   399  struct pci_dev *pdev = ctrl_dev(ctrl);
   400  u16 slot_ctrl;
   401  
   402  pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, _ctrl);
   403  ctrl_dbg(ctrl, "%s: SLOTCTRL %x value read %x\n", __func__,
   404   pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL, 
slot_ctrl);
   405  
   406  switch (slot_ctrl & PCI_EXP_SLTCTL_PCC) {
   407  case PCI_EXP_SLTCTL_PWR_ON:
   408  *status = 1;/* On */
   409  break;
   410  case PCI_EXP_SLTCTL_PWR_OFF:
   411  *status = 0;/* Off */
   412  break;
   413  default:
   414  *status = 0xFF;
   415  break;
   416  }
   417  }
   418  
   419  void pciehp_get_latch_status(struct slot *slot, u8 *status)
   420  {
   421  struct pci_dev *pdev = ctrl_dev(slot->ctrl);
   422  u16 slot_status;
   423  
   424  pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, _status);
   425  *status = !!(slot_status & PCI_EXP_SLTSTA_MRLSS);
   426  }
   427  
   428  void pciehp_get_adapter_status(struct slot *slot, u8 *status)
   429  {
   430  struct pci_dev *pdev = ctrl_dev(slot->ctrl);
   431  u16 slot_status;
   432  
   433  pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, _status);
   434  *status = !!(slot_status & PCI_EXP_SLTSTA_PDS);
   435  }
   436  
   437  int pciehp_query_power_fault(struct slot *slot)
   438  {
   439  struct pci_dev *pdev = ctrl_dev(slot->ctrl);
   440  u16 slot_status;
   441  
   442  pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, _status);
   443  return !!(slot_status & PCI_EXP_SLTSTA_PFD);
   444  }
   445  
   446  int

Re: [PATCHv3 1/2] pciehp: Let user control LED status

2016-09-13 Thread kbuild test robot 
Hi Keith,

[auto build test ERROR on pci/next]
[also build test ERROR on v4.8-rc6 next-20160913]
[if your patch is applied to the wrong git tree, please drop us a note to help 
improve the system]
[Suggest to use git(>=2.9.0) format-patch --base= (or --base=auto for 
convenience) to record what (public, well-known) commit your patch series was 
built on]
[Check https://git-scm.com/docs/git-format-patch for more information]

url:
https://github.com/0day-ci/linux/commits/Keith-Busch/pciehp-Let-user-control-LED-status/20160913-231123
base:   https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git next
config: x86_64-randconfig-x010-201637 (attached as .config)
compiler: gcc-6 (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64 

All errors (new ones prefixed by >>):

   drivers/pci/hotplug/pciehp_hpc.c: In function 
'pciehp_get_raw_attention_status':
>> drivers/pci/hotplug/pciehp_hpc.c:366:3: error: 'status' undeclared (first 
>> use in this function)
 *status = (slot_ctrl & (PCI_EXP_SLTCTL_AIC | PCI_EXP_SLTCTL_PIC)) >> 6;
  ^~
   drivers/pci/hotplug/pciehp_hpc.c:366:3: note: each undeclared identifier is 
reported only once for each function it appears in
   drivers/pci/hotplug/pciehp_hpc.c: In function 
'pciehp_set_raw_attention_status':
>> drivers/pci/hotplug/pciehp_hpc.c:452:30: error: 'value' undeclared (first 
>> use in this function)
 pcie_write_cmd_nowait(ctrl, value << 6,
 ^

vim +/status +366 drivers/pci/hotplug/pciehp_hpc.c

   360  {
   361  struct slot *slot = hotplug_slot->private;
   362  struct pci_dev *pdev = ctrl_dev(slot->ctrl);
   363  u16 slot_ctrl;
   364  
   365  pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, _ctrl);
 > 366  *status = (slot_ctrl & (PCI_EXP_SLTCTL_AIC | 
 > PCI_EXP_SLTCTL_PIC)) >> 6;
   367  return 0;
   368  }
   369  
   370  void pciehp_get_attention_status(struct slot *slot, u8 *status)
   371  {
   372  struct controller *ctrl = slot->ctrl;
   373  struct pci_dev *pdev = ctrl_dev(ctrl);
   374  u16 slot_ctrl;
   375  
   376  pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, _ctrl);
   377  ctrl_dbg(ctrl, "%s: SLOTCTRL %x, value read %x\n", __func__,
   378   pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL, 
slot_ctrl);
   379  
   380  switch (slot_ctrl & PCI_EXP_SLTCTL_AIC) {
   381  case PCI_EXP_SLTCTL_ATTN_IND_ON:
   382  *status = 1;/* On */
   383  break;
   384  case PCI_EXP_SLTCTL_ATTN_IND_BLINK:
   385  *status = 2;/* Blink */
   386  break;
   387  case PCI_EXP_SLTCTL_ATTN_IND_OFF:
   388  *status = 0;/* Off */
   389  break;
   390  default:
   391  *status = 0xFF;
   392  break;
   393  }
   394  }
   395  
   396  void pciehp_get_power_status(struct slot *slot, u8 *status)
   397  {
   398  struct controller *ctrl = slot->ctrl;
   399  struct pci_dev *pdev = ctrl_dev(ctrl);
   400  u16 slot_ctrl;
   401  
   402  pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, _ctrl);
   403  ctrl_dbg(ctrl, "%s: SLOTCTRL %x value read %x\n", __func__,
   404   pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL, 
slot_ctrl);
   405  
   406  switch (slot_ctrl & PCI_EXP_SLTCTL_PCC) {
   407  case PCI_EXP_SLTCTL_PWR_ON:
   408  *status = 1;/* On */
   409  break;
   410  case PCI_EXP_SLTCTL_PWR_OFF:
   411  *status = 0;/* Off */
   412  break;
   413  default:
   414  *status = 0xFF;
   415  break;
   416  }
   417  }
   418  
   419  void pciehp_get_latch_status(struct slot *slot, u8 *status)
   420  {
   421  struct pci_dev *pdev = ctrl_dev(slot->ctrl);
   422  u16 slot_status;
   423  
   424  pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, _status);
   425  *status = !!(slot_status & PCI_EXP_SLTSTA_MRLSS);
   426  }
   427  
   428  void pciehp_get_adapter_status(struct slot *slot, u8 *status)
   429  {
   430  struct pci_dev *pdev = ctrl_dev(slot->ctrl);
   431  u16 slot_status;
   432  
   433  pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, _status);
   434  *status = !!(slot_status & PCI_EXP_SLTSTA_PDS);
   435  }
   436  
   437  int pciehp_query_power_fault(struct slot *slot)
   438  {
   439  struct pci_dev *pdev = ctrl_dev(slot->ctrl);
   440  u16 slot_status;
   441  
   442  pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, _status);
   443  return !!(slot_status & PCI_EXP_SLTSTA_PFD);
   444  }
   445  
   446  int

[PATCHv3 1/2] pciehp: Let user control LED status

2016-09-13 Thread Keith Busch 
This patch adds a new flag to the pci_dev structure instructing pciehp
to not interpret PCIe slot LED indicators. The pciehp driver will instead
allow all LED control from the user by setting the slot control indicators
as the user requested through sysfs. This is preparing for domain devices
that repurpose these control bits for non-standard use.

Signed-off-by: Keith Busch 
---
v2 -> v3:

  Moved the slot op's attention status callback to pciehp_hpc.c

 drivers/pci/hotplug/pciehp.h  |  5 +
 drivers/pci/hotplug/pciehp_core.c |  3 +++
 drivers/pci/hotplug/pciehp_hpc.c  | 27 +++
 include/linux/pci.h   |  1 +
 4 files changed, 36 insertions(+)

diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index e764918..7f71ac1 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -152,6 +152,11 @@ bool pciehp_check_link_active(struct controller *ctrl);
 void pciehp_release_ctrl(struct controller *ctrl);
 int pciehp_reset_slot(struct slot *slot, int probe);
 
+int pciehp_set_raw_attention_status(struct hotplug_slot *hotplug_slot,
+   u8 status);
+int pciehp_get_raw_attention_status(struct hotplug_slot *hotplug_slot,
+   u8 *value);
+
 static inline const char *slot_name(struct slot *slot)
 {
return hotplug_slot_name(slot->hotplug_slot);
diff --git a/drivers/pci/hotplug/pciehp_core.c 
b/drivers/pci/hotplug/pciehp_core.c
index fb0f863..68b7aeb 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -113,6 +113,9 @@ static int init_slot(struct controller *ctrl)
if (ATTN_LED(ctrl)) {
ops->get_attention_status = get_attention_status;
ops->set_attention_status = set_attention_status;
+   } else if (ctrl->pcie->port->user_leds) {
+   ops->get_attention_status = pciehp_get_raw_attention_status;
+   ops->set_attention_status = pciehp_set_raw_attention_status;
}
 
/* register this slot with the hotplug pci core */
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 08e84d6..fccb63d 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -355,6 +355,18 @@ static int pciehp_link_enable(struct controller *ctrl)
return __pciehp_link_set(ctrl, true);
 }
 
+int pciehp_get_raw_attention_status(struct hotplug_slot *hotplug_slot,
+   u8 *value)
+{
+   struct slot *slot = hotplug_slot->private;
+   struct pci_dev *pdev = ctrl_dev(slot->ctrl);
+   u16 slot_ctrl;
+
+   pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, _ctrl);
+   *status = (slot_ctrl & (PCI_EXP_SLTCTL_AIC | PCI_EXP_SLTCTL_PIC)) >> 6;
+   return 0;
+}
+
 void pciehp_get_attention_status(struct slot *slot, u8 *status)
 {
struct controller *ctrl = slot->ctrl;
@@ -431,6 +443,17 @@ int pciehp_query_power_fault(struct slot *slot)
return !!(slot_status & PCI_EXP_SLTSTA_PFD);
 }
 
+int pciehp_set_raw_attention_status(struct hotplug_slot *hotplug_slot,
+   u8 status)
+{
+   struct slot *slot = hotplug_slot->private;
+   struct controller *ctrl = slot->ctrl;
+
+   pcie_write_cmd_nowait(ctrl, value << 6,
+ PCI_EXP_SLTCTL_AIC | PCI_EXP_SLTCTL_PIC);
+   return 0;
+}
+
 void pciehp_set_attention_status(struct slot *slot, u8 value)
 {
struct controller *ctrl = slot->ctrl;
@@ -804,6 +827,10 @@ struct controller *pcie_init(struct pcie_device *dev)
}
ctrl->pcie = dev;
pcie_capability_read_dword(pdev, PCI_EXP_SLTCAP, _cap);
+
+   if (pdev->user_leds)
+   slot_cap &= ~(PCI_EXP_SLTCAP_AIP | PCI_EXP_SLTCAP_PIP);
+
ctrl->slot_cap = slot_cap;
mutex_init(>ctrl_lock);
init_waitqueue_head(>queue);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 7256f33..f41bbca 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -308,6 +308,7 @@ struct pci_dev {
   powered on/off by the
   corresponding bridge */
unsigned intignore_hotplug:1;   /* Ignore hotplug events */
+   unsigned intuser_leds:1;/* User excluse LED SlotCtl */
unsigned intd3_delay;   /* D3->D0 transition time in ms */
unsigned intd3cold_delay;   /* D3cold->D0 transition time in ms */
 
-- 
2.7.2

[PATCHv3 1/2] pciehp: Let user control LED status

2016-09-13 Thread Keith Busch 
This patch adds a new flag to the pci_dev structure instructing pciehp
to not interpret PCIe slot LED indicators. The pciehp driver will instead
allow all LED control from the user by setting the slot control indicators
as the user requested through sysfs. This is preparing for domain devices
that repurpose these control bits for non-standard use.

Signed-off-by: Keith Busch 
---
v2 -> v3:

  Moved the slot op's attention status callback to pciehp_hpc.c

 drivers/pci/hotplug/pciehp.h  |  5 +
 drivers/pci/hotplug/pciehp_core.c |  3 +++
 drivers/pci/hotplug/pciehp_hpc.c  | 27 +++
 include/linux/pci.h   |  1 +
 4 files changed, 36 insertions(+)

diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index e764918..7f71ac1 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -152,6 +152,11 @@ bool pciehp_check_link_active(struct controller *ctrl);
 void pciehp_release_ctrl(struct controller *ctrl);
 int pciehp_reset_slot(struct slot *slot, int probe);
 
+int pciehp_set_raw_attention_status(struct hotplug_slot *hotplug_slot,
+   u8 status);
+int pciehp_get_raw_attention_status(struct hotplug_slot *hotplug_slot,
+   u8 *value);
+
 static inline const char *slot_name(struct slot *slot)
 {
return hotplug_slot_name(slot->hotplug_slot);
diff --git a/drivers/pci/hotplug/pciehp_core.c 
b/drivers/pci/hotplug/pciehp_core.c
index fb0f863..68b7aeb 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -113,6 +113,9 @@ static int init_slot(struct controller *ctrl)
if (ATTN_LED(ctrl)) {
ops->get_attention_status = get_attention_status;
ops->set_attention_status = set_attention_status;
+   } else if (ctrl->pcie->port->user_leds) {
+   ops->get_attention_status = pciehp_get_raw_attention_status;
+   ops->set_attention_status = pciehp_set_raw_attention_status;
}
 
/* register this slot with the hotplug pci core */
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 08e84d6..fccb63d 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -355,6 +355,18 @@ static int pciehp_link_enable(struct controller *ctrl)
return __pciehp_link_set(ctrl, true);
 }
 
+int pciehp_get_raw_attention_status(struct hotplug_slot *hotplug_slot,
+   u8 *value)
+{
+   struct slot *slot = hotplug_slot->private;
+   struct pci_dev *pdev = ctrl_dev(slot->ctrl);
+   u16 slot_ctrl;
+
+   pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, _ctrl);
+   *status = (slot_ctrl & (PCI_EXP_SLTCTL_AIC | PCI_EXP_SLTCTL_PIC)) >> 6;
+   return 0;
+}
+
 void pciehp_get_attention_status(struct slot *slot, u8 *status)
 {
struct controller *ctrl = slot->ctrl;
@@ -431,6 +443,17 @@ int pciehp_query_power_fault(struct slot *slot)
return !!(slot_status & PCI_EXP_SLTSTA_PFD);
 }
 
+int pciehp_set_raw_attention_status(struct hotplug_slot *hotplug_slot,
+   u8 status)
+{
+   struct slot *slot = hotplug_slot->private;
+   struct controller *ctrl = slot->ctrl;
+
+   pcie_write_cmd_nowait(ctrl, value << 6,
+ PCI_EXP_SLTCTL_AIC | PCI_EXP_SLTCTL_PIC);
+   return 0;
+}
+
 void pciehp_set_attention_status(struct slot *slot, u8 value)
 {
struct controller *ctrl = slot->ctrl;
@@ -804,6 +827,10 @@ struct controller *pcie_init(struct pcie_device *dev)
}
ctrl->pcie = dev;
pcie_capability_read_dword(pdev, PCI_EXP_SLTCAP, _cap);
+
+   if (pdev->user_leds)
+   slot_cap &= ~(PCI_EXP_SLTCAP_AIP | PCI_EXP_SLTCAP_PIP);
+
ctrl->slot_cap = slot_cap;
mutex_init(>ctrl_lock);
init_waitqueue_head(>queue);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 7256f33..f41bbca 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -308,6 +308,7 @@ struct pci_dev {
   powered on/off by the
   corresponding bridge */
unsigned intignore_hotplug:1;   /* Ignore hotplug events */
+   unsigned intuser_leds:1;/* User excluse LED SlotCtl */
unsigned intd3_delay;   /* D3->D0 transition time in ms */
unsigned intd3cold_delay;   /* D3cold->D0 transition time in ms */
 
-- 
2.7.2