KSZ8463 has one register containing all the PTP-related interrupts from
all ports. So it will use one IRQ domain for all of them, leading to 4
interrupt bits to be dispatched in two ports. Current implementation
doesn't allow to do so because the IRQ bit offset is also used as index
to store the struct ptpmsg_irq in the table held by the port.
Add a new input to the setup() function to independently provide the
interrupt bit offset and the ptpmsg_irq index.
Signed-off-by: Bastien Curutchet (Schneider Electric) <bastien.curutchet@bootlin.com>
---
drivers/net/dsa/microchip/ksz_ptp.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/net/dsa/microchip/ksz_ptp.c b/drivers/net/dsa/microchip/ksz_ptp.c
index 3b0dddf918595e9318c9e9779035d5152dcd9dde..ae46ba41c588c076de2c3b70c7c6702ad85263d5 100644
--- a/drivers/net/dsa/microchip/ksz_ptp.c
+++ b/drivers/net/dsa/microchip/ksz_ptp.c
@@ -1099,7 +1099,8 @@ static void ksz_ptp_msg_irq_free(struct ksz_port *port, u8 n)
irq_dispose_mapping(ptpmsg_irq->num);
}
-static int ksz_ptp_msg_irq_setup(struct irq_domain *domain, struct ksz_port *port, u8 n)
+static int ksz_ptp_msg_irq_setup(struct irq_domain *domain, struct ksz_port *port,
+ u8 index, int irq)
{
u16 ts_reg[] = {REG_PTP_PORT_PDRESP_TS, REG_PTP_PORT_XDELAY_TS,
REG_PTP_PORT_SYNC_TS};
@@ -1108,15 +1109,15 @@ static int ksz_ptp_msg_irq_setup(struct irq_domain *domain, struct ksz_port *por
const struct ksz_dev_ops *ops = port->ksz_dev->dev_ops;
struct ksz_ptp_irq *ptpmsg_irq;
- ptpmsg_irq = &port->ptpmsg_irq[n];
- ptpmsg_irq->num = irq_create_mapping(domain, n);
+ ptpmsg_irq = &port->ptpmsg_irq[index];
+ ptpmsg_irq->num = irq_create_mapping(domain, irq);
if (!ptpmsg_irq->num)
return -EINVAL;
ptpmsg_irq->port = port;
- ptpmsg_irq->ts_reg = ops->get_port_addr(port->num, ts_reg[n]);
+ ptpmsg_irq->ts_reg = ops->get_port_addr(port->num, ts_reg[index]);
- strscpy(ptpmsg_irq->name, name[n]);
+ strscpy(ptpmsg_irq->name, name[index]);
return request_threaded_irq(ptpmsg_irq->num, NULL,
ksz_ptp_msg_thread_fn, IRQF_ONESHOT,
@@ -1161,7 +1162,7 @@ int ksz_ptp_irq_setup(struct dsa_switch *ds, u8 p)
goto out;
for (irq = 0; irq < ptpirq->nirqs; irq++) {
- ret = ksz_ptp_msg_irq_setup(ptpirq->domain, port, irq);
+ ret = ksz_ptp_msg_irq_setup(ptpirq->domain, port, irq, irq);
if (ret)
goto out_ptp_msg;
}
--
2.52.0