Commit 9f37ab04 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Bjorn Helgaas

PCI/switchtec: Add check of event support

Not all events are supported by every gen/variant of the Switchtec
firmware. To solve this, since Gen4, a new bit in each event header
is introduced to indicate if an event is supported by the firmware.

Link: https://lore.kernel.org/r/20211014141859.11444-6-kelvin.cao@microchip.comSigned-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Signed-off-by: default avatarKelvin Cao <kelvin.cao@microchip.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 67116444
...@@ -1024,6 +1024,9 @@ static int event_ctl(struct switchtec_dev *stdev, ...@@ -1024,6 +1024,9 @@ static int event_ctl(struct switchtec_dev *stdev,
return PTR_ERR(reg); return PTR_ERR(reg);
hdr = ioread32(reg); hdr = ioread32(reg);
if (hdr & SWITCHTEC_EVENT_NOT_SUPP)
return -EOPNOTSUPP;
for (i = 0; i < ARRAY_SIZE(ctl->data); i++) for (i = 0; i < ARRAY_SIZE(ctl->data); i++)
ctl->data[i] = ioread32(&reg[i + 1]); ctl->data[i] = ioread32(&reg[i + 1]);
...@@ -1096,7 +1099,7 @@ static int ioctl_event_ctl(struct switchtec_dev *stdev, ...@@ -1096,7 +1099,7 @@ static int ioctl_event_ctl(struct switchtec_dev *stdev,
for (ctl.index = 0; ctl.index < nr_idxs; ctl.index++) { for (ctl.index = 0; ctl.index < nr_idxs; ctl.index++) {
ctl.flags = event_flags; ctl.flags = event_flags;
ret = event_ctl(stdev, &ctl); ret = event_ctl(stdev, &ctl);
if (ret < 0) if (ret < 0 && ret != -EOPNOTSUPP)
return ret; return ret;
} }
} else { } else {
...@@ -1403,6 +1406,9 @@ static int mask_event(struct switchtec_dev *stdev, int eid, int idx) ...@@ -1403,6 +1406,9 @@ static int mask_event(struct switchtec_dev *stdev, int eid, int idx)
hdr_reg = event_regs[eid].map_reg(stdev, off, idx); hdr_reg = event_regs[eid].map_reg(stdev, off, idx);
hdr = ioread32(hdr_reg); hdr = ioread32(hdr_reg);
if (hdr & SWITCHTEC_EVENT_NOT_SUPP)
return 0;
if (!(hdr & SWITCHTEC_EVENT_OCCURRED && hdr & SWITCHTEC_EVENT_EN_IRQ)) if (!(hdr & SWITCHTEC_EVENT_OCCURRED && hdr & SWITCHTEC_EVENT_EN_IRQ))
return 0; return 0;
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#define SWITCHTEC_EVENT_EN_CLI BIT(2) #define SWITCHTEC_EVENT_EN_CLI BIT(2)
#define SWITCHTEC_EVENT_EN_IRQ BIT(3) #define SWITCHTEC_EVENT_EN_IRQ BIT(3)
#define SWITCHTEC_EVENT_FATAL BIT(4) #define SWITCHTEC_EVENT_FATAL BIT(4)
#define SWITCHTEC_EVENT_NOT_SUPP BIT(31)
#define SWITCHTEC_DMA_MRPC_EN BIT(0) #define SWITCHTEC_DMA_MRPC_EN BIT(0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment