From: Russell King <rmk@arm.linux.org.uk>
To: Pavel Machek <pma@sysgo.com>
Cc: kernel list <linux-kernel@vger.kernel.org>,
cko@sysgo.com, linux@dominikbrodowski.net, eric.miao@marvell.com
Subject: Re: pcmcia vs. MECR on pxa25x/sa1111
Date: Tue, 1 Feb 2011 12:59:21 +0000 [thread overview]
Message-ID: <20110201125921.GA7984@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20110201120303.GA30464@pma.sysgo.com>
On Tue, Feb 01, 2011 at 01:03:03PM +0100, Pavel Machek wrote:
>
> After 2.6.34 changes, __pxa2xx_drv_pcmcia_probe() was replaced by
> sa1111_pcmcia_add(). That unfortunately means that configure_sockets()
> is not called, leading to MECR not being set properly, leading to
> strange crashes.
>
> Tested on pxa255+sa1111, I do not have lubbock board nearby. Perhaps
> cleaner solution exists?
>
> Signed-off-by: Pavel Machek <pma@sysgo.com>
>
>
> --- a/drivers/pcmcia/pxa2xx_base.c
> +++ b/drivers/pcmcia/pxa2xx_base.c
> @@ -204,10 +204,10 @@ pxa2xx_pcmcia_frequency_change(struct soc_pcmcia_socket *skt,
> }
> #endif
>
> -static void pxa2xx_configure_sockets(struct device *dev)
> +void pxa2xx_configure_sockets(struct device *dev)
> {
> struct pcmcia_low_level *ops = dev->platform_data;
>
> /*
> * We have at least one socket, so set MECR:CIT
> * (Card Is There)
> diff --git a/drivers/pcmcia/pxa2xx_lubbock.c b/drivers/pcmcia/pxa2xx_lubbock.c
> --- a/drivers/pcmcia/pxa2xx_lubbock.c
> +++ b/drivers/pcmcia/pxa2xx_lubbock.c
> @@ -209,6 +209,8 @@ static struct pcmcia_low_level lubbock_pcmcia_ops = {
>
> #include "pxa2xx_base.h"
>
> +extern void pxa2xx_configure_sockets(struct device *dev);
> +
Please put function prototypes in header files.
> int pcmcia_lubbock_init(struct sa1111_dev *sadev)
> {
> int ret = -ENODEV;
> @@ -228,6 +230,7 @@ int pcmcia_lubbock_init(struct sa1111_dev *sadev)
> pxa2xx_drv_pcmcia_ops(&lubbock_pcmcia_ops);
> ret = sa1111_pcmcia_add(sadev, &lubbock_pcmcia_ops,
> pxa2xx_drv_pcmcia_add_one);
> + pxa2xx_configure_sockets(&(sadev->dev));
Additional parens not required.
While making this a visible function, it may also make sense to
change it from taking a struct device pointer to taking the
struct pcmcia_low_level pointer which is really what its after.
Lastly the ordering of pxa2xx_configure_sockets() is wrong - doing
setup after adding sockets is racy. That's probably something which
should fixed in the pxa2xx code too.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
next prev parent reply other threads:[~2011-02-01 12:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-01 12:03 pcmcia vs. MECR on pxa25x/sa1111 Pavel Machek
2011-02-01 12:59 ` Russell King [this message]
2011-02-04 8:03 ` Pavel Machek
2011-02-16 7:25 ` Dominik Brodowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110201125921.GA7984@flint.arm.linux.org.uk \
--to=rmk@arm.linux.org.uk \
--cc=cko@sysgo.com \
--cc=eric.miao@marvell.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@dominikbrodowski.net \
--cc=pma@sysgo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox