From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Michael Ellerman <michael@ellerman.id.au>
Cc: linuxppc-dev@ozlabs.org
Subject: Re: [PATCH 4/7] Update axon_msi to use dcr_host_t.base
Date: Tue, 02 Oct 2007 15:14:15 +1000 [thread overview]
Message-ID: <1191302055.6310.72.camel@pasglop> (raw)
In-Reply-To: <2a6b3b82775119b4a1e1fd9b290051b1fef66d55.1190009070.git.michael@ellerman.id.au>
On Mon, 2007-09-17 at 16:05 +1000, Michael Ellerman wrote:
> Now that dcr_host_t contains the base address, we can use that in the
> axon_msi code, rather than storing it separately.
>
> Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> ---
> arch/powerpc/platforms/cell/axon_msi.c | 13 ++++++-------
> 1 files changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
> index 74407af..23e039a 100644
> --- a/arch/powerpc/platforms/cell/axon_msi.c
> +++ b/arch/powerpc/platforms/cell/axon_msi.c
> @@ -69,7 +69,6 @@ struct axon_msic {
> dcr_host_t dcr_host;
> struct list_head list;
> u32 read_offset;
> - u32 dcr_base;
> };
>
> static LIST_HEAD(axon_msic_list);
> @@ -78,12 +77,12 @@ static void msic_dcr_write(struct axon_msic *msic, unsigned int dcr_n, u32 val)
> {
> pr_debug("axon_msi: dcr_write(0x%x, 0x%x)\n", val, dcr_n);
>
> - dcr_write(msic->dcr_host, msic->dcr_base + dcr_n, val);
> + dcr_write(msic->dcr_host, msic->dcr_host.base + dcr_n, val);
> }
>
> static u32 msic_dcr_read(struct axon_msic *msic, unsigned int dcr_n)
> {
> - return dcr_read(msic->dcr_host, msic->dcr_base + dcr_n);
> + return dcr_read(msic->dcr_host, msic->dcr_host.base + dcr_n);
> }
>
> static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
> @@ -324,7 +323,7 @@ static int axon_msi_setup_one(struct device_node *dn)
> struct page *page;
> struct axon_msic *msic;
> unsigned int virq;
> - int dcr_len;
> + int dcr_base, dcr_len;
>
> pr_debug("axon_msi: setting up dn %s\n", dn->full_name);
>
> @@ -335,17 +334,17 @@ static int axon_msi_setup_one(struct device_node *dn)
> goto out;
> }
>
> - msic->dcr_base = dcr_resource_start(dn, 0);
> + dcr_base = dcr_resource_start(dn, 0);
> dcr_len = dcr_resource_len(dn, 0);
>
> - if (msic->dcr_base == 0 || dcr_len == 0) {
> + if (dcr_base == 0 || dcr_len == 0) {
> printk(KERN_ERR
> "axon_msi: couldn't parse dcr properties on %s\n",
> dn->full_name);
> goto out;
> }
>
> - msic->dcr_host = dcr_map(dn, msic->dcr_base, dcr_len);
> + msic->dcr_host = dcr_map(dn, dcr_base, dcr_len);
> if (!DCR_MAP_OK(msic->dcr_host)) {
> printk(KERN_ERR "axon_msi: dcr_map failed for %s\n",
> dn->full_name);
next prev parent reply other threads:[~2007-10-02 5:14 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-17 6:05 [PATCH 1/7] Store the base address in dcr_host_t Michael Ellerman
2007-09-17 6:05 ` [PATCH 3/7] Use dcr_host_t.base in ibm_emac_mal Michael Ellerman
2007-10-02 5:13 ` Benjamin Herrenschmidt
2007-10-02 6:06 ` Michael Ellerman
2007-09-17 6:05 ` [PATCH 2/7] Update mpic to use dcr_host_t.base Michael Ellerman
2007-10-02 5:12 ` Benjamin Herrenschmidt
2007-09-17 6:05 ` [PATCH 4/7] Update axon_msi " Michael Ellerman
2007-10-02 5:14 ` Benjamin Herrenschmidt [this message]
2007-09-17 6:05 ` [PATCH 5/7] Add dcr_host_t.base in dcr_read()/dcr_write() Michael Ellerman
2007-10-02 5:17 ` Benjamin Herrenschmidt
2007-09-17 6:05 ` [PATCH 6/7] Add dcr_map_reg() helper Michael Ellerman
2007-10-02 5:19 ` Benjamin Herrenschmidt
2007-10-02 5:51 ` Michael Ellerman
2007-10-02 6:22 ` Benjamin Herrenschmidt
2007-09-17 6:05 ` [PATCH 7/7] Remove msic_dcr_read() and use dcr_map_reg() in axon_msi.c Michael Ellerman
2007-10-02 5:20 ` Benjamin Herrenschmidt
2007-10-02 5:10 ` [PATCH 1/7] Store the base address in dcr_host_t Benjamin Herrenschmidt
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=1191302055.6310.72.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=michael@ellerman.id.au \
/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;
as well as URLs for NNTP newsgroup(s).