Skip to contentSkip to conversation

PS3 updates for 4.3

PATCH Superseded Geoff Levand 6 participants 10 messages Sep 14, 2015 – Oct 2, 2015

Subsystems (2)
lore
Share & tools
lore

Geoff Levand

author maintainer
#0 lore raw

cover PS3 updates for 4.3

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(-)
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/3 drivers/ps3: Fix ps3-lpm white space

Fixed a coding style issue.

---
 drivers/ps3/ps3-lpm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ps3/ps3-lpm.c +1 -1
index cb7d3a6..e34de9a 100644
@@ -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;
Signature · 1 line
2.1.0
#3 lore raw

PATCH 2/3 drivers/ps3: Fix ps3-vuart null dereference

In reply to Geoff Levand

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.

---
 drivers/ps3/ps3-vuart.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/ps3/ps3-vuart.c +1 -2
index d6db822..632701a 100644
@@ -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;
Signature · 1 line
2.1.0
author maintainer
#6 lore raw

PATCH 3/3 powerpc/ps3: Refresh ps3_defconfig

In reply to Geoff Levand
---
 arch/powerpc/configs/ps3_defconfig | 4 ----
 1 file changed, 4 deletions(-)
arch/powerpc/configs/ps3_defconfig +0 -4
index adc14e8..09f117e 100644
@@ -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
Signature · 1 line
2.1.0
#7 lore raw

Re: [Cbe-oss-dev] [PATCH 3/3] powerpc/ps3: Refresh ps3_defconfig

Hi Geoff,

arch/powerpc/configs/ps3_defconfig CONFIG_RTC_DRV_PS3=y · line 145

Quoted 10 lines · Geoff Levand
arch/powerpc/configs/ps3_defconfig +0 -1
index adc14e8..09f117e 100644
@@ -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.

arch/powerpc/configs/ps3_defconfig CONFIG_RTC_DRV_PS3=y · line 146

Quoted 3 lines
arch/powerpc/configs/ps3_defconfig +0 -0
 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 -- [email protected]

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

author maintainer
#8 lore raw

PATCH v2 3/3 powerpc/ps3: Refresh ps3_defconfig

In reply to Geoff Levand

Refresh and remove obsolete CONFIG_EXT3_FS.

---
V2: Remove ext3 as suggested by Geert.

 arch/powerpc/configs/ps3_defconfig | 5 -----
 1 file changed, 5 deletions(-)
(quoted diff) +0 -0

b/arch/powerpc/configs/ps3_defconfig
index adc14e8..683b4c3 100644

arch/powerpc/configs/ps3_defconfig +0 -5
@@ -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
Signature · 1 line
2.1.0
#4 lore raw

RE: [PATCH 2/3] drivers/ps3: Fix ps3-vuart null dereference

In reply to Colin Ian King

RnJvbTogQ29saW4gSWFuIEtpbmcNCj4gU2VudDogMTQgU2VwdGVtYmVyIDIwMTUgMjA6MzUNCj4g T24gdGhlIHVubGlrZWx5IGV2ZW50IHRoYXQgZHJ2IGlzIG51bGwsIHRoZSBjdXJyZW50IGNvZGUg d2lsbA0KPiBwZXJmb3JtIGEgbnVsbCBwb2ludGVyIGRlcmVmZXJlbmNlIHdpdGggaXQgd2hlbiBw cmludGluZyBhIGRldl9kYmcNCj4gbWVzc2FnZS4gIEluc3RlYWQsIHRoZSBCVUdfT04gY2hlY2sg b24gZHJ2IHNob3VsZCBiZSBwZXJmb3JtZWQNCj4gYmVmb3JlIHdlIGVtaXQgdGhlIGRldl9kYmcg bWVzc2FnZS4NCi4uLg0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9wczMvcHMzLXZ1YXJ0LmMgYi9k cml2ZXJzL3BzMy9wczMtdnVhcnQuYw0KPiBpbmRleCBkNmRiODIyLi42MzI3MDFhIDEwMDY0NA0K PiAtLS0gYS9kcml2ZXJzL3BzMy9wczMtdnVhcnQuYw0KPiArKysgYi9kcml2ZXJzL3BzMy9wczMt dnVhcnQuYw0KPiBAQCAtMTAwMCwxMiArMTAwMCwxMSBAQCBzdGF0aWMgaW50IHBzM192dWFydF9w cm9iZShzdHJ1Y3QgcHMzX3N5c3RlbV9idXNfZGV2aWNlICpkZXYpDQo+ICAJZGV2X2RiZygmZGV2 LT5jb3JlLCAiJXM6JWRcbiIsIF9fZnVuY19fLCBfX0xJTkVfXyk7DQo+IA0KPiAgCWRydiA9IHBz M19zeXN0ZW1fYnVzX2Rldl90b192dWFydF9kcnYoZGV2KTsNCj4gKwlCVUdfT04oIWRydik7DQo+ IA0KPiAgCWRldl9kYmcoJmRldi0+Y29yZSwgIiVzOiVkOiAoJXMpXG4iLCBfX2Z1bmNfXywgX19M SU5FX18sDQo+ICAJCWRydi0+Y29yZS5jb3JlLm5hbWUpOw0KPiANCj4gLQlCVUdfT04oIWRydik7 DQo+IC0NCg0KSnVzdCBkZWxldGUgdGhlIEJVR19PTigpLCBpdCBpcyBqdXN0IGFzIGVhc3kgdG8g ZGVidWcgdGhlIGRlcmVmZXJlbmNlLg0KDQoJRGF2aWQNCg0K

reviewer Applied
#5 lore raw

Re: [2/3] drivers/ps3: Fix ps3-vuart null dereference

In reply to Colin Ian King
Quoted 7 lines · Colin 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.

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/6a6120bc5ec9e54d3cc06e73

cheers