Add fan driver for PS5 (#25)

* linux: ps5: add fan driver

Thanks to cow for EMC RE and general help.

* ps5: remove redundant autoservo call in spcie

.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 7.1.1 Kernel Configuration
+# Linux/x86 7.1.2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 15.2.0-16ubuntu1) 15.2.0"
 CONFIG_CC_IS_GCC=y

.github/workflows/build-kernel.yml

@@ -8,7 +8,7 @@ on:
         description: 'Package format'
         default: 'all'
         type: choice
-        options: [deb, arch, all]
+        options: [deb, arch, rpm, all]
       patches_ref:
         description: 'Patches branch/tag/SHA (empty = default)'
         default: ''
@@ -43,6 +43,18 @@ jobs:
           bash image/build_image.sh --kernel-only \
             --distro "$FORMAT" \
             --patches-ref "$PATCHES_REF"
+          # build_image.sh's --distro all skips the rpm packager, and each
+          # kernel-build call wipes image/linux-bin/. Stash the deb + pkg.tar.zst
+          # from the "all" run before firing the rpm-producing "fedora" run,
+          # then restore so the release ships all three formats.
+          if [ "$FORMAT" = "all" ]; then
+            mkdir -p /tmp/kernel-stash
+            cp image/linux-bin/*.deb image/linux-bin/*.pkg.tar.zst /tmp/kernel-stash/
+            bash image/build_image.sh --kernel-only \
+              --distro fedora \
+              --patches-ref "$PATCHES_REF"
+            cp /tmp/kernel-stash/*.deb /tmp/kernel-stash/*.pkg.tar.zst image/linux-bin/
+          fi
 
       - name: Read kernel and patches version
         id: version
@@ -61,6 +73,7 @@ jobs:
           path: |
             image/linux-bin/*.deb
             image/linux-bin/*.pkg.tar.zst
+            image/linux-bin/*.rpm
           retention-days: 7
 
       - name: Compute checksums
@@ -68,7 +81,7 @@ jobs:
         run: |
           {
             echo 'sums<<SHAEOF'
-            sha256sum image/linux-bin/*.deb image/linux-bin/*.pkg.tar.zst | sed 's|image/linux-bin/||'
+            sha256sum image/linux-bin/*.deb image/linux-bin/*.pkg.tar.zst image/linux-bin/*.rpm 2>/dev/null | sed 's|image/linux-bin/||'
             echo 'SHAEOF'
           } >> "$GITHUB_OUTPUT"
 
@@ -90,4 +103,5 @@ jobs:
           files: |
             image/linux-bin/*.deb
             image/linux-bin/*.pkg.tar.zst
+            image/linux-bin/*.rpm
           make_latest: true

README.md

@@ -24,7 +24,6 @@ sudo make install
 ## TODO
 
 - amdgpu smu driver to show correct gpu frequency and temperature
-- xhci driver adjustment for 0x104d:0x9108 to enable bluetooth
 - hdmi converter improvments: hdr, rgb range, 120hz
 
 ## Bugs

linux.patch

@@ -1091,7 +1091,7 @@ index 000000000000..39cc76f39e06
 +
 +#endif
 diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
-index 830fefb342c6..f13155f049c4 100644
+index 830fefb342c6..380bc421583d 100644
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
 @@ -67,6 +67,10 @@ static struct usb_driver btusb_driver;
@@ -1112,10 +1112,10 @@ index 830fefb342c6..f13155f049c4 100644
 +       /* PS5 IW620 Bluetooth device */
 +	{ USB_DEVICE(0x1286, 0x2059),
 +	  .driver_info = BTUSB_MARVELL |
-+					 BTUSB_IFNUM_0 |
-+					 BTUSB_BROKEN_LE_DEFAULT_PHY |
-+					 BTUSB_BROKEN_READ_LOCAL_NAME |
-+					 BTUSB_NO_AUTOSUSPEND },
++			 BTUSB_IFNUM_0 |
++			 BTUSB_BROKEN_LE_DEFAULT_PHY |
++			 BTUSB_BROKEN_READ_LOCAL_NAME |
++			 BTUSB_NO_AUTOSUSPEND },
 +
  	{ }	/* Terminating entry */
  };
