Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch upstreaming #78

Closed
0lvin opened this issue Oct 5, 2021 · 18 comments
Closed

Patch upstreaming #78

0lvin opened this issue Oct 5, 2021 · 18 comments

Comments

@0lvin
Copy link

0lvin commented Oct 5, 2021

Could anyone help with patch test before send to linux kernel upstream? Code is based on current repository. Thanks @electrified for your code.

https://bugzilla.kernel.org/show_bug.cgi?id=204807#c128

We need help with check:

  • "ROG CROSSHAIR VII HERO (WI-FI)",
  • "ROG CROSSHAIR VII HERO",
  • "ROG CROSSHAIR VI HERO (WI-FI AC)",
  • "CROSSHAIR VI HERO",
  • "ROG CROSSHAIR VI EXTREME",
  • "ROG ZENITH EXTREME",
  • "ROG ZENITH EXTREME ALPHA",
  • "PRIME X399-A",
  • "PRIME X470-PRO",
  • "ROG STRIX X399-E GAMING",
  • "ROG STRIX B450-E GAMING",
  • "ROG STRIX B450-F GAMING",
  • "ROG STRIX B450-I GAMING",
  • "ROG STRIX X470-I GAMING",
  • "ROG STRIX X470-F GAMING",

Thank you!

@0lvin 0lvin changed the title Patch upstream Patch upstreaming Oct 5, 2021
@electrified
Copy link
Owner

Hey, many thanks for attempting to get my module upstream @0lvin!

I have a ROG CROSSHAIR VII HERO (WI-FI), so can have a go at testing it.

Do you have some simple instructions on which patches to apply etc, and what testing would you like me to do (is sensors output working adequate?)

Thanks

@electrified
Copy link
Owner

electrified commented Oct 5, 2021

Hi, I've given it a go @0lvin and it's working for me :)

[    4.547440] asus_wmi_sensors: ROG CROSSHAIR VII HERO (WI-FI) board has 32 sensors
% uname -a
Linux zoomer 5.15.0-rc3-00276-g53d5fc89d66a-dirty #1 SMP PREEMPT Tue Oct 5 17:36:44 BST 2021 x86_64 GNU/Linux

% sensors
eth1-pci-0800
Adapter: PCI adapter
PHY Temperature:  +42.6°C  
MAC Temperature:  +43.5°C  

nvme-pci-0100
Adapter: PCI adapter
Composite:    +38.9°C  

amdgpu-pci-0a00
Adapter: PCI adapter
vddgfx:      1000.00 mV 
fan1:             N/A  (min =    0 RPM, max = 5200 RPM)
edge:         +25.0°C  (crit = +94.0°C, hyst = -273.1°C)
power1:       30.11 W  (cap = 115.00 W)

k10temp-pci-00c3
Adapter: PCI adapter
Tctl:         +43.6°C  
Tdie:         +33.6°C  

asuswmisensors-isa-0000
Adapter: ISA adapter
CPU Core Voltage:          1.41 V  
CPU SOC Voltage:         807.00 mV 
DRAM Voltage:              1.19 V  
VDDP Voltage:            294.00 mV 
1.8V PLL Voltage:          1.85 V  
+12V Voltage:             11.83 V  
+5V Voltage:               5.01 V  
3VSB Voltage:              3.36 V  
VBAT Voltage:              3.23 V  
AVCC3 Voltage:             3.36 V  
SB 1.05V Voltage:          1.07 V  
CPU Core Voltage:          1.43 V  
CPU SOC Voltage:         818.00 mV 
DRAM Voltage:              1.20 V  
CPU Fan:                  380 RPM
Chassis Fan 1:              0 RPM
Chassis Fan 2:            800 RPM
Chassis Fan 3:            798 RPM
HAMP Fan:                 809 RPM
Water Pump:                 0 RPM
CPU OPT:                  356 RPM
Water Flow:               486 RPM
AIO Pump:                1339 RPM
CPU Temperature:          +33.0°C  
CPU Socket Temperature:   +29.0°C  
Motherboard Temperature:  +30.0°C  
Chipset Temperature:      +44.0°C  
Tsensor 1 Temperature:   +216.0°C  
CPU VRM Temperature:      +35.0°C  
Water In:                +216.0°C  
Water Out:                +25.0°C  
CPU VRM Output Current:    7.00 A

@0lvin
Copy link
Author

0lvin commented Oct 5, 2021

Thank you :-)

I have created updated patch: https://bugzilla.kernel.org/attachment.cgi?id=299111

Next review round will be with your patch.

@KeithMyers
Copy link

So do you need someone to test the C7H board also? How to apply the patch? Already using the asus_wmi_sensors out of tree module.

@0lvin
Copy link
Author

0lvin commented Oct 31, 2021

@KeithMyers
Copy link

I'll try and get to this today or tomorrow.

@electrified
Copy link
Owner

