Hi Greg,
On Wed, Jun 5, 2019 at 7:47 AM Sergio Paracuellos
<sergio.paracuellos@xxxxxxxxx> wrote:
>
> Hi Greg,
>
> On Wed, Jun 5, 2019 at 6:01 AM Greg Ungerer <gerg@xxxxxxxxxx> wrote:
> >
> > Hi Sergio,
> >
> > On 4/6/19 7:36 pm, Sergio Paracuellos wrote:
> > > On Tue, Jun 4, 2019 at 9:14 AM Greg Ungerer <gerg@xxxxxxxxxx> wrote:
> > >> On 4/6/19 3:06 pm, Sergio Paracuellos wrote:
> > >>> On Tue, Jun 4, 2019 at 3:31 AM Greg Ungerer <gerg@xxxxxxxxxx> wrote:
> > >>>> On 4/6/19 5:59 am, Sergio Paracuellos wrote:
> > >>>>> On Mon, Jun 3, 2019 at 2:32 PM Greg Ungerer <gerg@xxxxxxxxxx> wrote:
> > >>>>>> On 3/6/19 3:34 pm, Sergio Paracuellos wrote:
> > >>>>>>> On Mon, Jun 3, 2019 at 3:26 AM Greg Ungerer <gerg@xxxxxxxxxx> wrote:
> > >>>>>>>> On 31/5/19 10:37 pm, Sergio Paracuellos wrote:
> > >>>>>>>>> On Thu, May 30, 2019 at 3:46 AM Greg Ungerer <gerg@xxxxxxxxxx> wrote:
> > >>>>>>>>>> On 30/5/19 10:44 am, Greg Ungerer wrote:
> > >>>>>>>>>>> On 29/5/19 6:08 pm, Sergio Paracuellos wrote:
> > >>>>>>>>>>> [snip]
> > >>>>>>> Can you try to read and set BIT(10) instead of write it directly?:
> > >>>>>>>
> > >>>>>>> Instead of:
> > >>>>>>>
> > >>>>>>> rt_sysc_w32(PERST_MODE_GPIO, MT7621_GPIO_MODE);
> > >>>>>>
> > >>>>>> Oh, yeah, that is definitely not going to work. There is a bunch of
> > >>>>>> other GPIO control bits in there for other hardware blocks. Would
> > >>>>>> explain the broken NAND flash behavior...
> > >>>>>
> > >>>>> Yes, my bad here. Sometimes is better to go to sleep :)).
> > >>>>>>
> > >>>>>>> Do:
> > >>>>>>>
> > >>>>>>> u32 val = rt_sysc_r32(MT7621_GPIO_MODE);
> > >>>>>>> val |= PERST_MODE_GPIO;
> > >>>>>>> rt_sysc_w32(val, MT7621_GPIO_MODE);
> > >>>>>>
> > >>>>>> Much better result with that. Though ultimately it should clear
> > >>>>>> bits 10 and 11 (both are PERST_MODE bits) and then OR in BIT(10).
> > >>>>>
> > >>>>> Ok, so the following should do the trick:
> > >>>>>
> > >>>>> rt_sysc_m32(PERST_MODE_MASK, PERST_MODE_GPIO, MT7621_GPIO_MODE);
> > >>>>>
> > >>>>> with PERST_MODE_MASK defined as:
> > >>>>>
> > >>>>> #define PERST_MODE_MASK GENMASK(11, 10)
> > >>>>>
> > >>>>> (patch attached with this changes)
> > >>>>
> > >>>> I have mostly good news and a little bad news :-)
> > >>>>
> > >>>> I should have tested more thoroughly last night. Anyway, the new patch
> > >>>> works, even the IRQ of the PCI device. My Wifi PCI device works just
> > >>>> as well now as it did with the 4.20 pci-mt7621.c/pci-mt7621-phy.c.
> > >>>> I still get the lines:
> > >>>>
> > >>>> pcieport 0000:00:00.0: of_irq_parse_pci: failed with rc=-22
> > >>>> pcieport 0000:00:00.0: enabling device (0004 -> 0006)
> > >>>>
> > >>>> However that is referring to the root host PCI device (0000:00:00.0),
> > >>>> not my PCI peripheral device (which is 0000:01:00.0). It is actually
> > >>>> probed and working properly.
> > >>>>
> > >>>> That is the good news.
> > >>>
> > >>> That makes sense :). Good news are always good news even bads are
> > >>> coming also :))
> > >>>
> > >>>>
> > >>>>
> > >>>>> It would be also good to know what happen if you comment the following lines:
> > >>>>>
> > >>>>> pcie_write(pcie, 0xffffffff, RALINK_PCI_MEMBASE);
> > >>>>> pcie_write(pcie, RALINK_PCI_IO_MAP_BASE, RALINK_PCI_IOBASE);
> > >>>>>
> > >>>>> Are they really needed?
> > >>>>
> > >>>> Had no effect for me. Everything worked the same with or without
> > >>>> those lines as far as I could tell.
> > >>>
> > >>> Ok, I won't include them when I send a clean patch series with all of
> > >>> this changes.
> > >>>
> > >>>>
> > >>>>
> > >>>> [snip]
> > >>>>> Only one step more to get this properly working.
> > >>>>
> > >>>> Ok, now the bad news.
> > >>>>
> > >>>> I often get the boot hanging at various points in the PCI
> > >>>> initialization, setup and probing.
> > >>>>
> > >>>> For example sometimes it hangs with boot up to:
> > >>>>
> > >>>> mt7621-pci-phy 1e149000.pcie-phy: Xtal is 40MHz
> > >>>>
> > >>>>
> > >>>> Then sometimes it hangs at:
> > >>>>
> > >>>> mt7621-pci-phy 1e149000.pcie-phy: Xtal is 40MHz
> > >>>> mt7621-pci 1e140000.pcie: Port 454043648 N_FTS = 0
> > >>>> mt7621-pci-phy 1e149000.pcie-phy: Xtal is 40MHz
> > >>>> mt7621-pci 1e140000.pcie: Port 454043648 N_FTS = 1
> > >>>> mt7621-pci-phy 1e14a000.pcie-phy: Xtal is 40MHz
> > >>>> mt7621-pci 1e140000.pcie: Port 454043648 N_FTS = 2
> > >>>> mt7621-pci 1e140000.pcie: pcie0 no card, disable it (RST & CLK)
> > >>>> mt7621-pci 1e140000.pcie: pcie1 no card, disable it (RST & CLK)
> > >>>> mt7621-pci 1e140000.pcie: pcie2 no card, disable it (RST & CLK)
> > >>>>
> > >>>
> > >>> It is weird, here it is not initializing any port... All of them are disabled.
> > >>>
> > >>>>
> > >>>> And then I also see it hang up to:
> > >>>>
> > >>>> mt7621-pci-phy 1e149000.pcie-phy: Xtal is 40MHz
> > >>>> mt7621-pci 1e140000.pcie: Port 454043648 N_FTS = 0
> > >>>> mt7621-pci-phy 1e149000.pcie-phy: Xtal is 40MHz
> > >>>> mt7621-pci 1e140000.pcie: Port 454043648 N_FTS = 1
> > >>>> mt7621-pci-phy 1e14a000.pcie-phy: Xtal is 40MHz
> > >>>> mt7621-pci 1e140000.pcie: Port 454043648 N_FTS = 2
> > >>>> mt7621-pci 1e140000.pcie: pcie1 no card, disable it (RST & CLK)
> > >>>> mt7621-pci 1e140000.pcie: pcie2 no card, disable it (RST & CLK)
> > >>>> mt7621-pci 1e140000.pcie: PCIE0 enabled
> > >>>> mt7621-pci 1e140000.pcie: PCI coherence region base: 0x60000000, mask/settings: 0xf0000002
> > >>>> mt7621-pci 1e140000.pcie: PCI host bridge to bus 0000:00
> > >>>> pci_bus 0000:00: root bus resource [io 0xffffffff]
> > >>>> pci_bus 0000:00: root bus resource [mem 0x60000000-0x6fffffff]
> > >>>> pci_bus 0000:00: root bus resource [bus 00-ff]
> > >>>> pci 0000:00:00.0: bridge configuration invalid ([bus 00-00]), reconfiguring
> > >>>>
> > >>>>
> > >>>> It happens on cold or warm boots. Sometimes it boots up all the
> > >>>> way and everything works perfectly.
> > >>>
> > >>> Can you try to change all the msleeps of the code driver in favour of
> > >>> mdelay's? Looks like
> > >>> some timing problem.
> > >>
> > >> Changed the msleeps to mdelays and it still hangs somtimes.
> > >> I doubled the delay times in the msleeps and tried that too -
> > >> that also sometimes hangs.
> > >>
> > >>
> > >>> If it doesn't work, it would be great to have a full trace of working
> > >>> 4.20 and no working current 5.x series
> > >>> version just to carefully compare them.
> > >>
> > >> I'll attach at the end a full working boot trace from 5.1 with the 4.20 pci-mt7621.c.
> > >> I'll attach a 5.1 boot trace with your patch and hang below. Not that this very
> > >> same image doesn't always hang. Same binary will sometimes boot fine.
> > >>
> > >>
> > >>>> I had perfect reliable boot and operation with linux-5.1 using the
> > >>>> older 4.20 pci-mt7621.c and pci-mt7621-phy.c.
> > >>>
> > >>> AFAICT, there is not pci-mt7621-phy.c in the v4.20, isn't it? Do you
> > >>> mean you put also that
> > >>> code into that version and compile them? Or are you just using "pci-mt7621.c"?
> > >>
> > >> I just leave that pci-mt7621-phy.c code in place in linux-5.1 when I copy in
> > >> the linux-4.20 pci-mt7621.c - even though it isn't used in that case.
> > >>
> > >> One thing I always notice is that the PCI probing happens much earlier
> > >> with the 4.20 pci-mt7621.c. Not sure that will have any impact though.
> > >>
> > >
> > > It seems it is related because, looking at the trace which hangs I can see:
> > >
> > > mt7621-pci 1e140000.pcie: failed to get gpio perst
> > > mt7621-pci 1e140000.pcie: Parsing DT failed
> > >
> > > At that point gpio's driver are not being probed yet. This not happen
> > > with the original
> > > patch because it just access to memory to set up all the stuff intead
> > > of use the gpio's
> > > consumers apis which, IMHO, is the way to go.
> > >
> > > Can you try to return "-EPROBE_DEFER" if getting the gpio fails in
> > > initialization?
> > >
> > > (patch attached with this change and removing the two lines which
> > > seems to not be needed
> > > commented in previous patch)
> >
> > New patch tried. Behavior is no different. Occasional hang during boot.
> > I can see that it does the probe, and now deferr. Full boot log of a
> > hung boot below.
>
> Ok, so that means it was properly being deferred with the previous patch also.
>
> The original code set up all at a very early stage (arch_initcall)
> just after the pinctrl
> driver is being set up. The new one without my last patches was also
> being executed
> later because of the phy. At arch_initcall the 'phy_create()' is
> called before the phy module is initialized, so 'phy_class' is NULL,
> the new phy isn't placed in the right class, and it cannot be found.
> So the phy driver uses 'module_init' instead of 'arch_initcall' and it
> worked for the gnubee board. But according to your traces when it
> hangs the problem seems to be with gpio's being resetting or something
> so the pcie link is not in up
> state for any reason I cannot understand. So we have to determine if
> the problem is because of the phy and gpio init being done in later
> stages.
>
> We can try to change 'arch_initcall' to a later stage changing it to
> 'module_init' to see if it is a deferring problem or something. The
> other thing we can try to determine if it is a gpio access problem is
> to change in the last patch
> the gpio descriptor uses with you initial memory accessign hack to see
> if it eventually hungs or not. If this both tests result in eventually
> hung boot I'll try to prepare a patch with the current phy code in the
> 'arch_initcall' stage putting in the the same pci-mt7621.c file to see
> if order matters. No more ideas by now, sorry :(
>
> > Regards
> > Greg
>
> Best regards,
> Sergio Paracuellos
> >
> >
> > --------------------------------------------------------------------------------
> > Linux version 5.1.0-ac0 (gerg@goober) (gcc version 5.4.0 (GCC)) #78 SMP Wed Jun 5 13:45:19 AEST 2019
> > SoC Type: MediaTek MT7621 ver:1 eco:3
> > printk: bootconsole [early0] enabled
> > CPU0 revision is: 0001992f (MIPS 1004Kc)
> > OF: fdt: No chosen node found, continuing without
> > MIPS: machine is Digi EX15
> > Determined physical RAM map:
> > memory: 10000000 @ 00000000 (usable)
> > Initial ramdisk at: 0x81000000 (16920576 bytes)
> > VPE topology {2,2} total 4
> > Primary instruction cache 32kB, VIPT, 4-way, linesize 32 bytes.
> > Primary data cache 32kB, 4-way, PIPT, no aliases, linesize 32 bytes
> > MIPS secondary cache 256kB, 8-way, linesize 32 bytes.
> > Zone ranges:
> > Normal [mem 0x0000000000000000-0x000000000fffffff]
> > Movable zone start for each node
> > Early memory node ranges
> > node 0: [mem 0x0000000000000000-0x000000000fffffff]
> > Initmem setup node 0 [mem 0x0000000000000000-0x000000000fffffff]
> > random: get_random_bytes called from start_kernel+0xb0/0x524 with crng_init=0
> > percpu: Embedded 15 pages/cpu s30144 r8192 d23104 u61440
> > Built 1 zonelists, mobility grouping on. Total pages: 65024
> > Kernel command line: boot=network boot_ver=19.3.223.0-0c02c07312-dirty console=ttyS0,115200 ubi.mtd=3 root=/dev/ram0 rd_start=0x81000000 rd_size=0x1023000
> > Dentry cache hash table entries: 32768 (order: 5, 131072 bytes)
> > Inode-cache hash table entries: 16384 (order: 4, 65536 bytes)
> > Writing ErrCtl register=00020513
> > Readback ErrCtl register=00020513
> > Memory: 233756K/262144K available (7216K kernel code, 247K rwdata, 1320K rodata, 292K init, 230K bss, 28388K reserved, 0K cma-reserved)
> > SLUB: HWalign=32, Order=0-3, MinObjects=0, CPUs=4, Nodes=1
> > rcu: Hierarchical RCU implementation.
> > rcu: RCU calculated value of scheduler-enlistment delay is 10 jiffies.
> > NR_IRQS: 256
> > clocksource: GIC: mask: 0xffffffffffffffff max_cycles: 0xcaf478abb4, max_idle_ns: 440795247997 ns
> > sched_clock: 32 bits at 100 Hz, resolution 10000000ns, wraps every 21474836475000000ns
> > Calibrating delay loop... 586.13 BogoMIPS (lpj=2930688)
> > pid_max: default: 32768 minimum: 301
> > Mount-cache hash table entries: 1024 (order: 0, 4096 bytes)
> > Mountpoint-cache hash table entries: 1024 (order: 0, 4096 bytes)
> > rcu: Hierarchical SRCU implementation.
> > smp: Bringing up secondary CPUs ...
> > Primary instruction cache 32kB, VIPT, 4-way, linesize 32 bytes.
> > Primary data cache 32kB, 4-way, PIPT, no aliases, linesize 32 bytes
> > MIPS secondary cache 256kB, 8-way, linesize 32 bytes.
> > CPU1 revision is: 0001992f (MIPS 1004Kc)
> > Synchronize counters for CPU 1: done.
> > Primary instruction cache 32kB, VIPT, 4-way, linesize 32 bytes.
> > Primary data cache 32kB, 4-way, PIPT, no aliases, linesize 32 bytes
> > MIPS secondary cache 256kB, 8-way, linesize 32 bytes.
> > CPU2 revision is: 0001992f (MIPS 1004Kc)
> > Synchronize counters for CPU 2: done.
> > Primary instruction cache 32kB, VIPT, 4-way, linesize 32 bytes.
> > Primary data cache 32kB, 4-way, PIPT, no aliases, linesize 32 bytes
> > MIPS secondary cache 256kB, 8-way, linesize 32 bytes.
> > CPU3 revision is: 0001992f (MIPS 1004Kc)
> > Synchronize counters for CPU 3: done.
> > smp: Brought up 1 node, 4 CPUs
> > devtmpfs: initialized
> > clocksource: jiffies: mask: 0xffffffff max_cycles: 0xffffffff, max_idle_ns: 19112604462750000 ns
> > futex hash table entries: 1024 (order: 3, 32768 bytes)
> > pinctrl core: initialized pinctrl subsystem
> > NET: Registered protocol family 16
> > mt7621-pci 1e140000.pcie: failed to get gpio perst
> > mt7621-pci 1e140000.pcie: Parsing DT failed
> > SCSI subsystem initialized
> > usbcore: registered new interface driver usbfs
> > usbcore: registered new interface driver hub
> > usbcore: registered new device driver usb
> > pcf857x 0-0026: probed
> > i2c-mt7621 1e000900.i2c: clock 400KHz, re-start not support
> > clocksource: Switched to clocksource GIC
> > NET: Registered protocol family 2
> > tcp_listen_portaddr_hash hash table entries: 512 (order: 0, 6144 bytes)
> > TCP established hash table entries: 2048 (order: 1, 8192 bytes)
> > TCP bind hash table entries: 2048 (order: 2, 16384 bytes)
> > TCP: Hash tables configured (established 2048 bind 2048)
> > UDP hash table entries: 256 (order: 1, 8192 bytes)
> > UDP-Lite hash table entries: 256 (order: 1, 8192 bytes)
> > NET: Registered protocol family 1
> > Trying to unpack rootfs image as initramfs...
> > rootfs image is not initramfs (invalid magic at start of compressed archive); looks like an initrd
> > Freeing initrd memory: 16524K
> > Initialise system trusted keyrings
> > workingset: timestamp_bits=30 max_order=16 bucket_order=0
> > squashfs: version 4.0 (2009/01/31) Phillip Lougher
> > random: fast init done
> > Key type asymmetric registered
> > Asymmetric key parser 'x509' registered
> > Block layer SCSI generic (bsg) driver version 0.4 loaded (major 252)
> > mt7621_gpio 1e000600.gpio: registering 32 gpios
> > mt7621_gpio 1e000600.gpio: registering 32 gpios
> > mt7621_gpio 1e000600.gpio: registering 32 gpios
> > Serial: 8250/16550 driver, 3 ports, IRQ sharing disabled
> > printk: console [ttyS0] disabled
> > 1e000c00.uartlite: ttyS0 at MMIO 0x1e000c00 (irq = 18, base_baud = 3125000) is a 16550A
> > printk: console [ttyS0] enabled
> > printk: console [ttyS0] enabled
> > printk: bootconsole [early0] disabled
> > printk: bootconsole [early0] disabled
> > 1e000d00.uartlite: ttyS1 at MMIO 0x1e000d00 (irq = 19, base_baud = 3125000) is a 16550A
> > ledman: Copyright (C) SnapGear, 2000-2010.
> > ledman: registered ERASE switch on IRQ28
> > snapdog: HW/SW watchdog timer for SnapGear/Others
> > cacheinfo: Failed to find cpu0 device node
> > cacheinfo: Unable to detect cache hierarchy for CPU 0
> > brd: module loaded
> > mt7621-nand: NAND register bank at 0xbe003000
> > mt7621-nand: NAND ECC register bank at 0xbe003800
> > nand: device found, Manufacturer ID: 0x2c, Chip ID: 0xdc
> > nand: Micron NAND 512MiB 3,3V 8-bit
> > nand: 512 MiB, SLC, erase size: 128 KiB, page size: 2048, OOB size: 64
> > nand: ecc bit: 4, spare_per_sector: 16
> > Bad block table found at page 262080, version 0x01
> > Bad block table found at page 262016, version 0x01
> > 5 fixed-partitions partitions found on MTD device MT7621-NAND
> > Creating 5 MTD partitions on "MT7621-NAND":
> > 0x000000000000-0x000000200000 : "u-boot"
> > 0x000000200000-0x000000300000 : "u-boot-env"
> > 0x000000300000-0x000000500000 : "log"
> > 0x000000500000-0x000020000000 : "flash"
> > 0x000000000000-0x000020000000 : "all"
> > libphy: Fixed MDIO Bus: probed
> > tun: Universal TUN/TAP device driver, 1.6
> > libphy: mdio: probed
> > mtk_soc_eth 1e100000.ethernet: generated random MAC address 8a:8c:8b:24:60:92
> > mtk_soc_eth 1e100000.ethernet: connected mac 0 to PHY at fixed-0:00 [uid=00000000, driver=Generic PHY]
> > mtk_soc_eth 1e100000.ethernet eth0: mediatek frame engine at 0xbe100000, irq 21
> > PPP generic driver version 2.4.2
> > PPP BSD Compression module registered
> > PPP Deflate Compression module registered
> > PPP MPPE Compression module registered
> > NET: Registered protocol family 24
> > SLIP: version 0.8.4-NET3.019-NEWTTY (dynamic channels, max=256).
> > CSLIP: code copyright 1989 Regents of the University of California.
> > usbcore: registered new interface driver ar5523
> > usbcore: registered new interface driver asix
> > usbcore: registered new interface driver ax88179_178a
> > usbcore: registered new interface driver cdc_ether
> > usbcore: registered new interface driver cdc_eem
> > usbcore: registered new interface driver rndis_host
> > usbcore: registered new interface driver cdc_subset
> > usbcore: registered new interface driver cdc_ncm
> > usbcore: registered new interface driver qmi_wwan
> > usbcore: registered new interface driver cdc_mbim
> > ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver
> > ehci-pci: EHCI PCI platform driver
> > ehci-platform: EHCI generic platform driver
> > ohci_hcd: USB 1.1 'Open' Host Controller (OHCI) Driver
> > ohci-pci: OHCI PCI platform driver
> > xhci-mtk 1e1c0000.xhci: xHCI Host Controller
> > xhci-mtk 1e1c0000.xhci: new USB bus registered, assigned bus number 1
> > xhci-mtk 1e1c0000.xhci: hcc params 0x01401198 hci version 0x96 quirks 0x0000000000210010
> > xhci-mtk 1e1c0000.xhci: irq 20, io mem 0x1e1c0000
> > usb usb1: New USB device found, idVendor=1d6b, idProduct=0002, bcdDevice= 5.01
> > usb usb1: New USB device strings: Mfr=3, Product=2, SerialNumber=1
> > usb usb1: Product: xHCI Host Controller
> > usb usb1: Manufacturer: Linux 5.1.0-ac0 xhci-hcd
> > usb usb1: SerialNumber: 1e1c0000.xhci
> > hub 1-0:1.0: USB hub found
> > hub 1-0:1.0: 2 ports detected
> > xhci-mtk 1e1c0000.xhci: xHCI Host Controller
> > xhci-mtk 1e1c0000.xhci: new USB bus registered, assigned bus number 2
> > xhci-mtk 1e1c0000.xhci: Host supports USB 3.0 SuperSpeed
> > usb usb2: We don't know the algorithms for LPM for this host, disabling LPM.
> > usb usb2: New USB device found, idVendor=1d6b, idProduct=0003, bcdDevice= 5.01
> > usb usb2: New USB device strings: Mfr=3, Product=2, SerialNumber=1
> > usb usb2: Product: xHCI Host Controller
> > usb usb2: Manufacturer: Linux 5.1.0-ac0 xhci-hcd
> > usb usb2: SerialNumber: 1e1c0000.xhci
> > hub 2-0:1.0: USB hub found
> > hub 2-0:1.0: 1 port detected
> > usbcore: registered new interface driver cdc_acm
> > cdc_acm: USB Abstract Control Model driver for USB modems and ISDN adapters
> > usbcore: registered new interface driver cdc_wdm
> > usbcore: registered new interface driver usb-storage
> > usbcore: registered new interface driver usbserial_generic
> > usbserial: USB Serial support registered for generic
> > usbcore: registered new interface driver ipw
> > usbserial: USB Serial support registered for IPWireless converter
> > usbcore: registered new interface driver option
> > usbserial: USB Serial support registered for GSM modem (1-port)
> > usbcore: registered new interface driver qcaux
> > usbserial: USB Serial support registered for qcaux
> > usbcore: registered new interface driver qcserial
> > usbserial: USB Serial support registered for Qualcomm USB modem
> > usbcore: registered new interface driver quatech2
> > usbserial: USB Serial support registered for Quatech 2nd gen USB to Serial Driver
> > usbcore: registered new interface driver usb_serial_simple
> > usbserial: USB Serial support registered for carelink
> > usbserial: USB Serial support registered for zio
> > usbserial: USB Serial support registered for funsoft
> > usbserial: USB Serial support registered for flashloader
> > usbserial: USB Serial support registered for google
> > usbserial: USB Serial support registered for libtransistor
> > usbserial: USB Serial support registered for vivopay
> > usbserial: USB Serial support registered for moto_modem
> > usbserial: USB Serial support registered for motorola_tetra
> > usbserial: USB Serial support registered for novatel_gps
> > usbserial: USB Serial support registered for hp4x
> > usbserial: USB Serial support registered for suunto
> > usbserial: USB Serial support registered for siemens_mpi
> > u32 classifier
> > input device check on
> > ipip: IPv4 and MPLS over IPv4 tunneling driver
> > gre: GRE over IPv4 demultiplexor driver
> > ip_gre: GRE over IPv4 tunneling driver
> > Initializing XFRM netlink socket
> > NET: Registered protocol family 10
> > Segment Routing with IPv6
> > sit: IPv6, IPv4 and MPLS over IPv4 tunneling driver
> > NET: Registered protocol family 17
> > NET: Registered protocol family 15
> > 8021q: 802.1Q VLAN Support v1.8
> > Loading compiled-in X.509 certificates
> > mt7621-pci-phy 1e149000.pcie-phy: Xtal is 40MHz
> > mt7621-pci 1e140000.pcie: Port 0 N_FTS = 1b102800
> > mt7621-pci-phy 1e149000.pcie-phy: Xtal is 40MHz
> > mt7621-pci 1e140000.pcie: Port 1 N_FTS = 1b102800
> > mt7621-pci-phy 1e14a000.pcie-phy: Xtal is 40MHz
> > mt7621-pci 1e140000.pcie: Port 2 N_FTS = 1b102800
> > mt7621-pci 1e140000.pcie: pcie0 no card, disable it (RST & CLK)
> > mt7621-pci 1e140000.pcie: pcie1 no card, disable it (RST & CLK)
> > mt7621-pci 1e140000.pcie: pcie2 no card, disable it (RST & CLK)
I changed also the way port resets are done. Now all of ports are
being reset before
enabling the phy. Also, power_off the phy is done before reseting the
port so it should
not hang now. The real problem here is if the pcie link is properly
detected to get a working
PCI.
Patch attached.
> >
> > [HUNG]
> >
Best regards,
Sergio Paracuellos
From a07e1c8167f0b71759ad44b42f1250bbe821f366 Mon Sep 17 00:00:00 2001
From: Sergio Paracuellos <sparacuellos@xxxxxxxxxxxx>
Date: Wed, 29 May 2019 09:58:07 +0200
Subject: [PATCH] staging: mt7621-pci: use perst gpio instead of builtin perst
Some boards need gpio instead of builtin perst. Use gpio for all
of them which was the approach of the original code.
Signed-off-by: Sergio Paracuellos <sparacuellos@xxxxxxxxxxxx>
---
drivers/staging/mt7621-dts/mt7621.dtsi | 3 +-
drivers/staging/mt7621-pci/pci-mt7621.c | 122 ++++++++++++++++----------------
2 files changed, 64 insertions(+), 61 deletions(-)
diff --git a/drivers/staging/mt7621-dts/mt7621.dtsi b/drivers/staging/mt7621-dts/mt7621.dtsi
index 280ec33..aed2458 100644
--- a/drivers/staging/mt7621-dts/mt7621.dtsi
+++ b/drivers/staging/mt7621-dts/mt7621.dtsi
@@ -1,5 +1,5 @@
#include <dt-bindings/interrupt-controller/mips-gic.h>
-
+#include <dt-bindings/gpio/gpio.h>
/ {
#address-cells = <1>;
#size-cells = <1>;
@@ -468,6 +468,7 @@
#address-cells = <3>;
#size-cells = <2>;
+ perst-gpio = <&gpio 19 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&pcie_pins>;
diff --git a/drivers/staging/mt7621-pci/pci-mt7621.c b/drivers/staging/mt7621-pci/pci-mt7621.c
index 03d919a..b13920a 100644
--- a/drivers/staging/mt7621-pci/pci-mt7621.c
+++ b/drivers/staging/mt7621-pci/pci-mt7621.c
@@ -17,6 +17,7 @@
#include <linux/bitops.h>
#include <linux/delay.h>
+#include <linux/gpio/consumer.h>
#include <linux/iopoll.h>
#include <linux/module.h>
#include <linux/of.h>
@@ -35,6 +36,7 @@
/* sysctl */
#define MT7621_CHIP_REV_ID 0x0c
+#define MT7621_GPIO_MODE 0x60
#define CHIP_REV_MT7621_E2 0x0101
/* MediaTek specific configuration registers */
@@ -81,7 +83,6 @@
#define PCIE_BAR_ENABLE BIT(0)
#define PCIE_PORT_INT_EN(x) BIT(20 + (x))
#define PCIE_PORT_CLK_EN(x) BIT(24 + (x))
-#define PCIE_PORT_PERST(x) BIT(1 + (x))
#define PCIE_PORT_LINKUP BIT(0)
#define PCIE_CLK_GEN_EN BIT(31)
@@ -90,6 +91,10 @@
#define PCIE_CLK_GEN1_EN (BIT(27) | BIT(25))
#define MEMORY_BASE 0x0
+#define PERST_MODE_MASK GENMASK(11, 10)
+#define PERST_MODE_GPIO BIT(10)
+#define PERST_DELAY_US 1000
+
/**
* struct mt7621_pcie_port - PCIe port information
* @base: I/O mapped register base
@@ -119,6 +124,7 @@ struct mt7621_pcie_port {
* @offset: IO / Memory offset
* @dev: Pointer to PCIe device
* @ports: pointer to PCIe port information
+ * @perst: gpio reset
* @rst: pointer to pcie reset
*/
struct mt7621_pcie {
@@ -132,6 +138,7 @@ struct mt7621_pcie {
resource_size_t io;
} offset;
struct list_head ports;
+ struct gpio_desc *perst;
struct reset_control *rst;
};
@@ -198,6 +205,18 @@ static void write_config(struct mt7621_pcie *pcie, unsigned int dev,
pcie_write(pcie, val, RALINK_PCI_CONFIG_DATA);
}
+static void mt7621_perst_gpio_pcie_assert(struct mt7621_pcie *pcie)
+{
+ gpiod_set_value(pcie->perst, 0);
+ mdelay(PERST_DELAY_US);
+}
+
+static void mt7621_perst_gpio_pcie_deassert(struct mt7621_pcie *pcie)
+{
+ gpiod_set_value(pcie->perst, 1);
+ mdelay(PERST_DELAY_US);
+}
+
static inline void mt7621_control_assert(struct mt7621_pcie_port *port)
{
u32 chip_rev_id = rt_sysc_r32(MT7621_CHIP_REV_ID);
@@ -344,6 +363,12 @@ static int mt7621_pcie_parse_dt(struct mt7621_pcie *pcie)
struct resource regs;
int err;
+ pcie->perst = devm_gpiod_get(dev, "perst", GPIOD_OUT_HIGH);
+ if (IS_ERR(pcie->perst)) {
+ dev_err(dev, "failed to get gpio perst\n");
+ return -EPROBE_DEFER;
+ }
+
err = of_address_to_resource(node, 0, ®s);
if (err) {
dev_err(dev, "missing \"reg\" property\n");
@@ -384,56 +409,41 @@ static int mt7621_pcie_init_port(struct mt7621_pcie_port *port)
struct mt7621_pcie *pcie = port->pcie;
struct device *dev = pcie->dev;
u32 slot = port->slot;
- u32 val = 0;
int err;
- /*
- * Any MT7621 Ralink pcie controller that doesn't have 0x0101 at
- * the end of the chip_id has inverted PCI resets.
- */
- mt7621_reset_port(port);
-
- val = read_config(pcie, slot, PCIE_FTS_NUM);
- dev_info(dev, "Port %d N_FTS = %x\n", (unsigned int)val, slot);
-
err = phy_init(port->phy);
if (err) {
dev_err(dev, "failed to initialize port%d phy\n", slot);
- goto err_phy_init;
+ return err;
}
err = phy_power_on(port->phy);
if (err) {
dev_err(dev, "failed to power on port%d phy\n", slot);
- goto err_phy_on;
- }
-
- if ((pcie_port_read(port, RALINK_PCI_STATUS) & PCIE_PORT_LINKUP) == 0) {
- dev_err(dev, "pcie%d no card, disable it (RST & CLK)\n", slot);
- mt7621_control_assert(port);
- port->enabled = false;
- err = -ENODEV;
- goto err_no_link_up;
+ return err;
}
port->enabled = true;
return 0;
-
-err_no_link_up:
- phy_power_off(port->phy);
-err_phy_on:
- phy_exit(port->phy);
-err_phy_init:
- return err;
}
static void mt7621_pcie_init_ports(struct mt7621_pcie *pcie)
{
struct device *dev = pcie->dev;
struct mt7621_pcie_port *port, *tmp;
+ u32 val = 0;
int err;
+ list_for_each_entry(port, &pcie->ports, list)
+ mt7621_control_assert(port);
+
+ rt_sysc_m32(PERST_MODE_MASK, PERST_MODE_GPIO, MT7621_GPIO_MODE);
+ mt7621_perst_gpio_pcie_assert(pcie);
+
+ list_for_each_entry(port, &pcie->ports, list)
+ mt7621_control_deassert(port);
+
list_for_each_entry_safe(port, tmp, &pcie->ports, list) {
u32 slot = port->slot;
@@ -441,7 +451,10 @@ static void mt7621_pcie_init_ports(struct mt7621_pcie *pcie)
if (err) {
dev_err(dev, "Initiating port %d failed\n", slot);
list_del(&port->list);
- }
+ } else {
+ val = read_config(pcie, slot, PCIE_FTS_NUM);
+ dev_info(dev, "Port %d N_FTS = %x\n", slot, (unsigned int)val);
+ }
}
reset_control_assert(pcie->rst);
@@ -451,37 +464,32 @@ static void mt7621_pcie_init_ports(struct mt7621_pcie *pcie)
rt_sysc_m32(PCIE_CLK_GEN_DIS, PCIE_CLK_GEN_EN, RALINK_PCIE_CLK_GEN);
msleep(50);
reset_control_deassert(pcie->rst);
+
+ mt7621_perst_gpio_pcie_deassert(pcie);
+
+ list_for_each_entry(port, &pcie->ports, list) {
+ u32 slot = port->slot;
+
+ if ((pcie_port_read(port, RALINK_PCI_STATUS) & PCIE_PORT_LINKUP) == 0) {
+ dev_err(dev, "pcie%d no card, disable it (RST & CLK)\n", slot);
+ phy_power_off(port->phy);
+ mt7621_control_assert(port);
+ port->enabled = false;
+ } else {
+ /* enable pcie interrupt */
+ val = pcie_read(pcie, RALINK_PCI_PCIMSK_ADDR);
+ val |= PCIE_PORT_INT_EN(slot);
+ pcie_write(pcie, val, RALINK_PCI_PCIMSK_ADDR);
+ }
+ }
}
-static int mt7621_pcie_enable_port(struct mt7621_pcie_port *port)
+static void mt7621_pcie_enable_port(struct mt7621_pcie_port *port)
{
struct mt7621_pcie *pcie = port->pcie;
u32 slot = port->slot;
u32 offset = MT7621_PCIE_OFFSET + (slot * MT7621_NEXT_PORT);
u32 val;
- int err;
-
- /* assert port PERST_N */
- val = pcie_read(pcie, RALINK_PCI_PCICFG_ADDR);
- val |= PCIE_PORT_PERST(slot);
- pcie_write(pcie, val, RALINK_PCI_PCICFG_ADDR);
-
- /* de-assert port PERST_N */
- val = pcie_read(pcie, RALINK_PCI_PCICFG_ADDR);
- val &= ~PCIE_PORT_PERST(slot);
- pcie_write(pcie, val, RALINK_PCI_PCICFG_ADDR);
-
- /* 100ms timeout value should be enough for Gen1 training */
- err = readl_poll_timeout(port->base + RALINK_PCI_STATUS,
- val, !!(val & PCIE_PORT_LINKUP),
- 20, 100 * USEC_PER_MSEC);
- if (err)
- return -ETIMEDOUT;
-
- /* enable pcie interrupt */
- val = pcie_read(pcie, RALINK_PCI_PCIMSK_ADDR);
- val |= PCIE_PORT_INT_EN(slot);
- pcie_write(pcie, val, RALINK_PCI_PCIMSK_ADDR);
/* map 2G DDR region */
pcie_write(pcie, PCIE_BAR_MAP_MAX | PCIE_BAR_ENABLE,
@@ -492,8 +500,6 @@ static int mt7621_pcie_enable_port(struct mt7621_pcie_port *port)
/* configure class code and revision ID */
pcie_write(pcie, PCIE_CLASS_CODE | PCIE_REVISION_ID,
offset + RALINK_PCI_CLASS);
-
- return 0;
}
static void mt7621_pcie_enable_ports(struct mt7621_pcie *pcie)
@@ -506,11 +512,7 @@ static void mt7621_pcie_enable_ports(struct mt7621_pcie *pcie)
list_for_each_entry(port, &pcie->ports, list) {
if (port->enabled) {
- if (mt7621_pcie_enable_port(port)) {
- dev_err(dev, "de-assert port %d PERST_N\n",
- port->slot);
- continue;
- }
+ mt7621_pcie_enable_port(port);
dev_info(dev, "PCIE%d enabled\n", slot);
num_slots_enabled++;
}
--
2.7.4
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