@@ -1125,10 +1125,10 @@ index 830fefb342c6..f13155f049c4 100644
  	{ USB_DEVICE(0x1286, 0x2046), .driver_info = BTUSB_MARVELL },
  	{ USB_DEVICE(0x1286, 0x204e), .driver_info = BTUSB_MARVELL },
 +	{ USB_DEVICE(0x1286, 0x2059), .driver_info = BTUSB_MARVELL |
-+												 BTUSB_IFNUM_0 |
-+											 	 BTUSB_BROKEN_LE_DEFAULT_PHY |
-+											 	 BTUSB_BROKEN_READ_LOCAL_NAME |
-+											 	 BTUSB_NO_AUTOSUSPEND },
++						     BTUSB_IFNUM_0 |
++						     BTUSB_BROKEN_LE_DEFAULT_PHY |
++						     BTUSB_BROKEN_READ_LOCAL_NAME |
++						     BTUSB_NO_AUTOSUSPEND },
  
  	/* Intel Bluetooth devices */
  	{ USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_COMBINED },
@@ -3409,11 +3409,11 @@ index b63cd0c310bc..495b2714838b 100644
  
 diff --git a/drivers/ps5/Makefile b/drivers/ps5/Makefile
 new file mode 100644
-index 000000000000..ccb2740e3375
+index 000000000000..b4b42394aed9
 --- /dev/null
 +++ b/drivers/ps5/Makefile
 @@ -0,0 +1,2 @@
-+obj-y += spcie.o tpcie.o hdmi.o mp1.o buzzer.o svm.o vmenter.o
++obj-y += spcie.o tpcie.o hdmi.o mp1.o buzzer.o svm.o vmenter.o fan.o
 +obj-y += led/
 diff --git a/drivers/ps5/autoservo_param.h b/drivers/ps5/autoservo_param.h
 new file mode 100644
@@ -5620,6 +5620,205 @@ index 000000000000..f48ad6f92534
 +MODULE_AUTHOR("Armandas Kvietkus");
 +MODULE_DESCRIPTION("PlayStation 5 chassis piezo buzzer");
 +MODULE_LICENSE("GPL");
