diff for duplicates of <20130530085230.24374.41041.sendpatchset@w520> diff --git a/a/1.txt b/N1/1.txt index f5b55b8..06785df 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,28 +19,28 @@ Not-yet-Signed-off-by: Magnus Damm <damm@opensource.se> clock-frequency = <1500000000>; }; + -+ cpu4: cpu@4 { ++ cpu4: cpu at 4 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0x100>; + clock-frequency = <1000000000>; + }; + -+ cpu5: cpu@5 { ++ cpu5: cpu at 5 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0x101>; + clock-frequency = <1000000000>; + }; + -+ cpu6: cpu@6 { ++ cpu6: cpu at 6 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0x102>; + clock-frequency = <1000000000>; + }; + -+ cpu7: cpu@7 { ++ cpu7: cpu at 7 { + device_type = "cpu"; + compatible = "arm,cortex-a7"; + reg = <0x103>; @@ -48,7 +48,7 @@ Not-yet-Signed-off-by: Magnus Damm <damm@opensource.se> + }; }; - gic: interrupt-controller@f1001000 { + gic: interrupt-controller at f1001000 { --- 0004/arch/arm/mach-shmobile/smp-r8a73a4.c +++ work/arch/arm/mach-shmobile/smp-r8a73a4.c 2013-05-30 16:18:40.000000000 +0900 @@ -31,17 +31,22 @@ @@ -119,18 +119,18 @@ Not-yet-Signed-off-by: Magnus Damm <damm@opensource.se> */ p = ioremap_nocache(APMU, 0x3000); for (k = 0; k < 1000; k++) { -- if (((__raw_readl(p + CA15PSTR) >> (cpu * 4)) & 0x03) = 3) { +- if (((__raw_readl(p + CA15PSTR) >> (cpu * 4)) & 0x03) == 3) { - ret = 1; - break; + if (cpu < 4) { /* CA15 Core Standby */ + offs = cpu * 4; -+ if (((__raw_readl(p + CA15PSTR) >> offs) & 0x03) = 3) { ++ if (((__raw_readl(p + CA15PSTR) >> offs) & 0x03) == 3) { + ret = 1; + break; + } + } else { /* CA7 Core Standby */ + offs = (cpu - 4) * 4; -+ if (((__raw_readl(p + CA7PSTR) >> offs) & 0x03) = 3) { ++ if (((__raw_readl(p + CA7PSTR) >> offs) & 0x03) == 3) { + ret = 1; + break; + } diff --git a/a/content_digest b/N1/content_digest index fd2cff3..2959ef5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020130530085152.24374.64208.sendpatchset@w520\0" - "From\0Magnus Damm <magnus.damm@gmail.com>\0" + "From\0magnus.damm@gmail.com (Magnus Damm)\0" "Subject\0[PATCH 04/05] ARM: shmobile: r8a73a4 SMP CA7 prototype (+ CA7 x 4)\0" - "Date\0Thu, 30 May 2013 08:52:30 +0000\0" + "Date\0Thu, 30 May 2013 17:52:30 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -26,28 +26,28 @@ " \t\t\tclock-frequency = <1500000000>;\n" " \t\t};\n" "+\n" - "+\t\tcpu4: cpu@4 {\n" + "+\t\tcpu4: cpu at 4 {\n" "+\t\t\tdevice_type = \"cpu\";\n" "+\t\t\tcompatible = \"arm,cortex-a7\";\n" "+\t\t\treg = <0x100>;\n" "+\t\t\tclock-frequency = <1000000000>; \n" "+\t\t};\n" "+\n" - "+\t\tcpu5: cpu@5 {\n" + "+\t\tcpu5: cpu at 5 {\n" "+\t\t\tdevice_type = \"cpu\";\n" "+\t\t\tcompatible = \"arm,cortex-a7\";\n" "+\t\t\treg = <0x101>;\n" "+\t\t\tclock-frequency = <1000000000>; \n" "+\t\t};\n" "+\n" - "+\t\tcpu6: cpu@6 {\n" + "+\t\tcpu6: cpu at 6 {\n" "+\t\t\tdevice_type = \"cpu\";\n" "+\t\t\tcompatible = \"arm,cortex-a7\";\n" "+\t\t\treg = <0x102>;\n" "+\t\t\tclock-frequency = <1000000000>; \n" "+\t\t};\n" "+\n" - "+\t\tcpu7: cpu@7 {\n" + "+\t\tcpu7: cpu at 7 {\n" "+\t\t\tdevice_type = \"cpu\";\n" "+\t\t\tcompatible = \"arm,cortex-a7\";\n" "+\t\t\treg = <0x103>;\n" @@ -55,7 +55,7 @@ "+\t\t};\n" " \t};\n" " \n" - " \tgic: interrupt-controller@f1001000 {\n" + " \tgic: interrupt-controller at f1001000 {\n" "--- 0004/arch/arm/mach-shmobile/smp-r8a73a4.c\n" "+++ work/arch/arm/mach-shmobile/smp-r8a73a4.c\t2013-05-30 16:18:40.000000000 +0900\n" "@@ -31,17 +31,22 @@\n" @@ -126,18 +126,18 @@ " \t */\n" " \tp = ioremap_nocache(APMU, 0x3000);\n" " \tfor (k = 0; k < 1000; k++) {\n" - "-\t\tif (((__raw_readl(p + CA15PSTR) >> (cpu * 4)) & 0x03) = 3) {\n" + "-\t\tif (((__raw_readl(p + CA15PSTR) >> (cpu * 4)) & 0x03) == 3) {\n" "-\t\t\tret = 1;\n" "-\t\t\tbreak;\n" "+\t\tif (cpu < 4) { /* CA15 Core Standby */\n" "+\t\t\toffs = cpu * 4;\n" - "+\t\t\tif (((__raw_readl(p + CA15PSTR) >> offs) & 0x03) = 3) {\n" + "+\t\t\tif (((__raw_readl(p + CA15PSTR) >> offs) & 0x03) == 3) {\n" "+\t\t\t\tret = 1;\n" "+\t\t\t\tbreak;\n" "+\t\t\t}\n" "+\t\t} else { /* CA7 Core Standby */\n" "+\t\t\toffs = (cpu - 4) * 4;\n" - "+\t\t\tif (((__raw_readl(p + CA7PSTR) >> offs) & 0x03) = 3) {\n" + "+\t\t\tif (((__raw_readl(p + CA7PSTR) >> offs) & 0x03) == 3) {\n" "+\t\t\t\tret = 1;\n" "+\t\t\t\tbreak;\n" "+\t\t\t}\n" @@ -158,4 +158,4 @@ " \n" " \tcpu_enter_lowpower_a15();" -d9a5a3be34124fde11dba60ce59310caee6b75d1816077d2295477abbdadacc9 +6ea465e79ba435824a76a1bc9a644fe765869fb92860b0d4998d4e189c8be3ee
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.