From: Valentine Barshak <vbarshak@ru•mvista.com>
To: linuxppc-dev@ozlabs•org
Subject: Re: [PATCH] PowerPC 4xx: Use dcri_clrset() for PCIe indirect dcr read/modify/write access
Date: Thu, 06 Mar 2008 17:08:16 +0300 [thread overview]
Message-ID: <47CFFAD0.9060609@ru.mvista.com> (raw)
In-Reply-To: <20080306133751.GA31690@ru.mvista.com>
Oops, sorry, please discard this one.
There's a typo in it. The fixed patch is coming right away.
Thanks.
Valentine.
Valentine Barshak wrote:
> Use dcri_clrset() for PCIe SDR0 read/modify/write access.
>
> Signed-off-by: Valentine Barshak <vbarshak@ru•mvista.com>
> ---
> arch/powerpc/sysdev/ppc4xx_pci.c | 11 ++++-------
> 1 files changed, 4 insertions(+), 7 deletions(-)
>
> diff -pruN linux-2.6.orig/arch/powerpc/sysdev/ppc4xx_pci.c linux-2.6/arch/powerpc/sysdev/ppc4xx_pci.c
> --- linux-2.6.orig/arch/powerpc/sysdev/ppc4xx_pci.c 2008-03-06 14:39:46.000000000 +0300
> +++ linux-2.6/arch/powerpc/sysdev/ppc4xx_pci.c 2008-03-06 14:52:02.000000000 +0300
> @@ -645,7 +645,7 @@ static int __init ppc440spe_pciex_core_i
> int time_out = 20;
>
> /* Set PLL clock receiver to LVPECL */
> - mtdcri(SDR0, PESDR0_PLLLCT1, mfdcri(SDR0, PESDR0_PLLLCT1) | 1 << 28);
> + dcri_clrset(SDR0, PESDR0_PLLLCT1, 0, 1 << 28);
>
> /* Shouldn't we do all the calibration stuff etc... here ? */
> if (ppc440spe_pciex_check_reset(np))
> @@ -659,8 +659,7 @@ static int __init ppc440spe_pciex_core_i
> }
>
> /* De-assert reset of PCIe PLL, wait for lock */
> - mtdcri(SDR0, PESDR0_PLLLCT1,
> - mfdcri(SDR0, PESDR0_PLLLCT1) & ~(1 << 24));
> + dcri_clrset(SDR0, PESDR0_PLLLCT1, 1 << 24, 0);
> udelay(3);
>
> while (time_out) {
> @@ -712,9 +711,8 @@ static int ppc440spe_pciex_init_port_hw(
> mtdcri(SDR0, port->sdr_base + PESDRn_440SPE_HSSL7SET1,
> 0x35000000);
> }
> - val = mfdcri(SDR0, port->sdr_base + PESDRn_RCSSET);
> mtdcri(SDR0, port->sdr_base + PESDRn_RCSSET,
> - (val & ~(1 << 24 | 1 << 16)) | 1 << 12);
> + (1 << 24) | (1 << 16), 1 << 12);
>
> return 0;
> }
> @@ -1042,8 +1040,7 @@ static int __init ppc4xx_pciex_port_init
> port->link = 0;
> }
>
> - mtdcri(SDR0, port->sdr_base + PESDRn_RCSSET,
> - mfdcri(SDR0, port->sdr_base + PESDRn_RCSSET) | 1 << 20);
> + dcri_clrset(SDR0, port->sdr_base + PESDRn_RCSSET, 0, 1 << 20);
> msleep(100);
>
> return 0;
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs•org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev
next prev parent reply other threads:[~2008-03-06 14:10 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-21 14:46 [RFC][PATCH] PowerPC 4xx: ibm_newemac 440GX phy clock workaround Valentine Barshak
2008-02-21 22:52 ` Benjamin Herrenschmidt
2008-02-22 19:15 ` Valentine Barshak
2008-02-22 20:51 ` Josh Boyer
2008-02-22 19:24 ` [RFC][PATCH] ibm_newemac: PowerPC 440GX EMAC PHY " Valentine Barshak
2008-02-22 19:28 ` [RFC][PATCH] ibm_newemac: PowerPC 440EP/440GR " Valentine Barshak
2008-02-22 20:49 ` Josh Boyer
2008-02-26 12:25 ` Valentine Barshak
2008-02-26 14:10 ` Steven A. Falco
2008-02-26 15:02 ` Josh Boyer
2008-02-28 7:54 ` Benjamin Herrenschmidt
2008-03-05 17:46 ` Valentine Barshak
2008-03-05 18:38 ` [PATCH] PowerPC 4xx: Add dcri_clrset() for locked read/modify/write functionality Valentine Barshak
2008-03-06 0:06 ` Benjamin Herrenschmidt
2008-03-06 1:12 ` Josh Boyer
2008-03-06 11:31 ` Valentine Barshak
2008-03-06 11:50 ` Benjamin Herrenschmidt
2008-03-06 13:37 ` [PATCH] PowerPC 4xx: Use dcri_clrset() for PCIe indirect dcr read/modify/write access Valentine Barshak
2008-03-06 14:08 ` Valentine Barshak [this message]
2008-03-06 14:34 ` Valentine Barshak
2008-03-06 13:41 ` [PATCH 1/2] ibm_newemac: PowerPC 440GX EMAC PHY clock workaround Valentine Barshak
2008-03-24 23:21 ` Benjamin Herrenschmidt
2008-03-26 12:36 ` Josh Boyer
2008-03-06 13:43 ` [PATCH 2/2] ibm_newemac: PowerPC 440EP/440GR " Valentine Barshak
2008-03-24 23:22 ` Benjamin Herrenschmidt
2008-03-26 12:35 ` Josh Boyer
2008-03-27 13:50 ` Valentine Barshak
2008-03-27 13:53 ` Josh Boyer
2008-03-27 14:40 ` [PATCH 1/2] ibm_newemac: PowerPC 440GX " Valentine Barshak
2008-03-29 2:18 ` Jeff Garzik
2008-03-29 3:28 ` Benjamin Herrenschmidt
2008-03-29 3:30 ` Josh Boyer
2008-04-11 14:24 ` Josh Boyer
2008-04-12 20:28 ` Jeff Garzik
2008-04-12 20:47 ` Josh Boyer
2008-04-12 21:13 ` Jeff Garzik
2008-03-27 14:42 ` [PATCH 2/2] ibm_newemac: PowerPC 440EP/440GR " Valentine Barshak
2008-03-27 14:43 ` [PATCH] ibm_newemac: emac_tx_csum typo fix Valentine Barshak
2008-03-29 1:54 ` Jeff Garzik
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=47CFFAD0.9060609@ru.mvista.com \
--to=vbarshak@ru$(echo .)mvista.com \
--cc=linuxppc-dev@ozlabs$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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