+diff --git a/drivers/ps5/fan.c b/drivers/ps5/fan.c
+new file mode 100644
+index 000000000000..33a48c664f73
+--- /dev/null
++++ b/drivers/ps5/fan.c
+@@ -0,0 +1,193 @@
++// SPDX-License-Identifier: GPL-2.0-only
++
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/slab.h>
++#include <linux/err.h>
++#include <linux/unaligned.h>
++#include <linux/ps5.h>
++#include "ps5-fan.h"
++
++static int icc_fan_txn(u8 svc, u16 mt, u16 len,
++		       const u8 *data, size_t dlen,
++		       u8 *reply_out, size_t rlen)
++{
++	u8 *buf;
++	struct icc_msg *msg;
++	int ret;
++
++	buf = kzalloc(ICC_MSG_MAX_SIZE, GFP_KERNEL);
++	if (!buf)
++		return -ENOMEM;
++	msg = (struct icc_msg *)buf;
++
++	msg->service_id = svc;
++	msg->msg_type = mt;
++	msg->length = len;
++	if (data && dlen)
++		memcpy(msg->data, data, dlen);
++
++	ret = icc_query(buf, buf);
++	if (!ret && reply_out && rlen)
++		memcpy(reply_out, msg->data, rlen);
++
++	kfree(buf);
++	return ret;
++}
++
++static int icc_fan_get_curset(u8 zone, u32 out[PS5_CURSET_COUNT])
++{
++	u8 req[ICC_MSG_MAX_SIZE - sizeof(struct icc_msg)] = {};
++	u8 reply[ICC_MSG_MIN_SIZE] = {};
++	int ret, i;
++
++	req[PS5_FAN_ZONE_OFF] = zone;
++
++	ret = icc_fan_txn(ICC_SERVICE_ID_FAN, PS5_FAN_MT_CURSET_GET,
++			  PS5_FAN_CURSET_GET_LEN, req, sizeof(req),
++			  reply, sizeof(reply));
++	if (ret)
++		return ret;
++
++	for (i = 0; i < PS5_CURSET_COUNT; i++)
++		out[i] = get_unaligned_le32(reply +
++			  PS5_FAN_CURSET_GET_OFF + i * 4);
++	return 0;
++}
++
++static int icc_fan_set_curset(u8 zone, u8 config, const u32 in[PS5_CURSET_COUNT])
++{
++	u8 req[ICC_MSG_MAX_SIZE - sizeof(struct icc_msg)] = {};
++	int i;
++
++	req[PS5_FAN_ZONE_OFF] = zone;
++	req[PS5_FAN_CONFIG_OFF] = config;
++	for (i = 0; i < PS5_CURSET_COUNT; i++)
++		put_unaligned_le32(in[i], req + PS5_FAN_CURSET_SET_OFF + i * 4);
++
++	return icc_fan_txn(ICC_SERVICE_ID_FAN, PS5_FAN_MT_CURSET_SET,
++			   PS5_FAN_CURSET_SET_LEN, req, sizeof(req), NULL, 0);
++}
++
++static DEFINE_MUTEX(fan_lock);
++
++static int fan_get_target_temp(u8 zone, u16 *celsius)
++{
++	u32 cs[PS5_CURSET_COUNT];
++	int ret;
++
++	mutex_lock(&fan_lock);
++	ret = icc_fan_get_curset(zone, cs);
++	mutex_unlock(&fan_lock);
++	if (ret)
++		return ret;
++
++	*celsius = cs[PS5_CURSET_TARGETTEMP] >> PS5_TARGETTEMP_SHIFT;
++	return 0;
++}
++
++static int fan_set_target_temp(u8 zone, u8 config, u16 celsius)
++{
++	u32 cs[PS5_CURSET_COUNT];
++	int ret;
++
++	mutex_lock(&fan_lock);
++	ret = icc_fan_get_curset(zone, cs);
++	if (!ret) {
++		cs[PS5_CURSET_TARGETTEMP] = (u32)celsius << PS5_TARGETTEMP_SHIFT;
++		ret = icc_fan_set_curset(zone, config, cs);
++	}
++	mutex_unlock(&fan_lock);
++	return ret;
++}
++
++static ssize_t target_temp_show(struct device *dev,
++				struct device_attribute *attr, char *buf)
++{
++	u16 c;
++	int ret = fan_get_target_temp(PS5_ZONE_MAINSOC, &c);
++
++	if (ret)
++		return ret;
++	return sysfs_emit(buf, "%u\n", c);
++}
++
++static ssize_t target_temp_store(struct device *dev,
++				 struct device_attribute *attr,
++				 const char *buf, size_t count)
++{
++	u16 c;
++	int ret;
++
++	if (kstrtou16(buf, 10, &c))
++		return -EINVAL;
++	if (c > 100)
++		return -ERANGE;
++
++	ret = fan_set_target_temp(PS5_ZONE_MAINSOC, 0, c);
++	return ret ? ret : count;
++}
++static DEVICE_ATTR_RW(target_temp);
++
++static struct attribute *ps5_fan_attrs[] = {
++	&dev_attr_target_temp.attr,
++	NULL,
++};
++ATTRIBUTE_GROUPS(ps5_fan);
++
++#define PS5_FAN_BOOT_TARGET_TEMP	75
++
++static int ps5_fan_probe(struct platform_device *pdev)
++{
++	int ret = icc_fan_update_autoservo_param();
++
++	if (ret)
++		dev_warn(&pdev->dev, "autoservo param load failed: %d\n", ret);
++
++	ret = fan_set_target_temp(PS5_ZONE_MAINSOC, 0, PS5_FAN_BOOT_TARGET_TEMP);
++	if (ret)
++		dev_warn(&pdev->dev, "boot target temp set failed: %d\n", ret);
++
++	return 0;
++}
++
++static struct platform_driver ps5_fan_driver = {
++	.probe  = ps5_fan_probe,
++	.driver = {
++		.name = "ps5-fan",
++		.dev_groups = ps5_fan_groups,
++	},
++};
++
++static struct platform_device *ps5_fan_pdev;
++
++static int __init ps5_fan_init(void)
++{
++	int ret = platform_driver_register(&ps5_fan_driver);
++
++	if (ret)
++		return ret;
++
++	ps5_fan_pdev = platform_device_register_simple("ps5-fan", -1, NULL, 0);
++	if (IS_ERR(ps5_fan_pdev)) {
++		ret = PTR_ERR(ps5_fan_pdev);
++		platform_driver_unregister(&ps5_fan_driver);
++		ps5_fan_pdev = NULL;
++		return ret;
++	}
++	return 0;
++}
++
++static void __exit ps5_fan_exit(void)
++{
++	if (ps5_fan_pdev)
++		platform_device_unregister(ps5_fan_pdev);
++	platform_driver_unregister(&ps5_fan_driver);
++}
++
++module_init(ps5_fan_init);
++module_exit(ps5_fan_exit);
++
++MODULE_LICENSE("GPL");
++MODULE_DESCRIPTION("PS5 fan driver");
++MODULE_ALIAS("platform:ps5-fan");
 diff --git a/drivers/ps5/hdmi.c b/drivers/ps5/hdmi.c
 new file mode 100644
 index 000000000000..8f094490d677
