* [U-Boot] [PATCH] mpc83xx:fix pcie configuration space read/write
@ 2011-01-15 11:22 Baidu Boy
2011-01-15 16:11 ` Sergei Shtylyov
0 siblings, 1 reply; 5+ messages in thread
From: Baidu Boy @ 2011-01-15 11:22 UTC (permalink / raw)
To: u-boot
This patch fix a problem for the pcie enumeration when the mpc83xx pcie controller is
connected with switch or we use both of the two pcie controller.
Signed-off-by: Baidu Boy <liucai.lfn@gmail.com>
---
arch/powerpc/cpu/mpc83xx/pcie.c | 19 ++++++++++++++++++-
include/pci.h | 2 ++
2 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c
index 46a706d..c59e482 100644
--- a/arch/powerpc/cpu/mpc83xx/pcie.c
+++ b/arch/powerpc/cpu/mpc83xx/pcie.c
@@ -30,6 +30,20 @@ DECLARE_GLOBAL_DATA_PTR;
#define PCIE_MAX_BUSES 2
+/*private struct for mpc83xx pcie hose*/
+static struct mpc83xx_pcie_priv{
+ u8 index;
+}pcie_priv[PCIE_MAX_BUSES] = {
+ {
+ /*pcie controller 1*/
+ .index = 0,
+ },
+ {
+ /*pcie controller 2*/
+ .index = 1,
+ },
+};
+
static struct {
u32 base;
u32 size;
@@ -52,7 +66,8 @@ static int mpc83xx_pcie_remap_cfg(struct pci_controller *hose, pci_dev_t dev)
{
int bus = PCI_BUS(dev) - hose->first_busno;
immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
- pex83xx_t *pex = &immr->pciexp[bus];
+ struct mpc83xx_pcie_priv *pcie_priv = (struct mpc83xx_pcie_priv *)hose->priv_data;
+ pex83xx_t *pex = &immr->pciexp[pcie_priv->index];
struct pex_outbound_window *out_win = &pex->bridge.pex_outbound_win[0];
u8 devfn = PCI_DEV(dev) << 3 | PCI_FUNC(dev);
u32 dev_base = bus << 24 | devfn << 16;
@@ -142,6 +157,8 @@ static void mpc83xx_pcie_register_hose(int bus, struct pci_region *reg,
hose->cfg_addr = (unsigned int *)mpc83xx_pcie_cfg_space[bus].base;
+ hose->priv_data = (void *)&pcie_priv[bus];
+
pci_set_ops(hose,
pcie_read_config_byte,
pcie_read_config_word,
diff --git a/include/pci.h b/include/pci.h
index c456006..8b3bdbb 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -420,6 +420,8 @@ struct pci_controller {
/* Used by ppc405 autoconfig*/
struct pci_region *pci_fb;
int current_busno;
+
+ void *priv_data;
};
extern __inline__ void pci_set_ops(struct pci_controller *hose,
--
1.7.3.1.msysgit.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] mpc83xx:fix pcie configuration space read/write
2011-01-15 11:22 [U-Boot] [PATCH] mpc83xx:fix pcie configuration space read/write Baidu Boy
@ 2011-01-15 16:11 ` Sergei Shtylyov
2011-01-16 2:58 ` Baidu Boy
0 siblings, 1 reply; 5+ messages in thread
From: Sergei Shtylyov @ 2011-01-15 16:11 UTC (permalink / raw)
To: u-boot
Hello.
On 15-01-2011 14:22, Baidu Boy wrote:
> This patch fix a problem for the pcie enumeration when the mpc83xx pcie controller is
> connected with switch or we use both of the two pcie controller.
> Signed-off-by: Baidu Boy <liucai.lfn@gmail.com>
[...]
> diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c b/arch/powerpc/cpu/mpc83xx/pcie.c
> index 46a706d..c59e482 100644
> --- a/arch/powerpc/cpu/mpc83xx/pcie.c
> +++ b/arch/powerpc/cpu/mpc83xx/pcie.c
> @@ -30,6 +30,20 @@ DECLARE_GLOBAL_DATA_PTR;
>
> #define PCIE_MAX_BUSES 2
>
> +/*private struct for mpc83xx pcie hose*/
> +static struct mpc83xx_pcie_priv{
Need space before { here.
> + u8 index;
> +}pcie_priv[PCIE_MAX_BUSES] = {
And after } here.
> @@ -52,7 +66,8 @@ static int mpc83xx_pcie_remap_cfg(struct pci_controller *hose, pci_dev_t dev)
> {
> int bus = PCI_BUS(dev) - hose->first_busno;
> immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
> - pex83xx_t *pex =&immr->pciexp[bus];
> + struct mpc83xx_pcie_priv *pcie_priv = (struct mpc83xx_pcie_priv *)hose->priv_data;
'priv_data' is of type 'void *', so the type cast is not needed.
> + pex83xx_t *pex =&immr->pciexp[pcie_priv->index];
> struct pex_outbound_window *out_win =&pex->bridge.pex_outbound_win[0];
> u8 devfn = PCI_DEV(dev)<< 3 | PCI_FUNC(dev);
> u32 dev_base = bus<< 24 | devfn<< 16;
> @@ -142,6 +157,8 @@ static void mpc83xx_pcie_register_hose(int bus, struct pci_region *reg,
>
> hose->cfg_addr = (unsigned int *)mpc83xx_pcie_cfg_space[bus].base;
>
> + hose->priv_data = (void *)&pcie_priv[bus];
Likewise, there's no need to cast to 'void *' -- the cast is automatic.
WBR, Sergei
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] mpc83xx:fix pcie configuration space read/write
2011-01-15 16:11 ` Sergei Shtylyov
@ 2011-01-16 2:58 ` Baidu Boy
0 siblings, 0 replies; 5+ messages in thread
From: Baidu Boy @ 2011-01-16 2:58 UTC (permalink / raw)
To: u-boot
hi , Sergei
2011/1/16 Sergei Shtylyov <sshtylyov@mvista.com>:
> Hello.
>
> On 15-01-2011 14:22, Baidu Boy wrote:
>
>> This patch fix a problem for the pcie enumeration when the mpc83xx pcie
>> controller is
>> connected with switch or we use both of the two pcie controller.
>
>> Signed-off-by: Baidu Boy <liucai.lfn@gmail.com>
>
> [...]
>
>> diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c
>> b/arch/powerpc/cpu/mpc83xx/pcie.c
>> index 46a706d..c59e482 100644
>> --- a/arch/powerpc/cpu/mpc83xx/pcie.c
>> +++ b/arch/powerpc/cpu/mpc83xx/pcie.c
>> @@ -30,6 +30,20 @@ DECLARE_GLOBAL_DATA_PTR;
>>
>> ?#define PCIE_MAX_BUSES 2
>>
>> +/*private struct for mpc83xx pcie hose*/
>> +static struct mpc83xx_pcie_priv{
>
> ? Need space before { here.
>
>> + ? ? ? u8 index;
>> +}pcie_priv[PCIE_MAX_BUSES] = {
>
> ? And after } here.
>
>> @@ -52,7 +66,8 @@ static int mpc83xx_pcie_remap_cfg(struct pci_controller
>> *hose, pci_dev_t dev)
>> ?{
>> ? ? ? ?int bus = PCI_BUS(dev) - hose->first_busno;
>> ? ? ? ?immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
>> - ? ? ? pex83xx_t *pex =&immr->pciexp[bus];
>> + ? ? ? struct mpc83xx_pcie_priv *pcie_priv = (struct mpc83xx_pcie_priv
>> *)hose->priv_data;
>
> ? 'priv_data' is of type 'void *', so the type cast is not needed.
>
>> + ? ? ? pex83xx_t *pex =&immr->pciexp[pcie_priv->index];
>> ? ? ? ?struct pex_outbound_window *out_win
>> =&pex->bridge.pex_outbound_win[0];
>> ? ? ? ?u8 devfn = PCI_DEV(dev)<< ?3 | PCI_FUNC(dev);
>> ? ? ? ?u32 dev_base = bus<< ?24 | devfn<< ?16;
>> @@ -142,6 +157,8 @@ static void mpc83xx_pcie_register_hose(int bus, struct
>> pci_region *reg,
>>
>> ? ? ? ?hose->cfg_addr = (unsigned int *)mpc83xx_pcie_cfg_space[bus].base;
>>
>> + ? ? ? hose->priv_data = (void *)&pcie_priv[bus];
>
> ? Likewise, there's no need to cast to 'void *' -- the cast is automatic.
>
> WBR, Sergei
>
I have re-submit the patch:
http://patchwork.ozlabs.org/patch/79075/
Thanks
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] mpc83xx: fix pcie configuration space read/write
2011-01-07 12:29 [U-Boot] [PATCH] mpc83xx: fix " Baidu Boy
@ 2011-01-09 12:49 ` Sergei Shtylyov
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Shtylyov @ 2011-01-09 12:49 UTC (permalink / raw)
To: u-boot
Hello.
On 07-01-2011 15:29, Baidu Boy wrote:
> This patch fix a problem for the pcie enumeration when the mpc83xx pcie
> controller
> is connected with switch or we use both of the two pcie controller.
> Signed-off-by: Baidu Boy<liucai.lfn@gmail.com>
> ---
> arch/powerpc/cpu/mpc83xx/pcie.c | 8 ++++++--
> 1 files changed, 6 insertions(+), 2 deletions(-)
> diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c
> b/arch/powerpc/cpu/mpc83xx/pcie.c
> index 46a706d..2a200b8 100644
> --- a/arch/powerpc/cpu/mpc83xx/pcie.c
> +++ b/arch/powerpc/cpu/mpc83xx/pcie.c
[...]
> @@ -324,6 +326,8 @@ void mpc83xx_pcie_init(int num_buses, struct pci_region
> **reg)
> num_buses = ARRAY_SIZE(mpc83xx_pcie_cfg_space);
> }
>
> - for (i = 0; i< num_buses; i++)
> + for (i = 0; i< num_buses; i++){
There should be space between ) and {
> + pcie_index = i;
> mpc83xx_pcie_init_bus(i, reg[i]);
> + }
> }
WBR, Sergei
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] mpc83xx: fix pcie configuration space read/write
@ 2011-01-07 12:29 Baidu Boy
2011-01-09 12:49 ` Sergei Shtylyov
0 siblings, 1 reply; 5+ messages in thread
From: Baidu Boy @ 2011-01-07 12:29 UTC (permalink / raw)
To: u-boot
This patch fix a problem for the pcie enumeration when the mpc83xx pcie
controller
is connected with switch or we use both of the two pcie controller.
Signed-off-by: Baidu Boy <liucai.lfn@gmail.com>
---
arch/powerpc/cpu/mpc83xx/pcie.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/cpu/mpc83xx/pcie.c
b/arch/powerpc/cpu/mpc83xx/pcie.c
index 46a706d..2a200b8 100644
--- a/arch/powerpc/cpu/mpc83xx/pcie.c
+++ b/arch/powerpc/cpu/mpc83xx/pcie.c
@@ -46,13 +46,15 @@ static struct {
#endif
};
+static u8 pcie_index =0;
+
#ifdef CONFIG_83XX_GENERIC_PCIE_REGISTER_HOSES
static int mpc83xx_pcie_remap_cfg(struct pci_controller *hose, pci_dev_t
dev)
{
int bus = PCI_BUS(dev) - hose->first_busno;
immap_t *immr = (immap_t *)CONFIG_SYS_IMMR;
- pex83xx_t *pex = &immr->pciexp[bus];
+ pex83xx_t *pex = &immr->pciexp[pcie_index];
struct pex_outbound_window *out_win =
&pex->bridge.pex_outbound_win[0];
u8 devfn = PCI_DEV(dev) << 3 | PCI_FUNC(dev);
u32 dev_base = bus << 24 | devfn << 16;
@@ -324,6 +326,8 @@ void mpc83xx_pcie_init(int num_buses, struct pci_region
**reg)
num_buses = ARRAY_SIZE(mpc83xx_pcie_cfg_space);
}
- for (i = 0; i < num_buses; i++)
+ for (i = 0; i < num_buses; i++){
+ pcie_index = i;
mpc83xx_pcie_init_bus(i, reg[i]);
+ }
}
--
1.7.3.1.msysgit.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-01-16 2:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-15 11:22 [U-Boot] [PATCH] mpc83xx:fix pcie configuration space read/write Baidu Boy
2011-01-15 16:11 ` Sergei Shtylyov
2011-01-16 2:58 ` Baidu Boy
-- strict thread matches above, loose matches on Subject: below --
2011-01-07 12:29 [U-Boot] [PATCH] mpc83xx: fix " Baidu Boy
2011-01-09 12:49 ` Sergei Shtylyov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.