From patchwork Thu Apr 17 10:34:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 28547 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f198.google.com (mail-yk0-f198.google.com [209.85.160.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9A173206A6 for ; Thu, 17 Apr 2014 11:38:06 +0000 (UTC) Received: by mail-yk0-f198.google.com with SMTP id 9sf636743ykp.9 for ; Thu, 17 Apr 2014 04:38:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=zDm4fCXRxApdPCk5J2/y2xmHUP/gDibn8T84JF4qw9Q=; b=YXI308URxWYHL7TVtEoFgtvz5OWqMMkmVAtV62yZ4vLShtx99TGEyMud9pBlVyyEwJ 6PYELfkKZVW7o3OGClM7WkXmA0PmqImngCpe+sd2JL9SekdViqJBdPj6OCOYEqLuo64Z a6HYIWr5kpf86FrXMudcBS/NH+ilyJIk7prukRn4wha9KDp+Wnicv9t5y28upQvgZlzV 7ms42xrd62FqStbawDg4L97rx71wqk9TdhOzxoGKjQxPhfuDwpT2iQEIxexcGs12vDzE yDTd7r955vtfdPq0edrqJYGfmfKVz52eFs2cUNQ2jrWcZr1wdjvpVNDFepExZ61T2cnG HrIg== X-Gm-Message-State: ALoCoQmD3qDxHr7NJxcPjoudUbD/YIvyUH55ZDSQ2bG010TFluqPRugqVk9ZstglBqgln8EhLVPP X-Received: by 10.236.38.231 with SMTP id a67mr6228690yhb.17.1397734686308; Thu, 17 Apr 2014 04:38:06 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.86.170 with SMTP id p39ls1057991qgd.49.gmail; Thu, 17 Apr 2014 04:38:06 -0700 (PDT) X-Received: by 10.53.1.69 with SMTP id be5mr6093659vdd.27.1397734686193; Thu, 17 Apr 2014 04:38:06 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id k20si4402962vcm.97.2014.04.17.04.38.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Apr 2014 04:38:06 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id la4so353272vcb.3 for ; Thu, 17 Apr 2014 04:38:06 -0700 (PDT) X-Received: by 10.220.69.72 with SMTP id y8mr7295531vci.21.1397734686098; Thu, 17 Apr 2014 04:38:06 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp27931vcb; Thu, 17 Apr 2014 04:38:05 -0700 (PDT) X-Received: by 10.140.102.167 with SMTP id w36mr16170423qge.43.1397734685660; Thu, 17 Apr 2014 04:38:05 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id v6si10380762qas.275.2014.04.17.04.38.05 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 17 Apr 2014 04:38:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:59395 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WajfH-0000Tb-AE for patch@linaro.org; Thu, 17 Apr 2014 06:35:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50690) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Waje5-0007f2-MU for qemu-devel@nongnu.org; Thu, 17 Apr 2014 06:34:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Waje4-0002Pq-50 for qemu-devel@nongnu.org; Thu, 17 Apr 2014 06:34:17 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:47842) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Waje3-0002OB-VC for qemu-devel@nongnu.org; Thu, 17 Apr 2014 06:34:16 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Wajdx-00022b-VG for qemu-devel@nongnu.org; Thu, 17 Apr 2014 11:34:09 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 17 Apr 2014 11:34:04 +0100 Message-Id: <1397730846-7576-50-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1397730846-7576-1-git-send-email-peter.maydell@linaro.org> References: <1397730846-7576-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 49/51] net: cadence_gem: Make phy respond to broadcast X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Peter Crosthwaite Phys must respond to address 0 by specification. Implement. Signed-off-by: Nathan Rossi Signed-off-by: Peter Crosthwaite Message-id: 6f4d53b04ddbfb19895bfb61a595e69f1c08859a.1396594056.git.peter.crosthwaite@xilinx.com Reviewed-by: Beniamino Galvani Signed-off-by: Peter Maydell --- hw/net/cadence_gem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index 92dc2f2..e34b25e 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -1093,7 +1093,7 @@ static uint64_t gem_read(void *opaque, hwaddr offset, unsigned size) uint32_t phy_addr, reg_num; phy_addr = (retval & GEM_PHYMNTNC_ADDR) >> GEM_PHYMNTNC_ADDR_SHFT; - if (phy_addr == BOARD_PHY_ADDRESS) { + if (phy_addr == BOARD_PHY_ADDRESS || phy_addr == 0) { reg_num = (retval & GEM_PHYMNTNC_REG) >> GEM_PHYMNTNC_REG_SHIFT; retval &= 0xFFFF0000; retval |= gem_phy_read(s, reg_num); @@ -1193,7 +1193,7 @@ static void gem_write(void *opaque, hwaddr offset, uint64_t val, uint32_t phy_addr, reg_num; phy_addr = (val & GEM_PHYMNTNC_ADDR) >> GEM_PHYMNTNC_ADDR_SHFT; - if (phy_addr == BOARD_PHY_ADDRESS) { + if (phy_addr == BOARD_PHY_ADDRESS || phy_addr == 0) { reg_num = (val & GEM_PHYMNTNC_REG) >> GEM_PHYMNTNC_REG_SHIFT; gem_phy_write(s, reg_num, val); }