* [PATCH 0/3] PS3 updates for 4.3
@ 2015-09-14 19:35 Geoff Levand
2015-09-14 19:35 ` [PATCH 3/3] powerpc/ps3: Refresh ps3_defconfig Geoff Levand
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Geoff Levand @ 2015-09-14 19:35 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Michael Ellerman, linuxppc-dev, cbe-oss-dev, Rudhresh Kumar J,
Colin Ian King
A few minor updates for PS3. Please apply.
-Geoff
The following changes since commit 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f:
Linux 4.3-rc1 (2015-09-12 16:35:56 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/geoff/ps3-linux.git for-merge-powerpc
for you to fetch changes up to f9c28dfbef66b7f23f1e542397bd6a77d1258ddd:
powerpc/ps3: Refresh ps3_defconfig (2015-09-14 12:28:10 -0700)
----------------------------------------------------------------
Colin Ian King (1):
drivers/ps3: Fix ps3-vuart null dereference
Geoff Levand (1):
powerpc/ps3: Refresh ps3_defconfig
Rudhresh Kumar J (1):
drivers/ps3: Fix ps3-lpm white space
arch/powerpc/configs/ps3_defconfig | 4 ----
drivers/ps3/ps3-lpm.c | 2 +-
drivers/ps3/ps3-vuart.c | 3 +--
3 files changed, 2 insertions(+), 7 deletions(-)
Colin Ian King (1):
drivers/ps3: Fix ps3-vuart null dereference
Geoff Levand (1):
powerpc/ps3: Refresh ps3_defconfig
Rudhresh Kumar J (1):
drivers/ps3: Fix ps3-lpm white space
arch/powerpc/configs/ps3_defconfig | 4 ----
drivers/ps3/ps3-lpm.c | 2 +-
drivers/ps3/ps3-vuart.c | 3 +--
3 files changed, 2 insertions(+), 7 deletions(-)
--
2.1.0
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/3] powerpc/ps3: Refresh ps3_defconfig
2015-09-14 19:35 [PATCH 0/3] PS3 updates for 4.3 Geoff Levand
@ 2015-09-14 19:35 ` Geoff Levand
2015-09-14 20:13 ` [Cbe-oss-dev] " Geert Uytterhoeven
2015-09-14 21:36 ` [PATCH V2 " Geoff Levand
2015-09-14 19:35 ` [PATCH 1/3] drivers/ps3: Fix ps3-lpm white space Rudhresh Kumar J
2015-09-14 19:35 ` [PATCH 2/3] drivers/ps3: Fix ps3-vuart null dereference Colin Ian King
2 siblings, 2 replies; 10+ messages in thread
From: Geoff Levand @ 2015-09-14 19:35 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: Michael Ellerman, linuxppc-dev, cbe-oss-dev
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
arch/powerpc/configs/ps3_defconfig | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index adc14e8..09f117e 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@ -53,7 +53,6 @@ CONFIG_IP_PNP_DHCP=y
# CONFIG_INET_XFRM_MODE_BEET is not set
# CONFIG_INET_LRO is not set
# CONFIG_INET_DIAG is not set
-CONFIG_IPV6=y
CONFIG_BT=m
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
@@ -142,7 +141,6 @@ CONFIG_RTC_DRV_PS3=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_EXT2_FS=m
CONFIG_EXT3_FS=m
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
CONFIG_EXT4_FS=y
CONFIG_QUOTA=y
CONFIG_QFMT_V2=y
@@ -175,9 +173,7 @@ CONFIG_DEBUG_LOCKDEP=y
CONFIG_DEBUG_LIST=y
CONFIG_RCU_CPU_STALL_TIMEOUT=60
# CONFIG_FTRACE is not set
-CONFIG_CRYPTO_GCM=m
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_SALSA20=m
CONFIG_CRYPTO_LZO=m
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
--
2.1.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 1/3] drivers/ps3: Fix ps3-lpm white space
2015-09-14 19:35 [PATCH 0/3] PS3 updates for 4.3 Geoff Levand
2015-09-14 19:35 ` [PATCH 3/3] powerpc/ps3: Refresh ps3_defconfig Geoff Levand
@ 2015-09-14 19:35 ` Rudhresh Kumar J
2015-10-02 7:47 ` [1/3] " Michael Ellerman
2015-09-14 19:35 ` [PATCH 2/3] drivers/ps3: Fix ps3-vuart null dereference Colin Ian King
2 siblings, 1 reply; 10+ messages in thread
From: Rudhresh Kumar J @ 2015-09-14 19:35 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Michael Ellerman, linuxppc-dev, cbe-oss-dev, Rudhresh Kumar J
Fixed a coding style issue.
Signed-off-by: Rudhresh Kumar J <rudhresh.jk@gmail.com>
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
drivers/ps3/ps3-lpm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/ps3/ps3-lpm.c b/drivers/ps3/ps3-lpm.c
index cb7d3a6..e34de9a 100644
--- a/drivers/ps3/ps3-lpm.c
+++ b/drivers/ps3/ps3-lpm.c
@@ -901,7 +901,7 @@ void ps3_disable_pm(u32 cpu)
result = lv1_stop_lpm(lpm_priv->lpm_id, &tmp);
if (result) {
- if(result != LV1_WRONG_STATE)
+ if (result != LV1_WRONG_STATE)
dev_err(sbd_core(), "%s:%u: lv1_stop_lpm failed: %s\n",
__func__, __LINE__, ps3_result(result));
return;
--
2.1.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/3] drivers/ps3: Fix ps3-vuart null dereference
2015-09-14 19:35 [PATCH 0/3] PS3 updates for 4.3 Geoff Levand
2015-09-14 19:35 ` [PATCH 3/3] powerpc/ps3: Refresh ps3_defconfig Geoff Levand
2015-09-14 19:35 ` [PATCH 1/3] drivers/ps3: Fix ps3-lpm white space Rudhresh Kumar J
@ 2015-09-14 19:35 ` Colin Ian King
2015-09-15 10:37 ` David Laight
2015-10-02 7:47 ` [2/3] " Michael Ellerman
2 siblings, 2 replies; 10+ messages in thread
From: Colin Ian King @ 2015-09-14 19:35 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Michael Ellerman, linuxppc-dev, cbe-oss-dev, Colin Ian King
On the unlikely event that drv is null, the current code will
perform a null pointer dereference with it when printing a dev_dbg
message. Instead, the BUG_ON check on drv should be performed
before we emit the dev_dbg message.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
drivers/ps3/ps3-vuart.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/ps3/ps3-vuart.c b/drivers/ps3/ps3-vuart.c
index d6db822..632701a 100644
--- a/drivers/ps3/ps3-vuart.c
+++ b/drivers/ps3/ps3-vuart.c
@@ -1000,12 +1000,11 @@ static int ps3_vuart_probe(struct ps3_system_bus_device *dev)
dev_dbg(&dev->core, "%s:%d\n", __func__, __LINE__);
drv = ps3_system_bus_dev_to_vuart_drv(dev);
+ BUG_ON(!drv);
dev_dbg(&dev->core, "%s:%d: (%s)\n", __func__, __LINE__,
drv->core.core.name);
- BUG_ON(!drv);
-
if (dev->port_number >= PORT_COUNT) {
BUG();
return -EINVAL;
--
2.1.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Cbe-oss-dev] [PATCH 3/3] powerpc/ps3: Refresh ps3_defconfig
2015-09-14 19:35 ` [PATCH 3/3] powerpc/ps3: Refresh ps3_defconfig Geoff Levand
@ 2015-09-14 20:13 ` Geert Uytterhoeven
2015-09-14 21:36 ` [PATCH V2 " Geoff Levand
1 sibling, 0 replies; 10+ messages in thread
From: Geert Uytterhoeven @ 2015-09-14 20:13 UTC (permalink / raw)
To: Geoff Levand
Cc: Benjamin Herrenschmidt, cbe-oss-dev, Michael Ellerman, linuxppc-dev
Hi Geoff,
On Mon, Sep 14, 2015 at 9:35 PM, Geoff Levand <geoff@infradead.org> wrote:
> diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
> index adc14e8..09f117e 100644
> --- a/arch/powerpc/configs/ps3_defconfig
> +++ b/arch/powerpc/configs/ps3_defconfig
> @@ -142,7 +141,6 @@ CONFIG_RTC_DRV_PS3=y
> # CONFIG_IOMMU_SUPPORT is not set
> CONFIG_EXT2_FS=m
> CONFIG_EXT3_FS=m
> -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
Given Ext3 support was removed, and although the Kconfig symbol was kept for
(temporary?) backwards compatibility, I think these should be updated.
> CONFIG_EXT4_FS=y
> CONFIG_QUOTA=y
> CONFIG_QFMT_V2=y
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH V2 3/3] powerpc/ps3: Refresh ps3_defconfig
2015-09-14 19:35 ` [PATCH 3/3] powerpc/ps3: Refresh ps3_defconfig Geoff Levand
2015-09-14 20:13 ` [Cbe-oss-dev] " Geert Uytterhoeven
@ 2015-09-14 21:36 ` Geoff Levand
2015-10-02 7:47 ` [V2,3/3] " Michael Ellerman
1 sibling, 1 reply; 10+ messages in thread
From: Geoff Levand @ 2015-09-14 21:36 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Michael Ellerman, linuxppc-dev, cbe-oss-dev, Geert Uytterhoeven
Refresh and remove obsolete CONFIG_EXT3_FS.
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
V2: Remove ext3 as suggested by Geert.
arch/powerpc/configs/ps3_defconfig | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/powerpc/configs/ps3_defconfig
b/arch/powerpc/configs/ps3_defconfig
index adc14e8..683b4c3 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@ -53,7 +53,6 @@ CONFIG_IP_PNP_DHCP=y
# CONFIG_INET_XFRM_MODE_BEET is not set
# CONFIG_INET_LRO is not set
# CONFIG_INET_DIAG is not set
-CONFIG_IPV6=y
CONFIG_BT=m
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
@@ -141,8 +140,6 @@ CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_PS3=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_EXT2_FS=m
-CONFIG_EXT3_FS=m
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
CONFIG_EXT4_FS=y
CONFIG_QUOTA=y
CONFIG_QFMT_V2=y
@@ -175,9 +172,7 @@ CONFIG_DEBUG_LOCKDEP=y
CONFIG_DEBUG_LIST=y
CONFIG_RCU_CPU_STALL_TIMEOUT=60
# CONFIG_FTRACE is not set
-CONFIG_CRYPTO_GCM=m
CONFIG_CRYPTO_PCBC=m
CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_SALSA20=m
CONFIG_CRYPTO_LZO=m
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
--
2.1.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* RE: [PATCH 2/3] drivers/ps3: Fix ps3-vuart null dereference
2015-09-14 19:35 ` [PATCH 2/3] drivers/ps3: Fix ps3-vuart null dereference Colin Ian King
@ 2015-09-15 10:37 ` David Laight
2015-10-02 7:47 ` [2/3] " Michael Ellerman
1 sibling, 0 replies; 10+ messages in thread
From: David Laight @ 2015-09-15 10:37 UTC (permalink / raw)
To: 'Colin Ian King', Benjamin Herrenschmidt
Cc: cbe-oss-dev, linuxppc-dev
RnJvbTogQ29saW4gSWFuIEtpbmcNCj4gU2VudDogMTQgU2VwdGVtYmVyIDIwMTUgMjA6MzUNCj4g
T24gdGhlIHVubGlrZWx5IGV2ZW50IHRoYXQgZHJ2IGlzIG51bGwsIHRoZSBjdXJyZW50IGNvZGUg
d2lsbA0KPiBwZXJmb3JtIGEgbnVsbCBwb2ludGVyIGRlcmVmZXJlbmNlIHdpdGggaXQgd2hlbiBw
cmludGluZyBhIGRldl9kYmcNCj4gbWVzc2FnZS4gIEluc3RlYWQsIHRoZSBCVUdfT04gY2hlY2sg
b24gZHJ2IHNob3VsZCBiZSBwZXJmb3JtZWQNCj4gYmVmb3JlIHdlIGVtaXQgdGhlIGRldl9kYmcg
bWVzc2FnZS4NCi4uLg0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9wczMvcHMzLXZ1YXJ0LmMgYi9k
cml2ZXJzL3BzMy9wczMtdnVhcnQuYw0KPiBpbmRleCBkNmRiODIyLi42MzI3MDFhIDEwMDY0NA0K
PiAtLS0gYS9kcml2ZXJzL3BzMy9wczMtdnVhcnQuYw0KPiArKysgYi9kcml2ZXJzL3BzMy9wczMt
dnVhcnQuYw0KPiBAQCAtMTAwMCwxMiArMTAwMCwxMSBAQCBzdGF0aWMgaW50IHBzM192dWFydF9w
cm9iZShzdHJ1Y3QgcHMzX3N5c3RlbV9idXNfZGV2aWNlICpkZXYpDQo+ICAJZGV2X2RiZygmZGV2
LT5jb3JlLCAiJXM6JWRcbiIsIF9fZnVuY19fLCBfX0xJTkVfXyk7DQo+IA0KPiAgCWRydiA9IHBz
M19zeXN0ZW1fYnVzX2Rldl90b192dWFydF9kcnYoZGV2KTsNCj4gKwlCVUdfT04oIWRydik7DQo+
IA0KPiAgCWRldl9kYmcoJmRldi0+Y29yZSwgIiVzOiVkOiAoJXMpXG4iLCBfX2Z1bmNfXywgX19M
SU5FX18sDQo+ICAJCWRydi0+Y29yZS5jb3JlLm5hbWUpOw0KPiANCj4gLQlCVUdfT04oIWRydik7
DQo+IC0NCg0KSnVzdCBkZWxldGUgdGhlIEJVR19PTigpLCBpdCBpcyBqdXN0IGFzIGVhc3kgdG8g
ZGVidWcgdGhlIGRlcmVmZXJlbmNlLg0KDQoJRGF2aWQNCg0K
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [1/3] drivers/ps3: Fix ps3-lpm white space
2015-09-14 19:35 ` [PATCH 1/3] drivers/ps3: Fix ps3-lpm white space Rudhresh Kumar J
@ 2015-10-02 7:47 ` Michael Ellerman
0 siblings, 0 replies; 10+ messages in thread
From: Michael Ellerman @ 2015-10-02 7:47 UTC (permalink / raw)
To: Rudhresh Kumar J, Benjamin Herrenschmidt
Cc: cbe-oss-dev, linuxppc-dev, Rudhresh Kumar J
On Mon, 2015-14-09 at 19:35:04 UTC, Rudhresh Kumar J wrote:
> Fixed a coding style issue.
>
> Signed-off-by: Rudhresh Kumar J <rudhresh.jk@gmail.com>
> Signed-off-by: Geoff Levand <geoff@infradead.org>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/12a509336701132f521c8fc2
cheers
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [2/3] drivers/ps3: Fix ps3-vuart null dereference
2015-09-14 19:35 ` [PATCH 2/3] drivers/ps3: Fix ps3-vuart null dereference Colin Ian King
2015-09-15 10:37 ` David Laight
@ 2015-10-02 7:47 ` Michael Ellerman
1 sibling, 0 replies; 10+ messages in thread
From: Michael Ellerman @ 2015-10-02 7:47 UTC (permalink / raw)
To: Colin King, Benjamin Herrenschmidt
Cc: cbe-oss-dev, linuxppc-dev, Colin Ian King
On Mon, 2015-14-09 at 19:35:04 UTC, Colin King wrote:
> On the unlikely event that drv is null, the current code will
> perform a null pointer dereference with it when printing a dev_dbg
> message. Instead, the BUG_ON check on drv should be performed
> before we emit the dev_dbg message.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> Signed-off-by: Geoff Levand <geoff@infradead.org>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/6a6120bc5ec9e54d3cc06e73
cheers
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [V2,3/3] powerpc/ps3: Refresh ps3_defconfig
2015-09-14 21:36 ` [PATCH V2 " Geoff Levand
@ 2015-10-02 7:47 ` Michael Ellerman
0 siblings, 0 replies; 10+ messages in thread
From: Michael Ellerman @ 2015-10-02 7:47 UTC (permalink / raw)
To: Geoff Levand, Benjamin Herrenschmidt
Cc: cbe-oss-dev, linuxppc-dev, Geert Uytterhoeven
On Mon, 2015-14-09 at 21:36:35 UTC, Geoff Levand wrote:
> Refresh and remove obsolete CONFIG_EXT3_FS.
>
> Signed-off-by: Geoff Levand <geoff@infradead.org>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/336382c78b926af7f3b22f73
cheers
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-10-02 7:47 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-14 19:35 [PATCH 0/3] PS3 updates for 4.3 Geoff Levand
2015-09-14 19:35 ` [PATCH 3/3] powerpc/ps3: Refresh ps3_defconfig Geoff Levand
2015-09-14 20:13 ` [Cbe-oss-dev] " Geert Uytterhoeven
2015-09-14 21:36 ` [PATCH V2 " Geoff Levand
2015-10-02 7:47 ` [V2,3/3] " Michael Ellerman
2015-09-14 19:35 ` [PATCH 1/3] drivers/ps3: Fix ps3-lpm white space Rudhresh Kumar J
2015-10-02 7:47 ` [1/3] " Michael Ellerman
2015-09-14 19:35 ` [PATCH 2/3] drivers/ps3: Fix ps3-vuart null dereference Colin Ian King
2015-09-15 10:37 ` David Laight
2015-10-02 7:47 ` [2/3] " Michael Ellerman
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).