On Mon, Aug 30, 2021 at 6:37 AM Marc Zyngier <maz@xxxxxxxxxx> wrote:
>
> Hi Mark,
>
> On Fri, 27 Aug 2021 18:15:29 +0100,
> Mark Kettenis <mark.kettenis@xxxxxxxxx> wrote:
> >
> > From: Mark Kettenis <kettenis@xxxxxxxxxxx>
> >
> > Add node corresponding to the apcie,t8103 node in the
> > Apple device tree for the Mac mini (M1, 2020).
> >
> > Clock references and DART (IOMMU) references are left out at the
> > moment and will be added once the appropriate bindings have been
> > settled upon.
> >
> > Signed-off-by: Mark Kettenis <kettenis@xxxxxxxxxxx>
> > ---
> > arch/arm64/boot/dts/apple/t8103.dtsi | 63 ++++++++++++++++++++++++++++
> > 1 file changed, 63 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi
> > index 503a76fc30e6..6e4677bdef44 100644
> > --- a/arch/arm64/boot/dts/apple/t8103.dtsi
> > +++ b/arch/arm64/boot/dts/apple/t8103.dtsi
> > @@ -214,5 +214,68 @@ pinctrl_smc: pinctrl@23e820000 {
> > <AIC_IRQ 396 IRQ_TYPE_LEVEL_HIGH>,
> > <AIC_IRQ 397 IRQ_TYPE_LEVEL_HIGH>;
> > };
> > +
> > + pcie0: pcie@690000000 {
> > + compatible = "apple,t8103-pcie", "apple,pcie";
> > + device_type = "pci";
> > +
> > + reg = <0x6 0x90000000 0x0 0x1000000>,
> > + <0x6 0x80000000 0x0 0x4000>,
> > + <0x6 0x81000000 0x0 0x8000>,
> > + <0x6 0x82000000 0x0 0x8000>,
> > + <0x6 0x83000000 0x0 0x8000>;
> > + reg-names = "config", "rc", "port0", "port1", "port2";
> > +
> > + interrupt-parent = <&aic>;
> > + interrupts = <AIC_IRQ 695 IRQ_TYPE_LEVEL_HIGH>,
> > + <AIC_IRQ 698 IRQ_TYPE_LEVEL_HIGH>,
> > + <AIC_IRQ 701 IRQ_TYPE_LEVEL_HIGH>;
> > +
> > + msi-controller;
> > + msi-parent = <&pcie0>;
> > + msi-ranges = <&aic AIC_IRQ 704 IRQ_TYPE_EDGE_RISING 32>;
> > +
> > + bus-range = <0 3>;
> > + #address-cells = <3>;
> > + #size-cells = <2>;
> > + ranges = <0x43000000 0x6 0xa0000000 0x6 0xa0000000 0x0 0x20000000>,
> > + <0x02000000 0x0 0xc0000000 0x6 0xc0000000 0x0 0x40000000>;
> > +
> > + pinctrl-0 = <&pcie_pins>;
> > + pinctrl-names = "default";
> > +
> > + pci@0,0 {
> > + device_type = "pci";
> > + reg = <0x0 0x0 0x0 0x0 0x0>;
> > + reset-gpios = <&pinctrl_ap 152 0>;
> > + max-link-speed = <2>;
> > +
> > + #address-cells = <3>;
> > + #size-cells = <2>;
> > + ranges;
> > + };
> > +
> > + pci@1,0 {
> > + device_type = "pci";
> > + reg = <0x800 0x0 0x0 0x0 0x0>;
> > + reset-gpios = <&pinctrl_ap 153 0>;
> > + max-link-speed = <2>;
> > +
> > + #address-cells = <3>;
> > + #size-cells = <2>;
> > + ranges;
> > + };
> > +
> > + pci@2,0 {
> > + device_type = "pci";
> > + reg = <0x1000 0x0 0x0 0x0 0x0>;
> > + reset-gpios = <&pinctrl_ap 33 0>;
> > + max-link-speed = <1>;
> > +
> > + #address-cells = <3>;
> > + #size-cells = <2>;
> > + ranges;
> > + };
> > + };
> > };
> > };
>
> I have now implemented the MSI change on the Linux driver side, and it
> works nicely. So thumbs up from me on this front.
>
> I am now looking at the interrupts provided by each port:
> (1) a bunch of port-private interrupts (link up/down...)
> (2) INTx interrupts
So each port has an independent INTx space? Is that even something PCI
defines or comprehends?
> Given that the programming is per-port, I've implemented this as a
> per-port interrupt controller.
>
> (1) is dead easy to implement, and doesn't require any DT description.
> (2) is unfortunately exposing the limits of my DT knowledge, and I'm
> not clear how to model it. I came up with the following:
>
> port00: pci@0,0 {
> device_type = "pci";
> reg = <0x0 0x0 0x0 0x0 0x0>;
> reset-gpios = <&pinctrl_ap 152 0>;
> max-link-speed = <2>;
>
> #address-cells = <3>;
> #size-cells = <2>;
> ranges;
>
> interrupt-controller;
> #interrupt-cells = <1>;
> interrupt-parent = <&port00>;
> interrupt-map-mask = <0 0 0 7>;
> interrupt-map = <0 0 0 1 &port00 0>,
> <0 0 0 2 &port00 1>,
> <0 0 0 3 &port00 2>,
> <0 0 0 4 &port00 3>;
IIRC, I don't think the DT IRQ code handles a node having both
'interrupt-controller' and 'interrupt-map' properties. I think that's
why some PCI host bridge nodes have child interrupt-controller nodes.
I don't really like that work-around, so if the above can be made to
work, I'd be happy to see it. But the DT IRQ code is some ancient code
for ancient platforms (PowerMacs being one of them).
> };
>
> which vaguely seem to do the right thing for the devices behind root
> ports, but doesn't seem to work for INTx generated by the root ports
> themselves. Any clue? Alternatively, I could move it to something
> global to the whole PCIe controller, but that doesn't seem completely
> right.
>
> It also begs the question whether the per-port interrupt to the AIC
> should be moved into each root port, should my per-port approach hold
> any water.
I tend to think per-port is the right thing to do. However, the child
nodes are PCI devices, so that creates some restrictions. Such as the
per port registers are in the host address space, not the PCI address
space, so we can't move the registers into the child nodes. The
interrupts may be okay. Certainly, being an 'interrupt-controller'
without having an 'interrupts' property for an non root interrupt
controller is odd.
Rob
