Skip to content

R
raspberrypi-kernel

openeuler / raspberrypi-kernel

通知 13
Star 1
Fork 0
R
raspberrypi-kernel
提交 1a84b99c 编写于 作者: B Bjorn Helgaas
浏览文件
操作

PCI: pciehp: Remove error checks when accessing PCIe Capability 

There's not much point in checking the return value from every config space
access because the only likely errors are design-time things like unaligned
accesses or invalid register numbers.  The checking clutters the code
significantly, so this patch removes it.

No functional change.

Reference: http://lkml.kernel.org/r/CA+55aFzP4xEbcNmZ+MS0SQ3LrULzSq+dBiT_X9U-bPpR-Ukgrw@mail.gmail.comSigned-off-by: NBjorn Helgaas <bhelgaas@google.com>
上级 cd84d340
隐藏空白更改
内联 并排
Showing with 41 addition and 136 deletion
drivers/pci/hotplug/pciehp_hpc.c
浏览文件 @ 1a84b99c
...@@ -112,10 +112,10 @@ static int pcie_poll_cmd(struct controller *ctrl) ...@@ -112,10 +112,10 @@ static int pcie_poll_cmd(struct controller *ctrl)
{ {
struct pci_dev *pdev = ctrl_dev(ctrl); struct pci_dev *pdev = ctrl_dev(ctrl);
u16 slot_status; u16 slot_status;
int err, timeout = 1000; int timeout = 1000;
err = pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &slot_status); pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &slot_status);
if (!err && (slot_status & PCI_EXP_SLTSTA_CC)) { if (slot_status & PCI_EXP_SLTSTA_CC) {
pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, pcie_capability_write_word(pdev, PCI_EXP_SLTSTA,
PCI_EXP_SLTSTA_CC); PCI_EXP_SLTSTA_CC);
return 1; return 1;
...@@ -123,9 +123,8 @@ static int pcie_poll_cmd(struct controller *ctrl) ...@@ -123,9 +123,8 @@ static int pcie_poll_cmd(struct controller *ctrl)
while (timeout > 0) { while (timeout > 0) {
msleep(10); msleep(10);
timeout -= 10; timeout -= 10;
err = pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &slot_status);
&slot_status); if (slot_status & PCI_EXP_SLTSTA_CC) {
if (!err && (slot_status & PCI_EXP_SLTSTA_CC)) {
pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, pcie_capability_write_word(pdev, PCI_EXP_SLTSTA,
PCI_EXP_SLTSTA_CC); PCI_EXP_SLTSTA_CC);
return 1; return 1;
...@@ -157,19 +156,12 @@ static void pcie_wait_cmd(struct controller *ctrl, int poll) ...@@ -157,19 +156,12 @@ static void pcie_wait_cmd(struct controller *ctrl, int poll)
static int pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask) static int pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask)
{ {
struct pci_dev *pdev = ctrl_dev(ctrl); struct pci_dev *pdev = ctrl_dev(ctrl);
int retval = 0;
u16 slot_status; u16 slot_status;
u16 slot_ctrl; u16 slot_ctrl;
mutex_lock(&ctrl->ctrl_lock); mutex_lock(&ctrl->ctrl_lock);
retval = pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &slot_status); pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &slot_status);
if (retval) {
ctrl_err(ctrl, "%s: Cannot read SLOTSTATUS register\n",
__func__);
goto out;
}
if (slot_status & PCI_EXP_SLTSTA_CC) { if (slot_status & PCI_EXP_SLTSTA_CC) {
if (!ctrl->no_cmd_complete) { if (!ctrl->no_cmd_complete) {
/* /*
...@@ -193,24 +185,17 @@ static int pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask) ...@@ -193,24 +185,17 @@ static int pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask)
} }
} }
retval = pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, &slot_ctrl); pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, &slot_ctrl);
if (retval) {
ctrl_err(ctrl, "%s: Cannot read SLOTCTRL register\n", __func__);
goto out;
}
slot_ctrl &= ~mask; slot_ctrl &= ~mask;
slot_ctrl |= (cmd & mask); slot_ctrl |= (cmd & mask);
ctrl->cmd_busy = 1; ctrl->cmd_busy = 1;
smp_mb(); smp_mb();
retval = pcie_capability_write_word(pdev, PCI_EXP_SLTCTL, slot_ctrl); pcie_capability_write_word(pdev, PCI_EXP_SLTCTL, slot_ctrl);
if (retval)
ctrl_err(ctrl, "Cannot write to SLOTCTRL register\n");
/* /*
* Wait for command completion. * Wait for command completion.
*/ */
if (!retval && !ctrl->no_cmd_complete) { if (!ctrl->no_cmd_complete) {
int poll = 0; int poll = 0;
/* /*
* if hotplug interrupt is not enabled or command * if hotplug interrupt is not enabled or command
...@@ -222,20 +207,17 @@ static int pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask) ...@@ -222,20 +207,17 @@ static int pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask)
poll = 1; poll = 1;
pcie_wait_cmd(ctrl, poll); pcie_wait_cmd(ctrl, poll);
} }
out:
mutex_unlock(&ctrl->ctrl_lock); mutex_unlock(&ctrl->ctrl_lock);
return retval; return 0;
} }
static bool check_link_active(struct controller *ctrl) static bool check_link_active(struct controller *ctrl)
{ {
struct pci_dev *pdev = ctrl_dev(ctrl); struct pci_dev *pdev = ctrl_dev(ctrl);
bool ret = false;
u16 lnk_status; u16 lnk_status;
bool ret;
if (pcie_capability_read_word(pdev, PCI_EXP_LNKSTA, &lnk_status)) pcie_capability_read_word(pdev, PCI_EXP_LNKSTA, &lnk_status);
return ret;
ret = !!(lnk_status & PCI_EXP_LNKSTA_DLLLA); ret = !!(lnk_status & PCI_EXP_LNKSTA_DLLLA);
if (ret) if (ret)
...@@ -299,9 +281,8 @@ static bool pci_bus_check_dev(struct pci_bus *bus, int devfn) ...@@ -299,9 +281,8 @@ static bool pci_bus_check_dev(struct pci_bus *bus, int devfn)
int pciehp_check_link_status(struct controller *ctrl) int pciehp_check_link_status(struct controller *ctrl)
{ {
struct pci_dev *pdev = ctrl_dev(ctrl); struct pci_dev *pdev = ctrl_dev(ctrl);
bool found;
u16 lnk_status; u16 lnk_status;
int retval = 0;
bool found = false;
/* /*
* Data Link Layer Link Active Reporting must be capable for * Data Link Layer Link Active Reporting must be capable for
...@@ -318,53 +299,37 @@ int pciehp_check_link_status(struct controller *ctrl) ...@@ -318,53 +299,37 @@ int pciehp_check_link_status(struct controller *ctrl)
found = pci_bus_check_dev(ctrl->pcie->port->subordinate, found = pci_bus_check_dev(ctrl->pcie->port->subordinate,
PCI_DEVFN(0, 0)); PCI_DEVFN(0, 0));
retval = pcie_capability_read_word(pdev, PCI_EXP_LNKSTA, &lnk_status); pcie_capability_read_word(pdev, PCI_EXP_LNKSTA, &lnk_status);
if (retval) {
ctrl_err(ctrl, "Cannot read LNKSTATUS register\n");
return retval;
}
ctrl_dbg(ctrl, "%s: lnk_status = %x\n", __func__, lnk_status); ctrl_dbg(ctrl, "%s: lnk_status = %x\n", __func__, lnk_status);
if ((lnk_status & PCI_EXP_LNKSTA_LT) || if ((lnk_status & PCI_EXP_LNKSTA_LT) ||
!(lnk_status & PCI_EXP_LNKSTA_NLW)) { !(lnk_status & PCI_EXP_LNKSTA_NLW)) {
ctrl_err(ctrl, "Link Training Error occurs \n"); ctrl_err(ctrl, "Link Training Error occurs \n");
retval = -1; return -1;
return retval;
} }
pcie_update_link_speed(ctrl->pcie->port->subordinate, lnk_status); pcie_update_link_speed(ctrl->pcie->port->subordinate, lnk_status);
if (!found && !retval) if (!found)
retval = -1; return -1;
return retval; return 0;
} }
static int __pciehp_link_set(struct controller *ctrl, bool enable) static int __pciehp_link_set(struct controller *ctrl, bool enable)
{ {
struct pci_dev *pdev = ctrl_dev(ctrl); struct pci_dev *pdev = ctrl_dev(ctrl);
u16 lnk_ctrl; u16 lnk_ctrl;
int retval = 0;
retval = pcie_capability_read_word(pdev, PCI_EXP_LNKCTL, &lnk_ctrl); pcie_capability_read_word(pdev, PCI_EXP_LNKCTL, &lnk_ctrl);
if (retval) {
ctrl_err(ctrl, "Cannot read LNKCTRL register\n");
return retval;
}
if (enable) if (enable)
lnk_ctrl &= ~PCI_EXP_LNKCTL_LD; lnk_ctrl &= ~PCI_EXP_LNKCTL_LD;
else else
lnk_ctrl |= PCI_EXP_LNKCTL_LD; lnk_ctrl |= PCI_EXP_LNKCTL_LD;
retval = pcie_capability_write_word(pdev, PCI_EXP_LNKCTL, lnk_ctrl); pcie_capability_write_word(pdev, PCI_EXP_LNKCTL, lnk_ctrl);
if (retval) {
ctrl_err(ctrl, "Cannot write LNKCTRL register\n");
return retval;
}
ctrl_dbg(ctrl, "%s: lnk_ctrl = %x\n", __func__, lnk_ctrl); ctrl_dbg(ctrl, "%s: lnk_ctrl = %x\n", __func__, lnk_ctrl);
return 0;
return retval;
} }
static int pciehp_link_enable(struct controller *ctrl) static int pciehp_link_enable(struct controller *ctrl)
...@@ -383,14 +348,8 @@ int pciehp_get_attention_status(struct slot *slot, u8 *status) ...@@ -383,14 +348,8 @@ int pciehp_get_attention_status(struct slot *slot, u8 *status)
struct pci_dev *pdev = ctrl_dev(ctrl); struct pci_dev *pdev = ctrl_dev(ctrl);
u16 slot_ctrl; u16 slot_ctrl;
u8 atten_led_state; u8 atten_led_state;
int retval = 0;
retval = pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, &slot_ctrl);
if (retval) {
ctrl_err(ctrl, "%s: Cannot read SLOTCTRL register\n", __func__);
return retval;
}
pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, &slot_ctrl);
ctrl_dbg(ctrl, "%s: SLOTCTRL %x, value read %x\n", __func__, ctrl_dbg(ctrl, "%s: SLOTCTRL %x, value read %x\n", __func__,
pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL, slot_ctrl); pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL, slot_ctrl);
...@@ -423,13 +382,8 @@ int pciehp_get_power_status(struct slot *slot, u8 *status) ...@@ -423,13 +382,8 @@ int pciehp_get_power_status(struct slot *slot, u8 *status)
struct pci_dev *pdev = ctrl_dev(ctrl); struct pci_dev *pdev = ctrl_dev(ctrl);
u16 slot_ctrl; u16 slot_ctrl;
u8 pwr_state; u8 pwr_state;
int retval = 0;
retval = pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, &slot_ctrl); pcie_capability_read_word(pdev, PCI_EXP_SLTCTL, &slot_ctrl);
if (retval) {
ctrl_err(ctrl, "%s: Cannot read SLOTCTRL register\n", __func__);
return retval;
}
ctrl_dbg(ctrl, "%s: SLOTCTRL %x value read %x\n", __func__, ctrl_dbg(ctrl, "%s: SLOTCTRL %x value read %x\n", __func__,
pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL, slot_ctrl); pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL, slot_ctrl);
...@@ -447,55 +401,35 @@ int pciehp_get_power_status(struct slot *slot, u8 *status) ...@@ -447,55 +401,35 @@ int pciehp_get_power_status(struct slot *slot, u8 *status)
break; break;
} }
return retval; return 0;
} }
int pciehp_get_latch_status(struct slot *slot, u8 *status) int pciehp_get_latch_status(struct slot *slot, u8 *status)
{ {
struct controller *ctrl = slot->ctrl; struct pci_dev *pdev = ctrl_dev(slot->ctrl);
struct pci_dev *pdev = ctrl_dev(ctrl);
u16 slot_status; u16 slot_status;
int retval;
retval = pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &slot_status); pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &slot_status);
if (retval) {
ctrl_err(ctrl, "%s: Cannot read SLOTSTATUS register\n",
__func__);
return retval;
}
*status = !!(slot_status & PCI_EXP_SLTSTA_MRLSS); *status = !!(slot_status & PCI_EXP_SLTSTA_MRLSS);
return 0; return 0;
} }
int pciehp_get_adapter_status(struct slot *slot, u8 *status) int pciehp_get_adapter_status(struct slot *slot, u8 *status)
{ {
struct controller *ctrl = slot->ctrl; struct pci_dev *pdev = ctrl_dev(slot->ctrl);
struct pci_dev *pdev = ctrl_dev(ctrl);
u16 slot_status; u16 slot_status;
int retval;
retval = pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &slot_status); pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &slot_status);
if (retval) {
ctrl_err(ctrl, "%s: Cannot read SLOTSTATUS register\n",
__func__);
return retval;
}
*status = !!(slot_status & PCI_EXP_SLTSTA_PDS); *status = !!(slot_status & PCI_EXP_SLTSTA_PDS);
return 0; return 0;
} }
int pciehp_query_power_fault(struct slot *slot) int pciehp_query_power_fault(struct slot *slot)
{ {
struct controller *ctrl = slot->ctrl; struct pci_dev *pdev = ctrl_dev(slot->ctrl);
struct pci_dev *pdev = ctrl_dev(ctrl);
u16 slot_status; u16 slot_status;
int retval;
retval = pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &slot_status); pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &slot_status);
if (retval) {
ctrl_err(ctrl, "Cannot check for power fault\n");
return retval;
}
return !!(slot_status & PCI_EXP_SLTSTA_PFD); return !!(slot_status & PCI_EXP_SLTSTA_PFD);
} }
...@@ -570,25 +504,13 @@ int pciehp_power_on_slot(struct slot * slot) ...@@ -570,25 +504,13 @@ int pciehp_power_on_slot(struct slot * slot)
u16 slot_cmd; u16 slot_cmd;
u16 cmd_mask; u16 cmd_mask;
u16 slot_status; u16 slot_status;
int retval = 0; int retval;
/* Clear sticky power-fault bit from previous power failures */ /* Clear sticky power-fault bit from previous power failures */
retval = pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &slot_status); pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &slot_status);
if (retval) {
ctrl_err(ctrl, "%s: Cannot read SLOTSTATUS register\n",
__func__);
return retval;
}
slot_status &= PCI_EXP_SLTSTA_PFD; slot_status &= PCI_EXP_SLTSTA_PFD;
if (slot_status) { if (slot_status)
retval = pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, slot_status); pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, slot_status);
if (retval) {
ctrl_err(ctrl,
"%s: Cannot write to SLOTSTATUS register\n",
__func__);
return retval;
}
}
ctrl->power_fault_detected = 0; ctrl->power_fault_detected = 0;
slot_cmd = POWER_ON; slot_cmd = POWER_ON;
...@@ -649,12 +571,7 @@ static irqreturn_t pcie_isr(int irq, void *dev_id) ...@@ -649,12 +571,7 @@ static irqreturn_t pcie_isr(int irq, void *dev_id)
*/ */
intr_loc = 0; intr_loc = 0;
do { do {
if (pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &detected);
&detected)) {
ctrl_err(ctrl, "%s: Cannot read SLOTSTATUS\n",
__func__);
return IRQ_NONE;
}
detected &= (PCI_EXP_SLTSTA_ABP | PCI_EXP_SLTSTA_PFD | detected &= (PCI_EXP_SLTSTA_ABP | PCI_EXP_SLTSTA_PFD |
PCI_EXP_SLTSTA_MRLSC | PCI_EXP_SLTSTA_PDC | PCI_EXP_SLTSTA_MRLSC | PCI_EXP_SLTSTA_PDC |
...@@ -663,13 +580,9 @@ static irqreturn_t pcie_isr(int irq, void *dev_id) ...@@ -663,13 +580,9 @@ static irqreturn_t pcie_isr(int irq, void *dev_id)
intr_loc |= detected; intr_loc |= detected;
if (!intr_loc) if (!intr_loc)
return IRQ_NONE; return IRQ_NONE;
if (detected && if (detected)
pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, pcie_capability_write_word(pdev, PCI_EXP_SLTSTA,
intr_loc)) { intr_loc);
ctrl_err(ctrl, "%s: Cannot write to SLOTSTATUS\n",
__func__);
return IRQ_NONE;
}
} while (detected); } while (detected);
ctrl_dbg(ctrl, "%s: intr_loc %x\n", __func__, intr_loc); ctrl_dbg(ctrl, "%s: intr_loc %x\n", __func__, intr_loc);
...@@ -894,11 +807,7 @@ struct controller *pcie_init(struct pcie_device *dev) ...@@ -894,11 +807,7 @@ struct controller *pcie_init(struct pcie_device *dev)
goto abort; goto abort;
} }
ctrl->pcie = dev; ctrl->pcie = dev;
if (pcie_capability_read_dword(pdev, PCI_EXP_SLTCAP, &slot_cap)) { pcie_capability_read_dword(pdev, PCI_EXP_SLTCAP, &slot_cap);
ctrl_err(ctrl, "Cannot read SLOTCAP register\n");
goto abort_ctrl;
}
ctrl->slot_cap = slot_cap; ctrl->slot_cap = slot_cap;
mutex_init(&ctrl->ctrl_lock); mutex_init(&ctrl->ctrl_lock);
init_waitqueue_head(&ctrl->queue); init_waitqueue_head(&ctrl->queue);
...@@ -914,18 +823,14 @@ struct controller *pcie_init(struct pcie_device *dev) ...@@ -914,18 +823,14 @@ struct controller *pcie_init(struct pcie_device *dev)
ctrl->no_cmd_complete = 1; ctrl->no_cmd_complete = 1;
/* Check if Data Link Layer Link Active Reporting is implemented */ /* Check if Data Link Layer Link Active Reporting is implemented */
if (pcie_capability_read_dword(pdev, PCI_EXP_LNKCAP, &link_cap)) { pcie_capability_read_dword(pdev, PCI_EXP_LNKCAP, &link_cap);
ctrl_err(ctrl, "%s: Cannot read LNKCAP register\n", __func__);
goto abort_ctrl;
}
if (link_cap & PCI_EXP_LNKCAP_DLLLARC) { if (link_cap & PCI_EXP_LNKCAP_DLLLARC) {
ctrl_dbg(ctrl, "Link Active Reporting supported\n"); ctrl_dbg(ctrl, "Link Active Reporting supported\n");
ctrl->link_active_reporting = 1; ctrl->link_active_reporting = 1;
} }
/* Clear all remaining event bits in Slot Status register */ /* Clear all remaining event bits in Slot Status register */
if (pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, 0x1f)) pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, 0x1f);
goto abort_ctrl;
/* Disable software notification */ /* Disable software notification */
pcie_disable_notification(ctrl); pcie_disable_notification(ctrl);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或