| Message ID | 20221116135504.258687-4-daire.mcnamara@microchip.com |
|---|---|
| State | New |
| Headers | show |
| Series | PCI: microchip: Partition address translations | expand |
Hey Daire, On Wed, Nov 16, 2022 at 01:54:58PM +0000, daire.mcnamara@microchip.com wrote: > From: Daire McNamara <daire.mcnamara@microchip.com> > > Minor re-organisation so that event handlers can access both a pointer > to the bridge area of the PCIe rootport and the ctrl area of the PCIe > rootport. Perhaps explaining why we would want to access both, when we've not needed to so far, would be helpful so that this commit message will make sense in isolation would be nice. The mechanics of the change seem good to me though: Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Thanks, Conor. > > Signed-off-by: Daire McNamara <daire.mcnamara@microchip.com> > Signed-off-by: Conor Dooley <conor.dooley@microchip.com> > --- > drivers/pci/controller/pcie-microchip-host.c | 31 ++++++++++---------- > 1 file changed, 16 insertions(+), 15 deletions(-) > > diff --git a/drivers/pci/controller/pcie-microchip-host.c b/drivers/pci/controller/pcie-microchip-host.c > index 30153fd1a2b3..a81e6d25e347 100644 > --- a/drivers/pci/controller/pcie-microchip-host.c > +++ b/drivers/pci/controller/pcie-microchip-host.c > @@ -654,9 +654,10 @@ static inline u32 reg_to_event(u32 reg, struct event_map field) > return (reg & field.reg_mask) ? BIT(field.event_bit) : 0; > } > > -static u32 pcie_events(void __iomem *addr) > +static u32 pcie_events(struct mc_pcie *port) > { > - u32 reg = readl_relaxed(addr); > + void __iomem *ctrl_base_addr = port->axi_base_addr + MC_PCIE_CTRL_ADDR; > + u32 reg = readl_relaxed(ctrl_base_addr + PCIE_EVENT_INT); > u32 val = 0; > int i; > > @@ -666,9 +667,10 @@ static u32 pcie_events(void __iomem *addr) > return val; > } > > -static u32 sec_errors(void __iomem *addr) > +static u32 sec_errors(struct mc_pcie *port) > { > - u32 reg = readl_relaxed(addr); > + void __iomem *ctrl_base_addr = port->axi_base_addr + MC_PCIE_CTRL_ADDR; > + u32 reg = readl_relaxed(ctrl_base_addr + SEC_ERROR_INT); > u32 val = 0; > int i; > > @@ -678,9 +680,10 @@ static u32 sec_errors(void __iomem *addr) > return val; > } > > -static u32 ded_errors(void __iomem *addr) > +static u32 ded_errors(struct mc_pcie *port) > { > - u32 reg = readl_relaxed(addr); > + void __iomem *ctrl_base_addr = port->axi_base_addr + MC_PCIE_CTRL_ADDR; > + u32 reg = readl_relaxed(ctrl_base_addr + DED_ERROR_INT); > u32 val = 0; > int i; > > @@ -690,9 +693,10 @@ static u32 ded_errors(void __iomem *addr) > return val; > } > > -static u32 local_events(void __iomem *addr) > +static u32 local_events(struct mc_pcie *port) > { > - u32 reg = readl_relaxed(addr); > + void __iomem *bridge_base_addr = port->axi_base_addr + MC_PCIE_BRIDGE_ADDR; > + u32 reg = readl_relaxed(bridge_base_addr + ISTATUS_LOCAL); > u32 val = 0; > int i; > > @@ -704,15 +708,12 @@ static u32 local_events(void __iomem *addr) > > static u32 get_events(struct mc_pcie *port) > { > - void __iomem *bridge_base_addr = > - port->axi_base_addr + MC_PCIE_BRIDGE_ADDR; > - void __iomem *ctrl_base_addr = port->axi_base_addr + MC_PCIE_CTRL_ADDR; > u32 events = 0; > > - events |= pcie_events(ctrl_base_addr + PCIE_EVENT_INT); > - events |= sec_errors(ctrl_base_addr + SEC_ERROR_INT); > - events |= ded_errors(ctrl_base_addr + DED_ERROR_INT); > - events |= local_events(bridge_base_addr + ISTATUS_LOCAL); > + events |= pcie_events(port); > + events |= sec_errors(port); > + events |= ded_errors(port); > + events |= local_events(port); > > return events; > } > -- > 2.25.1 > > > _______________________________________________ > linux-riscv mailing list > linux-riscv@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-riscv
diff --git a/drivers/pci/controller/pcie-microchip-host.c b/drivers/pci/controller/pcie-microchip-host.c index 30153fd1a2b3..a81e6d25e347 100644 --- a/drivers/pci/controller/pcie-microchip-host.c +++ b/drivers/pci/controller/pcie-microchip-host.c @@ -654,9 +654,10 @@ static inline u32 reg_to_event(u32 reg, struct event_map field) return (reg & field.reg_mask) ? BIT(field.event_bit) : 0; } -static u32 pcie_events(void __iomem *addr) +static u32 pcie_events(struct mc_pcie *port) { - u32 reg = readl_relaxed(addr); + void __iomem *ctrl_base_addr = port->axi_base_addr + MC_PCIE_CTRL_ADDR; + u32 reg = readl_relaxed(ctrl_base_addr + PCIE_EVENT_INT); u32 val = 0; int i; @@ -666,9 +667,10 @@ static u32 pcie_events(void __iomem *addr) return val; } -static u32 sec_errors(void __iomem *addr) +static u32 sec_errors(struct mc_pcie *port) { - u32 reg = readl_relaxed(addr); + void __iomem *ctrl_base_addr = port->axi_base_addr + MC_PCIE_CTRL_ADDR; + u32 reg = readl_relaxed(ctrl_base_addr + SEC_ERROR_INT); u32 val = 0; int i; @@ -678,9 +680,10 @@ static u32 sec_errors(void __iomem *addr) return val; } -static u32 ded_errors(void __iomem *addr) +static u32 ded_errors(struct mc_pcie *port) { - u32 reg = readl_relaxed(addr); + void __iomem *ctrl_base_addr = port->axi_base_addr + MC_PCIE_CTRL_ADDR; + u32 reg = readl_relaxed(ctrl_base_addr + DED_ERROR_INT); u32 val = 0; int i; @@ -690,9 +693,10 @@ static u32 ded_errors(void __iomem *addr) return val; } -static u32 local_events(void __iomem *addr) +static u32 local_events(struct mc_pcie *port) { - u32 reg = readl_relaxed(addr); + void __iomem *bridge_base_addr = port->axi_base_addr + MC_PCIE_BRIDGE_ADDR; + u32 reg = readl_relaxed(bridge_base_addr + ISTATUS_LOCAL); u32 val = 0; int i; @@ -704,15 +708,12 @@ static u32 local_events(void __iomem *addr) static u32 get_events(struct mc_pcie *port) { - void __iomem *bridge_base_addr = - port->axi_base_addr + MC_PCIE_BRIDGE_ADDR; - void __iomem *ctrl_base_addr = port->axi_base_addr + MC_PCIE_CTRL_ADDR; u32 events = 0; - events |= pcie_events(ctrl_base_addr + PCIE_EVENT_INT); - events |= sec_errors(ctrl_base_addr + SEC_ERROR_INT); - events |= ded_errors(ctrl_base_addr + DED_ERROR_INT); - events |= local_events(bridge_base_addr + ISTATUS_LOCAL); + events |= pcie_events(port); + events |= sec_errors(port); + events |= ded_errors(port); + events |= local_events(port); return events; }