[PATCH] powerpc/pasemi: enable PRINTK_TIME in defconfig
Enable PRINTK_TIME in pasemi_defconfig. Also regenerate it, it seems that a lot of options have moved around since last time savedefconfig was ran on it. Signed-off-by: Olof Johansson --- arch/powerpc/configs/pasemi_defconfig | 31 --- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig index 840a2c2..bd8a6f7 100644 --- a/arch/powerpc/configs/pasemi_defconfig +++ b/arch/powerpc/configs/pasemi_defconfig @@ -1,28 +1,27 @@ CONFIG_PPC64=y CONFIG_ALTIVEC=y -# CONFIG_VIRT_CPU_ACCOUNTING is not set CONFIG_SMP=y CONFIG_NR_CPUS=2 CONFIG_EXPERIMENTAL=y CONFIG_SYSVIPC=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y CONFIG_BLK_DEV_INITRD=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_PROFILING=y CONFIG_OPROFILE=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set +CONFIG_PARTITION_ADVANCED=y +CONFIG_MAC_PARTITION=y # CONFIG_PPC_PSERIES is not set # CONFIG_PPC_PMAC is not set CONFIG_PPC_PASEMI=y CONFIG_PPC_PASEMI_IOMMU=y CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_DEBUG=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y CONFIG_HZ_1000=y CONFIG_PPC_64K_PAGES=y # CONFIG_SECCOMP is not set @@ -47,7 +46,6 @@ CONFIG_INET_ESP=y # CONFIG_IPV6 is not set CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_MTD=y -CONFIG_MTD_CONCAT=y CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y CONFIG_MTD_SLRAM=y @@ -58,7 +56,6 @@ CONFIG_PROC_DEVICETREE=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_MISC_DEVICES=y CONFIG_EEPROM_LEGACY=y CONFIG_IDE=y CONFIG_BLK_DEV_IDECD=y @@ -91,21 +88,19 @@ CONFIG_BLK_DEV_DM=y CONFIG_DM_CRYPT=y CONFIG_NETDEVICES=y CONFIG_DUMMY=y -CONFIG_MARVELL_PHY=y -CONFIG_NET_ETHERNET=y CONFIG_MII=y -CONFIG_NET_PCI=y -CONFIG_E1000=y CONFIG_TIGON3=y +CONFIG_E1000=y CONFIG_PASEMI_MAC=y +CONFIG_MARVELL_PHY=y CONFIG_INPUT_JOYDEV=y CONFIG_INPUT_EVDEV=y # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_MOUSE_PS2 is not set # CONFIG_SERIO is not set +CONFIG_LEGACY_PTY_COUNT=4 CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_LEGACY_PTY_COUNT=4 CONFIG_HW_RANDOM=y CONFIG_RAW_DRIVER=y CONFIG_I2C_CHARDEV=y @@ -146,14 +141,11 @@ CONFIG_HID_TOPSEED=y CONFIG_HID_THRUSTMASTER=y CONFIG_HID_ZEROPLUS=y CONFIG_USB=y -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_DEVICE_CLASS is not set CONFIG_USB_EHCI_HCD=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_UHCI_HCD=y CONFIG_USB_SL811_HCD=y CONFIG_USB_STORAGE=y -CONFIG_USB_LIBUSUAL=y CONFIG_EDAC=y CONFIG_EDAC_MM_EDAC=y CONFIG_EDAC_PASEMI=y @@ -164,8 +156,6 @@ CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_INOTIFY=y -CONFIG_AUTOFS_FS=y CONFIG_AUTOFS4_FS=y CONFIG_ISO9660_FS=y CONFIG_UDF_FS=y @@ -177,27 +167,22 @@ CONFIG_HUGETLBFS=y CONFIG_CONFIGFS_FS=y CONFIG_JFFS2_FS=y CONFIG_NFS_FS=y -CONFIG_NFS_V3=y CONFIG_ROOT_NFS=y CONFIG_NFSD=y CONFIG_NFSD_V4=y -CONFIG_PARTITION_ADVANCED=y -CONFIG_MAC_PARTITION=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_CRC_CCITT=y +CONFIG_PRINTK_TIME=y CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_FS=y CONFIG_DEBUG_KERNEL=y CONFIG_DETECT_HUNG_TASK=y # CONFIG_SCHED_DEBUG is not set -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y CONFIG_XMON=y CONFIG_XMON_DEFAULT=y CONFIG_CRYPTO_MD4=y CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_BLOWFISH=y # CONFIG_CRYPTO_ANSI_CPRNG is not set -- 1.7.10.1.488.g05fbf7a ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
RE: [PATCH 1/4 v2] iommu/fsl: Store iommu domain information pointer in archdata.
Hi Kumar,
Can you please apply this patch.
Regards
Varun
> -Original Message-
> From: Sethi Varun-B16395
> Sent: Tuesday, November 20, 2012 7:25 PM
> To: joerg.roe...@amd.com; io...@lists.linux-foundation.org; linuxppc-
> d...@lists.ozlabs.org; linux-ker...@vger.kernel.org; Wood Scott-B07421;
> Tabi Timur-B04825
> Cc: Sethi Varun-B16395
> Subject: [PATCH 1/4 v2] iommu/fsl: Store iommu domain information pointer
> in archdata.
>
> Add a new field in the device (powerpc) archdata structure for storing
> iommu domain information pointer. This pointer is stored when the device
> is attached to a particular domain.
>
> Signed-off-by: Varun Sethi
> ---
> arch/powerpc/include/asm/device.h |4
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/device.h
> b/arch/powerpc/include/asm/device.h
> index 77e97dd..6dc79fe 100644
> --- a/arch/powerpc/include/asm/device.h
> +++ b/arch/powerpc/include/asm/device.h
> @@ -28,6 +28,10 @@ struct dev_archdata {
> void*iommu_table_base;
> } dma_data;
>
> + /* IOMMU domain information pointer. This would be set
> + * when this device is attached to an iommu_domain.
> + */
> + void*iommu_domain;
> #ifdef CONFIG_SWIOTLB
> dma_addr_t max_direct_dma_addr;
> #endif
> --
> 1.7.4.1
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH] powerpc/pci-hotplug: fix the rescanned pci device's dma_set_mask issue
On 11/25/2012 08:41 PM, Kumar Gala wrote:
On Nov 22, 2012, at 10:29 PM, Yuanquan Chen wrote:
On powerpc arch, dma_ops of rescanned pci device after system's booting up
won't be
initialized by system, so it will fail to execute the dma_set_mask in the
device's
driver. Initialize it to solve this issue.
Signed-off-by: Yuanquan Chen
---
arch/powerpc/include/asm/dma-mapping.h |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
This is not the right way to get the dma_ops setup. You need to find some
other point for the hotplug scenario to get the dma_ops setup.
- k
Hi Kumar,
I read the code about pci bus scan and rescan. Only the
pcibios_fixup_bus in pci_scan_child_bus and
pcibios_enable_device in pci_rescan_bus are arch related code. The
pcibios_fixup_bus won't be called
for the rescanned PCI devices due to the bus->is_added has been set for
the first scanning at boot time.
So I think it's more reasonable to do the same work as pcibios_fixup_bus
for rescanned PCI device in
pcibios_enable_device. The patch code is a copy of
pcibios_setup_bus_devices called by pcibios_fixup_bus,
It can solve the dma_set_mask and irq related issues of rescanned PCI
device on powerpc arch. What's
your opinion?
Thanks,
yuanquan
diff --git a/arch/powerpc/kernel/pci-common.c
b/arch/powerpc/kernel/pci-common.c
index 7f94f76..30f7d61 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1496,6 +1496,23 @@ int pcibios_enable_device(struct pci_dev *dev,
int mask)
if (ppc_md.pcibios_enable_device_hook(dev))
return -EINVAL;
+ if (!dev->is_added) {
+ set_dev_node(&dev->dev, pcibus_to_node(dev->bus));
+
+ /* Hook up default DMA ops */
+ set_dma_ops(&dev->dev, pci_dma_ops);
+ set_dma_offset(&dev->dev, PCI_DRAM_OFFSET);
+
+ /* Additional platform DMA/iommu setup */
+ if (ppc_md.pci_dma_dev_setup)
+ ppc_md.pci_dma_dev_setup(dev);
+
+ /* Read default IRQs and fixup if necessary */
+ pci_read_irq_line(dev);
+ if (ppc_md.pci_irq_fixup)
+ ppc_md.pci_irq_fixup(dev);
+ }
+
return pci_enable_resources(dev, mask);
}
diff --git a/arch/powerpc/include/asm/dma-mapping.h
b/arch/powerpc/include/asm/dma-mapping.h
index 7816087..22eae53 100644
--- a/arch/powerpc/include/asm/dma-mapping.h
+++ b/arch/powerpc/include/asm/dma-mapping.h
@@ -126,8 +126,11 @@ static inline int dma_supported(struct device *dev, u64
mask)
{
struct dma_map_ops *dma_ops = get_dma_ops(dev);
- if (unlikely(dma_ops == NULL))
- return 0;
+ if (unlikely(dma_ops == NULL)) {
+ set_dma_ops(dev, &dma_direct_ops);
+ set_dma_offset(dev, PCI_DRAM_OFFSET);
+ dma_ops = &dma_direct_ops;
+ }
if (dma_ops->dma_supported == NULL)
return 1;
return dma_ops->dma_supported(dev, mask);
--
1.7.9.5
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
RE: [PATCH 3/4 v5] iommu/fsl: Add iommu domain attributes required by fsl PAMU driver.
Hi Joerg,
Any comments? Can we apply this patch?
Regards
Varun
> -Original Message-
> From: Sethi Varun-B16395
> Sent: Tuesday, November 20, 2012 7:25 PM
> To: joerg.roe...@amd.com; io...@lists.linux-foundation.org; linuxppc-
> d...@lists.ozlabs.org; linux-ker...@vger.kernel.org; Wood Scott-B07421;
> Tabi Timur-B04825
> Cc: Sethi Varun-B16395
> Subject: [PATCH 3/4 v5] iommu/fsl: Add iommu domain attributes required
> by fsl PAMU driver.
>
> Added the following domain attributes required by FSL PAMU driver:
> 1. Subwindows field added to the iommu domain geometry attribute.
> 2. Added new iommu stash attribute, which allows setting of the
>LIODN specific stash id parameter through IOMMU API.
> 3. Added an attribute for enabling/disabling DMA to a particular
>memory window.
>
> Signed-off-by: Varun Sethi
> ---
> changes in v5:
> - Updated description of the subwindows field.
> changes in v4:
> - Updated comment explaining subwindows(as mentioned by Scott).
> change in v3:
> -renamed the stash attribute targets
> include/linux/iommu.h | 43 +++
> 1 files changed, 43 insertions(+), 0 deletions(-)
>
> diff --git a/include/linux/iommu.h b/include/linux/iommu.h index
> f3b99e1..7ca1cda 100644
> --- a/include/linux/iommu.h
> +++ b/include/linux/iommu.h
> @@ -44,6 +44,41 @@ struct iommu_domain_geometry {
> dma_addr_t aperture_start; /* First address that can be mapped
> */
> dma_addr_t aperture_end; /* Last address that can be mapped
> */
> bool force_aperture; /* DMA only allowed in mappable range?
> */
> +
> + /*
> + * A geometry mapping can be created in one of the following ways
> + * for an IOMMU:
> + * 1. A single contiguous window
> + * 2. Through arbritary paging throughout the aperture.
> + * 3. Using multiple subwindows
> + *
> + * In absence of arbritary paging, subwindows allow for supporting
> + * physically discontiguous mappings.
> + *
> + * This attribute indicates number of DMA subwindows supported by
> + * the geometry. If there is a single window that maps the entire
> + * geometry, attribute must be set to "1". A value of "0" implies
> + * that this mechanism is not used at all(normal paging is used).
> + * Value other than* "0" or "1" indicates the actual number of
> + * subwindows.
> + */
> + u32 subwindows;
> +};
> +
> +/* cache stash targets */
> +#define IOMMU_ATTR_CACHE_L1 1
> +#define IOMMU_ATTR_CACHE_L2 2
> +#define IOMMU_ATTR_CACHE_L3 3
> +
> +/* This attribute corresponds to IOMMUs capable of generating
> + * a stash transaction. A stash transaction is typically a
> + * hardware initiated prefetch of data from memory to cache.
> + * This attribute allows configuring stashig specific parameters
> + * in the IOMMU hardware.
> + */
> +struct iommu_stash_attribute {
> + u32 cpu;/* cpu number */
> + u32 cache; /* cache to stash to: L1,L2,L3 */
> };
>
> struct iommu_domain {
> @@ -60,6 +95,14 @@ struct iommu_domain { enum iommu_attr {
> DOMAIN_ATTR_MAX,
> DOMAIN_ATTR_GEOMETRY,
> + /* Set the IOMMU hardware stashing
> + * parameters.
> + */
> + DOMAIN_ATTR_STASH,
> + /* Explicity enable/disable DMA for a
> + * particular memory window.
> + */
> + DOMAIN_ATTR_ENABLE,
> };
>
> #ifdef CONFIG_IOMMU_API
> --
> 1.7.4.1
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH] i2c-cpm: Fix to takeback i2c bus master-ship after a collision
Hi Kumar,
I have resent the updated patch.
Regards
Sachin
On Mon, Nov 26, 2012 at 2:21 AM, Kumar Gala wrote:
>
> On Oct 30, 2012, at 10:00 PM, sachin surendran wrote:
>
>> In case of collision on i2c bus the controller which lost bus mastership
>> stays as a slave
>> for all subsequent transfers. This results in the i2c controller never
>> writing to the bus
>> for future transactions, resulting in i2c transfer timeouts.
>> This fix checks for a collision on last I2C transaction and sets the
>> I2COM_MASTER
>> bit for the new transaction.
>>
>> Signed-off-by: Sachin Surendran
>> ---
>> drivers/i2c/busses/i2c-cpm.c |8
>> 1 file changed, 8 insertions(+)
>
> patch doesn't apply, please resend properly.
>
> - k
>
>>
>> diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
>> index c1e1096..bb94c6d 100644
>> --- a/drivers/i2c/busses/i2c-cpm.c
>> +++ b/drivers/i2c/busses/i2c-cpm.c
>> @@ -338,6 +338,14 @@ static int cpm_i2c_xfer(struct i2c_adapter *adap,
>> struct i2c_msg *msgs, int num)
>> tptr = 0;
>> rptr = 0;
>>
>> + /*
>> +* If there was a collision in the last i2c transaction,
>> +* Set I2COM_MASTER as it was cleared during collision.
>> +*/
>> + if (in_be16(&tbdf->cbd_sc) & BD_SC_CL) {
>> + out_8(&cpm->i2c_reg->i2com, I2COM_MASTER);
>> + }
>> +
>> while (tptr < num) {
>> pmsg = &msgs[tptr];
>> dev_dbg(&adap->dev, "R: %d T: %d\n", rptr, tptr);
>>
>> ___
>> Linuxppc-dev mailing list
>> Linuxppc-dev@lists.ozlabs.org
>> https://lists.ozlabs.org/listinfo/linuxppc-dev
>
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
[PATCH 1/1] i2c-cpm: Fix to takeback i2c bus master-ship after a collision
From: Sachin Surendran
In case of collision on i2c bus the controller which lost bus mastership
stays as a slave for all subsequent transfers. This results in the i2c
controller never writing to the bus for future transactions, resulting
in i2c transfer timeouts.
This fix checks for a collision on last I2C transaction and sets the
I2COM_MASTER bit for the new transaction.
Signed-off-by: Sachin Surendran
---
drivers/i2c/busses/i2c-cpm.c |8
1 file changed, 8 insertions(+)
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index c1e1096..bb94c6d 100644
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -338,6 +338,14 @@ static int cpm_i2c_xfer(struct i2c_adapter *adap, struct
i2c_msg *msgs, int num)
tptr = 0;
rptr = 0;
+ /*
+* If there was a collision in the last i2c transaction,
+* Set I2COM_MASTER as it was cleared during collision.
+*/
+ if (in_be16(&tbdf->cbd_sc) & BD_SC_CL) {
+ out_8(&cpm->i2c_reg->i2com, I2COM_MASTER);
+ }
+
while (tptr < num) {
pmsg = &msgs[tptr];
dev_dbg(&adap->dev, "R: %d T: %d\n", rptr, tptr);
--
1.7.9.5
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Mon, 2012-11-26 at 09:07 +1100, Benjamin Herrenschmidt wrote: > Hi Linus ! > > Here's a patch that would be good to still have in 3.7. It's a one liner > fixing > a regression introduced by the new EEH code in .37 (potential oops on some > PCI setups when configuring MSIs). > > Cheers, > Ben. > > The following changes since commit d6dc24613c222f9057131ccbd5264a10bcba9f97: > > Merge remote-tracking branch 'agust/merge' into merge (2012-11-21 13:24:49 > +1100) > > are available in the git repository at: > > > git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git And the branch is "merge". Cheers, Ben. > > for you to fetch changes up to bb4618823a3389086f157fafb2a0d97cade8d89f: > > powerpc/pseries: Fix oops with MSIs when missing EEH PEs (2012-11-23 > 13:26:05 +1100) > > > Alexey Kardashevskiy (1): > powerpc/pseries: Fix oops with MSIs when missing EEH PEs > > arch/powerpc/platforms/pseries/msi.c |3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git next branch
On Sun, 2012-11-25 at 07:27 -0600, Kumar Gala wrote: Next time, put a little message with "highlights" that I can include in the merge commit, that's how we tend to do things nowadays :-) Cheers, Ben. > The following changes since commit ce812a79a4fda3885a15711aee3de78c4a24: > > powerpc: Disable relocation on exceptions when kexecing (2012-11-15 > 15:08:08 +1100) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git next > > for you to fetch changes up to 1723d90915d4689fa2e8cd4151d45ea38c96cb99: > > powerpc/dma/raidengine: add raidengine device (2012-11-25 07:19:51 -0600) > > > Jia Hongtao (1): > powerpc/fsl-pci: Add PCI controller ATMU PM support > > Timur Tabi (2): > drivers/virt: the Freescale hypervisor driver doesn't need to check > MSR[GS] > powerpc/86xx: fsl_pcibios_fixup_bus requires CONFIG_PCI > > Tushar Behera (1): > powerpc/85xx: p1022ds: Use NULL instead of 0 for pointers > > Varun Sethi (1): > powerpc/iommu/fsl: Add PAMU bypass enable register to ccsr_guts struct > > Xuelin Shi (1): > powerpc/dma/raidengine: add raidengine device > > York Sun (1): > powerpc/mpc85xx: Change spin table to cached memory > > .../devicetree/bindings/powerpc/fsl/raideng.txt| 81 +++ > arch/powerpc/boot/dts/fsl/p5020si-post.dtsi|1 + > arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi |6 ++ > arch/powerpc/boot/dts/fsl/qoriq-raid1.0-0.dtsi | 85 > > arch/powerpc/include/asm/fsl_guts.h|4 +- > arch/powerpc/platforms/85xx/p1022_ds.c |2 +- > arch/powerpc/platforms/85xx/smp.c | 49 --- > arch/powerpc/platforms/86xx/mpc8610_hpcd.c |2 + > arch/powerpc/sysdev/fsl_pci.c | 37 - > drivers/virt/fsl_hypervisor.c |3 - > 10 files changed, 250 insertions(+), 20 deletions(-) > create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/raideng.txt > create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-raid1.0-0.dtsi ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [git pull] Please pull powerpc.git merge branch
On Mon, 2012-11-26 at 09:08 +1100, Benjamin Herrenschmidt wrote: > On Mon, 2012-11-26 at 09:07 +1100, Benjamin Herrenschmidt wrote: > > Hi Linus ! > > > > Here's a patch that would be good to still have in 3.7. It's a one liner > > fixing > > a regression introduced by the new EEH code in .37 (potential oops on some > > PCI setups when configuring MSIs). I've just added a second fix for EEH (Gavin found another issue) which is trivial enough (and tested) so it should still go in. Updated pull request: The following changes since commit d6dc24613c222f9057131ccbd5264a10bcba9f97: Merge remote-tracking branch 'agust/merge' into merge (2012-11-21 13:24:49 +1100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge for you to fetch changes up to e716e014384688d1a50d1aa5213ee74748c6d4e0: powerpc/eeh: Do not invalidate PE properly (2012-11-26 09:14:16 +1100) Alexey Kardashevskiy (1): powerpc/pseries: Fix oops with MSIs when missing EEH PEs Gavin Shan (1): powerpc/eeh: Do not invalidate PE properly arch/powerpc/platforms/pseries/eeh_pe.c |2 +- arch/powerpc/platforms/pseries/msi.c|3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
[git pull] Please pull powerpc.git merge branch
Hi Linus ! Here's a patch that would be good to still have in 3.7. It's a one liner fixing a regression introduced by the new EEH code in .37 (potential oops on some PCI setups when configuring MSIs). Cheers, Ben. The following changes since commit d6dc24613c222f9057131ccbd5264a10bcba9f97: Merge remote-tracking branch 'agust/merge' into merge (2012-11-21 13:24:49 +1100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git for you to fetch changes up to bb4618823a3389086f157fafb2a0d97cade8d89f: powerpc/pseries: Fix oops with MSIs when missing EEH PEs (2012-11-23 13:26:05 +1100) Alexey Kardashevskiy (1): powerpc/pseries: Fix oops with MSIs when missing EEH PEs arch/powerpc/platforms/pseries/msi.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
[git pull] Please pull powerpc.git next branch
The following changes since commit ce812a79a4fda3885a15711aee3de78c4a24: powerpc: Disable relocation on exceptions when kexecing (2012-11-15 15:08:08 +1100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git next for you to fetch changes up to 1723d90915d4689fa2e8cd4151d45ea38c96cb99: powerpc/dma/raidengine: add raidengine device (2012-11-25 07:19:51 -0600) Jia Hongtao (1): powerpc/fsl-pci: Add PCI controller ATMU PM support Timur Tabi (2): drivers/virt: the Freescale hypervisor driver doesn't need to check MSR[GS] powerpc/86xx: fsl_pcibios_fixup_bus requires CONFIG_PCI Tushar Behera (1): powerpc/85xx: p1022ds: Use NULL instead of 0 for pointers Varun Sethi (1): powerpc/iommu/fsl: Add PAMU bypass enable register to ccsr_guts struct Xuelin Shi (1): powerpc/dma/raidengine: add raidengine device York Sun (1): powerpc/mpc85xx: Change spin table to cached memory .../devicetree/bindings/powerpc/fsl/raideng.txt| 81 +++ arch/powerpc/boot/dts/fsl/p5020si-post.dtsi|1 + arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi |6 ++ arch/powerpc/boot/dts/fsl/qoriq-raid1.0-0.dtsi | 85 arch/powerpc/include/asm/fsl_guts.h|4 +- arch/powerpc/platforms/85xx/p1022_ds.c |2 +- arch/powerpc/platforms/85xx/smp.c | 49 --- arch/powerpc/platforms/86xx/mpc8610_hpcd.c |2 + arch/powerpc/sysdev/fsl_pci.c | 37 - drivers/virt/fsl_hypervisor.c |3 - 10 files changed, 250 insertions(+), 20 deletions(-) create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/raideng.txt create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-raid1.0-0.dtsi ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH] i2c-cpm: Fix to takeback i2c bus master-ship after a collision
On Oct 30, 2012, at 10:00 PM, sachin surendran wrote:
> In case of collision on i2c bus the controller which lost bus mastership
> stays as a slave
> for all subsequent transfers. This results in the i2c controller never
> writing to the bus
> for future transactions, resulting in i2c transfer timeouts.
> This fix checks for a collision on last I2C transaction and sets the
> I2COM_MASTER
> bit for the new transaction.
>
> Signed-off-by: Sachin Surendran
> ---
> drivers/i2c/busses/i2c-cpm.c |8
> 1 file changed, 8 insertions(+)
patch doesn't apply, please resend properly.
- k
>
> diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
> index c1e1096..bb94c6d 100644
> --- a/drivers/i2c/busses/i2c-cpm.c
> +++ b/drivers/i2c/busses/i2c-cpm.c
> @@ -338,6 +338,14 @@ static int cpm_i2c_xfer(struct i2c_adapter *adap, struct
> i2c_msg *msgs, int num)
> tptr = 0;
> rptr = 0;
>
> + /*
> +* If there was a collision in the last i2c transaction,
> +* Set I2COM_MASTER as it was cleared during collision.
> +*/
> + if (in_be16(&tbdf->cbd_sc) & BD_SC_CL) {
> + out_8(&cpm->i2c_reg->i2com, I2COM_MASTER);
> + }
> +
> while (tptr < num) {
> pmsg = &msgs[tptr];
> dev_dbg(&adap->dev, "R: %d T: %d\n", rptr, tptr);
>
> ___
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH 1/2] powerpc/dma/raidengine: add raidengine device
On Nov 21, 2012, at 3:01 AM, wrote: > From: Xuelin Shi > > The RaidEngine is a new Freescale hardware that used for parity > computation offloading in RAID5/6. > > This patch adds the device node in device tree and related binding > documentation. > > Signed-off-by: Harninder Rai > Signed-off-by: Naveen Burmi > Signed-off-by: Xuelin Shi > --- > .../devicetree/bindings/powerpc/fsl/raideng.txt| 81 +++ > arch/powerpc/boot/dts/fsl/p5020si-post.dtsi|1 + > arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi |6 ++ > arch/powerpc/boot/dts/fsl/qoriq-raid1.0-0.dtsi | 85 > 4 files changed, 173 insertions(+) > create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/raideng.txt > create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-raid1.0-0.dtsi applied to next - k ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH 2/4] iommu/fsl: Add PAMU bypass enable register to ccsr_guts structure.
On Nov 20, 2012, at 7:54 AM, Varun Sethi wrote: > PAMU bypass enable register added to the ccsr_guts structure. > > Signed-off-by: Timur Tabi > Signed-off-by: Varun Sethi > --- > arch/powerpc/include/asm/fsl_guts.h |4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) applied to next - k ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH][V3] powerpc/fsl-pci: Add PCI controller ATMU PM support
On Nov 7, 2012, at 8:11 PM, Jia Hongtao wrote: > Power supply for PCI controller ATMU registers is off when system go to > deep-sleep state. So ATMU registers should be re-setup during PCI > controllers resume from sleep. > > Signed-off-by: Jia Hongtao > Signed-off-by: Li Yang > --- > arch/powerpc/sysdev/fsl_pci.c | 37 +++-- > 1 files changed, 35 insertions(+), 2 deletions(-) applied to next - k ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH 2/2] powerpc/86xx: fsl_pcibios_fixup_bus requires CONFIG_PCI
On Oct 15, 2012, at 2:52 PM, Timur Tabi wrote: > Function fsl_pcibios_fixup_bus() is available only if PCI is enabled. The > MPC8610 HPCD platform file was not protecting the assigned with an #ifdef, > which results in a link failure when PCI is disabled. Every other platform > already has this #ifdef. > > Signed-off-by: Timur Tabi > --- > arch/powerpc/platforms/86xx/mpc8610_hpcd.c |2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) applied to next - k ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH 1/2] powerpc/85xx: p1022ds: Use NULL instead of 0 for pointers
On Nov 19, 2012, at 10:31 PM, Tushar Behera wrote: > The third argument for of_get_property() is a pointer, hence pass > NULL instead of 0. > > Signed-off-by: Tushar Behera > --- > arch/powerpc/platforms/85xx/p1022_ds.c |2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) applied to next - k ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH] powerpc/mpc85xx: Change spin table to cached memory
On Sep 29, 2012, at 6:44 PM, York Sun wrote: > ePAPR v1.1 requires the spin table to be in cached memory. So we need > to change the call argument of ioremap to enable cache and coherence. > We also flush the cache after writing to spin table to keep it compatible > with previous cache-inhibit spin table. Flushing before and after > accessing spin table is recommended by ePAPR. > > Signed-off-by: York Sun > Acked-by: Timur Tabi > --- > This patch applies to > git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git next branch. > > arch/powerpc/platforms/85xx/smp.c | 49 +++-- > 1 file changed, 36 insertions(+), 13 deletions(-) applied to next - k ___ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
Re: [PATCH] powerpc/pci-hotplug: fix the rescanned pci device's dma_set_mask issue
On Nov 22, 2012, at 10:29 PM, Yuanquan Chen wrote:
> On powerpc arch, dma_ops of rescanned pci device after system's booting up
> won't be
> initialized by system, so it will fail to execute the dma_set_mask in the
> device's
> driver. Initialize it to solve this issue.
>
> Signed-off-by: Yuanquan Chen
> ---
> arch/powerpc/include/asm/dma-mapping.h |7 +--
> 1 file changed, 5 insertions(+), 2 deletions(-)
This is not the right way to get the dma_ops setup. You need to find some
other point for the hotplug scenario to get the dma_ops setup.
- k
>
> diff --git a/arch/powerpc/include/asm/dma-mapping.h
> b/arch/powerpc/include/asm/dma-mapping.h
> index 7816087..22eae53 100644
> --- a/arch/powerpc/include/asm/dma-mapping.h
> +++ b/arch/powerpc/include/asm/dma-mapping.h
> @@ -126,8 +126,11 @@ static inline int dma_supported(struct device *dev, u64
> mask)
> {
> struct dma_map_ops *dma_ops = get_dma_ops(dev);
>
> - if (unlikely(dma_ops == NULL))
> - return 0;
> + if (unlikely(dma_ops == NULL)) {
> + set_dma_ops(dev, &dma_direct_ops);
> + set_dma_offset(dev, PCI_DRAM_OFFSET);
> + dma_ops = &dma_direct_ops;
> + }
> if (dma_ops->dma_supported == NULL)
> return 1;
> return dma_ops->dma_supported(dev, mask);
> --
> 1.7.9.5
>
>
> ___
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
