From patchwork Fri Aug 3 08:14:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 953101 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bdudjf/P"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41hfxq5lw0z9ryt for ; Fri, 3 Aug 2018 18:15:59 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 78919C21F16; Fri, 3 Aug 2018 08:13:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D8848C21F7D; Fri, 3 Aug 2018 08:10:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 36931C21F8F; Fri, 3 Aug 2018 08:10:20 +0000 (UTC) Received: from mail-pl0-f49.google.com (mail-pl0-f49.google.com [209.85.160.49]) by lists.denx.de (Postfix) with ESMTPS id 0F12FC21DAF for ; Fri, 3 Aug 2018 08:10:16 +0000 (UTC) Received: by mail-pl0-f49.google.com with SMTP id w19-v6so584091ply.8 for ; Fri, 03 Aug 2018 01:10:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=ihfjlCb1GCXBQFPKnf/YM2hxfdxZIFeO0q310Wg1nzM=; b=bdudjf/PhYTn+KbQ1RELExRbDYH53H0Wi93v90YVdJXQ6pHUJP/pOZor2DQQQnY77x jpvtNuY9iVM9JpUmVZ4SDweqz0IO8fQY0tRoMmTjO6Bq6MOkNVgY9eSMddIIjqc4EPys /sB7QaX+0sZU+adkX9LcmFmEuGNxCjaakhK5J5xdXCZ8/PptE9ew3zozru8L6BEdi0kZ h0NvU0Pe+9mpv4WlvKa9oyw/yAlOCt/KbDZjivALRoj4QZ0BTKkC8TAb8VSfLgK9Ms2k xJCsOE3xon+8QuKWwVDVFHHqyI1YrhnxtEuCKSoPEGj6nJJUAIyJEkHXxNBL8FxeIztX kfaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=ihfjlCb1GCXBQFPKnf/YM2hxfdxZIFeO0q310Wg1nzM=; b=PY0C5lVBVGWdDFAX+aSJryQrqIlZ0xeOBg4fNhBK62yJAnnXeYbFubJw8HBJetIUj+ CAMq7xgELKtgo6sB3T+WZnu5hAsx6uVhejLMeZAxEtDweo/NtWyCq71Q40RiaEEBXi2R XOjvZqnjCaC0quAHYrUEk9diXFDo8V7qfhbZSa9XvI40Rh9YMWVifDzjEWSNhRHCc3HQ Gp0aTtIqfQoTagQ8W92zkA+vHe08SaICqTNseJ/s44hIcAcfNmYxCspNKO1qjzj4whMn J2N6JV4B9XSQXX4Cm/Cmop8ykMsjMKOgsH0MHzLWVkpwlwRABM56Uqe8zCcB6cbKfVK8 5tQw== X-Gm-Message-State: AOUpUlHjls7CpC8Y3Js11vsinPp//Irif0Qjtg9xBflxwZwxalqhkWKx uvZ/6md49aOh2kRlUn6kgM8= X-Google-Smtp-Source: AAOMgpf16K92UTKEa0vfOnTHHdkEUiZU7fU7ZzN+qFC73yzR4riTzxt4z2i0ioHngq4FvKmdOGYGfA== X-Received: by 2002:a17:902:7147:: with SMTP id u7-v6mr2545219plm.154.1533283814722; Fri, 03 Aug 2018 01:10:14 -0700 (PDT) Received: from ala-d2121-lx1.wrs.com (unknown-156-139.windriver.com. [147.11.156.139]) by smtp.gmail.com with ESMTPSA id 1-v6sm9190070pfk.134.2018.08.03.01.10.13 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Aug 2018 01:10:13 -0700 (PDT) From: Bin Meng To: Simon Glass , U-Boot Mailing List Date: Fri, 3 Aug 2018 01:14:40 -0700 Message-Id: <1533284093-3084-9-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1533284093-3084-1-git-send-email-bmeng.cn@gmail.com> References: <1533284093-3084-1-git-send-email-bmeng.cn@gmail.com> Subject: [U-Boot] [PATCH v3 08/21] pci: sandbox: swap_case: Preserve space indicator bit in BAR registers X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" With the newly added testing of more than one device, we get: => ut dm pci_swapcase Test: dm_test_pci_swapcase: pci.c test/dm/pci.c:88, dm_test_pci_swapcase(): "tHIS IS A tESt" = ptr: Expected "tHIS IS A tESt", got "this is a test" Test: dm_test_pci_swapcase: pci.c (flat tree) test/dm/pci.c:88, dm_test_pci_swapcase(): "tHIS IS A tESt" = ptr: Expected "tHIS IS A tESt", got "this is a test" Failures: 2 The failure only happens on the 2nd swap_case device on the PCI bus. The case passes on the 1st device. It turns out the swap_case driver does not emulate bit#0 in BAR registers as a read-only bit. This corrects the implementation. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- Changes in v3: None Changes in v2: None drivers/misc/swap_case.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/misc/swap_case.c b/drivers/misc/swap_case.c index b777404..80ccb9f 100644 --- a/drivers/misc/swap_case.c +++ b/drivers/misc/swap_case.c @@ -142,6 +142,8 @@ static int sandbox_swap_case_write_config(struct udevice *emul, uint offset, debug("w bar %d=%lx\n", barnum, value); *bar = value; + /* space indicator (bit#0) is read-only */ + *bar |= barinfo[barnum].type; break; } } @@ -157,11 +159,11 @@ static int sandbox_swap_case_find_bar(struct udevice *emul, unsigned int addr, for (barnum = 0; barnum < ARRAY_SIZE(barinfo); barnum++) { unsigned int size = barinfo[barnum].size; + u32 base = plat->bar[barnum] & ~PCI_BASE_ADDRESS_SPACE; - if (addr >= plat->bar[barnum] && - addr < plat->bar[barnum] + size) { + if (addr >= base && addr < base + size) { *barnump = barnum; - *offsetp = addr - plat->bar[barnum]; + *offsetp = addr - base; return 0; } }