From 1e72d3c6223dd5008955797a6e7f8bf167420e1e Mon Sep 17 00:00:00 2001 From: Robert Jarzmik Date: Sat, 11 Apr 2015 23:42:42 +0200 Subject: net: smc1111: add a quirk for pxa pxa27x platforms As hinted in the linux kernel driver, pxa platforms such as mainstone, stargate and idp have a broken design, where half-word writes not aligned to a word address are not working. This patch is a taking back the half-word write accessor for this specific case from the linux kernel. Signed-off-by: Robert Jarzmik Signed-off-by: Sascha Hauer --- drivers/net/smc91111.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'drivers') diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c index 709a7402e4..c0cf42ad82 100644 --- a/drivers/net/smc91111.c +++ b/drivers/net/smc91111.c @@ -560,6 +560,20 @@ static inline void a32_insl(void __iomem *base, unsigned int offset, void *data, readsl(base + (offset << shift), data, count); } +static void a16_outw_algn4(unsigned value, void __iomem *base, + unsigned int offset, unsigned shift) +{ + u32 v; + + if ((offset << shift) & 2) { + v = value << 16; + v |= (a32_inl(base, offset & ~2, shift) & 0xffff); + a32_outl(v, base, offset & ~2, shift); + } else { + writew(value, base + (offset << shift)); + } +} + static const struct accessors access_via_16bit = { .ob = a8_outb, .ow = a16_outw, @@ -583,6 +597,18 @@ static const struct accessors access_via_32bit = { .isl = a32_insl, }; +/* access happens via a 32 bit bus, writes must by word aligned */ +static const struct accessors access_via_32bit_aligned_short_writes = { + .ob = a8_outb, + .ow = a16_outw_algn4, + .ol = a32_outl, + .osl = a32_outsl, + .ib = a8_inb, + .iw = a16_inw, + .il = a32_inl, + .isl = a32_insl, +}; + /* ------------------------------------------------------------------------ */ static unsigned last_bank; @@ -1435,6 +1461,9 @@ static int smc91c111_probe(struct device_d *dev) priv->shift = pdata->addr_shift; if (pdata->bus_width == 16) priv->a = access_via_16bit; + if (((pdata->bus_width == 0) || (pdata->bus_width == 32)) && + (pdata->word_aligned_short_writes)) + priv->a = access_via_32bit_aligned_short_writes; priv->config_setup = pdata->config_setup; priv->control_setup = pdata->control_setup; } -- cgit v1.2.3