Message ID | CAAwP0s1H9zaBZPMDz9=He-E68UK0Ay3jnxZ2frYH9r1xNeQhxQ@mail.gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Mon, 2013-04-01 at 22:05 +0200, Javier Martinez Canillas wrote: > On Mon, Apr 1, 2013 at 6:41 PM, Christoph Fritz > > As a quick-fix (hack) I wrote directly to the registers in gpio_probe() > > to enable GPIO banks. I now geht this: > > > >> > [ 0.214630] omap_gpio_probe, 1133, CM_CLKSEL_PER 0x48005040: 0x000000ff > >> > [ 0.214660] omap_gpio_probe, 1136, CM_ICLKEN_PER 0x48005010: 0x0007ffff > >> > [ 0.214660] omap_gpio_probe, 1139, CM_FCLKEN_PER 0x48005000: 0x0007ffff > > > > And it works for me. _But_ when I do enable regulator twl4030 > > (CONFIG_REGULATOR_TWL4030=y) in my config these registers get reset: > > > > [ 2.935455] smsc911x_open, 1537, CM_CLKSEL_PER 0x48005040: 0x000000ff > > [ 2.942291] smsc911x_open, 1540, CM_ICLKEN_PER 0x48005010: 0x00040fff > > [ 2.949066] smsc911x_open, 1543, CM_FCLKEN_PER 0x48005000: 0x00000000 > > > > And the IRQ source for the network chip (smsc911x) is disabled :-( > > > > Do you have any idea how to ("quick") fix this? > > > > A quick hack is to call gpio_request() explicitly before calling to > irq_set_type() is made. > I've this patch just to make it work until we find a clean solution: > > diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c > index 90c15ee..d594e1d 100644 > --- a/arch/arm/mach-omap2/gpmc.c > +++ b/arch/arm/mach-omap2/gpmc.c > @@ -14,6 +14,7 @@ > */ > #undef DEBUG > > +#include <linux/gpio.h> > #include <linux/irq.h> > #include <linux/kernel.h> > #include <linux/init.h> > @@ -1528,6 +1529,11 @@ static int gpmc_probe_dt(struct platform_device *pdev) > return ret; > } > > + ret = gpio_request_one(176, GPIOF_IN, "smsc911x irq"); > + if (ret) { > + pr_err("Failed to request IRQ GPIO%d\n", 176); > + return ret; > + } > + > for_each_node_by_name(child, "nand") { > ret = gpmc_probe_nand_child(pdev, child); > if (ret < 0) { > > This solves the issue of the non-initialized GPIO bank before that > makes the kernel to hang. Since I've to configure the IRQ polarity as > active low level-sensitive on my board and the flags are not set by > the IRQ core, I've another ugly hack that forces this: > > diff --git a/drivers/net/ethernet/smsc/smsc911x.c > b/drivers/net/ethernet/smsc/smsc > index da5cc9a..27e46f9 100644 > --- a/drivers/net/ethernet/smsc/smsc911x.c > +++ b/drivers/net/ethernet/smsc/smsc911x.c > @@ -2390,6 +2390,9 @@ static int smsc911x_drv_probe(struct > platform_device *pdev) > pdata = netdev_priv(dev); > dev->irq = irq_res->start; > - irq_flags = irq_res->flags & IRQF_TRIGGER_MASK; > + irq_flags = IRQF_TRIGGER_LOW; > pdata->ioaddr = ioremap_nocache(res->start, res_size); > > pdata->dev = dev; > > > Thanks > > -- Christoph > > > > I hope to find some time this week to work on this and at least find a > solution for the second issue (IORESOURCE_IRQ struct resource flags > not being set). Any updates on this issue? For me it works when doing this in the device tree: +&omap3_pmx_wkup { + pinctrl-names = "default"; + + lan9221_pins: pinmux_lan9221_pins { + pinctrl-single,pins = < + 0x5A 0x104 /* gpio_129, INPUT | MODE4 */ + >; + }; +}; + <SNIP> + lan9221@15000000 { + compatible = "smsc,lan9221", "smsc,lan9115"; + reg = <0x15000000 0x400>; + phy-mode = "mii"; + interrupt-parent = <&gpio5>; + interrupts = <1 0x2>; /* gpio_129, trigger: falling-edge */ + reg-io-width = <4>; + vdd33a-supply = <®_vcc3>; + vddvario-supply = <®_vcc3>; + pinctrl-names = "default"; + pinctrl-0 = <&lan9221_pins>; + }; but in arch/arm/mach-omap2/gpmc.c gpmc_probe_dt() I still need this hack: + ret = gpio_request_one(129, GPIOF_IN, "lan9221 irq"); + if (ret) { + pr_err("Failed to request IRQ GPIO%d\n", 129); + return ret; + } The following patches (already sent mainline) are also applied: "arm/dts: OMAP3: fix pinctrl-single configuration" "net: smsc911x: adopt pinctrl support" Thanks -- Christoph
On Sat, Apr 13, 2013 at 7:42 PM, Christoph Fritz <chf.fritz@googlemail.com> wrote: > On Mon, 2013-04-01 at 22:05 +0200, Javier Martinez Canillas wrote: >> On Mon, Apr 1, 2013 at 6:41 PM, Christoph Fritz >> > As a quick-fix (hack) I wrote directly to the registers in gpio_probe() >> > to enable GPIO banks. I now geht this: >> > >> >> > [ 0.214630] omap_gpio_probe, 1133, CM_CLKSEL_PER 0x48005040: 0x000000ff >> >> > [ 0.214660] omap_gpio_probe, 1136, CM_ICLKEN_PER 0x48005010: 0x0007ffff >> >> > [ 0.214660] omap_gpio_probe, 1139, CM_FCLKEN_PER 0x48005000: 0x0007ffff >> > >> > And it works for me. _But_ when I do enable regulator twl4030 >> > (CONFIG_REGULATOR_TWL4030=y) in my config these registers get reset: >> > >> > [ 2.935455] smsc911x_open, 1537, CM_CLKSEL_PER 0x48005040: 0x000000ff >> > [ 2.942291] smsc911x_open, 1540, CM_ICLKEN_PER 0x48005010: 0x00040fff >> > [ 2.949066] smsc911x_open, 1543, CM_FCLKEN_PER 0x48005000: 0x00000000 >> > >> > And the IRQ source for the network chip (smsc911x) is disabled :-( >> > >> > Do you have any idea how to ("quick") fix this? >> > >> >> A quick hack is to call gpio_request() explicitly before calling to >> irq_set_type() is made. >> I've this patch just to make it work until we find a clean solution: >> >> diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c >> index 90c15ee..d594e1d 100644 >> --- a/arch/arm/mach-omap2/gpmc.c >> +++ b/arch/arm/mach-omap2/gpmc.c >> @@ -14,6 +14,7 @@ >> */ >> #undef DEBUG >> >> +#include <linux/gpio.h> >> #include <linux/irq.h> >> #include <linux/kernel.h> >> #include <linux/init.h> >> @@ -1528,6 +1529,11 @@ static int gpmc_probe_dt(struct platform_device *pdev) >> return ret; >> } >> >> + ret = gpio_request_one(176, GPIOF_IN, "smsc911x irq"); >> + if (ret) { >> + pr_err("Failed to request IRQ GPIO%d\n", 176); >> + return ret; >> + } >> + >> for_each_node_by_name(child, "nand") { >> ret = gpmc_probe_nand_child(pdev, child); >> if (ret < 0) { >> >> This solves the issue of the non-initialized GPIO bank before that >> makes the kernel to hang. Since I've to configure the IRQ polarity as >> active low level-sensitive on my board and the flags are not set by >> the IRQ core, I've another ugly hack that forces this: >> >> diff --git a/drivers/net/ethernet/smsc/smsc911x.c >> b/drivers/net/ethernet/smsc/smsc >> index da5cc9a..27e46f9 100644 >> --- a/drivers/net/ethernet/smsc/smsc911x.c >> +++ b/drivers/net/ethernet/smsc/smsc911x.c >> @@ -2390,6 +2390,9 @@ static int smsc911x_drv_probe(struct >> platform_device *pdev) >> pdata = netdev_priv(dev); >> dev->irq = irq_res->start; >> - irq_flags = irq_res->flags & IRQF_TRIGGER_MASK; >> + irq_flags = IRQF_TRIGGER_LOW; >> pdata->ioaddr = ioremap_nocache(res->start, res_size); >> >> pdata->dev = dev; >> >> > Thanks >> > -- Christoph >> > >> >> I hope to find some time this week to work on this and at least find a >> solution for the second issue (IORESOURCE_IRQ struct resource flags >> not being set). > > Any updates on this issue? > Yes, my last approach to solve the IRQ flags not saved on the IORESOURCE_IRQ struct resource issue is to add a new irq_get_trigger_type() function to get the edge/level flags from an IRQ number and use that function on the smsc911x driver probe function to get the IRQ flags. The patch-set is composed of these patches: [PATCH v2 1/2] genirq: add function to get IRQ edge/level flags [1] [PATCH 2/2] net: smsc911x: get IRQ flags from chip if not present in IORESOURCE_IRQ [2] and the cover letter is this [3] It would be great if you can test these patches and give some feedback. > For me it works when doing this in the device tree: > > +&omap3_pmx_wkup { > + pinctrl-names = "default"; > + > + lan9221_pins: pinmux_lan9221_pins { > + pinctrl-single,pins = < > + 0x5A 0x104 /* gpio_129, INPUT | MODE4 */ > + >; > + }; > +}; > + > <SNIP> > + lan9221@15000000 { > + compatible = "smsc,lan9221", "smsc,lan9115"; > + reg = <0x15000000 0x400>; If I understood correctly your smsc ethernet chip is connected to the OMAP through the GPMC, then you should use a chip-select, base address and size instead of the physical address and size. Do you have commit 5330dc161 ("ARM: OMAP2+: Add GPMC DT support for Ethernet child nodes") already on your tree? [4] > + phy-mode = "mii"; > + interrupt-parent = <&gpio5>; > + interrupts = <1 0x2>; /* gpio_129, trigger: falling-edge */ I'm confused here, do you get the IRQ_TYPE_EDGE_FALLING (0x2) trigger type flag on the smsc911x driver probe function? > + reg-io-width = <4>; > + vdd33a-supply = <®_vcc3>; > + vddvario-supply = <®_vcc3>; > + pinctrl-names = "default"; > + pinctrl-0 = <&lan9221_pins>; > + }; > > but in arch/arm/mach-omap2/gpmc.c gpmc_probe_dt() I still need this > hack: > > + ret = gpio_request_one(129, GPIOF_IN, "lan9221 irq"); > + if (ret) { > + pr_err("Failed to request IRQ GPIO%d\n", 129); > + return ret; > + } > Yes, this hack is still needed until we figure out how to enable the GPIO bank before a call to request_irq() is made. > The following patches (already sent mainline) are also applied: > "arm/dts: OMAP3: fix pinctrl-single configuration" > "net: smsc911x: adopt pinctrl support" > Yes, but that patch is not needed anymore from 3.9, look at this [5] > Thanks > -- Christoph > Best regards, Javier [1]: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg88241.html [2]: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg88225.html [3]: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg88224.html [4]: https://patchwork.kernel.org/patch/2273851/ [5]: http://marc.info/?l=linux-kernel&m=135887740715083&w=2
On Sat, 2013-04-13 at 20:30 +0200, Javier Martinez Canillas wrote: > On Sat, Apr 13, 2013 at 7:42 PM, Christoph Fritz > <chf.fritz@googlemail.com> wrote: > Yes, my last approach to solve the IRQ flags not saved on the > IORESOURCE_IRQ struct resource issue is to add a new > irq_get_trigger_type() function to get the edge/level flags from an > IRQ number and use that function on the smsc911x driver probe function > to get the IRQ flags. > > The patch-set is composed of these patches: > > [PATCH v2 1/2] genirq: add function to get IRQ edge/level flags [1] > [PATCH 2/2] net: smsc911x: get IRQ flags from chip if not present in > IORESOURCE_IRQ [2] > > and the cover letter is this [3] > > It would be great if you can test these patches and give some feedback. > > > For me it works when doing this in the device tree: > > > > +&omap3_pmx_wkup { > > + pinctrl-names = "default"; > > + > > + lan9221_pins: pinmux_lan9221_pins { > > + pinctrl-single,pins = < > > + 0x5A 0x104 /* gpio_129, INPUT | MODE4 */ > > + >; > > + }; > > +}; > > + > > <SNIP> > > + lan9221@15000000 { > > + compatible = "smsc,lan9221", "smsc,lan9115"; > > + reg = <0x15000000 0x400>; > > If I understood correctly your smsc ethernet chip is connected to the > OMAP through the GPMC, then you should use a chip-select, base address > and size instead of the physical address and size. Yes, it's connected with GPMC. > Do you have commit 5330dc161 ("ARM: OMAP2+: Add GPMC DT support for > Ethernet child nodes") already on your tree? [4] No I haven't. > > > + phy-mode = "mii"; > > + interrupt-parent = <&gpio5>; > > + interrupts = <1 0x2>; /* gpio_129, trigger: falling-edge */ > > I'm confused here, do you get the IRQ_TYPE_EDGE_FALLING (0x2) trigger > type flag on the smsc911x driver probe function? I added printks for irq_res->flags and irq_flags: [ 1.259857] smsc911x_drv_probe, 2396, irq_res->flags 0x00000400 [ 1.266113] smsc911x_drv_probe, 2397, irq_flags 0x00000000 So the answer is no. But weird that the smsc911x works nevertheless. > > > + reg-io-width = <4>; > > + vdd33a-supply = <®_vcc3>; > > + vddvario-supply = <®_vcc3>; > > + pinctrl-names = "default"; > > + pinctrl-0 = <&lan9221_pins>; > > + }; > > > > but in arch/arm/mach-omap2/gpmc.c gpmc_probe_dt() I still need this > > hack: > > > > + ret = gpio_request_one(129, GPIOF_IN, "lan9221 irq"); > > + if (ret) { > > + pr_err("Failed to request IRQ GPIO%d\n", 129); > > + return ret; > > + } > > > > Yes, this hack is still needed until we figure out how to enable the > GPIO bank before a call to request_irq() is made. > > > The following patches (already sent mainline) are also applied: > > "arm/dts: OMAP3: fix pinctrl-single configuration" > > "net: smsc911x: adopt pinctrl support" > > > > Yes, but that patch is not needed anymore from 3.9, look at this [5] > > [1]: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg88241.html > [2]: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg88225.html > [3]: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg88224.html > [4]: https://patchwork.kernel.org/patch/2273851/ > [5]: http://marc.info/?l=linux-kernel&m=135887740715083&w=2 Thanks -- Christoph
On Sat, Apr 13, 2013 at 8:59 PM, Christoph Fritz <chf.fritz@googlemail.com> wrote: > On Sat, 2013-04-13 at 20:30 +0200, Javier Martinez Canillas wrote: >> On Sat, Apr 13, 2013 at 7:42 PM, Christoph Fritz >> <chf.fritz@googlemail.com> wrote: > >> Yes, my last approach to solve the IRQ flags not saved on the >> IORESOURCE_IRQ struct resource issue is to add a new >> irq_get_trigger_type() function to get the edge/level flags from an >> IRQ number and use that function on the smsc911x driver probe function >> to get the IRQ flags. >> >> The patch-set is composed of these patches: >> >> [PATCH v2 1/2] genirq: add function to get IRQ edge/level flags [1] >> [PATCH 2/2] net: smsc911x: get IRQ flags from chip if not present in >> IORESOURCE_IRQ [2] >> >> and the cover letter is this [3] >> >> It would be great if you can test these patches and give some feedback. >> >> > For me it works when doing this in the device tree: >> > >> > +&omap3_pmx_wkup { >> > + pinctrl-names = "default"; >> > + >> > + lan9221_pins: pinmux_lan9221_pins { >> > + pinctrl-single,pins = < >> > + 0x5A 0x104 /* gpio_129, INPUT | MODE4 */ >> > + >; >> > + }; >> > +}; >> > + >> > <SNIP> >> > + lan9221@15000000 { >> > + compatible = "smsc,lan9221", "smsc,lan9115"; >> > + reg = <0x15000000 0x400>; >> >> If I understood correctly your smsc ethernet chip is connected to the >> OMAP through the GPMC, then you should use a chip-select, base address >> and size instead of the physical address and size. > > Yes, it's connected with GPMC. > >> Do you have commit 5330dc161 ("ARM: OMAP2+: Add GPMC DT support for >> Ethernet child nodes") already on your tree? [4] > > No I haven't. > In that case you should have that commit on your tree. But the GPMC driver has changed a lot for 3.9 and 3.10, so I recommend you to base your work on linux-next that has the latest changes. And then you will need something like this on your DT (in this example is using the chip-select 5 but adjust according to your board): gpmc: gpmc@6e000000 { compatible = "ti,omap3430-gpmc"; ti,hwmods = "gpmc"; reg = <0x6e000000 0x1000>; interrupts = <20>; gpmc,num-cs = <8>; gpmc,num-waitpins = <4>; #address-cells = <2>; #size-cells = <1>; ranges = <5 0 0x2c000000 0x1000000>; ethernet@5,0 { pinctrl-names = "default"; pinctrl-0 = <&lan9221_pins>; compatible = "smsc,lan9221", "smsc,lan9115"; reg = <5 0 0xff>; bank-width = <2>; gpmc,mux-add-data; gpmc,cs-on-ns = <0>; gpmc,cs-rd-off-ns = <186>; gpmc,cs-wr-off-ns = <186>; gpmc,adv-on-ns = <12>; gpmc,adv-rd-off-ns = <48>; gpmc,adv-wr-off-ns = <48>; gpmc,oe-on-ns = <54>; gpmc,oe-off-ns = <168>; gpmc,we-on-ns = <54>; gpmc,we-off-ns = <168>; gpmc,rd-cycle-ns = <186>; gpmc,wr-cycle-ns = <186>; gpmc,access-ns = <114>; gpmc,page-burst-access-ns = <6>; gpmc,bus-turnaround-ns = <12>; gpmc,cycle2cycle-delay-ns = <18>; gpmc,wr-data-mux-bus-ns = <90>; gpmc,wr-access-ns = <186>; gpmc,cycle2cycle-samecsen; gpmc,cycle2cycle-diffcsen; interrupt-parent = <&gpio5>; interrupts = <1 0x2>; reg-io-width = <4>; vdd33a-supply = <®_vcc3>; vmmc_aux-supply = <&vdd33a>; vddvario-supply = <®_vcc3>; }; }; >> >> > + phy-mode = "mii"; >> > + interrupt-parent = <&gpio5>; >> > + interrupts = <1 0x2>; /* gpio_129, trigger: falling-edge */ >> >> I'm confused here, do you get the IRQ_TYPE_EDGE_FALLING (0x2) trigger >> type flag on the smsc911x driver probe function? > > I added printks for irq_res->flags and irq_flags: > [ 1.259857] smsc911x_drv_probe, 2396, irq_res->flags 0x00000400 > [ 1.266113] smsc911x_drv_probe, 2397, irq_flags 0x00000000 > > So the answer is no. But weird that the smsc911x works nevertheless. > Yes, that's what I thought. You will need patch [1] and [2] to allow smsc911x driver to get the GPIO-IRQ trigger type flags. With those patches + linux-next + the device node I posted above + your gpio_request_one() hack on gpmc_probe_dt() should be enough to have your smsc ethernet chip working on your board. >> >> > + reg-io-width = <4>; >> > + vdd33a-supply = <®_vcc3>; >> > + vddvario-supply = <®_vcc3>; >> > + pinctrl-names = "default"; >> > + pinctrl-0 = <&lan9221_pins>; >> > + }; >> > >> > but in arch/arm/mach-omap2/gpmc.c gpmc_probe_dt() I still need this >> > hack: >> > >> > + ret = gpio_request_one(129, GPIOF_IN, "lan9221 irq"); >> > + if (ret) { >> > + pr_err("Failed to request IRQ GPIO%d\n", 129); >> > + return ret; >> > + } >> > >> >> Yes, this hack is still needed until we figure out how to enable the >> GPIO bank before a call to request_irq() is made. >> >> > The following patches (already sent mainline) are also applied: >> > "arm/dts: OMAP3: fix pinctrl-single configuration" >> > "net: smsc911x: adopt pinctrl support" >> > >> >> Yes, but that patch is not needed anymore from 3.9, look at this [5] >> >> [1]: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg88241.html >> [2]: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg88225.html >> [3]: http://www.mail-archive.com/linux-omap@vger.kernel.org/msg88224.html >> [4]: https://patchwork.kernel.org/patch/2273851/ >> [5]: http://marc.info/?l=linux-kernel&m=135887740715083&w=2 > > Thanks > -- Christoph > > Best regards, Javier
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 90c15ee..d594e1d 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -14,6 +14,7 @@ */ #undef DEBUG +#include <linux/gpio.h> #include <linux/irq.h> #include <linux/kernel.h> #include <linux/init.h> @@ -1528,6 +1529,11 @@ static int gpmc_probe_dt(struct platform_device *pdev) return ret; } + ret = gpio_request_one(176, GPIOF_IN, "smsc911x irq"); + if (ret) { + pr_err("Failed to request IRQ GPIO%d\n", 176); + return ret; + } + for_each_node_by_name(child, "nand") { ret = gpmc_probe_nand_child(pdev, child); if (ret < 0) { This solves the issue of the non-initialized GPIO bank before that makes the kernel to hang. Since I've to configure the IRQ polarity as active low level-sensitive on my board and the flags are not set by the IRQ core, I've another ugly hack that forces this: diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc index da5cc9a..27e46f9 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c @@ -2390,6 +2390,9 @@ static int smsc911x_drv_probe(struct platform_device *pdev) pdata = netdev_priv(dev); dev->irq = irq_res->start; - irq_flags = irq_res->flags & IRQF_TRIGGER_MASK; + irq_flags = IRQF_TRIGGER_LOW; pdata->ioaddr = ioremap_nocache(res->start, res_size); pdata->dev = dev; > Thanks