@@ -7872,12 +8071,71 @@ index 000000000000..4af890c842a7
 +MODULE_AUTHOR("Andy Nguyen");
 +MODULE_DESCRIPTION("PlayStation 5 MP1 SMU driver");
 +MODULE_LICENSE("GPL");
+diff --git a/drivers/ps5/ps5-fan.h b/drivers/ps5/ps5-fan.h
+new file mode 100644
+index 000000000000..5ea1519823c3
+--- /dev/null
++++ b/drivers/ps5/ps5-fan.h
+@@ -0,0 +1,53 @@
++/* SPDX-License-Identifier: GPL-2.0-only */
++#ifndef _PS5_FAN_H
++#define _PS5_FAN_H
++
++#include <linux/ps5.h>
++
++#define PS5_FAN_MT_MODE_SET	0x02
++#define PS5_FAN_MT_MODE_GET	0x03
++#define PS5_FAN_MT_CURSET_SET	0x06
++#define PS5_FAN_MT_CURSET_GET	0x07
++
++#define PS5_FAN_CURSET_SET_LEN	0x40
++#define PS5_FAN_CURSET_GET_LEN	ICC_MSG_MIN_SIZE
++
++enum ps5_fan_zone {
++	PS5_ZONE_MAINSOC = 0,
++	PS5_ZONE_LOCAL1  = 1,
++	PS5_ZONE_LOCAL2  = 2,
++	PS5_ZONE_LOCAL3  = 3,
++	PS5_ZONE_COUNT   = 4,
++};
++
++enum ps5_fan_mode {
++	PS5_FAN_MODE_AUTO    = 1,
++	PS5_FAN_MODE_MAXIMUM = 2,
++	PS5_FAN_MODE_MINIMUM = 3,
++	PS5_FAN_MODE_MANUAL  = 4,
++	PS5_FAN_MODE_SP1     = 5,
++};
++#define PS5_FAN_MODE_MIN	PS5_FAN_MODE_AUTO
++#define PS5_FAN_MODE_MAX	PS5_FAN_MODE_SP1
++
++enum ps5_curset_id {
++	PS5_CURSET_TARGETTEMP = 0,
++	PS5_CURSET_PGAIN      = 1,
++	PS5_CURSET_IGAIN      = 2,
++	PS5_CURSET_ILIMIT     = 3,
++	PS5_CURSET_ULIMIT     = 4,
++	PS5_CURSET_DLIMIT     = 5,
++	PS5_CURSET_COUNT      = 6,
++};
++
++#define PS5_FAN_ZONE_OFF	0
++#define PS5_FAN_MODE_OFF	1
++#define PS5_FAN_SETTING_OFF	1
++#define PS5_FAN_CONFIG_OFF	1
++#define PS5_FAN_CURSET_OFF	0x04
++#define PS5_FAN_CURSET_GET_OFF	PS5_FAN_CURSET_OFF
++#define PS5_FAN_CURSET_SET_OFF	PS5_FAN_CURSET_OFF
++
++#define PS5_TARGETTEMP_SHIFT	8
++
++#endif /* _PS5_FAN_H */
 diff --git a/drivers/ps5/spcie.c b/drivers/ps5/spcie.c
 new file mode 100644
-index 000000000000..e02c074ee0b1
+index 000000000000..4a28451f89eb
 --- /dev/null
 +++ b/drivers/ps5/spcie.c
-@@ -0,0 +1,1149 @@
+@@ -0,0 +1,1146 @@
 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 +
 +#include <linux/module.h>
@@ -8709,9 +8967,6 @@ index 000000000000..e02c074ee0b1
 +	icc_button_enable_all_notifications(1);
 +	icc_thermal_enable_notification(1);
 +
-+	/* Update autoservo param */
-+	icc_fan_update_autoservo_param();
-+
 +	/* Set LED to white dim */
 +	icc_indicator_set_led_white(0);
 +