Hi @0lvin, I will also try and give this a go today

@0lvin
Copy link
Author

0lvin commented Nov 1, 2021

Thank you!

@electrified
Copy link
Owner

To get the patch to apply cleanly I needed to apply both of them.

@KeithMyers These were the steps I took on Arch

git clone git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git --branch hwmon-next --single-branch --depth 1
cd linux-staging
patch -i ~/Downloads/1.patch -p1
patch -i ~/Downloads/2.patch -p1
zcat /proc/config.gz > .config
make nconfig # enable "device drivers -> hwmon -> Asus X370/470" as a module
make -j16
make modules
sudo make modules_install
sudo cp -v arch/x86_64/boot/bzImage /boot/vmlinuz-linux-sensortest
sudo mkinitcpio -k 5.15.0-rc4-dirty -g /boot/initramfs-sensortest.img

@electrified
Copy link
Owner

@0lvin

Nice work, it's all still working fine for me, although haven't had it running for long:

ed@zoomer ~/dev/3rdparty/linux-staging (git)-[hwmon-next] % sensors

k10temp-pci-00c3
Adapter: PCI adapter
Tctl:         +57.4°C  
Tdie:         +47.4°C  

asus_wmi_sensors-virtual-0
Adapter: Virtual device
CPU Core Voltage:          1.42 V  
CPU SOC Voltage:         807.00 mV 
DRAM Voltage:              1.19 V  
VDDP Voltage:            316.00 mV 
1.8V PLL Voltage:          1.85 V  
+12V Voltage:             11.72 V  
+5V Voltage:               4.99 V  
3VSB Voltage:              3.36 V  
VBAT Voltage:              3.23 V  
AVCC3 Voltage:             3.36 V  
SB 1.05V Voltage:          1.07 V  
CPU Core Voltage:          1.37 V  
CPU SOC Voltage:         816.00 mV 
DRAM Voltage:              1.21 V  
CPU Fan:                  816 RPM
Chassis Fan 1:              0 RPM
Chassis Fan 2:            967 RPM
Chassis Fan 3:            948 RPM
HAMP Fan:                 909 RPM
Water Pump:                 0 RPM
CPU OPT:                  789 RPM
Water Flow:               486 RPM
AIO Pump:                1370 RPM
CPU Temperature:          +47.0°C  
CPU Socket Temperature:   +34.0°C  
Motherboard Temperature:  +33.0°C  
Chipset Temperature:      +47.0°C  
Tsensor 1 Temperature:   +216.0°C  
CPU VRM Temperature:      +40.0°C  
Water In:                +216.0°C  
Water Out:                +27.0°C  
CPU VRM Output Current:   41.00 A  

ed@zoomer ~/dev/3rdparty/linux-staging (git)-[hwmon-next] %  uname -a
Linux zoomer 5.15.0-rc4-dirty #2 SMP PREEMPT Mon Nov 1 18:43:33 GMT 2021 x86_64 GNU/Linux

@KeithMyers
Copy link

To get the patch to apply cleanly I needed to apply both of them.

@electrified Could you explain where the "other patch" is located?
The 1.patch just errored out. Assume the "other patch" is needed as a precursor.
Went back up the commit thread and couldn't find any reference to it.

@electrified
Copy link
Owner

To get the patch to apply cleanly I needed to apply both of them.

@electrified Could you explain where the "other patch" is located? The 1.patch just errored out. Assume the "other patch" is needed as a precursor. Went back up the commit thread and couldn't find any reference to it.

Apply the patch 1/2 from https://lkml.org/lkml/2021/10/31/209
and then the 2/2 from https://lkml.org/lkml/2021/10/31/210

@deri971
Copy link

deri971 commented Nov 7, 2021

please add ROG STRIX Z390-F GAMING

@electrified
Copy link
Owner

please add ROG STRIX Z390-F GAMING

This board does not have the required WMI interface (checked as per #11 (comment))

Generally only 1st and 2nd gen Ryzen boards have it.

@0lvin
Copy link
Author

0lvin commented Nov 16, 2021

@electrified I sent patch without Z390, and added you as one of maintainers if you do not mind.

There is exists possibility of Intel support, look to NadirZenith@61e5064. I am not sure what does it mean, maybe it was just test code or some bios versions has some limited support.

@electrified
Copy link
Owner

@0lvin Hi Denis, adding me as a maintainer is fine :)

Regarding the Z390 support, yes it's plausible an older BIOS version had it, it's not present in the latest 1903 version though.

Cheers,
Ed

@electrified
Copy link
Owner

Hi @0lvin, Many thanks for your work upstreaming this driver!

I'm going to close this issue now.

Thanks,
Ed

@electrified
Copy link
Owner

Hi @0lvin,

Have received this bug report about the upstreamed driver - it looks like one of the motherboard names got modified:

#79 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

4 participants