| Message ID | 1364407504-13524-3-git-send-email-thomas.petazzoni@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
Jason (Cooper), Do you mind taking this patch in your mvebu/drivers branch, next to the patch adding the mvebu-mbus driver? Or do you want a new mvebu-mbus driver patch that contains this fix and would replace the one you have already merged in mvebu/drivers? Thanks! Thomas On Wed, 27 Mar 2013 19:05:01 +0100, Thomas Petazzoni wrote: > The target and attributes for the PCIe address decoding windows were > not correct on Kirkwood for the second PCIe interface. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > Note: this patch should be merged with the existing mvebu-mbus driver. > --- > drivers/bus/mvebu-mbus.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c > index 586d03e..4de2c6b 100644 > --- a/drivers/bus/mvebu-mbus.c > +++ b/drivers/bus/mvebu-mbus.c > @@ -626,7 +626,7 @@ static const struct mvebu_mbus_soc_data armada_xp_mbus_data = { > > static const struct mvebu_mbus_mapping kirkwood_map[] = { > MAPDEF("pcie0.0", 4, 0xe0, MAPDEF_PCIMASK), > - MAPDEF("pcie1.0", 8, 0xe0, MAPDEF_PCIMASK), > + MAPDEF("pcie1.0", 4, 0xd0, MAPDEF_PCIMASK), > MAPDEF("sram", 3, 0x01, MAPDEF_NOMASK), > MAPDEF("nand", 1, 0x2f, MAPDEF_NOMASK), > {},
Thomas, On Wed, Apr 03, 2013 at 12:52:47PM +0200, Thomas Petazzoni wrote: > Jason (Cooper), > > Do you mind taking this patch in your mvebu/drivers branch, next to the > patch adding the mvebu-mbus driver? Or do you want a new mvebu-mbus > driver patch that contains this fix and would replace the one you have > already merged in mvebu/drivers? Thanks for pointing this out. I'll put it in mvebu/drivers as you suggested. I'll need to rebase mvebu/soc on it. But I haven't done the PR yet, so not a big deal. thx, Jason. > On Wed, 27 Mar 2013 19:05:01 +0100, Thomas Petazzoni wrote: > > The target and attributes for the PCIe address decoding windows were > > not correct on Kirkwood for the second PCIe interface. > > > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > > --- > > Note: this patch should be merged with the existing mvebu-mbus driver. > > --- > > drivers/bus/mvebu-mbus.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c > > index 586d03e..4de2c6b 100644 > > --- a/drivers/bus/mvebu-mbus.c > > +++ b/drivers/bus/mvebu-mbus.c > > @@ -626,7 +626,7 @@ static const struct mvebu_mbus_soc_data armada_xp_mbus_data = { > > > > static const struct mvebu_mbus_mapping kirkwood_map[] = { > > MAPDEF("pcie0.0", 4, 0xe0, MAPDEF_PCIMASK), > > - MAPDEF("pcie1.0", 8, 0xe0, MAPDEF_PCIMASK), > > + MAPDEF("pcie1.0", 4, 0xd0, MAPDEF_PCIMASK), > > MAPDEF("sram", 3, 0x01, MAPDEF_NOMASK), > > MAPDEF("nand", 1, 0x2f, MAPDEF_NOMASK), > > {}, -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Dear Jason Cooper, On Wed, 3 Apr 2013 06:57:57 -0400, Jason Cooper wrote: > Thanks for pointing this out. I'll put it in mvebu/drivers as you > suggested. I'll need to rebase mvebu/soc on it. But I haven't done the > PR yet, so not a big deal. Ok, thanks. I'll finalize the cleanup of the kirkwood PCIe branch in order to be able to submit a version that hopefully should be acceptable. Thanks, Thomas
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c index 586d03e..4de2c6b 100644 --- a/drivers/bus/mvebu-mbus.c +++ b/drivers/bus/mvebu-mbus.c @@ -626,7 +626,7 @@ static const struct mvebu_mbus_soc_data armada_xp_mbus_data = { static const struct mvebu_mbus_mapping kirkwood_map[] = { MAPDEF("pcie0.0", 4, 0xe0, MAPDEF_PCIMASK), - MAPDEF("pcie1.0", 8, 0xe0, MAPDEF_PCIMASK), + MAPDEF("pcie1.0", 4, 0xd0, MAPDEF_PCIMASK), MAPDEF("sram", 3, 0x01, MAPDEF_NOMASK), MAPDEF("nand", 1, 0x2f, MAPDEF_NOMASK), {},
The target and attributes for the PCIe address decoding windows were not correct on Kirkwood for the second PCIe interface. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- Note: this patch should be merged with the existing mvebu-mbus driver. --- drivers/bus/mvebu-mbus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)