From patchwork Sun Nov 28 01:15:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 73312 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1D2E3B70AF for ; Sun, 28 Nov 2010 12:16:01 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753422Ab0K1BPt (ORCPT ); Sat, 27 Nov 2010 20:15:49 -0500 Received: from mail-bw0-f46.google.com ([209.85.214.46]:55574 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753205Ab0K1BPr (ORCPT ); Sat, 27 Nov 2010 20:15:47 -0500 Received: by mail-bw0-f46.google.com with SMTP id 15so2883308bwz.19 for ; Sat, 27 Nov 2010 17:15:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=CN47mRUlOD11tx1oXc0AasUtth0hDvtwMsrhwhg3PHc=; b=GKp4t2Sqtv/g8X0fMwSunGnFgs8+0ytOWBfF04r3s79ZTqeo+HGdj/Qg5Zj/3Vpg90 /kGeke4igYuB3MuA9twxdwaOFCZYjJVYhpaxq8jfdg1DLLownqx69lqhKOQnN8kxhDie NltxaR08UVFnXc/BInnZ5vul9kFUqyRmfdFt8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=JjfErRaSMR0arn0GrK8KRyrYyONMxGYi35x0E7o3aW6mz5KtOD9FjtKQTF5TRj5cFZ +hW9QPJjO4FyeIl3ifGmjXTbMol9DFNXHgIbyHVc6RfCoiN9ZbkNuFj1/TlbK7jMm50w joXNokVXfTZxbPaSzmSKNCmKDFh6iuDfTNR2U= Received: by 10.204.69.200 with SMTP id a8mr3383038bkj.36.1290906946404; Sat, 27 Nov 2010 17:15:46 -0800 (PST) Received: from maxim-laptop ([77.125.106.90]) by mx.google.com with ESMTPS id g8sm1231117bkg.23.2010.11.27.17.15.44 (version=SSLv3 cipher=RC4-MD5); Sat, 27 Nov 2010 17:15:45 -0800 (PST) From: Maxim Levitsky To: linux1394-devel Cc: Stefan Richter , netdev@vger.kernel.org, Maxim Levitsky Subject: [PATCH 1/5] firewire: ohci: restore GUID register on resume. Date: Sun, 28 Nov 2010 03:15:32 +0200 Message-Id: <1290906936-14472-2-git-send-email-maximlevitsky@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1290906936-14472-1-git-send-email-maximlevitsky@gmail.com> References: <1290906936-14472-1-git-send-email-maximlevitsky@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Some lousy BIOSes, eg my Aspire 5720 BIOS forgets to restore device GUID on resume from ram. Fix that by programming GUID register on resume from ram Since that register is one time programable according to spec, that has no effect on systems that have sane BIOS (Are there any?) Signed-off-by: Maxim Levitsky --- drivers/firewire/ohci.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 6dd56cd..cadd6af 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c @@ -3240,6 +3240,10 @@ static int pci_resume(struct pci_dev *dev) return err; } + /* Some bioses forget to reinitialize the GUID. Do that ourselves */ + reg_write(ohci, OHCI1394_GUIDLo, ohci->card.guid & 0xFFFFFFFF); + reg_write(ohci, OHCI1394_GUIDHi, (ohci->card.guid >> 32) & 0xFFFFFFFF); + return ohci_enable(&ohci->card, NULL, 0); } #endif