From patchwork Mon Mar 21 07:17:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Education Directorate X-Patchwork-Id: 8629791 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6609E9F372 for ; Mon, 21 Mar 2016 07:18:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 82DD6202AE for ; Mon, 21 Mar 2016 07:18:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A117D20279 for ; Mon, 21 Mar 2016 07:18:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752667AbcCUHSS (ORCPT ); Mon, 21 Mar 2016 03:18:18 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36498 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752627AbcCUHSN (ORCPT ); Mon, 21 Mar 2016 03:18:13 -0400 Received: by mail-pf0-f193.google.com with SMTP id q129so29205722pfb.3 for ; Mon, 21 Mar 2016 00:18:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ODnMCdupjXcjYgxBgbuFJnAIDg9Sf/VoWueuIy9sivg=; b=fnKeZU/6IFkn1Q85IWKR69YDfVHLzTrhlfQ0Z2rVEBWL7uSvh3GrqrTx9Fd/1Wn+Bn J7/91ZN9ZMYbnSZI9nRHUxhhR/jcbxRUIi+yUZgip/kIoPZsZJpf4ZC4NYdrP7qR+IfE OAizRJBBLynpmt/zKIKVAq1p7dStdAZdjbzqpfSlyZbwANiRyQehbilBioNfOAiDBFln GSU14RPujGLZ6188GVdCyzYxdTQwsEIsJyBSvshOdpOrsRLtJ5SGHWMikSWnj25zqsN8 5mx42gBx56lHDBCmrknUkB+s67TAfvRSrBu540QnrIojRSYFePD226JWjvqxt4zHcZ5v nBTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ODnMCdupjXcjYgxBgbuFJnAIDg9Sf/VoWueuIy9sivg=; b=VpAIeoWBojtshPF/FyrdAK9BcEqymEMoaAafa6nzYiqz67qJ3+zl7wIVynpsKP6dp/ WXQk2ac/Fmz9DuW/0juYt8Zo1b0dQLINwqiUBk9xs43o8yj+97XHR5MR7co9jw7C40RM oOqGtHy7vxLN5zTbUfNor7CyX2aPCIjEDgXHZSFYXoB0h2sLD3nPwDoH/TyyXMVEz+oX Nf0cqGlODV0yKR5NIe/wD/yfVNHAcVpq1R+TGMs829UznBKzh5VUpLz2b3JSqm+QOlAw XpPWa92/tGt4jetmS7GcrUfkJoRAs9GbkpRPWlwsoDl7o/s++nQbgBb6QmoN77iMLKzm n8Ow== X-Gm-Message-State: AD7BkJIesLMd20znkQMoPHLmizNLzNt4JOPDdfckROl20kIG1fijM5jWt73rd86zC78THA== X-Received: by 10.66.220.66 with SMTP id pu2mr43315696pac.115.1458544692469; Mon, 21 Mar 2016 00:18:12 -0700 (PDT) Received: from cotter.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id ey7sm37911423pab.47.2016.03.21.00.18.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Mar 2016 00:18:11 -0700 (PDT) Received: by cotter.ozlabs.ibm.com (Postfix, from userid 1000) id B4466C01F8; Mon, 21 Mar 2016 18:18:07 +1100 (AEDT) From: Balbir Singh To: will.deacon@arm.com, kvm@vger.kernel.org Cc: penberg@kernel.org, mpe@ellerman.id.au, mikey@neuling.org, aik@ozlabs.ru, Balbir Singh Subject: [PATCH 4/4] Implement spapr pci for little endian systems. Date: Mon, 21 Mar 2016 18:17:30 +1100 Message-Id: <1458544650-31416-5-git-send-email-bsingharora@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1458544650-31416-1-git-send-email-bsingharora@gmail.com> References: <1458544650-31416-1-git-send-email-bsingharora@gmail.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Port the spapr_pci implementation for ppc64le. Based on suggestions by Alexey Kardashevskiy We should have always used phys_hi and 64 bit addr and size. Cc: Alexey Kardashevskiy Signed-off-by: Balbir Singh --- powerpc/spapr_pci.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/powerpc/spapr_pci.c b/powerpc/spapr_pci.c index 768e3f2..a15f7d8 100644 --- a/powerpc/spapr_pci.c +++ b/powerpc/spapr_pci.c @@ -234,8 +234,11 @@ int spapr_populate_pci_devices(struct kvm *kvm, int bus_off, node_off = 0, devid, fn, i, n, devices; struct device_header *dev_hdr; char nodename[256]; - struct of_pci_unit_address reg[PCI_NUM_REGIONS + 1], - assigned_addresses[PCI_NUM_REGIONS]; + struct of_pci_unit64_address { + u32 phys_hi; + u64 addr; + u64 size; + } __attribute((packed)) reg[PCI_NUM_REGIONS + 1], assigned_addresses[PCI_NUM_REGIONS]; uint32_t bus_range[] = { cpu_to_be32(0), cpu_to_be32(0xff) }; struct of_pci_ranges_entry ranges[] = { { @@ -339,7 +342,7 @@ int spapr_populate_pci_devices(struct kvm *kvm, le16_to_cpu(hdr->subsys_vendor_id))); /* Config space region comes first */ - reg[0].hi = cpu_to_be32( + reg[0].phys_hi = cpu_to_be32( of_pci_b_n(0) | of_pci_b_p(0) | of_pci_b_t(0) | @@ -347,8 +350,8 @@ int spapr_populate_pci_devices(struct kvm *kvm, of_pci_b_bbbbbbbb(0) | of_pci_b_ddddd(devid) | of_pci_b_fff(fn)); - reg[0].mid = 0; - reg[0].lo = 0; + reg[0].addr = 0; + reg[0].size = 0; n = 0; /* Six BARs, no ROM supported, addresses are 32bit */ @@ -357,7 +360,7 @@ int spapr_populate_pci_devices(struct kvm *kvm, continue; } - reg[n+1].hi = cpu_to_be32( + reg[n+1].phys_hi = cpu_to_be32( of_pci_b_n(0) | of_pci_b_p(0) | of_pci_b_t(0) | @@ -366,10 +369,10 @@ int spapr_populate_pci_devices(struct kvm *kvm, of_pci_b_ddddd(devid) | of_pci_b_fff(fn) | of_pci_b_rrrrrrrr(bars[i])); - reg[n+1].mid = 0; - reg[n+1].lo = cpu_to_be64(hdr->bar_size[i]); + reg[n+1].size = cpu_to_be64(hdr->bar_size[i]); + reg[n+1].addr = 0; - assigned_addresses[n].hi = cpu_to_be32( + assigned_addresses[n].phys_hi = cpu_to_be32( of_pci_b_n(1) | of_pci_b_p(0) | of_pci_b_t(0) | @@ -383,8 +386,8 @@ int spapr_populate_pci_devices(struct kvm *kvm, * Writing zeroes to assigned_addresses causes the guest kernel to * reassign BARs */ - assigned_addresses[n].mid = cpu_to_be64(bar_to_addr(le32_to_cpu(hdr->bar[i]))); - assigned_addresses[n].lo = reg[n+1].lo; + assigned_addresses[n].addr = cpu_to_be64(bar_to_addr(le32_to_cpu(hdr->bar[i]))); + assigned_addresses[n].size = reg[n+1].size; ++n; }