Received: by mail.netbsd.org (Postfix, from userid 605) id 4C0F784D9D; Fri, 14 Dec 2018 09:47:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2B10084D96 for ; Fri, 14 Dec 2018 09:47:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id XAG98kGhNG0M for ; Fri, 14 Dec 2018 09:47:40 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id A081684D27 for ; Fri, 14 Dec 2018 09:47:40 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 95D97FB16; Fri, 14 Dec 2018 09:47:40 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Fri, 14 Dec 2018 09:47:40 +0000 From: "SAITOH Masanobu" Subject: CVS commit: src/sys/dev/pci To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20181214094740.95D97FB16@cvs.NetBSD.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "SAITOH Masanobu" Mail-Followup-To: source-changes-d@NetBSD.org List-Unsubscribe: Module Name: src Committed By: msaitoh Date: Fri Dec 14 09:47:40 UTC 2018 Modified Files: src/sys/dev/pci: if_wm.c if_wmreg.h Log Message: - Fix availability detection of WoL on some chips. This change has no effect other than dmesg because WM_F_WOL is currently not used to change the behavior: - For ICH/PCH, check the capability not from NVM but from the WUC register. Check the value before clearing the register. - 82580 and newer have per-port NVM block, so read the area correctly. Note that 82580, I350 and I354 may have PCI function 2 and 3. - Some devices can't detect WoL capability neither from NVM nor from WUC. Use PCI device ID and the function number. - Print the WUS (WakeUp Status) register bits when resume. To generate a diff of this commit: cvs rdiff -u -r1.603 -r1.604 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.109 -r1.110 src/sys/dev/pci/if_wmreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.