* [PATCH 1/4] powerpc/ps3: Add macro PS3_VERBOSE_RESULT
2013-02-14 3:06 [PATCH 0/4] PS3 patches for 3.9 Geoff Levand
2013-02-14 3:03 ` [PATCH 2/4] powerpc/ps3: Increase verbosity of htab errors Geoff Levand
@ 2013-02-14 3:03 ` Geoff Levand
2013-02-14 3:03 ` [PATCH 4/4] powerpc: Move boot_paca into early_setup Geoff Levand
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Geoff Levand @ 2013-02-14 3:03 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: Geoff Levand, cbe-oss-dev, linuxppc-dev
To allow more control of the verbosity of ps3_result() add a check
for the preprocessor macro PS3_VERBOSE_RESULT that builds a verbose
verion of the ps3_result() routine.
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
arch/powerpc/include/asm/ps3.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/include/asm/ps3.h b/arch/powerpc/include/asm/ps3.h
index 0e15db4..678a7c1 100644
--- a/arch/powerpc/include/asm/ps3.h
+++ b/arch/powerpc/include/asm/ps3.h
@@ -245,7 +245,7 @@ enum lv1_result {
static inline const char* ps3_result(int result)
{
-#if defined(DEBUG)
+#if defined(DEBUG) || defined(PS3_VERBOSE_RESULT)
switch (result) {
case LV1_SUCCESS:
return "LV1_SUCCESS (0)";
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/4] powerpc/ps3: Increase verbosity of htab errors
2013-02-14 3:06 [PATCH 0/4] PS3 patches for 3.9 Geoff Levand
@ 2013-02-14 3:03 ` Geoff Levand
2013-02-14 3:03 ` [PATCH 1/4] powerpc/ps3: Add macro PS3_VERBOSE_RESULT Geoff Levand
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Geoff Levand @ 2013-02-14 3:03 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: Geoff Levand, cbe-oss-dev, linuxppc-dev
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
arch/powerpc/platforms/ps3/htab.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c
index d00d7b0..6cc5820 100644
--- a/arch/powerpc/platforms/ps3/htab.c
+++ b/arch/powerpc/platforms/ps3/htab.c
@@ -27,6 +27,7 @@
#include <asm/lv1call.h>
#include <asm/ps3fb.h>
+#define PS3_VERBOSE_RESULT
#include "platform.h"
/**
@@ -75,8 +76,9 @@ static long ps3_hpte_insert(unsigned long hpte_group, unsigned long vpn,
if (result) {
/* all entries bolted !*/
- pr_info("%s:result=%d vpn=%lx pa=%lx ix=%lx v=%llx r=%llx\n",
- __func__, result, vpn, pa, hpte_group, hpte_v, hpte_r);
+ pr_info("%s:result=%s vpn=%lx pa=%lx ix=%lx v=%llx r=%llx\n",
+ __func__, ps3_result(result), vpn, pa, hpte_group,
+ hpte_v, hpte_r);
BUG();
}
@@ -125,8 +127,8 @@ static long ps3_hpte_updatepp(unsigned long slot, unsigned long newpp,
&hpte_rs);
if (result) {
- pr_info("%s: res=%d read vpn=%lx slot=%lx psize=%d\n",
- __func__, result, vpn, slot, psize);
+ pr_info("%s: result=%s read vpn=%lx slot=%lx psize=%d\n",
+ __func__, ps3_result(result), vpn, slot, psize);
BUG();
}
@@ -170,8 +172,8 @@ static void ps3_hpte_invalidate(unsigned long slot, unsigned long vpn,
result = lv1_write_htab_entry(PS3_LPAR_VAS_ID_CURRENT, slot, 0, 0);
if (result) {
- pr_info("%s: res=%d vpn=%lx slot=%lx psize=%d\n",
- __func__, result, vpn, slot, psize);
+ pr_info("%s: result=%s vpn=%lx slot=%lx psize=%d\n",
+ __func__, ps3_result(result), vpn, slot, psize);
BUG();
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/4] powerpc/ps3: Refresh ps3_defconfig
2013-02-14 3:06 [PATCH 0/4] PS3 patches for 3.9 Geoff Levand
` (2 preceding siblings ...)
2013-02-14 3:03 ` [PATCH 4/4] powerpc: Move boot_paca into early_setup Geoff Levand
@ 2013-02-14 3:03 ` Geoff Levand
2013-03-19 1:11 ` [PATCH for 3.9] powerpc/ps3: Update ps3_defconfig Geoff Levand
4 siblings, 0 replies; 7+ messages in thread
From: Geoff Levand @ 2013-02-14 3:03 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: Geoff Levand, cbe-oss-dev, linuxppc-dev
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
arch/powerpc/configs/ps3_defconfig | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index c2f4b4a..7a5c15f 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@ -6,6 +6,7 @@ CONFIG_NR_CPUS=2
CONFIG_EXPERIMENTAL=y
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
+CONFIG_HIGH_RES_TIMERS=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_EMBEDDED=y
@@ -24,12 +25,13 @@ CONFIG_PS3_DISK=y
CONFIG_PS3_ROM=y
CONFIG_PS3_FLASH=y
CONFIG_PS3_VRAM=m
+CONFIG_PS3_LPM=m
# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
-CONFIG_HIGH_RES_TIMERS=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
CONFIG_BINFMT_MISC=y
CONFIG_KEXEC=y
# CONFIG_SPARSEMEM_VMEMMAP is not set
+# CONFIG_COMPACTION is not set
CONFIG_SCHED_SMT=y
CONFIG_CMDLINE_BOOL=y
CONFIG_CMDLINE=""
@@ -59,6 +61,7 @@ CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=m
CONFIG_BT_HCIBTUSB=m
CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT=y
CONFIG_MAC80211=m
CONFIG_MAC80211_RC_PID=y
# CONFIG_MAC80211_RC_MINSTREL is not set
@@ -78,7 +81,6 @@ CONFIG_MD=y
CONFIG_BLK_DEV_DM=m
CONFIG_NETDEVICES=y
# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
# CONFIG_NET_VENDOR_INTEL is not set
# CONFIG_NET_VENDOR_MARVELL is not set
# CONFIG_NET_VENDOR_MICREL is not set
@@ -119,21 +121,21 @@ CONFIG_SND=m
# CONFIG_SND_DRIVERS is not set
CONFIG_SND_USB_AUDIO=m
CONFIG_HIDRAW=y
-CONFIG_USB_HIDDEV=y
CONFIG_HID_APPLE=m
CONFIG_HID_BELKIN=m
CONFIG_HID_CHERRY=m
CONFIG_HID_EZKEY=m
CONFIG_HID_TWINHAN=m
CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
CONFIG_HID_MICROSOFT=m
+CONFIG_HID_PS3REMOTE=m
CONFIG_HID_SONY=m
CONFIG_HID_SUNPLUS=m
CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_USB_HIDDEV=y
CONFIG_USB=m
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
CONFIG_USB_SUSPEND=y
CONFIG_USB_MON=m
CONFIG_USB_EHCI_HCD=m
@@ -158,8 +160,8 @@ CONFIG_PROC_KCORE=y
CONFIG_TMPFS=y
CONFIG_HUGETLBFS=y
CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
CONFIG_NFS_V4=y
+CONFIG_NFS_SWAP=y
CONFIG_ROOT_NFS=y
CONFIG_CIFS=m
CONFIG_NLS=y
@@ -176,6 +178,7 @@ CONFIG_DEBUG_INFO=y
CONFIG_DEBUG_WRITECOUNT=y
CONFIG_DEBUG_MEMORY_INIT=y
CONFIG_DEBUG_LIST=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
# CONFIG_FTRACE is not set
CONFIG_DEBUG_STACKOVERFLOW=y
CONFIG_CRYPTO_CCM=m
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/4] powerpc: Move boot_paca into early_setup
2013-02-14 3:06 [PATCH 0/4] PS3 patches for 3.9 Geoff Levand
2013-02-14 3:03 ` [PATCH 2/4] powerpc/ps3: Increase verbosity of htab errors Geoff Levand
2013-02-14 3:03 ` [PATCH 1/4] powerpc/ps3: Add macro PS3_VERBOSE_RESULT Geoff Levand
@ 2013-02-14 3:03 ` Geoff Levand
2013-02-14 3:03 ` [PATCH 3/4] powerpc/ps3: Refresh ps3_defconfig Geoff Levand
2013-03-19 1:11 ` [PATCH for 3.9] powerpc/ps3: Update ps3_defconfig Geoff Levand
4 siblings, 0 replies; 7+ messages in thread
From: Geoff Levand @ 2013-02-14 3:03 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: Geoff Levand, cbe-oss-dev, linuxppc-dev
The powerpc boot_paca symbol is now only used within the
early_setup() routine, so move it from its global definition
into early_setup().
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
arch/powerpc/include/asm/paca.h | 1 -
arch/powerpc/kernel/paca.c | 2 --
arch/powerpc/kernel/setup_64.c | 2 ++
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h
index e9e7a69..45e87b7 100644
--- a/arch/powerpc/include/asm/paca.h
+++ b/arch/powerpc/include/asm/paca.h
@@ -167,7 +167,6 @@ struct paca_struct {
};
extern struct paca_struct *paca;
-extern __initdata struct paca_struct boot_paca;
extern void initialise_paca(struct paca_struct *new_paca, int cpu);
extern void setup_paca(struct paca_struct *new_paca);
extern void allocate_pacas(void);
diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c
index cd6da85..f8f2468 100644
--- a/arch/powerpc/kernel/paca.c
+++ b/arch/powerpc/kernel/paca.c
@@ -120,8 +120,6 @@ struct slb_shadow slb_shadow[] __cacheline_aligned = {
struct paca_struct *paca;
EXPORT_SYMBOL(paca);
-struct paca_struct boot_paca;
-
void __init initialise_paca(struct paca_struct *new_paca, int cpu)
{
/* The TOC register (GPR2) points 32kB into the TOC, so that 64kB
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 6da881b..f2514e1 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -177,6 +177,8 @@ early_param("smt-enabled", early_smt_enabled);
void __init early_setup(unsigned long dt_ptr)
{
+ static __initdata struct paca_struct boot_paca;
+
/* -------- printk is _NOT_ safe to use here ! ------- */
/* Identify CPU type */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 0/4] PS3 patches for 3.9
@ 2013-02-14 3:06 Geoff Levand
2013-02-14 3:03 ` [PATCH 2/4] powerpc/ps3: Increase verbosity of htab errors Geoff Levand
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Geoff Levand @ 2013-02-14 3:06 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: Geoff Levand, cbe-oss-dev, linuxppc-dev
Hi Ben,
Here are a few minor PS3 patches, and one cleanup for the powerpc
boot_paca variable.
Please consider for 3.9
-Geoff
The following changes since commit 836dc9e3fbbab0c30aa6e664417225f5c1fb1c39:
Linux 3.8-rc7 (2013-02-09 08:20:39 +1100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/geoff/ps3-linux.git for-powerpc
for you to fetch changes up to f9fda8ea9d2ef07dd5b3313892ec20b6cbad2ce8:
powerpc: Move boot_paca into early_setup (2013-02-13 18:07:41 -0800)
----------------------------------------------------------------
Geoff Levand (4):
powerpc/ps3: Add macro PS3_VERBOSE_RESULT
powerpc/ps3: Increase verbosity of htab errors
powerpc/ps3: Refresh ps3_defconfig
powerpc: Move boot_paca into early_setup
arch/powerpc/configs/ps3_defconfig | 15 +++++++++------
arch/powerpc/include/asm/paca.h | 1 -
arch/powerpc/include/asm/ps3.h | 2 +-
arch/powerpc/kernel/paca.c | 2 --
arch/powerpc/kernel/setup_64.c | 2 ++
arch/powerpc/platforms/ps3/htab.c | 14 ++++++++------
6 files changed, 20 insertions(+), 16 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH for 3.9] powerpc/ps3: Update ps3_defconfig
2013-02-14 3:06 [PATCH 0/4] PS3 patches for 3.9 Geoff Levand
` (3 preceding siblings ...)
2013-02-14 3:03 ` [PATCH 3/4] powerpc/ps3: Refresh ps3_defconfig Geoff Levand
@ 2013-03-19 1:11 ` Geoff Levand
2013-03-30 0:38 ` Geoff Levand
4 siblings, 1 reply; 7+ messages in thread
From: Geoff Levand @ 2013-03-19 1:11 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: cbe-oss-dev, linuxppc-dev
Refresh and set CONFIG_RD_LZMA=y.
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
Hi Ben,
This sets CONFIG_RD_LZMA=y, which is needed to boot with
newer initrd images.
Please apply for 3.9.
Also available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/geoff/ps3-linux.git for-powerpc
-Geoff
arch/powerpc/configs/ps3_defconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index 7a5c15f..f791962 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@ -3,11 +3,11 @@ CONFIG_TUNE_CELL=y
CONFIG_ALTIVEC=y
CONFIG_SMP=y
CONFIG_NR_CPUS=2
-CONFIG_EXPERIMENTAL=y
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_BLK_DEV_INITRD=y
+CONFIG_RD_LZMA=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_EMBEDDED=y
# CONFIG_PERF_EVENTS is not set
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH for 3.9] powerpc/ps3: Update ps3_defconfig
2013-03-19 1:11 ` [PATCH for 3.9] powerpc/ps3: Update ps3_defconfig Geoff Levand
@ 2013-03-30 0:38 ` Geoff Levand
0 siblings, 0 replies; 7+ messages in thread
From: Geoff Levand @ 2013-03-30 0:38 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: cbe-oss-dev, linuxppc-dev
Hi Ben,
It would be nice if I could get this in for 3.9. Did you miss it?
Thanks.
-Geoff
On Mon, 2013-03-18 at 18:11 -0700, Geoff Levand wrote:
> Refresh and set CONFIG_RD_LZMA=y.
>
> Signed-off-by: Geoff Levand <geoff@infradead.org>
> ---
> Hi Ben,
>
> This sets CONFIG_RD_LZMA=y, which is needed to boot with
> newer initrd images.
>
> Please apply for 3.9.
>
> Also available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/geoff/ps3-linux.git for-powerpc
>
> -Geoff
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-03-30 0:38 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-14 3:06 [PATCH 0/4] PS3 patches for 3.9 Geoff Levand
2013-02-14 3:03 ` [PATCH 2/4] powerpc/ps3: Increase verbosity of htab errors Geoff Levand
2013-02-14 3:03 ` [PATCH 1/4] powerpc/ps3: Add macro PS3_VERBOSE_RESULT Geoff Levand
2013-02-14 3:03 ` [PATCH 4/4] powerpc: Move boot_paca into early_setup Geoff Levand
2013-02-14 3:03 ` [PATCH 3/4] powerpc/ps3: Refresh ps3_defconfig Geoff Levand
2013-03-19 1:11 ` [PATCH for 3.9] powerpc/ps3: Update ps3_defconfig Geoff Levand
2013-03-30 0:38 ` Geoff Levand
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.