From patchwork Wed Jun 3 20:15:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1303193 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; 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.a=rsa-sha256 header.s=20161025 header.b=XW6ir2k2; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49cgCD6hqFz9sSF for ; Thu, 4 Jun 2020 06:15:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7635C86CB5; Wed, 3 Jun 2020 20:15:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HMSfJ9R4pxQg; Wed, 3 Jun 2020 20:15:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id E999984BC9; Wed, 3 Jun 2020 20:15:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 3603F1BF2AF for ; Wed, 3 Jun 2020 20:15:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2C64988612 for ; Wed, 3 Jun 2020 20:15:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8PSTmixeETTo for ; Wed, 3 Jun 2020 20:15:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by hemlock.osuosl.org (Postfix) with ESMTPS id CFBEB88611 for ; Wed, 3 Jun 2020 20:15:46 +0000 (UTC) Received: by mail-pl1-f195.google.com with SMTP id n9so1213371plk.1 for ; Wed, 03 Jun 2020 13:15:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RdqUy9VGEIU1a/jtliBkCthCSckYkrMj2bIiTjNuFy8=; b=XW6ir2k2Fsohm0e4uthV7QUqMNdeHlL9Ca7xq79c1OjmUb2MF0nmNRy6woQ3yRvxeb am8vDwXRnac26wcik1Z74VYnAr3oT3FfrQbmINiopsyalOghqNLLxFZlrdSv3XVZJD/V UpNF/Y1iUNuMAv702r7gMTJLUI1/7CINaE28hZhXCdH4APl5Rf7MY7F6t7PpCN20LqTS Y6Vb9miB0EqQKmXRIekLwQ7aRPHurlvT+xZf6npfZUzCo8ZFiID1SaklpO52RIMdi1ym ziNv7FsWfooDKD1dkUqGk/UOGHQs2e3VmFAIp/3Gy1myNGWpJl4KyC6qGPmEIdtxj1Lj 8tGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RdqUy9VGEIU1a/jtliBkCthCSckYkrMj2bIiTjNuFy8=; b=cO17SxIi1heGj198pxZjtFE4SB/GcANgsAqqZJCjQ3fQ0aTps6SPJnHlkrvgqJFs7j QR/hpZ6kr6GqIfz+IaNXfQL+D1sqZSkNtRdg3xKGygOJY5bdsmmIvaGgcTbOB2L3edOG UUvICHtG2EWEJyjcRj28Ee9R8wXHjniT856+VKa/7MB0p492zrhuV8GJeMjvYqCYAoGM vkqf6JwiT1rgNlrigA0pNRTUuW8b331X6BsfcpAvw0OlMTAWZkFr3SqIPwnJmBThth6J sTDjL3GYvTAy2mzq9Sv4WKU/Fdnq0caMIjby2rBT72qaqCpJZFjHCBQqaaLdjYlJ8JNW dBwA== X-Gm-Message-State: AOAM532zwBTTBbW/q7vlCUNstlWzOqboiKt836eghd/y5QmmlOzzprdI 3HGInse7DBFPkbtda/SuqeLgwcU6 X-Google-Smtp-Source: ABdhPJxQrjYzZjs7lDf+WirD0+Fz8mzRHPKOUEqqBAHv+OordrcpVdBTdXYPUwZFLnppKHqmyRPWUA== X-Received: by 2002:a17:90a:4495:: with SMTP id t21mr1811825pjg.185.1591215346052; Wed, 03 Jun 2020 13:15:46 -0700 (PDT) Received: from localhost.localdomain ([47.149.8.172]) by smtp.gmail.com with ESMTPSA id x25sm2172854pge.23.2020.06.03.13.15.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2020 13:15:45 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Wed, 3 Jun 2020 13:15:44 -0700 Message-Id: <20200603201544.1299103-1-aduskett@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/qemu: remove uneeded upstream patches X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett These patches are already applied in version 5.0 Fixes: http://autobuild.buildroot.net/results/0adfb031c243709b0bac71599ed419b64cc514a4 Signed-off-by: Adam Duskett --- ...fix-crash-when-compiling-with-uClibc.patch | 43 ---------- ...emi-fix-SYS_OPEN-to-return-nonzero-f.patch | 78 ------------------- 2 files changed, 121 deletions(-) delete mode 100644 package/qemu/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch delete mode 100644 package/qemu/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch diff --git a/package/qemu/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch b/package/qemu/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch deleted file mode 100644 index d1b9e35709..0000000000 --- a/package/qemu/0002-util-cacheinfo-fix-crash-when-compiling-with-uClibc.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d82b8540ecaf3cb09a033e4971d8645d3343211e Mon Sep 17 00:00:00 2001 -From: Carlos Santos -Date: Wed, 16 Oct 2019 22:27:30 -0300 -Subject: [PATCH] util/cacheinfo: fix crash when compiling with uClibc - -uClibc defines _SC_LEVEL1_ICACHE_LINESIZE and _SC_LEVEL1_DCACHE_LINESIZE -but the corresponding sysconf calls returns -1, which is a valid result, -meaning that the limit is indeterminate. - -Handle this situation using the fallback values instead of crashing due -to an assertion failure. - -Signed-off-by: Carlos Santos ---- - util/cacheinfo.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/util/cacheinfo.c b/util/cacheinfo.c -index ea6f3e99bf..d94dc6adc8 100644 ---- a/util/cacheinfo.c -+++ b/util/cacheinfo.c -@@ -93,10 +93,16 @@ static void sys_cache_info(int *isize, int *dsize) - static void sys_cache_info(int *isize, int *dsize) - { - # ifdef _SC_LEVEL1_ICACHE_LINESIZE -- *isize = sysconf(_SC_LEVEL1_ICACHE_LINESIZE); -+ int tmp_isize = (int) sysconf(_SC_LEVEL1_ICACHE_LINESIZE); -+ if (tmp_isize > 0) { -+ *isize = tmp_isize; -+ } - # endif - # ifdef _SC_LEVEL1_DCACHE_LINESIZE -- *dsize = sysconf(_SC_LEVEL1_DCACHE_LINESIZE); -+ int tmp_dsize = (int) sysconf(_SC_LEVEL1_DCACHE_LINESIZE); -+ if (tmp_dsize > 0) { -+ *dsize = tmp_dsize; -+ } - # endif - } - #endif /* sys_cache_info */ --- -2.18.1 - diff --git a/package/qemu/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch b/package/qemu/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch deleted file mode 100644 index 46652d8298..0000000000 --- a/package/qemu/0003-target-arm-arm-semi-fix-SYS_OPEN-to-return-nonzero-f.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 318f83f387678a3c0a2a729b506613011c6830b2 Mon Sep 17 00:00:00 2001 -From: Masahiro Yamada -Date: Fri, 17 Jan 2020 14:09:30 +0000 -Subject: [PATCH] target/arm/arm-semi: fix SYS_OPEN to return nonzero - filehandle - -According to the specification "Semihosting for AArch32 and Aarch64", -the SYS_OPEN operation should return: - - - A nonzero handle if the call is successful - - -1 if the call is not successful - -So, it should never return 0. - -Prior to commit 35e9a0a8ce4b ("target/arm/arm-semi: Make semihosting -code hand out its own file descriptors"), the guest fd matched to the -host fd. It returned a nonzero handle on success since the fd 0 is -already used for stdin. - -Now that the guest fd is the index of guestfd_array, it starts from 0. - -I noticed this issue particularly because Trusted Firmware-A built with -PLAT=qemu is no longer working. Its io_semihosting driver only handles -a positive return value as a valid filehandle. - -Basically, there are two ways to fix this: - - - Use (guestfd - 1) as the index of guestfs_arrary. We need to insert - increment/decrement to convert the guestfd and the array index back - and forth. - - - Keep using guestfd as the index of guestfs_array. The first entry - of guestfs_array is left unused. - -I thought the latter is simpler. We end up with wasting a small piece -of memory for the unused first entry of guestfd_array, but this is -probably not a big deal. - -Fixes: 35e9a0a8ce4b ("target/arm/arm-semi: Make semihosting code hand out its own file descriptors") -Cc: qemu-stable@nongnu.org -Signed-off-by: Masahiro Yamada -Reviewed-by: Richard Henderson -Message-id: 20200109041228.10131-1-masahiroy@kernel.org -Signed-off-by: Peter Maydell - -(cherry picked from commit 21bf9b06cb6d07c6cc437dfd47b47b28c2bb79db) -Signed-off-by: Adrien Grassein -Signed-off-by: Romain Naour ---- - target/arm/arm-semi.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/target/arm/arm-semi.c b/target/arm/arm-semi.c -index 6f7b6d801b..4275dfc345 100644 ---- a/target/arm/arm-semi.c -+++ b/target/arm/arm-semi.c -@@ -144,7 +144,8 @@ static int alloc_guestfd(void) - guestfd_array = g_array_new(FALSE, TRUE, sizeof(GuestFD)); - } - -- for (i = 0; i < guestfd_array->len; i++) { -+ /* SYS_OPEN should return nonzero handle on success. Start guestfd from 1 */ -+ for (i = 1; i < guestfd_array->len; i++) { - GuestFD *gf = &g_array_index(guestfd_array, GuestFD, i); - - if (gf->type == GuestFDUnused) { -@@ -168,7 +169,7 @@ static GuestFD *do_get_guestfd(int guestfd) - return NULL; - } - -- if (guestfd < 0 || guestfd >= guestfd_array->len) { -+ if (guestfd <= 0 || guestfd >= guestfd_array->len) { - return NULL; - } - --- -2.24.1 -