* Re: [PATCH] ASoC: fsl_sai: Add asynchronous mode support
From: Mark Brown @ 2014-08-07 9:45 UTC (permalink / raw)
To: Nicolin Chen
Cc: mark.rutland, devicetree, alsa-devel, pawel.moll, ijc+devicetree,
b42378, b02247, linux-kernel, robh+dt, timur, Li.Xiubo, galak,
linuxppc-dev
In-Reply-To: <1407223925-29678-1-git-send-email-nicoleotsuka@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1085 bytes --]
On Tue, Aug 05, 2014 at 03:32:05PM +0800, Nicolin Chen wrote:
> From: Nicolin Chen <Guangyu.Chen@freescale.com>
>
> SAI supports these operation modes:
> 1) asynchronous mode
> Both Tx and Rx are set to be asynchronous.
> 2) synchronous mode (Rx sync with Tx)
> Tx is set to be asynchronous, Rx is set to be synchronous.
> 3) synchronous mode (Tx sync with Rx)
> Rx is set to be asynchronous, Tx is set to be synchronous.
> 4) synchronous mode (Tx/Rx sync with another SAI's Tx)
> 5) synchronous mode (Tx/Rx sync with another SAI's Rx)
This seems to conflict with something else on my branch - not checked
what. Can you take a look please?
> +Note:
> +- If both fsl,sai-asynchronous and fsl,sai-synchronous-rx are absent, the
> + default synchronous mode (sync Rx with Tx) will be used, which means both
> + transimitter and receiver will send and receive data by following clocks
> + of transimitter.
> +- fsl,sai-asynchronous will be ignored if fsl,sai-synchronous-rx property is
> + already present.
Might be worth printing an error here.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: [PATCH] ASoC: fsl_sai: Add asynchronous mode support
From: Nicolin Chen @ 2014-08-07 9:44 UTC (permalink / raw)
To: Mark Brown
Cc: mark.rutland, devicetree, alsa-devel, pawel.moll, ijc+devicetree,
b42378, b02247, linux-kernel, robh+dt, timur, Nicolin Chen,
Li.Xiubo, galak, linuxppc-dev
In-Reply-To: <20140807094527.GC17528@sirena.org.uk>
On Thu, Aug 07, 2014 at 10:45:27AM +0100, Mark Brown wrote:
> On Tue, Aug 05, 2014 at 03:32:05PM +0800, Nicolin Chen wrote:
> > From: Nicolin Chen <Guangyu.Chen@freescale.com>
> >
> > SAI supports these operation modes:
> > 1) asynchronous mode
> > Both Tx and Rx are set to be asynchronous.
> > 2) synchronous mode (Rx sync with Tx)
> > Tx is set to be asynchronous, Rx is set to be synchronous.
> > 3) synchronous mode (Tx sync with Rx)
> > Rx is set to be asynchronous, Tx is set to be synchronous.
> > 4) synchronous mode (Tx/Rx sync with another SAI's Tx)
> > 5) synchronous mode (Tx/Rx sync with another SAI's Rx)
>
> This seems to conflict with something else on my branch - not checked
> what. Can you take a look please?
Ah...there is another patch that should haven been merged into for-next
is currently missing on the remote branch.
This one:
http://mailman.alsa-project.org/pipermail/alsa-devel/2014-August/079689.html
> > +Note:
> > +- If both fsl,sai-asynchronous and fsl,sai-synchronous-rx are absent, the
> > + default synchronous mode (sync Rx with Tx) will be used, which means both
> > + transimitter and receiver will send and receive data by following clocks
> > + of transimitter.
> > +- fsl,sai-asynchronous will be ignored if fsl,sai-synchronous-rx property is
> > + already present.
>
> Might be worth printing an error here.
Hmm...Do I need to send a v2?
Thank you
Nicolin
^ permalink raw reply
* Re: [PATCH] ASoC: fsl_sai: Add asynchronous mode support
From: Mark Brown @ 2014-08-07 10:05 UTC (permalink / raw)
To: Nicolin Chen
Cc: mark.rutland, devicetree, alsa-devel, pawel.moll, ijc+devicetree,
b42378, b02247, linux-kernel, robh+dt, timur, Nicolin Chen,
Li.Xiubo, galak, linuxppc-dev
In-Reply-To: <20140807094404.GB3088@MrMyself>
[-- Attachment #1: Type: text/plain, Size: 229 bytes --]
On Thu, Aug 07, 2014 at 05:44:05PM +0800, Nicolin Chen wrote:
> On Thu, Aug 07, 2014 at 10:45:27AM +0100, Mark Brown wrote:
> > Might be worth printing an error here.
> Hmm...Do I need to send a v2?
Send an incremental patch.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: [PATCH] ASoC: fsl_sai: Add asynchronous mode support
From: Mark Brown @ 2014-08-07 11:19 UTC (permalink / raw)
To: Nicolin Chen
Cc: mark.rutland, devicetree, alsa-devel, pawel.moll, ijc+devicetree,
b42378, b02247, linux-kernel, robh+dt, timur, Li.Xiubo, galak,
linuxppc-dev
In-Reply-To: <1407223925-29678-1-git-send-email-nicoleotsuka@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
On Tue, Aug 05, 2014 at 03:32:05PM +0800, Nicolin Chen wrote:
> From: Nicolin Chen <Guangyu.Chen@freescale.com>
>
> SAI supports these operation modes:
> 1) asynchronous mode
> Both Tx and Rx are set to be asynchronous.
Applied, thanks.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: [alsa-devel] [PATCH V2 2/2] Revert "ASoC: fsl-esai: Add .xlate_tdm_slot_mask() support."
From: Nicolin Chen @ 2014-08-07 12:09 UTC (permalink / raw)
To: Shengjiu Wang
Cc: fabio.estevam, alsa-devel, timur, arnd, shc_work, tiwai, Li.Xiubo,
lgirdwood, perex, nicoleotsuka, broonie, linuxppc-dev,
linux-kernel
In-Reply-To: <5627d0f839900c33b1c15de4c21f745015d3e19d.1407403727.git.shengjiu.wang@freescale.com>
Hi Shengjiu,
On Thu, Aug 07, 2014 at 05:33:25PM +0800, Shengjiu Wang wrote:
> This reverts commit a603c8ee526f5ea9ad9b40710308766299ad8a69.
>
> fsl_asoc_xlate_tdm_slot_mask() will invert the mask, which isn't fit for
> esai. The default function snd_soc_xlate_tdm_slot_mask() is ok for esai.
You should describe why that doesn't fit for ESAI and what's the result
if keeping it.
Thank you,
Nicolin
>
> Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
> ---
> sound/soc/fsl/Kconfig | 1 -
> sound/soc/fsl/fsl_esai.c | 2 --
> 2 files changed, 3 deletions(-)
>
> diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
> index f54a8fc..f3012b6 100644
> --- a/sound/soc/fsl/Kconfig
> +++ b/sound/soc/fsl/Kconfig
> @@ -49,7 +49,6 @@ config SND_SOC_FSL_ESAI
> tristate "Enhanced Serial Audio Interface (ESAI) module support"
> select REGMAP_MMIO
> select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
> - select SND_SOC_FSL_UTILS
> help
> Say Y if you want to add Enhanced Synchronous Audio Interface
> (ESAI) support for the Freescale CPUs.
> diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c
> index f252370..b2f6b3e 100644
> --- a/sound/soc/fsl/fsl_esai.c
> +++ b/sound/soc/fsl/fsl_esai.c
> @@ -18,7 +18,6 @@
>
> #include "fsl_esai.h"
> #include "imx-pcm.h"
> -#include "fsl_utils.h"
>
> #define FSL_ESAI_RATES SNDRV_PCM_RATE_8000_192000
> #define FSL_ESAI_FORMATS (SNDRV_PCM_FMTBIT_S8 | \
> @@ -612,7 +611,6 @@ static struct snd_soc_dai_ops fsl_esai_dai_ops = {
> .hw_params = fsl_esai_hw_params,
> .set_sysclk = fsl_esai_set_dai_sysclk,
> .set_fmt = fsl_esai_set_dai_fmt,
> - .xlate_tdm_slot_mask = fsl_asoc_xlate_tdm_slot_mask,
> .set_tdm_slot = fsl_esai_set_dai_tdm_slot,
> };
>
> --
> 1.7.9.5
>
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply
* Re: qe: move qe from arch/powerpc to drivers
From: Scott Wood @ 2014-08-07 17:15 UTC (permalink / raw)
To: Zhao Qiang-B45475; +Cc: linuxppc-dev@lists.ozlabs.org, Xie Xiaobo-R63061
In-Reply-To: <4fff14ebe11b44e997bbdc75f240356b@BLUPR03MB341.namprd03.prod.outlook.com>
On Thu, 2014-08-07 at 04:15 -0500, Zhao Qiang-B45475 wrote:
> On Thu, Aug 7, 2014 at 4:16 AM, Wood Scott wrote:
>
>
> > -----Original Message-----
> > From: Wood Scott-B07421
> > Sent: Thursday, August 07, 2014 4:16 AM
> > To: Zhao Qiang-B45475
> > Cc: linuxppc-dev@lists.ozlabs.org; Xie Xiaobo-R63061
> > Subject: Re: qe: move qe from arch/powerpc to drivers
> >
> > On Wed, 2014-08-06 at 03:53 -0500, Zhao Qiang-B45475 wrote:
> > > On Wed, Jul 30, 2014 at 08:19 AM, Wood Scott wrote:
> > >
> > >
> > > > -----Original Message-----
> > > > From: Wood Scott-B07421
> > > > Sent: Wednesday, July 30, 2014 8:19 AM
> > > > To: Zhao Qiang-B45475
> > > > Cc: linuxppc-dev@lists.ozlabs.org; Wood Scott-B07421; Xie
> > > > Xiaobo-R63061
> > > > Subject: Re: qe: move qe from arch/powerpc to drivers
> > > >
> > > > On Tue, Jun 24, 2014 at 11:31:52AM +0800, Zhao Qiang wrote:
> > > > > ls1 has qe and ls1 has arm cpu.
> > > > > move qe from arch/powerpc to drivers.
> > > > >
> > > > > Signed-off-by: Zhao Qiang <B45475@freescale.com>
> > > >
> > > > This is a very terse changelog. Explain more about what QE is, and
> > > > what this patch accomplishes (it doesn't seem to get rid of the PPC
> > > > dependency, just moving code at this stage)
> > > >
> > > > I don't see a MAINTAINERS update for the new path. Who is going to
> > > > maintain it?
> > > >
> > > > I don't think drivers/qe is the right place for it. Directories
> > > > directly under drivers/ tend to be for classes of devices, not
> > > > instances. In any case, LKML should be CCed when creating a new
> > > > directory directly under drivers/ or under a subdirectory of
> > > > drivers/ that doesn't have its own mailing list.
> > >
> > > So which directory do you recommend?
> >
> > drivers/soc/
> >
> > > Actually qe is a kind of IP block, so in my opinion, it is proper to
> > put it under driver/(just in my opinion).
> >
> > No, it isn't a type of device (e.g. "ethernet" or "tty"). It's an
> > abbreviation of a trademark for a specific multipurpose I/O architecture.
>
> So which directory do you recommend？
Please see about 10 lines up. :-P
-Scott
^ permalink raw reply
* Re: qe: move qe from arch/powerpc to drivers
From: Timur Tabi @ 2014-08-07 18:57 UTC (permalink / raw)
To: qiang.zhao@freescale.com
Cc: Scott Wood, linuxppc-dev@lists.ozlabs.org, Xiaobo Xie
In-Reply-To: <61b449dd79754d25ace3701ccebe10e2@BLUPR03MB341.namprd03.prod.outlook.com>
On Wed, Aug 6, 2014 at 3:53 AM, qiang.zhao@freescale.com
<qiang.zhao@freescale.com> wrote:
>
> Actually qe is a kind of IP block, so in my opinion, it is proper to put it under driver/(just in my opinion).
The QE library is not a driver, however. It doesn't register as a
driver with the kernel.
Scott suggests drivers/soc. I'm not crazy about that, but I don't
maintain that code any more.
^ permalink raw reply
* Re: qe: move qe from arch/powerpc to drivers
From: Scott Wood @ 2014-08-07 20:08 UTC (permalink / raw)
To: Timur Tabi
Cc: qiang.zhao@freescale.com, linuxppc-dev@lists.ozlabs.org,
Xiaobo Xie
In-Reply-To: <CAOZdJXW4yw0i2jRALoXUbGudh1_V5fzath_G5yW=Wkz3kreqzA@mail.gmail.com>
On Thu, 2014-08-07 at 13:57 -0500, Timur Tabi wrote:
> On Wed, Aug 6, 2014 at 3:53 AM, qiang.zhao@freescale.com
> <qiang.zhao@freescale.com> wrote:
> >
> > Actually qe is a kind of IP block, so in my opinion, it is proper to put it under driver/(just in my opinion).
>
> The QE library is not a driver, however. It doesn't register as a
> driver with the kernel.
It isn't a complete driver, but it is driver code.
> Scott suggests drivers/soc. I'm not crazy about that, but I don't
> maintain that code any more.
Do you have a better suggestion?
-Scott
^ permalink raw reply
* Re: qe: move qe from arch/powerpc to drivers
From: Timur Tabi @ 2014-08-07 20:09 UTC (permalink / raw)
To: Scott Wood
Cc: qiang.zhao@freescale.com, linuxppc-dev@lists.ozlabs.org,
Xiaobo Xie
In-Reply-To: <1407442120.7427.56.camel@snotra.buserror.net>
On 08/07/2014 03:08 PM, Scott Wood wrote:
>> >Scott suggests drivers/soc. I'm not crazy about that, but I don't
>> >maintain that code any more.
> Do you have a better suggestion?
Leave it where it is?
^ permalink raw reply
* Re: qe: move qe from arch/powerpc to drivers
From: Scott Wood @ 2014-08-07 20:11 UTC (permalink / raw)
To: Timur Tabi
Cc: qiang.zhao@freescale.com, linuxppc-dev@lists.ozlabs.org,
Xiaobo Xie
In-Reply-To: <53E3DD0E.7040802@tabi.org>
On Thu, 2014-08-07 at 15:09 -0500, Timur Tabi wrote:
> On 08/07/2014 03:08 PM, Scott Wood wrote:
> >> >Scott suggests drivers/soc. I'm not crazy about that, but I don't
> >> >maintain that code any more.
>
> > Do you have a better suggestion?
>
> Leave it where it is?
We need it on ARM as well.
-Scott
^ permalink raw reply
* Re: qe: move qe from arch/powerpc to drivers
From: Timur Tabi @ 2014-08-07 20:13 UTC (permalink / raw)
To: Scott Wood
Cc: qiang.zhao@freescale.com, linuxppc-dev@lists.ozlabs.org,
Xiaobo Xie
In-Reply-To: <1407442268.7427.57.camel@snotra.buserror.net>
On 08/07/2014 03:11 PM, Scott Wood wrote:
>>> > >Do you have a better suggestion?
>> >
>> >Leave it where it is?
> We need it on ARM as well.
In that case, drivers/soc is the least-bad option.
^ permalink raw reply
* [PATCH] deb-pkg: support ppc64 and ppc64el Debian archs
From: Thadeu Lima de Souza Cascardo @ 2014-08-07 20:32 UTC (permalink / raw)
To: mmarek
Cc: brenohl, linuxppc-dev, linux-kernel,
Thadeu Lima de Souza Cascardo, linux-kbuild
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
---
scripts/package/builddeb | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 35d5a58..c26c28b 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -36,6 +36,8 @@ create_package() {
debarch=sparc ;;
s390*)
debarch=s390$(grep -q CONFIG_64BIT=y $KCONFIG_CONFIG && echo x || true) ;;
+ ppc64*)
+ debarch=ppc64$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el || true) ;;
ppc*)
debarch=powerpc ;;
parisc*)
--
1.7.1
^ permalink raw reply related
* [PATCH] net: fs_enet: fix reference counting for phy_node
From: Uwe Kleine-König @ 2014-08-07 21:06 UTC (permalink / raw)
To: Florian Fainelli; +Cc: netdev, linuxppc-dev, kernel, Vitaly Bordug
Make sure that fs_enet_probe is left with a reference to the phy node.
In the presence of a phy handle this is already the case as
of_parse_phandle returns a reference. In the fixed phy case a call to
of_node_get is necessary. Otherwise the error path and remove function
drop a reference the driver isn't holding.
Fixes: bb74d9a4a87b ("fs_enet: use the new fixed PHY helpers")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index cfaf17b70f3f..748fd24d3d9e 100644
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -1033,7 +1033,7 @@ static int fs_enet_probe(struct platform_device *ofdev)
/* In the case of a fixed PHY, the DT node associated
* to the PHY is the Ethernet MAC DT node.
*/
- fpi->phy_node = ofdev->dev.of_node;
+ fpi->phy_node = of_node_get(ofdev->dev.of_node);
}
if (of_device_is_compatible(ofdev->dev.of_node, "fsl,mpc5125-fec")) {
--
2.0.1
^ permalink raw reply related
* Re: [PATCH v2 00/12] defconfigs: add MTD_SPI_NOR (new subsystem dependency for M25P80)
From: Geert Uytterhoeven @ 2014-08-07 21:36 UTC (permalink / raw)
To: Brian Norris
Cc: Andrew Lunn, Stephen Warren, Linux MIPS Mailing List,
Nicolas Ferre, Thierry Reding, MTD Maling List, Marek Vasut,
Russell King, Linux-sh list, Shawn Guo,
Jean-Christophe Plagniol-Villard, Sebastian Hesselbarth,
Roland Stigge, Jason Cooper, Arnd Bergmann, Steven Miao,
adi-buildroot-devel@lists.sourceforge.net, Simon Horman,
linux-tegra, Andrew Victor, linux-arm-kernel@lists.infradead.org,
Linux Kernel, Ralf Baechle, Huang Shijie, Santosh Shilimkar,
Sascha Hauer, Olof Johansson, Paul Mackerras,
linuxppc-dev@lists.ozlabs.org
In-Reply-To: <1398925607-7482-1-git-send-email-computersforpeace@gmail.com>
Hi Brian,
On Thu, May 1, 2014 at 8:26 AM, Brian Norris
<computersforpeace@gmail.com> wrote:
> v1 --> v2: split ARM defconfig changes into their sub-architectures. No change
> in the overall diff.
>
> Hi all,
>
> We are introducing a new SPI-NOR subsystem/framework for MTD, to support
> various types of SPI-NOR flash controllers which require (or benefit from)
> intimate knowledge of the flash interface, rather than just the relatively dumb
> SPI interface. This framework borrows much of the m25p80 driver for its
> abstraction and moves this code into a spi-nor module.
>
> This means CONFIG_M25P80 now has a dependency on CONFIG_MTD_SPI_NOR, which
> should be added to the defconfigs. I expect that each (sub)architecture
> maintainer can merge these patches to their own tree.
>
> Note that without the new CONFIG_MTD_SPI_NOR symbol in your defconfig, Kconfig
> will automatically drop M25P80 for you.
>
> Please keep general comments to the cover letter, so all parties can see.
>
> This series is based on 3.15-rc1.
>
> The SPI-NOR development code (in -next, queued for 3.16) is here:
>
> git://git.infradead.org/l2-mtd.git +spinor
>
> This defconfig series is available in the same repo at:
>
> git://git.infradead.org/l2-mtd.git +defconfigs
>
> Thanks,
> Brian
>
> Brian Norris (12):
> ARM: imx/mxs defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
> ARM: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
> ARM: keystone: add MTD_SPI_NOR (new dependency for M25P80)
> ARM: tegra: add MTD_SPI_NOR (new dependency for M25P80)
> ARM: lpc32xx: add MTD_SPI_NOR (new dependency for M25P80)
> ARM: at91: add MTD_SPI_NOR (new dependency for M25P80)
> ARM: shmobile: add MTD_SPI_NOR (new dependency for M25P80)
> ARM: marvell: add MTD_SPI_NOR (new dependency for M25P80)
> blackfin: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
> mips: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
> powerpc: defconfigs: add MTD_SPI_NOR (new dependency for M25P80)
> sh: defconfig: add MTD_SPI_NOR (new dependency for M25P80)
>
> arch/arm/configs/bockw_defconfig | 2 +-
> arch/arm/configs/dove_defconfig | 2 +-
> arch/arm/configs/imx_v6_v7_defconfig | 1 +
> arch/arm/configs/keystone_defconfig | 1 +
> arch/arm/configs/kirkwood_defconfig | 1 +
> arch/arm/configs/koelsch_defconfig | 1 +
> arch/arm/configs/lager_defconfig | 1 +
> arch/arm/configs/lpc32xx_defconfig | 2 +-
> arch/arm/configs/multi_v5_defconfig | 1 +
> arch/arm/configs/multi_v7_defconfig | 1 +
> arch/arm/configs/mvebu_v5_defconfig | 1 +
> arch/arm/configs/mvebu_v7_defconfig | 1 +
> arch/arm/configs/mxs_defconfig | 1 +
> arch/arm/configs/sama5_defconfig | 2 +-
> arch/arm/configs/shmobile_defconfig | 1 +
> arch/arm/configs/tegra_defconfig | 1 +
> arch/blackfin/configs/BF526-EZBRD_defconfig | 2 +-
> arch/blackfin/configs/BF527-EZKIT-V2_defconfig | 2 +-
> arch/blackfin/configs/BF527-EZKIT_defconfig | 2 +-
> arch/blackfin/configs/BF548-EZKIT_defconfig | 2 +-
> arch/blackfin/configs/BF609-EZKIT_defconfig | 2 +-
> arch/blackfin/configs/BlackStamp_defconfig | 3 +--
> arch/blackfin/configs/H8606_defconfig | 3 +--
> arch/mips/configs/ath79_defconfig | 3 +--
> arch/mips/configs/db1xxx_defconfig | 1 +
> arch/mips/configs/rt305x_defconfig | 2 +-
> arch/powerpc/configs/corenet32_smp_defconfig | 2 +-
> arch/powerpc/configs/corenet64_smp_defconfig | 2 +-
> arch/powerpc/configs/mpc85xx_defconfig | 2 +-
> arch/powerpc/configs/mpc85xx_smp_defconfig | 2 +-
> arch/sh/configs/sh7757lcr_defconfig | 2 +-
> 31 files changed, 31 insertions(+), 21 deletions(-)
FWIW, this change still hasn't propagated to the following defconfigs:
arch/arm/configs/axm55xx_defconfig
arch/arm/configs/bockw_defconfig
arch/arm/configs/koelsch_defconfig
arch/arm/configs/lager_defconfig
arch/arm/configs/lpc32xx_defconfig
arch/arm/configs/multi_v5_defconfig
arch/arm/configs/multi_v7_defconfig
arch/arm/configs/qcom_defconfig
arch/arm/configs/sama5_defconfig
arch/arm/configs/shmobile_defconfig
arch/powerpc/configs/85xx/kmp204x_defconfig
arch/powerpc/configs/corenet32_smp_defconfig
arch/powerpc/configs/corenet64_smp_defconfig
arch/powerpc/configs/mpc85xx_defconfig
arch/powerpc/configs/mpc85xx_smp_defconfig
arch/sh/configs/sh7757lcr_defconfig
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply
* [PATCH 1/3] net: ucc_geth: drop acquired references in probe error path and remove
From: Uwe Kleine-König @ 2014-08-07 21:48 UTC (permalink / raw)
To: Li Yang; +Cc: netdev, Florian Fainelli, linuxppc-dev, kernel
The ucc_geth_probe function assigns to ug_info->tbi_node and
ug_info->phy_node a value returned by of_parse_phandle which returns a
new reference. Put this reference again in the error path of
ucc_geth_probe and when removing the device.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
No Fixes: footer here. The problem already exists in v2.6.31-rc1 (e.g.
commit 0b9da337dca9 (net: Rework ucc_geth driver to use of_mdio
infrastructure)). Didn't continue to research a specific commit.
---
drivers/net/ethernet/freescale/ucc_geth.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 36fc429298e3..5f1aab9c4ee7 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -3864,8 +3864,11 @@ static int ucc_geth_probe(struct platform_device* ofdev)
/* Create an ethernet device instance */
dev = alloc_etherdev(sizeof(*ugeth));
- if (dev == NULL)
+ if (dev == NULL) {
+ of_node_put(ug_info->tbi_node);
+ of_node_put(ug_info->phy_node);
return -ENOMEM;
+ }
ugeth = netdev_priv(dev);
spin_lock_init(&ugeth->lock);
@@ -3899,6 +3902,8 @@ static int ucc_geth_probe(struct platform_device* ofdev)
pr_err("%s: Cannot register net device, aborting\n",
dev->name);
free_netdev(dev);
+ of_node_put(ug_info->tbi_node);
+ of_node_put(ug_info->phy_node);
return err;
}
@@ -3922,6 +3927,8 @@ static int ucc_geth_remove(struct platform_device* ofdev)
unregister_netdev(dev);
free_netdev(dev);
ucc_geth_memclean(ugeth);
+ of_node_put(ugeth->info->tbi_node);
+ of_node_put(ugeth->info->phy_node);
return 0;
}
--
2.0.1
^ permalink raw reply related
* [PATCH 2/3] net: ucc_geth: make probe consistently acquire a reference to the phy node
From: Uwe Kleine-König @ 2014-08-07 21:48 UTC (permalink / raw)
To: Li Yang; +Cc: netdev, Florian Fainelli, linuxppc-dev, kernel
In-Reply-To: <1407448106-1819-1-git-send-email-u.kleine-koenig@pengutronix.de>
When the driver attaches to a device that has a phy handle the probe
routine returns with a reference to that node. This reference is
correctly dropped in the error path and the remove function. In the
fixed phy case however no reference is acquired and so the error path
might drop a reference the driver isn't holding. Fix that by getting a
reference to the MAC.
Fixes: 87009814cdbb ("ucc_geth: use the new fixed PHY helpers")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/net/ethernet/freescale/ucc_geth.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 5f1aab9c4ee7..a22ff770f9e5 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -3796,7 +3796,7 @@ static int ucc_geth_probe(struct platform_device* ofdev)
if (err)
return err;
}
- ug_info->phy_node = np;
+ ug_info->phy_node = of_node_get(np);
}
/* Find the TBI PHY node. If it's not there, we don't support SGMII */
--
2.0.1
^ permalink raw reply related
* [PATCH 3/3] net: ucc_geth: Don't use the MAC as PHY without a fixed link
From: Uwe Kleine-König @ 2014-08-07 21:48 UTC (permalink / raw)
To: Li Yang; +Cc: netdev, Florian Fainelli, linuxppc-dev, kernel
In-Reply-To: <1407448106-1819-1-git-send-email-u.kleine-koenig@pengutronix.de>
This matches what the other drivers using fixed-link support do and
restores the behaviour before commit 87009814cdbb ("ucc_geth: use the
new fixed PHY helpers") for the affected device trees (i.e. no
phy-handle and no fixed-link).
Fixes: 87009814cdbb ("ucc_geth: use the new fixed PHY helpers")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/net/ethernet/freescale/ucc_geth.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index a22ff770f9e5..07415a0df88c 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -3787,15 +3787,14 @@ static int ucc_geth_probe(struct platform_device* ofdev)
ug_info->uf_info.irq = irq_of_parse_and_map(np, 0);
ug_info->phy_node = of_parse_phandle(np, "phy-handle", 0);
- if (!ug_info->phy_node) {
- /* In the case of a fixed PHY, the DT node associated
+ if (!ug_info->phy_node && of_phy_is_fixed_link(np)) {
+ /*
+ * In the case of a fixed PHY, the DT node associated
* to the PHY is the Ethernet MAC DT node.
*/
- if (of_phy_is_fixed_link(np)) {
- err = of_phy_register_fixed_link(np);
- if (err)
- return err;
- }
+ err = of_phy_register_fixed_link(np);
+ if (err)
+ return err;
ug_info->phy_node = of_node_get(np);
}
--
2.0.1
^ permalink raw reply related
* Re: [PATCH] net: fs_enet: fix reference counting for phy_node
From: David Miller @ 2014-08-07 23:07 UTC (permalink / raw)
To: u.kleine-koenig; +Cc: f.fainelli, vbordug, netdev, kernel, linuxppc-dev
In-Reply-To: <1407445560-20500-1-git-send-email-u.kleine-koenig@pengutronix.de>
From: Uwe Kleine-K=F6nig <u.kleine-koenig@pengutronix.de>
Date: Thu, 7 Aug 2014 23:06:00 +0200
> Make sure that fs_enet_probe is left with a reference to the phy node=
.=
> In the presence of a phy handle this is already the case as
> of_parse_phandle returns a reference. In the fixed phy case a call to=
> of_node_get is necessary. Otherwise the error path and remove functio=
n
> drop a reference the driver isn't holding.
> =
> Fixes: bb74d9a4a87b ("fs_enet: use the new fixed PHY helpers")
> Signed-off-by: Uwe Kleine-K=F6nig <u.kleine-koenig@pengutronix.de>
Applied.
^ permalink raw reply
* Re: [PATCH 1/3] net: ucc_geth: drop acquired references in probe error path and remove
From: David Miller @ 2014-08-07 23:07 UTC (permalink / raw)
To: u.kleine-koenig; +Cc: netdev, linuxppc-dev, f.fainelli, kernel
In-Reply-To: <1407448106-1819-1-git-send-email-u.kleine-koenig@pengutronix.de>
From: Uwe Kleine-K=F6nig <u.kleine-koenig@pengutronix.de>
Date: Thu, 7 Aug 2014 23:48:24 +0200
> The ucc_geth_probe function assigns to ug_info->tbi_node and
> ug_info->phy_node a value returned by of_parse_phandle which returns =
a
> new reference. Put this reference again in the error path of
> ucc_geth_probe and when removing the device.
> =
> Signed-off-by: Uwe Kleine-K=F6nig <u.kleine-koenig@pengutronix.de>
Applied.
^ permalink raw reply
* Re: [PATCH 2/3] net: ucc_geth: make probe consistently acquire a reference to the phy node
From: David Miller @ 2014-08-07 23:07 UTC (permalink / raw)
To: u.kleine-koenig; +Cc: netdev, linuxppc-dev, f.fainelli, kernel
In-Reply-To: <1407448106-1819-2-git-send-email-u.kleine-koenig@pengutronix.de>
From: Uwe Kleine-K=F6nig <u.kleine-koenig@pengutronix.de>
Date: Thu, 7 Aug 2014 23:48:25 +0200
> When the driver attaches to a device that has a phy handle the probe
> routine returns with a reference to that node. This reference is
> correctly dropped in the error path and the remove function. In the
> fixed phy case however no reference is acquired and so the error path=
> might drop a reference the driver isn't holding. Fix that by getting =
a
> reference to the MAC.
> =
> Fixes: 87009814cdbb ("ucc_geth: use the new fixed PHY helpers")
> Signed-off-by: Uwe Kleine-K=F6nig <u.kleine-koenig@pengutronix.de>
Applied.
^ permalink raw reply
* Re: [PATCH 3/3] net: ucc_geth: Don't use the MAC as PHY without a fixed link
From: David Miller @ 2014-08-07 23:07 UTC (permalink / raw)
To: u.kleine-koenig; +Cc: netdev, linuxppc-dev, f.fainelli, kernel
In-Reply-To: <1407448106-1819-3-git-send-email-u.kleine-koenig@pengutronix.de>
From: Uwe Kleine-K=F6nig <u.kleine-koenig@pengutronix.de>
Date: Thu, 7 Aug 2014 23:48:26 +0200
> This matches what the other drivers using fixed-link support do and
> restores the behaviour before commit 87009814cdbb ("ucc_geth: use the=
> new fixed PHY helpers") for the affected device trees (i.e. no
> phy-handle and no fixed-link).
> =
> Fixes: 87009814cdbb ("ucc_geth: use the new fixed PHY helpers")
> Signed-off-by: Uwe Kleine-K=F6nig <u.kleine-koenig@pengutronix.de>
Applied.
^ permalink raw reply
* [PATCH] powerpc: Remove ppc_md.remove_memory
From: Anton Blanchard @ 2014-08-08 1:09 UTC (permalink / raw)
To: benh, paulus, mpe, nfont; +Cc: linuxppc-dev
We have an extra level of indirection on memory hot remove which is not
matched on memory hot add. Memory hotplug is book3s only, so there is
no need for it.
This also enables means remove_memory() (ie memory hot unplug) works
on powernv.
Signed-off-by: Anton Blanchard <anton@samba.org>
---
Index: b/arch/powerpc/include/asm/machdep.h
===================================================================
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -294,10 +294,6 @@ struct machdep_calls {
#ifdef CONFIG_ARCH_RANDOM
int (*get_random_long)(unsigned long *v);
#endif
-
-#ifdef CONFIG_MEMORY_HOTREMOVE
- int (*remove_memory)(u64, u64);
-#endif
};
extern void e500_idle(void);
Index: b/arch/powerpc/mm/mem.c
===================================================================
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -35,6 +35,7 @@
#include <linux/memblock.h>
#include <linux/hugetlb.h>
#include <linux/slab.h>
+#include <linux/vmalloc.h>
#include <asm/pgalloc.h>
#include <asm/prom.h>
@@ -143,8 +144,15 @@ int arch_remove_memory(u64 start, u64 si
zone = page_zone(pfn_to_page(start_pfn));
ret = __remove_pages(zone, start_pfn, nr_pages);
- if (!ret && (ppc_md.remove_memory))
- ret = ppc_md.remove_memory(start, size);
+
+ start = (unsigned long)__va(start);
+ if (!ret)
+ ret = remove_section_mapping(start, start + size);
+
+ /* Ensure all vmalloc mappings are flushed in case they also
+ * hit that section of memory
+ */
+ vm_unmap_aliases();
return ret;
}
Index: b/arch/powerpc/platforms/pseries/hotplug-memory.c
===================================================================
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -12,7 +12,6 @@
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/memblock.h>
-#include <linux/vmalloc.h>
#include <linux/memory.h>
#include <linux/memory_hotplug.h>
@@ -65,22 +64,6 @@ unsigned long pseries_memory_block_size(
}
#ifdef CONFIG_MEMORY_HOTREMOVE
-static int pseries_remove_memory(u64 start, u64 size)
-{
- int ret;
-
- /* Remove htab bolted mappings for this section of memory */
- start = (unsigned long)__va(start);
- ret = remove_section_mapping(start, start + size);
-
- /* Ensure all vmalloc mappings are flushed in case they also
- * hit that section of memory
- */
- vm_unmap_aliases();
-
- return ret;
-}
-
static int pseries_remove_memblock(unsigned long base, unsigned int memblock_size)
{
unsigned long block_sz, start_pfn;
@@ -259,10 +242,6 @@ static int __init pseries_memory_hotplug
if (firmware_has_feature(FW_FEATURE_LPAR))
of_reconfig_notifier_register(&pseries_mem_nb);
-#ifdef CONFIG_MEMORY_HOTREMOVE
- ppc_md.remove_memory = pseries_remove_memory;
-#endif
-
return 0;
}
machine_device_initcall(pseries, pseries_memory_hotplug_init);
^ permalink raw reply
* [PATCH] powerpc: Move htab_remove_mapping function prototype into header file
From: Anton Blanchard @ 2014-08-08 1:49 UTC (permalink / raw)
To: benh, paulus, mpe, zhong, nfont; +Cc: linuxppc-dev
A recent patch added a function prototype for htab_remove_mapping in
c code. Fix it.
Signed-off-by: Anton Blanchard <anton@samba.org>
---
diff --git a/arch/powerpc/include/asm/mmu-hash64.h b/arch/powerpc/include/asm/mmu-hash64.h
index d765144..92bc3a6 100644
--- a/arch/powerpc/include/asm/mmu-hash64.h
+++ b/arch/powerpc/include/asm/mmu-hash64.h
@@ -342,6 +342,8 @@ extern void hash_failure_debug(unsigned long ea, unsigned long access,
extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
unsigned long pstart, unsigned long prot,
int psize, int ssize);
+int htab_remove_mapping(unsigned long vstart, unsigned long vend,
+ int psize, int ssize);
extern void add_gpage(u64 addr, u64 page_size, unsigned long number_of_pages);
extern void demote_segment_4k(struct mm_struct *mm, unsigned long addr);
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 253b4b9..3481556 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -233,9 +233,6 @@ static void __meminit vmemmap_create_mapping(unsigned long start,
}
#ifdef CONFIG_MEMORY_HOTPLUG
-extern int htab_remove_mapping(unsigned long vstart, unsigned long vend,
- int psize, int ssize);
-
static void vmemmap_remove_mapping(unsigned long start,
unsigned long page_size)
{
^ permalink raw reply related
* Re: [PATCH v4 1/5] powerpc/eeh: Export eeh_iommu_group_to_pe()
From: Benjamin Herrenschmidt @ 2014-08-08 3:49 UTC (permalink / raw)
To: Gavin Shan; +Cc: aik, alex.williamson, linuxppc-dev, kvm
In-Reply-To: <1407379640-13065-2-git-send-email-gwshan@linux.vnet.ibm.com>
On Thu, 2014-08-07 at 12:47 +1000, Gavin Shan wrote:
> The function is used by VFIO driver, which might be built as a
> dynamic module. So it should be exported.
>
> Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Alex, are you taking this or should I ?
> ---
> arch/powerpc/kernel/eeh.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
> index 6043879..59a64f8 100644
> --- a/arch/powerpc/kernel/eeh.c
> +++ b/arch/powerpc/kernel/eeh.c
> @@ -1254,6 +1254,7 @@ struct eeh_pe *eeh_iommu_group_to_pe(struct iommu_group *group)
>
> return edev->pe;
> }
> +EXPORT_SYMBOL_GPL(eeh_iommu_group_to_pe);
>
> #endif /* CONFIG_IOMMU_API */
>
^ permalink raw reply
* Re: [PATCH v4 2/5] powerpc/eeh: Add warning message in eeh_dev_open()
From: Benjamin Herrenschmidt @ 2014-08-08 3:50 UTC (permalink / raw)
To: Gavin Shan; +Cc: aik, alex.williamson, linuxppc-dev, kvm
In-Reply-To: <1407379640-13065-3-git-send-email-gwshan@linux.vnet.ibm.com>
On Thu, 2014-08-07 at 12:47 +1000, Gavin Shan wrote:
> The patch adds one warning message in eeh_dev_open() in case the
> PCI device can't be marked as passed through.
>
> Suggested-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
> ---
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Alex, are you taking this or should I ?
> arch/powerpc/kernel/eeh.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
> index 59a64f8..5d73a49 100644
> --- a/arch/powerpc/kernel/eeh.c
> +++ b/arch/powerpc/kernel/eeh.c
> @@ -1162,8 +1162,11 @@ int eeh_dev_open(struct pci_dev *pdev)
>
> /* No EEH device or PE ? */
> edev = pci_dev_to_eeh_dev(pdev);
> - if (!edev || !edev->pe)
> + if (!edev || !edev->pe) {
> + pr_warn_once("%s: PCI device %s not supported\n",
> + __func__, pci_name(pdev));
> goto out;
> + }
>
> /* Increase PE's pass through count */
> atomic_inc(&edev->pe->pass_dev_cnt);
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox