From: "Rafał Miłecki" <zajec5@gmail.com>
To: Hauke Mehrtens <hauke@hauke-m.de>
Cc: linux-wireless@vger.kernel.org, linux-mips@linux-mips.org,
mb@bu3sch.de, george@znau.edu.ua, arend@broadcom.com,
b43-dev@lists.infradead.org, bernhardloos@googlemail.com
Subject: Re: [RFC][PATCH 03/10] bcma: add embedded bus
Date: Mon, 6 Jun 2011 12:22:04 +0200 [thread overview]
Message-ID: <BANLkTi=T6xO9q+vOCk5Fu+2J_nUTwX3dcg@mail.gmail.com> (raw)
In-Reply-To: <1307311658-15853-4-git-send-email-hauke@hauke-m.de>
Hauke,
My idea for naming schema was to use:
bcma_host_TYPE_*
Like:
bcma_host_pci_*
bcma_host_sdio_*
You are using:
bcma_host_bcma_*
What do you think about changing this to:
bcma_host_embedded_*
or just some:
bcma_host_emb_*
?
Does it make more sense to you? I was trying to keep names in bcma
really clear, so every first-time-reader can see differences between
hosts, host and driver, etc.
2011/6/6 Hauke Mehrtens <hauke@hauke-m.de>:
> --- /dev/null
> +++ b/drivers/bcma/host_embedded.c
> @@ -0,0 +1,93 @@
> +/*
> + * Broadcom specific AMBA
> + * PCI Host
s/PCI/Embedded/
> +int bcma_host_bcma_register(struct bcma_bus *bus)
> +{
> + u32 __iomem *mmio;
> + /* iomap only first core. We have to read some register on this core
> + * to get the number of cores. This is sone in bcma_scan()
> + */
> + mmio = ioremap(BCMA_ADDR_BASE, BCMA_CORE_SIZE * 1);
> + if (!mmio)
> + return -ENOMEM;
> + bus->mmio = mmio;
Maybe just:
bus->mmio = ioremap(...);
? :)
> + /* Host specific */
> + bus->hosttype = BCMA_HOSTTYPE_EMBEDDED;
> + bus->ops = &bcma_host_bcma_ops;
> +
> + /* Register */
> + return bcma_bus_register(bus);
> +}
> diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
> index 1afa107..c5bcb5f 100644
> --- a/drivers/bcma/main.c
> +++ b/drivers/bcma/main.c
> @@ -119,6 +119,7 @@ static int bcma_register_cores(struct bcma_bus *bus)
> break;
> case BCMA_HOSTTYPE_NONE:
> case BCMA_HOSTTYPE_SDIO:
> + case BCMA_HOSTTYPE_EMBEDDED:
> break;
> }
>
> diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
> index 70b39f7..9229615 100644
> --- a/drivers/bcma/scan.c
> +++ b/drivers/bcma/scan.c
> @@ -203,7 +203,7 @@ static s32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 **eromptr,
> int bcma_bus_scan(struct bcma_bus *bus)
> {
> u32 erombase;
> - u32 __iomem *eromptr, *eromend;
> + u32 __iomem *eromptr, *eromend, *mmio;
>
> s32 cia, cib;
> u8 ports[2], wrappers[2];
> @@ -219,9 +219,34 @@ int bcma_bus_scan(struct bcma_bus *bus)
> bus->chipinfo.id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT;
> bus->chipinfo.rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT;
> bus->chipinfo.pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;
> + bus->nr_cores = (tmp & BCMA_CC_ID_NRCORES) >> BCMA_CC_ID_NRCORES_SHIFT;
I'd use different variable as Julian suggested.
> +
> + /* If we are an embedded device we now know the number of avaliable
> + * core and ioremap the correct space.
> + */
Typo: avaliable
> + if (bus->hosttype == BCMA_HOSTTYPE_EMBEDDED) {
> + iounmap(bus->mmio);
> + mmio = ioremap(BCMA_ADDR_BASE, BCMA_CORE_SIZE * bus->nr_cores);
> + if (!mmio)
> + return -ENOMEM;
> + bus->mmio = mmio;
> +
> + mmio = ioremap(BCMA_WRAP_BASE, BCMA_CORE_SIZE * bus->nr_cores);
> + if (!mmio)
> + return -ENOMEM;
> + bus->host_embedded = mmio;
Do we really need both? mmio and host_embedded? What about keeping
mmio only and using it in calculation for read/write[8,16,32]?
> + }
> + /* reset it to 0 as we use it for counting */
> + bus->nr_cores = 0;
>
> erombase = bcma_scan_read32(bus, 0, BCMA_CC_EROM);
> - eromptr = bus->mmio;
> + if (bus->hosttype == BCMA_HOSTTYPE_EMBEDDED) {
> + eromptr = ioremap(erombase, BCMA_CORE_SIZE);
> + if (!eromptr)
> + return -ENOMEM;
> + } else
> + eromptr = bus->mmio;
I though eromptr = bus->mmio; will do the trick for embedded as well.
I think I need some time to read about IO mapping and understand that.
--
Rafał
next prev parent reply other threads:[~2011-06-06 10:22 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-05 22:07 [RFC][PATCH 00/10] bcma: add support for embedded devices like bcm4716 Hauke Mehrtens
2011-06-05 22:07 ` [RFC][PATCH 01/10] bcma: Use array to store cores Hauke Mehrtens
2011-06-06 8:31 ` Arend van Spriel
2011-06-06 9:42 ` Rafał Miłecki
2011-06-06 10:09 ` Arend van Spriel
2011-06-06 11:32 ` Arnd Bergmann
2011-06-06 12:29 ` George Kashperko
2011-06-06 13:03 ` Arnd Bergmann
2011-06-06 21:38 ` Hauke Mehrtens
2011-06-06 21:53 ` Arnd Bergmann
2011-06-07 10:12 ` Arend van Spriel
2011-06-07 21:44 ` Hauke Mehrtens
2011-06-08 0:06 ` Rafał Miłecki
2011-06-08 8:20 ` Michael Büsch
2011-06-11 22:33 ` Hauke Mehrtens
2011-06-05 22:07 ` [RFC][PATCH 02/10] bcma: Make it possible to run bcma_register_cores() later Hauke Mehrtens
2011-06-05 22:07 ` [RFC][PATCH 03/10] bcma: add embedded bus Hauke Mehrtens
2011-06-05 23:22 ` Julian Calaby
2011-06-06 21:40 ` Hauke Mehrtens
2011-06-06 10:22 ` Rafał Miłecki [this message]
2011-06-06 10:32 ` George Kashperko
2011-06-06 10:51 ` Rafał Miłecki
2011-06-06 10:55 ` Arend van Spriel
2011-06-06 11:00 ` Rafał Miłecki
2011-06-06 22:00 ` Hauke Mehrtens
2011-06-07 0:33 ` Rafał Miłecki
2011-06-07 10:30 ` Arend van Spriel
2011-06-07 21:23 ` Hauke Mehrtens
2011-06-05 22:07 ` [RFC][PATCH 04/10] bcma: add mips driver Hauke Mehrtens
2011-06-06 11:23 ` Rafał Miłecki
2011-06-06 22:06 ` Hauke Mehrtens
2011-06-06 22:50 ` Rafał Miłecki
2011-06-05 22:07 ` [RFC][PATCH 05/10] bcma: add serial console support Hauke Mehrtens
2011-06-06 10:30 ` Rafał Miłecki
2011-06-05 22:07 ` [RFC][PATCH 06/10] bcma: get CPU clock Hauke Mehrtens
2011-06-06 10:34 ` Rafał Miłecki
2011-06-06 10:40 ` Rafał Miłecki
2011-06-05 22:07 ` [RFC][PATCH 07/10] bcma: add pci(e) host mode Hauke Mehrtens
2011-06-06 11:32 ` Rafał Miłecki
2011-06-06 22:11 ` Hauke Mehrtens
2011-06-06 11:34 ` Rafał Miłecki
2011-06-05 22:07 ` [RFC][PATCH 08/10] bcm47xx: prepare to support different buses Hauke Mehrtens
2011-06-05 22:07 ` [RFC][PATCH 09/10] bcm47xx: add support for bcma bus Hauke Mehrtens
2011-06-06 11:07 ` Rafał Miłecki
2011-06-06 22:13 ` Hauke Mehrtens
2011-06-05 22:07 ` [RFC][PATCH 10/10] bcm47xx: fix irq assignment for new SoCs Hauke Mehrtens
2011-06-06 9:24 ` Sergei Shtylyov
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='BANLkTi=T6xO9q+vOCk5Fu+2J_nUTwX3dcg@mail.gmail.com' \
--to=zajec5@gmail.com \
--cc=arend@broadcom.com \
--cc=b43-dev@lists.infradead.org \
--cc=bernhardloos@googlemail.com \
--cc=george@znau.edu.ua \
--cc=hauke@hauke-m.de \
--cc=linux-mips@linux-mips.org \
--cc=linux-wireless@vger.kernel.org \
--cc=mb@bu3sch.de \
/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).